Fix #505 : Illustrator EPS type with drop shadows and glows opens as vectors

Text effects from stock sites are Illustrator EPS with live type whose appearance (several fills and strokes, offset paths, drop shadows, glows) is flattened into many small images and clipped type. Made here with Illustrator 2026 (graphic styles and live effects on type, live and outlined, formats 2026, CS6, 10 and 8), every one fell back to its preview: - Illustrator's procsets keep their own graphics-state stack in a dictionary, count each `save` in it and raise `limitcheck` at 64, relying on `restore` to put the count back. `restore` didn't undo dictionary changes, so a file with more than 64 images (each drawn in a save) stopped. Now `restore` puts dictionaries back as they were at the `save`, as restoring virtual memory does: while a save is open, `def`, `store`, `put`, `undef` and dictionary `copy` keep the old value in a journal (counted against the memory budget), undone newest first. A save that was restored already (or through an outer one) can't be restored again (`invalidrestore`). - The Illustrator 8 format's pattern fills divide by the font cache's largest glyph (`cachestatus`), which was 0: it now reports a printer's sizes. - Type in Illustrator's reencoded font copies (`/Impact*1`) was set in the fallback font: the `*1` suffix is dropped when the family is looked up. The images of those effects also came in banded on main; that is #498's fix, which this builds on. Tests: 100 saves counted in a dictionary and restored, every dictionary change undone, saves restored twice, `cachestatus`, reencoded font names. The import fuzz vocabulary has saves and restores around dictionary changes. The generated files (not committed) now open with no warnings and look like their previews; the Illustrator 8-format ones draw what their PostScript holds (that format writes effects as opaque rasters). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Fix #498 : EPS colour images whose inks are read in turn aren't banded
2026-10-08 21:15:18 +07:00 · 2026-10-08 21:15:18 +07:00 · 2026-10-08 10:01:57 -04:00 · 2026-10-08 10:01:10 -04:00 · 2026-10-08 10:00:34 -04:00 · 2026-10-08 20:37:13 +07:00
81 changed files with 2468 additions and 358 deletions
@@ -54,4 +54,13 @@ 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 -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'"
+          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
@@ -1,9 +1,11 @@
 # 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.
 #
-# 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.
+# 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.
 name: Release

 on:
@@ -35,7 +37,7 @@ jobs:
  version:
    name: version
    runs-on: ubuntu-latest
-    environment: release
+    # No `environment: release`: no secrets here.
    outputs:
      version: ${{ steps.v.outputs.version }}
      date: ${{ steps.v.outputs.date }}
@@ -175,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 }}
-    environment: release
+    # No `environment: release`: Linux packages are not signed (checksums in SHA256SUMS.txt).
    strategy:
      fail-fast: false
      matrix:
@@ -200,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
+            desktop-file-utils appstream python3-yaml zsync
          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"
@@ -225,6 +227,12 @@ 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:
@@ -232,13 +240,52 @@ 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 as freebsd.yml).
+    # GitHub has no FreeBSD runners: build in a FreeBSD 14.3 VM (same image and packages as
+    # freebsd.yml).
    runs-on: ubuntu-latest
    timeout-minutes: 150
-    environment: release
+    # No `environment: release`: this job signs nothing, so it gets no release secrets.
    env:
      VECTORCRAFT_VERSION: ${{ needs.version.outputs.version }}
      VECTORCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
@@ -262,6 +309,7 @@ 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"
@@ -276,6 +324,8 @@ 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
@@ -286,7 +336,7 @@ jobs:
    name: Web (wasm)
    needs: version
    runs-on: ubuntu-latest
-    environment: release
+    # No `environment: release`: no secrets here.
    env:
      VECTORCRAFT_VERSION: ${{ needs.version.outputs.version }}
      VECTORCRAFT_BUILD_DATE: ${{ needs.version.outputs.date }}
@@ -327,7 +377,9 @@ jobs:

  release:
    name: Draft GitHub Release
-    needs: [version, macos, windows, linux, freebsd, web]
+    # 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]
    runs-on: ubuntu-latest
    environment: release
    permissions:
@@ -37,6 +37,9 @@ 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 |
@@ -4297,7 +4297,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "arboard",
 "block2 0.6.2",
@@ -4321,7 +4321,7 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "vectorcraft-doc"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "image",
 "jpeg-encoder",
@@ -4394,7 +4394,7 @@ dependencies = [

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

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

 [[package]]
 name = "vectorcraft-eps"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "flate2",
 "image",
@@ -4458,7 +4458,7 @@ dependencies = [

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

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

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

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

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

 [[package]]
 name = "vectorcraft-pdf"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "aes",
 "flate2",
@@ -4558,7 +4558,7 @@ dependencies = [

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

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

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

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

 [[package]]
 name = "vectorcraft-text"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "harfrust 0.13.3",
 "kurbo 0.13.1",
@@ -4656,7 +4656,7 @@ dependencies = [

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

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

 [[package]]
 name = "vectorcraft-ui-egui"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "egui",
 "egui_extras",
@@ -4713,7 +4713,7 @@ dependencies = [

 [[package]]
 name = "vectorcraft-web"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "eframe",
 "egui",
@@ -5816,7 +5816,7 @@ checksum = "9440ea3e5aeabb0ac63af70daf835274065238cdd0cec83418f417eae38bacee"

 [[package]]
 name = "xtask"
-version = "0.4.0"
+version = "0.6.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.4.0"
+version = "0.6.0"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 rust-version = "1.95"
@@ -54,6 +54,7 @@
  <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>
@@ -166,6 +167,10 @@ On laptops with two graphics processors, VectorCraft uses the power-saving (inte
 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)).

+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)).
+
 ### Use it from Claude Code and other agents

 Register the MCP server with Claude Code:
@@ -212,6 +217,51 @@ 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
@@ -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); see [Honest assessment](#honest-assessment-2026-10-05))._
+_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), Illustrator CS-and-later EPS images no longer banded (Line truncated

 ## Where we are

@@ -42,7 +42,7 @@ since 2026-10-01.
 | **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 (#306); 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); 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, and Finder opens every readable format with the macOS app (#295, #354); hybrid-graphics laptops render on the power-saving GPU by default (#306); 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) |
 | **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) |

@@ -70,7 +70,7 @@ Ordered by how much each gap blocks someone from switching. Sizes are one-agent
 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, accessibility, packaging. 50–80 h.
+   browser QA, pen tablets on Wayland and pen pressure beyond Windows (winit 0.31's tablet input, #491), accessibility, packaging. 50–80 h.

 ### Where we're going

@@ -97,23 +97,24 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **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.
  - 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.
  - 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).
  - 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.
+  - 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.
  - 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). They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). About 38 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…).
+  - 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 and dialogs step with Up/Down (Shift: ten, Ctrl/Cmd: a tenth of their unit), applied at once.
+  - 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. 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).
+  - **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).
@@ -128,7 +129,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
  - **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: the dragged edges align with the other objects; 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.
+- **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).
 - **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.
@@ -152,10 +153,10 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **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).
+  - 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), colour images whose ink planes are procedures reading one file in turn, as Illustrator CS and later write them (they came in banded, #498), `restore` putting dictionaries back as they were at the `save` (Illustrator's procsets count saves and stopped files with more than 64 images, such as the rasters of drop shadows and glows on type, #505), type in Illustrator's reencoded fonts (`Impact*1`) set in that font, 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).
 - **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 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. 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).
+- **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. 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.
 - **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
@@ -215,7 +216,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | 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, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 38 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, Show Pixel Grid, 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), 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 |
 | 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 |
@@ -687,6 +687,7 @@ fn lerp_text(o: &mut TextObject, x: &TextObject, y: &TextObject, t: f64) {
    }
    if resized {
        o.cached_bounds = None;
+        o.cached_baselines.clear();
    }
 }

@@ -50,11 +50,15 @@ 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 }
+        Self { tol: 3.0, outline: false, path_only: false, type_path_only: false }
    }
 }

@@ -190,6 +194,11 @@ fn hit_leaf(n: &Node, p: Point, opt: HitOptions) -> Option<HitKind> {
            }
            (!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)
+        }
        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)
        }
@@ -205,6 +214,28 @@ 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 {
@@ -404,6 +435,102 @@ mod tests {
        }
    }

+    /// 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() {
@@ -715,6 +715,10 @@ pub struct TextObject {
    /// 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,6 +735,7 @@ impl TextObject {
            path_spacing: 0.0,
            wrap: Vec::new(),
            cached_bounds: None,
+            cached_baselines: Vec::new(),
        }
    }
    pub fn plain_text(&self) -> String {
@@ -839,6 +844,15 @@ 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)]
@@ -300,7 +300,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));
-    t.cached_bounds = Some(vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t).bounds);
+    crate::cmd::typecmd::refresh_bounds(&mut t);
    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 }))
@@ -197,8 +197,7 @@ 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())) };
-    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t);
-    t.cached_bounds = Some(lay.bounds);
+    crate::cmd::typecmd::refresh_bounds(&mut t);
    t
 }

@@ -27,10 +27,26 @@ 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}", has_doc, toggle),
+        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.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}], add?: bool}", has_doc, anchors_many),
+        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!(
            "select.same.fillColor",
            "Fill Color",
@@ -217,8 +233,12 @@ fn add(s: &mut Session, p: &Value) -> Result<Value> {
 }

 fn toggle(s: &mut Session, p: &Value) -> Result<Value> {
-    let id = id_param(p, "id").ok_or_else(|| bad("select.toggle", "missing id"))?;
-    s.select(|_, sel| sel.toggle(id))?;
+    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);
+        }
+    })?;
    ok()
 }

@@ -262,16 +282,48 @@ 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();
-    let add = bool_or(p, "add", false);
+    // `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",
+    };
    s.select(|d, sel| {
-        if !add {
+        if mode == "set" {
            sel.clear();
        }
        for (id, refs) in items {
-            let total = d.node(id).and_then(|n| n.path_data()).map(|p| p.anchor_count()).unwrap_or(0);
+            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;
+            }
            sel.add(id);
-            if refs.len() < total {
-                sel.anchors.entry(id).or_default().extend(refs);
+            if next.len() < all.len() {
+                sel.anchors.insert(id, next);
            } else {
                sel.anchors.remove(&id);
            }
@@ -469,6 +469,7 @@ fn create_in_path(s: &mut Session, p: &Value) -> Result<Value> {
        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);
@@ -601,6 +602,7 @@ fn headline_tracking(t: &TextObject, target: f64) -> Option<f64> {
            path_spacing: 0.0,
            wrap: Vec::new(),
            cached_bounds: None,
+            cached_baselines: Vec::new(),
        };
        for r in &mut h.runs {
            r.style.tracking = tr;
@@ -97,10 +97,11 @@ 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 bounds cache after a text edit.
+/// Recompute the layout caches (bounds and baselines) 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.
@@ -397,6 +397,8 @@ 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
@@ -589,8 +589,7 @@ 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, outline: false, path_only: false });
+    let h = vectorcraft_doc::hit::hit_test(d, Point::new(50.0, 30.0), vectorcraft_doc::hit::HitOptions { tol: 1.0, ..Default::default() });
    assert_eq!(h.map(|h| h.leaf), Some(a));
 }

@@ -561,3 +561,82 @@ fn missing_glyph_protection_keeps_glyphs_a_new_font_lacks() {
    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())));
+}
@@ -338,6 +338,72 @@ fn lasso_selects_anchor_subset() {
    assert_eq!(st.selection.partial(a).map(|p| p.len()), Some(2));
 }

