Packaging: Windows MSI gets a setup wizard with version and launch box

Double-clicking the MSI used to flash a progress bar and close, so users couldn't tell it had installed. It now opens a wizard: Welcome, install folder (remembered across upgrades), Ready, progress, and a Finish page that says where to find the app with a ticked "Launch VectorCraft" box. Every page names the full version, pre-release tag included. The wizard art is drawn from the app icon at package time; msiexec /qn still installs silently. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-10-09 20:41:53 +07:00
355 changed files with 4004 additions and 55581 deletions
@@ -46,7 +46,7 @@ jobs:
          }
      - name: XML, desktop entry, AppStream, Flatpak manifest
        run: |
-          xmllint --noout packaging/windows/vectorcraft.wxs packaging/macos/*.plist* packaging/linux/*.xml*
+          xmllint --noout packaging/windows/vectorcraft.wxs packaging/windows/vectorcraft.en-us.wxl packaging/macos/*.plist* packaging/linux/*.xml*
          # Windows Installer needs Icon ids ending in .ico or .exe, or shortcuts show a blank icon.
          if grep -oE '<Icon Id="[^"]*"' packaging/windows/vectorcraft.wxs | grep -vE '\.(ico|exe)"$'; then
            echo "::error::Icon Id must end in .ico or .exe"; exit 1
@@ -54,13 +54,4 @@ jobs:
          desktop-file-validate packaging/linux/ai.storyteller.vectorcraft.desktop
          sed -e 's/@VERSION@/0.0.0/' -e 's/@DATE@/2026-01-01/' packaging/linux/ai.storyteller.vectorcraft.metainfo.xml.in >"$RUNNER_TEMP/ai.storyteller.vectorcraft.metainfo.xml"
          appstreamcli validate --no-net --explain "$RUNNER_TEMP/ai.storyteller.vectorcraft.metainfo.xml"
-          python3 - <<'EOF'
-          import yaml
-          src = yaml.safe_load(open("packaging/linux/flatpak/ai.storyteller.vectorcraft.yml"))
-          bundle = yaml.safe_load(open("packaging/linux/flatpak/ai.storyteller.vectorcraft.bundle.yml"))
-          for m in (src, bundle):
-              assert m["id"] == "ai.storyteller.vectorcraft" and m["command"] == "vectorcraft", m["id"]
-          for key in ("runtime", "runtime-version", "sdk", "finish-args"):
-              assert src[key] == bundle[key], f"Flatpak manifests disagree on {key}: {src[key]} vs {bundle[key]}"
-          print("Flatpak manifests ok")
-          EOF
+          python3 -c "import yaml; m = yaml.safe_load(open('packaging/linux/flatpak/ai.storyteller.vectorcraft.yml')); assert m['id'] == 'ai.storyteller.vectorcraft' and m['command'] == 'vectorcraft'"
@@ -1,11 +1,9 @@
 # Release pipeline: every push to `release` builds signed installers for every platform and
 # creates or updates the draft GitHub Release "VectorCraft v<version>". See docs/releasing.md.
 #
-# Jobs that sign (macOS, Windows) and the job that creates the release run in the `release`
-# environment (restricted to the `release` branch), which holds the signing secrets. Every secret
-# is optional: missing ones produce unsigned artifacts and a warning, never a failed build. The
-# other jobs sign nothing and get no environment, so a `workflow_dispatch` on any branch is a dry
-# run: they build and upload artifacts, the signed jobs are refused, and no release is drafted.
+# All jobs run in the `release` environment (restricted to the `release` branch), which holds
+# the signing secrets. Every secret is optional: missing ones produce unsigned artifacts and a
+# warning, never a failed build.
 name: Release

 on:
@@ -37,7 +35,7 @@ jobs:
  version:
    name: version
    runs-on: ubuntu-latest
-    # No `environment: release`: no secrets here.
+    environment: release
    outputs:
      version: ${{ steps.v.outputs.version }}
      date: ${{ steps.v.outputs.date }}
@@ -65,7 +63,7 @@ jobs:
  macos:
    name: macOS universal
    needs: version
-    runs-on: macos-15-xlarge  # M2 Pro larger runner; use only in release.yml (actions_macos_xl budget caps spend)
+    runs-on: macos-15
    environment: release
    env:
      VECTORCRAFT_VERSION: ${{ needs.version.outputs.version }}
@@ -150,7 +148,9 @@ jobs:
        run: cargo xtask version set "$VECTORCRAFT_VERSION"
      - name: Install WiX
        shell: pwsh
-        run: dotnet tool install --global wix --version 5.0.2
+        run: |
+          dotnet tool install --global wix --version 5.0.2
+          wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2
      - name: Build, sign, package
        shell: pwsh
        env:
@@ -177,7 +177,7 @@ jobs:
    # The oldest GitHub-hosted image, so the binaries only need glibc >= 2.35 (Ubuntu 22.04+,
    # Debian 12+, Fedora 36+, RHEL 10). See docs/releasing.md.
    runs-on: ${{ matrix.runner }}
-    # No `environment: release`: Linux packages are not signed (checksums in SHA256SUMS.txt).
+    environment: release
    strategy:
      fail-fast: false
      matrix:
@@ -202,7 +202,7 @@ jobs:
          sudo apt-get update
          sudo apt-get install -y --no-install-recommends \
            libxkbcommon-dev libwayland-dev libx11-dev libxrandr-dev libxi-dev libgl1-mesa-dev \
-            desktop-file-utils appstream python3-yaml zsync
+            desktop-file-utils appstream python3-yaml
          curl -fsSL -o "$RUNNER_TEMP/nfpm.deb" \
            "https://github.com/goreleaser/nfpm/releases/download/v${NFPM_VERSION}/nfpm_${NFPM_VERSION}_${{ matrix.deb }}.deb"
          sudo dpkg -i "$RUNNER_TEMP/nfpm.deb"
@@ -227,12 +227,6 @@ jobs:
          for appimage in dist/release/*.AppImage; do
            chmod +x "$appimage"
            APPIMAGE_EXTRACT_AND_RUN=1 "$appimage" --version
-            # Update information is embedded, and the .zsync for delta updates sits beside it.
-            # No APPIMAGE_EXTRACT_AND_RUN here: with it the runtime passes --appimage-* flags on
-            # to the app instead of answering them itself.
-            "$appimage" --appimage-updateinformation \
-              | grep -F "gh-releases-zsync|${GITHUB_REPOSITORY%%/*}|${GITHUB_REPOSITORY#*/}|latest|vectorcraft-*-linux-${{ matrix.arch }}.AppImage.zsync"
-            test -s "$appimage.zsync"
          done
      - uses: actions/upload-artifact@v4
        with:
@@ -240,52 +234,13 @@ jobs:
          path: dist/release/*
          if-no-files-found: error

-  flatpak:
-    name: Flatpak ${{ matrix.arch }}
-    needs: [version, linux]
-    # Repackages the Linux job's tarball (the same binaries as the AppImage/deb/rpm); no Rust
-    # build here. 24.04 for a newer flatpak-builder (1.4) than 22.04 ships.
-    runs-on: ${{ matrix.runner }}
-    # No `environment: release`: this job signs nothing, so it gets no release secrets.
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - { arch: x86_64, runner: ubuntu-24.04 }
-          - { arch: aarch64, runner: ubuntu-24.04-arm }
-    env:
-      VECTORCRAFT_VERSION: ${{ needs.version.outputs.version }}
-      VECTORCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/download-artifact@v4
-        with:
-          name: release-linux-${{ matrix.arch }}
-          path: dist/linux
-      - name: Install flatpak-builder
-        run: |
-          sudo apt-get update
-          # librsvg2-common: the SVG pixbuf loader. flatpak-builder runs the host's
-          # `appstreamcli compose`, which renders the scalable icon and fails without it.
-          sudo apt-get install -y --no-install-recommends flatpak flatpak-builder librsvg2-common
-          # Ubuntu 24.04's AppArmor blocks the unprivileged user namespaces bubblewrap needs.
-          sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
-      - name: Build the Flatpak bundle
-        run: packaging/linux/flatpak-bundle.sh "dist/linux/vectorcraft-$VECTORCRAFT_VERSION-linux-${{ matrix.arch }}.tar.gz"
-      - uses: actions/upload-artifact@v4
-        with:
-          name: release-flatpak-${{ matrix.arch }}
-          path: dist/release/*.flatpak
-          if-no-files-found: error
-
  freebsd:
    name: FreeBSD x86_64
    needs: version
-    # GitHub has no FreeBSD runners: build in a FreeBSD 14.3 VM (same image and packages as
-    # freebsd.yml).
+    # GitHub has no FreeBSD runners: build in a FreeBSD 14.3 VM (same image as freebsd.yml).
    runs-on: ubuntu-latest
    timeout-minutes: 150
-    # No `environment: release`: this job signs nothing, so it gets no release secrets.
+    environment: release
    env:
      VECTORCRAFT_VERSION: ${{ needs.version.outputs.version }}
      VECTORCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
@@ -309,7 +264,6 @@ jobs:
        with:
          release: "14.3"
          usesh: true
-          cpu: 4
          mem: 12288
          # Passed through by name; never templated into the script.
          envs: "VECTORCRAFT_VERSION VECTORCRAFT_BUILD_DATE VECTORCRAFT_BUILD_SHA"
@@ -324,8 +278,6 @@ jobs:
            export CRAFT_FONTS_DIR="$PWD/craft-fonts" CRAFT_FONTS_REQUIRED=1
            export CARGO_TARGET_DIR=/var/tmp/vectorcraft-target CARGO_BUILD_JOBS=4
            bash packaging/freebsd/package.sh
-            tar -tzf dist/release/vectorcraft-*-freebsd-x86_64.tar.gz \
-              | grep -E '/bin/vectorcraft$|/bin/vectorcraft-cli$|/share/applications/ai\.storyteller\.vectorcraft\.desktop$'
      - uses: actions/upload-artifact@v4
        with:
          name: release-freebsd
@@ -336,7 +288,7 @@ jobs:
    name: Web (wasm)
    needs: version
    runs-on: ubuntu-latest
-    # No `environment: release`: no secrets here.
+    environment: release
    env:
      VECTORCRAFT_VERSION: ${{ needs.version.outputs.version }}
      VECTORCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
@@ -377,9 +329,7 @@ jobs:

  release:
    name: Draft GitHub Release
-    # Needs the signed jobs, so a branch dry run (where the environment refuses them) never
-    # drafts a release.
-    needs: [version, macos, windows, linux, flatpak, freebsd, web]
+    needs: [version, macos, windows, linux, freebsd, web]
    runs-on: ubuntu-latest
    environment: release
    permissions:
@@ -1,7 +1,7 @@
 # Windows on ARM: package the ARM64 release the way release.yml does (cross-compiled on an x64
 # runner, unsigned here), then install that MSI on a Windows 11 ARM64 runner, check the installed
 # binaries are ARM64, run the CLI natively, and uninstall. (A native ARM64 `cargo test` job is left
-# out for now: PdfCraft saw an intermittent access violation in egui UI tests there.)
+# out for now: PrintCraft saw an intermittent access violation in egui UI tests there.)
 name: Windows ARM64

 on:
@@ -45,7 +45,9 @@ jobs:
          key: windows-arm64-package
      - name: Install WiX
        shell: pwsh
-        run: dotnet tool install --global wix --version 5.0.2
+        run: |
+          dotnet tool install --global wix --version 5.0.2
+          wix extension add -g WixToolset.UI.wixext/5.0.2 WixToolset.Util.wixext/5.0.2
      - name: Build and package (unsigned)
        shell: pwsh
        env:
@@ -1,43 +0,0 @@
-# Experimental, unsupported Windows 7 SP1 x64 portable build (docs/windows7.md). It runs by hand and
-# weekly, so ordinary PRs never wait on it, and the weekly run shows when a dependency update starts
-# importing a post-Windows-7 API. packaging/windows/windows7.ps1 does the work: it is the only build
-# that uses the patched vendor/windows-link. A modern Windows runner proves compilation and host
-# smoke tests only: run the checklist in docs/windows7.md on actual Windows 7 before claiming support.
-name: Windows 7 x64 compatibility
-
-on:
-  schedule:
-    - cron: "23 5 * * 1" # weekly
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-env:
-  CARGO_TERM_COLOR: always
-  CARGO_INCREMENTAL: 0
-
-jobs:
-  build:
-    runs-on: windows-2022
-    timeout-minutes: 90
-    steps:
-      - uses: actions/checkout@11d5960a326750d5838078e36cf38b85af677262 # v4.4.0
-      - uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
-        with:
-          arch: x64
-      - uses: dtolnay/rust-toolchain@7e38f4b43b4db5c8dd498af069a4f6196df1d067 # master
-        with:
-          toolchain: nightly-2026-10-01
-          components: rust-src
-      - uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
-        with:
-          key: windows7-x64
-      - name: Build, check and test the portable package
-        shell: pwsh
-        run: ./packaging/windows/windows7.ps1 -Test
-      - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
-        with:
-          name: vectorcraft-windows7-x64-portable
-          path: dist/release/vectorcraft-windows7-x64-portable.zip
-          if-no-files-found: error
@@ -1,24 +1,18 @@
 # VectorCraft — instructions for agents

-VectorCraft is a clean-room, open-source, Rust-native vector illustration app targeting Adobe Illustrator parity (and beyond). It runs natively on macOS, Windows and Linux, and on the web via WASM. Siblings: `../photocraft` (Photoshop-class) and `../pdfcraft` (Acrobat-class); same conventions.
+VectorCraft is a clean-room, open-source, Rust-native vector illustration app targeting Adobe Illustrator parity (and beyond). It runs natively on macOS, Windows and Linux, and on the web via WASM. Siblings: `../photocraft` (Photoshop-class) and `../printcraft` (Acrobat-class); same conventions.

 Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format": "drawcraft"` headers still open (`vectorcraft_format::LEGACY_EXTENSION`), and preferences migrate from the old config folder. Keep those paths working; use the new name everywhere else.

 ## Start every session here
 1. Read the [honest assessment in `ROADMAP.md`](ROADMAP.md#honest-assessment-2026-10-05): where we stand by dimension, **where we're lacking** (the prioritized gap list) and **where we're going**. Unless the user gives you a task, pick work from that list.
-2. Read `plan/STATUS.md` (local session notes, may lag the ROADMAP), then the task in `plan/execution-plan.md` §3 and the relevant `plan/architecture.md` section. Behaviour reference: public documentation only (see Clean-room below); `plan/illustrator/*.md` holds notes from it.
+2. Read `plan/STATUS.md` (local session notes, may lag the ROADMAP), then the task in `plan/execution-plan.md` §3 and the relevant `plan/architecture.md` section. Behaviour reference: `plan/illustrator/*.md`.
 3. Follow the autonomous operation protocol (`plan/execution-plan.md` §7): orient → plan → implement + test → verify → record → commit. Don't stop to ask unless §7 lists the decision as the user's.

 `plan/` is gitignored (local only).

 ## Non-negotiables
- **Clean-room: never use Adobe software (absolute rule, from the project owner).** Adobe's Terms of Use forbid reverse engineering, including observing a program's inputs and outputs to recreate it. So:
-  - Never launch, run, script, automate (COM, AppleScript, ExtendScript, UI automation), screenshot or measure Illustrator or any other Adobe application, and never compare our output against one. Don't make test files with them, not even "synthetic" ones.
-  - Never read, disassemble or copy anything inside an Adobe install (binaries, plug-ins, presets, procsets, resources, help files, fonts, ICC profiles).
-  - Never copy Adobe-authored code or text into this repo, tests included: no PostScript procsets or prologs (AGM, CoolType, the Illustrator prologs), no sample files. Write test inputs from scratch from the public specifications (PostScript Language Reference, PDF / ISO 32000, TIFF, EPSF/DCS).
-  - Behaviour comes only from public documentation (helpx, published specs, public forum posts), cited by URL, and from files users send us that they own (used locally, never committed). Never copy Adobe icons, artwork, presets or wording beyond feature names.
-  - If a task seems to need any of this, stop and say so instead. `cargo xtask cleanroom` (run by `cargo xtask ci`) fails on Adobe copyright notices and on fixtures made with Adobe applications.
-  - Never copy GPL/AGPL code (Inkscape, lib2geom…).
+- **Clean-room.** Never read, disassemble or copy anything inside the Illustrator bundle (names/listings only). Never copy Adobe icons, artwork, presets or wording beyond feature names. Behaviour comes from public docs and black-box observation of the running app with synthetic documents only (screenshots by window id, stored under `plan/illustrator/screenshots/`, never committed). Never copy GPL/AGPL code (Inkscape, lib2geom…).
 - **Assets: no Adobe iconography or images — ever (absolute rule, from the project owner).**
  - Never add, copy, trace, redraw-from, embed or ship any icon, image, artwork, cursor, preset, swatch/brush/symbol/pattern/style library, ICC profile or screenshot from Adobe products or from any other source whose licence doesn't allow it.
  - Every image, icon, font or other asset must be one of:
@@ -50,7 +44,7 @@ Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format
 ## Running and looking at the app
 - `cargo run --release -p vectorcraft -- --control 7979 [file.svg|file.vectorcraft]` (sibling apps' agents use the same default port: if the log says it failed to bind, pick another port — otherwise your requests reach a different app).
 - Drive it: JSON lines on `127.0.0.1:7979`, e.g. `{"id":1,"method":"engine.execute","params":{"command":"shape.rectangle","params":{"x":10,"y":10,"width":100,"height":50}}}` then `{"id":2,"method":"ui.screenshot","params":{"path":"/tmp/shot.png"}}`. Methods: `crates/ui-egui/src/control.rs`.
- **For UI work, look at the result** (take `ui.screenshot`, read the PNG) and compare with the public documentation (`plan/illustrator/02-ui-ux.md` notes). `ui.screenshot` needs a presented frame: if it errors (screen locked), check the art with `ui.render` / `vectorcraft-cli run … --export x.png`, and cover panels with a headless egui frame test (see `panels/transparency.rs` tests).
+- **For UI work, look at the result** (take `ui.screenshot`, read the PNG) and compare with `plan/illustrator/02-ui-ux.md` / `10-observed-ui.md`. `ui.screenshot` needs a presented frame: if it errors (screen locked), check the art with `ui.render` / `vectorcraft-cli run … --export x.png`, and cover panels with a headless egui frame test (see `panels/transparency.rs` tests).
 - **Performance:** `vectorcraft-cli perf` checks the budgets (render/pan/zoom, hit test, save/open, SVG, Pathfinder) on a synthetic 50k-path document; `vectorcraft-cli bench FILE` times one file. Run them before and after renderer, format or geometry changes, on an idle machine (the report warns when the load average makes timings noise).
 - MCP: `vectorcraft-cli mcp` (see `docs/mcp.md`).
 - Shell gotcha: `mv`/`cp` are aliased interactive here — use `/bin/mv -f` / `/bin/cp -f`.
@@ -59,23 +53,5 @@ Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format
 ## Roadmap
 `ROADMAP.md` (committed) is the shared picture of where VectorCraft stands. It holds status, the honest assessment (by dimension, the gap list, the direction), milestones, the parity table and time-to-parity estimates.
 - When a task lands, update it in the same PR: the milestone row, the parity-table row (score, missing items, hours), "Shipped so far", and the gap list if the gap closed or shrank.
- Grade by behaviour against the public documentation (`plan/illustrator/` notes), not by whether a menu item exists. Scores are self-assessed, so err low.
+- Grade by behaviour against `plan/illustrator/`, not by whether a menu item exists. Scores are self-assessed, so err low.
 - Keep the README's Status section in step with the ROADMAP headline.
-
-## Contributor credits (About window)
-
- About ▸ Contributors/Models are compiled into the binary from `contributors/contributors.json`
-  (commit stats; generated, never hand-edit) and `contributors/people.toml` (names people chose for
-  themselves). See `docs/contributors.md`.
- **Agents working for a contributor:** when you prepare a PR, check whether your human's GitHub
-  username has a `[people.<username>]` entry in `contributors/people.toml`. If not, ask them once
-  whether they want to be credited by more than their username: a real name, a display name, and/or
-  their public GitHub profile name (`sync_github_name = true`). If yes, add **only their own** entry
-  (copy the template at the top of the file, or run
-  `python3 ../../craftrules/scripts/contributors.py --add-me . --real-name "…" --sync-github-name`)
-  and include it in their PR, committed as them. If no, change nothing: they are credited as
-  `@username` anyway.
- Never add, edit, guess or copy anyone else's entry or name (not from git config, commit authors or
-  GitHub profiles). Never hand-edit `contributors.json`.
- Maintainers refresh the stats with `python3 ../../craftrules/scripts/contributors.py .` (it also
-  re-verifies who wrote each `people.toml` entry; `--check` only verifies).
@@ -37,9 +37,6 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/app-icon/vectorcraft.icns` | Project owner (ArtCraft team) | Original artwork drawn in ArtCraft for VectorCraft, vectorised and rendered by `packaging/icons.sh` | MIT OR Apache-2.0 (`assets/app-icon/LICENSE.txt`) | App icon (engraved dragon) |
 | `assets/app-icon/vectorcraft.ico` | Project owner (ArtCraft team) | Original artwork drawn in ArtCraft for VectorCraft, vectorised and rendered by `packaging/icons.sh` | MIT OR Apache-2.0 (`assets/app-icon/LICENSE.txt`) | App icon (engraved dragon) |
 | `assets/app-icon/vectorcraft.svg` | Project owner (ArtCraft team) | Original artwork drawn in ArtCraft for VectorCraft, vectorised and rendered by `packaging/icons.sh` | MIT OR Apache-2.0 (`assets/app-icon/LICENSE.txt`) | App icon (engraved dragon) |
-| `packaging/macos/dmg/background.svg` | Xus Badia (contributed in #493) | Original artwork for VectorCraft's DMG window; links the app icon `assets/app-icon/vectorcraft-small.svg` | MIT OR Apache-2.0 (licensed by the contributor under the project licence) | DMG background source. Text in Inter and JetBrains Mono (OFL-1.1, `assets/fonts`), not embedded; paper grain generated by an SVG `feTurbulence` filter |
-| `packaging/macos/dmg/background.tiff` | Xus Badia (contributed in #493) | Rendered from `packaging/macos/dmg/background.svg` by `packaging/macos/dmg/generate.py` | MIT OR Apache-2.0 | 1x + 2x DMG background; includes the app icon (see its rows), text rendered from OFL-1.1 fonts and LittleCMS's built-in sRGB profile ("No copyright, use freely") |
-| `packaging/macos/dmg/DS_Store` | Xus Badia (layout, #493) | Written by `packaging/macos/dmg/generate.py` | MIT OR Apache-2.0 | Finder view settings for the DMG (window, icon size and positions, background alias); no machine data |
 | `assets/fonts/Inter-Medium.ttf` | Rasmus Andersson / The Inter Project Authors | https://github.com/rsms/inter | OFL-1.1 (`assets/fonts/OFL-Inter.txt`) | Open-source typeface, not product iconography or artwork |
 | `assets/fonts/Inter-Regular.ttf` | Rasmus Andersson / The Inter Project Authors | https://github.com/rsms/inter | OFL-1.1 (`assets/fonts/OFL-Inter.txt`) | Open-source typeface, not product iconography or artwork |
 | `assets/fonts/Inter-SemiBold.ttf` | Rasmus Andersson / The Inter Project Authors | https://github.com/rsms/inter | OFL-1.1 (`assets/fonts/OFL-Inter.txt`) | Open-source typeface, not product iconography or artwork |
@@ -93,7 +90,6 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/icons/dc-alignto-key.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-alignto-selection.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-anchor.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
-| `assets/icons/dc-anchor-smooth.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-appearance.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-arc.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-arrow-down.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
@@ -170,11 +166,11 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/icons/dc-para-justify-left.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-para-justify-right.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-para-left.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
-| `assets/icons/dc-para-ltr.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-para-right.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
-| `assets/icons/dc-para-rtl.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-path-eraser.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-pathfinder.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
+| `assets/icons/dc-pen-add.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
+| `assets/icons/dc-pen-delete.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-perspective.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-pf-crop.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-pf-divide.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
@@ -267,8 +263,6 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/icons/paintbrush.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/palette.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/pen-tool.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
-| `assets/icons/pen-tool-add.svg` | Lucide Icons and Contributors; badge by VectorCraft contributors | https://lucide.dev (lucide-static v1.49.0 `pen-tool`; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) | Lucide's pen-tool with a plus badge |
-| `assets/icons/pen-tool-delete.svg` | Lucide Icons and Contributors; badge by VectorCraft contributors | https://lucide.dev (lucide-static v1.49.0 `pen-tool`; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) | Lucide's pen-tool with a minus badge |
 | `assets/icons/pencil.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/pilcrow.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/pin.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
@@ -320,7 +314,6 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `docs/images/shot-2-ribbons.png` | VectorCraft contributors | Screenshot of VectorCraft itself, editing `examples/ribbons.vectorcraft` | MIT OR Apache-2.0 |  |
 | `docs/images/shot-3-sheet.png` | VectorCraft contributors | Screenshot of VectorCraft itself, editing `examples/feature-sheet.vectorcraft` | MIT OR Apache-2.0 |  |
 | `docs/images/shot-4-bezier.png` | VectorCraft contributors | Screenshot of VectorCraft itself, editing `examples/feature-sheet.vectorcraft` | MIT OR Apache-2.0 |  |
-| `docs/images/shot-5-perspective.png` | VectorCraft contributors | Screenshot of VectorCraft itself, editing `examples/perspective-city.vectorcraft` | MIT OR Apache-2.0 |  |
 | `docs/images/art-neon-drive.png` | VectorCraft contributors | Rendered by VectorCraft from `examples/neon-drive.vectorcraft` | MIT OR Apache-2.0 |  |
 | `docs/images/art-ribbons.png` | VectorCraft contributors | Rendered by VectorCraft from `examples/ribbons.vectorcraft` | MIT OR Apache-2.0 |  |
 | `docs/images/art-pathfinder.png` | VectorCraft contributors | Rendered by VectorCraft from `examples/feature-sheet.vectorcraft` (artboard 1) | MIT OR Apache-2.0 |  |
@@ -330,4 +323,3 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `examples/neon-drive.vectorcraft` | VectorCraft contributors | Original artwork built through the VectorCraft command API | MIT OR Apache-2.0 |  |
 | `examples/ribbons.vectorcraft` | VectorCraft contributors | Original artwork built through the VectorCraft command API | MIT OR Apache-2.0 |  |
 | `examples/feature-sheet.vectorcraft` | VectorCraft contributors | Original artwork built through the VectorCraft command API | MIT OR Apache-2.0 |  |
-| `examples/perspective-city.vectorcraft` | VectorCraft contributors | Original artwork built through the VectorCraft command API | MIT OR Apache-2.0 |  |
@@ -1,24 +1,18 @@
 # VectorCraft — instructions for agents

-VectorCraft is a clean-room, open-source, Rust-native vector illustration app targeting Adobe Illustrator parity (and beyond). It runs natively on macOS, Windows and Linux, and on the web via WASM. Siblings: `../photocraft` (Photoshop-class) and `../pdfcraft` (Acrobat-class); same conventions.
+VectorCraft is a clean-room, open-source, Rust-native vector illustration app targeting Adobe Illustrator parity (and beyond). It runs natively on macOS, Windows and Linux, and on the web via WASM. Siblings: `../photocraft` (Photoshop-class) and `../printcraft` (Acrobat-class); same conventions.

 Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format": "drawcraft"` headers still open (`vectorcraft_format::LEGACY_EXTENSION`), and preferences migrate from the old config folder. Keep those paths working; use the new name everywhere else.

 ## Start every session here
 1. Read the [honest assessment in `ROADMAP.md`](ROADMAP.md#honest-assessment-2026-10-05): where we stand by dimension, **where we're lacking** (the prioritized gap list) and **where we're going**. Unless the user gives you a task, pick work from that list.
-2. Read `plan/STATUS.md` (local session notes, may lag the ROADMAP), then the task in `plan/execution-plan.md` §3 and the relevant `plan/architecture.md` section. Behaviour reference: public documentation only (see Clean-room below); `plan/illustrator/*.md` holds notes from it.
+2. Read `plan/STATUS.md` (local session notes, may lag the ROADMAP), then the task in `plan/execution-plan.md` §3 and the relevant `plan/architecture.md` section. Behaviour reference: `plan/illustrator/*.md`.
 3. Follow the autonomous operation protocol (`plan/execution-plan.md` §7): orient → plan → implement + test → verify → record → commit. Don't stop to ask unless §7 lists the decision as the user's.

 `plan/` is gitignored (local only).

 ## Non-negotiables
- **Clean-room: never use Adobe software (absolute rule, from the project owner).** Adobe's Terms of Use forbid reverse engineering, including observing a program's inputs and outputs to recreate it. So:
-  - Never launch, run, script, automate (COM, AppleScript, ExtendScript, UI automation), screenshot or measure Illustrator or any other Adobe application, and never compare our output against one. Don't make test files with them, not even "synthetic" ones.
-  - Never read, disassemble or copy anything inside an Adobe install (binaries, plug-ins, presets, procsets, resources, help files, fonts, ICC profiles).
-  - Never copy Adobe-authored code or text into this repo, tests included: no PostScript procsets or prologs (AGM, CoolType, the Illustrator prologs), no sample files. Write test inputs from scratch from the public specifications (PostScript Language Reference, PDF / ISO 32000, TIFF, EPSF/DCS).
-  - Behaviour comes only from public documentation (helpx, published specs, public forum posts), cited by URL, and from files users send us that they own (used locally, never committed). Never copy Adobe icons, artwork, presets or wording beyond feature names.
-  - If a task seems to need any of this, stop and say so instead. `cargo xtask cleanroom` (run by `cargo xtask ci`) fails on Adobe copyright notices and on fixtures made with Adobe applications.
-  - Never copy GPL/AGPL code (Inkscape, lib2geom…).
+- **Clean-room.** Never read, disassemble or copy anything inside the Illustrator bundle (names/listings only). Never copy Adobe icons, artwork, presets or wording beyond feature names. Behaviour comes from public docs and black-box observation of the running app with synthetic documents only (screenshots by window id, stored under `plan/illustrator/screenshots/`, never committed). Never copy GPL/AGPL code (Inkscape, lib2geom…).
 - **Assets: no Adobe iconography or images — ever (absolute rule, from the project owner).**
  - Never add, copy, trace, redraw-from, embed or ship any icon, image, artwork, cursor, preset, swatch/brush/symbol/pattern/style library, ICC profile or screenshot from Adobe products or from any other source whose licence doesn't allow it.
  - Every image, icon, font or other asset must be one of:
@@ -50,7 +44,7 @@ Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format
 ## Running and looking at the app
 - `cargo run --release -p vectorcraft -- --control 7979 [file.svg|file.vectorcraft]` (sibling apps' agents use the same default port: if the log says it failed to bind, pick another port — otherwise your requests reach a different app).
 - Drive it: JSON lines on `127.0.0.1:7979`, e.g. `{"id":1,"method":"engine.execute","params":{"command":"shape.rectangle","params":{"x":10,"y":10,"width":100,"height":50}}}` then `{"id":2,"method":"ui.screenshot","params":{"path":"/tmp/shot.png"}}`. Methods: `crates/ui-egui/src/control.rs`.
- **For UI work, look at the result** (take `ui.screenshot`, read the PNG) and compare with the public documentation (`plan/illustrator/02-ui-ux.md` notes). `ui.screenshot` needs a presented frame: if it errors (screen locked), check the art with `ui.render` / `vectorcraft-cli run … --export x.png`, and cover panels with a headless egui frame test (see `panels/transparency.rs` tests).
+- **For UI work, look at the result** (take `ui.screenshot`, read the PNG) and compare with `plan/illustrator/02-ui-ux.md` / `10-observed-ui.md`. `ui.screenshot` needs a presented frame: if it errors (screen locked), check the art with `ui.render` / `vectorcraft-cli run … --export x.png`, and cover panels with a headless egui frame test (see `panels/transparency.rs` tests).
 - **Performance:** `vectorcraft-cli perf` checks the budgets (render/pan/zoom, hit test, save/open, SVG, Pathfinder) on a synthetic 50k-path document; `vectorcraft-cli bench FILE` times one file. Run them before and after renderer, format or geometry changes, on an idle machine (the report warns when the load average makes timings noise).
 - MCP: `vectorcraft-cli mcp` (see `docs/mcp.md`).
 - Shell gotcha: `mv`/`cp` are aliased interactive here — use `/bin/mv -f` / `/bin/cp -f`.
@@ -59,5 +53,5 @@ Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format
 ## Roadmap
 `ROADMAP.md` (committed) is the shared picture of where VectorCraft stands. It holds status, the honest assessment (by dimension, the gap list, the direction), milestones, the parity table and time-to-parity estimates.
 - When a task lands, update it in the same PR: the milestone row, the parity-table row (score, missing items, hours), "Shipped so far", and the gap list if the gap closed or shrank.
- Grade by behaviour against the public documentation (`plan/illustrator/` notes), not by whether a menu item exists. Scores are self-assessed, so err low.
+- Grade by behaviour against `plan/illustrator/`, not by whether a menu item exists. Scores are self-assessed, so err low.
 - Keep the README's Status section in step with the ROADMAP headline.
@@ -145,21 +145,6 @@ dependencies = [
 "zerocopy",
 ]

-[[package]]
-name = "alloc-no-stdlib"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3"
-
-[[package]]
-name = "alloc-stdlib"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e76a019e91224d279006ff972f1e984179a6e9feb050adba6ce8274aef23195"
-dependencies = [
- "alloc-no-stdlib",
-]
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
@@ -217,7 +202,6 @@ dependencies = [
 "parking_lot",
 "percent-encoding",
 "windows-sys 0.60.2",
- "wl-clipboard-rs",
 "x11rb",
 ]

@@ -525,27 +509,6 @@ dependencies = [
 "piper",
 ]

-[[package]]
-name = "brotli"
-version = "8.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc91aac060a7a1e25823bdccbfb6af1875b88f17c6daac97894eed8207166b3"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
- "brotli-decompressor",
-]
-
-[[package]]
-name = "brotli-decompressor"
-version = "5.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a32acac15fe1967bc3986b2a6347dffc965602354ea6f450ad07e8bfd253583"
-dependencies = [
- "alloc-no-stdlib",
- "alloc-stdlib",
-]
-
 [[package]]
 name = "bumpalo"
 version = "3.20.3"
@@ -953,7 +916,6 @@ dependencies = [
 "egui-wgpu",
 "egui-winit",
 "egui_glow",
- "glow",
 "glutin",
 "glutin-winit",
 "image",
@@ -1243,12 +1205,6 @@ version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "aedcfb3409746eddb02b9e19ebda1c3394f759a152e48ee875a0844d1b955484"

-[[package]]
-name = "fixedbitset"
-version = "0.5.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
-
 [[package]]
 name = "flate2"
 version = "1.1.10"
@@ -1694,7 +1650,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d285dc30731c8485de5fa732fbdf2b3affdf01e4da7c2135022ca6fa664bf6"
 dependencies = [
- "brotli",
 "hayro-postscript",
 ]

@@ -2374,15 +2329,6 @@ 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 = "num-traits"
 version = "0.2.19"
@@ -2770,16 +2716,6 @@ 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.52.0",
-]
-
 [[package]]
 name = "parking"
 version = "2.2.1"
@@ -2840,17 +2776,6 @@ 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"
@@ -4104,17 +4029,6 @@ 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 = "ttf-parser"
 version = "0.25.1"
@@ -4297,10 +4211,9 @@ dependencies = [

 [[package]]
 name = "vectorcraft"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "arboard",
- "block2 0.6.2",
 "clipboard-win",
 "eframe",
 "egui",
@@ -4309,7 +4222,6 @@ dependencies = [
 "muda",
 "objc2 0.6.4",
 "objc2-app-kit 0.3.2",
- "objc2-foundation 0.3.2",
 "rfd",
 "serde_json",
 "vectorcraft-engine",
@@ -4321,7 +4233,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-brush"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "kurbo 0.13.1",
 "serde",
@@ -4333,7 +4245,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-cad"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
 "kurbo 0.13.1",
@@ -4349,7 +4261,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-cli"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "serde_json",
 "vectorcraft-color",
@@ -4365,7 +4277,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-color"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "kurbo 0.13.1",
 "moxcms",
@@ -4377,24 +4289,21 @@ dependencies = [

 [[package]]
 name = "vectorcraft-doc"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
- "jpeg-encoder",
 "kurbo 0.13.1",
 "proptest",
 "serde",
 "serde_json",
 "thiserror 2.0.21",
- "tiff",
 "vectorcraft-color",
 "vectorcraft-geom",
- "zune-jpeg",
 ]

 [[package]]
 name = "vectorcraft-effects"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "kurbo 0.13.1",
 "serde_json",
@@ -4408,7 +4317,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-engine"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "flate2",
 "image",
@@ -4440,7 +4349,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-eps"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "flate2",
 "image",
@@ -4450,7 +4359,6 @@ dependencies = [
 "vectorcraft-doc",
 "vectorcraft-effects",
 "vectorcraft-geom",
- "vectorcraft-metafile",
 "vectorcraft-render",
 "vectorcraft-testkit",
 "vectorcraft-text",
@@ -4458,7 +4366,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-format"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "flate2",
 "proptest",
@@ -4472,7 +4380,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-geom"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "kurbo 0.13.1",
 "proptest",
@@ -4484,7 +4392,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-mcp"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
 "log",
@@ -4503,7 +4411,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-metafile"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
 "kurbo 0.13.1",
@@ -4517,7 +4425,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-pathops"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "kurbo 0.13.1",
 "linesweeper",
@@ -4529,14 +4437,13 @@ dependencies = [

 [[package]]
 name = "vectorcraft-pdf"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "aes",
 "flate2",
 "hayro-interpret",
 "hayro-syntax",
 "image",
- "jpeg-encoder",
 "krilla",
 "kurbo 0.13.1",
 "log",
@@ -4544,7 +4451,6 @@ dependencies = [
 "serde",
 "serde_json",
 "sha2",
- "skrifa 0.47.0",
 "smallvec",
 "thiserror 2.0.21",
 "vectorcraft-brush",
@@ -4558,7 +4464,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-plugins"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "serde",
 "serde_json",
@@ -4572,7 +4478,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-render"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "flate2",
 "gif",
@@ -4597,7 +4503,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-svg"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "flate2",
 "image",
@@ -4621,7 +4527,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-testkit"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
 "kurbo 0.13.1",
@@ -4638,25 +4544,21 @@ dependencies = [

 [[package]]
 name = "vectorcraft-text"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "harfrust 0.13.3",
 "kurbo 0.13.1",
 "log",
 "skrifa 0.47.0",
 "subsetter",
- "unicode-bidi",
- "unicode-general-category",
- "unicode-script",
 "vectorcraft-doc",
 "vectorcraft-geom",
- "windows-registry",
 "write-fonts",
 ]

 [[package]]
 name = "vectorcraft-tools"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
 "kurbo 0.13.1",
@@ -4671,7 +4573,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-trace"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "image",
 "kurbo 0.13.1",
@@ -4684,7 +4586,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-ui-egui"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "egui",
 "egui_extras",
@@ -4692,7 +4594,6 @@ dependencies = [
 "log",
 "serde",
 "serde_json",
- "toml",
 "vectorcraft-cad",
 "vectorcraft-color",
 "vectorcraft-doc",
@@ -4713,7 +4614,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-web"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "eframe",
 "egui",
@@ -5423,17 +5324,6 @@ 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"
@@ -5702,24 +5592,6 @@ 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"
@@ -5816,7 +5688,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"

 [[package]]
 name = "xtask"
-version = "0.6.0"
+version = "0.4.0"
 dependencies = [
 "serde_json",
 ]
@@ -4,7 +4,7 @@ members = ["crates/*", "apps/*", "xtask"]
 default-members = ["crates/*", "apps/vectorcraft", "apps/vectorcraft-cli", "xtask"]

 [workspace.package]
-version = "0.6.0"
+version = "0.4.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -62,10 +62,6 @@ linesweeper = "0.4"
 flate2 = { version = "1", default-features = false, features = ["rust_backend"] }
 jpeg-encoder = { version = "0.6", default-features = false, features = ["std"] }
 gif = { version = "0.14", default-features = false, features = ["std", "raii_no_panic"] }
-# CMYK image samples (vectorcraft-doc's cmyk module): the image crate's own TIFF and JPEG
-# decoders, read directly (the image crate converts CMYK to RGB).
-tiff = "0.11"
-zune-jpeg = "0.5"

 # ui
 egui = "0.36"
@@ -30,45 +30,7 @@ based in part on the work of the Independent JPEG Group.
 WebAssembly plug-ins run in the wasmi interpreter (MIT OR Apache-2.0); its wasmparser dependency is
 under the Apache License 2.0 with the LLVM exception.

-The experimental Windows 7 build (packaging/windows/windows7.ps1) compiles a modified copy of the
-windows-link crate 0.2.1 (vendor/windows-link; Microsoft, MIT OR Apache-2.0) that binds CoTaskMemFree
-through ole32.dll. Its license texts are in vendor/windows-link and ship in that build's ZIP; every
-other build uses the unmodified crate from crates.io.
-
 Builds made with craft-fonts (the CRAFT_FONTS_DIR build option; all official releases) embed the
-fonts listed in https://github.com/storytold/craft-fonts/blob/main/ATTRIBUTION.md (BIZ UDPGothic,
-Shippori Mincho, BIZ UDMincho, Noto Sans CJK SC and Noto Sans Arabic in the current manifest;
-web builds BIZ UDPGothic Regular only) under the SIL
+fonts listed in https://github.com/storytold/craft-fonts/blob/main/ATTRIBUTION.md (today BIZ
+UDPGothic, Shippori Mincho and BIZ UDMincho; web builds BIZ UDPGothic Regular only) under the SIL
 Open Font License 1.1. Their license texts ship with the release packages as OFL-<family>.txt.
-
-PDF import decodes CJK text with Adobe's CMap resources (https://github.com/adobe-type-tools/cmap-resources),
-compiled into the app through the hayro-cmap crate under the BSD 3-Clause License:
-
-Copyright 1990-2023 Adobe. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither the name of Adobe nor the names of its contributors may be
-used to endorse or promote products derived from this software without
-specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
@@ -40,7 +40,7 @@
 <br>

 <p align="center">
-  <img src="docs/images/shot-1-neon.png" alt="VectorCraft editing the Neon Drive poster: the title is selected, the Appearance panel shows the settings of its live Outer Glow, and the Properties panel shows its character settings" width="100%">
+  <img src="docs/images/shot-1-neon.png" alt="VectorCraft editing the Neon Drive poster: the title is selected, the Appearance panel shows its live Outer Glow, and the Properties panel shows its character settings" width="100%">
  <br><sub><b>Neon Drive</b>: a Pathfinder-cut sun, live Outer Glow on the type and grid, and clipping masks · <code>examples/neon-drive.vectorcraft</code></sub>
 </p>

@@ -54,7 +54,6 @@
  <a href="#why-vectorcraft">Why VectorCraft</a> ·
  <a href="#quick-start">Quick start</a> ·
  <a href="#status">Status</a> ·
-  <a href="#downloads">Downloads</a> ·
  <a href="#the-crafting-apps">The Crafting Apps</a> ·
  <a href="#license-and-credits">License</a>
 </p>
@@ -64,8 +63,8 @@
 <table>
 <tr>
 <td width="50%" valign="top">
-  <img src="docs/images/shot-2-ribbons.png" alt="Three live blend ribbons clipped to the artboard, one selected with its key paths showing; the Layers panel lists the clip group, the blends and the selected blend's two key paths" width="100%">
-  <p align="center"><sub><b>Live Blends and Layers</b>: editable key paths, smooth colour, every object a row</sub></p>
+  <img src="docs/images/shot-2-ribbons.png" alt="Three live blend ribbons of 55 to 70 steps with smooth colour, clipped to the artboard, with the Layers panel open" width="100%">
+  <p align="center"><sub><b>Live Blends</b>: editable key paths and smooth colour, clipped to the artboard</sub></p>
 </td>
 <td width="50%" valign="top">
  <img src="docs/images/shot-4-bezier.png" alt="Direct Selection tool showing anchor points and Bézier handles on a crescent built with Pathfinder, with the contextual task bar below it" width="100%">
@@ -73,11 +72,7 @@
 </td>
 </tr>
 <tr>
-<td width="50%" valign="top">
-  <img src="docs/images/shot-5-perspective.png" alt="Two lit building facades drawn on the left and right planes of a two-point perspective grid at sunset, with the Perspective Selection tool and the Plane Switching Widget" width="100%">
-  <p align="center"><sub><b>Perspective Grid</b>: art attached to its planes stays editable in perspective · <code>examples/perspective-city.vectorcraft</code></sub></p>
-</td>
-<td width="50%" valign="top">
+<td colspan="2" valign="top">
  <img src="docs/images/shot-3-sheet.png" alt="Four artboards in the light UI theme: Pathfinder, Gradient Mesh, radial Repeat and Envelope Distort" width="100%">
  <p align="center"><sub><b>Multiple artboards, light theme</b>: Pathfinder · Gradient Mesh · live radial Repeat · Envelope Distort · <code>examples/feature-sheet.vectorcraft</code></sub></p>
 </td>
@@ -163,15 +158,9 @@ Japanese fonts come from [storytold/craft-fonts](https://github.com/storytold/cr
 build input (releases always use it): `CRAFT_FONTS_DIR="$PWD/../craft-fonts" cargo run --release -p vectorcraft` (an absolute path).
 Without it, Japanese text uses the installed system fonts. See [`docs/development.md`](docs/development.md#fonts-craft-fonts-optional-build-input).

-On machines with two graphics processors, VectorCraft renders on the power-saving (integrated) one by default on
-Windows and macOS, and on the one the desktop runs on under Linux. To choose, use **Preferences › Performance ›
-Graphics Processor** and restart. If a graphics processor can't show the window, VectorCraft starts again on the
-next one. To pick one when starting the app, set `WGPU_POWER_PREF=high` (or `low`), or `WGPU_ADAPTER_NAME` to part of
-its name, such as `WGPU_ADAPTER_NAME=nvidia` (see [`docs/development.md`](docs/development.md#desktop-graphics-processor)).
-
-On Linux under KDE Plasma 6.3 or later with Wayland, a drawing tablet's pen moves the cursor but VectorCraft doesn't
-respond to it yet (#491). Start the app under XWayland instead: `WAYLAND_DISPLAY= vectorcraft` (see
-[`docs/development.md`](docs/development.md#linux-wayland-and-x11)).
+On laptops with two graphics processors, VectorCraft uses the power-saving (integrated) one by default.
+To use the discrete one, choose **Preferences › Performance › Graphics Processor › High Performance**
+and restart, or start the app with `WGPU_POWER_PREF=high` (see [`docs/development.md`](docs/development.md#desktop-graphics-processor)).

 ### Use it from Claude Code and other agents

@@ -183,19 +172,15 @@ claude mcp add vectorcraft -- /path/to/vectorcraft-cli mcp

 The details are in [`docs/mcp.md`](docs/mcp.md) and [`docs/control-protocol.md`](docs/control-protocol.md).

-For the experimental, unsupported 64-bit Windows 7 build, see [Windows 7 instructions](docs/windows7.md).
-
 ## Status

 VectorCraft is under active development. [**ROADMAP.md**](ROADMAP.md) covers what ships today, the
 milestones, and honest time-to-parity estimates.

-**Where we are (2026-10-07):** roughly 69–75% of Illustrator's features exist and work, and about 40–55% of
+**Where we are (2026-10-06):** roughly 69–75% of Illustrator's features exist and work, and about 40–55% of
 "a power user can't tell the difference". Everyday vector illustration is close to usable: drawing and path tools,
-Pathfinder and Shape Builder, paint, gradients, appearance and transparency, type with styles, threading and Hebrew/Arabic bidirectional layout, and
-files (SVG, PDF and PDF-compatible `.ai` with PDF/X, EPS, DXF, EMF/WMF, raster formats and PSD, Print, Package). The interface
-speaks English, Japanese, Traditional and Simplified Chinese and Spanish (and Czech and Brazilian Portuguese in the menus).
-The scores are
+Pathfinder and Shape Builder, paint, gradients, appearance and transparency, type with styles and threading, and
+files (SVG, PDF and PDF-compatible `.ai` with PDF/X, EPS, DXF, EMF/WMF, raster formats and PSD, Print, Package). The scores are
 self-assessed, so the [honest assessment](ROADMAP.md#honest-assessment-2026-10-05) explains how far to trust them.

 **What's missing:**
@@ -219,51 +204,6 @@ Agent and contributor rules (clean-room, the asset policy, no panics in shipped
 explains how VectorCraft avoids crashing, and [`docs/releasing.md`](docs/releasing.md) how releases are built,
 signed and published. Every bundled asset is listed with its licence in [`ASSETS.md`](ASSETS.md).

-## Downloads
-
-**New to VectorCraft?** Download it from the [VectorCraft page on getartcraft.com](https://getartcraft.com/apps/vectorcraft). That's the easiest way to install it.
-
-**Want a specific build or format?** On GitHub, the [latest release](https://github.com/storytold/vectorcraft/releases/latest) has every build listed below, and [all releases](https://github.com/storytold/vectorcraft/releases) has earlier versions and their notes. `<ver>` in the file names is the version number, and `SHA256SUMS.txt` lists a checksum for every file.
-
-### Windows
-
-| Build | Installer | Portable |
-|---|---|---|
-| x64 (64-bit Intel/AMD) | `vectorcraft-<ver>-windows-x64.msi` | `vectorcraft-<ver>-windows-x64-portable.zip` |
-| arm64 (Snapdragon and other ARM PCs) | `vectorcraft-<ver>-windows-arm64.msi` | `vectorcraft-<ver>-windows-arm64-portable.zip` |
-| x86 (32-bit) | `vectorcraft-<ver>-windows-x86.msi` | `vectorcraft-<ver>-windows-x86-portable.zip` |
-
-Installers and executables are code-signed.
-
-### macOS
-
-| Build | File | Notes |
-|---|---|---|
-| App, universal (Apple silicon + Intel) | `vectorcraft-<ver>-macos-universal.dmg` | Signed and notarized |
-| Command-line tool, universal | `vectorcraft-cli-<ver>-macos-universal.zip` | Signed and notarized |
-
-### Linux
-
-| Format | x86_64 | aarch64 (ARM64) | Notes |
-|---|---|---|---|
-| AppImage | `vectorcraft-<ver>-linux-x86_64.AppImage` | `vectorcraft-<ver>-linux-aarch64.AppImage` | Runs anywhere; updates itself with [AppImageUpdate](https://github.com/AppImageCommunity/AppImageUpdate) (`.zsync` files) |
-| Flatpak | `vectorcraft-<ver>-linux-x86_64.flatpak` | `vectorcraft-<ver>-linux-aarch64.flatpak` | Sandboxed; `flatpak install --user <file>` |
-| Debian/Ubuntu | `vectorcraft-<ver>-linux-x86_64.deb` | `vectorcraft-<ver>-linux-aarch64.deb` | |
-| Fedora/RHEL/openSUSE | `vectorcraft-<ver>-linux-x86_64.rpm` | `vectorcraft-<ver>-linux-aarch64.rpm` | |
-| Tarball | `vectorcraft-<ver>-linux-x86_64.tar.gz` | `vectorcraft-<ver>-linux-aarch64.tar.gz` | Unpack anywhere |
-
-### FreeBSD
-
-| Build | File |
-|---|---|
-| x86_64 | `vectorcraft-<ver>-freebsd-x86_64.tar.gz` |
-
-### Web (WebAssembly)
-
-| Build | File | Notes |
-|---|---|---|
-| Static site | `vectorcraft-web-<ver>.zip` | Runs in a modern browser; host it on any static server |
-
 ## The Crafting Apps

 VectorCraft is one of the **Crafting Apps**: free, open-source creative tools from the
@@ -276,7 +216,7 @@ stand on its own.
 | <img src="https://raw.githubusercontent.com/storytold/vectorcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.vectorcraft.png" alt="" width="32" height="32"> | **VectorCraft** | **Vector illustration · you are here** | [GitHub](https://github.com/storytold/vectorcraft) | [Website](https://getartcraft.com/apps/vectorcraft) |
 | <img src="https://raw.githubusercontent.com/storytold/filmcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.filmcraft.png" alt="" width="32" height="32"> | **FilmCraft** | Video editing, color and sound | [GitHub](https://github.com/storytold/filmcraft) | [Website](https://getartcraft.com/apps/filmcraft) |
 | <img src="https://raw.githubusercontent.com/storytold/lightcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.lightcraft.png" alt="" width="32" height="32"> | **LightCraft** | Photo library and raw development | [GitHub](https://github.com/storytold/lightcraft) | [Website](https://getartcraft.com/apps/lightcraft) |
-| <img src="https://raw.githubusercontent.com/storytold/pdfcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.pdfcraft.png" alt="" width="32" height="32"> | **PdfCraft** | Reading, organizing and protecting PDFs | [GitHub](https://github.com/storytold/pdfcraft) | [Website](https://getartcraft.com/apps/pdfcraft) |
+| <img src="https://raw.githubusercontent.com/storytold/printcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.printcraft.png" alt="" width="32" height="32"> | **PrintCraft** | Reading, organizing and protecting PDFs | [GitHub](https://github.com/storytold/printcraft) | [Website](https://getartcraft.com/apps/printcraft) |
 | <img src="https://raw.githubusercontent.com/storytold/effectcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.effectcraft.png" alt="" width="32" height="32"> | **EffectCraft** | Motion graphics and visual effects | [GitHub](https://github.com/storytold/effectcraft) | [Website](https://getartcraft.com/apps/effectcraft) |
 | <img src="https://raw.githubusercontent.com/storytold/designcraft/main/assets/app-icon/hicolor/64x64/apps/ai.storyteller.designcraft.png" alt="" width="32" height="32"> | **DesignCraft** | Page layout and publishing | [GitHub](https://github.com/storytold/designcraft) | [Website](https://getartcraft.com/apps/designcraft) |

@@ -304,10 +244,6 @@ And [**ArtCraft**](https://getartcraft.com/) itself, our AI image and video stud
  <a href="https://getartcraft.com/apps/vectorcraft">VectorCraft</a>
 </p>

-## Star history
-
-[![Star History Chart](https://api.star-history.com/svg?repos=storytold/vectorcraft&type=Date&legend=top-left)](https://www.star-history.com/?repos=storytold%2Fvectorcraft&type=date&legend=top-left)
-
 ## License and credits

 VectorCraft is dual-licensed under [MIT](LICENSE-MIT) or [Apache-2.0](LICENSE-APACHE), at your option.
@@ -315,8 +251,8 @@ Copyright (c) 2026 ArtCraft Team and the VectorCraft contributors. Required noti

 Bundled fonts, icons, images and other assets keep their own open licenses; each one is listed
 with its author, source and license in [ASSETS.md](ASSETS.md). Release builds also embed the
-fonts of [craft-fonts](https://github.com/storytold/craft-fonts/blob/main/ATTRIBUTION.md) (Japanese,
-Simplified Chinese and Arabic faces; SIL Open Font License 1.1).
+Japanese fonts of [craft-fonts](https://github.com/storytold/craft-fonts/blob/main/ATTRIBUTION.md)
+(SIL Open Font License 1.1).

 The app icon (an engraved dragon on VectorCraft red, `#e8573f`) is the owner's original artwork; its
 palette and files are in [`assets/app-icon/`](assets/app-icon/README.md).
@@ -4,7 +4,7 @@ VectorCraft is a clean-room, open-source, pure-Rust reimplementation of the Adob

 This file tracks **how far we are and what's left**. Time estimates are wall-clock hours of continuous Claude Opus 5.5 agent work (including builds and the CI gate), given both for **one agent** and for **4–6 parallel agents** on disjoint crates. They are counted from the remaining work (see [Parity estimate](#parity-estimate)), calibrated against measured throughput, and updated as work lands.

-_Last updated: 2026-10-08 (after M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS files from Illustrator 2026, Inkscape/cairo, matplotlib, CorelDRAW, Affinity, LibreOffice and Ghostscript opening as vectors, and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482), Shift-drag marquees that toggle the objects or anchors they reach and a Lasso whose Alt subtraction keeps the rest of the selection (#483), the mouse wheel stepping the focused numeric field, the dialogs' and preferences' drag values made such fields (#485), Show The Home Screen When No Documents Are Open (#394), Numbers Without Units Are Points (#394), Auto-Collapse Iconic Panels (#394), the Contextual Task Bar moved by its handle and its More Options menu pinning and resetting its position, a designed macOS DMG window (#493), panels, panel groups and the Tools panel undocking intLine truncated
+_Last updated: 2026-10-07 (after M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes and the Layers panel rework; see [Honest assessment](#honest-assessment-2026-10-05))._

 ## Where we are

@@ -33,18 +33,17 @@ since 2026-10-01.

 | Dimension | Estimate | Evidence and what's missing |
 |---|---|---|
-| **Breadth:** menus, tools and panels exist | ~90% | 13 menu items still stubbed; every tool implemented except Touch Type; 51 panel modules |
+| **Breadth:** menus, tools and panels exist | ~90% | 16 menu items still stubbed; every tool implemented except Touch Type; 51 panel modules |
 | **Depth:** each feature behaves like Illustrator | ~69–75% | Strong: paint, appearance and colour (M3), Pathfinder and booleans, selection, drawing, files (M4). Weak: advanced type (~45%), brushes and symbols (in progress), raster effects (~20%) |
-| **Large missing subsystems** | 0–20% | 3D & Materials (0%), Photoshop-style raster effects and the Effect Gallery (~1 of ~56 filters), SVG Filters, CJK composition (vertical type with kinsoku, tate-chu-yoko and the font's vertical metrics; ruby, mojikumi and proportional vertical metrics open), Variables (data merge), scripting |
+| **Large missing subsystems** | 0–20% | 3D & Materials (0%), Photoshop-style raster effects and the Effect Gallery (~1 of ~56 filters), SVG Filters, CJK composition (vertical type with kinsoku and tate-chu-yoko; ruby, mojikumi and vertical metrics open), Variables (data merge), scripting |
 | **Interaction fidelity:** modifiers, cursors, small behaviours | ~30–40% | The dedicated pass hasn't started, and there has been no side-by-side session with Illustrator yet. A power user notices this first |
 | **Look & feel** | ~75–80% | Measured against Illustrator 2026 screenshots (2026-10-02); the panels added since haven't been re-measured |
 | **File interop** | ~85% | SVG/SVGZ, PDF and PDF-compatible `.ai`, EPS, DXF, EMF/WMF, raster formats, PSD export, Place and Links, Package, Print, clipboard flavours. Native `.ai` private data is out of scope by design; DWG has no open spec |
 | **Bundled content:** brush, symbol, style and swatch libraries | ~30% | Ours are original and generated in code, and far fewer than Illustrator ships; brush and symbol libraries are still missing |
 | **Performance** | unverified | Multithreaded, off-thread rendering and caches are in place. The last budget run (2026-10-01, loaded machine) measured 290 ms for a 50k-path fit against a 16 ms budget. Re-run `vectorcraft-cli perf` on an idle machine |
 | **Robustness** | good, new | ~2,840 tests, property tests, no panics in shipped code (lints, the `guard` safety net, import fuzzing), Data Recovery. Missing: a corpus of real-world files, Windows/Linux/browser QA |
-| **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only); on KDE Plasma 6.3+ under Wayland, pens and pen displays reach the app only under XWayland (`WAYLAND_DISPLAY=`) or with KWin's `KWIN_WAYLAND_EMULATE_TABLET=1`, since winit 0.30 has no Wayland tablet input (#491, not verified on hardware); Windows/Linux packaging and accessibility are pending; an experimental, unsupported Windows 7 x64 OpenGL build exists (community-contributed, not verified by maintainers) |
+| **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work; hybrid-graphics laptops render on the power-saving GPU by default (#306); Windows/Linux packaging and accessibility are pending |
 | **Agent automation** | beyond Illustrator | Every command, gesture and dialog is drivable over MCP, the CLI and the control channel |
-| **Scrubby numeric fields** | beyond Illustrator | As in Photoshop, dragging a numeric field's label (`W:`, `Opacity:`, the Character panel's icons) left or right steps its value live; one undo step per drag, Escape cancels (#400) |

 ### Where we're lacking (in priority order)

@@ -59,18 +58,17 @@ Ordered by how much each gap blocks someone from switching. Sizes are one-agent
 3. **3D and Materials:** Extrude & Bevel, Revolve, Inflate and Rotate with lighting and materials, using a software
   renderer in its own crate (layering allows it below L6), with output in SVG/PDF as rasters or projected vectors.
   The largest single gap. 50–80 h.
-4. **Advanced type:** CJK composition for vertical type (ruby, mojikumi, proportional vertical metrics, manual
+4. **Advanced type:** CJK composition for vertical type (ruby, mojikumi, vertical font metrics, manual
   tate-chu-yoko), Optical Margin Alignment, the composer/hyphenation options, tab leaders, a
   spell-check dictionary (open licence), Touch Type and Snap to Glyph. Vertical point, area and path type have
   initial support. 35–48 h across type core and advanced.
 5. **Brushes, symbols and libraries:** brush options depth; original brush, symbol and graphic-style libraries
-   generated in code (never Adobe's); dynamic symbols; Start Global Edit; brushes driven by pen tilt, bearing and
-   barrel rotation (6D art pens, #372), which needs tablet input beyond pressure on every platform. 20–32 h.
+   generated in code (never Adobe's); dynamic symbols; Start Global Edit. 14–22 h.
 6. **Automation:** Variables (data merge), a scripting surface over the command registry, batch. 8–12 h.
 7. **Views and windows:** multiple windows and arrange, Consolidate All Windows, video
   rulers. 15–25 h.
 8. **Hardening at scale:** a corpus of real-world SVG/PDF/EPS files, idle-machine perf budgets, Windows, Linux and
-   browser QA, pen tablets on Wayland and pen pressure beyond Windows (winit 0.31's tablet input, #491), accessibility, packaging. 50–80 h.
+   browser QA, accessibility, packaging. 50–80 h.

 ### Where we're going

@@ -91,73 +89,61 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
  - Actions panel (record/playback, persisted), generic parameter dialogs for every "…" command.
  - JSON-lines control channel with real egui pointer and keyboard injection.
  - MCP server with 25 tools (drawing, text, effects, Pathfinder, transforms, graphs, text wrap, export, screenshots, any command), attached to the running app or headless. Tool descriptions and replies agree with the engine: format lists come from its format table, `save_file` says it keeps the document's own format, `inspect_document` reports the paint type's characters show, and selection exports report the encoder's warnings.
-  - MCP protocol: five prompts (`prompts/list` / `prompts/get`: poster, icon set, recolour, trace-and-style, export set), `completion/complete` for prompt arguments and template variables read from the live catalogues (formats, effect ids, command ids, trace presets, swatch and object ids), four resource templates (`vectorcraft://object/{id}`, `//command/{id}`, `//effect/{id}`, `//swatch/{name}`) so an agent reads one thing instead of the whole document, and `logging/setLevel` with `notifications/message`. `window.panel` ids are case-insensitive (display labels work too), `vectorcraft://object/{id}` reads through `document.node {summary: true}` (the same reply bytes from one lookup instead of summarizing the whole document: a leaf read on a 2,000-object document drops from ~20 ms to ~0.06 ms), large containers slice with `document.node {depth?, childLimit?}` (truncated levels report `childCount`), `document.inspect` and the `inspect_document` tool slice the same way so a depth-0 read is the layer skeleton (~9.7 KB instead of ~2 MB on a 2,000-object document), `document.find` locates nodes by name/kind/text with ancestor paths, and the CLI sweeps the protocol surface over stdio against the compiled binary. `docs/mcp.md` has a Protocol section covering the capability table and what is deliberately absent (subscriptions, progress, cancellation, sampling, elicitation, Streamable HTTP — all of which need the transport to interleave reads).
+  - MCP protocol: five prompts (`prompts/list` / `prompts/get`: poster, icon set, recolour, trace-and-style, export set), `completion/complete` for prompt arguments and template variables read from the live catalogues (formats, effect ids, command ids, trace presets, swatch and object ids), four resource templates (`vectorcraft://object/{id}`, `//command/{id}`, `//effect/{id}`, `//swatch/{name}`) so an agent reads one thing instead of the whole document, and `logging/setLevel` with `notifications/message`. `docs/mcp.md` has a Protocol section covering the capability table and what is deliberately absent (subscriptions, progress, cancellation, sampling, elicitation, Streamable HTTP — all of which need the transport to interleave reads).
  - Headless CLI (`vectorcraft-cli run`, `convert`, `info`, `bench`, `perf`, `mcp`).
  - Actions panel that records and plays back commands.
 - **UI:** Illustrator 2026 layout restyled to measured values:
-  - Medium Dark theme, categorized and Advanced toolbars (a tool group's flyout opens on a right press, a long press or a press on its corner triangle), 35 pt document tabs, 33 pt panel tabs.
+  - Medium Dark theme, categorized and Advanced toolbars, 35 pt document tabs, 33 pt panel tabs.
  - Hint bar, contextual task bar, 19 dock panels with ≡ menus.
-  - The contextual task bar's handle drags it anywhere on the canvas (kept whole on it as the window resizes); unpinned it keeps that offset as it follows the selection, and its More Options menu hides it, pins its position across selection changes (`window.taskBar.pin`), resets it under the selection (`window.taskBar.reset`) and shows the Properties panel. As in Illustrator the position isn't kept across launches. Not done: the bar's tool-specific variants (only the selection tools show it).
-  - Tool flyouts tear off: dragging or clicking the tear-off bar on a flyout's right side (or releasing the long press over it) floats its group as a strip of tool buttons, moved by the same bar and put back in the toolbar by the × at its top (`window.floatTools`). While a group floats, the presses that would open its flyout raise the strip instead. Floating strips are kept with the preferences and in user workspaces. Not done: turning a strip vertical, docking it.
-  - Panels undock (#495): a dock tab, a panel icon or a popped-out panel's title dragged out of the dock floats that panel inside the window, and the strip right of the dock's tabs floats the whole tabbed group. A floating group moves by its title bar, a tab dragged out of it floats on its own, and dropped on another group's title bar or tabs it stacks with that group; dropped on the dock, which lights up under the pointer, its panels go back where they live (the tabbed group or the icon column), as its × and the panel menus' Float Panel / Dock Panel do (`window.panel.float`, `window.panel.dock`). The Tools panel floats by its title bar and docks again on the window's left edge. Floating panels and the Tools panel's position are kept with the preferences and in user workspaces, and clamped into a smaller window. Not done: panels in separate OS windows, docking a panel into a dock group it doesn't belong to, reordering tabs by dragging, collapsing a floating group to icons, resizing floating panels.
  - The dock's double arrow collapses Properties, Layers and Libraries to icons at the top of the icon column, popping out like the other icon panels, and expands them again (`window.collapseDock`, kept with the preferences and in saved workspaces). The icon column's own arrow (expanding the icon panels into a full column) is not done.
-  - Localised UI: menus (in-window and native), panels, dialogs, toolbar and Preferences read from per-language catalogs (`crates/ui-egui/src/i18n`, see `docs/development.md`); Traditional Chinese (Taiwan), Simplified Chinese (mainland), Japanese and Spanish ship complete, and Czech and Brazilian Portuguese cover every menu label (and more), with system-locale detection on macOS, Windows, Linux and the web (the browser's languages, or `?lang=`), a VectorCraft ▸ Language menu and a Language preference. Names are never translated (fonts and their styles, layers, artboards, saved presets, user libraries, custom workspaces, recent files, plug-ins).
+  - Localised UI: menus (in-window and native), panels, dialogs, toolbar and Preferences read from per-language catalogs (`crates/ui-egui/src/i18n`, see `docs/development.md`); Traditional Chinese (Taiwan) ships complete, and Czech and Japanese cover every menu label, with system-locale detection on macOS, Windows and Linux, a VectorCraft ▸ Language menu and a Language preference. Names are never translated (fonts and their styles, layers, artboards, saved presets, user libraries, custom workspaces, recent files, plug-ins).
  - Native macOS menu bar, vector tool cursors, a ⌘K command palette, middle-button panning with any tool.
-  - macOS: Finder opens every format File › Open reads with VectorCraft (double-click, Open With, a drop on the Dock icon, `open -a`), at launch or while it runs; the release and `cargo xtask bundle` apps share one `Info.plist` that declares those document types, owning only VectorCraft's own formats. The DMG opens on a designed Finder window, VectorCraft.app beside the `Applications` link over a background with the app icon (#493).
-  - A canvas context menu: right-click selects the object under the pointer and lists what applies to the selection (Undo/Redo, clipboard, group, isolation, join, Remove Anchor Points when anchors are selected, masks, compound paths, guides, Transform, Arrange, Select, Export Selection), or the view commands on empty canvas.
+  - A canvas context menu: right-click selects the object under the pointer and lists what applies to the selection (Undo/Redo, clipboard, group, isolation, join, masks, compound paths, guides, Transform, Arrange, Select, Export Selection), or the view commands on empty canvas.
  - Save / Don't Save / Cancel before closing or quitting with unsaved documents (tabs, Close, Close All, Quit, window close).
  - Four brightness themes, persistent preferences.
-  - Preferences that act (#394, in part): Show Tool Tips, Double Click To Isolate, Zoom with Mouse Wheel (the wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; Alt/Option-wheel and a trackpad pinch zoom about the pointer either way), Use Precise Cursors; Selection & Anchor Display › Tolerance (objects, anchors and handles), Object Selection by Path Only, Command Click to Select Objects Behind (cycling down the stack), Zoom to Selection, anchor Size, Highlight anchors on mouse over; Type › Number of Recent Fonts (up to 15); Guides & Grid › guide and grid Color and Style (lines or dots) and Grids In Back. Then Snap to Point (its distance, for moves, drawn points and reference points), Move Locked and Hidden Artwork with Artboard, Enable Rubber Band for the Pen and Curvature tools, Handles style, Show handles when multiple anchors are selected, Hide Corner Widget for angles greater than; General › Transform Pattern Tiles (the transforms' and dialogs' Transform Patterns) and Select Same Tint %; Type › Size/Leading, Tracking and Baseline Shift increments (`type.step`, Cmd+Shift+. and Cmd+Shift+, for the size, the Type tool's Alt+arrows), Enable Missing Glyph Protection and Fill New Type Objects With Placeholder Text. Then Smart Guides › Color, Alignment Guides, Anchor/Path Labels, Measurement Labels, Transform Tools, Object Highlighting (with Smart Guides on) and Snapping Tolerance (4 px by default, for every smart guide snap). Then Type › Type Object Selection by Path Only (type is picked on the baseline of any of its lines, area type's frame or the path of type on a path, no longer anywhere in its bounds; the Type tools and the Eyedropper still take a click among the characters). Then General › Anti-aliased Artwork (off, the canvas draws the art with hard edges). Then Guides & Grid › Show Pixel Grid (Above 600% Zoom), a line at every document pixel over the art in Pixel Preview, turning with a rotated view as the document grid now does too. Then General › Show The Home Screen When No Documents Are Open (off, closing the last document leaves an empty window; the Home button still opens the screen). Then Units › Numbers Without Units Are Points (on by default: a number typed with no unit into a field in picas is read in points, a typed unit still wins; dimmed unless a unit is Picas). Then User Interface › Auto-Collapse Iconic Panels (off by default: on, a click away from a panel popped out of the icon column puts it away). They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). About 32 stored options still do nothing yet (the rest of #394: Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, Construction and Spacing Guides, performance, devices…).
-  - Dialogs move by dragging their heading (the band down from the top edge, as a title bar), stay on screen and keep where they were moved for the session; the form dialogs' choices are dropdowns (Offset Path's Joins, Average's and Shear's and Reflect's axis), and Offset Path lists Offset, Joins, Miter Limit and previews (#423).
-  - Dialogs open with their first field focused and its value selected: type a value and press Enter (Move, Rotate, Scale…). Number fields in panels, the Control bar and dialogs (preferences too) step with Up/Down, or with the mouse wheel over the focused field (#485: a notch a step; the panel under it then stays put, and an unfocused field leaves the wheel to scrolling) (Shift: ten, Ctrl/Cmd: a tenth of their unit), applied at once.
-  - Scrubby labels (#400, beyond Illustrator, as in Photoshop): dragging a numeric field's label left or right (the ↔ cursor shows over it) steps the value one unit every 2 points (Shift: ten, Ctrl/Cmd: a tenth; counts stay whole), in the field's unit and within its limits, applied live as the art follows; the whole drag is one undo step and Escape puts the value back. A click on the label focuses the field; the text box itself never scrubs, and a field with no label doesn't. Text labels before a field (Transform, Properties, Control bar, Stroke, Transparency, form rows in dialogs) and the Character and Paragraph panels' icons act as labels. Preferences › General › Scrub Numeric Fields by Dragging (on by default) turns it off.
-  - Tab shows and hides the panels (in the Type tool it types a tab) without moving the keyboard focus onto a field, so the next shortcut or letter still works; in dialogs and panel fields it moves between fields.
-  - Cmd/Ctrl+A follows the keyboard: in a panel, dialog or search field it selects the field's text, while the Type tool edits it selects all of that text (also `select.all` over MCP), and only otherwise every object. On macOS the menu bar's Select All, Cut, Copy and Paste (keys or clicks) act on a focused field too. Not yet: Select All across threaded frames (one frame's text is selected).
  - On Windows and Linux the app bar is the window's title bar (its own minimize, maximize and close buttons, drag to move, edges to resize), with the dragon app icon as the brand mark; dialogs and menus size to their content. As on a native menu bar, once one menu is open, moving the pointer onto another title opens that one.
 - **Tools:**
-  - **Selection:** Selection, Direct/Group Selection, Magic Wand, Lasso. A Shift-drag marquee toggles what it reaches: objects with the Selection tool, anchors with Direct and Group Selection (#483); the Lasso adds with Shift and subtracts with Alt. Dragging a path segment with Direct Selection bends it when it's curved (its anchors stay) and moves its two anchors when it's straight, one undo step; the fill, Shift or Alt still pick the whole path (Alt-drag copies it).
-  - **Saved selections:** Select ▸ Save Selection… asks for a name and keeps the selection in the document (saved with the file, undoable, up to 25); each one is listed at the bottom of the Select menu and a click selects its objects again; Edit Selection… lists them to rename or delete, applied together on OK. A file's saved selections are capped and checked against its objects when it opens. Not yet: Update Selection and the Layers panel's saved-selection menu.
-  - **Drawing:** Pen, Curvature, anchor tools, Pencil, Paintbrush, Blob Brush, Smooth, Path Eraser, Join. Direction handles dragged with Direct Selection or the Anchor Point tool snap to smart guides, and Shift keeps them at 45° steps from their anchor.
-  - **Shapes:** all shape tools (including Flare) and the line, arc, spiral and grid tools. Space held while dragging out a shape, line, arc, spiral or grid moves it at its current size. While a grid is dragged out, Up/Down change its rows (concentric dividers) and Left/Right its columns (radial dividers).
+  - **Selection:** Selection, Direct/Group Selection, Magic Wand, Lasso.
+  - **Drawing:** Pen, Curvature, anchor tools, Pencil, Paintbrush, Blob Brush, Smooth, Path Eraser, Join.
+  - **Shapes:** all shape tools (including Flare) and the line, arc, spiral and grid tools.
  - **Cutting:** Eraser, Scissors, Knife, Mirror & Cut, Line Cut and Rectangle Cut (real geometry, compound paths keep their holes).
-  - **Transform:** Rotate, Reflect, Scale, Shear (click or Alt-click snaps the reference point to anchors and centres; Alt-click opens the tool's dialog, and a drag with Alt down at the release, from the press or pressed mid-drag, transforms a copy), Reshape, Free Transform (free and perspective distort and shear, switched by the keys held during a handle drag).
-  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. On a rectangle that isn't square every corner is the same circle: a radius past half the shorter side stops there for all of them, the widgets sit on the corners as drawn and turn the edited corners red at that limit, CSS export writes the drawn radii, and rectangles saved stretched by older versions get circular corners when their corners are next set (#442).
-  - **Pen:** Alt pressed in the middle of dragging out an anchor splits its handles and keeps the curve already shaped into it (only the outgoing handle follows the pointer); Space held while dragging out an anchor moves it, handles and all. Clicking the last anchor of the path being drawn retracts its outgoing handle (convert cursor), and dragging from it pulls out a new one on its own. Auto Add/Delete: over a selected path, a click on a segment adds an anchor and a click on an anchor deletes it (add and delete cursors); Shift held, or Preferences › General › Disable Auto Add/Delete, starts a new path instead. Alt held over a handle end or an anchor of a selected path (the one being drawn too) works as the Anchor Point tool, with its convert cursor: dragging a handle moves it alone, clicking a smooth anchor makes it a corner, dragging an anchor pulls out new symmetric handles; drawing then goes on.
+  - **Transform:** Rotate, Reflect, Scale, Shear (click or Alt-click snaps the reference point to anchors and centres), Reshape, Free Transform (free and perspective distort and shear, switched by the keys held during a handle drag).
+  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout. Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them.
  - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type.
-  - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on; Copy, Cut and Paste take the artboard with its art, Paste right of the last artboard, Paste in Place where it was, into this or another document, #446), Measure, Type, Hand, Zoom, Rotate View.
+  - **Other:** Eyedropper, Gradient annotator, Artboard, Measure, Type, Hand, Zoom, Rotate View.
  - **Editing type:** double-clicking type with a selection tool switches to the Type tool with the caret where it was clicked.
  - **Temporary tools:** Cmd with any other tool drags with the selection tool used last (Selection, Direct Selection or Group Selection). Held Space pans and Cmd+Space zooms (Cmd+Alt+Space out) whatever the tool.
-  - **Panel drag and drop:** art dragged off the canvas onto the Symbols panel becomes a symbol, onto the Swatches panel a pattern swatch and onto the Brushes panel an Art brush; a symbol dragged onto the canvas places an instance where it is dropped, and a brush dragged onto a path is applied to it.
-  - **Tool double-clicks:** double-clicking a tool's button opens its options: Hand fits the artboard in the window, Zoom shows 100 %, Rotate, Scale, Reflect and Shear open their Object › Transform dialogs, the Selection, Direct Selection and Group Selection tools the Move dialog (Enter opens these seven tools' dialogs too), Gradient, Eyedropper, Blend and the Liquify tools their panels or options, and the Pencil, Paintbrush, Smooth, Blob Brush and Eraser tools their Tool Options (Fidelity, fill, the tolerances, the brush size).
- **Layers panel:** every layer, sublayer, group and object is a clickable row at any depth: a click highlights it and makes its layer current (new art goes there), Shift-click a range, Ctrl/Cmd-click toggles. Sublayers are no longer treated as objects: clicks, marquees, Select All and the Select menu take the art inside them, and each sublayer selects in its own colour. Selection squares on rows with selected art (click selects a row's art, Shift adds or removes; dragging the square moves the selection to another row, Alt copies), the eye and lock on every row with drag-down-the-column (one undo step), Ctrl/Cmd-click an eye for per-layer Outline, Alt-click an eye or lock to hide or lock the other layers (again: show or unlock them all), triangles with Alt to open or close everything inside, drag and drop rows above, below or into layers and groups with a drop line (Alt copies) and a dimmed copy of the row under the pointer (dropped on the trash rows are deleted, on New Layer duplicated, as in Illustrator), inline rename, Delete key on highlighted rows. Buttons and the full panel menu: New Layer/Sublayer (Alt: options, Ctrl: on top), Duplicate, Delete, Options for Selection, clipping mask, isolation, Locate Object, Merge Selected, Flatten Artwork, Collect in New Layer, Release to Layers (Sequence and Build), Reverse Order, Template, Hide/Outline/Lock Others and Show/Preview/Unlock All, Paste Remembers Layers, Panel Options (row size, thumbnails per kind, Show Layers Only). Layer Options: name, colour (presets, each with a chip of its colour, or custom), Template, Lock, Show, Print, Preview (outline drawing and clicking) and Dim Images to %. Every operation is a command (`layer.move`, `layer.highlight`, `layer.merge`…) with validation against cycles and invalid nesting.
- **Drawing aids:** Smart Guides and snapping (moving, with the Selection, Group Selection or Direct Selection tool, and resizing by the bounding-box handles with the Selection or Free Transform tool, Shift and Alt too: the dragged corner or side lands on the other objects' anchors and centres ("anchor", "center") or lines up with their edges and centres (a line and "align"); the Rotate, Scale, Shear and Reflect tools drag from the anchor they grab and snap the pointer the same way, so a corner dragged onto another object's anchor scales exactly onto it, #482; anchors dragged with Direct Selection: the one pressed on lands on other anchors, its own path's that stay put among them, on path segments or in line with them, the others following, Shift keeps 45° steps, and with Smart Guides off Snap to Point pulls it onto anchors; the Artboard tool snaps artboards, and their bleed, to other artboards, bleeds and art, the grid or whole pixels while moving, copying and resizing them, and the Transform panel shows and edits the active artboard's X/Y/W/H), guides dragged out of the rulers (#451: they snap as moved guides do, Shift to the ruler's ticks; with the Artboard tool they are artboard guides, which run across their artboard only and move, copy and delete with it, `guide.add {artboard}`) that the Selection, Direct Selection and Group Selection tools then pick and drag (#414: the selected guides highlight and move together, Alt copies them, Shift snaps the dragged one to the ticks, otherwise it snaps to pixels, the grid or the edges, centres (so the sides' midpoints) and anchors of the art and the artboards, or with Smart Guides off Snap to Point pulls it onto anchors; the arrow keys nudge them, Delete deletes them, dragging one back onto its ruler deletes it, Lock Guides and Hide Guides leave them alone; `guide.list`, `guide.select`, `guide.move` and `guide.remove` reach agents), and Draw Normal / Behind / Inside modes.
- **Views:** the status bar's artboard navigator (first, previous, next, last; `view.goToArtboard`) goes to an artboard and fits it, and Fit Artboard in Window and Actual Size show the navigator's artboard. The Artboards panel highlights that active artboard: clicking a row makes it active (the Artboard tool's too, while it is chosen) as does clicking an artboard with the Artboard tool, double-clicking its number also fits it in the window and double-clicking its name renames it. Duplicate Artboards, or a row dragged onto New Artboard, copies the artboard with its art (#446). Escape leaves Presentation Mode, F from it goes back to Normal Screen Mode, and the screen mode isn't saved with the preferences: the app always starts in Normal Screen Mode with its menus and panels (#472).
+  - **Panel drag and drop:** art dragged off the canvas onto the Symbols panel becomes a symbol, and a symbol dragged onto the canvas places an instance where it is dropped.
+  - **Tool double-clicks:** double-clicking a tool's button opens its options: Hand fits the artboard in the window, Zoom shows 100 %, Rotate, Scale, Reflect and Shear open their Object › Transform dialogs, Gradient, Eyedropper, Blend and the Liquify tools their panels or options.
+- **Layers panel:** every layer, sublayer, group and object is a clickable row at any depth: a click highlights it and makes its layer current (new art goes there), Shift-click a range, Ctrl/Cmd-click toggles. Sublayers are no longer treated as objects: clicks, marquees, Select All and the Select menu take the art inside them, and each sublayer selects in its own colour. Selection squares on rows with selected art (click selects a row's art, Shift adds or removes; dragging the square moves the selection to another row, Alt copies), the eye and lock on every row with drag-down-the-column (one undo step), Ctrl/Cmd-click an eye for per-layer Outline, triangles with Alt to open or close everything inside, drag and drop rows above, below or into layers and groups with a drop line (Alt copies, the trash deletes), inline rename, Delete key on highlighted rows. Buttons and the full panel menu: New Layer/Sublayer (Alt: options, Ctrl: on top), Duplicate, Delete, Options for Selection, clipping mask, isolation, Locate Object, Merge Selected, Flatten Artwork, Collect in New Layer, Release to Layers (Sequence and Build), Reverse Order, Template, Hide/Outline/Lock Others and Show/Preview/Unlock All, Paste Remembers Layers, Panel Options (row size, thumbnails per kind, Show Layers Only). Layer Options: name, colour (presets or custom), Template, Lock, Show, Print, Preview (outline drawing and clicking) and Dim Images to %. Every operation is a command (`layer.move`, `layer.highlight`, `layer.merge`…) with validation against cycles and invalid nesting.
+- **Drawing aids:** Smart Guides and snapping, guides dragged out of the rulers, and Draw Normal / Behind / Inside modes.
+- **Views:** the status bar's artboard navigator (first, previous, next, last; `view.goToArtboard`) goes to an artboard and fits it, and Fit Artboard in Window and Actual Size show the navigator's artboard.
 - **Geometry and effects:**
-  - Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart.
+  - Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below.
  - Live effects with previewing dialogs: Distort & Transform, Path, Convert to Shape, 15 Warp styles, Round Corners, Scribble, Effect → Pathfinder (all 10 operations, live on groups; several loose objects are grouped first, in one undo step), Color Adjustments (Brightness/Contrast, Curves, Levels, Hue/Saturation, Shift to Color, Temperature/Tint, on vectors, live type and embedded images), and raster drop shadow, glows and feather. SVG and PDF export keep live effects (geometry baked; SVG raster effects as filters).
- **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline), threaded text across any closed shapes, Fit Headline. Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. Font Size and Leading are combo boxes in the Character and Properties panels (Font Size in the Control bar too, beside the Character link, font family and style): type, step with ↑/↓ or the spinner, scrub the label, or pick a preset (6–72 pt, shown in the type unit; Leading also Auto), each pick one undo step; Kerning and Tracking list -100…200; a size, leading, kerning or tracking the selected text doesn't share shows blank (#458).
- **Interface languages, vertical type:** VectorCraft ▸ Language (or Preferences ▸ User Interface) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese and Spanish (neutral international Spanish, for every `es-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish also translates status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech and Spanish ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese, and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a wrapped line flush with its start, and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline; Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline or the em box top/right, centre or bottom/left (ICF top and bottom not yet); Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
+- **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline), threaded text across any closed shapes, Fit Headline. Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done.
+- **Interface languages, vertical type:** VectorCraft ▸ Language (or Preferences ▸ User Interface) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional Chinese covers the whole interface, Czech and Japanese every menu label (tested); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech ones from the bundled UI fonts. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese; Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
 - **Transparency:** opacity masks (clip/invert/disable/link), exported as SVG `<mask>` and PDF soft masks.
- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), the Image Trace panel and Expand, plus Release in Properties; the View modes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
+- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type, Gradient Mesh, Shape Builder, Live Paint (every path an edge, open lines included), Image Trace (12 presets), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
 - **Paint and appearance (M3):**
  - **Swatches:** names follow the colour model and are unique; Swatch Options (process/spot, Global, Gray/RGB/HSB/CMYK/Web, live preview); editing a global or spot swatch recolours every linked fill, stroke and text run in one undo step; multi-select and delete with confirmation; New Swatch and New Color Group dialogs (a group from the selected artwork's colours); swatches in colour groups convert, separate and count like any other. The Swatches panel selects ranges and whole groups, has a find field, and drags swatches to reorder, regroup or paint art; Add Used Colors, Select All Unused, Merge, Ungroup and Sort by Kind; a CMYK document keeps applied colours in CMYK. Swatch libraries: nine generated colour libraries and five gradient libraries in a library panel, saved and loaded as `.vcswatches`, `.gpl` or CSS. Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate.
-  - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers (the Properties panel has the Control bar's Fill and Stroke chips, Stroke link and weight spinner, with nothing selected too), panels have Illustrator's Window menu keys (Align Shift+F7, Transform Shift+F8, Pathfinder Cmd+Shift+F9, Layers F7, Character Cmd+T…; every panel can be given one in Edit › Keyboard Shortcuts), and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening. Document Color Mode converts the art, symbols, pattern tiles and swatches through the colour settings: Gray stays Gray, RGB greys separate into four-colour greys and a rich black as Illustrator does, or go on the black plate only with `grays: "black"` (also for `document.open {colorMode}`).
+  - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers, panels have their shortcuts, and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening.
  - **Gradients:** lossless, validated gradient params; gradients follow rotate, reflect, shear, non-uniform scale and distortions; the Gradient tool edits the fill or stroke of the active proxy, type included; an interactive on-canvas annotator (move, length/angle, rotate, add/move/delete/duplicate stops, midpoints, a stop popover, Delete and arrow keys). The Gradient panel has the Fill/Stroke proxy, a gradient-swatch dropdown with Save to Swatches, midpoint locations, Alt-drag to copy or swap stops, swatch drops on the ramp and a stop eyedropper; copied appearances and graphic styles place gradients on each target's own bounds; gradient handles snap and honour Constrain Angle. Gradient stops stay linked to global and spot swatches. Freeform gradients (points and lines) are edited on the canvas; radial gradients have an extent ellipse, an aspect handle and an off-centre focal point (SVG `fx`/`fy`, PDF two-point radials). A stroke's gradient runs within, along or across it. Object ▸ Expand turns gradients into N objects or a gradient mesh.
-  - **Strokes:** one stroke-geometry module shared by the canvas, SVG, PDF and Outline Stroke; dotted lines (zero-length dashes draw dots or squares); arrowheads with hollow outlines, tip-on-end or extend-past-end alignment and one opacity for line and head. SVG and PDF export arrowheads, width profiles, brushes and aligned strokes exactly as the canvas draws them; Outline Stroke and the live Outline Stroke effect outline every stroke item as drawn (dashes, heads, profiles, alignment); dashes can be fitted to corners and path ends; width profiles carry through dashes, and their corners take the join. The Stroke panel edits type's character strokes, follows the stroke units (its weight presets are round values in that unit: `0.25 mm`, `0.0625 in`, `1 px`, #426; fields show four decimals in mm, cm and inches, three in points), shows mixed values blank and opens from the Control bar. A width profile library, thirty more arrowheads, and Width Point Edit with multi-select and discontinuous points. Visual bounds and clicks cover the whole painted stroke. Scale Strokes & Effects, Scale Corners and Use Preview Bounds work everywhere, and new art inherits stroke options, a graphic style or the whole last appearance.
-  - **Appearance:** the Appearance panel's selected row drives every paint, stroke, gradient and transparency edit (`item` on the commands); effects apply to one fill or stroke; per-item Opacity popups, whose blend-mode list and opacity slider stay open inside them (#430; the Control bar's Stroke popover too); Mixed Appearances, Layers target dots and basic-appearance rules. Effects can be reordered, moved between items and copied by dragging; Show All Hidden Attributes; clicking an effect edits it in place; the object thumbnail drags onto art; effects render on type, images, symbols, blends, envelopes, meshes and repeats, and per-item raster effects export. Groups, layers and type have their own fills, strokes and effects (Contents and Characters rows); the Layers panel's target circles target layers, groups and objects; Expand Appearance turns fills, strokes, effects and brushes into objects.
+  - **Strokes:** one stroke-geometry module shared by the canvas, SVG, PDF and Outline Stroke; dotted lines (zero-length dashes draw dots or squares); arrowheads with hollow outlines, tip-on-end or extend-past-end alignment and one opacity for line and head. SVG and PDF export arrowheads, width profiles, brushes and aligned strokes exactly as the canvas draws them; Outline Stroke and the live Outline Stroke effect outline every stroke item as drawn (dashes, heads, profiles, alignment); dashes can be fitted to corners and path ends; width profiles carry through dashes, and their corners take the join. The Stroke panel edits type's character strokes, follows the stroke units, shows mixed values blank and opens from the Control bar. A width profile library, thirty more arrowheads, and Width Point Edit with multi-select and discontinuous points. Visual bounds and clicks cover the whole painted stroke. Scale Strokes & Effects, Scale Corners and Use Preview Bounds work everywhere, and new art inherits stroke options, a graphic style or the whole last appearance.
+  - **Appearance:** the Appearance panel's selected row drives every paint, stroke, gradient and transparency edit (`item` on the commands); effects apply to one fill or stroke; per-item Opacity popups; Mixed Appearances, Layers target dots and basic-appearance rules. Effects can be reordered, moved between items and copied by dragging; Show All Hidden Attributes; clicking an effect edits it in place; the object thumbnail drags onto art; effects render on type, images, symbols, blends, envelopes, meshes and repeats, and per-item raster effects export. Groups, layers and type have their own fills, strokes and effects (Contents and Characters rows); the Layers panel's target circles target layers, groups and objects; Expand Appearance turns fills, strokes, effects and brushes into objects.
  - **Masks and clipping:** opacity-mask controls work while the mask is being edited; transparency commands take ids and work without a selection; clipping sets clip by compound paths, even-odd paths, text and groups on screen and in raster export, matching SVG/PDF. Alt-click shows only the mask; SVG masks keep Clip and Invert; the transparency grid is per-document state; a clipping path's own fill and stroke paint behind and over the clipped art; layers can be clipping masks.
  - **Transparency:** three-state Knockout Group (on, neutral, off), Opacity & Mask Define Knockout Shape, Page Isolated Blending and Page Knockout Group, on screen and in SVG/PDF. Blend modes match the standard formulas on screen, in SVG and in PDF, and non-isolated groups blend with the art below. Flatten Transparency with presets, a dialog and a Flattener Preview panel.
  - **Graphic styles:** styles keep opacity and blend mode, capture groups and type, apply on top with Alt, and link to the objects using them; Redefine, Break Link, Graphic Style Options, Select All Unused, Sort by Name, and Select > Same Graphic Style / Appearance Attribute. The panel has list and thumbnail views with rendered previews, merge, reorder and drag and drop, plus a Control bar Style picker; six generated style libraries save and load as `.vcstyles`.
  - **Neutral wording:** labels, MCP tool text, docs and packaging use neutral names, and `cargo xtask brands` (part of `cargo xtask ci`) fails on vendor names.
 - **Colour, type and file workflows:** Recolor Artwork (dialog with harmonies), Edit Colors, Find & Replace, Change Case, Smart Punctuation, Guides, Lock/Hide Above, Transform Each, Rasterize.
- **Fonts:** a font is found by any of its names (family and style in every language of its name table, legacy family/style pairs, PostScript name), so documents from other apps open with the font they name; Find Font and `text.fonts` say for each font whether it was found exactly, by another name, substituted or missing, and how many glyphs are missing. PDF and `.ai` import brings Japanese text back as live type: CID fonts without a ToUnicode map read through the standard CMaps, vertical columns (WMode 1) as vertical type, letter spacing as tracking; a glyph is live type only when the installed font (in the closest style of its family) draws the same glyph, and text in a font that isn't installed comes in as live type shown in the fallback font until the font is installed (exports that draw it — PDF, EPS, EMF/WMF, raster, SVG outlines or embedded fonts — warn that they wrote the fallback font; `textAs: outlines` keeps the PDF's embedded glyphs).
+- **Fonts:** a font is found by any of its names (family and style in every language of its name table, legacy family/style pairs, PostScript name), so documents from other apps open with the font they name; Find Font and `text.fonts` say for each font whether it was found exactly, by another name, substituted or missing, and how many glyphs are missing.
 - **Files (M4):**
-  - `.vectorcraft` (lossless JSON, compressed, atomic saves, save down to v1), Save As with a format chooser, Save a Copy, Revert, templates, Data Recovery after a crash (browser tabs hold their copies with Web Locks too, so a background tab's copies are never taken for a crash's, and a tab repairs copies another removed when it resumes: #367), background save and export. The desktop app writes its warnings and errors (graphics adapter, a lost graphics device, panics the guard recovered from) to standard error and to `logs/vectorcraft.log` next to the preferences, the two previous runs kept and each file capped at 16 MiB, so a launch without a terminal still leaves something to attach to a bug report (#465).
-  - SVG/SVGZ in and out with SVG Options, Preserve Editing, symbols, filters, rich text and physical units (SVG type under a transform or `viewBox` scale opens at the size it draws at, the scale moved into its size, leading, baseline shift and strokes, a stretch, skew or rotation kept as its transform: #396; a top-level group with a clip path, such as a clipped Inkscape layer, opens as a layer with a clipping mask, its name kept: #420); PDF and PDF-compatible `.ai` in and out (layers, with hidden ones kept hidden with their art and nested ones as sublayers, on pages of up to 64 million operators, art whose layer can't be told going to a hidden, non-printing layer rather than showing or printing: #419; strokes kept live, a fill and a stroke of one outline as one object; masks, editable text with type set along a curve coming back as type on a path, each artboard's art on its own page only, an `.ai`'s white page under its layers left out rather than coming in as art, spot colours, presets, security, marks and bleed, ICC output intents, raster effects, subset fonts, PDF/X, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3). CMYK images keep their ink amounts from PDF import (and from placed CMYK TIFFs) to PDF export: a CMYK JPEG passes through unchanged, others stay CMYK (DeviceCMYK, or ICC-based CMYK in PDF/X-3/X-4) unless the Output settings convert them; the canvas shows them through the working CMYK profile (#320).
-  - EPS and DXF in and out, EMF/WMF in and out; PNG (with PNG-8), JPEG, WebP, GIF, TIFF, BMP, Targa and layered PSD export. EPS import runs Illustrator's AGM/CoolType prologs (resource categories, `resourceforall`, `clipsave`/`cliprestore`, subarrays and substrings that share storage, the standard dictionaries in `systemdict`, `dictstack`, `internaldict`, executable filters, `cshow`, metadata skipped with `flushfile`), so Illustrator 30 EPS files open as vectors. It also runs what other generators write (Discord feedback, #466, #469): Illustrator 2026's procsets (`gcheck`, `rootfont`, `currentcolorrendering`: every Illustrator 2026 EPS fell back to its preview before), cairo/Inkscape (`status`/`flushfile`, images with a mask, `ImageType 3`, reusable streams), matplotlib's Type 3 fonts, Illustrator 8 EPS (stock art's usual format: executable strings such as its gradients' `ed`, `load` by integer keys, #474), Ghostscript's `//name` immediate names, `pdfmark`, `token`, `execform` and user paths. Tiling patterns come in as pattern swatches, uncoloured ones too; Type 3 fonts' glyphs as their outlines, spaced by `ashow`/`widthshow`/`xshow`/`kshow`; mesh and function-based shadings (types 1, 4–7) as gradient meshes; sampled functions (type 0) and Flate/LZW predictors are read. When a file's PostScript still can't be read, it opens as its TIFF preview, its Windows metafile preview (as vectors) or its EPSI preview, and the warning (in the status bar, `document.open`/`app.open`/MCP `open_file` replies and `vectorcraft-cli info`) names the error, the operator that raised it and the procedures it ran in. Legacy PostScript `.ai` files (Illustrator 3–8, written with the prolog that defines their operators) keep their groups and nested groups (`u` … `U`), between and inside clipping groups; EPS and EMF/WMF import nest clips (and groups) at most 128 deep, so a hostile file can't exhaust the stack. DXF TEXT justified Fit or Aligned spans its two points (stretched, or scaled as a whole).
-  - Place and the Links panel, Package, File Info, Print with print presets, PostScript output and print tiling, slices and Save for Web, Export for Screens and Asset Export, CSS Properties, PNG/PDF/SVG/text clipboard flavours; files copied in a file manager paste as art (SVG, PDF, EMF/WMF, bitmaps) on every desktop platform, and Linux/Wayland reads the compositor's clipboard (#398); screenshots and other copied pictures paste as embedded images at the view centre everywhere, the web included (#457).
+  - `.vectorcraft` (lossless JSON, compressed, atomic saves, save down to v1), Save As with a format chooser, Save a Copy, Revert, templates, Data Recovery after a crash, background save and export.
+  - SVG/SVGZ in and out with SVG Options, Preserve Editing, symbols, filters, rich text and physical units; PDF and PDF-compatible `.ai` in and out (layers, masks, editable text with type set along a curve coming back as type on a path, each artboard's art on its own page only, spot colours, presets, security, marks and bleed, ICC output intents, raster effects, subset fonts, PDF/X, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3).
+  - EPS and DXF in and out, EMF/WMF in and out; PNG (with PNG-8), JPEG, WebP, GIF, TIFF, BMP, Targa and layered PSD export. EPS import runs Illustrator's AGM/CoolType prologs (resource categories, `resourceforall`, `clipsave`/`cliprestore`, subarrays and substrings that share storage) and falls back to its palette TIFF preview. DXF TEXT justified Fit or Aligned spans its two points (stretched, or scaled as a whole).
+  - Place and the Links panel, Package, File Info, Print with print presets, PostScript output and print tiling, slices and Save for Web, Export for Screens and Asset Export, CSS Properties, PNG/PDF/SVG/text clipboard flavours.
 - **Performance:** 20k shapes + 1k texts render in 27 ms per full-retina frame (7.8 ms zoomed), 7× faster than the first version. The UI thread never blocks. The web build is 7.1 MB gzipped.
- **Graphics processor:** the canvas is rasterized on the CPU and the GPU only composites it, so any GPU that can show the window will do. Preferences › Performance › Graphics Processor (`gpuPreference`) is Automatic by default: the power-saving GPU on Windows and macOS (the integrated one on hybrid-graphics laptops, where presenting from the discrete GPU made the window flicker, #306), and the GPU the desktop runs on under Linux, where KWin on an NVIDIA GPU refused frames from a Ryzen's integrated GPU and 0.5.0 crashed at startup (#502). Power Saving and High Performance pick a kind of GPU; `WGPU_POWER_PREF`, `WGPU_ADAPTER_NAME` and `WGPU_BACKEND` override them. The app picks among the adapters that can present to the window (native backends before OpenGL, hardware before software), and if the window fails on one while starting up it starts again without it instead of crashing; Help › About, `ui.inspect` and the log name the adapter in use. When the browser drops the page's WebGPU device or WebGL context, the web build writes recovery copies, starts again on new graphics with the same app and uploads its textures again; if it can't, it removes the stale canvas and says to reload, which offers the copies back. The desktop app writes the copies and says to restart (#369). On Windows and Linux the tools' cursors are OS cursors (bitmaps rasterized once per display scale), which the system moves itself: painted into the window, they trailed the pointer by the frames waiting to be shown, and the window now queues one frame instead of two (#444). macOS and the web still paint them (macOS sizes cursor bitmaps in points, eframe has no bitmap cursors on the web). Pens and touch drive the tools as the mouse does, and a tap pressed and lifted within one frame clicks where it tapped (#491); pen pressure reaches the Liquify tools' Use Pressure Pen on Windows, while winit 0.30 reports none on macOS or Linux and egui none on the web. On Linux, see `docs/development.md` for pens under Wayland.
+- **Graphics processor:** the canvas is rasterized on the CPU and the GPU only composites it, so the desktop app asks for the power-saving GPU by default (the integrated one on hybrid-graphics laptops, where presenting from the discrete GPU made the window flicker, #306). Preferences › Performance › Graphics Processor (`gpuPreference`) or `WGPU_POWER_PREF` picks the discrete one; Help › About and `ui.inspect` name the adapter in use.
 - **Tests and robustness:** ~2,840 automated tests: model-based property tests, a junk-parameter sweep over every command, import fuzzing (SVG, PDF, libraries), golden renders, and MCP end-to-end tests over stdio. Shipped code never panics (workspace lints and a rollback safety net; see `docs/development.md`).

 ## Milestones and estimates
@@ -166,19 +152,19 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 |---|---|---|---|
 | M0 | Skeleton + vertical slice | ✅ done | — |
 | M1 | Selection, transform, layers, MCP | ✅ mostly done (transform reference point snaps to anchors/centres; rotated objects keep a rotated bounding box and their angle; Free Transform, Scale and Reflect along a rotated box pending) | 4–6 |
-| M2 | Drawing tools + smart guides | ✅ mostly done (Flare, Reshape, Live Corners widget dragging and per-corner radii and kinds landed; Shaper, the remaining Pen modifier nuances) | 15–20 |
+| M2 | Drawing tools + smart guides | ✅ mostly done (Flare, Reshape, Live Corners widget dragging landed; Shaper, Pen modifier nuances) | 15–20 |
 | M3 | Paint & appearance (swatches, color, gradient, stroke, appearance, transparency, styles) | ✅ done (M3.7–M3.98): swatches, groups, libraries, tints, Lab spots and Registration; Color Picker, Color panel, Color Guide, Color Themes, Edit Colors and Recolor Artwork; gradients that follow every transform, the annotator, linked stops, freeform gradients, focal points, gradients on strokes and Expand; stroke geometry, arrowheads, dashes fitted to corners, stroke on type, width profiles and the Width tool, Scale Strokes and preview bounds; Appearance targeting, container appearance, target circles, Expand Appearance; knockout, isolation, blend accuracy, CMYK blending, overprint, Attributes, masks and clipping, Flatten Transparency; graphic styles, links and libraries. Left: freeform and mixed spot/process gradients export as stops or process colours to SVG/PDF; confirm the Scale Strokes & Effects default | 4–8 |
 | M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out, EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, Asset Export, clipboard flavours, File Info. Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, polish | 3–6 |
 | M5 | Performance | 🟡 background render + caches + MT done; `vectorcraft-cli bench` and `vectorcraft-cli perf` (budget suite); file format v2 opens 3× faster (50k paths: 722 → 244 ms); raster effects (glows, shadows, blur, feather) no longer force the whole frame single-threaded (filtered offscreen per effect, verified equal to the single-threaded reference); effect-heavy demos need a clean-machine benchmark; dirty-region rendering, GPU backend spike pending | 15–25 |
-| M6 | Path operations (Pathfinder, Shape Builder, offset…) | ✅ mostly done (Boolean precision on almost-horizontal edges fixed and the property tests made deterministic; Shape Builder gap detection, large-offset bug open) | 3–6 |
-| M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | 🟡 Character/Paragraph Styles, Area Type Options (with Width/Height), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs, OpenType panel, Find Font, installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import, variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel, Hebrew/Arabic bidirectional text and Paragraph Direction done; tab leaders, spell check, vertical type pending | 45–60 |
+| M6 | Path operations (Pathfinder, Shape Builder, offset…) | ✅ mostly done (Boolean precision on almost-horizontal edges fixed and the property tests made deterministic; Shape Builder edge erase, large-offset bug open) | 3–6 |
+| M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | 🟡 Character/Paragraph Styles, Area Type Options (with Width/Height), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs, OpenType panel, Find Font, installed system fonts in every font menu (searchable) and found by name on open/import, variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects, tab stops + Tabs panel done; tab leaders, spell check, vertical type pending | 45–60 |
 | M8 | Transform & distort (Puppet Warp, Liquify tools, Envelopes, Blends, Perspective Grid) | ✅ done (M8.1–M8.20 on 2026-10-06, fidelity pass): Liquify Tool Options with one shared brush, pen pressure, hold-to-apply, a safe scope and incremental strokes; tool options that last; Puppet Warp rotation, multi-select, Control bar and a rest-shape session that follows Undo; Width tool on compound paths; Envelope dialogs with preview, Reset with Warp/Mesh, full Envelope Options, type/images/symbols/appearance/gradients/patterns distorted on canvas and in every export, warps that keep their frame, Edit Contents, mesh handles and Control bar; Blend Options, anchor-targeted Blend tool, editable spine, keys picked on the canvas, faithful interpolation and knockout; Perspective Grid with Define Grid, presets, lock/snap/rulers, widgets, the 1–4 plane switch, movable planes, Perspective Selection scale/copy/perpendicular/Transform Again, and type and symbols truly projected with Edit Text. Left: Anti-Alias and Preserve Shape output, warp-envelope point editing, brush interpolation in blends, Free Transform/Scale/Reflect along a rotated box | 2–4 |
 | M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder and Color Adjustments; SVG Filters, Document Raster Effects Settings, 3D pending | 86–135 |
 | M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG `<pattern>`/PDF export) and live Repeat (radial/grid/mirror) done; brushes/symbols in progress | 23–37 |
 | M11 | Artboards & views (artboard panel/tool, Trim View, middle-button pan, print tiling and the status bar's artboard navigator done; multiple windows, presentation polish) | 🟡 | 15–25 |
 | M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (12 presets, 18 ms/1k² image), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, regenerate in place) done; graph Design/Column/Marker designs pending | 6–10 |
 | M13 | Automation (Actions ✅ record/playback, persisted; variables, scripting, batch) | 🟡 | 18–27 |
-| M14 | 1.0 polish (preferences, shortcut editor, workspaces, accessibility, packaging for all OSes) | 🟡 Preferences, shortcut editor (chords with Shift and a punctuation key fire as typed), workspaces, a custom title bar on Windows/Linux with a Home button, content-sized dialogs and menus that scroll when longer than the window done; an experimental, unsupported Windows 7 x64 portable OpenGL build (not verified by maintainers); accessibility and broader Windows/Linux packaging/QA pending | 18–28 |
+| M14 | 1.0 polish (preferences, shortcut editor, workspaces, accessibility, packaging for all OSes) | 🟡 Preferences, shortcut editor (chords with Shift and a punctuation key fire as typed), workspaces, a custom title bar on Windows/Linux with a Home button, content-sized dialogs and menus that scroll when longer than the window done; accessibility, Windows/Linux packaging pending | 18–28 |
 | — | Interaction fidelity pass (every tool's modifiers, Properties panel per context, isolation, nuance) | ⬜ | 60–90 |
 | — | Hardening at scale (big-file corpus, fuzzing, cross-platform + browser QA) | 🟡 | 50–80 |
 | | **Total to full parity** (one agent; re-derived from the [Parity estimate](#parity-estimate) table) | | **~320–500** |
@@ -198,26 +184,26 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Area | Weight | Done | Missing (main items) | One agent (h) |
 |---|---:|---:|---|---:|
 | Selection, transform & align tools | 6 | 85% | Free Transform/Scale/Reflect along a rotated box, Start Global Edit, transform nuances (the rotated persistent bounding box is done) | 4–6 |
-| Drawing tools | 7 | 85% | Shaper Groups (merge/punch overlapping shapes), pencil and the remaining pen modifier nuances, the freehand Tool Options' Keep selected, Alt to the Smooth tool, Blob Brush Merge Only with Selection and brush angle/roundness, Touch Type, Live Corners on plain paths and polygons (and Relative rounding) | 10–15 |
-| Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 86% | Live Paint gap options, Shape Builder gap detection, options (Tool Options dialog, clicking a stroke in merge mode) and Shift-drag marquee | 3–6 |
+| Drawing tools | 7 | 85% | Shaper Groups (merge/punch overlapping shapes), pen/pencil modifier nuances, Touch Type | 10–15 |
+| Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 86% | Live Paint gap options, Shape Builder edge cases | 3–6 |
 | Colour, swatches, gradients, patterns, mesh, recolor | 7 | 96% | freeform and mixed spot/process gradients in SVG/PDF (exported as stops or process colours), pattern fills in Expand | 2–4 |
-| Strokes, brushes, width profiles | 5 | 88% | brush options depth, brush libraries (generated in code), brushes driven by pen tilt, bearing and barrel rotation (6D art pens) | 12–20 |
+| Strokes, brushes, width profiles | 5 | 88% | brush options depth, brush libraries (generated in code) | 6–10 |
 | Appearance, transparency, graphic styles, masks | 5 | 98% | raster effect reach in preview bounds (flattener presets apply in PDF, EPS and print) | 1–2 |
 | Live vector effects | 5 | 85% | Outline Object, Pathfinder Hard/Soft Mix and Trap, SVG Filters | 6–10 |
 | Raster effects (Effect Gallery, Document Raster Effects Settings) | 4 | 20% | ~55 Photoshop-style filters (Artistic, Brush Strokes, Distort, Pixelate, Sketch, Stylize, Texture, Video) and the Effect Gallery; Document Raster Effects Settings and raster effects in PDF are done | 28–42 |
 | 3D and Materials | 4 | 0% | Extrude & Bevel, Revolve, Inflate, Rotate, lighting, materials (software renderer) | 50–80 |
-| Type core | 9 | 79% | Middle Eastern features beyond bidi layout and Paragraph Direction (Character Direction, digit types, kashidas, the Middle Eastern composers, editable bidirectional SVG text, a split caret where directions meet); composer/hyphenation options, Optical Margin Alignment, hidden characters, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 15–20 |
-| Type advanced | 4 | 50% | CJK composition for vertical type (ruby, mojikumi beyond Line-end Punctuation Half Width — the other sets (and their paragraph-start bracket and indent rules), kinsoku sets and the Mojikumi Settings dialog —, proportional vertical metrics, manual tate-chu-yoko, Character Alignment on the ICF top and bottom), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support | 20–28 |
+| Type core | 9 | 78% | composer/hyphenation options, Optical Margin Alignment, hidden characters, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 15–20 |
+| Type advanced | 4 | 48% | CJK composition for vertical type (ruby, mojikumi, vertical metrics, manual tate-chu-yoko), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support | 20–28 |
 | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | symbol libraries (original), dynamic symbols, envelope Anti-Alias/Preserve Shape output and warp point editing, brush interpolation in blends (M8 fidelity pass done) | 5–8 |
-| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image) (Vector Halftone is done) | 6–10 |
+| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (Vector Halftone is done) | 6–10 |
 | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, Collect for Export, row context menus, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers, drag-scrolling a long panel while dragging rows; artboard presets/rearrange polish (Document Setup, New Document and the rest of the Layers panel are done) | 4–7 |
 | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 |
-| Guides, grids, smart guides, snapping, rulers | 3 | 82% | global/video rulers, smart-guide preference depth, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451) | 3–5 |
-| File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, EPS checked against more real files (Illustrator 2026 and Inkscape files open as vectors; CorelDRAW, Affinity, LibreOffice, matplotlib and Ghostscript output checked with synthetic programs only; CID-keyed CJK type and `CCITTFaxDecode` images not read), legacy `.ai` files saved without the prolog that defines their operators (their own operator set isn't read yet), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
+| Guides, grids, smart guides, snapping, rulers | 3 | 75% | global/video rulers, smart-guide preference depth, ruler-drag modifiers (Shift snaps to ticks, Alt swaps orientation) and dragging existing guides | 4–8 |
+| File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, Illustrator EPS checked against real files (only reduced repros so far), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
 | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | polish only (all four are done) | 2–4 |
 | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity (flattener presets in PDF and print, overprint in PDF and composite print, Print dialog, presets, PostScript, marks, separations, Print Tiling, print overprint/flattener/bitmap options and printer profile are done) | 1–2 |
 | Automation | 3 | 60% | Variables (data merge), scripting surface, batch | 8–12 |
-| UI chrome (panels, contextual Properties, workspaces, prefs) | 6 | 78% | Variables, SVG Interactivity, Properties per context, Consolidate All Windows, floating panels outside the app window and docked into any group, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 32 Preferences options stored but not yet acted on (#394: Construction and Spacing Guides, Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, performance, devices…) | 14–22 |
+| UI chrome (panels, contextual Properties, workspaces, prefs) | 6 | 78% | Variables, SVG Interactivity, Properties per context, Consolidate All Windows, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done) | 15–25 |
 | Libraries, Links, Package | 2 | 50% | a local Libraries panel (no cloud by design); Links and Package are done | 5–8 |
 | **Feature parity** | **103** | **~75%** | | **~210–330** |
 | Interaction-fidelity pass (side by side with Illustrator: every tool modifier, cursor, dialog, Properties context) | | | | 60–90 |
@@ -228,7 +214,7 @@ With 4–6 agents working on disjoint crates (as the layering allows) the wall-c
 (integration, review and shared files such as `menus.rs` serialize some work): **~55–95 h** to feature parity,
 **~80–145 h** to full parity.

-_Inventories (2026-10-07):_ 13 menu items still stubbed (`todo(…)` in `crates/ui-egui/src/menus.rs`); every tool
+_Inventories (2026-10-05):_ 16 menu items still stubbed (`todo(…)` in `crates/ui-egui/src/menus.rs`); every tool
 implemented except Touch Type; 51 panel modules; Illustrator-style live
 effects ~44/54, Photoshop-style raster effects ~1/56, 3D 0/5; ~2,840 tests; ~221k lines of Rust.

@@ -237,7 +223,7 @@ lossless SVG/PDF export of live effects with SVG filters, a documented JSON form
 command, gesture and dialog drivable by agents (MCP, CLI, control channel).

 ## Out of scope (by design or by law)
- **Native `.ai` private data:** it's undocumented. We read the PDF-compatible part, so Illustrator-only live objects arrive as appearance, and plain groups arrive ungrouped: that part draws each object on its own and marks only layers, clipping groups and groups with opacity, blending or a mask (those come back). Art outside the artboards isn't in that part at all (Illustrator's PDF part leaves it out), so it doesn't open; the import says so in a note (#472). Art off the page that a PDF does draw opens on the pasteboard.
+- **Native `.ai` private data:** it's undocumented. We read the PDF-compatible part, so Illustrator-only live objects arrive as appearance.
 - **Adobe cloud services** (Libraries sync, Adobe Fonts, Firefly/generative): these are pluggable provider APIs, not built in.
 - **Adobe's bundled assets** (swatch/brush/symbol libraries, presets, icons): ours are original.

@@ -72,9 +72,7 @@ USAGE:
      Live effects are kept; --outline-text writes SVG text as paths.

  vectorcraft-cli info FILE
-      Print a JSON summary: the import warnings (what didn't come in as it was, such as an EPS
-      read from its preview and why), title, colour mode, units, artboards, object counts by
-      kind, fonts.
+      Print a JSON summary: title, colour mode, units, artboards, object counts by kind, fonts.

  vectorcraft-cli bench FILE [--size WxH] [--iters N]
      Render FILE (any readable format) fitted to WxH (default 2880x1800) and print ms per frame
@@ -190,7 +188,7 @@ fn convert(args: &[String]) -> Result<(), String> {
 fn info(args: &[String]) -> Result<(), String> {
    let file = args.first().ok_or("info needs a FILE")?;
    let mut h = Headless::new();
-    let opened = h.call("app.open", json!({"path": file})).map_err(|e| format!("open {file}: {e}"))?;
+    h.call("app.open", json!({"path": file})).map_err(|e| format!("open {file}: {e}"))?;
    let base = h.call("engine.execute", json!({"command": "file.info", "params": {}}))?;
    let doc = h.session.doc().map_err(|e| e.to_string())?.doc.clone();
    let mut kinds: std::collections::BTreeMap<&'static str, usize> = Default::default();
@@ -198,8 +196,7 @@ fn info(args: &[String]) -> Result<(), String> {
    let fonts = h.call("engine.execute", json!({"command": "text.fonts", "params": {}})).unwrap_or(Value::Null);
    let artboards: Vec<Value> =
        doc.artboards.iter().map(|a| json!({"name": a.name, "rect": [a.rect.x0, a.rect.y0, a.rect.width(), a.rect.height()]})).collect();
-    // What didn't come in as it was (an EPS read from its preview says why).
-    let v = json!({"file": file, "warnings": opened["warnings"], "info": base, "artboards": artboards, "kinds": kinds, "fonts": fonts});
+    let v = json!({"file": file, "info": base, "artboards": artboards, "kinds": kinds, "fonts": fonts});
    outln!("{}", serde_json::to_string_pretty(&v).unwrap_or_default());
    Ok(())
 }
@@ -83,155 +83,6 @@ fn mcp_headless_over_stdio() {
    assert_eq!(replies[3]["result"]["content"][0]["type"], "image");
 }

-/// End-to-end protocol sweep over stdio against the compiled binary. The in-process
-/// tests drive `Server::handle_line` directly, so the binary's own wiring (argument
-/// parsing, logger install, stdout pollution, notification order) is untested: this
-/// drives the real `mcp --headless` process through prompts, completions, resource
-/// templates, logging and the error taxonomy instead.
-#[test]
-fn mcp_protocol_over_stdio() {
-    use std::io::{BufRead, BufReader};
-    let mut child =
-        Command::new(BIN).args(["mcp", "--headless"]).stdin(Stdio::piped()).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
-    let mut stdin = child.stdin.take().unwrap();
-    let mut lines = BufReader::new(child.stdout.take().unwrap()).lines();
-    let mut notes = vec![];
-
-    fn send(stdin: &mut std::process::ChildStdin, v: Value) {
-        writeln!(stdin, "{v}").unwrap();
-    }
-    // Next reply with this id; notifications (no id) are stashed for later.
-    fn recv(lines: &mut std::io::Lines<BufReader<std::process::ChildStdout>>, notes: &mut Vec<Value>, id: u64) -> Value {
-        loop {
-            let line = lines.next().unwrap().unwrap();
-            let v: Value = serde_json::from_str(&line).unwrap();
-            assert_eq!(v["jsonrpc"], "2.0", "{v}");
-            if v.get("id").and_then(|i| i.as_u64()) == Some(id) {
-                return v;
-            }
-            notes.push(v);
-        }
-    }
-
-    send(
-        &mut stdin,
-        json!({"jsonrpc":"2.0","id":1,"method":"initialize","params":{"protocolVersion":"2025-06-18","capabilities":{},"clientInfo":{"name":"test","version":"0"}}}),
-    );
-    let r = recv(&mut lines, &mut notes, 1);
-    assert_eq!(r["result"]["serverInfo"]["name"], "vectorcraft");
-    assert!(r["result"]["capabilities"]["prompts"].is_object(), "{r}");
-    send(&mut stdin, json!({"jsonrpc":"2.0","method":"notifications/initialized"}));
-
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":2,"method":"prompts/list","params":{}}));
-    let r = recv(&mut lines, &mut notes, 2);
-    assert!(r["result"]["prompts"].as_array().is_some_and(|p| !p.is_empty()), "{r}");
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":3,"method":"prompts/get","params":{"name":"poster","arguments":{"brief":"a jazz festival"}}}));
-    let r = recv(&mut lines, &mut notes, 3);
-    assert!(r["result"]["messages"][0]["content"]["text"].as_str().is_some_and(|t| t.contains("a jazz festival")), "{r}");
-
-    send(
-        &mut stdin,
-        json!({"jsonrpc":"2.0","id":4,"method":"completion/complete","params":{"ref":{"type":"ref/prompt","name":"export-set"},"argument":{"name":"formats","value":"sv"}}}),
-    );
-    let r = recv(&mut lines, &mut notes, 4);
-    assert!(r["result"]["completion"]["values"].as_array().is_some_and(|v| v.contains(&json!("svg"))), "{r}");
-
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":5,"method":"resources/list","params":{}}));
-    assert!(recv(&mut lines, &mut notes, 5)["result"]["resources"].as_array().is_some_and(|v| v.len() == 2));
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":6,"method":"resources/templates/list","params":{}}));
-    assert!(recv(&mut lines, &mut notes, 6)["result"]["resourceTemplates"].as_array().is_some_and(|v| v.len() >= 4));
-
-    send(
-        &mut stdin,
-        json!({"jsonrpc":"2.0","id":7,"method":"tools/call","params":{"name":"draw_shape","arguments":{"shape":"rectangle","x":10,"y":10,"width":60,"height":40}}}),
-    );
-    let r = recv(&mut lines, &mut notes, 7);
-    assert_eq!(r["result"]["isError"], false, "{r}");
-    let id: i64 = serde_json::from_str::<Value>(r["result"]["content"][0]["text"].as_str().unwrap()).unwrap()["id"].as_i64().unwrap();
-
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":8,"method":"resources/read","params":{"uri": format!("vectorcraft://object/{id}")}}));
-    let r = recv(&mut lines, &mut notes, 8);
-    let body: Value = serde_json::from_str(r["result"]["contents"][0]["text"].as_str().unwrap()).unwrap();
-    assert_eq!(body["id"].as_i64(), Some(id), "{body}");
-
-    // Unknown resources (-32002) and bad template values (-32602) stay apart.
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":9,"method":"resources/read","params":{"uri":"vectorcraft://nope" }}));
-    assert_eq!(recv(&mut lines, &mut notes, 9)["error"]["code"], -32002);
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":10,"method":"resources/read","params":{"uri":"vectorcraft://object/"}}));
-    assert_eq!(recv(&mut lines, &mut notes, 10)["error"]["code"], -32602);
-
-    // Large containers slice through run_command document.node: a truncated level reports
-    // childCount, and a bad limit is a tool error, not a crash or a full read.
-    send(
-        &mut stdin,
-        json!({"jsonrpc":"2.0","id":20,"method":"tools/call","params":{"name":"draw_shape","arguments":{"shape":"ellipse","x":90,"y":10,"width":30,"height":30}}}),
-    );
-    assert_eq!(recv(&mut lines, &mut notes, 20)["result"]["isError"], false);
-    let run = |id: u64, command: &str, params: Value| json!({"jsonrpc":"2.0","id":id,"method":"tools/call","params":{"name":"run_command","arguments":{"command":command,"params":params}}});
-    send(&mut stdin, run(21, "select.all", json!({})));
-    recv(&mut lines, &mut notes, 21);
-    send(&mut stdin, run(22, "object.group", json!({})));
-    let r = recv(&mut lines, &mut notes, 22);
-    let group = serde_json::from_str::<Value>(r["result"]["content"][0]["text"].as_str().unwrap()).unwrap()["id"].clone();
-    send(&mut stdin, run(23, "document.node", json!({"id": group, "summary": true, "childLimit": 1})));
-    let r = recv(&mut lines, &mut notes, 23);
-    let sliced: Value = serde_json::from_str(r["result"]["content"][0]["text"].as_str().unwrap()).unwrap();
-    assert_eq!(sliced["children"].as_array().map(Vec::len), Some(1), "{sliced}");
-    assert_eq!(sliced["childCount"], 2, "{sliced}");
-    send(&mut stdin, run(24, "document.node", json!({"id": group, "summary": true, "depth": -1})));
-    assert_eq!(recv(&mut lines, &mut notes, 24)["result"]["isError"], true);
-
-    // Skeleton then drill: a depth-0 inspect is the layer skeleton with counts, and
-    // document.find locates nodes without dumping the tree.
-    send(&mut stdin, run(25, "document.inspect", json!({"depth": 0})));
-    let r = recv(&mut lines, &mut notes, 25);
-    let skel: Value = serde_json::from_str(r["result"]["content"][0]["text"].as_str().unwrap()).unwrap();
-    assert!(skel["layers"][0].get("children").is_none(), "{skel}");
-    assert!(skel["artboards"].as_array().is_some_and(|a| !a.is_empty()), "{skel}");
-    send(&mut stdin, run(26, "document.find", json!({"kind": "ellipse"})));
-    let r = recv(&mut lines, &mut notes, 26);
-    let found: Value = serde_json::from_str(r["result"]["content"][0]["text"].as_str().unwrap()).unwrap();
-    assert_eq!(found["total"], 1, "{found}");
-    assert!(found["matches"][0]["path"].as_array().is_some_and(|p| !p.is_empty()), "{found}");
-    send(&mut stdin, run(27, "document.find", json!({})));
-    assert_eq!(recv(&mut lines, &mut notes, 27)["result"]["isError"], true);
-
-    // The binary installed its logger: records arrive as notifications/message, and only
-    // after the client asked for them.
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":11,"method":"logging/setLevel","params":{"level":"debug"}}));
-    assert!(recv(&mut lines, &mut notes, 11).get("error").is_none());
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":12,"method":"tools/list","params":{}}));
-    assert!(recv(&mut lines, &mut notes, 12)["result"]["tools"].as_array().is_some_and(|v| !v.is_empty()));
-
-    // Malformed input is a parse error, and the server keeps serving afterwards.
-    stdin.write_all(b"{not json\n").unwrap();
-    let parse_err: Value = loop {
-        let line = lines.next().unwrap().unwrap();
-        let v: Value = serde_json::from_str(&line).unwrap();
-        if v.get("error").is_some() {
-            break v;
-        }
-        notes.push(v);
-    };
-    assert_eq!(parse_err["error"]["code"], -32700);
-    assert!(parse_err["id"].is_null(), "{parse_err}");
-    send(&mut stdin, json!({"jsonrpc":"2.0","id":13,"method":"ping","params":{}}));
-    assert!(recv(&mut lines, &mut notes, 13).get("error").is_none());
-    drop(stdin);
-    // Drain whatever the debug window queued; every line off the protocol stream parses.
-    for line in lines.by_ref() {
-        let line = line.unwrap();
-        let v: Value = serde_json::from_str(&line).unwrap();
-        assert_eq!(v["jsonrpc"], "2.0", "{v}");
-        notes.push(v);
-    }
-    let out = child.wait_with_output().unwrap();
-    assert!(out.status.success());
-    assert!(!String::from_utf8_lossy(&out.stderr).contains("panicked"));
-    let messages = notes.iter().filter(|n| n["method"] == "notifications/message").count();
-    assert!(messages > 0, "no log records after logging/setLevel: {notes:?}");
-}
-
 /// `vectorcraft-cli commands | head -1` panicked with "failed printing to
 /// stdout: Broken pipe (os error 32)" and exit status 101.
 #[test]
@@ -82,14 +82,3 @@ fn help_lists_readable_formats() {
    let out = ok(&["--help"]);
    assert!(out.contains("Readable formats: .vectorcraft") && out.contains(".ait") && out.contains(".webp"), "{out}");
 }
-
-/// `info` reports the import warnings: an EPS read only up to an error names it.
-#[test]
-fn info_reports_why_an_eps_read_partly() {
-    let eps = tmp("partial.eps");
-    std::fs::write(&eps, "%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 100\n%%EndComments\n0 0 10 10 rectfill frobnicate\n%%EOF\n").unwrap();
-    let v = info(&eps);
-    let w = v["warnings"][0].as_str().unwrap_or_default();
-    assert!(w.contains("`frobnicate`"), "{v}");
-    assert_eq!(v["kinds"]["Path"], 1, "{v}");
-}
@@ -27,4 +27,4 @@ rfd = { workspace = true }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
-web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "HtmlIFrameElement", "HtmlAnchorElement", "Blob", "BlobPropertyBag", "ClipboardEvent", "DataTransfer", "File", "FileList", "Url", "Location", "CssStyleDeclaration", "Event", "EventTarget", "MouseEvent", "DragEvent", "Storage", "Navigator"] }
+web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "HtmlIFrameElement", "HtmlAnchorElement", "Blob", "BlobPropertyBag", "Url", "Location", "CssStyleDeclaration", "Event", "EventTarget", "MouseEvent", "DragEvent", "Storage"] }
@@ -1,122 +0,0 @@
-//! The browser's Web Locks (`navigator.locks`), which tell Data Recovery whether another tab still
-//! runs ([`vectorcraft_engine::cmd::recovery::RecoveryStore::announce`]). A tab holds a lock named
-//! after its recovery area for as long as it lives; the browser releases it only when the tab is
-//! gone (closed, crashed or reloaded), not while its timers are paused in the background, which a
-//! heartbeat can't tell apart.
-//!
-//! web-sys has Web Locks only as an unstable API, so they are reached through `js_sys::Reflect`.
-//! Pages that aren't secure (plain `http://` other than localhost) and older browsers have none:
-//! heartbeats alone decide there.
-
-use std::cell::RefCell;
-use std::collections::{BTreeMap, BTreeSet};
-use std::sync::{Arc, Mutex};
-
-use js_sys::{Function, Promise, Reflect};
-use vectorcraft_engine::cmd::recovery::Hold;
-use wasm_bindgen::JsCast as _;
-use wasm_bindgen::JsValue;
-use wasm_bindgen::closure::Closure;
-
-/// How often the snapshot of the locks held is refreshed (ms).
-const REFRESH_MS: i32 = 10_000;
-/// How old a snapshot may be and still be trusted (ms). A lock asked for after the snapshot was
-/// taken comes with a heartbeat, which stays fresh for at least three minutes, so anything under
-/// that is safe; an older snapshot counts every area as held.
-const FRESH_MS: f64 = 60_000.0;
-
-thread_local! {
-    /// What releases each lock this tab holds, by name: it resolves the promise the lock is held
-    /// by (wasm runs on one thread).
-    static RELEASE: RefCell<BTreeMap<String, Function>> = const { RefCell::new(BTreeMap::new()) };
-}
-
-/// The locks of the page, named `<prefix><area>`.
-#[derive(Clone)]
-pub struct WebLocks {
-    prefix: &'static str,
-    /// The areas whose locks were held at the last snapshot, and when it was asked for (ms since
-    /// the epoch). `navigator.locks.query()` is asynchronous, so the snapshot is refreshed every
-    /// [`REFRESH_MS`] and read from here.
-    seen: Arc<Mutex<(f64, BTreeSet<String>)>>,
-}
-
-/// `navigator.locks`, if the browser has it here.
-fn manager() -> Option<JsValue> {
-    let locks = Reflect::get(&web_sys::window()?.navigator(), &"locks".into()).ok()?;
-    locks.is_object().then_some(locks)
-}
-
-/// Method `name` of `obj`.
-fn method(obj: &JsValue, name: &str) -> Option<Function> {
-    Reflect::get(obj, &name.into()).ok()?.dyn_into().ok()
-}
-
-impl WebLocks {
-    /// The page's Web Locks with a first snapshot of them, kept fresh from then on; `None` when
-    /// the browser has none or won't say which are held (heartbeats alone decide then).
-    pub async fn start(prefix: &'static str) -> Option<Self> {
-        let locks = Self { prefix, seen: Arc::new(Mutex::new((f64::NEG_INFINITY, BTreeSet::new()))) };
-        locks.refresh().await?;
-        let again = locks.clone();
-        let tick = Closure::<dyn FnMut()>::new(move || {
-            let locks = again.clone();
-            wasm_bindgen_futures::spawn_local(async move {
-                // A failed refresh leaves the snapshot to age, and every area counts as held.
-                let _ = locks.refresh().await;
-            });
-        });
-        web_sys::window()?.set_interval_with_callback_and_timeout_and_arguments_0(tick.as_ref().unchecked_ref(), REFRESH_MS).ok()?;
-        // The timer lives as long as the page.
-        tick.forget();
-        Some(locks)
-    }
-
-    /// Take a new snapshot of the locks held.
-    async fn refresh(&self) -> Option<()> {
-        let m = manager()?;
-        let asked = js_sys::Date::now();
-        let query: Promise = method(&m, "query")?.call0(&m).ok()?.dyn_into().ok()?;
-        let snapshot = wasm_bindgen_futures::JsFuture::from(query).await.ok()?;
-        let held = js_sys::Array::from(&Reflect::get(&snapshot, &"held".into()).ok()?);
-        let areas = held
-            .iter()
-            .filter_map(|l| Reflect::get(&l, &"name".into()).ok()?.as_string())
-            .filter_map(|n| n.strip_prefix(self.prefix).map(str::to_string))
-            .collect();
-        *self.seen.lock().unwrap_or_else(|e| e.into_inner()) = (asked, areas);
-        Some(())
-    }
-
-    /// Does a tab hold `area`'s lock? Yes when the last snapshot is too old to tell.
-    pub fn held(&self, area: &str) -> bool {
-        let seen = self.seen.lock().unwrap_or_else(|e| e.into_inner());
-        js_sys::Date::now() - seen.0 > FRESH_MS || seen.1.contains(area)
-    }
-
-    /// Hold `area`'s lock until the returned hold is dropped (or the page goes).
-    pub fn hold(&self, area: &str) -> Option<Hold> {
-        let m = manager()?;
-        let name = format!("{}{area}", self.prefix);
-        // The lock is held until this promise resolves: when the hold is dropped.
-        let mut release = None;
-        let until = Promise::new(&mut |resolve, _| release = Some(resolve));
-        let release = release?;
-        let granted = Closure::once_into_js(move |_lock: JsValue| until);
-        method(&m, "request")?.call2(&m, &name.clone().into(), &granted).ok()?;
-        RELEASE.with(|r| r.borrow_mut().insert(name.clone(), release));
-        Some(Box::new(LockHold(name)))
-    }
-}
-
-/// A lock this tab holds (by name), released when dropped.
-struct LockHold(String);
-
-impl Drop for LockHold {
-    fn drop(&mut self) {
-        if let Some(resolve) = RELEASE.with(|r| r.borrow_mut().remove(&self.0)) {
-            // Resolving can't fail in a way worth reporting: the lock goes with the page anyway.
-            let _ = resolve.call0(&JsValue::NULL);
-        }
-    }
-}
@@ -11,11 +11,8 @@
 //! - Save / Export trigger a browser download;
 //! - dropped files are read asynchronously by `web::WebShell` and delivered through the inbox.
 //!
-//! URL query flags: `?webgl` forces the WebGL2 backend instead of WebGPU; `?lang=es` (any
-//! language code) stands in for the browser's languages when the interface language is Automatic.
+//! URL query flag: `?webgl` forces the WebGL2 backend instead of WebGPU.

-#[cfg(target_arch = "wasm32")]
-mod locks;
 #[cfg(target_arch = "wasm32")]
 mod web;

@@ -1,183 +1,76 @@
-//! The browser shell: web `Services`, drag-and-drop, pasted pictures and files, the eframe web
-//! runner, and starting again with new graphics when the page loses them (#369).
+//! The browser shell: web `Services`, drag-and-drop, and the eframe web runner.

-use std::cell::{Cell, RefCell};
+use std::cell::Cell;
 use std::rc::Rc;
 use std::sync::{Arc, Mutex};

 use vectorcraft_engine::Session;
-use vectorcraft_engine::cmd::clipboard::{FILE_HEAD, Flavour, PASTE_ORDER, file_flavour};
 use vectorcraft_engine::cmd::fileio;
-use vectorcraft_engine::cmd::recovery::{self, Hold, RecoveryStore};
-use vectorcraft_ui_egui::graphics::GraphicsLoss;
-use vectorcraft_ui_egui::i18n;
+use vectorcraft_engine::cmd::recovery::RecoveryStore;
 use vectorcraft_ui_egui::place::{DropTarget, PlaceArrival, PlaceInbox};
 use vectorcraft_ui_egui::print::{PrintJob, PrintService, Printer};
 use vectorcraft_ui_egui::{Services, VectorcraftApp};
 use wasm_bindgen::JsCast as _;

-use crate::locks::WebLocks;
-
 type Inbox = Arc<Mutex<Vec<(String, Vec<u8>)>>>;

 /// Where the pointer was over the canvas during the last file drag (CSS px from its top-left) and
 /// whether Shift was held: where dropped files land.
 type DragPos = Rc<Cell<Option<(f32, f32, bool)>>>;

-/// A picture or file pasted into the page, read and waiting for the next frame with the modifiers
-/// held at the paste, and the context to wake for it (the current runner's).
-#[derive(Default)]
-struct Pasted {
-    flavour: Option<(Flavour, egui::Modifiers)>,
-    ctx: Option<egui::Context>,
-}
-
 const CANVAS_ID: &str = "vectorcraft_canvas";
 const LOADING_ID: &str = "vectorcraft_loading";

-/// How many times the page starts again with new graphics after losing them before it gives up
-/// (a GPU that keeps failing).
-const MAX_RESTARTS: u32 = 3;
-
-/// What the page keeps while the app runs, across graphics restarts.
-#[derive(Clone)]
-struct Host {
-    runner: eframe::WebRunner,
-    inbox: Inbox,
-    place_inbox: PlaceInbox,
-    drag: DragPos,
-    pasted: Rc<RefCell<Pasted>>,
-    /// The page's Web Locks for Data Recovery, started once before the first frame: a graphics
-    /// restart keeps them, so the tab stays the owner of its recovery area.
-    locks: Option<WebLocks>,
-    /// Graphics restarts so far.
-    restarts: u32,
-}
-
 pub fn start() {
    eframe::WebLogger::init(log::LevelFilter::Info).ok();
-    let Some(canvas) = element(CANVAS_ID).and_then(|e| e.dyn_into::<web_sys::HtmlCanvasElement>().ok()) else {
-        log::error!("missing <canvas id=\"{CANVAS_ID}\">");
-        return;
-    };
-    detect_language();
-    wasm_bindgen_futures::spawn_local(async move {
-        // Before the first frame, which looks for copies a crash left behind.
-        let locks = WebLocks::start(RECOVERY_PREFIX).await;
-        let host = Host {
-            runner: eframe::WebRunner::new(),
-            inbox: Arc::default(),
-            place_inbox: Arc::default(),
-            drag: DragPos::default(),
-            pasted: Rc::default(),
-            locks,
-            restarts: 0,
+    wasm_bindgen_futures::spawn_local(async {
+        let Some(document) = web_sys::window().and_then(|w| w.document()) else {
+            log::error!("no document");
+            return;
        };
-        track_paste(&host.pasted);
-        run(host, canvas, None).await;
-    });
-}
-
-/// An app whose graphics were lost, on its way to new ones.
-struct Moving {
-    app: VectorcraftApp,
-    /// Its unsaved changes are kept in recovery copies ([`VectorcraftApp::graphics_lost`]).
-    kept: bool,
-}
-
-/// Run the app on `canvas`: the `moving` one when starting again after losing the graphics, else
-/// a new one.
-async fn run(host: Host, canvas: web_sys::HtmlCanvasElement, moving: Option<Moving>) {
-    track_drag(&canvas, &host.drag);
-    let kept = moving.as_ref().map(|m| m.kept);
-    // The app until the new runner takes it (still here if starting fails before).
-    let slot = Rc::new(RefCell::new(moving.map(|m| m.app)));
-    let (runner, taken, page) = (host.runner.clone(), slot.clone(), canvas.clone());
-    let result = runner
-        .start(
-            canvas,
-            web_options(),
-            Box::new(move |cc| {
-                let ctx = &cc.egui_ctx;
-                let loss = GraphicsLoss::default();
-                watch_canvas(&page, &loss, ctx);
-                if let Some(rs) = &cc.wgpu_render_state {
-                    log::info!("vectorcraft-web: wgpu backend {:?}", rs.adapter.get_info().backend);
-                    let (loss, ctx) = (loss.clone(), ctx.clone());
-                    rs.device.set_device_lost_callback(move |reason, msg| loss.report(&ctx, format!("{reason:?}: {msg}")));
-                }
-                host.pasted.borrow_mut().ctx = Some(ctx.clone());
-                let services = services(host.inbox.clone(), host.place_inbox.clone(), ctx.clone(), host.locks.clone());
-                let app = match taken.borrow_mut().take() {
-                    Some(mut app) => {
-                        // The old services asked the old context for frames.
-                        app.services = services;
-                        app.status("The graphics were lost and have been restarted");
-                        app
+        let Some(canvas) = document.get_element_by_id(CANVAS_ID).and_then(|e| e.dyn_into::<web_sys::HtmlCanvasElement>().ok()) else {
+            log::error!("missing <canvas id=\"{CANVAS_ID}\">");
+            return;
+        };
+        let drag = track_drag(&canvas);
+        let mut options = eframe::WebOptions::default();
+        if query().contains("webgl")
+            && let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup
+        {
+            create.instance_descriptor.backends = eframe::wgpu::Backends::GL;
+        }
+        let result = eframe::WebRunner::new()
+            .start(
+                canvas,
+                options,
+                Box::new(move |cc| {
+                    if let Some(rs) = &cc.wgpu_render_state {
+                        log::info!("vectorcraft-web: wgpu backend {:?}", rs.adapter.get_info().backend);
                    }
-                    None => VectorcraftApp::new(Session::new(), services),
-                };
-                Ok(Box::new(WebShell { app: Some(app), host, canvas: page, loss }))
-            }),
-        )
-        .await;
-    match (result, kept) {
-        (Ok(()), _) => {
-            if let Some(el) = element(LOADING_ID) {
-                el.remove();
+                    let inbox: Inbox = Arc::default();
+                    let place_inbox: PlaceInbox = Arc::default();
+                    let app = VectorcraftApp::new(Session::new(), services(inbox.clone(), place_inbox.clone(), cc.egui_ctx.clone()));
+                    Ok(Box::new(WebShell { app, inbox, place_inbox, drag }))
+                }),
+            )
+            .await;
+        if let Some(el) = document.get_element_by_id(LOADING_ID) {
+            match result {
+                Ok(()) => el.remove(),
+                Err(e) => el.set_inner_html(&format!("<p>VectorCraft failed to start: {e:?}</p><p>A browser with WebGPU or WebGL2 is required.</p>")),
            }
        }
-        (Err(e), None) => notice(&[&format!("VectorCraft failed to start: {}", js_err(e)), "A browser with WebGPU or WebGL2 is required."]),
-        (Err(e), Some(kept)) => {
-            log::error!("vectorcraft-web: couldn't restart the graphics: {}", js_err(e));
-            give_up(slot.borrow_mut().take(), kept);
-        }
-    }
-}
-
-/// The runner's options: wgpu (WebGPU where available, else WebGL2; `?webgl` forces WebGL2).
-fn web_options() -> eframe::WebOptions {
-    let mut options = eframe::WebOptions::default();
-    if query().contains("webgl")
-        && let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup
-    {
-        create.instance_descriptor.backends = eframe::wgpu::Backends::GL;
-    }
-    options
-}
-
-/// Tell the UI the browser's languages (`?lang=es` in the address first, as `VECTORCRAFT_LOCALE`
-/// does on the desktop) before the first frame, so the Automatic interface language follows the
-/// browser; and show the loading text in that language.
-fn detect_language() {
-    let mut tags: Vec<String> = query_param("lang").into_iter().collect();
-    if let Some(navigator) = web_sys::window().map(|w| w.navigator()) {
-        tags.extend(navigator.languages().iter().filter_map(|v| v.as_string()));
-        tags.extend(navigator.language());
-    }
-    i18n::set_system_locales(tags.as_slice());
-    if let Some(el) = element(LOADING_ID) {
-        el.set_text_content(Some(i18n::message(i18n::system_lang(), "Loading VectorCraft…").as_str()));
-    }
-}
-
-/// The value of `name=` in the address's query, if given.
-fn query_param(name: &str) -> Option<String> {
-    let query = query();
-    query.trim_start_matches('?').split('&').find_map(|kv| kv.strip_prefix(name)?.strip_prefix('=').map(str::to_string)).filter(|v| !v.is_empty())
+    });
 }

 fn query() -> String {
    web_sys::window().and_then(|w| w.location().search().ok()).unwrap_or_default()
 }

-fn element(id: &str) -> Option<web_sys::Element> {
-    web_sys::window()?.document()?.get_element_by_id(id)
-}
-
-/// Follow file drags over `canvas` into `pos`: drag events carry the pointer position, which egui
-/// doesn't get during a drag.
-fn track_drag(canvas: &web_sys::HtmlCanvasElement, pos: &DragPos) {
+/// Follow file drags over the canvas: drag events carry the pointer position, which egui doesn't
+/// get during a drag.
+fn track_drag(canvas: &web_sys::HtmlCanvasElement) -> DragPos {
+    let pos = DragPos::default();
    let p = pos.clone();
    let on_drag = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::DragEvent)>::new(move |e: web_sys::DragEvent| {
        p.set(Some((e.offset_x() as f32, e.offset_y() as f32, e.shift_key())));
@@ -187,179 +80,36 @@ fn track_drag(canvas: &web_sys::HtmlCanvasElement, pos: &DragPos) {
            log::error!("couldn't follow {kind} events: {e:?}");
        }
    }
-    // The listener lives as long as the canvas.
-    on_drag.forget();
-}
-
-/// Take pictures and files pasted into the page (egui reads a paste's text only): a paste without
-/// text hands the first of its files that is art (a bitmap, SVG, PDF, a metafile) to the next
-/// frame. Text, SVG markup among it, is left to egui.
-fn track_paste(pasted: &Rc<RefCell<Pasted>>) {
-    let Some(window) = web_sys::window() else { return };
-    let pasted = pasted.clone();
-    let on_paste = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::ClipboardEvent)>::new(move |e: web_sys::ClipboardEvent| {
-        let Some(data) = e.clipboard_data() else { return };
-        let Some(files) = data.files().filter(|f| f.length() > 0) else { return };
-        if data.get_data("text").is_ok_and(|t| !t.is_empty()) {
-            return;
-        }
-        e.prevent_default();
-        let held = pasted.borrow().ctx.as_ref().map(|c| c.input(|i| i.modifiers)).unwrap_or_default();
-        let files: Vec<web_sys::File> = (0..files.length()).filter_map(|i| files.get(i)).collect();
-        let pasted = pasted.clone();
-        wasm_bindgen_futures::spawn_local(async move {
-            for file in files {
-                let bytes = match wasm_bindgen_futures::JsFuture::from(file.array_buffer()).await {
-                    Ok(buf) => js_sys::Uint8Array::new(&buf).to_vec(),
-                    Err(e) => {
-                        log::error!("couldn't read the pasted file {}: {}", file.name(), js_err(e));
-                        continue;
-                    }
-                };
-                if let Some(mime) = file_flavour(&file.name(), bytes.get(..FILE_HEAD).unwrap_or(&bytes), &PASTE_ORDER) {
-                    let mut p = pasted.borrow_mut();
-                    p.flavour = Some((Flavour { mime, data: bytes }, held));
-                    if let Some(ctx) = &p.ctx {
-                        ctx.request_repaint();
-                    }
-                    return;
-                }
-            }
-        });
-    });
-    // Captured before eframe's own listener, which stops the event.
-    if let Err(e) = window.add_event_listener_with_callback_and_bool("paste", on_paste.as_ref().unchecked_ref(), true) {
-        log::error!("couldn't follow paste events: {e:?}");
-    }
    // The listener lives as long as the page.
-    on_paste.forget();
-}
-
-/// Report the loss of `canvas`'s WebGL context to `loss` (WebGPU devices report theirs through
-/// wgpu).
-fn watch_canvas(canvas: &web_sys::HtmlCanvasElement, loss: &GraphicsLoss, ctx: &egui::Context) {
-    let (loss, ctx) = (loss.clone(), ctx.clone());
-    let on_lost = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::Event)>::new(move |_: web_sys::Event| {
-        loss.report(&ctx, "the WebGL context was lost");
-    });
-    if let Err(e) = canvas.add_event_listener_with_callback("webglcontextlost", on_lost.as_ref().unchecked_ref()) {
-        log::error!("couldn't watch for a lost WebGL context: {e:?}");
-    }
-    // The listener lives as long as the canvas.
-    on_lost.forget();
-}
-
-/// A new canvas in place of `old`, whose graphics were lost (a canvas whose WebGL context is lost
-/// can't get another).
-fn fresh_canvas(old: &web_sys::HtmlCanvasElement) -> Result<web_sys::HtmlCanvasElement, String> {
-    let new: web_sys::HtmlCanvasElement = old.clone_node().map_err(js_err)?.dyn_into().map_err(|_| "not a canvas")?;
-    old.replace_with_with_node_1(&new).map_err(js_err)?;
-    Ok(new)
-}
-
-/// The graphics are lost for good: the dead canvas goes (it would show a stale picture), the app
-/// (if still here) lets go of its recovery copies so the reloaded page offers them at once, and
-/// the page says what to do.
-fn give_up(app: Option<VectorcraftApp>, kept: bool) {
-    if let Some(mut app) = app {
-        recovery::leave(&mut app.session);
-    }
-    if let Some(canvas) = element(CANVAS_ID) {
-        canvas.remove();
-    }
-    notice(&[
-        "The graphics were lost and couldn't be restarted.",
-        if kept {
-            "Your unsaved changes are kept in this browser: reload the page to get them back."
-        } else {
-            "Reload the page to go on (changes not saved yet may be lost)."
-        },
-    ]);
-}
-
-/// Show `lines` in the middle of the page (where the loading message was).
-fn notice(lines: &[&str]) {
-    let Some(document) = web_sys::window().and_then(|w| w.document()) else { return };
-    let el = match document.get_element_by_id(LOADING_ID) {
-        Some(el) => el,
-        None => {
-            let Ok(el) = document.create_element("div") else { return };
-            el.set_id(LOADING_ID);
-            let Some(body) = document.body() else { return };
-            if let Err(e) = body.append_child(&el) {
-                log::error!("couldn't show a message: {e:?}");
-            }
-            el
-        }
-    };
-    el.set_text_content(None);
-    for line in lines {
-        if let Ok(p) = document.create_element("p") {
-            p.set_text_content(Some(i18n::message(i18n::system_lang(), line).as_str()));
-            // Best effort: the log has the message too.
-            el.append_child(&p).ok();
-        }
-    }
+    on_drag.forget();
+    pos
 }

 /// Wraps the app to read dropped files asynchronously (browsers can't read them synchronously)
 /// and feed them through the inboxes: placed where they were dropped on the canvas, else opened.
-/// When the graphics are lost it hands the app to a new runner on a new canvas.
 struct WebShell {
-    /// `None` once handed on.
-    app: Option<VectorcraftApp>,
-    host: Host,
-    canvas: web_sys::HtmlCanvasElement,
-    loss: GraphicsLoss,
-}
-
-impl WebShell {
-    /// The graphics were lost (`why`): keep recovery copies, then start again on a new canvas
-    /// with the same app once this frame is over (the runner is busy with it until then).
-    fn restart(&mut self, why: &str) {
-        let Some(mut app) = self.app.take() else { return };
-        let kept = app.graphics_lost(why);
-        let mut host = self.host.clone();
-        host.restarts += 1;
-        let canvas =
-            if host.restarts > MAX_RESTARTS { Err(format!("the graphics were lost {MAX_RESTARTS} times")) } else { fresh_canvas(&self.canvas) };
-        match canvas {
-            Ok(canvas) => wasm_bindgen_futures::spawn_local(run(host, canvas, Some(Moving { app, kept }))),
-            Err(e) => {
-                log::error!("vectorcraft-web: giving up on the graphics: {e}");
-                let runner = host.runner;
-                wasm_bindgen_futures::spawn_local(async move { runner.destroy() });
-                give_up(Some(app), kept);
-            }
-        }
-    }
+    app: VectorcraftApp,
+    inbox: Inbox,
+    place_inbox: PlaceInbox,
+    drag: DragPos,
 }

 impl eframe::App for WebShell {
    fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        if let Some(why) = self.loss.take() {
-            self.restart(&why);
-        }
-        let Some(app) = &mut self.app else { return };
-        let pasted = self.host.pasted.borrow_mut().flavour.take();
-        if let Some((f, held)) = pasted {
-            app.paste_from_host(ctx, f, held);
-        }
        let dropped = ctx.input_mut(|i| std::mem::take(&mut i.raw.dropped_files));
        if !dropped.is_empty() {
-            let at = self.host.drag.take();
+            let at = self.drag.take();
            let z = ctx.zoom_factor();
-            let (pos, shift) = (at.map(|(x, y, _)| egui::pos2(x / z, y / z)), at.is_some_and(|a| a.2));
+            let target = self.app.drop_target(at.map(|(x, y, _)| egui::pos2(x / z, y / z)), at.is_some_and(|a| a.2));
            for f in dropped {
-                let name = f.path().file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped".into());
-                let target = app.drop_target(&name, pos, shift);
-                let (inbox, place_inbox, ctx) = (self.host.inbox.clone(), self.host.place_inbox.clone(), ctx.clone());
+                let (inbox, place_inbox, ctx) = (self.inbox.clone(), self.place_inbox.clone(), ctx.clone());
                wasm_bindgen_futures::spawn_local(async move {
+                    let name = f.path().file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped".into());
                    match f.bytes_async().await {
                        Ok(bytes) => {
                            match target {
-                                DropTarget::Place(d) => {
-                                    place_inbox.lock().unwrap_or_else(|e| e.into_inner()).push(PlaceArrival { name, bytes, drop: Some(d) })
+                                DropTarget::Place { at, embed } => {
+                                    place_inbox.lock().unwrap_or_else(|e| e.into_inner()).push(PlaceArrival { name, bytes, drop: Some((at, embed)) })
                                }
                                DropTarget::Open => inbox.lock().unwrap_or_else(|e| e.into_inner()).push((name, bytes)),
                            }
@@ -370,23 +120,19 @@ impl eframe::App for WebShell {
                });
            }
        }
-        app.logic(ctx);
+        self.app.logic(ctx);
    }

    fn raw_input_hook(&mut self, _ctx: &egui::Context, raw: &mut egui::RawInput) {
-        if let Some(app) = &mut self.app {
-            app.raw_input_hook(raw);
-        }
+        self.app.raw_input_hook(raw);
    }

    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
-        if let Some(app) = &mut self.app {
-            app.ui(ui);
-        }
+        self.app.ui(ui);
    }
 }

-fn services(inbox: Inbox, place_inbox: PlaceInbox, ctx: egui::Context, locks: Option<WebLocks>) -> Services {
+fn services(inbox: Inbox, place_inbox: PlaceInbox, ctx: egui::Context) -> Services {
    let open_inbox = inbox.clone();
    let picked = place_inbox.clone();
    let place_ctx = ctx.clone();
@@ -428,7 +174,7 @@ fn services(inbox: Inbox, place_inbox: PlaceInbox, ctx: egui::Context, locks: Op
            }
        })),
        inbox: Some(inbox),
-        recovery_store: Some(Arc::new(BrowserStore { locks })),
+        recovery_store: Some(Arc::new(BrowserStore)),
        // File → Print: the browser's print dialog.
        print: Some(Box::new(BrowserPrint)),
        ..Default::default()
@@ -437,12 +183,8 @@ fn services(inbox: Inbox, place_inbox: PlaceInbox, ctx: egui::Context, locks: Op

 /// Data Recovery's store on the web: the browser's local storage (kept across visits and shared by
 /// the site's tabs), each entry as base64 under [`RECOVERY_PREFIX`]`<area>/<name>`. It has no
-/// locks: each tab holds its area with a heartbeat, judged by the browser's clock, and with a Web
-/// Lock named after it where the browser has them (`locks`), which a tab whose timers are paused
-/// in the background keeps.
-struct BrowserStore {
-    locks: Option<WebLocks>,
-}
+/// locks: each tab holds its area with a heartbeat, judged by the browser's clock.
+struct BrowserStore;

 const RECOVERY_PREFIX: &str = "vectorcraft-recovery/";

@@ -478,12 +220,6 @@ impl RecoveryStore for BrowserStore {
    fn now(&self) -> Option<i64> {
        Some((js_sys::Date::now() / 1000.0) as i64)
    }
-    fn announce(&self, area: &str) -> Option<Hold> {
-        self.locks.as_ref()?.hold(area)
-    }
-    fn announced(&self, area: &str) -> Option<bool> {
-        self.locks.as_ref().map(|l| l.held(area))
-    }
 }

 /// Trigger a browser download of `bytes` named after the last component of `path`.
@@ -9,25 +9,17 @@ default-run = "vectorcraft"
 [lints]
 workspace = true

-[features]
-default = ["wgpu", "accessibility"]
-wgpu = ["eframe/wgpu"]
-accessibility = ["eframe/accesskit"]
-# Build with --no-default-features --features windows7 and the win7 Rust target.
-windows7 = ["eframe/glow"]
-
 [dependencies]
 vectorcraft-engine = { workspace = true }
 vectorcraft-ui-egui = { workspace = true }
-eframe = { workspace = true, features = ["default_fonts", "wayland", "x11"] }
+eframe = { workspace = true, features = ["default_fonts", "wgpu", "accesskit", "wayland", "x11"] }
 egui = { workspace = true }
 serde_json = { workspace = true }
 log = { workspace = true }

 [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
 rfd = { workspace = true }
-# wayland-data-control: native Wayland clipboard (Linux; X11 through XWayland only sees what X11 apps copied).
-arboard = { workspace = true, features = ["image-data", "wayland-data-control"] }
+arboard = { workspace = true, features = ["image-data"] }
 image = { workspace = true }
 webbrowser = { workspace = true }
 # The window's monitors, size and position (the same winit eframe runs on).
@@ -39,10 +31,7 @@ clipboard-win = { workspace = true }
 [target.'cfg(target_os = "macos")'.dependencies]
 muda = { version = "0.21", default-features = false }
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSPasteboard", "NSResponder", "NSTextInputContext"] }
-# Files opened from Finder and the Dock (src/open_documents.rs) and pasted bitmaps (src/clipboard.rs); both already come with winit, muda and rfd.
-objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSData", "NSNotification", "NSOperation", "NSString", "NSURL"] }
-block2 = "0.6"
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSTextInputContext"] }

 [build-dependencies]
 # Icon + VERSIONINFO for vectorcraft.exe; build.rs only uses it when targeting Windows.
@@ -2,20 +2,13 @@
 //! (`Services::system_clipboard`).
 //!
 //! - Windows: text, SVG, PDF, PNG and an opaque bitmap (for apps that don't read PNG) in one go;
-//!   Paste reads each of them, a bitmap as PNG, else as the device-independent bitmap that
-//!   screenshots and most apps copy (`CF_DIBV5`, `CF_DIB`; the system makes them of a `CF_BITMAP`).
+//!   Paste reads each of them.
 //! - macOS and Linux: one format at a time, the text (a type-only copy's text or the SVG markup),
-//!   else the PNG as a bitmap; Paste reads text and bitmaps (on macOS the pasteboard's PNG or TIFF
-//!   as they are, as screenshots copy them). On Wayland, arboard's data-control
-//!   backend reads the compositor's clipboard (X11 through XWayland only sees what X11 apps
-//!   copied), falling back to X11 where the compositor lacks the protocol.
-//! - Everywhere: files copied in a file manager paste as the first one that is art (SVG, PDF, a
-//!   metafile or a bitmap), before the clipboard's other formats (the files' paths as text).
+//!   else the PNG as a bitmap; Paste reads text and bitmaps.

-use std::io::{Cursor, Read};
-use std::path::PathBuf;
+use std::io::Cursor;

-use vectorcraft_engine::cmd::clipboard::{BITMAP, FILE_HEAD, Flavour, PNG, TEXT, file_flavour};
+use vectorcraft_engine::cmd::clipboard::{BITMAP, Flavour, PNG, TEXT};
 use vectorcraft_ui_egui::SystemClipboard;

 /// This platform's system clipboard.
@@ -32,96 +25,10 @@ fn text_of(flavours: &[Flavour]) -> Option<String> {
    flavours.iter().find(|f| f.mime == TEXT).map(|f| String::from_utf8_lossy(&f.data).into_owned())
 }

-/// Most pixels a side of a bitmap another app put on the clipboard (untrusted data).
-const MAX_SIDE: u32 = 32_768;
-
 fn decode_png(png: &[u8]) -> Option<image::RgbaImage> {
    Some(image::load_from_memory_with_format(png, image::ImageFormat::Png).ok()?.to_rgba8())
 }

-/// `img` as a PNG flavour.
-fn png_flavour(img: &image::RgbaImage) -> Option<Flavour> {
-    let mut data = vec![];
-    img.write_to(&mut Cursor::new(&mut data), image::ImageFormat::Png).ok()?;
-    Some(Flavour { mime: PNG, data })
-}
-
-/// A Windows device-independent bitmap (`CF_DIB`, `CF_DIBV5`: a BITMAPINFO header, the colour
-/// masks of a BITMAPINFOHEADER, the colour table, then the pixels) as a BMP file, whose header
-/// says where the pixels start. `None` when the header is cut short or out of range.
-#[cfg_attr(not(windows), allow(dead_code))]
-fn dib_file(dib: &[u8]) -> Option<Vec<u8>> {
-    const BI_BITFIELDS: u32 = 3;
-    const BI_ALPHABITFIELDS: u32 = 6;
-    let u16_at = |i: usize| Some(u16::from_le_bytes(dib.get(i..i + 2)?.try_into().ok()?));
-    let u32_at = |i: usize| Some(u32::from_le_bytes(dib.get(i..i + 4)?.try_into().ok()?));
-    let header = u32_at(0)?;
-    // BITMAPCOREHEADER has 16-bit fields and 3-byte colours; the others 32-bit fields, 4-byte
-    // colours and a count of them (0: all a palette of the depth has), the 40-byte one its masks
-    // after it.
-    let (bits, used, entry, masks) = match header {
-        12 => (u16_at(10)?, 0, 3, 0),
-        _ => {
-            let masks = match (header, u32_at(16)?) {
-                (40, BI_BITFIELDS) => 12,
-                (40, BI_ALPHABITFIELDS) => 16,
-                _ => 0,
-            };
-            (u16_at(14)?, u32_at(32)?, 4, masks)
-        }
-    };
-    let colours = match used {
-        0 if bits <= 8 => 1 << bits,
-        n if n <= 256 => n,
-        _ => return None,
-    };
-    let offset = [header, masks, colours * entry].into_iter().try_fold(14u32, u32::checked_add)?;
-    let size = u32::try_from(dib.len()).ok()?.checked_add(14)?;
-    if offset > size {
-        return None;
-    }
-    let mut bmp = Vec::with_capacity(dib.len() + 14);
-    bmp.extend_from_slice(b"BM");
-    bmp.extend_from_slice(&size.to_le_bytes());
-    bmp.extend_from_slice(&[0; 4]);
-    bmp.extend_from_slice(&offset.to_le_bytes());
-    bmp.extend_from_slice(dib);
-    Some(bmp)
-}
-
-/// A device-independent bitmap as an image, at most [`MAX_SIDE`] pixels a side. It is opaque when
-/// its alpha is zero throughout: screenshots and most apps leave the fourth byte of a 32-bit pixel
-/// at zero, even under an alpha mask.
-#[cfg_attr(not(windows), allow(dead_code))]
-fn dib_image(dib: &[u8]) -> Option<image::RgbaImage> {
-    let mut reader = image::ImageReader::with_format(Cursor::new(dib_file(dib)?), image::ImageFormat::Bmp);
-    let mut limits = image::Limits::default();
-    (limits.max_image_width, limits.max_image_height) = (Some(MAX_SIDE), Some(MAX_SIDE));
-    reader.limits(limits);
-    let mut img = reader.decode().ok()?.into_rgba8();
-    if img.pixels().all(|p| p.0[3] == 0) {
-        img.pixels_mut().for_each(|p| p.0[3] = u8::MAX);
-    }
-    Some(img)
-}
-
-/// The first of `paths` (files copied in a file manager) that pastes as one of `mimes`, read
-/// whole. Only its first bytes are read to tell, so other files cost little.
-fn copied_file(paths: Vec<PathBuf>, mimes: &[&'static str]) -> Option<Flavour> {
-    paths.into_iter().find_map(|path| {
-        // text/uri-list lines end in CRLF (RFC 2483), but arboard splits them on LF only.
-        let path = match path.to_str() {
-            Some(p) if p.ends_with('\r') => PathBuf::from(p.trim_end_matches('\r')),
-            _ => path,
-        };
-        let mut head = Vec::with_capacity(FILE_HEAD);
-        std::fs::File::open(&path).ok()?.take(FILE_HEAD as u64).read_to_end(&mut head).ok()?;
-        let mime = file_flavour(&path.to_string_lossy(), &head, mimes)?;
-        let data = std::fs::read(&path).ok()?;
-        (!data.is_empty()).then_some(Flavour { mime, data })
-    })
-}
-
 #[cfg(windows)]
 mod win {
    use std::num::NonZeroU32;
@@ -142,10 +49,6 @@ mod win {
        }
    }

-    /// The device-independent bitmaps, the one that carries alpha first. Each is there whenever the
-    /// other or a `CF_BITMAP` is: the system converts between them.
-    const DIBS: [u32; 2] = [formats::CF_DIBV5, formats::CF_DIB];
-
    fn formats_of(mime: &str) -> impl Iterator<Item = u32> {
        names(mime).iter().filter_map(|n| raw::register_format(n)).map(NonZeroU32::get)
    }
@@ -220,26 +123,16 @@ mod win {
        }

        fn read(&mut self, mimes: &[&'static str]) -> Option<Flavour> {
-            let mut files = vec![];
-            {
-                let _open = clipboard_win::Clipboard::new_attempts(10).ok()?;
-                // None copied when the clipboard holds no file list.
-                let _ = raw::get_file_list_path(&mut files);
-            }
-            // The files are read with the clipboard closed again, not keeping other apps waiting.
-            copied_file(files, mimes).or_else(|| {
-                let _open = clipboard_win::Clipboard::new_attempts(10).ok()?;
-                mimes.iter().find_map(|m| read_one(m))
-            })
+            let _open = clipboard_win::Clipboard::new_attempts(10).ok()?;
+            mimes.iter().find_map(|m| read_one(m))
        }

        fn has(&mut self, mimes: &[&'static str]) -> bool {
-            raw::is_format_avail(formats::CF_HDROP)
-                || mimes.iter().any(|m| match *m {
-                    TEXT => raw::is_format_avail(formats::CF_UNICODETEXT),
-                    BITMAP => DIBS.into_iter().chain(formats_of(PNG)).any(raw::is_format_avail),
-                    m => formats_of(m).any(raw::is_format_avail),
-                })
+            mimes.iter().any(|m| match *m {
+                TEXT => raw::is_format_avail(formats::CF_UNICODETEXT),
+                BITMAP => raw::is_format_avail(formats::CF_BITMAP) || formats_of(PNG).any(raw::is_format_avail),
+                m => formats_of(m).any(raw::is_format_avail),
+            })
        }
    }

@@ -257,11 +150,9 @@ mod win {
        let mime = match mime {
            BITMAP if read_registered(PNG, &mut data) => PNG,
            BITMAP => {
-                return DIBS.into_iter().find_map(|id| {
-                    data.clear();
-                    raw::get_vec(id, &mut data).ok()?;
-                    png_flavour(&dib_image(&data)?)
-                });
+                data.clear();
+                raw::get_bitmap(&mut data).ok()?;
+                "image/bmp"
            }
            TEXT => {
                raw::get_string(&mut data).ok()?;
@@ -287,6 +178,13 @@ mod portable {

    use super::*;

+    /// `img` as PNG bytes.
+    fn encode_png(img: &image::RgbaImage) -> Option<Vec<u8>> {
+        let mut out = vec![];
+        img.write_to(&mut Cursor::new(&mut out), image::ImageFormat::Png).ok()?;
+        Some(out)
+    }
+
    /// What our last write put on the clipboard.
    enum Ours {
        Text(String),
@@ -347,203 +245,20 @@ mod portable {

        fn read(&mut self, mimes: &[&'static str]) -> Option<Flavour> {
            let cb = self.cb().ok()?;
-            if let Some(f) = cb.get().file_list().ok().and_then(|paths| copied_file(paths, mimes)) {
-                return Some(f);
-            }
            mimes.iter().find_map(|m| match *m {
                TEXT => cb.get_text().ok().filter(|t| !t.is_empty()).map(|t| Flavour { mime: TEXT, data: t.into_bytes() }),
                BITMAP => {
-                    #[cfg(target_os = "macos")]
-                    if let Some(f) = super::mac::bitmap() {
-                        return Some(f);
-                    }
                    let img = cb.get_image().ok()?;
                    let rgba = image::RgbaImage::from_raw(u32::try_from(img.width).ok()?, u32::try_from(img.height).ok()?, img.bytes.into_owned())?;
-                    png_flavour(&rgba)
+                    encode_png(&rgba).map(|data| Flavour { mime: PNG, data })
                }
                _ => None,
            })
        }

-        /// Text, and on macOS a bitmap (by the pasteboard's types). Linux has no cheap way to ask
-        /// for a bitmap (reading one costs as much as pasting it): the paste keys take it, the
-        /// menu item waits for text.
+        /// Text only: reading a bitmap costs as much as pasting it.
        fn has(&mut self, mimes: &[&'static str]) -> bool {
-            #[cfg(target_os = "macos")]
-            if mimes.contains(&BITMAP) && super::mac::has_bitmap() {
-                return true;
-            }
            mimes.contains(&TEXT) && self.cb().is_ok_and(|cb| cb.get_text().is_ok_and(|t| !t.is_empty()))
        }
    }
 }
-
-/// The macOS pasteboard's bitmaps as they are (arboard reads TIFF only, and decodes it).
-#[cfg(target_os = "macos")]
-mod mac {
-    use objc2::rc::autoreleasepool;
-    use objc2_app_kit::NSPasteboard;
-    use objc2_foundation::{NSArray, NSString};
-
-    use super::*;
-
-    /// The bitmap types Paste reads, best first (the values of `NSPasteboardTypePNG` and
-    /// `NSPasteboardTypeTIFF`), with their MIME types.
-    const TYPES: [(&str, &str); 2] = [("public.png", PNG), ("public.tiff", "image/tiff")];
-
-    /// Does the pasteboard hold a bitmap? Asks for its types only.
-    pub fn has_bitmap() -> bool {
-        autoreleasepool(|_| {
-            let types = TYPES.map(|(t, _)| NSString::from_str(t));
-            let types: Vec<&NSString> = types.iter().map(|t| &**t).collect();
-            NSPasteboard::generalPasteboard().availableTypeFromArray(&NSArray::from_slice(&types)).is_some()
-        })
-    }
-
-    /// The pasteboard's bitmap, PNG before TIFF.
-    pub fn bitmap() -> Option<Flavour> {
-        autoreleasepool(|_| {
-            let pasteboard = NSPasteboard::generalPasteboard();
-            TYPES.into_iter().find_map(|(t, mime)| {
-                let data = pasteboard.dataForType(&NSString::from_str(t))?.to_vec();
-                (!data.is_empty()).then_some(Flavour { mime, data })
-            })
-        })
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use vectorcraft_engine::cmd::clipboard::{PASTE_ORDER, SVG};
-
-    use super::*;
-
-    fn dir(name: &str) -> PathBuf {
-        let d = std::env::temp_dir().join(format!("vectorcraft-clipboard-{name}-{}", std::process::id()));
-        std::fs::create_dir_all(&d).unwrap();
-        d
-    }
-
-    fn png(w: u32, h: u32) -> Vec<u8> {
-        let mut out = vec![];
-        image::RgbaImage::new(w, h).write_to(&mut Cursor::new(&mut out), image::ImageFormat::Png).unwrap();
-        out
-    }
-
-    #[test]
-    fn the_first_copied_file_that_is_art_pastes() {
-        let d = dir("art");
-        let (notes, red, art) = (d.join("notes.txt"), d.join("red image.png"), d.join("art.svg"));
-        std::fs::write(&notes, "not art").unwrap();
-        std::fs::write(&red, png(3, 2)).unwrap();
-        std::fs::write(&art, "<svg xmlns=\"http://www.w3.org/2000/svg\"/>").unwrap();
-        // Missing files, folders and text are skipped.
-        let f = copied_file(vec![d.join("gone.png"), d.clone(), notes.clone(), red.clone(), art.clone()], &PASTE_ORDER).unwrap();
-        assert_eq!((f.mime, f.data), (PNG, png(3, 2)));
-        assert_eq!(copied_file(vec![art.clone(), red.clone()], &PASTE_ORDER).map(|f| f.mime), Some(SVG));
-        // Only what Paste asks for.
-        assert_eq!(copied_file(vec![art, red.clone()], &[BITMAP]).map(|f| f.mime), Some(PNG));
-        assert!(copied_file(vec![red], &[TEXT]).is_none());
-        assert!(copied_file(vec![notes], &PASTE_ORDER).is_none());
-        assert!(copied_file(vec![], &PASTE_ORDER).is_none());
-    }
-
-    #[test]
-    fn a_crlf_left_by_the_uri_list_is_ignored() {
-        let red = dir("crlf").join("red.png");
-        std::fs::write(&red, png(2, 2)).unwrap();
-        let with_cr = PathBuf::from(format!("{}\r", red.display()));
-        assert_eq!(copied_file(vec![with_cr], &PASTE_ORDER).map(|f| f.mime), Some(PNG));
-    }
-
-    /// A DIB of `w`×`h` pixels (top row first when `h` is negative): a `header`-byte header (40,
-    /// or 124 for a BITMAPV5HEADER with BGRA masks), `extra` (the masks after a 40-byte header, a
-    /// colour table), then `rows`, each padded to 4 bytes.
-    fn dib(header: u32, w: i32, h: i32, bits: u16, compression: u32, extra: &[u8], rows: &[u8]) -> Vec<u8> {
-        let mut d = vec![];
-        d.extend(header.to_le_bytes());
-        d.extend(w.to_le_bytes());
-        d.extend(h.to_le_bytes());
-        d.extend(1u16.to_le_bytes());
-        d.extend(bits.to_le_bytes());
-        d.extend(compression.to_le_bytes());
-        d.extend((rows.len() as u32).to_le_bytes());
-        // 96 ppi, every colour of the table used.
-        d.extend([3780u32, 3780, 0, 0].iter().flat_map(|v| v.to_le_bytes()));
-        if header == 124 {
-            d.extend([0x00FF_0000u32, 0xFF00, 0xFF, 0xFF00_0000, 0x7352_4742].iter().flat_map(|v| v.to_le_bytes()));
-            d.resize(124, 0);
-        }
-        d.extend_from_slice(extra);
-        d.extend_from_slice(rows);
-        d
-    }
-
-    /// 32-bit BGRA rows of `px` (top row first).
-    fn bgra(px: &[[u8; 4]]) -> Vec<u8> {
-        px.iter().flat_map(|[r, g, b, a]| [*b, *g, *r, *a]).collect()
-    }
-
-    const RED: [u8; 4] = [255, 0, 0, 255];
-    const BLUE: [u8; 4] = [0, 0, 255, 255];
-
-    fn pixels(img: &image::RgbaImage) -> Vec<[u8; 4]> {
-        img.pixels().map(|p| p.0).collect()
-    }
-
-    #[test]
-    fn a_screenshot_dib_pastes_opaque_and_upright() {
-        // CF_DIB as screenshots copy it: 32-bit BI_RGB, bottom row first, the fourth byte zero.
-        let rows = bgra(&[[0, 0, 255, 0], [0, 0, 255, 0], [255, 0, 0, 0], [255, 0, 0, 0]]);
-        let img = dib_image(&dib(40, 2, 2, 32, 0, &[], &rows)).unwrap();
-        assert_eq!(pixels(&img), [RED, RED, BLUE, BLUE]);
-        // The same bitmap with an alpha mask (CF_DIBV5), alpha still zero throughout: opaque too.
-        let img = dib_image(&dib(124, 2, -2, 32, 3, &[], &bgra(&[[255, 0, 0, 0]; 4]))).unwrap();
-        assert_eq!(pixels(&img), [RED; 4]);
-    }
-
-    #[test]
-    fn a_dibv5_keeps_its_alpha_top_down() {
-        // A negative height: top row first.
-        let rows = bgra(&[[255, 0, 0, 128], [255, 0, 0, 128], [0, 0, 255, 0], [0, 0, 255, 255]]);
-        let img = dib_image(&dib(124, 2, -2, 32, 3, &[], &rows)).unwrap();
-        assert_eq!(pixels(&img), [[255, 0, 0, 128], [255, 0, 0, 128], [0, 0, 255, 0], BLUE]);
-    }
-
-    #[test]
-    fn masks_and_colour_tables_come_before_the_pixels() {
-        // BI_BITFIELDS after a 40-byte header: three masks between it and the pixels.
-        let masks: Vec<u8> = [0x00FF_0000u32, 0xFF00, 0xFF].iter().flat_map(|v| v.to_le_bytes()).collect();
-        let img = dib_image(&dib(40, 1, 1, 32, 3, &masks, &bgra(&[[0, 0, 255, 0]]))).unwrap();
-        assert_eq!(pixels(&img), [BLUE]);
-        // 8-bit, two colours used, rows padded to 4 bytes, bottom row first.
-        let mut table = bgra(&[RED, BLUE]);
-        table[3] = 0;
-        let mut d = dib(40, 3, 2, 8, 0, &table, &[1, 1, 1, 0, 0, 1, 0, 0]);
-        d[32..36].copy_from_slice(&2u32.to_le_bytes());
-        assert_eq!(pixels(&dib_image(&d).unwrap()), [RED, BLUE, RED, BLUE, BLUE, BLUE]);
-        // 24-bit, rows padded.
-        let img = dib_image(&dib(40, 1, 2, 24, 0, &[], &[255, 0, 0, 0, 0, 0, 255, 0])).unwrap();
-        assert_eq!(pixels(&img), [RED, BLUE]);
-    }
-
-    #[test]
-    fn untrusted_dibs_are_refused_not_trusted() {
-        let one = bgra(&[RED]);
-        // Too large a side (the pixels aren't even there), cut short, a header or a colour count
-        // out of range, no pixels.
-        assert!(dib_image(&dib(40, MAX_SIDE as i32 + 1, 1, 32, 0, &[], &one)).is_none());
-        assert!(dib_image(&dib(40, 1, -(MAX_SIDE as i32) - 1, 32, 0, &[], &one)).is_none());
-        assert!(dib_image(&dib(40, 4096, 4096, 32, 0, &[], &one)).is_none());
-        assert!(dib_image(&[40, 0, 0]).is_none());
-        assert!(dib_image(&[]).is_none());
-        let mut d = dib(40, 1, 1, 32, 0, &[], &one);
-        d[0..4].copy_from_slice(&u32::MAX.to_le_bytes());
-        assert!(dib_image(&d).is_none());
-        let mut d = dib(40, 1, 1, 8, 0, &[], &[0; 4]);
-        d[32..36].copy_from_slice(&u32::MAX.to_le_bytes());
-        assert!(dib_file(&d).is_none());
-        assert!(dib_image(&dib(40, 1, 1, 32, 0, &[], &[])).is_none());
-        assert!(dib_image(&dib(40, 0, 0, 32, 0, &[], &[])).is_none());
-    }
-}
@@ -1,470 +0,0 @@
-//! Which graphics adapter the window renders with (#306, #502), and what happens when it can't
-//! show the window.
-//!
-//! The canvas is rasterized on the CPU; the GPU only composites it and draws the UI, so any
-//! adapter that can present to the window will do. [`adapter_order`] ranks the adapters: those that
-//! can't present to the window's surface never, then the one `WGPU_ADAPTER_NAME` names, hardware
-//! before software, the native backends (Vulkan, Metal, DX12) before OpenGL, and the power
-//! preference ([`power_preference`]) among the rest. eframe is handed [`selector`], which takes
-//! the first of that order.
-//!
-//! An adapter can report that it presents to the window and still fail once it does: on a hybrid
-//! Linux desktop under Wayland, the compositor runs on one GPU and may refuse the frame buffers
-//! another GPU allocates, which kills the window's Wayland connection; egui-wgpu then panics while
-//! configuring the surface (#502). Nothing in the process can show a window after that, so when
-//! the graphics fail while the window is starting up, [`finish`] starts the app again without
-//! that adapter, as the next one in the order would be tried. Each restart leaves out one more
-//! adapter, so it ends when none is left.
-
-use std::sync::atomic::{AtomicBool, Ordering};
-use std::sync::{Arc, OnceLock};
-
-use eframe::egui_wgpu::NativeAdapterSelectorMethod;
-use eframe::wgpu::{self, Backend, DeviceType, PowerPreference};
-
-/// The adapters a restart leaves out, those the window failed on, as comma-separated
-/// `backend:vendor:device` keys (`Vulkan:1002:164e`). Set by the app itself when it starts again.
-pub const SKIP_ENV: &str = "VECTORCRAFT_GPU_SKIP";
-
-/// wgpu's variable for choosing an adapter by (part of) its name, any case.
-const NAME_ENV: &str = "WGPU_ADAPTER_NAME";
-
-/// Where to read how to choose another adapter, for the error that ends the app.
-const HELP: &str =
-    "to choose a graphics adapter, see https://github.com/storytold/vectorcraft/blob/main/docs/development.md#desktop-graphics-processor";
-
-/// Frames the UI ran before the failure, below which it was still starting up. The failure in
-/// #502 came on the first or second frame; later, the adapter has proved itself, and a lost
-/// window is something else (such as the compositor restarting).
-const STARTUP_FRAMES: u64 = 10;
-
-/// The preference used when Preferences say Automatic. Windows and macOS show frames from any GPU
-/// (the integrated one avoids the flicker of #306). Elsewhere, the system's own order: Mesa's
-/// device-select layer puts the GPU the desktop runs on first (the integrated one on hybrid
-/// laptops), and a Wayland compositor may not show frames from another GPU (#502).
-pub const AUTOMATIC: PowerPreference = if cfg!(any(windows, target_os = "macos")) { PowerPreference::LowPower } else { PowerPreference::None };
-
-/// The power preference that orders the adapters: the `WGPU_POWER_PREF` environment variable
-/// (`low`, `high`, `none`) when set, otherwise Preferences › Performance › Graphics Processor
-/// (`gpuPreference`). Automatic, and any value this version doesn't know (0.5.0's default
-/// `powerSaving`, a newer or damaged preference file), is [`AUTOMATIC`].
-pub fn power_preference(pref: Option<&str>, env: Option<PowerPreference>) -> PowerPreference {
-    match (env, pref) {
-        (Some(p), _) => p,
-        (None, Some("highPerformance")) => PowerPreference::HighPerformance,
-        (None, Some("lowPower")) => PowerPreference::LowPower,
-        (None, _) => AUTOMATIC,
-    }
-}
-
-/// One adapter, as [`adapter_order`] sees it.
-#[derive(Clone, Debug)]
-pub struct Candidate {
-    /// Identifies the adapter across a restart: `backend:vendor:device` ([`key`]).
-    pub key: String,
-    pub name: String,
-    pub backend: Backend,
-    pub device_type: DeviceType,
-    /// Reports that it can present to the window's surface.
-    pub presents: bool,
-}
-
-impl Candidate {
-    fn new(adapter: &wgpu::Adapter, surface: Option<&wgpu::Surface<'_>>) -> Self {
-        let info = adapter.get_info();
-        Self {
-            key: key(info.backend, info.vendor, info.device),
-            presents: surface.is_none_or(|s| adapter.is_surface_supported(s)),
-            name: info.name,
-            backend: info.backend,
-            device_type: info.device_type,
-        }
-    }
-}
-
-/// `backend:vendor:device`, e.g. `Vulkan:1002:164e` (PCI ids, as `MESA_VK_DEVICE_SELECT` takes them).
-fn key(backend: Backend, vendor: u32, device: u32) -> String {
-    format!("{backend:?}:{vendor:04x}:{device:04x}")
-}
-
-/// The order to try `candidates` in (their indices): only those that present to the window and
-/// aren't in `skip`; the one whose name contains `named` (any case) first; hardware before
-/// software; native backends before OpenGL; then by `power`, keeping the system's order among
-/// equals (all of it for [`PowerPreference::None`]).
-pub fn adapter_order(candidates: &[Candidate], power: PowerPreference, named: Option<&str>, skip: &[String]) -> Vec<usize> {
-    let named = named.map(str::to_lowercase).filter(|n| !n.is_empty());
-    let mut order: Vec<(usize, &Candidate)> = candidates.iter().enumerate().filter(|(_, c)| c.presents && !skip.contains(&c.key)).collect();
-    // Stable, so equals keep the system's order.
-    order.sort_by_key(|(_, c)| {
-        let unnamed = named.as_ref().is_some_and(|n| !c.name.to_lowercase().contains(n));
-        (unnamed, c.device_type == DeviceType::Cpu, c.backend == Backend::Gl, power_rank(c.device_type, power))
-    });
-    order.into_iter().map(|(i, _)| i).collect()
-}
-
-/// wgpu's own ranking for a power preference: the preferred kind of GPU, the other kind, unknown,
-/// virtual, software.
-fn power_rank(t: DeviceType, power: PowerPreference) -> u8 {
-    match (power, t) {
-        (PowerPreference::None, _) => 0,
-        (PowerPreference::LowPower, DeviceType::IntegratedGpu) | (PowerPreference::HighPerformance, DeviceType::DiscreteGpu) => 0,
-        (_, DeviceType::IntegratedGpu | DeviceType::DiscreteGpu) => 1,
-        (_, DeviceType::Other) => 2,
-        (_, DeviceType::VirtualGpu) => 3,
-        (_, DeviceType::Cpu) => 4,
-    }
-}
-
-/// The adapters [`SKIP_ENV`] lists.
-pub fn skipped() -> Vec<String> {
-    std::env::var(SKIP_ENV).map(|v| parse_skip(&v)).unwrap_or_default()
-}
-
-fn parse_skip(v: &str) -> Vec<String> {
-    v.split(',').map(str::trim).filter(|k| !k.is_empty()).map(String::from).collect()
-}
-
-/// What the window's start-up leaves for [`finish`].
-#[derive(Default)]
-pub struct Startup {
-    /// The key of the adapter [`selector`] picked.
-    adapter: OnceLock<String>,
-    /// The UI's context, which counts the frames run.
-    ui: OnceLock<egui::Context>,
-}
-
-impl Startup {
-    /// The app was created on `ctx`.
-    pub fn created(&self, ctx: &egui::Context) {
-        // Set once; the window is created once.
-        let _ = self.ui.set(ctx.clone());
-    }
-}
-
-/// eframe's adapter choice: the first of [`adapter_order`] for `power`, `WGPU_ADAPTER_NAME` and the
-/// adapters a restart left out. Every adapter and the choice are logged, for bug reports.
-pub fn selector(power: PowerPreference, startup: Arc<Startup>) -> NativeAdapterSelectorMethod {
-    let named = std::env::var(NAME_ENV).ok();
-    let skip = skipped();
-    Arc::new(move |adapters, surface| {
-        let candidates: Vec<Candidate> = adapters.iter().map(|a| Candidate::new(a, surface)).collect();
-        let order = adapter_order(&candidates, power, named.as_deref(), &skip);
-        let listed: Vec<String> = candidates
-            .iter()
-            .map(|c| {
-                let note = if !c.presents {
-                    ", can't show the window"
-                } else if skip.contains(&c.key) {
-                    ", failed before"
-                } else {
-                    ""
-                };
-                format!("{} ({:?}, {:?}, {}{note})", c.name.trim(), c.backend, c.device_type, c.key)
-            })
-            .collect();
-        log::info!("graphics adapters: {}", listed.join("; "));
-        let first = order.first().and_then(|&i| adapters.get(i).zip(candidates.get(i)));
-        let Some((adapter, chosen)) = first else {
-            return Err(format!("no graphics adapter can show the window (power preference {power:?}, {} adapters)", adapters.len()));
-        };
-        // Set once; eframe picks the adapter once.
-        let _ = startup.adapter.set(chosen.key.clone());
-        Ok(adapter.clone())
-    })
-}
-
-/// The last panic came from the graphics stack (see [`watch_panics`]).
-static GRAPHICS_PANIC: AtomicBool = AtomicBool::new(false);
-
-/// Note whether each panic comes from the graphics stack, so [`finish`] can tell a failing adapter
-/// from a bug. The default hook still prints it.
-pub fn watch_panics() {
-    let default = std::panic::take_hook();
-    std::panic::set_hook(Box::new(move |info| {
-        GRAPHICS_PANIC.store(info.location().is_some_and(|l| in_graphics_stack(l.file())), Ordering::Relaxed);
-        default(info);
-    }));
-}
-
-/// A source file of wgpu (`wgpu-core-30.0.1/src/…`, `wgpu-hal-…`), egui-wgpu or naga.
-fn in_graphics_stack(file: &str) -> bool {
-    file.split(['/', '\\']).any(|dir| ["wgpu-", "egui-wgpu-", "naga-"].iter().any(|p| dir.starts_with(p)))
-}
-
-/// The adapter to start again without: the one picked, when the graphics failed while the window
-/// was starting up and it wasn't already left out.
-fn restart_without<'a>(graphics_failed: bool, frames: u64, picked: Option<&'a str>, skip: &[String]) -> Option<&'a str> {
-    picked.filter(|p| graphics_failed && frames < STARTUP_FRAMES && !skip.iter().any(|s| s == p))
-}
-
-/// After the window's run: `Ok` when it closed normally or the app started again (see the module
-/// docs), otherwise why it failed. `outcome` is eframe's result, or the message of a panic that
-/// ended it.
-pub fn finish(outcome: Result<eframe::Result, String>, startup: &Startup) -> Result<(), String> {
-    let (why, graphics_failed) = match outcome {
-        Ok(Ok(())) => return Ok(()),
-        Ok(Err(e @ eframe::Error::Wgpu(_))) => (e.to_string(), true),
-        Ok(Err(e)) => (e.to_string(), false),
-        Err(panic) => (panic, GRAPHICS_PANIC.load(Ordering::Relaxed)),
-    };
-    let frames = startup.ui.get().map_or(0, egui::Context::cumulative_frame_nr);
-    let mut skip = skipped();
-    let Some(failed) = restart_without(graphics_failed, frames, startup.adapter.get().map(String::as_str), &skip) else {
-        return Err(if graphics_failed { format!("{why} ({HELP})") } else { why });
-    };
-    log::error!("the window failed on graphics adapter {failed} ({why}): starting again without it");
-    skip.push(failed.to_string());
-    restart(&skip.join(",")).map_err(|e| format!("{why}; starting again failed: {e}"))
-}
-
-/// Start the app again with the same arguments, leaving out the adapters in `skip`. On Unix the
-/// new app replaces this process (same process id, so an AppImage keeps its files mounted), and
-/// this returns only on failure; on Windows it starts beside this one, which then exits.
-fn restart(skip: &str) -> std::io::Result<()> {
-    log::logger().flush();
-    let mut c = std::process::Command::new(std::env::current_exe()?);
-    c.args(std::env::args_os().skip(1)).env(SKIP_ENV, skip);
-    #[cfg(unix)]
-    {
-        use std::os::unix::process::CommandExt as _;
-        Err(c.exec())
-    }
-    #[cfg(not(unix))]
-    c.spawn().map(|_| ())
-}
-
-#[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, presents: true }
-    }
-
-    fn names(c: &[Candidate], order: &[usize]) -> Vec<String> {
-        order.iter().map(|&i| c[i].name.clone()).collect()
-    }
-
-    /// The machine of #502 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 issue_502() -> 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 = issue_502();
-        let order = adapter_order(&c, power_preference(None, 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 {
-            // #502: 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 = issue_502();
-        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, so Power Saving on the machine of
-    /// #502 ends up on the NVIDIA GPU, and once every adapter failed there is nothing to try.
-    #[test]
-    fn a_restart_tries_the_next_adapter() {
-        let c = issue_502();
-        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 = issue_502();
-        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 = issue_502();
-        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 (Vulkan and DX12): power saving still takes the
-    /// integrated GPU first, as wgpu's own choice did (#306).
-    #[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, [1, 3, 0, 2, 4]);
-        assert_eq!(adapter_order(&c, PowerPreference::HighPerformance, None, &[]), [0, 2, 1, 3, 4]);
-    }
-
-    #[test]
-    fn power_preference_follows_the_environment_then_the_preference() {
-        assert_eq!(power_preference(None, None), AUTOMATIC);
-        assert_eq!(power_preference(Some("automatic"), None), AUTOMATIC);
-        assert_eq!(power_preference(Some("lowPower"), None), PowerPreference::LowPower);
-        assert_eq!(power_preference(Some("highPerformance"), None), PowerPreference::HighPerformance);
-        // 0.5.0's default, and values this version doesn't know (a newer or damaged file).
-        for old in ["powerSaving", "turbo", ""] {
-            assert_eq!(power_preference(Some(old), None), AUTOMATIC, "{old}");
-        }
-        // WGPU_POWER_PREF wins over the preference, either way.
-        assert_eq!(power_preference(Some("lowPower"), Some(PowerPreference::HighPerformance)), PowerPreference::HighPerformance);
-        assert_eq!(power_preference(Some("highPerformance"), Some(PowerPreference::LowPower)), PowerPreference::LowPower);
-        assert_eq!(power_preference(Some("lowPower"), Some(PowerPreference::None)), PowerPreference::None);
-        assert_eq!(AUTOMATIC, if cfg!(any(windows, target_os = "macos")) { PowerPreference::LowPower } else { PowerPreference::None });
-    }
-
-    /// The preference the engine saves is the one the app reads back before the window opens.
-    #[test]
-    fn the_saved_engine_preference_is_found() {
-        let mut prefs = vectorcraft_engine::Prefs::default();
-        let saved = prefs.to_json();
-        assert_eq!(saved.get("gpuPreference").and_then(serde_json::Value::as_str), Some("automatic"));
-        for (value, power) in [("lowPower", PowerPreference::LowPower), ("highPerformance", PowerPreference::HighPerformance)] {
-            prefs.gpu_preference = value.into();
-            let saved = prefs.to_json();
-            assert_eq!(power_preference(saved.get("gpuPreference").and_then(serde_json::Value::as_str), None), power);
-        }
-        // Every choice Preferences offer means something here.
-        for (value, _) in vectorcraft_engine::cmd::prefscmds::GPU_PREFERENCES {
-            assert!(["automatic", "lowPower", "highPerformance"].contains(value), "{value}");
-        }
-    }
-
-    #[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), "Vulkan:1002:164e");
-        assert_eq!(key(Backend::Gl, 0x10de, 0x2f04), "Gl:10de:2f04");
-    }
-
-    #[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/vectorcraft/src/main.rs",
-            "/home/wgpu/vectorcraft/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);
-    }
-
-    #[test]
-    fn a_normal_exit_or_another_failure_does_not_restart() {
-        let startup = Startup::default();
-        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()));
-    }
-}
@@ -1,582 +0,0 @@
-//! The desktop app's logger: `log::` records go to standard error and to a log file.
-//!
-//! Without a logger every `log::warn!`/`log::error!` in the workspace (the graphics adapter, a
-//! lost graphics device, a panic the engine's guard recovered from) vanished. A launch from a desktop menu
-//! has no terminal, so the file is what a bug report can attach: `<settings dir>/logs/vectorcraft.log`,
-//! next to the preferences (`prefs_path` in `main.rs`). Each start moves the previous log to
-//! `vectorcraft.1.log` (and that one to `.2`), so the log of a run that crashed survives the next
-//! launch. Runs without preferences (`VECTORCRAFT_NO_PREFS`) log to standard error only.
-//!
-//! Levels: `info` for VectorCraft's own crates, `warn` for everything else (wgpu and naga are
-//! chatty). `RUST_LOG` replaces that with env_logger-style directives: `debug`,
-//! `warn,vectorcraft_render=trace`, `wgpu_core=info`. A directive ending in `*` matches every
-//! target that starts with it (`vectorcraft*=debug`).
-//!
-//! Records logged before the settings directory is known are kept (up to [`MAX_PENDING`]) and
-//! written once the file is attached. Writing never panics: a file that can't be created or
-//! written leaves standard error as the only sink.
-//!
-//! This is the desktop app's logger only. `vectorcraft-cli mcp` installs its own
-//! (`vectorcraft_mcp::logging`, MCP `notifications/message`); the two never share a process.
-
-use std::fs::File;
-use std::io::Write;
-use std::path::{Path, PathBuf};
-use std::sync::{Mutex, OnceLock, PoisonError};
-use std::time::SystemTime;
-
-use log::LevelFilter;
-
-/// The current log file's name inside the log directory.
-pub const LOG_FILE: &str = "vectorcraft.log";
-/// How many previous logs are kept (`vectorcraft.1.log` … `vectorcraft.<KEEP>.log`).
-pub const KEEP: usize = 2;
-/// The log file stops growing past this size (a runaway warning can't fill the disk).
-pub const MAX_FILE_BYTES: u64 = 16 * 1024 * 1024;
-/// Records kept in memory until the log file is attached.
-pub const MAX_PENDING: usize = 512;
-/// The built-in filter when `RUST_LOG` is unset or empty.
-pub const DEFAULT_FILTER: &str = "warn,vectorcraft*=info";
-
-/// Per-target level filter parsed from env_logger-style directives.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub struct Filter {
-    default: LevelFilter,
-    directives: Vec<(String, LevelFilter)>,
-}
-
-impl Filter {
-    /// Parse `spec`; unknown levels and empty parts are skipped. Without a bare level, targets no
-    /// directive names log errors only.
-    pub fn parse(spec: &str) -> Filter {
-        let mut f = Filter { default: LevelFilter::Error, directives: Vec::new() };
-        for part in spec.split(',').map(str::trim).filter(|p| !p.is_empty()) {
-            match part.split_once('=') {
-                Some((name, level)) => {
-                    let name = name.trim();
-                    if let (false, Some(level)) = (name.is_empty(), parse_level(level)) {
-                        f.directives.push((name.to_owned(), level));
-                    }
-                }
-                None => match parse_level(part) {
-                    Some(level) => f.default = level,
-                    // A bare target name: everything from it (env_logger does the same).
-                    None => f.directives.push((part.to_owned(), LevelFilter::Trace)),
-                },
-            }
-        }
-        f
-    }
-
-    /// The level that applies to `target` (the most specific matching directive wins).
-    pub fn level_for(&self, target: &str) -> LevelFilter {
-        self.directives.iter().filter(|(name, _)| matches(name, target)).max_by_key(|(name, _)| name.len()).map_or(self.default, |(_, level)| *level)
-    }
-
-    /// The most verbose level any target can reach (for `log::set_max_level`).
-    pub fn max(&self) -> LevelFilter {
-        self.directives.iter().map(|(_, level)| *level).fold(self.default, Ord::max)
-    }
-}
-
-fn parse_level(s: &str) -> Option<LevelFilter> {
-    s.trim().parse().ok()
-}
-
-/// `name` matches `target` itself and its submodules (`a` matches `a` and `a::b`, not `ab`);
-/// `name*` matches every target starting with `name`.
-fn matches(name: &str, target: &str) -> bool {
-    match name.strip_suffix('*') {
-        Some(prefix) => target.starts_with(prefix),
-        None => target.strip_prefix(name).is_some_and(|rest| rest.is_empty() || rest.starts_with("::")),
-    }
-}
-
-/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds). A clock before 1970 reads as the epoch.
-pub fn timestamp(t: SystemTime) -> String {
-    let since = t.duration_since(std::time::UNIX_EPOCH).unwrap_or_default();
-    let secs = since.as_secs();
-    let (days, rem) = (secs / 86_400, secs % 86_400);
-    let (y, m, d) = civil_from_days(days);
-    format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}.{:03}Z", rem / 3600, rem % 3600 / 60, rem % 60, since.subsec_millis())
-}
-
-/// Days since 1970-01-01 to a proleptic Gregorian (year, month, day) (Howard Hinnant's
-/// `civil_from_days`, unsigned because `timestamp` clamps at the epoch). Saturating, so no clock
-/// value can overflow it.
-fn civil_from_days(days: u64) -> (u64, u64, u64) {
-    let z = days.saturating_add(719_468);
-    let era = z / 146_097;
-    let doe = z % 146_097;
-    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
-    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
-    let mp = (5 * doy + 2) / 153;
-    let d = doy - (153 * mp + 2) / 5 + 1;
-    let m = if mp < 10 { mp + 3 } else { mp - 9 };
-    let y = era.saturating_mul(400).saturating_add(yoe).saturating_add(u64::from(m <= 2));
-    (y, m, d)
-}
-
-fn numbered(dir: &Path, n: usize) -> PathBuf {
-    if n == 0 { dir.join(LOG_FILE) } else { dir.join(format!("vectorcraft.{n}.log")) }
-}
-
-/// Shift the previous logs up one (`.log` → `.1.log` → … → `.<KEEP>.log`, the oldest dropped)
-/// and create a fresh, empty log file in `dir` (created if missing).
-pub fn rotate(dir: &Path) -> std::io::Result<(PathBuf, File)> {
-    std::fs::create_dir_all(dir)?;
-    for n in (1..=KEEP).rev() {
-        match std::fs::rename(numbered(dir, n - 1), numbered(dir, n)) {
-            Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e),
-            _ => {}
-        }
-    }
-    let path = numbered(dir, 0);
-    let file = File::create(&path)?;
-    Ok((path, file))
-}
-
-/// One formatted log line: `<timestamp> <LEVEL> [<thread>] <target>: <message>\n`.
-pub fn format_line(ts: &str, level: log::Level, thread: &str, target: &str, message: &str) -> String {
-    let message = message.strip_suffix('\n').unwrap_or(message);
-    format!("{ts} {level:<5} [{thread}] {target}: {message}\n")
-}
-
-/// Where formatted lines go besides standard error: kept in memory until a file is attached,
-/// then appended to it until it reaches its size cap.
-pub struct Sink {
-    file: Option<File>,
-    pending: Vec<String>,
-    dropped: usize,
-    written: u64,
-    max_bytes: u64,
-    capped: bool,
-}
-
-impl Sink {
-    pub fn new(max_bytes: u64) -> Sink {
-        Sink { file: None, pending: Vec::new(), dropped: 0, written: 0, max_bytes, capped: false }
-    }
-
-    /// Append `line` to the file, or keep it until [`Sink::attach`].
-    pub fn write(&mut self, line: &str) {
-        if self.file.is_none() {
-            if self.capped {
-                // No file is coming ([`Sink::no_file`]): standard error had the line.
-            } else if self.pending.len() < MAX_PENDING {
-                self.pending.push(line.to_owned());
-            } else {
-                self.dropped = self.dropped.saturating_add(1);
-            }
-            return;
-        }
-        self.append(line);
-    }
-
-    /// Start writing to `file` (a fresh one: the size cap starts over), first the lines kept so far.
-    pub fn attach(&mut self, file: File) {
-        self.file = Some(file);
-        self.written = 0;
-        self.capped = false;
-        for line in std::mem::take(&mut self.pending) {
-            self.append(&line);
-        }
-        if self.dropped > 0 {
-            let note = format!("{} earlier log lines were dropped before the log file was opened\n", self.dropped);
-            self.dropped = 0;
-            self.append(&note);
-        }
-    }
-
-    /// There will be no log file: forget the lines kept for it and keep no more.
-    pub fn no_file(&mut self) {
-        self.pending = Vec::new();
-        self.dropped = 0;
-        self.capped = true;
-    }
-
-    fn append(&mut self, line: &str) {
-        if self.capped {
-            return;
-        }
-        let Some(file) = self.file.as_mut() else { return };
-        let len = u64::try_from(line.len()).unwrap_or(u64::MAX);
-        let text = if self.written.saturating_add(len) > self.max_bytes {
-            self.capped = true;
-            format!("log file reached {} bytes; later records go to standard error only\n", self.max_bytes)
-        } else {
-            self.written = self.written.saturating_add(len);
-            line.to_owned()
-        };
-        // A full disk or a vanished file must not take the app down: drop the file sink.
-        if file.write_all(text.as_bytes()).is_err() {
-            self.file = None;
-            self.capped = true;
-        }
-    }
-}
-
-/// The installed logger: a [`Filter`], standard error and a [`Sink`].
-pub struct AppLogger {
-    filter: Filter,
-    stderr: bool,
-    sink: Mutex<Sink>,
-}
-
-impl AppLogger {
-    pub fn new(filter: Filter, stderr: bool) -> AppLogger {
-        AppLogger { filter, stderr, sink: Mutex::new(Sink::new(MAX_FILE_BYTES)) }
-    }
-
-    /// Rotate the logs in `dir` and send records to the fresh file; returns its path. On an error
-    /// standard error stays the only sink.
-    pub fn attach_dir(&self, dir: &Path) -> Result<PathBuf, String> {
-        // A thread that panicked while logging leaves the sink usable: take it back.
-        let mut sink = self.sink.lock().unwrap_or_else(PoisonError::into_inner);
-        match rotate(dir) {
-            Ok((path, file)) => {
-                sink.attach(file);
-                Ok(path)
-            }
-            Err(e) => {
-                sink.no_file();
-                Err(format!("{}: {e}", dir.display()))
-            }
-        }
-    }
-
-    /// No log file for this run (runs without preferences): log to standard error only.
-    pub fn no_file(&self) {
-        self.sink.lock().unwrap_or_else(PoisonError::into_inner).no_file();
-    }
-}
-
-impl log::Log for AppLogger {
-    fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
-        metadata.level() <= self.filter.level_for(metadata.target())
-    }
-
-    fn log(&self, record: &log::Record<'_>) {
-        if !self.enabled(record.metadata()) {
-            return;
-        }
-        // Formatted before the sink is locked, so a message that logs while it is formatted can't deadlock.
-        let thread = std::thread::current();
-        let line =
-            format_line(&timestamp(SystemTime::now()), record.level(), thread.name().unwrap_or("?"), record.target(), &record.args().to_string());
-        if self.stderr {
-            // No terminal (a Windows GUI build, a closed pipe) is not an error worth reporting.
-            let _ = std::io::stderr().write_all(line.as_bytes());
-        }
-        self.sink.lock().unwrap_or_else(PoisonError::into_inner).write(&line);
-    }
-
-    fn flush(&self) {}
-}
-
-/// Install the logger (filter from `RUST_LOG`, else [`DEFAULT_FILTER`]); `None` when another
-/// logger was installed first. Call [`AppLogger::attach_dir`] once the settings directory is known.
-pub fn install() -> Option<&'static AppLogger> {
-    static LOGGER: OnceLock<AppLogger> = OnceLock::new();
-    let spec = std::env::var("RUST_LOG").ok().filter(|s| !s.trim().is_empty());
-    let filter = Filter::parse(spec.as_deref().unwrap_or(DEFAULT_FILTER));
-    let max = filter.max();
-    let logger = LOGGER.get_or_init(|| AppLogger::new(filter, true));
-    log::set_logger(logger).ok()?;
-    log::set_max_level(max);
-    Some(logger)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use std::sync::atomic::{AtomicUsize, Ordering};
-    use std::time::{Duration, UNIX_EPOCH};
-
-    fn temp_dir(tag: &str) -> PathBuf {
-        static N: AtomicUsize = AtomicUsize::new(0);
-        let d = std::env::temp_dir().join(format!("vectorcraft-logging-{tag}-{}-{}", std::process::id(), N.fetch_add(1, Ordering::Relaxed)));
-        let _ = std::fs::remove_dir_all(&d);
-        d
-    }
-
-    fn read(path: &Path) -> String {
-        std::fs::read_to_string(path).expect("read log")
-    }
-
-    #[test]
-    fn the_default_filter_shows_vectorcraft_info_and_other_crates_warnings() {
-        let f = Filter::parse(DEFAULT_FILTER);
-        assert_eq!(f.level_for("vectorcraft"), LevelFilter::Info);
-        assert_eq!(f.level_for("vectorcraft::window"), LevelFilter::Info);
-        assert_eq!(f.level_for("vectorcraft_engine::guard"), LevelFilter::Info);
-        assert_eq!(f.level_for("vectorcraft_ui_egui::io"), LevelFilter::Info);
-        assert_eq!(f.level_for("wgpu_core::device"), LevelFilter::Warn);
-        assert_eq!(f.level_for("naga"), LevelFilter::Warn);
-        assert_eq!(f.max(), LevelFilter::Info);
-    }
-
-    #[test]
-    fn directives_follow_env_logger_and_the_most_specific_one_wins() {
-        let f = Filter::parse("info,wgpu_core=error,vectorcraft_render=trace,vectorcraft_render::tiles=off");
-        assert_eq!(f.level_for("eframe"), LevelFilter::Info);
-        assert_eq!(f.level_for("wgpu_core::instance"), LevelFilter::Error);
-        assert_eq!(f.level_for("vectorcraft_render::canvas"), LevelFilter::Trace);
-        assert_eq!(f.level_for("vectorcraft_render::tiles"), LevelFilter::Off);
-        assert_eq!(f.max(), LevelFilter::Trace);
-        // A module name is matched at `::` boundaries, not as a bare prefix.
-        assert_eq!(f.level_for("wgpu_core_extra"), LevelFilter::Info);
-        // A trailing `*` is a prefix.
-        assert_eq!(Filter::parse("vectorcraft*=debug").level_for("vectorcraft_text::shape"), LevelFilter::Debug);
-        assert_eq!(Filter::parse("vectorcraft*=debug").level_for("eframe"), LevelFilter::Error);
-        // A bare target name sets that target to the most verbose level, as env_logger does.
-        assert_eq!(Filter::parse("naga").level_for("naga::front"), LevelFilter::Trace);
-        assert_eq!(Filter::parse("naga").level_for("eframe"), LevelFilter::Error);
-        // Levels are case-insensitive and surrounding blanks are ignored.
-        assert_eq!(Filter::parse(" WARN , vectorcraft = Debug ").level_for("vectorcraft"), LevelFilter::Debug);
-        assert_eq!(Filter::parse(" WARN , vectorcraft = Debug ").level_for("eframe"), LevelFilter::Warn);
-    }
-
-    #[test]
-    fn hostile_specs_never_panic_and_fall_back_sensibly() {
-        let long = "x".repeat(100_000);
-        let many = "a=info,".repeat(10_000);
-        for spec in [
-            "",
-            ",,,",
-            "=",
-            "==",
-            "=debug",
-            "vectorcraft=",
-            "nonsense=loud",
-            "🦀=info",
-            "*",
-            "*=",
-            "=*",
-            "a=b=c",
-            "warn,,vectorcraft=DEBUG",
-            "\0",
-            "é::ü=trace",
-            &long,
-            &many,
-        ] {
-            let f = Filter::parse(spec);
-            for target in ["", "vectorcraft", "🦀", "a::b", "*"] {
-                let _ = f.level_for(target);
-            }
-            let _ = f.max();
-        }
-        assert_eq!(Filter::parse("warn,,vectorcraft=DEBUG").level_for("vectorcraft"), LevelFilter::Debug);
-        // An unknown level is skipped: that target keeps the default.
-        assert_eq!(Filter::parse("nonsense=loud").level_for("nonsense"), LevelFilter::Error);
-        assert_eq!(Filter::parse("vectorcraft=").level_for("vectorcraft"), LevelFilter::Error);
-        assert_eq!(Filter::parse("=debug").max(), LevelFilter::Error);
-        assert_eq!(Filter::parse("🦀=info").level_for("🦀::claw"), LevelFilter::Info);
-    }
-
-    #[test]
-    fn timestamps_are_utc_with_milliseconds() {
-        assert_eq!(timestamp(UNIX_EPOCH), "1970-01-01T00:00:00.000Z");
-        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_millis(1_791_446_357_728)), "2026-10-08T07:59:17.728Z");
-        // Leap day, and the day after it.
-        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_164_800)), "2024-02-29T00:00:00.000Z");
-        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_251_199)), "2024-02-29T23:59:59.000Z");
-        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_251_200)), "2024-03-01T00:00:00.000Z");
-        // 2000 is a leap year (divisible by 400), 2100 is not.
-        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(951_782_400)), "2000-02-29T00:00:00.000Z");
-        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(4_107_542_400)), "2100-03-01T00:00:00.000Z");
-        // Before the epoch (a clock set wrong) clamps instead of panicking.
-        assert_eq!(timestamp(UNIX_EPOCH - Duration::from_secs(5)), "1970-01-01T00:00:00.000Z");
-    }
-
-    #[test]
-    fn a_line_carries_time_level_thread_target_and_message() {
-        assert_eq!(
-            format_line("2026-10-08T07:59:17.728Z", log::Level::Info, "main", "vectorcraft", "rendering with Mesa (Vulkan, IntegratedGpu)"),
-            "2026-10-08T07:59:17.728Z INFO  [main] vectorcraft: rendering with Mesa (Vulkan, IntegratedGpu)\n"
-        );
-        // A multi-line message keeps its lines; the record still ends in one newline.
-        assert!(format_line("t", log::Level::Error, "w", "x", "a\nb\n").ends_with("x: a\nb\n"));
-    }
-
-    #[test]
-    fn rotation_keeps_the_previous_logs_and_starts_an_empty_file() {
-        let dir = temp_dir("rotate");
-        for run in 1..=4 {
-            let (path, _file) = rotate(&dir).expect("rotate");
-            assert_eq!(path, dir.join(LOG_FILE));
-            assert_eq!(read(&path), "");
-            std::fs::write(&path, format!("run {run}")).expect("write");
-        }
-        assert_eq!(read(&dir.join(LOG_FILE)), "run 4");
-        assert_eq!(read(&dir.join("vectorcraft.1.log")), "run 3");
-        assert_eq!(read(&dir.join("vectorcraft.2.log")), "run 2");
-        assert!(!dir.join("vectorcraft.3.log").exists(), "only {KEEP} old logs are kept");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn rotation_into_an_unusable_directory_is_an_error_not_a_panic() {
-        let dir = temp_dir("blocked");
-        std::fs::create_dir_all(dir.parent().expect("parent")).expect("tmp");
-        std::fs::write(&dir, "a file where the directory should be").expect("block");
-        assert!(rotate(&dir).is_err());
-        let _ = std::fs::remove_file(&dir);
-    }
-
-    #[test]
-    fn lines_logged_before_the_file_exists_are_written_when_it_is_attached() {
-        let dir = temp_dir("pending");
-        let (path, file) = rotate(&dir).expect("rotate");
-        let mut sink = Sink::new(MAX_FILE_BYTES);
-        sink.write("early 1\n");
-        sink.write("early 2\n");
-        sink.attach(file);
-        sink.write("late\n");
-        assert_eq!(read(&path), "early 1\nearly 2\nlate\n");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn the_pending_buffer_is_bounded_and_says_how_much_it_dropped() {
-        let dir = temp_dir("bounded");
-        let (path, file) = rotate(&dir).expect("rotate");
-        let mut sink = Sink::new(MAX_FILE_BYTES);
-        for i in 0..MAX_PENDING + 5 {
-            sink.write(&format!("line {i}\n"));
-        }
-        sink.attach(file);
-        let text = read(&path);
-        assert_eq!(text.lines().filter(|l| l.starts_with("line ")).count(), MAX_PENDING);
-        assert!(text.contains("5 earlier log lines were dropped"), "{text}");
-        assert!(text.contains("line 0\n") && !text.contains(&format!("line {MAX_PENDING}\n")));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn exactly_a_full_pending_buffer_drops_nothing() {
-        let dir = temp_dir("full");
-        let (path, file) = rotate(&dir).expect("rotate");
-        let mut sink = Sink::new(MAX_FILE_BYTES);
-        for i in 0..MAX_PENDING {
-            sink.write(&format!("line {i}\n"));
-        }
-        sink.attach(file);
-        let text = read(&path);
-        assert_eq!(text.lines().count(), MAX_PENDING);
-        assert!(!text.contains("dropped"), "{text}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn without_a_file_nothing_is_kept_in_memory() {
-        let mut sink = Sink::new(MAX_FILE_BYTES);
-        sink.write("early\n");
-        sink.no_file();
-        sink.write("late\n");
-        assert!(sink.pending.is_empty() && sink.dropped == 0);
-    }
-
-    #[test]
-    fn the_file_stops_at_its_size_cap_with_one_note() {
-        let dir = temp_dir("cap");
-        let (path, file) = rotate(&dir).expect("rotate");
-        let mut sink = Sink::new(100);
-        sink.attach(file);
-        for i in 0..50 {
-            sink.write(&format!("line {i:02} with some padding\n"));
-        }
-        let text = read(&path);
-        assert_eq!(text.lines().filter(|l| l.starts_with("line ")).count(), 3, "{text}");
-        assert_eq!(text.matches("log file reached").count(), 1, "{text}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn the_logger_filters_records_and_writes_them_to_the_attached_file() {
-        use log::Log;
-        let dir = temp_dir("logger");
-        let logger = AppLogger::new(Filter::parse(DEFAULT_FILTER), false);
-        let record = |level, target: &'static str, msg: &'static str| {
-            logger.log(&log::Record::builder().level(level).target(target).args(format_args!("{msg}")).build());
-        };
-        record(log::Level::Info, "vectorcraft", "before the settings directory");
-        record(log::Level::Info, "wgpu_core::device", "too chatty");
-        let path = logger.attach_dir(&dir).expect("attach");
-        assert_eq!(path, dir.join(LOG_FILE));
-        record(log::Level::Warn, "wgpu_hal::vulkan", "a real warning");
-        record(log::Level::Error, "vectorcraft_engine::guard", "recovered from a panic: boom");
-        record(log::Level::Debug, "vectorcraft", "below info");
-        let text = read(&path);
-        let lines: Vec<&str> = text.lines().collect();
-        assert_eq!(lines.len(), 3, "{text}");
-        assert!(lines[0].contains(" INFO  [") && lines[0].ends_with("vectorcraft: before the settings directory"), "{text}");
-        assert!(lines[1].ends_with("wgpu_hal::vulkan: a real warning"), "{text}");
-        assert!(lines[2].contains(" ERROR [") && lines[2].ends_with("vectorcraft_engine::guard: recovered from a panic: boom"), "{text}");
-        assert!(logger.enabled(&log::Metadata::builder().level(log::Level::Info).target("vectorcraft_ui_egui").build()));
-        assert!(!logger.enabled(&log::Metadata::builder().level(log::Level::Info).target("naga").build()));
-        // Attaching again rotates: the first log becomes `.1`.
-        logger.attach_dir(&dir).expect("attach again");
-        assert_eq!(read(&dir.join("vectorcraft.1.log")), text);
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn records_from_many_threads_are_whole_lines() {
-        use log::Log;
-        let dir = temp_dir("threads");
-        let logger = std::sync::Arc::new(AppLogger::new(Filter::parse("info"), false));
-        let path = logger.attach_dir(&dir).expect("attach");
-        let workers: Vec<_> = (0..8)
-            .map(|t| {
-                let l = std::sync::Arc::clone(&logger);
-                std::thread::spawn(move || {
-                    for i in 0..100 {
-                        l.log(
-                            &log::Record::builder().level(log::Level::Info).target("vectorcraft").args(format_args!("thread {t} record {i}")).build(),
-                        );
-                    }
-                })
-            })
-            .collect();
-        for w in workers {
-            w.join().expect("worker");
-        }
-        let text = read(&path);
-        assert_eq!(text.lines().count(), 800);
-        assert!(text.lines().all(|l| l.contains(" vectorcraft: thread ")), "{text}");
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-
-    #[test]
-    fn attaching_to_an_unusable_directory_reports_an_error_and_keeps_logging() {
-        use log::Log;
-        let dir = temp_dir("unusable");
-        std::fs::create_dir_all(dir.parent().expect("parent")).expect("tmp");
-        std::fs::write(&dir, "not a directory").expect("block");
-        let logger = AppLogger::new(Filter::parse("info"), false);
-        assert!(logger.attach_dir(&dir).is_err());
-        logger.log(&log::Record::builder().level(log::Level::Error).target("x").args(format_args!("still fine")).build());
-        // Nothing waits in memory for a file that won't come.
-        assert!(logger.sink.lock().expect("sink").pending.is_empty());
-        let _ = std::fs::remove_file(&dir);
-    }
-
-    #[test]
-    fn a_poisoned_sink_still_logs() {
-        use log::Log;
-        let dir = temp_dir("poison");
-        let logger = std::sync::Arc::new(AppLogger::new(Filter::parse("info"), false));
-        let l = std::sync::Arc::clone(&logger);
-        let _ = std::thread::spawn(move || {
-            let _guard = l.sink.lock().expect("lock");
-            panic!("poison the sink");
-        })
-        .join();
-        assert!(logger.sink.is_poisoned());
-        let path = logger.attach_dir(&dir).expect("attach");
-        logger.log(&log::Record::builder().level(log::Level::Warn).target("vectorcraft").args(format_args!("after the poison")).build());
-        assert!(read(&path).contains("vectorcraft: after the poison"));
-        let _ = std::fs::remove_dir_all(&dir);
-    }
-}
@@ -7,101 +7,48 @@
 //! See `vectorcraft_ui_egui::control` for the methods.
 #![cfg_attr(all(target_os = "windows", not(debug_assertions)), windows_subsystem = "windows")]

-#[cfg(all(feature = "windows7", any(feature = "wgpu", feature = "accessibility")))]
-compile_error!("windows7 requires --no-default-features (wgpu and accessibility must be disabled)");
-#[cfg(all(windows, feature = "windows7", not(target_vendor = "win7")))]
-compile_error!("windows7 requires --target x86_64-win7-windows-msvc; the ordinary Windows target still imports newer APIs");
-#[cfg(all(target_vendor = "win7", not(feature = "windows7")))]
-compile_error!("the win7 target requires --no-default-features --features windows7");
-
 mod clipboard;
 mod control_server;
-#[cfg(feature = "wgpu")]
-mod gpu;
-mod logging;
 #[cfg(target_os = "macos")]
 mod native_menu;
-#[cfg(target_os = "macos")]
-mod open_documents;
 mod printing;
 mod window;

 use vectorcraft_engine::Session;
 use vectorcraft_engine::cmd::fileio;
-use vectorcraft_ui_egui::graphics::GraphicsLoss;
 use vectorcraft_ui_egui::{FilePick, Services, VectorcraftApp};

-struct App {
-    app: VectorcraftApp,
-    /// Reported by wgpu when the window's graphics device is lost (a driver reset).
-    graphics_loss: GraphicsLoss,
-    /// The graphics device was lost and the unsaved changes are kept for Data Recovery.
-    graphics_lost: bool,
-    #[cfg(target_os = "macos")]
-    menu: Option<native_menu::NativeMenu>,
-}
+struct App(VectorcraftApp, #[cfg(target_os = "macos")] Option<native_menu::NativeMenu>);

 impl eframe::App for App {
    fn logic(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
-        if let Some(why) = self.graphics_loss.take() {
-            // eframe can't give a window a new device: the user saves and starts again.
-            self.graphics_lost = self.app.graphics_lost(&why);
-            self.app.status(if self.graphics_lost {
-                "The graphics device was lost: unsaved changes are kept for Data Recovery. Save your documents and restart VectorCraft"
-            } else {
-                "The graphics device was lost: save your documents and restart VectorCraft"
-            });
-        }
-        if self.graphics_lost && ctx.input(|i| i.viewport().close_requested()) {
-            // The window can't show the Save Changes question: it closes, and the next launch
-            // offers the changes back.
-            vectorcraft_ui_egui::background::wait_all(&mut self.app);
-            return;
-        }
        #[cfg(target_os = "macos")]
        {
-            if self.menu.is_none() && std::env::var_os("VECTORCRAFT_NO_NATIVE_MENU").is_none() {
-                self.menu = Some(native_menu::NativeMenu::install(&mut self.app));
+            if self.1.is_none() && std::env::var_os("VECTORCRAFT_NO_NATIVE_MENU").is_none() {
+                self.1 = Some(native_menu::NativeMenu::install(&mut self.0));
            }
-            if let Some(m) = &mut self.menu {
-                m.poll(&mut self.app, ctx);
+            if let Some(m) = &mut self.1 {
+                m.poll(&mut self.0);
            }
-            open_files(&mut self.app, open_documents::take());
        }
-        self.app.logic(ctx);
-        window::track(ctx, &mut self.app.ui.window);
-        if self.app.ui.status == "quit" {
+        self.0.logic(ctx);
+        window::track(ctx, &mut self.0.ui.window);
+        if self.0.ui.status == "quit" {
            ctx.send_viewport_cmd(egui::ViewportCommand::Close);
        }
    }
    fn raw_input_hook(&mut self, _ctx: &egui::Context, raw: &mut egui::RawInput) {
-        self.app.raw_input_hook(raw);
+        self.0.raw_input_hook(raw);
    }
    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
-        self.app.ui(ui);
+        self.0.ui(ui);
        #[cfg(target_os = "macos")]
-        if self.app.take_ime_discard() {
+        if self.0.take_ime_discard() {
            discard_marked_text();
        }
    }
-    #[cfg(not(feature = "windows7"))]
    fn on_exit(&mut self) {
-        save_prefs(&self.app);
-    }
-    #[cfg(feature = "windows7")]
-    fn on_exit(&mut self, _gl: Option<&eframe::glow::Context>) {
-        save_prefs(&self.app);
-    }
-}
-
-/// Open files handed to the app (command line, macOS Finder and Dock) as documents. A file that
-/// can't be opened is reported in the status bar and on stderr; the others still open.
-fn open_files(app: &mut VectorcraftApp, files: Vec<String>) {
-    for f in files {
-        if let Err(e) = vectorcraft_ui_egui::io::open_path(app, &f) {
-            eprintln!("vectorcraft: {f}: {e}");
-            app.status(format!("Couldn't open {}: {e}", fileio::file_name(&f)));
-        }
+        save_prefs(&self.0);
    }
 }

@@ -142,11 +89,6 @@ fn prefs_path_for(name: &str, lower: &str) -> Option<std::path::PathBuf> {
    base.map(|b| b.join("ui.json"))
 }

-/// Where the log files live: `logs` in the preferences folder (see `logging`).
-fn log_dir() -> Option<std::path::PathBuf> {
-    Some(prefs_path()?.parent()?.join("logs"))
-}
-
 /// Runs without preferences (`VECTORCRAFT_NO_PREFS`, agents' test runs) neither read nor write them.
 fn prefs_enabled() -> bool {
    std::env::var_os("VECTORCRAFT_NO_PREFS").is_none()
@@ -299,8 +241,23 @@ fn app_icon() -> egui::IconData {
    eframe::icon_data::from_png_bytes(png).unwrap_or_default()
 }

+/// The power preference wgpu picks the window's graphics adapter with (#306): the
+/// `WGPU_POWER_PREF` environment variable (`low`, `high`, `none`) when set, otherwise Preferences ›
+/// Performance › Graphics Processor (`gpuPreference`). Power saving unless the preference asks for
+/// high performance: the canvas is rasterized on the CPU and the GPU only composites it, which the
+/// integrated GPU of a hybrid-graphics laptop does easily, while presenting frames rendered on the
+/// discrete GPU through the integrated one made the window flicker on some laptops. With a single
+/// GPU both preferences pick it.
+fn power_preference(pref: Option<&str>, env: Option<eframe::wgpu::PowerPreference>) -> eframe::wgpu::PowerPreference {
+    use eframe::wgpu::PowerPreference;
+    match (env, pref) {
+        (Some(p), _) => p,
+        (None, Some("highPerformance")) => PowerPreference::HighPerformance,
+        (None, _) => PowerPreference::LowPower,
+    }
+}
+
 /// "name (backend, kind)" of the adapter the window renders with, for Help › About and bug reports.
-#[cfg(feature = "wgpu")]
 fn adapter_summary(info: &eframe::wgpu::AdapterInfo) -> String {
    format!("{} ({:?}, {:?})", info.name.trim(), info.backend, info.device_type)
 }
@@ -309,9 +266,7 @@ fn adapter_summary(info: &eframe::wgpu::AdapterInfo) -> String {
 /// macOS keeps its traffic lights over the integrated title strip.
 const CUSTOM_TITLEBAR: bool = !cfg!(target_os = "macos");

-fn main() -> std::process::ExitCode {
-    // First, so every start-up warning is recorded (`logging`).
-    let logger = logging::install();
+fn main() -> eframe::Result {
    vectorcraft_ui_egui::i18n::detect_system_lang_in_background();
    let mut control_port: Option<u16> = std::env::var("VECTORCRAFT_CONTROL_PORT").ok().and_then(|p| p.parse().ok());
    let mut files = Vec::new();
@@ -321,34 +276,16 @@ fn main() -> std::process::ExitCode {
            "--control" => control_port = args.next().and_then(|p| p.parse().ok()),
            "--version" => {
                println!("vectorcraft {}", env!("CARGO_PKG_VERSION"));
-                return std::process::ExitCode::SUCCESS;
+                return Ok(());
            }
            _ => files.push(a),
        }
    }
-    // The log file lives in the settings directory, next to the preferences; opened after the
-    // arguments, so `--version` leaves no file behind. Records logged until now are written to it
-    // first. Runs without preferences (agents' test runs) log to standard error only, so they
-    // don't rotate away the user's own logs.
-    if let Some(logger) = logger {
-        match log_dir().filter(|_| prefs_enabled()) {
-            Some(dir) => match logger.attach_dir(&dir) {
-                Ok(path) => log::info!("VectorCraft {}, log file {}", env!("CARGO_PKG_VERSION"), path.display()),
-                // Standard error only by now (`attach_dir` gave up on the file); unlike `eprintln!`, never panics.
-                Err(e) => log::warn!("no log file: {e}"),
-            },
-            None => logger.no_file(),
-        }
-    }
    let saved = read_prefs();
    let saved_window = saved.as_ref().and_then(|ui| ui.window);
-    #[cfg(feature = "wgpu")]
    let gpu_pref = saved.as_ref().and_then(|ui| ui.engine_prefs.get("gpuPreference")).and_then(serde_json::Value::as_str);
-    #[cfg(feature = "wgpu")]
-    let power = gpu::power_preference(gpu_pref, eframe::wgpu::PowerPreference::from_env());
-    #[cfg(feature = "wgpu")]
-    let startup = std::sync::Arc::new(gpu::Startup::default());
-    let options = eframe::NativeOptions {
+    let power = power_preference(gpu_pref, eframe::wgpu::PowerPreference::from_env());
+    let mut options = eframe::NativeOptions {
        viewport: egui::ViewportBuilder::default()
            .with_title("VectorCraft")
            .with_inner_size(window::DEFAULT_SIZE)
@@ -360,131 +297,85 @@ fn main() -> std::process::ExitCode {
            .with_title_shown(false)
            .with_icon(app_icon())
            .with_app_id("ai.storyteller.vectorcraft"),
-        #[cfg(feature = "windows7")]
-        renderer: eframe::Renderer::Glow,
        ..Default::default()
    };
-    #[cfg(feature = "wgpu")]
-    let options = {
-        let mut options = options;
-        // One frame queued, not two: the canvas is rasterized on the CPU and the GPU only
-        // composites it, so the window answers the pointer a frame sooner (#444).
-        options.wgpu_options.surface = eframe::egui_wgpu::SurfaceConfig::LOW_LATENCY;
-        // Only adapters that can show the window, in the order `gpu` gives (#306, #502).
-        if let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
-            create.native_adapter_selector = Some(gpu::selector(power, startup.clone()));
-        }
-        options
-    };
-    #[cfg(feature = "wgpu")]
-    gpu::watch_panics();
-    // Files opened from Finder and the Dock arrive as events, not arguments.
-    #[cfg(target_os = "macos")]
-    open_documents::install();
-    #[cfg(feature = "wgpu")]
-    let created = startup.clone();
-    // A panic that ends the window (egui-wgpu's own, #502) is caught here: never a crash.
-    let outcome = vectorcraft_engine::guard::catch_panic(|| {
-        eframe::run_native(
-            "VectorCraft",
-            options,
-            Box::new(move |cc| {
-                let mut app = VectorcraftApp::new(Session::new(), services());
-                load_prefs(&mut app, saved);
-                // Fit the window to its monitor, or put it back where it was (still hidden).
-                if let Some(w) = cc.winit_window() {
-                    app.ui.window = Some(window::restore(w, saved_window));
-                }
-                // User Defined swatch and graphic style libraries live next to the preferences.
-                let swatches = prefs_path().and_then(|p| Some(p.parent()?.join("Swatches").to_string_lossy().to_string()));
-                app.session.swatch_libraries.set_user_dir(swatches);
-                let styles = prefs_path().and_then(|p| Some(p.parent()?.join("Graphic Styles").to_string_lossy().to_string()));
-                app.session.style_libraries.set_user_dir(styles);
-                // Data Recovery copies live next to the preferences too (none for runs without
-                // preferences, such as agents' test runs, unless the recoveryFolder preference is set).
-                if std::env::var_os("VECTORCRAFT_NO_PREFS").is_none() {
-                    let recovery = prefs_path().and_then(|p| Some(p.parent()?.join("Data Recovery").to_string_lossy().to_string()));
-                    app.session.recovery.set_default_folder(recovery);
-                }
-                let graphics_loss = GraphicsLoss::default();
-                #[cfg(feature = "wgpu")]
-                if let Some(rs) = &cc.wgpu_render_state {
-                    let summary = adapter_summary(&rs.adapter.get_info());
-                    log::info!("rendering with {summary} (power preference {power:?})");
-                    created.created(&cc.egui_ctx);
-                    if !gpu::skipped().is_empty() {
-                        app.status(format!("The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}"));
-                    }
-                    app.graphics_adapter = Some(summary);
-                    let (loss, ctx) = (graphics_loss.clone(), cc.egui_ctx.clone());
-                    rs.device.set_device_lost_callback(move |reason, msg| loss.report(&ctx, format!("{reason:?}: {msg}")));
-                }
-                #[cfg(feature = "windows7")]
-                {
-                    app.graphics_adapter = Some("OpenGL (Windows 7 compatibility)".into());
-                }
-                app.integrated_titlebar = cfg!(target_os = "macos");
-                app.custom_titlebar = CUSTOM_TITLEBAR;
-                if let Some(port) = control_port {
-                    let rx = control_server::start(port, cc.egui_ctx.clone());
-                    app = app.with_control(rx);
-                }
-                #[cfg(target_os = "macos")]
-                open_documents::set_ui(&cc.egui_ctx);
-                open_files(&mut app, files);
-                Ok(Box::new(App {
-                    app,
-                    graphics_loss,
-                    graphics_lost: false,
-                    #[cfg(target_os = "macos")]
-                    menu: None,
-                }))
-            }),
-        )
-    });
-    #[cfg(feature = "wgpu")]
-    let outcome = gpu::finish(outcome, &startup);
-    #[cfg(not(feature = "wgpu"))]
-    let outcome = outcome.and_then(|r| r.map_err(|e| e.to_string()));
-    match outcome {
-        Ok(()) => std::process::ExitCode::SUCCESS,
-        Err(e) => {
-            log::error!("VectorCraft stopped: {e}");
-            std::process::ExitCode::FAILURE
-        }
+    if let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
+        create.power_preference = power;
    }
+    eframe::run_native(
+        "VectorCraft",
+        options,
+        Box::new(move |cc| {
+            let mut app = VectorcraftApp::new(Session::new(), services());
+            load_prefs(&mut app, saved);
+            // Fit the window to its monitor, or put it back where it was (still hidden).
+            if let Some(w) = cc.winit_window() {
+                app.ui.window = Some(window::restore(w, saved_window));
+            }
+            // User Defined swatch and graphic style libraries live next to the preferences.
+            let swatches = prefs_path().and_then(|p| Some(p.parent()?.join("Swatches").to_string_lossy().to_string()));
+            app.session.swatch_libraries.set_user_dir(swatches);
+            let styles = prefs_path().and_then(|p| Some(p.parent()?.join("Graphic Styles").to_string_lossy().to_string()));
+            app.session.style_libraries.set_user_dir(styles);
+            // Data Recovery copies live next to the preferences too (none for runs without
+            // preferences, such as agents' test runs, unless the recoveryFolder preference is set).
+            if std::env::var_os("VECTORCRAFT_NO_PREFS").is_none() {
+                let recovery = prefs_path().and_then(|p| Some(p.parent()?.join("Data Recovery").to_string_lossy().to_string()));
+                app.session.recovery.set_default_folder(recovery);
+            }
+            if let Some(rs) = &cc.wgpu_render_state {
+                let summary = adapter_summary(&rs.adapter.get_info());
+                log::info!("vectorcraft: rendering with {summary} (power preference {power:?})");
+                app.graphics_adapter = Some(summary);
+            }
+            app.integrated_titlebar = cfg!(target_os = "macos");
+            app.custom_titlebar = CUSTOM_TITLEBAR;
+            if let Some(port) = control_port {
+                let rx = control_server::start(port, cc.egui_ctx.clone());
+                app = app.with_control(rx);
+            }
+            for f in files {
+                if let Err(e) = vectorcraft_ui_egui::io::open_path(&mut app, &f) {
+                    eprintln!("vectorcraft: {f}: {e}");
+                }
+            }
+            Ok(Box::new(App(
+                app,
+                #[cfg(target_os = "macos")]
+                None,
+            )))
+        }),
+    )
 }

-#[cfg(all(test, feature = "wgpu"))]
+#[cfg(test)]
 mod tests {
    use super::*;
+    use eframe::wgpu::PowerPreference;

-    /// The file extensions the macOS bundle declares: its document types and its own exported type.
-    fn plist_extensions(plist: &str) -> Vec<&str> {
-        ["<key>CFBundleTypeExtensions</key>", "<key>public.filename-extension</key>"]
-            .iter()
-            .flat_map(|key| plist.split(key).skip(1))
-            .filter_map(|rest| rest.split("</array>").next())
-            .flat_map(|array| array.split("<string>").skip(1))
-            .filter_map(|s| s.split("</string>").next())
-            .collect()
+    #[test]
+    fn power_saving_unless_the_preference_or_the_environment_says_otherwise() {
+        assert_eq!(power_preference(None, None), PowerPreference::LowPower);
+        assert_eq!(power_preference(Some("powerSaving"), None), PowerPreference::LowPower);
+        assert_eq!(power_preference(Some("highPerformance"), None), PowerPreference::HighPerformance);
+        // A value this version doesn't know (a newer or damaged preference file) is the default.
+        assert_eq!(power_preference(Some("turbo"), None), PowerPreference::LowPower);
+        assert_eq!(power_preference(Some(""), None), PowerPreference::LowPower);
+        // WGPU_POWER_PREF wins over the preference, either way.
+        assert_eq!(power_preference(Some("powerSaving"), Some(PowerPreference::HighPerformance)), PowerPreference::HighPerformance);
+        assert_eq!(power_preference(Some("highPerformance"), Some(PowerPreference::LowPower)), PowerPreference::LowPower);
+        assert_eq!(power_preference(None, Some(PowerPreference::None)), PowerPreference::None);
    }

-    /// Finder offers the app for every file File › Open reads (#295, #354), takes over no other
-    /// app's files, and hands them to the app rather than to AppKit's document machinery.
+    /// The preference the engine saves is the one the app reads back before the window opens.
    #[test]
-    fn the_macos_bundle_opens_every_readable_format() {
-        let plist = include_str!("../../../packaging/macos/Info.plist.in");
-        let declared = plist_extensions(plist);
-        for e in fileio::OPEN_EXTS {
-            assert!(declared.contains(e), "Info.plist.in doesn't declare .{e}");
-        }
-        for e in &declared {
-            assert!(fileio::OPEN_EXTS.contains(e), "Info.plist.in declares .{e}, which the app doesn't open");
-        }
-        assert!(!plist.contains("<key>NSDocumentClass</key>"), "not an NSDocument app: AppKit would refuse the files");
-        let types = plist.matches("<key>CFBundleTypeName</key>").count();
-        assert!(types > 1 && plist.matches("<key>LSHandlerRank</key>").count() == types, "every document type has a rank");
-        assert_eq!(plist.matches("<string>Owner</string>").count(), 2, "only VectorCraft documents and templates are owned");
+    fn the_saved_engine_preference_is_found() {
+        let mut prefs = vectorcraft_engine::Prefs::default();
+        let saved = prefs.to_json();
+        assert_eq!(saved.get("gpuPreference").and_then(serde_json::Value::as_str), Some("powerSaving"));
+        prefs.gpu_preference = "highPerformance".into();
+        let saved = prefs.to_json();
+        let pref = saved.get("gpuPreference").and_then(serde_json::Value::as_str);
+        assert_eq!(power_preference(pref, None), PowerPreference::HighPerformance);
    }
 }
@@ -33,7 +33,7 @@ pub struct NativeMenu {
 }

 /// Accelerator for a shortcut like "Cmd+Shift+]" (modifier-less shortcuts stay in the app so they
-/// don't steal keys from text fields; a focused field still gets Cmd+A/X/C/V, see [`NativeMenu::poll`]).
+/// don't steal keys from text fields).
 fn accel(sc: &str) -> Option<Accelerator> {
    if !(sc.contains("Cmd") || sc.contains("Ctrl") || sc.contains("Alt") || sc.starts_with('F')) {
        return None;
@@ -72,13 +72,12 @@ impl NativeMenu {
        }
    }

-    /// Dispatch chosen items (a focused text field takes Select All and the clipboard) and refresh
-    /// state.
-    pub fn poll(&mut self, app: &mut VectorcraftApp, ctx: &egui::Context) {
+    /// Dispatch clicked items and refresh state.
+    pub fn poll(&mut self, app: &mut VectorcraftApp) {
        while let Ok(ev) = MenuEvent::receiver().try_recv() {
            if let Some((cmd, params, _, _)) = self.items.get(ev.id.as_ref()) {
                let p = if params.is_null() { serde_json::json!({}) } else { params.clone() };
-                menus::invoke_from_system_menu(app, ctx, cmd, p);
+                menus::invoke(app, cmd, p);
            }
        }
        let now = vectorcraft_ui_egui::now_ms();
@@ -1,105 +0,0 @@
-//! macOS: files opened from Finder (double-click, Open With, a drop on the Dock icon) or with
-//! `open -a VectorCraft file`.
-//!
-//! macOS doesn't pass these on the command line: AppKit hands them to the application delegate's
-//! `application:openURLs:`, and when the delegate has no such method it asks `NSDocumentController`,
-//! which fails with "VectorCraft cannot open files in the … format" because VectorCraft isn't an
-//! `NSDocument` app. winit 0.30's delegate doesn't implement the method, so [`install`] adds it to
-//! the delegate's class when the app is about to finish launching: after winit set the delegate and
-//! before AppKit delivers the files the app was launched with. The handler queues the paths and
-//! wakes the UI, which opens them with [`take`] like files named on the command line.
-//!
-//! Adding a method to another crate's Objective-C class has no safe API, hence the scoped
-//! `unsafe_code` allowance (winit overrides `sendEvent:` on `NSApplication` the same way).
-#![allow(unsafe_code)]
-
-use std::ptr::NonNull;
-use std::sync::{Mutex, OnceLock, PoisonError};
-
-use block2::RcBlock;
-use objc2::MainThreadMarker;
-use objc2::runtime::{AnyObject, Imp, Sel};
-use objc2::sel;
-use objc2_app_kit::{NSApplication, NSApplicationWillFinishLaunchingNotification};
-use objc2_foundation::{NSArray, NSNotification, NSNotificationCenter, NSURL};
-
-/// Paths that arrived and haven't been opened yet.
-static PENDING: Mutex<Vec<String>> = Mutex::new(Vec::new());
-/// The UI to wake when files arrive (unset until the window exists; the first frame opens them).
-static UI: OnceLock<egui::Context> = OnceLock::new();
-
-/// Handle open-document events from now on. Call before the event loop runs.
-pub fn install() {
-    let block = RcBlock::new(|_: NonNull<NSNotification>| add_open_urls_method());
-    // SAFETY: the name is AppKit's notification constant; no object or queue filter, so the block
-    // runs on the posting thread (AppKit posts it on the main thread). The notification center
-    // keeps the registration (and the block) for the life of the app.
-    unsafe {
-        NSNotificationCenter::defaultCenter().addObserverForName_object_queue_usingBlock(
-            Some(NSApplicationWillFinishLaunchingNotification),
-            None,
-            None,
-            &block,
-        );
-    }
-}
-
-/// Wake `ctx` when files arrive while the app runs.
-pub fn set_ui(ctx: &egui::Context) {
-    // Set once; a second call would hand over the same context.
-    let _ = UI.set(ctx.clone());
-}
-
-/// The paths that arrived since the last call.
-pub fn take() -> Vec<String> {
-    std::mem::take(&mut *PENDING.lock().unwrap_or_else(PoisonError::into_inner))
-}
-
-/// `application:openURLs:` on the application delegate's class.
-fn add_open_urls_method() {
-    let Some(mtm) = MainThreadMarker::new() else { return };
-    let Some(delegate) = NSApplication::sharedApplication(mtm).delegate() else {
-        log::warn!("no application delegate; files opened from Finder won't open");
-        return;
-    };
-    let class = AsRef::<AnyObject>::as_ref(&*delegate).class();
-    let handler: extern "C-unwind" fn(&AnyObject, Sel, &AnyObject, &NSArray<NSURL>) = open_urls;
-    // SAFETY: `Imp` is the untyped form of a method implementation; the Objective-C runtime calls
-    // it with the arguments the type encoding declares, which match `open_urls`: no return value
-    // (`v`), the receiver (`@`), the selector (`:`), the application (`@`) and the URL array (`@`).
-    let added = unsafe {
-        let imp = std::mem::transmute::<extern "C-unwind" fn(&AnyObject, Sel, &AnyObject, &NSArray<NSURL>), Imp>(handler);
-        objc2::ffi::class_addMethod(std::ptr::from_ref(class).cast_mut(), sel!(application:openURLs:), imp, c"v@:@@".as_ptr())
-    };
-    if !added.as_bool() {
-        log::warn!("the application delegate already handles open-document events");
-    }
-}
-
-/// Queue the files among `urls` and wake the UI. Never panics: it runs inside AppKit.
-extern "C-unwind" fn open_urls(_delegate: &AnyObject, _cmd: Sel, _app: &AnyObject, urls: &NSArray<NSURL>) {
-    let paths = urls.iter().filter_map(|u| u.to_file_path()).map(|p| p.to_string_lossy().into_owned());
-    PENDING.lock().unwrap_or_else(PoisonError::into_inner).extend(paths);
-    if let Some(ctx) = UI.get() {
-        ctx.request_repaint();
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use objc2::runtime::NSObject;
-    use objc2_foundation::NSString;
-
-    use super::*;
-
-    /// Files queue until the UI takes them; URLs that aren't files are left out.
-    #[test]
-    fn opened_files_wait_for_the_ui() {
-        let web = NSURL::URLWithString(&NSString::from_str("https://example.com/a.svg")).unwrap();
-        let urls = NSArray::from_retained_slice(&[NSURL::from_file_path("/tmp/a b.pdf").unwrap(), web, NSURL::from_file_path("/tmp/c.ai").unwrap()]);
-        let any = NSObject::new();
-        open_urls(&any, sel!(application:openURLs:), &any, &urls);
-        assert_eq!(take(), ["/tmp/a b.pdf", "/tmp/c.ai"]);
-        assert!(take().is_empty());
-    }
-}
@@ -156,9 +156,6 @@ mod system {
    }

    pub fn printers() -> Vec<Printer> {
-        #[cfg(feature = "windows7")]
-        let script = "Get-WmiObject Win32_Printer | ForEach-Object { \"$($_.Default)`t$($_.Name)\" }";
-        #[cfg(not(feature = "windows7"))]
        let script = "Get-CimInstance Win32_Printer | ForEach-Object { \"$($_.Default)`t$($_.Name)\" }";
        output(&mut powershell(script)).map(|t| windows_printers(&t)).unwrap_or_default()
    }
@@ -177,19 +174,7 @@ mod system {
    }

    pub fn setup(_printer: Option<&str>) -> Result<(), String> {
-        #[cfg(feature = "windows7")]
-        let mut command = {
-            let mut command = Command::new("control.exe");
-            command.arg("printers");
-            command
-        };
-        #[cfg(not(feature = "windows7"))]
-        let mut command = {
-            let mut command = Command::new("explorer");
-            command.arg("ms-settings:printers");
-            command
-        };
-        command.spawn().map(|_| ()).map_err(|e| e.to_string())
+        Command::new("explorer").arg("ms-settings:printers").spawn().map(|_| ()).map_err(|e| e.to_string())
    }
 }

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 20 C5 11 8 7 12 7 S19 11 21 20"/><path d="M5 7 H19"/><circle cx="5" cy="7" r="1.4" fill="currentColor"/><circle cx="19" cy="7" r="1.4" fill="currentColor"/><rect x="10" y="5" width="4" height="4" fill="currentColor"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="miter"><path d="M11 3V14" /><path d="M14 3V14" /><path d="M16 3H9.5a3 3 0 0 0 0 6H11" /><path d="M4 19H20" /><path d="M17 16L20 19L17 22" /></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="butt" stroke-linejoin="miter"><path d="M13 3V14" /><path d="M10 3V14" /><path d="M8 3H14.5a3 3 0 0 1 0 6H13" /><path d="M20 19H4" /><path d="M7 16L4 19L7 22" /></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l-7-7 3-6 8 3 3 7-7 3z" /><path d="M5 12l5-5"/><circle cx="11" cy="11" r="1.5"/><path d="M19 3v5M16.5 5.5h5"/></svg>
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l-7-7 3-6 8 3 3 7-7 3z" /><path d="M5 12l5-5"/><circle cx="11" cy="11" r="1.5"/><path d="M16.5 5.5h5"/></svg>
@@ -1,19 +0,0 @@
-<!-- @license lucide-static v1.49.0 - ISC -->
-<!-- Lucide's pen-tool with a plus badge added for VectorCraft -->
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M15.707 21.293a1 1 0 0 1-1.414 0l-1.586-1.586a1 1 0 0 1 0-1.414l5.586-5.586a1 1 0 0 1 1.414 0l1.586 1.586a1 1 0 0 1 0 1.414z" />
-  <path d="m18 13-1.375-6.874a1 1 0 0 0-.746-.776L3.235 2.028a1 1 0 0 0-1.207 1.207L5.35 15.879a1 1 0 0 0 .776.746L13 18" />
-  <path d="m2.3 2.3 7.286 7.286" />
-  <circle cx="11" cy="11" r="2" />
-  <path d="M4 18.3v4.4M1.8 20.5h4.4" />
-</svg>
@@ -1,19 +0,0 @@
-<!-- @license lucide-static v1.49.0 - ISC -->
-<!-- Lucide's pen-tool with a minus badge added for VectorCraft -->
-<svg
-  xmlns="http://www.w3.org/2000/svg"
-  width="24"
-  height="24"
-  viewBox="0 0 24 24"
-  fill="none"
-  stroke="currentColor"
-  stroke-width="2"
-  stroke-linecap="round"
-  stroke-linejoin="round"
->
-  <path d="M15.707 21.293a1 1 0 0 1-1.414 0l-1.586-1.586a1 1 0 0 1 0-1.414l5.586-5.586a1 1 0 0 1 1.414 0l1.586 1.586a1 1 0 0 1 0 1.414z" />
-  <path d="m18 13-1.375-6.874a1 1 0 0 0-.746-.776L3.235 2.028a1 1 0 0 0-1.207 1.207L5.35 15.879a1 1 0 0 0 .776.746L13 18" />
-  <path d="m2.3 2.3 7.286 7.286" />
-  <circle cx="11" cy="11" r="2" />
-  <path d="M1.8 20.5h4.4" />
-</svg>
@@ -1,348 +0,0 @@
-{
-  "schema": 1,
-  "repo": "storytold/vectorcraft",
-  "branch": "main",
-  "head": "fe9f3afcb7d32032e8f332b0594692a03e275b84",
-  "head_date": "2026-10-08T00:36:16Z",
-  "commits": 607,
-  "unattributed_commits": 0,
-  "contributors": [
-    {
-      "login": "echelon",
-      "people_entry": true,
-      "github_name": null,
-      "prs": 15,
-      "commits": 119,
-      "lines_added": 172276,
-      "lines_deleted": 40329,
-      "binary_added": 37,
-      "binary_deleted": 2,
-      "first_commit": "2026-09-30T09:12:46Z",
-      "last_commit": "2026-10-07T22:04:30Z"
-    },
-    {
-      "login": "bflatastic",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 176,
-      "commits": 394,
-      "lines_added": 212929,
-      "lines_deleted": 24160,
-      "binary_added": 2,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-02T15:22:29Z",
-      "last_commit": "2026-10-08T00:36:16Z"
-    },
-    {
-      "login": "storybored379",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 7,
-      "commits": 7,
-      "lines_added": 456,
-      "lines_deleted": 49,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-04T06:45:57Z",
-      "last_commit": "2026-10-04T08:14:20Z"
-    },
-    {
-      "login": "theironchef",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 38,
-      "commits": 41,
-      "lines_added": 2803,
-      "lines_deleted": 232,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-05T14:40:20Z",
-      "last_commit": "2026-10-07T22:39:00Z"
-    },
-    {
-      "login": "midasdf",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 2,
-      "commits": 2,
-      "lines_added": 579,
-      "lines_deleted": 43,
-      "binary_added": 1,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-05T16:10:37Z",
-      "last_commit": "2026-10-07T20:53:30Z"
-    },
-    {
-      "login": "japbcoelho",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 57,
-      "lines_deleted": 13,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-06T01:45:49Z",
-      "last_commit": "2026-10-06T01:45:49Z"
-    },
-    {
-      "login": "p0lyg0n",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 5,
-      "commits": 6,
-      "lines_added": 780,
-      "lines_deleted": 69,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-06T09:22:46Z",
-      "last_commit": "2026-10-07T04:33:45Z"
-    },
-    {
-      "login": "imachus",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 12,
-      "commits": 12,
-      "lines_added": 6302,
-      "lines_deleted": 212,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-06T10:06:18Z",
-      "last_commit": "2026-10-07T22:20:10Z"
-    },
-    {
-      "login": "petrleocompel",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 784,
-      "lines_deleted": 36,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-06T12:23:11Z",
-      "last_commit": "2026-10-06T12:23:11Z"
-    },
-    {
-      "login": "fahrim",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 3,
-      "commits": 6,
-      "lines_added": 1964,
-      "lines_deleted": 76,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-06T12:48:28Z",
-      "last_commit": "2026-10-07T23:36:17Z"
-    },
-    {
-      "login": "EthanSuquet",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 4,
-      "commits": 4,
-      "lines_added": 413,
-      "lines_deleted": 71,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-06T19:30:49Z",
-      "last_commit": "2026-10-07T14:24:14Z"
-    },
-    {
-      "login": "realwitt",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 607,
-      "lines_deleted": 3,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T00:12:52Z",
-      "last_commit": "2026-10-07T00:12:52Z"
-    },
-    {
-      "login": "WildfootW",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 6809,
-      "lines_deleted": 2627,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T00:37:02Z",
-      "last_commit": "2026-10-07T00:37:02Z"
-    },
-    {
-      "login": "coygeek",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 4,
-      "lines_deleted": 0,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T02:29:03Z",
-      "last_commit": "2026-10-07T02:29:03Z"
-    },
-    {
-      "login": "Luskish",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 261,
-      "lines_deleted": 32,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T02:50:35Z",
-      "last_commit": "2026-10-07T02:50:35Z"
-    },
-    {
-      "login": "daniel-efrat",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 547,
-      "lines_deleted": 43,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T08:13:19Z",
-      "last_commit": "2026-10-07T08:13:19Z"
-    },
-    {
-      "login": "Pengjingyu1992",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 3132,
-      "lines_deleted": 4,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T09:56:23Z",
-      "last_commit": "2026-10-07T09:56:23Z"
-    },
-    {
-      "login": "MillhioreBT",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 564,
-      "lines_deleted": 41,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T12:58:33Z",
-      "last_commit": "2026-10-07T12:58:33Z"
-    },
-    {
-      "login": "fabian-co",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 2,
-      "lines_added": 270,
-      "lines_deleted": 48,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T18:05:26Z",
-      "last_commit": "2026-10-07T19:32:11Z"
-    },
-    {
-      "login": "Haven-King",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 2,
-      "lines_added": 467,
-      "lines_deleted": 76,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T18:10:39Z",
-      "last_commit": "2026-10-07T18:40:49Z"
-    },
-    {
-      "login": "njmueller",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 619,
-      "lines_deleted": 11,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T21:14:42Z",
-      "last_commit": "2026-10-07T21:14:42Z"
-    },
-    {
-      "login": "RicSchonfelder",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 2592,
-      "lines_deleted": 9,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T21:44:42Z",
-      "last_commit": "2026-10-07T21:44:42Z"
-    },
-    {
-      "login": "DWAA1660",
-      "people_entry": false,
-      "github_name": null,
-      "prs": 1,
-      "commits": 1,
-      "lines_added": 76,
-      "lines_deleted": 21,
-      "binary_added": 0,
-      "binary_deleted": 0,
-      "first_commit": "2026-10-07T23:09:37Z",
-      "last_commit": "2026-10-07T23:09:37Z"
-    }
-  ],
-  "models": [
-    {
-      "id": "anthropic/claude-opus/5.5",
-      "company": "Anthropic",
-      "model": "Claude Opus",
-      "version": "5.5",
-      "commits": 567,
-      "lines_added": 382239,
-      "lines_deleted": 67174
-    },
-    {
-      "id": "anthropic/claude-sonnet/5.5",
-      "company": "Anthropic",
-      "model": "Claude Sonnet",
-      "version": "5.5",
-      "commits": 6,
-      "lines_added": 660,
-      "lines_deleted": 34
-    },
-    {
-      "id": "anthropic/claude-opus/4.8",
-      "company": "Anthropic",
-      "model": "Claude Opus",
-      "version": "4.8",
-      "commits": 3,
-      "lines_added": 1672,
-      "lines_deleted": 42
-    },
-    {
-      "id": "anthropic/claude-fable/5.1",
-      "company": "Anthropic",
-      "model": "Claude Fable",
-      "version": "5.1",
-      "commits": 1,
-      "lines_added": 6809,
-      "lines_deleted": 2627
-    }
-  ]
-}
@@ -1,23 +0,0 @@
-# Contributor names for the About window (craftrules standards/contributors.md).
-#
-# Everyone who contributes is credited by GitHub username automatically. Anything more is up to
-# you: add YOUR OWN entry below, in your own PR (commit it yourself). Never add someone else; a
-# maintainer may add a person only when that person asked, recording where in consent_source.
-#
-# Easiest: python3 ../../craftrules/scripts/contributors.py --add-me . \
-#            [--real-name "Ada Lovelace"] [--display-name "Ada"] [--sync-github-name]
-#
-# Or copy this block, replacing your-github-username (every field is optional):
-#
-#   [people.your-github-username]
-#   real_name = "Your Name"        # shown when the viewer picks "Real name"
-#   display_name = "Nickname"      # shown when the viewer picks "Display name"
-#   sync_github_name = true        # or: use the name on your public GitHub profile as display name
-#
-# To remove your names, delete your entry (or set fields empty) in a PR. The next
-# contributors.py run, and the next build, drop them.
-
-[people.echelon]
-real_name = "Brandon Thomas"
-display_name = "Brandon Thomas"
-sync_github_name = false
@@ -662,60 +662,6 @@ impl ProofLut {
    }
 }

-/// A 17⁴ CMYK → four values lookup table with quadrilinear interpolation: ink amounts to a
-/// colour (XYZ, RGB, or CMYK in another space).
-pub struct CmykLut {
-    data: Vec<[f32; 4]>,
-}
-
-impl CmykLut {
-    pub fn build(f: impl Fn([f32; 4]) -> [f32; 4]) -> Self {
-        let s = (LUT_N - 1) as f32;
-        let mut data = Vec::with_capacity(LUT_N.pow(4));
-        for c in 0..LUT_N {
-            for m in 0..LUT_N {
-                for y in 0..LUT_N {
-                    for k in 0..LUT_N {
-                        data.push(f([c, m, y, k].map(|i| i as f32 / s)));
-                    }
-                }
-            }
-        }
-        Self { data }
-    }
-
-    pub fn apply(&self, inks: [f32; 4]) -> [f32; 4] {
-        const STRIDE: [usize; 4] = [LUT_N * LUT_N * LUT_N, LUT_N * LUT_N, LUT_N, 1];
-        let p = inks.map(|v| v.clamp(0.0, 1.0) * (LUT_N - 1) as f32);
-        let i = p.map(|v| (v as usize).min(LUT_N - 2));
-        let base: usize = (0..4).map(|d| i[d] * STRIDE[d]).sum();
-        let mut out = [0.0f32; 4];
-        for corner in 0..16 {
-            let (mut w, mut at) = (1.0f32, base);
-            for d in 0..4 {
-                let t = p[d] - i[d] as f32;
-                if corner >> d & 1 == 1 {
-                    w *= t;
-                    at += STRIDE[d];
-                } else {
-                    w *= 1.0 - t;
-                }
-            }
-            if w > 0.0 {
-                for (o, v) in out.iter_mut().zip(self.data[at]) {
-                    *o += w * v;
-                }
-            }
-        }
-        out
-    }
-
-    /// [`Self::apply`] to 8-bit ink amounts, for 8-bit values.
-    pub fn apply8(&self, inks: [u8; 4]) -> [u8; 4] {
-        self.apply(inks.map(|v| v as f32 / 255.0)).map(|v| (v.clamp(0.0, 1.0) * 255.0).round() as u8)
-    }
-}
-
 // ---------- the active (process-wide) settings ----------

 static ACTIVE: RwLock<Option<Arc<Cms>>> = RwLock::new(None);
@@ -13,12 +13,9 @@ vectorcraft-geom = { workspace = true }
 vectorcraft-color = { workspace = true }
 kurbo = { workspace = true }
 image = { workspace = true }
-tiff = { workspace = true }
-zune-jpeg = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }

 [dev-dependencies]
-jpeg-encoder = { workspace = true }
 proptest = { workspace = true }
@@ -687,7 +687,6 @@ fn lerp_text(o: &mut TextObject, x: &TextObject, y: &TextObject, t: f64) {
    }
    if resized {
        o.cached_bounds = None;
-        o.cached_baselines.clear();
    }
 }

@@ -1,10 +1,8 @@
-//! Clipped and grouped art read from page descriptions (metafiles, PostScript) into clipping
-//! groups and groups.
+//! Clipped art read from page descriptions (metafiles, PostScript) into clipping groups.
 //!
-//! Importers record each object they draw with the chain of clips (and groups) in force at the
-//! time, outermost first ([`Drawn`]); [`nest`] then puts runs of objects under the same clip into
-//! one clipping group (under the same group into one group), nesting groups for nested clips,
-//! keeping the drawing order.
+//! Importers record each object they draw with the chain of clips in force at the time, outermost
+//! first ([`Drawn`]); [`nest`] then puts runs of objects under the same clip into one clipping
+//! group, nesting groups for nested clips, keeping the drawing order.

 use std::sync::Arc;

@@ -13,30 +11,20 @@ use vectorcraft_geom::{BezPath, FillRule, PathData};
 use crate::appearance::Appearance;
 use crate::{Document, Node, NodeKind};

-/// A clip: a region in document space and its rule, or a plain group (one that holds its art
-/// without clipping it, such as an Illustrator file's `u` … `U`). Each has an id unique within an
-/// import, so what one clip clips (or one group holds) can be grouped.
+/// A clip: a region in document space and its rule. Each has an id unique within an import, so
+/// what one clip clips can be grouped.
 #[derive(Debug)]
 pub struct Clip {
    pub id: u32,
-    /// The region and its rule; `None` for a plain group.
-    pub region: Option<(BezPath, FillRule)>,
-}
-
-/// Deepest nesting of clips, and of groups, an importer records ([`nest`] goes one level deeper
-/// for each): deeper ones are left out.
-pub const MAX_NEST: usize = 128;
-
-/// The warning for clips left out for nesting deeper than [`MAX_NEST`].
-pub fn deep_clips() -> String {
-    format!("clips nested more than {MAX_NEST} deep were left out: what they clip is clipped by the clips around them")
+    pub path: BezPath,
+    pub rule: FillRule,
 }

 /// Objects in drawing order, each with its clips (outermost first).
 pub type Drawn = Vec<(Vec<Arc<Clip>>, Node)>;

-/// The nodes of `items`, those under clips grouped into clipping groups and those in groups into
-/// groups (ids from `doc`), in order.
+/// The nodes of `items`, those under clips grouped into clipping groups (ids from `doc`), in
+/// order.
 pub fn nest(doc: &mut Document, items: Drawn) -> Vec<Arc<Node>> {
    nest_at(doc, items, 0)
 }
@@ -65,18 +53,14 @@ fn nest_at(doc: &mut Document, items: Drawn, depth: usize) -> Vec<Arc<Node>> {
    out
 }

-/// A clipping group of `items`, clipped by `c` (their clip at `depth`), or their group when `c` is
-/// a plain group.
+/// A clipping group of `items`, clipped by `c` (their clip at `depth`).
 fn clip_group(doc: &mut Document, c: &Clip, items: Drawn, depth: usize) -> Arc<Node> {
-    let mut children = vec![];
-    if let Some((bp, r)) = &c.region {
-        let mut path = Node::path(doc.alloc_id(), PathData::from_bezpath(bp), Appearance::default());
-        if let NodeKind::Path { clipping, rule, .. } = &mut path.kind {
-            *clipping = true;
-            *rule = *r;
-        }
-        children.push(Arc::new(path));
+    let mut path = Node::path(doc.alloc_id(), PathData::from_bezpath(&c.path), Appearance::default());
+    if let NodeKind::Path { clipping, rule, .. } = &mut path.kind {
+        *clipping = true;
+        *rule = c.rule;
    }
+    let mut children = vec![Arc::new(path)];
    children.extend(nest_at(doc, items, depth + 1));
-    Arc::new(Node::new(doc.alloc_id(), NodeKind::Group { children, clip: c.region.is_some() }))
+    Arc::new(Node::new(doc.alloc_id(), NodeKind::Group { children, clip: true }))
 }
@@ -1,188 +0,0 @@
-//! CMYK images: the ink amounts of image blobs that hold CMYK samples.
-//!
-//! Two encodings hold them: a four-component JPEG, whose samples are stored inverted with Adobe's
-//! marker (the convention JPEG readers and PDF writers take a CMYK JPEG to follow), and a CMYK
-//! TIFF (8 or 16 bits, chunky, ink amounts as they are). [`ImageBlob::cmyk_tiff`] writes the
-//! latter, Deflate-compressed. Every other image decodes to RGB(A) only.
-
-use std::io::Cursor;
-
-use zune_jpeg::zune_core::bytestream::ZCursor;
-use zune_jpeg::zune_core::colorspace::ColorSpace;
-use zune_jpeg::zune_core::options::DecoderOptions;
-
-use crate::ImageBlob;
-
-/// Most pixels a CMYK image is decoded with (256 MB of samples): larger ones decode as RGB.
-pub const MAX_CMYK_PIXELS: u64 = 1 << 26;
-
-/// The ink amounts of a CMYK image: C, M, Y and K bytes per pixel, 0 is no ink.
-#[derive(Clone, Debug, PartialEq)]
-pub struct Inks {
-    pub width: u32,
-    pub height: u32,
-    pub data: Vec<u8>,
-}
-
-impl Inks {
-    /// `data` as a `width` × `height` image; `None` when it doesn't hold that many pixels, the
-    /// image is empty or it has more than [`MAX_CMYK_PIXELS`].
-    pub fn new(width: u32, height: u32, data: Vec<u8>) -> Option<Self> {
-        let n = pixels(width, height)?;
-        (data.len() as u64 == n * 4).then_some(Self { width, height, data })
-    }
-}
-
-/// `width` × `height` when it is a CMYK image's size: not empty, at most [`MAX_CMYK_PIXELS`].
-fn pixels(width: u32, height: u32) -> Option<u64> {
-    let n = width as u64 * height as u64;
-    (n > 0 && n <= MAX_CMYK_PIXELS).then_some(n)
-}
-
-/// The number of colour components of JPEG `bytes` (its frame header); `None` when they aren't a
-/// JPEG.
-pub fn jpeg_components(bytes: &[u8]) -> Option<usize> {
-    if !bytes.starts_with(&[0xFF, 0xD8]) {
-        return None;
-    }
-    let mut d = zune_jpeg::JpegDecoder::new_with_options(ZCursor::new(bytes), DecoderOptions::default());
-    d.decode_headers().ok()?;
-    Some(d.info()?.components as usize)
-}
-
-fn is_tiff(bytes: &[u8]) -> bool {
-    bytes.starts_with(b"II*\0") || bytes.starts_with(b"MM\0*")
-}
-
-/// The colour type of TIFF `bytes` and its decoder.
-fn tiff(bytes: &[u8]) -> Option<(tiff::ColorType, tiff::decoder::Decoder<Cursor<&[u8]>>)> {
-    if !is_tiff(bytes) {
-        return None;
-    }
-    let mut d = tiff::decoder::Decoder::new(Cursor::new(bytes)).ok()?;
-    Some((d.colortype().ok()?, d))
-}
-
-impl ImageBlob {
-    /// A CMYK TIFF of ink amounts `inks` (Deflate-compressed); `None` when it can't be written.
-    pub fn cmyk_tiff(inks: &Inks) -> Option<Self> {
-        use tiff::encoder::{Compression, TiffEncoder, colortype::CMYK8, compression::DeflateLevel};
-        let mut out = Cursor::new(Vec::new());
-        TiffEncoder::new(&mut out)
-            .ok()?
-            .with_compression(Compression::Deflate(DeflateLevel::Balanced))
-            .write_image::<CMYK8>(inks.width, inks.height, &inks.data)
-            .ok()?;
-        Some(Self::new("image/tiff", out.into_inner()))
-    }
-
-    /// Does the image hold CMYK samples (a four-component JPEG or a CMYK TIFF)? Reads only its
-    /// header.
-    pub fn is_cmyk(&self) -> bool {
-        jpeg_components(&self.bytes) == Some(4) || tiff(&self.bytes).is_some_and(|(t, _)| matches!(t, tiff::ColorType::CMYK(8 | 16)))
-    }
-
-    /// The ink amounts of a CMYK image; `None` for other images, and ones that can't be decoded
-    /// or are larger than [`MAX_CMYK_PIXELS`].
-    pub fn cmyk(&self) -> Option<Inks> {
-        let bytes = self.bytes.as_slice();
-        if bytes.starts_with(&[0xFF, 0xD8]) { jpeg_inks(bytes) } else { tiff_inks(bytes) }
-    }
-}
-
-/// The ink amounts of a four-component JPEG (its samples inverted back; YCCK converted to CMYK
-/// first, as JPEG readers do).
-fn jpeg_inks(bytes: &[u8]) -> Option<Inks> {
-    let mut d = zune_jpeg::JpegDecoder::new_with_options(ZCursor::new(bytes), DecoderOptions::default());
-    d.decode_headers().ok()?;
-    let space = d.input_colorspace()?;
-    if d.info()?.components != 4 || !matches!(space, ColorSpace::CMYK | ColorSpace::YCCK) {
-        return None;
-    }
-    let (w, h) = d.dimensions()?;
-    let (w, h) = (u32::try_from(w).ok()?, u32::try_from(h).ok()?);
-    pixels(w, h)?;
-    d.set_options(DecoderOptions::default().jpeg_set_out_colorspace(space));
-    let mut data = d.decode().ok()?;
-    for p in data.as_chunks_mut::<4>().0 {
-        if space == ColorSpace::YCCK {
-            let [y, cb, cr] = [p[0], p[1], p[2]].map(f32::from);
-            // libjpeg's YCCK → CMYK: the complement of the YCbCr colour's RGB.
-            p[0] = (434.456 - y - 1.402 * cr).clamp(0.0, 255.0) as u8;
-            p[1] = (119.541 - y + 0.344 * cb + 0.714 * cr).clamp(0.0, 255.0) as u8;
-            p[2] = (481.816 - y - 1.772 * cb).clamp(0.0, 255.0) as u8;
-        }
-        for v in p.iter_mut() {
-            *v = 255 - *v;
-        }
-    }
-    Inks::new(w, h, data)
-}
-
-/// The ink amounts of a chunky CMYK TIFF (16-bit samples to 8 bits).
-fn tiff_inks(bytes: &[u8]) -> Option<Inks> {
-    let (kind, mut d) = tiff(bytes)?;
-    let (w, h) = d.dimensions().ok()?;
-    // Planar samples (one plane per ink) would read as interleaved.
-    let planar = d.find_tag_unsigned::<u16>(tiff::tags::Tag::PlanarConfiguration).ok().flatten().is_some_and(|p| p != 1);
-    if !matches!(kind, tiff::ColorType::CMYK(8 | 16)) || planar || pixels(w, h).is_none() {
-        return None;
-    }
-    let data = match d.read_image().ok()? {
-        tiff::decoder::DecodingResult::U8(v) => v,
-        tiff::decoder::DecodingResult::U16(v) => v.iter().map(|s| (s >> 8) as u8).collect(),
-        _ => return None,
-    };
-    Inks::new(w, h, data)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    fn inks() -> Inks {
-        Inks::new(3, 2, vec![0, 40, 100, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 255, 0, 0, 0, 0, 255, 12, 34, 56, 78]).unwrap()
-    }
-
-    #[test]
-    fn a_cmyk_tiff_keeps_its_ink_amounts_and_shows_as_rgb() {
-        let b = ImageBlob::cmyk_tiff(&inks()).unwrap();
-        assert_eq!(b.mime, "image/tiff");
-        assert!(b.is_cmyk());
-        assert_eq!(b.cmyk(), Some(inks()), "lossless");
-        // Every image reader sees an RGB image: cyan is (0, 255, 255).
-        let rgb = image::load_from_memory(&b.bytes).unwrap().to_rgb8();
-        assert_eq!(rgb.get_pixel(1, 0).0, [0, 255, 255]);
-    }
-
-    #[test]
-    fn a_cmyk_jpeg_reads_back_as_ink_amounts() {
-        // A flat CMYK JPEG: Adobe's inverted samples with its marker.
-        let flat = [10u8, 40, 100, 20];
-        let px: Vec<u8> = (0..16 * 16).flat_map(|_| flat).collect();
-        let mut jpg = Vec::new();
-        jpeg_encoder::Encoder::new(&mut jpg, 100).encode(&px, 16, 16, jpeg_encoder::ColorType::Cmyk).unwrap();
-        let b = ImageBlob::new("image/jpeg", jpg);
-        assert_eq!(jpeg_components(&b.bytes), Some(4));
-        assert!(b.is_cmyk());
-        let back = b.cmyk().unwrap();
-        assert_eq!((back.width, back.height), (16, 16));
-        for p in back.data.as_chunks::<4>().0 {
-            assert!(p.iter().zip(flat).all(|(a, b)| a.abs_diff(b) <= 2), "{p:?}");
-        }
-    }
-
-    #[test]
-    fn other_images_are_not_cmyk() {
-        let mut png = Vec::new();
-        image::RgbaImage::new(2, 2).write_to(&mut Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
-        let mut jpg = Vec::new();
-        image::RgbImage::new(8, 8).write_to(&mut Cursor::new(&mut jpg), image::ImageFormat::Jpeg).unwrap();
-        for b in [ImageBlob::png(png), ImageBlob::new("image/jpeg", jpg), ImageBlob::new("image/tiff", b"II*\0junk".to_vec())] {
-            assert!(!b.is_cmyk() && b.cmyk().is_none(), "{}", b.mime);
-        }
-        assert_eq!(Inks::new(2, 2, vec![0; 15]), None, "too few samples");
-        assert_eq!(Inks::new(0, 2, vec![]), None, "empty");
-        assert_eq!(Inks::new(1 << 14, 1 << 13, vec![]), None, "too large");
-    }
-}
@@ -50,39 +50,16 @@ pub struct HitOptions {
    pub outline: bool,
    /// "Object Selection by Path Only" preference.
    pub path_only: bool,
-    /// "Type Object Selection by Path Only" preference: type is picked on its type path only
-    /// (point type's baseline, area type's frame, type on a path's path), not anywhere in its
-    /// bounds.
-    pub type_path_only: bool,
 }

 impl Default for HitOptions {
    fn default() -> Self {
-        Self { tol: 3.0, outline: false, path_only: false, type_path_only: false }
+        Self { tol: 3.0, outline: false, path_only: false }
    }
 }

 /// Topmost editable object under `p`.
 pub fn hit_test(doc: &Document, p: Point, opt: HitOptions) -> Option<Hit> {
-    hit_test_skipping(doc, p, opt, &|_| false)
-}
-
-/// The objects under `p` that [`Hit::top_object`] picks in `scope` (isolation mode), topmost
-/// first: what clicks there select, one below the other (Cmd/Ctrl-click selects behind).
-pub fn objects_at(doc: &Document, p: Point, opt: HitOptions, scope: Option<NodeId>) -> Vec<NodeId> {
-    let mut tops: Vec<NodeId> = vec![];
-    // Each round leaves out the objects found so far (and everything inside them).
-    while let Some(top) = hit_test_skipping(doc, p, opt, &|id| tops.contains(&id)).map(|h| h.top_object(scope)) {
-        if tops.contains(&top) {
-            break;
-        }
-        tops.push(top);
-    }
-    tops
-}
-
-/// [`hit_test`] passing over the nodes `skip` names (and their contents).
-fn hit_test_skipping(doc: &Document, p: Point, opt: HitOptions, skip: &dyn Fn(NodeId) -> bool) -> Option<Hit> {
    let mut chain = Vec::new();
    for layer in doc.layers.iter().rev() {
        if !layer.visible || layer.locked {
@@ -97,7 +74,7 @@ fn hit_test_skipping(doc: &Document, p: Point, opt: HitOptions, skip: &dyn Fn(No
        }
        chain.push(layer.id);
        let opt = if matches!(layer.kind, NodeKind::Layer { preview: false, .. }) { HitOptions { outline: true, ..opt } } else { opt };
-        if let Some(mut h) = hit_children(layer, p, opt, skip, &mut chain) {
+        if let Some(mut h) = hit_children(layer, p, opt, &mut chain) {
            h.contents_of = h.ancestry.iter().rev().copied().find(|a| doc.node(*a).is_some_and(edits_contents));
            h.layers = h.ancestry.iter().take_while(|a| doc.node(**a).is_some_and(Node::is_layer)).count();
            return Some(h);
@@ -122,7 +99,7 @@ fn clip_contains(clip: &Node, p: Point) -> bool {
    clip.clip_shapes(Some(&frame)).iter().any(|(bp, rule)| fill_contains(bp, *rule, p))
 }

-fn hit_children(parent: &Node, p: Point, opt: HitOptions, skip: &dyn Fn(NodeId) -> bool, chain: &mut Vec<NodeId>) -> Option<Hit> {
+fn hit_children(parent: &Node, p: Point, opt: HitOptions, chain: &mut Vec<NodeId>) -> Option<Hit> {
    let children = parent.children()?;
    // A clip group (or a layer with a clipping mask) only hits inside its clipping path.
    if parent.clips()
@@ -133,7 +110,7 @@ fn hit_children(parent: &Node, p: Point, opt: HitOptions, skip: &dyn Fn(NodeId)
    }
    for c in children.iter().rev() {
        // Hidden, locked and template sublayers block clicks like top-level layers do.
-        if !c.visible || c.locked || c.is_template() || skip(c.id) {
+        if !c.visible || c.locked || c.is_template() {
            continue;
        }
        // (An envelope's content sits where it was, not where the envelope draws it.)
@@ -146,13 +123,13 @@ fn hit_children(parent: &Node, p: Point, opt: HitOptions, skip: &dyn Fn(NodeId)
        chain.push(c.id);
        let hit = match &c.kind {
            // A sublayer whose Preview is off is clicked in outline, like an outline view.
-            NodeKind::Layer { preview: false, .. } => hit_children(c, p, HitOptions { outline: true, ..opt }, skip, chain),
-            NodeKind::Layer { .. } | NodeKind::Group { .. } => hit_children(c, p, opt, skip, chain),
+            NodeKind::Layer { preview: false, .. } => hit_children(c, p, HitOptions { outline: true, ..opt }, chain),
+            NodeKind::Layer { .. } | NodeKind::Group { .. } => hit_children(c, p, opt, chain),
            // Edit Contents: the envelope's content hits, undistorted.
-            NodeKind::Envelope { editing: true, .. } => hit_children(c, p, opt, skip, chain),
+            NodeKind::Envelope { editing: true, .. } => hit_children(c, p, opt, chain),
            // A blend's key objects first (Direct and Group Selection pick them); its steps hit
            // as the blend.
-            NodeKind::Blend { .. } => hit_children(c, p, opt, skip, chain)
+            NodeKind::Blend { .. } => hit_children(c, p, opt, chain)
                .or_else(|| hit_leaf(c, p, opt).map(|kind| Hit { leaf: c.id, ancestry: chain.clone(), kind, contents_of: None, layers: 1 })),
            _ => hit_leaf(c, p, opt).map(|kind| Hit { leaf: c.id, ancestry: chain.clone(), kind, contents_of: None, layers: 1 }),
        };
@@ -192,12 +169,7 @@ fn hit_leaf(n: &Node, p: Point, opt: HitOptions) -> Option<HitKind> {
            if let Some(k) = hit_stroke(n, &bp, *rule, p, opt) {
                return Some(k);
            }
-            (!opt.outline && !opt.path_only && fill_contains(&bp, *rule, p)).then_some(HitKind::Fill)
-        }
-        // The type path lies within the bounds: they rule out the rest before it is measured.
-        NodeKind::Text(t) if opt.type_path_only => {
-            n.geometric_bounds().filter(|b| b.inflate(opt.tol, opt.tol).contains(p))?;
-            on_type_path(n, t, p, opt.tol).then_some(HitKind::Outline)
+            (!opt.outline && fill_contains(&bp, *rule, p)).then_some(HitKind::Fill)
        }
        NodeKind::Text(_) | NodeKind::Image(_) | NodeKind::SymbolInstance { .. } | NodeKind::Blend { .. } | NodeKind::Envelope { .. } => {
            n.geometric_bounds().filter(|b| b.inflate(opt.tol, opt.tol).contains(p)).map(|_| HitKind::Bounds)
@@ -214,28 +186,6 @@ fn hit_leaf(n: &Node, p: Point, opt: HitOptions) -> Option<HitKind> {
    }
 }

-/// Is `p` within `tol` of the type path of `t` (in `n`), what "Type Object Selection by Path
-/// Only" picks type by: its baselines ([`crate::TextObject::baselines`]), area type's frame and
-/// type on a path's path, drawn through `n`'s perspective projection if it has one.
-fn on_type_path(n: &Node, t: &crate::TextObject, p: Point, tol: f64) -> bool {
-    use crate::TextKind;
-    use vectorcraft_geom::kurbo::ParamCurveNearest;
-    let h = n.projection();
-    let project = |q: Point| h.as_ref().and_then(|h| h.apply(q)).unwrap_or(q);
-    // A homography keeps straight lines straight: a baseline's ends are enough.
-    let near = |(a, b): (Point, Point)| vectorcraft_geom::Line::new(project(t.xf * a), project(t.xf * b)).nearest(p, 1e-9).distance_sq <= tol * tol;
-    if t.baselines().any(near) {
-        return true;
-    }
-    let (TextKind::Area { frame: path } | TextKind::OnPath { path, .. }) = &t.kind else { return false };
-    let mut path = path.transformed(t.xf);
-    if h.is_some() {
-        let piece = path.bounds().map_or(1.0, |b| (b.width().max(b.height()) / 64.0).max(0.25));
-        path = crate::live::map_nonlinear(&path, piece, project);
-    }
-    stroke_contains(&path.to_bezpath(), 0.0, tol, p)
-}
-
 /// Hit anywhere in an evaluated subtree (groups recurse; leaves use [`hit_leaf`]).
 fn hit_any(n: &Node, p: Point, opt: HitOptions) -> Option<HitKind> {
    match &n.kind {
@@ -416,142 +366,6 @@ mod tests {
        assert!(hit_test(&d, Point::new(0.5, 25.0), HitOptions::default()).is_some());
    }

-    /// Object Selection by Path Only: a filled path or compound path hits on its outline only.
-    #[test]
-    fn path_only_leaves_out_fills() {
-        let mut d = Document::new(200.0, 200.0);
-        let l = d.layers[0].id;
-        let (a, c) = (d.alloc_id(), d.alloc_id());
-        d.insert(Some(l), 0, Node::path(a, shapes::rectangle(Rect::new(0.0, 0.0, 50.0, 50.0)), Appearance::default_art())).unwrap();
-        let inner = Node::path(d.alloc_id(), shapes::rectangle(Rect::new(100.0, 0.0, 150.0, 50.0)), Appearance::default());
-        let mut compound = Node::new(c, NodeKind::Compound { children: vec![Arc::new(inner)], rule: vectorcraft_geom::FillRule::NonZero });
-        compound.appearance = Appearance::default_art();
-        d.insert(Some(l), 9, compound).unwrap();
-        let path_only = HitOptions { path_only: true, ..Default::default() };
-        for (id, inside, edge) in [(a, Point::new(25.0, 25.0), Point::new(0.5, 25.0)), (c, Point::new(125.0, 25.0), Point::new(100.5, 25.0))] {
-            assert_eq!(hit_test(&d, inside, HitOptions::default()).map(|h| h.leaf), Some(id), "the fill hits");
-            assert!(hit_test(&d, inside, path_only).is_none(), "path only: the fill of {id:?} doesn't hit");
-            assert_eq!(hit_test(&d, edge, path_only).map(|h| h.leaf), Some(id), "path only: the outline does");
-        }
-    }
-
-    /// Type Object Selection by Path Only: point type is picked on its baseline, area type on its
-    /// frame and type on a path on its path, no longer anywhere in its bounds.
-    #[test]
-    fn type_path_only_picks_type_on_its_path() {
-        use crate::{CharStyle, TextKind, TextObject};
-        let mut d = Document::new(400.0, 400.0);
-        let l = d.layers[0].id;
-        let mut add = |t: TextObject| {
-            let id = d.alloc_id();
-            d.insert(Some(l), 9, Node::new(id, NodeKind::Text(Box::new(t)))).unwrap();
-            id
-        };
-        // Point type at (10, 100), 20 pt: its glyphs rise above the baseline, its layout is 60 wide.
-        let mut point = TextObject::point(Point::new(10.0, 100.0), "Hello", CharStyle { size: 20.0, ..CharStyle::default() });
-        point.cached_bounds = Some(Rect::new(0.0, -16.0, 60.0, 4.0));
-        let point = add(point);
-        let mut area = TextObject::point(Point::new(200.0, 200.0), "Area", CharStyle::default());
-        area.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 50.0)) };
-        let area = add(area);
-        let mut on_path = TextObject::point(Point::new(10.0, 300.0), "Path", CharStyle::default());
-        on_path.kind = TextKind::OnPath { path: shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 40.0)), start: 0.0, end: None };
-        let on_path = add(on_path);
-        let path_only = HitOptions { type_path_only: true, ..Default::default() };
-        let hit = |p: Point, opt: HitOptions| hit_test(&d, p, opt).map(|h| (h.leaf, h.kind));
-        // Off: anywhere in the bounds.
-        assert_eq!(hit(Point::new(40.0, 90.0), HitOptions::default()), Some((point, HitKind::Bounds)));
-        assert_eq!(hit(Point::new(250.0, 225.0), HitOptions::default()), Some((area, HitKind::Bounds)));
-        assert_eq!(hit(Point::new(60.0, 320.0), HitOptions::default()), Some((on_path, HitKind::Bounds)));
-        // On: the glyphs and the inside of the frame or path no longer pick the type.
-        assert_eq!(hit(Point::new(40.0, 90.0), path_only), None, "point type: among its glyphs");
-        assert_eq!(hit(Point::new(250.0, 225.0), path_only), None, "area type: inside its frame");
-        assert_eq!(hit(Point::new(60.0, 320.0), path_only), None, "type on a path: inside its path");
-        // The baseline (within the tolerance, across the layout's width), frame and path do.
-        assert_eq!(hit(Point::new(40.0, 101.5), path_only), Some((point, HitKind::Outline)), "point type: its baseline");
-        assert_eq!(hit(Point::new(75.0, 100.0), path_only), None, "point type: past the end of its layout");
-        assert_eq!(hit(Point::new(250.0, 200.5), path_only), Some((area, HitKind::Outline)), "area type: its frame");
-        assert_eq!(hit(Point::new(60.0, 339.5), path_only), Some((on_path, HitKind::Outline)), "type on a path: its path");
-    }
-
-    /// Type Object Selection by Path Only with the layout's baselines: every line's for point type,
-    /// area type's besides its frame, a vertical column's centre line, and type in perspective
-    /// where it is drawn.
-    #[test]
-    fn type_path_only_picks_every_baseline() {
-        use crate::{CharStyle, PerspectiveAttachment, TextKind, TextObject};
-        use vectorcraft_geom::{Affine, Homography};
-        let mut d = Document::new(400.0, 400.0);
-        let l = d.layers[0].id;
-        let mut add = |t: TextObject, perspective: Option<Affine>| {
-            let mut n = Node::new(d.alloc_id(), NodeKind::Text(Box::new(t)));
-            n.perspective = perspective.map(|a| {
-                Box::new(PerspectiveAttachment { projection: Some(Homography::from_affine(a).to_array()), ..PerspectiveAttachment::new("left", 0.0) })
-            });
-            let id = n.id;
-            d.insert(Some(l), 9, n).unwrap();
-            id
-        };
-        let style = CharStyle { size: 20.0, ..CharStyle::default() };
-        // Two lines of point type at (10, 100), 24 pt apart.
-        let mut point = TextObject::point(
-            Point::new(10.0, 100.0),
-            "Hello
-world",
-            style.clone(),
-        );
-        point.cached_bounds = Some(Rect::new(0.0, -16.0, 60.0, 28.0));
-        point.cached_baselines = vec![(Point::ZERO, Point::new(60.0, 0.0)), (Point::new(0.0, 24.0), Point::new(50.0, 24.0))];
-        let point = add(point, None);
-        // Area type: a line inside its frame.
-        let mut area = TextObject::point(Point::new(200.0, 50.0), "Area", style.clone());
-        area.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, 100.0, 50.0)) };
-        area.cached_baselines = vec![(Point::new(0.0, 16.0), Point::new(40.0, 16.0))];
-        let area = add(area, None);
-        // Vertical point type at (300, 200) with no baselines cached: down its first column.
-        let mut vertical = TextObject::point(Point::new(300.0, 200.0), "Tate", style.clone());
-        vertical.vertical = true;
-        vertical.cached_bounds = Some(Rect::new(-10.0, 0.0, 10.0, 80.0));
-        let vertical = add(vertical, None);
-        // Point type drawn 100 to the right of where it is laid out.
-        let mut moved = TextObject::point(Point::new(10.0, 350.0), "Moved", style);
-        moved.cached_bounds = Some(Rect::new(0.0, -16.0, 60.0, 4.0));
-        let moved = add(moved, Some(Affine::translate((100.0, 0.0))));
-        let path_only = HitOptions { type_path_only: true, ..Default::default() };
-        let hit = |p: Point| hit_test(&d, p, path_only).map(|h| h.leaf);
-        assert_eq!(hit(Point::new(40.0, 100.0)), Some(point), "the first line's baseline");
-        assert_eq!(hit(Point::new(40.0, 125.0)), Some(point), "the second line's");
-        assert_eq!(hit(Point::new(40.0, 112.0)), None, "between the lines");
-        assert_eq!(hit(Point::new(65.0, 124.0)), None, "past the end of the shorter second line");
-        assert_eq!(hit(Point::new(220.0, 66.0)), Some(area), "area type: a line's baseline");
-        assert_eq!(hit(Point::new(220.0, 80.0)), None, "area type: inside the frame, off the baselines");
-        assert_eq!(hit(Point::new(299.0, 260.0)), Some(vertical), "vertical type: down the column");
-        assert_eq!(hit(Point::new(306.0, 260.0)), None, "vertical type: beside it");
-        assert_eq!(hit(Point::new(140.0, 351.0)), Some(moved), "in perspective: where it is drawn");
-        assert_eq!(hit(Point::new(40.0, 351.0)), None, "in perspective: not where it is laid out");
-    }
-
-    /// `objects_at`: every object under the point, topmost first; a group counts once.
-    #[test]
-    fn objects_at_lists_the_stack() {
-        let mut d = Document::new(200.0, 200.0);
-        let l = d.layers[0].id;
-        let rect =
-            |d: &mut Document, x: f64| Node::path(d.alloc_id(), shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::default_art());
-        let a = rect(&mut d, 0.0);
-        let (b, c) = (rect(&mut d, 10.0), rect(&mut d, 20.0));
-        let (a_id, b_id, c_id, g) = (a.id, b.id, c.id, d.alloc_id());
-        d.insert(Some(l), 0, a).unwrap();
-        d.insert(Some(l), 9, Node::group(g, vec![Arc::new(b), Arc::new(c)])).unwrap();
-        let far = rect(&mut d, 120.0);
-        d.insert(Some(l), 9, far).unwrap();
-        let at = |x: f64, scope| objects_at(&d, Point::new(x, 25.0), HitOptions::default(), scope);
-        assert_eq!(at(30.0, None), vec![g, a_id]);
-        assert_eq!(at(30.0, Some(g))[..2], [c_id, b_id], "isolated: the group's own objects");
-        assert_eq!(at(5.0, None), vec![a_id]);
-        assert!(at(90.0, None).is_empty());
-    }
-
    #[test]
    fn locked_and_hidden_skip() {
        let mut d = Document::new(200.0, 200.0);
@@ -9,7 +9,6 @@ pub mod appearance;
 pub mod assets;
 pub mod blend;
 pub mod clipnest;
-pub mod cmyk;
 pub mod graph;
 pub mod hit;
 pub mod inks;
@@ -78,15 +77,15 @@ pub use setup::{Background, DocSetup, ExportText, GridSize, Quotes};
 pub use slices::{CellAlign, CellVAlign, Slice, SliceArea, SliceKind, SliceOptions, SliceSource};
 pub use style_libs::StyleLibrary;
 pub use text::{
-    AreaOptions, Burasagari, CharAlign, CharPosition, CharStyle, FirstBaseline, Justify, LeadingModel, Mojikumi, ParaDirection, ParaStyle, PathAlign,
-    PathEffect, ScriptMetrics, TabAlign, TabStop, TextKind, TextObject, TextRun, TextStyleDef, TextWrap, WrapShape,
+    AreaOptions, CharPosition, CharStyle, FirstBaseline, Justify, ParaStyle, PathEffect, ScriptMetrics, TabAlign, TabStop, TextKind, TextObject,
+    TextRun, TextStyleDef, TextWrap, WrapShape,
 };
 pub use vectorcraft_color as color;
 pub use vectorcraft_geom as geom;

 use serde::{Deserialize, Serialize};
 use vectorcraft_color::{Swatch, SwatchGroup};
-use vectorcraft_geom::{Point, Rect, Vec2};
+use vectorcraft_geom::{Point, Rect};

 #[derive(Debug, thiserror::Error, PartialEq)]
 pub enum DocError {
@@ -167,18 +166,6 @@ impl Unit {
            Unit::Feet => "Feet",
        }
    }
-    /// The rulers' label step at `zoom` (screen pixels per point), in this unit: the first of
-    /// 1, 2, 5 × 10ⁿ that puts labels at least 50 pixels apart. Ticks mark every tenth of it.
-    pub fn ruler_step(self, zoom: f64) -> f64 {
-        const STEPS: [f64; 19] =
-            [0.01, 0.02, 0.05, 0.1, 0.2, 0.5, 1.0, 2.0, 5.0, 10.0, 25.0, 50.0, 100.0, 200.0, 500.0, 1000.0, 2000.0, 5000.0, 10000.0];
-        STEPS.iter().copied().find(|s| s * self.points() * zoom >= 50.0).unwrap_or(10000.0)
-    }
-    /// `v` (points) on the nearest ruler tick at `zoom` ([`Self::ruler_step`]).
-    pub fn snap_to_ruler_tick(self, v: f64, zoom: f64) -> f64 {
-        let tick = self.ruler_step(zoom) / 10.0 * self.points();
-        (v / tick).round() * tick
-    }
    pub fn from_pt(self, v: f64) -> f64 {
        v / self.points()
    }
@@ -191,10 +178,7 @@ impl Unit {
    }
    /// [`Unit::format`] without the suffix (`12.5`), for narrow fields.
    pub fn number(self, pt: f64) -> String {
-        // Three decimals for the small units (`595.276 pt`), four for the large ones (`8.2677 in`,
-        // `35.2778 mm`, the `0.0078 in` stroke preset); trailing zeros are trimmed (`1 pt` is `1`).
-        let decimals = if matches!(self, Unit::Points | Unit::Pixels | Unit::Picas) { 3 } else { 4 };
-        let s = format!("{:.*}", decimals, self.from_pt(pt));
+        let s = format!("{:.3}", self.from_pt(pt));
        let s = s.trim_end_matches('0').trim_end_matches('.');
        if s == "-0" { "0".into() } else { s.into() }
    }
@@ -355,53 +339,11 @@ pub struct SavedView {
    pub rotation: f64,
 }

-/// A saved selection (Select → Save Selection…): the objects that were selected, listed by name at
-/// the bottom of the Select menu.
-#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct SavedSelection {
-    pub name: String,
-    pub objects: Vec<NodeId>,
-}
-
-impl SavedSelection {
-    /// Most saved selections a document keeps (the Select menu lists every one).
-    pub const MAX: usize = 25;
-    /// Longest name, in characters.
-    pub const MAX_NAME: usize = 255;
-
-    /// `name` trimmed and cut to [`Self::MAX_NAME`] characters (`None` when blank).
-    pub fn clean_name(name: &str) -> Option<String> {
-        let name: String = name.trim().chars().take(Self::MAX_NAME).collect();
-        (!name.is_empty()).then_some(name)
-    }
-
-    /// The first "Selection N" none of `saved` is named.
-    pub fn default_name(saved: &[SavedSelection]) -> String {
-        (1..=saved.len() + 1).map(|i| format!("Selection {i}")).find(|n| !saved.iter().any(|x| &x.name == n)).unwrap_or_default()
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 pub struct Guide {
    /// true = vertical guide at `pos` (x), false = horizontal at `pos` (y).
    pub vertical: bool,
    pub pos: f64,
-    /// An artboard guide: the [`Artboard::id`] it belongs to. It runs across that artboard only
-    /// and moves, is copied and is deleted with it. None: a canvas guide, across the whole canvas.
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    pub artboard: Option<u32>,
-}
-
-impl Guide {
-    /// A canvas guide.
-    pub fn new(vertical: bool, pos: f64) -> Self {
-        Self { vertical, pos, artboard: None }
-    }
-
-    /// Moved by `d` (a vertical guide across, a horizontal one down).
-    pub fn moved(&self, d: Vec2) -> Self {
-        Self { pos: self.pos + if self.vertical { d.x } else { d.y }, ..self.clone() }
-    }
 }

 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -548,9 +490,6 @@ pub struct Document {
    /// View → New View… (up to 25, like Illustrator).
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub views: Vec<SavedView>,
-    /// Select → Save Selection… (at most [`SavedSelection::MAX`]); saved with the document.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub saved_selections: Vec<SavedSelection>,
    #[serde(default)]
    pub grid: GridPrefs,
    #[serde(default = "ppi72")]
@@ -677,7 +616,6 @@ impl Document {
            symbols: vec![],
            guides: vec![],
            views: vec![],
-            saved_selections: vec![],
            grid: GridPrefs::default(),
            raster_effects_ppi: 72.0,
            images: BTreeMap::new(),
@@ -872,17 +810,15 @@ impl Document {
        self.layers.push(Arc::new(Node::layer(id, &name, LayerColor::Preset((n % LAYER_COLORS.len()) as u8))));
        id
    }
-    /// The default name of a new layer or sublayer, "Layer N". Layers and sublayers share the
-    /// numbering: it starts after the number of layers there are and skips any layer's name.
    pub fn next_layer_name(&self) -> String {
-        let (mut count, mut taken) = (0, std::collections::HashSet::new());
-        self.walk(|n| {
-            if n.is_layer() {
-                count += 1;
-                taken.extend(n.name.as_deref());
+        let mut i = self.layers.len() + 1;
+        loop {
+            let name = format!("Layer {i}");
+            if !self.layers.iter().any(|l| l.name.as_deref() == Some(&name)) {
+                return name;
            }
-        });
-        (count + 1..).map(|i| format!("Layer {i}")).find(|name| !taken.contains(name.as_str())).unwrap_or_default()
+            i += 1;
+        }
    }

    /// Visit every node depth first in paint order (bottom to top).
@@ -933,70 +869,6 @@ impl Document {
    pub fn artboard_at(&self, p: Point) -> Option<usize> {
        self.artboards.iter().rposition(|a| a.rect.contains(p))
    }
-    /// The art that moves with an artboard at `rect`: top-level objects (children of layers and
-    /// sublayers) lying entirely inside it. Locked and hidden objects and layers stay put unless
-    /// `locked_and_hidden` (Selection & Anchor Display › Move Locked and Hidden Artwork with
-    /// Artboard).
-    pub fn art_on_artboard(&self, rect: Rect, locked_and_hidden: bool) -> Vec<NodeId> {
-        fn collect(n: &Node, rect: Rect, all: bool, out: &mut Vec<NodeId>) {
-            for c in n.children().into_iter().flatten().filter(|c| c.rides_with_artboard(all)) {
-                if c.is_layer() {
-                    collect(c, rect, all, out);
-                } else if let Some(b) = c.geometric_bounds()
-                    && rect.contains(Point::new(b.x0, b.y0))
-                    && rect.contains(Point::new(b.x1, b.y1))
-                {
-                    out.push(c.id);
-                }
-            }
-        }
-        let mut art = vec![];
-        for l in self.layers.iter().filter(|l| l.rides_with_artboard(locked_and_hidden)) {
-            collect(l, rect, locked_and_hidden, &mut art);
-        }
-        art
-    }
-    /// Where ruler guide `g` runs along its line (the y range of a vertical guide): across its
-    /// artboard for an artboard guide, None (the whole canvas) for a canvas guide or one whose
-    /// artboard is gone.
-    pub fn guide_span(&self, g: &Guide) -> Option<(f64, f64)> {
-        let r = self.artboards.iter().find(|a| Some(a.id) == g.artboard)?.rect;
-        Some(if g.vertical { (r.y0, r.y1) } else { (r.x0, r.x1) })
-    }
-    /// Does ruler guide `g` run past `p` (up to `tol` beyond its ends)?
-    pub fn guide_passes(&self, g: &Guide, p: Point, tol: f64) -> bool {
-        let along = if g.vertical { p.y } else { p.x };
-        self.guide_span(g).is_none_or(|(a, b)| along >= a - tol && along <= b + tol)
-    }
-    /// Keep the ruler guides `keep` accepts (by index), the selected ones left keeping their
-    /// place among the rest (the selected art stays selected). Returns how many went.
-    pub fn retain_guides(&mut self, sel: &mut Selection, keep: impl Fn(usize, &Guide) -> bool) -> usize {
-        let kept: Vec<bool> = self.guides.iter().enumerate().map(|(i, g)| keep(i, g)).collect();
-        // Where each kept guide ends up.
-        let (mut to, mut n) = (Vec::with_capacity(kept.len()), 0);
-        for k in &kept {
-            to.push(k.then_some(n));
-            n += usize::from(*k);
-        }
-        sel.guides = sel.guides.iter().filter_map(|i| to.get(*i).copied().flatten()).collect();
-        let before = self.guides.len();
-        let mut flags = kept.into_iter();
-        self.guides.retain(|_| flags.next().unwrap_or(true));
-        before - self.guides.len()
-    }
-    /// Move the guides of artboard `id` by `d` (along with their artboard).
-    pub fn move_artboard_guides(&mut self, id: u32, d: Vec2) {
-        for g in self.guides.iter_mut().filter(|g| g.artboard == Some(id)) {
-            *g = g.moved(d);
-        }
-    }
-    /// Copy the guides of artboard `from` onto artboard `to`, `d` away (with a copy of their
-    /// artboard).
-    pub fn copy_artboard_guides(&mut self, from: u32, to: u32, d: Vec2) {
-        let copies: Vec<Guide> =
-            self.guides.iter().filter(|g| g.artboard == Some(from)).map(|g| Guide { artboard: Some(to), ..g.moved(d) }).collect();
-        self.guides.extend(copies);
-    }
    pub fn next_artboard_id(&self) -> u32 {
        self.artboards.iter().map(|a| a.id).max().unwrap_or(0) + 1
    }
@@ -1019,33 +891,6 @@ impl Document {
 }

 impl Document {
-    /// Saved selections as a file gives them, made safe to list and recall: at most
-    /// [`SavedSelection::MAX`], each with a clean, unique name and naming objects this document
-    /// has, each once. (An id it doesn't have would select whatever object takes that id later.)
-    pub fn tidy_saved_selections(&mut self) {
-        if self.saved_selections.is_empty() {
-            return;
-        }
-        let mut ids = std::collections::HashSet::new();
-        self.walk(|n| {
-            ids.insert(n.id);
-        });
-        let mut kept: Vec<SavedSelection> = vec![];
-        for s in std::mem::take(&mut self.saved_selections) {
-            if kept.len() >= SavedSelection::MAX {
-                break;
-            }
-            let Some(name) = SavedSelection::clean_name(&s.name) else { continue };
-            if kept.iter().any(|k| k.name == name) {
-                continue;
-            }
-            let mut seen = std::collections::HashSet::new();
-            let objects = s.objects.into_iter().filter(|id| ids.contains(id) && seen.insert(*id)).collect();
-            kept.push(SavedSelection { name, objects });
-        }
-        self.saved_selections = kept;
-    }
-
    /// Leave opacity-mask editing: drop the temporary editing layer, a working copy of art the
    /// mask already holds (the engine syncs it after every edit).
    pub fn drop_edit_modes(&mut self) {
@@ -1144,23 +989,6 @@ mod tests {
        assert_eq!(d.artboards[0].rect, Rect::new(0.0, 0.0, 612.0, 792.0));
    }

-    #[test]
-    fn art_on_artboard_takes_unlocked_objects_wholly_inside() {
-        let (mut d, a, b) = doc_with_rects();
-        let wide = Rect::new(-1.0, -1.0, 40.0, 15.0);
-        assert_eq!(d.art_on_artboard(Rect::new(-1.0, -1.0, 15.0, 15.0), false), vec![a]);
-        assert_eq!(d.art_on_artboard(Rect::new(-1.0, -1.0, 25.0, 15.0), false), vec![a], "b only half inside");
-        d.node_mut(a).unwrap().locked = true;
-        assert_eq!(d.art_on_artboard(wide, false), vec![b]);
-        // Move Locked and Hidden Artwork with Artboard (#394): hidden art stays too, unless on.
-        d.node_mut(b).unwrap().visible = false;
-        assert!(d.art_on_artboard(wide, false).is_empty());
-        assert_eq!(d.art_on_artboard(wide, true), vec![a, b]);
-        Arc::make_mut(&mut d.layers[0]).locked = true;
-        assert!(d.art_on_artboard(wide, false).is_empty());
-        assert_eq!(d.art_on_artboard(wide, true), vec![a, b], "a locked layer's art too");
-    }
-
    #[test]
    fn find_and_paths() {
        let (d, a, b) = doc_with_rects();
@@ -589,46 +589,6 @@ impl GradientMesh {
        self.rows >= 1 && self.cols >= 1 && self.points.len() == (self.rows as usize + 1) * (self.cols as usize + 1)
    }

-    /// A 1×1 mesh from its four corners (bottom-left, top-left, top-right, bottom-right in u/v
-    /// order: row 0 is v = 0, columns follow u), each with its handles ([`H_RIGHT`] …).
-    fn patch(corners: [(Point, [Vec2; 4], Color); 4]) -> Self {
-        let point = |(p, handles, color): (Point, [Vec2; 4], Color)| MeshPoint { p, color, opacity: 1.0, handles };
-        let [a, b, c, d] = corners;
-        Self { rows: 1, cols: 1, points: vec![point(a), point(d), point(b), point(c)] }
-    }
-
-    /// A 1×1 mesh from a Coons patch's twelve boundary points (in the order PDF and PostScript
-    /// shadings list them: v runs cp0 → cp3 along cp1 and cp2, u runs cp0 → cp9 along cp11 and
-    /// cp10) and its corner colours (at cp0, cp3, cp6, cp9); `None` if a point isn't finite.
-    pub fn coons(cp: &[Point; 12], colors: [Color; 4]) -> Option<Self> {
-        if !cp.iter().all(|p| p.is_finite()) {
-            return None;
-        }
-        let h = |a: usize, b: usize| cp[b] - cp[a];
-        let handles = |right: Vec2, left: Vec2, down: Vec2, up: Vec2| {
-            let mut h = [Vec2::ZERO; 4];
-            (h[H_RIGHT], h[H_LEFT], h[H_DOWN], h[H_UP]) = (right, left, down, up);
-            h
-        };
-        let [c0, c1, c2, c3] = colors;
-        Some(Self::patch([
-            (cp[0], handles(h(0, 11), Vec2::ZERO, h(0, 1), Vec2::ZERO), c0),
-            (cp[3], handles(h(3, 4), Vec2::ZERO, Vec2::ZERO, h(3, 2)), c1),
-            (cp[6], handles(Vec2::ZERO, h(6, 5), Vec2::ZERO, h(6, 7)), c2),
-            (cp[9], handles(Vec2::ZERO, h(9, 10), h(9, 8), Vec2::ZERO), c3),
-        ]))
-    }
-
-    /// A 1×1 mesh of a Gouraud-shaded triangle (a patch with two corners together); `None` if a
-    /// point isn't finite.
-    pub fn triangle(corners: [(Point, Color); 3]) -> Option<Self> {
-        if !corners.iter().all(|(p, _)| p.is_finite()) {
-            return None;
-        }
-        let [a, b, c] = corners.map(|(p, color)| (p, [Vec2::ZERO; 4], color));
-        Some(Self::patch([a, b, c, c]))
-    }
-
    /// A mesh over surface `s` (u, v ∈ [0,1]) with handles from its partial derivatives.
    pub fn from_surface(rows: u32, cols: u32, s: &dyn Fn(f64, f64) -> Point, color: &dyn Fn(f64, f64) -> Color) -> Self {
        let (us, vs) = (even_steps(cols), even_steps(rows));
@@ -1,17 +1,14 @@
 //! Document nodes.

-use std::collections::BTreeSet;
 use std::sync::Arc;

 use serde::{Deserialize, Serialize};
 use vectorcraft_color::BlendMode;
-use vectorcraft_geom::shapes::{self, CornerKind};
-use vectorcraft_geom::{Affine, BezPath, FillRule, PathData, Point, Rect};
+use vectorcraft_geom::{Affine, BezPath, FillRule, PathData, Point, Rect, shapes};

 use crate::appearance::Appearance;
 use crate::live::{BlendSpec, EnvelopeKind, GradientMesh, Outliner};
 use crate::pattern::RepeatSpec;
-use crate::selection::AnchorRef;
 use crate::text::TextObject;

 /// Stable per-document object id. Never reused.
@@ -85,9 +82,6 @@ pub enum LiveShape {
        /// Corner radii: top-left, top-right, bottom-right, bottom-left. In the same units as
        /// `w`/`h`: the corners are circular arcs in the document whenever `xf` doesn't scale.
        radii: [f64; 4],
-        /// Corner kinds, in the same order (Live Corners' corner types).
-        #[serde(default, skip_serializing_if = "all_round")]
-        kinds: [CornerKind; 4],
        /// Maps the untransformed shape (origin at its top-left) into the document. A rotation
        /// or reflection plus a move, unless a shear (or a file saved before transforms folded
        /// their scale into `w`/`h`) put more in it.
@@ -124,8 +118,15 @@ impl LiveShape {
    /// Regenerate the path.
    pub fn to_path(&self) -> PathData {
        match self {
-            LiveShape::Rectangle { w, h, radii, kinds, xf } => {
-                shapes::rectangle_with_corners(Rect::new(0.0, 0.0, *w, *h), *radii, *kinds).transformed(*xf)
+            LiveShape::Rectangle { w, h, radii, xf } => {
+                let r = Rect::new(0.0, 0.0, *w, *h);
+                let p = if radii.iter().all(|x| (x - radii[0]).abs() < 1e-9) {
+                    shapes::rounded_rectangle(r, radii[0])
+                } else {
+                    // Per-corner radii: generate uniformly then adjust (approximation until M2.5).
+                    shapes::rounded_rectangle(r, radii.iter().cloned().fold(0.0, f64::max))
+                };
+                p.transformed(*xf)
            }
            LiveShape::Ellipse { w, h, xf, .. } => shapes::ellipse(Rect::new(0.0, 0.0, *w, *h)).transformed(*xf),
            LiveShape::Polygon { radius, sides, xf } => shapes::polygon(Point::ZERO, *radius, *sides, 0.0).transformed(*xf),
@@ -143,11 +144,24 @@ impl LiveShape {
    /// scale in `xf` keep their exact geometry until they're next transformed).
    pub fn transform(&mut self, a: Affine) -> bool {
        match self {
-            LiveShape::Rectangle { xf, .. } => {
-                *xf = a * *xf;
+            LiveShape::Rectangle { w, h, radii, xf } => {
+                let m = a * *xf;
                let [a0, a1, a2, a3, _, _] = a.as_coeffs();
                let moves_only = (a0 - 1.0).abs() < 1e-12 && a1.abs() < 1e-12 && a2.abs() < 1e-12 && (a3 - 1.0).abs() < 1e-12;
-                !moves_only && self.fold_scale()
+                let [m0, m1, m2, m3, m4, m5] = m.as_coeffs();
+                let (sx, sy) = (m0.hypot(m1), m2.hypot(m3));
+                let orthogonal = sx > 1e-12 && sy > 1e-12 && (m0 * m2 + m1 * m3).abs() <= 1e-9 * sx * sy;
+                let finite = m.as_coeffs().iter().all(|c| c.is_finite()) && w.is_finite() && h.is_finite();
+                if moves_only || !orthogonal || !finite {
+                    *xf = m;
+                    return false;
+                }
+                let k = (sx * sy).sqrt();
+                radii.iter_mut().for_each(|r| *r *= k);
+                *w *= sx;
+                *h *= sy;
+                *xf = Affine::new([m0 / sx, m1 / sx, m2 / sy, m3 / sy, m4, m5]);
+                true
            }
            LiveShape::Ellipse { xf, .. } | LiveShape::Polygon { xf, .. } => {
                *xf = a * *xf;
@@ -160,35 +174,6 @@ impl LiveShape {
            }
        }
    }
-    /// Move the scale of a rectangle's `xf` into `w`/`h` (and its radii, by the mean scale), so
-    /// `xf` keeps only a rotation or reflection plus a move and the corners are circular in the
-    /// document. False (and nothing changes) when there is no scale to move, when `xf` shears or
-    /// isn't finite, and for other shapes. Files saved before transforms did this (#291) carry an
-    /// uneven scale in `xf`: their corners are elliptical until this runs.
-    pub fn fold_scale(&mut self) -> bool {
-        let LiveShape::Rectangle { w, h, radii, xf, .. } = self else { return false };
-        let [m0, m1, m2, m3, m4, m5] = xf.as_coeffs();
-        let (sx, sy) = (m0.hypot(m1), m2.hypot(m3));
-        let orthogonal = sx > 1e-12 && sy > 1e-12 && (m0 * m2 + m1 * m3).abs() <= 1e-9 * sx * sy;
-        let finite = xf.as_coeffs().iter().all(|c| c.is_finite()) && w.is_finite() && h.is_finite();
-        let unscaled = (sx - 1.0).abs() < 1e-12 && (sy - 1.0).abs() < 1e-12;
-        if !orthogonal || !finite || unscaled {
-            return false;
-        }
-        let k = (sx * sy).sqrt();
-        radii.iter_mut().for_each(|r| *r *= k);
-        *w *= sx;
-        *h *= sy;
-        *xf = Affine::new([m0 / sx, m1 / sx, m2 / sy, m3 / sy, m4, m5]);
-        true
-    }
-    /// This shape with [`LiveShape::fold_scale`] applied: a rectangle's size and radii in document
-    /// units (what Live Corners show and edit).
-    pub fn folded(&self) -> Self {
-        let mut s = self.clone();
-        s.fold_scale();
-        s
-    }
    /// Divide live corner radii by `k`, the mean scale of a transform just applied, so the corners
    /// keep their size (Scale Corners off). False when nothing changed.
    pub fn keep_corners(&mut self, k: f64) -> bool {
@@ -200,45 +185,6 @@ impl LiveShape {
            _ => false,
        }
    }
-    /// The corner (radii order) of each anchor of a rectangle's path; empty for other shapes.
-    pub fn anchor_corners(&self) -> Vec<usize> {
-        match self {
-            LiveShape::Rectangle { w, h, radii, .. } => shapes::rectangle_anchor_corners(Rect::new(0.0, 0.0, *w, *h), *radii),
-            _ => vec![],
-        }
-    }
-    /// The corners of a rectangle that hold one of `anchors` (of its only subpath).
-    pub fn corners_of(&self, anchors: &BTreeSet<AnchorRef>) -> [bool; 4] {
-        let map = self.anchor_corners();
-        let mut out = [false; 4];
-        for k in anchors.iter().filter(|(si, _)| *si == 0).filter_map(|(_, ai)| map.get(*ai)) {
-            if let Some(c) = out.get_mut(*k) {
-                *c = true;
-            }
-        }
-        out
-    }
-    /// The corners Live Corners edit for a selection: those holding a selected anchor when the
-    /// shape is partly selected (Direct Selection), else all four.
-    pub fn picked_corners(&self, partial: Option<&BTreeSet<AnchorRef>>) -> [bool; 4] {
-        let picked = partial.map_or([true; 4], |a| self.corners_of(a));
-        if picked.contains(&true) { picked } else { [true; 4] }
-    }
-    /// The anchors of a rectangle's `corners` (to keep them selected as its path changes).
-    pub fn corner_anchors(&self, corners: [bool; 4]) -> BTreeSet<AnchorRef> {
-        self.anchor_corners().into_iter().enumerate().filter(|(_, k)| corners.get(*k) == Some(&true)).map(|(ai, _)| (0, ai)).collect()
-    }
-    /// The radius (in document units, see [`LiveShape::folded`]) and kind the `corners` of a
-    /// rectangle share (each `None` when they differ).
-    pub fn corner_style(&self, corners: [bool; 4]) -> (Option<f64>, Option<CornerKind>) {
-        let LiveShape::Rectangle { radii, kinds, .. } = self.folded() else { return (None, None) };
-        fn shared<T: Copy>(v: [T; 4], corners: [bool; 4], same: impl Fn(T, T) -> bool) -> Option<T> {
-            let mut it = v.into_iter().zip(corners).filter(|(_, on)| *on).map(|(x, _)| x);
-            let first = it.next()?;
-            it.all(|x| same(x, first)).then_some(first)
-        }
-        (shared(radii, corners, |a, b| (a - b).abs() < 1e-9), shared(kinds, corners, |a, b| a == b))
-    }
    /// Rotation angle of the live shape in degrees (shown in the Properties panel).
    pub fn angle_deg(&self) -> f64 {
        match self {
@@ -251,10 +197,6 @@ impl LiveShape {
    }
 }

-fn all_round(kinds: &[CornerKind; 4]) -> bool {
-    kinds.iter().all(|k| *k == CornerKind::Round)
-}
-
 /// What a transform scales besides geometry, by its mean scale (the square root of its
 /// determinant). `Scaling::default()` (and `false`) scales nothing else; `true` scales stroke
 /// weights and dashes only. Transforms the user asks for take theirs from Scale Strokes & Effects
@@ -269,9 +211,6 @@ pub struct Scaling {
    pub keep_type_strokes: bool,
    /// Live corner radii keep their size.
    pub keep_corners: bool,
-    /// Pattern fills and strokes move with the art (Transform Patterns; General › Transform
-    /// Pattern Tiles is its default): their tiles transform too, instead of staying put.
-    pub patterns: bool,
 }

 impl Scaling {
@@ -546,12 +485,6 @@ impl Node {
            _ => None,
        }
    }
-    /// Does this object or layer move with its artboard? Locked and hidden ones only with
-    /// `locked_and_hidden` (Selection & Anchor Display › Move Locked and Hidden Artwork with
-    /// Artboard).
-    pub fn rides_with_artboard(&self, locked_and_hidden: bool) -> bool {
-        locked_and_hidden || (!self.locked && self.visible)
-    }
    pub fn is_layer(&self) -> bool {
        matches!(self.kind, NodeKind::Layer { .. })
    }
@@ -747,9 +680,6 @@ impl Node {
            }
        }
        self.appearance.transform_gradients(a);
-        if sc.patterns {
-            crate::pattern::transform_pattern_paints(self, a);
-        }
        match &mut self.kind {
            NodeKind::Path { path, live, .. } => {
                path.transform(a);
@@ -1270,44 +1200,14 @@ mod tests {

    #[test]
    fn rect_live_shape_roundtrip() {
-        let l = LiveShape::Rectangle { w: 10.0, h: 20.0, radii: [0.0; 4], kinds: Default::default(), xf: Affine::translate((5.0, 5.0)) };
+        let l = LiveShape::Rectangle { w: 10.0, h: 20.0, radii: [0.0; 4], xf: Affine::translate((5.0, 5.0)) };
        assert_eq!(l.to_path().bounds(), Some(Rect::new(5.0, 5.0, 15.0, 25.0)));
        assert_eq!(l.label(), "Rectangle");
    }

-    #[test]
-    fn rectangle_corners_map_to_their_anchors() {
-        let mut l = LiveShape::Rectangle { w: 100.0, h: 50.0, radii: [0.0, 10.0, 0.0, 0.0], kinds: Default::default(), xf: Affine::IDENTITY };
-        // Anchors: top-left, the top-right corner's two, bottom-right, bottom-left.
-        assert_eq!(l.anchor_corners(), [0, 1, 1, 2, 3]);
-        assert_eq!(l.to_path().anchor_count(), 5);
-        let set = |v: &[usize]| v.iter().map(|ai| (0, *ai)).collect::<BTreeSet<AnchorRef>>();
-        assert_eq!(l.corners_of(&set(&[2, 4])), [false, true, false, true]);
-        assert_eq!(l.corners_of(&set(&[9])), [false; 4], "out of range");
-        assert_eq!(l.corner_anchors([false, true, false, true]), set(&[1, 2, 4]));
-        // Partly selected: the corners of the selected anchors; wholly (or no anchor): all four.
-        assert_eq!(l.picked_corners(Some(&set(&[0]))), [true, false, false, false]);
-        assert_eq!(l.picked_corners(None), [true; 4]);
-        assert_eq!(l.picked_corners(Some(&set(&[]))), [true; 4]);
-        assert_eq!(l.corner_style([false, true, false, false]), (Some(10.0), Some(CornerKind::Round)));
-        assert_eq!(l.corner_style([true, true, false, false]), (None, Some(CornerKind::Round)));
-        assert_eq!(l.corner_style([true, false, true, true]), (Some(0.0), Some(CornerKind::Round)));
-        // Corner kinds save only when some corner isn't round, and older files read as round.
-        let json = serde_json::to_value(&l).unwrap();
-        assert!(json.get("kinds").is_none(), "{json}");
-        assert_eq!(serde_json::from_value::<LiveShape>(json).unwrap(), l);
-        if let LiveShape::Rectangle { kinds, .. } = &mut l {
-            kinds[1] = CornerKind::Chamfer;
-        }
-        let json = serde_json::to_value(&l).unwrap();
-        assert_eq!(json["kinds"], serde_json::json!(["round", "chamfer", "round", "round"]));
-        assert_eq!(serde_json::from_value::<LiveShape>(json).unwrap(), l);
-        assert!(LiveShape::Ellipse { w: 1.0, h: 1.0, pie: (0.0, 360.0), xf: Affine::IDENTITY }.anchor_corners().is_empty());
-    }
-
    /// A node holding a live rectangle (`w` × `h`, all radii `r`, placed by `xf`) and its path.
    fn live_rect(w: f64, h: f64, r: f64, xf: Affine) -> Node {
-        let live = LiveShape::Rectangle { w, h, radii: [r; 4], kinds: Default::default(), xf };
+        let live = LiveShape::Rectangle { w, h, radii: [r; 4], xf };
        let mut n = Node::path(NodeId(1), live.to_path(), Appearance::default_art());
        if let NodeKind::Path { live: slot, .. } = &mut n.kind {
            *slot = Some(live);
@@ -1316,7 +1216,7 @@ mod tests {
    }

    fn live_of(n: &Node) -> (f64, f64, [f64; 4], Affine) {
-        let NodeKind::Path { live: Some(LiveShape::Rectangle { w, h, radii, xf, .. }), .. } = &n.kind else { panic!("not a live rectangle") };
+        let NodeKind::Path { live: Some(LiveShape::Rectangle { w, h, radii, xf }), .. } = &n.kind else { panic!("not a live rectangle") };
        (*w, *h, *radii, *xf)
    }

@@ -1347,7 +1247,7 @@ mod tests {
        }
    }

-    const KEEP_CORNERS: Scaling = Scaling { strokes: false, effects: None, keep_type_strokes: false, keep_corners: true, patterns: false };
+    const KEEP_CORNERS: Scaling = Scaling { strokes: false, effects: None, keep_type_strokes: false, keep_corners: true };

    #[test]
    fn uneven_scales_keep_live_corners_circular() {
@@ -1412,33 +1312,6 @@ mod tests {
        assert_round_corners(&n, Affine::IDENTITY, 20.0 * 2f64.sqrt() * 2.0);
    }

-    /// A rectangle saved with an uneven scale in `xf` (before #291) has elliptical corners; Live
-    /// Corners see and edit it in document units, with circular corners (#442).
-    #[test]
-    fn a_scale_left_in_the_transform_folds_into_the_size() {
-        let legacy = Affine::translate((5.0, 5.0)) * Affine::scale_non_uniform(4.0, 1.0);
-        let n = live_rect(50.0, 80.0, 20.0, legacy);
-        let NodeKind::Path { live: Some(live), .. } = &n.kind else { panic!("not live") };
-        let folded = live.folded();
-        assert_eq!(live_of(&n).3, legacy, "folded() leaves the shape alone");
-        let LiveShape::Rectangle { w, h, radii, xf, .. } = &folded else { panic!("not a rectangle") };
-        // Drawn 200 × 80 with 80 × 20 corners; folded, the corners are circles of the mean radius.
-        assert!(near(*w, 200.0) && near(*h, 80.0) && radii.iter().all(|r| near(*r, 40.0)), "{w} × {h} r {radii:?}");
-        assert!(near_xf(*xf, Affine::translate((5.0, 5.0))));
-        let (a, b) = (folded.to_path().bounds().unwrap(), live.to_path().bounds().unwrap());
-        assert!(near(a.x0, b.x0) && near(a.y0, b.y0) && near(a.x1, b.x1) && near(a.y1, b.y1), "same place and size: {a:?} {b:?}");
-        assert_eq!(live.corner_style([true; 4]).0, Some(40.0), "the radius in document units");
-        // Nothing to fold: a moved, rotated or reflected rectangle and a sheared one stay as they are.
-        let place = Affine::translate((5.0, 5.0)) * Affine::rotate(0.5) * Affine::scale_non_uniform(-1.0, 1.0);
-        let shear = Affine::new([1.0, 0.0, 0.5, 1.0, 0.0, 0.0]);
-        for xf in [place, shear] {
-            let mut l = live_rect(100.0, 160.0, 20.0, xf);
-            let NodeKind::Path { live: Some(live), .. } = &mut l.kind else { panic!("not live") };
-            assert!(!live.fold_scale());
-            assert_eq!(live_of(&l), (100.0, 160.0, [20.0; 4], xf));
-        }
-    }
-
    #[test]
    fn default_transparency() {
        let p = || Node::path(NodeId(1), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::default_art());
@@ -1,4 +1,4 @@
-//! Selection state (objects and, for direct selection, individual anchors; ruler guides).
+//! Selection state (objects and, for direct selection, individual anchors).

 use std::collections::{BTreeMap, BTreeSet};

@@ -29,20 +29,12 @@ pub struct Selection {
    /// clears them.
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub slices: Vec<NodeId>,
-    /// Ruler guides selected with a selection tool, as indexes into [`Document::guides`]. They are
-    /// selected on their own: any change to the object selection clears them.
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    pub guides: Vec<usize>,
 }

 impl Selection {
    pub fn is_empty(&self) -> bool {
        self.objects.is_empty()
    }
-    /// Is anything selected that Delete and the arrow keys act on: objects or ruler guides?
-    pub fn has_objects_or_guides(&self) -> bool {
-        !self.objects.is_empty() || !self.guides.is_empty()
-    }
    pub fn len(&self) -> usize {
        self.objects.len()
    }
@@ -55,7 +47,6 @@ impl Selection {
        self.key = None;
        self.target = None;
        self.slices.clear();
-        self.guides.clear();
    }
    pub fn set(&mut self, ids: impl IntoIterator<Item = NodeId>) {
        self.clear();
@@ -66,7 +57,6 @@ impl Selection {
    pub fn add(&mut self, id: NodeId) {
        self.target = None;
        self.slices.clear();
-        self.guides.clear();
        if !self.objects.contains(&id) {
            self.objects.push(id);
        }
@@ -74,7 +64,6 @@ impl Selection {
    pub fn remove(&mut self, id: NodeId) {
        self.target = None;
        self.slices.clear();
-        self.guides.clear();
        self.objects.retain(|x| *x != id);
        self.anchors.remove(&id);
        if self.key == Some(id) {
@@ -90,15 +79,6 @@ impl Selection {
            }
        }
    }
-    /// Select ruler guides `indexes` (see [`Selection::guides`]) and nothing else.
-    pub fn set_guides(&mut self, indexes: impl IntoIterator<Item = usize>) {
-        self.clear();
-        for i in indexes {
-            if !self.guides.contains(&i) {
-                self.guides.push(i);
-            }
-        }
-    }
    pub fn toggle(&mut self, id: NodeId) {
        if self.contains(id) { self.remove(id) } else { self.add(id) }
    }
@@ -117,7 +97,6 @@ impl Selection {
            self.target = None;
        }
        self.slices.retain(|id| doc.is_slice(*id));
-        self.guides.retain(|i| *i < doc.guides.len());
    }
    /// Target `id` (see [`Selection::target`]): a layer gets its visible, unlocked art selected
    /// (the art of its sublayers too), anything else is selected itself.
@@ -159,23 +138,6 @@ mod tests {
        assert!(s.is_empty());
    }

-    #[test]
-    fn guides_are_selected_on_their_own() {
-        let mut s = Selection::default();
-        s.add(NodeId(1));
-        s.set_guides([2, 0, 2]);
-        assert_eq!((s.objects.clone(), s.guides.clone()), (vec![], vec![2, 0]));
-        assert!(s.has_objects_or_guides() && s.is_empty());
-        s.add(NodeId(1));
-        assert!(s.guides.is_empty());
-        // Pruning drops guides the document no longer has.
-        let mut d = Document::new(100.0, 100.0);
-        d.guides.push(crate::Guide::new(true, 10.0));
-        s.set_guides([0, 1]);
-        s.prune(&d);
-        assert_eq!(s.guides, vec![0]);
-    }
-
    #[test]
    fn selection_changes_clear_the_target() {
        let mut s = Selection::default();
@@ -60,9 +60,6 @@ fn readouts_show_two_decimals() {
    assert_eq!(Unit::Points.readout(15.0), "15.00 pt");
    assert_eq!(Unit::Millimeters.readout(72.0), "25.40 mm");
    assert_eq!(Unit::Inches.readout(-36.0), "-0.50 in");
-    assert_eq!(Unit::Millimeters.number(1.0), "0.3528");
-    // Four decimals for the large units, three for the small ones.
-    assert_eq!(Unit::Inches.number(0.5616), "0.0078");
-    assert_eq!((Unit::Inches.number(595.2756), Unit::Points.number(595.2756)), ("8.2677".into(), "595.276".into()));
-    assert_eq!(Unit::Points.number(-0.00001), "0");
+    assert_eq!(Unit::Millimeters.number(1.0), "0.353");
+    assert_eq!(Unit::Points.number(-0.0001), "0");
 }
@@ -8,9 +8,6 @@ use crate::appearance::{Appearance, AppearanceItem, Dash, FillLayer, LineCap, Li

 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Justify {
-    /// Align to the start of each paragraph's direction ([`ParaStyle::direction`]): left for
-    /// left-to-right paragraphs, right for right-to-left ones. New type's alignment.
-    Auto,
    #[default]
    Left,
    Center,
@@ -86,23 +83,6 @@ pub struct CharStyle {
    /// size (Document Setup → Type → Small Caps); None = off.
    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub small_caps: Option<f64>,
-    /// Character Alignment (Character panel menu): where characters smaller than the largest on
-    /// their line line up with it.
-    #[serde(default, rename = "charAlign", skip_serializing_if = "crate::skip::is_default")]
-    pub char_align: CharAlign,
-}
-
-/// Where a character smaller than the largest on its line lines up with it: on the Roman
-/// baseline, or at the top (right, in vertical type), centre or bottom (left) of the ideographic
-/// em boxes.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum CharAlign {
-    #[default]
-    RomanBaseline,
-    EmBoxTop,
-    EmBoxCenter,
-    EmBoxBottom,
 }

 /// Superscript or subscript proportions in percent of the font size (Document Setup → Type).
@@ -195,7 +175,6 @@ impl Default for CharStyle {
            stroke_miter_limit: 10.0,
            stroke_dash: None,
            position: CharPosition::Normal,
-            char_align: CharAlign::RomanBaseline,
            small_caps: None,
        }
    }
@@ -286,209 +265,28 @@ fn default_align_on() -> char {
 pub const DEFAULT_TAB_INTERVAL: f64 = 36.0;

 /// Paragraph attributes (the Paragraph panel).
-///
-/// Saved through [`ParaStyleFile`], which keeps files with text openable by builds from before
-/// [`Justify::Auto`].
 #[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
-#[serde(from = "ParaStyleFile", into = "ParaStyleFile")]
 pub struct ParaStyle {
+    #[serde(default)]
    pub justify: Justify,
+    #[serde(default)]
    pub left_indent: f64,
+    #[serde(default)]
    pub right_indent: f64,
+    #[serde(default)]
    pub first_line_indent: f64,
+    #[serde(default)]
    pub space_before: f64,
+    #[serde(default)]
    pub space_after: f64,
+    #[serde(default)]
    pub hyphenate: bool,
    /// Tab stops (Tabs panel), sorted by position.
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub tabs: Vec<TabStop>,
    /// Paragraph style (Paragraph Styles panel) these attributes come from; None = Normal.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
    pub style_name: Option<String>,
-    /// Japanese composition: the spacing of punctuation (Paragraph panel › Mojikumi). Type made
-    /// with the Type tools and `text.create` takes [`Mojikumi::LineEndHalf`]; documents from before
-    /// it and imported text (already set) keep [`Mojikumi::None`].
-    pub mojikumi: Mojikumi,
-    /// Paragraph direction (Paragraph panel): the base direction of each paragraph for
-    /// bidirectional text (UAX #9). None: from each paragraph's first strong character (Hebrew or
-    /// Arabic: right to left).
-    pub direction: Option<ParaDirection>,
-    /// How leading is measured (Paragraph panel menu): from baseline to baseline, or from the top
-    /// of one line's ideographic em box to the next.
-    pub leading_model: LeadingModel,
-    /// Hanging punctuation (Paragraph panel menu › Burasagari): a comma or full stop ending a line
-    /// may stand outside the frame. New type takes [`Burasagari::Standard`]; documents from before
-    /// it and imported text keep [`Burasagari::None`].
-    pub burasagari: Burasagari,
-}
-
-/// [`ParaStyle`] as saved. [`Justify::Auto`] is written as the alignment it has in the paragraph
-/// direction (`Right` for right to left, else `Left`) with `justify_auto` set: builds without Auto
-/// read the alignment and ignore the flag, and builds with it read Auto back.
-#[derive(Serialize, Deserialize)]
-struct ParaStyleFile {
-    #[serde(default)]
-    justify: Justify,
-    #[serde(default, skip_serializing_if = "crate::skip::is_default")]
-    justify_auto: bool,
-    #[serde(default)]
-    left_indent: f64,
-    #[serde(default)]
-    right_indent: f64,
-    #[serde(default)]
-    first_line_indent: f64,
-    #[serde(default)]
-    space_before: f64,
-    #[serde(default)]
-    space_after: f64,
-    #[serde(default)]
-    hyphenate: bool,
-    #[serde(default, skip_serializing_if = "Vec::is_empty")]
-    tabs: Vec<TabStop>,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    style_name: Option<String>,
-    #[serde(default, skip_serializing_if = "Mojikumi::is_none")]
-    mojikumi: Mojikumi,
-    #[serde(default, skip_serializing_if = "Option::is_none")]
-    direction: Option<ParaDirection>,
-    #[serde(default, skip_serializing_if = "crate::skip::is_default")]
-    leading_model: LeadingModel,
-    #[serde(default, skip_serializing_if = "crate::skip::is_default")]
-    burasagari: Burasagari,
-}
-
-impl From<ParaStyle> for ParaStyleFile {
-    fn from(p: ParaStyle) -> Self {
-        let justify_auto = p.justify == Justify::Auto;
-        let justify = match p.justify {
-            Justify::Auto if p.direction == Some(ParaDirection::RightToLeft) => Justify::Right,
-            Justify::Auto => Justify::Left,
-            j => j,
-        };
-        let ParaStyle {
-            left_indent,
-            right_indent,
-            first_line_indent,
-            space_before,
-            space_after,
-            hyphenate,
-            tabs,
-            style_name,
-            mojikumi,
-            direction,
-            leading_model,
-            burasagari,
-            ..
-        } = p;
-        Self {
-            justify,
-            justify_auto,
-            left_indent,
-            right_indent,
-            first_line_indent,
-            space_before,
-            space_after,
-            hyphenate,
-            tabs,
-            style_name,
-            mojikumi,
-            direction,
-            leading_model,
-            burasagari,
-        }
-    }
-}
-
-impl From<ParaStyleFile> for ParaStyle {
-    fn from(f: ParaStyleFile) -> Self {
-        let justify = if f.justify_auto { Justify::Auto } else { f.justify };
-        let ParaStyleFile {
-            left_indent,
-            right_indent,
-            first_line_indent,
-            space_before,
-            space_after,
-            hyphenate,
-            tabs,
-            style_name,
-            mojikumi,
-            direction,
-            leading_model,
-            burasagari,
-            ..
-        } = f;
-        Self {
-            justify,
-            left_indent,
-            right_indent,
-            first_line_indent,
-            space_before,
-            space_after,
-            hyphenate,
-            tabs,
-            style_name,
-            mojikumi,
-            direction,
-            leading_model,
-            burasagari,
-        }
-    }
-}
-
-/// A paragraph's base direction ([`ParaStyle::direction`]).
-#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum ParaDirection {
-    LeftToRight,
-    RightToLeft,
-}
-
-/// How a paragraph's leading is measured.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum LeadingModel {
-    /// From one line's baseline to the next's: a line's leading is the space above it, and area
-    /// type's first baseline follows Area Type Options › First Baseline.
-    #[default]
-    RomanBaseline,
-    /// From the top of one line's ideographic em box (the right side, in vertical type) to the
-    /// next's: a line's leading is the space below it, and area type's first line touches the top
-    /// of the frame. Japanese layout's usual model.
-    EmBoxTop,
-}
-
-/// How Japanese punctuation is spaced (JLREQ 3.1). Full-width punctuation is half a glyph and half
-/// a space: an opening bracket's space before it, a closing bracket's, a comma's or a full stop's
-/// after it.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Mojikumi {
-    /// Every character takes its full advance.
-    #[default]
-    None,
-    /// Consecutive punctuation shares one half-em space (JLREQ 3.1.4), and a closing bracket,
-    /// comma or full stop ending a line is set half width.
-    LineEndHalf,
-}
-
-impl Mojikumi {
-    pub fn is_none(&self) -> bool {
-        *self == Mojikumi::None
-    }
-}
-
-/// Hanging punctuation (burasagari): an East Asian comma or full stop ending a line (、。，．､｡)
-/// stands outside the line's measure, in the space its punctuation spacing gives it (half width
-/// with Line-end Punctuation Half Width). Closing brackets and Latin punctuation don't hang. Shown
-/// as None / Regular / Force.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum Burasagari {
-    /// A comma or full stop that doesn't fit goes to the next line with the character before it.
-    #[default]
-    None,
-    /// A comma or full stop that doesn't fit hangs outside the line; one that fits stays inside.
-    Standard,
-    /// A comma or full stop ending a line always hangs, and the rest of the line fills the measure.
-    Forced,
 }

 /// Area Type Options "First Baseline" offset.
@@ -565,36 +363,6 @@ impl PathEffect {
    }
 }

-/// Type on a Path Options › Align to Path: which height of the type runs along the path.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub enum PathAlign {
-    /// The font's top edge: the type hangs below the path.
-    Ascender,
-    /// The font's bottom edge: the type stands above the path.
-    Descender,
-    /// Halfway between the ascender and the descender.
-    Center,
-    /// The baseline (the default).
-    #[default]
-    Baseline,
-}
-
-impl PathAlign {
-    pub const ALL: [PathAlign; 4] = [PathAlign::Ascender, PathAlign::Descender, PathAlign::Center, PathAlign::Baseline];
-    pub fn id(self) -> &'static str {
-        match self {
-            PathAlign::Ascender => "ascender",
-            PathAlign::Descender => "descender",
-            PathAlign::Center => "center",
-            PathAlign::Baseline => "baseline",
-        }
-    }
-    pub fn parse(s: &str) -> Option<Self> {
-        Self::ALL.into_iter().find(|a| a.id().eq_ignore_ascii_case(s.trim()))
-    }
-}
-
 /// Area Type Options: rows and columns, gutters, inset and first baseline of area type.
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
@@ -639,48 +407,8 @@ pub enum TextKind {
    Point,
    /// Area type flowed inside `frame` (document coordinates, untransformed by `xf`).
    Area { frame: PathData },
-    /// Type on a path, flowing from its start bracket `start` to its end bracket `end` (0..1 of the
-    /// path length; no `end`: the end of the path, or once round a closed path). See
-    /// [`TextKind::path_span`].
-    OnPath {
-        path: PathData,
-        start: f64,
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        end: Option<f64>,
-    },
-}
-
-impl TextKind {
-    /// Type on a path's span: from its start to its end bracket, as fractions of its path's length.
-    /// Round a closed path the end may be past 1 (the span runs on past the path's start), a full
-    /// turn without an end or with the end at the start. None for other type.
-    pub fn path_span(&self) -> Option<(f64, f64)> {
-        let TextKind::OnPath { path, start, end } = self else { return None };
-        let s = fraction(*start);
-        Some(if path.is_closed() {
-            let run = end.map_or(0.0, |e| (fraction(e) - s).rem_euclid(1.0));
-            (s, s + if run < 1e-9 { 1.0 } else { run })
-        } else {
-            (s, end.map_or(1.0, |e| fraction(e).max(s)))
-        })
-    }
-}
-
-/// `x` as a fraction of a path's length (0..1; 0 when not finite).
-fn fraction(x: f64) -> f64 {
-    if x.is_finite() { x.clamp(0.0, 1.0) } else { 0.0 }
-}
-
-/// `path` run the other way, each point as far from its new start as it was from its old end
-/// (the subpaths in reverse order, a closed one keeping its first anchor first).
-fn reverse_from_end(path: &mut PathData) {
-    path.subpaths.reverse();
-    for sp in &mut path.subpaths {
-        sp.reverse();
-        if sp.closed && !sp.anchors.is_empty() {
-            sp.anchors.rotate_right(1);
-        }
-    }
+    /// Type on a path, starting at `start` (0..1 of the path length).
+    OnPath { path: PathData, start: f64 },
 }

 /// A text object. `runs` split into paragraphs at `\n`.
@@ -701,24 +429,12 @@ pub struct TextObject {
    /// Type on a Path effect (type on a path only).
    #[serde(default, rename = "pathEffect", skip_serializing_if = "crate::skip::is_default")]
    pub path_effect: PathEffect,
-    /// Type on a Path Options › Align to Path (type on a path only).
-    #[serde(default, rename = "pathAlign", skip_serializing_if = "crate::skip::is_default")]
-    pub path_align: PathAlign,
-    /// Type on a Path Options › Spacing in points (type on a path only): glyphs are spaced as if
-    /// set this far above the path, which closes them up round the outside of a curve and opens
-    /// them up round the inside.
-    #[serde(default, rename = "pathSpacing", skip_serializing_if = "crate::skip::is_default")]
-    pub path_spacing: f64,
    /// Wrap objects above this area type, resolved by the engine after each edit (text space).
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    pub wrap: Vec<WrapShape>,
    /// Cached layout bounds in text space, filled in by the layout engine (not serialized).
    #[serde(skip)]
    pub cached_bounds: Option<Rect>,
-    /// Cached baselines in text space, start to end, one per line that holds characters (a
-    /// vertical column's centre line), filled in with `cached_bounds` (not serialized).
-    #[serde(skip)]
-    pub cached_baselines: Vec<(Point, Point)>,
 }

 impl TextObject {
@@ -731,11 +447,8 @@ impl TextObject {
            para: ParaStyle::default(),
            area: AreaOptions::default(),
            path_effect: PathEffect::default(),
-            path_align: PathAlign::default(),
-            path_spacing: 0.0,
            wrap: Vec::new(),
            cached_bounds: None,
-            cached_baselines: Vec::new(),
        }
    }
    pub fn plain_text(&self) -> String {
@@ -763,29 +476,6 @@ impl TextObject {
    pub fn transform(&mut self, a: Affine) {
        self.xf = a * self.xf;
    }
-    /// Type on a path's path in document space; None for other type.
-    pub fn type_path(&self) -> Option<PathData> {
-        match &self.kind {
-            TextKind::OnPath { path, .. } => Some(path.transformed(self.xf)),
-            _ => None,
-        }
-    }
-    /// Flip type on a path to the other side of its path (Type on a Path Options › Flip, or its
-    /// centre bracket dragged across the path): the path runs the other way and the brackets swap
-    /// ends, so the type keeps its stretch of the path. False, changing nothing, for other type.
-    pub fn flip_on_path(&mut self) -> bool {
-        let Some((s, e)) = self.kind.path_span() else { return false };
-        let TextKind::OnPath { path, start, end } = &mut self.kind else { return false };
-        reverse_from_end(path);
-        if path.is_closed() {
-            *start = (1.0 - e).rem_euclid(1.0);
-            *end = (e - s < 1.0 - 1e-9).then(|| (1.0 - s).rem_euclid(1.0));
-        } else {
-            *start = 1.0 - e;
-            *end = (s > 1e-9).then_some(1.0 - s);
-        }
-        true
-    }
    /// Area type's frame (the type area) in document space; None for other type.
    pub fn area_frame(&self) -> Option<PathData> {
        match &self.kind {
@@ -844,15 +534,6 @@ impl TextObject {
    pub fn local_bounds(&self) -> Rect {
        self.cached_bounds.unwrap_or_else(|| self.estimate_bounds())
    }
-    /// The baselines in text space (the layout cache): for point type with none cached, the first
-    /// one across [`Self::local_bounds`] (down the first column's centre line for vertical type).
-    pub fn baselines(&self) -> impl Iterator<Item = (Point, Point)> + '_ {
-        let first = (self.cached_baselines.is_empty() && matches!(self.kind, TextKind::Point)).then(|| {
-            let b = self.local_bounds();
-            if self.vertical { (Point::new(0.0, b.y0), Point::new(0.0, b.y1)) } else { (Point::new(b.x0, 0.0), Point::new(b.x1, 0.0)) }
-        });
-        self.cached_baselines.iter().copied().chain(first)
-    }
 }

 #[cfg(test)]
@@ -912,45 +593,4 @@ mod tests {
        assert!(!t.move_area_anchors(&[(3, 0)], Vec2::new(5.0, 5.0)));
        assert_eq!(t, before);
    }
-
-    /// Builds from before [`Justify::Auto`] read new type's alignment as Left or Right (and ignore
-    /// `justify_auto`); this build reads Auto back.
-    #[test]
-    fn auto_alignment_saves_readable_by_older_builds() {
-        #[derive(Deserialize, Debug, PartialEq)]
-        enum OldJustify {
-            Left,
-            Center,
-            Right,
-            JustifyLeft,
-            JustifyCenter,
-            JustifyRight,
-            JustifyAll,
-        }
-        #[derive(Deserialize)]
-        struct OldPara {
-            justify: OldJustify,
-        }
-        #[derive(Deserialize)]
-        struct OldText {
-            para: OldPara,
-        }
-        for (direction, physical) in
-            [(Some(ParaDirection::RightToLeft), OldJustify::Right), (Some(ParaDirection::LeftToRight), OldJustify::Left), (None, OldJustify::Left)]
-        {
-            let mut t = TextObject::point(Point::ZERO, "שלום", CharStyle::default());
-            t.para = ParaStyle { justify: Justify::Auto, direction, ..Default::default() };
-            let json = serde_json::to_string(&t).unwrap();
-            let old: OldText = serde_json::from_str(&json).unwrap();
-            assert_eq!(old.para.justify, physical, "{json}");
-            assert_eq!(serde_json::from_str::<TextObject>(&json).unwrap(), t);
-        }
-        // Other alignments save as before, without the flag.
-        let p = ParaStyle { justify: Justify::Right, ..Default::default() };
-        let json = serde_json::to_string(&p).unwrap();
-        assert!(!json.contains("justify_auto"), "{json}");
-        assert_eq!(serde_json::from_str::<ParaStyle>(&json).unwrap(), p);
-        // Files from before the flag keep their alignment.
-        assert_eq!(serde_json::from_str::<ParaStyle>(r#"{"justify":"Center"}"#).unwrap().justify, Justify::Center);
-    }
 }
@@ -16,11 +16,10 @@ use serde_json::{Value, json};
 use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::appearance::{AppearanceItem, FillLayer, StrokeLayer};
 use vectorcraft_doc::{Appearance, Document, Node, NodeId, NodeKind, Selection};
-use vectorcraft_geom::{FillRule, PathData, Point, Rect, SubPath};
+use vectorcraft_geom::{FillRule, Point, Rect, Shape as _};
 use vectorcraft_pathops as po;
 use vectorcraft_tools::builder::{
-    self as b, BuilderMap, EDGE_NAME, FACE_NAME, LIVE_PAINT_NAME, SOURCES_NAME, Touched, edge_near, face_at, is_live_paint, sample_polyline,
-    sorted_roots,
+    self as b, EDGE_NAME, FACE_NAME, LIVE_PAINT_NAME, SOURCES_NAME, edge_near, face_at, is_live_paint, sample_polyline, shapes_for, sorted_roots,
 };
 use vectorcraft_trace as tr;

@@ -39,7 +38,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Shape Builder",
            [],
            None,
-            "{ids?: [id…] (default: selection), points: [[x,y]…] (drag path; one point = click), erase?: bool (erase mode, Alt: deletes the regions touched, and the pieces of unfilled open paths and the edges (outline pieces between the points where paths meet; see shapeBuilder.regions) within tolerance; a deleted edge opens its path there, and edges bounding a deleted region go with it), tolerance?: pt (2, erase only), fill?: \"#rrggbb\" | {color|swatch|gradient|none} (default: the fill of the object under the first point; the current fill for an area only lines enclose)} → {ids, merged, regions, lines, edges} (counts deleted or merged)",
+            "{ids?: [id…] (default: selection), points: [[x,y]…] (drag path; one point = click), erase?: bool (Alt-drag deletes the regions), fill?: \"#rrggbb\" | {color|swatch|gradient|none} (default: the fill of the object under the first point)} → {ids, merged, regions}",
            has_selection_or_ids,
            sb_merge
        ),
@@ -48,7 +47,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Shape Builder Regions",
            [],
            None,
-            "{ids?} → {regions: [{bounds: [x0,y0,x1,y1], area, sources: [id…]}], lines: [{bounds, source: id}], edges: [{bounds, source: id}]} faces of the planar arrangement (unfilled open paths cut them; sources is empty for an area only they enclose), the pieces of those open paths and the edges (the other paths' outlines cut where paths meet; source: the front-most path along it), which erasing deletes",
+            "{ids?} → {regions: [{bounds: [x0,y0,x1,y1], area, sources: [id…]}]} faces of the planar arrangement",
            has_selection_or_ids,
            sb_regions
        ),
@@ -225,80 +224,47 @@ fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
        return Err(bad(C, "points must be a non-empty list of finite [x,y]"));
    }
    let erase = bool_or(p, "erase", false);
-    // Line pieces and edges are only deleted (erase mode), never merged.
-    let piece_tol = erase.then(|| f64_or(p, "tolerance", 2.0).clamp(0.0, 1000.0));
    let fill = fill_param(s, p, C)?;
-    let current_fill = s.paint.fill.clone();
    let roots = root_ids(s, p)?;
    let label = if erase { "Shape Builder Delete" } else { "Shape Builder" };
-    let (ids, merged, touched) = s.edit(label, |d, sel| {
-        let (map, leaves) = BuilderMap::new(d, &roots, erase);
+    let (ids, merged, count) = s.edit(label, |d, sel| {
+        let (shapes, leaves) = shapes_for(d, &roots);
        let leaves: Vec<Node> = leaves.into_iter().cloned().collect();
-        if map.shapes.is_empty() {
+        if shapes.is_empty() {
            return Err(EngineError::Other("Shape Builder: select paths or compound paths".into()));
        }
+        let regs = po::regions(&shapes);
+        let shapes_r: Vec<(kurbo::BezPath, Rect)> = regs.iter().map(|r| (r.path.to_bezpath(), r.path.bounds().unwrap_or(Rect::ZERO))).collect();
        let step = (d.bounds_of(&roots, false).map(|r| r.width().max(r.height())).unwrap_or(100.0) / 2000.0).max(0.25);
-        let mut touched = Touched::default();
+        let mut touched: Vec<usize> = vec![];
        for q in sample_polyline(&pts, step) {
-            touched.add(map.hit(q, piece_tol));
+            if let Some(i) = shapes_r.iter().position(|(bp, bb)| bb.contains(q) && bp.winding(q) != 0)
+                && !touched.contains(&i)
+            {
+                touched.push(i);
+            }
        }
-        touched.edges = map.erased_edges(&touched);
        if touched.is_empty() {
            return Err(EngineError::Other("Shape Builder: no region under the pointer".into()));
        }
-        let cuts: Vec<&SubPath> = touched.edges.iter().filter_map(|&k| map.edges.get(k)?.0.path.subpaths.first()).collect();
-        // Edges come back from the planar map within a few hundredths of the outlines they follow.
-        let cut_tol = step * 0.2;
-        let picked: Vec<&po::Region> = touched.regions.iter().filter_map(|&i| map.regions.get(i).map(|r| &r.0)).collect();
-        let union = if picked.is_empty() { PathData::default() } else { po::merge_regions(&picked) };
-        // The merged shape takes the look of the front-most object over the first region, or (for an
-        // area only lines enclose) of the front-most object and the current fill.
-        let covered = picked.iter().find_map(|r| r.top());
-        let style_src = covered.or(map.shapes.len().checked_sub(1));
-        let merged_fill = fill.or_else(|| covered.is_none().then_some(current_fill));
+        let picked: Vec<&po::Region> = touched.iter().map(|&i| &regs[i]).collect();
+        let union = po::merge_regions(&picked);
+        let affected: Vec<bool> = (0..shapes.len()).map(|i| picked.iter().any(|r| r.sources.contains(&i))).collect();
+        let style_src = regs[touched[0]].top();
        let mut new_nodes: Vec<Node> = vec![];
        let mut merged_id = None;
-        for (i, (sh, leaf)) in map.shapes.iter().zip(&leaves).enumerate() {
-            let pieces: Vec<usize> = map.lines.iter().enumerate().filter(|(_, (l, _))| l.key == i as u64).map(|(k, _)| k).collect();
-            if !pieces.is_empty() {
-                // An open path loses the pieces deleted and those between merged (or deleted) regions.
-                let keep: Vec<usize> =
-                    pieces.iter().copied().filter(|k| !touched.lines.contains(k) && !map.line_between(*k, &touched.regions)).collect();
-                if keep.len() == pieces.len() {
-                    new_nodes.push(d.reid(leaf));
-                } else {
-                    for k in keep {
-                        if let Some((l, _)) = map.lines.get(k) {
-                            new_nodes.push(shape_node(d, l.path.clone(), Some(leaf)));
-                        }
-                    }
-                }
+        for (i, (sh, leaf)) in shapes.iter().zip(&leaves).enumerate() {
+            if !affected[i] {
+                new_nodes.push(d.reid(leaf));
            } else {
-                // A shape loses the regions deleted or merged, then the edges deleted (each one on
-                // its outline, shared edges from every shape along them).
-                let in_union = picked.iter().any(|r| r.sources.contains(&i));
-                let mut rest = if in_union {
-                    po::boolean(&sh.path, sh.rule, &union, FillRule::NonZero, po::BoolOp::Difference)
-                } else {
-                    b::node_outline(leaf).map_or_else(|| sh.path.clone(), |o| o.0)
-                };
-                let fill_closes = !leaf.appearance.fill_paint().is_none();
-                let mut cut = false;
-                for piece in &cuts {
-                    if let Some(r) = po::cut_out(&rest, piece, fill_closes, cut_tol) {
-                        rest = r;
-                        cut = true;
-                    }
-                }
-                if !in_union && !cut {
-                    new_nodes.push(d.reid(leaf));
-                } else if !rest.is_empty() {
+                let rest = po::boolean(&sh.path, sh.rule, &union, FillRule::NonZero, po::BoolOp::Difference);
+                if !rest.is_empty() {
                    new_nodes.push(shape_node(d, rest, Some(leaf)));
                }
            }
-            if !erase && !union.is_empty() && Some(i) == style_src {
+            if !erase && Some(i) == style_src {
                let mut m = shape_node(d, union.clone(), Some(leaf));
-                if let Some(f) = &merged_fill {
+                if let Some(f) = &fill {
                    m.appearance.set_fill(f.clone());
                }
                merged_id = Some(m.id);
@@ -307,15 +273,9 @@ fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
        }
        let new_ids = replace_roots(d, &roots, new_nodes)?;
        sel.set(new_ids.iter().copied());
-        Ok((new_ids, merged_id, touched))
+        Ok((new_ids, merged_id, touched.len()))
    })?;
-    Ok(json!({
-        "ids": ids_json(&ids),
-        "merged": merged.map(|m| m.0),
-        "regions": touched.regions.len(),
-        "lines": touched.lines.len(),
-        "edges": touched.edges.len(),
-    }))
+    Ok(json!({ "ids": ids_json(&ids), "merged": merged.map(|m| m.0), "regions": count }))
 }

 /// Remove the roots and insert `nodes` where the front-most root was. Returns the new ids.
@@ -340,23 +300,20 @@ fn replace_roots(d: &mut Document, roots: &[NodeId], nodes: Vec<Node>) -> Result
 fn sb_regions(s: &mut Session, p: &Value) -> Result<Value> {
    let roots = root_ids(s, p)?;
    let d = &s.doc()?.doc;
-    let (map, leaves) = BuilderMap::new(d, &roots, true);
-    let id_of = |i: usize| leaves.get(i).map(|n| n.id.0);
-    let regions: Vec<Value> = map
-        .regions
+    let (shapes, leaves) = shapes_for(d, &roots);
+    let regs = po::regions(&shapes);
+    let out: Vec<Value> = regs
        .iter()
-        .map(|(r, _, bb)| {
-            json!({
+        .filter_map(|r| {
+            let bb = r.path.bounds()?;
+            Some(json!({
                "bounds": [bb.x0, bb.y0, bb.x1, bb.y1],
                "area": po::area(&r.path, FillRule::NonZero),
-                "sources": r.sources.iter().filter_map(|&i| id_of(i)).collect::<Vec<_>>(),
-            })
+                "sources": r.sources.iter().map(|&i| leaves[i].id.0).collect::<Vec<_>>(),
+            }))
        })
        .collect();
-    let pieces = |list: &[(po::Shape, Rect)]| -> Vec<Value> {
-        list.iter().map(|(l, bb)| json!({ "bounds": [bb.x0, bb.y0, bb.x1, bb.y1], "source": id_of(l.key as usize) })).collect()
-    };
-    Ok(json!({ "regions": regions, "lines": pieces(&map.lines), "edges": pieces(&map.edges) }))
+    Ok(json!({ "regions": out }))
 }

 // ---------- Live Paint ----------
@@ -21,7 +21,7 @@ use vectorcraft_color::Swatch;
 use vectorcraft_doc::{Document, GraphicStyle, ImageBlob, Node, NodeId, PatternDef, Symbol, TextStyleDef};
 use vectorcraft_geom::Rect;

-pub use flavours::{BITMAP, EMF, FILE_HEAD, Flavour, PASTE_ORDER, PDF, PNG, SVG, TEXT, file_flavour};
+pub use flavours::{BITMAP, EMF, Flavour, PASTE_ORDER, PDF, PNG, SVG, TEXT};
 pub(crate) use resources::SwatchChoices;

 use super::*;
@@ -87,14 +87,11 @@ pub struct Clipboard {
    /// The open document the objects came from ([`DocState::uid`]): pasting back into it uses its
    /// own resources as they are now.
    pub source_doc: Option<u64>,
-    /// An artboard copied with the Artboard tool (`artboard.copy`); `nodes` are then its art. Pasting
-    /// adds a copy of it with the art.
-    pub artboard: Option<vectorcraft_doc::Artboard>,
 }

 impl Clipboard {
    pub fn is_empty(&self) -> bool {
-        self.nodes.is_empty() && self.artboard.is_none()
+        self.nodes.is_empty()
    }

    /// Objects `roots` of `st`'s document with their resources, source artboard and layers.
@@ -30,23 +30,6 @@ pub const EMF: &str = "image/emf";
 /// What Paste reads from other apps, best first: vector art before text, text before bitmaps
 /// (word processors offer a picture of copied text too).
 pub const PASTE_ORDER: [&str; 5] = [SVG, PDF, EMF, TEXT, BITMAP];
-/// How much of a copied file [`file_flavour`] needs to tell what it is.
-pub const FILE_HEAD: usize = 4096;
-
-/// What a file copied in a file manager pastes as, if one of `mimes` (`image/*`: any bitmap):
-/// SVG, PDF, a Windows metafile or a bitmap (its own `image/…` type), told from its first
-/// [`FILE_HEAD`] bytes and its name. The file's bytes are that flavour's data.
-pub fn file_flavour(name: &str, head: &[u8], mimes: &[&str]) -> Option<&'static str> {
-    let f = fileio::detect(name, head)?;
-    let (asked, mime) = match f.id {
-        "svg" => (SVG, SVG),
-        "pdf" => (PDF, PDF),
-        "emf" | "wmf" => (EMF, EMF),
-        _ if f.raster => (BITMAP, f.mime),
-        _ => return None,
-    };
-    mimes.contains(&asked).then_some(mime)
-}

 /// One representation of the clipboard's contents.
 #[derive(Clone, Debug, PartialEq, Eq)]
@@ -300,7 +283,7 @@ fn import_text(s: &mut Session, p: &Value) -> Result<Value> {
        return Err(bad(C, "the text is empty"));
    }
    let mut t = TextObject::point(Point::ZERO, text, super::super::create::new_type_style(s, &Value::Null));
-    crate::cmd::typecmd::refresh_bounds(&mut t);
+    t.cached_bounds = Some(vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t).bounds);
    let n = Node::new(NodeId(1), NodeKind::Text(Box::new(t)));
    let count = s.load_clipboard(Clipboard { nodes: vec![n], ..Default::default() }, p)?;
    Ok(json!({ "count": count }))
@@ -8,11 +8,9 @@
 //! become active when assigned.

 use std::collections::BTreeMap;
-use std::sync::Arc;

 use serde_json::{Value, json};
 use vectorcraft_color::cms::{self, ColorSettings, Intent, Model, ProofTarget};
-use vectorcraft_color::recolor::Neutral;
 use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::ColorMode;
 use vectorcraft_render::proof;
@@ -57,7 +55,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Convert Document Color Mode",
            [],
            None,
-            "same as file.documentColorMode: {mode: \"cmyk\"|\"rgb\", convert?: true, intent?, grays?} → {changed} (an alias kept for older scripts; the command palette leaves it out)",
+            "same as file.documentColorMode: {mode: \"cmyk\"|\"rgb\", convert?: true, intent?} → {changed} (an alias kept for older scripts; the command palette leaves it out)",
            has_doc,
            convert_mode
        ),
@@ -234,28 +232,6 @@ fn assign_profile(s: &mut Session, p: &Value) -> Result<Value> {
    Ok(json!({"rgb": rgb, "cmyk": cmyk}))
 }

-/// How Document Color Mode converts neutral RGB greys (R = G = B) to CMYK (the `grays` param).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum Grays {
-    /// Through the CMYK profile like any colour: four-colour greys and a rich black.
-    #[default]
-    Profile,
-    /// On the black plate only: K is the grey's ink percentage (as Convert to Grayscale and then
-    /// to CMYK would give).
-    Black,
-}
-
-impl Grays {
-    /// The `grays` param of `cmd`: `"profile"` (default) or `"black"`.
-    pub(crate) fn param(cmd: &str, p: &Value) -> Result<Self> {
-        match str_param(p, "grays").map(str::to_ascii_lowercase).as_deref() {
-            None | Some("profile") => Ok(Grays::Profile),
-            Some("black") => Ok(Grays::Black),
-            Some(g) => Err(bad(cmd, format!("grays must be \"profile\" or \"black\", not `{g}`"))),
-        }
-    }
-}
-
 /// File → Document Color Mode (`file.documentColorMode` and its alias
 /// `object.convertDocumentColorMode`): set the mode and, unless `convert: false`, convert every
 /// colour through the colour settings.
@@ -267,7 +243,6 @@ pub(crate) fn convert_mode(s: &mut Session, p: &Value) -> Result<Value> {
        _ => return Err(bad(C, "mode must be \"cmyk\" or \"rgb\"")),
    };
    let intent = intent_param(p, C)?;
-    let grays = Grays::param(C, p)?;
    // Choosing the mode the document already has (the checked menu item) is not an edit.
    if s.doc()?.doc.color_mode == mode {
        return Ok(json!({ "changed": 0 }));
@@ -275,20 +250,18 @@ pub(crate) fn convert_mode(s: &mut Session, p: &Value) -> Result<Value> {
    let convert = bool_or(p, "convert", true);
    let mut changed = 0usize;
    s.edit("Document Color Mode", |d, _| {
-        changed = set_color_mode(d, mode, convert, intent, grays);
+        changed = set_color_mode(d, mode, convert, intent);
        Ok(())
    })?;
    Ok(json!({ "changed": changed }))
 }

-/// Put `d` in colour `mode` and, with `convert`, convert every colour of its art, symbols,
-/// pattern tiles and swatches through the colour settings (`intent`, default: theirs) → how many
-/// colours of the art, symbols and patterns changed. Gray colours stay Gray (they print on the
-/// black plate in either mode); RGB greys are colours like any other and separate through the
-/// CMYK profile, unless `grays` puts them on the black plate. Lab colours (spot colour
+/// Put `d` in colour `mode` and, with `convert`, convert every colour of its art, symbols and
+/// swatches through the colour settings (`intent`, default: theirs) → how many colours changed.
+/// Greys stay greys (they print on the black plate in either mode); Lab colours (spot colour
 /// definitions) are device independent and fit either mode. Document Color Mode and
 /// `document.open {colorMode}` both convert this way.
-pub(crate) fn set_color_mode(d: &mut vectorcraft_doc::Document, mode: ColorMode, convert: bool, intent: Option<Intent>, grays: Grays) -> usize {
+pub(crate) fn set_color_mode(d: &mut vectorcraft_doc::Document, mode: ColorMode, convert: bool, intent: Option<Intent>) -> usize {
    d.color_mode = mode;
    if !convert {
        return 0;
@@ -296,25 +269,15 @@ pub(crate) fn set_color_mode(d: &mut vectorcraft_doc::Document, mode: ColorMode,
    let c = cms::active();
    let intent = intent.unwrap_or(c.settings().intent);
    let model = if mode == ColorMode::Cmyk { Model::Cmyk } else { Model::Rgb };
-    let k_only = model == Model::Cmyk && grays == Grays::Black;
-    let conv = |col: &Color| match col {
-        Color::Gray { .. } | Color::Lab { .. } => *col,
-        // Grey ink percentage, then K only (a Gray colour's CMYK).
-        Color::Rgb { .. } if k_only && Neutral::of(col).is_some() => c.convert(&c.convert(col, Model::Gray, intent), Model::Cmyk, intent),
-        _ => c.convert(col, model, intent),
-    };
+    let conv = |col: &Color| if matches!(col, Color::Gray { .. } | Color::Lab { .. }) { *col } else { c.convert(col, model, intent) };
    let mut changed = 0usize;
-    let mut count = |col: &Color, _: proof::Link| {
+    proof::map_document_colors(d, &mut |col, _| {
        let n = conv(col);
        if n != *col {
            changed += 1;
        }
        n
-    };
-    proof::map_document_colors(d, &mut count);
-    for a in d.patterns.iter_mut().flat_map(|p| &mut p.art) {
-        proof::map_node_colors(Arc::make_mut(a), &mut count);
-    }
+    });
    for sw in d.swatches_iter_mut() {
        match &mut sw.paint {
            Paint::Solid { color, .. } => *color = conv(color),
@@ -50,7 +50,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Create Text",
            [],
            None,
-            "{x, y, text, vertical?: bool = false, size?: pt, font?: family, style?, color?, area?: {width, height}, placeholder?: bool (fill it with placeholder text instead, as the Type tools do with prefs placeholderText)} → {id}",
+            "{x, y, text, vertical?: bool = false, size?: pt, font?: family, style?, color?, area?: {width, height}} → {id}",
            has_doc,
            text_create
        ),
@@ -166,13 +166,7 @@ fn rect_of(p: &Value, cmd: &str) -> Result<Rect> {
 fn rectangle(s: &mut Session, p: &Value) -> Result<Value> {
    let r = rect_of(p, "shape.rectangle")?;
    let radius = f64_or(p, "radius", 0.0).max(0.0);
-    let live = LiveShape::Rectangle {
-        w: r.width(),
-        h: r.height(),
-        radii: [radius; 4],
-        kinds: Default::default(),
-        xf: Affine::translate(r.origin().to_vec2()),
-    };
+    let live = LiveShape::Rectangle { w: r.width(), h: r.height(), radii: [radius; 4], xf: Affine::translate(r.origin().to_vec2()) };
    let label = if radius > 0.0 { "Rounded Rectangle" } else { "Rectangle" };
    add_art(s, label, path_kind(live.to_path(), Some(live)), None)
 }
@@ -408,33 +402,16 @@ fn text_create(s: &mut Session, p: &Value) -> Result<Value> {
    let text = str_param(p, "text").unwrap_or("");
    let mut t = TextObject::point(Point::new(x, y), text, new_type_style(s, p));
    t.vertical = p.get("vertical").and_then(Value::as_bool).unwrap_or(false);
-    t.para = new_type_para();
    if let Some(a) = p.get("area") {
        let w = f64_or(a, "width", 200.0);
        let h = f64_or(a, "height", 100.0);
        t.kind = vectorcraft_doc::TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, w, h)) };
    }
-    if bool_or(p, "placeholder", false) {
-        super::typemenu::fill_with_placeholder(&mut t);
-    } else {
-        super::typecmd::refresh_bounds(&mut t);
-    }
+    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t);
+    t.cached_bounds = Some(lay.bounds);
    add_node(s, "Type", NodeKind::Text(Box::new(t)), Appearance::default(), None)
 }

-/// The paragraph attributes new type gets (the Type tools, `text.create`): aligned to the start of
-/// each paragraph's direction (left, right for Hebrew and Arabic), Japanese punctuation composed
-/// with Line-end Punctuation Half Width and Standard burasagari (as in Illustrator). Imported text
-/// keeps its own.
-pub(crate) fn new_type_para() -> vectorcraft_doc::ParaStyle {
-    vectorcraft_doc::ParaStyle {
-        justify: vectorcraft_doc::Justify::Auto,
-        mojikumi: vectorcraft_doc::Mojikumi::LineEndHalf,
-        burasagari: vectorcraft_doc::Burasagari::Standard,
-        ..Default::default()
-    }
-}
-
 /// The character style new type gets: `size`, `font`, `style` and `color` from `p`, else the
 /// defaults, filled with the current fill unless that is None or white (black then).
 pub(crate) fn new_type_style(s: &Session, p: &Value) -> CharStyle {
@@ -6,8 +6,7 @@ use std::collections::BTreeSet;
 use std::sync::Arc;

 use serde_json::{Value, json};
-use vectorcraft_doc::{CharStyle, Guide, Node, NodeId, NodeKind, SavedSelection, TextKind};
-use vectorcraft_geom::Vec2;
+use vectorcraft_doc::{CharStyle, Guide, Node, NodeId, NodeKind, TextKind};

 use super::edit::selected_roots;
 use super::*;
@@ -94,30 +93,15 @@ pub fn specs() -> Vec<CommandSpec> {
            "Save Selection…",
            ["Select"],
            None,
-            "{name?} save the current selection under a name, in the document (default \"Selection N\"; an existing name is replaced; at most 25, names up to 255 characters) → {name}",
+            "{name?} remember the current selection for this session (default name \"Selection N\") → {name}",
            has_selection,
            save_selection
        ),
-        cmd!(
-            "select.recall",
-            "Recall Selection",
-            ["Select"],
-            None,
-            "{name} select the objects of a saved selection (those since deleted are left out) → {count}",
-            has_saved_selection,
-            recall_selection
-        ),
-        cmd!(
-            "select.editSaved",
-            "Edit Selection…",
-            ["Select"],
-            None,
-            "{name, newName?: rename, delete?: bool} | {edits: [{name, newName?, delete?}…]} rename or delete saved selections, all in one undo step; names are those before the edit and must stay unique",
-            has_saved_selection,
-            edit_saved
-        ),
+        cmd!("select.recall", "Recall Selection", ["Select"], None, "{name} → {count}", has_doc, recall_selection),
+        cmd!("select.editSaved", "Edit Selection…", ["Select"], None, "{name, newName?: rename, delete?: bool}", has_doc, edit_saved),
        cmd!(query "select.savedList", "Saved Selections", [], None, "{} → [name…] for the active document", has_doc, |s, _| {
-            Ok(json!(s.doc()?.doc.saved_selections.iter().map(|x| x.name.clone()).collect::<Vec<_>>()))
+            let t = s.doc()?.title();
+            Ok(json!(s.menu.saved_selections.iter().filter(|x| x.0 == t).map(|x| x.1.clone()).collect::<Vec<_>>()))
        }),
        cmd!(
            "view.guides.make",
@@ -155,58 +139,16 @@ pub fn specs() -> Vec<CommandSpec> {
            has_doc,
            clear_guides
        ),
-        cmd!(
-            "guide.add",
-            "Add Guide",
-            [],
-            None,
-            "{vertical: bool, pos: pt (x for vertical, y for horizontal), artboard?: index (an artboard guide: it runs across that artboard only and moves, is copied and is deleted with it; default a canvas guide, across the whole canvas)} → {index}",
-            has_doc,
-            guide_add
-        ),
-        cmd!(
-            query "guide.list",
-            "Guides",
-            [],
-            None,
-            "{} → [{index, vertical, pos, selected, artboard?: index (an artboard guide's)}…] the ruler guides",
-            has_doc,
-            guide_list
-        ),
-        cmd!(
-            "guide.select",
-            "Select Guides",
-            [],
-            None,
-            "{indexes: [index…], toggle?: bool} select ruler guides on their own (deselecting the art); toggle adds or removes them instead → {selected: [index…]}",
-            guides_unlocked,
-            guide_select
-        ),
-        cmd!(
-            "guide.remove",
-            "Remove Guide",
-            [],
-            None,
-            "{index?} delete ruler guide `index`, else the selected ones (as Delete / edit.clear does) → {count}",
-            guides_unlocked,
-            guide_remove
-        ),
-        cmd!(
-            "guide.move",
-            "Move Guide",
-            [],
-            None,
-            "{index, pos: pt} put ruler guide `index` at `pos` | {dx?, dy?: pt, copy?: bool} move the selected guides (vertical ones by dx, horizontal ones by dy); copy leaves them and selects the moved copies",
-            guides_unlocked,
-            guide_move
-        ),
+        cmd!("guide.add", "Add Guide", [], None, "{vertical: bool, pos: pt (x for vertical, y for horizontal)} → {index}", has_doc, guide_add),
+        cmd!("guide.remove", "Remove Guide", [], None, "{index}", guides_unlocked, guide_remove),
+        cmd!("guide.move", "Move Guide", [], None, "{index, pos: pt}", guides_unlocked, guide_move),
        cmd!("file.closeAll", "Close All", ["File"], Some("Cmd+Alt+W"), "{} → {closed}", has_doc, close_all),
        cmd!(
            "file.documentColorMode",
            "Document Color Mode",
            ["File", "Document Color Mode"],
            None,
-            "{mode: \"cmyk\"|\"rgb\", convert?: true (convert every colour of the art, symbols, pattern tiles and swatches through the colour settings; swatch links kept; Gray colours stay Gray, on the black plate), intent?, grays?: \"profile\" (default: RGB greys separate through the CMYK profile like any colour, into four-colour greys and a rich black) | \"black\" (to CMYK, RGB greys with R = G = B go on the black plate only, K = their grey value)} → {changed}",
+            "{mode: \"cmyk\"|\"rgb\", convert?: true (convert every colour of the art, symbols and swatches through the colour settings; swatch links kept; greys stay greys), intent?} → {changed}",
            has_doc,
            super::colormgmt::convert_mode
        ),
@@ -317,79 +259,43 @@ fn direction_handles(s: &mut Session, _: &Value) -> Result<Value> {
 }

 fn save_selection(s: &mut Session, p: &Value) -> Result<Value> {
-    const C: &str = "select.save";
    let st = s.doc()?;
+    let title = st.title();
    let ids = st.selection.objects.clone();
-    let saved = &st.doc.saved_selections;
-    let name = str_param(p, "name").and_then(SavedSelection::clean_name).unwrap_or_else(|| SavedSelection::default_name(saved));
-    let existing = saved.iter().position(|x| x.name == name);
-    if existing.is_none() && saved.len() >= SavedSelection::MAX {
-        return Err(bad(C, format!("a document keeps at most {} saved selections", SavedSelection::MAX)));
-    }
-    s.edit("Save Selection", |d, _| {
-        let entry = SavedSelection { name: name.clone(), objects: ids };
-        match existing.and_then(|i| d.saved_selections.get_mut(i)) {
-            Some(x) => *x = entry,
-            None => d.saved_selections.push(entry),
+    let name = match str_param(p, "name").filter(|n| !n.trim().is_empty()) {
+        Some(n) => n.trim().to_string(),
+        None => {
+            let mut i = 1;
+            while s.menu.saved_selections.iter().any(|x| x.0 == title && x.1 == format!("Selection {i}")) {
+                i += 1;
+            }
+            format!("Selection {i}")
        }
-        Ok(())
-    })?;
+    };
+    s.menu.saved_selections.retain(|x| !(x.0 == title && x.1 == name));
+    s.menu.saved_selections.push((title, name.clone(), ids));
    Ok(json!({ "name": name }))
 }

+fn saved_index(s: &Session, p: &Value, cmd: &str) -> Result<usize> {
+    let name = str_param(p, "name").ok_or_else(|| bad(cmd, "missing name"))?;
+    let t = s.doc()?.title();
+    s.menu.saved_selections.iter().position(|x| x.0 == t && x.1 == name).ok_or_else(|| bad(cmd, format!("no saved selection `{name}`")))
+}
+
 fn recall_selection(s: &mut Session, p: &Value) -> Result<Value> {
-    const C: &str = "select.recall";
-    let name = str_param(p, "name").ok_or_else(|| bad(C, "missing name"))?;
-    let ids = s.doc()?.doc.saved_selections.iter().find(|x| x.name == name).map(|x| x.objects.clone());
-    let ids = ids.ok_or_else(|| bad(C, format!("no saved selection `{name}`")))?;
+    let i = saved_index(s, p, "select.recall")?;
+    let ids = s.menu.saved_selections[i].2.clone();
    s.select(|d, sel| sel.set(ids.into_iter().filter(|id| d.node(*id).is_some())))?;
    Ok(json!({ "count": s.doc()?.selection.len() }))
 }

-/// Recall and Edit Selection… need a document with at least one saved selection.
-fn has_saved_selection(s: &Session) -> std::result::Result<(), String> {
-    let st = s.active().ok_or("no document open")?;
-    if st.doc.saved_selections.is_empty() { Err("no saved selections".into()) } else { Ok(()) }
-}
-
 fn edit_saved(s: &mut Session, p: &Value) -> Result<Value> {
-    const C: &str = "select.editSaved";
-    let edits = match p.get("edits").and_then(Value::as_array) {
-        Some(list) => list.as_slice(),
-        None => std::slice::from_ref(p),
-    };
-    let before = s.doc()?.doc.saved_selections.clone();
-    // Edits name the selections as they are now, so they don't depend on each other's order.
-    let mut after: Vec<Option<SavedSelection>> = before.iter().cloned().map(Some).collect();
-    // Files may hold any number of saved selections: keep this linear.
-    let mut index = std::collections::HashMap::with_capacity(before.len());
-    for (i, x) in before.iter().enumerate() {
-        index.entry(x.name.as_str()).or_insert(i);
-    }
-    for e in edits {
-        let name = str_param(e, "name").ok_or_else(|| bad(C, "missing name"))?;
-        let i = *index.get(name).ok_or_else(|| bad(C, format!("no saved selection `{name}`")))?;
-        let Some(slot) = after.get_mut(i) else { continue };
-        if bool_or(e, "delete", false) {
-            *slot = None;
-        } else if let Some(n) = str_param(e, "newName").and_then(SavedSelection::clean_name)
-            && let Some(x) = slot
-        {
-            x.name = n;
-        }
-    }
-    let after: Vec<SavedSelection> = after.into_iter().flatten().collect();
-    let mut names = std::collections::HashSet::with_capacity(after.len());
-    for x in &after {
-        if !names.insert(x.name.as_str()) {
-            return Err(bad(C, format!("two saved selections would be named `{}`", x.name)));
-        }
-    }
-    if after != before {
-        s.edit("Edit Selection", |d, _| {
-            d.saved_selections = after;
-            Ok(())
-        })?;
+    let i = saved_index(s, p, "select.editSaved")?;
+    if bool_or(p, "delete", false) {
+        s.menu.saved_selections.remove(i);
+    } else if let Some(n) = str_param(p, "newName").filter(|n| !n.trim().is_empty()) {
+        s.menu.saved_selections[i].1 = n.trim().to_string();
    }
    ok()
 }
@@ -471,10 +377,6 @@ fn release_guides(s: &mut Session, _: &Value) -> Result<Value> {
 fn lock_guides(s: &mut Session, p: &Value) -> Result<Value> {
    let v = p.get("locked").and_then(Value::as_bool).unwrap_or(!s.menu.guides_locked);
    s.menu.guides_locked = v;
-    // Locked guides can't stay selected.
-    if v && !s.doc()?.selection.guides.is_empty() {
-        s.select(|_, sel| sel.guides.clear())?;
-    }
    Ok(json!({ "locked": v }))
 }

@@ -498,112 +400,35 @@ fn clear_guides(s: &mut Session, _: &Value) -> Result<Value> {
 fn guide_add(s: &mut Session, p: &Value) -> Result<Value> {
    let pos = f64_req(p, "pos", "guide.add")?;
    let vertical = bool_or(p, "vertical", false);
-    let artboard = match p.get("artboard").filter(|v| !v.is_null()) {
-        Some(v) => {
-            let boards = &s.doc()?.doc.artboards;
-            let ab = v.as_u64().and_then(|i| boards.get(usize::try_from(i).ok()?)).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-            Some(ab.id)
-        }
-        None => None,
-    };
    let i = s.edit("New Guide", |d, _| {
-        d.guides.push(Guide { artboard, ..Guide::new(vertical, pos) });
+        d.guides.push(Guide { vertical, pos });
        Ok(d.guides.len() - 1)
    })?;
    Ok(json!({ "index": i }))
 }

-fn guide_list(s: &mut Session, _: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let row = |(i, g): (usize, &Guide)| {
-        let mut r = json!({ "index": i, "vertical": g.vertical, "pos": g.pos, "selected": st.selection.guides.contains(&i) });
-        if let Some(ab) = st.doc.artboards.iter().position(|a| Some(a.id) == g.artboard) {
-            r["artboard"] = json!(ab);
-        }
-        r
-    };
-    Ok(Value::Array(st.doc.guides.iter().enumerate().map(row).collect()))
-}
-
-/// Ruler guide `index` of the active document (`index` validated).
-fn guide_index(s: &Session, v: Option<&Value>, cmd: &str) -> Result<usize> {
-    let i = v.and_then(Value::as_u64).and_then(|i| usize::try_from(i).ok()).ok_or_else(|| bad(cmd, "an index must be a whole number"))?;
+fn guide_index(s: &Session, p: &Value, cmd: &str) -> Result<usize> {
+    let i = p.get("index").and_then(Value::as_u64).ok_or_else(|| bad(cmd, "missing index"))? as usize;
    if i >= s.doc()?.doc.guides.len() {
-        return Err(bad(cmd, format!("no guide {i}")));
+        return Err(bad(cmd, "no such guide"));
    }
    Ok(i)
 }

-fn guide_select(s: &mut Session, p: &Value) -> Result<Value> {
-    let list = p.get("indexes").and_then(Value::as_array).ok_or_else(|| bad("guide.select", "missing indexes"))?;
-    let picked = list.iter().map(|v| guide_index(s, Some(v), "guide.select")).collect::<Result<Vec<_>>>()?;
-    if bool_or(p, "toggle", false) {
-        let mut now = s.doc()?.selection.guides.clone();
-        for i in picked {
-            if let Some(k) = now.iter().position(|g| *g == i) {
-                now.remove(k);
-            } else {
-                now.push(i);
-            }
-        }
-        s.select(|_, sel| sel.set_guides(now))?;
-    } else {
-        s.select(|_, sel| sel.set_guides(picked))?;
-    }
-    Ok(json!({ "selected": s.doc()?.selection.guides }))
-}
-
-/// Delete ruler guide `index`, else the selected guides, in one undo step → {count}.
-pub(crate) fn guide_remove(s: &mut Session, p: &Value) -> Result<Value> {
-    let gone: Vec<usize> = match p.get("index") {
-        Some(v) => vec![guide_index(s, Some(v), "guide.remove")?],
-        None => s.doc()?.selection.guides.clone(),
-    };
-    if gone.is_empty() {
-        return Err(bad("guide.remove", "no guide selected"));
-    }
-    let label = if gone.len() == 1 { "Delete Guide" } else { "Delete Guides" };
-    s.edit(label, |d, sel| {
-        d.retain_guides(sel, |i, _| !gone.contains(&i));
+fn guide_remove(s: &mut Session, p: &Value) -> Result<Value> {
+    let i = guide_index(s, p, "guide.remove")?;
+    s.edit("Delete Guide", |d, _| {
+        d.guides.remove(i);
        Ok(())
    })?;
-    Ok(json!({ "count": gone.len() }))
+    ok()
 }

-/// Put ruler guide `index` at `pos`, else move (or copy) the selected guides, in one undo step.
-pub(crate) fn guide_move(s: &mut Session, p: &Value) -> Result<Value> {
-    if let Some(v) = p.get("index") {
-        let i = guide_index(s, Some(v), "guide.move")?;
-        let pos = f64_req(p, "pos", "guide.move")?;
-        s.edit("Move Guide", |d, _| {
-            if let Some(g) = d.guides.get_mut(i) {
-                g.pos = pos;
-            }
-            Ok(())
-        })?;
-        return ok();
-    }
-    let moving = s.doc()?.selection.guides.clone();
-    if moving.is_empty() {
-        return Err(bad("guide.move", "no guide selected (or give an index)"));
-    }
-    let (dx, dy, copy) = (f64_or(p, "dx", 0.0), f64_or(p, "dy", 0.0), bool_or(p, "copy", false));
-    s.edit(if copy { "Copy Guide" } else { "Move Guide" }, |d, sel| {
-        let mut copies = vec![];
-        for &i in &moving {
-            let Some(g) = d.guides.get_mut(i) else { continue };
-            let moved = g.moved(Vec2::new(dx, dy));
-            if copy {
-                copies.push(moved);
-            } else {
-                *g = moved;
-            }
-        }
-        if copy {
-            let first = d.guides.len();
-            d.guides.extend(copies);
-            sel.set_guides(first..d.guides.len());
-        }
+fn guide_move(s: &mut Session, p: &Value) -> Result<Value> {
+    let i = guide_index(s, p, "guide.move")?;
+    let pos = f64_req(p, "pos", "guide.move")?;
+    s.edit("Move Guide", |d, _| {
+        d.guides[i].pos = pos;
        Ok(())
    })?;
    ok()
@@ -45,15 +45,6 @@ pub fn specs() -> Vec<CommandSpec> {
            has_doc,
            remove_anchor
        ),
-        cmd!(
-            "path.removeAnchors",
-            "Remove Anchor Points",
-            ["Object", "Path"],
-            None,
-            "{} remove the direct-selected anchors without opening their paths, refitting the curve round each → {removedObjects}",
-            has_anchors,
-            remove_anchors
-        ),
        cmd!(
            "path.convertAnchor",
            "Convert Anchor Point",
@@ -601,62 +592,66 @@ fn remove_anchor(s: &mut Session, p: &Value) -> Result<Value> {
    let si = p.get("subpath").and_then(Value::as_u64).unwrap_or(0) as usize;
    let ai = usize_req(p, "anchor", C)?;
    let removed = s.edit("Delete Anchor Point", |d, sel| {
-        let sp = path_mut(d, id)?.subpaths.get(si).ok_or_else(|| EngineError::Other("no such subpath".into()))?;
-        if ai >= sp.anchors.len() {
+        let path = path_mut(d, id)?;
+        let sp = path.subpaths.get_mut(si).ok_or_else(|| EngineError::Other("no such subpath".into()))?;
+        let n = sp.anchors.len();
+        if ai >= n {
            return Err(EngineError::Other("no such anchor".into()));
        }
-        remove_anchors_of(d, sel, id, [(si, ai)])
+        let interior = sp.closed || (ai > 0 && ai + 1 < n);
+        if interior && n >= 3 {
+            let (pi, ni) = ((ai + n - 1) % n, (ai + 1) % n);
+            let (prev, a, next) = (sp.anchors[pi], sp.anchors[ai], sp.anchors[ni]);
+            // Keep the outer tangents; stretch them to span both removed segments.
+            let l1 = prev.p.distance(a.p);
+            let l2 = a.p.distance(next.p);
+            let chord = prev.p.distance(next.p).max(1e-9);
+            let first_line = !prev.has_out() && !a.has_in();
+            let second_line = !a.has_out() && !next.has_in();
+            let (mut hout, mut hin) = (prev.h_out, next.h_in);
+            if !(first_line && second_line) {
+                // Curved: stretch the outer handles to span both segments; a straight side aims a
+                // third of the chord at the removed anchor.
+                hout = if prev.has_out() {
+                    prev.p + (prev.h_out - prev.p) * ((l1 + l2) / l1.max(1e-9)).min(3.0)
+                } else {
+                    prev.p + (a.p - prev.p) * (chord / 3.0 / l1.max(1e-9))
+                };
+                hin = if next.has_in() {
+                    next.p + (next.h_in - next.p) * ((l1 + l2) / l2.max(1e-9)).min(3.0)
+                } else {
+                    next.p + (a.p - next.p) * (chord / 3.0 / l2.max(1e-9))
+                };
+            }
+            sp.anchors[pi].h_out = hout;
+            sp.anchors[ni].h_in = hin;
+        }
+        sp.anchors.remove(ai);
+        if !sp.closed && !sp.anchors.is_empty() {
+            let (f, l) = (0, sp.anchors.len() - 1);
+            let a0 = sp.anchors[f].p;
+            sp.anchors[f].h_in = a0;
+            let al = sp.anchors[l].p;
+            sp.anchors[l].h_out = al;
+        }
+        if sp.anchors.len() < 3 {
+            sp.closed = sp.closed && sp.anchors.len() == 2 && sp.anchors.iter().any(|a| a.has_in() || a.has_out());
+        }
+        let empty = sp.anchors.len() < 2;
+        if empty {
+            path.subpaths.remove(si);
+        }
+        if path.is_empty() {
+            d.remove(id)?;
+            sel.clear();
+            return Ok(true);
+        }
+        sel.anchors.remove(&id);
+        Ok(false)
    })?;
    Ok(json!({ "removedObject": removed }))
 }

-fn remove_anchors(s: &mut Session, _: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let jobs: Vec<(NodeId, Vec<(usize, usize)>)> = st
-        .selection
-        .anchors
-        .iter()
-        .filter(|(id, set)| !set.is_empty() && st.doc.node(**id).is_some_and(|n| matches!(n.kind, NodeKind::Path { .. })))
-        .map(|(id, set)| (*id, set.iter().copied().collect()))
-        .collect();
-    if jobs.is_empty() {
-        return Err(bad("path.removeAnchors", "direct-select anchor points of a path"));
-    }
-    let removed = s.edit("Remove Anchor Points", |d, sel| {
-        let mut removed = 0;
-        for (id, anchors) in jobs {
-            removed += usize::from(remove_anchors_of(d, sel, id, anchors)?);
-        }
-        Ok(removed)
-    })?;
-    Ok(json!({ "removedObjects": removed }))
-}
-
-/// Remove `anchors` (subpath, anchor) of path `id` without opening it, refitting the curve round
-/// each one; a subpath left with one anchor goes, and the path with its last subpath. True when
-/// the path went.
-fn remove_anchors_of(d: &mut Document, sel: &mut Selection, id: NodeId, anchors: impl IntoIterator<Item = (usize, usize)>) -> Result<bool> {
-    let mut anchors: Vec<(usize, usize)> = anchors.into_iter().collect();
-    // The last first, so the indexes still to come stay valid.
-    anchors.sort_unstable_by(|a, b| b.cmp(a));
-    anchors.dedup();
-    let path = path_mut(d, id)?;
-    for (si, ai) in anchors {
-        if let Some(sp) = path.subpaths.get_mut(si) {
-            po::remove_anchor(sp, ai);
-        }
-    }
-    path.subpaths.retain(|sp| sp.anchors.len() >= 2);
-    let gone = path.is_empty();
-    if gone {
-        d.remove(id)?;
-        sel.remove(id);
-    } else {
-        sel.anchors.remove(&id);
-    }
-    Ok(gone)
-}
-
 fn convert_anchor(s: &mut Session, p: &Value) -> Result<Value> {
    const C: &str = "path.convertAnchor";
    let id = id_param(p, "id").ok_or_else(|| bad(C, "missing id"))?;
@@ -670,13 +665,34 @@ fn convert_anchor(s: &mut Session, p: &Value) -> Result<Value> {
    s.edit("Convert Anchor Point", |d, _| {
        let path = path_mut(d, id)?;
        let sp = path.subpaths.get_mut(si).ok_or_else(|| EngineError::Other("no such subpath".into()))?;
-        let a = sp.anchors.get_mut(ai).ok_or_else(|| EngineError::Other("no such anchor".into()))?;
+        let n = sp.anchors.len();
+        if ai >= n {
+            return Err(EngineError::Other("no such anchor".into()));
+        }
+        let prev = if ai > 0 || sp.closed { Some(sp.anchors[(ai + n - 1) % n].p) } else { None };
+        let next = if ai + 1 < n || sp.closed { Some(sp.anchors[(ai + 1) % n].p) } else { None };
+        let a = &mut sp.anchors[ai];
+        if !smooth {
+            a.retract();
+            return Ok(());
+        }
        match target {
-            _ if !smooth => a.retract(),
-            Some(t) if t.distance(a.p) > 1e-9 => *a = Anchor::smooth(a.p, t),
+            Some(t) if t.distance(a.p) > 1e-9 => {
+                a.h_out = t;
+                a.h_in = a.p - (t - a.p);
+                a.kind = AnchorKind::Smooth;
+            }
            Some(_) => a.retract(),
            None => {
-                sp.smooth_anchor(ai);
+                let (pp, nn) = (prev.unwrap_or(a.p), next.unwrap_or(a.p));
+                let dir = nn - pp;
+                let l = dir.hypot();
+                if l > 1e-9 {
+                    let u = dir / l;
+                    a.h_in = a.p - u * (a.p.distance(pp) / 3.0);
+                    a.h_out = a.p + u * (a.p.distance(nn) / 3.0);
+                    a.kind = AnchorKind::Smooth;
+                }
            }
        }
        Ok(())
@@ -746,13 +762,30 @@ fn split(s: &mut Session, p: &Value) -> Result<Value> {
            }
            _ => return Err(EngineError::Other("no such segment".into())),
        };
-        let mut pieces = sp.cut_at(&std::collections::BTreeSet::from([k]));
        if sp.closed {
-            path.subpaths[si] = pieces.pop().ok_or_else(|| EngineError::Other("no such anchor".into()))?;
+            sp.anchors.rotate_left(k);
+            let mut last = sp.anchors[0];
+            last.h_out = last.p;
+            sp.anchors[0].h_in = sp.anchors[0].p;
+            last.kind = AnchorKind::Corner;
+            sp.anchors[0].kind = AnchorKind::Corner;
+            sp.anchors.push(last);
+            sp.closed = false;
+            path.subpaths[si] = sp;
            sel.set([id]);
            return Ok(vec![id]);
        }
-        let [left, right] = <[SubPath; 2]>::try_from(pieces).map_err(|_| EngineError::Other("cannot split an open path at its end point".into()))?;
+        let n = sp.anchors.len();
+        if k == 0 || k + 1 >= n {
+            return Err(EngineError::Other("cannot split an open path at its end point".into()));
+        }
+        let mut left = SubPath::new(sp.anchors[..=k].to_vec(), false);
+        let mut right = SubPath::new(sp.anchors[k..].to_vec(), false);
+        let lp = left.anchors[k].p;
+        left.anchors[k].h_out = lp;
+        left.anchors[k].kind = AnchorKind::Corner;
+        right.anchors[0].h_in = lp;
+        right.anchors[0].kind = AnchorKind::Corner;
        if path.subpaths.len() == 1 {
            path.subpaths[0] = left;
            let node = sibling_with(d, id, PathData::single(right))?;
@@ -5,7 +5,7 @@ use std::sync::Arc;

 use serde_json::{Value, json};
 use vectorcraft_doc::{Document, Node, NodeId, Unit};
-use vectorcraft_geom::{Affine, Vec2};
+use vectorcraft_geom::Affine;

 use super::clipboard::SwatchChoices;
 use super::*;
@@ -24,9 +24,8 @@ pub fn specs() -> Vec<CommandSpec> {
        ),
        cmd!("file.close", "Close", ["File"], Some("Cmd+W"), "{index?}", has_doc, file_close),
        cmd!("document.activate", "Activate Document", [], None, "{index}", always, doc_activate),
-        cmd!(query "document.inspect", "Inspect Document", [], None, "{depth?, childLimit?} → layer tree, artboards, selection, history (a sliced tree reports childCount)", has_doc, |s, p| Ok(inspect::document_opts(s, slice_opts(p, "document.inspect")?))),
-        cmd!(query "document.node", "Inspect Object", [], None, "{id, summary?: compact summary, depth?: child levels in the summary (default all), childLimit?: children shown per node (default all; a level that shows fewer reports childCount)} → one object", has_doc, doc_node),
-        cmd!(query "document.find", "Find Objects", [], None, "{name?: substring of the Layers panel name, kind?: panel label such as Group, Path, Type or Image (exact), text?: substring of type content, limit?: max matches (default 100, 0 counts only)} → {matches: [{id, name, kind, path}], total}", has_doc, doc_find),
+        cmd!(query "document.inspect", "Inspect Document", [], None, "{} → layer tree, artboards, selection, history", has_doc, |s, _| Ok(inspect::document(s))),
+        cmd!(query "document.node", "Inspect Object", [], None, "{id} → full object JSON", has_doc, doc_node),
        cmd!(query "document.json", "Document JSON", [], None, "{} → complete document model", has_doc, |s, _| Ok(serde_json::to_value(&*s.doc()?.doc).unwrap_or(Value::Null))),
        cmd!(
            "document.setUnits",
@@ -39,14 +38,14 @@ pub fn specs() -> Vec<CommandSpec> {
        ),
        cmd!("edit.undo", "Undo", ["Edit"], Some("Cmd+Z"), "{}", can_undo, undo),
        cmd!("edit.redo", "Redo", ["Edit"], Some("Cmd+Shift+Z"), "{}", can_redo, redo),
-        cmd!("edit.cut", "Cut", ["Edit"], Some("Cmd+X"), "{} (the Artboard tool chosen: artboard.cut)", has_selection_or_artboard_tool, cut),
-        cmd!("edit.copy", "Copy", ["Edit"], Some("Cmd+C"), "{} (the Artboard tool chosen: artboard.copy)", has_selection_or_artboard_tool, copy),
+        cmd!("edit.cut", "Cut", ["Edit"], Some("Cmd+X"), "{}", has_selection, cut),
+        cmd!("edit.copy", "Copy", ["Edit"], Some("Cmd+C"), "{}", has_selection, copy),
        cmd!(
            "edit.paste",
            "Paste",
            ["Edit"],
            Some("Cmd+V"),
-            "{center?: [x, y], dx?, dy?, swatchConflict?} paste centred on `center` (the app passes the view centre), else offset by dx/dy (default: the Paste Offset preference). Pasting brings the image blobs, symbols, patterns, global and spot swatches (with the tint swatches of the tints used), gradient swatches, graphic styles, character and paragraph styles and brushes the objects use; one of the same name that differs comes in renamed. swatchConflict, for a swatch whose name the document gives another colour (clipboard.conflicts): \"merge\" (default: the objects take the document's swatch) | \"add\" (the pasted swatch comes in renamed) | {name: \"merge\"|\"add\"}. With Paste Remembers Layers on (layer.pasteRemembersLayers), objects go back into the layers they came from (by name; made when missing). An artboard copied with artboard.copy comes with its art, right of the last artboard (the other paste commands but Paste on All Artboards: where it was), its art back in the layers it came from → {ids, artboard: the new artboard's index or null, added: resources added, merged: conflicts merged, renamed: [{kind, from, to}]}",
+            "{center?: [x, y], dx?, dy?, swatchConflict?} paste centred on `center` (the app passes the view centre), else offset by dx/dy (default: the Paste Offset preference). Pasting brings the image blobs, symbols, patterns, global and spot swatches (with the tint swatches of the tints used), gradient swatches, graphic styles, character and paragraph styles and brushes the objects use; one of the same name that differs comes in renamed. swatchConflict, for a swatch whose name the document gives another colour (clipboard.conflicts): \"merge\" (default: the objects take the document's swatch) | \"add\" (the pasted swatch comes in renamed) | {name: \"merge\"|\"add\"}. With Paste Remembers Layers on (layer.pasteRemembersLayers), objects go back into the layers they came from (by name; made when missing) → {ids, added: resources added, merged: conflicts merged, renamed: [{kind, from, to}]}",
            has_clipboard,
            |s, p| paste(s, p, PasteMode::Offset)
        ),
@@ -86,15 +85,7 @@ pub fn specs() -> Vec<CommandSpec> {
            has_clipboard,
            |s, p| paste(s, p, PasteMode::AllArtboards)
        ),
-        cmd!(
-            "edit.clear",
-            "Clear",
-            ["Edit"],
-            Some("Delete"),
-            "{ids?} delete the objects `ids`, else the selection (direct-selected anchors, else objects, else ruler guides)",
-            has_selection_or_guides,
-            clear
-        ),
+        cmd!("edit.clear", "Clear", ["Edit"], Some("Delete"), "{ids?}", has_selection, clear),
        cmd!("edit.duplicate", "Duplicate", [], None, "{dx?, dy?} duplicate the selection in place (offset optional)", has_selection, duplicate),
    ]
 }
@@ -114,45 +105,8 @@ fn doc_activate(s: &mut Session, p: &Value) -> Result<Value> {

 fn doc_node(s: &mut Session, p: &Value) -> Result<Value> {
    let id = id_param(p, "id").ok_or_else(|| bad("document.node", "missing id"))?;
-    let opts = slice_opts(p, "document.node")?;
-    let summary = bool_or(p, "summary", false);
-    if !summary && (opts.depth.is_some() || opts.child_limit.is_some()) {
-        // The full object JSON is never truncated: a slice without `summary` would
-        // otherwise silently return the whole subtree.
-        return Err(bad("document.node", "`depth` and `childLimit` slice the summary: pass `summary: true`"));
-    }
    let n = s.doc()?.doc.node(id).ok_or(EngineError::NoNode(id))?;
-    if summary { Ok(inspect::node_summary_opts(n, opts)) } else { Ok(serde_json::to_value(n).unwrap_or(Value::Null)) }
-}
-
-/// `depth` / `childLimit` for a summary read: absent (or null) means no limit.
-fn slice_opts(p: &Value, cmd: &str) -> Result<inspect::SummaryOpts> {
-    Ok(inspect::SummaryOpts { depth: opt_u64(p, cmd, "depth")?, child_limit: opt_u64(p, cmd, "childLimit")? })
-}
-
-/// An optional count: absent (or null) is `None`; a present value that is not a
-/// non-negative integer is rejected rather than silently reinterpreted.
-fn opt_u64(p: &Value, cmd: &str, key: &str) -> Result<Option<u64>> {
-    match p.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(v) => v.as_u64().map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be a non-negative integer"))),
-    }
-}
-
-fn doc_find(s: &mut Session, p: &Value) -> Result<Value> {
-    // A filter of the wrong type is an error, not dropped: dropping it would widen the search.
-    let needle = |key: &str| match p.get(key) {
-        None | Some(Value::Null) => Ok(None),
-        Some(Value::String(v)) => Ok(Some(v.to_lowercase()).filter(|v| !v.is_empty())),
-        Some(_) => Err(bad("document.find", format!("`{key}` must be a string"))),
-    };
-    let filter = inspect::FindFilter { name: needle("name")?, kind: needle("kind")?, text: needle("text")? };
-    if filter.is_empty() {
-        return Err(bad("document.find", "give at least one of `name`, `kind`, `text`"));
-    }
-    let limit = opt_u64(p, "document.find", "limit")?.unwrap_or(100);
-    let (matches, total) = inspect::find_nodes(&s.doc()?.doc, &filter, limit);
-    Ok(json!({"matches": matches, "total": total}))
+    Ok(serde_json::to_value(n).unwrap_or(Value::Null))
 }

 /// Document Setup's units (also `document.setup {units}`).
@@ -163,7 +117,7 @@ fn set_units(s: &mut Session, p: &Value) -> Result<Value> {
 }

 /// A typing session in progress (the Type tool previews the whole session as one interaction).
-pub(crate) fn typing_in_progress(s: &Session) -> bool {
+fn typing_in_progress(s: &Session) -> bool {
    s.active().and_then(|d| d.interaction.as_ref()).is_some_and(|it| it.label == "Typing" && it.preview.is_some())
 }

@@ -237,19 +191,12 @@ pub(crate) fn roots_of(doc: &Document, ids: Vec<NodeId>) -> Vec<NodeId> {
 }

 fn copy(s: &mut Session, _: &Value) -> Result<Value> {
-    // The Artboard tool copies its artboard (and the art on it).
-    if s.tool_id() == "artboard" {
-        return super::panelcmds::artboard_copy(s, &json!({}), false);
-    }
    let roots = selected_roots(s)?;
    s.clipboard = Clipboard::copy(s.doc()?, &roots);
    Ok(json!({ "copied": s.clipboard.nodes.len() }))
 }

 fn cut(s: &mut Session, p: &Value) -> Result<Value> {
-    if s.tool_id() == "artboard" {
-        return super::panelcmds::artboard_copy(s, &json!({}), true);
-    }
    copy(s, p)?;
    clear(s, &json!({}))
 }
@@ -259,10 +206,6 @@ fn clear(s: &mut Session, p: &Value) -> Result<Value> {
    if ids_param(p, "ids").is_none() && !s.doc()?.selection.anchors.is_empty() {
        return super::path::delete_anchors(s, p);
    }
-    // Selected ruler guides (selected on their own).
-    if ids_param(p, "ids").is_none() && s.doc()?.selection.is_empty() {
-        return super::docmenu::guide_remove(s, &json!({}));
-    }
    let ids = match ids_param(p, "ids") {
        Some(v) => v,
        None => selected_roots(s)?,
@@ -315,16 +258,8 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
    let st = s.doc()?;
    let same_doc = clip.source_doc == Some(st.uid);
    let parent = st.insertion_parent();
-    // A copied artboard comes back with its art: right of the last artboard, or where it was
-    // (Paste in Place, in Front, in Back). Paste on All Artboards pastes only the art.
-    let board = clip
-        .artboard
-        .as_ref()
-        .filter(|_| mode != PasteMode::AllArtboards)
-        .map(|a| (a, if mode == PasteMode::Offset { super::panelcmds::beside_artboards(&st.doc, a.rect) } else { Vec2::ZERO }));
-    // Paste Remembers Layers (not while isolating a group: pastes stay in it); an artboard's art
-    // always goes back into its layers.
-    let remember = (st.doc.paste_remembers_layers || board.is_some()) && parent.is_some_and(|p| st.doc.node(p).is_some_and(Node::is_layer));
+    // Paste Remembers Layers (not while isolating a group: pastes stay in it).
+    let remember = st.doc.paste_remembers_layers && parent.is_some_and(|p| st.doc.node(p).is_some_and(Node::is_layer));
    // Front/back: relative to the selection (top-most / bottom-most selected object); with
    // nothing selected, the top / bottom of the current layer.
    let anchor = match mode {
@@ -335,21 +270,19 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
        }
        _ => None,
    };
-    let placements: Vec<Affine> = match (mode, board) {
-        (_, Some((_, dv))) => vec![Affine::translate(dv)],
-        (PasteMode::Offset, None) => vec![match point_param(p, "center") {
+    let placements: Vec<Affine> = match mode {
+        PasteMode::Offset => vec![match point_param(p, "center") {
            Some(c) => clip.bounds().map_or(Affine::IDENTITY, |b| Affine::translate(c - b.center())),
            None => Affine::translate((f64_or(p, "dx", off), f64_or(p, "dy", off))),
        }],
-        (PasteMode::AllArtboards, None) => {
+        PasteMode::AllArtboards => {
            let src = clip.source_artboard.or_else(|| st.doc.artboards.first().map(|a| a.rect)).map(|r| r.origin()).unwrap_or_default();
            st.doc.artboards.iter().map(|a| Affine::translate(a.rect.origin() - src)).collect()
        }
        _ => vec![Affine::IDENTITY],
    };
-    let (ids, imported, artboard) = s.edit(mode.label(), |d, sel| {
+    let (ids, imported) = s.edit(mode.label(), |d, sel| {
        let imported = clip.import_into(d, choices, same_doc);
-        let artboard = board.map(|(a, dv)| super::panelcmds::push_artboard_copy(d, a, a.rect + dv));
        let mut layers: BTreeMap<&str, NodeId> = BTreeMap::new();
        // Objects pasted into each parent so far (keeps their order in front and back pastes).
        let mut placed: BTreeMap<Option<NodeId>, usize> = BTreeMap::new();
@@ -381,15 +314,10 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
            }
        }
        sel.set(new_ids.iter().copied());
-        Ok((new_ids, imported, artboard))
+        Ok((new_ids, imported))
    })?;
-    // The Artboard tool takes the pasted artboard.
-    if let Some(i) = artboard.filter(|_| s.tool_id() == "artboard") {
-        s.set_tool_option("active", &json!(i));
-    }
    Ok(json!({
        "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>(),
-        "artboard": artboard,
        "added": imported.added,
        "merged": imported.merged,
        "renamed": imported.renamed,
@@ -355,8 +355,7 @@ pub fn encode(doc: &Document, format: &str, p: &Value) -> Result<Vec<u8>> {
 }

 /// Like [`encode`], also returning the encoder's warnings (PDF and SVG: options not applied yet,
-/// features approximated or left out; every format that draws type: fonts written in the fallback
-/// font).
+/// features approximated or left out; the other formats have none).
 pub fn encode_with_warnings(doc: &Document, format: &str, p: &Value) -> Result<(Vec<u8>, Vec<String>)> {
    let f = super::writable(C, Some(format), None)?;
    encode_all(doc, f.id, p)?.single(f)
@@ -365,19 +364,6 @@ pub fn encode_with_warnings(doc: &Document, format: &str, p: &Value) -> Result<(
 /// [`encode`], with every file the export writes.
 pub fn encode_all(doc: &Document, format: &str, p: &Value) -> Result<Encoded> {
    let f = super::writable(C, Some(format), None)?;
-    let mut enc = encode_files(doc, f, p)?;
-    // Formats that draw type: missing fonts come out in the fallback font (PDF and SVG say so
-    // themselves: SVG only when it outlines or embeds fonts).
-    if (f.raster || matches!(f.id, "eps" | "emf" | "wmf"))
-        && let Some(w) = crate::cmd::fonts::substitution_warning(doc)
-    {
-        enc.warnings.push(w);
-    }
-    Ok(enc)
-}
-
-/// [`encode_all`] without the font substitution warning.
-fn encode_files(doc: &Document, f: &Format, p: &Value) -> Result<Encoded> {
    let doc = &*doc.without_edit_modes();
    let n = doc.artboards.len();
    // SVG reads its own `useArtboards` (an SVG option).
@@ -388,7 +374,7 @@ fn encode_files(doc: &Document, f: &Format, p: &Value) -> Result<Encoded> {
        if let Some(o) = q.as_object_mut() {
            o.remove("useArtboards");
        }
-        return encode_files(&single_artboard(doc, bounds, "Art"), f, &q);
+        return encode_all(&single_artboard(doc, bounds, "Art"), f.id, &q);
    }
    let bytes = match f.id {
        "vectorcraft" => super::native::encode(C, f, doc, p)?,
@@ -178,7 +178,7 @@ pub fn load_with(name: &str, bytes: &[u8], opts: &LoadOptions) -> Result<Loaded>
        _ => return Err(err(format!("{} files can't be opened yet", format.label))),
    };
    if let Some(mode) = opts.color_mode.filter(|m| *m != doc.color_mode) {
-        super::super::colormgmt::set_color_mode(&mut doc, mode, true, None, opts.grays);
+        super::super::colormgmt::set_color_mode(&mut doc, mode, true, None);
    }
    // Imports are named after the file; a native document keeps its own title (the tab shows the
    // file name once it has a path).
@@ -282,15 +282,13 @@ pub(super) fn new_from_template(s: &mut Session, p: &Value) -> Result<Value> {
    open_template(s, src.name, &src.bytes, src.path)
 }

-/// Decode an image's header (and, for formats stored as PNG, its pixels). CMYK TIFFs are kept as
-/// they are, with their ink amounts ([`ImageBlob::cmyk`]).
+/// Decode an image's header (and, for formats stored as PNG, its pixels).
 pub fn raster_image(bytes: &[u8]) -> Result<RasterImage> {
    let reader = image::ImageReader::new(Cursor::new(bytes)).with_guessed_format().map_err(err)?;
    let kind = reader.format().ok_or_else(|| err("not an image VectorCraft reads (see document.formats)"))?;
    let f = image_format(kind).ok_or_else(|| err(format!("{kind:?} images can't be opened (see document.formats)")))?;
    let ppi = super::ppi::resolution(bytes);
-    let cmyk = || ImageBlob::new(f.mime, bytes.to_vec()).cmyk().is_some();
-    let (bytes, mime, (width, height)) = if matches!(f.id, "png" | "jpg" | "gif" | "webp") || (f.id == "tiff" && cmyk()) {
+    let (bytes, mime, (width, height)) = if matches!(f.id, "png" | "jpg" | "gif" | "webp") {
        (bytes.to_vec(), f.mime, reader.into_dimensions().map_err(err)?)
    } else {
        let img = reader.decode().map_err(err)?.to_rgba8();
@@ -78,7 +78,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Open Document",
            [],
            None,
-            "{path} or {name, dataBase64}, PDF/.ai: pages?: \"2-3, 5\" (1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page) | false (one layer per page, without the art that is off; Save then asks for a name), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), DXF: dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its pixel size), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwork is imported and the first warning says why. Templates (native templates, .ait) open as a new untitled document; a restored .ai keeps its path (Save writes .ai again). Linked images are read from their files (looked for at their path, then relative to the document): missing ones show their saved preview (links.relink), modified ones are read again only with Preferences › Update Links: Automatically (else links.update). An SVG's <image> files (relative links from the SVG's folder) stay linked, SVG files become art, missing ones a placeholder in their box (a warning and missingLinks)",
+            "{path} or {name, dataBase64}, PDF/.ai: pages?: \"2-3, 5\" (1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page) | false (one layer per page, without the art that is off; Save then asks for a name), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), DXF: dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its pixel size), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwork is imported and the first warning says why. Templates (native templates, .ait) open as a new untitled document; a restored .ai keeps its path (Save writes .ai again). Linked images are read from their files (looked for at their path, then relative to the document): missing ones show their saved preview (links.relink), modified ones are read again only with Preferences › Update Links: Automatically (else links.update). An SVG's <image> files (relative links from the SVG's folder) stay linked, SVG files become art, missing ones a placeholder in their box (a warning and missingLinks)",
            always,
            load::open
        ),
@@ -276,7 +276,6 @@ pub(super) fn encode_carrying(cmd: &str, doc: &Document, p: &Value, native: impl
    }
    let r = super::super::rasterfx::export_pdf_with_report(flat.as_ref().unwrap_or(doc), &opts).map_err(|e| pdf_error(cmd, e))?;
    warnings.extend(r.warnings);
-    warnings.extend(crate::cmd::fonts::substitution_warning(doc));
    Ok((r.bytes, warnings))
 }

@@ -6,7 +6,6 @@ use serde_json::{Value, json};
 use vectorcraft_doc::{ColorMode, Document};
 use vectorcraft_pdf::{Choice, CropTo, ImportOptions, PdfError, TextAs};

-use super::super::colormgmt::Grays;
 use super::super::*;
 use super::{err, source};

@@ -23,8 +22,6 @@ pub struct LoadOptions {
    /// The colour mode the document opens in, its colours converted as Document Color Mode does
    /// (default: the file's; a PDF painted mostly in CMYK opens in CMYK).
    pub color_mode: Option<ColorMode>,
-    /// How that conversion separates RGB greys (`grays`).
-    pub grays: Grays,
    /// What a PDF's text becomes.
    pub text_as: TextAs,
    /// A PDF's optional content groups become layers (else one layer per page, without the art
@@ -41,7 +38,6 @@ impl Default for LoadOptions {
            crop: CropTo::default(),
            password: None,
            color_mode: None,
-            grays: Grays::default(),
            text_as: TextAs::default(),
            layers: true,
            dxf: Default::default(),
@@ -51,7 +47,7 @@ impl Default for LoadOptions {

 impl LoadOptions {
    /// From command params: `pages` (`"2-3, 5"`, a page number or `"all"`), `page` (one page, when
-    /// `pages` isn't given), `cropTo` (or `crop`), `password`, `colorMode` (`rgb` | `cmyk`) with `grays`,
+    /// `pages` isn't given), `cropTo` (or `crop`), `password`, `colorMode` (`rgb` | `cmyk`),
    /// `textAs` (`text` | `outlines`), `layers` (true | false) and `dxf` (the DXF import options).
    pub fn from_params(cmd: &str, p: &Value) -> Result<Self> {
        let pages = match p.get("pages").filter(|v| !v.is_null()).or_else(|| p.get("page").filter(|v| !v.is_null())) {
@@ -69,14 +65,13 @@ impl LoadOptions {
            Some("cmyk") => Some(ColorMode::Cmyk),
            Some(m) => return Err(bad(cmd, format!("colorMode must be rgb or cmyk, not `{m}`"))),
        };
-        let grays = Grays::param(cmd, p)?;
        let text_as = choice(cmd, "textAs", str_param(p, "textAs"))?;
        let layers = match p.get("layers").filter(|v| !v.is_null()) {
            None => true,
            Some(v) => v.as_bool().ok_or_else(|| bad(cmd, "layers must be true or false"))?,
        };
        let dxf = super::dxfimport::options(cmd, p.get("dxf"))?;
-        Ok(Self { pages, crop, password, color_mode, grays, text_as, layers, dxf })
+        Ok(Self { pages, crop, password, color_mode, text_as, layers, dxf })
    }

    /// Does the document read only part of the file, or read it differently (a page range, another
@@ -166,11 +166,5 @@ pub(super) fn encode(doc: &Document, p: &Value, compressed: bool) -> Result<Enco
        }
        enc.files.push((artboard, if compressed { vectorcraft_svg::compress_bytes(&bytes) } else { bytes }));
    }
-    // Live type names its fonts; outlines and embedded fonts are the fallback font's.
-    if (opts.outline_text || opts.embed_fonts)
-        && let Some(w) = crate::cmd::fonts::substitution_warning(doc)
-    {
-        enc.warnings.push(w);
-    }
    Ok(enc)
 }
@@ -103,17 +103,6 @@ fn webp_opens_at_its_pixel_size() {
    assert_eq!((r.width, r.height, r.blob.mime.as_str()), (3, 2, "image/webp"));
 }

-#[test]
-fn cmyk_tiffs_keep_their_inks_and_other_tiffs_become_png() {
-    let inks = vectorcraft_doc::cmyk::Inks::new(2, 1, vec![0, 102, 255, 0, 10, 20, 30, 40]).unwrap();
-    let tiff = vectorcraft_doc::ImageBlob::cmyk_tiff(&inks).unwrap();
-    let r = raster_image(&tiff.bytes).unwrap();
-    assert_eq!((r.width, r.height, r.blob.mime.as_str()), (2, 1, "image/tiff"));
-    assert_eq!(r.blob.cmyk(), Some(inks));
-    let rgb = raster_image(&image_bytes(2, 1, image::ImageFormat::Tiff)).unwrap();
-    assert_eq!(rgb.blob.mime, "image/png");
-}
-
 #[test]
 fn content_beats_a_wrong_extension() {
    let png = image_bytes(2, 2, image::ImageFormat::Png);
@@ -92,22 +92,6 @@ fn postscript_ai_files_and_garbage() {
    assert_eq!((&r["format"], &r["restored"]), (&json!("ai"), &json!(false)), "{r}");
    assert_eq!(s.doc().unwrap().path, None);
    assert_eq!(objects(&s), 1);
-    // Illustrator's groups come in as groups, nested as they were.
-    let ai = b"%!PS-Adobe-3.0
-%%Creator: Adobe Illustrator(R) 8.0
-%%BoundingBox: 0 0 100 100
-%%EndComments
-               /u {} def /U {} def /L {lineto} def /f {closepath fill} def
-               u 0 0 moveto 9 0 L 9 9 L f u 20 0 moveto 29 0 L 29 9 L f 40 0 moveto 49 0 L 49 9 L f U U
-showpage
-%%EOF
-";
-    open(&mut s, "groups.ai", ai).unwrap();
-    let d = s.doc().unwrap().doc.clone();
-    let outer = &d.layers[0].children().unwrap()[0];
-    let inner = outer.children().map(|c| (c.len(), c[1].children().map(Vec::len))).unwrap();
-    assert!(matches!(outer.kind, vectorcraft_doc::NodeKind::Group { clip: false, .. }), "{:?}", outer.kind);
-    assert_eq!(inner, (2, Some(2)));
    // A .ait one opens as a new untitled document.
    let r = open(&mut s, "legacy.ait", ps).unwrap();
    assert!(r["title"].as_str().unwrap().starts_with("Untitled"), "{r}");
@@ -67,40 +67,3 @@ fn load_options_read_text_and_layers() {
    let d = LoadOptions::default();
    assert_eq!((d.text_as, d.layers, d.is_partial()), (TextAs::Text, true, false));
 }
-
-#[test]
-fn exports_that_draw_type_in_a_missing_font_say_it_is_the_fallback_font() {
-    let page = PdfPage {
-        resources: "/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Zyxwvu-Serif >> >>".into(),
-        ..PdfPage::new(200.0, 100.0, "BT /F1 12 Tf 10 50 Td (Hello) Tj ET")
-    };
-    let mut s = Session::new();
-    let r = open(&mut s, &pdf(&[page], None), json!({})).unwrap();
-    let fonts = s.execute("text.fonts", &json!({})).unwrap();
-    let family = fonts[0]["family"].as_str().unwrap().to_string();
-    assert_eq!(fonts[0]["status"], "missing", "{fonts}");
-    assert!(r["warnings"].to_string().contains(&family), "opening lists it: {r}");
-    let warned = |s: &mut Session, p: Value| {
-        let w = s.execute("document.serialize", &p).unwrap()["warnings"].to_string();
-        w.contains(&family) && w.contains(vectorcraft_text::FALLBACK_FAMILY)
-    };
-    for p in [
-        json!({"format": "pdf"}),
-        json!({"format": "pdf", "advanced": {"outlineText": false}}),
-        json!({"format": "png"}),
-        json!({"format": "eps"}),
-        json!({"format": "emf"}),
-        json!({"format": "svg", "outlineText": true}),
-        json!({"format": "svg", "embedFonts": true}),
-    ] {
-        assert!(warned(&mut s, p.clone()), "{p}");
-    }
-    // Live SVG type and the native file name the font itself.
-    for p in [json!({"format": "svg", "outlineText": false}), json!({"format": "vectorcraft"}), json!({"format": "txt"})] {
-        assert!(!warned(&mut s, p.clone()), "{p}");
-    }
-    let pdf_export = s.execute("document.exportPdf", &json!({})).unwrap();
-    assert!(pdf_export["warnings"].to_string().contains(&family), "{pdf_export}");
-    s.execute("text.replaceFont", &json!({"from": {"family": family}, "to": {"family": "Source Serif 4"}})).unwrap();
-    assert!(!warned(&mut s, json!({"format": "pdf"})), "replaced: nothing is substituted");
-}
@@ -2,10 +2,10 @@
 //! another everywhere or in the selection, and selecting the text that uses a font. Also the fonts
 //! available (the bundled and installed ones) and rescanning the installed fonts.

-use std::collections::{BTreeMap, BTreeSet};
+use std::collections::BTreeMap;

 use serde_json::{Value, json};
-use vectorcraft_doc::{Document, Node, NodeId, NodeKind};
+use vectorcraft_doc::{Document, NodeId, NodeKind};

 use super::typecmd::refresh_bounds;
 use super::*;
@@ -85,41 +85,6 @@ fn scope(s: &Session, selection_only: bool) -> Result<Vec<NodeId>> {
    Ok(v)
 }

-/// The fonts (family, style) of the type in the layers and symbols of `d`.
-pub(super) fn used_fonts(d: &Document) -> BTreeSet<(String, String)> {
-    let mut fonts = BTreeSet::new();
-    let mut add = |n: &Node| {
-        if let NodeKind::Text(t) = &n.kind {
-            fonts.extend(t.runs.iter().map(|r| (r.style.font_family.clone(), r.style.font_style.clone())));
-        }
-    };
-    d.walk(&mut add);
-    for s in &d.symbols {
-        s.art.walk(&mut add);
-    }
-    fonts
-}
-
-/// What an export that draws type (as outlines, embedded fonts or pixels) says when `d` uses font
-/// families that aren't available: their type is drawn in the fallback font, not the font it names.
-pub(super) fn substitution_warning(d: &Document) -> Option<String> {
-    let db = vectorcraft_text::FontDb::global();
-    let mut missing: Vec<String> = used_fonts(d)
-        .into_iter()
-        .filter(|(family, style)| db.resolve(family, style).is_none_or(|(_, m)| m == vectorcraft_text::FontMatch::Missing))
-        .map(|(family, _)| family)
-        .collect();
-    // Sorted by family: its styles are neighbours.
-    missing.dedup();
-    (!missing.is_empty()).then(|| {
-        format!(
-            "fonts that aren't available were written in the fallback font, {}: {} (install them, or replace them with Find Font)",
-            vectorcraft_text::FALLBACK_FAMILY,
-            missing.join(", ")
-        )
-    })
-}
-
 fn text(d: &Document, id: NodeId) -> Option<&vectorcraft_doc::TextObject> {
    match d.node(id).map(|n| &n.kind) {
        Some(NodeKind::Text(t)) => Some(t),
@@ -228,10 +228,24 @@ fn all_layers(d: &Document) -> Vec<&Node> {
    out
 }

+/// The next unused `Layer N` name, counting sublayers too.
+pub(crate) fn next_layer_name(d: &Document) -> String {
+    let layers = all_layers(d);
+    let taken: HashSet<&str> = layers.iter().filter_map(|l| l.name.as_deref()).collect();
+    let mut i = layers.len() + 1;
+    loop {
+        let name = format!("Layer {i}");
+        if !taken.contains(name.as_str()) {
+            return name;
+        }
+        i += 1;
+    }
+}
+
 /// A new layer named `name` (default: the next `Layer N`) in the next layer colour.
 pub(crate) fn make_layer(d: &mut Document, name: Option<&str>) -> Node {
    let n = all_layers(d).len();
-    let name = name.map(str::to_string).unwrap_or_else(|| d.next_layer_name());
+    let name = name.map(str::to_string).unwrap_or_else(|| next_layer_name(d));
    let id = d.alloc_id();
    Node::layer(id, &name, LayerColor::Preset((n % LAYER_COLORS.len()) as u8))
 }
@@ -735,16 +749,14 @@ fn artboard_new(s: &mut Session, p: &Value) -> Result<Value> {

 fn artboard_delete(s: &mut Session, p: &Value) -> Result<Value> {
    let i = p.get("index").and_then(Value::as_u64).ok_or_else(|| bad("artboard.delete", "missing index"))? as usize;
-    s.edit("Delete Artboard", |d, sel| {
+    s.edit("Delete Artboard", |d, _| {
        if d.artboards.len() <= 1 {
            return Err(EngineError::Other("a document needs at least one artboard".into()));
        }
        if i >= d.artboards.len() {
            return Err(EngineError::Other("no such artboard".into()));
        }
-        // Its guides go with it.
-        let id = d.artboards.remove(i).id;
-        d.retain_guides(sel, |_, g| g.artboard != Some(id));
+        d.artboards.remove(i);
        Ok(())
    })?;
    ok()
@@ -754,16 +766,10 @@ fn artboard_set(s: &mut Session, p: &Value) -> Result<Value> {
    let i = p.get("index").and_then(Value::as_u64).unwrap_or(0) as usize;
    s.edit("Artboard Options", |d, _| {
        let a = d.artboards.get_mut(i).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-        let was = a.rect;
        a.rect = rect_from(p, a.rect);
        if let Some(n) = str_param(p, "name") {
            a.name = n.to_string();
        }
-        // Moved (not resized), it takes its guides along.
-        let (id, now) = (a.id, a.rect);
-        if (now.width() - was.width()).abs() <= 1e-6 && (now.height() - was.height()).abs() <= 1e-6 {
-            d.move_artboard_guides(id, now.origin() - was.origin());
-        }
        Ok(())
    })?;
    ok()
@@ -1,5 +1,5 @@
 //! Object menu long tail: Lock/Hide All Artwork Above & Other Layers, Transform Each, Reset
-//! Bounding Box, Rasterize, Crop Image, Mask (an image), Create Trim Marks, Convert to Shape and
+//! Bounding Box, Rasterize, Crop Image, Create Trim Marks, Convert to Shape and
 //! Artboards → Convert / Rearrange. (Live blends are in `live.rs`.)

 use std::sync::Arc;
@@ -18,6 +18,8 @@ use super::*;
 /// Session-level (not saved) state owned by the menu commands.
 #[derive(Clone, Debug, Default)]
 pub struct MenuState {
+    /// Saved selections: (document title, name, object ids).
+    pub saved_selections: Vec<(String, String, Vec<NodeId>)>,
    /// View → Guides → Lock Guides.
    pub guides_locked: bool,
    /// Transparency panel menu: "New Opacity Masks Are Clipping" turned off.
@@ -75,7 +77,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Transform Each…",
            ["Object", "Transform"],
            Some("Cmd+Alt+Shift+D"),
-            "{scaleH?: % (100), scaleV?: % (100), moveH?: pt, moveV?: pt (down = +), rotate?: deg (counter-clockwise), reflectX?: bool (flip vertically), reflectY?: bool (flip horizontally), random?: bool, seed?: n, reference?: 0..8 (9-point grid, 4 = centre), copy?: bool, strokes?: bool (Scale Strokes & Effects), corners?: bool (Scale Corners; both default to the preferences), patterns?: bool (Transform Patterns; default: prefs transformPatternTiles)} transform every selected object about its own reference point → {ids}",
+            "{scaleH?: % (100), scaleV?: % (100), moveH?: pt, moveV?: pt (down = +), rotate?: deg (counter-clockwise), reflectX?: bool (flip vertically), reflectY?: bool (flip horizontally), random?: bool, seed?: n, reference?: 0..8 (9-point grid, 4 = centre), copy?: bool, strokes?: bool (Scale Strokes & Effects), corners?: bool (Scale Corners; both default to the preferences)} transform every selected object about its own reference point → {ids}",
            has_selection,
            transform_each
        ),
@@ -115,15 +117,6 @@ pub fn specs() -> Vec<CommandSpec> {
            has_image,
            crop_image
        ),
-        cmd!(
-            "object.maskImage",
-            "Mask",
-            [],
-            None,
-            "{} clip the selected image with a rectangle around it (its own outline, rotated with it) and select that clipping path, whose handles then crop it; one undo step → {id: the clip group, path: the clipping path}",
-            has_image,
-            mask_image
-        ),
        cmd!(
            "object.createTrimMarks",
            "Create Trim Marks",
@@ -156,7 +149,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Rearrange All Artboards…",
            ["Object", "Artboards"],
            None,
-            "{columns?: n (2), spacing?: pt (20), byColumn?: false, moveArtwork?: true (locked and hidden art only with prefs moveLockedWithArtboard)} lay artboards out in a grid",
+            "{columns?: n (2), spacing?: pt (20), byColumn?: false, moveArtwork?: true} lay artboards out in a grid",
            has_doc,
            rearrange_artboards
        ),
@@ -297,8 +290,7 @@ fn transform_each(s: &mut Session, p: &Value) -> Result<Value> {
        return Err(bad("object.transformEach", "scale must be non-zero"));
    }
    let mut rng = Rng(p.get("seed").and_then(Value::as_u64).unwrap_or(0x9E37_79B9_7F4A_7C15).max(1));
-    let mut sc = if sh != 100.0 || sv != 100.0 { super::object::scaling(s, p) } else { Default::default() };
-    sc.patterns = super::object::transform_patterns(s, p, &roots)?;
+    let sc = if sh != 100.0 || sv != 100.0 { super::object::scaling(s, p) } else { Default::default() };
    let ids = s.edit("Transform Each", |d, sel| {
        let targets = if copy { duplicate_in(d, sel, &roots, Affine::IDENTITY)? } else { roots.clone() };
        for id in &targets {
@@ -594,36 +586,6 @@ fn crop_image(s: &mut Session, p: &Value) -> Result<Value> {
    Ok(json!({ "id": id.0, "width": w, "height": h }))
 }

-/// The Control bar's Mask for an image: a clip group of the image and a clipping path on its
-/// outline, with that path selected so dragging its handles crops the image.
-fn mask_image(s: &mut Session, _: &Value) -> Result<Value> {
-    let st = s.doc()?;
-    let (id, outline) = st
-        .selection
-        .objects
-        .iter()
-        .find_map(|id| match st.doc.node(*id).map(|n| &n.kind) {
-            Some(NodeKind::Image(im)) => {
-                Some((*id, vectorcraft_geom::shapes::rectangle(Rect::new(0.0, 0.0, im.width as f64, im.height as f64)).transformed(im.xf)))
-            }
-            _ => None,
-        })
-        .ok_or_else(|| bad("object.maskImage", "select an image"))?;
-    let (gid, pid) = s.edit("Mask", |d, sel| {
-        let mut clip = super::pathops::shape_node(d, outline, None);
-        super::object::as_clipping_path(&mut clip)?;
-        let pid = clip.id;
-        let (par, idx, _) = d.position(id).ok_or(EngineError::NoNode(id))?;
-        let gid = d.alloc_id();
-        d.insert(par, idx + 1, Node::new(gid, NodeKind::Group { children: vec![], clip: true }))?;
-        d.insert(Some(gid), 0, clip)?;
-        d.move_node(id, Some(gid), usize::MAX)?;
-        sel.set([pid]);
-        Ok((gid, pid))
-    })?;
-    Ok(json!({ "id": gid.0, "path": pid.0 }))
-}
-
 // ---------- Trim marks ----------

 impl Session {
@@ -698,7 +660,7 @@ pub(crate) fn detect_shape(path: &PathData) -> Option<LiveShape> {
        }
        let rot = Affine::rotate(e0.y.atan2(e0.x));
        let flip = if e0.cross(e1) < 0.0 { Affine::scale_non_uniform(1.0, -1.0) } else { Affine::IDENTITY };
-        return Some(LiveShape::Rectangle { w, h, radii: [0.0; 4], kinds: Default::default(), xf: Affine::translate(a[0].p.to_vec2()) * rot * flip });
+        return Some(LiveShape::Rectangle { w, h, radii: [0.0; 4], xf: Affine::translate(a[0].p.to_vec2()) * rot * flip });
    }
    let b = path.bounds()?;
    let c = b.center();
@@ -782,7 +744,6 @@ fn rearrange_artboards(s: &mut Session, p: &Value) -> Result<Value> {
    let spacing = f64_or(p, "spacing", 20.0).clamp(-1.0e5, 1.0e5);
    let by_col = bool_or(p, "byColumn", false);
    let move_art = bool_or(p, "moveArtwork", true);
-    let locked_and_hidden = s.prefs.move_locked_with_artboard;
    let scale_strokes = false;
    s.edit("Rearrange Artboards", |d, _| {
        let rects: Vec<Rect> = d.artboards.iter().map(|a| a.rect).collect();
@@ -794,9 +755,7 @@ fn rearrange_artboards(s: &mut Session, p: &Value) -> Result<Value> {
            let tops: Vec<(NodeId, Point)> = d
                .layers
                .iter()
-                .filter(|l| l.rides_with_artboard(locked_and_hidden))
                .flat_map(|l| l.children().into_iter().flatten())
-                .filter(|n| n.rides_with_artboard(locked_and_hidden))
                .filter_map(|n| Some((n.id, n.geometric_bounds()?.center())))
                .collect();
            for (id, c) in tops {
@@ -808,13 +767,8 @@ fn rearrange_artboards(s: &mut Session, p: &Value) -> Result<Value> {
                }
            }
        }
-        let mut moved = vec![];
        for (a, dl) in d.artboards.iter_mut().zip(&deltas) {
            a.rect = a.rect + *dl;
-            moved.push((a.id, *dl));
-        }
-        for (id, dl) in moved {
-            d.move_artboard_guides(id, dl);
        }
        Ok(())
    })?;
@@ -144,19 +144,6 @@ pub fn has_selection(s: &Session) -> std::result::Result<(), String> {
    let st = s.active().ok_or("no document open")?;
    if st.selection.is_empty() { Err("nothing selected".into()) } else { Ok(()) }
 }
-/// Objects are selected, or the Artboard tool is chosen (Copy and Cut take its artboard).
-pub fn has_selection_or_artboard_tool(s: &Session) -> std::result::Result<(), String> {
-    if s.tool_id() == "artboard" { has_doc(s) } else { has_selection(s) }
-}
-/// Objects or ruler guides are selected (what Delete and the arrow keys act on).
-pub fn has_selection_or_guides(s: &Session) -> std::result::Result<(), String> {
-    let st = s.active().ok_or("no document open")?;
-    if st.selection.has_objects_or_guides() { Ok(()) } else { Err("nothing selected".into()) }
-}
-pub fn has_anchors(s: &Session) -> std::result::Result<(), String> {
-    let st = s.active().ok_or("no document open")?;
-    if st.selection.anchors.values().all(|a| a.is_empty()) { Err("no anchor points selected".into()) } else { Ok(()) }
-}
 pub fn has_multi(s: &Session) -> std::result::Result<(), String> {
    let st = s.active().ok_or("no document open")?;
    if st.selection.len() < 2 { Err("select at least two objects".into()) } else { Ok(()) }
@@ -6,7 +6,6 @@ use std::sync::Arc;
 use serde_json::{Value, json};
 use vectorcraft_color::{BlendMode, Paint};
 use vectorcraft_doc::{Appearance, Document, Knockout, Node, NodeId, NodeKind, OrientedBox, Scaling};
-use vectorcraft_geom::shapes::CornerKind;
 use vectorcraft_geom::{Affine, FillRule, Point, Rect, Vec2};

 use super::edit::{duplicate_in, selected_roots};
@@ -21,25 +20,17 @@ pub fn specs() -> Vec<CommandSpec> {
            "Transform",
            [],
            None,
-            "{matrix: [a,b,c,d,e,f], copy?: bool, ids?, strokes?: bool, corners?: bool, typeAreas?: bool, patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles)} apply an affine to the selection (or ids); strokes/corners: Scale Strokes & Effects / Scale Corners (default: the preferences); typeAreas: area type among them (not type inside a group) reshapes its frame by the matrix and its text reflows at its size, as a bounding-box handle drag does (default: the type transforms too)",
+            "{matrix: [a,b,c,d,e,f], copy?: bool, ids?, strokes?: bool, corners?: bool, typeAreas?: bool} apply an affine to the selection (or ids); strokes/corners: Scale Strokes & Effects / Scale Corners (default: the preferences); typeAreas: area type among them (not type inside a group) reshapes its frame by the matrix and its text reflows at its size, as a bounding-box handle drag does (default: the type transforms too)",
            has_doc,
            transform
        ),
-        cmd!(
-            "object.move",
-            "Move…",
-            ["Object", "Transform"],
-            Some("Cmd+Shift+M"),
-            "{dx, dy, copy?, patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles)}",
-            has_selection,
-            move_cmd
-        ),
+        cmd!("object.move", "Move…", ["Object", "Transform"], Some("Cmd+Shift+M"), "{dx, dy, copy?}", has_selection, move_cmd),
        cmd!(
            "object.rotate",
            "Rotate…",
            ["Object", "Transform"],
            None,
-            "{angle: deg (counter-clockwise), absolute?: bool (angle is the bounding box's new angle, not an amount), origin?: [x,y] (default: the bounding box centre), copy?, patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles)} → {ids}",
+            "{angle: deg (counter-clockwise), absolute?: bool (angle is the bounding box's new angle, not an amount), origin?: [x,y] (default: the bounding box centre), copy?} → {ids}",
            has_selection,
            rotate
        ),
@@ -48,7 +39,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Scale…",
            ["Object", "Transform"],
            None,
-            "{sx: %, sy?: %, origin?: [x,y], copy?, strokes?: bool (Scale Strokes & Effects: stroke weights, dashes and effect distances scale; off keeps them, type strokes included), corners?: bool (Scale Corners: live corner radii scale), patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles)} (strokes/corners default to the preferences)",
+            "{sx: %, sy?: %, origin?: [x,y], copy?, strokes?: bool (Scale Strokes & Effects: stroke weights, dashes and effect distances scale; off keeps them, type strokes included), corners?: bool (Scale Corners: live corner radii scale)} (strokes/corners default to the preferences)",
            has_selection,
            scale
        ),
@@ -57,7 +48,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Reflect…",
            ["Object", "Transform"],
            None,
-            "{axis: \"vertical\"|\"horizontal\"|deg, origin?, copy?, patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles)}",
+            "{axis: \"vertical\"|\"horizontal\"|deg, origin?, copy?}",
            has_selection,
            reflect
        ),
@@ -66,7 +57,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Shear…",
            ["Object", "Transform"],
            None,
-            "{angle: deg, axis?: \"horizontal\"|\"vertical\", origin?, copy?, patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles)}",
+            "{angle: deg, axis?: \"horizontal\"|\"vertical\", origin?, copy?}",
            has_selection,
            shear
        ),
@@ -76,8 +67,8 @@ pub fn specs() -> Vec<CommandSpec> {
            "Nudge",
            [],
            None,
-            "{dx: -1|0|1, dy: -1|0|1, big?: bool (×10), copy?: bool} arrow-key nudge by the keyboard increment (the selected anchors, else objects, else ruler guides)",
-            has_selection_or_guides,
+            "{dx: -1|0|1, dy: -1|0|1, big?: bool (×10), copy?: bool} arrow-key nudge by the keyboard increment",
+            has_selection,
            nudge
        ),
        cmd!("object.arrange.bringToFront", "Bring to Front", ["Object", "Arrange"], Some("Cmd+Shift+]"), "{}", has_selection, |s, _| arrange(
@@ -189,15 +180,7 @@ pub fn specs() -> Vec<CommandSpec> {
            set_bounds
        ),
        cmd!("object.expandShape", "Expand Shape", ["Object", "Shape"], None, "{} convert live shapes to plain paths", has_selection, expand_shape),
-        cmd!(
-            "object.setLiveShape",
-            "Live Shape Properties",
-            [],
-            None,
-            "{id?, ids?, radius?: pt, kind?: \"round\"|\"invertedRound\"|\"chamfer\", corners?: [0..3…], sides?: n} (Live Corners: radius and kind set a rectangle's corners: `corners` (0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left), else the corners with a Direct-Selected anchor, else all four; sides: a polygon's)",
-            has_selection,
-            set_live_shape
-        ),
+        cmd!("object.setLiveShape", "Live Shape Properties", [], None, "{id?, radius?: pt (all corners), sides?: n}", has_selection, set_live_shape),
    ]
 }

@@ -216,39 +199,15 @@ pub(crate) fn scaling(s: &mut Session, p: &Value) -> Scaling {
    let corners = bool_or(p, "corners", s.prefs.scale_corners);
    s.note_journal("strokes", json!(strokes));
    s.note_journal("corners", json!(corners));
-    Scaling {
-        strokes,
-        effects: strokes.then_some(vectorcraft_render::effects::scale_effect),
-        keep_type_strokes: !strokes,
-        keep_corners: !corners,
-        ..Scaling::default()
-    }
-}
-
-/// Transform Patterns: do the pattern fills and strokes of `ids` transform with them (`patterns`
-/// param, else General › Transform Pattern Tiles)? Noted in the journal when they use a pattern,
-/// so a replay moves their tiles alike whatever the preference is then.
-pub(crate) fn transform_patterns(s: &mut Session, p: &Value, ids: &[NodeId]) -> Result<bool> {
-    let on = bool_or(p, "patterns", s.prefs.transform_pattern_tiles);
-    let d = &s.doc()?.doc;
-    let mut uses = false;
-    for n in ids.iter().filter_map(|id| d.node(*id)) {
-        n.walk(&mut |c| uses |= vectorcraft_doc::pattern::uses_pattern(c, None));
-    }
-    if uses {
-        s.note_journal("patterns", json!(on));
-    }
-    Ok(on)
+    Scaling { strokes, effects: strokes.then_some(vectorcraft_render::effects::scale_effect), keep_type_strokes: !strokes, keep_corners: !corners }
 }

 /// Apply `xf` to `ids` (`copy` param: duplicate first; `strokes`/`corners`: see [`scaling`];
-/// `patterns`: see [`transform_patterns`]; `typeAreas`: see [`resize_type_area`]). Records
-/// Transform Again.
+/// `typeAreas`: see [`resize_type_area`]). Records Transform Again.
 pub(crate) fn apply_transform(s: &mut Session, label: &str, ids: Vec<NodeId>, xf: Affine, p: &Value) -> Result<Value> {
    let copy = bool_or(p, "copy", false);
    let areas = bool_or(p, "typeAreas", false);
-    let mut sc = if Scaling::factor(xf).is_some() { scaling(s, p) } else { Scaling::default() };
-    sc.patterns = transform_patterns(s, p, &ids)?;
+    let sc = if Scaling::factor(xf).is_some() { scaling(s, p) } else { Scaling::default() };
    let ids = s.edit(label, |d, sel| {
        let targets = if copy { duplicate_in(d, sel, &ids, Affine::IDENTITY)? } else { ids.clone() };
        for id in &targets {
@@ -300,9 +259,6 @@ fn nudge(s: &mut Session, p: &Value) -> Result<Value> {
    if !s.doc()?.selection.anchors.is_empty() {
        return super::path::move_anchors(s, &json!({ "dx": dx, "dy": dy }));
    }
-    if s.doc()?.selection.is_empty() {
-        return super::docmenu::guide_move(s, &json!({ "dx": dx, "dy": dy, "copy": bool_or(p, "copy", false) }));
-    }
    let ids = selected_roots(s)?;
    apply_transform(s, "Move", ids, Affine::translate((dx, dy)), p)
 }
@@ -1006,53 +962,15 @@ fn expand_shape(s: &mut Session, _: &Value) -> Result<Value> {
    ok()
 }

-/// The `corners` of `object.setLiveShape`: a mask of corner indices 0–3.
-fn corners_param(p: &Value) -> Result<Option<[bool; 4]>> {
-    let Some(v) = p.get("corners").filter(|v| !v.is_null()) else { return Ok(None) };
-    let err = || {
-        bad(
-            "object.setLiveShape",
-            format!("`corners` must list corner indices 0–3 (0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left), not {v}"),
-        )
-    };
-    let mut mask = [false; 4];
-    for k in v.as_array().ok_or_else(err)? {
-        let slot = k.as_u64().and_then(|k| mask.get_mut(usize::try_from(k).ok()?)).ok_or_else(err)?;
-        *slot = true;
-    }
-    Ok(Some(mask))
-}
-
 fn set_live_shape(s: &mut Session, p: &Value) -> Result<Value> {
    let ids = targets(s, p)?;
-    let corners = corners_param(p)?;
-    let kind = p
-        .get("kind")
-        .filter(|v| !v.is_null())
-        .map(|v| {
-            serde_json::from_value::<CornerKind>(v.clone())
-                .map_err(|_| bad("object.setLiveShape", format!("`kind` must be \"round\", \"invertedRound\" or \"chamfer\", not {v}")))
-        })
-        .transpose()?;
-    let radius = p.get("radius").and_then(Value::as_f64);
-    s.edit("Live Shape", |d, sel| {
+    s.edit("Live Shape", |d, _| {
        for id in &ids {
            let Some(NodeKind::Path { path, live: Some(live), .. }) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
-            // Radii are document lengths and corners circular, also on a rectangle from a file
-            // that kept an uneven scale in its transform (#442).
-            live.fold_scale();
-            let partial = sel.anchors.get_mut(id);
-            let picked = corners.unwrap_or_else(|| live.picked_corners(partial.as_deref()));
-            let (layout, selected) = (live.anchor_corners(), partial.as_deref().map(|a| live.corners_of(a)));
            match live {
-                vectorcraft_doc::LiveShape::Rectangle { radii, kinds, .. } => {
-                    for ((_, r), k) in picked.iter().zip(radii.iter_mut()).zip(kinds.iter_mut()).filter(|((on, _), _)| **on) {
-                        if let Some(radius) = radius {
-                            *r = radius.max(0.0);
-                        }
-                        if let Some(kind) = kind {
-                            *k = kind;
-                        }
+                vectorcraft_doc::LiveShape::Rectangle { radii, .. } => {
+                    if let Some(r) = p.get("radius").and_then(Value::as_f64) {
+                        *radii = [r.max(0.0); 4];
                    }
                }
                vectorcraft_doc::LiveShape::Polygon { sides, .. } => {
@@ -1063,12 +981,6 @@ fn set_live_shape(s: &mut Session, p: &Value) -> Result<Value> {
                _ => {}
            }
            *path = live.to_path();
-            // Direct-Selected corners stay selected as they gain or lose anchors.
-            if let (Some(anchors), Some(selected)) = (partial, selected)
-                && live.anchor_corners() != layout
-            {
-                *anchors = live.corner_anchors(selected);
-            }
        }
        Ok(())
    })?;
@@ -4,11 +4,12 @@
 //! report). The packaged document links to the copies (Relink); the open document doesn't change.
 //! Without a folder (the web, agents) the same files come back as a zip archive.

-use std::collections::{BTreeMap, HashSet};
+use std::collections::{BTreeMap, BTreeSet, HashSet};
 use std::io::Write;
 use std::path::Path;

 use serde_json::{Value, json};
+use vectorcraft_doc::{Document, Node, NodeKind};

 use super::fileio::{create_dir, write_file};
 use super::*;
@@ -50,6 +51,21 @@ fn font_ext(bytes: &[u8]) -> &'static str {
    }
 }

+/// The fonts (family, style) of the type in the layers and symbols of `d`.
+fn used_fonts(d: &Document) -> BTreeSet<(String, String)> {
+    let mut fonts = BTreeSet::new();
+    let mut add = |n: &Node| {
+        if let NodeKind::Text(t) = &n.kind {
+            fonts.extend(t.runs.iter().map(|r| (r.style.font_family.clone(), r.style.font_style.clone())));
+        }
+    };
+    d.walk(&mut add);
+    for s in &d.symbols {
+        s.art.walk(&mut add);
+    }
+    fonts
+}
+
 /// The options of a package.
 struct Options {
    copy_links: bool,
@@ -107,7 +123,7 @@ fn package(s: &mut Session, p: &Value) -> Result<Value> {
        let db = vectorcraft_text::FontDb::global();
        let mut files = HashSet::new();
        lines.push("FONTS".to_string());
-        for (family, style) in super::fonts::used_fonts(&st.doc) {
+        for (family, style) in used_fonts(&st.doc) {
            let font = format!("{family} {style}");
            let reason = match db.face(&family, &style) {
                Some(f) if f.family.eq_ignore_ascii_case(&family) && f.embeddable() => {
@@ -1,12 +1,11 @@
-//! Commands the panels need beyond the core set: artboard reorder, duplicate, copy and cut, and the advanced
+//! Commands the panels need beyond the core set: artboard reorder/duplicate and the advanced
 //! Character/Paragraph attributes.

 use serde_json::{Value, json};
 use vectorcraft_doc::NodeKind;
-use vectorcraft_geom::{Rect, Vec2};

 use super::*;
-use crate::{Clipboard, EngineError};
+use crate::EngineError;

 pub fn specs() -> Vec<CommandSpec> {
    vec![
@@ -16,34 +15,16 @@ pub fn specs() -> Vec<CommandSpec> {
            "Duplicate Artboard",
            ["Window", "Artboards"],
            None,
-            "{index?: n (default: the Artboard tool's artboard), art?: bool (default: the Artboard tool's moveArt option)} copy placed right of the last artboard, with copies of the art fully inside it when `art` (locked and hidden art only with prefs moveLockedWithArtboard) → {index, ids: the art's copies}",
+            "{index} copy placed right of the last artboard",
            has_doc,
            artboard_duplicate
        ),
-        cmd!(
-            "artboard.copy",
-            "Copy Artboard",
-            [],
-            None,
-            "{index?, art?} (defaults as artboard.duplicate) put the artboard, and the art fully inside it when `art`, on the clipboard: edit.paste adds a copy right of the last artboard, edit.pasteInPlace/InFront/InBack where it was, in this or another document (one undo step; edit.pasteOnAllArtboards pastes only the art); edit.copy runs this while the Artboard tool is chosen → {copied: objects}",
-            has_doc,
-            |s, p| artboard_copy(s, p, false)
-        ),
-        cmd!(
-            "artboard.cut",
-            "Cut Artboard",
-            [],
-            None,
-            "{index?, art?} artboard.copy, then delete the artboard and that art in one undo step (not the only artboard); edit.cut runs this while the Artboard tool is chosen → {copied: objects}",
-            has_doc,
-            |s, p| artboard_copy(s, p, true)
-        ),
        cmd!(
            "text.setFormat",
            "Character / Paragraph",
            [],
            None,
-            "{ids?|id?, kerning?: 1/1000 em|\"auto\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg, underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt, hyphenate?: bool, mojikumi?: \"none\"|\"lineEndHalf\" (Japanese punctuation spacing), direction?: \"auto\"|\"leftToRight\"|\"rightToLeft\" (paragraph direction; auto: from each paragraph's first strong character), leadingModel?: \"romanBaseline\"|\"emBoxTop\" (leading measured baseline to baseline, or em box top to top), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\" (where characters smaller than the largest on their line line up with it), burasagari?: \"none\"|\"standard\"|\"forced\" (Paragraph panel menu › Burasagari None/Regular/Force: an East Asian comma or full stop ending an area type line hangs outside it: when it doesn't fit, or always; new type: \"standard\")}",
+            "{ids?|id?, kerning?: 1/1000 em|\"auto\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg, underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt, hyphenate?: bool}",
            has_doc,
            set_format
        ),
@@ -68,114 +49,20 @@ fn artboard_reorder(s: &mut Session, p: &Value) -> Result<Value> {
    ok()
 }

-/// The artboard (`index`) and whether its art comes along (`art`) for the artboard copy
-/// commands: by default the Artboard tool's artboard and its Move/Copy Artwork with Artboard option.
-fn board_and_art(s: &Session, p: &Value) -> (usize, bool) {
-    let t = s.tool_options_of("artboard");
-    let i = p.get("index").and_then(Value::as_u64).or_else(|| t["active"].as_u64()).unwrap_or(0) as usize;
-    (i, bool_or(p, "art", t["moveArt"].as_bool().unwrap_or(true)))
-}
-
-/// The art that goes with artboard `i` when `art`: the objects fully inside it (locked and hidden
-/// ones only with prefs moveLockedWithArtboard), in paint order.
-pub(crate) fn artboard_art(s: &Session, i: usize, art: bool) -> Result<Vec<NodeId>> {
-    let d = &s.doc()?.doc;
-    let rect = d.artboards.get(i).map(|a| a.rect).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-    Ok(if art { d.art_on_artboard(rect, s.prefs.move_locked_with_artboard) } else { vec![] })
-}
-
-/// How far a copy of `rect` moves to sit right of the last artboard (Duplicate Artboards, Paste).
-pub(crate) fn beside_artboards(d: &vectorcraft_doc::Document, rect: Rect) -> Vec2 {
-    let right = d.artboards.iter().map(|a| a.rect.x1).fold(f64::MIN, f64::max);
-    Vec2::new(right + 20.0 - rect.x0, 0.0)
-}
-
 fn artboard_duplicate(s: &mut Session, p: &Value) -> Result<Value> {
-    let (i, art) = board_and_art(s, p);
-    let art = artboard_art(s, i, art)?;
-    let scale_strokes = s.prefs.scale_strokes;
-    let (index, ids) = s.edit("Duplicate Artboard", |d, _| {
-        let dv = d.artboards.get(i).map(|a| beside_artboards(d, a.rect)).unwrap_or_default();
-        copy_artboard(d, i, dv, &art, scale_strokes)
+    let i = p.get("index").and_then(Value::as_u64).unwrap_or(0) as usize;
+    let index = s.edit("Duplicate Artboard", |d, _| {
+        let src = d.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+        let right = d.artboards.iter().map(|a| a.rect.x1).fold(f64::MIN, f64::max);
+        let mut a = src.clone();
+        a.id = d.artboards.iter().map(|a| a.id).max().unwrap_or(0) + 1;
+        a.name = format!("{} copy", src.name);
+        let dx = right + 20.0 - src.rect.x0;
+        a.rect = vectorcraft_geom::Rect::new(src.rect.x0 + dx, src.rect.y0, src.rect.x1 + dx, src.rect.y1);
+        d.artboards.push(a);
+        Ok(d.artboards.len() - 1)
    })?;
-    Ok(json!({"index": index, "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>()}))
-}
-
-/// Artboard Copy / Cut: the artboard and its art onto the clipboard (pasting brings both); a cut
-/// then deletes them.
-pub(crate) fn artboard_copy(s: &mut Session, p: &Value, cut: bool) -> Result<Value> {
-    let (i, art) = board_and_art(s, p);
-    let art = artboard_art(s, i, art)?;
-    let st = s.doc()?;
-    if cut && st.doc.artboards.len() <= 1 {
-        return Err(EngineError::Other("a document needs at least one artboard".into()));
-    }
-    let board = st.doc.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-    let clip = Clipboard { source_artboard: Some(board.rect), artboard: Some(board), ..Clipboard::copy(st, &art) };
-    let copied = clip.nodes.len();
-    if cut {
-        s.edit("Cut Artboard", |d, sel| {
-            if i >= d.artboards.len() {
-                return Err(EngineError::Other("no such artboard".into()));
-            }
-            // Its guides go with it.
-            let gone = d.artboards.remove(i).id;
-            d.retain_guides(sel, |_, g| g.artboard != Some(gone));
-            for id in &art {
-                // Always there: none of the art is inside another of it.
-                let _ = d.remove(*id);
-            }
-            sel.prune(d);
-            Ok(())
-        })?;
-        if s.tool_id() == "artboard" {
-            s.set_tool_option("active", &json!(i.saturating_sub(1)));
-        }
-    }
-    s.clipboard = clip;
-    Ok(json!({"copied": copied}))
-}
-
-/// Add a copy of artboard `i` moved by `dv`, with copies of its guides and of its `art` (each just
-/// above its original) moved along → (the copy's index, the art's copies). Duplicate Artboards and
-/// Alt-drag.
-pub(crate) fn copy_artboard(
-    d: &mut vectorcraft_doc::Document,
-    i: usize,
-    dv: Vec2,
-    art: &[NodeId],
-    scale_strokes: bool,
-) -> Result<(usize, Vec<NodeId>)> {
-    let src = d.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-    let index = push_artboard_copy(d, &src, src.rect + dv);
-    // Its guides come along.
-    if let Some(id) = d.artboards.get(index).map(|a| a.id) {
-        d.copy_artboard_guides(src.id, id, dv);
-    }
-    let mut copies = Vec::with_capacity(art.len());
-    for id in art {
-        let (Some((parent, at, _)), Some(n)) = (d.position(*id), d.node(*id).cloned()) else { continue };
-        let mut c = d.reid(&n);
-        c.transform(Affine::translate(dv), scale_strokes);
-        copies.push(d.insert(parent, at + 1, c)?);
-    }
-    Ok((index, copies))
-}
-
-/// Add a copy of artboard `src` at `rect`, with an id of its own and its name, or `<name> copy`
-/// (`<name> copy 2`…) when that is taken → its index.
-pub(crate) fn push_artboard_copy(d: &mut vectorcraft_doc::Document, src: &vectorcraft_doc::Artboard, rect: Rect) -> usize {
-    let mut a = src.clone();
-    a.id = d.artboards.iter().map(|a| a.id).max().unwrap_or(0).saturating_add(1);
-    let taken = |name: &str| d.artboards.iter().any(|a| a.name == name);
-    a.name = [src.name.clone(), format!("{} copy", src.name)]
-        .into_iter()
-        .chain((2u64..).map(|i| format!("{} copy {i}", src.name)))
-        .find(|name| !taken(name))
-        .unwrap_or_default();
-    a.rect = rect;
-    d.artboards.push(a);
-    d.artboards.len() - 1
+    Ok(json!({"index": index}))
 }

 // ---------- text ----------
@@ -214,51 +101,11 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
        "spaceBefore",
        "spaceAfter",
        "hyphenate",
-        "mojikumi",
-        "direction",
-        "leadingModel",
-        "charAlign",
-        "burasagari",
    ];
    if !keys.iter().any(|k| p.get(*k).is_some()) {
        return Err(bad(C, "nothing to change"));
    }
    let (position, small_caps) = super::docsetup::script_params(p, &s.doc()?.doc.setup, C)?;
-    let char_align = super::textedit::char_align_param(p, C)?;
-    let mojikumi = match p.get("mojikumi") {
-        None => None,
-        Some(v) => Some(match v.as_str() {
-            Some("none") => vectorcraft_doc::Mojikumi::None,
-            Some("lineEndHalf") => vectorcraft_doc::Mojikumi::LineEndHalf,
-            _ => return Err(bad(C, "`mojikumi` must be \"none\" or \"lineEndHalf\"")),
-        }),
-    };
-    let direction = match p.get("direction") {
-        None => None,
-        Some(v) => Some(match v.as_str() {
-            Some("auto") => None,
-            Some("leftToRight") => Some(vectorcraft_doc::ParaDirection::LeftToRight),
-            Some("rightToLeft") => Some(vectorcraft_doc::ParaDirection::RightToLeft),
-            _ => return Err(bad(C, "`direction` must be \"auto\", \"leftToRight\" or \"rightToLeft\"")),
-        }),
-    };
-    let leading_model = match p.get("leadingModel") {
-        None => None,
-        Some(v) => Some(match v.as_str() {
-            Some("romanBaseline") => vectorcraft_doc::LeadingModel::RomanBaseline,
-            Some("emBoxTop") => vectorcraft_doc::LeadingModel::EmBoxTop,
-            _ => return Err(bad(C, "`leadingModel` must be \"romanBaseline\" or \"emBoxTop\"")),
-        }),
-    };
-    let burasagari = match p.get("burasagari") {
-        None => None,
-        Some(v) => Some(match v.as_str() {
-            Some("none") => vectorcraft_doc::Burasagari::None,
-            Some("standard") => vectorcraft_doc::Burasagari::Standard,
-            Some("forced") => vectorcraft_doc::Burasagari::Forced,
-            _ => return Err(bad(C, "`burasagari` must be \"none\", \"standard\" or \"forced\"")),
-        }),
-    };
    s.edit("Character", |d, _| {
        for id in &ids {
            let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
@@ -294,9 +141,6 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
                if let Some(v) = small_caps {
                    st.small_caps = v;
                }
-                if let Some(v) = char_align {
-                    st.char_align = v;
-                }
            }
            let para = &mut t.para;
            if let Some(v) = num("leftIndent") {
@@ -317,18 +161,6 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
            if let Some(v) = flag("hyphenate") {
                para.hyphenate = v;
            }
-            if let Some(v) = mojikumi {
-                para.mojikumi = v;
-            }
-            if let Some(v) = direction {
-                para.direction = v;
-            }
-            if let Some(v) = leading_model {
-                para.leading_model = v;
-            }
-            if let Some(v) = burasagari {
-                para.burasagari = v;
-            }
            super::typecmd::refresh_bounds(t);
        }
        Ok(())
@@ -4,7 +4,7 @@ use std::collections::BTreeSet;

 use serde_json::{Value, json};
 use vectorcraft_doc::{NodeId, NodeKind};
-use vectorcraft_geom::{AnchorKind, PathData, Point, SubPath, Vec2};
+use vectorcraft_geom::{Anchor, AnchorKind, PathData, Point, SubPath, Vec2};

 use super::create::anchor_from_json;
 use super::*;
@@ -81,17 +81,17 @@ pub fn specs() -> Vec<CommandSpec> {
            "Convert Anchor Points",
            [],
            None,
-            "{to: \"corner\"|\"smooth\"} convert the direct-selected anchors (all anchors of fully selected paths) as one undo step: corner retracts both handles, smooth pulls handles in line with the neighbours (smooth anchors keep theirs)",
+            "{to: \"corner\"|\"smooth\"} (Control bar convert buttons)",
            has_selection,
            convert_anchors
        ),
        cmd!(
            "path.deleteAnchors",
-            "Delete Anchor Points",
-            [],
+            "Remove Anchor Points",
+            ["Object", "Path"],
            None,
-            "{} delete the direct-selected anchors and their segments, opening closed paths there (the Delete key)",
-            has_anchors,
+            "{} delete direct-selected anchors",
+            has_selection,
            delete_anchors
        ),
        cmd!(
@@ -104,15 +104,7 @@ pub fn specs() -> Vec<CommandSpec> {
            reshape
        ),
        cmd!("path.insertAnchor", "Add Anchor Point", [], None, "{id, subpath, segment, t: 0..1}", has_doc, insert_anchor),
-        cmd!(
-            "path.cutAtAnchors",
-            "Cut Path at Selected Anchor Points",
-            [],
-            None,
-            "{} cut the paths at their direct-selected anchors (one undo step): a closed path opens there, an open one becomes one path per piece; one of each cut's two coincident anchors stays selected → {ids}",
-            has_anchors,
-            cut_at_anchors
-        ),
+        cmd!("path.cutAtAnchors", "Cut Path at Selected Anchor Points", [], None, "{}", has_selection, cut_at_anchors),
    ]
 }

@@ -394,24 +386,41 @@ fn average(s: &mut Session, p: &Value) -> Result<Value> {
 }

 fn convert_anchors(s: &mut Session, p: &Value) -> Result<Value> {
-    const C: &str = "path.convertAnchors";
-    let smooth = match str_param(p, "to") {
-        Some("smooth") => true,
-        Some("corner") => false,
-        _ => return Err(bad(C, "`to` must be \"corner\" or \"smooth\"")),
-    };
    let t = anchor_targets(s)?;
-    if t.is_empty() {
-        return Err(bad(C, "select paths or anchor points"));
-    }
+    let smooth = str_param(p, "to") == Some("smooth");
    s.edit("Convert Anchor Points", |d, _| {
        for (id, v) in &t {
            let path = path_mut(d, *id)?;
            for &(si, ai) in v {
-                let Some(sp) = path.subpaths.get_mut(si) else { continue };
+                let sp = &path.subpaths[si];
+                let n = sp.anchors.len();
+                let prev = if ai > 0 {
+                    Some(sp.anchors[ai - 1].p)
+                } else if sp.closed {
+                    Some(sp.anchors[n - 1].p)
+                } else {
+                    None
+                };
+                let next = if ai + 1 < n {
+                    Some(sp.anchors[ai + 1].p)
+                } else if sp.closed {
+                    Some(sp.anchors[0].p)
+                } else {
+                    None
+                };
+                let a: &mut Anchor = &mut path.subpaths[si].anchors[ai];
                if smooth {
-                    sp.smooth_anchor(ai);
-                } else if let Some(a) = sp.anchors.get_mut(ai) {
+                    // Handles parallel to prev→next, a third of the neighbour distances.
+                    let (pp, nn) = (prev.unwrap_or(a.p), next.unwrap_or(a.p));
+                    let dir = nn - pp;
+                    let l = dir.hypot();
+                    if l > 1e-9 {
+                        let u = dir / l;
+                        a.h_in = a.p - u * (a.p.distance(pp) / 3.0);
+                        a.h_out = a.p + u * (a.p.distance(nn) / 3.0);
+                        a.kind = AnchorKind::Smooth;
+                    }
+                } else {
                    a.retract();
                }
            }
@@ -510,50 +519,40 @@ fn insert_anchor(s: &mut Session, p: &Value) -> Result<Value> {
 }

 fn cut_at_anchors(s: &mut Session, _: &Value) -> Result<Value> {
-    const C: &str = "path.cutAtAnchors";
-    let st = s.doc()?;
-    // Each selected path's subpaths cut at its selected anchors, those that cut anything.
-    let mut cuts: Vec<(NodeId, Vec<SubPath>, Vec<bool>)> = vec![];
-    for (id, set) in &st.selection.anchors {
-        let Some(pd) = st.doc.node(*id).and_then(|n| n.path_data()) else { continue };
-        let (mut subs, mut starts) = (vec![], vec![]);
-        for (si, sp) in pd.subpaths.iter().enumerate() {
-            let at: BTreeSet<usize> = set.iter().filter(|(s, _)| *s == si).map(|(_, a)| *a).collect();
-            let pieces = sp.cut_at(&at);
-            // The pieces that start at a cut: every piece of an opened closed subpath, all but the
-            // first of an open one.
-            starts.extend(pieces.iter().enumerate().map(|(k, piece)| if sp.closed { !piece.closed } else { k > 0 }));
-            subs.extend(pieces);
-        }
-        if starts.contains(&true) {
-            cuts.push((*id, subs, starts));
-        }
-    }
-    if cuts.is_empty() {
-        return Err(bad(C, "direct-select anchor points to cut at (not the end points of open paths)"));
-    }
-    let ids = s.edit("Cut Path", |d, sel| {
-        let (mut all, mut picked) = (vec![], vec![]);
-        for (id, subs, starts) in cuts {
-            // A path of one subpath becomes one path per piece (the first keeps the id); the
-            // pieces of a compound shape stay subpaths of it.
-            if d.node(id).and_then(|n| n.path_data()).is_some_and(|pd| pd.subpaths.len() == 1) {
-                let ids = super::draw2::replace_with_pieces(d, id, subs.into_iter().map(PathData::single).collect())?;
-                picked.extend(ids.iter().zip(&starts).filter(|(_, s)| **s).map(|(id, _)| (*id, (0, 0))));
-                all.extend(ids);
-            } else {
-                path_mut(d, id)?.subpaths = subs;
-                picked.extend(starts.iter().enumerate().filter(|(_, s)| **s).map(|(si, _)| (id, (si, 0))));
-                all.push(id);
+    let sel = s.doc()?.selection.anchors.clone();
+    s.edit("Cut Path", |d, _| {
+        for (id, set) in &sel {
+            let path = path_mut(d, *id)?;
+            let mut out = vec![];
+            for (si, sp) in path.subpaths.iter().enumerate() {
+                let cuts: Vec<usize> = set.iter().filter(|(s, _)| *s == si).map(|(_, a)| *a).collect();
+                if cuts.is_empty() {
+                    out.push(sp.clone());
+                    continue;
+                }
+                let mut anchors = sp.anchors.clone();
+                if sp.closed {
+                    anchors.rotate_left(cuts[0]);
+                    anchors.push(anchors[0]);
+                }
+                let base = if sp.closed { cuts[0] } else { 0 };
+                let n = sp.anchors.len();
+                let rel: Vec<usize> = cuts.iter().map(|c| (c + n - base) % n).collect();
+                let mut cur = vec![];
+                for (i, a) in anchors.iter().enumerate() {
+                    cur.push(*a);
+                    if rel.contains(&(i % n)) && cur.len() > 1 {
+                        out.push(SubPath::new(std::mem::take(&mut cur), false));
+                        cur.push(*a);
+                    }
+                }
+                if cur.len() > 1 {
+                    out.push(SubPath::new(cur, false));
+                }
            }
+            path.subpaths = out;
        }
-        // Each cut leaves one of its two coincident anchors selected, so a drag pulls the ends apart.
-        sel.clear();
-        for (id, a) in picked {
-            sel.add(id);
-            sel.anchors.entry(id).or_default().insert(a);
-        }
-        Ok(all)
+        Ok(())
    })?;
-    Ok(super::draw2::ids_json(&ids))
+    ok()
 }
@@ -452,7 +452,7 @@ impl Session {
                let w = self.prefs.perspective_widget;
                let st = self.active().filter(|_| w.show)?;
                let g = PerspectiveGrid::current(&st.doc);
-                if !g.visible {
+                if !g.shown(self.tool_id()) {
                    return None;
                }
                let place = WidgetPlace { screen: view.screen.as_ref(), corner: w.position };
@@ -476,6 +476,6 @@ impl Session {
            ToolKey::Digit(4) => Plane::None,
            _ => return None,
        };
-        PerspectiveGrid::current(&self.active()?.doc).visible.then_some(plane)
+        PerspectiveGrid::current(&self.active()?.doc).shown(self.tool_id()).then_some(plane)
    }
 }
@@ -197,7 +197,8 @@ pub(super) fn area_text(text: String, frame: Rect) -> vectorcraft_doc::TextObjec
        run.text = text;
    }
    t.kind = vectorcraft_doc::TextKind::Area { frame: shapes::rectangle(Rect::from_origin_size(Point::ORIGIN, frame.size())) };
-    crate::cmd::typecmd::refresh_bounds(&mut t);
+    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t);
+    t.cached_bounds = Some(lay.bounds);
    t
 }

@@ -82,11 +82,8 @@ pub const UNITS: &[(&str, &str)] = &[
    ("feet", "Feet"),
 ];
 const LINE_STYLE: &[(&str, &str)] = &[("lines", "Lines"), ("dots", "Dots")];
-/// Performance › Graphics Processor (`gpuPreference`), read by the desktop app at startup. The
-/// values are WebGPU's power preferences plus `automatic`; 0.5.0's default, `powerSaving`, reads as
-/// `automatic` (#502).
-pub const GPU_PREFERENCES: &[(&str, &str)] =
-    &[("automatic", "Automatic"), ("lowPower", "Power Saving (integrated)"), ("highPerformance", "High Performance (discrete)")];
+/// Performance › Graphics Processor (`gpuPreference`), read by the desktop app at startup.
+pub const GPU_PREFERENCES: &[(&str, &str)] = &[("powerSaving", "Power Saving (integrated)"), ("highPerformance", "High Performance (discrete)")];
 const BLACK: &[(&str, &str)] = &[("accurate", "Display All Blacks Accurately"), ("rich", "Display All Blacks as Rich Black")];
 const BLACK_OUT: &[(&str, &str)] = &[("accurate", "Output All Blacks Accurately"), ("rich", "Output All Blacks as Rich Black")];

@@ -133,7 +130,6 @@ pub const PREF_SPECS: &[PrefSpec] = &[
    p!("scaleCorners", "General", "Options", "Scale Corners", bool),
    p!("scaleStrokes", "General", "Options", "Scale Strokes & Effects", bool),
    p!("zoomWithMouseWheel", "General", "Options", "Zoom with Mouse Wheel", bool),
-    p!("scrubNumericFields", "General", "Options", "Scrub Numeric Fields by Dragging", bool),
    // Selection & Anchor Display
    p!("selectionTolerance", "Selection & Anchor Display", "Selection", "Tolerance", num(1.0, 8.0, "px")),
    p!("objectSelectionByPathOnly", "Selection & Anchor Display", "Selection", "Object Selection by Path Only", bool),
@@ -13,17 +13,9 @@
 //!
 //! Every running app (each browser tab) keeps its copies in an area of its own, `<area>/…`, and
 //! holds it while it runs: a lock on the area for its lifetime where the store has locks (folders:
-//! [`FolderStore`]), else a heartbeat it refreshes ([`heartbeat`]; browser storage) plus, where the
-//! store can, an announcement that lasts as long as the app ([`RecoveryStore::announce`]: the
-//! browser's Web Locks). Only areas nobody holds any more (their app is gone) are offered, and
-//! while their copies are restored or discarded the area is held, so two apps launched together
-//! never both take it.
-//!
-//! A heartbeat alone can't tell a gone app from one whose timers stopped (a background tab), so
-//! when unsure an area counts as held, and its app repairs what another app did meanwhile: each
-//! heartbeat and each recovery save write again the copies missing from its area ([`repair`]), and
-//! a heartbeat newer than the one another app wrote when taking the area over marks it running
-//! again.
+//! [`FolderStore`]), else a heartbeat it refreshes ([`heartbeat`]; browser storage). Only areas
+//! nobody holds any more (their app is gone) are offered, and while their copies are restored or
+//! discarded the area is held, so two apps launched together never both take it.
 //!
 //! Each copy is two entries: `<area>/<file>.vectorcraft` (the native document, written as a save
 //! writes it) and `<area>/<file>.json` (its title, original path and format, and when it was
@@ -94,17 +86,6 @@ pub trait RecoveryStore: Send + Sync {
    fn lock(&self, _area: &str) -> std::result::Result<Lock, String> {
        Ok(Lock::Unsupported)
    }
-    /// Stores without locks: also hold area `area` in a way other apps can see that lasts exactly as
-    /// long as this app runs, if the store has one (the browser's Web Locks) → it, until dropped.
-    fn announce(&self, _area: &str) -> Option<Hold> {
-        None
-    }
-    /// Stores without locks: does a running app hold area `area` by [`RecoveryStore::announce`]?
-    /// `None`: the store can't tell (heartbeats alone decide). A store that can tell but isn't sure
-    /// right now says `Some(true)`: a copy kept loses nothing, one deleted may.
-    fn announced(&self, _area: &str) -> Option<bool> {
-        None
-    }
    /// Tidy away area `area` once it holds no copies and nobody holds it (its lock file and folder).
    fn remove_area(&self, _area: &str) {}
    /// The clock heartbeats are judged by (Unix seconds; `None`: none, so no area counts as gone).
@@ -115,19 +96,17 @@ pub trait RecoveryStore: Send + Sync {

 /// A store in memory (tests, and hosts without storage). Areas are locked in memory, so sessions
 /// sharing one store behave like apps sharing a folder; [`MemoryStore::without_locks`] uses
-/// heartbeats like browser storage, judged by a clock tests set ([`MemoryStore::set_now`]), and
-/// [`MemoryStore::announcing`] adds announcements like the browser's Web Locks.
+/// heartbeats like browser storage, judged by a clock tests set ([`MemoryStore::set_now`]).
 pub struct MemoryStore {
    entries: Mutex<BTreeMap<String, Vec<u8>>>,
    held: Arc<Mutex<BTreeSet<String>>>,
    locks: bool,
-    announces: bool,
    now: Mutex<Option<i64>>,
 }

 impl Default for MemoryStore {
    fn default() -> Self {
-        Self { entries: Default::default(), held: Default::default(), locks: true, announces: false, now: Mutex::new(Some(1_000_000)) }
+        Self { entries: Default::default(), held: Default::default(), locks: true, now: Mutex::new(Some(1_000_000)) }
    }
 }

@@ -137,19 +116,6 @@ impl MemoryStore {
        Self { locks: false, ..Self::default() }
    }

-    /// A store without locks whose apps also announce the areas they hold for as long as they run
-    /// (as the browser's Web Locks do).
-    pub fn announcing() -> Self {
-        Self { announces: true, ..Self::without_locks() }
-    }
-
-    fn hold(&self, area: &str) -> Option<Hold> {
-        if !self.held.lock().unwrap_or_else(|e| e.into_inner()).insert(area.to_string()) {
-            return None;
-        }
-        Some(Box::new(MemoryHold { held: self.held.clone(), area: area.to_string() }))
-    }
-
    /// Set the clock heartbeats are judged by.
    pub fn set_now(&self, t: i64) {
        *self.now.lock().unwrap_or_else(|e| e.into_inner()) = Some(t);
@@ -194,16 +160,10 @@ impl RecoveryStore for MemoryStore {
        if !self.locks {
            return Ok(Lock::Unsupported);
        }
-        Ok(self.hold(area).map_or(Lock::Busy, Lock::Held))
-    }
-    fn announce(&self, area: &str) -> Option<Hold> {
-        if !self.announces {
-            return None;
+        if !self.held.lock().unwrap_or_else(|e| e.into_inner()).insert(area.to_string()) {
+            return Ok(Lock::Busy);
        }
-        self.hold(area)
-    }
-    fn announced(&self, area: &str) -> Option<bool> {
-        self.announces.then(|| self.held.lock().unwrap_or_else(|e| e.into_inner()).contains(area))
+        Ok(Lock::Held(Box::new(MemoryHold { held: self.held.clone(), area: area.to_string() })))
    }
    fn now(&self) -> Option<i64> {
        *self.now.lock().unwrap_or_else(|e| e.into_inner())
@@ -328,11 +288,8 @@ struct Own {
    /// The store it is in (copies are removed from there even after the preference moves on).
    store: Arc<dyn RecoveryStore>,
    area: String,
-    /// What holds the area for the session's lifetime: its lock, else its announcement (stores
-    /// without locks that have them).
+    /// The lock held for the session's lifetime; none in stores with heartbeats.
    hold: Option<Hold>,
-    /// Held with a heartbeat (stores without locks).
-    beats: bool,
 }

 /// The session's recovery store settings and its own area ([`crate::Session::recovery`]).
@@ -343,10 +300,9 @@ pub struct Recovery {
    /// The folder the desktop app keeps copies in when the `recoveryFolder` preference is empty.
    default_folder: Option<String>,
    own: Option<Own>,
-    /// Gone apps' areas this session took over by heartbeat (stores without locks), with the
-    /// heartbeat it wrote there: that one doesn't make them look running, a newer one does (their
-    /// app was only paused and came back).
-    adopted: BTreeMap<String, i64>,
+    /// Gone apps' areas this session took over by heartbeat (stores without locks), so its own
+    /// fresh heartbeat there doesn't make them look running.
+    adopted: BTreeSet<String>,
 }

 impl Recovery {
@@ -398,52 +354,31 @@ fn stale_after(s: &Session) -> i64 {
    (i64::from(s.prefs.autosave_interval.max(1)) * 180).max(MIN_STALE)
 }

-/// Record that `area`'s app runs (stores without locks) → the heartbeat written.
-fn beat(store: &dyn RecoveryStore, area: &str) -> std::result::Result<i64, String> {
+/// Record that `area`'s app runs (stores without locks).
+fn beat(store: &dyn RecoveryStore, area: &str) -> std::result::Result<(), String> {
    let now = store.now().ok_or("no clock to keep a heartbeat by")?;
-    store.write(&format!("{area}/{BEAT}"), now.to_string().as_bytes())?;
-    Ok(now)
+    store.write(&format!("{area}/{BEAT}"), now.to_string().as_bytes())
 }

-/// Has `area`'s app said it runs within `stale` seconds (stores without locks)? `mine`: the
-/// heartbeat this session wrote there itself when taking the area over, which doesn't count.
-/// Without a clock every app counts as running.
-fn beating(store: &dyn RecoveryStore, area: &str, stale: i64, mine: Option<i64>) -> bool {
+/// Has `area`'s app said it runs within `stale` seconds (stores without locks)? Without a clock
+/// every app counts as running.
+fn beating(store: &dyn RecoveryStore, area: &str, stale: i64) -> bool {
    let Some(now) = store.now() else { return true };
    let at = store.read(&format!("{area}/{BEAT}")).ok().and_then(|b| String::from_utf8(b).ok()).and_then(|t| t.trim().parse::<i64>().ok());
-    at.is_some_and(|t| now.saturating_sub(t) <= stale && Some(t) != mine)
+    at.is_some_and(|t| now.saturating_sub(t) <= stale)
 }

-/// Refresh this session's hold on its area (the app does this every [`HEARTBEAT_EVERY`] seconds,
-/// so also on its first frame after its timers were paused): its heartbeat in a store without
-/// locks, and its copies ([`repair`]) → the documents whose copies went missing (write them now).
-/// Best effort: a missed beat only lets another app offer the copies once three intervals have
-/// passed.
-pub fn heartbeat(s: &mut Session) -> Vec<u64> {
-    if let Some(own) = s.recovery.own.as_ref().filter(|o| o.beats) {
+/// Refresh this session's heartbeat in a store without locks (the app does this every
+/// [`HEARTBEAT_EVERY`] seconds). Best effort: a missed beat only lets another app offer the copies
+/// once three intervals have passed.
+pub fn heartbeat(s: &Session) {
+    if let Some(own) = s.recovery.own.as_ref().filter(|o| o.hold.is_none()) {
        let _ = beat(own.store.as_ref(), &own.area);
    }
-    repair(s)
-}
-
-/// Forget this session's copies that are missing from its area, so the next recovery save writes
-/// them again → their documents' uids. Another app removes them only when it took this one for
-/// gone (its heartbeat stopped while its timers were paused, as browsers do to background tabs); a
-/// copy it restored is its own now, so both are kept. A store that can't be listed changes nothing.
-pub fn repair(s: &mut Session) -> Vec<u64> {
-    let Some(names) = s.recovery.own.as_ref().and_then(|o| o.store.list().ok()) else { return vec![] };
-    let mut lost = vec![];
-    for st in &mut s.docs {
-        if st.recovery.as_ref().is_some_and(|c| !names.iter().any(|n| n.strip_suffix(DOC_EXT) == Some(c.file.as_str()))) {
-            st.recovery = None;
-            lost.push(st.uid);
-        }
-    }
-    lost
 }

 /// This session's area in `store`, taken now if it has none there yet: a fresh area, held for the
-/// session's lifetime (locked, or with a heartbeat and an announcement where the store has them).
+/// session's lifetime (locked, or with a heartbeat).
 pub fn claim(s: &mut Session, store: &Arc<dyn RecoveryStore>) -> Result<String> {
    if let Some(own) = &s.recovery.own {
        if own.store.location() == store.location() {
@@ -459,15 +394,15 @@ pub fn claim(s: &mut Session, store: &Arc<dyn RecoveryStore>) -> Result<String>
        if taken.contains(&area) {
            continue;
        }
-        let (hold, beats) = match store.lock(&area).map_err(EngineError::Other)? {
-            Lock::Held(h) => (Some(h), false),
+        let hold = match store.lock(&area).map_err(EngineError::Other)? {
+            Lock::Held(h) => Some(h),
            Lock::Busy => continue,
            Lock::Unsupported => {
                beat(store.as_ref(), &area).map_err(EngineError::Other)?;
-                (store.announce(&area), true)
+                None
            }
        };
-        s.recovery.own = Some(Own { store: store.clone(), area: area.clone(), hold, beats });
+        s.recovery.own = Some(Own { store: store.clone(), area: area.clone(), hold });
        return Ok(area);
    }
    Err(EngineError::Other("no free recovery area".into()))
@@ -478,7 +413,7 @@ pub fn release(s: &mut Session) {
    for st in &mut s.docs {
        st.recovery = None;
    }
-    let Some(Own { store, area, hold, .. }) = s.recovery.own.take() else { return };
+    let Some(Own { store, area, hold }) = s.recovery.own.take() else { return };
    let mine = |n: &String| n.split_once('/').is_some_and(|(a, _)| a == area);
    for name in store.list().unwrap_or_default().iter().filter(|n| mine(n)) {
        let _ = store.remove(name);
@@ -487,22 +422,6 @@ pub fn release(s: &mut Session) {
    store.remove_area(&area);
 }

-/// Let go of this session's area but leave its copies, as a crash would, so the next app started
-/// offers them at once instead of waiting for the heartbeat to go stale: for an app that can't go
-/// on (the web page lost its graphics and has to be reloaded). Its documents keep no copies.
-pub fn leave(s: &mut Session) {
-    for st in &mut s.docs {
-        st.recovery = None;
-    }
-    let Some(Own { store, area, hold, beats }) = s.recovery.own.take() else { return };
-    if beats {
-        // Best effort: if the heartbeat stays, the copies are offered once it is stale.
-        let _ = store.remove(&format!("{area}/{BEAT}"));
-    }
-    // The lock or announcement goes too.
-    drop(hold);
-}
-
 /// A document's recovery copy: its entry and the document it holds.
 #[derive(Clone, Debug)]
 pub struct RecoveryCopy {
@@ -612,8 +531,6 @@ fn fresh_name(area: &str, stem: &str, taken: &[String]) -> String {
 /// when it has none and a copy is needed) → (jobs, skipped: `[{title, reason}]` for modified
 /// documents that get none).
 pub fn jobs(s: &mut Session, store: &Arc<dyn RecoveryStore>) -> Result<(Vec<RecoveryJob>, Vec<Value>)> {
-    // Copies another app removed are written again.
-    repair(s);
    let skipped: Vec<Value> = s
        .documents()
        .iter()
@@ -711,9 +628,7 @@ enum Owner {

 /// Whose `area` of `store` is. A gone app's area is held by the caller (its lock in `hold` until
 /// dropped) and, with `take` in a store without locks, taken over with a fresh heartbeat, so
-/// another app leaves it alone meanwhile. In a store without locks an area is gone only when
-/// nothing says its app runs: no announcement (or the store can't tell) and no heartbeat for three
-/// intervals but the one this session wrote taking it over.
+/// another app leaves it alone meanwhile.
 fn owner(s: &mut Session, store: &dyn RecoveryStore, area: &str, hold: &mut Vec<Hold>, take: bool) -> Owner {
    if s.recovery.own.as_ref().is_some_and(|o| o.area == area && o.store.location() == store.location()) {
        return Owner::Mine;
@@ -725,12 +640,14 @@ fn owner(s: &mut Session, store: &dyn RecoveryStore, area: &str, hold: &mut Vec<
        }
        Ok(Lock::Busy) | Err(_) => Owner::Running,
        Ok(Lock::Unsupported) => {
-            if store.announced(area).unwrap_or(false) || beating(store, area, stale_after(s), s.recovery.adopted.get(area).copied()) {
+            if !s.recovery.adopted.contains(area) && beating(store, area, stale_after(s)) {
                return Owner::Running;
            }
-            // Best effort: without it another app might offer the copies too, which loses nothing.
-            if take && let Ok(t) = beat(store, area) {
-                s.recovery.adopted.insert(area.to_string(), t);
+            if take {
+                // Best effort: without it another app might offer the copies too, which loses
+                // nothing.
+                let _ = beat(store, area);
+                s.recovery.adopted.insert(area.to_string());
            }
            Owner::Gone
        }
@@ -3,22 +3,13 @@
 use std::collections::BTreeSet;

 use serde_json::{Value, json};
-use vectorcraft_color::Paint;
 use vectorcraft_doc::{Document, Node, NodeId, NodeKind};

 use super::*;

 pub fn specs() -> Vec<CommandSpec> {
    vec![
-        cmd!(
-            "select.all",
-            "All",
-            ["Select"],
-            Some("Cmd+A"),
-            "{} → {count}; while the Type tool edits text, all of that text instead → {editing, start, end} (byte offsets)",
-            has_doc,
-            all
-        ),
+        cmd!("select.all", "All", ["Select"], Some("Cmd+A"), "{}", has_doc, all),
        cmd!("select.allOnArtboard", "All on Active Artboard", ["Select"], Some("Cmd+Alt+A"), "{artboard?: index}", has_doc, all_on_artboard),
        cmd!("select.none", "Deselect", ["Select"], Some("Cmd+Shift+A"), "{}", has_doc, none),
        cmd!("select.reselect", "Reselect", ["Select"], Some("Cmd+6"), "{}", has_doc, reselect),
@@ -27,70 +18,30 @@ pub fn specs() -> Vec<CommandSpec> {
        cmd!("select.nextBelow", "Next Object Below", ["Select"], Some("Cmd+Alt+["), "{}", has_selection, |s, _| step(s, -1)),
        cmd!("select.set", "Select Objects", [], None, "{ids: [id…]}", has_doc, set),
        cmd!("select.add", "Add to Selection", [], None, "{ids: [id…]}", has_doc, add),
-        cmd!(
-            "select.toggle",
-            "Toggle Selection",
-            [],
-            None,
-            "{id} or {ids: [id…]}: each selected one leaves the selection, the others join it",
-            has_doc,
-            toggle
-        ),
+        cmd!("select.toggle", "Toggle Selection", [], None, "{id}", has_doc, toggle),
        cmd!("select.key", "Set Key Object", [], None, "{id?} (none clears)", has_doc, key),
        cmd!("select.anchors", "Select Anchors", [], None, "{id, anchors: [[subpath, anchor]…], mode: \"set\"|\"add\"|\"toggle\"}", has_doc, anchors),
-        cmd!(
-            "select.anchorsMany",
-            "Select Anchors",
-            [],
-            None,
-            "{items: [{id, anchors}], mode?: \"set\"|\"add\"|\"toggle\"|\"subtract\" (set by default; add: true is mode add)}: toggle selects the anchors not selected and deselects the others, subtract deselects them; a path left with none leaves the selection",
-            has_doc,
-            anchors_many
-        ),
-        cmd!(
+        cmd!("select.anchorsMany", "Select Anchors", [], None, "{items: [{id, anchors}], add?: bool}", has_doc, anchors_many),
+        cmd!("select.same.fillColor", "Fill Color", ["Select", "Same"], None, "{}", has_selection, |s, _| same(
+            s,
            "select.same.fillColor",
-            "Fill Color",
-            ["Select", "Same"],
-            None,
-            "{} the objects filled with the first selected object's fill colour (any tint of its global or spot swatch, the same tint with prefs selectSameTintPercent)",
-            has_selection,
-            |s, _| {
-                let tint = s.prefs.select_same_tint_percent;
-                same(s, "select.same.fillColor", |a, b| same_paint(&a.appearance.fill_paint(), &b.appearance.fill_paint(), tint))
-            }
-        ),
-        cmd!(
+            |a, b| a.appearance.fill_paint() == b.appearance.fill_paint()
+        )),
+        cmd!("select.same.strokeColor", "Stroke Color", ["Select", "Same"], None, "{}", has_selection, |s, _| same(
+            s,
            "select.same.strokeColor",
-            "Stroke Color",
-            ["Select", "Same"],
-            None,
-            "{} the objects stroked with the first selected object's stroke colour (tints as select.same.fillColor)",
-            has_selection,
-            |s, _| {
-                let tint = s.prefs.select_same_tint_percent;
-                same(s, "select.same.strokeColor", |a, b| same_paint(&a.appearance.stroke_paint(), &b.appearance.stroke_paint(), tint))
-            }
-        ),
+            |a, b| a.appearance.stroke_paint() == b.appearance.stroke_paint()
+        )),
        cmd!("select.same.strokeWeight", "Stroke Weight", ["Select", "Same"], None, "{}", has_selection, |s, _| same(
            s,
            "select.same.strokeWeight",
            |a, b| (a.appearance.stroke_width() - b.appearance.stroke_width()).abs() < 1e-9
        )),
-        cmd!(
+        cmd!("select.same.fillAndStroke", "Fill & Stroke", ["Select", "Same"], None, "{}", has_selection, |s, _| same(
+            s,
            "select.same.fillAndStroke",
-            "Fill & Stroke",
-            ["Select", "Same"],
-            None,
-            "{} the objects with the first selected object's fill and stroke colours (tints as select.same.fillColor)",
-            has_selection,
-            |s, _| {
-                let tint = s.prefs.select_same_tint_percent;
-                same(s, "select.same.fillAndStroke", |a, b| {
-                    let (x, y) = (&a.appearance, &b.appearance);
-                    same_paint(&x.fill_paint(), &y.fill_paint(), tint) && same_paint(&x.stroke_paint(), &y.stroke_paint(), tint)
-                })
-            }
-        ),
+            |a, b| a.appearance.fill_paint() == b.appearance.fill_paint() && a.appearance.stroke_paint() == b.appearance.stroke_paint()
+        )),
        cmd!("select.same.opacity", "Opacity", ["Select", "Same"], None, "{}", has_selection, |s, _| same(s, "select.same.opacity", |a, b| (a
            .opacity
            - b.opacity)
@@ -156,18 +107,6 @@ fn selectable(d: &Document, iso: Option<NodeId>) -> Vec<NodeId> {
 }

 fn all(s: &mut Session, _: &Value) -> Result<Value> {
-    // While the Type tool edits text, Select All takes all of that text and leaves the art
-    // selection as it is (Illustrator: text cursor in a text object).
-    if s.tool_wants_text() {
-        s.set_tool_option("selectAll", &json!(true));
-        let editing = s.tool_options()["editing"].clone();
-        let id = editing.as_u64().map(NodeId);
-        let end = id.and_then(|id| match &s.doc().ok()?.doc.node(id)?.kind {
-            NodeKind::Text(t) => Some(t.plain_text().len()),
-            _ => None,
-        });
-        return Ok(json!({ "editing": editing, "start": 0, "end": end.unwrap_or(0) }));
-    }
    let st = s.doc()?;
    let ids = selectable(&st.doc, st.isolation);
    s.select(|_, sel| sel.set(ids.iter().copied()))?;
@@ -233,12 +172,8 @@ fn add(s: &mut Session, p: &Value) -> Result<Value> {
 }

 fn toggle(s: &mut Session, p: &Value) -> Result<Value> {
-    let ids = ids_param(p, "ids").or_else(|| id_param(p, "id").map(|id| vec![id])).ok_or_else(|| bad("select.toggle", "missing id or ids"))?;
-    s.select(|_, sel| {
-        for id in ids {
-            sel.toggle(id);
-        }
-    })?;
+    let id = id_param(p, "id").ok_or_else(|| bad("select.toggle", "missing id"))?;
+    s.select(|_, sel| sel.toggle(id))?;
    ok()
 }

@@ -282,48 +217,16 @@ fn anchors_many(s: &mut Session, p: &Value) -> Result<Value> {
        .and_then(Value::as_array)
        .map(|a| a.iter().filter_map(|it| Some((NodeId(it.get("id")?.as_u64()?), parse_refs(it.get("anchors")).into_iter().collect()))).collect())
        .unwrap_or_default();
-    // `add: true` is the older spelling of mode add.
-    let mode = match str_param(p, "mode") {
-        Some(m @ ("set" | "add" | "toggle" | "subtract")) => m,
-        Some(m) => return Err(bad("select.anchorsMany", format!("unknown mode {m:?}"))),
-        None if bool_or(p, "add", false) => "add",
-        None => "set",
-    };
+    let add = bool_or(p, "add", false);
    s.select(|d, sel| {
-        if mode == "set" {
+        if !add {
            sel.clear();
        }
        for (id, refs) in items {
-            let all: BTreeSet<(usize, usize)> =
-                d.node(id).and_then(|n| n.path_data()).map(|p| p.anchors().map(|(s, i, _)| (s, i)).collect()).unwrap_or_default();
-            // Anything but a path is selected, toggled or deselected as a whole.
-            if all.is_empty() {
-                match mode {
-                    "toggle" => sel.toggle(id),
-                    "subtract" => sel.remove(id),
-                    _ => sel.add(id),
-                }
-                continue;
-            }
-            // From the anchors selected now (all of them for a path selected as a whole).
-            let now = match sel.partial(id) {
-                Some(a) => a.clone(),
-                None if sel.contains(id) => all.clone(),
-                None => BTreeSet::new(),
-            };
-            let refs: BTreeSet<(usize, usize)> = refs.intersection(&all).copied().collect();
-            let next: BTreeSet<(usize, usize)> = match mode {
-                "toggle" => now.symmetric_difference(&refs).copied().collect(),
-                "subtract" => now.difference(&refs).copied().collect(),
-                _ => now.union(&refs).copied().collect(),
-            };
-            if next.is_empty() {
-                sel.remove(id);
-                continue;
-            }
+            let total = d.node(id).and_then(|n| n.path_data()).map(|p| p.anchor_count()).unwrap_or(0);
            sel.add(id);
-            if next.len() < all.len() {
-                sel.anchors.insert(id, next);
+            if refs.len() < total {
+                sel.anchors.entry(id).or_default().extend(refs);
            } else {
                sel.anchors.remove(&id);
            }
@@ -332,16 +235,7 @@ fn anchors_many(s: &mut Session, p: &Value) -> Result<Value> {
    ok()
 }

-/// Select › Same › Fill/Stroke Color: is `a` the same colour as `b`? Tints of one global or spot
-/// swatch are, unless `tint` (General › Select Same Tint %) asks for the same tint too.
-fn same_paint(a: &Paint, b: &Paint, tint: bool) -> bool {
-    match (a, b) {
-        (Paint::Solid { swatch: Some(x), tint: ta, .. }, Paint::Solid { swatch: Some(y), tint: tb, .. }) if x == y => !tint || (ta - tb).abs() < 1e-4,
-        _ => a == b,
-    }
-}
-
-fn same(s: &mut Session, cmd: &str, eq: impl Fn(&Node, &Node) -> bool) -> Result<Value> {
+fn same(s: &mut Session, cmd: &str, eq: fn(&Node, &Node) -> bool) -> Result<Value> {
    let st = s.doc()?;
    let refn = st.selection.objects.first().and_then(|id| st.doc.node(*id)).cloned().ok_or_else(|| bad(cmd, "nothing selected"))?;
    select_where(s, cmd, &json!({}), |_, n| !n.is_container() && eq(n, &refn))
@@ -27,7 +27,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Character",
            [],
            None,
-            "{id, start?: byte, end?: byte (default: all text), font?, style?, size?: pt, leading?: pt|\"auto\", tracking?, kerning?: 1/1000 em|\"auto\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg, fill?: colour|\"none\", stroke?: colour|\"none\", strokeWidth?: pt, strokeOptions?: {weight?, cap?, join?, miterLimit?, dash?, dashOffset?, alignDashes?} (as stroke.set: the character stroke), underline?, strikethrough?, allCaps?: bool, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), features?: [\"dlig\", \"-liga\", …], charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\"} style a character range (runs are split at the range ends) → {id, runs}",
+            "{id, start?: byte, end?: byte (default: all text), font?, style?, size?: pt, leading?: pt|\"auto\", tracking?, kerning?: 1/1000 em|\"auto\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg, fill?: colour|\"none\", stroke?: colour|\"none\", strokeWidth?: pt, strokeOptions?: {weight?, cap?, join?, miterLimit?, dash?, dashOffset?, alignDashes?} (as stroke.set: the character stroke), underline?, strikethrough?, allCaps?: bool, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), features?: [\"dlig\", \"-liga\", …]} style a character range (runs are split at the range ends) → {id, runs}",
            has_doc,
            set_range_style
        ),
@@ -45,7 +45,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Area / Path Type",
            [],
            None,
-            "{path: id, mode: \"area\"|\"onPath\", text?: \"\", vertical?: bool = false, at?: [x, y] (on-path start: nearest point), size?, font?, placeholder?: bool (placeholder text instead, as text.create)} turn a path into an area-type frame or a type-on-a-path baseline (the path's paint is dropped) → {id}",
+            "{path: id, mode: \"area\"|\"onPath\", text?: \"\", vertical?: bool = false, at?: [x, y] (on-path start: nearest point), size?, font?} turn a path into an area-type frame or a type-on-a-path baseline (the path's paint is dropped) → {id}",
            has_doc,
            create_in_path
        ),
@@ -58,33 +58,6 @@ pub fn specs() -> Vec<CommandSpec> {
            has_selection,
            fit_headline
        ),
-        cmd!(
-            "type.step",
-            "Step Type",
-            [],
-            None,
-            "{attribute: \"size\"|\"leading\"|\"tracking\"|\"kerning\"|\"baselineShift\", by?: steps (1; negative steps down), id?, start?: byte, end?: byte} step type by the Preferences › Type increments (size and leading: typeSizeIncrement, pt; tracking and kerning: trackingIncrement, 1/1000 em; baseline shift: baselineShiftIncrement, pt), what the Type tool's Alt+arrows do (Cmd/Ctrl too: five steps; ←/→ kerning at the caret or tracking of the selection, ↑/↓ leading, Shift+↑/↓ baseline shift). The range of `id`, else the text the Type tool has selected (at a caret: kerning steps the character before it, leading its paragraph), else every selected type object → {ids}",
-            has_doc,
-            type_step
-        ),
-        cmd!(
-            "type.size.increase",
-            "Increase Font Size",
-            [],
-            Some("Cmd+Shift+."),
-            "{by?: steps (1)} type.step {attribute: size}",
-            has_selection,
-            |s, p| type_step(s, &json!({"attribute": "size", "by": f64_or(p, "by", 1.0)}))
-        ),
-        cmd!(
-            "type.size.decrease",
-            "Decrease Font Size",
-            [],
-            Some("Cmd+Shift+,"),
-            "{by?: steps (1)} type.step {attribute: size, by: -by}",
-            has_selection,
-            |s, p| type_step(s, &json!({"attribute": "size", "by": -f64_or(p, "by", 1.0)}))
-        ),
        cmd!(
            "text.discardEmpty",
            "Discard Empty Type",
@@ -178,7 +151,6 @@ pub(crate) struct CharChange {
    features: Option<Vec<String>>,
    position: Option<vectorcraft_doc::CharPosition>,
    small_caps: Option<Option<f64>>,
-    char_align: Option<vectorcraft_doc::CharAlign>,
 }

 /// `features: ["dlig", "-liga", …]` → the canonical tag list (differences from the defaults).
@@ -191,19 +163,6 @@ pub(crate) fn features_param(p: &Value, cmd: &str) -> Result<Option<Vec<String>>
    Ok(Some(vectorcraft_text::OtFeatures::default().with_tags(tags).to_tags()))
 }

-/// `charAlign: "romanBaseline"|"emBoxTop"|"emBoxCenter"|"emBoxBottom"` (Character Alignment).
-pub(crate) fn char_align_param(p: &Value, cmd: &str) -> Result<Option<vectorcraft_doc::CharAlign>> {
-    use vectorcraft_doc::CharAlign;
-    let Some(v) = p.get("charAlign").filter(|v| !v.is_null()) else { return Ok(None) };
-    Ok(Some(match v.as_str() {
-        Some("romanBaseline") => CharAlign::RomanBaseline,
-        Some("emBoxTop") => CharAlign::EmBoxTop,
-        Some("emBoxCenter") => CharAlign::EmBoxCenter,
-        Some("emBoxBottom") => CharAlign::EmBoxBottom,
-        _ => return Err(bad(cmd, "`charAlign` must be \"romanBaseline\", \"emBoxTop\", \"emBoxCenter\" or \"emBoxBottom\"")),
-    }))
-}
-
 fn paint_param(p: &Value, k: &str, cmd: &str) -> Result<Option<Paint>> {
    match p.get(k) {
        None | Some(Value::Null) => Ok(None),
@@ -254,7 +213,6 @@ impl CharChange {
            features: features_param(p, cmd)?,
            position,
            small_caps,
-            char_align: char_align_param(p, cmd)?,
        };
        if c.size.is_some_and(|v| v <= 0.0) {
            return Err(bad(cmd, "size must be positive"));
@@ -282,7 +240,6 @@ impl CharChange {
            && self.features.is_none()
            && self.position.is_none()
            && self.small_caps.is_none()
-            && self.char_align.is_none()
    }

    pub(crate) fn apply(&self, st: &mut CharStyle) {
@@ -353,48 +310,6 @@ impl CharChange {
        if let Some(v) = self.small_caps {
            st.small_caps = v;
        }
-        if let Some(v) = self.char_align {
-            st.char_align = v;
-        }
-    }
-}
-
-/// Type › Enable Missing Glyph Protection: after a font change, the characters of `runs` their new
-/// font has no glyph for, but their font `before` the change had, keep that font.
-pub(crate) fn protect_missing_glyphs(before: &[TextRun], runs: &mut Vec<TextRun>) {
-    fn chars(runs: &[TextRun]) -> impl Iterator<Item = (usize, char, &CharStyle)> {
-        runs.iter()
-            .scan(0, |at, r| {
-                let start = *at;
-                *at += r.text.len();
-                Some(r.text.char_indices().map(move |(i, c)| (start + i, c, &r.style)))
-            })
-            .flatten()
-    }
-    let db = vectorcraft_text::FontDb::global();
-    let mut faces = std::collections::HashMap::new();
-    let mut covers = |st: &CharStyle, c: char| {
-        let face = faces.entry((st.font_family.clone(), st.font_style.clone())).or_insert_with(|| db.face(&st.font_family, &st.font_style));
-        face.as_ref().map(|f| f.covers(c))
-    };
-    // Byte ranges that keep a font (family, style).
-    let mut keep: Vec<(usize, usize, &CharStyle)> = vec![];
-    for ((at, c, old), (_, _, new)) in chars(before).zip(chars(runs)) {
-        let changed = (&old.font_family, &old.font_style) != (&new.font_family, &new.font_style);
-        if !changed || c.is_whitespace() || c.is_control() || covers(new, c) != Some(false) || covers(old, c) != Some(true) {
-            continue;
-        }
-        let end = at + c.len_utf8();
-        match keep.last_mut() {
-            Some((_, e, st)) if *e == at && (&st.font_family, &st.font_style) == (&old.font_family, &old.font_style) => *e = end,
-            _ => keep.push((at, end, old)),
-        }
-    }
-    for (a, b, old) in keep {
-        edit::style_range(runs, a, b, |st| {
-            st.font_family.clone_from(&old.font_family);
-            st.font_style.clone_from(&old.font_style);
-        });
    }
 }

@@ -405,7 +320,6 @@ fn set_range_style(s: &mut Session, p: &Value) -> Result<Value> {
    if change.is_empty() {
        return Err(bad(C, "nothing to change"));
    }
-    let protect = s.prefs.missing_glyph_protection && (change.font.is_some() || change.style.is_some());
    let t = text_ref(s, id)?;
    let (a, b) = range_of(p, edit::runs_len(&t.runs));
    let n = s.edit("Character", |d, _| {
@@ -414,11 +328,7 @@ fn set_range_style(s: &mut Session, p: &Value) -> Result<Value> {
            // An empty range inside text styles nothing (Illustrator keeps it for the next typing).
            return Ok(t.runs.len());
        }
-        let before = protect.then(|| t.runs.clone());
        edit::style_range(&mut t.runs, a, b, |st| change.apply(st));
-        if let Some(before) = before {
-            protect_missing_glyphs(&before, &mut t.runs);
-        }
        refresh_bounds(t);
        Ok(t.runs.len())
    })?;
@@ -453,29 +363,22 @@ fn create_in_path(s: &mut Session, p: &Value) -> Result<Value> {
    }
    let text = str_param(p, "text").unwrap_or("").to_string();
    let start = match point_param(p, "at") {
-        Some(at) if on_path => vectorcraft_geom::ArcPath::new(path).fraction_at(at).unwrap_or(0.0),
+        Some(at) if on_path => vectorcraft_text::path_fraction_at(&path.to_bezpath(), at).0,
        _ => 0.0,
    };
-    let kind = if on_path { TextKind::OnPath { path: path.clone(), start, end: None } } else { TextKind::Area { frame: path.clone() } };
+    let kind = if on_path { TextKind::OnPath { path: path.clone(), start } } else { TextKind::Area { frame: path.clone() } };
    let mut t = TextObject {
        vertical: p.get("vertical").and_then(Value::as_bool).unwrap_or(false),
        kind,
        xf: Affine::IDENTITY,
        runs: vec![TextRun { text, style }],
-        para: super::create::new_type_para(),
+        para: Default::default(),
        area: Default::default(),
        path_effect: Default::default(),
-        path_align: Default::default(),
-        path_spacing: 0.0,
        wrap: Vec::new(),
        cached_bounds: None,
-        cached_baselines: Vec::new(),
    };
-    if bool_or(p, "placeholder", false) {
-        super::typemenu::fill_with_placeholder(&mut t);
-    } else {
-        refresh_bounds(&mut t);
-    }
+    refresh_bounds(&mut t);
    let id = s.edit(if on_path { "Type on a Path" } else { "Area Type" }, |d, sel| {
        let (par, idx, _) = d.position(pid).ok_or(EngineError::NoNode(pid))?;
        d.remove(pid)?;
@@ -491,95 +394,6 @@ fn create_in_path(s: &mut Session, p: &Value) -> Result<Value> {
    Ok(json!({"id": id.0}))
 }

-/// What `type.step` changes.
-#[derive(Clone, Copy, PartialEq)]
-enum Step {
-    Size,
-    Leading,
-    Tracking,
-    Kerning,
-    BaselineShift,
-}
-
-/// The Type tool's selected text while it edits (its typing session ends first: one undo step).
-fn editing_range(s: &mut Session) -> Result<Option<(NodeId, usize, usize)>> {
-    let o = s.tool_options();
-    let Some(id) = o.get("editing").and_then(Value::as_u64).map(NodeId) else { return Ok(None) };
-    if super::edit::typing_in_progress(s) {
-        s.set_tool_option("commitTyping", &Value::Bool(true));
-        s.commit_interaction()?;
-    }
-    let at = |k: &str| byte_param(&o, k).unwrap_or(0);
-    Ok(Some((id, at("start"), at("end"))))
-}
-
-fn type_step(s: &mut Session, p: &Value) -> Result<Value> {
-    const C: &str = "type.step";
-    let step = match str_param(p, "attribute") {
-        Some("size") => Step::Size,
-        Some("leading") => Step::Leading,
-        Some("tracking") => Step::Tracking,
-        Some("kerning") => Step::Kerning,
-        Some("baselineShift") => Step::BaselineShift,
-        _ => return Err(bad(C, "attribute must be size|leading|tracking|kerning|baselineShift")),
-    };
-    let by = f64_or(p, "by", 1.0);
-    if !by.is_finite() {
-        return Err(bad(C, "by must be a number"));
-    }
-    let prefs = &s.prefs;
-    let inc = by.clamp(-1000.0, 1000.0)
-        * match step {
-            Step::Size | Step::Leading => prefs.type_size_increment,
-            Step::Tracking | Step::Kerning => prefs.tracking_increment,
-            Step::BaselineShift => prefs.baseline_shift_increment,
-        };
-    // (text, its range; None: all of it).
-    let targets: Vec<(NodeId, Option<(usize, usize)>)> = match id_param(p, "id") {
-        Some(id) => vec![(id, Some(range_of(p, edit::runs_len(&text_ref(s, id)?.runs))))],
-        None => match editing_range(s)? {
-            Some((id, a, b)) => vec![(id, Some((a.min(b), a.max(b))))],
-            None => super::typecmd::text_targets(s, p, C)?.into_iter().map(|id| (id, None)).collect(),
-        },
-    };
-    // The ranges stepped. At a caret: kerning is the space after the character before it, leading
-    // the paragraph's; the rest wait for a selection.
-    let mut ranges = vec![];
-    for (id, range) in targets {
-        let text = text_ref(s, id)?.plain_text();
-        let (a, b) = range.map_or((0, text.len()), |(a, b)| (a.min(text.len()), b.min(text.len())));
-        let (a, b) = match step {
-            _ if a < b => (a, b),
-            Step::Kerning => (edit::prev_char(&text, a), a),
-            Step::Leading => {
-                let para = edit::paragraph_at(&text, a);
-                (para.start, para.end)
-            }
-            _ => continue,
-        };
-        if a < b {
-            ranges.push((id, a, b));
-        }
-    }
-    if !ranges.is_empty() {
-        s.edit("Character", |d, _| {
-            for &(id, a, b) in &ranges {
-                let t = text_mut(d, id).ok_or(EngineError::NoNode(id))?;
-                edit::style_range(&mut t.runs, a, b, |st| match step {
-                    Step::Size => st.size = (st.size + inc).clamp(0.1, 1296.0),
-                    Step::Leading => st.leading = Some((st.effective_leading() + inc).clamp(0.1, 5000.0)),
-                    Step::Tracking => st.tracking = (st.tracking + inc).clamp(-1000.0, 10000.0),
-                    Step::Kerning => st.kerning = Some((st.kerning.unwrap_or(0.0) + inc).clamp(-1000.0, 10000.0)),
-                    Step::BaselineShift => st.baseline_shift = (st.baseline_shift + inc).clamp(-1296.0, 1296.0),
-                });
-                refresh_bounds(t);
-            }
-            Ok(())
-        })?;
-    }
-    Ok(json!({ "ids": ranges.iter().map(|(id, ..)| id.0).collect::<Vec<_>>() }))
-}
-
 /// Tracking (1/1000 em) that makes the first paragraph of `t` exactly `target` wide, if it fits
 /// on one line at all.
 fn headline_tracking(t: &TextObject, target: f64) -> Option<f64> {
@@ -598,11 +412,8 @@ fn headline_tracking(t: &TextObject, target: f64) -> Option<f64> {
            para: Default::default(),
            area: Default::default(),
            path_effect: Default::default(),
-            path_align: Default::default(),
-            path_spacing: 0.0,
            wrap: Vec::new(),
            cached_bounds: None,
-            cached_baselines: Vec::new(),
        };
        for r in &mut h.runs {
            r.style.tracking = tr;
@@ -115,20 +115,12 @@ pub fn specs() -> Vec<CommandSpec> {

 // ---------- attribute plumbing ----------

-/// `v` as a JSON map with one key per attribute: Auto alignment, which files save as its
-/// direction's alignment plus `justify_auto` (see `vectorcraft_doc::ParaStyle`), is `"justify":
-/// "Auto"`, so a style's `justify` replaces it.
-fn to_map<T: Serialize>(v: &T) -> Option<Map<String, Value>> {
-    let Ok(Value::Object(mut m)) = serde_json::to_value(v) else { return None };
-    if m.remove("justify_auto") == Some(Value::Bool(true)) {
-        m.insert("justify".into(), Value::from("Auto"));
-    }
-    Some(m)
-}
-
 /// A style's attributes as a JSON map, without the style name.
 fn to_attrs<T: Serialize>(v: &T) -> Map<String, Value> {
-    let mut m = to_map(v).unwrap_or_default();
+    let mut m = match serde_json::to_value(v) {
+        Ok(Value::Object(m)) => m,
+        _ => Map::new(),
+    };
    m.remove("style_name");
    m
 }
@@ -136,7 +128,7 @@ fn to_attrs<T: Serialize>(v: &T) -> Map<String, Value> {
 /// `base` with `attrs` written over it (unknown or ill-typed attributes are an error).
 fn with_attrs<T: Serialize + DeserializeOwned>(base: &T, attrs: &Map<String, Value>, cmd: &str) -> Result<T> {
    let mut m = to_attrs(base);
-    if let Some(full) = to_map(base) {
+    if let Ok(Value::Object(full)) = serde_json::to_value(base) {
        m.insert("style_name".into(), full.get("style_name").cloned().unwrap_or(Value::Null));
    }
    for (k, v) in attrs {
@@ -152,7 +144,7 @@ fn with_attrs<T: Serialize + DeserializeOwned>(base: &T, attrs: &Map<String, Val
 /// value (or not set by it) take the new value; overrides stay. Unchanged if the style doesn't
 /// round-trip through JSON.
 fn restyle<T: Serialize + DeserializeOwned + Clone>(cur: &T, old: &Map<String, Value>, new: &Map<String, Value>) -> T {
-    let Some(mut m) = to_map(cur) else { return cur.clone() };
+    let Ok(Value::Object(mut m)) = serde_json::to_value(cur) else { return cur.clone() };
    for (k, v) in new {
        if old.get(k).is_none_or(|o| m.get(k) == Some(o)) {
            m.insert(k.clone(), v.clone());
@@ -75,7 +75,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Character",
            [],
            None,
-            "{ids?|id?, font?, style?, size?: pt, leading?: pt|\"auto\", tracking?: 1/1000 em, justify?: \"auto\" (the start of each paragraph's direction)|\"left\"|\"center\"|\"right\"|\"justifyAll\", fill?: colour, features?: [\"dlig\", \"-liga\", …] OpenType}",
+            "{ids?|id?, font?, style?, size?: pt, leading?: pt|\"auto\", tracking?: 1/1000 em, justify?: \"left\"|\"center\"|\"right\"|\"justifyAll\", fill?: colour, features?: [\"dlig\", \"-liga\", …] OpenType}",
            has_doc,
            set_style
        ),
@@ -97,11 +97,10 @@ fn orientation(s: &mut Session, p: &Value, vertical: bool) -> Result<Value> {
    Ok(json!({"vertical": vertical, "ids": ids.iter().map(|id| id.0).collect::<Vec<_>>()}))
 }

-/// Recompute the layout caches (bounds and baselines) after a text edit.
+/// Recompute the layout bounds cache after a text edit.
 pub(crate) fn refresh_bounds(t: &mut TextObject) {
    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t);
    t.cached_bounds = Some(lay.bounds);
-    t.cached_baselines = lay.baselines();
 }

 /// Text objects among `ids` and their descendants.
@@ -191,7 +190,6 @@ fn set_text(s: &mut Session, p: &Value) -> Result<Value> {

 fn justify_param(v: &str) -> Option<Justify> {
    Some(match v.to_ascii_lowercase().as_str() {
-        "auto" => Justify::Auto,
        "left" => Justify::Left,
        "center" => Justify::Center,
        "right" => Justify::Right,
@@ -218,7 +216,7 @@ fn set_style(s: &mut Session, p: &Value) -> Result<Value> {
    };
    let tracking = num_param(p, "tracking");
    let justify = match str_param(p, "justify") {
-        Some(j) => Some(justify_param(j).ok_or_else(|| bad(C, "justify must be auto|left|center|right|justifyAll"))?),
+        Some(j) => Some(justify_param(j).ok_or_else(|| bad(C, "justify must be left|center|right|justifyAll"))?),
        None => None,
    };
    let fill = match p.get("fill") {
@@ -239,11 +237,9 @@ fn set_style(s: &mut Session, p: &Value) -> Result<Value> {
        return Err(bad(C, "nothing to change"));
    }
    let ids = text_targets(s, p, C)?;
-    let protect = s.prefs.missing_glyph_protection && (font.is_some() || style.is_some());
    s.edit("Character", |d, _| {
        for id in &ids {
            let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
-            let before = protect.then(|| t.runs.clone());
            for r in &mut t.runs {
                let st = &mut r.style;
                if let Some(f) = &font {
@@ -268,9 +264,6 @@ fn set_style(s: &mut Session, p: &Value) -> Result<Value> {
                    st.features = f.clone();
                }
            }
-            if let Some(before) = before {
-                super::textedit::protect_missing_glyphs(&before, &mut t.runs);
-            }
            if let Some(j) = justify {
                t.para.justify = j;
            }
@@ -414,112 +407,6 @@ fn reshape_area(s: &mut Session, p: &Value) -> Result<Value> {
 mod area_tests {
    use super::*;

-    #[test]
-    fn burasagari_is_set_per_paragraph_and_saved_only_when_on() {
-        use vectorcraft_doc::Burasagari;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-        let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "雅楽、笙。", "area": {"width": 200, "height": 100}})).unwrap()["id"]
-            .as_u64()
-            .unwrap();
-        let para = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
-            NodeKind::Text(t) => t.para.clone(),
-            _ => panic!("text"),
-        };
-        // New type: Standard, as in Illustrator.
-        assert_eq!(para(&s).burasagari, Burasagari::Standard);
-        s.execute("select.set", &json!({"ids": [id]})).unwrap();
-        assert!(s.execute("text.setFormat", &json!({"burasagari": "strong"})).is_err());
-        s.execute("text.setFormat", &json!({"burasagari": "forced"})).unwrap();
-        assert_eq!(para(&s).burasagari, Burasagari::Forced);
-        assert_eq!(serde_json::to_value(para(&s)).unwrap()["burasagari"], "forced");
-        s.execute("text.setFormat", &json!({"burasagari": "none"})).unwrap();
-        assert_eq!(para(&s).burasagari, Burasagari::None);
-        // Saved only when on; documents from before it read as None.
-        assert!(serde_json::to_value(para(&s)).unwrap().get("burasagari").is_none());
-        s.execute("edit.undo", &json!({})).unwrap();
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(para(&s).burasagari, Burasagari::Standard);
-        let old: vectorcraft_doc::ParaStyle = serde_json::from_value(json!({"justify": "Left"})).unwrap();
-        assert_eq!(old.burasagari, Burasagari::None);
-    }
-
-    #[test]
-    fn leading_model_is_set_per_paragraph_and_saved_only_when_top_to_top() {
-        use vectorcraft_doc::LeadingModel;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-        let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "一\n二", "area": {"width": 200, "height": 100}})).unwrap()["id"]
-            .as_u64()
-            .unwrap();
-        let text = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
-            NodeKind::Text(t) => (**t).clone(),
-            _ => panic!("text"),
-        };
-        assert_eq!(text(&s).para.leading_model, LeadingModel::RomanBaseline);
-        s.execute("select.set", &json!({"ids": [id]})).unwrap();
-        assert!(s.execute("text.setFormat", &json!({"leadingModel": "middle"})).is_err());
-        let before = text(&s).cached_bounds;
-        s.execute("text.setFormat", &json!({"leadingModel": "emBoxTop"})).unwrap();
-        let t = text(&s);
-        assert_eq!(t.para.leading_model, LeadingModel::EmBoxTop);
-        assert_ne!(t.cached_bounds, before, "the first line moves up to the frame's top");
-        assert_eq!(serde_json::to_value(&t.para).unwrap()["leading_model"], "emBoxTop");
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert!(serde_json::to_value(&text(&s).para).unwrap().get("leading_model").is_none());
-    }
-
-    #[test]
-    fn character_alignment_is_a_character_attribute_saved_only_when_set() {
-        use vectorcraft_doc::CharAlign;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-        let id = s.execute("text.create", &json!({"x": 10, "y": 50, "text": "雅楽"})).unwrap()["id"].as_u64().unwrap();
-        let runs = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
-            NodeKind::Text(t) => t.runs.clone(),
-            _ => panic!("text"),
-        };
-        assert_eq!(runs(&s)[0].style.char_align, CharAlign::RomanBaseline);
-        assert!(serde_json::to_value(&runs(&s)[0].style).unwrap().get("charAlign").is_none());
-        s.execute("select.set", &json!({"ids": [id]})).unwrap();
-        assert!(s.execute("text.setFormat", &json!({"charAlign": "middle"})).is_err());
-        s.execute("text.setFormat", &json!({"charAlign": "emBoxCenter"})).unwrap();
-        assert!(runs(&s).iter().all(|r| r.style.char_align == CharAlign::EmBoxCenter));
-        assert_eq!(serde_json::to_value(&runs(&s)[0].style).unwrap()["charAlign"], "emBoxCenter");
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(runs(&s)[0].style.char_align, CharAlign::RomanBaseline);
-        // Characters selected with the Type tool: only the range takes it (雅 is 3 bytes).
-        assert!(s.execute("text.setRangeStyle", &json!({"id": id, "start": 3, "end": 6, "charAlign": "top"})).is_err());
-        s.execute("text.setRangeStyle", &json!({"id": id, "start": 3, "end": 6, "charAlign": "emBoxTop"})).unwrap();
-        let aligns: Vec<_> = runs(&s).iter().map(|r| (r.text.clone(), r.style.char_align)).collect();
-        assert_eq!(aligns, [("雅".to_string(), CharAlign::RomanBaseline), ("楽".to_string(), CharAlign::EmBoxTop)]);
-    }
-
-    #[test]
-    fn new_type_is_composed_with_line_end_half_width_punctuation() {
-        use vectorcraft_doc::Mojikumi;
-        let mut s = Session::new();
-        s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-        let id = s.execute("text.create", &json!({"x": 10, "y": 50, "text": "雅楽。"})).unwrap()["id"].as_u64().unwrap();
-        let para = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
-            NodeKind::Text(t) => t.para.clone(),
-            _ => panic!("text"),
-        };
-        assert_eq!(para(&s).mojikumi, Mojikumi::LineEndHalf);
-        s.execute("select.set", &json!({"ids": [id]})).unwrap();
-        assert!(s.execute("text.setFormat", &json!({"mojikumi": "everything"})).is_err());
-        s.execute("text.setFormat", &json!({"mojikumi": "none"})).unwrap();
-        assert_eq!(para(&s).mojikumi, Mojikumi::None);
-        s.execute("edit.undo", &json!({})).unwrap();
-        assert_eq!(para(&s).mojikumi, Mojikumi::LineEndHalf);
-        // Saved only when set; documents from before it read as None.
-        let json = serde_json::to_value(para(&s)).unwrap();
-        assert_eq!(json["mojikumi"], "lineEndHalf");
-        let old: vectorcraft_doc::ParaStyle = serde_json::from_value(json!({"justify": "Left"})).unwrap();
-        assert_eq!(old.mojikumi, Mojikumi::None);
-        assert!(serde_json::to_value(&old).unwrap().get("mojikumi").is_none());
-    }
-
    #[test]
    fn vertical_point_type_keeps_its_anchor_on_the_column_centre_line() {
        let mut s = Session::new();
@@ -3,7 +3,7 @@
 //! commands of the Edit menu (Find and Replace, Find Next, Paste without Formatting).

 use serde_json::{Value, json};
-use vectorcraft_doc::{CharStyle, Document, Justify, NodeId, NodeKind, Quotes, TextKind, TextObject, TextRun};
+use vectorcraft_doc::{CharStyle, Document, Justify, NodeId, NodeKind, Quotes, TextKind, TextRun};
 use vectorcraft_geom::{Affine, Rect, shapes};

 use super::typecmd::refresh_bounds;
@@ -52,7 +52,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Type on a Path Options…",
            ["Type", "Type on a Path"],
            None,
-            "{ids?, start?: 0..1, end?: 0..1|null, flip?: bool, effect?: rainbow|skew|3dRibbon|stairStep|gravity, alignToPath?: ascender|descender|center|baseline, spacing?: pt} set the selected type on a path's options: start and end place its start and end brackets as fractions of the path's length (end null: the end of the path, or once round a closed path), and flip then turns the type to the other side of its path (the path runs the other way, the brackets swap ends); none given: query → the first object's {start, end, flip: false, effect, alignToPath, spacing}",
+            "{start?: 0..1 (fraction of the path length), flip?: bool (reverse the path), effect?: rainbow|skew|3dRibbon|stairStep|gravity, ids?}",
            has_selection,
            path_options
        ),
@@ -275,7 +275,6 @@ fn to_area(s: &mut Session, p: &Value) -> Result<Value> {
            let (sl, sr) = match t.para.justify {
                Justify::Center | Justify::JustifyCenter => (slack * 0.5, slack * 0.5),
                Justify::Right | Justify::JustifyRight => (slack, 0.0),
-                Justify::Auto if lay.lines.first().is_some_and(|l| l.rtl) => (slack, 0.0),
                _ => (0.0, slack),
            };
            let frame = Rect::new(b.x0 - sl, top, b.x1 + sr, b.y1.max(top + 1.0));
@@ -331,7 +330,6 @@ fn to_point(s: &mut Session, p: &Value) -> Result<Value> {
            let ox = match t.para.justify {
                Justify::Center | Justify::JustifyCenter => (x0 + x1) * 0.5,
                Justify::Right | Justify::JustifyRight => x1,
-                Justify::Auto if lay.lines.first().is_some_and(|l| l.rtl) => x1,
                _ => x0,
            };
            t.kind = TextKind::Point;
@@ -343,95 +341,38 @@ fn to_point(s: &mut Session, p: &Value) -> Result<Value> {
    Ok(ids_json(&ids))
 }

-/// The options `type.pathOptions` sets; with none of them given it queries.
-const PATH_OPTIONS: [&str; 6] = ["start", "end", "flip", "effect", "alignToPath", "spacing"];
-
-/// Type on a path's text, if `n` is type on a path.
-fn path_text(n: Option<&vectorcraft_doc::Node>) -> Option<&TextObject> {
-    match n.map(|n| &n.kind) {
-        Some(NodeKind::Text(t)) if matches!(t.kind, TextKind::OnPath { .. }) => Some(t),
-        _ => None,
-    }
-}
-
-/// Type on a Path Options of `t`, as `type.pathOptions` takes them (`flip` is an action: false).
-fn path_options_of(t: &TextObject) -> Value {
-    let (start, end) = match &t.kind {
-        TextKind::OnPath { start, end, .. } => (*start, *end),
-        _ => (0.0, None),
-    };
-    json!({
-        "start": start,
-        "end": end,
-        "flip": false,
-        "effect": t.path_effect.id(),
-        "alignToPath": t.path_align.id(),
-        "spacing": t.path_spacing,
-    })
-}
-
 fn path_options(s: &mut Session, p: &Value) -> Result<Value> {
    const C: &str = "type.pathOptions";
-    let ids: Vec<NodeId> = {
-        let d = &s.doc()?.doc;
-        texts(s, p, C)?.into_iter().filter(|i| path_text(d.node(*i)).is_some()).collect()
-    };
-    let first = *ids.first().ok_or_else(|| bad(C, "select type on a path"))?;
-    let options = |s: &Session| -> Result<Value> {
-        let t = path_text(s.doc()?.doc.node(first)).ok_or_else(|| bad(C, "select type on a path"))?;
-        Ok(path_options_of(t))
-    };
-    if !PATH_OPTIONS.iter().any(|k| p.get(k).is_some()) {
-        return options(s);
-    }
-    // A bracket: a fraction of the path's length.
-    let fraction = |k: &str| -> Result<Option<f64>> {
-        match p.get(k) {
-            None | Some(Value::Null) => Ok(None),
-            Some(v) => v.as_f64().filter(|x| x.is_finite()).map(|x| Some(x.clamp(0.0, 1.0))).ok_or_else(|| bad(C, format!("`{k}` is a number 0..1"))),
-        }
-    };
-    let start = fraction("start")?;
-    // `end: null` puts the end bracket back at the end of the path.
-    let end = p.get("end").map(|_| fraction("end")).transpose()?;
+    let ids = texts(s, p, C)?;
+    let start = p.get("start").and_then(Value::as_f64);
    let flip = bool_or(p, "flip", false);
    let effect = match str_param(p, "effect") {
        Some(e) => Some(vectorcraft_doc::PathEffect::parse(e).ok_or_else(|| bad(C, format!("unknown effect `{e}`")))?),
        None => None,
    };
-    let align = match str_param(p, "alignToPath") {
-        Some(a) => Some(vectorcraft_doc::PathAlign::parse(a).ok_or_else(|| bad(C, format!("unknown alignToPath `{a}`")))?),
-        None => None,
-    };
-    let spacing = p.get("spacing").and_then(Value::as_f64).filter(|x| x.is_finite()).map(|x| x.clamp(-1000.0, 1000.0));
-    s.edit("Type on a Path Options", |d, _| {
+    let n = s.edit("Type on a Path Options", |d, _| {
+        let mut n = 0;
        for id in &ids {
            let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
-            let TextKind::OnPath { start: st, end: en, .. } = &mut t.kind else { continue };
+            let TextKind::OnPath { path, start: st } = &mut t.kind else { continue };
            if let Some(v) = start {
-                *st = v;
+                *st = v.clamp(0.0, 1.0);
            }
-            if let Some(v) = end {
-                *en = v;
-            }
-            // After the brackets: they are given on the path as it runs before the flip.
            if flip {
-                t.flip_on_path();
+                path.reverse();
            }
            if let Some(e) = effect {
                t.path_effect = e;
            }
-            if let Some(a) = align {
-                t.path_align = a;
-            }
-            if let Some(v) = spacing {
-                t.path_spacing = v;
-            }
+            n += 1;
            refresh_bounds(t);
        }
-        Ok(())
+        if n == 0 {
+            return Err(bad(C, "select type on a path"));
+        }
+        Ok(n)
    })?;
-    options(s)
+    Ok(json!({ "changed": n }))
 }

 // ---------- placeholder / insert ----------
@@ -445,44 +386,36 @@ fn fill_placeholder(s: &mut Session, p: &Value) -> Result<Value> {
    let ids = texts(s, p, "type.fillPlaceholder")?;
    s.edit("Fill with Placeholder Text", |d, _| {
        for id in &ids {
-            if let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) {
-                fill_with_placeholder(t);
-            }
+            let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
+            let style = t.first_style();
+            let text = match &t.kind {
+                TextKind::Area { frame } => {
+                    let b = frame.bounds().unwrap_or_default();
+                    let chars_per_line = (b.width() / (style.size * 0.5)).max(1.0);
+                    let lines = (b.height() / style.effective_leading()).max(1.0);
+                    let want = (chars_per_line * lines) as usize;
+                    let mut out = String::new();
+                    let words: Vec<&str> = PLACEHOLDER.split(' ').collect();
+                    let mut i = 0;
+                    while out.len() < want && i < 10_000 {
+                        if !out.is_empty() {
+                            out.push(' ');
+                        }
+                        out.push_str(words[i % words.len()]);
+                        i += 1;
+                    }
+                    out
+                }
+                _ => PLACEHOLDER.split(". ").next().unwrap_or(PLACEHOLDER).to_string() + ".",
+            };
+            t.runs = vec![TextRun { text, style }];
+            refresh_bounds(t);
        }
        Ok(())
    })?;
    Ok(ids_json(&ids))
 }

-/// Replace `t`'s text with placeholder text in its first style: area type is filled to its frame,
-/// other type gets a sentence (Type › Fill with Placeholder Text, and new type with Preferences ›
-/// Type › Fill New Type Objects With Placeholder Text).
-pub(crate) fn fill_with_placeholder(t: &mut TextObject) {
-    let style = t.first_style();
-    let text = match &t.kind {
-        TextKind::Area { frame } => {
-            let b = frame.bounds().unwrap_or_default();
-            let chars_per_line = (b.width() / (style.size * 0.5)).max(1.0);
-            let lines = (b.height() / style.effective_leading()).max(1.0);
-            let want = (chars_per_line * lines) as usize;
-            let mut out = String::new();
-            for (i, w) in PLACEHOLDER.split(' ').cycle().enumerate() {
-                if out.len() >= want || i >= 10_000 {
-                    break;
-                }
-                if !out.is_empty() {
-                    out.push(' ');
-                }
-                out.push_str(w);
-            }
-            out
-        }
-        _ => PLACEHOLDER.split(". ").next().unwrap_or(PLACEHOLDER).to_string() + ".",
-    };
-    t.runs = vec![TextRun { text, style }];
-    refresh_bounds(t);
-}
-
 pub(crate) fn special_char(name: &str) -> Option<&'static str> {
    Some(match name {
        "bullet" => "•",
@@ -4,7 +4,7 @@ use std::sync::Arc;

 use serde_json::{Value, json};
 use vectorcraft_color::Paint;
-use vectorcraft_doc::{Node, NodeKind};
+use vectorcraft_doc::{Node, NodeId, NodeKind};
 use vectorcraft_geom::{Affine, Point, Rect, Vec2};

 use super::edit::selected_roots;
@@ -45,7 +45,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Move Artboard",
            [],
            None,
-            "{index, dx, dy, moveArt?: bool, copy?: bool} move an artboard (and the art fully inside it; locked and hidden art only with prefs moveLockedWithArtboard); `copy` (Alt-drag) leaves them and moves copies → {index, moved: the art moved or the copies}",
+            "{index, dx, dy, moveArt?: bool} move an artboard (and the unlocked art fully inside it)",
            has_doc,
            artboard_move
        ),
@@ -371,24 +371,43 @@ fn sample_color(s: &mut Session, p: &Value) -> Result<Value> {
 fn artboard_move(s: &mut Session, p: &Value) -> Result<Value> {
    let i = p.get("index").and_then(Value::as_u64).ok_or_else(|| bad("artboard.move", "missing index"))? as usize;
    let dv = Vec2::new(f64_or(p, "dx", 0.0), f64_or(p, "dy", 0.0));
-    let art = super::panelcmds::artboard_art(s, i, bool_or(p, "moveArt", false))?;
-    let scale_strokes = s.prefs.scale_strokes;
-    let copy = bool_or(p, "copy", false);
-    let (index, moved) = s.edit(if copy { "Duplicate Artboard" } else { "Move Artboard" }, |d, _| {
-        // A copy keeps the artboard (and its art) where they are and moves duplicates instead.
-        if copy {
-            return super::panelcmds::copy_artboard(d, i, dv, &art, scale_strokes);
+    let move_art = bool_or(p, "moveArt", false);
+    let st = s.doc()?;
+    let rect = st.doc.artboards.get(i).map(|a| a.rect).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+    // Top-level objects (children of layers) lying entirely inside the artboard.
+    let mut art = vec![];
+    if move_art {
+        fn collect(n: &Node, rect: Rect, out: &mut Vec<NodeId>) {
+            for c in n.children().into_iter().flatten() {
+                if c.locked {
+                    continue;
+                }
+                if c.is_layer() {
+                    collect(c, rect, out);
+                } else if let Some(b) = c.geometric_bounds()
+                    && rect.contains(Point::new(b.x0, b.y0))
+                    && rect.contains(Point::new(b.x1, b.y1))
+                {
+                    out.push(c.id);
+                }
+            }
        }
+        for l in &st.doc.layers {
+            if !l.locked {
+                collect(l, rect, &mut art);
+            }
+        }
+    }
+    let scale_strokes = s.prefs.scale_strokes;
+    s.edit("Move Artboard", |d, _| {
        let a = d.artboards.get_mut(i).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
        a.rect = a.rect + dv;
-        let id = a.id;
-        d.move_artboard_guides(id, dv);
        for id in &art {
            if let Some(n) = d.node_mut(*id) {
                n.transform(Affine::translate(dv), scale_strokes);
            }
        }
-        Ok((i, art.clone()))
+        Ok(())
    })?;
-    Ok(json!({ "index": index, "moved": moved.iter().map(|i| i.0).collect::<Vec<_>>() }))
+    Ok(json!({ "index": i, "moved": art.iter().map(|i| i.0).collect::<Vec<_>>() }))
 }
@@ -1,7 +1,7 @@
 //! Agent-friendly document summaries and view-models for panels.

 use serde_json::{Value, json};
-use vectorcraft_doc::{ArrowAlign, Document, LineCap, LineJoin, Node, NodeKind, StrokeAlign, StrokeLayer, WidthProfile};
+use vectorcraft_doc::{ArrowAlign, LineCap, LineJoin, Node, NodeKind, StrokeAlign, StrokeLayer, WidthProfile};

 use crate::Session;

@@ -12,23 +12,8 @@ fn rect_json(r: Option<vectorcraft_geom::Rect>) -> Value {
    }
 }

-/// How much of the subtree a node summary carries.
-#[derive(Clone, Copy, Default)]
-pub struct SummaryOpts {
-    /// Child levels to include (`None`: the whole subtree). `0` is the node alone.
-    pub depth: Option<u64>,
-    /// Children shown per node (`None`: all, top of the stack first). A level that shows
-    /// fewer children than it has reports `childCount`, so truncation is never silent.
-    pub child_limit: Option<u64>,
-}
-
-/// Compact tree summary of a node (for `document.inspect`): the whole subtree.
+/// Compact tree summary of a node (for `document.inspect`).
 pub fn node_summary(n: &Node) -> Value {
-    node_summary_opts(n, SummaryOpts::default())
-}
-
-/// The same summary with [`SummaryOpts`] applied.
-pub fn node_summary_opts(n: &Node, opts: SummaryOpts) -> Value {
    let mut v = json!({
        "id": n.id.0,
        "name": n.display_name(),
@@ -84,26 +69,12 @@ pub fn node_summary_opts(n: &Node, opts: SummaryOpts) -> Value {
        _ => {}
    }
    if let Some(ch) = n.children() {
-        let total = ch.len();
-        let take_n = opts.child_limit.map_or(total, |l| l.min(total as u64) as usize);
-        if opts.depth.is_none_or(|d| d > 0) {
-            let next = SummaryOpts { depth: opts.depth.map(|d| d.saturating_sub(1)), child_limit: opts.child_limit };
-            v["children"] = Value::Array(ch.iter().rev().take(take_n).map(|c| node_summary_opts(c, next)).collect());
-        }
-        if take_n < total || v.get("children").is_none() {
-            v["childCount"] = json!(total);
-        }
+        v["children"] = Value::Array(ch.iter().rev().map(|c| node_summary(c)).collect());
    }
    v
 }

 pub fn document(s: &Session) -> Value {
-    document_opts(s, SummaryOpts::default())
-}
-
-/// The same summary with [`SummaryOpts`] applied to the layer tree (artboards and
-/// the rest always come whole): `depth: 0` is the skeleton — top layers with counts.
-pub fn document_opts(s: &Session, opts: SummaryOpts) -> Value {
    let Some(st) = s.active() else { return Value::Null };
    let d = &st.doc;
    json!({
@@ -115,7 +86,7 @@ pub fn document_opts(s: &Session, opts: SummaryOpts) -> Value {
        "colorMode": format!("{:?}", d.color_mode),
        "artboards": d.artboards.iter().map(|a| json!({"name": a.name, "x": a.rect.x0, "y": a.rect.y0, "width": a.rect.width(), "height": a.rect.height()})).collect::<Vec<_>>(),
        // Top of the stack first, like the Layers panel.
-        "layers": d.layers.iter().rev().map(|l| node_summary_opts(l, opts)).collect::<Vec<_>>(),
+        "layers": d.layers.iter().rev().map(|l| node_summary(l)).collect::<Vec<_>>(),
        "currentLayer": st.active_layer.map(|l| l.0),
        // The rows highlighted in the Layers panel (`layer.setCurrent`, `layer.highlight`).
        "layerRows": st.highlighted_rows().iter().map(|i| i.0).collect::<Vec<_>>(),
@@ -135,69 +106,6 @@ pub fn document_opts(s: &Session, opts: SummaryOpts) -> Value {
    })
 }

-/// What `document.find` matches: every given filter must hit (AND). All matching is
-/// case-insensitive; `name` and `text` are substrings, `kind` is the exact panel label
-/// (`Layer`, `Group`, `Path`, `Type`, `Image`, ...).
-pub struct FindFilter {
-    pub name: Option<String>,
-    pub kind: Option<String>,
-    pub text: Option<String>,
-}
-
-impl FindFilter {
-    /// True when no effective filter was given (empty strings count as absent).
-    pub fn is_empty(&self) -> bool {
-        [self.name.as_ref(), self.kind.as_ref(), self.text.as_ref()].iter().all(|f| f.is_none())
-    }
-
-    fn hits(&self, n: &Node) -> bool {
-        if let Some(needle) = &self.name
-            && !n.display_name().to_lowercase().contains(needle)
-        {
-            return false;
-        }
-        if let Some(kind) = &self.kind
-            && !n.kind_label().eq_ignore_ascii_case(kind)
-        {
-            return false;
-        }
-        if let Some(needle) = &self.text {
-            let NodeKind::Text(t) = &n.kind else { return false };
-            if !t.plain_text().to_lowercase().contains(needle) {
-                return false;
-            }
-        }
-        true
-    }
-}
-
-/// Search the whole layer tree, top of the stack first like the Layers panel.
-/// Returns at most `limit` hits as `{id, name, kind, path}` (`path` is the ancestor
-/// chain, layer first) plus the total hit count, so a capped reply stays explicit.
-pub fn find_nodes(doc: &Document, filter: &FindFilter, limit: u64) -> (Vec<Value>, u64) {
-    use std::sync::Arc;
-    let mut out = Vec::new();
-    let mut total = 0u64;
-    let mut ancestors: Vec<u64> = Vec::new();
-    fn walk(nodes: &[Arc<Node>], ancestors: &mut Vec<u64>, filter: &FindFilter, limit: u64, out: &mut Vec<Value>, total: &mut u64) {
-        for n in nodes.iter().rev() {
-            if filter.hits(n) {
-                *total += 1;
-                if (out.len() as u64) < limit {
-                    out.push(json!({"id": n.id.0, "name": n.display_name(), "kind": n.kind_label(), "path": ancestors}));
-                }
-            }
-            if let Some(ch) = n.children() {
-                ancestors.push(n.id.0);
-                walk(ch, ancestors, filter, limit, out, total);
-                ancestors.pop();
-            }
-        }
-    }
-    walk(&doc.layers, &mut ancestors, filter, limit, &mut out, &mut total);
-    (out, total)
-}
-
 /// Cap names as `stroke.set` takes them.
 pub const CAPS: [(LineCap, &str); 3] = [(LineCap::Butt, "butt"), (LineCap::Round, "round"), (LineCap::Square, "square")];
 /// Join names as `stroke.set` takes them.
@@ -79,25 +79,14 @@ pub struct Interaction {
    pub doc: Arc<Document>,
    pub selection: Selection,
    pub preview: Option<(String, Value)>,
-    /// Per-document state restored on cancel (current layer, highlighted Layers panel rows,
-    /// isolation).
+    /// Per-document state restored on cancel (current layer, isolation).
    pub active_layer: Option<NodeId>,
-    pub layer_rows: Vec<NodeId>,
    pub isolation: Option<NodeId>,
    /// The perspective transform the previews make (`perspective.transform` params): Transform
    /// Again repeats it once the drag is committed.
    pub perspective_again: Option<Value>,
 }

-/// An open undo group ([`Session::begin_undo_group`]): the edits made in it are one undo step.
-#[derive(Clone, Debug)]
-pub struct UndoGroup {
-    /// The document before the group's first edit, as the undo step that edit recorded keeps it.
-    first: Option<Arc<Document>>,
-    /// The journal's length when the group began: a cancelled group drops the entries after it.
-    journal: usize,
-}
-
 /// Per-document editing state.
 #[derive(Clone, Debug)]
 pub struct DocState {
@@ -121,8 +110,6 @@ pub struct DocState {
    /// Isolation mode container.
    pub isolation: Option<NodeId>,
    pub interaction: Option<Interaction>,
-    /// Edits made while this is open are one undo step (a scrubbed numeric field).
-    pub undo_group: Option<UndoGroup>,
    /// For Object → Transform → Transform Again (⌘D).
    pub last_transform: Option<(Affine, bool)>,
    /// Selection saved by Select → Reselect.
@@ -177,7 +164,6 @@ impl DocState {
            layer_rows: vec![],
            isolation: None,
            interaction: None,
-            undo_group: None,
            last_transform: None,
            last_selection_cmd: None,
            uid: NEXT_DOC_UID.fetch_add(1, std::sync::atomic::Ordering::Relaxed),
@@ -209,33 +195,17 @@ impl DocState {
    /// Keep what interaction `it` (taken from this document) changed, as one undo step.
    pub(crate) fn keep_interaction(&mut self, it: Interaction) {
        if !Arc::ptr_eq(&it.doc, &self.doc) {
-            self.push_undo(HistoryEntry { label: it.label, doc: it.doc, selection: it.selection });
+            self.history.undo.push(HistoryEntry { label: it.label, doc: it.doc, selection: it.selection });
+            self.history.redo.clear();
            self.revision += 1;
        }
    }
-    /// Record undo step `e` (the document before an edit). In an undo group only the group's first
-    /// edit records one: the edits after it extend that step.
-    fn push_undo(&mut self, e: HistoryEntry) {
-        if let Some(g) = &mut self.undo_group {
-            let recorded = |first: &Arc<Document>| self.history.undo.last().is_some_and(|l| Arc::ptr_eq(&l.doc, first));
-            if g.first.as_ref().is_some_and(recorded) {
-                return;
-            }
-            g.first = Some(e.doc.clone());
-        }
-        self.history.undo.push(e);
-        if self.history.undo.len() > self.history.limit {
-            self.history.undo.remove(0);
-        }
-        self.history.redo.clear();
-    }
    /// End the interaction in progress, undoing what it changed.
    pub(crate) fn undo_interaction(&mut self) {
        if let Some(it) = self.interaction.take() {
            self.doc = it.doc;
            self.selection = it.selection;
            self.active_layer = it.active_layer;
-            self.layer_rows = it.layer_rows;
            self.isolation = it.isolation;
            self.revision += 1;
        }
@@ -320,9 +290,7 @@ fn strip_replay_only(id: &str, p: &mut Value) {
 /// have finite, in-range geometry, so saved files always reload and renderers never see NaN/∞.
 fn doc_sane(d: &Document, sel: &Selection) -> bool {
    let ok = |r: vectorcraft_geom::Rect| [r.x0, r.y0, r.x1, r.y1].iter().all(|v| v.is_finite() && v.abs() <= MAX_COORD);
-    d.artboards.iter().all(|a| ok(a.rect))
-        && d.guides.iter().all(|g| g.pos.is_finite() && g.pos.abs() <= MAX_COORD)
-        && sel.objects.iter().all(|id| d.node(*id).and_then(|n| n.geometric_bounds()).is_none_or(ok))
+    d.artboards.iter().all(|a| ok(a.rect)) && sel.objects.iter().all(|id| d.node(*id).and_then(|n| n.geometric_bounds()).is_none_or(ok))
 }

 /// Where new art goes (Illustrator's drawing modes, Shift+D cycles).
@@ -359,8 +327,6 @@ pub struct Prefs {
    /// Scale Strokes & Effects.
    pub scale_strokes: bool,
    pub zoom_with_mouse_wheel: bool,
-    /// A horizontal drag on a numeric field or its label steps its value (#400).
-    pub scrub_numeric_fields: bool,
    /// Offset for Paste / duplicate (Illustrator pastes to the view centre; we offset by this).
    pub paste_offset: f64,
    // Selection & Anchor Display
@@ -397,8 +363,6 @@ pub struct Prefs {
    pub units_stroke: String,
    pub units_type: String,
    pub units_asian_type: String,
-    /// Numbers Without Units Are Points: a number typed with no unit into a length field in picas
-    /// is read in points (on by default; the reference app dims it unless a unit is Picas).
    pub numbers_without_units_are_points: bool,
    pub identify_objects_by: String,
    // Guides & Grid
@@ -446,13 +410,10 @@ pub struct Prefs {
    pub gpu_performance: bool,
    pub animated_zoom: bool,
    /// Which graphics processor the desktop app asks for at startup (it takes effect after a
-    /// restart): `automatic`, `lowPower` (the integrated GPU on hybrid-graphics machines) or
-    /// `highPerformance` (the discrete one). The canvas is rasterized on the CPU and only
-    /// composited on the GPU, so the integrated GPU is plenty; presenting from the discrete GPU
-    /// through the integrated one made some hybrid laptops flicker (#306). Automatic is power
-    /// saving on Windows and macOS and the system's default GPU elsewhere, the one the desktop
-    /// runs on: a Wayland compositor may not show frames from another GPU (#502). Single-GPU
-    /// machines are unaffected.
+    /// restart): `powerSaving` (the integrated GPU on hybrid-graphics laptops) or `highPerformance`
+    /// (the discrete one). The canvas is rasterized on the CPU and only composited on the GPU, so
+    /// the integrated GPU is plenty; presenting from the discrete GPU through the integrated one
+    /// made some hybrid laptops flicker (#306). Single-GPU machines are unaffected.
    pub gpu_preference: String,
    pub history_states: u32,
    pub real_time_drawing: bool,
@@ -586,7 +547,6 @@ impl Default for Prefs {
            scale_corners: false,
            scale_strokes: false,
            zoom_with_mouse_wheel: false,
-            scrub_numeric_fields: true,
            paste_offset: 10.0,
            selection_tolerance: 3.0,
            object_selection_by_path_only: false,
@@ -629,7 +589,7 @@ impl Default for Prefs {
            grid_subdivisions: 8,
            grids_in_back: true,
            show_pixel_grid: true,
-            smart_guide_color: s("#ff3dfc"),
+            smart_guide_color: s("#ff4af0"),
            alignment_guides: true,
            object_highlighting: true,
            transform_tools_guides: true,
@@ -656,7 +616,7 @@ impl Default for Prefs {
            interface_language: s("auto"),
            gpu_performance: true,
            animated_zoom: true,
-            gpu_preference: s("automatic"),
+            gpu_preference: s("powerSaving"),
            history_states: 500,
            real_time_drawing: true,
            render_threads: -1,
@@ -779,8 +739,6 @@ pub struct Session {
    pub(crate) liquify_stroke: Option<Box<cmd::distortcmds::LiquifyStroke>>,
    /// A press on the Plane Switching Widget is under way: its drag and release are the widget's.
    pub(crate) plane_widget_press: bool,
-    /// A guide being dragged out of a ruler ([`Session::ruler_guide`]).
-    pub(crate) ruler_guide: Option<vectorcraft_tools::rulerguide::NewGuide>,
 }

 impl Default for Session {
@@ -825,7 +783,6 @@ impl Session {
            envelope_defaults: None,
            liquify_stroke: None,
            plane_widget_press: false,
-            ruler_guide: None,
        }
    }

@@ -1104,7 +1061,11 @@ impl Session {
                st.selection.prune(&st.doc);
                st.revision += 1;
                if st.interaction.is_none() {
-                    st.push_undo(HistoryEntry { label: label.to_string(), doc: before, selection: before_sel });
+                    st.history.undo.push(HistoryEntry { label: label.to_string(), doc: before, selection: before_sel });
+                    if st.history.undo.len() > st.history.limit {
+                        st.history.undo.remove(0);
+                    }
+                    st.history.redo.clear();
                }
                Ok(v)
            }
@@ -1153,7 +1114,6 @@ impl Session {
            selection: st.selection.clone(),
            preview: None,
            active_layer: st.active_layer,
-            layer_rows: st.layer_rows.clone(),
            isolation: st.isolation,
            perspective_again: None,
        });
@@ -1218,44 +1178,6 @@ impl Session {
        self.active().is_some_and(|d| d.interaction.is_some())
    }

-    // ---------- undo groups (scrubbed numeric fields) ----------
-
-    /// Open an undo group in the active document: until [`Session::end_undo_group`], the edits
-    /// made there (commands, committed interactions) are one undo step. A scrubbed numeric field
-    /// applies each value it passes as its own command, as a typed value is applied; the drag is
-    /// one step.
-    pub fn begin_undo_group(&mut self) {
-        let journal = self.journal.len();
-        if let Some(st) = self.active_mut()
-            && st.undo_group.is_none()
-        {
-            st.undo_group = Some(UndoGroup { first: None, journal });
-        }
-    }
-
-    /// Close the open undo groups: their edits stay one undo step or, `cancel`led (Escape), are
-    /// undone and dropped from the journal.
-    pub fn end_undo_group(&mut self, cancel: bool) {
-        let mut journal = None;
-        for st in &mut self.docs {
-            let Some(g) = st.undo_group.take() else { continue };
-            // Only while the group's step is still the newest one.
-            if cancel
-                && let Some(first) = g.first
-                && st.history.undo.last().is_some_and(|e| Arc::ptr_eq(&e.doc, &first))
-                && let Some(e) = st.history.undo.pop()
-            {
-                st.doc = e.doc;
-                st.selection = e.selection;
-                st.revision += 1;
-                journal = Some(g.journal);
-            }
-        }
-        if let Some(len) = journal {
-            self.journal.truncate(len);
-        }
-    }
-
    /// Commands with enablement (for menus, palette, MCP `list_commands`).
    pub fn commands(&self) -> Vec<CommandInfo> {
        command_specs().iter().map(|c| c.info(self)).collect()
@@ -1379,8 +1301,6 @@ mod tests_liquify;
 #[cfg(test)]
 mod tests_live;
 #[cfg(test)]
-mod tests_livecorners;
-#[cfg(test)]
 mod tests_maskview;
 #[cfg(test)]
 mod tests_menucmds;
@@ -1407,8 +1327,6 @@ mod tests_panelcmds;
 #[cfg(test)]
 mod tests_pathops;
 #[cfg(test)]
-mod tests_pathtype;
-#[cfg(test)]
 mod tests_pattern;
 #[cfg(test)]
 mod tests_pdffidelity;
@@ -252,33 +252,6 @@ fn pen_tool_draws_closed_path() {
    assert!(p.is_closed());
 }

-/// Auto Add/Delete: a Pen click on a selected path's segment adds an anchor, unless General →
-/// Disable Auto Add/Delete is on.
-#[test]
-fn pen_click_on_a_selected_path_adds_an_anchor_unless_disabled() {
-    let mut s = session();
-    let v = ViewInfo::default();
-    let r = s.execute("path.create", &json!({"anchors": [{"x": 10, "y": 100}, {"x": 110, "y": 100}, {"x": 210, "y": 100}]})).unwrap();
-    let id = NodeId(r["id"].as_u64().unwrap());
-    s.execute("select.all", &json!({})).unwrap();
-    s.select_tool("pen", v).unwrap();
-    let click = |s: &mut Session| {
-        s.pointer(&PointerEvent::new(PointerKind::Down, 60.0, 101.0), v).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Up, 60.0, 101.0), v).unwrap();
-    };
-    click(&mut s);
-    let d = &s.doc().unwrap().doc;
-    assert_eq!(d.layers[0].children().unwrap().len(), 1);
-    assert_eq!(d.node(id).unwrap().path_data().unwrap().anchor_count(), 4);
-    s.execute("edit.undo", &json!({})).unwrap();
-    s.execute("prefs.set", &json!({"key": "disableAutoAddDelete", "value": true})).unwrap();
-    s.execute("select.all", &json!({})).unwrap();
-    click(&mut s);
-    let d = &s.doc().unwrap().doc;
-    assert_eq!(d.layers[0].children().unwrap().len(), 2, "a new path starts");
-    assert_eq!(d.node(id).unwrap().path_data().unwrap().anchor_count(), 3);
-}
-
 #[test]
 fn direct_selection_moves_one_anchor() {
    let mut s = session();
@@ -294,43 +267,6 @@ fn direct_selection_moves_one_anchor() {
    assert_eq!(p.subpaths[0].anchors[1].p, vectorcraft_geom::Point::new(200.0, 100.0));
 }

-/// Dragging a curved segment with Direct Selection bends it (its anchors stay), and dragging a
-/// straight one moves its two anchors, not the whole path; each is one undo step.
-#[test]
-fn direct_selection_drags_segments() {
-    let mut s = session();
-    let v = ViewInfo::default();
-    let drag = |s: &mut Session, from: (f64, f64), to: (f64, f64)| {
-        s.pointer(&PointerEvent::new(PointerKind::Down, from.0, from.1), v).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Drag, to.0, to.1), v).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Up, to.0, to.1), v).unwrap();
-    };
-    let arch = &json!({"anchors": [{"x": 100, "y": 200, "out": [100, 100]}, {"x": 300, "y": 200, "in": [300, 100]}]});
-    let arch = NodeId(s.execute("path.create", arch).unwrap()["id"].as_u64().unwrap());
-    let square = &json!({"anchors": [{"x": 150, "y": 400}, {"x": 150, "y": 300}, {"x": 250, "y": 300}, {"x": 250, "y": 400}], "closed": true});
-    let square = NodeId(s.execute("path.create", square).unwrap()["id"].as_u64().unwrap());
-    s.execute("select.none", &json!({})).unwrap();
-    s.select_tool("directSelection", v).unwrap();
-    let steps = |s: &Session| s.doc().unwrap().history.undo.len();
-    let before = steps(&s);
-    // The arch's middle, 40 up: the curve bends, its two anchors stay.
-    drag(&mut s, (200.0, 125.0), (200.0, 85.0));
-    let sp = s.doc().unwrap().doc.node(arch).unwrap().path_data().unwrap().subpaths[0].clone();
-    let (a, b) = (sp.anchors[0], sp.anchors[1]);
-    assert_eq!((a.p, b.p), (vectorcraft_geom::Point::new(100.0, 200.0), vectorcraft_geom::Point::new(300.0, 200.0)), "the anchors stay");
-    assert!(a.h_out.y < 100.0 && b.h_in.y < 100.0, "the curve bent up: {a:?} {b:?}");
-    assert_eq!(steps(&s), before + 1);
-    // The square's top edge, 40 up: its two anchors move, the bottom two stay.
-    drag(&mut s, (200.0, 300.0), (200.0, 260.0));
-    let sq = s.doc().unwrap().doc.node(square).unwrap().geometric_bounds().unwrap();
-    assert_eq!((sq.y0, sq.y1, sq.x0, sq.x1), (260.0, 400.0, 150.0, 250.0), "the edge moved, the rest stayed");
-    assert_eq!(steps(&s), before + 2);
-    // Its fill still moves the whole square.
-    drag(&mut s, (200.0, 350.0), (200.0, 330.0));
-    let sq = s.doc().unwrap().doc.node(square).unwrap().geometric_bounds().unwrap();
-    assert_eq!((sq.y0, sq.y1), (240.0, 380.0), "the whole path moved");
-}
-
 #[test]
 fn text_create_has_bounds() {
    let mut s = session();
@@ -349,127 +285,6 @@ fn inspect_lists_everything() {
    assert!(s.commands().len() > 100);
 }

-/// `document.node {summary: true}` answers the `document.inspect` shape for one node:
-/// the same fields the full-tree summary carries, without serializing the whole tree.
-#[test]
-fn document_node_summary_matches_inspect() {
-    let mut s = session();
-    let id = rect(&mut s, 0.0, 0.0, 10.0, 10.0).0;
-    let full = s.execute("document.node", &json!({"id": id})).unwrap();
-    assert!(full.get("bounds").is_none(), "full object JSON carries geometry, not bounds: {full}");
-    let summary = s.execute("document.node", &json!({"id": id, "summary": true})).unwrap();
-    let v = s.execute("document.inspect", &json!({})).unwrap();
-    let node = v["layers"][0]["children"].as_array().unwrap().iter().find(|n| n["id"] == id).cloned().unwrap();
-    assert_eq!(summary, node, "{summary} vs {node}");
-    assert!(s.execute("document.node", &json!({"id": 999999, "summary": true})).is_err());
-}
-
-/// `depth` and `childLimit` slice a summary read; a level that shows fewer children
-/// than it has reports `childCount`, and invalid values are rejected, not reinterpreted.
-#[test]
-fn document_node_summary_slices_with_depth_and_limit() {
-    let mut s = session();
-    rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    rect(&mut s, 20.0, 0.0, 10.0, 10.0);
-    s.execute("select.all", &json!({})).unwrap();
-    let inner = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
-    rect(&mut s, 40.0, 0.0, 10.0, 10.0);
-    s.execute("select.all", &json!({})).unwrap();
-    let outer = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
-    let mut read = |p: Value| s.execute("document.node", &p).unwrap();
-
-    let g = read(json!({"id": outer, "summary": true}));
-    assert_eq!(g["children"].as_array().map(Vec::len), Some(2));
-    assert!(g.get("childCount").is_none(), "nothing truncated: {g}");
-    // Limits beyond the tree are the whole tree, byte for byte.
-    assert_eq!(read(json!({"id": outer, "summary": true, "depth": u64::MAX, "childLimit": u64::MAX})), g);
-
-    let one = read(json!({"id": outer, "summary": true, "childLimit": 1}));
-    assert_eq!(one["children"].as_array().map(Vec::len), Some(1));
-    assert_eq!(one["childCount"], 2);
-
-    let flat = read(json!({"id": outer, "summary": true, "depth": 0}));
-    assert!(flat.get("children").is_none(), "{flat}");
-    assert_eq!(flat["childCount"], 2);
-
-    // Limits compose per level: the outer children show; the inner group's own
-    // children don't, and it says so.
-    let shallow = read(json!({"id": outer, "summary": true, "depth": 1}));
-    let kids = shallow["children"].as_array().unwrap();
-    assert_eq!(kids.len(), 2);
-    assert!(shallow.get("childCount").is_none(), "{shallow}");
-    let nested = kids.iter().find(|n| n["id"] == inner).unwrap();
-    assert!(nested.get("children").is_none(), "{nested}");
-    assert_eq!(nested["childCount"], 2);
-
-    for bad in [
-        json!({"id": outer, "summary": true, "depth": -1}),
-        json!({"id": outer, "summary": true, "depth": 1.5}),
-        json!({"id": outer, "summary": true, "childLimit": "many"}),
-        // A slice of the full object JSON would silently be the whole subtree.
-        json!({"id": outer, "depth": 0}),
-        json!({"id": outer, "summary": false, "childLimit": 1}),
-    ] {
-        assert!(s.execute("document.node", &bad).is_err(), "{bad}");
-    }
-}
-
-/// `document.inspect` slices the layer tree with the same options; artboards and the
-/// rest always come whole, and the default output is unchanged.
-#[test]
-fn document_inspect_slices_the_layer_tree() {
-    let mut s = session();
-    rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    rect(&mut s, 20.0, 0.0, 10.0, 10.0);
-    s.execute("select.all", &json!({})).unwrap();
-    s.execute("object.group", &json!({})).unwrap();
-
-    let full = s.execute("document.inspect", &json!({})).unwrap();
-    assert!(full["layers"][0].get("childCount").is_none(), "{full}");
-    let flat = s.execute("document.inspect", &json!({"depth": 0})).unwrap();
-    assert!(flat["layers"][0].get("children").is_none(), "{flat}");
-    assert_eq!(flat["layers"][0]["childCount"], 1);
-    assert_eq!(flat["artboards"], full["artboards"]);
-    assert_eq!(flat["objects"], full["objects"]);
-    let one = s.execute("document.inspect", &json!({"childLimit": 0})).unwrap();
-    assert_eq!(one["layers"][0]["children"], json!([]));
-    assert_eq!(one["layers"][0]["childCount"], 1);
-    assert!(s.execute("document.inspect", &json!({"depth": "deep"})).is_err());
-}
-
-/// `document.find` searches names, kinds and type content across the whole tree and
-/// answers ids with ancestor paths plus the total, so capped replies stay explicit.
-#[test]
-fn document_find_searches_names_kinds_and_text() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0).0;
-    s.execute("object.setProps", &json!({"ids": [a], "name": "Hero Banner"})).unwrap();
-    rect(&mut s, 20.0, 0.0, 10.0, 10.0);
-    s.execute("select.all", &json!({})).unwrap();
-    let group = s.execute("object.group", &json!({})).unwrap()["id"].as_u64().unwrap();
-    let mut find = |p: Value| s.execute("document.find", &p).unwrap();
-
-    let v = find(json!({"name": "hero"}));
-    assert_eq!(v["total"], 1);
-    assert_eq!(v["matches"][0]["id"], a);
-    assert_eq!(v["matches"][0]["path"], json!([1, group]));
-
-    let v = find(json!({"kind": "group"}));
-    assert_eq!(v["total"], 1);
-    assert_eq!(v["matches"][0]["id"], group);
-
-    // `limit: 0` counts without listing; a missing filter is rejected, not a full dump.
-    let v = find(json!({"kind": "rectangle", "limit": 0}));
-    assert_eq!(v["matches"].as_array().map(Vec::len), Some(0));
-    assert_eq!(v["total"], 2);
-    assert!(s.execute("document.find", &json!({})).is_err());
-    assert!(s.execute("document.find", &json!({"name": ""})).is_err());
-    assert!(s.execute("document.find", &json!({"name": "hero", "limit": "many"})).is_err());
-    // A filter of the wrong type is rejected, not dropped (dropping it would widen the search).
-    assert!(s.execute("document.find", &json!({"kind": "group", "name": 5})).is_err());
-    assert_eq!(s.execute("document.find", &json!({"kind": "nope"})).unwrap()["total"], 0);
-}
-
 /// Type reports the paint its characters show, and its own object-level paint apart from it.
 #[test]
 fn inspect_reports_the_paint_of_types_characters() {
@@ -728,20 +543,3 @@ fn a_panicking_command_rolls_back_instead_of_crashing() {
    assert!(s.doc().unwrap().doc.node(b).is_some());
    assert_eq!(s.journal.last().map(|j| j.0.as_str()), Some("shape.rectangle"));
 }
-
-/// New layers and sublayers share one "Layer N" numbering, whatever art the document holds, and
-/// never repeat a name.
-#[test]
-fn new_layers_and_sublayers_are_numbered_together() {
-    let name = |s: &Session, id: &Value| s.doc().unwrap().doc.node(NodeId(id["id"].as_u64().unwrap())).unwrap().display_name().to_string();
-    let mut s = session();
-    let sub = s.execute("layer.newSublayer", &json!({})).unwrap();
-    assert_eq!(name(&s, &sub), "Layer 2", "not its parent's name");
-    for x in [0.0, 60.0, 120.0, 180.0, 240.0] {
-        rect(&mut s, x, 0.0, 50.0, 50.0);
-    }
-    let layer = s.execute("layer.new", &json!({})).unwrap();
-    assert_eq!(name(&s, &layer), "Layer 3", "after the sublayer, not a repeat of it");
-    let sub = s.execute("layer.newSublayer", &json!({})).unwrap();
-    assert_eq!(name(&s, &sub), "Layer 4", "the art doesn't count");
-}
@@ -172,217 +172,6 @@ fn shape_builder_tool_drives_the_command() {
    assert_eq!(layer_children(&s), 1);
 }

-/// A red 100 × 100 square crossed by a stroke-only vertical line at x = 50, both selected.
-fn square_and_line(s: &mut Session) -> (NodeId, NodeId) {
-    let a = rect(s, 0.0, 0.0, 100.0, 100.0);
-    set_fill(s, a, Color::rgb(1.0, 0.0, 0.0));
-    let l = line(s, (50.0, -20.0), (50.0, 120.0));
-    s.execute("select.set", &json!({"ids": [a.0, l.0]})).unwrap();
-    (a, l)
-}
-
-/// The open paths among `ids`, as (anchors, bounds).
-fn open_paths(s: &Session, ids: &[NodeId]) -> Vec<(usize, Rect)> {
-    ids.iter()
-        .map(|i| node(s, *i))
-        .filter(|n| !outline(n).0.is_closed())
-        .map(|n| (outline(&n).0.anchor_count(), n.geometric_bounds().unwrap()))
-        .collect()
-}
-
-#[test]
-fn shape_builder_line_splits_a_shape_into_regions() {
-    let mut s = session();
-    let (a, l) = square_and_line(&mut s);
-    let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
-    let regs = r["regions"].as_array().unwrap();
-    assert_eq!(regs.len(), 2, "{r}");
-    for x in regs {
-        assert!((x["area"].as_f64().unwrap() - 5000.0).abs() < 1e-6);
-        assert_eq!(x["sources"], json!([a.0]));
-    }
-    let lines = r["lines"].as_array().unwrap();
-    assert_eq!(lines.len(), 3, "the line cut at both sides of the square");
-    assert!(lines.iter().all(|x| x["source"] == l.0));
-}
-
-#[test]
-fn shape_builder_click_on_a_side_of_a_line_splits_the_shape() {
-    let mut s = session();
-    square_and_line(&mut s);
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[25, 50]]})).unwrap();
-    assert_eq!(r["regions"], 1);
-    let out = ids(&r);
-    let merged = NodeId(r["merged"].as_u64().unwrap());
-    assert_eq!(node(&s, merged).geometric_bounds().unwrap(), Rect::new(0.0, 0.0, 50.0, 100.0));
-    assert_eq!(node(&s, merged).appearance.fill_paint(), Paint::solid(Color::rgb(1.0, 0.0, 0.0)));
-    let closed: Vec<f64> = out.iter().filter(|i| outline(&node(&s, **i)).0.is_closed()).map(|i| area(&s, *i)).collect();
-    assert_eq!(closed.len(), 2, "both halves");
-    assert!(closed.iter().all(|a| (a - 5000.0).abs() < 1.0), "{closed:?}");
-    // The line only bounds the region: it stays whole.
-    assert_eq!(open_paths(&s, &out), vec![(2, Rect::new(50.0, -20.0, 50.0, 120.0))]);
-}
-
-#[test]
-fn shape_builder_merge_across_a_line_removes_the_piece_between() {
-    let mut s = session();
-    square_and_line(&mut s);
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[25, 50], [75, 50]]})).unwrap();
-    assert_eq!(r["regions"], 2);
-    let out = ids(&r);
-    let merged = NodeId(r["merged"].as_u64().unwrap());
-    assert!((area(&s, merged) - 10000.0).abs() < 1.0);
-    assert_eq!(out.len(), 3, "merged square + the line's two loose ends");
-    let mut ends = open_paths(&s, &out);
-    ends.sort_by(|a, b| a.1.y0.total_cmp(&b.1.y0));
-    assert_eq!(ends, vec![(2, Rect::new(50.0, -20.0, 50.0, 0.0)), (2, Rect::new(50.0, 100.0, 50.0, 120.0))]);
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(layer_children(&s), 2);
-}
-
-#[test]
-fn shape_builder_alt_deletes_a_region_or_a_line_piece() {
-    let mut s = session();
-    square_and_line(&mut s);
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[75, 50]], "erase": true})).unwrap();
-    assert!(r["merged"].is_null());
-    let out = ids(&r);
-    let left: Vec<NodeId> = out.iter().copied().filter(|i| outline(&node(&s, *i)).0.is_closed()).collect();
-    assert_eq!(left.len(), 1);
-    assert_eq!(node(&s, left[0]).geometric_bounds().unwrap(), Rect::new(0.0, 0.0, 50.0, 100.0));
-    assert_eq!(open_paths(&s, &out).len(), 1, "the line stays whole");
-
-    // Alt on the line inside the square deletes that piece only.
-    let mut s = session();
-    square_and_line(&mut s);
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[51, 50]], "erase": true, "tolerance": 2})).unwrap();
-    assert_eq!((r["regions"].as_u64(), r["lines"].as_u64()), (Some(0), Some(1)));
-    let out = ids(&r);
-    assert_eq!(out.len(), 3);
-    let sq: Vec<NodeId> = out.iter().copied().filter(|i| outline(&node(&s, *i)).0.is_closed()).collect();
-    assert_eq!(sq.len(), 1);
-    assert!((area(&s, sq[0]) - 10000.0).abs() < 1.0, "the square is untouched");
-    assert_eq!(open_paths(&s, &out).len(), 2);
-}
-
-#[test]
-fn shape_builder_fills_an_area_lines_enclose() {
-    let mut s = session();
-    let l1 = line(&mut s, (0.0, 0.0), (100.0, 100.0));
-    let l2 = line(&mut s, (100.0, 0.0), (0.0, 100.0));
-    let l3 = line(&mut s, (-10.0, 80.0), (110.0, 80.0));
-    s.execute("select.set", &json!({"ids": [l1.0, l2.0, l3.0]})).unwrap();
-    let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
-    assert_eq!(r["regions"].as_array().unwrap().len(), 1);
-    assert_eq!(r["regions"][0]["sources"], json!([]));
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[50, 70]]})).unwrap();
-    let merged = NodeId(r["merged"].as_u64().unwrap());
-    assert!((area(&s, merged) - 900.0).abs() < 1e-6, "{}", area(&s, merged));
-    assert_eq!(node(&s, merged).appearance.fill_paint(), s.paint.fill, "the current fill");
-    assert!(!node(&s, merged).appearance.stroke_paint().is_none(), "the lines' stroke");
-    assert_eq!(ids(&r).len(), 4, "the triangle + the three lines, which only bound it");
-}
-
-#[test]
-fn shape_builder_closes_filled_open_paths() {
-    let mut s = session();
-    let r = s.execute("path.create", &json!({"anchors": [{"x": 0, "y": 0}, {"x": 100, "y": 0}, {"x": 100, "y": 100}]})).unwrap();
-    let p = NodeId(r["id"].as_u64().unwrap());
-    set_fill(&mut s, p, Color::rgb(0.0, 1.0, 0.0));
-    s.execute("select.set", &json!({"ids": [p.0]})).unwrap();
-    let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
-    assert_eq!(r["regions"].as_array().unwrap().len(), 1, "the fill's area, closed by an invisible edge");
-    assert!((r["regions"][0]["area"].as_f64().unwrap() - 5000.0).abs() < 1e-6);
-    assert_eq!(r["lines"], json!([]));
-    // Unfilled, it is only an edge.
-    s.edit("t", |d, _| {
-        d.node_mut(p).unwrap().appearance.set_fill(Paint::None);
-        Ok(())
-    })
-    .unwrap();
-    let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
-    assert_eq!(r["regions"], json!([]));
-    assert_eq!(r["lines"].as_array().unwrap().len(), 1);
-}
-
-#[test]
-fn shape_builder_tool_alt_deletes_line_pieces() {
-    let mut s = session();
-    square_and_line(&mut s);
-    let v = ViewInfo::default();
-    s.select_tool("shapeBuilder", v).unwrap();
-    let alt = Mods { alt: true, ..Default::default() };
-    s.pointer(&PointerEvent::new(PointerKind::Move, 51.0, 50.0).with_mods(alt), v).unwrap();
-    assert_eq!(s.overlays(v).len(), 1, "the line piece is highlighted");
-    s.pointer(&PointerEvent::new(PointerKind::Down, 51.0, 50.0).with_mods(alt), v).unwrap();
-    s.pointer(&PointerEvent::new(PointerKind::Up, 51.0, 50.0).with_mods(alt), v).unwrap();
-    assert_eq!(s.journal.last().unwrap().0, "shapeBuilder.merge");
-    assert_eq!(layer_children(&s), 3, "square + the line's two loose ends");
-}
-
-/// Red square A (0..100) and blue square B (50..150 both ways), overlapping at a corner, selected.
-fn corner(s: &mut Session) -> (NodeId, NodeId) {
-    let a = rect(s, 0.0, 0.0, 100.0, 100.0);
-    let b = rect(s, 50.0, 50.0, 100.0, 100.0);
-    set_fill(s, a, Color::rgb(1.0, 0.0, 0.0));
-    set_fill(s, b, Color::rgb(0.0, 0.0, 1.0));
-    s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
-    (a, b)
-}
-
-/// (closed, anchors, length) of each of `ids`.
-fn shapes_of(s: &Session, ids: &[NodeId]) -> Vec<(bool, usize, f64)> {
-    ids.iter()
-        .map(|i| {
-            let (p, _) = outline(&node(s, *i));
-            (p.is_closed(), p.anchor_count(), (p.length() * 1e6).round() / 1e6)
-        })
-        .collect()
-}
-
-#[test]
-fn shape_builder_erase_click_on_an_edge_opens_its_path() {
-    let mut s = session();
-    corner(&mut s);
-    let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
-    assert_eq!(r["edges"].as_array().unwrap().len(), 4, "each outline cut in two where the other crosses it: {r}");
-    // A's side inside B (1 pt off it).
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[101, 75]], "erase": true})).unwrap();
-    assert_eq!((r["regions"].as_u64(), r["lines"].as_u64(), r["edges"].as_u64()), (Some(0), Some(0), Some(1)));
-    let out = ids(&r);
-    // A opens where B's outline crosses it and keeps its look; B is untouched.
-    assert_eq!(shapes_of(&s, &out), vec![(false, 5, 300.0), (true, 4, 400.0)]);
-    assert_eq!(node(&s, out[0]).appearance.fill_paint(), Paint::solid(Color::rgb(1.0, 0.0, 0.0)));
-    assert_eq!(s.journal.last().unwrap().0, "shapeBuilder.merge");
-    s.execute("edit.undo", &json!({})).unwrap();
-    let back: Vec<NodeId> = s.doc().unwrap().doc.children(s.doc().unwrap().doc.default_layer()).unwrap().iter().map(|n| n.id).collect();
-    assert_eq!(shapes_of(&s, &back), vec![(true, 4, 400.0); 2], "one undo step");
-}
-
-#[test]
-fn shape_builder_erase_drag_along_edges_deletes_each() {
-    let mut s = session();
-    corner(&mut s);
-    // Down A's side inside B, round the corner and along B's side inside A.
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[100, 75], [100, 50], [75, 50]], "erase": true})).unwrap();
-    assert_eq!((r["regions"].as_u64(), r["edges"].as_u64()), (Some(0), Some(2)));
-    assert_eq!(shapes_of(&s, &ids(&r)), vec![(false, 5, 300.0); 2]);
-}
-
-#[test]
-fn shape_builder_erase_drag_into_regions_deletes_them_not_the_edges_it_crosses() {
-    let mut s = session();
-    corner(&mut s);
-    let r = s.execute("shapeBuilder.merge", &json!({"points": [[25, 25], [75, 75]], "erase": true})).unwrap();
-    assert_eq!((r["regions"].as_u64(), r["edges"].as_u64()), (Some(2), Some(0)));
-    // A is gone; what is left of B stays closed and blue.
-    let out = ids(&r);
-    assert_eq!(out.len(), 1);
-    assert!((area(&s, out[0]) - 7500.0).abs() < 1e-6);
-    assert!(outline(&node(&s, out[0])).0.is_closed());
-    assert_eq!(node(&s, out[0]).appearance.fill_paint(), Paint::solid(Color::rgb(0.0, 0.0, 1.0)));
-}
-
 // ---------- Live Paint ----------

 fn live(s: &mut Session) -> NodeId {
@@ -7,7 +7,7 @@ use vectorcraft_geom::Point;
 use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};

 use super::*;
-use crate::cmd::clipboard::{BITMAP, FILE_HEAD, PASTE_ORDER, PDF, PNG, SVG, TEXT, file_flavour};
+use crate::cmd::clipboard::{PDF, PNG, SVG, TEXT};

 fn session() -> Session {
    let mut s = Session::new();
@@ -118,29 +118,6 @@ fn import_image_then_paste_gives_an_image() {
    assert!(s.execute("clipboard.importImage", &json!({"dataBase64": "!!"})).is_err());
 }

-#[test]
-fn copied_files_paste_by_their_content() {
-    let mut s = session();
-    copy_red_square(&mut s);
-    let png = decode(&run(&mut s, "clipboard.exportPng", json!({})));
-    let pdf = decode(&run(&mut s, "clipboard.exportPdf", json!({})));
-    let mut jpeg = vec![];
-    image::RgbImage::new(2, 2).write_to(&mut std::io::Cursor::new(&mut jpeg), image::ImageFormat::Jpeg).unwrap();
-    let svg = b"<svg xmlns=\"http://www.w3.org/2000/svg\"><rect width=\"4\" height=\"4\"/></svg>";
-    let of = |name: &str, bytes: &[u8]| file_flavour(name, &bytes[..bytes.len().min(FILE_HEAD)], &PASTE_ORDER);
-    assert_eq!(of("red.png", &png), Some(PNG));
-    // The content tells, whatever the name says; bitmaps keep their own type.
-    assert_eq!(of("photo.txt", &jpeg), Some("image/jpeg"));
-    assert_eq!(of("art.svg", svg), Some(SVG));
-    assert_eq!(of("doc.pdf", &pdf), Some(PDF));
-    // Files that aren't art paste as nothing (not as their path).
-    assert_eq!(of("notes.txt", b"hello"), None);
-    assert_eq!(of("archive.zip", b"PK\x03\x04"), None);
-    // Only what was asked for.
-    assert_eq!(file_flavour("red.png", &png, &[TEXT, SVG]), None);
-    assert_eq!(file_flavour("art.svg", svg, &[BITMAP]), None);
-}
-
 #[test]
 fn import_text_then_paste_gives_point_text() {
    let mut s = session();
@@ -247,42 +247,6 @@ fn grid_show_and_plane_are_view_state() {
    assert!(s.overlays(ViewInfo::default()).len() > 20);
 }

-#[test]
-fn the_grid_hides_while_a_perspective_tool_is_chosen() {
-    // #321: choosing the Perspective Grid tool showed the grid for good.
-    let mut s = session();
-    let v = ViewInfo::default();
-    for tool in ["perspectiveGrid", "perspectiveSelection"] {
-        s.select_tool(tool, v).unwrap();
-        assert!(s.overlays(v).len() > 20, "{tool}");
-        let n = undo_len(&s);
-        assert_eq!(s.execute("perspective.grid.show", &json!({})).unwrap(), json!({"visible": false}));
-        assert!(s.overlays(v).is_empty(), "{tool}: the hidden grid still draws");
-        assert_eq!(undo_len(&s), n);
-        // Choosing the tool again shows it again.
-        s.select_tool(tool, v).unwrap();
-        assert!(s.overlays(v).len() > 20, "{tool}");
-        s.execute("perspective.grid.show", &json!({"visible": false})).unwrap();
-        s.select_tool("selection", v).unwrap();
-    }
-}
-
-#[test]
-fn a_hidden_grid_stays_hidden_back_from_a_temporary_tool() {
-    // Cmd-dragging with a perspective tool borrows the Selection tool; going back to the
-    // perspective tool is not choosing it, so the grid hidden meanwhile stays hidden.
-    let mut s = session();
-    let v = ViewInfo::default();
-    s.select_tool("perspectiveGrid", v).unwrap();
-    s.execute("perspective.grid.show", &json!({"visible": false})).unwrap();
-    s.switch_tool("selection", v).unwrap();
-    s.switch_tool("perspectiveGrid", v).unwrap();
-    assert!(s.overlays(v).is_empty());
-    s.select_tool("selection", v).unwrap();
-    s.select_tool("perspectiveGrid", v).unwrap();
-    assert!(s.overlays(v).len() > 20, "choosing it shows the grid");
-}
-
 #[test]
 fn grid_preset_and_set_are_undoable() {
    let mut s = session();
@@ -375,7 +375,6 @@ fn draw2_commands_reject_bad_params() {
        ("path.freehand", json!({"points": [[1, 2]]})),
        ("path.curvature", json!({"points": []})),
        ("path.removeAnchor", json!({"id": id.0, "anchor": 99})),
-        ("path.removeAnchors", json!({})),
        ("path.convertAnchor", json!({"id": 9999, "anchor": 0, "to": "corner"})),
        ("path.reshapeSegment", json!({"id": id.0, "segment": 42})),
        ("path.split", json!({"id": id.0})),
@@ -390,272 +389,3 @@ fn draw2_commands_reject_bad_params() {
        assert_eq!(s.doc().unwrap().history.undo.len(), before, "{cmd} left an undo step");
    }
 }
-
-/// A curve from (100, 100) to (300, 100) whose first anchor has an out handle at (150, 100).
-fn curve(s: &mut Session) -> NodeId {
-    let anchors = json!([{"x": 100, "y": 100, "out": [150, 100]}, {"x": 300, "y": 100, "in": [250, 100]}]);
-    NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap())
-}
-
-/// Drag the out handle of path `id`'s first anchor with `tool` to `to`, holding `mods`. Direct
-/// Selection clicks the anchor first, so its handles show.
-fn drag_handle(s: &mut Session, tool: &str, id: NodeId, to: (f64, f64), mods: Mods, v: ViewInfo) {
-    let from = path(s, id).subpaths[0].anchors[0].h_out;
-    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
-    s.select_tool(tool, v).unwrap();
-    if tool == "directSelection" {
-        s.execute("select.none", &json!({})).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Down, 100.0, 100.0), v).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Up, 100.0, 100.0), v).unwrap();
-    }
-    s.pointer(&PointerEvent::new(PointerKind::Down, from.x, from.y).with_mods(mods), v).unwrap();
-    s.pointer(&PointerEvent::new(PointerKind::Drag, to.0, to.1).with_mods(mods), v).unwrap();
-    s.pointer(&PointerEvent::new(PointerKind::Up, to.0, to.1).with_mods(mods), v).unwrap();
-    assert!(!s.in_interaction());
-}
-
-/// The out handle of path `id`'s first anchor.
-fn out_handle(s: &Session, id: NodeId) -> Point {
-    path(s, id).subpaths[0].anchors[0].h_out
-}
-
-#[test]
-fn shift_keeps_a_dragged_handle_at_45_degree_steps() {
-    // #322.
-    let shift = Mods { shift: true, ..Mods::default() };
-    for tool in ["directSelection", "anchorPoint"] {
-        let mut s = session();
-        let id = curve(&mut s);
-        drag_handle(&mut s, tool, id, (190.0, 130.0), shift, view());
-        let h = out_handle(&s, id);
-        assert!(near(h, Point::new(100.0 + 90.0f64.hypot(30.0), 100.0)), "{tool}: {h:?}");
-        drag_handle(&mut s, tool, id, (160.0, 155.0), shift, view());
-        let h = out_handle(&s, id);
-        assert!((h.x - h.y).abs() < 1e-6 && h.x > 100.0, "{tool}: 45°: {h:?}");
-        // Without Shift the handle goes where it is dragged.
-        drag_handle(&mut s, tool, id, (190.0, 130.0), Mods::default(), view());
-        assert_eq!(out_handle(&s, id), Point::new(190.0, 130.0), "{tool}");
-    }
-}
-
-#[test]
-fn a_dragged_handle_snaps_to_smart_guides() {
-    // #322: in line with the other anchor, with smart guides on.
-    for tool in ["directSelection", "anchorPoint"] {
-        let mut s = session();
-        let id = curve(&mut s);
-        drag_handle(&mut s, tool, id, (298.0, 160.0), Mods::default(), ViewInfo::default());
-        assert_eq!(out_handle(&s, id), Point::new(300.0, 160.0), "{tool}");
-        drag_handle(&mut s, tool, id, (298.0, 170.0), Mods::default(), view());
-        assert_eq!(out_handle(&s, id), Point::new(298.0, 170.0), "{tool}: smart guides off");
-    }
-}
-
-#[test]
-fn shift_drag_keeps_a_smooth_anchor_smooth_and_alt_breaks_it() {
-    // #322: the opposite handle of a smooth anchor turns with the constrained one; Alt still
-    // moves the dragged handle alone.
-    let shift = Mods { shift: true, ..Mods::default() };
-    let shift_alt = Mods { shift: true, alt: true, ..Mods::default() };
-    for (mods, opposite_follows) in [(shift, true), (shift_alt, false)] {
-        let mut s = session();
-        let anchors = json!([{"x": 100, "y": 200}, {"x": 200, "y": 100, "in": [150, 100], "out": [250, 100]}, {"x": 300, "y": 200}]);
-        let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
-        s.select_tool("directSelection", view()).unwrap();
-        for (kind, x, y, m) in [
-            (PointerKind::Down, 200.0, 100.0, Mods::default()),
-            (PointerKind::Up, 200.0, 100.0, Mods::default()),
-            (PointerKind::Down, 250.0, 100.0, mods),
-            (PointerKind::Drag, 275.0, 165.0, mods),
-            (PointerKind::Up, 275.0, 165.0, mods),
-        ] {
-            s.pointer(&PointerEvent::new(kind, x, y).with_mods(m), view()).unwrap();
-        }
-        let a = path(&s, id).subpaths[0].anchors[1];
-        let (o, i) = (a.h_out - a.p, a.h_in - a.p);
-        assert!((o.x - o.y).abs() < 1e-6 && o.x > 0.0, "{mods:?}: 45°: {o:?}");
-        if opposite_follows {
-            assert!(near(a.h_in, a.p - o.normalize() * 50.0), "{mods:?}: {i:?}");
-        } else {
-            assert_eq!(a.h_in, Point::new(150.0, 100.0), "{mods:?}");
-        }
-    }
-}
-
-#[test]
-fn removing_an_anchor_refits_a_split_curve_and_undo_restores_it() {
-    let mut s = session();
-    let made = s
-        .execute(
-            "path.create",
-            &json!({"anchors": [
-                {"x": 0, "y": 0, "out": [30, 80]},
-                {"x": 100, "y": 0, "in": [70, 80]}
-            ]}),
-        )
-        .unwrap();
-    let id = NodeId(made["id"].as_u64().unwrap());
-    let before = path(&s, id);
-    let inserted = s.execute("path.insertAnchor", &json!({"id": id.0, "segment": 0, "t": 0.4})).unwrap();
-    let ai = inserted["anchor"].as_u64().unwrap();
-    s.execute("path.removeAnchor", &json!({"id": id.0, "anchor": ai})).unwrap();
-    let after = path(&s, id);
-    assert_eq!(after.subpaths[0].anchors.len(), 2);
-    let (got, orig) = (&after.subpaths[0].anchors, &before.subpaths[0].anchors);
-    assert!(got[0].h_out.distance(orig[0].h_out) < 0.5, "{:?}", got[0].h_out);
-    assert!(got[1].h_in.distance(orig[1].h_in) < 0.5, "{:?}", got[1].h_in);
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(path(&s, id).subpaths[0].anchors.len(), 3);
-}
-
-#[test]
-fn remove_anchor_points_keeps_the_paths_closed() {
-    // Object › Path › Remove Anchor Points, unlike the Delete key: a rectangle loses a corner and
-    // stays closed, a straight-sided triangle; a curve keeps its shape round a removed point.
-    let mut s = session();
-    let r = rect(&mut s, 0.0, 0.0, 100.0, 80.0);
-    let made = s.execute("path.create", &json!({"anchors": [{"x": 300, "y": 0, "out": [330, 80]}, {"x": 400, "y": 0, "in": [370, 80]}]})).unwrap();
-    let c = NodeId(made["id"].as_u64().unwrap());
-    let before = path(&s, c).subpaths[0].segment(0);
-    s.execute("path.insertAnchor", &json!({"id": c.0, "segment": 0, "t": 0.5})).unwrap();
-    s.execute("select.anchors", &json!({"id": r.0, "anchors": [[0, 0]]})).unwrap();
-    s.execute("select.anchors", &json!({"id": c.0, "anchors": [[0, 1]], "mode": "add"})).unwrap();
-    assert_eq!(s.execute("path.removeAnchors", &json!({})).unwrap()["removedObjects"], 0);
-    let sp = &path(&s, r).subpaths[0];
-    assert!(sp.closed && sp.anchors.len() == 3, "{sp:?}");
-    assert!(!sp.anchors.iter().any(|a| a.has_in() || a.has_out()), "straight sides stay straight: {sp:?}");
-    let after = path(&s, c).subpaths[0].segment(0);
-    assert_eq!(path(&s, c).subpaths[0].anchors.len(), 2);
-    assert!(after.p1.distance(before.p1) < 0.5 && after.p2.distance(before.p2) < 0.5, "{after:?}");
-    assert_eq!(s.doc().unwrap().history.undo.last().unwrap().label, "Remove Anchor Points");
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(path(&s, r).subpaths[0].anchors.len(), 4);
-    assert_eq!(path(&s, c).subpaths[0].anchors.len(), 3);
-    let spec = find_command("path.removeAnchors").unwrap();
-    assert_eq!(spec.menu, &["Object", "Path"][..]);
-}
-
-fn undo_steps(s: &Session) -> usize {
-    s.doc().unwrap().history.undo.len()
-}
-
-#[test]
-fn convert_anchors_turns_the_selected_anchors_corner_or_smooth() {
-    // The Control bar's convert buttons: one undo step each, other anchors left alone.
-    let mut s = session();
-    let made = s.execute("path.create", &json!({"anchors": [{"x": 100, "y": 200}, {"x": 200, "y": 100}, {"x": 300, "y": 200}]})).unwrap();
-    let id = NodeId(made["id"].as_u64().unwrap());
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1]]})).unwrap();
-    let undo = undo_steps(&s);
-    s.execute("path.convertAnchors", &json!({"to": "smooth"})).unwrap();
-    let a = path(&s, id).subpaths[0].anchors.clone();
-    assert_eq!(undo_steps(&s), undo + 1);
-    assert_eq!(a[1].kind, vectorcraft_geom::AnchorKind::Smooth);
-    let r = 100.0 * 2f64.sqrt() / 3.0;
-    assert!(near(a[1].h_in, Point::new(200.0 - r, 100.0)) && near(a[1].h_out, Point::new(200.0 + r, 100.0)), "{:?}", a[1]);
-    assert!(!a[0].has_out() && !a[2].has_in(), "the neighbours keep theirs");
-    // Smooth again keeps the handles; corner retracts them.
-    s.execute("path.setHandle", &json!({"id": id.0, "anchor": 1, "which": "out", "x": 260, "y": 100})).unwrap();
-    let h = path(&s, id).subpaths[0].anchors[1];
-    s.execute("path.convertAnchors", &json!({"to": "smooth"})).unwrap();
-    assert_eq!(path(&s, id).subpaths[0].anchors[1], h);
-    s.execute("path.convertAnchors", &json!({"to": "corner"})).unwrap();
-    let a = path(&s, id).subpaths[0].anchors[1];
-    assert!(!a.has_in() && !a.has_out(), "{a:?}");
-    // Anchors that are gone (a stale selection) are skipped; a bad `to` is refused.
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 99], [7, 0]]})).unwrap();
-    s.execute("path.convertAnchors", &json!({"to": "smooth"})).unwrap();
-    let undo = undo_steps(&s);
-    assert!(s.execute("path.convertAnchors", &json!({"to": "round"})).is_err());
-    assert_eq!(undo_steps(&s), undo);
-}
-
-#[test]
-fn cut_at_anchors_splits_paths_and_leaves_one_end_selected() {
-    // Cut Path at Selected Anchor Points: an open path becomes one path per piece, and one anchor
-    // of each cut stays selected, so dragging it pulls the path apart there.
-    let mut s = session();
-    let anchors = json!([{"x": 100, "y": 100}, {"x": 200, "y": 100, "in": [170, 80], "out": [230, 120]}, {"x": 300, "y": 100}, {"x": 400, "y": 100}]);
-    let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1], [0, 2]]})).unwrap();
-    let undo = undo_steps(&s);
-    let made = s.execute("path.cutAtAnchors", &json!({})).unwrap();
-    let ids: Vec<NodeId> = made["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
-    assert_eq!(undo_steps(&s), undo + 1);
-    assert_eq!((ids.len(), ids[0]), (3, id));
-    let pieces: Vec<Vec<Point>> = ids.iter().map(|i| path(&s, *i).subpaths[0].anchors.iter().map(|a| a.p).collect()).collect();
-    let p = |x: f64| Point::new(x, 100.0);
-    assert_eq!(pieces, vec![vec![p(100.0), p(200.0)], vec![p(200.0), p(300.0)], vec![p(300.0), p(400.0)]]);
-    // The curve keeps its shape: each end keeps the handle on its own side only.
-    let (l, r) = (path(&s, ids[0]).subpaths[0].anchors[1], path(&s, ids[1]).subpaths[0].anchors[0]);
-    assert!(l.h_in == Point::new(170.0, 80.0) && !l.has_out() && r.h_out == Point::new(230.0, 120.0) && !r.has_in(), "{l:?} {r:?}");
-    let sel = s.doc().unwrap().selection.clone();
-    assert_eq!(sel.objects, vec![ids[1], ids[2]]);
-    assert!(sel.anchors.values().all(|a| a.iter().eq([&(0, 0)])), "{sel:?}");
-    s.execute("path.moveAnchors", &json!({"dx": 0, "dy": 50})).unwrap();
-    assert_eq!(path(&s, ids[0]).subpaths[0].anchors[1].p, p(200.0));
-    assert_eq!(path(&s, ids[1]).subpaths[0].anchors[0].p, Point::new(200.0, 150.0));
-    s.execute("edit.undo", &json!({})).unwrap();
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(paths(&s).len(), 1);
-    // A closed path opens at the cut, its ends on top of each other.
-    let r = rect(&mut s, 500.0, 100.0, 100.0, 100.0);
-    s.execute("select.anchors", &json!({"id": r.0, "anchors": [[0, 2]]})).unwrap();
-    s.execute("path.cutAtAnchors", &json!({})).unwrap();
-    let sp = &path(&s, r).subpaths[0];
-    assert!(!sp.closed && sp.anchors.len() == 5 && sp.anchors[0].p == sp.anchors[4].p, "{sp:?}");
-    assert_eq!(s.doc().unwrap().selection.anchors[&r].iter().collect::<Vec<_>>(), [&(0, 0)]);
-    // Only the end points of an open path selected: nothing to cut.
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 0], [0, 3]]})).unwrap();
-    let undo = undo_steps(&s);
-    assert!(s.execute("path.cutAtAnchors", &json!({})).is_err());
-    assert_eq!(undo_steps(&s), undo);
-}
-
-#[test]
-fn pen_with_alt_moves_one_handle_and_converts_anchors() {
-    // Discord feedback: Alt held with the Pen moves a direction handle on its own (and works as
-    // the Anchor Point tool on a selected path's anchors), while a path is being drawn too.
-    let alt = Mods { alt: true, ..Mods::default() };
-    let v = view();
-    let mut s = session();
-    let anchors = json!([{"x": 100, "y": 200}, {"x": 200, "y": 100, "in": [150, 100], "out": [250, 100]}, {"x": 300, "y": 200}]);
-    let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
-    s.select_tool("pen", v).unwrap();
-    let gesture = |s: &mut Session, pts: &[(f64, f64)], m: Mods| {
-        let undo = undo_steps(s);
-        s.pointer(&PointerEvent::new(PointerKind::Down, pts[0].0, pts[0].1).with_mods(m), v).unwrap();
-        for &(x, y) in &pts[1..] {
-            s.pointer(&PointerEvent::new(PointerKind::Drag, x, y).with_mods(m), v).unwrap();
-        }
-        let l = pts[pts.len() - 1];
-        s.pointer(&PointerEvent::new(PointerKind::Up, l.0, l.1).with_mods(m), v).unwrap();
-        undo_steps(s) - undo
-    };
-    // Alt-drag the out handle: it moves alone, the in handle stays.
-    assert_eq!(gesture(&mut s, &[(250.0, 100.0), (260.0, 130.0), (275.0, 165.0)], alt), 1);
-    assert!(!s.in_interaction());
-    let a = path(&s, id).subpaths[0].anchors[1];
-    assert_eq!((a.h_in, a.h_out), (Point::new(150.0, 100.0), Point::new(275.0, 165.0)));
-    assert_eq!(paths(&s).len(), 1, "no new path or anchor");
-    // Alt-click the anchor: a corner. Alt-drag it: new symmetric handles.
-    assert_eq!(gesture(&mut s, &[(200.0, 100.0)], alt), 1);
-    let a = path(&s, id).subpaths[0].anchors[1];
-    assert!(!a.has_in() && !a.has_out(), "{a:?}");
-    gesture(&mut s, &[(200.0, 100.0), (220.0, 100.0), (240.0, 110.0)], alt);
-    let a = path(&s, id).subpaths[0].anchors[1];
-    assert_eq!((a.h_in, a.h_out), (Point::new(160.0, 90.0), Point::new(240.0, 110.0)));
-    assert_eq!(path(&s, id).subpaths[0].anchors.len(), 3);
-    // Drawing: place a smooth point, then Alt-drag its outgoing handle; the next click goes on
-    // drawing the same path.
-    s.execute("select.none", &json!({})).unwrap();
-    gesture(&mut s, &[(100.0, 400.0)], Mods::default());
-    gesture(&mut s, &[(200.0, 400.0), (250.0, 400.0)], Mods::default());
-    let new = *s.doc().unwrap().selection.objects.first().unwrap();
-    gesture(&mut s, &[(250.0, 400.0), (230.0, 350.0)], alt);
-    let a = path(&s, new).subpaths[0].anchors[1];
-    assert_eq!((a.h_in, a.h_out), (Point::new(150.0, 400.0), Point::new(230.0, 350.0)));
-    gesture(&mut s, &[(300.0, 450.0)], Mods::default());
-    assert_eq!(path(&s, new).subpaths[0].anchors.len(), 3);
-    assert_eq!(paths(&s).len(), 2);
-}
@@ -8,9 +8,7 @@ use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};
 use super::*;

 fn session() -> Session {
-    // Type placed by the Type tools starts empty (Fill New Type Objects With Placeholder Text off).
    let mut s = Session::new();
-    s.prefs.placeholder_text = false;
    s.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
    s
 }
@@ -100,10 +100,9 @@ fn type_picks_up_font_and_size() {
    assert!(width(&s, dst) > before, "laid out again at the new size");
    // Without character or paragraph attributes only the paints go.
    let dst2 = id_of(s.execute("text.create", &json!({"x": 10, "y": 500, "text": "Other"})).unwrap());
-    let preserved_alignment = style(&s, dst2).1;
    s.execute("appearance.copyFrom", &json!({"source": src.0, "pickUp": {"character": false, "paragraph": false}})).unwrap();
    let (st, justify) = style(&s, dst2);
-    assert_eq!((st.size, justify, st.fill.color().unwrap().to_hex()), (12.0, preserved_alignment, "#00ff00".into()));
+    assert_eq!((st.size, justify, st.fill.color().unwrap().to_hex()), (12.0, Justify::Left, "#00ff00".into()));
 }

 #[test]
@@ -231,68 +231,3 @@ fn a_failed_batch_brings_back_a_document_it_reverted() {
    assert!(st.is_dirty() && st.interaction.is_none());
    assert!(st.revision > revision, "the restored document redraws");
 }
-
-#[test]
-fn a_failed_batch_gives_back_the_highlighted_rows_and_the_current_layer() {
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"created": null})).unwrap();
-    let layer = s.doc().unwrap().doc.layers[0].id;
-    // A step that highlights the layer's row, then one that fails: the highlight goes back too.
-    let steps = json!([{"command": "layer.setCurrent", "params": {"id": layer.0}}, {"command": "no.such.command"}]);
-    assert!(s.execute("command.batch", &json!({ "commands": steps })).is_err());
-    assert!(s.doc().unwrap().layer_rows.is_empty(), "no row stays highlighted");
-    assert_eq!(s.doc().unwrap().active_layer, Some(layer));
-    // So Collect in New Layer acts on the drawn rectangle, as it does when the journal is replayed
-    // (a failed batch isn't journaled).
-    s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 1, "height": 1})).unwrap();
-    s.execute("layer.collectInNew", &json!({})).unwrap();
-    let r = replayed(&s);
-    assert_eq!(documents(&r), documents(&s));
-}
-
-/// The edits made in an undo group (a scrubbed numeric field, #400) are one undo step, journaled
-/// one by one; a cancelled group undoes them and leaves the journal as it was.
-#[test]
-fn an_undo_group_is_one_undo_step() {
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
-    s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 100, "height": 50})).unwrap();
-    let width = |s: &Session| s.transform_box(&s.doc().unwrap().selection.objects).unwrap().rect.width();
-    let undo_len = |s: &Session| s.doc().unwrap().history.undo.len();
-    let (undo, journal) = (undo_len(&s), s.journal.len());
-    s.begin_undo_group();
-    for w in [101, 102, 103] {
-        s.execute("object.setBounds", &json!({"width": w})).unwrap();
-    }
-    // A live drag committed in the group (the Transparency panel's opacity field) joins it too.
-    s.begin_interaction("Opacity").unwrap();
-    s.preview("transparency.set", &json!({"opacity": 50})).unwrap();
-    s.commit_interaction().unwrap();
-    s.end_undo_group(false);
-    assert!((width(&s) - 103.0).abs() < 1e-9);
-    assert_eq!(undo_len(&s), undo + 1, "one undo step");
-    assert_eq!(s.journal.len(), journal + 4, "each edit journaled");
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert!((width(&s) - 100.0).abs() < 1e-9, "undo takes the whole drag back");
-    assert_eq!(undo_len(&s), undo);
-    s.execute("edit.redo", &json!({})).unwrap();
-    assert!((width(&s) - 103.0).abs() < 1e-9);
-
-    // Escape: back where it started, with no trace in the history or the journal.
-    let (undo, journal) = (undo_len(&s), s.journal.len());
-    s.begin_undo_group();
-    s.execute("object.setBounds", &json!({"width": 150})).unwrap();
-    s.execute("object.setBounds", &json!({"width": 160})).unwrap();
-    s.end_undo_group(true);
-    assert!((width(&s) - 103.0).abs() < 1e-9);
-    assert_eq!((undo_len(&s), s.journal.len()), (undo, journal));
-    // Closed: the next edits are steps of their own again.
-    s.execute("object.setBounds", &json!({"width": 110})).unwrap();
-    s.execute("object.setBounds", &json!({"width": 120})).unwrap();
-    assert_eq!(undo_len(&s), undo + 2);
-    // A group with no edits records nothing, and cancelling it undoes nothing.
-    s.begin_undo_group();
-    s.end_undo_group(true);
-    assert!((width(&s) - 120.0).abs() < 1e-9);
-    assert_eq!(undo_len(&s), undo + 2);
-}
@@ -589,7 +589,8 @@ fn mesh_hit_test_inside() {
    sel(&mut s, &[a]);
    s.execute("object.mesh.create", &json!({"rows": 2, "cols": 2})).unwrap();
    let d = &s.doc().unwrap().doc;
-    let h = vectorcraft_doc::hit::hit_test(d, Point::new(50.0, 30.0), vectorcraft_doc::hit::HitOptions { tol: 1.0, ..Default::default() });
+    let h =
+        vectorcraft_doc::hit::hit_test(d, Point::new(50.0, 30.0), vectorcraft_doc::hit::HitOptions { tol: 1.0, outline: false, path_only: false });
    assert_eq!(h.map(|h| h.leaf), Some(a));
 }

@@ -1,152 +0,0 @@
-//! Live Corners on live rectangles: `object.setLiveShape` rounds the given corners, the
-//! Direct-Selected ones or all four, sets corner kinds, and keeps selected corners selected.
-
-use std::collections::BTreeSet;
-
-use serde_json::{Value, json};
-use vectorcraft_doc::{AnchorRef, LiveShape, NodeKind};
-use vectorcraft_geom::Affine;
-use vectorcraft_geom::shapes::CornerKind;
-
-use super::*;
-
-/// A 100 × 60 pt live rectangle at (10, 10), selected.
-fn session() -> (Session, NodeId) {
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-    let id = s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 100, "height": 60})).unwrap()["id"].as_u64().unwrap();
-    (s, NodeId(id))
-}
-
-fn run(s: &mut Session, p: Value) {
-    s.execute("object.setLiveShape", &p).unwrap_or_else(|e| panic!("{p}: {e}"));
-}
-
-fn corners(s: &Session, id: NodeId) -> ([f64; 4], [CornerKind; 4], usize) {
-    let n = s.doc().unwrap().doc.node(id).unwrap();
-    let NodeKind::Path { live: Some(LiveShape::Rectangle { radii, kinds, .. }), path, .. } = &n.kind else { panic!("not a live rectangle") };
-    (*radii, *kinds, path.anchor_count())
-}
-
-fn selected_anchors(s: &Session, id: NodeId) -> Option<BTreeSet<AnchorRef>> {
-    s.doc().unwrap().selection.partial(id).cloned()
-}
-
-fn anchors(v: &[usize]) -> BTreeSet<AnchorRef> {
-    v.iter().map(|ai| (0, *ai)).collect()
-}
-
-#[test]
-fn a_whole_rectangle_rounds_all_corners_and_given_corners_alone() {
-    let (mut s, id) = session();
-    run(&mut s, json!({"radius": 8}));
-    assert_eq!(corners(&s, id), ([8.0; 4], [CornerKind::Round; 4], 8));
-    run(&mut s, json!({"id": id.0, "radius": 0}));
-    // One corner: only it rounds, and the path gains one anchor (one undo step).
-    let undo = s.doc().unwrap().history.undo.len();
-    run(&mut s, json!({"ids": [id.0], "corners": [1], "radius": 12}));
-    assert_eq!(corners(&s, id), ([0.0, 12.0, 0.0, 0.0], [CornerKind::Round; 4], 5));
-    assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
-    let b = s.doc().unwrap().doc.node(id).unwrap().geometric_bounds().unwrap();
-    assert!((b.x1 - 110.0).abs() < 1e-9 && (b.y0 - 10.0).abs() < 1e-9, "the shape keeps its bounds: {b:?}");
-    // Kinds alone, then both; the others stay as they were.
-    run(&mut s, json!({"corners": [1, 3], "kind": "chamfer"}));
-    run(&mut s, json!({"corners": [3], "radius": 5, "kind": "invertedRound"}));
-    assert_eq!(corners(&s, id), ([0.0, 12.0, 0.0, 5.0], [CornerKind::Round, CornerKind::Chamfer, CornerKind::Round, CornerKind::InvertedRound], 6));
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(corners(&s, id).1[3], CornerKind::Chamfer);
-}
-
-#[test]
-fn bad_corners_and_kinds_are_errors() {
-    let (mut s, id) = session();
-    for p in
-        [json!({"corners": [4], "radius": 5}), json!({"corners": ["a"]}), json!({"corners": 1}), json!({"corners": [-1]}), json!({"kind": "wavy"})]
-    {
-        assert!(s.execute("object.setLiveShape", &p).is_err(), "{p}");
-    }
-    assert_eq!(corners(&s, id), ([0.0; 4], [CornerKind::Round; 4], 4), "nothing changed");
-}
-
-#[test]
-fn direct_selected_corners_round_alone_and_stay_selected() {
-    let (mut s, id) = session();
-    // Direct Selection picks the top-right and bottom-left corners.
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1], [0, 3]], "mode": "set"})).unwrap();
-    run(&mut s, json!({"radius": 10}));
-    assert_eq!(corners(&s, id), ([0.0, 10.0, 0.0, 10.0], [CornerKind::Round; 4], 6));
-    // Anchors: top-left, top-right's two, bottom-right, bottom-left's two.
-    assert_eq!(selected_anchors(&s, id), Some(anchors(&[1, 2, 4, 5])));
-    // The same corners again (a field in the Properties panel), now with their two anchors each.
-    run(&mut s, json!({"kind": "chamfer"}));
-    assert_eq!(corners(&s, id).1, [CornerKind::Round, CornerKind::Chamfer, CornerKind::Round, CornerKind::Chamfer]);
-    run(&mut s, json!({"radius": 0}));
-    assert_eq!(corners(&s, id).2, 4);
-    assert_eq!(selected_anchors(&s, id), Some(anchors(&[1, 3])));
-    // Undo brings back the selection with the shape.
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(selected_anchors(&s, id), Some(anchors(&[1, 2, 4, 5])));
-    // Explicit corners win over the selection, which follows its own corners.
-    run(&mut s, json!({"corners": [0], "radius": 4}));
-    assert_eq!(corners(&s, id).0, [4.0, 10.0, 0.0, 10.0]);
-    assert_eq!(selected_anchors(&s, id), Some(anchors(&[1, 2, 4, 5])), "the top-left corner comes first and last");
-}
-
-#[test]
-fn a_drag_previews_one_corner_and_commits_one_step() {
-    let (mut s, id) = session();
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 2]], "mode": "set"})).unwrap();
-    let undo = s.doc().unwrap().history.undo.len();
-    s.begin_interaction("Corner Radius").unwrap();
-    for r in [5.0, 9.0, 14.0] {
-        s.preview("object.setLiveShape", &json!({"id": id.0, "radius": r, "corners": [2]})).unwrap();
-    }
-    s.commit_interaction().unwrap();
-    assert_eq!(corners(&s, id), ([0.0, 0.0, 14.0, 0.0], [CornerKind::Round; 4], 5));
-    assert_eq!(selected_anchors(&s, id), Some(anchors(&[2, 3])));
-    assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
-}
-
-/// How far each corner's cut reaches along x and y (top-left, top-right, bottom-right,
-/// bottom-left) of a rectangle with four cut corners: equal for a circular arc.
-fn spans(s: &Session, id: NodeId) -> Vec<(f64, f64)> {
-    let NodeKind::Path { path, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("not a path") };
-    let a: Vec<_> = path.subpaths[0].anchors.iter().map(|a| a.p).collect();
-    assert_eq!(a.len(), 8, "four cut corners");
-    [(7, 0), (1, 2), (3, 4), (5, 6)].iter().map(|(i, j)| ((a[*j].x - a[*i].x).abs(), (a[*j].y - a[*i].y).abs())).collect()
-}
-
-fn assert_spans(s: &Session, id: NodeId, want: [f64; 4]) {
-    let got = spans(s, id);
-    let ok = got.iter().zip(want).all(|((x, y), r)| (x - r).abs() < 1e-9 && (y - r).abs() < 1e-9);
-    assert!(ok, "corners span {got:?}, want circles of radii {want:?}");
-}
-
-/// #442: on a rectangle that isn't square, every corner is the same circle, also past the limit
-/// and on a shape from a file that kept an uneven scale in its transform (before #291).
-#[test]
-fn corners_of_a_non_square_rectangle_are_alike_circles() {
-    let (mut s, id) = session();
-    run(&mut s, json!({"radius": 12}));
-    assert_spans(&s, id, [12.0; 4]);
-    // Past half the shorter side, every corner stops there.
-    run(&mut s, json!({"radius": 45}));
-    assert_spans(&s, id, [30.0; 4]);
-    // A 50 × 60 rectangle with 10 pt corners, saved stretched to 100 × 60: 20 × 10 ellipses.
-    {
-        let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
-        let NodeKind::Path { path, live: Some(live), .. } = &mut d.node_mut(id).unwrap().kind else { panic!("not live") };
-        let xf = Affine::translate((10.0, 10.0)) * Affine::scale_non_uniform(2.0, 1.0);
-        *live = LiveShape::Rectangle { w: 50.0, h: 60.0, radii: [10.0; 4], kinds: Default::default(), xf };
-        *path = live.to_path();
-    }
-    assert_eq!(spans(&s, id)[0], (20.0, 10.0));
-    // Rounding one corner makes every corner a circle: the others of the mean radius.
-    run(&mut s, json!({"corners": [1], "radius": 12}));
-    let mean = 10.0 * 2f64.sqrt();
-    assert_spans(&s, id, [mean, 12.0, mean, mean]);
-    let b = s.doc().unwrap().doc.node(id).unwrap().geometric_bounds().unwrap();
-    assert!((b.x0 - 10.0).abs() < 1e-9 && (b.x1 - 110.0).abs() < 1e-9 && (b.y1 - 70.0).abs() < 1e-9, "same bounds: {b:?}");
-    run(&mut s, json!({"radius": 8}));
-    assert_spans(&s, id, [8.0; 4]);
-}
@@ -1,7 +1,7 @@
 //! Menu long-tail commands (Object/Edit/Select/Type/View/File), driven through `Session::execute`.

 use serde_json::{Value, json};
-use vectorcraft_color::{Color, Paint};
+use vectorcraft_color::Color;
 use vectorcraft_doc::{ColorMode, LiveShape, Node, NodeKind, TextKind};
 use vectorcraft_geom::Rect;

@@ -234,30 +234,6 @@ fn crop_image_disabled_without_image() {
    assert!(matches!(s.execute("object.cropImage", &json!({})), Err(EngineError::Disabled(..))));
 }

-#[test]
-fn mask_image_clips_it_to_its_outline_and_selects_the_clipping_path() {
-    let mut s = session();
-    let a = rect(&mut s, 10.0, 20.0, 100.0, 50.0);
-    sel(&mut s, &[a]);
-    let img = id_of(&s.execute("object.rasterize", &json!({"ppi": 72})).unwrap());
-    s.execute("object.rotate", &json!({"angle": 30})).unwrap();
-    let ib = bounds(&s, img);
-    let r = s.execute("object.maskImage", &json!({})).unwrap();
-    let (g, p) = (id_of(&r), NodeId(r["path"].as_u64().unwrap()));
-    let group = node(&s, g);
-    assert!(matches!(group.kind, NodeKind::Group { clip: true, .. }));
-    assert_eq!(group.children().unwrap().iter().map(|c| c.id).collect::<Vec<_>>(), [p, img]);
-    // The clipping path follows the rotated image's outline, so nothing is cut off yet.
-    assert!(matches!(node(&s, p).kind, NodeKind::Path { clipping: true, .. }));
-    let pb = bounds(&s, p);
-    assert!(close(pb.x0, ib.x0) && close(pb.y0, ib.y0) && close(pb.x1, ib.x1) && close(pb.y1, ib.y1), "{pb:?} {ib:?}");
-    assert_eq!(s.doc().unwrap().selection.objects, [p]);
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert!(s.doc().unwrap().doc.node(g).is_none() && s.doc().unwrap().doc.node(img).is_some());
-    sel(&mut s, &[]);
-    assert!(matches!(s.execute("object.maskImage", &json!({})), Err(EngineError::Disabled(..))));
-}
-
 #[test]
 fn trim_marks_around_selection() {
    let mut s = session();
@@ -550,92 +526,6 @@ fn save_and_recall_selection() {
    assert!(s.execute("select.recall", &json!({"name": "Pair"})).is_err());
 }

-#[test]
-fn edit_selection_needs_a_saved_selection_and_a_free_name() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    sel(&mut s, &[a]);
-    // Edit Selection… is off until something is saved.
-    assert!(s.execute("select.editSaved", &json!({"name": "Selection 1", "newName": "A"})).is_err());
-    s.execute("select.save", &json!({"name": "One"})).unwrap();
-    s.execute("select.save", &json!({"name": "Two"})).unwrap();
-    // A name already saved can't be taken; both selections keep theirs.
-    assert!(s.execute("select.editSaved", &json!({"name": "One", "newName": " Two "})).is_err());
-    assert_eq!(s.execute("select.savedList", &json!({})).unwrap(), json!(["One", "Two"]));
-    // Renaming to its own name, or a blank name, changes nothing; a free name renames.
-    s.execute("select.editSaved", &json!({"name": "One", "newName": "One"})).unwrap();
-    s.execute("select.editSaved", &json!({"name": "One", "newName": "  "})).unwrap();
-    s.execute("select.editSaved", &json!({"name": "One", "newName": " Uno "})).unwrap();
-    assert_eq!(s.execute("select.savedList", &json!({})).unwrap(), json!(["Uno", "Two"]));
-}
-
-#[test]
-fn saved_selections_live_in_the_document() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    let b = rect(&mut s, 20.0, 0.0, 10.0, 10.0);
-    let list = |s: &mut Session| s.execute("select.savedList", &json!({})).unwrap();
-    sel(&mut s, &[a]);
-    s.execute("select.save", &json!({"name": "A"})).unwrap();
-    sel(&mut s, &[a, b]);
-    s.execute("select.save", &json!({"name": "Both"})).unwrap();
-    // They travel with the file.
-    let loaded = vectorcraft_format::load(&vectorcraft_format::save_file(&s.doc().unwrap().doc)).unwrap();
-    assert_eq!(loaded.saved_selections.iter().map(|x| x.name.as_str()).collect::<Vec<_>>(), ["A", "Both"]);
-    // Saving is an undo step.
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(list(&mut s), json!(["A"]));
-    // An existing name is replaced by the current selection.
-    sel(&mut s, &[b]);
-    s.execute("select.save", &json!({"name": "A"})).unwrap();
-    s.execute("select.none", &json!({})).unwrap();
-    assert_eq!(s.execute("select.recall", &json!({"name": "A"})).unwrap()["count"], 1);
-    assert_eq!(selected(&s), vec![b]);
-    // Objects deleted since are left out of a recall.
-    sel(&mut s, &[a, b]);
-    s.execute("select.save", &json!({"name": "Pair"})).unwrap();
-    sel(&mut s, &[a]);
-    s.execute("edit.clear", &json!({})).unwrap();
-    assert_eq!(s.execute("select.recall", &json!({"name": "Pair"})).unwrap()["count"], 1);
-}
-
-#[test]
-fn edit_selection_applies_several_edits_as_one_step() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    sel(&mut s, &[a]);
-    for n in ["A", "B", "C"] {
-        s.execute("select.save", &json!({ "name": n })).unwrap();
-    }
-    let list = |s: &mut Session| s.execute("select.savedList", &json!({})).unwrap();
-    // Edits name the selections as they are, so two can swap names; a delete goes with them.
-    s.execute("select.editSaved", &json!({"edits": [{"name": "A", "newName": "B"}, {"name": "B", "newName": "A"}, {"name": "C", "delete": true}]}))
-        .unwrap();
-    assert_eq!(list(&mut s), json!(["B", "A"]));
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(list(&mut s), json!(["A", "B", "C"]));
-    // Two ending with one name, or an unknown name, change nothing.
-    assert!(s.execute("select.editSaved", &json!({"edits": [{"name": "A", "newName": "B"}]})).is_err());
-    assert!(s.execute("select.editSaved", &json!({"edits": [{"name": "Z", "delete": true}]})).is_err());
-    assert_eq!(list(&mut s), json!(["A", "B", "C"]));
-}
-
-#[test]
-fn a_document_keeps_at_most_25_saved_selections() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    sel(&mut s, &[a]);
-    for i in 0..25 {
-        s.execute("select.save", &json!({ "name": format!("S{i}") })).unwrap();
-    }
-    assert!(s.execute("select.save", &json!({"name": "One too many"})).is_err());
-    // A name already saved is replaced even when the list is full.
-    s.execute("select.save", &json!({"name": "S3"})).unwrap();
-    // Unnamed saves take the first free "Selection N".
-    s.execute("select.editSaved", &json!({"name": "S0", "delete": true})).unwrap();
-    assert_eq!(s.execute("select.save", &json!({})).unwrap()["name"], "Selection 1");
-}
-
 // ---------- Type ----------

 #[test]
@@ -764,219 +654,6 @@ fn ruler_guides_and_lock() {
    assert!(s.execute("guide.remove", &json!({"index": 0})).is_err());
 }

-fn guides(s: &Session) -> Vec<(bool, f64)> {
-    s.doc().unwrap().doc.guides.iter().map(|g| (g.vertical, g.pos)).collect()
-}
-
-fn selected_guides(s: &Session) -> Vec<usize> {
-    s.doc().unwrap().selection.guides.clone()
-}
-
-/// #414: ruler guides are selected, moved, copied, nudged and deleted like art, over commands.
-#[test]
-fn ruler_guides_select_move_and_delete() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    for (vertical, pos) in [(true, 100.0), (false, 50.0), (true, 300.0)] {
-        s.execute("guide.add", &json!({"vertical": vertical, "pos": pos})).unwrap();
-    }
-    sel(&mut s, &[a]);
-    // Selecting guides deselects the art; toggle adds and removes.
-    assert_eq!(s.execute("guide.select", &json!({"indexes": [0]})).unwrap()["selected"], json!([0]));
-    assert!(selected(&s).is_empty());
-    assert_eq!(s.execute("guide.select", &json!({"indexes": [1], "toggle": true})).unwrap()["selected"], json!([0, 1]));
-    assert_eq!(s.execute("guide.list", &json!({})).unwrap()[1], json!({"index": 1, "vertical": false, "pos": 50.0, "selected": true}));
-    assert!(s.execute("guide.select", &json!({"indexes": [7]})).is_err());
-    // A move takes each selected guide along its own axis, in one undo step.
-    let n = undo_len(&s);
-    s.execute("guide.move", &json!({"dx": 10, "dy": -5})).unwrap();
-    assert_eq!(guides(&s), [(true, 110.0), (false, 45.0), (true, 300.0)]);
-    assert_eq!(undo_len(&s), n + 1);
-    // Alt: copies, which are then the selection.
-    s.execute("guide.move", &json!({"dx": 20, "copy": true})).unwrap();
-    assert_eq!(guides(&s).len(), 5);
-    assert_eq!(&guides(&s)[3..], [(true, 130.0), (false, 45.0)]);
-    assert_eq!(selected_guides(&s), [3, 4]);
-    // The arrow keys nudge them.
-    s.execute("object.nudge", &json!({"dx": 1, "dy": 0, "big": true})).unwrap();
-    assert_eq!(guides(&s)[3], (true, 140.0));
-    // Delete (edit.clear) deletes the selected guides; the others keep their places.
-    s.execute("guide.select", &json!({"indexes": [1, 3]})).unwrap();
-    assert_eq!(s.execute("guide.list", &json!({})).unwrap().as_array().unwrap().len(), 5);
-    s.execute("edit.clear", &json!({})).unwrap();
-    assert_eq!(guides(&s), [(true, 110.0), (true, 300.0), (false, 45.0)]);
-    assert!(selected_guides(&s).is_empty());
-    assert!(s.doc().unwrap().doc.node(a).is_some(), "the art stays");
-    // Removing one keeps the rest of the selection pointing at the same guides.
-    s.execute("guide.select", &json!({"indexes": [1, 2]})).unwrap();
-    assert_eq!(s.execute("guide.remove", &json!({"index": 0})).unwrap()["count"], 1);
-    assert_eq!((guides(&s), selected_guides(&s)), (vec![(true, 300.0), (false, 45.0)], vec![0, 1]));
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![1, 2]));
-    // Out of range positions are refused.
-    assert!(s.execute("guide.move", &json!({"index": 0, "pos": 1e300})).is_err());
-    assert!(s.execute("guide.add", &json!({"vertical": true, "pos": -1e300})).is_err());
-    // Locking deselects them, and they can't be picked again until unlocked.
-    s.execute("view.guides.lock", &json!({"locked": true})).unwrap();
-    assert!(selected_guides(&s).is_empty());
-    assert!(matches!(s.execute("guide.select", &json!({"indexes": [0]})), Err(EngineError::Disabled(..))));
-    assert!(matches!(s.execute("edit.clear", &json!({})), Err(EngineError::Disabled(..))));
-}
-
-/// #451: an artboard guide (`guide.add {artboard}`) runs across its artboard only, and is moved,
-/// copied and deleted with it; canvas guides stay put.
-#[test]
-fn artboard_guides_go_with_their_artboard() {
-    let mut s = session();
-    s.execute("artboard.new", &json!({"x": 900, "y": 0, "width": 400, "height": 300})).unwrap();
-    s.execute("guide.add", &json!({"vertical": true, "pos": 1000, "artboard": 1})).unwrap();
-    s.execute("guide.add", &json!({"vertical": false, "pos": 100})).unwrap();
-    let list = |s: &mut Session| s.execute("guide.list", &json!({})).unwrap();
-    assert_eq!(
-        list(&mut s),
-        json!([
-            {"index": 0, "vertical": true, "pos": 1000.0, "selected": false, "artboard": 1},
-            {"index": 1, "vertical": false, "pos": 100.0, "selected": false},
-        ])
-    );
-    let spans = |s: &Session| {
-        let d = &s.doc().unwrap().doc;
-        d.guides.iter().map(|g| d.guide_span(g)).collect::<Vec<_>>()
-    };
-    assert_eq!(spans(&s), [Some((0.0, 300.0)), None]);
-    for bad in [json!(5), json!("x"), json!(-1)] {
-        assert!(s.execute("guide.add", &json!({"vertical": true, "pos": 10, "artboard": bad})).is_err(), "{bad}");
-    }
-    // Moved, the artboard takes its guides along; in Artboard Options too, unless resized.
-    s.execute("artboard.move", &json!({"index": 1, "dx": 50, "dy": 20})).unwrap();
-    assert_eq!(guides(&s), [(true, 1050.0), (false, 100.0)]);
-    s.execute("artboard.setProps", &json!({"index": 1, "x": 960.5})).unwrap();
-    assert_eq!(guides(&s)[0], (true, 1060.5));
-    s.execute("artboard.setProps", &json!({"index": 1, "x": 900, "width": 500})).unwrap();
-    assert_eq!((guides(&s)[0], spans(&s)[0]), ((true, 1060.5), Some((20.0, 320.0))));
-    // Renumbered, it keeps them.
-    s.execute("artboard.reorder", &json!({"index": 1, "to": 0})).unwrap();
-    assert_eq!(list(&mut s)[0]["artboard"], 0);
-    // Duplicated (or Alt-dragged), the copy gets copies of them.
-    let dup = s.execute("artboard.duplicate", &json!({"index": 0})).unwrap()["index"].as_u64().unwrap();
-    let dx = s.doc().unwrap().doc.artboards[dup as usize].rect.x0 - 900.0;
-    assert_eq!(guides(&s), [(true, 1060.5), (false, 100.0), (true, 1060.5 + dx)]);
-    assert_eq!(list(&mut s)[2]["artboard"], dup);
-    s.execute("artboard.move", &json!({"index": 0, "dx": 0, "dy": 400, "copy": true})).unwrap();
-    assert_eq!((guides(&s).len(), list(&mut s)[3]["artboard"].clone()), (4, json!(3)));
-    // Rearranged, they follow their artboards.
-    s.execute("artboard.rearrange", &json!({"columns": 4})).unwrap();
-    let d = &s.doc().unwrap().doc;
-    for (g, ab) in d.guides.iter().filter_map(|g| Some((g, d.artboards.iter().find(|a| Some(a.id) == g.artboard)?))) {
-        assert_eq!(g.pos - ab.rect.x0, 160.5, "{g:?} on {ab:?}");
-    }
-    // Deleted, the artboard takes its guides; the selected ones left stay selected.
-    s.execute("guide.select", &json!({"indexes": [1, 2]})).unwrap();
-    let n = undo_len(&s);
-    s.execute("artboard.delete", &json!({"index": 0})).unwrap();
-    assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![0, 1]));
-    assert_eq!(list(&mut s)[0], json!({"index": 0, "vertical": false, "pos": 100.0, "selected": true}));
-    assert_eq!(undo_len(&s), n + 1);
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!((guides(&s).len(), selected_guides(&s)), (4, vec![1, 2]));
-    // Cut, too.
-    s.execute("artboard.cut", &json!({"index": 0})).unwrap();
-    assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![0, 1]));
-}
-
-/// #451: a guide dragged out of a ruler snaps (to the art's corners, side midpoints and anchors,
-/// the artboards' edges and centres) and is made in one undo step where it is released over the
-/// canvas; with the Artboard tool it is an artboard guide of the active artboard.
-#[test]
-fn guides_dragged_out_of_a_ruler_snap_and_take_the_artboard_tool_s_artboard() {
-    use vectorcraft_tools::{Overlay, PointerEvent, PointerKind};
-    let mut s = session();
-    rect(&mut s, 100.0, 100.0, 100.0, 100.0);
-    let v = ViewInfo::default();
-    let ev = |kind, x, y| PointerEvent::new(kind, x, y);
-    let n = undo_len(&s);
-    s.ruler_guide(true, &ev(PointerKind::Drag, -10.0, 30.0), false, v).unwrap();
-    assert!(guides(&s).is_empty(), "still over the ruler");
-    s.ruler_guide(true, &ev(PointerKind::Drag, 153.0, 30.0), true, v).unwrap();
-    assert_eq!(guides(&s), [(true, 150.0)], "onto the line through the top and bottom midpoints");
-    assert!(s.overlays(v).iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "center")));
-    s.ruler_guide(true, &ev(PointerKind::Drag, 797.0, 30.0), true, v).unwrap();
-    assert_eq!(guides(&s), [(true, 800.0)], "the artboard's edge");
-    s.ruler_guide(true, &ev(PointerKind::Up, 797.0, 30.0), true, v).unwrap();
-    assert_eq!(guides(&s), [(true, 800.0)]);
-    assert_eq!(undo_len(&s), n + 1);
-    assert_eq!(s.doc().unwrap().history.undo.last().unwrap().label, "New Guide");
-    assert!(s.overlays(v).is_empty());
-    // Released off the canvas: none.
-    s.ruler_guide(false, &ev(PointerKind::Drag, 30.0, 250.0), true, v).unwrap();
-    s.ruler_guide(false, &ev(PointerKind::Up, 30.0, -10.0), false, v).unwrap();
-    assert_eq!((guides(&s).len(), undo_len(&s)), (1, n + 1));
-    // The Artboard tool: an artboard guide of its active artboard.
-    s.execute("artboard.new", &json!({"x": 900, "y": 0, "width": 400, "height": 300})).unwrap();
-    s.select_tool("artboard", v).unwrap();
-    s.set_tool_option("active", &json!(1));
-    s.ruler_guide(false, &ev(PointerKind::Drag, 1000.0, 50.0), true, v).unwrap();
-    s.ruler_guide(false, &ev(PointerKind::Up, 1000.0, 50.0), true, v).unwrap();
-    assert_eq!(
-        s.execute("guide.list", &json!({})).unwrap()[1],
-        json!({"index": 1, "vertical": false, "pos": 50.0, "selected": false, "artboard": 1})
-    );
-}
-
-/// #451: art moved with the Selection tool lands flush on the artboard's edges and centre (Smart
-/// Guides).
-#[test]
-fn moved_art_snaps_to_the_artboard_edges_and_centre() {
-    use vectorcraft_tools::{PointerEvent, PointerKind};
-    let mut s = session();
-    let a = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
-    let v = ViewInfo::default();
-    s.select_tool("selection", v).unwrap();
-    let mut drag = |from: (f64, f64), to: (f64, f64)| {
-        for (kind, (x, y)) in [(PointerKind::Down, from), (PointerKind::Drag, to), (PointerKind::Up, to)] {
-            s.pointer(&PointerEvent::new(kind, x, y), v).unwrap();
-        }
-        let b = bounds(&s, a);
-        (b.x0, b.y0)
-    };
-    assert_eq!(drag((150.0, 150.0), (53.0, 147.0)), (0.0, 97.0), "3 pt off the left edge: flush with it");
-    assert_eq!(drag((50.0, 147.0), (402.0, 298.0)), (350.0, 250.0), "its centre on the artboard's");
-}
-
-/// #414: the Selection tool picks a ruler guide over the art and drags it in one undo step; with
-/// guides hidden or locked the press goes to the art.
-#[test]
-fn selection_tool_drags_a_ruler_guide() {
-    use vectorcraft_tools::{PointerEvent, PointerKind};
-    let mut s = session();
-    let a = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
-    s.execute("guide.add", &json!({"vertical": true, "pos": 150})).unwrap();
-    s.execute("select.none", &json!({})).unwrap();
-    let v = ViewInfo { smart_guides: false, ..Default::default() };
-    s.select_tool("selection", v).unwrap();
-    let drag = |s: &mut Session, v: ViewInfo, from: (f64, f64), to: (f64, f64)| {
-        s.pointer(&PointerEvent::new(PointerKind::Down, from.0, from.1), v).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Drag, to.0, to.1), v).unwrap();
-        s.pointer(&PointerEvent::new(PointerKind::Up, to.0, to.1), v).unwrap();
-    };
-    let n = undo_len(&s);
-    drag(&mut s, v, (151.0, 120.0), (171.0, 140.0));
-    assert_eq!(guides(&s), [(true, 170.0)]);
-    assert_eq!(selected_guides(&s), [0]);
-    assert!(selected(&s).is_empty());
-    assert_eq!(bounds(&s, a).x0, 100.0, "the art stays");
-    assert_eq!(undo_len(&s), n + 1);
-    assert_eq!(s.doc().unwrap().history.undo.last().unwrap().label, "Move Guide");
-    // Hidden guides: the press takes the art.
-    let hidden = ViewInfo { guides: false, ..v };
-    drag(&mut s, hidden, (170.0, 120.0), (180.0, 120.0));
-    assert_eq!((guides(&s), bounds(&s, a).x0), (vec![(true, 170.0)], 110.0));
-    // Locked guides too.
-    s.execute("view.guides.lock", &json!({"locked": true})).unwrap();
-    drag(&mut s, v, (170.0, 120.0), (180.0, 120.0));
-    assert_eq!((guides(&s), bounds(&s, a).x0), (vec![(true, 170.0)], 120.0));
-}
-
 // ---------- File ----------

 #[test]
@@ -1003,122 +680,6 @@ fn document_color_mode_converts_colours() {
    assert!(s.execute("file.documentColorMode", &json!({"mode": "lab"})).is_err());
 }

-/// Four RGB greys (#000000, #333333, #808080, #e6e6e6, as in issue #421) and a red, a 40% tint of a
-/// grey global swatch, a gradient to grey and a pattern of a grey tile → (session, the five
-/// rectangles, the tinted one, the gradient one).
-fn greys_document() -> (Session, Vec<NodeId>, NodeId, NodeId) {
-    let mut s = session();
-    let ids: Vec<NodeId> = ["#000000", "#333333", "#808080", "#e6e6e6", "#ff0000"]
-        .iter()
-        .map(|hex| {
-            let id = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-            fill(&mut s, id, hex);
-            id
-        })
-        .collect();
-    s.execute("swatch.new", &json!({"name": "Ink", "color": "#808080", "global": true})).unwrap();
-    let tint = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    s.execute("paint.setFill", &json!({"ids": [tint.0], "swatch": "Ink", "tint": 40})).unwrap();
-    let grad = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    let stops = json!([{"offset": 0, "color": "#ffffff"}, {"offset": 1, "color": "#333333"}]);
-    s.execute("paint.setFill", &json!({"ids": [grad.0], "gradient": {"kind": "linear", "stops": stops}})).unwrap();
-    let tile = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    fill(&mut s, tile, "#808080");
-    s.execute("object.pattern.make", &json!({"ids": [tile.0], "name": "Grey Tile", "edit": false})).unwrap();
-    (s, ids, tint, grad)
-}
-
-/// The colour of pattern `name`'s first tile object.
-fn pattern_fill(s: &Session, name: &str) -> Color {
-    s.doc().unwrap().doc.pattern(name).unwrap().art[0].appearance.fill_paint().color().unwrap()
-}
-
-/// K of a colour that prints on the black plate only.
-fn k_only(c: Color) -> f32 {
-    match c {
-        Color::Cmyk { c: 0.0, m: 0.0, y: 0.0, k } => k,
-        other => panic!("not K only: {other:?}"),
-    }
-}
-
-#[test]
-fn document_color_mode_separates_rgb_greys_through_the_profile() {
-    let (mut s, ids, _, _) = greys_document();
-    s.execute("file.documentColorMode", &json!({"mode": "cmyk"})).unwrap();
-    // As Illustrator converts them: four-colour greys and a rich black.
-    let Color::Cmyk { c, m, y, k } = fill_of(&s, ids[2]) else { panic!("not CMYK") };
-    assert!(c > 0.05 && m > 0.05 && y > 0.05 && k > 0.0, "a four-colour mid grey: {c} {m} {y} {k}");
-    let Color::Cmyk { c, k, .. } = fill_of(&s, ids[0]) else { panic!("not CMYK") };
-    assert!(k > 0.9 && c > 0.3, "rich black: {c} {k}");
-    // Pattern tiles are swatches too: their art converts with the rest.
-    assert!(matches!(pattern_fill(&s, "Grey Tile"), Color::Cmyk { .. }), "{:?}", pattern_fill(&s, "Grey Tile"));
-    // Gray colours stay Gray.
-    let mut g = session();
-    let a = rect(&mut g, 0.0, 0.0, 10.0, 10.0);
-    g.execute("paint.setFill", &json!({"ids": [a.0], "color": {"gray": 0.3}})).unwrap();
-    g.execute("file.documentColorMode", &json!({"mode": "cmyk"})).unwrap();
-    assert_eq!(fill_of(&g, a), Color::gray(0.3));
-}
-
-#[test]
-fn document_color_mode_can_put_rgb_greys_on_the_black_plate() {
-    let (mut profile, pids, ..) = greys_document();
-    profile.execute("file.documentColorMode", &json!({"mode": "cmyk"})).unwrap();
-    let (mut s, ids, tint, grad) = greys_document();
-    let e = s.execute("file.documentColorMode", &json!({"mode": "cmyk", "grays": "rich"})).unwrap_err().to_string();
-    assert!(e.contains("grays"), "{e}");
-    s.execute("file.documentColorMode", &json!({"mode": "cmyk", "grays": "black"})).unwrap();
-    let close = |a: f32, b: f32| (a - b).abs() < 0.005;
-    for (id, want) in ids.iter().zip([1.0, 0.8, 0.498, 0.098]) {
-        let k = k_only(fill_of(&s, *id));
-        assert!(close(k, want), "K {k}, want {want}");
-    }
-    // Other colours convert through the profile as before.
-    assert_eq!(fill_of(&s, ids[4]), fill_of(&profile, pids[4]));
-    // Swatches, their tints, gradient stops and pattern tiles follow the same rule.
-    let d = &s.doc().unwrap().doc;
-    assert!(close(k_only(d.swatch("Ink").unwrap().paint.color().unwrap()), 0.498));
-    let Paint::Solid { color, swatch, tint: t } = node(&s, tint).appearance.fill_paint() else { panic!("not solid") };
-    assert!(close(k_only(color), 0.498 * 0.4) && swatch.as_deref() == Some("Ink") && t == 0.4, "{color:?} {swatch:?} {t}");
-    let Paint::Gradient(g) = node(&s, grad).appearance.fill_paint() else { panic!("not a gradient") };
-    let ks: Vec<f32> = g.gradient.stops.iter().map(|st| k_only(st.color)).collect();
-    assert!(close(ks[0], 0.0) && close(ks[1], 0.8), "{ks:?}");
-    assert!(close(k_only(pattern_fill(&s, "Grey Tile")), 0.498));
-    // To RGB, `grays` changes nothing.
-    s.execute("file.documentColorMode", &json!({"mode": "rgb", "grays": "black"})).unwrap();
-    let rgb = s.doc().unwrap().doc.layers.clone();
-    s.execute("edit.undo", &json!({})).unwrap();
-    s.execute("file.documentColorMode", &json!({"mode": "rgb"})).unwrap();
-    assert_eq!(s.doc().unwrap().doc.layers, rgb);
-}
-
-#[test]
-fn opening_in_cmyk_can_put_rgb_greys_on_the_black_plate() {
-    let mut s = session();
-    for hex in ["#000000", "#333333", "#808080", "#e6e6e6", "#ff0000"] {
-        let id = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-        fill(&mut s, id, hex);
-    }
-    let svg = s.execute("document.serialize", &json!({"format": "svg"})).unwrap()["text"].as_str().unwrap().to_string();
-    let data = vectorcraft_format::base64_encode(svg.as_bytes());
-    let mut o = Session::new();
-    o.execute("document.open", &json!({"name": "greys.svg", "dataBase64": data, "colorMode": "cmyk", "grays": "black"})).unwrap();
-    let d = &o.doc().unwrap().doc;
-    assert_eq!(d.color_mode, ColorMode::Cmyk);
-    let mut fills = vec![];
-    for l in &d.layers {
-        l.walk(&mut |n| fills.extend(n.children().is_none().then(|| n.appearance.fill_paint().color()).flatten()));
-    }
-    assert_eq!(fills.len(), 5, "{fills:?}");
-    for (c, want) in fills.iter().zip([1.0, 0.8, 0.498, 0.098]) {
-        let k = k_only(*c);
-        assert!((k - want).abs() < 0.005, "K {k}, want {want}");
-    }
-    assert!(matches!(fills[4], Color::Cmyk { m, y, .. } if m > 0.8 && y > 0.8), "red separates as usual: {:?}", fills[4]);
-    let e = Session::new().execute("document.open", &json!({"name": "greys.svg", "dataBase64": data, "grays": "k"})).unwrap_err().to_string();
-    assert!(e.contains("grays"), "{e}");
-}
-
 #[test]
 fn file_info_sets_title() {
    let mut s = session();
@@ -1146,16 +707,3 @@ fn every_new_command_has_params_doc_and_menu() {
        assert!(!c.params.is_empty() && !c.menu.is_empty(), "{id}");
    }
 }
-
-#[test]
-fn saved_selection_names_are_trimmed_and_capped() {
-    let mut s = session();
-    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
-    sel(&mut s, &[a]);
-    let long = "n".repeat(1000);
-    let name = s.execute("select.save", &json!({ "name": format!(" {long} ") })).unwrap()["name"].clone();
-    assert_eq!(name.as_str().map(|n| n.chars().count()), Some(vectorcraft_doc::SavedSelection::MAX_NAME));
-    s.execute("select.editSaved", &json!({"name": name, "newName": format!("{long}é")})).unwrap();
-    let list = s.execute("select.savedList", &json!({})).unwrap();
-    assert_eq!(list[0].as_str().map(|n| n.chars().count()), Some(vectorcraft_doc::SavedSelection::MAX_NAME));
-}
@@ -87,109 +87,6 @@ fn artboards_reorder_and_duplicate() {
    assert_eq!(s.doc().unwrap().doc.artboards[0].name, "Second");
 }

-/// The artboards' left edges and names.
-fn boards(s: &Session) -> Vec<(f64, String)> {
-    s.doc().unwrap().doc.artboards.iter().map(|a| (a.rect.x0, a.name.clone())).collect()
-}
-
-/// The left edge of object `id`.
-fn left(s: &Session, id: u64) -> f64 {
-    s.doc().unwrap().doc.node(NodeId(id)).unwrap().geometric_bounds().unwrap().x0
-}
-
-fn ids(v: &serde_json::Value) -> Vec<u64> {
-    v.as_array().unwrap().iter().map(|v| v.as_u64().unwrap()).collect()
-}
-
-/// Duplicate Artboards (#446) copies the art on the artboard too, as the Artboard tool's Move/Copy
-/// Artwork with Artboard says, in one undo step.
-#[test]
-fn duplicate_artboard_copies_its_art() {
-    let mut s = session();
-    let r = rect(&mut s);
-    let out = s.execute("artboard.duplicate", &json!({"index": 0})).unwrap();
-    assert_eq!(out["index"], 1);
-    let copies = ids(&out["ids"]);
-    assert_eq!(copies.len(), 1);
-    assert_ne!(copies[0], r.0);
-    assert_eq!(boards(&s), vec![(0.0, "Artboard 1".into()), (820.0, "Artboard 1 copy".into())]);
-    assert_eq!(left(&s, copies[0]), 830.0, "the copy sits on the new artboard as the original on its own");
-    s.execute("edit.undo", &json!({})).unwrap();
-    let d = &s.doc().unwrap().doc;
-    assert_eq!((d.artboards.len(), d.layers[0].children().unwrap().len()), (1, 1), "one undo step");
-    // Off (the tool's option or the param): the artboard alone.
-    s.set_tool_options(Some("artboard"), json!({"moveArt": false}).as_object().unwrap());
-    assert_eq!(s.execute("artboard.duplicate", &json!({})).unwrap()["ids"], json!([]));
-    assert_eq!(ids(&s.execute("artboard.duplicate", &json!({"index": 0, "art": true})).unwrap()["ids"]).len(), 1);
-}
-
-/// With the Artboard tool, Copy and Paste copy its artboard with the art on it (#446): Paste places
-/// it right of the last artboard, Paste in Place where it was, also in another document; each paste
-/// is one undo step, and the tool takes the pasted artboard.
-#[test]
-fn artboard_tool_copy_and_paste_artboards_with_their_art() {
-    let mut s = session();
-    let r = rect(&mut s);
-    s.execute("artboard.new", &json!({"x": 0, "y": 700, "width": 100, "height": 100, "name": "Small"})).unwrap();
-    s.execute("select.none", &json!({})).unwrap();
-    // Nothing selected: Copy is off, until the Artboard tool is chosen.
-    let copy_enabled = |s: &Session| (crate::find_command("edit.copy").unwrap().enabled)(s).is_ok();
-    assert!(!copy_enabled(&s));
-    s.select_tool("artboard", ViewInfo::default()).unwrap();
-    assert!(copy_enabled(&s));
-    assert_eq!(s.execute("edit.copy", &json!({})).unwrap()["copied"], 1, "artboard 1 and its rectangle");
-    let out = s.execute("edit.paste", &json!({"center": [5, 5]})).unwrap();
-    assert_eq!(out["artboard"], 2);
-    let pasted = ids(&out["ids"]);
-    assert_eq!(left(&s, pasted[0]), 830.0, "beside the artboards, not at the view centre");
-    assert_eq!(boards(&s)[2], (820.0, "Artboard 1 copy".into()));
-    assert_eq!(s.tool_options()["active"], 2);
-    let st = s.doc().unwrap();
-    assert_eq!(st.selection.in_paint_order(&st.doc), vec![NodeId(pasted[0])]);
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(boards(&s).len(), 2);
-    assert!(s.doc().unwrap().doc.node(NodeId(pasted[0])).is_none(), "one undo step");
-    // In place: on top of the original.
-    let out = s.execute("edit.pasteInPlace", &json!({})).unwrap();
-    assert_eq!(left(&s, ids(&out["ids"])[0]), 10.0);
-    let d = &s.doc().unwrap().doc;
-    assert_eq!(d.artboards[2].rect, d.artboards[0].rect);
-    // Into another document.
-    s.execute("file.new", &json!({"width": 300, "height": 300})).unwrap();
-    let out = s.execute("edit.paste", &json!({})).unwrap();
-    assert_eq!(boards(&s), vec![(0.0, "Artboard 1".into()), (320.0, "Artboard 1 copy".into())]);
-    let n = s.doc().unwrap().doc.node(NodeId(ids(&out["ids"])[0])).unwrap().geometric_bounds().unwrap();
-    assert_eq!((n.x0, n.width()), (330.0, 100.0));
-    // Paste on All Artboards pastes the art alone.
-    let out = s.execute("edit.pasteOnAllArtboards", &json!({})).unwrap();
-    assert_eq!((out["artboard"].clone(), ids(&out["ids"]).len(), boards(&s).len()), (json!(null), 2, 2));
-    // The clipboard still holds the artboard for the next document, and the original is untouched.
-    s.execute("document.activate", &json!({"index": 0})).unwrap();
-    assert!(s.doc().unwrap().doc.node(r).is_some());
-}
-
-/// With the Artboard tool, Cut takes its artboard and the art on it away in one undo step (#446),
-/// never the only artboard; pasting it back keeps its name.
-#[test]
-fn artboard_tool_cut_removes_the_artboard_and_its_art() {
-    let mut s = session();
-    let r = rect(&mut s);
-    let outside = s.execute("shape.rectangle", &json!({"x": 2000, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap();
-    s.select_tool("artboard", ViewInfo::default()).unwrap();
-    assert!(s.execute("edit.cut", &json!({})).is_err(), "the only artboard");
-    s.execute("artboard.new", &json!({"x": 1000, "y": 0, "width": 100, "height": 100})).unwrap();
-    s.set_tool_option("active", &json!(0));
-    s.execute("edit.cut", &json!({})).unwrap();
-    let d = &s.doc().unwrap().doc;
-    assert_eq!((d.artboards.len(), d.node(r).is_none(), d.node(NodeId(outside)).is_some()), (1, true, true));
-    s.execute("edit.pasteInPlace", &json!({})).unwrap();
-    assert_eq!(boards(&s), vec![(1000.0, "Artboard 2".into()), (0.0, "Artboard 1".into())]);
-    s.execute("edit.undo", &json!({})).unwrap();
-    s.execute("edit.undo", &json!({})).unwrap();
-    let d = &s.doc().unwrap().doc;
-    assert_eq!((d.artboards.len(), d.node(r).is_some()), (2, true), "the cut is one undo step");
-}
-
 #[test]
 fn swatch_groups_duplicate_sort() {
    let mut s = session();
@@ -1,219 +0,0 @@
-//! Type on a path (#429): Type on a Path Options keep its brackets, flip it, align it to the path
-//! and space it; the selection tools drag its brackets to move it along the path and across it.
-
-use serde_json::{Value, json};
-use vectorcraft_doc::{NodeKind, PathAlign, TextKind, TextObject};
-use vectorcraft_geom::{Point, Rect, Shape};
-use vectorcraft_tools::{Mods, PointerEvent, PointerKind};
-
-use super::*;
-
-fn session() -> Session {
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
-    s
-}
-
-/// 12 pt type on a path along `d` (SVG path data), starting where the path is nearest `at`.
-fn path_type(s: &mut Session, d: &str, at: [f64; 2], text: &str) -> NodeId {
-    let pid = s.execute("path.create", &json!({ "d": d })).unwrap()["id"].as_u64().unwrap();
-    let r = s.execute("text.createInPath", &json!({"path": pid, "mode": "onPath", "text": text, "size": 12, "at": at})).unwrap();
-    let id = NodeId(r["id"].as_u64().unwrap());
-    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
-    id
-}
-
-/// Type on the 400 pt line from (100, 300) to (500, 300), from its middle on.
-fn on_line(s: &mut Session) -> NodeId {
-    path_type(s, "M100 300 L500 300", [300.0, 310.0], "Slide")
-}
-
-fn text(s: &Session, id: NodeId) -> TextObject {
-    match &s.doc().unwrap().doc.node(id).unwrap().kind {
-        NodeKind::Text(t) => (**t).clone(),
-        k => panic!("not text: {k:?}"),
-    }
-}
-
-/// The type's start and end brackets as stored.
-fn brackets(s: &Session, id: NodeId) -> (f64, Option<f64>) {
-    match text(s, id).kind {
-        TextKind::OnPath { start, end, .. } => (start, end),
-        k => panic!("not type on a path: {k:?}"),
-    }
-}
-
-/// The glyphs' ink bounds in the document.
-fn ink(s: &Session, id: NodeId) -> Rect {
-    let t = text(s, id);
-    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t);
-    lay.glyphs
-        .iter()
-        .filter(|g| !g.outline.elements().is_empty())
-        .map(|g| t.xf.transform_rect_bbox(g.outline.bounding_box()))
-        .reduce(|a, b| a.union(b))
-        .unwrap()
-}
-
-/// The glyph origins along the path, in reading order.
-fn origins(s: &Session, id: NodeId) -> Vec<Point> {
-    let t = text(s, id);
-    vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t).glyphs.iter().map(|g| t.xf * g.origin).collect()
-}
-
-fn undo_len(s: &Session) -> usize {
-    s.doc().unwrap().history.undo.len()
-}
-
-fn last_step(s: &Session) -> String {
-    s.doc().unwrap().history.undo.last().unwrap().label.clone()
-}
-
-/// Press, drag and release `tool` from `from` to `to`.
-fn drag(s: &mut Session, tool: &str, from: Point, to: Point, mods: Mods) {
-    let v = ViewInfo::default();
-    s.select_tool(tool, v).unwrap();
-    for (kind, p) in [(PointerKind::Down, from), (PointerKind::Drag, to), (PointerKind::Up, to)] {
-        s.pointer(&PointerEvent::new(kind, p.x, p.y).with_mods(mods), v).unwrap();
-    }
-    assert!(!s.in_interaction());
-}
-
-fn near(a: f64, b: f64) -> bool {
-    (a - b).abs() < 1e-3
-}
-
-#[test]
-fn options_keep_the_brackets() {
-    let mut s = session();
-    let id = on_line(&mut s);
-    assert!(near(brackets(&s, id).0, 0.5));
-    // The query (what the dialog shows) has the current options.
-    let mut q = s.execute("type.pathOptions", &json!({})).unwrap();
-    assert!(near(q["start"].as_f64().unwrap(), 0.5), "{q}");
-    q.as_object_mut().unwrap().remove("start");
-    assert_eq!(q, json!({"end": null, "flip": false, "effect": "rainbow", "alignToPath": "baseline", "spacing": 0.0}));
-    let start = brackets(&s, id).0;
-    // OK with the dialog's values (effect, flip, align, spacing) leaves the type where it is.
-    let before = origins(&s, id);
-    s.execute("type.pathOptions", &json!({"effect": "rainbow", "flip": false, "alignToPath": "baseline", "spacing": 0})).unwrap();
-    assert_eq!(brackets(&s, id), (start, None));
-    assert_eq!(origins(&s, id), before);
-    // So does a new effect.
-    s.execute("type.pathOptions", &json!({"effect": "skew"})).unwrap();
-    assert_eq!(brackets(&s, id), (start, None));
-    assert_eq!(text(&s, id).path_effect, vectorcraft_doc::PathEffect::Skew);
-    // The end bracket is set, and put back at the end of the path.
-    s.execute("type.pathOptions", &json!({"end": 0.9})).unwrap();
-    assert_eq!(brackets(&s, id), (start, Some(0.9)));
-    s.execute("type.pathOptions", &json!({"end": null})).unwrap();
-    assert_eq!(brackets(&s, id), (start, None));
-    for bad in [json!({"start": "x"}), json!({"effect": "nope"}), json!({"alignToPath": "top"})] {
-        assert!(s.execute("type.pathOptions", &bad).is_err(), "{bad}");
-    }
-}
-
-#[test]
-fn flip_turns_the_type_to_the_other_side_of_its_stretch() {
-    let mut s = session();
-    let id = on_line(&mut s);
-    let up = ink(&s, id);
-    assert!(up.y1 < 301.0 && up.x0 > 299.0, "above the path from its middle: {up:?}");
-    let n = undo_len(&s);
-    let r = s.execute("type.pathOptions", &json!({"flip": true})).unwrap();
-    assert_eq!(undo_len(&s), n + 1);
-    // The path runs the other way and the brackets swap ends: the type keeps the right half.
-    assert!(near(r["start"].as_f64().unwrap(), 0.0) && near(r["end"].as_f64().unwrap(), 0.5), "{r}");
-    let down = ink(&s, id);
-    assert!(down.y0 > 299.0 && down.x0 > 299.0, "below the path, on the same half: {down:?}");
-    let o = origins(&s, id);
-    assert!(o.first().unwrap().x > o.last().unwrap().x, "reading right to left: {o:?}");
-    // Flipped back, it is as it was.
-    s.execute("type.pathOptions", &json!({"flip": true})).unwrap();
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.5) && end.is_none(), "{start} {end:?}");
-    assert!(ink(&s, id).y1 < 301.0);
-}
-
-#[test]
-fn a_flip_round_a_closed_path_keeps_the_type_in_place() {
-    let mut s = session();
-    let id = path_type(&mut s, "M100 100 L300 100 L300 300 L100 300 Z", [200.0, 90.0], "Ring");
-    let (start, _) = brackets(&s, id);
-    assert!(near(start, 0.125), "{start}");
-    let first = origins(&s, id)[0];
-    s.execute("type.pathOptions", &json!({"flip": true})).unwrap();
-    // Once round from the same point, the other way.
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.875) && end.is_none(), "{start} {end:?}");
-    assert!(origins(&s, id)[0].distance(first) < 8.0);
-}
-
-#[test]
-fn align_to_path_and_spacing() {
-    let mut s = session();
-    let id = on_line(&mut s);
-    s.execute("type.pathOptions", &json!({"alignToPath": "ascender"})).unwrap();
-    assert_eq!(text(&s, id).path_align, PathAlign::Ascender);
-    let hang = ink(&s, id);
-    assert!(hang.y0 > 299.0, "hangs below the path: {hang:?}");
-    s.execute("type.pathOptions", &json!({"alignToPath": "center"})).unwrap();
-    let mid = ink(&s, id);
-    assert!(mid.y0 < 300.0 && mid.y1 > 300.0, "the path runs through it: {mid:?}");
-    // Spacing closes glyphs up round the outside of a curve.
-    let id = path_type(&mut s, "M100 400 A60 60 0 0 1 220 400", [100.0, 400.0], "Round the bend");
-    let spread = |s: &Session| {
-        let o = origins(s, id);
-        o.first().unwrap().distance(*o.last().unwrap())
-    };
-    let loose = spread(&s);
-    s.execute("type.pathOptions", &json!({"spacing": 6})).unwrap();
-    assert!(spread(&s) < loose - 1.0, "{} < {loose}", spread(&s));
-    assert_eq!(s.execute("type.pathOptions", &json!({})).unwrap()["spacing"], json!(6.0));
-}
-
-#[test]
-fn dragging_the_centre_bracket_slides_the_type_and_across_the_path_flips_it() {
-    let mut s = session();
-    let id = on_line(&mut s);
-    let n = undo_len(&s);
-    // The centre bracket stands midway between the start (300) and the end of the path (500).
-    drag(&mut s, "selection", Point::new(400.0, 295.0), Point::new(440.0, 295.0), Mods::default());
-    assert_eq!(undo_len(&s), n + 1, "one step");
-    assert_eq!(last_step(&s), "Move Type on a Path");
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.6) && end.is_none(), "{start} {end:?}");
-    assert!(ink(&s, id).x0 > 339.0);
-    // Direct Selection drags it too; Cmd/Ctrl held below the path only slides it.
-    drag(&mut s, "directSelection", Point::new(420.0, 295.0), Point::new(380.0, 330.0), Mods { cmd: true, ..Mods::default() });
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.5) && end.is_none(), "{start} {end:?}");
-    assert!(ink(&s, id).y1 < 301.0, "still above the path");
-    // Across the path: flipped, on the same stretch.
-    drag(&mut s, "selection", Point::new(400.0, 295.0), Point::new(400.0, 330.0), Mods::default());
-    assert_eq!(undo_len(&s), n + 3);
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.0) && end.is_some_and(|e| near(e, 0.5)), "{start} {end:?}");
-    assert!(ink(&s, id).y0 > 299.0, "below the path");
-    // The step undoes as one.
-    s.execute("edit.undo", &json!({})).unwrap();
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.5) && end.is_none(), "{start} {end:?}");
-}
-
-#[test]
-fn dragging_the_start_and_end_brackets_sets_where_the_type_runs() {
-    let mut s = session();
-    let id = on_line(&mut s);
-    // The start bracket from the middle (300) to 200.
-    drag(&mut s, "selection", Point::new(300.0, 290.0), Point::new(200.0, 290.0), Mods::default());
-    assert!(near(brackets(&s, id).0, 0.25));
-    // The end bracket from the end of the path to 400.
-    drag(&mut s, "directSelection", Point::new(500.0, 290.0), Point::new(400.0, 290.0), Mods::default());
-    let (start, end) = brackets(&s, id);
-    assert!(near(start, 0.25) && end.is_some_and(|e| near(e, 0.75)), "{start} {end:?}");
-    let v: Value = s.execute("type.pathOptions", &json!({})).unwrap();
-    assert!(near(v["end"].as_f64().unwrap(), 0.75));
-    let r = ink(&s, id);
-    assert!(r.x0 > 199.0 && r.x1 < 401.0, "between the brackets: {r:?}");
-}
@@ -401,7 +401,7 @@ fn the_plane_widget_stays_on_screen_and_takes_clicks_with_any_tool() {
    assert_eq!(grid(&s).plane, Plane::Right);
    assert!(s.doc().unwrap().selection.is_empty());
    assert_eq!(undo_len(&s), n);
-    // A hidden grid takes no clicks; choosing a perspective tool shows it.
+    // While the grid is hidden only the perspective tools show it (and take its clicks).
    run(&mut s, "perspective.grid.show", json!({"visible": false}));
    let q = face(&s, view, WidgetCorner::TopLeft, Plane::Ground);
    click(&mut s, q, view);
@@ -1,6 +1,6 @@
 //! Preferences: `prefs.get` / `prefs.set` / `prefs.reset` / `prefs.list`.

-use serde_json::{Value, json};
+use serde_json::json;

 use super::*;
 use crate::cmd::prefscmds::{PREF_CATEGORIES, PREF_GROUPS, PREF_SPECS, validate};
@@ -123,523 +123,32 @@ fn prefs_serde_round_trip_and_tolerates_missing_fields() {
    assert_eq!(partial.corner_radius, 12.0);
 }

-/// Performance › Graphics Processor (#306, #502): automatic by default, set by value or label,
-/// kept through a save/load round trip, and a bad value (0.5.0's `powerSaving` among them) is an
-/// error that changes nothing.
+/// Performance › Graphics Processor (#306): power saving by default, set by value or label, kept
+/// through a save/load round trip, and a bad value is an error that changes nothing.
 #[test]
-fn gpu_preference_defaults_to_automatic_and_validates() {
+fn gpu_preference_defaults_to_power_saving_and_validates() {
    let mut s = Session::new();
-    assert_eq!(s.prefs.gpu_preference, "automatic");
-    assert_eq!(s.execute("prefs.get", &json!({"key": "gpuPreference"})).unwrap(), json!("automatic"));
+    assert_eq!(s.prefs.gpu_preference, "powerSaving");
+    assert_eq!(s.execute("prefs.get", &json!({"key": "gpuPreference"})).unwrap(), json!("powerSaving"));
    s.execute("prefs.set", &json!({"key": "gpuPreference", "value": "highPerformance"})).unwrap();
    assert_eq!(s.prefs.gpu_preference, "highPerformance");
    s.execute("prefs.set", &json!({"key": "gpuPreference", "value": "Power Saving (integrated)"})).unwrap();
-    assert_eq!(s.prefs.gpu_preference, "lowPower");
-    s.execute("prefs.set", &json!({"key": "gpuPreference", "value": "automatic"})).unwrap();
-    assert_eq!(s.prefs.gpu_preference, "automatic");
-    for bad in [json!("powerSaving"), json!("turbo"), json!(""), json!(1), json!(null), json!(["highPerformance"])] {
+    assert_eq!(s.prefs.gpu_preference, "powerSaving");
+    for bad in [json!("turbo"), json!(""), json!(1), json!(null), json!(["highPerformance"])] {
        assert!(s.execute("prefs.set", &json!({"key": "gpuPreference", "value": bad})).is_err(), "{bad}");
-        assert_eq!(s.prefs.gpu_preference, "automatic");
+        assert_eq!(s.prefs.gpu_preference, "powerSaving");
    }
-    let p = Prefs { gpu_preference: "lowPower".into(), ..Default::default() };
+    let p = Prefs { gpu_preference: "highPerformance".into(), ..Default::default() };
    let back: Prefs = serde_json::from_value(p.to_json()).unwrap();
-    assert_eq!(back.gpu_preference, "lowPower");
+    assert_eq!(back.gpu_preference, "highPerformance");
    // Preference files written before the preference existed get the default.
    let old: Prefs = serde_json::from_value(json!({"gpuPerformance": true})).unwrap();
-    assert_eq!(old.gpu_preference, "automatic");
+    assert_eq!(old.gpu_preference, "powerSaving");
    let l = s.execute("prefs.list", &json!({})).unwrap();
    let row = l.as_array().unwrap().iter().find(|e| e["key"] == "gpuPreference").unwrap().clone();
    assert_eq!(row["category"], "Performance");
-    assert_eq!(row["options"], json!(["automatic", "lowPower", "highPerformance"]));
+    assert_eq!(row["options"], json!(["powerSaving", "highPerformance"]));
    s.execute("prefs.set", &json!({"key": "gpuPreference", "value": "highPerformance"})).unwrap();
    s.execute("prefs.reset", &json!({"category": "Performance"})).unwrap();
-    assert_eq!(s.prefs.gpu_preference, "automatic");
-}
-
-/// Selection & Anchor Display › Tolerance, Object Selection by Path Only and Command Click to
-/// Select Objects Behind, and General › Double Click To Isolate, as the Selection tool sees them
-/// (#394).
-#[test]
-fn selection_preferences_drive_the_selection_tool() {
-    use vectorcraft_tools::{Mods, PointerEvent, PointerKind};
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-    let rect = |s: &mut Session, x: f64| {
-        NodeId(s.execute("shape.rectangle", &json!({"x": x, "y": 100, "width": 100, "height": 100})).unwrap()["id"].as_u64().unwrap())
-    };
-    // Two filled squares overlapping between x = 150 and 200, `front` on top.
-    let (back, front) = (rect(&mut s, 100.0), rect(&mut s, 150.0));
-    s.select_tool("selection", ViewInfo::default()).unwrap();
-    let set = |s: &mut Session, key: &str, value: Value| s.execute("prefs.set", &json!({"key": key, "value": value})).unwrap();
-    let click = |s: &mut Session, x: f64, mods: Mods| {
-        for k in [PointerKind::Down, PointerKind::Up] {
-            // Halfway between the bounding box's handles.
-            s.pointer(&PointerEvent::new(k, x, 125.0).with_mods(mods), ViewInfo::default()).unwrap();
-        }
-        s.doc().unwrap().selection.objects.clone()
-    };
-    let plain = Mods::default();
-    // Tolerance: the right edge's stroke ends at x = 250.5.
-    assert_eq!(click(&mut s, 252.5, plain), vec![front], "2 px out: within the default 3 px");
-    assert!(click(&mut s, 256.5, plain).is_empty(), "6 px out: beyond 3 px");
-    set(&mut s, "selectionTolerance", json!(8));
-    assert_eq!(click(&mut s, 256.5, plain), vec![front], "6 px out: within 8 px");
-    set(&mut s, "selectionTolerance", json!(1));
-    assert!(click(&mut s, 252.5, plain).is_empty(), "2 px out: beyond 1 px");
-    set(&mut s, "selectionTolerance", json!(3));
-    // Object Selection by Path Only: the fill no longer selects, the path does.
-    assert_eq!(click(&mut s, 225.0, plain), vec![front]);
-    set(&mut s, "objectSelectionByPathOnly", json!(true));
-    assert!(click(&mut s, 225.0, plain).is_empty(), "a click inside the fill selects nothing");
-    assert_eq!(click(&mut s, 250.0, plain), vec![front], "a click on the path selects it");
-    set(&mut s, "objectSelectionByPathOnly", json!(false));
-    // Command Click to Select Objects Behind (on by default): each Cmd/Ctrl-click goes one down,
-    // then back to the top.
-    let cmd = Mods { cmd: true, ..Mods::default() };
-    assert_eq!(click(&mut s, 175.0, plain), vec![front]);
-    assert_eq!(click(&mut s, 175.0, cmd), vec![back], "the object behind");
-    assert_eq!(click(&mut s, 175.0, cmd), vec![front], "back to the topmost");
-    set(&mut s, "ctrlClickSelectsBehind", json!(false));
-    assert_eq!(click(&mut s, 175.0, cmd), vec![front], "off: a plain click");
-    // Double Click To Isolate (on by default) isolates a group; off, it doesn't.
-    s.execute("select.all", &json!({})).unwrap();
-    s.execute("object.group", &json!({})).unwrap();
-    let double = |s: &mut Session| {
-        s.pointer(&PointerEvent::new(PointerKind::DoubleClick, 175.0, 150.0), ViewInfo::default()).unwrap();
-        s.doc().unwrap().isolation
-    };
-    set(&mut s, "doubleClickToIsolate", json!(false));
-    assert_eq!(double(&mut s), None, "off: no isolation");
-    set(&mut s, "doubleClickToIsolate", json!(true));
-    assert!(double(&mut s).is_some(), "on: the group is isolated");
-}
-
-/// General › Use Precise Cursors (#394): the Pen's pointer becomes a crosshair; the Selection
-/// tool's arrow stays.
-#[test]
-fn use_precise_cursors_makes_drawing_cursors_crosshairs() {
-    use vectorcraft_tools::{Cursor, Mods};
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-    let cursor = |s: &mut Session, tool: &str| {
-        s.select_tool(tool, ViewInfo::default()).unwrap();
-        s.cursor(vectorcraft_geom::Point::new(300.0, 300.0), Mods::default(), ViewInfo::default())
-    };
-    assert_eq!(cursor(&mut s, "pen"), Cursor::Pen);
-    s.execute("prefs.set", &json!({"key": "usePreciseCursors", "value": true})).unwrap();
-    assert_eq!(cursor(&mut s, "pen"), Cursor::Crosshair);
-    assert_eq!(cursor(&mut s, "selection"), Cursor::Arrow);
-}
-
-// ---------- #394, second batch ----------
-
-fn new_doc() -> Session {
-    let mut s = Session::new();
-    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
-    s
-}
-
-fn square(s: &mut Session, x: f64, y: f64) -> NodeId {
-    NodeId(s.execute("shape.rectangle", &json!({"x": x, "y": y, "width": 50, "height": 50})).unwrap()["id"].as_u64().unwrap())
-}
-
-fn set_pref(s: &mut Session, key: &str, value: Value) {
-    s.execute("prefs.set", &json!({"key": key, "value": value})).unwrap();
-}
-
-fn gesture(s: &mut Session, v: ViewInfo, events: &[(vectorcraft_tools::PointerKind, f64, f64)]) {
-    for (k, x, y) in events {
-        s.pointer(&vectorcraft_tools::PointerEvent::new(*k, *x, *y), v).unwrap();
-    }
-}
-
-fn top_left(s: &Session, id: NodeId) -> (f64, f64) {
-    let b = s.doc().unwrap().doc.node(id).unwrap().geometric_bounds().unwrap();
-    (b.x0, b.y0)
-}
-
-/// View › Snap to Point with Selection & Anchor Display › Snap to Point's distance (#394): with
-/// Smart Guides off, the point a selection is dragged by lands on an anchor within 2 px.
-#[test]
-fn snap_to_point_lands_a_dragged_selection_on_anchors() {
-    use vectorcraft_tools::PointerKind::{Down, Drag, Up};
-    let mut s = new_doc();
-    let a = square(&mut s, 100.0, 100.0);
-    square(&mut s, 300.0, 100.0);
-    let v = ViewInfo { smart_guides: false, ..ViewInfo::default() };
-    s.select_tool("selection", v).unwrap();
-    // Grabbed by its centre and dropped 1.5, 1 px from the other square's top-left anchor.
-    let drag = |s: &mut Session, v: ViewInfo| {
-        gesture(s, v, &[(Down, 125.0, 125.0), (Drag, 200.0, 110.0), (Drag, 301.5, 101.0), (Up, 301.5, 101.0)]);
-        let at = top_left(s, a);
-        s.execute("edit.undo", &json!({})).unwrap();
-        at
-    };
-    assert_eq!(drag(&mut s, v), (275.0, 75.0), "the centre lands on the anchor");
-    set_pref(&mut s, "snapToPointTolerance", json!(1));
-    assert_eq!(drag(&mut s, v), (276.5, 76.0), "1.8 px is beyond 1 px");
-    set_pref(&mut s, "snapToPointTolerance", json!(2));
-    assert_eq!(drag(&mut s, ViewInfo { snap_to_point: false, ..v }), (276.5, 76.0), "View › Snap to Point off");
-}
-
-/// Preferences › Smart Guides (#394): Color, Alignment Guides, Anchor/Path Labels, Measurement
-/// Labels, Transform Tools and Snapping Tolerance change what the Selection tool shows while a
-/// square is dragged into line with another, and how far the pull reaches; a hidden guide still
-/// snaps.
-#[test]
-fn smart_guide_display_preferences_filter_the_overlays() {
-    use vectorcraft_tools::Overlay;
-    use vectorcraft_tools::PointerKind::{Down, Drag, Up};
-    let mut s = new_doc();
-    square(&mut s, 100.0, 100.0);
-    let b = square(&mut s, 200.0, 100.0);
-    let v = ViewInfo::default();
-    s.select_tool("selection", v).unwrap();
-    let count = |s: &mut Session, f: &dyn Fn(&Overlay) -> bool| s.overlays(v).iter().filter(|o| f(o)).count();
-    let line = |o: &Overlay| matches!(o, Overlay::Line { .. });
-    let label = |o: &Overlay| matches!(o, Overlay::Label { .. });
-    let measure = |o: &Overlay| matches!(o, Overlay::Measure { .. });
-    // `b` grabbed by its centre and dragged so its left edge comes `off` px from the first
-    // square's right edge (x = 150): the x of its left edge mid-drag, before the pointer is let go.
-    let drag_to = |s: &mut Session, off: f64| {
-        gesture(s, v, &[(Down, 225.0, 125.0), (Drag, 200.0, 125.0), (Drag, 175.0 + off, 125.0)]);
-        top_left(s, b).0
-    };
-    let release = |s: &mut Session| {
-        gesture(s, v, &[(Up, 175.0, 125.0)]);
-        s.execute("edit.undo", &json!({})).unwrap();
-    };
-    assert_eq!(drag_to(&mut s, 3.0), 150.0, "3 px off: into line");
-    assert!(count(&mut s, &line) > 0 && count(&mut s, &measure) == 1);
-    let magenta = s.overlays(v).iter().find_map(|o| if let Overlay::Line { color, .. } = o { Some(*color) } else { None });
-    assert_eq!(magenta, Some(vectorcraft_tools::guides::MAGENTA), "the default colour");
-    release(&mut s);
-    set_pref(&mut s, "smartGuideColor", json!("#00ff00"));
-    drag_to(&mut s, 3.0);
-    assert!(s.overlays(v).iter().all(|o| !matches!(o, Overlay::Line { color, .. } | Overlay::Label { color, .. } if *color != [0, 255, 0])));
-    release(&mut s);
-    set_pref(&mut s, "alignmentGuides", json!(false));
-    assert_eq!(drag_to(&mut s, 3.0), 150.0, "still into line");
-    assert_eq!(count(&mut s, &line), 0, "no line");
-    release(&mut s);
-    set_pref(&mut s, "measurementLabels", json!(false));
-    drag_to(&mut s, 3.0);
-    assert_eq!(count(&mut s, &measure), 0);
-    release(&mut s);
-    // Snapping Tolerance: 6 px is beyond the default 4, within 8.
-    assert_eq!(drag_to(&mut s, 6.0), 156.0);
-    release(&mut s);
-    set_pref(&mut s, "snappingTolerance", json!(8));
-    assert_eq!(drag_to(&mut s, 6.0), 150.0);
-    release(&mut s);
-    // Transform Tools: the size readout while a bounding-box handle is dragged.
-    let scale = |s: &mut Session| {
-        gesture(s, v, &[(Down, 225.0, 150.0), (Drag, 225.0, 170.0)]);
-        let n = count(s, &measure);
-        gesture(s, v, &[(Up, 225.0, 170.0)]);
-        s.execute("edit.undo", &json!({})).unwrap();
-        n
-    };
-    assert_eq!(scale(&mut s), 1);
-    set_pref(&mut s, "transformToolsGuides", json!(false));
-    assert_eq!(scale(&mut s), 0);
-    // Anchor/Path Labels: a drawn corner pulled onto an anchor says "anchor" (and still lands there).
-    s.select_tool("rectangle", v).unwrap();
-    let draw = |s: &mut Session| {
-        gesture(s, v, &[(Down, 300.0, 300.0), (Drag, 153.0, 151.0)]);
-        let n = count(s, &label);
-        gesture(s, v, &[(Up, 153.0, 151.0)]);
-        let at = top_left(s, s.doc().unwrap().selection.objects[0]);
-        s.execute("edit.undo", &json!({})).unwrap();
-        (n, at)
-    };
-    assert_eq!(draw(&mut s), (1, (150.0, 150.0)));
-    set_pref(&mut s, "anchorPathLabels", json!(false));
-    assert_eq!(draw(&mut s), (0, (150.0, 150.0)));
-}
-
-/// Enable Rubber Band for Pen Tool / Curvature Tool (#394): off, no segment follows the pointer.
-#[test]
-fn rubber_band_preferences_hide_the_preview_to_the_pointer() {
-    use vectorcraft_tools::Overlay;
-    use vectorcraft_tools::PointerKind::{Down, Move, Up};
-    let v = ViewInfo::default();
-    for (tool, key) in [("pen", "penRubberBand"), ("curvature", "curvatureRubberBand")] {
-        let mut s = new_doc();
-        s.select_tool(tool, v).unwrap();
-        gesture(&mut s, v, &[(Down, 50.0, 50.0), (Up, 50.0, 50.0), (Down, 150.0, 50.0), (Up, 150.0, 50.0), (Move, 200.0, 150.0)]);
-        let bands = |s: &mut Session| s.overlays(v).iter().filter(|o| matches!(o, Overlay::Path { .. })).count();
-        assert_eq!(bands(&mut s), 1, "{tool}: the rubber band");
-        set_pref(&mut s, key, json!(false));
-        assert_eq!(bands(&mut s), 0, "{tool}: off");
-    }
-}
-
-/// Move Locked and Hidden Artwork with Artboard (#394): off, an artboard moved with its art
-/// leaves locked and hidden objects where they are; on, they move too.
-#[test]
-fn move_locked_and_hidden_artwork_with_artboard() {
-    let mut s = new_doc();
-    let (free, locked, hidden) = (square(&mut s, 10.0, 10.0), square(&mut s, 100.0, 10.0), square(&mut s, 200.0, 10.0));
-    for (id, cmd) in [(locked, "object.lock"), (hidden, "object.hide")] {
-        s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
-        s.execute(cmd, &json!({})).unwrap();
-    }
-    let moved = |s: &mut Session| {
-        s.execute("artboard.move", &json!({"index": 0, "dx": 30, "dy": 0, "moveArt": true})).unwrap();
-        let xs = [free, locked, hidden].map(|id| top_left(s, id).0);
-        s.execute("edit.undo", &json!({})).unwrap();
-        xs
-    };
-    assert_eq!(moved(&mut s), [40.0, 100.0, 200.0]);
-    set_pref(&mut s, "moveLockedWithArtboard", json!(true));
-    assert_eq!(moved(&mut s), [40.0, 130.0, 230.0]);
-}
-
-/// General › Transform Pattern Tiles (#394) is what transforms do with pattern fills unless their
-/// `patterns` param says otherwise (the dialogs' Transform Patterns).
-#[test]
-fn transform_pattern_tiles_is_the_transforms_default() {
-    use vectorcraft_color::Paint;
-    let mut s = new_doc();
-    let tile = square(&mut s, 0.0, 0.0);
-    s.execute("select.set", &json!({"ids": [tile.0]})).unwrap();
-    s.execute("object.pattern.make", &json!({"name": "Dots", "width": 20, "height": 20})).unwrap();
-    s.execute("object.pattern.done", &json!({})).unwrap();
-    let big = square(&mut s, 100.0, 100.0);
-    s.execute("paint.setFill", &json!({"ids": [big.0], "swatch": "Dots"})).unwrap();
-    s.execute("select.set", &json!({"ids": [big.0]})).unwrap();
-    let tiles = |s: &Session| match s.doc().unwrap().doc.node(big).unwrap().appearance.fill_paint() {
-        Paint::Pattern { xf, .. } => xf.as_coeffs(),
-        p => panic!("not a pattern: {p:?}"),
-    };
-    s.execute("object.move", &json!({"dx": 10, "dy": 0})).unwrap();
-    assert_eq!(tiles(&s), [1.0, 0.0, 0.0, 1.0, 0.0, 0.0], "off: the tiles stay");
-    set_pref(&mut s, "transformPatternTiles", json!(true));
-    s.execute("object.move", &json!({"dx": 10, "dy": 0})).unwrap();
-    assert_eq!(tiles(&s), [1.0, 0.0, 0.0, 1.0, 10.0, 0.0], "on: they move with the art");
-    assert_eq!(s.journal.last().unwrap().1["patterns"], json!(true), "the journal keeps the choice");
-    s.execute("object.scale", &json!({"sx": 200, "origin": [0, 0], "patterns": false})).unwrap();
-    assert_eq!(tiles(&s), [1.0, 0.0, 0.0, 1.0, 10.0, 0.0], "the param wins");
-    s.execute("object.scale", &json!({"sx": 50, "origin": [0, 0]})).unwrap();
-    assert_eq!(tiles(&s), [0.5, 0.0, 0.0, 0.5, 5.0, 0.0]);
-}
-
-/// General › Select Same Tint % (#394): off, Select › Same › Fill Color takes every tint of the
-/// swatch; on, only the same tint.
-#[test]
-fn select_same_tint_percent() {
-    let mut s = new_doc();
-    s.execute("swatch.new", &json!({"name": "Ink", "color": "#cc0066", "spot": true})).unwrap();
-    // Before the others: new art takes the last fill applied.
-    square(&mut s, 300.0, 10.0);
-    let ids: Vec<NodeId> = [(10.0, 40), (100.0, 40), (200.0, 80)]
-        .into_iter()
-        .map(|(x, tint)| {
-            let id = square(&mut s, x, 10.0);
-            s.execute("paint.setFill", &json!({"ids": [id.0], "swatch": "Ink", "tint": tint})).unwrap();
-            id
-        })
-        .collect();
-    let same = |s: &mut Session| {
-        s.execute("select.set", &json!({"ids": [ids[0].0]})).unwrap();
-        s.execute("select.same.fillColor", &json!({})).unwrap();
-        s.doc().unwrap().selection.objects.len()
-    };
-    assert_eq!(same(&mut s), 3, "every tint of Ink");
-    set_pref(&mut s, "selectSameTintPercent", json!(true));
-    assert_eq!(same(&mut s), 2, "only Ink 40%");
-}
-
-fn style_at(s: &Session, id: NodeId, byte: usize) -> vectorcraft_doc::CharStyle {
-    let Some(vectorcraft_doc::NodeKind::Text(t)) = s.doc().unwrap().doc.node(id).map(|n| &n.kind) else { panic!("not text") };
-    let mut at = 0;
-    for r in &t.runs {
-        if byte < at + r.text.len() {
-            return r.style.clone();
-        }
-        at += r.text.len();
-    }
-    panic!("byte {byte} past the text")
-}
-
-/// Type › Size/Leading, Tracking and Baseline Shift (#394): the increments `type.step` and the
-/// font size shortcuts step by, on selected type objects and on the Type tool's selected text
-/// (Alt+arrows; Cmd/Ctrl too: five steps).
-#[test]
-fn type_increments_step_the_type() {
-    use vectorcraft_tools::PointerKind::{Down, Up};
-    use vectorcraft_tools::{Mods, ToolKey};
-    let mut s = new_doc();
-    let id = NodeId(s.execute("text.create", &json!({"x": 100, "y": 100, "text": "Hello world", "size": 20})).unwrap()["id"].as_u64().unwrap());
-    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
-    s.execute("type.size.increase", &json!({})).unwrap();
-    assert_eq!(style_at(&s, id, 0).size, 22.0, "Size/Leading is 2 pt");
-    set_pref(&mut s, "typeSizeIncrement", json!(3));
-    s.execute("type.size.decrease", &json!({})).unwrap();
-    assert_eq!(style_at(&s, id, 0).size, 19.0);
-    s.execute("type.step", &json!({"attribute": "leading"})).unwrap();
-    assert!((style_at(&s, id, 0).leading.unwrap() - (19.0 * 1.2 + 3.0)).abs() < 1e-9, "from Auto");
-    set_pref(&mut s, "baselineShiftIncrement", json!(1.5));
-    s.execute("type.step", &json!({"attribute": "baselineShift", "by": -2})).unwrap();
-    assert_eq!(style_at(&s, id, 10).baseline_shift, -3.0);
-    // The Type tool: Alt+→ tracks the selected text by Tracking (20/1000 em), Cmd-Alt five times.
-    let v = ViewInfo::default();
-    s.select_tool("type", v).unwrap();
-    gesture(&mut s, v, &[(Down, 102.0, 95.0), (Up, 102.0, 95.0)]);
-    assert_eq!(s.tool_options()["editing"], json!(id.0), "editing the text");
-    let alt = Mods { alt: true, ..Mods::default() };
-    let select = |s: &mut Session, a: usize, b: usize| s.set_tool_option("select", &json!({"start": a, "end": b}));
-    select(&mut s, 0, 5);
-    s.tool_key(ToolKey::Right, alt, v).unwrap();
-    assert_eq!((style_at(&s, id, 0).tracking, style_at(&s, id, 6).tracking), (20.0, 0.0));
-    s.tool_key(ToolKey::Left, Mods { cmd: true, ..alt }, v).unwrap();
-    assert_eq!(style_at(&s, id, 4).tracking, -80.0);
-    // At a caret: Alt+← kerns the character before it, Alt+↓ opens up the paragraph's leading.
-    select(&mut s, 3, 3);
-    s.tool_key(ToolKey::Left, alt, v).unwrap();
-    assert_eq!((style_at(&s, id, 2).kerning, style_at(&s, id, 3).kerning), (Some(-20.0), None));
-    let leading = style_at(&s, id, 0).leading.unwrap();
-    s.tool_key(ToolKey::Down, alt, v).unwrap();
-    assert_eq!(style_at(&s, id, 8).leading, Some(leading + 3.0));
-    // Alt+Shift+↑ raises the selected text's baseline.
-    select(&mut s, 6, 11);
-    s.tool_key(ToolKey::Up, Mods { shift: true, ..alt }, v).unwrap();
-    assert_eq!((style_at(&s, id, 0).baseline_shift, style_at(&s, id, 6).baseline_shift), (-3.0, -1.5));
-    // The font size shortcut steps the selected text while the tool edits.
-    s.execute("type.size.increase", &json!({})).unwrap();
-    assert_eq!((style_at(&s, id, 0).size, style_at(&s, id, 6).size), (19.0, 22.0));
-}
-
-/// Type › Fill New Type Objects With Placeholder Text (#394, on by default): type the Type tool
-/// places starts with placeholder text, selected, so typing replaces it; off, it starts empty.
-#[test]
-fn new_type_starts_with_placeholder_text() {
-    use vectorcraft_tools::PointerKind::{Down, Drag, Up};
-    let v = ViewInfo::default();
-    let mut s = new_doc();
-    s.select_tool("type", v).unwrap();
-    let text = |s: &Session| {
-        let st = s.doc().unwrap();
-        match &st.doc.node(st.selection.objects[0]).unwrap().kind {
-            vectorcraft_doc::NodeKind::Text(t) => t.plain_text(),
-            _ => panic!("not text"),
-        }
-    };
-    gesture(&mut s, v, &[(Down, 50.0, 50.0), (Up, 50.0, 50.0)]);
-    let placeholder = text(&s);
-    assert!(placeholder.len() > 10, "{placeholder}");
-    assert_eq!((s.tool_options()["start"].clone(), s.tool_options()["end"].clone()), (json!(0), json!(placeholder.len())), "selected");
-    s.tool_text("Hi", v).unwrap();
-    assert_eq!(text(&s), "Hi");
-    // Area type is filled to its frame.
-    gesture(&mut s, v, &[(Down, 100.0, 150.0), (Drag, 300.0, 300.0), (Up, 300.0, 300.0)]);
-    assert!(text(&s).len() > placeholder.len());
-    set_pref(&mut s, "placeholderText", json!(false));
-    gesture(&mut s, v, &[(Down, 50.0, 350.0), (Up, 50.0, 350.0)]);
-    assert_eq!(text(&s), "");
-}
-
-/// Type › Enable Missing Glyph Protection (#394, on by default): characters a new font has no
-/// glyph for keep the font that has one; off, they take the new font.
-#[test]
-fn missing_glyph_protection_keeps_glyphs_a_new_font_lacks() {
-    let (from, to, c) = ("Source Sans 3", "JetBrains Mono", '\u{180}');
-    let db = vectorcraft_text::FontDb::global();
-    let covers = |f: &str| db.face(f, "Regular").is_some_and(|face| face.covers(c));
-    if !covers(from) || covers(to) {
-        return; // Installed fonts of these names cover other characters.
-    }
-    let mut s = new_doc();
-    let id = NodeId(s.execute("text.create", &json!({"x": 10, "y": 50, "text": "a\u{180}c", "font": from})).unwrap()["id"].as_u64().unwrap());
-    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
-    let fonts = |s: &Session| [0, 1, 3].map(|b| style_at(s, id, b).font_family);
-    s.execute("text.setStyle", &json!({"font": to})).unwrap();
-    assert_eq!(fonts(&s), [to, from, to], "the character keeps its font");
-    s.execute("edit.undo", &json!({})).unwrap();
-    s.execute("text.setRangeStyle", &json!({"id": id.0, "start": 1, "end": 4, "font": to})).unwrap();
-    assert_eq!(fonts(&s), [from, from, to]);
-    s.execute("edit.undo", &json!({})).unwrap();
-    set_pref(&mut s, "missingGlyphProtection", json!(false));
-    s.execute("text.setStyle", &json!({"font": to})).unwrap();
-    assert_eq!(fonts(&s), [to, to, to]);
-}
-
-// ---------- #394, fourth batch ----------
-
-/// Type › Type Object Selection by Path Only (#394): on, a click among point type's glyphs no
-/// longer selects it with the Selection tool, a click on its baseline does; off (the default),
-/// anywhere in its bounds selects it.
-#[test]
-fn type_selection_by_path_only_picks_type_on_its_baseline() {
-    use vectorcraft_tools::{PointerEvent, PointerKind};
-    let mut s = new_doc();
-    let id = NodeId(s.execute("text.create", &json!({"x": 100, "y": 100, "text": "Hello world", "size": 20})).unwrap()["id"].as_u64().unwrap());
-    s.execute("select.none", &json!({})).unwrap();
-    let b = s.doc().unwrap().doc.node(id).and_then(|n| n.geometric_bounds()).unwrap();
-    assert!(b.y0 < 95.0 && b.x1 > 130.0, "the glyphs rise above the baseline at y = 100: {b:?}");
-    s.select_tool("selection", ViewInfo::default()).unwrap();
-    let click = |s: &mut Session, x: f64, y: f64| {
-        for k in [PointerKind::Down, PointerKind::Up] {
-            s.pointer(&PointerEvent::new(k, x, y), ViewInfo::default()).unwrap();
-        }
-        s.doc().unwrap().selection.objects.clone()
-    };
-    // Clear of the bounding box's handles: 15 px in from the left, halfway up the glyphs.
-    let (x, glyphs) = (b.x0 + 15.0, (b.y0 + 100.0) / 2.0);
-    assert_eq!(click(&mut s, x, glyphs), vec![id], "off: a click among the glyphs selects the type");
-    assert!(click(&mut s, x, 300.0).is_empty(), "empty canvas deselects");
-    set_pref(&mut s, "typeSelectionByPathOnly", json!(true));
-    assert!(click(&mut s, x, glyphs).is_empty(), "on: a click among the glyphs selects nothing");
-    assert_eq!(click(&mut s, x, 101.0), vec![id], "on: a click on the baseline selects it");
-    assert!(click(&mut s, x, 300.0).is_empty());
-    set_pref(&mut s, "typeSelectionByPathOnly", json!(false));
-    assert_eq!(click(&mut s, x, glyphs), vec![id], "off again: the glyphs select it");
-}
-
-/// Type Object Selection by Path Only (#394) with real layout: every line's baseline picks point
-/// type, between the lines nothing does; the Type tool still edits type clicked among its
-/// characters, and the Eyedropper still samples it there.
-#[test]
-fn type_selection_by_path_only_takes_every_line_and_spares_the_type_tool_and_eyedropper() {
-    use vectorcraft_tools::{PointerEvent, PointerKind};
-    let v = ViewInfo::default();
-    let mut s = new_doc();
-    let created = s
-        .execute(
-            "text.create",
-            &json!({"x": 100, "y": 100, "text": "Hello
-world", "size": 20}),
-        )
-        .unwrap();
-    let src = NodeId(created["id"].as_u64().unwrap());
-    s.execute("text.setStyle", &json!({"fill": "#00ff00"})).unwrap();
-    let NodeKind::Text(t) = &s.doc().unwrap().doc.node(src).unwrap().kind else { panic!("not type") };
-    let [(a, _), (b, _)] = t.cached_baselines[..] else { panic!("two baselines: {:?}", t.cached_baselines) };
-    let (first, second) = (t.xf * a, t.xf * b);
-    assert!(first.y == 100.0 && second.y > 115.0, "{first:?} {second:?}");
-    let click = |s: &mut Session, tool: &str, x: f64, y: f64| {
-        s.select_tool(tool, v).unwrap();
-        for k in [PointerKind::Down, PointerKind::Up] {
-            s.pointer(&PointerEvent::new(k, x, y), v).unwrap();
-        }
-        s.doc().unwrap().selection.objects.clone()
-    };
-    set_pref(&mut s, "typeSelectionByPathOnly", json!(true));
-    let x = first.x + 15.0;
-    assert!(click(&mut s, "selection", x, 300.0).is_empty());
-    assert_eq!(click(&mut s, "selection", x, second.y + 1.0), vec![src], "the second line's baseline");
-    assert!(click(&mut s, "selection", x, (first.y + second.y) / 2.0).is_empty(), "between the lines");
-    // The Type tool: a click among the glyphs puts the caret in that type, it adds none.
-    assert_eq!(click(&mut s, "type", x, first.y - 7.0), vec![src]);
-    assert!(s.tool_wants_text(), "editing");
-    let texts =
-        |s: &Session| s.doc().unwrap().doc.layers[0].children().map_or(0, |c| c.iter().filter(|n| matches!(n.kind, NodeKind::Text(_))).count());
-    assert_eq!(texts(&s), 1, "no new type");
-    // The Eyedropper: a click among the glyphs samples the type into the selected type.
-    s.select_tool("selection", v).unwrap();
-    let dst = NodeId(s.execute("text.create", &json!({"x": 100, "y": 300, "text": "Target"})).unwrap()["id"].as_u64().unwrap());
-    click(&mut s, "eyedropper", x, first.y - 7.0);
-    let NodeKind::Text(t) = &s.doc().unwrap().doc.node(dst).unwrap().kind else { panic!("not type") };
-    assert_eq!((t.first_style().size, t.first_style().fill.color().map(|c| c.to_hex())), (20.0, Some("#00ff00".into())));
+    assert_eq!(s.prefs.gpu_preference, "powerSaving");
 }
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 20 C5 11 8 7 12 7 S19 11 21 20"/><path d="M5 7 H19"/><circle cx="5" cy="7" r="1.4" fill="currentColor"/><circle cx="19" cy="7" r="1.4" fill="currentColor"/><rect x="10" y="5" width="4" height="4" fill="currentColor"/></svg>`
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l-7-7 3-6 8 3 3 7-7 3z" /><path d="M5 12l5-5"/><circle cx="11" cy="11" r="1.5"/><path d="M19 3v5M16.5 5.5h5"/></svg>`