+/// Shift-drag a marquee with the Selection tool (#483): the selected objects it reaches are
+/// deselected and the others selected, the rest of the selection staying as it was.
+#[test]
+fn selection_shift_marquee_toggles_objects() {
+    let mut s = session();
+    let a = rect(&mut s, 100.0, 100.0, 50.0, 50.0);
+    let b = rect(&mut s, 200.0, 100.0, 50.0, 50.0);
+    let c = rect(&mut s, 300.0, 100.0, 50.0, 50.0);
+    s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
+    let shift = Mods { shift: true, ..Default::default() };
+    gesture(&mut s, "selection", &[(180.0, 80.0), (300.0, 200.0), (380.0, 200.0)], shift);
+    assert_eq!(s.doc().unwrap().selection.objects, vec![a, c]);
+    // Again over all three: a leaves, b joins, c leaves.
+    gesture(&mut s, "selection", &[(80.0, 80.0), (300.0, 200.0), (380.0, 200.0)], shift);
+    assert_eq!(s.doc().unwrap().selection.objects, vec![b]);
+    // Without Shift the marquee replaces the selection.
+    gesture(&mut s, "selection", &[(80.0, 80.0), (300.0, 200.0), (260.0, 200.0)], Mods::default());
+    assert_eq!(s.doc().unwrap().selection.objects, vec![a, b]);
+}
+
+/// Shift-drag a marquee with Direct Selection (#483): the anchors inside toggle; a path left with
+/// none of them leaves the selection, one with all of them is selected whole again.
+#[test]
+fn direct_selection_shift_marquee_toggles_anchors() {
+    let mut s = session();
+    let a = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
+    let b = rect(&mut s, 300.0, 100.0, 100.0, 100.0);
+    s.execute("select.set", &json!({"ids": [a.0]})).unwrap();
+    let shift = Mods { shift: true, ..Default::default() };
+    // Around a's top edge (two anchors, selected) and b's top-left anchor (not selected).
+    let top = [(90.0, 90.0), (310.0, 110.0), (310.0, 110.0)];
+    gesture(&mut s, "directSelection", &top, shift);
+    let st = s.doc().unwrap();
+    assert_eq!(st.selection.objects, vec![a, b]);
+    assert_eq!(st.selection.partial(a).map(|p| p.len()), Some(2), "a's bottom anchors stay");
+    assert_eq!(st.selection.partial(b).map(|p| p.len()), Some(1));
+    // The same again: a whole once more, b out.
+    gesture(&mut s, "directSelection", &top, shift);
+    let st = s.doc().unwrap();
+    assert_eq!(st.selection.objects, vec![a]);
+    assert_eq!(st.selection.partial(a), None);
+    // Group Selection's marquee toggles the same way.
+    gesture(&mut s, "groupSelection", &top, shift);
+    assert_eq!(s.doc().unwrap().selection.partial(a).map(|p| p.len()), Some(2));
+}
+
+/// The Lasso: Shift adds anchors, Alt takes them away, and neither drops the rest of the
+/// selection (a path selected whole stays whole when its anchors are added again).
+#[test]
+fn lasso_shift_adds_and_alt_subtracts() {
+    let mut s = session();
+    let a = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
+    let t = s.execute("text.create", &json!({"x": 300, "y": 300, "text": "Hi"})).unwrap();
+    let t = NodeId(t["id"].as_u64().unwrap());
+    s.execute("select.set", &json!({"ids": [a.0, t.0]})).unwrap();
+    // A loop round a's top-left anchor.
+    let corner = [(90.0, 90.0), (110.0, 90.0), (110.0, 110.0), (90.0, 110.0), (90.0, 110.0)];
+    gesture(&mut s, "lasso", &corner, Mods { shift: true, ..Default::default() });
+    let st = s.doc().unwrap();
+    assert_eq!((st.selection.objects.clone(), st.selection.partial(a)), (vec![a, t], None));
+    gesture(&mut s, "lasso", &corner, Mods { alt: true, ..Default::default() });
+    let st = s.doc().unwrap();
+    assert_eq!(st.selection.objects, vec![a, t], "the type stays selected");
+    assert_eq!(st.selection.partial(a).map(|p| p.len()), Some(3));
+}
+
 #[test]
 fn measure_tool_leaves_document_untouched() {
    let mut s = session();
@@ -166,6 +166,7 @@ impl Session {
            auto_add_delete: !self.prefs.disable_auto_add_delete,
            selection_tolerance: self.prefs.selection_tolerance,
            path_only: self.prefs.object_selection_by_path_only,
+            type_path_only: self.prefs.type_selection_by_path_only,
            double_click_isolate: self.prefs.double_click_to_isolate,
            select_behind: self.prefs.ctrl_click_selects_behind,
            highlight_anchors: self.prefs.highlight_anchors_on_hover,
@@ -180,6 +180,10 @@ fn structured_junk() {
        ("select.add", json!({"ids": [[1], {"a": 1}]})),
        ("select.anchors", json!({"id": 2, "anchors": [[99, 99], [-1, 0], ["a", "b"]], "mode": "set"})),
        ("select.anchorsMany", json!({"items": [{"id": 2, "anchors": [[0, 1000]]}, null, 5]})),
+        ("select.anchorsMany", json!({"items": [{"id": 2, "anchors": [[0, 1000], [0, 0]]}, {"id": u64::MAX}], "mode": "toggle"})),
+        ("select.anchorsMany", json!({"items": [{"id": 2, "anchors": [[0, 0]]}], "mode": "subtract"})),
+        ("select.anchorsMany", json!({"items": [], "mode": 7})),
+        ("select.toggle", json!({"ids": [2, u64::MAX, "x"]})),
        ("object.transform", json!({"matrix": [0, 0, 0, 0, 0, 0]})),
        ("object.transform", json!({"matrix": [1e308, 1e308, 1e308, 1e308, 1e308, 1e308]})),
        ("object.transform", json!({"matrix": [1, 2, 3]})),
@@ -949,7 +949,13 @@ fn arb_ps_token() -> impl Strategy<Value = String> {
            "/T4 << /FontType 3 /FontMatrix [1 0 0 1 0 0] /BuildGlyph { pop pop (x) show } /Encoding [/a] >> definefont setfont",
            "glyphshow", "xshow", "xyshow", "awidthshow", "kshow", "/a", "[1 2 3]",
            // Executable strings and integer keys (Illustrator 8's procsets).
-            "(>>) cvx", "(1 2 add) cvx exec", "(x) cvx dup exec", "0 load", "1 { } def", "(mark) cvx cvlit"
+            // Several data sources reading one file in turn, and strings of other lengths.
+            "/f currentfile /ASCIIHexDecode filter def", "{f 3 string readstring pop}", "{f 0 string readstring pop}", "true 3 colorimage",
+            "3 2 8 [3 0 0 2 0 0] {f 5 string readstring pop} {(ab)} {f 1 string readstring pop} true 3 colorimage",
+            "<< /ImageType 1 /Width 3 /Height 2 /BitsPerComponent 4 /Decode [0 1 0 1 0 1 0 1] /ImageMatrix [3 0 0 2 0 0] /MultipleDataSources true /DataSource [(a) (bc) {f 2 string readstring pop} (d)] >>",
+            // Virtual memory restored: dictionary changes undone, saves restored twice.
+            "/a 1 def save /a 2 def", "restore", "save dup restore", "1 dict save exch /k 1 put", "cachestatus", "/n 0 def save /n n 1 add store",
+                        "(>>) cvx", "(1 2 add) cvx exec", "(x) cvx dup exec", "0 load", "1 { } def", "(mark) cvx cvlit"
        ])
        .prop_map(str::to_string),
    ]
@@ -635,33 +635,50 @@ impl Interp<'_> {

    /// The bytes a data procedure gives, called until it gives an empty string or `n` bytes.
    fn gather(&mut self, p: &Obj, n: usize) -> Res<Vec<u8>> {
-        let mut out = vec![];
-        while out.len() < n {
-            self.call(p.clone())?;
-            let s = self.pop_str()?;
-            let s = s.borrow();
-            if s.is_empty() {
-                break;
-            }
-            self.alloc(s.len())?;
-            out.extend_from_slice(&s);
-        }
-        out.truncate(n);
-        Ok(out)
+        Ok(self.read_sources(&[Source::Proc(p.clone())], n, n)?.pop().unwrap_or_default())
    }

    /// `n` bytes of image data from `src` (zeros past its end).
    fn source_bytes(&mut self, src: &Source, n: usize) -> Res<Vec<u8>> {
-        let mut v = match src {
-            Source::File(f) => self.read(f, n)?,
-            Source::Str(s) if !s.is_empty() => s.iter().copied().cycle().take(n).collect(),
-            Source::Str(_) => vec![],
-            Source::Proc(p) => self.gather(p, n)?,
-        };
+        let mut v = self.read_sources(std::slice::from_ref(src), n, n)?.pop().unwrap_or_default();
        v.resize(n, 0);
        Ok(v)
    }

+    /// Up to `n` bytes from each of `sources`, read in turn as an image reads its data sources:
+    /// each procedure called once a round (its string, whatever its length), each file and
+    /// string giving `step` bytes a round, until each has given `n` bytes or ended. Procedures
+    /// reading one file (the planes of an image, row by row) get their own rows that way.
+    fn read_sources(&mut self, sources: &[Source], n: usize, step: usize) -> Res<Vec<Vec<u8>>> {
+        let mut out: Vec<Vec<u8>> = vec![vec![]; sources.len()];
+        let mut ended = vec![false; sources.len()];
+        while out.iter().zip(&ended).any(|(o, e)| o.len() < n && !e) {
+            for ((src, o), e) in sources.iter().zip(out.iter_mut()).zip(ended.iter_mut()) {
+                if *e || o.len() >= n {
+                    continue;
+                }
+                let want = step.min(n - o.len());
+                let chunk = match src {
+                    Source::File(f) => self.read(f, want)?,
+                    // A string gives its bytes over and over.
+                    Source::Str(s) => {
+                        let at = o.len() % s.len().max(1);
+                        s.get(at..).unwrap_or_default().iter().chain(s.iter().cycle()).take(want).copied().collect()
+                    }
+                    Source::Proc(p) => {
+                        self.call(p.clone())?;
+                        let s = self.pop_str()?.to_vec();
+                        self.alloc(s.len())?;
+                        s
+                    }
+                };
+                *e = chunk.is_empty();
+                o.extend_from_slice(chunk.get(..chunk.len().min(n - o.len())).unwrap_or_default());
+            }
+        }
+        Ok(out)
+    }
+
    /// `eexec`: an encrypted font program follows. It is skipped (type is drawn in the app's
    /// fonts, by name): the font dictionary it would complete is defined as it is.
    fn eexec(&mut self) -> Res {
@@ -849,16 +866,12 @@ impl Interp<'_> {
        let multi = s.sources.len() > 1;
        let row_bits = if multi { s.w * bpc } else { s.w * n * bpc };
        let row = row_bits.div_ceil(8);
-        let planes: Vec<Vec<u8>> = if multi {
-            let mut v = vec![];
-            for src in &s.sources {
-                v.push(self.source_bytes(src, row * s.h)?);
-            }
-            v
-        } else {
-            let src = s.sources.first().ok_or(PsError::Ps("undefined", "DataSource".into()))?;
-            vec![self.source_bytes(src, row * s.h)?]
-        };
+        // Several sources are read a row at a time each, in turn (zeros past their ends).
+        let sources = if multi { &s.sources[..] } else { s.sources.get(..1).ok_or(PsError::Ps("undefined", "DataSource".into()))? };
+        let mut planes = self.read_sources(sources, row * s.h, if multi { row } else { row * s.h })?;
+        for p in &mut planes {
+            p.resize(row * s.h, 0);
+        }
        let max = ((1u32 << bpc.min(16)) - 1) as f64;
        let sample = |plane: &[u8], y: usize, i: usize| -> u32 {
            let bit = y * row * 8 + i * bpc;
@@ -49,6 +49,11 @@ pub(crate) struct Interp<'a> {
    /// Bytes asked for so far (see [`MAX_MEMORY`]).
    allocated: usize,
    seed: u32,
+    /// The `save`s not restored yet, oldest first.
+    saves: Vec<SaveMark>,
+    /// What dictionary entries were before they changed since the oldest `save` (dictionary,
+    /// key, old value): `restore` puts them back, as restoring virtual memory does.
+    journal: Vec<(DictRef, Key, Option<Obj>)>,
    /// Where the error that is unwinding was raised (see [`Fault`]).
    pub fault: Option<Fault>,
    /// The width a Type 3 glyph procedure gave (`setcachedevice`, `setcharwidth`).
@@ -72,6 +77,13 @@ pub(crate) struct Fault {
 /// Most procedure names a [`Fault`] keeps.
 const FAULT_PROCS: usize = 3;

+/// Where a `save` was made: the graphics states saved and the journal's length then.
+#[derive(Clone, Copy, Debug)]
+struct SaveMark {
+    gstates: usize,
+    journal: usize,
+}
+
 fn new_dict() -> DictRef {
    Rc::new(RefCell::new(Dict::new()))
 }
@@ -143,6 +155,8 @@ impl<'a> Interp<'a> {
            ops: 0,
            allocated: 0,
            seed: 1,
+            saves: vec![],
+            journal: vec![],
            fault: None,
            glyph_width: None,
            g,
@@ -190,6 +204,7 @@ impl<'a> Interp<'a> {
        }
        self.dicts.clear();
        self.stack.clear();
+        self.journal.clear();
    }

    // ---------- the operand stack ----------
@@ -879,7 +894,7 @@ impl<'a> Interp<'a> {
                    }
                    Obj::Dict(d) => {
                        let key = k.key().ok_or(PsError::Ps("typecheck", String::new()))?;
-                        insert(&d, key, v)?;
+                        self.insert(&d, key, Some(v))?;
                        true
                    }
                    _ => return ps_err("typecheck", ""),
@@ -968,7 +983,7 @@ impl<'a> Interp<'a> {
                let v = self.pop()?;
                let k = self.pop()?.key().ok_or(PsError::Ps("typecheck", String::new()))?;
                let d = self.dicts.last().cloned().ok_or(PsError::Ps("dictstackunderflow", String::new()))?;
-                insert(&d, k, v)?;
+                self.insert(&d, k, Some(v))?;
            }
            Load => {
                let k = self.pop()?;
@@ -981,7 +996,7 @@ impl<'a> Interp<'a> {
                let k = self.pop()?.key().ok_or(PsError::Ps("typecheck", String::new()))?;
                let d = self.dicts.iter().rev().find(|d| d.borrow().contains_key(&k)).or(self.dicts.last()).cloned();
                let d = d.ok_or(PsError::Ps("dictstackunderflow", String::new()))?;
-                insert(&d, k, v)?;
+                self.insert(&d, k, Some(v))?;
            }
            Known => {
                let k = self.pop()?.key().ok_or(PsError::Ps("typecheck", String::new()))?;
@@ -1001,7 +1016,8 @@ impl<'a> Interp<'a> {
            }
            Undef => {
                let k = self.pop()?.key().ok_or(PsError::Ps("typecheck", String::new()))?;
-                self.pop_dict()?.borrow_mut().remove(&k);
+                let d = self.pop_dict()?;
+                self.insert(&d, k, None)?;
            }
            CurrentDict => {
                let d = self.dicts.last().cloned().ok_or(PsError::Ps("dictstackunderflow", String::new()))?;
@@ -1034,11 +1050,23 @@ impl<'a> Interp<'a> {
            }
            Save => {
                self.gsave()?;
-                self.push(Obj::Save(self.saved.len()))?;
+                self.push(Obj::Save(self.saves.len()))?;
+                self.saves.push(SaveMark { gstates: self.saved.len(), journal: self.journal.len() });
            }
            Restore => {
-                let Obj::Save(level) = self.pop()? else { return ps_err("typecheck", "") };
-                while self.saved.len() >= level && !self.saved.is_empty() {
+                let Obj::Save(i) = self.pop()? else { return ps_err("typecheck", "") };
+                // A save restored already (or through an outer one) can't be restored again.
+                let mark = self.saves.get(i).copied().ok_or(PsError::Ps("invalidrestore", String::new()))?;
+                self.saves.truncate(i);
+                // The dictionaries as they were at the save, newest change undone first.
+                for (d, k, old) in self.journal.drain(mark.journal..).rev() {
+                    let mut d = d.borrow_mut();
+                    match old {
+                        Some(v) => d.insert(k, v),
+                        None => d.remove(&k),
+                    };
+                }
+                while self.saved.len() >= mark.gstates && !self.saved.is_empty() {
                    self.grestore();
                }
            }
@@ -1083,9 +1111,11 @@ impl<'a> Interp<'a> {
                    self.push(Obj::Int(1 << 20))?;
                }
            }
+            // An empty font cache with a printer's sizes: bytes used and most, fonts used and most,
+            // glyphs used and most, and the largest glyph cached (programs divide by it).
            CacheStatus => {
-                for _ in 0..7 {
-                    self.push(Obj::Int(0))?;
+                for v in [0, 1 << 20, 0, 1000, 0, 10_000, 25_000] {
+                    self.push(Obj::Int(v))?;
                }
            }
            StartJob => {
@@ -1143,7 +1173,9 @@ impl<'a> Interp<'a> {
            }
            Obj::Dict(d) => {
                let from = self.pop_dict()?.borrow().clone();
-                d.borrow_mut().extend(from);
+                for (k, v) in from {
+                    self.insert(&d, k, Some(v))?;
+                }
                self.push(Obj::Dict(d))?;
            }
            _ => return ps_err("typecheck", "copy"),
@@ -1219,6 +1251,26 @@ impl<'a> Interp<'a> {
        }
    }

+    /// Put `v` under `k` in `d` (`None`: remove it), within [`MAX_ALLOC`] entries; while a `save`
+    /// is open the old value is kept for `restore`.
+    fn insert(&mut self, d: &DictRef, k: Key, v: Option<Obj>) -> Res {
+        let old = {
+            let mut dm = d.borrow_mut();
+            if v.is_some() && dm.len() >= MAX_ALLOC && !dm.contains_key(&k) {
+                return Err(PsError::Limit("a dictionary grew too large"));
+            }
+            match v {
+                Some(v) => dm.insert(k.clone(), v),
+                None => dm.remove(&k),
+            }
+        };
+        if !self.saves.is_empty() {
+            self.alloc(2 * std::mem::size_of::<Obj>())?;
+            self.journal.push((d.clone(), k, old));
+        }
+        Ok(())
+    }
+
    // ---------- resources ----------

    /// The resources of `category`.
@@ -1293,16 +1345,6 @@ impl<'a> Interp<'a> {
    }
 }

-/// Put `v` under `k` in `d`, within [`MAX_ALLOC`] entries.
-fn insert(d: &DictRef, k: Key, v: Obj) -> Res {
-    let mut d = d.borrow_mut();
-    if d.len() >= MAX_ALLOC && !d.contains_key(&k) {
-        return Err(PsError::Limit("a dictionary grew too large"));
-    }
-    d.insert(k, v);
-    Ok(())
-}
-
 /// An array or string index.
 fn index(k: &Obj) -> Res<usize> {
    match *k {
@@ -39,6 +39,8 @@ mod tests_fontnames;
 mod tests_generators;
 #[cfg(test)]
 mod tests_illustrator;
+#[cfg(test)]
+mod tests_images;

 use std::sync::Arc;

@@ -280,6 +280,10 @@ fn type_becomes_point_type_in_the_font_named() {
    assert!(t2.xf.translation().x > 15.0);
    assert_eq!(crate::family_style("ABCDEF+TimesNewRomanPS-BoldItalicMT"), ("Times New Roman".into(), "Bold Italic".into()));
    assert_eq!(crate::family_style("Times-Roman"), ("Times".into(), "Regular".into()));
+    // Illustrator's reencoded copies (#505).
+    assert_eq!(crate::family_style("Impact*1"), ("Impact".into(), "Regular".into()));
+    assert_eq!(crate::family_style("MyriadPro-Bold*12"), ("Myriad Pro".into(), "Bold".into()));
+    assert_eq!(crate::family_style("Odd*Name"), ("Odd*Name".into(), "Regular".into()));
 }

 #[test]
@@ -42,7 +42,7 @@ fn a85_flate(data: &[u8]) -> String {
 }

 /// Pixel `(x, y)` (straight RGBA) of the first image in `d`.
-fn pixel(d: &Document, x: u32, y: u32) -> [u8; 4] {
+pub(super) fn pixel(d: &Document, x: u32, y: u32) -> [u8; 4] {
    let im = all(d)
        .into_iter()
        .find_map(|n| match &n.kind {
@@ -991,3 +991,27 @@ showpage"##;
    assert!(all(d).iter().any(|n| fill(n).and_then(Paint::color) == Some(Color::rgb(0.0, 1.0, 0.0))));
    assert_eq!(objects(d).len(), 3);
 }
+
+/// `restore` puts dictionaries back as they were at the `save`, as restoring virtual memory does:
+/// Illustrator's procsets count `save`s in a dictionary and raise `limitcheck` at 64, so every file
+/// with more than 64 images (the rasters of drop shadows and glows on type, #505) fell back to
+/// its preview while the count only grew.
+#[test]
+fn restore_puts_dictionaries_back() {
+    let r = read(
+        "/AGM 4 dict def AGM /n 0 put \
+         /mysave { save AGM /n get 1 add dup 64 ge { limitcheck } if AGM exch /n exch put } def \
+         1 1 100 { pop mysave 0 0 1 1 rectfill restore } for AGM /n get 0 eq { 10 10 5 5 rectfill } if",
+    );
+    clean(&r);
+    assert_eq!(objects(&r.document).len(), 101);
+    // def, store, put, undef and copy are undone, newest first; a save restored can't be again.
+    super::tests::check(
+        "/a 1 def /d 2 dict def d /k 1 put save /a 2 def /b 3 def d /k 2 put d /k undef 1 dict dup /z 9 put d copy pop \
+         /a 4 store restore a 1 eq /b where not and d /k get 1 eq and d /z known not and",
+    );
+    super::tests::check("save dup restore { restore } stopped");
+    super::tests::check("save save exch restore { restore } stopped");
+    // The font cache's sizes are numbers programs divide by (Illustrator 8's pattern fills).
+    super::tests::check("cachestatus 7 1 roll 6 { pop } repeat 0 gt");
+}
@@ -0,0 +1,128 @@
+//! Image data read the way images read it: several data sources in turn, rows padded to a byte at
+//! every bit depth and odd widths, predictors undone row by row (#498).
+
+use super::tests::read;
+use super::tests_generators::pixel;
+
+/// Each pixel of the first image, row by row.
+fn pixels(r: &crate::Imported, w: u32, h: u32) -> Vec<[u8; 4]> {
+    assert!(!r.preview && r.warnings.is_empty(), "{:?}", r.warnings);
+    (0..h).flat_map(|y| (0..w).map(move |x| (x, y))).map(|(x, y)| pixel(&r.document, x, y)).collect()
+}
+
+/// A CMYK image whose four data sources are procedures reading one file, a row of one ink each in
+/// turn (how Illustrator CS and later write colour images): each source gets its own rows. Read
+/// one after the other, the cyan source took the first four rows of all four inks and the image
+/// came out in horizontal bands (#498).
+#[test]
+fn procedures_reading_one_file_are_read_in_turn() {
+    // 3 × 2 pixels; rows: C M Y K of row 0, then of row 1.
+    let rows = ["ff0000", "00ff00", "000000", "000000", "000000", "000000", "ffff00", "0000ff"];
+    let r = read(&format!(
+        "/DeviceCMYK setcolorspace 30 20 scale /f currentfile /ASCIIHexDecode filter def \
+         << /ImageType 1 /Width 3 /Height 2 /BitsPerComponent 8 /Decode [0 1 0 1 0 1 0 1] /ImageMatrix [3 0 0 -2 0 2] \
+         /MultipleDataSources true /DataSource [ {{f 3 string readstring pop}} {{f 3 string readstring pop}} \
+         {{f 3 string readstring pop}} {{f 3 string readstring pop}} ] >> image\n{}>",
+        rows.concat()
+    ));
+    let cyan = [0, 174, 239, 255];
+    let magenta = [236, 0, 140, 255];
+    let yellow = [255, 242, 0, 255];
+    let black = [35, 31, 32, 255];
+    let white = [255, 255, 255, 255];
+    let px = pixels(&r, 3, 2);
+    let near = |a: [u8; 4], b: [u8; 4]| a.iter().zip(b).all(|(x, y)| x.abs_diff(y) <= 40);
+    let want = [cyan, magenta, white, yellow, yellow, black];
+    assert!(px.iter().zip(want).all(|(a, b)| near(*a, b)), "{px:?}");
+
+    // The operand form: `{r} {g} {b} true 3 colorimage`, procedures reading one file.
+    let r = read(
+        "30 20 scale /f currentfile /ASCIIHexDecode filter def \
+         3 2 8 [3 0 0 -2 0 2] {f 3 string readstring pop} {f 3 string readstring pop} {f 3 string readstring pop} true 3 colorimage\n\
+         ff0000 00ff00 0000ff 102030 405060 708090>",
+    );
+    assert_eq!(pixels(&r, 3, 2), [[255, 0, 0, 255], [0, 255, 0, 255], [0, 0, 255, 255], [16, 64, 112, 255], [32, 80, 128, 255], [48, 96, 144, 255]]);
+}
+
+/// Separate strings and files as the sources: each is read for its own plane, whatever the row.
+#[test]
+fn separate_sources_keep_their_planes() {
+    let r = read("30 20 scale 3 2 8 [3 0 0 -2 0 2] <ff0000102030> <00ff00405060> <0000ff708090> true 3 colorimage");
+    assert_eq!(pixels(&r, 3, 2), [[255, 0, 0, 255], [0, 255, 0, 255], [0, 0, 255, 255], [16, 64, 112, 255], [32, 80, 128, 255], [48, 96, 144, 255]]);
+}
+
+/// Rows of an odd width at 1, 2, 4, 12 and 16 bits a sample start at a byte (their last byte
+/// padded), in one source and in several.
+#[test]
+fn rows_of_every_depth_start_at_a_byte() {
+    // 3 pixels a row, two rows: 0, max, mid / max, 0, 0 (grey), each row padded.
+    let cases = [
+        (1, "a0 80"),                  // 101(00000) 100(00000)
+        (2, "cc c0"),                  // 11 00 11 (00), 11 00 00 (00)
+        (4, "f0 80 f0 00"),            // f 0 8 (0), f 0 0 (0)
+        (12, "fff0008000 fff0000000"), // fff 000 800 (0), fff 000 000 (0)
+        (16, "ffff00008000 ffff00000000"),
+    ];
+    for (bpc, data) in cases {
+        let data = data.replace(' ', "");
+        let r = read(&format!("30 20 scale 3 2 {bpc} [3 0 0 -2 0 2] <{data}> image"));
+        let px: Vec<u8> = pixels(&r, 3, 2).iter().map(|p| p[0]).collect();
+        let want: &[u8] = match bpc {
+            1 => &[255, 0, 255, 255, 0, 0],
+            2 => &[255, 0, 255, 255, 0, 0],
+            4 => &[255, 0, 136, 255, 0, 0],
+            12 => &[255, 0, 128, 255, 0, 0],
+            _ => &[255, 0, 128, 255, 0, 0],
+        };
+        assert_eq!(px, want, "{bpc} bits");
+    }
+    // Several 4-bit sources, odd width: each plane's rows padded on their own.
+    let r = read("30 20 scale 3 2 4 [3 0 0 -2 0 2] <f0f000f0> <0f00f000> <00f00ff0> true 3 colorimage");
+    let (on, off) = (255, 0);
+    let want = [[on, off, off], [off, on, off], [on, off, on], [off, on, off], [off, off, on], [on, off, on]];
+    assert_eq!(pixels(&r, 3, 2), want.map(|[r, g, b]| [r, g, b, 255]));
+}
+
+/// A PNG-predicted Flate image of an odd width: every row filter (None, Sub, Up, Average, Paeth)
+/// undone on its own row.
+#[test]
+fn predicted_rows_of_an_odd_width() {
+    // 3 RGB pixels a row, five rows; each row predicted with its own filter.
+    let raw: Vec<[u8; 9]> = (0..5u8).map(|y| std::array::from_fn(|i| (i as u8).wrapping_mul(29).wrapping_add(y.wrapping_mul(53)))).collect();
+    let mut encoded = vec![];
+    let mut prev = [0u8; 9];
+    for (kind, row) in raw.iter().enumerate() {
+        encoded.push(kind as u8);
+        for i in 0..9 {
+            let a = if i >= 3 { row[i - 3] } else { 0 };
+            let b = prev[i];
+            let c = if i >= 3 { prev[i - 3] } else { 0 };
+            let pred = match kind {
+                1 => a,
+                2 => b,
+                3 => ((u16::from(a) + u16::from(b)) / 2) as u8,
+                4 => {
+                    let p = i16::from(a) + i16::from(b) - i16::from(c);
+                    let (pa, pb, pc) = ((p - i16::from(a)).abs(), (p - i16::from(b)).abs(), (p - i16::from(c)).abs());
+                    if pa <= pb && pa <= pc {
+                        a
+                    } else if pb <= pc {
+                        b
+                    } else {
+                        c
+                    }
+                }
+                _ => 0,
+            };
+            encoded.push(row[i].wrapping_sub(pred));
+        }
+        prev = *row;
+    }
+    let r = read(&format!(
+        "/DeviceRGB setcolorspace 30 50 scale << /ImageType 1 /Width 3 /Height 5 /BitsPerComponent 8 /Decode [0 1 0 1 0 1] /ImageMatrix [3 0 0 -5 0 5] \
+         /DataSource currentfile /ASCII85Decode filter << /Predictor 15 /Colors 3 /Columns 3 >> /FlateDecode filter >> image\n{}",
+        crate::ps::ascii85(&crate::ps::deflate(&encoded))
+    ));
+    let want: Vec<[u8; 4]> = raw.iter().flat_map(|row| (0..3).map(move |x| [row[3 * x], row[3 * x + 1], row[3 * x + 2], 255])).collect();
+    assert_eq!(pixels(&r, 3, 5), want);
+}
@@ -20,12 +20,17 @@ const DEFAULT_FONT: &str = "Helvetica";

 /// A font's family and style from its PostScript name: `Helvetica-BoldOblique` → (`Helvetica`,
 /// `Bold Oblique`), `TimesNewRomanPS-BoldMT` → (`Times New Roman`, `Bold`), without a subset
-/// prefix (`ABCDEF+`).
+/// prefix (`ABCDEF+`) or a reencoded copy's suffix (`*1`).
 pub fn family_style(name: &str) -> (String, String) {
    let name = match name.split_once('+') {
        Some((prefix, rest)) if prefix.len() == 6 && prefix.bytes().all(|b| b.is_ascii_uppercase()) => rest,
        _ => name,
    };
+    // A copy the program reencoded (`Impact*1`, as Illustrator's type procsets name them).
+    let name = match name.rsplit_once('*') {
+        Some((font, n)) if !font.is_empty() && !n.is_empty() && n.bytes().all(|b| b.is_ascii_digit()) => font,
+        _ => name,
+    };
    let (family, style) = name.split_once('-').unwrap_or((name, ""));
    let trim = |s: &str| -> String {
        let s = ["PSMT", "MT", "PS"].iter().find_map(|suffix| s.strip_suffix(suffix)).unwrap_or(s);
@@ -539,6 +539,30 @@ fn selection_preferences_apply_to_pointer_gestures() {
    assert_eq!(click(&mut s, 7, 250.0, json!({})), json!([front]), "the path does");
 }

+/// A Shift-drag marquee reaches agents (#483): `pointer_gesture` with `mods.shift` toggles the
+/// objects it reaches, so a selected one leaves the selection and an unselected one joins it.
+#[test]
+fn shift_marquee_gesture_toggles_the_selection() {
+    let mut s = server();
+    let square = |s: &mut Server, id: u64, x: u64| {
+        let r = call(s, id, "draw_shape", json!({"shape": "rectangle", "x": x, "y": 100, "width": 50, "height": 50}));
+        serde_json::from_str::<Value>(&text_of(&r)).unwrap()["id"].as_u64().unwrap()
+    };
+    let (a, b, c) = (square(&mut s, 1, 100), square(&mut s, 2, 200), square(&mut s, 3, 300));
+    let r = call(&mut s, 4, "run_command", json!({"command": "select.set", "params": {"ids": [a, b]}}));
+    assert_eq!(r["isError"], false, "{r}");
+    let events = json!([{"kind": "down", "x": 180, "y": 80}, {"kind": "drag", "x": 300, "y": 200}, {"kind": "up", "x": 380, "y": 200}]);
+    for tool in ["selection", "directSelection"] {
+        let r = call(&mut s, 5, "pointer_gesture", json!({"tool": tool, "events": events, "mods": {"shift": true}}));
+        assert_eq!(r["isError"], false, "{r}");
+        let sel = &serde_json::from_str::<Value>(&text_of(&r)).unwrap()["selection"];
+        // The Selection tool takes b out and adds c; Direct Selection's marquee then toggles their
+        // anchors back: b's are selected again and c, whole, leaves.
+        let want = if tool == "selection" { json!([a, c]) } else { json!([a, b]) };
+        assert_eq!(*sel, want, "{tool}");
+    }
+}
+
 /// Type preferences reach agents (#394): type the Type tool places starts with placeholder text,
 /// selected; Alt+→ tracks it by Tracking and Cmd+Shift+. steps its size by Size/Leading.
 #[test]
@@ -158,6 +158,18 @@ impl TextLayout {
    pub fn physical_point(&self, p: Point) -> Point {
        if self.vertical { self.line_xf * p } else { p }
    }
+    /// Each line's baseline in text space, start to end (a vertical column's centre line), for
+    /// the lines that hold characters; none for type on a path, which its path stands for.
+    pub fn baselines(&self) -> Vec<(Point, Point)> {
+        if self.on_path {
+            return vec![];
+        }
+        let line = |l: &LineInfo| {
+            let y = if self.vertical { l.baseline + (l.descent - l.ascent) / 2.0 } else { l.baseline };
+            (self.physical_point(Point::new(l.x0, y)), self.physical_point(Point::new(l.x1, y)))
+        };
+        self.lines.iter().filter(|l| l.x1 > l.x0).map(line).collect()
+    }
    /// All glyph outlines combined (e.g. for Create Outlines).
    pub fn to_bezpath(&self) -> BezPath {
        let mut p = BezPath::new();
@@ -73,6 +73,41 @@ fn area_type_starts_at_the_right_edge_and_wraps_to_the_left() {
    assert!(l.glyphs.iter().all(|g| g.outline.bounding_box().y1 <= 105.0 + 1e-6), "inside the frame");
 }

+/// `baselines`: one per line that holds characters, along it for horizontal type and down the
+/// column's centre line for vertical type (where point type's anchor is); none on a path.
+#[test]
+fn baselines_run_along_lines_and_down_column_centres() {
+    let h = layout(
+        FontDb::global(),
+        &TextObject::point(
+            Point::ZERO,
+            "§§
+
+§",
+            CharStyle { size: 20.0, ..CharStyle::default() },
+        ),
+    );
+    let hb = h.baselines();
+    assert_eq!(hb.len(), 2, "the empty line has none: {hb:?}");
+    assert!(hb[0].0 == Point::ZERO && hb[0].1.y == 0.0 && hb[0].1.x > 15.0, "the first baseline runs from the anchor: {hb:?}");
+    assert!(hb[1].0.y > 40.0 && hb[1].0.y == hb[1].1.y && hb[1].1.x > hb[1].0.x, "the third line's, lower: {hb:?}");
+    let v = layout(
+        FontDb::global(),
+        &vertical(
+            "§§
+§",
+        ),
+    );
+    let vb = v.baselines();
+    let (a, c) = (ink(&v, 0), ink(&v, 2));
+    assert_eq!(vb.len(), 2, "{vb:?}");
+    assert!(vb[0].0.x.abs() < 4.0 && vb[0].0.x == vb[0].1.x && vb[0].1.y > vb[0].0.y + 30.0, "down the first column's centre: {vb:?}");
+    assert!((vb[0].0.x - a.center().x).abs() < 4.0 && (vb[1].0.x - c.center().x).abs() < 4.0, "through the glyphs: {vb:?} {a:?} {c:?}");
+    let mut on_path = vertical("ab");
+    on_path.kind = TextKind::OnPath { path: PathData::from_bezpath(&kurbo::Line::new((0.0, 0.0), (100.0, 0.0)).to_path(0.1)), start: 0.0, end: None };
+    assert!(layout(FontDb::global(), &on_path).baselines().is_empty());
+}
+
 #[test]
 fn type_on_a_path_stays_horizontal() {
    let mut t = vertical("ab");
@@ -5,10 +5,12 @@
 //! anchors, segments and Smart Guides, or with them off Snap to Point; Shift keeps the move at 45°
 //! steps), drag a direction handle to
 //! reshape (Shift keeps it at 45° steps round its anchor, Alt moves it alone; smart guides snap
-//! it), marquee to select anchors, drag a live rectangle's corner widget to round its corners
+//! it), marquee to select anchors (Shift-drag toggles them: the selected ones inside are
+//! deselected, the others selected), drag a live rectangle's corner widget to round its corners
 //! (the selected ones when anchors are selected; Alt-click cycles their kind, double-click opens
 //! the Corners dialog).
-//! Group Selection: click selects the leaf; each further click on it adds the next enclosing group.
+//! Group Selection: click selects the leaf; each further click on it adds the next enclosing group;
+//! its marquee works as Direct Selection's.
 //! Both move objects selected as a whole as the Selection tool does, snapping alike.
 //! Both pick the key objects of a blend, and click or drag ruler guides ([`crate::rulerguide`]).
 //! Direct Selection also edits a blend's spine: drag its points (a key object on a point moves
@@ -69,7 +71,8 @@ enum State {
    Marquee {
        start: Point,
        cur: Point,
-        add: bool,
+        /// Shift: the anchors inside leave the selection if selected, else join it.
+        toggle: bool,
    },
    Corner(CornerDrag),
    /// Dragging a bracket of type on a path.
@@ -285,7 +288,7 @@ impl Tool for DirectSelectionTool {
                    return out;
                }
                let Some(h) = hit_test(cx.doc, p, cx.hit_options()) else {
-                    self.state = State::Marquee { start: p, cur: p, add: ev.mods.shift };
+                    self.state = State::Marquee { start: p, cur: p, toggle: ev.mods.shift };
                    return vec![];
                };
                // Walk up from the leaf: select the first ancestor not yet selected (below the layer).
@@ -393,7 +396,7 @@ impl Tool for DirectSelectionTool {
                    }
                    return vec![];
                }
-                self.state = State::Marquee { start: p, cur: p, add: ev.mods.shift };
+                self.state = State::Marquee { start: p, cur: p, toggle: ev.mods.shift };
                vec![]
            }
            (PointerKind::Drag, State::MoveAnchors { start, grab, began }) => {
@@ -497,8 +500,8 @@ impl Tool for DirectSelectionTool {
                self.state = State::Idle;
                self.mesh.release().unwrap_or_default()
            }
-            (PointerKind::Drag, State::Marquee { start, add, .. }) => {
-                self.state = State::Marquee { start, cur: p, add };
+            (PointerKind::Drag, State::Marquee { start, toggle, .. }) => {
+                self.state = State::Marquee { start, cur: p, toggle };
                vec![]
            }
            (PointerKind::Drag, State::Corner(mut c)) => {
@@ -537,11 +540,11 @@ impl Tool for DirectSelectionTool {
                self.guides.clear();
                vec![Action::Commit]
            }
-            (PointerKind::Up, State::Marquee { start, add, .. }) => {
+            (PointerKind::Up, State::Marquee { start, toggle, .. }) => {
                self.state = State::Idle;
                let r = Rect::from_points(start, p);
                if r.width() < cx.tol(3.0) && r.height() < cx.tol(3.0) {
-                    return if add { vec![] } else { vec![Action::Exec("select.none".into(), json!({}))] };
+                    return if toggle { vec![] } else { vec![Action::Exec("select.none".into(), json!({}))] };
                }
                // Collect anchors inside the rect for every editable path.
                let mut sel: Vec<(NodeId, Vec<AnchorRef>)> = vec![];
@@ -555,7 +558,7 @@ impl Tool for DirectSelectionTool {
                });
                sel.retain(|(id, _)| cx.doc.is_editable(*id));
                let items: Vec<Value> = sel.iter().map(|(id, v)| json!({"id": id.0, "anchors": anchors_json(v)})).collect();
-                vec![Action::Exec("select.anchorsMany".into(), json!({"items": items, "add": add}))]
+                vec![Action::Exec("select.anchorsMany".into(), json!({"items": items, "mode": if toggle { "toggle" } else { "set" }}))]
            }
            _ => vec![],
        }
@@ -792,8 +795,25 @@ mod tests {
        t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 50.0));
        t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 250.0, 150.0));
        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 150.0));
-        assert_eq!(a, vec![Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": id.0, "anchors": [[0, 1]]}], "add": false}))]);
+        assert_eq!(a, vec![Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": id.0, "anchors": [[0, 1]]}], "mode": "set"}))]);
    }
+    /// Shift-drag a marquee: the anchors inside toggle (#483), with Group Selection too.
+    #[test]
+    fn shift_marquee_toggles_anchors() {
+        let (d, id) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let shift = Mods { shift: true, ..Default::default() };
+        for group in [false, true] {
+            let mut t = DirectSelectionTool::new(group);
+            t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 150.0, 50.0).with_mods(shift));
+            t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 250.0, 150.0).with_mods(shift));
+            let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 150.0).with_mods(shift));
+            assert_eq!(a, vec![Action::Exec("select.anchorsMany".into(), json!({"items": [{"id": id.0, "anchors": [[0, 1]]}], "mode": "toggle"}))]);
+        }
+    }
+
    /// An open path from (100, 300) to (200, 300) arching up through (150, 262.5).
    fn arch_doc() -> (vectorcraft_doc::Document, NodeId) {
        let (mut d, _) = doc_with_rect();
@@ -271,8 +271,8 @@ impl Targets {
    /// Snap a single point: onto the nearest anchor or centre, else onto the nearest segment, else
    /// into line with targets. Returns the snapped point and guide overlays.
    pub fn snap_point(&self, p: Point, tol: f64) -> (Point, Vec<Overlay>) {
-        if let Some((q, k)) = self.points.iter().filter(|(q, _)| q.distance(p) <= tol).min_by(|a, b| a.0.distance(p).total_cmp(&b.0.distance(p))) {
-            return (*q, self.label(*q, k.label()).into_iter().collect());
+        if let Some((q, k)) = self.nearest_point(p, tol) {
+            return (q, self.label(q, k.label()).into_iter().collect());
        }
        if let Some(q) = self.on_segment(p, tol) {
            return (q, self.label(q, Kind::Edge.label()).into_iter().collect());
@@ -302,6 +302,11 @@ impl Targets {
        (out, ov)
    }

+    /// The anchor or centre nearest `p`, within `tol`.
+    fn nearest_point(&self, p: Point, tol: f64) -> Option<(Point, Kind)> {
+        self.points.iter().copied().filter(|(q, _)| q.distance(p) <= tol).min_by(|a, b| a.0.distance(p).total_cmp(&b.0.distance(p)))
+    }
+
    /// The nearest point within `tol` of `p` on a target segment.
    fn on_segment(&self, p: Point, tol: f64) -> Option<Point> {
        self.segments
@@ -334,7 +339,7 @@ impl Targets {
    /// bleed edge beyond it): onto an anchor or centre near the point itself, otherwise into line
    /// with targets, each axis on whichever of them comes nearest.
    pub fn snap_point_with(&self, p: Point, offsets: &[Vec2], tol: f64) -> (Point, Vec<Overlay>) {
-        if self.points.iter().any(|(q, _)| q.distance(p) <= tol) {
+        if self.nearest_point(p, tol).is_some() {
            return self.snap_point(p, tol);
        }
        let rects: Vec<Rect> = std::iter::once(Vec2::ZERO).chain(offsets.iter().copied()).map(|o| Rect::from_points(p + o, p + o)).collect();
@@ -390,11 +395,14 @@ impl Targets {

    /// Snap a bounding-box resize. `a` is the scale [`crate::bbox::scale_for_drag`] gave for
    /// dragging `handle` of the box `bx` (about the centre when `from_center`), in the box's own
-    /// frame, and so is the result. The corners and the side that handle moves land on the nearest
-    /// target within `tol` on the page, whatever the box's angle. A handle with one way to go (a
-    /// side, or a proportional corner) slides along it until one of them is on a target.
+    /// frame, and so is the result. The handle lands on an anchor or centre within `tol` on the page
+    /// (labelled as [`Self::snap_point`] does), else the corners and the side it moves line up with
+    /// the nearest target ("align"), whatever the box's angle. A handle with one way to go (a side,
+    /// or a proportional corner) slides along it until one of them is on a target.
    pub fn snap_scale(&self, bx: &OrientedBox, handle: Handle, a: Affine, proportional: bool, from_center: bool, tol: f64) -> (Affine, Vec<Overlay>) {
        type Hit = Option<(f64, Point)>;
+        // Where a snap lands: in line with a target's x and/or y, or on an anchor or centre.
+        type Snap = (Hit, Hit, Option<(Point, Kind)>);
        let r = bx.rect;
        let origin = if from_center { r.center() } else { handle.opposite().pos(r) };
        let (d0, [sx, _, _, sy, _, _]) = (handle.pos(r) - origin, a.as_coeffs());
@@ -405,12 +413,14 @@ impl Targets {
            ts.iter().map(|(t, from, _)| (*t, *from)).filter(|(t, _)| (t - v).abs() <= tol).min_by(|p, q| (p.0 - v).abs().total_cmp(&(q.0 - v).abs()))
        };
        let (mut nx, mut ny) = (sx, sy);
-        let (mut hit_x, mut hit_y): (Hit, Hit) = (None, None);
+        let mut snap: Snap = (None, None, None);
        if handle.is_corner() && !proportional {
-            // The corner goes anywhere: it takes the target's x, its y, or both.
+            // The corner goes anywhere: onto an anchor or centre, else it takes the target's x, its
+            // y, or both.
            let p = to_doc * (a * handle.pos(r));
            let (hx, hy) = (nearest(p.x, &self.xs), nearest(p.y, &self.ys));
-            for (tx, ty) in [(hx, hy), (hx, None), (None, hy)] {
+            let on = self.nearest_point(p, tol).map(|(q, k)| (Some((q.x, q)), Some((q.y, q)), Some((q, k))));
+            for (tx, ty, at) in on.into_iter().chain([(hx, hy, None), (hx, None, None), (None, hy, None)]) {
                if tx.is_none() && ty.is_none() {
                    continue;
                }
@@ -421,7 +431,7 @@ impl Targets {
                    (cx, cy) = (if tx.is_some() { cx } else { sx }, if ty.is_some() { cy } else { sy });
                }
                if valid(cx, sx) && valid(cy, sy) {
-                    (nx, ny, hit_x, hit_y) = (cx, cy, tx, ty);
+                    (nx, ny, snap) = (cx, cy, (tx, ty, at));
                    break;
                }
            }
@@ -441,34 +451,44 @@ impl Targets {
            // How far the handle travels per unit of `s`: a snap may not drag it far from the
            // pointer, as it would for a target the side runs almost along.
            let travel = (e.0 * d0.x).hypot(e.1 * d0.y);
-            let mut best: Option<(f64, f64, bool, (f64, Point))> = None;
+            // The snap so far: its `s`, whether it only lines up (an anchor or centre comes first),
+            // how far it moves the handle, and where it lands.
+            let mut best: Option<(f64, bool, f64, Snap)> = None;
+            let mut consider = |s: f64, in_line: bool, found: Snap| {
+                let moved = (s - s0).abs() * travel;
+                if valid(s, s0) && moved <= 2.0 * tol && best.as_ref().is_none_or(|k| (in_line, moved) < (k.1, k.2)) {
+                    best = Some((s, in_line, moved, found));
+                }
+            };
            for h in std::iter::once(handle).chain(ends.into_iter().flatten().copied()) {
                let v = h.pos(r) - origin;
                let base = to_doc * (origin + Vec2::new(c.0 * v.x, c.1 * v.y));
                let dir = (to_doc * Point::new(e.0 * v.x, e.1 * v.y)).to_vec2();
                let p = base + dir * s0;
+                // An anchor or centre beside its way: it stops at the nearest point of the way.
+                let l2 = dir.hypot2();
+                if l2 > 1e-18
+                    && let Some((q, k)) = self.nearest_point(p, tol)
+                {
+                    consider((q - base).dot(dir) / l2, false, (None, None, Some((q, k))));
+                }
                for (is_x, at, b, d, ts) in [(true, p.x, base.x, dir.x, &self.xs), (false, p.y, base.y, dir.y, &self.ys)] {
                    if d.abs() <= 1e-9 {
                        continue;
                    }
                    let Some(hit) = nearest(at, ts) else { continue };
-                    let s = (hit.0 - b) / d;
-                    let moved = (s - s0).abs() * travel;
-                    if valid(s, s0) && moved <= 2.0 * tol && best.is_none_or(|k| moved < k.1) {
-                        best = Some((s, moved, is_x, hit));
-                    }
+                    consider((hit.0 - b) / d, true, if is_x { (Some(hit), None, None) } else { (None, Some(hit), None) });
                }
            }
-            if let Some((s, _, is_x, hit)) = best {
-                (nx, ny) = (c.0 + s * e.0, c.1 + s * e.1);
-                if is_x {
-                    hit_x = Some(hit);
-                } else {
-                    hit_y = Some(hit);
-                }
+            if let Some((s, _, _, found)) = best {
+                (nx, ny, snap) = (c.0 + s * e.0, c.1 + s * e.1, found);
            }
        }
        let out = Affine::translate(origin.to_vec2()) * Affine::scale_non_uniform(nx, ny) * Affine::translate(-origin.to_vec2());
+        let (hit_x, hit_y, on) = snap;
+        if let Some((q, k)) = on {
+            return (out, self.label(q, k.label()).into_iter().collect());
+        }
        // The lines run from the target's own point across the resized box, on the page.
        let nr = (to_doc * out).transform_rect_bbox(r);
        let mut ov = vec![];
@@ -478,6 +498,9 @@ impl Targets {
        if let Some((y, from)) = hit_y {
            ov.extend(self.line(Point::new(from.x.min(nr.x0), y), Point::new(from.x.max(nr.x1), y)));
        }
+        if hit_x.is_some() || hit_y.is_some() {
+            ov.extend(self.label(to_doc * (out * handle.pos(r)), "align"));
+        }
        (out, ov)
    }
 }
@@ -612,13 +635,16 @@ mod tests {
            (a.transform_rect_bbox(r), ov)
        };
        // The bottom edge lands on the neighbour's bottom: same height.
+        let lines = |ov: &[Overlay]| ov.iter().filter(|o| matches!(o, Overlay::Line { .. })).count();
+        let align = |ov: &[Overlay]| ov.iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "align"));
        let (nr, ov) = snap(Handle::Bottom, Point::new(275.0, 197.0), false, false);
        assert_eq!(nr, Rect::new(250.0, 100.0, 300.0, 200.0));
-        assert_eq!(ov.len(), 1);
+        assert_eq!(lines(&ov), 1);
+        assert!(align(&ov), "{ov:?}");
        // A corner snaps each axis on its own: y to the neighbour, x stays free.
        let (nr, ov) = snap(Handle::BottomRight, Point::new(330.0, 202.0), false, false);
        assert_eq!(nr, Rect::new(250.0, 100.0, 330.0, 200.0));
-        assert_eq!(ov.len(), 1);
+        assert_eq!(lines(&ov), 1);
        // Proportional: the snapped axis carries the other one.
        let (nr, _) = snap(Handle::BottomRight, Point::new(340.0, 198.0), true, false);
        assert_eq!(nr, Rect::new(250.0, 100.0, 350.0, 200.0));
@@ -634,6 +660,41 @@ mod tests {
        assert!(ov.is_empty());
    }

+    /// A resize handle lands on another object's anchor point (#482), not only in line with its
+    /// edges and centre, and says so; a side handle stops where its way passes the anchor.
+    #[test]
+    fn scale_snap_lands_the_handle_on_anchors() {
+        use crate::bbox::scale_for_drag;
+        use vectorcraft_doc::{Appearance, Node};
+        let (mut d, _) = doc_with_rect();
+        let l = d.layers[0].id;
+        let id = d.alloc_id();
+        // A triangle whose apex (320, 400) lines up with none of the edges or centres on x.
+        let tri = vectorcraft_geom::PathData::single(SubPath::polyline(
+            &[Point::new(300.0, 300.0), Point::new(380.0, 300.0), Point::new(320.0, 400.0)],
+            true,
+        ));
+        d.insert(Some(l), 1, Node::path(id, tri, Appearance::default_art())).unwrap();
+        let t = Targets::collect(&d, &[], None);
+        let snap = |r: Rect, h: Handle, p: Point, shift: bool| {
+            let (a, ov) = t.snap_scale(&OrientedBox::aligned(r), h, scale_for_drag(r, h, p, shift, false), shift, false, 4.0);
+            (a.transform_rect_bbox(r), ov)
+        };
+        let anchor = |ov: &[Overlay]| matches!(ov, [Overlay::Label { text, p, .. }] if text == "anchor" && *p == Point::new(320.0, 400.0));
+        // A free corner takes the anchor's x and y.
+        let (nr, ov) = snap(Rect::new(250.0, 350.0, 300.0, 390.0), Handle::BottomRight, Point::new(322.0, 398.0), false);
+        assert_eq!(nr, Rect::new(250.0, 350.0, 320.0, 400.0));
+        assert!(anchor(&ov), "{ov:?}");
+        // The right side, at the apex's height: its x lands on the anchor.
+        let (nr, ov) = snap(Rect::new(250.0, 380.0, 300.0, 420.0), Handle::Right, Point::new(318.0, 401.0), false);
+        assert_eq!(nr, Rect::new(250.0, 380.0, 320.0, 420.0));
+        assert!(anchor(&ov), "{ov:?}");
+        // A proportional corner slides along its diagonal onto it.
+        let (nr, ov) = snap(Rect::new(240.0, 320.0, 300.0, 380.0), Handle::BottomRight, Point::new(318.0, 398.0), true);
+        assert_eq!(nr, Rect::new(240.0, 320.0, 320.0, 400.0));
+        assert!(anchor(&ov), "{ov:?}");
+    }
+
    /// Preferences › Smart Guides › Display Options (#394): the colour, and Alignment Guides and
    /// Anchor/Path Labels off, change what shows and never where a point lands.
    #[test]
@@ -273,6 +273,9 @@ pub struct ToolContext<'a> {
    /// Selection & Anchor Display → Object Selection by Path Only: a click inside a filled path
    /// doesn't pick it, only one on its path does.
    pub path_only: bool,
+    /// Type → Type Object Selection by Path Only: 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,
    /// General → Double Click To Isolate: a double-click on a group with the Selection tool
    /// isolates it.
    pub double_click_isolate: bool,
@@ -352,7 +355,12 @@ impl ToolContext<'_> {
        self.tol(self.selection_tolerance)
    }
    pub fn hit_options(&self) -> vectorcraft_doc::hit::HitOptions {
-        vectorcraft_doc::hit::HitOptions { tol: self.pick_tol(), outline: self.outline, path_only: self.path_only }
+        vectorcraft_doc::hit::HitOptions {
+            tol: self.pick_tol(),
+            outline: self.outline,
+            path_only: self.path_only,
+            type_path_only: self.type_path_only,
+        }
    }
 }

@@ -650,6 +658,7 @@ pub(crate) mod testutil {
            auto_add_delete: true,
            selection_tolerance: 3.0,
            path_only: false,
+            type_path_only: false,
            double_click_isolate: true,
            select_behind: true,
            highlight_anchors: true,
@@ -1,4 +1,5 @@
-//! The Selection tool (V): click/shift-click, marquee, move (Alt copies, Shift constrains; Smart
+//! The Selection tool (V): click/shift-click, marquee (Shift-drag toggles the objects it reaches:
+//! the selected ones are deselected, the others selected), move (Alt copies, Shift constrains; Smart
 //! Guides, or with them off View › Snap to Point, snap it),
 //! bounding-box scale (Shift proportional, Alt from centre) and rotate (outside corners, Shift 45°),
 //! drag a live rectangle's corner widget to round its corners (Alt-click cycles their kind,
@@ -49,7 +50,8 @@ enum State {
    Marquee {
        start: Point,
        cur: Point,
-        add: bool,
+        /// Shift: the objects inside leave the selection if selected, else join it.
+        toggle: bool,
    },
    /// Dragging a Live Corners widget.
    Corner(CornerDrag),
@@ -256,7 +258,7 @@ impl Tool for SelectionTool {
                        out
                    }
                    None => {
-                        self.state = State::Marquee { start: p, cur: p, add: m.shift };
+                        self.state = State::Marquee { start: p, cur: p, toggle: m.shift };
                        vec![]
                    }
                }
@@ -299,8 +301,8 @@ impl Tool for SelectionTool {
                self.measure = cx.transform_tools_guides.then(|| (p, format!("{:.1}°", -deg)));
                vec![Action::Preview("object.transform".into(), json!({ "matrix": matrix_json(a), "copy": false }))]
            }
-            (PointerKind::Drag, State::Marquee { start, add, .. }) => {
-                self.state = State::Marquee { start, cur: p, add };
+            (PointerKind::Drag, State::Marquee { start, toggle, .. }) => {
+                self.state = State::Marquee { start, cur: p, toggle };
                vec![]
            }
            (PointerKind::Drag, State::Corner(mut c)) => {
@@ -339,18 +341,14 @@ impl Tool for SelectionTool {
                self.targets = None;
                vec![Action::Commit]
            }
-            (PointerKind::Up, State::Marquee { start, add, .. }) => {
+            (PointerKind::Up, State::Marquee { start, toggle, .. }) => {
                self.state = State::Idle;
                let r = Rect::from_points(start, p);
                if r.width() < Self::drag_threshold(cx) && r.height() < Self::drag_threshold(cx) {
-                    return if add { vec![] } else { vec![Action::Exec("select.none".into(), json!({}))] };
+                    return if toggle { vec![] } else { vec![Action::Exec("select.none".into(), json!({}))] };
                }
                let ids: Vec<NodeId> = marquee(cx.doc, r, cx.isolation, false);
-                if add {
-                    vec![Action::Exec("select.add".into(), json!({ "ids": json_ids(&ids) }))]
-                } else {
-                    vec![Action::Exec("select.set".into(), json!({ "ids": json_ids(&ids) }))]
-                }
+                vec![Action::Exec(if toggle { "select.toggle" } else { "select.set" }.into(), json!({ "ids": json_ids(&ids) }))]
            }
            _ => vec![],
        }
@@ -556,6 +554,24 @@ mod tests {
        assert_eq!(a, vec![Action::Exec("select.set".into(), json!({"ids": [id.0]}))]);
    }

+    /// Shift-drag a marquee: the objects it reaches toggle (#483), so selected ones can be
+    /// taken out of the selection; a Shift-click on empty canvas leaves the selection alone.
+    #[test]
+    fn shift_marquee_toggles() {
+        let (d, id) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let mut t = SelectionTool::default();
+        let shift = Mods { shift: true, ..Default::default() };
+        t.pointer(&cx, &ev(PointerKind::Down, 50.0, 50.0).with_mods(shift));
+        t.pointer(&cx, &ev(PointerKind::Drag, 120.0, 120.0).with_mods(shift));
+        let a = t.pointer(&cx, &ev(PointerKind::Up, 120.0, 120.0).with_mods(shift));
+        assert_eq!(a, vec![Action::Exec("select.toggle".into(), json!({"ids": [id.0]}))]);
+        t.pointer(&cx, &ev(PointerKind::Down, 50.0, 50.0).with_mods(shift));
+        assert!(t.pointer(&cx, &ev(PointerKind::Up, 50.0, 50.0).with_mods(shift)).is_empty());
+    }
+
    #[test]
    fn handle_drag_scales() {
        let (d, id) = doc_with_rect();
@@ -230,7 +230,7 @@ impl TypeTool {

    /// Path under `p` for the Area Type / Type on a Path tools.
    fn path_at(cx: &ToolContext, p: Point, closed: bool) -> Option<NodeId> {
-        let h = hit_test(cx.doc, p, vectorcraft_doc::hit::HitOptions { tol: cx.tol(4.0), outline: true, path_only: false })?;
+        let h = hit_test(cx.doc, p, vectorcraft_doc::hit::HitOptions { tol: cx.tol(4.0), outline: true, ..Default::default() })?;
        match &cx.doc.node(h.leaf)?.kind {
            NodeKind::Path { path, .. } if !closed || path.is_closed() => Some(h.leaf),
            _ => None,
@@ -238,9 +238,10 @@ impl TypeTool {
    }

    /// Start editing the type under `p` with the caret there → the actions (ending the previous
-    /// edit, selecting the type); None when no type is under `p`.
+    /// edit, selecting the type); None when no type is under `p`. A click among the characters
+    /// edits them, whatever Type Object Selection by Path Only says.
    fn edit_at(&mut self, cx: &ToolContext, p: Point) -> Option<Vec<Action>> {
-        let h = hit_test(cx.doc, p, cx.hit_options())?;
+        let h = hit_test(cx.doc, p, vectorcraft_doc::hit::HitOptions { type_path_only: false, ..cx.hit_options() })?;
        let Some(NodeKind::Text(t)) = cx.doc.node(h.leaf).map(|n| &n.kind) else { return None };
        let lay = self.layout(t);
        let byte = vectorcraft_text::hit_byte(&lay, t.xf.inverse() * p);
@@ -70,7 +70,9 @@ impl Tool for EyedropperTool {
        if ev.kind != PointerKind::Down {
            return vec![];
        }
-        let opts = vectorcraft_doc::hit::HitOptions { path_only: false, ..cx.hit_options() };
+        // A click inside a fill or among characters samples it too, whatever Object and Type
+        // Object Selection by Path Only say.
+        let opts = vectorcraft_doc::hit::HitOptions { path_only: false, type_path_only: false, ..cx.hit_options() };
        let Some(h) = hit_test(cx.doc, ev.pos, opts) else { return vec![] };
        let src = paint_owner(cx.doc, h.leaf);
        let Some(n) = cx.doc.node(src) else { return vec![] };
@@ -5,7 +5,10 @@
 //! at release makes a copy: Alt-drag). Alt-click (the release of a click made with Alt) sets the
 //! point and opens the tool's dialog; double-click or Return opens the dialog too. A clicked or
 //! Alt-clicked point snaps to the nearest anchor or centre (Snap to Point / Smart Guides), labelled
-//! while hovering, so transforms pivot exactly on a corner.
+//! while hovering, so transforms pivot exactly on a corner. A drag starts from the point it grabbed
+//! snapped the same way, and the pointer snaps as a drawn point does (Smart Guides: the other
+//! objects' anchors, centres and edges; or the grid, pixels, Snap to Point), so a corner dragged
+//! onto another object's anchor scales exactly onto it.

 use serde_json::{Value, json};
 use vectorcraft_doc::NodeId;
@@ -13,7 +16,7 @@ use vectorcraft_geom::{Affine, Point, Rect, Vec2};

 use super::target_overlays;
 use crate::bbox::rotate_for_drag;
-use crate::guides::snap_pick;
+use crate::guides::{PointSnap, Targets, snap_pick};
 use crate::select::{matrix_json, selection_bounds, selection_box};
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};

@@ -57,7 +60,8 @@ impl TransformKind {
 #[derive(Clone, Copy, Debug)]
 struct Drag {
    start: Point,
-    /// The pressed point snapped to an anchor or centre (becomes the reference point on a click).
+    /// The pressed point snapped to an anchor or centre: the reference point on a click, where a
+    /// drag starts from.
    pick: Point,
    origin: Point,
    began: bool,
@@ -73,8 +77,10 @@ pub struct TransformTool {
    origin: Option<(Point, Vec<NodeId>)>,
    drag: Option<Drag>,
    measure: Option<(Point, String)>,
-    /// Snap feedback while hovering ("anchor" / "center" label).
+    /// Snap feedback while hovering ("anchor" / "center" label), and for the dragged pointer.
    hover: Vec<Overlay>,
+    /// What the dragged pointer snaps to, gathered when the drag begins.
+    snap: Option<PointSnap>,
 }

 fn about(o: Point, a: Affine) -> Affine {
@@ -88,7 +94,7 @@ pub fn reflect_matrix(o: Point, theta: f64) -> Affine {

 impl TransformTool {
    pub fn new(kind: TransformKind) -> Self {
-        Self { kind, origin: None, drag: None, measure: None, hover: vec![] }
+        Self { kind, origin: None, drag: None, measure: None, hover: vec![], snap: None }
    }

    /// The effective reference point: the custom one if it belongs to the current selection,
@@ -150,6 +156,14 @@ impl TransformTool {
        }
    }

+    /// Ends the drag, its snapping and readouts with it.
+    fn end_drag(&mut self) -> Option<Drag> {
+        self.measure = None;
+        self.snap = None;
+        self.hover.clear();
+        self.drag.take()
+    }
+
    fn dialog(&self, o: Point) -> Action {
        Action::Dialog(self.kind.id().into(), self.kind.dialog_fields(o))
    }
@@ -185,9 +199,13 @@ impl Tool for TransformTool {
                        return out;
                    }
                    d.began = true;
+                    // The selection moves, so only the other objects are targets.
+                    self.snap = Some(PointSnap::new(cx, || Targets::collect(cx.doc, &cx.selection.objects, None)));
                    out.push(Action::Begin(self.kind.label().into()));
                }
-                let (m, text) = self.matrix_for(d.origin, d.start, p, ev.mods.shift, d.bounds);
+                let (p, guides) = self.snap.as_ref().map_or((p, vec![]), |s| s.snap(cx, p));
+                self.hover = guides;
+                let (m, text) = self.matrix_for(d.origin, d.pick, p, ev.mods.shift, d.bounds);
                d.last = m;
                self.drag = Some(d);
                self.measure = Some((p, text));
@@ -195,8 +213,7 @@ impl Tool for TransformTool {
                out
            }
            PointerKind::Up => {
-                let Some(d) = self.drag.take() else { return vec![] };
-                self.measure = None;
+                let Some(d) = self.end_drag() else { return vec![] };
                if d.began {
                    // The Alt state at release decides whether the result is a copy.
                    vec![Action::Preview("object.transform".into(), json!({ "matrix": matrix_json(d.last), "copy": ev.mods.alt })), Action::Commit]
@@ -207,14 +224,16 @@ impl Tool for TransformTool {
                }
            }
            PointerKind::DoubleClick => {
-                self.drag = None;
+                self.end_drag();
                match self.reference_point(cx) {
                    Some(o) => vec![self.dialog(o)],
                    None => vec![],
                }
            }
            PointerKind::Move => {
-                self.hover = if self.drag.is_none() && !cx.selection.is_empty() { snap_pick(cx, p).1 } else { vec![] };
+                if self.drag.is_none() {
+                    self.hover = if cx.selection.is_empty() { vec![] } else { snap_pick(cx, p).1 };
+                }
                vec![]
            }
        }
@@ -223,8 +242,7 @@ impl Tool for TransformTool {
    fn key(&mut self, cx: &ToolContext, key: ToolKey, _mods: Mods) -> Vec<Action> {
        match key {
            ToolKey::Escape if self.busy() => {
-                self.drag = None;
-                self.measure = None;
+                self.end_drag();
                vec![Action::Cancel]
            }
            ToolKey::Enter => self.reference_point(cx).map(|o| vec![self.dialog(o)]).unwrap_or_default(),
@@ -278,7 +296,7 @@ impl Tool for TransformTool {
    }

    fn deactivate(&mut self, _cx: &ToolContext) -> Vec<Action> {
-        if self.drag.take().is_some_and(|d| d.began) { vec![Action::Cancel] } else { vec![] }
+        if self.end_drag().is_some_and(|d| d.began) { vec![Action::Cancel] } else { vec![] }
    }
 }

@@ -428,6 +446,43 @@ mod tests {
        assert!(matches!(&a[0], Action::Dialog(_, v) if v["origin"] == json!([102.0, 98.0])));
    }

+    /// Smart Guides while a transform tool drags (#482): the drag starts from the selection's
+    /// anchor it grabbed and the pointer lands on another object's anchor, so the scale is exact.
+    #[test]
+    fn scale_drag_snaps_from_an_anchor_onto_another_objects_anchor() {
+        use vectorcraft_doc::{Appearance, Node};
+        let (mut d, id) = doc_with_rect();
+        let l = d.layers[0].id;
+        let other = d.alloc_id();
+        d.insert(
+            Some(l),
+            1,
+            Node::path(other, vectorcraft_geom::shapes::rectangle(Rect::new(300.0, 260.0, 340.0, 300.0)), Appearance::default_art()),
+        )
+        .unwrap();
+        let mut s = Selection::default();
+        s.add(id);
+        let p = paint();
+        let mut c = cx(&d, &s, &p);
+        let mut t = TransformTool::new(TransformKind::Scale);
+        // The reference point on the top-left corner, then a drag from near the bottom-right one
+        // to near the other rect's top-left corner.
+        t.pointer(&c, &ev(PointerKind::Down, 100.0, 100.0));
+        t.pointer(&c, &ev(PointerKind::Up, 100.0, 100.0));
+        t.pointer(&c, &ev(PointerKind::Down, 199.0, 198.0));
+        let a = t.pointer(&c, &ev(PointerKind::Drag, 302.0, 262.0));
+        let m = matrix(&a[1]);
+        assert!((m * Point::new(200.0, 200.0)).distance(Point::new(300.0, 260.0)) < 1e-9, "{m:?}");
+        assert!(t.overlays(&c).iter().any(|o| matches!(o, Overlay::Label { text, p, .. } if text == "anchor" && *p == Point::new(300.0, 260.0))));
+        t.pointer(&c, &ev(PointerKind::Up, 302.0, 262.0));
+        assert!(!t.overlays(&c).iter().any(|o| matches!(o, Overlay::Label { .. })));
+        // Smart Guides and Snap to Point off: the pointer is where it is.
+        (c.smart_guides, c.snap_to_point) = (false, false);
+        t.pointer(&c, &ev(PointerKind::Down, 200.0, 200.0));
+        let a = t.pointer(&c, &ev(PointerKind::Drag, 302.0, 262.0));
+        assert!((matrix(&a[1]) * Point::new(200.0, 200.0)).distance(Point::new(302.0, 262.0)) < 1e-9);
+    }
+
    #[test]
    fn reflect_vertical_axis_mirrors_x() {
        let t = TransformTool::new(TransformKind::Reflect);
@@ -115,25 +115,15 @@ impl Tool for LassoTool {
                    }
                });
                hits.retain(|(id, _)| cx.doc.is_editable(*id) && cx.doc.is_visible(*id));
-                if sub {
-                    // Current anchor selection minus the lassoed anchors.
-                    let mut items = vec![];
-                    for id in &cx.selection.objects {
-                        let Some(path) = cx.doc.node(*id).and_then(|n| n.path_data()) else { continue };
-                        let cur: BTreeSet<AnchorRef> = match cx.selection.partial(*id) {
-                            Some(s) => s.clone(),
-                            None => path.anchors().map(|(s, i, _)| (s, i)).collect(),
-                        };
-                        let remove = hits.iter().find(|(h, _)| h == id).map(|(_, v)| v.clone()).unwrap_or_default();
-                        let rest: BTreeSet<AnchorRef> = cur.difference(&remove).copied().collect();
-                        if !rest.is_empty() {
-                            items.push(json!({ "id": id.0, "anchors": anchors_json(&rest) }));
-                        }
-                    }
-                    return vec![Action::Exec("select.anchorsMany".into(), json!({ "items": items, "add": false }))];
-                }
                let items: Vec<Value> = hits.iter().map(|(id, v)| json!({ "id": id.0, "anchors": anchors_json(v) })).collect();
-                vec![Action::Exec("select.anchorsMany".into(), json!({ "items": items, "add": add }))]
+                let mode = if sub {
+                    "subtract"
+                } else if add {
+                    "add"
+                } else {
+                    "set"
+                };
+                vec![Action::Exec("select.anchorsMany".into(), json!({ "items": items, "mode": mode }))]
            }
            _ => vec![],
        }
@@ -198,7 +188,7 @@ mod tests {
        assert_eq!(c, "select.anchorsMany");
        assert_eq!(v["items"][0]["id"], id.0);
        assert_eq!(v["items"][0]["anchors"].as_array().unwrap().len(), 1);
-        assert_eq!(v["add"], false);
+        assert_eq!(v["mode"], "set");
        assert!(point_in_polygon(&[Point::new(0.0, 0.0), Point::new(10.0, 0.0), Point::new(0.0, 10.0)], Point::new(2.0, 2.0)));
    }
 }
@@ -1,7 +1,7 @@
 //! The document canvas: rendering, rulers, navigation, pointer routing to tools and on-canvas
 //! selection visuals (bounding box, anchors, handles, smart-guide style labels).

-use egui::{Color32, CornerRadius, Pos2, Sense, Shape, Stroke, StrokeKind, Ui, pos2, vec2};
+use egui::{Color32, CornerRadius, Pos2, Sense, Shape, Stroke, StrokeKind, Ui, Vec2, pos2, vec2};
 use serde_json::json;
 use vectorcraft_doc::{Node, NodeKind, Unit};
 use vectorcraft_geom::{Affine, BezPath, PathEl, Point, Rect};
@@ -91,6 +91,10 @@ fn drag_id() -> egui::Id {
 fn temp_tool_id() -> egui::Id {
    egui::Id::new("canvas-temp-tool")
 }
+/// Where the pointer was last seen during a press on the canvas.
+fn drag_pos_id() -> egui::Id {
+    egui::Id::new("canvas-drag-pos")
+}

 /// Selection, Direct Selection and Group Selection: the tools Cmd switches to for a drag.
 pub(crate) fn is_selection_tool(id: &str) -> bool {
@@ -154,10 +158,15 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
    if app.ui.home.is_some_and(|k| k != crate::menus::home_key(app)) {
        app.ui.home = None;
    }
-    if app.session.active().is_none() || app.ui.home.is_some() {
+    if crate::menus::home_showing(app) {
        home(app, ui, full);
        return;
    }
+    if app.session.active().is_none() {
+        // No document and Show The Home Screen When No Documents Are Open off: an empty window.
+        ui.painter().rect_filled(full, 0.0, t.panel_darker);
+        return;
+    }
    let rect = if app.ui.view.rulers && app.ui.screen_mode < 3 { egui::Rect::from_min_max(full.min + vec2(RULER, RULER), full.max) } else { full };
    app.canvas_rect = Some(rect);
    let fitted = app.view().is_some_and(|v| v.fitted);
@@ -232,6 +241,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
        ppp,
        hidden: vec![],
        rot: v.rotation,
+        anti_alias: app.session.prefs.anti_aliased_artwork,
    };
    if !app.canvas.worker_started {
        app.canvas.worker_started = true;
@@ -264,6 +274,9 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
            }),
            mask_view,
            highlight_substitutions: true,
+            // General › Anti-aliased Artwork: off, edges are hard on screen (raster effects and
+            // pattern tiles stay smooth), as in Illustrator.
+            anti_alias: if app.session.prefs.anti_aliased_artwork { vectorcraft_render::AntiAlias::Art } else { vectorcraft_render::AntiAlias::None },
            ..opts
        };
        // Light documents render synchronously (no lag vs overlays); heavy ones go to the worker.
@@ -296,6 +309,11 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
    if let Some(look) = grid_look.filter(|_| !grids_in_back) {
        grid(&painter, &xf, doc.grid.spacing, doc.grid.subdivisions, look);
    }
+    // The pixel grid (Guides & Grid › Show Pixel Grid (Above 600% Zoom)): in Pixel Preview from
+    // 600% zoom, a line at every document pixel over the art, so the pixels it rasterizes to show.
+    if app.ui.view.pixel_preview && v.zoom >= PIXEL_GRID_ZOOM && app.session.prefs.show_pixel_grid {
+        grid(&painter, &xf, 1.0, 1, LineLook { color: PIXEL_GRID, dots: false });
+    }
    // Artboard edges and names.
    let active_ab = 0;
    for (i, ab) in doc.artboards.iter().enumerate() {
@@ -456,6 +474,10 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
    let v = *app.view().unwrap_or(&View::default());
    let xf = Xf::new(rect, &v);
    let hover = pointer.hover_pos().filter(|p| rect.contains(*p));
+    // A lifted pen or finger takes the pointer away in the frame it lifts (egui's `PointerGone`),
+    // so a tap whose press and lift come in one frame has no hover position: it presses (and
+    // double-taps) where it was seen last (#491).
+    let at = hover.or_else(|| pointer.interact_pos().filter(|p| rect.contains(*p)));
    app.hover_doc = hover.map(|p| xf.to_doc(p));
    let view = app.view_info();
    let drag: Option<Drag> = ui.data(|d| d.get_temp(drag_id()));
@@ -497,7 +519,7 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
    if pointer.primary_pressed()
        && resp.hovered()
        && !middle_pan
-        && let Some(p) = hover
+        && let Some(p) = at
    {
        ui.ctx().memory_mut(|mem| mem.stop_text_input());
        app.ui.flyout = None;
@@ -523,7 +545,10 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
            dispatch(app, &ev, view);
            kind
        };
-        ui.data_mut(|dd| dd.insert_temp(drag_id(), d));
+        ui.data_mut(|dd| {
+            dd.insert_temp(drag_id(), d);
+            dd.insert_temp(drag_pos_id(), p);
+        });
    } else if drag.is_none()
        && resp.hovered()
        && pointer.button_pressed(egui::PointerButton::Middle)
@@ -532,9 +557,11 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
        // Middle-button drag pans the view whatever the tool.
        ui.data_mut(|dd| dd.insert_temp(drag_id(), Drag::Pan { start, center: v.center, middle: true }));
    } else if let Some(d) = drag {
-        let p = pointer.interact_pos().unwrap_or(rect.center());
+        // The pointer gone (a pen lifted with its press), the drag ends where it was last seen.
+        let p = pointer.interact_pos().or_else(|| ui.data(|dd| dd.get_temp(drag_pos_id()))).unwrap_or(rect.center());
        let held = if middle_pan { pointer.button_down(egui::PointerButton::Middle) } else { pointer.primary_down() };
        if held {
+            ui.data_mut(|dd| dd.insert_temp(drag_pos_id(), p));
            match d {
                Drag::Pan { start, center, .. } => {
                    let d = xf.delta_to_doc(p - start);
@@ -572,7 +599,10 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
                }
            }
        } else {
-            ui.data_mut(|dd| dd.remove::<Drag>(drag_id()));
+            ui.data_mut(|dd| {
+                dd.remove::<Drag>(drag_id());
+                dd.remove::<Pos2>(drag_pos_id());
+            });
            match d {
                Drag::ZoomBox { start } => {
                    let r = egui::Rect::from_two_pos(start, p);
@@ -611,7 +641,7 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
        dispatch(app, &ev, view);
    }
    if resp.double_clicked()
-        && let Some(p) = hover
+        && let Some(p) = at
    {
        let ev = PointerEvent { kind: PointerKind::DoubleClick, pos: xf.to_doc(p), mods: mods(m, space), pressure: 1.0 };
        let before = app.session.tool_id().to_string();
@@ -763,6 +793,11 @@ fn checker(p: &egui::Painter, quad: &[Pos2], ab: Rect, zoom: f64, tex: egui::Tex
    p.add(Shape::mesh(mesh));
 }

+/// The zoom the pixel grid shows from in Pixel Preview (600%), and its colour: a translucent grey,
+/// so the art's pixels read through it.
+const PIXEL_GRID_ZOOM: f64 = 6.0;
+const PIXEL_GRID: Color32 = Color32::from_rgba_premultiplied(64, 64, 64, 96);
+
 /// The look of the grid or of the guides (Preferences › Guides & Grid › Color and Style).
 #[derive(Clone, Copy)]
 struct LineLook {
@@ -799,8 +834,10 @@ fn pref_color(hex: &str, fallback: Color32) -> Color32 {
 /// subdivisions instead.
 fn grid(p: &egui::Painter, xf: &Xf, spacing: f64, subdiv: u32, look: LineLook) {
    let r = xf.rect;
-    let a = xf.to_doc(r.min);
-    let b = xf.to_doc(r.max);
+    // The view in document space: the box round the canvas's corners (the view may be rotated;
+    // the painter clips to the canvas).
+    let corners = [r.left_top(), r.right_top(), r.right_bottom(), r.left_bottom()].map(|c| xf.to_doc(c));
+    let view = corners.iter().fold(Rect::from_points(corners[0], corners[0]), |b, c| b.union_pt(*c));
    let sub = spacing / subdiv.max(1) as f64;
    let step = if sub * xf.zoom >= 6.0 { sub } else { spacing };
    // Dots crowd sooner than lines.
@@ -808,25 +845,16 @@ fn grid(p: &egui::Painter, xf: &Xf, spacing: f64, subdiv: u32, look: LineLook) {
        return;
    }
    let major = |v: f64| (v / spacing - (v / spacing).round()).abs() < 1e-6;
-    // The lines across the view, on screen, each with whether it is a gridline.
-    let lines = |from: f64, to: f64, screen: &dyn Fn(f64) -> f32| {
-        let mut v = (from / step).floor() * step;
-        let mut out = vec![];
-        while v <= to {
-            out.push((screen(v), major(v)));
-            v += step;
-        }
-        out
+    // The lines across the view (where along their axis), at least 4 px apart (and capped).
+    let lines = |from: f64, to: f64| {
+        let first = (from / step).floor();
+        (0..10_000u32).map(move |i| (first + f64::from(i)) * step).take_while(move |v| *v <= to)
    };
-    let xs = lines(a.x, b.x, &|x| xf.to_screen(Point::new(x, 0.0)).x);
-    let ys = lines(a.y, b.y, &|y| xf.to_screen(Point::new(0.0, y)).y);
    if look.dots {
        let mut mesh = egui::Mesh::default();
-        for &(x, mx) in &xs {
-            for &(y, my) in &ys {
-                if mx || my {
-                    mesh.add_colored_rect(egui::Rect::from_center_size(pos2(x, y), vec2(1.5, 1.5)), look.color);
-                }
+        for x in lines(view.x0, view.x1) {
+            for y in lines(view.y0, view.y1).filter(|y| major(x) || major(*y)) {
+                mesh.add_colored_rect(egui::Rect::from_center_size(xf.to_screen(Point::new(x, y)), vec2(1.5, 1.5)), look.color);
            }
        }
        p.add(Shape::mesh(mesh));
@@ -834,11 +862,11 @@ fn grid(p: &egui::Painter, xf: &Xf, spacing: f64, subdiv: u32, look: LineLook) {
    }
    let minor = look.color.gamma_multiply(0.4);
    let stroke = |major: bool| Stroke::new(1.0, if major { look.color } else { minor });
-    for (x, m) in xs {
-        p.line_segment([pos2(x, r.top()), pos2(x, r.bottom())], stroke(m));
+    for x in lines(view.x0, view.x1) {
+        p.line_segment([xf.to_screen(Point::new(x, view.y0)), xf.to_screen(Point::new(x, view.y1))], stroke(major(x)));
    }
-    for (y, m) in ys {
-        p.line_segment([pos2(r.left(), y), pos2(r.right(), y)], stroke(m));
+    for y in lines(view.y0, view.y1) {
+        p.line_segment([xf.to_screen(Point::new(view.x0, y)), xf.to_screen(Point::new(view.x1, y))], stroke(major(y)));
    }
 }

@@ -1043,13 +1071,15 @@ fn walk_drawn<'a>(n: &'a Node, f: &mut impl FnMut(&'a Node)) {
 }

 /// The topmost editable object under document point `p` at `zoom`, as the selection tools pick it
-/// (Selection & Anchor Display › Tolerance and Object Selection by Path Only).
+/// (Selection & Anchor Display › Tolerance and Object Selection by Path Only, Type › Type Object
+/// Selection by Path Only).
 fn hit_at(app: &VectorcraftApp, p: Point, zoom: f64) -> Option<vectorcraft_doc::hit::Hit> {
    let prefs = &app.session.prefs;
    let opt = vectorcraft_doc::hit::HitOptions {
        tol: prefs.selection_tolerance / zoom,
        outline: app.ui.view.outline,
        path_only: prefs.object_selection_by_path_only,
+        type_path_only: prefs.type_selection_by_path_only,
    };
    vectorcraft_doc::hit::hit_test(&app.session.active()?.doc, p, opt)
 }
@@ -1547,7 +1577,7 @@ fn draw_overlays(p: &egui::Painter, xf: &Xf, overlays: &[Overlay], t: &Tokens, l
    }
 }

-/// The Home screen shown when no document is open.
+/// The Home screen (`app.home`; with no document open, unless its preference is off).
 fn home(app: &mut VectorcraftApp, ui: &mut Ui, rect: egui::Rect) {
    let t = Tokens::get(ui.ctx());
    ui.painter().rect_filled(rect, 0.0, t.panel_darker);
@@ -1599,7 +1629,20 @@ fn upload(app: &mut VectorcraftApp, ctx: &egui::Context, img: &vectorcraft_rende
    }
 }

+/// The Contextual Task Bar's area.
+fn task_bar_id() -> egui::Id {
+    egui::Id::new("task-bar")
+}
+
+/// Where the Contextual Task Bar was last drawn (none while it isn't shown).
+pub(crate) fn task_bar_rect(ctx: &egui::Context) -> Option<egui::Rect> {
+    let id = task_bar_id();
+    ctx.memory(|m| m.areas().is_visible(&egui::LayerId::new(egui::Order::Middle, id)).then(|| m.area_rect(id)).flatten())
+}
+
 /// The Contextual Task Bar: a floating pill under the selection with the most likely next actions.
+/// Its handle drags it anywhere on the canvas; unpinned it keeps that offset as it follows the
+/// selection, pinned it stays put ([`crate::state::TaskBarPlace`]).
 fn task_bar(app: &mut VectorcraftApp, ui: &mut Ui, xf: &Xf) {
    let t = Tokens::get(ui.ctx());
    let Some(st) = app.session.active() else { return };
@@ -1632,12 +1675,36 @@ fn task_bar(app: &mut VectorcraftApp, ui: &mut Ui, xf: &Xf) {
    }
    items.push((tl!("Duplicate"), "copy", "edit.duplicate"));
    let fill = first.as_ref().map(|f| f.appearance.fill_paint()).unwrap_or_default();
+    let doc = st.uid;
    let anchor = xf.to_screen(Point::new(b.center().x, b.y1));
    let est_w = 118.0 + items.iter().map(|(l, _, _)| l.len() as f32 * 7.2 + 44.0).sum::<f32>();
-    let x = (anchor.x - est_w / 2.0).clamp(xf.rect.left() + 8.0, (xf.rect.right() - est_w - 8.0).max(xf.rect.left() + 8.0));
-    let y = (anchor.y + 28.0).min(xf.rect.bottom() - 56.0);
-    let mut run: Option<String> = None;
-    egui::Area::new(egui::Id::new("task-bar")).order(egui::Order::Middle).fixed_pos(pos2(x, y)).show(ui.ctx(), |ui| {
+    // Its place under the selection, then where the handle moved it, kept on the canvas (with the
+    // bar's size last frame, the estimate before it first shows).
+    let under = pos2(anchor.x - est_w / 2.0, anchor.y + 28.0);
+    let id = task_bar_id();
+    let size = egui::AreaState::load(ui.ctx(), id).and_then(|s| s.size).unwrap_or(vec2(est_w, 44.0));
+    let bounds = xf.rect.shrink(8.0);
+    let keep_in = |p: Pos2| p.clamp(bounds.min, (bounds.max - size).max(bounds.min));
+    let place = &mut app.ui.task_bar_place;
+    // Just unpinned: follow the selection from the pinned spot.
+    if !place.pinned
+        && let Some(at) = place.pin_at.take()
+    {
+        place.offset = Some((doc, xf.rect.min + at - under));
+    }
+    let pos = keep_in(match place.pin_at {
+        Some(at) => xf.rect.min + at,
+        None => under + place.offset.filter(|(d, _)| *d == doc).map_or(Vec2::ZERO, |(_, o)| o),
+    });
+    place.shown_at = Some(pos - xf.rect.min);
+    // Pinned before it ever showed: hold it here.
+    if place.pinned && place.pin_at.is_none() {
+        place.pin_at = place.shown_at;
+    }
+    let pinned = place.pinned;
+    let mut moved = Vec2::ZERO;
+    let mut run: Option<(&str, serde_json::Value)> = None;
+    egui::Area::new(id).order(egui::Order::Middle).fixed_pos(pos).show(ui.ctx(), |ui| {
        egui::Frame::NONE
            .fill(t.panel)
            .stroke(Stroke::new(1.0, t.tool_active))
@@ -1647,8 +1714,15 @@ fn task_bar(app: &mut VectorcraftApp, ui: &mut Ui, xf: &Xf) {
            .show(ui, |ui| {
                ui.horizontal(|ui| {
                    ui.spacing_mut().item_spacing.x = 6.0;
-                    let (g, _) = ui.allocate_exact_size(vec2(4.0, 28.0), Sense::hover());
-                    ui.painter().rect_filled(g.shrink2(vec2(0.5, 4.0)), CornerRadius::same(2), t.button_border);
+                    let (g, grip) = ui.allocate_exact_size(vec2(4.0, 28.0), Sense::drag());
+                    let active = grip.hovered() || grip.dragged();
+                    ui.painter().rect_filled(g.shrink2(vec2(0.5, 4.0)), CornerRadius::same(2), if active { t.text_dim } else { t.button_border });
+                    if grip.dragged() {
+                        ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing);
+                        moved = grip.drag_delta();
+                    } else if grip.hovered() {
+                        ui.ctx().set_cursor_icon(egui::CursorIcon::Grab);
+                    }
                    for (label, icon, cmd) in &items {
                        let galley = ui.painter().layout_no_wrap(label.to_string(), egui::FontId::proportional(13.0), t.text_strong);
                        let (r, resp) = ui.allocate_exact_size(vec2(galley.size().x + 38.0, 30.0), Sense::click());
@@ -1659,7 +1733,7 @@ fn task_bar(app: &mut VectorcraftApp, ui: &mut Ui, xf: &Xf) {
                        crate::icons::paint(ui, icon, egui::Rect::from_min_size(r.min + vec2(8.0, 7.0), vec2(16.0, 16.0)), t.icon);
                        ui.painter().galley(pos2(r.left() + 30.0, r.center().y - galley.size().y / 2.0), galley, t.text_strong);
                        if resp.clicked() {
-                            run = Some(cmd.to_string());
+                            run = Some((*cmd, json!({})));
                        }
                    }
                    let (r, resp) = ui.allocate_exact_size(vec2(26.0, 30.0), Sense::click());
@@ -1675,16 +1749,41 @@ fn task_bar(app: &mut VectorcraftApp, ui: &mut Ui, xf: &Xf) {
                        app.ui.open_panel = Some("swatches".into());
                    }
                    if widgets::icon_button(ui, "lock", tl!("Lock (⌘2)"), false, 30.0).clicked() {
-                        run = Some("object.lock".into());
-                    }
-                    if widgets::icon_button(ui, "ellipsis", tl!("Hide Contextual Task Bar"), false, 30.0).clicked() {
-                        run = Some("window.taskBar".into());
+                        run = Some(("object.lock", json!({})));
                    }
+                    let more = widgets::icon_button(ui, "ellipsis", tl!("More Options"), false, 30.0);
+                    egui::Popup::menu(&more).show(|ui| {
+                        ui.set_min_width(170.0);
+                        let bar = [
+                            (tl!("Hide Bar"), "window.taskBar", false),
+                            (tl!("Pin Bar Position"), "window.taskBar.pin", pinned),
+                            (tl!("Reset Bar Position"), "window.taskBar.reset", false),
+                        ];
+                        for (label, cmd, checked) in bar {
+                            if widgets::menu_item(ui, label, true, checked) {
+                                run = Some((cmd, json!({})));
+                            }
+                        }
+                        ui.separator();
+                        if widgets::menu_item(ui, tl!("Show Properties Panel"), true, false) {
+                            run = Some(("window.panel", json!({"panel": "properties"})));
+                        }
+                    });
                });
            });
    });
-    if let Some(c) = run {
-        crate::menus::invoke(app, &c, json!({}));
+    if moved != Vec2::ZERO {
+        let to = keep_in(pos + moved);
+        let place = &mut app.ui.task_bar_place;
+        if place.pinned {
+            place.pin_at = Some(to - xf.rect.min);
+        } else {
+            place.offset = Some((doc, to - under));
+        }
+        ui.ctx().request_repaint();
+    }
+    if let Some((c, p)) = run {
+        crate::menus::invoke(app, c, p);
    }
 }

@@ -1939,6 +2038,14 @@ mod tests {

    /// One headless canvas frame → the shapes drawn, `Shape::Vec`s flattened.
    fn shapes(app: &mut VectorcraftApp, ctx: &egui::Context) -> Vec<Shape> {
+        let (shapes, mut delta) = frame_output(app, ctx);
+        delta.clear();
+        shapes
+    }
+
+    /// One headless canvas frame → the shapes drawn (`Shape::Vec`s flattened) and the textures
+    /// uploaded by it (the art's raster among them, when it was re-rendered).
+    fn frame_output(app: &mut VectorcraftApp, ctx: &egui::Context) -> (Vec<Shape>, egui::TexturesDelta) {
        fn flat(s: Shape, out: &mut Vec<Shape>) {
            match s {
                Shape::Vec(v) => v.into_iter().for_each(|s| flat(s, out)),
@@ -1946,11 +2053,93 @@ mod tests {
            }
        }
        let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), ..Default::default() };
-        let mut out = ctx.run_ui(raw, |ui| show(app, ui));
-        out.textures_delta.clear();
+        let out = ctx.run_ui(raw, |ui| show(app, ui));
        let mut v = vec![];
        out.shapes.into_iter().for_each(|c| flat(c.shape, &mut v));
-        v
+        (v, out.textures_delta)
+    }
+
+    /// General › Anti-aliased Artwork (#394): on (the default), the art's edges are smoothed on
+    /// screen; off, every pixel is either painted or not, and turning it either way re-renders.
+    #[test]
+    fn anti_aliased_artwork_preference_smooths_the_canvas() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        // Render on this thread: the worker's frame would land later than the test looks.
+        app.canvas.worker_started = true;
+        // A disc: its edge crosses pixels at every angle.
+        app.session.execute("shape.ellipse", &json!({"x": 100, "y": 50, "width": 200, "height": 200})).unwrap();
+        let ctx = egui::Context::default();
+        // The alphas of the art's raster uploaded by one frame, None when it was not re-rendered.
+        let alphas = |app: &mut VectorcraftApp| -> Option<Vec<u8>> {
+            let (_, mut delta) = frame_output(app, &ctx);
+            let art = app.canvas.texture.as_ref().unwrap().id();
+            let alphas = delta.set.iter().find(|e| e.0.eq(&art)).and_then(|e| e.1.last()).map(|d| {
+                let egui::ImageData::Color(img) = &d.image;
+                img.pixels.iter().map(|c| c.a()).collect()
+            });
+            delta.clear();
+            alphas
+        };
+        let partial = |a: &[u8]| a.iter().filter(|&&a| a != 0 && a != 255).count();
+        let on = alphas(&mut app).expect("the first frame renders the art");
+        assert!(partial(&on) > 50, "anti-aliased: edge pixels partly covered ({} of them)", partial(&on));
+        assert!(alphas(&mut app).is_none(), "nothing changed: no re-render");
+        app.session.execute("prefs.set", &json!({"key": "antiAliasedArtwork", "value": false})).unwrap();
+        let off = alphas(&mut app).expect("the preference change re-renders");
+        assert_eq!(partial(&off), 0, "hard edges: every pixel painted or not");
+        assert!(off.iter().filter(|&&a| a == 255).count() > 1000, "the disc is still painted");
+        app.session.execute("prefs.set", &json!({"key": "antiAliasedArtwork", "value": true})).unwrap();
+        assert!(partial(&alphas(&mut app).expect("re-rendered")) > 50, "smooth again");
+    }
+
+    /// Guides & Grid › Show Pixel Grid (Above 600% Zoom) (#394): in Pixel Preview at 600% zoom and
+    /// above, a line at every document pixel over the art; none below 600%, out of Pixel Preview,
+    /// or with the option off.
+    #[test]
+    fn pixel_grid_shows_in_pixel_preview_from_600_percent() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        app.session.execute("shape.rectangle", &json!({"x": 100, "y": 50, "width": 200, "height": 200})).unwrap();
+        app.canvas.worker_started = true; // render on this thread
+        let ctx = egui::Context::default();
+        shapes(&mut app, &ctx); // the first frame fits the view to the artboard
+        // → (the pixel grid's lines, whether the first of them is drawn over the art).
+        let pixel_lines = |app: &mut VectorcraftApp| {
+            let s = shapes(app, &ctx);
+            let art = app.canvas.texture.as_ref().unwrap().id();
+            let image = s.iter().position(|s| matches!(s, Shape::Mesh(m) if m.texture_id == art)).expect("the art");
+            let is_line = |s: &Shape| matches!(s, Shape::LineSegment { stroke, .. } if stroke.color == PIXEL_GRID);
+            let lines: Vec<usize> = s.iter().enumerate().filter(|(_, s)| is_line(s)).map(|(i, _)| i).collect();
+            (lines.len(), lines.first().is_some_and(|&i| i > image))
+        };
+        app.ui.view.pixel_preview = true;
+        app.view_mut().unwrap().zoom = 8.0;
+        let (n, over) = pixel_lines(&mut app);
+        assert!(n >= 150, "a line every 8 px across the 800 × 600 canvas: {n}");
+        assert!(over, "over the art");
+        app.view_mut().unwrap().zoom = 5.0;
+        assert_eq!(pixel_lines(&mut app).0, 0, "below 600%: none");
+        app.view_mut().unwrap().zoom = 6.0;
+        assert!(pixel_lines(&mut app).0 >= 200, "from 600%");
+        app.ui.view.pixel_preview = false;
+        assert_eq!(pixel_lines(&mut app).0, 0, "out of Pixel Preview: none");
+        app.ui.view.pixel_preview = true;
+        app.session.execute("prefs.set", &json!({"key": "showPixelGrid", "value": false})).unwrap();
+        assert_eq!(pixel_lines(&mut app).0, 0, "the option off: none");
+        // A rotated view: the lines turn with the pixels, across the whole canvas.
+        app.session.execute("prefs.set", &json!({"key": "showPixelGrid", "value": true})).unwrap();
+        app.view_mut().unwrap().rotation = 30.0;
+        let s = shapes(&mut app, &ctx);
+        let turned: Vec<_> = s
+            .iter()
+            .filter_map(|s| match s {
+                Shape::LineSegment { points: [a, b], stroke } if stroke.color == PIXEL_GRID => Some((b.x - a.x).atan2(b.y - a.y).to_degrees().abs()),
+                _ => None,
+            })
+            .collect();
+        assert!(turned.len() >= 200, "{}", turned.len());
+        assert!(turned.iter().all(|a| [30.0, 60.0, 120.0, 150.0].iter().any(|t| (a - t).abs() < 0.5)), "turned 30°: {turned:?}");
    }

    /// Guides & Grid (#394): the grid in Grid Color, behind the art or, with Grids In Back off,
@@ -2625,4 +2814,155 @@ mod tests {
        assert!(!app.take_ime_discard());
        assert_eq!(plain(&app, id), "雅がくらくか");
    }
+
+    /// The events eframe's winit integration sends for a pen (Windows Ink) or a finger: a touch
+    /// with its pressure, and the mouse it stands in for (#491).
+    fn pen(phase: egui::TouchPhase, pos: Pos2, force: f32) -> Vec<egui::Event> {
+        let touch = egui::Event::Touch { device_id: egui::TouchDeviceId(1), id: egui::TouchId(1), phase, pos, force: Some(force) };
+        let button = |pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        match phase {
+            egui::TouchPhase::Start => vec![touch, egui::Event::PointerMoved(pos), button(true)],
+            egui::TouchPhase::Move => vec![touch, egui::Event::PointerMoved(pos)],
+            egui::TouchPhase::End | egui::TouchPhase::Cancel => vec![touch, button(false), egui::Event::PointerGone],
+        }
+    }
+
+    /// A pen stroke across `pts` (document points), one frame per sample, with its pressures.
+    fn pen_stroke(app: &mut VectorcraftApp, ctx: &egui::Context, pts: &[(f64, f64, f32)]) {
+        let xf = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap());
+        let last = pts.len() - 1;
+        for (i, &(x, y, force)) in pts.iter().enumerate() {
+            let phase = if i == 0 { egui::TouchPhase::Start } else { egui::TouchPhase::Move };
+            frame(app, ctx, pen(phase, xf.to_screen(Point::new(x, y)), force));
+            if i == last {
+                frame(app, ctx, pen(egui::TouchPhase::End, xf.to_screen(Point::new(x, y)), force));
+            }
+        }
+    }
+
+    /// #491: a pen or a finger draws as the mouse does, and its pressure reaches the tools that
+    /// use it; the pointer leaving with the lift doesn't move the stroke's end.
+    #[test]
+    fn pen_and_touch_input_drive_the_tools_with_their_pressure() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
+        let ctx = egui::Context::default();
+        frame(&mut app, &ctx, vec![]);
+        app.select_tool("pencil");
+        pen_stroke(&mut app, &ctx, &[(100.0, 100.0, 0.5), (140.0, 120.0, 0.6), (180.0, 150.0, 0.7), (220.0, 200.0, 0.4)]);
+        let b = app.session.active().unwrap().doc.art_bounds().expect("the pen drew a path");
+        assert!(b.x0 > 90.0 && b.y0 > 90.0 && b.x1 < 230.0 && b.y1 < 210.0 && b.x1 > 200.0, "the stroke stays where the pen went: {b:?}");
+
+        // Bloat with Use Pressure Pen: each sample carries the pen's pressure.
+        app.session.execute("shape.rectangle", &json!({"x": 300, "y": 300, "width": 200, "height": 200})).unwrap();
+        app.select_tool("bloat");
+        app.session.set_tool_option("usePressure", &json!(true));
+        pen_stroke(&mut app, &ctx, &[(500.0, 350.0, 0.2), (500.0, 400.0, 0.5), (500.0, 420.0, 0.8)]);
+        let (cmd, p) = app.session.journal.last().unwrap().clone();
+        assert_eq!(cmd, "object.liquify");
+        let pressures: Vec<f64> = p["points"].as_array().unwrap().iter().map(|s| (s[2].as_f64().unwrap() * 100.0).round() / 100.0).collect();
+        assert_eq!(pressures.first(), Some(&0.2), "the press's own pressure: {pressures:?}");
+        assert!(pressures.contains(&0.5) && pressures.contains(&0.8), "{pressures:?}");
+    }
+
+    /// #491: a pen tap whose press and lift come in one frame selects what it tapped, and the
+    /// lift (the pointer gone with it) doesn't drag the selection to the canvas's centre.
+    #[test]
+    fn a_pen_tap_within_one_frame_clicks_where_it_tapped() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
+        let id = app.session.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 100, "height": 100})).unwrap()["id"].as_u64().unwrap();
+        app.session.execute("select.none", &json!({})).unwrap();
+        let ctx = egui::Context::default();
+        frame(&mut app, &ctx, vec![]);
+        app.select_tool("selection");
+        let before = app.session.active().unwrap().doc.art_bounds();
+        let at = Xf::new(app.canvas_rect.unwrap(), app.view().unwrap()).to_screen(Point::new(150.0, 150.0));
+        let mut tap = pen(egui::TouchPhase::Start, at, 0.5);
+        tap.extend(pen(egui::TouchPhase::End, at, 0.5));
+        frame(&mut app, &ctx, tap);
+        frame(&mut app, &ctx, vec![]);
+        let doc = app.session.active().unwrap();
+        assert_eq!(doc.selection.objects, vec![vectorcraft_doc::NodeId(id)]);
+        assert_eq!(doc.doc.art_bounds(), before, "the tap moved nothing");
+    }
+
+    /// The Contextual Task Bar's handle drags it: unpinned it keeps that offset as it follows the
+    /// selection, pinned it stays put when the selection changes, unpinned again it follows from
+    /// there, and Reset Bar Position puts it back under the selection. It never leaves the canvas,
+    /// also when the window shrinks.
+    #[test]
+    fn the_task_bar_is_dragged_by_its_handle_pinned_and_reset() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        let mut square =
+            |x: f64, y: f64| app.session.execute("shape.rectangle", &json!({"x": x, "y": y, "width": 40, "height": 40})).unwrap()["id"].clone();
+        let (a, b) = (square(120.0, 40.0), square(220.0, 150.0));
+        app.select_tool("selection");
+        let ctx = egui::Context::default();
+        let bar = || task_bar_rect(&ctx).expect("the task bar shows");
+        let select = |app: &mut VectorcraftApp, id: &serde_json::Value| {
+            app.session.execute("select.set", &json!({"ids": [id]})).unwrap();
+            frame(app, &ctx, vec![]);
+            frame(app, &ctx, vec![]);
+            bar().min
+        };
+        let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        let drag = |app: &mut VectorcraftApp, by: Vec2| {
+            let grip = pos2(bar().left() + 11.0, bar().center().y);
+            frame(app, &ctx, vec![egui::Event::PointerMoved(grip)]);
+            frame(app, &ctx, vec![button(grip, true)]);
+            frame(app, &ctx, vec![egui::Event::PointerMoved(grip + by)]);
+            frame(app, &ctx, vec![button(grip + by, false)]);
+            frame(app, &ctx, vec![]);
+            bar().min
+        };
+        let near = |p: Pos2, q: Pos2| assert!((p - q).length() < 1.5, "{p:?} is not at {q:?}");
+        let (under_a, under_b) = (select(&mut app, &a), select(&mut app, &b));
+        assert!(under_b.y > under_a.y + 100.0, "each bar sits under its selection");
+
+        // Dragged unpinned: it keeps its offset from the selection.
+        select(&mut app, &a);
+        let by = vec2(40.0, -30.0);
+        near(drag(&mut app, by), under_a + by);
+        near(select(&mut app, &b), under_b + by);
+        assert!(!app.ui.task_bar_place.pinned);
+
+        // Pinned: it stays where it is across selection changes, and the handle still moves it.
+        assert_eq!(app.run("window.taskBar.pin", json!({})).unwrap(), json!(true));
+        assert_eq!(crate::menus::checked(&app, "window.taskBar.pin", &json!({})), Some(true));
+        near(select(&mut app, &a), under_b + by);
+        let spot = drag(&mut app, vec2(-20.0, 10.0));
+        near(spot, under_b + by + vec2(-20.0, 10.0));
+        near(select(&mut app, &b), spot);
+
+        // Unpinned: it follows the selection from where it is, kept on the canvas.
+        assert_eq!(app.run("window.taskBar.pin", json!({"pinned": false})).unwrap(), json!(false));
+        near(select(&mut app, &a), spot);
+        let canvas = app.canvas_rect.unwrap();
+        let last = canvas.max - vec2(8.0, 8.0) - bar().size();
+        near(select(&mut app, &b), (under_b + (spot - under_a)).min(last));
+        assert!(app.run("window.taskBar.pin", json!({"pinned": "yes"})).is_err());
+
+        // Kept on the canvas: dragged far off, then pinned in the corner of a shrinking window.
+        near(drag(&mut app, vec2(-2000.0, -2000.0)), canvas.min + vec2(8.0, 8.0));
+        app.run("window.taskBar.pin", json!({"pinned": true})).unwrap();
+        drag(&mut app, vec2(2000.0, 2000.0));
+        near(bar().max, canvas.max - vec2(8.0, 8.0));
+        let small = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(640.0, 480.0))), ..Default::default() };
+        for _ in 0..2 {
+            let mut out = ctx.run_ui(small.clone(), |ui| show(&mut app, ui));
+            out.textures_delta.clear();
+        }
+        let canvas = app.canvas_rect.unwrap();
+        assert!(canvas.width() < 700.0, "the canvas shrank: {canvas:?}");
+        near(bar().max, canvas.max - vec2(8.0, 8.0));
+
+        // Reset: back under the selection, unpinned.
+        frame(&mut app, &ctx, vec![]);
+        app.run("window.taskBar.reset", json!({})).unwrap();
+        assert!(!app.ui.task_bar_place.pinned);
+        near(select(&mut app, &a), under_a);
+        near(select(&mut app, &b), under_b);
+    }
 }
@@ -29,7 +29,7 @@ pub fn app_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
            let (r, _) = ui.allocate_exact_size(vec2(22.0, 22.0), Sense::hover());
            crate::brand::paint_mark(ui, r);
            ui.add_space(4.0);
-            let on_home = app.ui.home.is_some() || app.session.active().is_none();
+            let on_home = menus::home_showing(app);
            if widgets::icon_button(ui, "house", tl!("Home"), on_home, 24.0).clicked() {
                app.run("app.home", json!({})).ok();
            }
@@ -79,6 +79,11 @@ pub fn inspect(app: &VectorcraftApp, ctx: &egui::Context) -> Value {
        "ui": serde_json::to_value(&app.ui).unwrap_or_default(),
        // Not saved with the UI state, so not in `ui`: 0 normal … 3 Presentation Mode.
        "screenMode": app.ui.screen_mode,
+        // The Contextual Task Bar: pinned (not saved either) and where it shows.
+        "taskBar": {
+            "pinned": app.ui.task_bar_place.pinned,
+            "rect": crate::canvas::task_bar_rect(ctx).map(|r| json!([r.left(), r.top(), r.width(), r.height()])),
+        },
        "view": app.view().map(|v| serde_json::to_value(v).unwrap_or_default()),
        "canvasRect": app.canvas_rect.map(|c| json!([c.left(), c.top(), c.width(), c.height()])),
        "window": [r.width(), r.height()],
@@ -225,8 +225,7 @@ fn adjust_fields(ui: &mut egui::Ui, d: &mut Dialog) -> bool {
    }
    if d.fields.contains_key("gamma") {
        widgets::label_row(ui, tl!("Gamma"), LABEL_W, |ui| {
-            let mut g = d.f64("gamma", 1.0);
-            if ui.add(egui::DragValue::new(&mut g).speed(0.01).range(0.1..=10.0).max_decimals(2)).changed() {
+            if let Some(g) = widgets::range_field(ui, "gamma", d.f64("gamma", 1.0), 0.1..=10.0, "", 2, 60.0) {
                d.fields.insert("gamma".into(), json!(g));
            }
        });
@@ -238,9 +238,7 @@ pub(super) fn param_fields(
            }
            match v {
                Value::Number(n) => {
-                    let mut x = n.as_f64().unwrap_or(0.0);
-                    let speed = if x.abs() > 20.0 { 1.0 } else { 0.1 };
-                    if ui.add(egui::DragValue::new(&mut x).speed(speed).max_decimals(2)).changed() {
+                    if let Some(x) = crate::widgets::plain_field(ui, ("fx-num", &k), n.as_f64().unwrap_or(0.0), "", 3, 140.0) {
                        d.fields.insert(k, json!(x));
                        changed = true;
                    }
@@ -288,13 +286,12 @@ pub(super) fn schema_fields(ui: &mut egui::Ui, d: &mut Dialog, specs: &[(String,
            let cur = d.fields.get(k).cloned().unwrap_or_else(|| spec.default_value());
            let new = match spec {
                ParamSpec::Number { min, max, .. } => {
-                    let mut x = cur.as_f64().unwrap_or(*min).clamp(*min, *max);
-                    let speed = ((max - min) / 200.0).clamp(0.01, 10.0);
-                    ui.add(egui::DragValue::new(&mut x).range(*min..=*max).speed(speed).max_decimals(2)).changed().then(|| json!(x))
+                    let x = cur.as_f64().unwrap_or(*min);
+                    crate::widgets::range_field(ui, ("plugin-num", k), x, *min..=*max, "", 2, 100.0).map(|x| json!(x))
                }
                ParamSpec::Int { min, max, .. } => {
-                    let mut x = cur.as_i64().unwrap_or(*min).clamp(*min, *max);
-                    ui.add(egui::DragValue::new(&mut x).range(*min..=*max).speed(0.2)).changed().then(|| json!(x))
+                    let x = cur.as_i64().unwrap_or(*min) as f64;
+                    crate::widgets::range_field(ui, ("plugin-int", k), x, *min as f64..=*max as f64, "", 0, 100.0).map(|x| json!(x as i64))
                }
                ParamSpec::Bool { .. } => {
                    let mut b = cur.as_bool().unwrap_or(false);
@@ -178,9 +178,10 @@ fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
                toggle(ui, d, "preview", tl!("Preview"), true);
                ui.horizontal(|ui| {
                    toggle(ui, d, "dimImages", tl!("Dim Images to:"), true);
-                    let mut v = d.f64("dimPercent", 50.0);
-                    if ui.add_enabled(d.bool("dimImages"), egui::DragValue::new(&mut v).range(0.0..=100.0).suffix("%")).changed() {
-                        d.fields.insert("dimPercent".into(), json!(v.round()));
+                    let v = d.f64("dimPercent", 50.0);
+                    let dim = d.bool("dimImages");
+                    if let Some(v) = ui.add_enabled_ui(dim, |ui| crate::widgets::range_field(ui, "dimPercent", v, 0.0..=100.0, "%", 0, 52.0)).inner {
+                        d.fields.insert("dimPercent".into(), json!(v));
                    }
                });
            });
@@ -51,9 +51,10 @@ fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
            if let Some(i) = widgets::dropdown(ui, "layers-row-size", shown, &labels, 110.0) {
                d.fields.insert("rowSize".into(), json!(SIZES.get(i).map_or("other", |s| s.0)));
            }
-            let mut v = d.f64("otherSize", f64::from(ROW_MEDIUM));
-            if ui.add_enabled(d.str("rowSize") == "other", egui::DragValue::new(&mut v).range(12.0..=100.0).suffix(" pt")).changed() {
-                d.fields.insert("otherSize".into(), json!(v.round()));
+            let v = d.f64("otherSize", f64::from(ROW_MEDIUM));
+            let other = d.str("rowSize") == "other";
+            if let Some(v) = ui.add_enabled_ui(other, |ui| widgets::range_field(ui, "otherSize", v, 12.0..=100.0, " pt", 0, 60.0)).inner {
+                d.fields.insert("otherSize".into(), json!(v));
            }
        });
        ui.end_row();
@@ -12,7 +12,8 @@ use crate::theme::{self, Tokens};
 /// should start with [`heading`] (or [`drag_band`]) so the window can be moved.
 pub(crate) fn show<R>(ctx: &egui::Context, title: &str, id: Id, nudge: f32, margin: i8, add: impl FnOnce(&mut egui::Ui) -> R) -> Option<R> {
    let t = Tokens::get(ctx);
-    egui::Area::new(Id::new("modal-dim")).order(egui::Order::Middle).fixed_pos(egui::Pos2::ZERO).show(ctx, |ui| {
+    let dim = backdrop();
+    egui::Area::new(dim.id).order(dim.order).fixed_pos(egui::Pos2::ZERO).show(ctx, |ui| {
        // Modal, but the canvas isn't dimmed so previews stay readable (as in the reference app).
        ui.allocate_rect(ctx.content_rect(), egui::Sense::click());
    });
@@ -28,6 +29,12 @@ pub(crate) fn show<R>(ctx: &egui::Context, title: &str, id: Id, nudge: f32, marg
        .and_then(|r| r.inner)
 }

+/// The layer of the backdrop behind a modal dialog window, which takes the clicks the rest of
+/// the app would get.
+pub(crate) fn backdrop() -> egui::LayerId {
+    egui::LayerId::new(egui::Order::Middle, Id::new("modal-dim"))
+}
+
 /// The dialog's heading, which also moves the window ([`drag_band`]).
 pub(crate) fn heading(ui: &mut egui::Ui, text: &str) {
    let t = Tokens::get(ui.ctx());
@@ -254,9 +254,9 @@ fn method_row(ui: &mut egui::Ui, d: &mut Dialog, label: &dyn Fn(&mut egui::Ui, &
        choice(ui, d, "method", &Method::ALL.map(Method::id), &Method::ALL.map(Method::label));
        if Method::from_id(&d.str("method")) == Some(Method::Progressive) {
            label(ui, tl!("Scans:"));
-            let mut scans = d.f64("scans", 3.0).round().clamp(*jpeg::SCANS.start() as f64, *jpeg::SCANS.end() as f64) as u8;
-            if ui.add(egui::DragValue::new(&mut scans).range(jpeg::SCANS)).changed() {
-                d.fields.insert("scans".into(), json!(scans));
+            let range = f64::from(*jpeg::SCANS.start())..=f64::from(*jpeg::SCANS.end());
+            if let Some(scans) = widgets::range_field(ui, "scans", d.f64("scans", 3.0), range, "", 0, 44.0) {
+                d.fields.insert("scans".into(), json!(scans as u8));
            }
        }
    });
@@ -277,8 +277,8 @@ fn palette_rows(ui: &mut egui::Ui, d: &mut Dialog, label: &dyn Fn(&mut egui::Ui,
            n = COLOR_COUNTS.get(i).and_then(|c| c.parse().ok()).unwrap_or(n);
            d.fields.insert("colors".into(), json!(n));
        }
-        if ui.add(egui::DragValue::new(&mut n).range(2..=256)).changed() {
-            d.fields.insert("colors".into(), json!(n));
+        if let Some(n) = widgets::range_field(ui, "colors", f64::from(n), 2.0..=256.0, "", 0, 52.0) {
+            d.fields.insert("colors".into(), json!(n as u16));
        }
    });
    ui.end_row();
@@ -286,11 +286,10 @@ fn palette_rows(ui: &mut egui::Ui, d: &mut Dialog, label: &dyn Fn(&mut egui::Ui,
    label(ui, tl!("Dither:"));
    ui.horizontal(|ui| {
        choice(ui, d, "dither", &Dither::ALL.map(Dither::id), &Dither::ALL.map(Dither::label));
-        if Dither::from_id(&d.str("dither")).is_some_and(|x| x != Dither::None) {
-            let mut amount = d.f64("ditherAmount", 100.0).round().clamp(0.0, 100.0) as u8;
-            if ui.add(egui::DragValue::new(&mut amount).range(0..=100).suffix("%")).changed() {
-                d.fields.insert("ditherAmount".into(), json!(amount));
-            }
+        if Dither::from_id(&d.str("dither")).is_some_and(|x| x != Dither::None)
+            && let Some(amount) = widgets::range_field(ui, "ditherAmount", d.f64("ditherAmount", 100.0), 0.0..=100.0, "%", 0, 52.0)
+        {
+            d.fields.insert("ditherAmount".into(), json!(amount as u8));
        }
    });
    ui.end_row();
@@ -646,8 +646,8 @@ fn colors_row(ui: &mut egui::Ui, d: &mut Dialog) {
            n = c.parse().unwrap_or(n);
            d.fields.insert("colors".into(), json!(n));
        }
-        if ui.add(egui::DragValue::new(&mut n).range(2..=256)).changed() {
-            d.fields.insert("colors".into(), json!(n));
+        if let Some(n) = widgets::range_field(ui, "sfw-colors-n", f64::from(n), 2.0..=256.0, "", 0, 52.0) {
+            d.fields.insert("colors".into(), json!(n as u16));
        }
    });
 }
@@ -169,11 +169,11 @@ fn option_row(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, o: &Forma
        }
    } else {
        let integer = o.ty == "integer";
-        let mut x = value.as_f64().unwrap_or(0.0);
-        let drag =
-            egui::DragValue::new(&mut x).range(0.0..=f64::MAX).speed(if integer { 1.0 } else { 0.1 }).max_decimals(if integer { 0 } else { 2 });
-        if ui.add(drag).on_hover_text(o.description).changed() {
-            d.fields.insert(o.name.into(), if integer { json!(x.round() as i64) } else { json!(x) });
+        let x = value.as_f64().unwrap_or(0.0);
+        let field = ui.scope(|ui| widgets::range_field(ui, ("save-option", o.name), x, 0.0..=f64::MAX, "", if integer { 0 } else { 2 }, 80.0));
+        field.response.on_hover_text(o.description);
+        if let Some(x) = field.inner {
+            d.fields.insert(o.name.into(), if integer { json!(x as i64) } else { json!(x) });
        }
    }
    ui.end_row();
@@ -227,6 +227,19 @@ pub fn floating_panel(app: &mut VectorcraftApp, ctx: &egui::Context) {
            });
        });
    });
+    // User Interface › Auto-Collapse Iconic Panels (#394): a press away from the flyout puts it
+    // away, on the canvas or a docked panel. Not one on the icon column (its icons swap or close the
+    // flyout themselves, on release), nor one on a foreground layer (the flyout itself, a dialog, a palette) or a modal dialog's
+    // backdrop, nor one that closes a popup (a panel menu, a dropdown the flyout opened).
+    if open && app.session.prefs.auto_collapse_icon_panels && !egui::Popup::is_any_open(ctx) {
+        let away = |p: egui::Pos2| {
+            !(column..=column + ICON_COL).contains(&p.x)
+                && ctx.layer_id_at(p).is_none_or(|l| l.order != egui::Order::Foreground && l != crate::dialogs::modal::backdrop())
+        };
+        if ctx.input(|i| i.pointer.any_pressed().then(|| i.pointer.interact_pos()).flatten()).is_some_and(away) {
+            open = false;
+        }
+    }
    if !open {
        app.ui.open_panel = None;
    }
@@ -319,6 +332,7 @@ mod tests {
                .run_ui(input, |ui| {
                    show(app, ui);
                    floating_panel(app, ui.ctx());
+                    crate::dialogs::show(app, ui.ctx());
                })
                .textures_delta
                .clear();
@@ -416,6 +430,53 @@ mod tests {
        assert!(rect.height() > 450.0 && rect.bottom() <= SCREEN.y, "Properties flyout {rect:?}");
    }

+    /// User Interface › Auto-Collapse Iconic Panels (#394): on, a click away from a popped-out
+    /// panel puts it away; off (the default), the panel stays until its » or its icon.
+    #[test]
+    fn auto_collapse_puts_a_flyout_away_on_a_click_elsewhere() {
+        let mut h = Harness::new();
+        h.app.run("window.collapseDock", json!({"collapsed": true})).unwrap();
+        h.settle();
+        let (properties, layers) = (h.icons()[0], h.icons()[1]);
+        let away = egui::pos2(300.0, 500.0);
+        h.click(layers.center());
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("layers"));
+        h.click(away);
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("layers"), "off: a click elsewhere leaves it");
+        h.app.session.execute("prefs.set", &json!({"key": "autoCollapseIconPanels", "value": true})).unwrap();
+        h.click(away);
+        assert_eq!(h.app.ui.open_panel, None, "on: a click elsewhere puts it away");
+        h.click(layers.center());
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("layers"), "its icon still pops it out");
+        let rect = h.ctx.memory(|m| m.area_rect(egui::Id::new("icon-panel"))).unwrap();
+        h.click(egui::pos2(rect.center().x, rect.top() + 13.0 + 26.0 + 10.0));
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("layers"), "a click inside keeps it");
+        // The icons still swap the flyout and put it away.
+        h.click(properties.center());
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("properties"), "another icon swaps it");
+        h.click(properties.center());
+        assert_eq!(h.app.ui.open_panel, None, "the same icon puts it away");
+        // A dialog (one a panel menu opens, say): a click in it or on its backdrop keeps the panel.
+        h.click(layers.center());
+        h.app.ui.dialog = Some(crate::state::Dialog::new("move", json!({"dx": "0 pt", "dy": "0 pt"})));
+        h.settle();
+        let dialog = h.ctx.memory(|m| m.area_rect(egui::Id::new(("dialog", "move")))).expect("the Move dialog");
+        h.click(dialog.left_top() + vec2(20.0, 30.0));
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("layers"), "a click in the dialog keeps it");
+        h.click(egui::pos2(dialog.left() - 40.0, dialog.center().y));
+        assert_eq!(h.app.ui.open_panel.as_deref(), Some("layers"), "a click on the backdrop keeps it");
+        h.app.ui.dialog = None;
+        // The dock expanded: a click in its panel group puts a popped-out icon panel away too.
+        h.app.run("window.collapseDock", json!({"collapsed": false})).unwrap();
+        h.settle();
+        let icon = h.icons()[0];
+        h.click(icon.center());
+        let open = h.app.ui.open_panel.clone();
+        assert!(open.is_some(), "an icon panel pops out beside the expanded dock");
+        h.click(egui::pos2(SCREEN.x - 100.0, 300.0));
+        assert_eq!(h.app.ui.open_panel, None, "a click in the docked group puts {open:?} away");
+    }
+
    #[test]
    fn the_collapse_command_sets_or_toggles_the_dock() {
        let mut app = VectorcraftApp::new(Session::new(), Default::default());
@@ -490,6 +490,8 @@
 	Manage Workspaces…	Spravovat pracovní prostory…
 	Control	Ovládací panel
 	Contextual Task Bar	Kontextový panel úloh
+	Pin Bar Position	Připnout polohu panelu
+	Reset Bar Position	Obnovit polohu panelu
 	Tools	Nástroje
 	Toolbars	Panely nástrojů
 	Advanced	Rozšířený
@@ -435,6 +435,8 @@
 	Construction Guides	Guías de construcción
 	Contextual Alternates	Alternativas contextuales
 	Contextual Task Bar	Barra de tareas contextual
+	Pin Bar Position	Fijar posición de la barra
+	Reset Bar Position	Restablecer posición de la barra
 	Contrast	Contraste
 	Control	Control
 	Convert	Convertir
@@ -1089,7 +1091,9 @@
 	Hide Artboards	Ocultar mesas de trabajo
 	Hide Bounding Box	Ocultar cuadro delimitador
 	Hide Code	Ocultar código
-	Hide Contextual Task Bar	Ocultar barra de tareas contextual
+	Hide Bar	Ocultar barra
+	More Options	Más opciones
+	Show Properties Panel	Mostrar panel Propiedades
 	Hide Corner Widget	Ocultar widget de esquina
 	Hide Corner Widget for angles greater than	Ocultar widget de esquina para ángulos mayores que
 	Hide Edges	Ocultar bordes
@@ -3213,7 +3217,6 @@ axis	Both	Ambos
@msg	choose a folder to export to	elige una carpeta a la que exportar
@msg	choose a location for the package	elige una ubicación para el paquete
@msg	clipboard is empty	el portapapeles está vacío
-@msg	collapsed must be true or false	collapsed debe ser true o false
@msg	colorTable.{what}: `{h}` is not a colour such as "#ff8800"	colorTable.{what}: `{h}` no es un color como "#ff8800"
@msg	colorTable.{what}: at most {MAX_TABLE} colours	colorTable.{what}: como máximo {MAX_TABLE} colores
@msg	command `{0}` is not available right now: {1}	el comando `{0}` no está disponible ahora: {1}
@@ -3568,7 +3571,5 @@ axis	Both	Ambos
@msg	The graphics were lost and couldn't be restarted.	Se perdieron los gráficos y no se pudieron reiniciar.
@msg	Your unsaved changes are kept in this browser: reload the page to get them back.	Tus cambios sin guardar se conservan en este navegador: vuelve a cargar la página para recuperarlos.
@msg	Reload the page to go on (changes not saved yet may be lost).	Vuelve a cargar la página para continuar (los cambios que aún no se guardaron podrían perderse).
-@msg	floating must be true or false	floating debe ser true o false
@msg	tool (a tool id) is required	se requiere tool (un id de herramienta)
@msg	{tool} isn't in a toolbar group of several tools	{tool} no está en un grupo de la barra de herramientas con varias herramientas
-@msg	double must be true or false	double debe ser true o false
@@ -511,6 +511,8 @@
 	Manage Workspaces…	ワークスペースを管理…
 	Control	コントロール
 	Contextual Task Bar	コンテキストタスクバー
+	Pin Bar Position	バーの位置を固定
+	Reset Bar Position	バーの位置をリセット
 	Tools	ツール
 	Toolbars	ツールバー
 	Advanced	詳細
@@ -1372,7 +1374,9 @@
 	Height:	高さ:
 	Help › Search Commands…	ヘルプ › コマンドを検索…
 	Hide Code	コードを隠す
-	Hide Contextual Task Bar	コンテキストタスクバーを隠す
+	Hide Bar	バーを隠す
+	More Options	その他のオプション
+	Show Properties Panel	プロパティパネルを表示
 	Hide Corner Widget for angles greater than	次の角度より大きい場合はコーナーウィジェットを隠す
 	Hide Note	メモを隠す
 	Hide Options	オプションを隠す
@@ -447,6 +447,8 @@
 	Construction Guides	Guias de Construção
 	Contextual Alternates	Variantes Contextuais
 	Contextual Task Bar	Barra de Tarefas Contextual
+	Pin Bar Position	Fixar Posição da Barra
+	Reset Bar Position	Redefinir Posição da Barra
 	Control	Controle
 	Convert	Converter
 	Convert All Spot Colors to Process	Converter Todas as Cores Spot em Processo
@@ -1006,7 +1008,9 @@
 	Hide Artboards	Ocultar Mesas de Trabalho
 	Hide Bounding Box	Ocultar Caixa Delimitadora
 	Hide Code	Ocultar Código
-	Hide Contextual Task Bar	Ocultar Barra de Tarefas Contextual
+	Hide Bar	Ocultar Barra
+	More Options	Mais Opções
+	Show Properties Panel	Mostrar Painel Propriedades
 	Hide Corner Widget	Ocultar Widget de Canto
 	Hide Corner Widget for angles greater than	Ocultar Widget de Canto para ângulos maiores que
 	Hide Edges	Ocultar Bordas
@@ -436,6 +436,8 @@
 	Construction Guides	构造参考线
 	Contextual Alternates	上下文替代
 	Contextual Task Bar	上下文任务栏
+	Pin Bar Position	固定任务栏位置
+	Reset Bar Position	重置任务栏位置
 	Contrast	对比
 	Control	控制栏
 	Convert	转换
@@ -1080,7 +1082,9 @@
 	Hide Artboards	隐藏画板
 	Hide Bounding Box	隐藏定界框
 	Hide Code	隐藏代码
-	Hide Contextual Task Bar	隐藏快捷工作列
+	Hide Bar	隐藏任务栏
+	More Options	更多选项
+	Show Properties Panel	显示属性面板
 	Hide Corner Widget	隐藏角控件
 	Hide Corner Widget for angles greater than	角度大于此值时隐藏圆角控件
 	Hide Edges	隐藏边缘
@@ -450,6 +450,8 @@
 	Construction Guides	建構參考線
 	Contextual Alternates	前後關聯替代字
 	Contextual Task Bar	快捷工作列
+	Pin Bar Position	釘選工作列位置
+	Reset Bar Position	重設工作列位置
 	Contrast	對比
 	Control	控制
 	Convert	轉換
@@ -1106,7 +1108,9 @@
 	Hide Artboards	隱藏工作區域
 	Hide Bounding Box	隱藏邊框
 	Hide Code	隱藏程式碼
-	Hide Contextual Task Bar	隱藏快捷工作列
+	Hide Bar	隱藏工作列
+	More Options	更多選項
+	Show Properties Panel	顯示內容面板
 	Hide Corner Widget	隱藏轉角 Widget
 	Hide Corner Widget for angles greater than	角度大於以下數值時隱藏轉角 Widget
 	Hide Edges	隱藏邊緣
@@ -260,6 +260,8 @@ pub struct CacheKey {
    pub ppp: f32,
    pub hidden: Vec<u64>,
    pub rot: f64,
+    /// General › Anti-aliased Artwork.
+    pub anti_alias: bool,
 }

 #[derive(Clone, Copy, Debug, Default)]
@@ -216,6 +216,13 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
        "{tool: id, floating?: bool} float the toolbar group holding `tool` (in the current Basic or Advanced layout) as its own strip of tool buttons (true), put it back in the toolbar (false) or toggle (omitted), as dragging or clicking a flyout's tear-off bar and the strip's × do; returns the new state",
    ),
    ("window.taskBar", "Contextual Task Bar", "", "{}"),
+    (
+        "window.taskBar.pin",
+        "Pin Bar Position",
+        "",
+        "{pinned?: bool} keep the Contextual Task Bar where it is instead of following the selection (true), let it follow the selection again from where it is (false) or toggle (omitted), as the bar's More Options menu does; returns the new state",
+    ),
+    ("window.taskBar.reset", "Reset Bar Position", "", "{} unpin the Contextual Task Bar and put it back under the selection"),
    ("window.dock", "Panels", "Tab", "{} show/hide all panels"),
    ("window.panel", "Show Panel", "", "{panel: id} e.g. layers, swatches, stroke (case-insensitive; display labels like \"Layers\" work too)"),
    (
@@ -770,6 +777,15 @@ fn normalize_panel(input: &str) -> Option<&'static str> {
    crate::state::all_panels().find(|(id, label)| name.eq_ignore_ascii_case(id) || name.eq_ignore_ascii_case(label)).map(|(id, _)| id)
 }

+/// An optional `{key?: bool}` param: none when it is omitted or null (the commands then toggle).
+fn opt_bool(p: &Value, key: &str) -> Result<Option<bool>, String> {
+    match p.get(key) {
+        None | Some(Value::Null) => Ok(None),
+        Some(Value::Bool(b)) => Ok(Some(*b)),
+        Some(_) => Err(format!("`{key}` must be true or false")),
+    }
+}
+
 /// Handle a UI command. `None` = not a UI command (the engine handles it).
 pub fn run_ui_command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
    if id == "app.language" {
@@ -994,25 +1010,38 @@ pub fn run_ui_command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<R
        }
        "window.control" => flag(&mut app.ui.control_bar),
        "window.toolbar" => flag(&mut app.ui.toolbar),
-        "window.toolbarColumns" => {
-            app.ui.toolbar_double = match p.get("double") {
-                None | Some(Value::Null) => !app.ui.toolbar_double,
-                Some(Value::Bool(b)) => *b,
-                Some(_) => return Some(Err("double must be true or false".into())),
-            };
-            Ok(json!(app.ui.toolbar_double))
-        }
+        "window.toolbarColumns" => opt_bool(p, "double").map(|on| {
+            let on = on.unwrap_or(!app.ui.toolbar_double);
+            app.ui.toolbar_double = on;
+            json!(on)
+        }),
        "window.toolbarAdvanced" => flag(&mut app.ui.toolbar_advanced),
        "window.floatTools" => {
-            let floating = match p.get("floating") {
-                None | Some(Value::Null) => None,
-                Some(Value::Bool(b)) => Some(*b),
-                Some(_) => return Some(Err("floating must be true or false".into())),
+            let floating = match opt_bool(p, "floating") {
+                Ok(on) => on,
+                Err(e) => return Some(Err(e)),
            };
            let Some(tool) = s("tool") else { return Some(Err("tool (a tool id) is required".into())) };
            crate::toolbar::float_group(app, &tool, floating).map(Value::Bool)
        }
        "window.taskBar" => flag(&mut app.ui.task_bar),
+        "window.taskBar.pin" => {
+            let place = &mut app.ui.task_bar_place;
+            opt_bool(p, "pinned").map(|pinned| {
+                let pinned = pinned.unwrap_or(!place.pinned);
+                // Pinning holds the bar where it shows; unpinning lets it follow the selection from
+                // there (the bar turns its pinned spot into an offset when it is next drawn).
+                if pinned && !place.pinned {
+                    place.pin_at = place.shown_at;
+                }
+                place.pinned = pinned;
+                json!(pinned)
+            })
+        }
+        "window.taskBar.reset" => {
+            app.ui.task_bar_place = Default::default();
+            Ok(Value::Null)
+        }
        "window.dock" => {
            let on = !(app.ui.dock && app.ui.toolbar);
            app.ui.dock = on;
@@ -1020,15 +1049,11 @@ pub fn run_ui_command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<R
            app.ui.control_bar = on;
            Ok(json!(on))
        }
-        "window.collapseDock" => {
-            let collapsed = match p.get("collapsed") {
-                None | Some(Value::Null) => !app.ui.dock_collapsed,
-                Some(Value::Bool(b)) => *b,
-                Some(_) => return Some(Err("collapsed must be true or false".into())),
-            };
+        "window.collapseDock" => opt_bool(p, "collapsed").map(|collapsed| {
+            let collapsed = collapsed.unwrap_or(!app.ui.dock_collapsed);
            crate::dock::set_collapsed(app, collapsed);
-            Ok(json!(collapsed))
-        }
+            json!(collapsed)
+        }),
        "window.panel" => {
            let raw = s("panel").unwrap_or_default();
            // Canonical id (case-insensitive; display labels work too), then the
@@ -1340,6 +1365,7 @@ pub fn checked(app: &VectorcraftApp, id: &str, p: &Value) -> Option<bool> {
            app.ui.floating_flyouts.iter().any(|f| f.tools.iter().any(|id| id == tool))
        }
        "window.taskBar" => app.ui.task_bar,
+        "window.taskBar.pin" => app.ui.task_bar_place.pinned,
        "window.panel" => {
            let panel = p.get("panel").and_then(Value::as_str).unwrap_or("");
            let canonical = normalize_panel(panel);
@@ -2672,6 +2698,13 @@ pub(crate) fn home_key(app: &VectorcraftApp) -> (Option<u64>, usize) {
    (app.session.active().map(|d| d.uid), app.session.documents().len())
 }

+/// Whether the Home screen is up: chosen with the Home button (`app.home`), or no document is open
+/// and Preferences › General › Show The Home Screen When No Documents Are Open is on (#394). Off,
+/// an app with no document shows an empty window, and the Home button still opens the screen.
+pub(crate) fn home_showing(app: &VectorcraftApp) -> bool {
+    app.ui.home.is_some() || (app.session.active().is_none() && app.session.prefs.show_home_screen)
+}
+
 fn label_of(it: &Item) -> &'static str {
    match it {
        Item::Cmd(l, _, _) => l,
@@ -79,6 +79,7 @@ struct Applied {
    threads: i32,
    tool_tips: bool,
    scrub: bool,
+    bare_points: bool,
 }

 /// Per frame: push UI-side preferences into egui / the renderer when they change.
@@ -95,6 +96,7 @@ pub fn apply_runtime(app: &mut VectorcraftApp, ctx: &egui::Context) {
        threads: p.render_threads,
        tool_tips: p.show_tool_tips,
        scrub: p.scrub_numeric_fields,
+        bare_points: p.numbers_without_units_are_points,
    };
    let id = egui::Id::new("dc-applied-prefs");
    let prev: Option<Applied> = ctx.data(|d| d.get_temp::<Option<Applied>>(id)).flatten();
@@ -105,6 +107,7 @@ pub fn apply_runtime(app: &mut VectorcraftApp, ctx: &egui::Context) {
        let delay = if want.tool_tips { egui::style::Interaction::default().tooltip_delay } else { f32::INFINITY };
        ctx.global_style_mut(|s| s.interaction.tooltip_delay = delay);
        crate::scrub::set_enabled(ctx, want.scrub);
+        crate::widgets::set_bare_numbers_are_points(ctx, want.bare_points);
        if want.white_canvas {
            let mut t = Tokens::get(ctx);
            t.pasteboard = egui::Color32::WHITE;
@@ -231,17 +234,21 @@ fn category_fields(ui: &mut egui::Ui, d: &mut Dialog, cat: &str) {
        first = false;
        let v = d.fields.get(sp.key).cloned().unwrap_or(Value::Null);
        match sp.kind {
+            // Units › Numbers Without Units Are Points only tells points from picas: dimmed
+            // unless a unit is Picas.
+            PrefKind::Bool if sp.key == "numbersWithoutUnitsArePoints" => {
+                ui.add_enabled_ui(picas_in_use(d), |ui| bool_row(ui, d, sp.key, sp.label));
+            }
            PrefKind::Bool => bool_row(ui, d, sp.key, sp.label),
            PrefKind::Num { min, max, unit } => {
                labeled(ui, sp.label, |ui| {
                    let mut x = v.as_f64().unwrap_or(min);
-                    let r = if sp.key == "uiScaling" {
-                        ui.add(egui::Slider::new(&mut x, min..=max).step_by(0.05).text(tl!("Smaller ↔ Larger")))
+                    let new = if sp.key == "uiScaling" {
+                        ui.add(egui::Slider::new(&mut x, min..=max).step_by(0.05).text(tl!("Smaller ↔ Larger"))).changed().then_some(x)
                    } else {
-                        let speed = if max - min > 100.0 { 0.5 } else { 0.05 };
-                        ui.add(egui::DragValue::new(&mut x).range(min..=max).speed(speed).max_decimals(3).suffix(format!(" {unit}")))
+                        widgets::range_field(ui, sp.key, x, min..=max, &format!(" {unit}"), 3, 110.0)
                    };
-                    if r.changed() {
+                    if let Some(x) = new {
                        d.fields.insert(sp.key.into(), json!(x));
                    }
                });
@@ -259,12 +266,12 @@ fn category_fields(ui: &mut egui::Ui, d: &mut Dialog, cat: &str) {
            PrefKind::Int { min, max } => {
                labeled(ui, sp.label, |ui| {
                    let mut x = v.as_i64().unwrap_or(min);
-                    let r = if sp.key == "anchorSize" {
-                        ui.add(egui::Slider::new(&mut x, min..=max).show_value(false).text(tl!("Size")))
+                    let new = if sp.key == "anchorSize" {
+                        ui.add(egui::Slider::new(&mut x, min..=max).show_value(false).text(tl!("Size"))).changed().then_some(x)
                    } else {
-                        ui.add(egui::DragValue::new(&mut x).range(min..=max).speed(0.2))
+                        widgets::range_field(ui, sp.key, x as f64, min as f64..=max as f64, "", 0, 110.0).map(|x| x as i64)
                    };
-                    if r.changed() {
+                    if let Some(x) = new {
                        d.fields.insert(sp.key.into(), json!(x));
                    }
                });
@@ -320,6 +327,11 @@ fn category_fields(ui: &mut egui::Ui, d: &mut Dialog, cat: &str) {
    }
 }

+/// Is one of the dialog's Units (General, Stroke, Type, East Asian Type) Picas?
+fn picas_in_use(d: &Dialog) -> bool {
+    ["unitsGeneral", "unitsStroke", "unitsType", "unitsAsianType"].iter().any(|k| d.str(k) == vectorcraft_doc::Unit::Picas.key())
+}
+
 fn bool_row(ui: &mut egui::Ui, d: &mut Dialog, key: &str, label: &str) {
    let mut b = d.bool(key);
    if ui.checkbox(&mut b, tl!(label)).changed() {
@@ -474,6 +486,34 @@ mod tests {
        assert_eq!(saved["engine_prefs"]["gpuPreference"], json!("highPerformance"));
    }

+    /// Units › Numbers Without Units Are Points (#394): the preference reaches the fields when it
+    /// changes, and its checkbox is dimmed unless a unit is Picas.
+    #[test]
+    fn numbers_without_units_are_points_reaches_the_fields_and_dims_without_picas() {
+        let mut a = app();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let frame = |a: &mut VectorcraftApp| {
+            let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+                apply_runtime(a, ui.ctx());
+                show(a, ui.ctx());
+            });
+            out.textures_delta.clear();
+        };
+        let read = |ctx: &egui::Context| widgets::typed_unit(ctx, vectorcraft_doc::Unit::Picas);
+        frame(&mut a);
+        assert_eq!(read(&ctx), vectorcraft_doc::Unit::Points, "on by default");
+        a.run("prefs.set", json!({"key": "numbersWithoutUnitsArePoints", "value": false})).unwrap();
+        frame(&mut a);
+        assert_eq!(read(&ctx), vectorcraft_doc::Unit::Picas, "off");
+        // The checkbox: dimmed with every unit in points, enabled once a unit is Picas.
+        open(&mut a, Some("Units"));
+        let d = a.ui.dialog.as_mut().unwrap();
+        assert!(!picas_in_use(d), "dimmed in points");
+        d.fields.insert("unitsStroke".into(), json!("picas"));
+        assert!(picas_in_use(d), "enabled with a unit in picas");
+    }
+
    #[test]
    fn every_category_renders_fields() {
        for c in PREF_CATEGORIES {
@@ -515,11 +515,12 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
    let mut ok = false;
    let mut cancel = false;
    let recording = d.str("__recording");
-    // Record a chord (before widgets see the keys).
+    // Record a chord (before widgets see the keys). Modifiers held down are part of the next key's
+    // chord, not a chord of their own.
    if !recording.is_empty() {
        let ev = ctx.input(|i| {
            i.events.iter().find_map(|e| match e {
-                egui::Event::Key { key, pressed: true, modifiers, .. } => Some((*key, *modifiers)),
+                egui::Event::Key { key, pressed: true, modifiers, .. } if !crate::shortcuts::is_modifier(*key) => Some((*key, *modifiers)),
                _ => None,
            })
        });
@@ -789,6 +790,39 @@ mod tests {
        assert_eq!(chord_from_event(Key::K, Modifiers::COMMAND | Modifiers::SHIFT).as_deref(), Some("Cmd+Shift+K"));
        assert_eq!(chord_from_event(Key::P, Modifiers::NONE).as_deref(), Some("P"));
        assert_eq!(chord_from_event(Key::Escape, Modifiers::NONE), None);
+        // A modifier's own key press is no chord (#487).
+        assert_eq!(chord_from_event(Key::ShiftLeft, Modifiers::SHIFT), None);
+        assert!(normalize("ShiftLeft").is_none() && normalize("Cmd+ControlRight").is_none());
+    }
+
+    #[test]
+    fn a_modifier_pressed_while_recording_waits_for_the_key() {
+        let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        open(&mut app);
+        app.ui.dialog.as_mut().unwrap().fields.insert("__recording".into(), json!("tool:groupSelection"));
+        let ctx = egui::Context::default();
+        theme::install_fonts(&ctx);
+        let mut press = |key, modifiers| {
+            let events = vec![egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers }];
+            let mut out = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| show(&mut app, ui.ctx()));
+            out.textures_delta.clear();
+            app.ui.dialog.clone().unwrap()
+        };
+        // egui reports Shift's own key press first (#487): the recording goes on.
+        assert_eq!(press(Key::ShiftLeft, Modifiers::SHIFT).str("__recording"), "tool:groupSelection");
+        let d = press(Key::A, Modifiers::SHIFT);
+        assert_eq!(d.str("__recording"), "");
+        assert_eq!(dialog_overrides(&d).get("tool:groupSelection").map(String::as_str), Some("Shift+A"));
+    }
+
+    #[test]
+    fn saved_modifier_only_overrides_give_the_default_back() {
+        let mut ui = UiState::default();
+        ui.shortcut_overrides.insert("tool:groupSelection".into(), "Shift+ShiftLeft".into());
+        ui.shortcut_overrides.insert("edit.preferences".into(), String::new());
+        let ui = ui.sanitized();
+        assert!(!ui.shortcut_overrides.contains_key("tool:groupSelection"));
+        assert_eq!(ui.shortcut_overrides.get("edit.preferences").map(String::as_str), Some(""));
    }

    #[test]
@@ -40,11 +40,20 @@ pub fn parse(s: &str) -> Option<KeyboardShortcut> {
        "Backspace" => Key::Backspace,
        "Tab" => Key::Tab,
        "~" => Key::Backtick,
-        k => Key::from_name(k)?,
+        // A modifier alone is never a chord's key: it couldn't fire (#487).
+        k => Key::from_name(k).filter(|k| !is_modifier(*k))?,
    };
    Some(KeyboardShortcut::new(m, key))
 }

+/// The modifier keys, which egui also reports as key presses of their own.
+pub(crate) fn is_modifier(key: Key) -> bool {
+    matches!(
+        key,
+        Key::ShiftLeft | Key::ShiftRight | Key::ControlLeft | Key::ControlRight | Key::AltLeft | Key::AltRight | Key::SuperLeft | Key::SuperRight
+    )
+}
+
 /// Every command shortcut in effect (user overrides from Edit → Keyboard Shortcuts win), with the
 /// command's params: `{}`, or `{panel}` for the panel shortcuts (`window.panel`).
 pub(crate) fn all_shortcuts() -> Vec<(KeyboardShortcut, &'static str, serde_json::Value)> {
@@ -258,6 +258,10 @@ pub struct UiState {
    pub toolbar_advanced: bool,
    #[serde(default = "yes")]
    pub task_bar: bool,
+    /// Where the Contextual Task Bar was dragged or pinned. Not saved, as in Illustrator: the bar
+    /// starts under the selection at every launch.
+    #[serde(skip)]
+    pub task_bar_place: TaskBarPlace,
    /// Last tool shown in each toolbar slot (keyed by the slot's first tool id).
    #[serde(default)]
    pub slot_tool: std::collections::BTreeMap<String, String>,
@@ -389,6 +393,24 @@ pub struct FloatingFlyout {
    pub pos: [f32; 2],
 }

+/// Where the Contextual Task Bar sits once its handle has moved it (`window.taskBar.pin`,
+/// `window.taskBar.reset`).
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct TaskBarPlace {
+    /// More Options › Pin Bar Position: the bar stays where it is instead of following the selection.
+    pub pinned: bool,
+    /// Where a pinned bar's top-left corner sits from the canvas's top-left (none when it was
+    /// pinned before it ever showed, until it is drawn). Unpinning leaves it for the next frame
+    /// to turn into `offset`.
+    pub pin_at: Option<egui::Vec2>,
+    /// Where the bar was last drawn, from the canvas's top-left: where pinning holds it.
+    pub shown_at: Option<egui::Vec2>,
+    /// How far an unpinned bar was dragged from its place under the selection, which it keeps while
+    /// it follows the selection, and the document (`DocState::uid`) it was moved in: in another
+    /// document the bar starts under the selection again.
+    pub offset: Option<(u64, egui::Vec2)>,
+}
+
 impl UiState {
    /// Clear transient state after loading saved preferences.
    pub fn sanitized(mut self) -> Self {
@@ -407,6 +429,9 @@ impl UiState {
            f.tools.retain(|id| vectorcraft_tools::tool_info(id).is_some());
            f.tools.first().is_some_and(|k| seen.insert(k.clone()))
        });
+        // Overrides that can't fire (modifier-only chords recorded by older versions, #487) give
+        // the default back.
+        self.shortcut_overrides.retain(|_, c| c.is_empty() || crate::shortcut_editor::normalize(c).is_some());
        self
    }
 }
@@ -424,6 +449,7 @@ impl Default for UiState {
            toolbar_double: false,
            toolbar_advanced: false,
            task_bar: true,
+            task_bar_place: TaskBarPlace::default(),
            slot_tool: Default::default(),
            floating_flyouts: vec![],
            status_bar: true,
@@ -39,6 +39,49 @@ fn home_shows_over_open_documents_until_a_document_is_chosen() {
    assert!(app.ui.home.is_none());
 }

+/// Draw one canvas frame; whether it drew any text (the Home screen's labels; an empty window
+/// draws none).
+fn draws_text(app: &mut VectorcraftApp) -> bool {
+    fn has_text(s: &egui::Shape) -> bool {
+        match s {
+            egui::Shape::Text(_) => true,
+            egui::Shape::Vec(v) => v.iter().any(has_text),
+            _ => false,
+        }
+    }
+    app.canvas_rect = None;
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx);
+    let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(800.0, 600.0))), ..Default::default() };
+    let mut out = ctx.run_ui(raw, |ui| canvas::show(app, ui));
+    out.textures_delta.clear();
+    out.shapes.iter().any(|c| has_text(&c.shape))
+}
+
+/// General › Show The Home Screen When No Documents Are Open (#394): off, an app with no document
+/// shows an empty window instead of the Home screen, and the Home button still opens it.
+#[test]
+fn home_screen_without_documents_follows_its_preference() {
+    let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), crate::Services::default());
+    assert!(app.session.active().is_none());
+    assert!(draws_text(&mut app), "Home with no document open (the default)");
+    assert!(crate::menus::home_showing(&app));
+    app.session.execute("prefs.set", &json!({"key": "showHomeScreen", "value": false})).unwrap();
+    assert!(!draws_text(&mut app), "off: an empty window");
+    assert!(!shows_document(&mut app));
+    assert!(!crate::menus::home_showing(&app), "the Home button isn't lit");
+    app.run("app.home", json!({})).unwrap();
+    assert!(draws_text(&mut app), "the Home button still shows the Home screen");
+    app.run("file.new", json!({})).unwrap();
+    assert!(shows_document(&mut app));
+    assert!(app.ui.home.is_none());
+    app.run("file.close", json!({})).unwrap();
+    assert!(app.session.active().is_none());
+    assert!(!draws_text(&mut app), "closing the last document leaves the window empty");
+    app.session.execute("prefs.set", &json!({"key": "showHomeScreen", "value": true})).unwrap();
+    assert!(draws_text(&mut app), "on again: Home");
+}
+
 #[test]
 fn cmd_n_opens_the_new_document_dialog() {
    assert_eq!(crate::shortcut_editor::command_for_key("Cmd+N"), Some("file.newDialog"));
@@ -132,6 +132,31 @@ fn plain_fields_do_math_with_their_suffix() {
    assert_eq!(f.frame(vec![enter()], &draw), Some(90.0));
 }

+/// Preferences › Units › Numbers Without Units Are Points (#394): on (the default), a number typed
+/// with no unit into a field in picas is read in points; a typed unit still wins (`2p6`, `1in`);
+/// off, it is in picas. A field in any other unit reads it in its unit either way.
+#[test]
+fn bare_numbers_in_picas_fields_are_points_when_the_preference_says_so() {
+    let mut f = Field::new();
+    let typed = |f: &mut Field, u: Unit, text: &str| {
+        let pt = Cell::new(u.to_pt(4.0));
+        let draw = |ui: &mut egui::Ui| widgets::num_field(ui, "f", Some(pt.get()), u, 80.0).inspect(|&v| pt.set(v));
+        f.frame(vec![], &draw);
+        f.frame(f.click(1), &draw);
+        f.frame(vec![Event::Text(text.into())], &draw);
+        f.frame(vec![enter()], &draw)
+    };
+    let (pc, mm) = (Unit::Picas, Unit::Millimeters);
+    assert_eq!(typed(&mut f, pc, "12"), Some(12.0), "on by default: points in a picas field");
+    assert_eq!(typed(&mut f, pc, "2p6"), Some(30.0), "picas and points as typed");
+    assert_eq!(typed(&mut f, pc, "1in"), Some(72.0), "a typed unit wins");
+    assert_eq!(typed(&mut f, pc, "10+5"), Some(15.0), "arithmetic in points too");
+    assert_eq!(typed(&mut f, mm, "12"), Some(mm.to_pt(12.0)), "a millimetre field keeps millimetres");
+    widgets::set_bare_numbers_are_points(&f.ctx, false);
+    assert_eq!(typed(&mut f, pc, "12"), Some(pc.to_pt(12.0)), "off: picas");
+    assert_eq!(typed(&mut f, mm, "12"), Some(mm.to_pt(12.0)));
+}
+
 /// ↑/↓ step a focused numeric field by one of its unit (Shift: ten, Ctrl/Cmd: a tenth) and apply it
 /// at once, the new value selected so typing replaces it; an unfocused field leaves the arrows to
 /// the canvas (nudge).
@@ -180,3 +205,90 @@ fn arrow_keys_step_plain_fields() {
    assert_eq!(f.frame(vec![key(Key::ArrowUp, Modifiers::COMMAND)], &count), None);
    assert_eq!(f.frame(vec![key(Key::ArrowUp, Modifiers::NONE)], &count), Some(4.0));
 }
+
+/// A wheel turn of `dy` (`unit`s, up positive) with `modifiers`, the pointer at `at`.
+fn wheel(at: Pos2, unit: egui::MouseWheelUnit, dy: f32, modifiers: Modifiers) -> Vec<Event> {
+    vec![Event::PointerMoved(at), Event::MouseWheel { unit, delta: vec2(0.0, dy), phase: egui::TouchPhase::Move, modifiers }]
+}
+
+/// The mouse wheel over a focused numeric field steps it as ↑/↓ do (#485): a notch a step, Shift
+/// ten, Ctrl/Cmd a tenth; a trackpad's points add up to notches. Unfocused, or with the pointer
+/// elsewhere, the wheel isn't the field's.
+#[test]
+fn the_wheel_steps_a_focused_field_under_the_pointer() {
+    use egui::MouseWheelUnit::{Line, Point};
+    let mut f = Field::new();
+    let u = Unit::Millimeters;
+    let mm = Cell::new(4.0);
+    let draw = |ui: &mut egui::Ui| widgets::num_field(ui, "f", Some(u.to_pt(mm.get())), u, 80.0).inspect(|&v| mm.set(u.from_pt(v)));
+    f.frame(vec![], &draw);
+    let at = f.rect.get().center();
+    assert_eq!(f.frame(wheel(at, Line, 1.0, Modifiers::NONE), &draw), None, "unfocused");
+    f.frame(f.click(1), &draw);
+    f.frame(vec![], &draw);
+    for (dy, mods, want) in
+        [(1.0, Modifiers::NONE, 5.0), (2.0, Modifiers::SHIFT, 25.0), (-1.0, Modifiers::COMMAND, 24.9), (-1.0, Modifiers::NONE, 23.9)]
+    {
+        assert!(f.frame(wheel(at, Line, dy, mods), &draw).is_some(), "{dy} {mods:?}");
+        assert!((mm.get() - want).abs() < 1e-6, "{dy} {mods:?}: {}", mm.get());
+    }
+    assert_eq!(f.selection(), Some((0, "23.9 mm".len())), "the new value is selected");
+    // Points: a step for each line's worth, what is left carried to the next turn.
+    let line = f.ctx.options(|o| o.input_options.line_scroll_speed);
+    assert_eq!(f.frame(wheel(at, Point, line * 0.6, Modifiers::NONE), &draw), None);
+    assert!(f.frame(wheel(at, Point, line * 0.6, Modifiers::NONE), &draw).is_some());
+    assert!((mm.get() - 24.9).abs() < 1e-6, "{}", mm.get());
+    assert_eq!(f.frame(wheel(Pos2::new(390.0, 190.0), Line, 1.0, Modifiers::NONE), &draw), None, "the pointer elsewhere");
+    // Plain fields (degrees, percent, counts) too.
+    let mut f = Field::new();
+    let count = |ui: &mut egui::Ui| widgets::plain_field(ui, "f", 3.0, "", 0, 80.0);
+    f.frame(vec![], &count);
+    f.frame(f.click(1), &count);
+    f.frame(vec![], &count);
+    assert_eq!(f.frame(wheel(f.rect.get().center(), Line, -1.0, Modifiers::NONE), &count), Some(2.0));
+}
+
+/// The wheel over a focused field steps it and leaves the panel where it is; over an unfocused one
+/// it scrolls the panel as before.
+#[test]
+fn the_wheel_scrolls_the_panel_unless_over_the_focused_field() {
+    for focus in [false, true] {
+        let mut f = Field::new();
+        let offset = Cell::new(0.0);
+        let draw = |ui: &mut egui::Ui| {
+            let out = egui::ScrollArea::vertical().max_height(60.0).show(ui, |ui| {
+                let v = widgets::plain_field(ui, "f", 10.0, "", 0, 80.0);
+                ui.add_space(600.0);
+                v
+            });
+            offset.set(out.state.offset.y);
+            out.inner
+        };
+        f.frame(vec![], &draw);
+        let at = Pos2::new(20.0, 12.0);
+        if focus {
+            f.frame(
+                f.click(1)
+                    .into_iter()
+                    .map(|e| {
+                        if let Event::PointerButton { button, pressed, modifiers, .. } = e {
+                            Event::PointerButton { pos: at, button, pressed, modifiers }
+                        } else {
+                            Event::PointerMoved(at)
+                        }
+                    })
+                    .collect(),
+                &draw,
+            );
+        }
+        let stepped = f.frame(wheel(at, egui::MouseWheelUnit::Line, -2.0, Modifiers::NONE), &draw);
+        for _ in 0..20 {
+            f.frame(vec![], &draw);
+        }
+        if focus {
+            assert_eq!((stepped, offset.get()), (Some(8.0), 0.0));
+        } else {
+            assert!(stepped.is_none() && offset.get() > 0.0, "{stepped:?} {}", offset.get());
+        }
+    }
+}
@@ -146,8 +146,24 @@ pub fn dim_name(ui: &mut Ui, text: &str) -> Response {
    ui.label(egui::RichText::new(text).color(t.text).size(12.5))
 }

+/// Preferences › Units › Numbers Without Units Are Points (#394; on until set): the app sets it
+/// when the preference changes (`prefs_dialog::apply_runtime`), the length fields read it.
+pub(crate) fn set_bare_numbers_are_points(ctx: &egui::Context, on: bool) {
+    ctx.data_mut(|d| d.insert_temp(egui::Id::new("bare_numbers_are_points"), on));
+}
+
+/// The unit a number typed with no unit into a field in `unit` is read in: `unit`, or for a field
+/// in picas points with Numbers Without Units Are Points on (where `12` could be either). A typed
+/// unit (`12 mm`, `2p6`, `1in`) always wins.
+pub(crate) fn typed_unit(ctx: &egui::Context, unit: Unit) -> Unit {
+    let bare_points = ctx.data(|d| d.get_temp::<bool>(egui::Id::new("bare_numbers_are_points"))).unwrap_or(true);
+    if bare_points && unit == Unit::Picas { Unit::Points } else { unit }
+}
+
 /// A recessed numeric field showing `value` (points) in `unit`. Returns the new value (points)
-/// when the user commits (Enter / focus loss). Supports unit suffixes and arithmetic.
+/// when the user commits (Enter / focus loss). Supports unit suffixes and arithmetic; a number
+/// without a unit is in `unit` ([`typed_unit`]: in points in a picas field with Numbers Without
+/// Units Are Points on).
 pub fn num_field(ui: &mut Ui, id: impl std::hash::Hash + std::fmt::Debug, value: Option<f64>, unit: Unit, width: f32) -> Option<f64> {
    let t = Tokens::get(ui.ctx());
    let id = ui.id().with(id);
@@ -181,12 +197,13 @@ pub fn num_field(ui: &mut Ui, id: impl std::hash::Hash + std::fmt::Debug, value:
        })
        .inner;
    select_all_on_focus(ui, &resp, &buf);
-    // ↑/↓ step in the field's unit; a drag on its label scrubs it.
-    let stepped = step_with_arrows(ui, &resp, &mut buf, |b| Some(unit.from_pt(unit.parse(b)?)), |v| unit.format(unit.to_pt(v)));
+    // ↑/↓ and the wheel step in the field's unit; a drag on its label scrubs it.
+    let read = typed_unit(ui.ctx(), unit);
+    let stepped = step_value(ui, &resp, &mut buf, |b| Some(unit.from_pt(read.parse(b)?)), |v| unit.format(unit.to_pt(v)));
    let scrubbed = scrub::field(ui, id, rect, &buf, value.map(|v| unit.from_pt(v)), STEP_DECIMALS);
    let commit = resp.lost_focus() && buf != shown;
    ui.data_mut(|d| d.insert_temp(id, buf.clone()));
-    if commit { unit.parse(&buf) } else { stepped.or(scrubbed).map(|v| unit.to_pt(v)) }
+    if commit { read.parse(&buf) } else { stepped.or(scrubbed).map(|v| unit.to_pt(v)) }
 }

 /// The places a stepped value in a unit field keeps (no 12.300000001).
@@ -198,26 +215,58 @@ pub(crate) fn round_to(v: f64, decimals: i32) -> f64 {
    (v * scale).round() / scale
 }

-/// ↑/↓ in focused numeric field `resp` step the number `buf` shows (`read` parses it, `show`
-/// formats it) by one (Shift: ten, Ctrl/Cmd: a tenth), applied at once as in Illustrator's panels
-/// and dialogs. The new text replaces `buf`, all selected so typing replaces it. Returns the new
-/// number when a step was taken.
-fn step_with_arrows(ui: &Ui, resp: &Response, buf: &mut String, read: impl Fn(&str) -> Option<f64>, show: impl Fn(f64) -> String) -> Option<f64> {
+/// One step of a numeric field with each modifier, most specific first (a plain pattern would also
+/// match Shift): ten with Shift, a tenth with Ctrl/Cmd, else one.
+const STEPS: [(egui::Modifiers, f64); 3] = [(egui::Modifiers::SHIFT, 10.0), (egui::Modifiers::COMMAND, 0.1), (egui::Modifiers::NONE, 1.0)];
+
+/// ↑/↓ in focused numeric field `resp`, or the mouse wheel turned over it, step the number `buf`
+/// shows (`read` parses it, `show` formats it) by one per press or wheel notch ([`STEPS`]: Shift
+/// ten, Ctrl/Cmd a tenth), applied at once as in Illustrator's panels and dialogs. The new text
+/// replaces `buf`, all selected so typing replaces it. Returns the new number when a step was
+/// taken. While the pointer is over the focused field the wheel is the field's (the panel under it
+/// doesn't scroll); an unfocused field leaves the wheel to the panel and the canvas.
+fn step_value(ui: &Ui, resp: &Response, buf: &mut String, read: impl Fn(&str) -> Option<f64>, show: impl Fn(f64) -> String) -> Option<f64> {
    // Memory focus, as the field's highlight and its typing use: `Response::has_focus` also needs the
    // window to report keyboard focus.
    if !ui.memory(|m| m.has_focus(resp.id)) {
        return None;
    }
-    use egui::{Key, Modifiers};
+    use egui::{Event, Key, MouseWheelUnit};
+    let wheel = resp.contains_pointer();
+    // Wheel turns in notches: a line each, or `line` points of a trackpad or a fine wheel; what is
+    // left of a notch carries over to the next turn.
+    let (line, notch_id) = (ui.ctx().options(|o| o.input_options.line_scroll_speed), resp.id.with("wheel"));
+    let mut notches: f32 = if wheel { ui.data(|d| d.get_temp(notch_id)).unwrap_or(0.0) } else { 0.0 };
    let mut steps = 0.0;
    ui.input_mut(|i| {
-        // Most specific first: a plain pattern would also take Shift+↑.
-        for (mods, size) in [(Modifiers::SHIFT, 10.0), (Modifiers::COMMAND, 0.1), (Modifiers::NONE, 1.0)] {
+        for (mods, size) in STEPS {
            let up = i.count_and_consume_key(mods, Key::ArrowUp) as f64;
            let down = i.count_and_consume_key(mods, Key::ArrowDown) as f64;
            steps += size * (up - down);
        }
+        if !wheel {
+            return;
+        }
+        i.events.retain(|e| {
+            let Event::MouseWheel { unit, delta, modifiers, .. } = e else { return true };
+            let Some((_, size)) = STEPS.iter().find(|(m, _)| modifiers.matches_logically(*m)) else { return true };
+            // Shift may turn the wheel sideways (the Mac does).
+            let d = if modifiers.shift { delta.x + delta.y } else { delta.y };
+            notches += match unit {
+                MouseWheelUnit::Point => d / line.max(1.0),
+                MouseWheelUnit::Line | MouseWheelUnit::Page => d,
+            };
+            let whole = notches.trunc();
+            notches -= whole;
+            steps += size * f64::from(whole);
+            false
+        });
+        // The rest of a turn egui spreads over the next frames scrolls nothing either.
+        i.smooth_scroll_delta = egui::Vec2::ZERO;
    });
+    if wheel {
+        ui.data_mut(|d| d.insert_temp(notch_id, notches));
+    }
    if steps == 0.0 {
        return None;
    }
@@ -331,6 +380,22 @@ pub fn plain_field(ui: &mut Ui, id: impl std::hash::Hash + std::fmt::Debug, valu
    mixed_field(ui, id, Some(value), suffix, decimals, width)
 }

+/// [`plain_field`] for a number kept within `range` (the values of dialogs and preferences): what is
+/// typed, stepped or scrubbed is clamped into it and rounded to `decimals` places (0: a count).
+pub fn range_field(
+    ui: &mut Ui,
+    id: impl std::hash::Hash + std::fmt::Debug,
+    value: f64,
+    range: std::ops::RangeInclusive<f64>,
+    suffix: &str,
+    decimals: usize,
+    width: f32,
+) -> Option<f64> {
+    let (lo, hi) = (*range.start(), *range.end());
+    let places = decimals.min(6) as i32;
+    plain_field(ui, id, value.clamp(lo, hi), suffix, decimals, width).map(|v| round_to(v, places).clamp(lo, hi))
+}
+
 /// [`plain_field`] for a value the selected objects may not share: `None` shows a blank field.
 pub fn mixed_field(
    ui: &mut Ui,
@@ -355,10 +420,10 @@ pub fn mixed_field(
    let shown = value.map(show).unwrap_or_default();
    let (mut buf, resp, rect) = recessed_text(ui, id, &shown, width, 1);
    select_all_on_focus(ui, &resp, &buf);
-    // ↑/↓ step at the field's precision (a count ignores Ctrl/Cmd's tenth); a drag on its label
-    // scrubs it.
+    // ↑/↓ and the wheel step at the field's precision (a count ignores Ctrl/Cmd's tenth); a drag on
+    // its label scrubs it.
    let decimals = decimals.min(6) as i32;
-    let stepped = step_with_arrows(ui, &resp, &mut buf, read, show).map(|v| round_to(v, decimals));
+    let stepped = step_value(ui, &resp, &mut buf, read, show).map(|v| round_to(v, decimals));
    let scrubbed = scrub::field(ui, id, rect, &buf, value, decimals);
    if resp.lost_focus() && buf != shown { read(&buf) } else { stepped.or(scrubbed).filter(|&v| Some(v) != value) }
 }
@@ -1265,13 +1330,15 @@ pub fn opt_field(ui: &mut Ui, id: impl std::hash::Hash + std::fmt::Debug, value:
        });
    let resp = framed.inner;
    select_all_on_focus(ui, &resp, &buf);
+    // ↑/↓ and the wheel step a value (an empty field stays empty); a drag on its label scrubs it.
+    let stepped = step_value(ui, &resp, &mut buf, |b| Some(unit.from_pt(unit.parse(b)?)), |v| unit.number(unit.to_pt(v)));
    let scrubbed = scrub::field(ui, id, framed.response.rect, &buf, value.map(|v| unit.from_pt(v)), STEP_DECIMALS);
    ui.data_mut(|d| d.insert_temp(id, buf.clone()));
    if resp.lost_focus() && buf != shown {
        let s = buf.trim();
-        if s.is_empty() { Some(None) } else { unit.parse(s).map(Some) }
+        if s.is_empty() { Some(None) } else { typed_unit(ui.ctx(), unit).parse(s).map(Some) }
    } else {
-        scrubbed.map(|v| Some(unit.to_pt(v)))
+        stepped.or(scrubbed).map(|v| Some(unit.to_pt(v)))
    }
 }

@@ -18,13 +18,13 @@ so only enable it while you use it. Transport: `apps/vectorcraft/src/control_ser
 | `engine.execute` | `{command, params}` | run any engine or UI command (see `engine.commands`) |
 | `engine.commands` | | every command with label, shortcut, params doc, enablement |
 | `document.inspect` | `{depth?, childLimit?}` | layer tree, selection, history, paint defaults; the options slice the layer tree as `document.node {summary: true}` does |
-| `ui.inspect` | | tool, UI state, `screenMode` (0 normal, 1 full screen with menu bar, 2 full screen, 3 Presentation Mode), view, canvas rect, window size, perf, background saves and exports still running |
+| `ui.inspect` | | tool, UI state, `screenMode` (0 normal, 1 full screen with menu bar, 2 full screen, 3 Presentation Mode), `taskBar` (`pinned`, and `rect` `[x, y, w, h]` while the Contextual Task Bar shows), view, canvas rect, window size, perf, background saves and exports still running |
 | `ui.menu.list` / `ui.menu.invoke` | `{command, params}` | the full menu tree / invoke an item |
 | `ui.contextMenu.list` | | the canvas context menu for the current selection, flattened like `ui.menu.list` (`path` holds its submenus). `ui.click {x, y, button: "right"}` on the canvas opens it, after selecting the object there unless it is already selected |
 | `ui.tool.select` / `ui.tool.list` | `{tool}` | |
 | `ui.pointer` | `{events:[{kind: down|drag|up|move|doubleclick, x, y, space?: "doc"|"screen", mods?}]}` | drive the active tool exactly like the mouse |
 | `ui.key` / `ui.text` | `{key, shift?, alt?, cmd?}` / `{text}` | synthetic keyboard input |
-| `ui.wheel` | `{x, y, dy?, dx?, unit?: "line"\|"point", shift?, alt?, cmd?}` | a mouse wheel turn over screen point (x, y): `dy` notches up (+) or down, `dx` sideways. Over the canvas the wheel scrolls and Cmd- or Alt-wheel (Option on the Mac) zooms about the pointer; with the `zoomWithMouseWheel` preference the wheel and Alt-wheel zoom about the pointer, Shift-wheel scrolls up and down and Cmd-wheel (Ctrl on Windows and Linux) sideways |
+| `ui.wheel` | `{x, y, dy?, dx?, unit?: "line"\|"point", shift?, alt?, cmd?}` | a mouse wheel turn over screen point (x, y): `dy` notches up (+) or down, `dx` sideways. Over the canvas the wheel scrolls and Cmd- or Alt-wheel (Option on the Mac) zooms about the pointer; with the `zoomWithMouseWheel` preference the wheel and Alt-wheel zoom about the pointer, Shift-wheel scrolls up and down and Cmd-wheel (Ctrl on Windows and Linux) sideways. Over a focused numeric field (click it first) each notch steps its value as Up/Down do (Shift: ten, Cmd/Ctrl: a tenth) and the panel stays put; over anything else in a panel the wheel scrolls it |
 | `ui.set` | `{brightness?, panel?, rulers?, outline?, grid?, smartGuides?, boundingBox?, controlBar?}` | |
 | `ui.dialog.set` / `.confirm` / `.cancel` | `{field, value}` | fill and submit the open dialog |
 | `ui.screenshot` | `{path?}` | capture the window (PNG). Needs a presented frame: with the screen locked or the window minimized/covered it fails after ~8 s with an explanatory error |
@@ -205,6 +205,15 @@ that open its flyout raise the strip instead. The strips (`ui.floating_flyouts`
 and the strip's top-left corner) are saved with the preferences and in user workspaces; the built-in workspaces
 float none.

+The Contextual Task Bar: its handle (the grip at its left end) drags it anywhere on the canvas, which always holds
+it whole, also when the window shrinks. Unpinned, the bar keeps that offset as it follows the selection, until
+another document becomes active. Its More Options (…) menu has Hide Bar (`window.taskBar`); Pin Bar Position
+(`window.taskBar.pin {pinned?}`, omitted toggles, checked while pinned), which holds the bar where it is across
+selection changes (the handle still moves it) and, turned off, lets it follow the selection again from there; Reset
+Bar Position (`window.taskBar.reset`), which unpins it and puts it back under the selection; and Show Properties
+Panel. As in Illustrator, neither the position nor the pin is saved: each launch starts with the bar under the
+selection.
+
 Flatten Transparency: `ui.flattenTransparencyDialog` opens the `flattenTransparency` dialog for the selection
 (fields `preset`: a preset name, setting it loads that preset's options; the option keys of
 `object.flattenTransparency`: `balance` 0–100, `lineArtPpi` and `gradientPpi` 1–2400, `textToOutlines`,
@@ -64,6 +64,7 @@ The window runs natively on Wayland (eframe's `wayland` feature) and on X11. The
 - **Clipboard:** under Wayland arboard talks to the compositor through the data-control protocol (wlroots compositors such as Sway and Hyprland, KDE Plasma), so bitmaps (`image/png`), SVG markup and text copied in any app paste (#398). Where the compositor lacks the protocol (GNOME's Mutter, [arboard#223](https://github.com/1Password/arboard/issues/223)), arboard falls back to the X11 clipboard through XWayland, which only holds what X11 apps copied. egui's own text paste into fields goes through smithay-clipboard and works either way.
 - **Copied files:** files copied in a file manager (`text/uri-list`; `CF_HDROP` on Windows, file URLs on macOS) paste as the first one that is art (SVG, PDF, EMF/WMF or a bitmap), before the clipboard's other formats (which include the files' paths as text).
 - **Dropping files on the window does not work under Wayland:** winit 0.30, which eframe 0.36 runs on, has no Wayland drag and drop ([winit#1881](https://github.com/rust-windowing/winit/issues/1881), added in winit 0.31; [egui#1563](https://github.com/emilk/egui/issues/1563)), so no `dropped_files` arrive. Until eframe moves to winit 0.31: copy the files in the file manager and paste them, use File › Place or Open, or run the app under XWayland, where drops work (`WAYLAND_DISPLAY= vectorcraft`).
+- **Pens and pen displays under Wayland (#491):** winit 0.30 doesn't bind the Wayland tablet protocol (`zwp_tablet_v2`; tablet input arrives in winit 0.31, [winit#4318](https://github.com/rust-windowing/winit/pull/4318), [egui#7731](https://github.com/emilk/egui/pull/7731)). Since Plasma 6.3, KWin no longer turns tablet input into pointer input for such apps ([kwin!6336](https://invent.kde.org/plasma/kwin/-/merge_requests/6336)): the pen moves the compositor's cursor over the window, but the app gets no motion or presses and shows none of its own cursors. Until eframe moves to winit 0.31, either run the app under XWayland, which supports the tablet protocol and hands the pen to X11 apps as a pointer (`WAYLAND_DISPLAY= vectorcraft`, or `env -u WAYLAND_DISPLAY vectorcraft`; for a desktop launcher, put `env WAYLAND_DISPLAY=` before the command in its `Exec=` line), or turn KWin's deprecated emulation back on for the whole session by setting `KWIN_WAYLAND_EMULATE_TABLET=1` in KWin's environment (for example in a file under `~/.config/environment.d/` or in `/etc/environment`) and logging in again. The pen then works as a mouse, without pressure: winit 0.30 reads pen pressure on Windows only (Windows Ink, which reaches the Liquify tools' Use Pressure Pen). Other compositors that don't emulate a pointer for tablets behave the same way.

 ## Fonts: craft-fonts (optional build input)

@@ -189,6 +189,16 @@ objects' fills or strokes differ (`fillMixed` / `strokeMixed`, drawn as a "?" pr
 | `text_wrap` | `{ids?, offset?, invert?, release?}` | Area type below the objects (same layer) flows around them. |
 | `undo` / `redo` | `{}` | |

+With `mods.shift`, a marquee dragged with the Selection tool toggles the objects it reaches (the selected ones leave
+the selection, the others join it, the rest stays), and one dragged with Direct or Group Selection toggles the anchors
+inside it (a path left with none leaves the selection, one with all of them is selected whole). The Lasso adds anchors
+with `mods.shift` and takes them away with `mods.alt`. They run `select.toggle {ids}` and `select.anchorsMany {items,
+mode: "set"|"add"|"toggle"|"subtract"}`:
+
+```json
+{"name":"pointer_gesture","arguments":{"tool":"selection","mods":{"shift":true},"events":[{"kind":"down","x":180,"y":80},{"kind":"drag","x":300,"y":200},{"kind":"up","x":380,"y":200}]}}
+```
+
 Appearance stacks: an object can carry several fills and strokes (`appearance.addFill`, `appearance.addStroke`), indexed
 in paint order (0 is painted first, the bottom row of the Appearance panel). `paint.setFill`, `paint.setStroke`,
 `stroke.set`, `stroke.setAdvanced`, `paint.editGradient`, `paint.setGradientGeom` and `transparency.set` take
@@ -1176,9 +1186,15 @@ The Selection & Anchor Display and General preferences apply to `pointer_gesture
 The preferences for the view need the desktop app (`vectorcraft-cli mcp --connect`): `zoomWithMouseWheel` (the
 wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; the control channel's
 `ui.wheel` turns the wheel), `zoomToSelection` (on: Zoom In and Zoom Out centre the selection), `showToolTips`,
-`anchorSize` (1–7), `gridColor`, `gridStyle`, `gridsInBack`, `guideColor`, `guideStyle`, `recentFontsCount` and
+`anchorSize` (1–7), `gridColor`, `gridStyle`, `gridsInBack`, `guideColor`, `guideStyle`, `showPixelGrid` (on by
+default: in View › Pixel Preview at 600% zoom and above, a line at every document pixel over the art),
+`recentFontsCount`, `antiAliasedArtwork` (on by default; off, the canvas draws the art with hard edges — a pixel is
+painted when the art covers at least half of it — while raster effects and pattern tiles stay smooth; exports keep
+their own Anti-aliasing option),
 `scrubNumericFields` (on: a horizontal drag on a numeric field's label steps the field, one undo step per drag; the
-control channel's `ui.drag` scrubs).
+control channel's `ui.drag` scrubs), `showHomeScreen` (on by default: the Home screen while no document is open;
+off, an empty window, and the Home button or `app.home` still shows the screen) and `autoCollapseIconPanels` (off by
+default: on, a click away from a panel popped out of the icon column puts it away).

 The Smart Guides preferences (Preferences › Smart Guides) apply to `pointer_gesture` with Smart Guides on (the
 default view) and to the mouse; they change what the tools show and how far a target pulls, never where a snapped
@@ -1198,6 +1214,16 @@ point lands:
  a dragged selection, a bounding-box handle, a ruler guide or an artboard. With Smart Guides off, Snap to Point uses
  `snapToPointTolerance` instead.

+With Smart Guides on, a bounding-box handle dragged with the Selection or Free Transform tool (`mods.shift`
+proportional, `mods.alt` from the centre) lands on another object's anchor or centre (labelled "anchor" or
+"center"), else its corners and side line up with the edges and centres of the other objects and the artboards (a
+line and "align"). The Rotate, Scale, Shear and Reflect tools start a drag from the anchor or centre they grab and
+snap the pointer as drawing tools do, so dragging a corner onto another object's anchor scales exactly onto it:
+
+```json
+{"name":"pointer_gesture","arguments":{"tool":"scale","events":[{"kind":"down","x":100,"y":100},{"kind":"up","x":100,"y":100},{"kind":"down","x":199,"y":198},{"kind":"drag","x":302,"y":262},{"kind":"up","x":302,"y":262}]}}
+```
+
 Not read yet: Construction Guides and their Angles, and Spacing Guides (the tools draw neither).

 ## Type preferences
@@ -1211,6 +1237,11 @@ Not read yet: Construction Guides and their Angles, and Spacing Guides (the tool
  selection (←/→), leading (↑/↓) and baseline shift (Shift+↑/↓), five steps with Cmd/Ctrl too.
 - `missingGlyphProtection` (on by default): `text.setStyle` and `text.setRangeStyle` changing the font leave the
  characters the new font has no glyph for in the font that had one.
+- `typeSelectionByPathOnly` (off by default): on, the Selection tools (`pointer_gesture` with `selection`, and the
+  mouse) pick type on its type path only — the baseline of each of its lines (a vertical column's centre line), area
+  type's frame, type on a path's path — within `selectionTolerance`; a click among the glyphs, between the lines or
+  inside the frame selects nothing. Off, anywhere in the type's bounds selects it. Marquee selection is unchanged, and
+  the Type tools (a click among the characters edits them) and the Eyedropper (`eyedropper`) are not affected.

 ```json
 {"name":"run_command","arguments":{"command":"prefs.set","params":{"values":{"typeSizeIncrement":4,"trackingIncrement":50}}}}
@@ -1296,6 +1327,10 @@ three: General (rulers, positions and sizes, the Info panel, dialog distances, c
 (`document.inspect` → `units`): `document.setUnits {units}` (Document Setup) sets it for that document, and
 `prefs.set {key: "unitsGeneral", value}` sets it for the active document too (one undo step) and is the units
 `file.new` starts in when it gets no `units`. Stroke and Type are the preferences `unitsStroke` and `unitsType`.
+`numbersWithoutUnitsArePoints` (on by default) makes the desktop app's length fields in picas read a number typed
+with no unit in points (`12` is 12 pt, `2p6` and `1p` stay picas, `12 mm` millimetres); off, it is in picas. Fields in
+other units read it in their unit either way, and the Preferences dialog dims the option unless a unit is Picas.
+Command params are in points either way.
 `prefs.list` marks the length preferences (`keyboardIncrement`, `cornerRadius`, `pasteOffset`, `gridlineEvery`,
 `typeSizeIncrement`, `baselineShiftIncrement`) with `measure: "general"|"type"`; they are kept in points and also take
 a string with a unit. Unit names: `Points`, `Picas`, `Inches`, `Millimeters`, `Centimeters`, `Pixels`, `Feet & Inches`,
@@ -1,7 +1,7 @@
 # Releasing VectorCraft

 Every push to the `release` branch runs `.github/workflows/release.yml`. The workflow builds
-installers for macOS, Windows, Linux and FreeBSD, plus the web build, and creates or updates a
+installers for macOS, Windows, Linux (including Flatpak bundles) and FreeBSD, plus the web build, and creates or updates a
 **draft** GitHub Release named `VectorCraft v<version>`. Nobody sees a draft until a maintainer
 publishes it.

@@ -34,8 +34,11 @@ Once the draft is published, the workflow refuses to touch that version again: b

 **Test runs:** *Actions › Release › Run workflow* runs the whole pipeline by hand. The optional
 `version` input (such as `0.4.0-rc.1`) overrides `Cargo.toml` for that run only; each build job
-applies it with `cargo xtask version set` before building. The jobs run in the `release`
-environment, which only the `release` branch can use, so pick that branch in the dialog.
+applies it with `cargo xtask version set` before building. The signing jobs (macOS, Windows) and
+the draft-release job run in the `release` environment, which only the `release` branch can use, so
+pick that branch for a full run. Run on any other branch, it is a dry run: the Linux, Flatpak,
+FreeBSD and web jobs build and upload their artifacts, the environment refuses the signing jobs,
+and no draft release is created.

 ## What gets built

@@ -47,6 +50,8 @@ environment, which only the `release` branch can use, so pick that branch in the
 | Windows on ARM64 | `vectorcraft-<v>-windows-arm64.msi`, `vectorcraft-<v>-windows-arm64-portable.zip` | `windows-latest` (cross-compiled) |
 | Linux x86_64 | `vectorcraft-<v>-linux-x86_64.{AppImage,deb,rpm,tar.gz}` | `ubuntu-22.04` |
 | Linux aarch64 | `vectorcraft-<v>-linux-aarch64.{AppImage,deb,rpm,tar.gz}` | `ubuntu-22.04-arm` |
+| Linux AppImage updates | `vectorcraft-<v>-linux-{x86_64,aarch64}.AppImage.zsync` | with the AppImages |
+| Flatpak x86_64, aarch64 | `vectorcraft-<v>-linux-{x86_64,aarch64}.flatpak` | `ubuntu-24.04`, `ubuntu-24.04-arm` (repackages the Linux tarball) |
 | FreeBSD 14 x86_64 | `vectorcraft-<v>-freebsd-x86_64.tar.gz` | a FreeBSD 14.3 VM on `ubuntu-latest` |
 | Web | `vectorcraft-web-<v>.zip`, a static site (see [`packaging/web/README.md`](../packaging/web/README.md)) | `ubuntu-latest` |

@@ -80,7 +85,9 @@ The rules are in craftrules `standards/fonts.md`, the build option in
 - **Notarization:** the app is zipped and sent with `xcrun notarytool submit --wait`, then the
  ticket is stapled and checked with `stapler validate` and `spctl`. The app goes on a DMG
  (`hdiutil makehybrid` and `convert`, with an `Applications` link to drag onto), which is signed,
-  notarized and stapled too.
+  notarized and stapled too. Its Finder window (background, icon size and positions) comes from
+  [`packaging/macos/dmg/`](../packaging/macos/dmg/README.md), and its volume is named `VectorCraft`
+  without the version, which the window's background needs; the DMG file name keeps the version.
 - **CLI:** the universal `vectorcraft-cli` is signed the same way, zipped, and the zip is
  notarized. A bare executable can't hold a stapled ticket, so Gatekeeper looks the CLI's ticket up
  online the first time a downloaded copy runs.
@@ -130,9 +137,21 @@ glibc 2.35 or newer: Ubuntu 22.04+, Debian 12+, Fedora 36+ and RHEL 10. Moving t
 image raises that floor, so do it deliberately. After packaging, the job prints the `.deb`'s
 metadata and contents, runs `ldd` on the binary and runs each AppImage with `--version`.

-`packaging/linux/flatpak/ai.storyteller.vectorcraft.yml` is a Flatpak manifest ready for a
-Flathub submission (its header says how to build it). The release doesn't build a Flatpak; the
-workflows only check the manifest's id.
+**AppImage updates.** Each AppImage embeds the update information
+`gh-releases-zsync|storytold|vectorcraft|latest|vectorcraft-*-linux-<arch>.AppImage.zsync`
+(appimagetool `-u`), and `package.sh` writes the matching `.zsync` beside it when `zsyncmake` (the
+`zsync` package) is installed. [AppImageUpdate](https://github.com/AppImageCommunity/AppImageUpdate)
+and AppImageLauncher then download only the changed blocks from the newest published,
+non-pre-release release. The job checks both are there.
+
+**Flatpak.** The `flatpak` jobs (x86_64 on `ubuntu-24.04`, aarch64 on `ubuntu-24.04-arm`) take the
+Linux job's tarball and repackage it with `packaging/linux/flatpak-bundle.sh` and
+`packaging/linux/flatpak/ai.storyteller.vectorcraft.bundle.yml` into a single-file bundle
+(`flatpak install --user vectorcraft-<v>-linux-<arch>.flatpak`), then install it and run
+`vectorcraft-cli --version` in the sandbox. No Rust build happens there, so the bundle carries the
+same binaries as the AppImage. `packaging/linux/flatpak/ai.storyteller.vectorcraft.yml` is the
+from-source manifest for a Flathub submission (its header says how to build it); packaging-lint
+keeps the runtime and sandbox permissions of the two manifests identical.

 ### FreeBSD

@@ -157,8 +176,9 @@ the job fails and asks for a version bump (`cargo xtask version set`).

 ## Secrets

-All jobs run in the `release` environment, which only the `release` branch can use and which holds
-the signing secrets. Every secret is optional: a missing one produces unsigned artifacts and a
+The jobs that sign (macOS, Windows) and the draft-release job run in the `release` environment,
+which only the `release` branch can use and which holds the signing secrets. The other jobs get no
+secrets. Every secret is optional: a missing one produces unsigned artifacts and a
 warning, never a failed build.

 | Secret | Used for |
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+# Repackage a VectorCraft Linux tarball as a single-file Flatpak bundle:
+#
+#   $DIST/vectorcraft-<version>-linux-<arch>.flatpak
+#
+# Usage: packaging/linux/flatpak-bundle.sh [--no-test] [TARBALL]
+#
+# TARBALL defaults to $DIST/vectorcraft-<version>-linux-<arch>.tar.gz from package.sh. The bundle
+# is built for the host architecture (x86_64 or aarch64), which must match the tarball's.
+# Needs flatpak, flatpak-builder and the SVG pixbuf loader (librsvg2-common) for the host's
+# `appstreamcli compose`; the freedesktop runtime and SDK named in the manifest are
+# installed per-user from Flathub. Unless --no-test, the bundle is then installed per-user and
+# `vectorcraft-cli --version` is run inside the sandbox as a smoke test.
+# Manifest: packaging/linux/flatpak/ai.storyteller.vectorcraft.bundle.yml.
+set -euo pipefail
+# shellcheck source=../env.sh
+. "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
+HERE="$ROOT/packaging/linux"
+APP_ID=ai.storyteller.vectorcraft
+FLATHUB=https://dl.flathub.org/repo/flathub.flatpakrepo
+
+TEST=1
+TARBALL=""
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --no-test) TEST=0; shift ;;
+    -h | --help) sed -n '2,14p' "$0"; exit 0 ;;
+    -*) echo "unknown argument: $1" >&2; exit 2 ;;
+    *) TARBALL="$1"; shift ;;
+  esac
+done
+
+ARCH="$(uname -m)"
+case "$ARCH" in
+  x86_64) ;;
+  aarch64 | arm64) ARCH=aarch64 ;;
+  *) echo "unsupported architecture $ARCH" >&2; exit 2 ;;
+esac
+BASENAME="vectorcraft-$VERSION-linux-$ARCH"
+TARBALL="${TARBALL:-$DIST/$BASENAME.tar.gz}"
+[ -f "$TARBALL" ] || { echo "error: $TARBALL not found (run packaging/linux/package.sh --formats tar first)" >&2; exit 1; }
+for tool in flatpak flatpak-builder; do
+  command -v "$tool" >/dev/null || { echo "error: $tool not found (apt install flatpak flatpak-builder librsvg2-common)" >&2; exit 1; }
+done
+
+echo "==> VectorCraft $VERSION Flatpak bundle for $ARCH from $(basename "$TARBALL")"
+
+WORK="$CARGO_TARGET_DIR/flatpak-bundle"
+rm -rf "$WORK"
+mkdir -p "$WORK/stage"
+tar -xzf "$TARBALL" -C "$WORK/stage" --strip-components=1
+[ -x "$WORK/stage/bin/vectorcraft" ] || { echo "error: $TARBALL has no bin/vectorcraft" >&2; exit 1; }
+cp "$HERE/flatpak/$APP_ID.bundle.yml" "$WORK/$APP_ID.yml"
+
+flatpak remote-add --user --if-not-exists flathub "$FLATHUB"
+# --disable-rofiles-fuse: no FUSE in containers and CI runners.
+flatpak-builder --user --install-deps-from=flathub --disable-rofiles-fuse --force-clean \
+  --default-branch=stable --repo="$WORK/repo" --state-dir="$WORK/state" "$WORK/build" "$WORK/$APP_ID.yml"
+
+OUT="$DIST/$BASENAME.flatpak"
+# --runtime-repo lets `flatpak install` fetch the freedesktop runtime from Flathub if missing.
+flatpak build-bundle --runtime-repo="$FLATHUB" "$WORK/repo" "$OUT" "$APP_ID" stable
+echo "wrote $OUT"
+
+if [ "$TEST" = 1 ]; then
+  flatpak install --user -y --noninteractive --reinstall "$OUT"
+  flatpak info --user "$APP_ID"
+  flatpak run --command=vectorcraft-cli "$APP_ID" --version
+  flatpak run --command=sh "$APP_ID" -c 'ls /app/share/applications /app/share/metainfo /app/share/mime/packages /app/share/icons/hicolor/scalable/apps'
+fi
+echo "==> done"
+ls -lh "$OUT"
@@ -0,0 +1,47 @@
+# Flatpak manifest for the single-file bundle attached to every GitHub release
+# (vectorcraft-<version>-linux-<arch>.flatpak). Build it with packaging/linux/flatpak-bundle.sh.
+#
+# It repackages the release's own Linux tarball (vectorcraft-<version>-linux-<arch>.tar.gz,
+# built on Ubuntu 22.04 by package.sh) instead of compiling Rust inside flatpak-builder: no
+# network and no vendored crate sources during the build, a few seconds instead of 20+ minutes,
+# and byte-for-byte the same binaries as the AppImage/deb/rpm. The script unpacks the tarball
+# into `stage/` next to a copy of this file. The binaries need glibc >= 2.35 and load X11,
+# Wayland, xkbcommon and Vulkan at runtime; the freedesktop runtime has all of them, and the
+# GPU driver comes from its org.freedesktop.Platform.GL extension.
+#
+# ai.storyteller.vectorcraft.yml (same directory) is the from-source manifest for Flathub. Keep
+# runtime, runtime-version, sdk and finish-args identical in both (packaging-lint checks this).
+id: ai.storyteller.vectorcraft
+runtime: org.freedesktop.Platform
+runtime-version: '25.08'
+sdk: org.freedesktop.Sdk
+command: vectorcraft
+finish-args:
+  # X11 shared memory (MIT-SHM). Without it the X11 fallback is slow or fails.
+  - --share=ipc
+  # Display: Wayland first; X11 only when no Wayland compositor is running.
+  - --socket=wayland
+  - --socket=fallback-x11
+  # GPU access for the wgpu renderer (Vulkan, or GL as a fallback).
+  - --device=dri
+  # Open/Save dialogs use the file-chooser portal (rfd), and drag-and-drop uses the document
+  # portal, so broad filesystem access isn't needed. Pictures is granted for opening files by
+  # path from the command line.
+  - --filesystem=xdg-pictures
+  # Deliberately not granted: network (the optional --control server listens on 127.0.0.1 in
+  # the sandbox; `flatpak override --user --share=network ai.storyteller.vectorcraft` exposes it
+  # to host agents) and home/host filesystem access.
+modules:
+  - name: vectorcraft
+    buildsystem: simple
+    build-commands:
+      - install -Dm755 bin/vectorcraft /app/bin/vectorcraft
+      - install -Dm755 bin/vectorcraft-cli /app/bin/vectorcraft-cli
+      - install -Dm644 share/applications/ai.storyteller.vectorcraft.desktop /app/share/applications/ai.storyteller.vectorcraft.desktop
+      - install -Dm644 share/mime/packages/ai.storyteller.vectorcraft.xml /app/share/mime/packages/ai.storyteller.vectorcraft.xml
+      # Already has the release's version and date substituted by package.sh.
+      - install -Dm644 share/metainfo/ai.storyteller.vectorcraft.metainfo.xml /app/share/metainfo/ai.storyteller.vectorcraft.metainfo.xml
+      - mkdir -p /app/share/icons /app/share/doc && cp -R share/icons/hicolor /app/share/icons/ && cp -R share/doc/vectorcraft /app/share/doc/
+    sources:
+      - type: dir
+        path: stage
@@ -8,6 +8,7 @@
 #   flatpak run ai.storyteller.vectorcraft
 #
 # For Flathub, replace the `dir` source with a `git` source pinned to a release tag and commit.
+# Release bundles (.flatpak on GitHub Releases) use ai.storyteller.vectorcraft.bundle.yml instead.
 id: ai.storyteller.vectorcraft
 runtime: org.freedesktop.Platform
 runtime-version: '25.08'
@@ -16,6 +17,7 @@ sdk-extensions:
  - org.freedesktop.Sdk.Extension.rust-stable
 command: vectorcraft
 finish-args:
+  # Keep identical to ai.storyteller.vectorcraft.bundle.yml (the release bundle); comments there.
  - --share=ipc
  - --socket=wayland
  - --socket=fallback-x11
@@ -2,6 +2,7 @@
 # Build and package VectorCraft for Linux (<arch> is x86_64 or aarch64):
 #
 #   $DIST/vectorcraft-<version>-linux-<arch>.AppImage  any distro with glibc >= the build host's
+#   $DIST/vectorcraft-<version>-linux-<arch>.AppImage.zsync  delta updates (needs zsyncmake)
 #   $DIST/vectorcraft-<version>-linux-<arch>.deb       Debian, Ubuntu, Mint, Pop!_OS, ...
 #   $DIST/vectorcraft-<version>-linux-<arch>.rpm       Fedora, openSUSE, RHEL, ...
 #   $DIST/vectorcraft-<version>-linux-<arch>.tar.gz    plain FHS-style tree (bin/, share/)
@@ -10,7 +11,8 @@
 #
 # Needs: cargo; nfpm for deb/rpm (https://nfpm.goreleaser.com); appimagetool for the AppImage
 # (downloaded into $CARGO_TARGET_DIR if missing). Build on an old distro (CI: Ubuntu 22.04,
-# glibc 2.35) so the binaries run on newer ones. Optional: desktop-file-validate, appstreamcli.
+# glibc 2.35) so the binaries run on newer ones. Optional: desktop-file-validate, appstreamcli,
+# zsyncmake (the zsync package) for the AppImage's .zsync.
 set -euo pipefail
 # shellcheck source=../env.sh
 . "$(dirname "${BASH_SOURCE[0]}")/../env.sh"
@@ -108,11 +110,29 @@ if has appimage; then
      chmod +x "$TOOL"
    fi
  fi
-  OUT="$DIST/$BASENAME.AppImage"
+  # Absolute, because appimagetool runs in $DIST below (CARGO_TARGET_DIR or APPIMAGETOOL may be
+  # relative, e.g. target/agent-<name>).
+  OUT="$(cd "$DIST" && pwd)/$BASENAME.AppImage"
+  APPDIR="$(cd "$APPDIR" && pwd)"
+  TOOL="$(cd "$(dirname "$TOOL")" && pwd)/$(basename "$TOOL")"
+  # A .zsync left by an earlier run would hide a missing zsyncmake and describe another file.
+  rm -f "$OUT.zsync"
+  # Update information: AppImageUpdate, AppImageLauncher and the like read it from the file and
+  # fetch only the blocks that changed in a newer release, through the .zsync published next to
+  # each AppImage on GitHub Releases. `latest` is the newest published release that is not a
+  # pre-release. A fork's builds point at its own releases through GITHUB_REPOSITORY.
+  REPO="${GITHUB_REPOSITORY:-storytold/vectorcraft}"
+  UPDATE_INFO="gh-releases-zsync|${REPO%%/*}|${REPO#*/}|latest|vectorcraft-*-linux-$ARCH.AppImage.zsync"
  # Extract-and-run: works without FUSE (containers, CI). The output embeds the static runtime,
-  # so users don't need libfuse2 either.
-  ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream "$APPDIR" "$OUT"
+  # so users don't need libfuse2 either. With zsyncmake on the host (CI installs the zsync
+  # package) appimagetool also writes the .zsync, into its working directory, hence the cd.
+  (cd "$DIST" && ARCH="$ARCH" APPIMAGE_EXTRACT_AND_RUN=1 "$TOOL" --no-appstream -u "$UPDATE_INFO" "$APPDIR" "$OUT")
  echo "wrote $OUT"
+  if [ -s "$OUT.zsync" ]; then
+    echo "wrote $OUT.zsync"
+  else
+    warn "zsyncmake not found, so $OUT.zsync was not written; AppImage delta updates need it"
+  fi
 fi

 "$STAGE/usr/bin/vectorcraft-cli" --version
@@ -0,0 +1,37 @@
+# macOS DMG window
+
+What Finder shows when the DMG opens: a 660 × 400 pt background with the app icon and the
+`Applications` link side by side. `package.sh` copies these files into the image; nothing here is
+generated at build time, so the DMG still builds with `hdiutil makehybrid` (no mounted device, no
+Finder scripting on CI).
+
+| File | What |
+|---|---|
+| `background.svg` | Source of the background: the app icon (`assets/app-icon/vectorcraft-small.svg`, linked, not copied) cropped as a cover on the VectorCraft colour field (`#e8573f`), Ink and Paper, Inter and JetBrains Mono (from `assets/fonts`, not embedded). |
+| `background.tiff` | The background at 1x (660 × 400 px, 72 dpi) and 2x (1320 × 800 px, 144 dpi) in one HiDPI TIFF (Deflate, sRGB). Goes to `.background/background.tiff`. |
+| `DS_Store` | Finder's view settings for the volume: window size, icon size 128, VectorCraft.app at (326, 205), `Applications` at (574, 205), and the background. Goes to `.DS_Store`. |
+| `generate.py` | Writes `background.tiff` and `DS_Store` from the SVG and the layout above. |
+
+## Rules
+
+- **The volume name has no version** (`VectorCraft`, not `VectorCraft <version>`). `.DS_Store` points at the
+  background through an alias that includes the volume name, so a versioned name loses the
+  background. The DMG file name still carries the version.
+- **Finder draws the icon labels in black in light and dark mode** when a window has a background,
+  so the area under both icons stays light (Paper).
+- **Nothing goes inside the icon boxes:** artwork keeps 10 pt clear of each 128 pt icon box and of
+  the label strip under it.
+
+## Regenerate
+
+Edit `background.svg` (or the layout constants in `generate.py`), then run, on any OS:
+
+```sh
+pip install 'pillow>=12' ds_store==1.3.3 mac_alias==2.2.3
+python3 packaging/macos/dmg/generate.py   # needs resvg on PATH, as packaging/icons.sh
+```
+
+It renders the SVG with resvg using only the fonts in `assets/fonts`, so the pixels are the same
+on every machine, and writes `DS_Store` from scratch: the background alias holds the volume name
+and `/.background/background.tiff`, nothing from the machine that ran it. The window is 660 × 432
+with Finder's 32 pt title bar; the content area is 660 × 400.
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="660" height="400" viewBox="0 0 660 400">
+<defs><clipPath id="panel"><rect width="232" height="400"/></clipPath><filter id="grain" x="0" y="0" width="100%" height="100%">
+  <feTurbulence type="fractalNoise" baseFrequency="0.9" numOctaves="2" seed="7"/>
+  <feColorMatrix values="0 0 0 0 0.04  0 0 0 0 0.04  0 0 0 0 0.05  0.5 0 0 0 -0.225"/>
+</filter></defs>
+
+<rect width="660" height="400" fill="#efe9dc"/><rect width="660" height="400" filter="url(#grain)"/>
+<g clip-path="url(#panel)"><rect width="232" height="400" fill="#e8573f"/><g transform="translate(-62.5,-31.0) scale(1.05)"><image href="../../../assets/app-icon/vectorcraft-small.svg" width="512" height="512"/></g></g>
+<line x1="232.5" y1="0" x2="232.5" y2="400" stroke="#0b0b0c" stroke-width="1.2"/>
+<line x1="236.5" y1="0" x2="236.5" y2="400" stroke="#0b0b0c" stroke-width="0.5"/>
+<text x="266" y="72" font-family="Inter" font-weight="600" font-size="30" letter-spacing="-0.5" fill="#0b0b0c">VectorCraft</text>
+<line x1="267" y1="88.5" x2="624" y2="88.5" stroke="#0b0b0c" stroke-width="0.6"/>
+<path d="M271.5,81.5 L276,88.5 L271.5,95.5 L267,88.5 Z" fill="#e8573f"/>
+<text x="267" y="112" font-family="JetBrains Mono" font-size="9" fill="#0b0b0c" fill-opacity="0.7">Path · 2 anchors · 2 pt stroke</text>
+<path d="M412,213 C438,169 452,237 482,205" fill="none" stroke="#0b0b0c" stroke-width="2"/><rect x="408.5" y="209.5" width="7" height="7" fill="#efe9dc" stroke="#e8573f" stroke-width="1.4"/><path d="M494.8,201.9 L484.3,211.9 L480.5,199.5 Z" fill="#0b0b0c"/>
+<line x1="267" y1="335.5" x2="624" y2="335.5" stroke="#0b0b0c" stroke-width="0.6"/>
+<text x="267" y="358" font-family="Inter" font-weight="500" font-size="11" letter-spacing="1.5"
+      fill="#0b0b0c" fill-opacity="0.65">DRAG ONTO APPLICATIONS TO INSTALL</text>
+
+</svg>
@@ -0,0 +1,136 @@
+#!/usr/bin/env python3
+"""Regenerate background.tiff and DS_Store for the macOS DMG window (see README.md here).
+
+Needs resvg on PATH (as packaging/icons.sh) and:
+    pip install 'pillow>=12' ds_store==1.3.3 mac_alias==2.2.3
+
+Runs on any OS, no Mac needed. Both outputs come from this script alone, so they carry nothing
+from the machine that made them: no local paths, user or disk names, dates or volume UUIDs.
+
+    python3 packaging/macos/dmg/generate.py
+"""
+
+import datetime
+import os
+import shutil
+import subprocess
+import sys
+import tempfile
+
+from ds_store import DSStore
+from mac_alias import Alias, TargetInfo, VolumeInfo
+from PIL import Image, ImageCms
+
+HERE = os.path.dirname(os.path.abspath(__file__))
+FONTS = os.path.join(HERE, "..", "..", "..", "assets", "fonts")
+
+# Keep in sync with package.sh (volume name) and README.md (layout).
+VOLUME = "VectorCraft"
+WIDTH, HEIGHT = 660, 400  # window content, pt; the background's 1x size
+TITLE_BAR = 32
+ICON_SIZE = 128
+ICONS = {"VectorCraft.app": (326, 205), "Applications": (574, 205)}
+# A fixed date for the alias and the colour profile. Finder never matches it against the image
+# (each build is a new volume): it finds the background by volume name and path.
+FIXED_DATE = datetime.datetime(2026, 10, 8, tzinfo=datetime.timezone.utc)
+
+
+def render(svg, width, out):
+    # Only the repo's fonts (Inter, JetBrains Mono), so every machine draws the same pixels.
+    subprocess.run(
+        ["resvg", "--skip-system-fonts", "--use-fonts-dir", FONTS, "-w", str(width), svg, out],
+        check=True,
+    )
+    with Image.open(out) as im:
+        return im.convert("RGB")
+
+
+def srgb_profile():
+    # LittleCMS's built-in sRGB ("No copyright, use freely"), with its creation date fixed.
+    icc = bytearray(ImageCms.ImageCmsProfile(ImageCms.createProfile("sRGB")).tobytes())
+    d = FIXED_DATE
+    icc[24:36] = b"".join(v.to_bytes(2, "big") for v in (d.year, d.month, d.day, 0, 0, 0))
+    if icc[84:100] != bytes(16):
+        sys.exit("error: the sRGB profile has an ID; recompute it after fixing the date")
+    return bytes(icc)
+
+
+def write_tiff(svg, out):
+    """1x (72 dpi) and 2x (144 dpi) in one TIFF, as `tiffutil -cathidpicheck` writes them."""
+    with tempfile.TemporaryDirectory() as tmp:
+        one, two = (render(svg, WIDTH * s, os.path.join(tmp, f"{s}x.png")) for s in (1, 2))
+    two.encoderinfo = {"dpi": (144, 144)}  # the rest as the first page
+    # Opaque RGB, Deflate without a predictor: the paper grain is noise, which a predictor inflates.
+    one.save(
+        out,
+        "TIFF",
+        save_all=True,
+        append_images=[two],
+        compression="tiff_adobe_deflate",  # brand-ok: Pillow's name for TIFF compression 8 (Deflate)
+        dpi=(72, 72),
+        icc_profile=srgb_profile(),
+    )
+    with Image.open(out) as im:
+        im.seek(1)
+        if im.info.get("dpi") != (144, 144):
+            sys.exit("error: the 2x page isn't 144 dpi (needs Pillow 12 or later)")
+
+
+def background_alias():
+    # What Finder stores for /.background/background.tiff on the volume, minus anything about the
+    # machine (dmgbuild writes the same kind of alias from a mounted image). Disk type 5 (ejectable),
+    # the volume flags and the folder/file ids (25, 26) are what Finder wrote on a test image; the ids
+    # are only hints, as the volume's creation date.
+    volume = VolumeInfo(VOLUME, FIXED_DATE, b"H+", 5, 0x0D02, b"\0\0")
+    volume.posix_path = f"/Volumes/{VOLUME}"
+    target = TargetInfo(0, "background.tiff", 25, 26, FIXED_DATE, b"\0\0\0\0", b"\0\0\0\0")
+    target.folder_name = ".background"
+    target.cnid_path = [25]
+    target.carbon_path = f"{VOLUME}:.background:\0background.tiff"
+    target.posix_path = "/.background/background.tiff"
+    return Alias(volume=volume, target=target).to_bytes()
+
+
+def write_ds_store(out):
+    if os.path.exists(out):
+        os.remove(out)
+    with DSStore.open(out, "w+") as d:
+        d["."]["bwsp"] = {
+            "ShowStatusBar": False,
+            "ShowToolbar": False,
+            "ShowTabView": False,
+            "ContainerShowSidebar": False,
+            "ShowSidebar": False,
+            "WindowBounds": f"{{{{200, 528}}, {{{WIDTH}, {HEIGHT + TITLE_BAR}}}}}",
+        }
+        d["."]["icvp"] = {
+            "viewOptionsVersion": 1,
+            "backgroundType": 2,
+            "backgroundImageAlias": background_alias(),
+            "backgroundColorRed": 1.0,
+            "backgroundColorGreen": 1.0,
+            "backgroundColorBlue": 1.0,
+            "gridOffsetX": 0.0,
+            "gridOffsetY": 0.0,
+            "gridSpacing": 100.0,
+            "arrangeBy": "none",
+            "showIconPreview": True,
+            "showItemInfo": False,
+            "labelOnBottom": True,
+            "textSize": 16.0,
+            "iconSize": float(ICON_SIZE),
+        }
+        d["."]["vSrn"] = ("long", 1)
+        for name, pos in ICONS.items():
+            d[name]["Iloc"] = pos
+
+
+def main():
+    if not shutil.which("resvg"):
+        sys.exit("error: resvg not found (brew install resvg / cargo install resvg)")
+    write_tiff(os.path.join(HERE, "background.svg"), os.path.join(HERE, "background.tiff"))
+    write_ds_store(os.path.join(HERE, "DS_Store"))
+
+
+if __name__ == "__main__":
+    main()
@@ -131,10 +131,15 @@ STAGE="$WORK/dmg"
 mkdir -p "$STAGE"
 ditto "$APP" "$STAGE/VectorCraft.app"
 ln -s /Applications "$STAGE/Applications"
+# Finder window layout: background, icon size and positions (packaging/macos/dmg/README.md).
+mkdir -p "$STAGE/.background"
+cp "$HERE/dmg/background.tiff" "$STAGE/.background/background.tiff"
+cp "$HERE/dmg/DS_Store" "$STAGE/.DS_Store"
 rm -f "$DMG" "$WORK/raw.dmg"
 # makehybrid + convert builds the image without attaching a device, unlike `create -srcfolder`,
 # which is flaky on CI runners ("Resource busy") and hangs in sandboxed sessions.
-hdiutil makehybrid -hfs -hfs-volume-name "VectorCraft $VERSION" -hfs-openfolder "$STAGE" -o "$WORK/raw.dmg" "$STAGE"
+# The volume name has no version: .DS_Store finds the background through an alias that includes it.
+hdiutil makehybrid -hfs -hfs-volume-name "VectorCraft" -hfs-openfolder "$STAGE" -o "$WORK/raw.dmg" "$STAGE"
 hdiutil convert "$WORK/raw.dmg" -format UDZO -imagekey zlib-level=9 -o "$DMG"
 rm -f "$WORK/raw.dmg"
 sign "$DMG"