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
192 changed files with 13591 additions and 1705 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 |
@@ -90,6 +93,7 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/icons/dc-alignto-key.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-alignto-selection.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-anchor.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
+| `assets/icons/dc-anchor-smooth.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-appearance.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-arc.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-arrow-down.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
@@ -171,8 +175,6 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/icons/dc-para-rtl.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-path-eraser.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-pathfinder.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
-| `assets/icons/dc-pen-add.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
-| `assets/icons/dc-pen-delete.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-perspective.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-pf-crop.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
 | `assets/icons/dc-pf-divide.svg` | VectorCraft contributors | Original work, drawn for VectorCraft | MIT OR Apache-2.0 |  |
@@ -265,6 +267,8 @@ Generated-in-code art is original and has no file to list. This covers the defau
 | `assets/icons/paintbrush.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/palette.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/pen-tool.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
+| `assets/icons/pen-tool-add.svg` | Lucide Icons and Contributors; badge by VectorCraft contributors | https://lucide.dev (lucide-static v1.49.0 `pen-tool`; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) | Lucide's pen-tool with a plus badge |
+| `assets/icons/pen-tool-delete.svg` | Lucide Icons and Contributors; badge by VectorCraft contributors | https://lucide.dev (lucide-static v1.49.0 `pen-tool`; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) | Lucide's pen-tool with a minus badge |
 | `assets/icons/pencil.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/pilcrow.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
 | `assets/icons/pin.svg` | Lucide Icons and Contributors | https://lucide.dev (lucide-static v1.49.0; header kept in file) | ISC (`assets/icons/LICENSE-lucide.txt`) |  |
@@ -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",
@@ -4450,6 +4450,7 @@ dependencies = [
 "vectorcraft-doc",
 "vectorcraft-effects",
 "vectorcraft-geom",
+ "vectorcraft-metafile",
 "vectorcraft-render",
 "vectorcraft-testkit",
 "vectorcraft-text",
@@ -4457,7 +4458,7 @@ dependencies = [

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

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

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

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

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

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

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

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

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

 [[package]]
 name = "vectorcraft-testkit"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "image",
 "kurbo 0.13.1",
@@ -4637,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",
@@ -4649,12 +4650,13 @@ dependencies = [
 "unicode-script",
 "vectorcraft-doc",
 "vectorcraft-geom",
+ "windows-registry",
 "write-fonts",
 ]

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

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

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

 [[package]]
 name = "vectorcraft-web"
-version = "0.4.0"
+version = "0.6.0"
 dependencies = [
 "eframe",
 "egui",
@@ -5421,6 +5423,17 @@ dependencies = [
 "windows-link",
 ]

+[[package]]
+name = "windows-registry"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720"
+dependencies = [
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
 [[package]]
 name = "windows-result"
 version = "0.4.1"
@@ -5803,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); 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); 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

@@ -95,50 +95,52 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
  - Headless CLI (`vectorcraft-cli run`, `convert`, `info`, `bench`, `perf`, `mcp`).
  - Actions panel that records and plays back commands.
 - **UI:** Illustrator 2026 layout restyled to measured values:
-  - Medium Dark theme, categorized and Advanced toolbars, 35 pt document tabs, 33 pt panel tabs.
+  - 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 and Linux, a VectorCraft ▸ Language menu and a Language preference. Names are never translated (fonts and their styles, layers, artboards, saved presets, user libraries, custom workspaces, recent files, plug-ins).
+  - 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), 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. They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). About 45 stored options still do nothing yet (the rest of #394: Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, the smart guide display options, 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).
  - **Cutting:** Eraser, Scissors, Knife, Mirror & Cut, Line Cut and Rectangle Cut (real geometry, compound paths keep their holes).
  - **Transform:** Rotate, Reflect, Scale, Shear (click or Alt-click snaps the reference point to anchors and centres; Alt-click opens the tool's dialog, and a drag with Alt down at the release, from the press or pressed mid-drag, transforms a copy), Reshape, Free Transform (free and perspective distort and shear, switched by the keys held during a handle drag).
-  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them.
-  - **Pen:** Alt pressed in the middle of dragging out an anchor splits its handles and keeps the curve already shaped into it (only the outgoing handle follows the pointer); Space held while dragging out an anchor moves it, handles and all. Clicking the last anchor of the path being drawn retracts its outgoing handle (convert cursor), and dragging from it pulls out a new one on its own. Auto Add/Delete: over a selected path, a click on a segment adds an anchor and a click on an anchor deletes it (add and delete cursors); Shift held, or Preferences › General › Disable Auto Add/Delete, starts a new path instead.
+  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. On a rectangle that isn't square every corner is the same circle: a radius past half the shorter side stops there for all of them, the widgets sit on the corners as drawn and turn the edited corners red at that limit, CSS export writes the drawn radii, and rectangles saved stretched by older versions get circular corners when their corners are next set (#442).
+  - **Pen:** Alt pressed in the middle of dragging out an anchor splits its handles and keeps the curve already shaped into it (only the outgoing handle follows the pointer); Space held while dragging out an anchor moves it, handles and all. Clicking the last anchor of the path being drawn retracts its outgoing handle (convert cursor), and dragging from it pulls out a new one on its own. Auto Add/Delete: over a selected path, a click on a segment adds an anchor and a click on an anchor deletes it (add and delete cursors); Shift held, or Preferences › General › Disable Auto Add/Delete, starts a new path instead. Alt held over a handle end or an anchor of a selected path (the one being drawn too) works as the Anchor Point tool, with its convert cursor: dragging a handle moves it alone, clicking a smooth anchor makes it a corner, dragging an anchor pulls out new symmetric handles; drawing then goes on.
  - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type.
-  - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on), Measure, Type, Hand, Zoom, Rotate View.
+  - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on; Copy, Cut and Paste take the artboard with its art, Paste right of the last artboard, Paste in Place where it was, into this or another document, #446), Measure, Type, Hand, Zoom, Rotate View.
  - **Editing type:** double-clicking type with a selection tool switches to the Type tool with the caret where it was clicked.
  - **Temporary tools:** Cmd with any other tool drags with the selection tool used last (Selection, Direct Selection or Group Selection). Held Space pans and Cmd+Space zooms (Cmd+Alt+Space out) whatever the tool.
  - **Panel drag and drop:** art dragged off the canvas onto the Symbols panel becomes a symbol, onto the Swatches panel a pattern swatch and onto the Brushes panel an Art brush; a symbol dragged onto the canvas places an instance where it is dropped, and a brush dragged onto a path is applied to it.
  - **Tool double-clicks:** double-clicking a tool's button opens its options: Hand fits the artboard in the window, Zoom shows 100 %, Rotate, Scale, Reflect and Shear open their Object › Transform dialogs, the Selection, Direct Selection and Group Selection tools the Move dialog (Enter opens these seven tools' dialogs too), Gradient, Eyedropper, Blend and the Liquify tools their panels or options, and the Pencil, Paintbrush, Smooth, Blob Brush and Eraser tools their Tool Options (Fidelity, fill, the tolerances, the brush size).
- **Layers panel:** every layer, sublayer, group and object is a clickable row at any depth: a click highlights it and makes its layer current (new art goes there), Shift-click a range, Ctrl/Cmd-click toggles. Sublayers are no longer treated as objects: clicks, marquees, Select All and the Select menu take the art inside them, and each sublayer selects in its own colour. Selection squares on rows with selected art (click selects a row's art, Shift adds or removes; dragging the square moves the selection to another row, Alt copies), the eye and lock on every row with drag-down-the-column (one undo step), Ctrl/Cmd-click an eye for per-layer Outline, Alt-click an eye or lock to hide or lock the other layers (again: show or unlock them all), triangles with Alt to open or close everything inside, drag and drop rows above, below or into layers and groups with a drop line (Alt copies, the trash deletes), inline rename, Delete key on highlighted rows. Buttons and the full panel menu: New Layer/Sublayer (Alt: options, Ctrl: on top), Duplicate, Delete, Options for Selection, clipping mask, isolation, Locate Object, Merge Selected, Flatten Artwork, Collect in New Layer, Release to Layers (Sequence and Build), Reverse Order, Template, Hide/Outline/Lock Others and Show/Preview/Unlock All, Paste Remembers Layers, Panel Options (row size, thumbnails per kind, Show Layers Only). Layer Options: name, colour (presets or custom), Template, Lock, Show, Print, Preview (outline drawing and clicking) and Dim Images to %. Every operation is a command (`layer.move`, `layer.highlight`, `layer.merge`…) with validation against cycles and invalid nesting.
- **Drawing aids:** Smart Guides and snapping (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 (Shift snaps them to the ruler's ticks) 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 art's edges, centres and 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.
+- **Layers panel:** every layer, sublayer, group and object is a clickable row at any depth: a click highlights it and makes its layer current (new art goes there), Shift-click a range, Ctrl/Cmd-click toggles. Sublayers are no longer treated as objects: clicks, marquees, Select All and the Select menu take the art inside them, and each sublayer selects in its own colour. Selection squares on rows with selected art (click selects a row's art, Shift adds or removes; dragging the square moves the selection to another row, Alt copies), the eye and lock on every row with drag-down-the-column (one undo step), Ctrl/Cmd-click an eye for per-layer Outline, Alt-click an eye or lock to hide or lock the other layers (again: show or unlock them all), triangles with Alt to open or close everything inside, drag and drop rows above, below or into layers and groups with a drop line (Alt copies) and a dimmed copy of the row under the pointer (dropped on the trash rows are deleted, on New Layer duplicated, as in Illustrator), inline rename, Delete key on highlighted rows. Buttons and the full panel menu: New Layer/Sublayer (Alt: options, Ctrl: on top), Duplicate, Delete, Options for Selection, clipping mask, isolation, Locate Object, Merge Selected, Flatten Artwork, Collect in New Layer, Release to Layers (Sequence and Build), Reverse Order, Template, Hide/Outline/Lock Others and Show/Preview/Unlock All, Paste Remembers Layers, Panel Options (row size, thumbnails per kind, Show Layers Only). Layer Options: name, colour (presets, each with a chip of its colour, or custom), Template, Lock, Show, Print, Preview (outline drawing and clicking) and Dim Images to %. Every operation is a command (`layer.move`, `layer.highlight`, `layer.merge`…) with validation against cycles and invalid nesting.
+- **Drawing aids:** Smart Guides and snapping (moving, with the Selection, Group Selection or Direct Selection tool, and resizing by the bounding-box handles with the Selection or Free Transform tool, Shift and Alt too: the dragged corner or side lands on the other objects' anchors and centres ("anchor", "center") or lines up with their edges and centres (a line and "align"); the Rotate, Scale, Shear and Reflect tools drag from the anchor they grab and snap the pointer the same way, so a corner dragged onto another object's anchor scales exactly onto it, #482; anchors dragged with Direct Selection: the one pressed on lands on other anchors, its own path's that stay put among them, on path segments or in line with them, the others following, Shift keeps 45° steps, and with Smart Guides off Snap to Point pulls it onto anchors; the Artboard tool snaps artboards, and their bleed, to other artboards, bleeds and art, the grid or whole pixels while moving, copying and resizing them, and the Transform panel shows and edits the active artboard's X/Y/W/H), guides dragged out of the rulers (#451: they snap as moved guides do, Shift to the ruler's ticks; with the Artboard tool they are artboard guides, which run across their artboard only and move, copy and delete with it, `guide.add {artboard}`) that the Selection, Direct Selection and Group Selection tools then pick and drag (#414: the selected guides highlight and move together, Alt copies them, Shift snaps the dragged one to the ticks, otherwise it snaps to pixels, the grid or the edges, centres (so the sides' midpoints) and anchors of the art and the artboards, or with Smart Guides off Snap to Point pulls it onto anchors; the arrow keys nudge them, Delete deletes them, dragging one back onto its ruler deletes it, Lock Guides and Hide Guides leave them alone; `guide.list`, `guide.select`, `guide.move` and `guide.remove` reach agents), and Draw Normal / Behind / Inside modes.
+- **Views:** the status bar's artboard navigator (first, previous, next, last; `view.goToArtboard`) goes to an artboard and fits it, and Fit Artboard in Window and Actual Size show the navigator's artboard. The Artboards panel highlights that active artboard: clicking a row makes it active (the Artboard tool's too, while it is chosen) as does clicking an artboard with the Artboard tool, double-clicking its number also fits it in the window and double-clicking its name renames it. Duplicate Artboards, or a row dragged onto New Artboard, copies the artboard with its art (#446). Escape leaves Presentation Mode, F from it goes back to Normal Screen Mode, and the screen mode isn't saved with the preferences: the app always starts in Normal Screen Mode with its menus and panels (#472).
 - **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.
+  - 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.
  - Live effects with previewing dialogs: Distort & Transform, Path, Convert to Shape, 15 Warp styles, Round Corners, Scribble, Effect → Pathfinder (all 10 operations, live on groups; several loose objects are grouped first, in one undo step), Color Adjustments (Brightness/Contrast, Curves, Levels, Hue/Saturation, Shift to Color, Temperature/Tint, on vectors, live type and embedded images), and raster drop shadow, glows and feather. SVG and PDF export keep live effects (geometry baked; SVG raster effects as filters).
- **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline), threaded text across any closed shapes, Fit Headline. Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text.
- **Interface languages, vertical type:** VectorCraft ▸ Language (or Preferences ▸ User Interface) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese and Spanish (neutral international Spanish, for every `es-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech and Spanish ones from the bundled UI fonts. The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese, and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a wrapped line flush with its start, and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline; Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline or the em box top/right, centre or bottom/left (ICF top and bottom not yet); Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
+- **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline), threaded text across any closed shapes, Fit Headline. Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. Font Size and Leading are combo boxes in the Character and Properties panels (Font Size in the Control bar too, beside the Character link, font family and style): type, step with ↑/↓ or the spinner, scrub the label, or pick a preset (6–72 pt, shown in the type unit; Leading also Auto), each pick one undo step; Kerning and Tracking list -100…200; a size, leading, kerning or tracking the selected text doesn't share shows blank (#458).
+- **Interface languages, vertical type:** VectorCraft ▸ Language (or Preferences ▸ User Interface) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese and Spanish (neutral international Spanish, for every `es-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish also translates status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech and Spanish ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese, and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a wrapped line flush with its start, and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline; Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline or the em box top/right, centre or bottom/left (ICF top and bottom not yet); Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
 - **Transparency:** opacity masks (clip/invert/disable/link), exported as SVG `<mask>` and PDF soft masks.
- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; Alt deletes their pieces; filled open paths count as closed), Live Paint (every path an edge, open lines included), Image Trace (12 presets), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
+- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), the Image Trace panel and Expand, plus Release in Properties; the View modes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
 - **Paint and appearance (M3):**
  - **Swatches:** names follow the colour model and are unique; Swatch Options (process/spot, Global, Gray/RGB/HSB/CMYK/Web, live preview); editing a global or spot swatch recolours every linked fill, stroke and text run in one undo step; multi-select and delete with confirmation; New Swatch and New Color Group dialogs (a group from the selected artwork's colours); swatches in colour groups convert, separate and count like any other. The Swatches panel selects ranges and whole groups, has a find field, and drags swatches to reorder, regroup or paint art; Add Used Colors, Select All Unused, Merge, Ungroup and Sort by Kind; a CMYK document keeps applied colours in CMYK. Swatch libraries: nine generated colour libraries and five gradient libraries in a library panel, saved and loaded as `.vcswatches`, `.gpl` or CSS. Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate.
-  - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers, panels have their shortcuts, and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening. Document Color Mode converts the art, symbols, pattern tiles and swatches through the colour settings: Gray stays Gray, RGB greys separate into four-colour greys and a rich black as Illustrator does, or go on the black plate only with `grays: "black"` (also for `document.open {colorMode}`).
+  - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers (the Properties panel has the Control bar's Fill and Stroke chips, Stroke link and weight spinner, with nothing selected too), panels have Illustrator's Window menu keys (Align Shift+F7, Transform Shift+F8, Pathfinder Cmd+Shift+F9, Layers F7, Character Cmd+T…; every panel can be given one in Edit › Keyboard Shortcuts), and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening. Document Color Mode converts the art, symbols, pattern tiles and swatches through the colour settings: Gray stays Gray, RGB greys separate into four-colour greys and a rich black as Illustrator does, or go on the black plate only with `grays: "black"` (also for `document.open {colorMode}`).
  - **Gradients:** lossless, validated gradient params; gradients follow rotate, reflect, shear, non-uniform scale and distortions; the Gradient tool edits the fill or stroke of the active proxy, type included; an interactive on-canvas annotator (move, length/angle, rotate, add/move/delete/duplicate stops, midpoints, a stop popover, Delete and arrow keys). The Gradient panel has the Fill/Stroke proxy, a gradient-swatch dropdown with Save to Swatches, midpoint locations, Alt-drag to copy or swap stops, swatch drops on the ramp and a stop eyedropper; copied appearances and graphic styles place gradients on each target's own bounds; gradient handles snap and honour Constrain Angle. Gradient stops stay linked to global and spot swatches. Freeform gradients (points and lines) are edited on the canvas; radial gradients have an extent ellipse, an aspect handle and an off-centre focal point (SVG `fx`/`fy`, PDF two-point radials). A stroke's gradient runs within, along or across it. Object ▸ Expand turns gradients into N objects or a gradient mesh.
  - **Strokes:** one stroke-geometry module shared by the canvas, SVG, PDF and Outline Stroke; dotted lines (zero-length dashes draw dots or squares); arrowheads with hollow outlines, tip-on-end or extend-past-end alignment and one opacity for line and head. SVG and PDF export arrowheads, width profiles, brushes and aligned strokes exactly as the canvas draws them; Outline Stroke and the live Outline Stroke effect outline every stroke item as drawn (dashes, heads, profiles, alignment); dashes can be fitted to corners and path ends; width profiles carry through dashes, and their corners take the join. The Stroke panel edits type's character strokes, follows the stroke units (its weight presets are round values in that unit: `0.25 mm`, `0.0625 in`, `1 px`, #426; fields show four decimals in mm, cm and inches, three in points), shows mixed values blank and opens from the Control bar. A width profile library, thirty more arrowheads, and Width Point Edit with multi-select and discontinuous points. Visual bounds and clicks cover the whole painted stroke. Scale Strokes & Effects, Scale Corners and Use Preview Bounds work everywhere, and new art inherits stroke options, a graphic style or the whole last appearance.
  - **Appearance:** the Appearance panel's selected row drives every paint, stroke, gradient and transparency edit (`item` on the commands); effects apply to one fill or stroke; per-item Opacity popups, whose blend-mode list and opacity slider stay open inside them (#430; the Control bar's Stroke popover too); Mixed Appearances, Layers target dots and basic-appearance rules. Effects can be reordered, moved between items and copied by dragging; Show All Hidden Attributes; clicking an effect edits it in place; the object thumbnail drags onto art; effects render on type, images, symbols, blends, envelopes, meshes and repeats, and per-item raster effects export. Groups, layers and type have their own fills, strokes and effects (Contents and Characters rows); the Layers panel's target circles target layers, groups and objects; Expand Appearance turns fills, strokes, effects and brushes into objects.
@@ -149,12 +151,12 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **Colour, type and file workflows:** Recolor Artwork (dialog with harmonies), Edit Colors, Find & Replace, Change Case, Smart Punctuation, Guides, Lock/Hide Above, Transform Each, Rasterize.
 - **Fonts:** a font is found by any of its names (family and style in every language of its name table, legacy family/style pairs, PostScript name), so documents from other apps open with the font they name; Find Font and `text.fonts` say for each font whether it was found exactly, by another name, substituted or missing, and how many glyphs are missing. PDF and `.ai` import brings Japanese text back as live type: CID fonts without a ToUnicode map read through the standard CMaps, vertical columns (WMode 1) as vertical type, letter spacing as tracking; a glyph is live type only when the installed font (in the closest style of its family) draws the same glyph, and text in a font that isn't installed comes in as live type shown in the fallback font until the font is installed (exports that draw it — PDF, EPS, EMF/WMF, raster, SVG outlines or embedded fonts — warn that they wrote the fallback font; `textAs: outlines` keeps the PDF's embedded glyphs).
 - **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.
+  - `.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, and falls back to its palette TIFF preview. DXF TEXT justified Fit or Aligned spans its two points (stretched, or scaled as a whole).
-  - Place and the Links panel, Package, File Info, Print with print presets, PostScript output and print tiling, slices and Save for Web, Export for Screens and Asset Export, CSS Properties, PNG/PDF/SVG/text clipboard flavours; 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).
+  - 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).
+- **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
@@ -168,7 +170,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 | M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out, EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, Asset Export, clipboard flavours, File Info. Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, polish | 3–6 |
 | M5 | Performance | 🟡 background render + caches + MT done; `vectorcraft-cli bench` and `vectorcraft-cli perf` (budget suite); file format v2 opens 3× faster (50k paths: 722 → 244 ms); raster effects (glows, shadows, blur, feather) no longer force the whole frame single-threaded (filtered offscreen per effect, verified equal to the single-threaded reference); effect-heavy demos need a clean-machine benchmark; dirty-region rendering, GPU backend spike pending | 15–25 |
 | M6 | Path operations (Pathfinder, Shape Builder, offset…) | ✅ mostly done (Boolean precision on almost-horizontal edges fixed and the property tests made deterministic; Shape Builder gap detection, large-offset bug open) | 3–6 |
-| M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | 🟡 Character/Paragraph Styles, Area Type Options (with Width/Height), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs, OpenType panel, Find Font, installed system fonts in every font menu (searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import, variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel, Hebrew/Arabic bidirectional text and Paragraph Direction done; tab leaders, spell check, vertical type pending | 45–60 |
+| M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | 🟡 Character/Paragraph Styles, Area Type Options (with Width/Height), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs, OpenType panel, Find Font, installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import, variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel, Hebrew/Arabic bidirectional text and Paragraph Direction done; tab leaders, spell check, vertical type pending | 45–60 |
 | M8 | Transform & distort (Puppet Warp, Liquify tools, Envelopes, Blends, Perspective Grid) | ✅ done (M8.1–M8.20 on 2026-10-06, fidelity pass): Liquify Tool Options with one shared brush, pen pressure, hold-to-apply, a safe scope and incremental strokes; tool options that last; Puppet Warp rotation, multi-select, Control bar and a rest-shape session that follows Undo; Width tool on compound paths; Envelope dialogs with preview, Reset with Warp/Mesh, full Envelope Options, type/images/symbols/appearance/gradients/patterns distorted on canvas and in every export, warps that keep their frame, Edit Contents, mesh handles and Control bar; Blend Options, anchor-targeted Blend tool, editable spine, keys picked on the canvas, faithful interpolation and knockout; Perspective Grid with Define Grid, presets, lock/snap/rulers, widgets, the 1–4 plane switch, movable planes, Perspective Selection scale/copy/perpendicular/Transform Again, and type and symbols truly projected with Edit Text. Left: Anti-Alias and Preserve Shape output, warp-envelope point editing, brush interpolation in blends, Free Transform/Scale/Reflect along a rotated box | 2–4 |
 | M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder and Color Adjustments; SVG Filters, Document Raster Effects Settings, 3D pending | 86–135 |
 | M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG `<pattern>`/PDF export) and live Repeat (radial/grid/mirror) done; brushes/symbols in progress | 23–37 |
@@ -196,7 +198,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 |---|---:|---:|---|---:|
 | Selection, transform & align tools | 6 | 85% | Free Transform/Scale/Reflect along a rotated box, Start Global Edit, transform nuances (the rotated persistent bounding box is done) | 4–6 |
 | Drawing tools | 7 | 85% | Shaper Groups (merge/punch overlapping shapes), pencil and the remaining pen modifier nuances, the freehand Tool Options' Keep selected, Alt to the Smooth tool, Blob Brush Merge Only with Selection and brush angle/roundness, Touch Type, Live Corners on plain paths and polygons (and Relative rounding) | 10–15 |
-| Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 86% | Live Paint gap options, Shape Builder gap detection and options | 3–6 |
+| Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 86% | Live Paint gap options, Shape Builder gap detection, options (Tool Options dialog, clicking a stroke in merge mode) and Shift-drag marquee | 3–6 |
 | Colour, swatches, gradients, patterns, mesh, recolor | 7 | 96% | freeform and mixed spot/process gradients in SVG/PDF (exported as stops or process colours), pattern fills in Expand | 2–4 |
 | Strokes, brushes, width profiles | 5 | 88% | brush options depth, brush libraries (generated in code), brushes driven by pen tilt, bearing and barrel rotation (6D art pens) | 12–20 |
 | Appearance, transparency, graphic styles, masks | 5 | 98% | raster effect reach in preview bounds (flattener presets apply in PDF, EPS and print) | 1–2 |
@@ -204,17 +206,17 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Raster effects (Effect Gallery, Document Raster Effects Settings) | 4 | 20% | ~55 Photoshop-style filters (Artistic, Brush Strokes, Distort, Pixelate, Sketch, Stylize, Texture, Video) and the Effect Gallery; Document Raster Effects Settings and raster effects in PDF are done | 28–42 |
 | 3D and Materials | 4 | 0% | Extrude & Bevel, Revolve, Inflate, Rotate, lighting, materials (software renderer) | 50–80 |
 | Type core | 9 | 79% | Middle Eastern features beyond bidi layout and Paragraph Direction (Character Direction, digit types, kashidas, the Middle Eastern composers, editable bidirectional SVG text, a split caret where directions meet); composer/hyphenation options, Optical Margin Alignment, hidden characters, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 15–20 |
-| Type advanced | 4 | 50% | CJK composition for vertical type (ruby, mojikumi beyond Line-end Punctuation Half Width — the other sets (and their paragraph-start bracket and indent rules), hanging punctuation, kinsoku sets and the Mojikumi Settings dialog —, proportional vertical metrics, manual tate-chu-yoko, Character Alignment on the ICF top and bottom), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support | 20–28 |
+| Type advanced | 4 | 50% | CJK composition for vertical type (ruby, mojikumi beyond Line-end Punctuation Half Width — the other sets (and their paragraph-start bracket and indent rules), kinsoku sets and the Mojikumi Settings dialog —, proportional vertical metrics, manual tate-chu-yoko, Character Alignment on the ICF top and bottom), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support | 20–28 |
 | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | symbol libraries (original), dynamic symbols, envelope Anti-Alias/Preserve Shape output and warp point editing, brush interpolation in blends (M8 fidelity pass done) | 5–8 |
-| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (Vector Halftone is done) | 6–10 |
+| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image) (Vector Halftone is done) | 6–10 |
 | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, Collect for Export, row context menus, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers, drag-scrolling a long panel while dragging rows; artboard presets/rearrange polish (Document Setup, New Document and the rest of the Layers panel are done) | 4–7 |
 | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 |
-| Guides, grids, smart guides, snapping, rulers | 3 | 80% | global/video rulers, smart-guide preference depth, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click) and on layers (dragging existing guides is done, #414) | 3–6 |
-| File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, Illustrator EPS checked against more real files (two Illustrator 30 files open as vectors so far), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
+| Guides, grids, smart guides, snapping, rulers | 3 | 82% | global/video rulers, smart-guide preference depth, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451) | 3–5 |
+| File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, EPS checked against more real files (Illustrator 2026 and Inkscape files open as vectors; CorelDRAW, Affinity, LibreOffice, matplotlib and Ghostscript output checked with synthetic programs only; CID-keyed CJK type and `CCITTFaxDecode` images not read), legacy `.ai` files saved without the prolog that defines their operators (their own operator set isn't read yet), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
 | 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 45 Preferences options stored but not yet acted on (#394: smart guide display options, Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, Show Pixel Grid, performance, devices…) | 16–26 |
+| 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 |
@@ -234,7 +236,7 @@ lossless SVG/PDF export of live effects with SVG filters, a documented JSON form
 command, gesture and dialog drivable by agents (MCP, CLI, control channel).

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

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

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

  vectorcraft-cli bench FILE [--size WxH] [--iters N]
      Render FILE (any readable format) fitted to WxH (default 2880x1800) and print ms per frame
@@ -188,7 +190,7 @@ fn convert(args: &[String]) -> Result<(), String> {
 fn info(args: &[String]) -> Result<(), String> {
    let file = args.first().ok_or("info needs a FILE")?;
    let mut h = Headless::new();
-    h.call("app.open", json!({"path": file})).map_err(|e| format!("open {file}: {e}"))?;
+    let opened = h.call("app.open", json!({"path": file})).map_err(|e| format!("open {file}: {e}"))?;
    let base = h.call("engine.execute", json!({"command": "file.info", "params": {}}))?;
    let doc = h.session.doc().map_err(|e| e.to_string())?.doc.clone();
    let mut kinds: std::collections::BTreeMap<&'static str, usize> = Default::default();
@@ -196,7 +198,8 @@ fn info(args: &[String]) -> Result<(), String> {
    let fonts = h.call("engine.execute", json!({"command": "text.fonts", "params": {}})).unwrap_or(Value::Null);
    let artboards: Vec<Value> =
        doc.artboards.iter().map(|a| json!({"name": a.name, "rect": [a.rect.x0, a.rect.y0, a.rect.width(), a.rect.height()]})).collect();
-    let v = json!({"file": file, "info": base, "artboards": artboards, "kinds": kinds, "fonts": fonts});
+    // What didn't come in as it was (an EPS read from its preview says why).
+    let v = json!({"file": file, "warnings": opened["warnings"], "info": base, "artboards": artboards, "kinds": kinds, "fonts": fonts});
    outln!("{}", serde_json::to_string_pretty(&v).unwrap_or_default());
    Ok(())
 }
@@ -82,3 +82,14 @@ fn help_lists_readable_formats() {
    let out = ok(&["--help"]);
    assert!(out.contains("Readable formats: .vectorcraft") && out.contains(".ait") && out.contains(".webp"), "{out}");
 }
+
+/// `info` reports the import warnings: an EPS read only up to an error names it.
+#[test]
+fn info_reports_why_an_eps_read_partly() {
+    let eps = tmp("partial.eps");
+    std::fs::write(&eps, "%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 100\n%%EndComments\n0 0 10 10 rectfill frobnicate\n%%EOF\n").unwrap();
+    let v = info(&eps);
+    let w = v["warnings"][0].as_str().unwrap_or_default();
+    assert!(w.contains("`frobnicate`"), "{v}");
+    assert_eq!(v["kinds"]["Path"], 1, "{v}");
+}
@@ -27,4 +27,4 @@ rfd = { workspace = true }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 js-sys = "0.3"
-web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "HtmlIFrameElement", "HtmlAnchorElement", "Blob", "BlobPropertyBag", "Url", "Location", "CssStyleDeclaration", "Event", "EventTarget", "MouseEvent", "DragEvent", "Storage", "Navigator"] }
+web-sys = { version = "0.3", features = ["Window", "Document", "Element", "HtmlElement", "HtmlCanvasElement", "HtmlIFrameElement", "HtmlAnchorElement", "Blob", "BlobPropertyBag", "ClipboardEvent", "DataTransfer", "File", "FileList", "Url", "Location", "CssStyleDeclaration", "Event", "EventTarget", "MouseEvent", "DragEvent", "Storage", "Navigator"] }
@@ -11,7 +11,8 @@
 //! - Save / Export trigger a browser download;
 //! - dropped files are read asynchronously by `web::WebShell` and delivered through the inbox.
 //!
-//! URL query flag: `?webgl` forces the WebGL2 backend instead of WebGPU.
+//! URL query flags: `?webgl` forces the WebGL2 backend instead of WebGPU; `?lang=es` (any
+//! language code) stands in for the browser's languages when the interface language is Automatic.

 #[cfg(target_arch = "wasm32")]
 mod locks;
@@ -1,14 +1,16 @@
-//! The browser shell: web `Services`, drag-and-drop, the eframe web runner, and starting again
-//! with new graphics when the page loses them (#369).
+//! The browser shell: web `Services`, drag-and-drop, pasted pictures and files, the eframe web
+//! runner, and starting again with new graphics when the page loses them (#369).

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

 use vectorcraft_engine::Session;
+use vectorcraft_engine::cmd::clipboard::{FILE_HEAD, Flavour, PASTE_ORDER, file_flavour};
 use vectorcraft_engine::cmd::fileio;
 use vectorcraft_engine::cmd::recovery::{self, Hold, RecoveryStore};
 use vectorcraft_ui_egui::graphics::GraphicsLoss;
+use vectorcraft_ui_egui::i18n;
 use vectorcraft_ui_egui::place::{DropTarget, PlaceArrival, PlaceInbox};
 use vectorcraft_ui_egui::print::{PrintJob, PrintService, Printer};
 use vectorcraft_ui_egui::{Services, VectorcraftApp};
@@ -22,6 +24,14 @@ type Inbox = Arc<Mutex<Vec<(String, Vec<u8>)>>>;
 /// whether Shift was held: where dropped files land.
 type DragPos = Rc<Cell<Option<(f32, f32, bool)>>>;

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

@@ -36,6 +46,7 @@ struct Host {
    inbox: Inbox,
    place_inbox: PlaceInbox,
    drag: DragPos,
+    pasted: Rc<RefCell<Pasted>>,
    /// The page's Web Locks for Data Recovery, started once before the first frame: a graphics
    /// restart keeps them, so the tab stays the owner of its recovery area.
    locks: Option<WebLocks>,
@@ -49,6 +60,7 @@ pub fn start() {
        log::error!("missing <canvas id=\"{CANVAS_ID}\">");
        return;
    };
+    detect_language();
    wasm_bindgen_futures::spawn_local(async move {
        // Before the first frame, which looks for copies a crash left behind.
        let locks = WebLocks::start(RECOVERY_PREFIX).await;
@@ -57,9 +69,11 @@ pub fn start() {
            inbox: Arc::default(),
            place_inbox: Arc::default(),
            drag: DragPos::default(),
+            pasted: Rc::default(),
            locks,
            restarts: 0,
        };
+        track_paste(&host.pasted);
        run(host, canvas, None).await;
    });
 }
@@ -92,6 +106,7 @@ async fn run(host: Host, canvas: web_sys::HtmlCanvasElement, moving: Option<Movi
                    let (loss, ctx) = (loss.clone(), ctx.clone());
                    rs.device.set_device_lost_callback(move |reason, msg| loss.report(&ctx, format!("{reason:?}: {msg}")));
                }
+                host.pasted.borrow_mut().ctx = Some(ctx.clone());
                let services = services(host.inbox.clone(), host.place_inbox.clone(), ctx.clone(), host.locks.clone());
                let app = match taken.borrow_mut().take() {
                    Some(mut app) => {
@@ -131,6 +146,27 @@ fn web_options() -> eframe::WebOptions {
    options
 }

+/// Tell the UI the browser's languages (`?lang=es` in the address first, as `VECTORCRAFT_LOCALE`
+/// does on the desktop) before the first frame, so the Automatic interface language follows the
+/// browser; and show the loading text in that language.
+fn detect_language() {
+    let mut tags: Vec<String> = query_param("lang").into_iter().collect();
+    if let Some(navigator) = web_sys::window().map(|w| w.navigator()) {
+        tags.extend(navigator.languages().iter().filter_map(|v| v.as_string()));
+        tags.extend(navigator.language());
+    }
+    i18n::set_system_locales(tags.as_slice());
+    if let Some(el) = element(LOADING_ID) {
+        el.set_text_content(Some(i18n::message(i18n::system_lang(), "Loading VectorCraft…").as_str()));
+    }
+}
+
+/// The value of `name=` in the address's query, if given.
+fn query_param(name: &str) -> Option<String> {
+    let query = query();
+    query.trim_start_matches('?').split('&').find_map(|kv| kv.strip_prefix(name)?.strip_prefix('=').map(str::to_string)).filter(|v| !v.is_empty())
+}
+
 fn query() -> String {
    web_sys::window().and_then(|w| w.location().search().ok()).unwrap_or_default()
 }
@@ -155,6 +191,50 @@ fn track_drag(canvas: &web_sys::HtmlCanvasElement, pos: &DragPos) {
    on_drag.forget();
 }

+/// Take pictures and files pasted into the page (egui reads a paste's text only): a paste without
+/// text hands the first of its files that is art (a bitmap, SVG, PDF, a metafile) to the next
+/// frame. Text, SVG markup among it, is left to egui.
+fn track_paste(pasted: &Rc<RefCell<Pasted>>) {
+    let Some(window) = web_sys::window() else { return };
+    let pasted = pasted.clone();
+    let on_paste = wasm_bindgen::closure::Closure::<dyn FnMut(web_sys::ClipboardEvent)>::new(move |e: web_sys::ClipboardEvent| {
+        let Some(data) = e.clipboard_data() else { return };
+        let Some(files) = data.files().filter(|f| f.length() > 0) else { return };
+        if data.get_data("text").is_ok_and(|t| !t.is_empty()) {
+            return;
+        }
+        e.prevent_default();
+        let held = pasted.borrow().ctx.as_ref().map(|c| c.input(|i| i.modifiers)).unwrap_or_default();
+        let files: Vec<web_sys::File> = (0..files.length()).filter_map(|i| files.get(i)).collect();
+        let pasted = pasted.clone();
+        wasm_bindgen_futures::spawn_local(async move {
+            for file in files {
+                let bytes = match wasm_bindgen_futures::JsFuture::from(file.array_buffer()).await {
+                    Ok(buf) => js_sys::Uint8Array::new(&buf).to_vec(),
+                    Err(e) => {
+                        log::error!("couldn't read the pasted file {}: {}", file.name(), js_err(e));
+                        continue;
+                    }
+                };
+                if let Some(mime) = file_flavour(&file.name(), bytes.get(..FILE_HEAD).unwrap_or(&bytes), &PASTE_ORDER) {
+                    let mut p = pasted.borrow_mut();
+                    p.flavour = Some((Flavour { mime, data: bytes }, held));
+                    if let Some(ctx) = &p.ctx {
+                        ctx.request_repaint();
+                    }
+                    return;
+                }
+            }
+        });
+    });
+    // Captured before eframe's own listener, which stops the event.
+    if let Err(e) = window.add_event_listener_with_callback_and_bool("paste", on_paste.as_ref().unchecked_ref(), true) {
+        log::error!("couldn't follow paste events: {e:?}");
+    }
+    // The listener lives as long as the page.
+    on_paste.forget();
+}
+
 /// Report the loss of `canvas`'s WebGL context to `loss` (WebGPU devices report theirs through
 /// wgpu).
 fn watch_canvas(canvas: &web_sys::HtmlCanvasElement, loss: &GraphicsLoss, ctx: &egui::Context) {
@@ -215,7 +295,7 @@ fn notice(lines: &[&str]) {
    el.set_text_content(None);
    for line in lines {
        if let Ok(p) = document.create_element("p") {
-            p.set_text_content(Some(line));
+            p.set_text_content(Some(i18n::message(i18n::system_lang(), line).as_str()));
            // Best effort: the log has the message too.
            el.append_child(&p).ok();
        }
@@ -261,15 +341,20 @@ impl eframe::App for WebShell {
            self.restart(&why);
        }
        let Some(app) = &mut self.app else { return };
+        let pasted = self.host.pasted.borrow_mut().flavour.take();
+        if let Some((f, held)) = pasted {
+            app.paste_from_host(ctx, f, held);
+        }
        let dropped = ctx.input_mut(|i| std::mem::take(&mut i.raw.dropped_files));
        if !dropped.is_empty() {
            let at = self.host.drag.take();
            let z = ctx.zoom_factor();
-            let target = app.drop_target(at.map(|(x, y, _)| egui::pos2(x / z, y / z)), at.is_some_and(|a| a.2));
+            let (pos, shift) = (at.map(|(x, y, _)| egui::pos2(x / z, y / z)), at.is_some_and(|a| a.2));
            for f in dropped {
+                let name = f.path().file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped".into());
+                let target = app.drop_target(&name, pos, shift);
                let (inbox, place_inbox, ctx) = (self.host.inbox.clone(), self.host.place_inbox.clone(), ctx.clone());
                wasm_bindgen_futures::spawn_local(async move {
-                    let name = f.path().file_name().map(|n| n.to_string_lossy().to_string()).unwrap_or_else(|| "dropped".into());
                    match f.bytes_async().await {
                        Ok(bytes) => {
                            match target {
@@ -39,9 +39,9 @@ clipboard-win = { workspace = true }
 [target.'cfg(target_os = "macos")'.dependencies]
 muda = { version = "0.21", default-features = false }
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSResponder", "NSTextInputContext"] }
-# Files opened from Finder and the Dock (src/open_documents.rs); both already come with winit, muda and rfd.
-objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSNotification", "NSOperation", "NSString", "NSURL"] }
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSPasteboard", "NSResponder", "NSTextInputContext"] }
+# Files opened from Finder and the Dock (src/open_documents.rs) and pasted bitmaps (src/clipboard.rs); both already come with winit, muda and rfd.
+objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSData", "NSNotification", "NSOperation", "NSString", "NSURL"] }
 block2 = "0.6"

 [build-dependencies]
@@ -2,9 +2,11 @@
 //! (`Services::system_clipboard`).
 //!
 //! - Windows: text, SVG, PDF, PNG and an opaque bitmap (for apps that don't read PNG) in one go;
-//!   Paste reads each of them.
+//!   Paste reads each of them, a bitmap as PNG, else as the device-independent bitmap that
+//!   screenshots and most apps copy (`CF_DIBV5`, `CF_DIB`; the system makes them of a `CF_BITMAP`).
 //! - macOS and Linux: one format at a time, the text (a type-only copy's text or the SVG markup),
-//!   else the PNG as a bitmap; Paste reads text and bitmaps. On Wayland, arboard's data-control
+//!   else the PNG as a bitmap; Paste reads text and bitmaps (on macOS the pasteboard's PNG or TIFF
+//!   as they are, as screenshots copy them). On Wayland, arboard's data-control
 //!   backend reads the compositor's clipboard (X11 through XWayland only sees what X11 apps
 //!   copied), falling back to X11 where the compositor lacks the protocol.
 //! - Everywhere: files copied in a file manager paste as the first one that is art (SVG, PDF, a
@@ -30,10 +32,79 @@ fn text_of(flavours: &[Flavour]) -> Option<String> {
    flavours.iter().find(|f| f.mime == TEXT).map(|f| String::from_utf8_lossy(&f.data).into_owned())
 }

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

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

+    /// The device-independent bitmaps, the one that carries alpha first. Each is there whenever the
+    /// other or a `CF_BITMAP` is: the system converts between them.
+    const DIBS: [u32; 2] = [formats::CF_DIBV5, formats::CF_DIB];
+
    fn formats_of(mime: &str) -> impl Iterator<Item = u32> {
        names(mime).iter().filter_map(|n| raw::register_format(n)).map(NonZeroU32::get)
    }
@@ -162,7 +237,7 @@ mod win {
            raw::is_format_avail(formats::CF_HDROP)
                || mimes.iter().any(|m| match *m {
                    TEXT => raw::is_format_avail(formats::CF_UNICODETEXT),
-                    BITMAP => raw::is_format_avail(formats::CF_BITMAP) || formats_of(PNG).any(raw::is_format_avail),
+                    BITMAP => DIBS.into_iter().chain(formats_of(PNG)).any(raw::is_format_avail),
                    m => formats_of(m).any(raw::is_format_avail),
                })
        }
@@ -182,9 +257,11 @@ mod win {
        let mime = match mime {
            BITMAP if read_registered(PNG, &mut data) => PNG,
            BITMAP => {
-                data.clear();
-                raw::get_bitmap(&mut data).ok()?;
-                "image/bmp"
+                return DIBS.into_iter().find_map(|id| {
+                    data.clear();
+                    raw::get_vec(id, &mut data).ok()?;
+                    png_flavour(&dib_image(&data)?)
+                });
            }
            TEXT => {
                raw::get_string(&mut data).ok()?;
@@ -210,13 +287,6 @@ mod portable {

    use super::*;

-    /// `img` as PNG bytes.
-    fn encode_png(img: &image::RgbaImage) -> Option<Vec<u8>> {
-        let mut out = vec![];
-        img.write_to(&mut Cursor::new(&mut out), image::ImageFormat::Png).ok()?;
-        Some(out)
-    }
-
    /// What our last write put on the clipboard.
    enum Ours {
        Text(String),
@@ -283,21 +353,65 @@ mod portable {
            mimes.iter().find_map(|m| match *m {
                TEXT => cb.get_text().ok().filter(|t| !t.is_empty()).map(|t| Flavour { mime: TEXT, data: t.into_bytes() }),
                BITMAP => {
+                    #[cfg(target_os = "macos")]
+                    if let Some(f) = super::mac::bitmap() {
+                        return Some(f);
+                    }
                    let img = cb.get_image().ok()?;
                    let rgba = image::RgbaImage::from_raw(u32::try_from(img.width).ok()?, u32::try_from(img.height).ok()?, img.bytes.into_owned())?;
-                    encode_png(&rgba).map(|data| Flavour { mime: PNG, data })
+                    png_flavour(&rgba)
                }
                _ => None,
            })
        }

-        /// Text only: reading a bitmap costs as much as pasting it.
+        /// Text, and on macOS a bitmap (by the pasteboard's types). Linux has no cheap way to ask
+        /// for a bitmap (reading one costs as much as pasting it): the paste keys take it, the
+        /// menu item waits for text.
        fn has(&mut self, mimes: &[&'static str]) -> bool {
+            #[cfg(target_os = "macos")]
+            if mimes.contains(&BITMAP) && super::mac::has_bitmap() {
+                return true;
+            }
            mimes.contains(&TEXT) && self.cb().is_ok_and(|cb| cb.get_text().is_ok_and(|t| !t.is_empty()))
        }
    }
 }

+/// The macOS pasteboard's bitmaps as they are (arboard reads TIFF only, and decodes it).
+#[cfg(target_os = "macos")]
+mod mac {
+    use objc2::rc::autoreleasepool;
+    use objc2_app_kit::NSPasteboard;
+    use objc2_foundation::{NSArray, NSString};
+
+    use super::*;
+
+    /// The bitmap types Paste reads, best first (the values of `NSPasteboardTypePNG` and
+    /// `NSPasteboardTypeTIFF`), with their MIME types.
+    const TYPES: [(&str, &str); 2] = [("public.png", PNG), ("public.tiff", "image/tiff")];
+
+    /// Does the pasteboard hold a bitmap? Asks for its types only.
+    pub fn has_bitmap() -> bool {
+        autoreleasepool(|_| {
+            let types = TYPES.map(|(t, _)| NSString::from_str(t));
+            let types: Vec<&NSString> = types.iter().map(|t| &**t).collect();
+            NSPasteboard::generalPasteboard().availableTypeFromArray(&NSArray::from_slice(&types)).is_some()
+        })
+    }
+
+    /// The pasteboard's bitmap, PNG before TIFF.
+    pub fn bitmap() -> Option<Flavour> {
+        autoreleasepool(|_| {
+            let pasteboard = NSPasteboard::generalPasteboard();
+            TYPES.into_iter().find_map(|(t, mime)| {
+                let data = pasteboard.dataForType(&NSString::from_str(t))?.to_vec();
+                (!data.is_empty()).then_some(Flavour { mime, data })
+            })
+        })
+    }
+}
+
 #[cfg(test)]
 mod tests {
    use vectorcraft_engine::cmd::clipboard::{PASTE_ORDER, SVG};
@@ -341,4 +455,95 @@ mod tests {
        let with_cr = PathBuf::from(format!("{}\r", red.display()));
        assert_eq!(copied_file(vec![with_cr], &PASTE_ORDER).map(|f| f.mime), Some(PNG));
    }
+
+    /// A DIB of `w`×`h` pixels (top row first when `h` is negative): a `header`-byte header (40,
+    /// or 124 for a BITMAPV5HEADER with BGRA masks), `extra` (the masks after a 40-byte header, a
+    /// colour table), then `rows`, each padded to 4 bytes.
+    fn dib(header: u32, w: i32, h: i32, bits: u16, compression: u32, extra: &[u8], rows: &[u8]) -> Vec<u8> {
+        let mut d = vec![];
+        d.extend(header.to_le_bytes());
+        d.extend(w.to_le_bytes());
+        d.extend(h.to_le_bytes());
+        d.extend(1u16.to_le_bytes());
+        d.extend(bits.to_le_bytes());
+        d.extend(compression.to_le_bytes());
+        d.extend((rows.len() as u32).to_le_bytes());
+        // 96 ppi, every colour of the table used.
+        d.extend([3780u32, 3780, 0, 0].iter().flat_map(|v| v.to_le_bytes()));
+        if header == 124 {
+            d.extend([0x00FF_0000u32, 0xFF00, 0xFF, 0xFF00_0000, 0x7352_4742].iter().flat_map(|v| v.to_le_bytes()));
+            d.resize(124, 0);
+        }
+        d.extend_from_slice(extra);
+        d.extend_from_slice(rows);
+        d
+    }
+
+    /// 32-bit BGRA rows of `px` (top row first).
+    fn bgra(px: &[[u8; 4]]) -> Vec<u8> {
+        px.iter().flat_map(|[r, g, b, a]| [*b, *g, *r, *a]).collect()
+    }
+
+    const RED: [u8; 4] = [255, 0, 0, 255];
+    const BLUE: [u8; 4] = [0, 0, 255, 255];
+
+    fn pixels(img: &image::RgbaImage) -> Vec<[u8; 4]> {
+        img.pixels().map(|p| p.0).collect()
+    }
+
+    #[test]
+    fn a_screenshot_dib_pastes_opaque_and_upright() {
+        // CF_DIB as screenshots copy it: 32-bit BI_RGB, bottom row first, the fourth byte zero.
+        let rows = bgra(&[[0, 0, 255, 0], [0, 0, 255, 0], [255, 0, 0, 0], [255, 0, 0, 0]]);
+        let img = dib_image(&dib(40, 2, 2, 32, 0, &[], &rows)).unwrap();
+        assert_eq!(pixels(&img), [RED, RED, BLUE, BLUE]);
+        // The same bitmap with an alpha mask (CF_DIBV5), alpha still zero throughout: opaque too.
+        let img = dib_image(&dib(124, 2, -2, 32, 3, &[], &bgra(&[[255, 0, 0, 0]; 4]))).unwrap();
+        assert_eq!(pixels(&img), [RED; 4]);
+    }
+
+    #[test]
+    fn a_dibv5_keeps_its_alpha_top_down() {
+        // A negative height: top row first.
+        let rows = bgra(&[[255, 0, 0, 128], [255, 0, 0, 128], [0, 0, 255, 0], [0, 0, 255, 255]]);
+        let img = dib_image(&dib(124, 2, -2, 32, 3, &[], &rows)).unwrap();
+        assert_eq!(pixels(&img), [[255, 0, 0, 128], [255, 0, 0, 128], [0, 0, 255, 0], BLUE]);
+    }
+
+    #[test]
+    fn masks_and_colour_tables_come_before_the_pixels() {
+        // BI_BITFIELDS after a 40-byte header: three masks between it and the pixels.
+        let masks: Vec<u8> = [0x00FF_0000u32, 0xFF00, 0xFF].iter().flat_map(|v| v.to_le_bytes()).collect();
+        let img = dib_image(&dib(40, 1, 1, 32, 3, &masks, &bgra(&[[0, 0, 255, 0]]))).unwrap();
+        assert_eq!(pixels(&img), [BLUE]);
+        // 8-bit, two colours used, rows padded to 4 bytes, bottom row first.
+        let mut table = bgra(&[RED, BLUE]);
+        table[3] = 0;
+        let mut d = dib(40, 3, 2, 8, 0, &table, &[1, 1, 1, 0, 0, 1, 0, 0]);
+        d[32..36].copy_from_slice(&2u32.to_le_bytes());
+        assert_eq!(pixels(&dib_image(&d).unwrap()), [RED, BLUE, RED, BLUE, BLUE, BLUE]);
+        // 24-bit, rows padded.
+        let img = dib_image(&dib(40, 1, 2, 24, 0, &[], &[255, 0, 0, 0, 0, 0, 255, 0])).unwrap();
+        assert_eq!(pixels(&img), [RED, BLUE]);
+    }
+
+    #[test]
+    fn untrusted_dibs_are_refused_not_trusted() {
+        let one = bgra(&[RED]);
+        // Too large a side (the pixels aren't even there), cut short, a header or a colour count
+        // out of range, no pixels.
+        assert!(dib_image(&dib(40, MAX_SIDE as i32 + 1, 1, 32, 0, &[], &one)).is_none());
+        assert!(dib_image(&dib(40, 1, -(MAX_SIDE as i32) - 1, 32, 0, &[], &one)).is_none());
+        assert!(dib_image(&dib(40, 4096, 4096, 32, 0, &[], &one)).is_none());
+        assert!(dib_image(&[40, 0, 0]).is_none());
+        assert!(dib_image(&[]).is_none());
+        let mut d = dib(40, 1, 1, 32, 0, &[], &one);
+        d[0..4].copy_from_slice(&u32::MAX.to_le_bytes());
+        assert!(dib_image(&d).is_none());
+        let mut d = dib(40, 1, 1, 8, 0, &[], &[0; 4]);
+        d[32..36].copy_from_slice(&u32::MAX.to_le_bytes());
+        assert!(dib_file(&d).is_none());
+        assert!(dib_image(&dib(40, 1, 1, 32, 0, &[], &[])).is_none());
+        assert!(dib_image(&dib(40, 0, 0, 32, 0, &[], &[])).is_none());
+    }
 }
@@ -0,0 +1,582 @@
+//! The desktop app's logger: `log::` records go to standard error and to a log file.
+//!
+//! Without a logger every `log::warn!`/`log::error!` in the workspace (the graphics adapter, a
+//! lost graphics device, a panic the engine's guard recovered from) vanished. A launch from a desktop menu
+//! has no terminal, so the file is what a bug report can attach: `<settings dir>/logs/vectorcraft.log`,
+//! next to the preferences (`prefs_path` in `main.rs`). Each start moves the previous log to
+//! `vectorcraft.1.log` (and that one to `.2`), so the log of a run that crashed survives the next
+//! launch. Runs without preferences (`VECTORCRAFT_NO_PREFS`) log to standard error only.
+//!
+//! Levels: `info` for VectorCraft's own crates, `warn` for everything else (wgpu and naga are
+//! chatty). `RUST_LOG` replaces that with env_logger-style directives: `debug`,
+//! `warn,vectorcraft_render=trace`, `wgpu_core=info`. A directive ending in `*` matches every
+//! target that starts with it (`vectorcraft*=debug`).
+//!
+//! Records logged before the settings directory is known are kept (up to [`MAX_PENDING`]) and
+//! written once the file is attached. Writing never panics: a file that can't be created or
+//! written leaves standard error as the only sink.
+//!
+//! This is the desktop app's logger only. `vectorcraft-cli mcp` installs its own
+//! (`vectorcraft_mcp::logging`, MCP `notifications/message`); the two never share a process.
+
+use std::fs::File;
+use std::io::Write;
+use std::path::{Path, PathBuf};
+use std::sync::{Mutex, OnceLock, PoisonError};
+use std::time::SystemTime;
+
+use log::LevelFilter;
+
+/// The current log file's name inside the log directory.
+pub const LOG_FILE: &str = "vectorcraft.log";
+/// How many previous logs are kept (`vectorcraft.1.log` … `vectorcraft.<KEEP>.log`).
+pub const KEEP: usize = 2;
+/// The log file stops growing past this size (a runaway warning can't fill the disk).
+pub const MAX_FILE_BYTES: u64 = 16 * 1024 * 1024;
+/// Records kept in memory until the log file is attached.
+pub const MAX_PENDING: usize = 512;
+/// The built-in filter when `RUST_LOG` is unset or empty.
+pub const DEFAULT_FILTER: &str = "warn,vectorcraft*=info";
+
+/// Per-target level filter parsed from env_logger-style directives.
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct Filter {
+    default: LevelFilter,
+    directives: Vec<(String, LevelFilter)>,
+}
+
+impl Filter {
+    /// Parse `spec`; unknown levels and empty parts are skipped. Without a bare level, targets no
+    /// directive names log errors only.
+    pub fn parse(spec: &str) -> Filter {
+        let mut f = Filter { default: LevelFilter::Error, directives: Vec::new() };
+        for part in spec.split(',').map(str::trim).filter(|p| !p.is_empty()) {
+            match part.split_once('=') {
+                Some((name, level)) => {
+                    let name = name.trim();
+                    if let (false, Some(level)) = (name.is_empty(), parse_level(level)) {
+                        f.directives.push((name.to_owned(), level));
+                    }
+                }
+                None => match parse_level(part) {
+                    Some(level) => f.default = level,
+                    // A bare target name: everything from it (env_logger does the same).
+                    None => f.directives.push((part.to_owned(), LevelFilter::Trace)),
+                },
+            }
+        }
+        f
+    }
+
+    /// The level that applies to `target` (the most specific matching directive wins).
+    pub fn level_for(&self, target: &str) -> LevelFilter {
+        self.directives.iter().filter(|(name, _)| matches(name, target)).max_by_key(|(name, _)| name.len()).map_or(self.default, |(_, level)| *level)
+    }
+
+    /// The most verbose level any target can reach (for `log::set_max_level`).
+    pub fn max(&self) -> LevelFilter {
+        self.directives.iter().map(|(_, level)| *level).fold(self.default, Ord::max)
+    }
+}
+
+fn parse_level(s: &str) -> Option<LevelFilter> {
+    s.trim().parse().ok()
+}
+
+/// `name` matches `target` itself and its submodules (`a` matches `a` and `a::b`, not `ab`);
+/// `name*` matches every target starting with `name`.
+fn matches(name: &str, target: &str) -> bool {
+    match name.strip_suffix('*') {
+        Some(prefix) => target.starts_with(prefix),
+        None => target.strip_prefix(name).is_some_and(|rest| rest.is_empty() || rest.starts_with("::")),
+    }
+}
+
+/// `2026-10-08T07:59:17.728Z` (UTC, milliseconds). A clock before 1970 reads as the epoch.
+pub fn timestamp(t: SystemTime) -> String {
+    let since = t.duration_since(std::time::UNIX_EPOCH).unwrap_or_default();
+    let secs = since.as_secs();
+    let (days, rem) = (secs / 86_400, secs % 86_400);
+    let (y, m, d) = civil_from_days(days);
+    format!("{y:04}-{m:02}-{d:02}T{:02}:{:02}:{:02}.{:03}Z", rem / 3600, rem % 3600 / 60, rem % 60, since.subsec_millis())
+}
+
+/// Days since 1970-01-01 to a proleptic Gregorian (year, month, day) (Howard Hinnant's
+/// `civil_from_days`, unsigned because `timestamp` clamps at the epoch). Saturating, so no clock
+/// value can overflow it.
+fn civil_from_days(days: u64) -> (u64, u64, u64) {
+    let z = days.saturating_add(719_468);
+    let era = z / 146_097;
+    let doe = z % 146_097;
+    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
+    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
+    let mp = (5 * doy + 2) / 153;
+    let d = doy - (153 * mp + 2) / 5 + 1;
+    let m = if mp < 10 { mp + 3 } else { mp - 9 };
+    let y = era.saturating_mul(400).saturating_add(yoe).saturating_add(u64::from(m <= 2));
+    (y, m, d)
+}
+
+fn numbered(dir: &Path, n: usize) -> PathBuf {
+    if n == 0 { dir.join(LOG_FILE) } else { dir.join(format!("vectorcraft.{n}.log")) }
+}
+
+/// Shift the previous logs up one (`.log` → `.1.log` → … → `.<KEEP>.log`, the oldest dropped)
+/// and create a fresh, empty log file in `dir` (created if missing).
+pub fn rotate(dir: &Path) -> std::io::Result<(PathBuf, File)> {
+    std::fs::create_dir_all(dir)?;
+    for n in (1..=KEEP).rev() {
+        match std::fs::rename(numbered(dir, n - 1), numbered(dir, n)) {
+            Err(e) if e.kind() != std::io::ErrorKind::NotFound => return Err(e),
+            _ => {}
+        }
+    }
+    let path = numbered(dir, 0);
+    let file = File::create(&path)?;
+    Ok((path, file))
+}
+
+/// One formatted log line: `<timestamp> <LEVEL> [<thread>] <target>: <message>\n`.
+pub fn format_line(ts: &str, level: log::Level, thread: &str, target: &str, message: &str) -> String {
+    let message = message.strip_suffix('\n').unwrap_or(message);
+    format!("{ts} {level:<5} [{thread}] {target}: {message}\n")
+}
+
+/// Where formatted lines go besides standard error: kept in memory until a file is attached,
+/// then appended to it until it reaches its size cap.
+pub struct Sink {
+    file: Option<File>,
+    pending: Vec<String>,
+    dropped: usize,
+    written: u64,
+    max_bytes: u64,
+    capped: bool,
+}
+
+impl Sink {
+    pub fn new(max_bytes: u64) -> Sink {
+        Sink { file: None, pending: Vec::new(), dropped: 0, written: 0, max_bytes, capped: false }
+    }
+
+    /// Append `line` to the file, or keep it until [`Sink::attach`].
+    pub fn write(&mut self, line: &str) {
+        if self.file.is_none() {
+            if self.capped {
+                // No file is coming ([`Sink::no_file`]): standard error had the line.
+            } else if self.pending.len() < MAX_PENDING {
+                self.pending.push(line.to_owned());
+            } else {
+                self.dropped = self.dropped.saturating_add(1);
+            }
+            return;
+        }
+        self.append(line);
+    }
+
+    /// Start writing to `file` (a fresh one: the size cap starts over), first the lines kept so far.
+    pub fn attach(&mut self, file: File) {
+        self.file = Some(file);
+        self.written = 0;
+        self.capped = false;
+        for line in std::mem::take(&mut self.pending) {
+            self.append(&line);
+        }
+        if self.dropped > 0 {
+            let note = format!("{} earlier log lines were dropped before the log file was opened\n", self.dropped);
+            self.dropped = 0;
+            self.append(&note);
+        }
+    }
+
+    /// There will be no log file: forget the lines kept for it and keep no more.
+    pub fn no_file(&mut self) {
+        self.pending = Vec::new();
+        self.dropped = 0;
+        self.capped = true;
+    }
+
+    fn append(&mut self, line: &str) {
+        if self.capped {
+            return;
+        }
+        let Some(file) = self.file.as_mut() else { return };
+        let len = u64::try_from(line.len()).unwrap_or(u64::MAX);
+        let text = if self.written.saturating_add(len) > self.max_bytes {
+            self.capped = true;
+            format!("log file reached {} bytes; later records go to standard error only\n", self.max_bytes)
+        } else {
+            self.written = self.written.saturating_add(len);
+            line.to_owned()
+        };
+        // A full disk or a vanished file must not take the app down: drop the file sink.
+        if file.write_all(text.as_bytes()).is_err() {
+            self.file = None;
+            self.capped = true;
+        }
+    }
+}
+
+/// The installed logger: a [`Filter`], standard error and a [`Sink`].
+pub struct AppLogger {
+    filter: Filter,
+    stderr: bool,
+    sink: Mutex<Sink>,
+}
+
+impl AppLogger {
+    pub fn new(filter: Filter, stderr: bool) -> AppLogger {
+        AppLogger { filter, stderr, sink: Mutex::new(Sink::new(MAX_FILE_BYTES)) }
+    }
+
+    /// Rotate the logs in `dir` and send records to the fresh file; returns its path. On an error
+    /// standard error stays the only sink.
+    pub fn attach_dir(&self, dir: &Path) -> Result<PathBuf, String> {
+        // A thread that panicked while logging leaves the sink usable: take it back.
+        let mut sink = self.sink.lock().unwrap_or_else(PoisonError::into_inner);
+        match rotate(dir) {
+            Ok((path, file)) => {
+                sink.attach(file);
+                Ok(path)
+            }
+            Err(e) => {
+                sink.no_file();
+                Err(format!("{}: {e}", dir.display()))
+            }
+        }
+    }
+
+    /// No log file for this run (runs without preferences): log to standard error only.
+    pub fn no_file(&self) {
+        self.sink.lock().unwrap_or_else(PoisonError::into_inner).no_file();
+    }
+}
+
+impl log::Log for AppLogger {
+    fn enabled(&self, metadata: &log::Metadata<'_>) -> bool {
+        metadata.level() <= self.filter.level_for(metadata.target())
+    }
+
+    fn log(&self, record: &log::Record<'_>) {
+        if !self.enabled(record.metadata()) {
+            return;
+        }
+        // Formatted before the sink is locked, so a message that logs while it is formatted can't deadlock.
+        let thread = std::thread::current();
+        let line =
+            format_line(&timestamp(SystemTime::now()), record.level(), thread.name().unwrap_or("?"), record.target(), &record.args().to_string());
+        if self.stderr {
+            // No terminal (a Windows GUI build, a closed pipe) is not an error worth reporting.
+            let _ = std::io::stderr().write_all(line.as_bytes());
+        }
+        self.sink.lock().unwrap_or_else(PoisonError::into_inner).write(&line);
+    }
+
+    fn flush(&self) {}
+}
+
+/// Install the logger (filter from `RUST_LOG`, else [`DEFAULT_FILTER`]); `None` when another
+/// logger was installed first. Call [`AppLogger::attach_dir`] once the settings directory is known.
+pub fn install() -> Option<&'static AppLogger> {
+    static LOGGER: OnceLock<AppLogger> = OnceLock::new();
+    let spec = std::env::var("RUST_LOG").ok().filter(|s| !s.trim().is_empty());
+    let filter = Filter::parse(spec.as_deref().unwrap_or(DEFAULT_FILTER));
+    let max = filter.max();
+    let logger = LOGGER.get_or_init(|| AppLogger::new(filter, true));
+    log::set_logger(logger).ok()?;
+    log::set_max_level(max);
+    Some(logger)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::sync::atomic::{AtomicUsize, Ordering};
+    use std::time::{Duration, UNIX_EPOCH};
+
+    fn temp_dir(tag: &str) -> PathBuf {
+        static N: AtomicUsize = AtomicUsize::new(0);
+        let d = std::env::temp_dir().join(format!("vectorcraft-logging-{tag}-{}-{}", std::process::id(), N.fetch_add(1, Ordering::Relaxed)));
+        let _ = std::fs::remove_dir_all(&d);
+        d
+    }
+
+    fn read(path: &Path) -> String {
+        std::fs::read_to_string(path).expect("read log")
+    }
+
+    #[test]
+    fn the_default_filter_shows_vectorcraft_info_and_other_crates_warnings() {
+        let f = Filter::parse(DEFAULT_FILTER);
+        assert_eq!(f.level_for("vectorcraft"), LevelFilter::Info);
+        assert_eq!(f.level_for("vectorcraft::window"), LevelFilter::Info);
+        assert_eq!(f.level_for("vectorcraft_engine::guard"), LevelFilter::Info);
+        assert_eq!(f.level_for("vectorcraft_ui_egui::io"), LevelFilter::Info);
+        assert_eq!(f.level_for("wgpu_core::device"), LevelFilter::Warn);
+        assert_eq!(f.level_for("naga"), LevelFilter::Warn);
+        assert_eq!(f.max(), LevelFilter::Info);
+    }
+
+    #[test]
+    fn directives_follow_env_logger_and_the_most_specific_one_wins() {
+        let f = Filter::parse("info,wgpu_core=error,vectorcraft_render=trace,vectorcraft_render::tiles=off");
+        assert_eq!(f.level_for("eframe"), LevelFilter::Info);
+        assert_eq!(f.level_for("wgpu_core::instance"), LevelFilter::Error);
+        assert_eq!(f.level_for("vectorcraft_render::canvas"), LevelFilter::Trace);
+        assert_eq!(f.level_for("vectorcraft_render::tiles"), LevelFilter::Off);
+        assert_eq!(f.max(), LevelFilter::Trace);
+        // A module name is matched at `::` boundaries, not as a bare prefix.
+        assert_eq!(f.level_for("wgpu_core_extra"), LevelFilter::Info);
+        // A trailing `*` is a prefix.
+        assert_eq!(Filter::parse("vectorcraft*=debug").level_for("vectorcraft_text::shape"), LevelFilter::Debug);
+        assert_eq!(Filter::parse("vectorcraft*=debug").level_for("eframe"), LevelFilter::Error);
+        // A bare target name sets that target to the most verbose level, as env_logger does.
+        assert_eq!(Filter::parse("naga").level_for("naga::front"), LevelFilter::Trace);
+        assert_eq!(Filter::parse("naga").level_for("eframe"), LevelFilter::Error);
+        // Levels are case-insensitive and surrounding blanks are ignored.
+        assert_eq!(Filter::parse(" WARN , vectorcraft = Debug ").level_for("vectorcraft"), LevelFilter::Debug);
+        assert_eq!(Filter::parse(" WARN , vectorcraft = Debug ").level_for("eframe"), LevelFilter::Warn);
+    }
+
+    #[test]
+    fn hostile_specs_never_panic_and_fall_back_sensibly() {
+        let long = "x".repeat(100_000);
+        let many = "a=info,".repeat(10_000);
+        for spec in [
+            "",
+            ",,,",
+            "=",
+            "==",
+            "=debug",
+            "vectorcraft=",
+            "nonsense=loud",
+            "🦀=info",
+            "*",
+            "*=",
+            "=*",
+            "a=b=c",
+            "warn,,vectorcraft=DEBUG",
+            "\0",
+            "é::ü=trace",
+            &long,
+            &many,
+        ] {
+            let f = Filter::parse(spec);
+            for target in ["", "vectorcraft", "🦀", "a::b", "*"] {
+                let _ = f.level_for(target);
+            }
+            let _ = f.max();
+        }
+        assert_eq!(Filter::parse("warn,,vectorcraft=DEBUG").level_for("vectorcraft"), LevelFilter::Debug);
+        // An unknown level is skipped: that target keeps the default.
+        assert_eq!(Filter::parse("nonsense=loud").level_for("nonsense"), LevelFilter::Error);
+        assert_eq!(Filter::parse("vectorcraft=").level_for("vectorcraft"), LevelFilter::Error);
+        assert_eq!(Filter::parse("=debug").max(), LevelFilter::Error);
+        assert_eq!(Filter::parse("🦀=info").level_for("🦀::claw"), LevelFilter::Info);
+    }
+
+    #[test]
+    fn timestamps_are_utc_with_milliseconds() {
+        assert_eq!(timestamp(UNIX_EPOCH), "1970-01-01T00:00:00.000Z");
+        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_millis(1_791_446_357_728)), "2026-10-08T07:59:17.728Z");
+        // Leap day, and the day after it.
+        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_164_800)), "2024-02-29T00:00:00.000Z");
+        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_251_199)), "2024-02-29T23:59:59.000Z");
+        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(1_709_251_200)), "2024-03-01T00:00:00.000Z");
+        // 2000 is a leap year (divisible by 400), 2100 is not.
+        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(951_782_400)), "2000-02-29T00:00:00.000Z");
+        assert_eq!(timestamp(UNIX_EPOCH + Duration::from_secs(4_107_542_400)), "2100-03-01T00:00:00.000Z");
+        // Before the epoch (a clock set wrong) clamps instead of panicking.
+        assert_eq!(timestamp(UNIX_EPOCH - Duration::from_secs(5)), "1970-01-01T00:00:00.000Z");
+    }
+
+    #[test]
+    fn a_line_carries_time_level_thread_target_and_message() {
+        assert_eq!(
+            format_line("2026-10-08T07:59:17.728Z", log::Level::Info, "main", "vectorcraft", "rendering with Mesa (Vulkan, IntegratedGpu)"),
+            "2026-10-08T07:59:17.728Z INFO  [main] vectorcraft: rendering with Mesa (Vulkan, IntegratedGpu)\n"
+        );
+        // A multi-line message keeps its lines; the record still ends in one newline.
+        assert!(format_line("t", log::Level::Error, "w", "x", "a\nb\n").ends_with("x: a\nb\n"));
+    }
+
+    #[test]
+    fn rotation_keeps_the_previous_logs_and_starts_an_empty_file() {
+        let dir = temp_dir("rotate");
+        for run in 1..=4 {
+            let (path, _file) = rotate(&dir).expect("rotate");
+            assert_eq!(path, dir.join(LOG_FILE));
+            assert_eq!(read(&path), "");
+            std::fs::write(&path, format!("run {run}")).expect("write");
+        }
+        assert_eq!(read(&dir.join(LOG_FILE)), "run 4");
+        assert_eq!(read(&dir.join("vectorcraft.1.log")), "run 3");
+        assert_eq!(read(&dir.join("vectorcraft.2.log")), "run 2");
+        assert!(!dir.join("vectorcraft.3.log").exists(), "only {KEEP} old logs are kept");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn rotation_into_an_unusable_directory_is_an_error_not_a_panic() {
+        let dir = temp_dir("blocked");
+        std::fs::create_dir_all(dir.parent().expect("parent")).expect("tmp");
+        std::fs::write(&dir, "a file where the directory should be").expect("block");
+        assert!(rotate(&dir).is_err());
+        let _ = std::fs::remove_file(&dir);
+    }
+
+    #[test]
+    fn lines_logged_before_the_file_exists_are_written_when_it_is_attached() {
+        let dir = temp_dir("pending");
+        let (path, file) = rotate(&dir).expect("rotate");
+        let mut sink = Sink::new(MAX_FILE_BYTES);
+        sink.write("early 1\n");
+        sink.write("early 2\n");
+        sink.attach(file);
+        sink.write("late\n");
+        assert_eq!(read(&path), "early 1\nearly 2\nlate\n");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn the_pending_buffer_is_bounded_and_says_how_much_it_dropped() {
+        let dir = temp_dir("bounded");
+        let (path, file) = rotate(&dir).expect("rotate");
+        let mut sink = Sink::new(MAX_FILE_BYTES);
+        for i in 0..MAX_PENDING + 5 {
+            sink.write(&format!("line {i}\n"));
+        }
+        sink.attach(file);
+        let text = read(&path);
+        assert_eq!(text.lines().filter(|l| l.starts_with("line ")).count(), MAX_PENDING);
+        assert!(text.contains("5 earlier log lines were dropped"), "{text}");
+        assert!(text.contains("line 0\n") && !text.contains(&format!("line {MAX_PENDING}\n")));
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn exactly_a_full_pending_buffer_drops_nothing() {
+        let dir = temp_dir("full");
+        let (path, file) = rotate(&dir).expect("rotate");
+        let mut sink = Sink::new(MAX_FILE_BYTES);
+        for i in 0..MAX_PENDING {
+            sink.write(&format!("line {i}\n"));
+        }
+        sink.attach(file);
+        let text = read(&path);
+        assert_eq!(text.lines().count(), MAX_PENDING);
+        assert!(!text.contains("dropped"), "{text}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn without_a_file_nothing_is_kept_in_memory() {
+        let mut sink = Sink::new(MAX_FILE_BYTES);
+        sink.write("early\n");
+        sink.no_file();
+        sink.write("late\n");
+        assert!(sink.pending.is_empty() && sink.dropped == 0);
+    }
+
+    #[test]
+    fn the_file_stops_at_its_size_cap_with_one_note() {
+        let dir = temp_dir("cap");
+        let (path, file) = rotate(&dir).expect("rotate");
+        let mut sink = Sink::new(100);
+        sink.attach(file);
+        for i in 0..50 {
+            sink.write(&format!("line {i:02} with some padding\n"));
+        }
+        let text = read(&path);
+        assert_eq!(text.lines().filter(|l| l.starts_with("line ")).count(), 3, "{text}");
+        assert_eq!(text.matches("log file reached").count(), 1, "{text}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn the_logger_filters_records_and_writes_them_to_the_attached_file() {
+        use log::Log;
+        let dir = temp_dir("logger");
+        let logger = AppLogger::new(Filter::parse(DEFAULT_FILTER), false);
+        let record = |level, target: &'static str, msg: &'static str| {
+            logger.log(&log::Record::builder().level(level).target(target).args(format_args!("{msg}")).build());
+        };
+        record(log::Level::Info, "vectorcraft", "before the settings directory");
+        record(log::Level::Info, "wgpu_core::device", "too chatty");
+        let path = logger.attach_dir(&dir).expect("attach");
+        assert_eq!(path, dir.join(LOG_FILE));
+        record(log::Level::Warn, "wgpu_hal::vulkan", "a real warning");
+        record(log::Level::Error, "vectorcraft_engine::guard", "recovered from a panic: boom");
+        record(log::Level::Debug, "vectorcraft", "below info");
+        let text = read(&path);
+        let lines: Vec<&str> = text.lines().collect();
+        assert_eq!(lines.len(), 3, "{text}");
+        assert!(lines[0].contains(" INFO  [") && lines[0].ends_with("vectorcraft: before the settings directory"), "{text}");
+        assert!(lines[1].ends_with("wgpu_hal::vulkan: a real warning"), "{text}");
+        assert!(lines[2].contains(" ERROR [") && lines[2].ends_with("vectorcraft_engine::guard: recovered from a panic: boom"), "{text}");
+        assert!(logger.enabled(&log::Metadata::builder().level(log::Level::Info).target("vectorcraft_ui_egui").build()));
+        assert!(!logger.enabled(&log::Metadata::builder().level(log::Level::Info).target("naga").build()));
+        // Attaching again rotates: the first log becomes `.1`.
+        logger.attach_dir(&dir).expect("attach again");
+        assert_eq!(read(&dir.join("vectorcraft.1.log")), text);
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn records_from_many_threads_are_whole_lines() {
+        use log::Log;
+        let dir = temp_dir("threads");
+        let logger = std::sync::Arc::new(AppLogger::new(Filter::parse("info"), false));
+        let path = logger.attach_dir(&dir).expect("attach");
+        let workers: Vec<_> = (0..8)
+            .map(|t| {
+                let l = std::sync::Arc::clone(&logger);
+                std::thread::spawn(move || {
+                    for i in 0..100 {
+                        l.log(
+                            &log::Record::builder().level(log::Level::Info).target("vectorcraft").args(format_args!("thread {t} record {i}")).build(),
+                        );
+                    }
+                })
+            })
+            .collect();
+        for w in workers {
+            w.join().expect("worker");
+        }
+        let text = read(&path);
+        assert_eq!(text.lines().count(), 800);
+        assert!(text.lines().all(|l| l.contains(" vectorcraft: thread ")), "{text}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
+    #[test]
+    fn attaching_to_an_unusable_directory_reports_an_error_and_keeps_logging() {
+        use log::Log;
+        let dir = temp_dir("unusable");
+        std::fs::create_dir_all(dir.parent().expect("parent")).expect("tmp");
+        std::fs::write(&dir, "not a directory").expect("block");
+        let logger = AppLogger::new(Filter::parse("info"), false);
+        assert!(logger.attach_dir(&dir).is_err());
+        logger.log(&log::Record::builder().level(log::Level::Error).target("x").args(format_args!("still fine")).build());
+        // Nothing waits in memory for a file that won't come.
+        assert!(logger.sink.lock().expect("sink").pending.is_empty());
+        let _ = std::fs::remove_file(&dir);
+    }
+
+    #[test]
+    fn a_poisoned_sink_still_logs() {
+        use log::Log;
+        let dir = temp_dir("poison");
+        let logger = std::sync::Arc::new(AppLogger::new(Filter::parse("info"), false));
+        let l = std::sync::Arc::clone(&logger);
+        let _ = std::thread::spawn(move || {
+            let _guard = l.sink.lock().expect("lock");
+            panic!("poison the sink");
+        })
+        .join();
+        assert!(logger.sink.is_poisoned());
+        let path = logger.attach_dir(&dir).expect("attach");
+        logger.log(&log::Record::builder().level(log::Level::Warn).target("vectorcraft").args(format_args!("after the poison")).build());
+        assert!(read(&path).contains("vectorcraft: after the poison"));
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+}
@@ -16,6 +16,7 @@ compile_error!("the win7 target requires --no-default-features --features window

 mod clipboard;
 mod control_server;
+mod logging;
 #[cfg(target_os = "macos")]
 mod native_menu;
 #[cfg(target_os = "macos")]
@@ -139,6 +140,11 @@ fn prefs_path_for(name: &str, lower: &str) -> Option<std::path::PathBuf> {
    base.map(|b| b.join("ui.json"))
 }

+/// Where the log files live: `logs` in the preferences folder (see `logging`).
+fn log_dir() -> Option<std::path::PathBuf> {
+    Some(prefs_path()?.parent()?.join("logs"))
+}
+
 /// Runs without preferences (`VECTORCRAFT_NO_PREFS`, agents' test runs) neither read nor write them.
 fn prefs_enabled() -> bool {
    std::env::var_os("VECTORCRAFT_NO_PREFS").is_none()
@@ -319,6 +325,8 @@ fn adapter_summary(info: &eframe::wgpu::AdapterInfo) -> String {
 const CUSTOM_TITLEBAR: bool = !cfg!(target_os = "macos");

 fn main() -> eframe::Result {
+    // First, so every start-up warning is recorded (`logging`).
+    let logger = logging::install();
    vectorcraft_ui_egui::i18n::detect_system_lang_in_background();
    let mut control_port: Option<u16> = std::env::var("VECTORCRAFT_CONTROL_PORT").ok().and_then(|p| p.parse().ok());
    let mut files = Vec::new();
@@ -333,6 +341,20 @@ fn main() -> eframe::Result {
            _ => files.push(a),
        }
    }
+    // The log file lives in the settings directory, next to the preferences; opened after the
+    // arguments, so `--version` leaves no file behind. Records logged until now are written to it
+    // first. Runs without preferences (agents' test runs) log to standard error only, so they
+    // don't rotate away the user's own logs.
+    if let Some(logger) = logger {
+        match log_dir().filter(|_| prefs_enabled()) {
+            Some(dir) => match logger.attach_dir(&dir) {
+                Ok(path) => log::info!("VectorCraft {}, log file {}", env!("CARGO_PKG_VERSION"), path.display()),
+                // Standard error only by now (`attach_dir` gave up on the file); unlike `eprintln!`, never panics.
+                Err(e) => log::warn!("no log file: {e}"),
+            },
+            None => logger.no_file(),
+        }
+    }
    let saved = read_prefs();
    let saved_window = saved.as_ref().and_then(|ui| ui.window);
    #[cfg(feature = "wgpu")]
@@ -358,6 +380,9 @@ fn main() -> eframe::Result {
    #[cfg(feature = "wgpu")]
    let options = {
        let mut options = options;
+        // One frame queued, not two: the canvas is rasterized on the CPU and the GPU only
+        // composites it, so the window answers the pointer a frame sooner (#444).
+        options.wgpu_options.surface = eframe::egui_wgpu::SurfaceConfig::LOW_LATENCY;
        if let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
            create.power_preference = power;
        }
@@ -391,7 +416,7 @@ fn main() -> eframe::Result {
            #[cfg(feature = "wgpu")]
            if let Some(rs) = &cc.wgpu_render_state {
                let summary = adapter_summary(&rs.adapter.get_info());
-                log::info!("vectorcraft: rendering with {summary} (power preference {power:?})");
+                log::info!("rendering with {summary} (power preference {power:?})");
                app.graphics_adapter = Some(summary);
                let (loss, ctx) = (graphics_loss.clone(), cc.egui_ctx.clone());
                rs.device.set_device_lost_callback(move |reason, msg| loss.report(&ctx, format!("{reason:?}: {msg}")));
@@ -59,7 +59,7 @@ pub fn take() -> Vec<String> {
 fn add_open_urls_method() {
    let Some(mtm) = MainThreadMarker::new() else { return };
    let Some(delegate) = NSApplication::sharedApplication(mtm).delegate() else {
-        log::warn!("vectorcraft: no application delegate; files opened from Finder won't open");
+        log::warn!("no application delegate; files opened from Finder won't open");
        return;
    };
    let class = AsRef::<AnyObject>::as_ref(&*delegate).class();
@@ -72,7 +72,7 @@ fn add_open_urls_method() {
        objc2::ffi::class_addMethod(std::ptr::from_ref(class).cast_mut(), sel!(application:openURLs:), imp, c"v@:@@".as_ptr())
    };
    if !added.as_bool() {
-        log::warn!("vectorcraft: the application delegate already handles open-document events");
+        log::warn!("the application delegate already handles open-document events");
    }
 }

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 20 C5 11 8 7 12 7 S19 11 21 20"/><path d="M5 7 H19"/><circle cx="5" cy="7" r="1.4" fill="currentColor"/><circle cx="19" cy="7" r="1.4" fill="currentColor"/><rect x="10" y="5" width="4" height="4" fill="currentColor"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l-7-7 3-6 8 3 3 7-7 3z" /><path d="M5 12l5-5"/><circle cx="11" cy="11" r="1.5"/><path d="M19 3v5M16.5 5.5h5"/></svg>
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l-7-7 3-6 8 3 3 7-7 3z" /><path d="M5 12l5-5"/><circle cx="11" cy="11" r="1.5"/><path d="M16.5 5.5h5"/></svg>
@@ -0,0 +1,19 @@
+<!-- @license lucide-static v1.49.0 - ISC -->
+<!-- Lucide's pen-tool with a plus badge added for VectorCraft -->
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M15.707 21.293a1 1 0 0 1-1.414 0l-1.586-1.586a1 1 0 0 1 0-1.414l5.586-5.586a1 1 0 0 1 1.414 0l1.586 1.586a1 1 0 0 1 0 1.414z" />
+  <path d="m18 13-1.375-6.874a1 1 0 0 0-.746-.776L3.235 2.028a1 1 0 0 0-1.207 1.207L5.35 15.879a1 1 0 0 0 .776.746L13 18" />
+  <path d="m2.3 2.3 7.286 7.286" />
+  <circle cx="11" cy="11" r="2" />
+  <path d="M4 18.3v4.4M1.8 20.5h4.4" />
+</svg>
@@ -0,0 +1,19 @@
+<!-- @license lucide-static v1.49.0 - ISC -->
+<!-- Lucide's pen-tool with a minus badge added for VectorCraft -->
+<svg
+  xmlns="http://www.w3.org/2000/svg"
+  width="24"
+  height="24"
+  viewBox="0 0 24 24"
+  fill="none"
+  stroke="currentColor"
+  stroke-width="2"
+  stroke-linecap="round"
+  stroke-linejoin="round"
+>
+  <path d="M15.707 21.293a1 1 0 0 1-1.414 0l-1.586-1.586a1 1 0 0 1 0-1.414l5.586-5.586a1 1 0 0 1 1.414 0l1.586 1.586a1 1 0 0 1 0 1.414z" />
+  <path d="m18 13-1.375-6.874a1 1 0 0 0-.746-.776L3.235 2.028a1 1 0 0 0-1.207 1.207L5.35 15.879a1 1 0 0 0 .776.746L13 18" />
+  <path d="m2.3 2.3 7.286 7.286" />
+  <circle cx="11" cy="11" r="2" />
+  <path d="M1.8 20.5h4.4" />
+</svg>
@@ -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();
    }
 }

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

 use std::sync::Arc;

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

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

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

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

-/// A clipping group of `items`, clipped by `c` (their clip at `depth`).
+/// A clipping group of `items`, clipped by `c` (their clip at `depth`), or their group when `c` is
+/// a plain group.
 fn clip_group(doc: &mut Document, c: &Clip, items: Drawn, depth: usize) -> Arc<Node> {
-    let mut path = Node::path(doc.alloc_id(), PathData::from_bezpath(&c.path), Appearance::default());
-    if let NodeKind::Path { clipping, rule, .. } = &mut path.kind {
-        *clipping = true;
-        *rule = c.rule;
+    let mut children = vec![];
+    if let Some((bp, r)) = &c.region {
+        let mut path = Node::path(doc.alloc_id(), PathData::from_bezpath(bp), Appearance::default());
+        if let NodeKind::Path { clipping, rule, .. } = &mut path.kind {
+            *clipping = true;
+            *rule = *r;
+        }
+        children.push(Arc::new(path));
    }
-    let mut children = vec![Arc::new(path)];
    children.extend(nest_at(doc, items, depth + 1));
-    Arc::new(Node::new(doc.alloc_id(), NodeKind::Group { children, clip: true }))
+    Arc::new(Node::new(doc.alloc_id(), NodeKind::Group { children, clip: c.region.is_some() }))
 }
@@ -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() {
@@ -78,15 +78,15 @@ pub use setup::{Background, DocSetup, ExportText, GridSize, Quotes};
 pub use slices::{CellAlign, CellVAlign, Slice, SliceArea, SliceKind, SliceOptions, SliceSource};
 pub use style_libs::StyleLibrary;
 pub use text::{
-    AreaOptions, CharAlign, CharPosition, CharStyle, FirstBaseline, Justify, LeadingModel, Mojikumi, ParaDirection, ParaStyle, PathAlign, PathEffect,
-    ScriptMetrics, TabAlign, TabStop, TextKind, TextObject, TextRun, TextStyleDef, TextWrap, WrapShape,
+    AreaOptions, Burasagari, CharAlign, CharPosition, CharStyle, FirstBaseline, Justify, LeadingModel, Mojikumi, ParaDirection, ParaStyle, PathAlign,
+    PathEffect, ScriptMetrics, TabAlign, TabStop, TextKind, TextObject, TextRun, TextStyleDef, TextWrap, WrapShape,
 };
 pub use vectorcraft_color as color;
 pub use vectorcraft_geom as geom;

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

 #[derive(Debug, thiserror::Error, PartialEq)]
 pub enum DocError {
@@ -386,6 +386,22 @@ pub struct Guide {
    /// true = vertical guide at `pos` (x), false = horizontal at `pos` (y).
    pub vertical: bool,
    pub pos: f64,
+    /// An artboard guide: the [`Artboard::id`] it belongs to. It runs across that artboard only
+    /// and moves, is copied and is deleted with it. None: a canvas guide, across the whole canvas.
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub artboard: Option<u32>,
+}
+
+impl Guide {
+    /// A canvas guide.
+    pub fn new(vertical: bool, pos: f64) -> Self {
+        Self { vertical, pos, artboard: None }
+    }
+
+    /// Moved by `d` (a vertical guide across, a horizontal one down).
+    pub fn moved(&self, d: Vec2) -> Self {
+        Self { pos: self.pos + if self.vertical { d.x } else { d.y }, ..self.clone() }
+    }
 }

 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
@@ -940,6 +956,47 @@ impl Document {
        }
        art
    }
+    /// Where ruler guide `g` runs along its line (the y range of a vertical guide): across its
+    /// artboard for an artboard guide, None (the whole canvas) for a canvas guide or one whose
+    /// artboard is gone.
+    pub fn guide_span(&self, g: &Guide) -> Option<(f64, f64)> {
+        let r = self.artboards.iter().find(|a| Some(a.id) == g.artboard)?.rect;
+        Some(if g.vertical { (r.y0, r.y1) } else { (r.x0, r.x1) })
+    }
+    /// Does ruler guide `g` run past `p` (up to `tol` beyond its ends)?
+    pub fn guide_passes(&self, g: &Guide, p: Point, tol: f64) -> bool {
+        let along = if g.vertical { p.y } else { p.x };
+        self.guide_span(g).is_none_or(|(a, b)| along >= a - tol && along <= b + tol)
+    }
+    /// Keep the ruler guides `keep` accepts (by index), the selected ones left keeping their
+    /// place among the rest (the selected art stays selected). Returns how many went.
+    pub fn retain_guides(&mut self, sel: &mut Selection, keep: impl Fn(usize, &Guide) -> bool) -> usize {
+        let kept: Vec<bool> = self.guides.iter().enumerate().map(|(i, g)| keep(i, g)).collect();
+        // Where each kept guide ends up.
+        let (mut to, mut n) = (Vec::with_capacity(kept.len()), 0);
+        for k in &kept {
+            to.push(k.then_some(n));
+            n += usize::from(*k);
+        }
+        sel.guides = sel.guides.iter().filter_map(|i| to.get(*i).copied().flatten()).collect();
+        let before = self.guides.len();
+        let mut flags = kept.into_iter();
+        self.guides.retain(|_| flags.next().unwrap_or(true));
+        before - self.guides.len()
+    }
+    /// Move the guides of artboard `id` by `d` (along with their artboard).
+    pub fn move_artboard_guides(&mut self, id: u32, d: Vec2) {
+        for g in self.guides.iter_mut().filter(|g| g.artboard == Some(id)) {
+            *g = g.moved(d);
+        }
+    }
+    /// Copy the guides of artboard `from` onto artboard `to`, `d` away (with a copy of their
+    /// artboard).
+    pub fn copy_artboard_guides(&mut self, from: u32, to: u32, d: Vec2) {
+        let copies: Vec<Guide> =
+            self.guides.iter().filter(|g| g.artboard == Some(from)).map(|g| Guide { artboard: Some(to), ..g.moved(d) }).collect();
+        self.guides.extend(copies);
+    }
    pub fn next_artboard_id(&self) -> u32 {
        self.artboards.iter().map(|a| a.id).max().unwrap_or(0) + 1
    }
@@ -589,6 +589,46 @@ impl GradientMesh {
        self.rows >= 1 && self.cols >= 1 && self.points.len() == (self.rows as usize + 1) * (self.cols as usize + 1)
    }

+    /// A 1×1 mesh from its four corners (bottom-left, top-left, top-right, bottom-right in u/v
+    /// order: row 0 is v = 0, columns follow u), each with its handles ([`H_RIGHT`] …).
+    fn patch(corners: [(Point, [Vec2; 4], Color); 4]) -> Self {
+        let point = |(p, handles, color): (Point, [Vec2; 4], Color)| MeshPoint { p, color, opacity: 1.0, handles };
+        let [a, b, c, d] = corners;
+        Self { rows: 1, cols: 1, points: vec![point(a), point(d), point(b), point(c)] }
+    }
+
+    /// A 1×1 mesh from a Coons patch's twelve boundary points (in the order PDF and PostScript
+    /// shadings list them: v runs cp0 → cp3 along cp1 and cp2, u runs cp0 → cp9 along cp11 and
+    /// cp10) and its corner colours (at cp0, cp3, cp6, cp9); `None` if a point isn't finite.
+    pub fn coons(cp: &[Point; 12], colors: [Color; 4]) -> Option<Self> {
+        if !cp.iter().all(|p| p.is_finite()) {
+            return None;
+        }
+        let h = |a: usize, b: usize| cp[b] - cp[a];
+        let handles = |right: Vec2, left: Vec2, down: Vec2, up: Vec2| {
+            let mut h = [Vec2::ZERO; 4];
+            (h[H_RIGHT], h[H_LEFT], h[H_DOWN], h[H_UP]) = (right, left, down, up);
+            h
+        };
+        let [c0, c1, c2, c3] = colors;
+        Some(Self::patch([
+            (cp[0], handles(h(0, 11), Vec2::ZERO, h(0, 1), Vec2::ZERO), c0),
+            (cp[3], handles(h(3, 4), Vec2::ZERO, Vec2::ZERO, h(3, 2)), c1),
+            (cp[6], handles(Vec2::ZERO, h(6, 5), Vec2::ZERO, h(6, 7)), c2),
+            (cp[9], handles(Vec2::ZERO, h(9, 10), h(9, 8), Vec2::ZERO), c3),
+        ]))
+    }
+
+    /// A 1×1 mesh of a Gouraud-shaded triangle (a patch with two corners together); `None` if a
+    /// point isn't finite.
+    pub fn triangle(corners: [(Point, Color); 3]) -> Option<Self> {
+        if !corners.iter().all(|(p, _)| p.is_finite()) {
+            return None;
+        }
+        let [a, b, c] = corners.map(|(p, color)| (p, [Vec2::ZERO; 4], color));
+        Some(Self::patch([a, b, c, c]))
+    }
+
    /// A mesh over surface `s` (u, v ∈ [0,1]) with handles from its partial derivatives.
    pub fn from_surface(rows: u32, cols: u32, s: &dyn Fn(f64, f64) -> Point, color: &dyn Fn(f64, f64) -> Color) -> Self {
        let (us, vs) = (even_steps(cols), even_steps(rows));
@@ -143,24 +143,11 @@ impl LiveShape {
    /// scale in `xf` keep their exact geometry until they're next transformed).
    pub fn transform(&mut self, a: Affine) -> bool {
        match self {
-            LiveShape::Rectangle { w, h, radii, xf, .. } => {
-                let m = a * *xf;
+            LiveShape::Rectangle { xf, .. } => {
+                *xf = a * *xf;
                let [a0, a1, a2, a3, _, _] = a.as_coeffs();
                let moves_only = (a0 - 1.0).abs() < 1e-12 && a1.abs() < 1e-12 && a2.abs() < 1e-12 && (a3 - 1.0).abs() < 1e-12;
-                let [m0, m1, m2, m3, m4, m5] = m.as_coeffs();
-                let (sx, sy) = (m0.hypot(m1), m2.hypot(m3));
-                let orthogonal = sx > 1e-12 && sy > 1e-12 && (m0 * m2 + m1 * m3).abs() <= 1e-9 * sx * sy;
-                let finite = m.as_coeffs().iter().all(|c| c.is_finite()) && w.is_finite() && h.is_finite();
-                if moves_only || !orthogonal || !finite {
-                    *xf = m;
-                    return false;
-                }
-                let k = (sx * sy).sqrt();
-                radii.iter_mut().for_each(|r| *r *= k);
-                *w *= sx;
-                *h *= sy;
-                *xf = Affine::new([m0 / sx, m1 / sx, m2 / sy, m3 / sy, m4, m5]);
-                true
+                !moves_only && self.fold_scale()
            }
            LiveShape::Ellipse { xf, .. } | LiveShape::Polygon { xf, .. } => {
                *xf = a * *xf;
@@ -173,6 +160,35 @@ impl LiveShape {
            }
        }
    }
+    /// Move the scale of a rectangle's `xf` into `w`/`h` (and its radii, by the mean scale), so
+    /// `xf` keeps only a rotation or reflection plus a move and the corners are circular in the
+    /// document. False (and nothing changes) when there is no scale to move, when `xf` shears or
+    /// isn't finite, and for other shapes. Files saved before transforms did this (#291) carry an
+    /// uneven scale in `xf`: their corners are elliptical until this runs.
+    pub fn fold_scale(&mut self) -> bool {
+        let LiveShape::Rectangle { w, h, radii, xf, .. } = self else { return false };
+        let [m0, m1, m2, m3, m4, m5] = xf.as_coeffs();
+        let (sx, sy) = (m0.hypot(m1), m2.hypot(m3));
+        let orthogonal = sx > 1e-12 && sy > 1e-12 && (m0 * m2 + m1 * m3).abs() <= 1e-9 * sx * sy;
+        let finite = xf.as_coeffs().iter().all(|c| c.is_finite()) && w.is_finite() && h.is_finite();
+        let unscaled = (sx - 1.0).abs() < 1e-12 && (sy - 1.0).abs() < 1e-12;
+        if !orthogonal || !finite || unscaled {
+            return false;
+        }
+        let k = (sx * sy).sqrt();
+        radii.iter_mut().for_each(|r| *r *= k);
+        *w *= sx;
+        *h *= sy;
+        *xf = Affine::new([m0 / sx, m1 / sx, m2 / sy, m3 / sy, m4, m5]);
+        true
+    }
+    /// This shape with [`LiveShape::fold_scale`] applied: a rectangle's size and radii in document
+    /// units (what Live Corners show and edit).
+    pub fn folded(&self) -> Self {
+        let mut s = self.clone();
+        s.fold_scale();
+        s
+    }
    /// Divide live corner radii by `k`, the mean scale of a transform just applied, so the corners
    /// keep their size (Scale Corners off). False when nothing changed.
    pub fn keep_corners(&mut self, k: f64) -> bool {
@@ -212,15 +228,16 @@ impl LiveShape {
    pub fn corner_anchors(&self, corners: [bool; 4]) -> BTreeSet<AnchorRef> {
        self.anchor_corners().into_iter().enumerate().filter(|(_, k)| corners.get(*k) == Some(&true)).map(|(ai, _)| (0, ai)).collect()
    }
-    /// The radius and kind the `corners` of a rectangle share (each `None` when they differ).
+    /// The radius (in document units, see [`LiveShape::folded`]) and kind the `corners` of a
+    /// rectangle share (each `None` when they differ).
    pub fn corner_style(&self, corners: [bool; 4]) -> (Option<f64>, Option<CornerKind>) {
-        let LiveShape::Rectangle { radii, kinds, .. } = self else { return (None, None) };
+        let LiveShape::Rectangle { radii, kinds, .. } = self.folded() else { return (None, None) };
        fn shared<T: Copy>(v: [T; 4], corners: [bool; 4], same: impl Fn(T, T) -> bool) -> Option<T> {
            let mut it = v.into_iter().zip(corners).filter(|(_, on)| *on).map(|(x, _)| x);
            let first = it.next()?;
            it.all(|x| same(x, first)).then_some(first)
        }
-        (shared(*radii, corners, |a, b| (a - b).abs() < 1e-9), shared(*kinds, corners, |a, b| a == b))
+        (shared(radii, corners, |a, b| (a - b).abs() < 1e-9), shared(kinds, corners, |a, b| a == b))
    }
    /// Rotation angle of the live shape in degrees (shown in the Properties panel).
    pub fn angle_deg(&self) -> f64 {
@@ -1395,6 +1412,33 @@ mod tests {
        assert_round_corners(&n, Affine::IDENTITY, 20.0 * 2f64.sqrt() * 2.0);
    }

+    /// A rectangle saved with an uneven scale in `xf` (before #291) has elliptical corners; Live
+    /// Corners see and edit it in document units, with circular corners (#442).
+    #[test]
+    fn a_scale_left_in_the_transform_folds_into_the_size() {
+        let legacy = Affine::translate((5.0, 5.0)) * Affine::scale_non_uniform(4.0, 1.0);
+        let n = live_rect(50.0, 80.0, 20.0, legacy);
+        let NodeKind::Path { live: Some(live), .. } = &n.kind else { panic!("not live") };
+        let folded = live.folded();
+        assert_eq!(live_of(&n).3, legacy, "folded() leaves the shape alone");
+        let LiveShape::Rectangle { w, h, radii, xf, .. } = &folded else { panic!("not a rectangle") };
+        // Drawn 200 × 80 with 80 × 20 corners; folded, the corners are circles of the mean radius.
+        assert!(near(*w, 200.0) && near(*h, 80.0) && radii.iter().all(|r| near(*r, 40.0)), "{w} × {h} r {radii:?}");
+        assert!(near_xf(*xf, Affine::translate((5.0, 5.0))));
+        let (a, b) = (folded.to_path().bounds().unwrap(), live.to_path().bounds().unwrap());
+        assert!(near(a.x0, b.x0) && near(a.y0, b.y0) && near(a.x1, b.x1) && near(a.y1, b.y1), "same place and size: {a:?} {b:?}");
+        assert_eq!(live.corner_style([true; 4]).0, Some(40.0), "the radius in document units");
+        // Nothing to fold: a moved, rotated or reflected rectangle and a sheared one stay as they are.
+        let place = Affine::translate((5.0, 5.0)) * Affine::rotate(0.5) * Affine::scale_non_uniform(-1.0, 1.0);
+        let shear = Affine::new([1.0, 0.0, 0.5, 1.0, 0.0, 0.0]);
+        for xf in [place, shear] {
+            let mut l = live_rect(100.0, 160.0, 20.0, xf);
+            let NodeKind::Path { live: Some(live), .. } = &mut l.kind else { panic!("not live") };
+            assert!(!live.fold_scale());
+            assert_eq!(live_of(&l), (100.0, 160.0, [20.0; 4], xf));
+        }
+    }
+
    #[test]
    fn default_transparency() {
        let p = || Node::path(NodeId(1), shapes::rectangle(Rect::new(0.0, 0.0, 10.0, 10.0)), Appearance::default_art());
@@ -170,7 +170,7 @@ mod tests {
        assert!(s.guides.is_empty());
        // Pruning drops guides the document no longer has.
        let mut d = Document::new(100.0, 100.0);
-        d.guides.push(crate::Guide { vertical: true, pos: 10.0 });
+        d.guides.push(crate::Guide::new(true, 10.0));
        s.set_guides([0, 1]);
        s.prune(&d);
        assert_eq!(s.guides, vec![0]);
@@ -314,6 +314,10 @@ pub struct ParaStyle {
    /// How leading is measured (Paragraph panel menu): from baseline to baseline, or from the top
    /// of one line's ideographic em box to the next.
    pub leading_model: LeadingModel,
+    /// Hanging punctuation (Paragraph panel menu › Burasagari): a comma or full stop ending a line
+    /// may stand outside the frame. New type takes [`Burasagari::Standard`]; documents from before
+    /// it and imported text keep [`Burasagari::None`].
+    pub burasagari: Burasagari,
 }

 /// [`ParaStyle`] as saved. [`Justify::Auto`] is written as the alignment it has in the paragraph
@@ -347,6 +351,8 @@ struct ParaStyleFile {
    direction: Option<ParaDirection>,
    #[serde(default, skip_serializing_if = "crate::skip::is_default")]
    leading_model: LeadingModel,
+    #[serde(default, skip_serializing_if = "crate::skip::is_default")]
+    burasagari: Burasagari,
 }

 impl From<ParaStyle> for ParaStyleFile {
@@ -369,6 +375,7 @@ impl From<ParaStyle> for ParaStyleFile {
            mojikumi,
            direction,
            leading_model,
+            burasagari,
            ..
        } = p;
        Self {
@@ -385,6 +392,7 @@ impl From<ParaStyle> for ParaStyleFile {
            mojikumi,
            direction,
            leading_model,
+            burasagari,
        }
    }
 }
@@ -404,6 +412,7 @@ impl From<ParaStyleFile> for ParaStyle {
            mojikumi,
            direction,
            leading_model,
+            burasagari,
            ..
        } = f;
        Self {
@@ -419,6 +428,7 @@ impl From<ParaStyleFile> for ParaStyle {
            mojikumi,
            direction,
            leading_model,
+            burasagari,
        }
    }
 }
@@ -465,6 +475,22 @@ impl Mojikumi {
    }
 }

+/// Hanging punctuation (burasagari): an East Asian comma or full stop ending a line (、。，．､｡)
+/// stands outside the line's measure, in the space its punctuation spacing gives it (half width
+/// with Line-end Punctuation Half Width). Closing brackets and Latin punctuation don't hang. Shown
+/// as None / Regular / Force.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Hash, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Burasagari {
+    /// A comma or full stop that doesn't fit goes to the next line with the character before it.
+    #[default]
+    None,
+    /// A comma or full stop that doesn't fit hangs outside the line; one that fits stays inside.
+    Standard,
+    /// A comma or full stop ending a line always hangs, and the rest of the line fills the measure.
+    Forced,
+}
+
 /// Area Type Options "First Baseline" offset.
 #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
@@ -689,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 {
@@ -705,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 {
@@ -813,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)]
@@ -16,7 +16,7 @@ use serde_json::{Value, json};
 use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::appearance::{AppearanceItem, FillLayer, StrokeLayer};
 use vectorcraft_doc::{Appearance, Document, Node, NodeId, NodeKind, Selection};
-use vectorcraft_geom::{FillRule, PathData, Point, Rect};
+use vectorcraft_geom::{FillRule, PathData, Point, Rect, SubPath};
 use vectorcraft_pathops as po;
 use vectorcraft_tools::builder::{
    self as b, BuilderMap, EDGE_NAME, FACE_NAME, LIVE_PAINT_NAME, SOURCES_NAME, Touched, edge_near, face_at, is_live_paint, sample_polyline,
@@ -39,7 +39,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Shape Builder",
            [],
            None,
-            "{ids?: [id…] (default: selection), points: [[x,y]…] (drag path; one point = click), erase?: bool (Alt-drag deletes the regions, and the pieces of unfilled open paths within tolerance), tolerance?: pt (2, erase only), fill?: \"#rrggbb\" | {color|swatch|gradient|none} (default: the fill of the object under the first point; the current fill for an area only lines enclose)} → {ids, merged, regions, lines}",
+            "{ids?: [id…] (default: selection), points: [[x,y]…] (drag path; one point = click), erase?: bool (erase mode, Alt: deletes the regions touched, and the pieces of unfilled open paths and the edges (outline pieces between the points where paths meet; see shapeBuilder.regions) within tolerance; a deleted edge opens its path there, and edges bounding a deleted region go with it), tolerance?: pt (2, erase only), fill?: \"#rrggbb\" | {color|swatch|gradient|none} (default: the fill of the object under the first point; the current fill for an area only lines enclose)} → {ids, merged, regions, lines, edges} (counts deleted or merged)",
            has_selection_or_ids,
            sb_merge
        ),
@@ -48,7 +48,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Shape Builder Regions",
            [],
            None,
-            "{ids?} → {regions: [{bounds: [x0,y0,x1,y1], area, sources: [id…]}], lines: [{bounds, source: id}]} faces of the planar arrangement (unfilled open paths cut them; sources is empty for an area only they enclose) and the pieces of those open paths",
+            "{ids?} → {regions: [{bounds: [x0,y0,x1,y1], area, sources: [id…]}], lines: [{bounds, source: id}], edges: [{bounds, source: id}]} faces of the planar arrangement (unfilled open paths cut them; sources is empty for an area only they enclose), the pieces of those open paths and the edges (the other paths' outlines cut where paths meet; source: the front-most path along it), which erasing deletes",
            has_selection_or_ids,
            sb_regions
        ),
@@ -225,14 +225,14 @@ fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
        return Err(bad(C, "points must be a non-empty list of finite [x,y]"));
    }
    let erase = bool_or(p, "erase", false);
-    // Line pieces are only deleted (Alt), never merged.
-    let line_tol = erase.then(|| f64_or(p, "tolerance", 2.0).clamp(0.0, 1000.0));
+    // Line pieces and edges are only deleted (erase mode), never merged.
+    let piece_tol = erase.then(|| f64_or(p, "tolerance", 2.0).clamp(0.0, 1000.0));
    let fill = fill_param(s, p, C)?;
    let current_fill = s.paint.fill.clone();
    let roots = root_ids(s, p)?;
    let label = if erase { "Shape Builder Delete" } else { "Shape Builder" };
-    let (ids, merged, regions, lines) = s.edit(label, |d, sel| {
-        let (map, leaves) = BuilderMap::new(d, &roots);
+    let (ids, merged, touched) = s.edit(label, |d, sel| {
+        let (map, leaves) = BuilderMap::new(d, &roots, erase);
        let leaves: Vec<Node> = leaves.into_iter().cloned().collect();
        if map.shapes.is_empty() {
            return Err(EngineError::Other("Shape Builder: select paths or compound paths".into()));
@@ -240,11 +240,15 @@ fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
        let step = (d.bounds_of(&roots, false).map(|r| r.width().max(r.height())).unwrap_or(100.0) / 2000.0).max(0.25);
        let mut touched = Touched::default();
        for q in sample_polyline(&pts, step) {
-            touched.add(map.hit(q, line_tol));
+            touched.add(map.hit(q, piece_tol));
        }
+        touched.edges = map.erased_edges(&touched);
        if touched.is_empty() {
            return Err(EngineError::Other("Shape Builder: no region under the pointer".into()));
        }
+        let cuts: Vec<&SubPath> = touched.edges.iter().filter_map(|&k| map.edges.get(k)?.0.path.subpaths.first()).collect();
+        // Edges come back from the planar map within a few hundredths of the outlines they follow.
+        let cut_tol = step * 0.2;
        let picked: Vec<&po::Region> = touched.regions.iter().filter_map(|&i| map.regions.get(i).map(|r| &r.0)).collect();
        let union = if picked.is_empty() { PathData::default() } else { po::merge_regions(&picked) };
        // The merged shape takes the look of the front-most object over the first region, or (for an
@@ -269,11 +273,26 @@ fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
                        }
                    }
                }
-            } else if !picked.iter().any(|r| r.sources.contains(&i)) {
-                new_nodes.push(d.reid(leaf));
            } else {
-                let rest = po::boolean(&sh.path, sh.rule, &union, FillRule::NonZero, po::BoolOp::Difference);
-                if !rest.is_empty() {
+                // A shape loses the regions deleted or merged, then the edges deleted (each one on
+                // its outline, shared edges from every shape along them).
+                let in_union = picked.iter().any(|r| r.sources.contains(&i));
+                let mut rest = if in_union {
+                    po::boolean(&sh.path, sh.rule, &union, FillRule::NonZero, po::BoolOp::Difference)
+                } else {
+                    b::node_outline(leaf).map_or_else(|| sh.path.clone(), |o| o.0)
+                };
+                let fill_closes = !leaf.appearance.fill_paint().is_none();
+                let mut cut = false;
+                for piece in &cuts {
+                    if let Some(r) = po::cut_out(&rest, piece, fill_closes, cut_tol) {
+                        rest = r;
+                        cut = true;
+                    }
+                }
+                if !in_union && !cut {
+                    new_nodes.push(d.reid(leaf));
+                } else if !rest.is_empty() {
                    new_nodes.push(shape_node(d, rest, Some(leaf)));
                }
            }
@@ -288,9 +307,15 @@ fn sb_merge(s: &mut Session, p: &Value) -> Result<Value> {
        }
        let new_ids = replace_roots(d, &roots, new_nodes)?;
        sel.set(new_ids.iter().copied());
-        Ok((new_ids, merged_id, touched.regions.len(), touched.lines.len()))
+        Ok((new_ids, merged_id, touched))
    })?;
-    Ok(json!({ "ids": ids_json(&ids), "merged": merged.map(|m| m.0), "regions": regions, "lines": lines }))
+    Ok(json!({
+        "ids": ids_json(&ids),
+        "merged": merged.map(|m| m.0),
+        "regions": touched.regions.len(),
+        "lines": touched.lines.len(),
+        "edges": touched.edges.len(),
+    }))
 }

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

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

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

    /// Objects `roots` of `st`'s document with their resources, source artboard and layers.
@@ -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 }))
@@ -424,9 +424,15 @@ fn text_create(s: &mut Session, p: &Value) -> Result<Value> {

 /// The paragraph attributes new type gets (the Type tools, `text.create`): aligned to the start of
 /// each paragraph's direction (left, right for Hebrew and Arabic), Japanese punctuation composed
-/// with Line-end Punctuation Half Width. Imported text keeps its own.
+/// with Line-end Punctuation Half Width and Standard burasagari (as in Illustrator). Imported text
+/// keeps its own.
 pub(crate) fn new_type_para() -> vectorcraft_doc::ParaStyle {
-    vectorcraft_doc::ParaStyle { justify: vectorcraft_doc::Justify::Auto, mojikumi: vectorcraft_doc::Mojikumi::LineEndHalf, ..Default::default() }
+    vectorcraft_doc::ParaStyle {
+        justify: vectorcraft_doc::Justify::Auto,
+        mojikumi: vectorcraft_doc::Mojikumi::LineEndHalf,
+        burasagari: vectorcraft_doc::Burasagari::Standard,
+        ..Default::default()
+    }
 }

 /// The character style new type gets: `size`, `font`, `style` and `color` from `p`, else the
@@ -7,6 +7,7 @@ use std::sync::Arc;

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

 use super::edit::selected_roots;
 use super::*;
@@ -154,8 +155,24 @@ pub fn specs() -> Vec<CommandSpec> {
            has_doc,
            clear_guides
        ),
-        cmd!("guide.add", "Add Guide", [], None, "{vertical: bool, pos: pt (x for vertical, y for horizontal)} → {index}", has_doc, guide_add),
-        cmd!(query "guide.list", "Guides", [], None, "{} → [{index, vertical, pos, selected}…] the ruler guides", has_doc, guide_list),
+        cmd!(
+            "guide.add",
+            "Add Guide",
+            [],
+            None,
+            "{vertical: bool, pos: pt (x for vertical, y for horizontal), artboard?: index (an artboard guide: it runs across that artboard only and moves, is copied and is deleted with it; default a canvas guide, across the whole canvas)} → {index}",
+            has_doc,
+            guide_add
+        ),
+        cmd!(
+            query "guide.list",
+            "Guides",
+            [],
+            None,
+            "{} → [{index, vertical, pos, selected, artboard?: index (an artboard guide's)}…] the ruler guides",
+            has_doc,
+            guide_list
+        ),
        cmd!(
            "guide.select",
            "Select Guides",
@@ -481,8 +498,16 @@ fn clear_guides(s: &mut Session, _: &Value) -> Result<Value> {
 fn guide_add(s: &mut Session, p: &Value) -> Result<Value> {
    let pos = f64_req(p, "pos", "guide.add")?;
    let vertical = bool_or(p, "vertical", false);
+    let artboard = match p.get("artboard").filter(|v| !v.is_null()) {
+        Some(v) => {
+            let boards = &s.doc()?.doc.artboards;
+            let ab = v.as_u64().and_then(|i| boards.get(usize::try_from(i).ok()?)).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+            Some(ab.id)
+        }
+        None => None,
+    };
    let i = s.edit("New Guide", |d, _| {
-        d.guides.push(Guide { vertical, pos });
+        d.guides.push(Guide { artboard, ..Guide::new(vertical, pos) });
        Ok(d.guides.len() - 1)
    })?;
    Ok(json!({ "index": i }))
@@ -490,7 +515,13 @@ fn guide_add(s: &mut Session, p: &Value) -> Result<Value> {

 fn guide_list(s: &mut Session, _: &Value) -> Result<Value> {
    let st = s.doc()?;
-    let row = |(i, g): (usize, &Guide)| json!({ "index": i, "vertical": g.vertical, "pos": g.pos, "selected": st.selection.guides.contains(&i) });
+    let row = |(i, g): (usize, &Guide)| {
+        let mut r = json!({ "index": i, "vertical": g.vertical, "pos": g.pos, "selected": st.selection.guides.contains(&i) });
+        if let Some(ab) = st.doc.artboards.iter().position(|a| Some(a.id) == g.artboard) {
+            r["artboard"] = json!(ab);
+        }
+        r
+    };
    Ok(Value::Array(st.doc.guides.iter().enumerate().map(row).collect()))
 }

@@ -533,11 +564,7 @@ pub(crate) fn guide_remove(s: &mut Session, p: &Value) -> Result<Value> {
    }
    let label = if gone.len() == 1 { "Delete Guide" } else { "Delete Guides" };
    s.edit(label, |d, sel| {
-        let kept = |i: &usize| !gone.contains(i);
-        // The guides left selected keep their place among the rest.
-        let left: Vec<usize> = sel.guides.iter().filter(|i| kept(i)).map(|i| i - gone.iter().filter(|g| *g < i).count()).collect();
-        d.guides = std::mem::take(&mut d.guides).into_iter().enumerate().filter(|(i, _)| kept(i)).map(|(_, g)| g).collect();
-        sel.set_guides(left);
+        d.retain_guides(sel, |i, _| !gone.contains(&i));
        Ok(())
    })?;
    Ok(json!({ "count": gone.len() }))
@@ -565,7 +592,7 @@ pub(crate) fn guide_move(s: &mut Session, p: &Value) -> Result<Value> {
        let mut copies = vec![];
        for &i in &moving {
            let Some(g) = d.guides.get_mut(i) else { continue };
-            let moved = Guide { vertical: g.vertical, pos: g.pos + if g.vertical { dx } else { dy } };
+            let moved = g.moved(Vec2::new(dx, dy));
            if copy {
                copies.push(moved);
            } else {
@@ -670,34 +670,13 @@ fn convert_anchor(s: &mut Session, p: &Value) -> Result<Value> {
    s.edit("Convert Anchor Point", |d, _| {
        let path = path_mut(d, id)?;
        let sp = path.subpaths.get_mut(si).ok_or_else(|| EngineError::Other("no such subpath".into()))?;
-        let n = sp.anchors.len();
-        if ai >= n {
-            return Err(EngineError::Other("no such anchor".into()));
-        }
-        let prev = if ai > 0 || sp.closed { Some(sp.anchors[(ai + n - 1) % n].p) } else { None };
-        let next = if ai + 1 < n || sp.closed { Some(sp.anchors[(ai + 1) % n].p) } else { None };
-        let a = &mut sp.anchors[ai];
-        if !smooth {
-            a.retract();
-            return Ok(());
-        }
+        let a = sp.anchors.get_mut(ai).ok_or_else(|| EngineError::Other("no such anchor".into()))?;
        match target {
-            Some(t) if t.distance(a.p) > 1e-9 => {
-                a.h_out = t;
-                a.h_in = a.p - (t - a.p);
-                a.kind = AnchorKind::Smooth;
-            }
+            _ if !smooth => a.retract(),
+            Some(t) if t.distance(a.p) > 1e-9 => *a = Anchor::smooth(a.p, t),
            Some(_) => a.retract(),
            None => {
-                let (pp, nn) = (prev.unwrap_or(a.p), next.unwrap_or(a.p));
-                let dir = nn - pp;
-                let l = dir.hypot();
-                if l > 1e-9 {
-                    let u = dir / l;
-                    a.h_in = a.p - u * (a.p.distance(pp) / 3.0);
-                    a.h_out = a.p + u * (a.p.distance(nn) / 3.0);
-                    a.kind = AnchorKind::Smooth;
-                }
+                sp.smooth_anchor(ai);
            }
        }
        Ok(())
@@ -767,30 +746,13 @@ fn split(s: &mut Session, p: &Value) -> Result<Value> {
            }
            _ => return Err(EngineError::Other("no such segment".into())),
        };
+        let mut pieces = sp.cut_at(&std::collections::BTreeSet::from([k]));
        if sp.closed {
-            sp.anchors.rotate_left(k);
-            let mut last = sp.anchors[0];
-            last.h_out = last.p;
-            sp.anchors[0].h_in = sp.anchors[0].p;
-            last.kind = AnchorKind::Corner;
-            sp.anchors[0].kind = AnchorKind::Corner;
-            sp.anchors.push(last);
-            sp.closed = false;
-            path.subpaths[si] = sp;
+            path.subpaths[si] = pieces.pop().ok_or_else(|| EngineError::Other("no such anchor".into()))?;
            sel.set([id]);
            return Ok(vec![id]);
        }
-        let n = sp.anchors.len();
-        if k == 0 || k + 1 >= n {
-            return Err(EngineError::Other("cannot split an open path at its end point".into()));
-        }
-        let mut left = SubPath::new(sp.anchors[..=k].to_vec(), false);
-        let mut right = SubPath::new(sp.anchors[k..].to_vec(), false);
-        let lp = left.anchors[k].p;
-        left.anchors[k].h_out = lp;
-        left.anchors[k].kind = AnchorKind::Corner;
-        right.anchors[0].h_in = lp;
-        right.anchors[0].kind = AnchorKind::Corner;
+        let [left, right] = <[SubPath; 2]>::try_from(pieces).map_err(|_| EngineError::Other("cannot split an open path at its end point".into()))?;
        if path.subpaths.len() == 1 {
            path.subpaths[0] = left;
            let node = sibling_with(d, id, PathData::single(right))?;
@@ -5,7 +5,7 @@ use std::sync::Arc;

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

 use super::clipboard::SwatchChoices;
 use super::*;
@@ -39,14 +39,14 @@ pub fn specs() -> Vec<CommandSpec> {
        ),
        cmd!("edit.undo", "Undo", ["Edit"], Some("Cmd+Z"), "{}", can_undo, undo),
        cmd!("edit.redo", "Redo", ["Edit"], Some("Cmd+Shift+Z"), "{}", can_redo, redo),
-        cmd!("edit.cut", "Cut", ["Edit"], Some("Cmd+X"), "{}", has_selection, cut),
-        cmd!("edit.copy", "Copy", ["Edit"], Some("Cmd+C"), "{}", has_selection, copy),
+        cmd!("edit.cut", "Cut", ["Edit"], Some("Cmd+X"), "{} (the Artboard tool chosen: artboard.cut)", has_selection_or_artboard_tool, cut),
+        cmd!("edit.copy", "Copy", ["Edit"], Some("Cmd+C"), "{} (the Artboard tool chosen: artboard.copy)", has_selection_or_artboard_tool, copy),
        cmd!(
            "edit.paste",
            "Paste",
            ["Edit"],
            Some("Cmd+V"),
-            "{center?: [x, y], dx?, dy?, swatchConflict?} paste centred on `center` (the app passes the view centre), else offset by dx/dy (default: the Paste Offset preference). Pasting brings the image blobs, symbols, patterns, global and spot swatches (with the tint swatches of the tints used), gradient swatches, graphic styles, character and paragraph styles and brushes the objects use; one of the same name that differs comes in renamed. swatchConflict, for a swatch whose name the document gives another colour (clipboard.conflicts): \"merge\" (default: the objects take the document's swatch) | \"add\" (the pasted swatch comes in renamed) | {name: \"merge\"|\"add\"}. With Paste Remembers Layers on (layer.pasteRemembersLayers), objects go back into the layers they came from (by name; made when missing) → {ids, added: resources added, merged: conflicts merged, renamed: [{kind, from, to}]}",
+            "{center?: [x, y], dx?, dy?, swatchConflict?} paste centred on `center` (the app passes the view centre), else offset by dx/dy (default: the Paste Offset preference). Pasting brings the image blobs, symbols, patterns, global and spot swatches (with the tint swatches of the tints used), gradient swatches, graphic styles, character and paragraph styles and brushes the objects use; one of the same name that differs comes in renamed. swatchConflict, for a swatch whose name the document gives another colour (clipboard.conflicts): \"merge\" (default: the objects take the document's swatch) | \"add\" (the pasted swatch comes in renamed) | {name: \"merge\"|\"add\"}. With Paste Remembers Layers on (layer.pasteRemembersLayers), objects go back into the layers they came from (by name; made when missing). An artboard copied with artboard.copy comes with its art, right of the last artboard (the other paste commands but Paste on All Artboards: where it was), its art back in the layers it came from → {ids, artboard: the new artboard's index or null, added: resources added, merged: conflicts merged, renamed: [{kind, from, to}]}",
            has_clipboard,
            |s, p| paste(s, p, PasteMode::Offset)
        ),
@@ -237,12 +237,19 @@ pub(crate) fn roots_of(doc: &Document, ids: Vec<NodeId>) -> Vec<NodeId> {
 }

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

 fn cut(s: &mut Session, p: &Value) -> Result<Value> {
+    if s.tool_id() == "artboard" {
+        return super::panelcmds::artboard_copy(s, &json!({}), true);
+    }
    copy(s, p)?;
    clear(s, &json!({}))
 }
@@ -308,8 +315,16 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
    let st = s.doc()?;
    let same_doc = clip.source_doc == Some(st.uid);
    let parent = st.insertion_parent();
-    // Paste Remembers Layers (not while isolating a group: pastes stay in it).
-    let remember = st.doc.paste_remembers_layers && parent.is_some_and(|p| st.doc.node(p).is_some_and(Node::is_layer));
+    // A copied artboard comes back with its art: right of the last artboard, or where it was
+    // (Paste in Place, in Front, in Back). Paste on All Artboards pastes only the art.
+    let board = clip
+        .artboard
+        .as_ref()
+        .filter(|_| mode != PasteMode::AllArtboards)
+        .map(|a| (a, if mode == PasteMode::Offset { super::panelcmds::beside_artboards(&st.doc, a.rect) } else { Vec2::ZERO }));
+    // Paste Remembers Layers (not while isolating a group: pastes stay in it); an artboard's art
+    // always goes back into its layers.
+    let remember = (st.doc.paste_remembers_layers || board.is_some()) && parent.is_some_and(|p| st.doc.node(p).is_some_and(Node::is_layer));
    // Front/back: relative to the selection (top-most / bottom-most selected object); with
    // nothing selected, the top / bottom of the current layer.
    let anchor = match mode {
@@ -320,19 +335,21 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
        }
        _ => None,
    };
-    let placements: Vec<Affine> = match mode {
-        PasteMode::Offset => vec![match point_param(p, "center") {
+    let placements: Vec<Affine> = match (mode, board) {
+        (_, Some((_, dv))) => vec![Affine::translate(dv)],
+        (PasteMode::Offset, None) => vec![match point_param(p, "center") {
            Some(c) => clip.bounds().map_or(Affine::IDENTITY, |b| Affine::translate(c - b.center())),
            None => Affine::translate((f64_or(p, "dx", off), f64_or(p, "dy", off))),
        }],
-        PasteMode::AllArtboards => {
+        (PasteMode::AllArtboards, None) => {
            let src = clip.source_artboard.or_else(|| st.doc.artboards.first().map(|a| a.rect)).map(|r| r.origin()).unwrap_or_default();
            st.doc.artboards.iter().map(|a| Affine::translate(a.rect.origin() - src)).collect()
        }
        _ => vec![Affine::IDENTITY],
    };
-    let (ids, imported) = s.edit(mode.label(), |d, sel| {
+    let (ids, imported, artboard) = s.edit(mode.label(), |d, sel| {
        let imported = clip.import_into(d, choices, same_doc);
+        let artboard = board.map(|(a, dv)| super::panelcmds::push_artboard_copy(d, a, a.rect + dv));
        let mut layers: BTreeMap<&str, NodeId> = BTreeMap::new();
        // Objects pasted into each parent so far (keeps their order in front and back pastes).
        let mut placed: BTreeMap<Option<NodeId>, usize> = BTreeMap::new();
@@ -364,10 +381,15 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
            }
        }
        sel.set(new_ids.iter().copied());
-        Ok((new_ids, imported))
+        Ok((new_ids, imported, artboard))
    })?;
+    // The Artboard tool takes the pasted artboard.
+    if let Some(i) = artboard.filter(|_| s.tool_id() == "artboard") {
+        s.set_tool_option("active", &json!(i));
+    }
    Ok(json!({
        "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>(),
+        "artboard": artboard,
        "added": imported.added,
        "merged": imported.merged,
        "renamed": imported.renamed,
@@ -92,6 +92,22 @@ fn postscript_ai_files_and_garbage() {
    assert_eq!((&r["format"], &r["restored"]), (&json!("ai"), &json!(false)), "{r}");
    assert_eq!(s.doc().unwrap().path, None);
    assert_eq!(objects(&s), 1);
+    // Illustrator's groups come in as groups, nested as they were.
+    let ai = b"%!PS-Adobe-3.0
+%%Creator: Adobe Illustrator(R) 8.0
+%%BoundingBox: 0 0 100 100
+%%EndComments
+               /u {} def /U {} def /L {lineto} def /f {closepath fill} def
+               u 0 0 moveto 9 0 L 9 9 L f u 20 0 moveto 29 0 L 29 9 L f 40 0 moveto 49 0 L 49 9 L f U U
+showpage
+%%EOF
+";
+    open(&mut s, "groups.ai", ai).unwrap();
+    let d = s.doc().unwrap().doc.clone();
+    let outer = &d.layers[0].children().unwrap()[0];
+    let inner = outer.children().map(|c| (c.len(), c[1].children().map(Vec::len))).unwrap();
+    assert!(matches!(outer.kind, vectorcraft_doc::NodeKind::Group { clip: false, .. }), "{:?}", outer.kind);
+    assert_eq!(inner, (2, Some(2)));
    // A .ait one opens as a new untitled document.
    let r = open(&mut s, "legacy.ait", ps).unwrap();
    assert!(r["title"].as_str().unwrap().starts_with("Untitled"), "{r}");
@@ -735,14 +735,16 @@ fn artboard_new(s: &mut Session, p: &Value) -> Result<Value> {

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

 use std::sync::Arc;
@@ -115,6 +115,15 @@ pub fn specs() -> Vec<CommandSpec> {
            has_image,
            crop_image
        ),
+        cmd!(
+            "object.maskImage",
+            "Mask",
+            [],
+            None,
+            "{} clip the selected image with a rectangle around it (its own outline, rotated with it) and select that clipping path, whose handles then crop it; one undo step → {id: the clip group, path: the clipping path}",
+            has_image,
+            mask_image
+        ),
        cmd!(
            "object.createTrimMarks",
            "Create Trim Marks",
@@ -585,6 +594,36 @@ fn crop_image(s: &mut Session, p: &Value) -> Result<Value> {
    Ok(json!({ "id": id.0, "width": w, "height": h }))
 }

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

 impl Session {
@@ -769,8 +808,13 @@ fn rearrange_artboards(s: &mut Session, p: &Value) -> Result<Value> {
                }
            }
        }
+        let mut moved = vec![];
        for (a, dl) in d.artboards.iter_mut().zip(&deltas) {
            a.rect = a.rect + *dl;
+            moved.push((a.id, *dl));
+        }
+        for (id, dl) in moved {
+            d.move_artboard_guides(id, dl);
        }
        Ok(())
    })?;
@@ -144,6 +144,10 @@ pub fn has_selection(s: &Session) -> std::result::Result<(), String> {
    let st = s.active().ok_or("no document open")?;
    if st.selection.is_empty() { Err("nothing selected".into()) } else { Ok(()) }
 }
+/// Objects are selected, or the Artboard tool is chosen (Copy and Cut take its artboard).
+pub fn has_selection_or_artboard_tool(s: &Session) -> std::result::Result<(), String> {
+    if s.tool_id() == "artboard" { has_doc(s) } else { has_selection(s) }
+}
 /// Objects or ruler guides are selected (what Delete and the arrow keys act on).
 pub fn has_selection_or_guides(s: &Session) -> std::result::Result<(), String> {
    let st = s.active().ok_or("no document open")?;
@@ -1038,6 +1038,9 @@ fn set_live_shape(s: &mut Session, p: &Value) -> Result<Value> {
    s.edit("Live Shape", |d, sel| {
        for id in &ids {
            let Some(NodeKind::Path { path, live: Some(live), .. }) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
+            // Radii are document lengths and corners circular, also on a rectangle from a file
+            // that kept an uneven scale in its transform (#442).
+            live.fold_scale();
            let partial = sel.anchors.get_mut(id);
            let picked = corners.unwrap_or_else(|| live.picked_corners(partial.as_deref()));
            let (layout, selected) = (live.anchor_corners(), partial.as_deref().map(|a| live.corners_of(a)));
@@ -1,11 +1,12 @@
-//! Commands the panels need beyond the core set: artboard reorder/duplicate and the advanced
+//! Commands the panels need beyond the core set: artboard reorder, duplicate, copy and cut, and the advanced
 //! Character/Paragraph attributes.

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

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

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

-fn artboard_duplicate(s: &mut Session, p: &Value) -> Result<Value> {
-    let i = p.get("index").and_then(Value::as_u64).unwrap_or(0) as usize;
-    let index = s.edit("Duplicate Artboard", |d, _| {
-        let src = d.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-        let right = d.artboards.iter().map(|a| a.rect.x1).fold(f64::MIN, f64::max);
-        let dx = right + 20.0 - src.rect.x0;
-        Ok(push_artboard_copy(d, &src, vectorcraft_geom::Rect::new(src.rect.x0 + dx, src.rect.y0, src.rect.x1 + dx, src.rect.y1)))
-    })?;
-    Ok(json!({"index": index}))
+/// The artboard (`index`) and whether its art comes along (`art`) for the artboard copy
+/// commands: by default the Artboard tool's artboard and its Move/Copy Artwork with Artboard option.
+fn board_and_art(s: &Session, p: &Value) -> (usize, bool) {
+    let t = s.tool_options_of("artboard");
+    let i = p.get("index").and_then(Value::as_u64).or_else(|| t["active"].as_u64()).unwrap_or(0) as usize;
+    (i, bool_or(p, "art", t["moveArt"].as_bool().unwrap_or(true)))
 }

-/// Add a copy of artboard `src` at `rect`, named `<name> copy` (`<name> copy 2`… when taken),
-/// with an id of its own → its index.
-pub(crate) fn push_artboard_copy(d: &mut vectorcraft_doc::Document, src: &vectorcraft_doc::Artboard, rect: vectorcraft_geom::Rect) -> usize {
+/// The art that goes with artboard `i` when `art`: the objects fully inside it (locked and hidden
+/// ones only with prefs moveLockedWithArtboard), in paint order.
+pub(crate) fn artboard_art(s: &Session, i: usize, art: bool) -> Result<Vec<NodeId>> {
+    let d = &s.doc()?.doc;
+    let rect = d.artboards.get(i).map(|a| a.rect).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+    Ok(if art { d.art_on_artboard(rect, s.prefs.move_locked_with_artboard) } else { vec![] })
+}
+
+/// How far a copy of `rect` moves to sit right of the last artboard (Duplicate Artboards, Paste).
+pub(crate) fn beside_artboards(d: &vectorcraft_doc::Document, rect: Rect) -> Vec2 {
+    let right = d.artboards.iter().map(|a| a.rect.x1).fold(f64::MIN, f64::max);
+    Vec2::new(right + 20.0 - rect.x0, 0.0)
+}
+
+fn artboard_duplicate(s: &mut Session, p: &Value) -> Result<Value> {
+    let (i, art) = board_and_art(s, p);
+    let art = artboard_art(s, i, art)?;
+    let scale_strokes = s.prefs.scale_strokes;
+    let (index, ids) = s.edit("Duplicate Artboard", |d, _| {
+        let dv = d.artboards.get(i).map(|a| beside_artboards(d, a.rect)).unwrap_or_default();
+        copy_artboard(d, i, dv, &art, scale_strokes)
+    })?;
+    Ok(json!({"index": index, "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>()}))
+}
+
+/// Artboard Copy / Cut: the artboard and its art onto the clipboard (pasting brings both); a cut
+/// then deletes them.
+pub(crate) fn artboard_copy(s: &mut Session, p: &Value, cut: bool) -> Result<Value> {
+    let (i, art) = board_and_art(s, p);
+    let art = artboard_art(s, i, art)?;
+    let st = s.doc()?;
+    if cut && st.doc.artboards.len() <= 1 {
+        return Err(EngineError::Other("a document needs at least one artboard".into()));
+    }
+    let board = st.doc.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+    let clip = Clipboard { source_artboard: Some(board.rect), artboard: Some(board), ..Clipboard::copy(st, &art) };
+    let copied = clip.nodes.len();
+    if cut {
+        s.edit("Cut Artboard", |d, sel| {
+            if i >= d.artboards.len() {
+                return Err(EngineError::Other("no such artboard".into()));
+            }
+            // Its guides go with it.
+            let gone = d.artboards.remove(i).id;
+            d.retain_guides(sel, |_, g| g.artboard != Some(gone));
+            for id in &art {
+                // Always there: none of the art is inside another of it.
+                let _ = d.remove(*id);
+            }
+            sel.prune(d);
+            Ok(())
+        })?;
+        if s.tool_id() == "artboard" {
+            s.set_tool_option("active", &json!(i.saturating_sub(1)));
+        }
+    }
+    s.clipboard = clip;
+    Ok(json!({"copied": copied}))
+}
+
+/// Add a copy of artboard `i` moved by `dv`, with copies of its guides and of its `art` (each just
+/// above its original) moved along → (the copy's index, the art's copies). Duplicate Artboards and
+/// Alt-drag.
+pub(crate) fn copy_artboard(
+    d: &mut vectorcraft_doc::Document,
+    i: usize,
+    dv: Vec2,
+    art: &[NodeId],
+    scale_strokes: bool,
+) -> Result<(usize, Vec<NodeId>)> {
+    let src = d.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+    let index = push_artboard_copy(d, &src, src.rect + dv);
+    // Its guides come along.
+    if let Some(id) = d.artboards.get(index).map(|a| a.id) {
+        d.copy_artboard_guides(src.id, id, dv);
+    }
+    let mut copies = Vec::with_capacity(art.len());
+    for id in art {
+        let (Some((parent, at, _)), Some(n)) = (d.position(*id), d.node(*id).cloned()) else { continue };
+        let mut c = d.reid(&n);
+        c.transform(Affine::translate(dv), scale_strokes);
+        copies.push(d.insert(parent, at + 1, c)?);
+    }
+    Ok((index, copies))
+}
+
+/// Add a copy of artboard `src` at `rect`, with an id of its own and its name, or `<name> copy`
+/// (`<name> copy 2`…) when that is taken → its index.
+pub(crate) fn push_artboard_copy(d: &mut vectorcraft_doc::Document, src: &vectorcraft_doc::Artboard, rect: Rect) -> usize {
    let mut a = src.clone();
    a.id = d.artboards.iter().map(|a| a.id).max().unwrap_or(0).saturating_add(1);
    let taken = |name: &str| d.artboards.iter().any(|a| a.name == name);
-    a.name = std::iter::once(format!("{} copy", src.name))
+    a.name = [src.name.clone(), format!("{} copy", src.name)]
+        .into_iter()
        .chain((2u64..).map(|i| format!("{} copy {i}", src.name)))
        .find(|name| !taken(name))
        .unwrap_or_default();
@@ -115,6 +218,7 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
        "direction",
        "leadingModel",
        "charAlign",
+        "burasagari",
    ];
    if !keys.iter().any(|k| p.get(*k).is_some()) {
        return Err(bad(C, "nothing to change"));
@@ -146,6 +250,15 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
            _ => return Err(bad(C, "`leadingModel` must be \"romanBaseline\" or \"emBoxTop\"")),
        }),
    };
+    let burasagari = match p.get("burasagari") {
+        None => None,
+        Some(v) => Some(match v.as_str() {
+            Some("none") => vectorcraft_doc::Burasagari::None,
+            Some("standard") => vectorcraft_doc::Burasagari::Standard,
+            Some("forced") => vectorcraft_doc::Burasagari::Forced,
+            _ => return Err(bad(C, "`burasagari` must be \"none\", \"standard\" or \"forced\"")),
+        }),
+    };
    s.edit("Character", |d, _| {
        for id in &ids {
            let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
@@ -213,6 +326,9 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
            if let Some(v) = leading_model {
                para.leading_model = v;
            }
+            if let Some(v) = burasagari {
+                para.burasagari = v;
+            }
            super::typecmd::refresh_bounds(t);
        }
        Ok(())
@@ -4,7 +4,7 @@ use std::collections::BTreeSet;

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

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

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

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

 fn cut_at_anchors(s: &mut Session, _: &Value) -> Result<Value> {
-    let sel = s.doc()?.selection.anchors.clone();
-    s.edit("Cut Path", |d, _| {
-        for (id, set) in &sel {
-            let path = path_mut(d, *id)?;
-            let mut out = vec![];
-            for (si, sp) in path.subpaths.iter().enumerate() {
-                let cuts: Vec<usize> = set.iter().filter(|(s, _)| *s == si).map(|(_, a)| *a).collect();
-                if cuts.is_empty() {
-                    out.push(sp.clone());
-                    continue;
-                }
-                let mut anchors = sp.anchors.clone();
-                if sp.closed {
-                    anchors.rotate_left(cuts[0]);
-                    anchors.push(anchors[0]);
-                }
-                let base = if sp.closed { cuts[0] } else { 0 };
-                let n = sp.anchors.len();
-                let rel: Vec<usize> = cuts.iter().map(|c| (c + n - base) % n).collect();
-                let mut cur = vec![];
-                for (i, a) in anchors.iter().enumerate() {
-                    cur.push(*a);
-                    if rel.contains(&(i % n)) && cur.len() > 1 {
-                        out.push(SubPath::new(std::mem::take(&mut cur), false));
-                        cur.push(*a);
-                    }
-                }
-                if cur.len() > 1 {
-                    out.push(SubPath::new(cur, false));
-                }
-            }
-            path.subpaths = out;
+    const C: &str = "path.cutAtAnchors";
+    let st = s.doc()?;
+    // Each selected path's subpaths cut at its selected anchors, those that cut anything.
+    let mut cuts: Vec<(NodeId, Vec<SubPath>, Vec<bool>)> = vec![];
+    for (id, set) in &st.selection.anchors {
+        let Some(pd) = st.doc.node(*id).and_then(|n| n.path_data()) else { continue };
+        let (mut subs, mut starts) = (vec![], vec![]);
+        for (si, sp) in pd.subpaths.iter().enumerate() {
+            let at: BTreeSet<usize> = set.iter().filter(|(s, _)| *s == si).map(|(_, a)| *a).collect();
+            let pieces = sp.cut_at(&at);
+            // The pieces that start at a cut: every piece of an opened closed subpath, all but the
+            // first of an open one.
+            starts.extend(pieces.iter().enumerate().map(|(k, piece)| if sp.closed { !piece.closed } else { k > 0 }));
+            subs.extend(pieces);
        }
-        Ok(())
+        if starts.contains(&true) {
+            cuts.push((*id, subs, starts));
+        }
+    }
+    if cuts.is_empty() {
+        return Err(bad(C, "direct-select anchor points to cut at (not the end points of open paths)"));
+    }
+    let ids = s.edit("Cut Path", |d, sel| {
+        let (mut all, mut picked) = (vec![], vec![]);
+        for (id, subs, starts) in cuts {
+            // A path of one subpath becomes one path per piece (the first keeps the id); the
+            // pieces of a compound shape stay subpaths of it.
+            if d.node(id).and_then(|n| n.path_data()).is_some_and(|pd| pd.subpaths.len() == 1) {
+                let ids = super::draw2::replace_with_pieces(d, id, subs.into_iter().map(PathData::single).collect())?;
+                picked.extend(ids.iter().zip(&starts).filter(|(_, s)| **s).map(|(id, _)| (*id, (0, 0))));
+                all.extend(ids);
+            } else {
+                path_mut(d, id)?.subpaths = subs;
+                picked.extend(starts.iter().enumerate().filter(|(_, s)| **s).map(|(si, _)| (id, (si, 0))));
+                all.push(id);
+            }
+        }
+        // Each cut leaves one of its two coincident anchors selected, so a drag pulls the ends apart.
+        sel.clear();
+        for (id, a) in picked {
+            sel.add(id);
+            sel.anchors.entry(id).or_default().insert(a);
+        }
+        Ok(all)
    })?;
-    ok()
+    Ok(super::draw2::ids_json(&ids))
 }
@@ -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.
@@ -413,6 +414,36 @@ fn reshape_area(s: &mut Session, p: &Value) -> Result<Value> {
 mod area_tests {
    use super::*;

+    #[test]
+    fn burasagari_is_set_per_paragraph_and_saved_only_when_on() {
+        use vectorcraft_doc::Burasagari;
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
+        let id = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "雅楽、笙。", "area": {"width": 200, "height": 100}})).unwrap()["id"]
+            .as_u64()
+            .unwrap();
+        let para = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
+            NodeKind::Text(t) => t.para.clone(),
+            _ => panic!("text"),
+        };
+        // New type: Standard, as in Illustrator.
+        assert_eq!(para(&s).burasagari, Burasagari::Standard);
+        s.execute("select.set", &json!({"ids": [id]})).unwrap();
+        assert!(s.execute("text.setFormat", &json!({"burasagari": "strong"})).is_err());
+        s.execute("text.setFormat", &json!({"burasagari": "forced"})).unwrap();
+        assert_eq!(para(&s).burasagari, Burasagari::Forced);
+        assert_eq!(serde_json::to_value(para(&s)).unwrap()["burasagari"], "forced");
+        s.execute("text.setFormat", &json!({"burasagari": "none"})).unwrap();
+        assert_eq!(para(&s).burasagari, Burasagari::None);
+        // Saved only when on; documents from before it read as None.
+        assert!(serde_json::to_value(para(&s)).unwrap().get("burasagari").is_none());
+        s.execute("edit.undo", &json!({})).unwrap();
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(para(&s).burasagari, Burasagari::Standard);
+        let old: vectorcraft_doc::ParaStyle = serde_json::from_value(json!({"justify": "Left"})).unwrap();
+        assert_eq!(old.burasagari, Burasagari::None);
+    }
+
    #[test]
    fn leading_model_is_set_per_paragraph_and_saved_only_when_top_to_top() {
        use vectorcraft_doc::LeadingModel;
@@ -371,35 +371,24 @@ fn sample_color(s: &mut Session, p: &Value) -> Result<Value> {
 fn artboard_move(s: &mut Session, p: &Value) -> Result<Value> {
    let i = p.get("index").and_then(Value::as_u64).ok_or_else(|| bad("artboard.move", "missing index"))? as usize;
    let dv = Vec2::new(f64_or(p, "dx", 0.0), f64_or(p, "dy", 0.0));
-    let move_art = bool_or(p, "moveArt", false);
-    let st = s.doc()?;
-    let rect = st.doc.artboards.get(i).map(|a| a.rect).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
-    let art = if move_art { st.doc.art_on_artboard(rect, s.prefs.move_locked_with_artboard) } else { vec![] };
+    let art = super::panelcmds::artboard_art(s, i, bool_or(p, "moveArt", false))?;
    let scale_strokes = s.prefs.scale_strokes;
    let copy = bool_or(p, "copy", false);
    let (index, moved) = s.edit(if copy { "Duplicate Artboard" } else { "Move Artboard" }, |d, _| {
-        let src = d.artboards.get(i).cloned().ok_or_else(|| EngineError::Other("no such artboard".into()))?;
        // A copy keeps the artboard (and its art) where they are and moves duplicates instead.
-        if !copy {
-            if let Some(a) = d.artboards.get_mut(i) {
-                a.rect = src.rect + dv;
-            }
-            for id in &art {
-                if let Some(n) = d.node_mut(*id) {
-                    n.transform(Affine::translate(dv), scale_strokes);
-                }
-            }
-            return Ok((i, art.clone()));
+        if copy {
+            return super::panelcmds::copy_artboard(d, i, dv, &art, scale_strokes);
        }
-        let index = super::panelcmds::push_artboard_copy(d, &src, src.rect + dv);
-        let mut copies = Vec::with_capacity(art.len());
+        let a = d.artboards.get_mut(i).ok_or_else(|| EngineError::Other("no such artboard".into()))?;
+        a.rect = a.rect + dv;
+        let id = a.id;
+        d.move_artboard_guides(id, dv);
        for id in &art {
-            let (Some((parent, at, _)), Some(n)) = (d.position(*id), d.node(*id).cloned()) else { continue };
-            let mut c = d.reid(&n);
-            c.transform(Affine::translate(dv), scale_strokes);
-            copies.push(d.insert(parent, at + 1, c)?);
+            if let Some(n) = d.node_mut(*id) {
+                n.transform(Affine::translate(dv), scale_strokes);
+            }
        }
-        Ok((index, copies))
+        Ok((i, art.clone()))
    })?;
    Ok(json!({ "index": index, "moved": moved.iter().map(|i| i.0).collect::<Vec<_>>() }))
 }
@@ -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
@@ -624,7 +626,7 @@ impl Default for Prefs {
            grid_subdivisions: 8,
            grids_in_back: true,
            show_pixel_grid: true,
-            smart_guide_color: s("#ff4af0"),
+            smart_guide_color: s("#ff3dfc"),
            alignment_guides: true,
            object_highlighting: true,
            transform_tools_guides: true,
@@ -774,6 +776,8 @@ pub struct Session {
    pub(crate) liquify_stroke: Option<Box<cmd::distortcmds::LiquifyStroke>>,
    /// A press on the Plane Switching Widget is under way: its drag and release are the widget's.
    pub(crate) plane_widget_press: bool,
+    /// A guide being dragged out of a ruler ([`Session::ruler_guide`]).
+    pub(crate) ruler_guide: Option<vectorcraft_tools::rulerguide::NewGuide>,
 }

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

@@ -320,6 +320,69 @@ fn shape_builder_tool_alt_deletes_line_pieces() {
    assert_eq!(layer_children(&s), 3, "square + the line's two loose ends");
 }

+/// Red square A (0..100) and blue square B (50..150 both ways), overlapping at a corner, selected.
+fn corner(s: &mut Session) -> (NodeId, NodeId) {
+    let a = rect(s, 0.0, 0.0, 100.0, 100.0);
+    let b = rect(s, 50.0, 50.0, 100.0, 100.0);
+    set_fill(s, a, Color::rgb(1.0, 0.0, 0.0));
+    set_fill(s, b, Color::rgb(0.0, 0.0, 1.0));
+    s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
+    (a, b)
+}
+
+/// (closed, anchors, length) of each of `ids`.
+fn shapes_of(s: &Session, ids: &[NodeId]) -> Vec<(bool, usize, f64)> {
+    ids.iter()
+        .map(|i| {
+            let (p, _) = outline(&node(s, *i));
+            (p.is_closed(), p.anchor_count(), (p.length() * 1e6).round() / 1e6)
+        })
+        .collect()
+}
+
+#[test]
+fn shape_builder_erase_click_on_an_edge_opens_its_path() {
+    let mut s = session();
+    corner(&mut s);
+    let r = s.execute("shapeBuilder.regions", &json!({})).unwrap();
+    assert_eq!(r["edges"].as_array().unwrap().len(), 4, "each outline cut in two where the other crosses it: {r}");
+    // A's side inside B (1 pt off it).
+    let r = s.execute("shapeBuilder.merge", &json!({"points": [[101, 75]], "erase": true})).unwrap();
+    assert_eq!((r["regions"].as_u64(), r["lines"].as_u64(), r["edges"].as_u64()), (Some(0), Some(0), Some(1)));
+    let out = ids(&r);
+    // A opens where B's outline crosses it and keeps its look; B is untouched.
+    assert_eq!(shapes_of(&s, &out), vec![(false, 5, 300.0), (true, 4, 400.0)]);
+    assert_eq!(node(&s, out[0]).appearance.fill_paint(), Paint::solid(Color::rgb(1.0, 0.0, 0.0)));
+    assert_eq!(s.journal.last().unwrap().0, "shapeBuilder.merge");
+    s.execute("edit.undo", &json!({})).unwrap();
+    let back: Vec<NodeId> = s.doc().unwrap().doc.children(s.doc().unwrap().doc.default_layer()).unwrap().iter().map(|n| n.id).collect();
+    assert_eq!(shapes_of(&s, &back), vec![(true, 4, 400.0); 2], "one undo step");
+}
+
+#[test]
+fn shape_builder_erase_drag_along_edges_deletes_each() {
+    let mut s = session();
+    corner(&mut s);
+    // Down A's side inside B, round the corner and along B's side inside A.
+    let r = s.execute("shapeBuilder.merge", &json!({"points": [[100, 75], [100, 50], [75, 50]], "erase": true})).unwrap();
+    assert_eq!((r["regions"].as_u64(), r["edges"].as_u64()), (Some(0), Some(2)));
+    assert_eq!(shapes_of(&s, &ids(&r)), vec![(false, 5, 300.0); 2]);
+}
+
+#[test]
+fn shape_builder_erase_drag_into_regions_deletes_them_not_the_edges_it_crosses() {
+    let mut s = session();
+    corner(&mut s);
+    let r = s.execute("shapeBuilder.merge", &json!({"points": [[25, 25], [75, 75]], "erase": true})).unwrap();
+    assert_eq!((r["regions"].as_u64(), r["edges"].as_u64()), (Some(2), Some(0)));
+    // A is gone; what is left of B stays closed and blue.
+    let out = ids(&r);
+    assert_eq!(out.len(), 1);
+    assert!((area(&s, out[0]) - 7500.0).abs() < 1e-6);
+    assert!(outline(&node(&s, out[0])).0.is_closed());
+    assert_eq!(node(&s, out[0]).appearance.fill_paint(), Paint::solid(Color::rgb(0.0, 0.0, 1.0)));
+}
+
 // ---------- Live Paint ----------

 fn live(s: &mut Session) -> NodeId {
@@ -534,3 +534,128 @@ fn remove_anchor_points_keeps_the_paths_closed() {
    let spec = find_command("path.removeAnchors").unwrap();
    assert_eq!(spec.menu, &["Object", "Path"][..]);
 }
+
+fn undo_steps(s: &Session) -> usize {
+    s.doc().unwrap().history.undo.len()
+}
+
+#[test]
+fn convert_anchors_turns_the_selected_anchors_corner_or_smooth() {
+    // The Control bar's convert buttons: one undo step each, other anchors left alone.
+    let mut s = session();
+    let made = s.execute("path.create", &json!({"anchors": [{"x": 100, "y": 200}, {"x": 200, "y": 100}, {"x": 300, "y": 200}]})).unwrap();
+    let id = NodeId(made["id"].as_u64().unwrap());
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1]]})).unwrap();
+    let undo = undo_steps(&s);
+    s.execute("path.convertAnchors", &json!({"to": "smooth"})).unwrap();
+    let a = path(&s, id).subpaths[0].anchors.clone();
+    assert_eq!(undo_steps(&s), undo + 1);
+    assert_eq!(a[1].kind, vectorcraft_geom::AnchorKind::Smooth);
+    let r = 100.0 * 2f64.sqrt() / 3.0;
+    assert!(near(a[1].h_in, Point::new(200.0 - r, 100.0)) && near(a[1].h_out, Point::new(200.0 + r, 100.0)), "{:?}", a[1]);
+    assert!(!a[0].has_out() && !a[2].has_in(), "the neighbours keep theirs");
+    // Smooth again keeps the handles; corner retracts them.
+    s.execute("path.setHandle", &json!({"id": id.0, "anchor": 1, "which": "out", "x": 260, "y": 100})).unwrap();
+    let h = path(&s, id).subpaths[0].anchors[1];
+    s.execute("path.convertAnchors", &json!({"to": "smooth"})).unwrap();
+    assert_eq!(path(&s, id).subpaths[0].anchors[1], h);
+    s.execute("path.convertAnchors", &json!({"to": "corner"})).unwrap();
+    let a = path(&s, id).subpaths[0].anchors[1];
+    assert!(!a.has_in() && !a.has_out(), "{a:?}");
+    // Anchors that are gone (a stale selection) are skipped; a bad `to` is refused.
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 99], [7, 0]]})).unwrap();
+    s.execute("path.convertAnchors", &json!({"to": "smooth"})).unwrap();
+    let undo = undo_steps(&s);
+    assert!(s.execute("path.convertAnchors", &json!({"to": "round"})).is_err());
+    assert_eq!(undo_steps(&s), undo);
+}
+
+#[test]
+fn cut_at_anchors_splits_paths_and_leaves_one_end_selected() {
+    // Cut Path at Selected Anchor Points: an open path becomes one path per piece, and one anchor
+    // of each cut stays selected, so dragging it pulls the path apart there.
+    let mut s = session();
+    let anchors = json!([{"x": 100, "y": 100}, {"x": 200, "y": 100, "in": [170, 80], "out": [230, 120]}, {"x": 300, "y": 100}, {"x": 400, "y": 100}]);
+    let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1], [0, 2]]})).unwrap();
+    let undo = undo_steps(&s);
+    let made = s.execute("path.cutAtAnchors", &json!({})).unwrap();
+    let ids: Vec<NodeId> = made["ids"].as_array().unwrap().iter().map(|v| NodeId(v.as_u64().unwrap())).collect();
+    assert_eq!(undo_steps(&s), undo + 1);
+    assert_eq!((ids.len(), ids[0]), (3, id));
+    let pieces: Vec<Vec<Point>> = ids.iter().map(|i| path(&s, *i).subpaths[0].anchors.iter().map(|a| a.p).collect()).collect();
+    let p = |x: f64| Point::new(x, 100.0);
+    assert_eq!(pieces, vec![vec![p(100.0), p(200.0)], vec![p(200.0), p(300.0)], vec![p(300.0), p(400.0)]]);
+    // The curve keeps its shape: each end keeps the handle on its own side only.
+    let (l, r) = (path(&s, ids[0]).subpaths[0].anchors[1], path(&s, ids[1]).subpaths[0].anchors[0]);
+    assert!(l.h_in == Point::new(170.0, 80.0) && !l.has_out() && r.h_out == Point::new(230.0, 120.0) && !r.has_in(), "{l:?} {r:?}");
+    let sel = s.doc().unwrap().selection.clone();
+    assert_eq!(sel.objects, vec![ids[1], ids[2]]);
+    assert!(sel.anchors.values().all(|a| a.iter().eq([&(0, 0)])), "{sel:?}");
+    s.execute("path.moveAnchors", &json!({"dx": 0, "dy": 50})).unwrap();
+    assert_eq!(path(&s, ids[0]).subpaths[0].anchors[1].p, p(200.0));
+    assert_eq!(path(&s, ids[1]).subpaths[0].anchors[0].p, Point::new(200.0, 150.0));
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(paths(&s).len(), 1);
+    // A closed path opens at the cut, its ends on top of each other.
+    let r = rect(&mut s, 500.0, 100.0, 100.0, 100.0);
+    s.execute("select.anchors", &json!({"id": r.0, "anchors": [[0, 2]]})).unwrap();
+    s.execute("path.cutAtAnchors", &json!({})).unwrap();
+    let sp = &path(&s, r).subpaths[0];
+    assert!(!sp.closed && sp.anchors.len() == 5 && sp.anchors[0].p == sp.anchors[4].p, "{sp:?}");
+    assert_eq!(s.doc().unwrap().selection.anchors[&r].iter().collect::<Vec<_>>(), [&(0, 0)]);
+    // Only the end points of an open path selected: nothing to cut.
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 0], [0, 3]]})).unwrap();
+    let undo = undo_steps(&s);
+    assert!(s.execute("path.cutAtAnchors", &json!({})).is_err());
+    assert_eq!(undo_steps(&s), undo);
+}
+
+#[test]
+fn pen_with_alt_moves_one_handle_and_converts_anchors() {
+    // Discord feedback: Alt held with the Pen moves a direction handle on its own (and works as
+    // the Anchor Point tool on a selected path's anchors), while a path is being drawn too.
+    let alt = Mods { alt: true, ..Mods::default() };
+    let v = view();
+    let mut s = session();
+    let anchors = json!([{"x": 100, "y": 200}, {"x": 200, "y": 100, "in": [150, 100], "out": [250, 100]}, {"x": 300, "y": 200}]);
+    let id = NodeId(s.execute("path.create", &json!({"anchors": anchors})).unwrap()["id"].as_u64().unwrap());
+    s.select_tool("pen", v).unwrap();
+    let gesture = |s: &mut Session, pts: &[(f64, f64)], m: Mods| {
+        let undo = undo_steps(s);
+        s.pointer(&PointerEvent::new(PointerKind::Down, pts[0].0, pts[0].1).with_mods(m), v).unwrap();
+        for &(x, y) in &pts[1..] {
+            s.pointer(&PointerEvent::new(PointerKind::Drag, x, y).with_mods(m), v).unwrap();
+        }
+        let l = pts[pts.len() - 1];
+        s.pointer(&PointerEvent::new(PointerKind::Up, l.0, l.1).with_mods(m), v).unwrap();
+        undo_steps(s) - undo
+    };
+    // Alt-drag the out handle: it moves alone, the in handle stays.
+    assert_eq!(gesture(&mut s, &[(250.0, 100.0), (260.0, 130.0), (275.0, 165.0)], alt), 1);
+    assert!(!s.in_interaction());
+    let a = path(&s, id).subpaths[0].anchors[1];
+    assert_eq!((a.h_in, a.h_out), (Point::new(150.0, 100.0), Point::new(275.0, 165.0)));
+    assert_eq!(paths(&s).len(), 1, "no new path or anchor");
+    // Alt-click the anchor: a corner. Alt-drag it: new symmetric handles.
+    assert_eq!(gesture(&mut s, &[(200.0, 100.0)], alt), 1);
+    let a = path(&s, id).subpaths[0].anchors[1];
+    assert!(!a.has_in() && !a.has_out(), "{a:?}");
+    gesture(&mut s, &[(200.0, 100.0), (220.0, 100.0), (240.0, 110.0)], alt);
+    let a = path(&s, id).subpaths[0].anchors[1];
+    assert_eq!((a.h_in, a.h_out), (Point::new(160.0, 90.0), Point::new(240.0, 110.0)));
+    assert_eq!(path(&s, id).subpaths[0].anchors.len(), 3);
+    // Drawing: place a smooth point, then Alt-drag its outgoing handle; the next click goes on
+    // drawing the same path.
+    s.execute("select.none", &json!({})).unwrap();
+    gesture(&mut s, &[(100.0, 400.0)], Mods::default());
+    gesture(&mut s, &[(200.0, 400.0), (250.0, 400.0)], Mods::default());
+    let new = *s.doc().unwrap().selection.objects.first().unwrap();
+    gesture(&mut s, &[(250.0, 400.0), (230.0, 350.0)], alt);
+    let a = path(&s, new).subpaths[0].anchors[1];
+    assert_eq!((a.h_in, a.h_out), (Point::new(150.0, 400.0), Point::new(230.0, 350.0)));
+    gesture(&mut s, &[(300.0, 450.0)], Mods::default());
+    assert_eq!(path(&s, new).subpaths[0].anchors.len(), 3);
+    assert_eq!(paths(&s).len(), 2);
+}
@@ -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));
 }

@@ -5,6 +5,7 @@ use std::collections::BTreeSet;

 use serde_json::{Value, json};
 use vectorcraft_doc::{AnchorRef, LiveShape, NodeKind};
+use vectorcraft_geom::Affine;
 use vectorcraft_geom::shapes::CornerKind;

 use super::*;
@@ -105,3 +106,47 @@ fn a_drag_previews_one_corner_and_commits_one_step() {
    assert_eq!(selected_anchors(&s, id), Some(anchors(&[2, 3])));
    assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
 }
+
+/// How far each corner's cut reaches along x and y (top-left, top-right, bottom-right,
+/// bottom-left) of a rectangle with four cut corners: equal for a circular arc.
+fn spans(s: &Session, id: NodeId) -> Vec<(f64, f64)> {
+    let NodeKind::Path { path, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("not a path") };
+    let a: Vec<_> = path.subpaths[0].anchors.iter().map(|a| a.p).collect();
+    assert_eq!(a.len(), 8, "four cut corners");
+    [(7, 0), (1, 2), (3, 4), (5, 6)].iter().map(|(i, j)| ((a[*j].x - a[*i].x).abs(), (a[*j].y - a[*i].y).abs())).collect()
+}
+
+fn assert_spans(s: &Session, id: NodeId, want: [f64; 4]) {
+    let got = spans(s, id);
+    let ok = got.iter().zip(want).all(|((x, y), r)| (x - r).abs() < 1e-9 && (y - r).abs() < 1e-9);
+    assert!(ok, "corners span {got:?}, want circles of radii {want:?}");
+}
+
+/// #442: on a rectangle that isn't square, every corner is the same circle, also past the limit
+/// and on a shape from a file that kept an uneven scale in its transform (before #291).
+#[test]
+fn corners_of_a_non_square_rectangle_are_alike_circles() {
+    let (mut s, id) = session();
+    run(&mut s, json!({"radius": 12}));
+    assert_spans(&s, id, [12.0; 4]);
+    // Past half the shorter side, every corner stops there.
+    run(&mut s, json!({"radius": 45}));
+    assert_spans(&s, id, [30.0; 4]);
+    // A 50 × 60 rectangle with 10 pt corners, saved stretched to 100 × 60: 20 × 10 ellipses.
+    {
+        let d = std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc);
+        let NodeKind::Path { path, live: Some(live), .. } = &mut d.node_mut(id).unwrap().kind else { panic!("not live") };
+        let xf = Affine::translate((10.0, 10.0)) * Affine::scale_non_uniform(2.0, 1.0);
+        *live = LiveShape::Rectangle { w: 50.0, h: 60.0, radii: [10.0; 4], kinds: Default::default(), xf };
+        *path = live.to_path();
+    }
+    assert_eq!(spans(&s, id)[0], (20.0, 10.0));
+    // Rounding one corner makes every corner a circle: the others of the mean radius.
+    run(&mut s, json!({"corners": [1], "radius": 12}));
+    let mean = 10.0 * 2f64.sqrt();
+    assert_spans(&s, id, [mean, 12.0, mean, mean]);
+    let b = s.doc().unwrap().doc.node(id).unwrap().geometric_bounds().unwrap();
+    assert!((b.x0 - 10.0).abs() < 1e-9 && (b.x1 - 110.0).abs() < 1e-9 && (b.y1 - 70.0).abs() < 1e-9, "same bounds: {b:?}");
+    run(&mut s, json!({"radius": 8}));
+    assert_spans(&s, id, [8.0; 4]);
+}
@@ -234,6 +234,30 @@ fn crop_image_disabled_without_image() {
    assert!(matches!(s.execute("object.cropImage", &json!({})), Err(EngineError::Disabled(..))));
 }

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

+/// #451: an artboard guide (`guide.add {artboard}`) runs across its artboard only, and is moved,
+/// copied and deleted with it; canvas guides stay put.
+#[test]
+fn artboard_guides_go_with_their_artboard() {
+    let mut s = session();
+    s.execute("artboard.new", &json!({"x": 900, "y": 0, "width": 400, "height": 300})).unwrap();
+    s.execute("guide.add", &json!({"vertical": true, "pos": 1000, "artboard": 1})).unwrap();
+    s.execute("guide.add", &json!({"vertical": false, "pos": 100})).unwrap();
+    let list = |s: &mut Session| s.execute("guide.list", &json!({})).unwrap();
+    assert_eq!(
+        list(&mut s),
+        json!([
+            {"index": 0, "vertical": true, "pos": 1000.0, "selected": false, "artboard": 1},
+            {"index": 1, "vertical": false, "pos": 100.0, "selected": false},
+        ])
+    );
+    let spans = |s: &Session| {
+        let d = &s.doc().unwrap().doc;
+        d.guides.iter().map(|g| d.guide_span(g)).collect::<Vec<_>>()
+    };
+    assert_eq!(spans(&s), [Some((0.0, 300.0)), None]);
+    for bad in [json!(5), json!("x"), json!(-1)] {
+        assert!(s.execute("guide.add", &json!({"vertical": true, "pos": 10, "artboard": bad})).is_err(), "{bad}");
+    }
+    // Moved, the artboard takes its guides along; in Artboard Options too, unless resized.
+    s.execute("artboard.move", &json!({"index": 1, "dx": 50, "dy": 20})).unwrap();
+    assert_eq!(guides(&s), [(true, 1050.0), (false, 100.0)]);
+    s.execute("artboard.setProps", &json!({"index": 1, "x": 960.5})).unwrap();
+    assert_eq!(guides(&s)[0], (true, 1060.5));
+    s.execute("artboard.setProps", &json!({"index": 1, "x": 900, "width": 500})).unwrap();
+    assert_eq!((guides(&s)[0], spans(&s)[0]), ((true, 1060.5), Some((20.0, 320.0))));
+    // Renumbered, it keeps them.
+    s.execute("artboard.reorder", &json!({"index": 1, "to": 0})).unwrap();
+    assert_eq!(list(&mut s)[0]["artboard"], 0);
+    // Duplicated (or Alt-dragged), the copy gets copies of them.
+    let dup = s.execute("artboard.duplicate", &json!({"index": 0})).unwrap()["index"].as_u64().unwrap();
+    let dx = s.doc().unwrap().doc.artboards[dup as usize].rect.x0 - 900.0;
+    assert_eq!(guides(&s), [(true, 1060.5), (false, 100.0), (true, 1060.5 + dx)]);
+    assert_eq!(list(&mut s)[2]["artboard"], dup);
+    s.execute("artboard.move", &json!({"index": 0, "dx": 0, "dy": 400, "copy": true})).unwrap();
+    assert_eq!((guides(&s).len(), list(&mut s)[3]["artboard"].clone()), (4, json!(3)));
+    // Rearranged, they follow their artboards.
+    s.execute("artboard.rearrange", &json!({"columns": 4})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    for (g, ab) in d.guides.iter().filter_map(|g| Some((g, d.artboards.iter().find(|a| Some(a.id) == g.artboard)?))) {
+        assert_eq!(g.pos - ab.rect.x0, 160.5, "{g:?} on {ab:?}");
+    }
+    // Deleted, the artboard takes its guides; the selected ones left stay selected.
+    s.execute("guide.select", &json!({"indexes": [1, 2]})).unwrap();
+    let n = undo_len(&s);
+    s.execute("artboard.delete", &json!({"index": 0})).unwrap();
+    assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![0, 1]));
+    assert_eq!(list(&mut s)[0], json!({"index": 0, "vertical": false, "pos": 100.0, "selected": true}));
+    assert_eq!(undo_len(&s), n + 1);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!((guides(&s).len(), selected_guides(&s)), (4, vec![1, 2]));
+    // Cut, too.
+    s.execute("artboard.cut", &json!({"index": 0})).unwrap();
+    assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![0, 1]));
+}
+
+/// #451: a guide dragged out of a ruler snaps (to the art's corners, side midpoints and anchors,
+/// the artboards' edges and centres) and is made in one undo step where it is released over the
+/// canvas; with the Artboard tool it is an artboard guide of the active artboard.
+#[test]
+fn guides_dragged_out_of_a_ruler_snap_and_take_the_artboard_tool_s_artboard() {
+    use vectorcraft_tools::{Overlay, PointerEvent, PointerKind};
+    let mut s = session();
+    rect(&mut s, 100.0, 100.0, 100.0, 100.0);
+    let v = ViewInfo::default();
+    let ev = |kind, x, y| PointerEvent::new(kind, x, y);
+    let n = undo_len(&s);
+    s.ruler_guide(true, &ev(PointerKind::Drag, -10.0, 30.0), false, v).unwrap();
+    assert!(guides(&s).is_empty(), "still over the ruler");
+    s.ruler_guide(true, &ev(PointerKind::Drag, 153.0, 30.0), true, v).unwrap();
+    assert_eq!(guides(&s), [(true, 150.0)], "onto the line through the top and bottom midpoints");
+    assert!(s.overlays(v).iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "center")));
+    s.ruler_guide(true, &ev(PointerKind::Drag, 797.0, 30.0), true, v).unwrap();
+    assert_eq!(guides(&s), [(true, 800.0)], "the artboard's edge");
+    s.ruler_guide(true, &ev(PointerKind::Up, 797.0, 30.0), true, v).unwrap();
+    assert_eq!(guides(&s), [(true, 800.0)]);
+    assert_eq!(undo_len(&s), n + 1);
+    assert_eq!(s.doc().unwrap().history.undo.last().unwrap().label, "New Guide");
+    assert!(s.overlays(v).is_empty());
+    // Released off the canvas: none.
+    s.ruler_guide(false, &ev(PointerKind::Drag, 30.0, 250.0), true, v).unwrap();
+    s.ruler_guide(false, &ev(PointerKind::Up, 30.0, -10.0), false, v).unwrap();
+    assert_eq!((guides(&s).len(), undo_len(&s)), (1, n + 1));
+    // The Artboard tool: an artboard guide of its active artboard.
+    s.execute("artboard.new", &json!({"x": 900, "y": 0, "width": 400, "height": 300})).unwrap();
+    s.select_tool("artboard", v).unwrap();
+    s.set_tool_option("active", &json!(1));
+    s.ruler_guide(false, &ev(PointerKind::Drag, 1000.0, 50.0), true, v).unwrap();
+    s.ruler_guide(false, &ev(PointerKind::Up, 1000.0, 50.0), true, v).unwrap();
+    assert_eq!(
+        s.execute("guide.list", &json!({})).unwrap()[1],
+        json!({"index": 1, "vertical": false, "pos": 50.0, "selected": false, "artboard": 1})
+    );
+}
+
+/// #451: art moved with the Selection tool lands flush on the artboard's edges and centre (Smart
+/// Guides).
+#[test]
+fn moved_art_snaps_to_the_artboard_edges_and_centre() {
+    use vectorcraft_tools::{PointerEvent, PointerKind};
+    let mut s = session();
+    let a = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
+    let v = ViewInfo::default();
+    s.select_tool("selection", v).unwrap();
+    let mut drag = |from: (f64, f64), to: (f64, f64)| {
+        for (kind, (x, y)) in [(PointerKind::Down, from), (PointerKind::Drag, to), (PointerKind::Up, to)] {
+            s.pointer(&PointerEvent::new(kind, x, y), v).unwrap();
+        }
+        let b = bounds(&s, a);
+        (b.x0, b.y0)
+    };
+    assert_eq!(drag((150.0, 150.0), (53.0, 147.0)), (0.0, 97.0), "3 pt off the left edge: flush with it");
+    assert_eq!(drag((50.0, 147.0), (402.0, 298.0)), (350.0, 250.0), "its centre on the artboard's");
+}
+
 /// #414: the Selection tool picks a ruler guide over the art and drags it in one undo step; with
 /// guides hidden or locked the press goes to the art.
 #[test]
@@ -87,6 +87,109 @@ fn artboards_reorder_and_duplicate() {
    assert_eq!(s.doc().unwrap().doc.artboards[0].name, "Second");
 }

+/// The artboards' left edges and names.
+fn boards(s: &Session) -> Vec<(f64, String)> {
+    s.doc().unwrap().doc.artboards.iter().map(|a| (a.rect.x0, a.name.clone())).collect()
+}
+
+/// The left edge of object `id`.
+fn left(s: &Session, id: u64) -> f64 {
+    s.doc().unwrap().doc.node(NodeId(id)).unwrap().geometric_bounds().unwrap().x0
+}
+
+fn ids(v: &serde_json::Value) -> Vec<u64> {
+    v.as_array().unwrap().iter().map(|v| v.as_u64().unwrap()).collect()
+}
+
+/// Duplicate Artboards (#446) copies the art on the artboard too, as the Artboard tool's Move/Copy
+/// Artwork with Artboard says, in one undo step.
+#[test]
+fn duplicate_artboard_copies_its_art() {
+    let mut s = session();
+    let r = rect(&mut s);
+    let out = s.execute("artboard.duplicate", &json!({"index": 0})).unwrap();
+    assert_eq!(out["index"], 1);
+    let copies = ids(&out["ids"]);
+    assert_eq!(copies.len(), 1);
+    assert_ne!(copies[0], r.0);
+    assert_eq!(boards(&s), vec![(0.0, "Artboard 1".into()), (820.0, "Artboard 1 copy".into())]);
+    assert_eq!(left(&s, copies[0]), 830.0, "the copy sits on the new artboard as the original on its own");
+    s.execute("edit.undo", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!((d.artboards.len(), d.layers[0].children().unwrap().len()), (1, 1), "one undo step");
+    // Off (the tool's option or the param): the artboard alone.
+    s.set_tool_options(Some("artboard"), json!({"moveArt": false}).as_object().unwrap());
+    assert_eq!(s.execute("artboard.duplicate", &json!({})).unwrap()["ids"], json!([]));
+    assert_eq!(ids(&s.execute("artboard.duplicate", &json!({"index": 0, "art": true})).unwrap()["ids"]).len(), 1);
+}
+
+/// With the Artboard tool, Copy and Paste copy its artboard with the art on it (#446): Paste places
+/// it right of the last artboard, Paste in Place where it was, also in another document; each paste
+/// is one undo step, and the tool takes the pasted artboard.
+#[test]
+fn artboard_tool_copy_and_paste_artboards_with_their_art() {
+    let mut s = session();
+    let r = rect(&mut s);
+    s.execute("artboard.new", &json!({"x": 0, "y": 700, "width": 100, "height": 100, "name": "Small"})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    // Nothing selected: Copy is off, until the Artboard tool is chosen.
+    let copy_enabled = |s: &Session| (crate::find_command("edit.copy").unwrap().enabled)(s).is_ok();
+    assert!(!copy_enabled(&s));
+    s.select_tool("artboard", ViewInfo::default()).unwrap();
+    assert!(copy_enabled(&s));
+    assert_eq!(s.execute("edit.copy", &json!({})).unwrap()["copied"], 1, "artboard 1 and its rectangle");
+    let out = s.execute("edit.paste", &json!({"center": [5, 5]})).unwrap();
+    assert_eq!(out["artboard"], 2);
+    let pasted = ids(&out["ids"]);
+    assert_eq!(left(&s, pasted[0]), 830.0, "beside the artboards, not at the view centre");
+    assert_eq!(boards(&s)[2], (820.0, "Artboard 1 copy".into()));
+    assert_eq!(s.tool_options()["active"], 2);
+    let st = s.doc().unwrap();
+    assert_eq!(st.selection.in_paint_order(&st.doc), vec![NodeId(pasted[0])]);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(boards(&s).len(), 2);
+    assert!(s.doc().unwrap().doc.node(NodeId(pasted[0])).is_none(), "one undo step");
+    // In place: on top of the original.
+    let out = s.execute("edit.pasteInPlace", &json!({})).unwrap();
+    assert_eq!(left(&s, ids(&out["ids"])[0]), 10.0);
+    let d = &s.doc().unwrap().doc;
+    assert_eq!(d.artboards[2].rect, d.artboards[0].rect);
+    // Into another document.
+    s.execute("file.new", &json!({"width": 300, "height": 300})).unwrap();
+    let out = s.execute("edit.paste", &json!({})).unwrap();
+    assert_eq!(boards(&s), vec![(0.0, "Artboard 1".into()), (320.0, "Artboard 1 copy".into())]);
+    let n = s.doc().unwrap().doc.node(NodeId(ids(&out["ids"])[0])).unwrap().geometric_bounds().unwrap();
+    assert_eq!((n.x0, n.width()), (330.0, 100.0));
+    // Paste on All Artboards pastes the art alone.
+    let out = s.execute("edit.pasteOnAllArtboards", &json!({})).unwrap();
+    assert_eq!((out["artboard"].clone(), ids(&out["ids"]).len(), boards(&s).len()), (json!(null), 2, 2));
+    // The clipboard still holds the artboard for the next document, and the original is untouched.
+    s.execute("document.activate", &json!({"index": 0})).unwrap();
+    assert!(s.doc().unwrap().doc.node(r).is_some());
+}
+
+/// With the Artboard tool, Cut takes its artboard and the art on it away in one undo step (#446),
+/// never the only artboard; pasting it back keeps its name.
+#[test]
+fn artboard_tool_cut_removes_the_artboard_and_its_art() {
+    let mut s = session();
+    let r = rect(&mut s);
+    let outside = s.execute("shape.rectangle", &json!({"x": 2000, "y": 0, "width": 10, "height": 10})).unwrap()["id"].as_u64().unwrap();
+    s.select_tool("artboard", ViewInfo::default()).unwrap();
+    assert!(s.execute("edit.cut", &json!({})).is_err(), "the only artboard");
+    s.execute("artboard.new", &json!({"x": 1000, "y": 0, "width": 100, "height": 100})).unwrap();
+    s.set_tool_option("active", &json!(0));
+    s.execute("edit.cut", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!((d.artboards.len(), d.node(r).is_none(), d.node(NodeId(outside)).is_some()), (1, true, true));
+    s.execute("edit.pasteInPlace", &json!({})).unwrap();
+    assert_eq!(boards(&s), vec![(1000.0, "Artboard 2".into()), (0.0, "Artboard 1".into())]);
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    let d = &s.doc().unwrap().doc;
+    assert_eq!((d.artboards.len(), d.node(r).is_some()), (2, true), "the cut is one undo step");
+}
+
 #[test]
 fn swatch_groups_duplicate_sort() {
    let mut s = session();
@@ -279,6 +279,82 @@ fn snap_to_point_lands_a_dragged_selection_on_anchors() {
    assert_eq!(drag(&mut s, ViewInfo { snap_to_point: false, ..v }), (276.5, 76.0), "View › Snap to Point off");
 }

+/// Preferences › Smart Guides (#394): Color, Alignment Guides, Anchor/Path Labels, Measurement
+/// Labels, Transform Tools and Snapping Tolerance change what the Selection tool shows while a
+/// square is dragged into line with another, and how far the pull reaches; a hidden guide still
+/// snaps.
+#[test]
+fn smart_guide_display_preferences_filter_the_overlays() {
+    use vectorcraft_tools::Overlay;
+    use vectorcraft_tools::PointerKind::{Down, Drag, Up};
+    let mut s = new_doc();
+    square(&mut s, 100.0, 100.0);
+    let b = square(&mut s, 200.0, 100.0);
+    let v = ViewInfo::default();
+    s.select_tool("selection", v).unwrap();
+    let count = |s: &mut Session, f: &dyn Fn(&Overlay) -> bool| s.overlays(v).iter().filter(|o| f(o)).count();
+    let line = |o: &Overlay| matches!(o, Overlay::Line { .. });
+    let label = |o: &Overlay| matches!(o, Overlay::Label { .. });
+    let measure = |o: &Overlay| matches!(o, Overlay::Measure { .. });
+    // `b` grabbed by its centre and dragged so its left edge comes `off` px from the first
+    // square's right edge (x = 150): the x of its left edge mid-drag, before the pointer is let go.
+    let drag_to = |s: &mut Session, off: f64| {
+        gesture(s, v, &[(Down, 225.0, 125.0), (Drag, 200.0, 125.0), (Drag, 175.0 + off, 125.0)]);
+        top_left(s, b).0
+    };
+    let release = |s: &mut Session| {
+        gesture(s, v, &[(Up, 175.0, 125.0)]);
+        s.execute("edit.undo", &json!({})).unwrap();
+    };
+    assert_eq!(drag_to(&mut s, 3.0), 150.0, "3 px off: into line");
+    assert!(count(&mut s, &line) > 0 && count(&mut s, &measure) == 1);
+    let magenta = s.overlays(v).iter().find_map(|o| if let Overlay::Line { color, .. } = o { Some(*color) } else { None });
+    assert_eq!(magenta, Some(vectorcraft_tools::guides::MAGENTA), "the default colour");
+    release(&mut s);
+    set_pref(&mut s, "smartGuideColor", json!("#00ff00"));
+    drag_to(&mut s, 3.0);
+    assert!(s.overlays(v).iter().all(|o| !matches!(o, Overlay::Line { color, .. } | Overlay::Label { color, .. } if *color != [0, 255, 0])));
+    release(&mut s);
+    set_pref(&mut s, "alignmentGuides", json!(false));
+    assert_eq!(drag_to(&mut s, 3.0), 150.0, "still into line");
+    assert_eq!(count(&mut s, &line), 0, "no line");
+    release(&mut s);
+    set_pref(&mut s, "measurementLabels", json!(false));
+    drag_to(&mut s, 3.0);
+    assert_eq!(count(&mut s, &measure), 0);
+    release(&mut s);
+    // Snapping Tolerance: 6 px is beyond the default 4, within 8.
+    assert_eq!(drag_to(&mut s, 6.0), 156.0);
+    release(&mut s);
+    set_pref(&mut s, "snappingTolerance", json!(8));
+    assert_eq!(drag_to(&mut s, 6.0), 150.0);
+    release(&mut s);
+    // Transform Tools: the size readout while a bounding-box handle is dragged.
+    let scale = |s: &mut Session| {
+        gesture(s, v, &[(Down, 225.0, 150.0), (Drag, 225.0, 170.0)]);
+        let n = count(s, &measure);
+        gesture(s, v, &[(Up, 225.0, 170.0)]);
+        s.execute("edit.undo", &json!({})).unwrap();
+        n
+    };
+    assert_eq!(scale(&mut s), 1);
+    set_pref(&mut s, "transformToolsGuides", json!(false));
+    assert_eq!(scale(&mut s), 0);
+    // Anchor/Path Labels: a drawn corner pulled onto an anchor says "anchor" (and still lands there).
+    s.select_tool("rectangle", v).unwrap();
+    let draw = |s: &mut Session| {
+        gesture(s, v, &[(Down, 300.0, 300.0), (Drag, 153.0, 151.0)]);
+        let n = count(s, &label);
+        gesture(s, v, &[(Up, 153.0, 151.0)]);
+        let at = top_left(s, s.doc().unwrap().selection.objects[0]);
+        s.execute("edit.undo", &json!({})).unwrap();
+        (n, at)
+    };
+    assert_eq!(draw(&mut s), (1, (150.0, 150.0)));
+    set_pref(&mut s, "anchorPathLabels", json!(false));
+    assert_eq!(draw(&mut s), (0, (150.0, 150.0)));
+}
+
 /// Enable Rubber Band for Pen Tool / Curvature Tool (#394): off, no segment follows the pointer.
 #[test]
 fn rubber_band_preferences_hide_the_preview_to_the_pointer() {
@@ -485,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())));
+}
@@ -1,6 +1,6 @@
 //! Resizing area type (#252): a bounding-box handle drag and Area Type Options size the type area
 //! and the text reflows at its size; Direct Selection reshapes the frame by a corner or an edge.
-//! Point type still scales.
+//! Point type still scales. The type widget converts point type to area type and back.

 use serde_json::{Value, json};
 use vectorcraft_doc::{NodeKind, TextKind, TextObject};
@@ -267,3 +267,75 @@ fn reshape_area_is_a_registered_command() {
    assert!(cmd::find_command("object.transform").unwrap().params.contains("typeAreas"));
    assert!(session().commands().iter().any(|c| c.id == "text.reshapeArea" && c.enabled));
 }
+
+/// The Discord report: type in a frame dragged with the Type tool, then the Selection tool. Its
+/// bounding box resizes the type area (the text reflows at its size), it doesn't scale the type.
+#[test]
+fn type_in_a_dragged_frame_resizes_with_the_selection_tool() {
+    let mut s = session();
+    drag(&mut s, "type", Point::new(40.0, 40.0), Point::new(160.0, 80.0));
+    let v = ViewInfo::default();
+    s.tool_text(STORY, v).unwrap();
+    s.select_tool("selection", v).unwrap();
+    let id = s.doc().unwrap().selection.objects[0];
+    assert_eq!(frame(&s, id), Rect::new(0.0, 0.0, 120.0, 40.0));
+    let lines = layout(&s, id).lines.len();
+    drag(&mut s, "selection", Point::new(160.0, 80.0), Point::new(200.0, 140.0));
+    assert_eq!(last_step(&s), "Resize Type Area");
+    assert_eq!(frame(&s, id), Rect::new(0.0, 0.0, 160.0, 100.0));
+    assert_eq!(text(&s, id).xf, Affine::translate((40.0, 40.0)), "the type isn't scaled");
+    assert!(layout(&s, id).lines.len() > lines, "the text reflows into the larger area");
+}
+
+/// The type widget beside the selected type's bounding box (as the Selection tool shows it at
+/// the default view).
+fn widget(s: &Session) -> vectorcraft_tools::typewidget::TypeWidget {
+    let st = s.doc().unwrap();
+    let bx = s.transform_box(&st.selection.objects).unwrap();
+    vectorcraft_tools::typewidget::TypeWidget::of(&st.doc, &st.selection, &bx, ViewInfo::default().zoom).unwrap()
+}
+
+fn double_click(s: &mut Session, p: Point) {
+    let v = ViewInfo::default();
+    s.select_tool("selection", v).unwrap();
+    for kind in [PointerKind::Down, PointerKind::Up, PointerKind::Down, PointerKind::Up, PointerKind::DoubleClick] {
+        s.pointer(&PointerEvent::new(kind, p.x, p.y).with_mods(Mods::default()), v).unwrap();
+    }
+}
+
+/// Double-clicking the type widget converts point type to area type and back, each one undo
+/// step, keeping the text, its styles and where it stands; the selection stays.
+#[test]
+fn the_type_widget_converts_point_and_area_type() {
+    let mut s = session();
+    let id = id_of(&s.execute("text.create", &json!({"x": 40, "y": 100, "size": 18, "text": "Two words"})).unwrap());
+    s.execute("text.setRangeStyle", &json!({"id": id.0, "start": 4, "end": 9, "size": 24})).unwrap();
+    sel(&mut s, &[id]);
+    let before = text(&s, id);
+    let glyph = |t: &TextObject| t.xf * vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t).glyphs[0].origin;
+    let w = widget(&s);
+    assert!(!w.area);
+    let n = undo_len(&s);
+    double_click(&mut s, w.at);
+    assert_eq!(undo_len(&s), n + 1, "one step");
+    assert_eq!(last_step(&s), "Convert To Area Type");
+    let t = text(&s, id);
+    assert!(matches!(t.kind, TextKind::Area { .. }));
+    assert_eq!((t.plain_text(), &t.runs), (before.plain_text(), &before.runs), "the text and its styles stay");
+    assert!(glyph(&t).distance(glyph(&before)) < 0.01, "the type stays where it was");
+    assert!(!layout(&s, id).overflow);
+    assert_eq!(s.doc().unwrap().selection.objects, vec![id]);
+    // Now area type: a filled widget, and a double-click turns it back into point type.
+    let w = widget(&s);
+    assert!(w.area);
+    double_click(&mut s, w.at);
+    assert_eq!(undo_len(&s), n + 2);
+    assert_eq!(last_step(&s), "Convert To Point Type");
+    let t = text(&s, id);
+    assert!(matches!(t.kind, TextKind::Point));
+    assert_eq!(t.runs, before.runs);
+    assert!(glyph(&t).distance(glyph(&before)) < 0.01);
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(text(&s, id), before);
+}
@@ -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();
@@ -44,6 +44,14 @@ impl Default for ViewInfo {
    }
 }

+/// The RGB of a colour preference (`#rrggbb`), or `fallback` when it doesn't parse.
+fn rgb(hex: &str, fallback: [u8; 3]) -> [u8; 3] {
+    vectorcraft_color::Color::from_hex(hex).map_or(fallback, |c| {
+        let [r, g, b, _] = c.to_rgba8(1.0);
+        [r, g, b]
+    })
+}
+
 /// Requests from tools that only the frontend can fulfil.
 #[derive(Clone, Debug, PartialEq)]
 pub enum UiRequest {
@@ -158,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,
@@ -168,6 +177,12 @@ impl Session {
            pen_rubber_band: self.prefs.pen_rubber_band,
            curvature_rubber_band: self.prefs.curvature_rubber_band,
            placeholder_text: self.prefs.placeholder_text,
+            smart_guide_color: rgb(&self.prefs.smart_guide_color, vectorcraft_tools::guides::MAGENTA),
+            alignment_guides: self.prefs.alignment_guides,
+            anchor_path_labels: self.prefs.anchor_path_labels,
+            measurement_labels: self.prefs.measurement_labels,
+            transform_tools_guides: self.prefs.transform_tools_guides,
+            snapping_tolerance: self.prefs.snapping_tolerance,
            screen: view.screen,
            plane_widget: self.prefs.perspective_widget.show.then_some(self.prefs.perspective_widget.position),
        };
@@ -206,6 +221,30 @@ impl Session {
        self.apply_actions(acts)
    }

+    /// A guide dragged out of a ruler, whatever the tool: a vertical one out of the left ruler, a
+    /// horizontal one out of the top ruler. `ev` is the pointer in document space (a drag, then the
+    /// release), over the canvas or not (`on_canvas`). The guide shows where the pointer is over
+    /// the canvas, snapped as a moved guide is, and is made where the button is released over it
+    /// (one undo step); released anywhere else, none is. With the Artboard tool it is an artboard
+    /// guide of the active artboard.
+    pub fn ruler_guide(&mut self, vertical: bool, ev: &PointerEvent, on_canvas: bool, view: ViewInfo) -> Result<()> {
+        let g = match self.ruler_guide.take() {
+            Some(g) => Some(g),
+            None => {
+                let boards = self.active().map_or(0, |d| d.doc.artboards.len());
+                let active = (self.tool.id() == "artboard").then(|| self.tool.options()["active"].as_u64()).flatten();
+                let artboard = active.and_then(|i| usize::try_from(i).ok()).filter(|i| *i < boards);
+                self.with_tool_cx(view, |_, cx| Some(vectorcraft_tools::rulerguide::NewGuide::new(cx, vertical, artboard)))
+            }
+        };
+        let Some(mut g) = g else { return Ok(()) };
+        let acts = self.with_tool_cx(view, |_, cx| g.pointer(cx, ev, on_canvas));
+        if ev.kind != PointerKind::Up {
+            self.ruler_guide = Some(g);
+        }
+        self.apply_actions(acts).map(drop)
+    }
+
    /// Time passed while the pointer button is held (`dt` seconds; see [`Tool::tick`]): the
    /// desktop app ticks every frame of a press, agents with `holdMs` on a pointer event.
    pub fn tool_tick(&mut self, dt: f64, view: ViewInfo) -> Result<Vec<UiRequest>> {
@@ -273,6 +312,10 @@ impl Session {

    pub fn overlays(&mut self, view: ViewInfo) -> Vec<Overlay> {
        let mut v = self.with_tool_cx(view, |t, cx| t.overlays(cx));
+        if let Some(g) = self.ruler_guide.take() {
+            v.extend(self.with_tool_cx(view, |_, cx| g.overlays(cx)));
+            self.ruler_guide = Some(g);
+        }
        if let Some(d) = self.active() {
            let w = self.prefs.perspective_widget;
            let place = w.show.then_some(WidgetPlace { screen: view.screen.as_ref(), corner: w.position });
@@ -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]})),
@@ -873,10 +873,12 @@ proptest! {
        survive("mutated EPS PostScript", || vectorcraft_eps::import(&bytes).ok().map(|r| r.document))?;
    }

-    /// Hostile PostScript programs: operators in any order with any operands, opened and placed.
+    /// Hostile PostScript programs: operators in any order with any operands, opened and placed;
+    /// as Illustrator's too, its groups (`u` … `U`) unbalanced, deep and among clips.
    #[test]
-    fn eps_hostile_programs_never_panic(tokens in prop::collection::vec(arb_ps_token(), 0..60)) {
-        let ps = format!("%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 200 200\n%%EndComments\n{}\nshowpage\n", tokens.join(" "));
+    fn eps_hostile_programs_never_panic(tokens in prop::collection::vec(arb_ps_token(), 0..60), illustrator in any::<bool>()) {
+        let head = if illustrator { "%%Creator: Adobe Illustrator(R) 8.0\n%%EndComments\n/u {} def /U {} def" } else { "%%EndComments" };
+        let ps = format!("%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 200 200\n{head}\n{}\nshowpage\n", tokens.join(" "));
        survive("hostile PostScript", || vectorcraft_engine::cmd::fileio::load("x.eps", ps.as_bytes()).ok().map(|l| l.doc))?;
        let r = catch_quiet(|| {
            let mut s = rich_session();
@@ -922,6 +924,38 @@ fn arb_ps_token() -> impl Strategy<Value = String> {
            "<< /ShadingType 2 /ColorSpace /DeviceRGB /Coords [0 0 1 1] /Function << /FunctionType 2 /C0 [0 0 0] /C1 [1 1 1] /N 1 >> >>",
            "<< /PatternType 2 /Shading << /ShadingType 3 /ColorSpace /DeviceGray /Coords [0 0 0 9 9 9] /Function << /FunctionType 3 /Functions [] /Bounds [] /Encode [] >> >> >>",
            "<< /ImageType 1 /Width 2 /Height 2 /BitsPerComponent 8 /ImageMatrix [2 0 0 2 0 0] /DataSource (abcdefghijkl) >>",
+            "u", "U", "u u u", "U U", "{ u } 300 repeat", "1 1 300 { pop u 0 0 9 9 rectclip } for",
+            // Probing, files, forms and devices.
+            "status", "token", "bytesavailable", "resetfile", "pdfmark", "execform", "nulldevice", "strokepath", "pathforall",
+            "currenthsbcolor", "currentcolorrendering", "gcheck", "rootfont", "setcachedevice2", "writestring", "(%stdout) (w) file",
+            "//x", "{ //dup }", "/ReusableStreamDecode", "currentfile /ASCII85Decode filter /ReusableStreamDecode filter",
+            "<< /Predictor 12 /Columns 2 /Colors 1 >> /FlateDecode", "<< /FormType 1 /BBox [0 0 9 9] /PaintProc { pop 0 0 5 5 rectfill } >>",
+            // Tiling patterns, uncoloured ones and patterns drawing patterns.
+            "<< /PatternType 1 /PaintType 1 /XStep 5 /YStep 5 /BBox [0 0 5 5] /PaintProc { pop 0 0 3 3 rectfill } >> matrix makepattern",
+            "<< /PatternType 1 /PaintType 2 /XStep 5 /YStep 5 /BBox [0 0 5 5] /PaintProc { pop dup setpattern 0 0 3 3 rectfill } >>",
+            "[/Pattern /DeviceRGB] setcolorspace", "1 0 0", "setpattern",
+            // Mesh and function shadings, sampled functions.
+            "<< /ShadingType 4 /ColorSpace /DeviceGray /DataSource [0 0 0 0 0 9 0 1 0 0 9 1 1 9 9 0] >>",
+            "<< /ShadingType 5 /ColorSpace /DeviceGray /VerticesPerRow 2 /DataSource [0 0 0 9 0 1 0 9 1 9 9 0] >>",
+            "<< /ShadingType 6 /ColorSpace /DeviceGray /BitsPerCoordinate 8 /BitsPerComponent 8 /BitsPerFlag 8 /Decode [0 9 0 9 0 1] /DataSource <00ff10ff20ff30> >>",
+            "<< /ShadingType 7 /ColorSpace /DeviceRGB /BitsPerCoordinate 32 /BitsPerComponent 16 /BitsPerFlag 8 /Decode [0 9 0 9 0 1 0 1 0 1] /DataSource (abc) >>",
+            "<< /ShadingType 1 /ColorSpace /DeviceGray /Function << /FunctionType 0 /Domain [0 1 0 1] /Range [0 1] /Size [2 2] /BitsPerSample 8 /DataSource <00ff00ff> >> >>",
+            "<< /FunctionType 0 /Domain [0 1] /Range [0 1 0 1 0 1] /Size [99999999] /BitsPerSample 32 /DataSource () >>",
+            // Masked images.
+            "<< /ImageType 3 /InterleaveType 1 /DataDict << /ImageType 1 /Width 2 /Height 2 /BitsPerComponent 8 /ImageMatrix [2 0 0 2 0 0] /DataSource (abcdefghijklmnop) >> /MaskDict << /ImageType 1 /Width 2 /Height 2 /BitsPerComponent 1 /ImageMatrix [2 0 0 2 0 0] >> >>",
+            "<< /ImageType 3 /InterleaveType 2 /DataDict << /ImageType 1 /Width 3 /Height 1 /BitsPerComponent 8 /ImageMatrix [3 0 0 1 0 0] /DataSource (abcdefghijklmnop) >> /MaskDict << /ImageType 1 /Width 3 /Height 5 /BitsPerComponent 1 /ImageMatrix [3 0 0 5 0 0] >> >>",
+            // Type 3 fonts and the show operators that space their glyphs.
+            "/T3 << /FontType 3 /FontMatrix [0.1 0 0 0.1 0 0] /FontBBox [0 0 9 9] /Encoding [/a /b] /BuildChar { pop pop 9 0 setcharwidth 0 0 5 5 rectfill } >> definefont setfont",
+            "/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).
+            // 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),
    ]
@@ -15,6 +15,8 @@ vectorcraft-doc = { workspace = true }
 vectorcraft-effects = { workspace = true }
 vectorcraft-brush = { workspace = true }
 vectorcraft-text = { workspace = true }
+# Windows metafile previews, opened when a file's PostScript can't be read.
+vectorcraft-metafile = { workspace = true }
 # The TIFF writer (previews) and PackBits, shared with raster export.
 vectorcraft-render = { workspace = true }
 kurbo = { workspace = true }
@@ -11,7 +11,7 @@ use vectorcraft_geom::Affine;

 use super::graphics::{Space, process};
 use super::interp::{Interp, matrix_of};
-use super::lex::{find, hex_decode};
+use super::lex::{Lexer, find, hex_decode};
 use super::obj::{DictRef, Key, Obj, Op, PsError, Res, Shared, ps_err};
 use crate::ps;

@@ -19,6 +19,8 @@ use crate::ps;
 const MAX_DATA: usize = 1 << 28;
 /// Most pixels an image may have.
 const MAX_PIXELS: usize = 1 << 26;
+/// Why an image is missing.
+const TOO_LARGE: &str = "images too large to read were left out";
 /// Most distinct colours an image converts through a tint transform.
 const MAX_TINTS: usize = 1 << 16;

@@ -159,6 +161,100 @@ pub(crate) struct Filter {
    name: Rc<str>,
    /// `SubFileDecode`'s count and end-of-data string.
    sub: (usize, Vec<u8>),
+    /// `FlateDecode`'s and `LZWDecode`'s `Predictor`: what it undoes.
+    predictor: Option<Predictor>,
+}
+
+/// A `Predictor` (2: TIFF, 10–15: PNG) with its `Colors`, `BitsPerComponent` and `Columns`.
+#[derive(Clone, Copy, Debug)]
+struct Predictor {
+    kind: u8,
+    colors: usize,
+    bpc: usize,
+    columns: usize,
+}
+
+impl Predictor {
+    /// The predictor of a filter's parameters, if it has one.
+    fn of(d: &DictRef) -> Res<Option<Self>> {
+        let num = |k: &str, default: f64| d.borrow().get(&Key::name(k)).and_then(Obj::as_num).unwrap_or(default);
+        let kind = num("Predictor", 1.0);
+        if kind <= 1.0 {
+            return Ok(None);
+        }
+        let (colors, bpc, columns) = (num("Colors", 1.0), num("BitsPerComponent", 8.0), num("Columns", 1.0));
+        if !(kind == 2.0 || (10.0..=15.0).contains(&kind))
+            || !(1.0..=32.0).contains(&colors)
+            || ![1.0, 2.0, 4.0, 8.0, 16.0].contains(&bpc)
+            || !(1.0..=1e6).contains(&columns)
+        {
+            return ps_err("rangecheck", "Predictor");
+        }
+        Ok(Some(Self { kind: kind as u8, colors: colors as usize, bpc: bpc as usize, columns: columns as usize }))
+    }
+
+    /// The data the predictor made `data` from.
+    fn undo(self, data: &[u8]) -> Vec<u8> {
+        // A row longer than the data is the data.
+        let row = (self.colors * self.bpc * self.columns).div_ceil(8).min(data.len().max(1));
+        // Bytes per pixel (at least one) is how far back the left neighbour is.
+        let bpp = (self.colors * self.bpc).div_ceil(8).max(1);
+        if self.kind == 2 {
+            let mut out = data.to_vec();
+            // Horizontal differencing, for 8-bit components (the common case).
+            if self.bpc == 8 {
+                for line in out.chunks_mut(row.max(1)) {
+                    for i in bpp..line.len() {
+                        let left = line.get(i - bpp).copied().unwrap_or(0);
+                        if let Some(b) = line.get_mut(i) {
+                            *b = b.wrapping_add(left);
+                        }
+                    }
+                }
+            }
+            return out;
+        }
+        // PNG: each row starts with its filter type.
+        let mut out: Vec<u8> = Vec::with_capacity(data.len());
+        let mut prev = vec![0u8; row];
+        for chunk in data.chunks(row + 1) {
+            let Some((&kind, line)) = chunk.split_first() else { break };
+            let mut cur = line.to_vec();
+            cur.resize(row, 0);
+            for i in 0..row {
+                let a = if i >= bpp { cur.get(i - bpp).copied().unwrap_or(0) } else { 0 };
+                let b = prev.get(i).copied().unwrap_or(0);
+                let c = if i >= bpp { prev.get(i - bpp).copied().unwrap_or(0) } else { 0 };
+                let add = match kind {
+                    1 => a,
+                    2 => b,
+                    3 => ((u16::from(a) + u16::from(b)) / 2) as u8,
+                    4 => paeth(a, b, c),
+                    _ => 0,
+                };
+                if let Some(v) = cur.get_mut(i) {
+                    *v = v.wrapping_add(add);
+                }
+            }
+            out.extend_from_slice(cur.get(..line.len().min(row)).unwrap_or_default());
+            prev = cur;
+        }
+        out
+    }
+}
+
+/// The PNG Paeth predictor.
+fn paeth(a: u8, b: u8, c: u8) -> u8 {
+    let (ia, ib, ic) = (i16::from(a), i16::from(b), i16::from(c));
+    let p = ia + ib - ic;
+    let (pa, pb, pc) = ((p - ia).abs(), (p - ib).abs(), (p - ic).abs());
+    if pa <= pb && pa <= pc {
+        a
+    } else if pb <= pc {
+        b
+    } else {
+        c
+    }
 }

 /// The bytes `f` decodes from `raw`, how many it read, and the channels of a decoded JPEG.
@@ -176,8 +272,13 @@ fn decode(f: &Filter, raw: &[u8]) -> Res<(Vec<u8>, usize, Option<u8>)> {
            (ps::ascii85_decode(&text).ok_or(PsError::Ps("ioerror", "ASCII85Decode".into()))?, end.map_or(raw.len(), |e| e + 2))
        }
        "RunLengthDecode" => run_length(raw)?,
-        "FlateDecode" => flate(raw)?,
-        "LZWDecode" => lzw(raw)?,
+        "FlateDecode" | "LZWDecode" => {
+            let (data, used) = if &*f.name == "FlateDecode" { flate(raw)? } else { lzw(raw)? };
+            match f.predictor {
+                Some(p) => (p.undo(&data), used),
+                None => (data, used),
+            }
+        }
        "DCTDecode" => {
            let (d, used, channels) = dct(raw)?;
            return Ok((d, used, Some(channels)));
@@ -202,13 +303,15 @@ fn decode(f: &Filter, raw: &[u8]) -> Res<(Vec<u8>, usize, Option<u8>)> {
                }
            }
        }
-        "NullEncode" => (raw.to_vec(), raw.len()),
+        // Reads all of its source (up to the end of the filters below it) and keeps it.
+        "NullEncode" | "ReusableStreamDecode" => (raw.to_vec(), raw.len()),
        other => return ps_err("undefined", other),
    };
    Ok((data, used, None))
 }

 /// What a source of image data gives.
+#[derive(Clone)]
 enum Source {
    File(Rc<RefCell<Stream>>),
    Str(Vec<u8>),
@@ -263,9 +366,74 @@ impl Interp<'_> {
            }
            File => {
                self.pop()?;
-                self.pop()?;
-                return ps_err("invalidfileaccess", "file");
+                let name = self.pop()?.text().unwrap_or_else(|| Rc::from(""));
+                // The standard files take what programs print (and give nothing); there is no
+                // file system to open others in.
+                if !matches!(&*name, "%stdout" | "%stderr" | "%stdin" | "%lineedit" | "%statementedit") {
+                    return ps_err("invalidfileaccess", "file");
+                }
+                self.push(Obj::File { stream: Rc::new(RefCell::new(Stream::Buf { data: vec![], pos: 0, rgb: None })), exec: false })?;
            }
+            Status => match self.pop()? {
+                Obj::File { .. } => self.push(Obj::Bool(true))?,
+                // A file name: there are no files.
+                Obj::Str(_) => self.push(Obj::Bool(false))?,
+                _ => return ps_err("typecheck", ""),
+            },
+            BytesAvailable => {
+                let Obj::File { stream: f, .. } = self.pop()? else { return ps_err("typecheck", "") };
+                self.materialize(&f)?;
+                let n = match &*f.borrow() {
+                    Stream::Current => self.lex.rest().len(),
+                    Stream::Buf { data, pos, .. } => data.len().saturating_sub(*pos),
+                    Stream::Pending(_) => 0,
+                };
+                self.push(Obj::Int(n as i64))?;
+            }
+            ResetFile => {
+                // A decoded (reusable) stream reads again from its start.
+                if let Obj::File { stream: f, .. } = self.pop()?
+                    && let Stream::Buf { pos, .. } = &mut *f.borrow_mut()
+                {
+                    *pos = 0;
+                }
+            }
+            Write | WriteString | WriteHexString => {
+                self.pop()?;
+                self.pop()?;
+            }
+            Read => {
+                let Obj::File { stream: f, .. } = self.pop()? else { return ps_err("typecheck", "") };
+                match self.read(&f, 1)?.first() {
+                    Some(b) => {
+                        self.push(Obj::Int(i64::from(*b)))?;
+                        self.push(Obj::Bool(true))?;
+                    }
+                    None => self.push(Obj::Bool(false))?,
+                }
+            }
+            FilePosition => {
+                let Obj::File { stream: f, .. } = self.pop()? else { return ps_err("typecheck", "") };
+                let Stream::Buf { pos, .. } = &*f.borrow() else { return ps_err("ioerror", "") };
+                self.push(Obj::Int(*pos as i64))?;
+            }
+            SetFilePosition => {
+                let at = self.pop_count()?;
+                let Obj::File { stream: f, .. } = self.pop()? else { return ps_err("typecheck", "") };
+                let Stream::Buf { data, pos, .. } = &mut *f.borrow_mut() else { return ps_err("ioerror", "") };
+                *pos = at.min(data.len());
+            }
+            // There are no files to delete, rename or run.
+            DeleteFile | Run => {
+                self.pop_str()?;
+                return ps_err("undefinedfilename", "");
+            }
+            RenameFile => {
+                self.pop_str()?;
+                self.pop_str()?;
+                return ps_err("undefinedfilename", "");
+            }
+            Token => self.token()?,
            Eexec => self.eexec()?,
            Image | ImageMask | ColorImage => self.image(op)?,
            _ => self.text_op(op)?,
@@ -273,6 +441,41 @@ impl Interp<'_> {
        Ok(())
    }

+    /// `token`: the next object read from a string (and the rest of it) or a file.
+    fn token(&mut self) -> Res {
+        match self.pop()? {
+            Obj::Str(s) => {
+                let bytes = s.to_vec();
+                let mut lex = Lexer::new(&bytes);
+                let Some(o) = lex.next()? else { return self.push(Obj::Bool(false)) };
+                let o = self.scanned(o, lex.immediate)?;
+                // The whitespace after the token is read with it.
+                let used = bytes.len() - lex.data().len();
+                self.push_interval(Obj::Str(s), used, bytes.len() - used)?;
+                self.push(o)?;
+            }
+            Obj::File { stream: f, .. } => {
+                self.materialize(&f)?;
+                let (o, immediate) = match &mut *f.borrow_mut() {
+                    Stream::Current => (self.lex.next()?, self.lex.immediate),
+                    Stream::Buf { data, pos, .. } => {
+                        let rest = data.get(*pos..).unwrap_or_default();
+                        let mut lex = Lexer::new(rest);
+                        let o = lex.next()?;
+                        *pos += rest.len() - lex.data().len();
+                        (o, lex.immediate)
+                    }
+                    Stream::Pending(_) => (None, false),
+                };
+                let Some(o) = o else { return self.push(Obj::Bool(false)) };
+                let o = self.scanned(o, immediate)?;
+                self.push(o)?;
+            }
+            _ => return ps_err("typecheck", "token"),
+        }
+        self.push(Obj::Bool(true))
+    }
+
    /// Up to `n` bytes of file `f`.
    fn read(&mut self, f: &Rc<RefCell<Stream>>, n: usize) -> Res<Vec<u8>> {
        self.materialize(f)?;
@@ -328,14 +531,13 @@ impl Interp<'_> {
        } else {
            (0, vec![])
        };
+        let mut predictor = None;
        if let Some(Obj::Dict(d)) = self.stack.last().cloned() {
            self.pop()?;
-            let predictor = d.borrow().get(&Key::name("Predictor")).and_then(Obj::as_num).unwrap_or(1.0);
-            if predictor > 1.0 {
-                return ps_err("undefined", "a filter predictor");
-            }
+            predictor = Predictor::of(&d)?;
        }
-        let spec = Filter { name, sub };
+        let spec_name = name.clone();
+        let spec = Filter { name, sub, predictor };
        let stream = match self.pop()? {
            Obj::File { stream: f, .. } => {
                if let Stream::Buf { data, pos, .. } = &*f.borrow() {
@@ -377,7 +579,12 @@ impl Interp<'_> {
            }
            _ => return ps_err("typecheck", "filter"),
        };
-        self.push(Obj::File { stream: Rc::new(RefCell::new(stream)), exec: false })
+        let stream = Rc::new(RefCell::new(stream));
+        // A reusable stream reads its source when it is made: the data follows the operator.
+        if &*spec_name == "ReusableStreamDecode" {
+            self.materialize(&stream)?;
+        }
+        self.push(Obj::File { stream, exec: false })
    }

    /// The data an executable file runs as a program: what is left of it. `None` for the
@@ -389,6 +596,15 @@ impl Interp<'_> {
        self.read(f, MAX_DATA).map(Some)
    }

+    /// The decoded data left in file `f`, without reading it (a shading's or function's data).
+    pub(super) fn peek_all(&mut self, f: &Rc<RefCell<Stream>>) -> Res<Vec<u8>> {
+        self.materialize(f)?;
+        Ok(match &*f.borrow() {
+            Stream::Buf { data, pos, .. } => data.get(*pos..).unwrap_or_default().to_vec(),
+            _ => vec![],
+        })
+    }
+
    /// Decode the filters a file waits to run over the program's data, from where it is now.
    fn materialize(&mut self, f: &Rc<RefCell<Stream>>) -> Res {
        let chain = match &*f.borrow() {
@@ -419,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 {
@@ -467,17 +700,79 @@ impl Interp<'_> {

    fn image(&mut self, op: Op) -> Res {
        let mask = op == Op::ImageMask;
-        let spec = match self.stack.last() {
+        let img = match self.stack.last() {
            Some(Obj::Dict(_)) if op != Op::ColorImage => {
                let d = self.pop_dict()?;
-                self.image_dict(&d, mask)?
+                let kind = d.borrow().get(&Key::name("ImageType")).and_then(Obj::as_num);
+                if kind == Some(3.0) && !mask {
+                    self.masked_image(&d)?
+                } else {
+                    let spec = self.image_dict(&d, mask)?;
+                    self.decode_image(spec)?
+                }
+            }
+            _ => {
+                let spec = self.image_operands(op)?;
+                self.decode_image(spec)?
            }
-            _ => self.image_operands(op)?,
        };
-        let Some(img) = self.decode_image(spec)? else { return Ok(()) };
+        let Some(img) = img else { return Ok(()) };
        self.place_image(img)
    }

+    /// ImageType 3: an image and the mask that says where it paints (where the mask's samples
+    /// read below one half through its `Decode`, as an image mask paints its 0 bits), in separate
+    /// sources (`InterleaveType` 3) or interleaved with the image's by row (2) or by sample (1).
+    fn masked_image(&mut self, d: &DictRef) -> Res<Option<Pixels>> {
+        let get = |k: &str| d.borrow().get(&Key::name(k)).cloned();
+        let (Some(Obj::Dict(data)), Some(Obj::Dict(mask))) = (get("DataDict"), get("MaskDict")) else {
+            return ps_err("typecheck", "ImageType 3");
+        };
+        let interleave = get("InterleaveType").and_then(|o| o.as_num()).unwrap_or(1.0);
+        let mut image = self.image_dict(&data, false)?;
+        let mut stencil = self.image_dict(&mask, false)?;
+        stencil.space = Space::Gray;
+        let n = image.space.n();
+        if image.w.saturating_mul(image.h) > MAX_PIXELS || stencil.w.saturating_mul(stencil.h) > MAX_PIXELS {
+            self.out.warn(TOO_LARGE);
+            return Ok(None);
+        }
+        if interleave != 3.0 {
+            let src = image.sources.first().cloned().ok_or(PsError::Ps("undefined", "DataSource".into()))?;
+            let (pixels, samples) = if interleave == 2.0 {
+                let (mrow, drow) = (stencil.row_bytes(1), image.row_bytes(n));
+                let total = mrow.saturating_mul(stencil.h).saturating_add(drow.saturating_mul(image.h));
+                self.alloc(total)?;
+                let raw = self.source_bytes(&src, total.min(MAX_DATA))?;
+                by_rows(&raw, (mrow, stencil.h), (drow, image.h))
+            } else {
+                // Each sample: the mask's value, then the colour's, as many bits each.
+                stencil.bpc = image.bpc;
+                (stencil.w, stencil.h) = (image.w, image.h);
+                let row = (image.w * (n + 1) * usize::from(image.bpc)).div_ceil(8);
+                self.alloc(row.saturating_mul(image.h))?;
+                let raw = self.source_bytes(&src, row.saturating_mul(image.h).min(MAX_DATA))?;
+                by_samples(&raw, image.w, image.h, n, image.bpc)
+            };
+            stencil.sources = vec![Source::Str(pixels)];
+            image.sources = vec![Source::Str(samples)];
+        }
+        let Some(mut img) = self.decode_image(image)? else { return Ok(None) };
+        let Some(m) = self.decode_image(stencil)? else { return Ok(Some(img)) };
+        let (w, h, mw, mh) = (img.w as usize, img.h as usize, m.w as usize, m.h as usize);
+        for (i, px) in img.rgba.chunks_exact_mut(4).enumerate() {
+            let (x, y) = (i % w, i / w);
+            // The mask's pixel over this one (in 64 bits: rows times rows overflow 32).
+            let at = (y as u64 * mh as u64 / h.max(1) as u64) * mw as u64 + x as u64 * mw as u64 / w.max(1) as u64;
+            if usize::try_from(at * 4).ok().and_then(|i| m.rgba.get(i)).is_none_or(|v| *v >= 128)
+                && let Some(a) = px.get_mut(3)
+            {
+                *a = 0;
+            }
+        }
+        Ok(Some(img))
+    }
+
    /// The dictionary form of `image` and `imagemask`.
    fn image_dict(&mut self, d: &DictRef, mask: bool) -> Res<Spec> {
        let get = |k: &str| d.borrow().get(&Key::name(k)).cloned();
@@ -494,10 +789,10 @@ impl Interp<'_> {
        let decode: Vec<f64> = get("Decode").and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default();
        let space = if mask { Space::Gray } else { (*self.g.space).clone() };
        let multi = get("MultipleDataSources").is_some_and(|o| matches!(o, Obj::Bool(true)));
-        let src = get("DataSource").ok_or(PsError::Ps("undefined", "DataSource".into()))?;
-        let sources = match (&src, multi) {
-            (Obj::Array { items, exec: false }, true) => items.borrow().iter().map(source).collect::<Res<Vec<_>>>()?,
-            _ => vec![source(&src)?],
+        let sources = match (get("DataSource"), multi) {
+            (None, _) => vec![],
+            (Some(Obj::Array { items, exec: false }), true) => items.borrow().iter().map(source).collect::<Res<Vec<_>>>()?,
+            (Some(src), _) => vec![source(&src)?],
        };
        let mask_color: Option<Vec<u32>> = (kind == 4.0)
            .then(|| {
@@ -544,7 +839,7 @@ impl Interp<'_> {
            return ps_err("rangecheck", "BitsPerComponent");
        }
        if s.w.saturating_mul(s.h) > MAX_PIXELS {
-            self.out.warn("images too large to read were left out");
+            self.out.warn(TOO_LARGE);
            return Ok(None);
        }
        self.alloc(s.w * s.h * 4)?;
@@ -571,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;
@@ -667,6 +958,9 @@ impl Interp<'_> {
        if !xf.as_coeffs().iter().all(|v| v.is_finite()) || xf.determinant().abs() < 1e-12 {
            return Ok(());
        }
+        if self.g.null {
+            return Ok(());
+        }
        let Some(rgba) = image::RgbaImage::from_raw(img.w, img.h, img.rgba) else { return Ok(()) };
        let mut png = vec![];
        if rgba.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).is_err() {
@@ -700,6 +994,65 @@ struct Spec {
    stencil: Option<bool>,
 }

+impl Spec {
+    /// Bytes a row of `n` components takes.
+    fn row_bytes(&self, n: usize) -> usize {
+        (self.w * n * usize::from(self.bpc)).div_ceil(8)
+    }
+}
+
+/// Data of an ImageType 3 interleaved by row, split into the mask's and the image's: the one
+/// with fewer rows gives one row before each run of the other's (`(row bytes, rows)` each).
+fn by_rows(raw: &[u8], (mrow, mh): (usize, usize), (drow, dh): (usize, usize)) -> (Vec<u8>, Vec<u8>) {
+    let room = |row: usize, rows: usize| row.saturating_mul(rows).min(raw.len());
+    let (mut mask, mut data) = (Vec::with_capacity(room(mrow, mh)), Vec::with_capacity(room(drow, dh)));
+    let mut at = 0;
+    let mut take = |into: &mut Vec<u8>, n: usize| {
+        into.extend_from_slice(raw.get(at..at + n).unwrap_or_default());
+        at += n;
+    };
+    let (blocks, masks, rows) = if mh >= dh { (dh, mh / dh.max(1), 1) } else { (mh, 1, dh / mh.max(1)) };
+    for _ in 0..blocks {
+        for _ in 0..masks {
+            take(&mut mask, mrow);
+        }
+        for _ in 0..rows {
+            take(&mut data, drow);
+        }
+    }
+    (mask, data)
+}
+
+/// Data of an ImageType 3 interleaved by sample (the mask's value first, then `n` colour
+/// components, `bpc` bits each, rows from whole bytes), split into the mask's and the image's.
+fn by_samples(raw: &[u8], w: usize, h: usize, n: usize, bpc: u8) -> (Vec<u8>, Vec<u8>) {
+    let bpc = usize::from(bpc);
+    let bit = |at: usize| raw.get(at / 8).is_some_and(|b| b & (0x80 >> (at % 8)) != 0);
+    let (mrow, drow, row) = ((w * bpc).div_ceil(8), (w * n * bpc).div_ceil(8), (w * (n + 1) * bpc).div_ceil(8));
+    let (mut mask, mut data) = (vec![0u8; mrow * h], vec![0u8; drow * h]);
+    let put = |into: &mut [u8], at: usize| {
+        if let Some(b) = into.get_mut(at / 8) {
+            *b |= 0x80 >> (at % 8);
+        }
+    };
+    for y in 0..h {
+        for x in 0..w {
+            let from = y * row * 8 + x * (n + 1) * bpc;
+            for k in 0..bpc {
+                if bit(from + k) {
+                    put(&mut mask, y * mrow * 8 + x * bpc + k);
+                }
+            }
+            for k in 0..n * bpc {
+                if bit(from + bpc + k) {
+                    put(&mut data, y * drow * 8 + x * n * bpc + k);
+                }
+            }
+        }
+    }
+    (mask, data)
+}
+
 /// Decoded pixels.
 struct Pixels {
    w: u32,
@@ -7,12 +7,13 @@ use std::sync::Arc;
 use kurbo::{PathEl, Shape};
 use vectorcraft_color::swatch::REGISTRATION;
 use vectorcraft_color::{Color, Gradient, GradientGeom, GradientKind, GradientPaint, GradientStop, Paint};
-use vectorcraft_doc::clipnest::{Clip, Drawn};
+use vectorcraft_doc::clipnest::{Clip, Drawn, MAX_NEST, deep_clips};
+use vectorcraft_doc::pattern::PatternDef;
 use vectorcraft_doc::{Appearance, AppearanceItem, Dash, Document, FillLayer, LineCap, LineJoin, Node, NodeId, NodeKind, StrokeLayer};
 use vectorcraft_geom::{Affine, BezPath, FillRule, PathData, Point, Rect, Vec2};

 use super::interp::{Interp, MAX_GSAVE, matrix_obj};
-use super::obj::{DictRef, Key, Obj, Op, PsError, Res, ps_err};
+use super::obj::{DictRef, Key, Obj, Op, PsError, Res, Shared, ps_err};

 /// Most objects one file makes.
 const MAX_NODES: usize = 1 << 20;
@@ -21,19 +22,26 @@ const MAX_NODES: usize = 1 << 20;
 const LIMIT: f64 = 1e6;
 /// Width of a zero-width line (the thinnest a device draws), points.
 const HAIRLINE: f64 = 0.25;
+/// Most inks a `DeviceN` space has (PostScript's own limit).
+const MAX_INKS: usize = 32;
+/// Most dashes `strokepath` makes of a path (more and it outlines the path undashed).
+const MAX_DASHES: f64 = 1e5;
 /// Most entries an indexed colour space's table has.
 const MAX_HIVAL: usize = 4095;
 /// Most elements the current path may have.
 const MAX_PATH: usize = 1 << 20;
-/// Most path elements drawn in all.
+/// Most path elements drawn in all (each object's clips and groups counting as elements too).
 const MAX_DRAWN: usize = 1 << 24;
 /// Samples taken of a shading function that isn't a plain interpolation.
 const SHADING_SAMPLES: usize = 32;

 const FAR_AWAY: &str = "objects far outside the page were left out";
 const TOO_MUCH: &str = "the file draws more than VectorCraft reads: the rest was left out";
-const TILING_PATTERNS: &str = "pattern fills are filled with mid-grey";
-const SAMPLED_FUNCTIONS: &str = "shadings whose colours come from sampled functions are filled with their middle colour";
+const NESTED_PATTERNS: &str = "patterns nested too deeply are filled with mid-grey";
+/// Deepest patterns and glyph procedures drawn inside each other's art.
+pub(crate) const MAX_APART: u32 = 8;
+const UNKNOWN_FUNCTIONS: &str = "shadings whose functions are of an unknown type are filled with their middle colour";
+const UNKNOWN_SHADINGS: &str = "shadings of an unknown type were left out";

 /// A colour space.
 #[derive(Clone, Debug)]
@@ -51,14 +59,15 @@ pub(crate) enum Space {
        base: Rc<Space>,
        table: Rc<Vec<f64>>,
    },
-    Pattern,
+    /// Patterns; an uncoloured one paints in a colour of the underlying space.
+    Pattern(Option<Rc<Space>>),
 }

 impl Space {
    /// Components a colour has in it.
    pub fn n(&self) -> usize {
        match self {
-            Self::Gray | Self::Indexed { .. } | Self::Pattern => 1,
+            Self::Gray | Self::Indexed { .. } | Self::Pattern(_) => 1,
            Self::Rgb => 3,
            Self::Cmyk => 4,
            Self::Inks { names, .. } => names.len().max(1),
@@ -110,6 +119,11 @@ pub(crate) struct GState {
    pub saved_clips: Vec<Rc<[Arc<Clip>]>>,
    pub overprint: bool,
    pub font: Option<DictRef>,
+    /// `nulldevice`: painting draws nothing.
+    pub null: bool,
+    /// The colour is a shading pattern whose shading is a mesh: a fill paints it (the shading
+    /// and pattern space → the document).
+    pub mesh: Option<(DictRef, Affine)>,
 }

 impl Default for GState {
@@ -133,6 +147,8 @@ impl Default for GState {
            saved_clips: vec![],
            overprint: false,
            font: None,
+            null: false,
+            mesh: None,
        }
    }
 }
@@ -147,8 +163,13 @@ pub(crate) struct Out {
    pub page: Affine,
    /// The page (the bounding box) in document space.
    pub frame: Rect,
+    /// Clip and group ids are given in the order they open, so a chain of both sorts by id.
    next_clip: u32,
-    /// Path elements drawn so far (see [`MAX_DRAWN`]).
+    /// The groups open (outermost first), and how many more opened past [`MAX_NEST`] (their art
+    /// goes in the innermost group kept).
+    groups: Vec<Arc<Clip>>,
+    too_deep: usize,
+    /// Path elements (and the clips and groups of each object) drawn so far (see [`MAX_DRAWN`]).
    elements: usize,
    /// The path the last object was filled with: a stroke of the same path right after joins it.
    merge: Option<BezPath>,
@@ -160,6 +181,12 @@ pub(crate) struct Out {
    /// Rectangles painted with a shading (`shfill`): a clipping group of one is the clip path
    /// filled with it.
    pub shadings: Vec<NodeId>,
+    /// Tiling patterns made into pattern swatches: the pattern's `PaintProc` (a pattern made
+    /// again with `makepattern` shares it) and cell, the colour an uncoloured one painted in, and
+    /// the swatch's name.
+    tilings: Vec<(Shared<Obj>, Rect, Option<Paint>, String)>,
+    /// How deep art drawn apart (a pattern's cell, a Type 3 glyph) is nested.
+    pub apart: u32,
 }

 fn sane(r: Rect) -> bool {
@@ -175,12 +202,16 @@ impl Out {
            page,
            frame,
            next_clip: 0,
+            groups: vec![],
+            too_deep: 0,
            elements: 0,
            merge: None,
            cmyk: 0,
            rgb: 0,
            spots: vec![],
            shadings: vec![],
+            tilings: vec![],
+            apart: 0,
        }
    }

@@ -190,10 +221,48 @@ impl Out {
        }
    }

-    /// Add `node` under `clips`; `None` when it was left out.
+    /// Open a group: what is drawn until it ends ([`Self::end_group`]) goes in it.
+    pub fn begin_group(&mut self) {
+        if self.groups.len() >= MAX_NEST {
+            self.too_deep += 1;
+            self.warn(&format!("groups nested more than {MAX_NEST} deep were read as part of the group around them"));
+            return;
+        }
+        self.next_clip += 1;
+        self.groups.push(Arc::new(Clip { id: self.next_clip, region: None }));
+    }
+
+    /// End the innermost group open (an end without a beginning ends nothing).
+    pub fn end_group(&mut self) {
+        if self.too_deep > 0 {
+            self.too_deep -= 1;
+        } else {
+            self.groups.pop();
+        }
+    }
+
+    /// The chain an object drawn under `clips` is drawn in: the clips and the groups open, in the
+    /// order they opened.
+    pub fn chain(&self, clips: &[Arc<Clip>]) -> Vec<Arc<Clip>> {
+        if self.groups.is_empty() {
+            return clips.to_vec();
+        }
+        let mut chain = Vec::with_capacity(clips.len() + self.groups.len());
+        let (mut a, mut b) = (clips.iter().peekable(), self.groups.iter().peekable());
+        while let (Some(x), Some(y)) = (a.peek(), b.peek()) {
+            let next = if x.id < y.id { a.next() } else { b.next() };
+            chain.extend(next.cloned());
+        }
+        chain.extend(a.chain(b).cloned());
+        chain
+    }
+
+    /// Add `node` under `clips` (in the groups open); `None` when it was left out.
    pub fn push(&mut self, mut node: Node, clips: &[Arc<Clip>]) -> Option<NodeId> {
        self.merge = None;
-        self.elements = self.elements.saturating_add(node.path_data().map_or(1, |p| p.subpaths.iter().map(|s| s.anchors.len()).sum()));
+        let chain = self.chain(clips);
+        let size = node.path_data().map_or(1, |p| p.subpaths.iter().map(|s| s.anchors.len()).sum()) + chain.len();
+        self.elements = self.elements.saturating_add(size);
        if self.drawn.len() >= MAX_NODES || self.elements > MAX_DRAWN {
            self.warn(TOO_MUCH);
            return None;
@@ -204,7 +273,7 @@ impl Out {
        }
        node.id = self.doc.alloc_id();
        let id = node.id;
-        self.drawn.push((clips.to_vec(), node));
+        self.drawn.push((chain, node));
        Some(id)
    }

@@ -234,14 +303,15 @@ impl Out {
    /// clips (`gsave fill grestore stroke`).
    fn stroke(&mut self, bp: BezPath, st: StrokeLayer, clips: &[Arc<Clip>]) {
        self.count(&st.paint);
-        if self.merge.as_ref() == Some(&bp)
-            && let Some((chain, last)) = self.drawn.last_mut()
-            && chain.len() == clips.len()
-            && chain.iter().zip(clips).all(|(a, b)| Arc::ptr_eq(a, b))
-        {
-            last.appearance.items.push(AppearanceItem::Stroke(st));
-            self.merge = None;
-            return;
+        if self.merge.as_ref() == Some(&bp) {
+            let here = self.chain(clips);
+            if let Some((chain, last)) = self.drawn.last_mut()
+                && chain.iter().map(|c| c.id).eq(here.iter().map(|c| c.id))
+            {
+                last.appearance.items.push(AppearanceItem::Stroke(st));
+                self.merge = None;
+                return;
+            }
        }
        let n = Node::path(NodeId(0), PathData::from_bezpath(&bp), Appearance { items: vec![AppearanceItem::Stroke(st)], ..Appearance::default() });
        self.push(n, clips);
@@ -256,7 +326,7 @@ impl Out {
            return None;
        }
        self.next_clip += 1;
-        Some(Arc::new(Clip { id: self.next_clip, path, rule }))
+        Some(Arc::new(Clip { id: self.next_clip, region: Some((path, rule)) }))
    }
 }

@@ -440,18 +510,36 @@ impl Interp<'_> {

    // ---------- painting ----------

-    fn fill_path(&mut self, bp: BezPath, rule: FillRule) {
-        if bp.elements().is_empty() || self.g.paint.is_none() {
-            return;
+    fn fill_path(&mut self, bp: BezPath, rule: FillRule) -> Res {
+        if bp.elements().is_empty() || self.g.null {
+            return Ok(());
+        }
+        // A mesh pattern paints its shading inside the path.
+        if let Some((sh, m)) = self.g.mesh.clone() {
+            let clips = self.g.clips.clone();
+            self.clip_with(bp, rule);
+            let r = self.mesh_fill(&sh, m);
+            self.g.clips = clips;
+            return r;
+        }
+        if self.g.paint.is_none() {
+            return Ok(());
        }
        let (paint, overprint) = (self.g.paint.clone(), self.g.overprint);
        self.out.fill(bp, rule, paint, overprint, &self.g.clips);
+        Ok(())
    }

    fn stroke_path(&mut self, bp: BezPath) {
-        if bp.elements().is_empty() || self.g.paint.is_none() {
+        if bp.elements().is_empty() || self.g.paint.is_none() || self.g.null {
            return;
        }
+        let st = self.stroke_layer();
+        self.out.stroke(bp, st, &self.g.clips);
+    }
+
+    /// The stroke the graphics state draws, in document space.
+    fn stroke_layer(&self) -> StrokeLayer {
        let k = self.scale();
        let w = self.g.width * k;
        let mut st = StrokeLayer::new(self.g.paint.clone(), if w > 0.0 && w.is_finite() { w } else { HAIRLINE });
@@ -462,30 +550,194 @@ impl Interp<'_> {
        let pattern: Vec<f64> = self.g.dash.iter().map(|d| d * k).collect();
        let dash = Dash { pattern, offset: self.g.dash_offset * k, align_corners: false };
        st.dash = dash.is_dashed().then_some(dash);
-        self.out.stroke(bp, st, &self.g.clips);
+        st
    }

-    fn take_path(&mut self) -> BezPath {
+    /// The current path in user space, each element as its operator and points (quadratic
+    /// segments as cubic ones).
+    fn user_elements(&self) -> Res<Vec<(Op, Vec<Point>)>> {
+        let xf = self.xf();
+        if xf.determinant().abs() < 1e-12 {
+            return ps_err("undefinedresult", "");
+        }
+        let inv = xf.inverse();
+        let mut last = Point::ZERO;
+        let mut out = Vec::with_capacity(self.g.path.elements().len());
+        for el in self.g.path.elements() {
+            let (op, pts) = match *el {
+                PathEl::MoveTo(p) => (Op::MoveTo, vec![p]),
+                PathEl::LineTo(p) => (Op::LineTo, vec![p]),
+                PathEl::QuadTo(a, p) => (Op::CurveTo, vec![last + (a - last) * (2.0 / 3.0), p + (a - p) * (2.0 / 3.0), p]),
+                PathEl::CurveTo(a, b, p) => (Op::CurveTo, vec![a, b, p]),
+                PathEl::ClosePath => (Op::ClosePath, vec![]),
+            };
+            last = pts.last().copied().unwrap_or(last);
+            out.push((op, pts.into_iter().map(|p| inv * p).collect()));
+        }
+        Ok(out)
+    }
+
+    /// `pathforall`: the current path in user space, each element through its procedure.
+    fn path_for_all(&mut self) -> Res {
+        let close = self.pop_proc()?;
+        let curve = self.pop_proc()?;
+        let line = self.pop_proc()?;
+        let mv = self.pop_proc()?;
+        for (op, pts) in self.user_elements()? {
+            for p in pts {
+                self.push_num(p.x)?;
+                self.push_num(p.y)?;
+            }
+            let proc = match op {
+                Op::MoveTo => &mv,
+                Op::LineTo => &line,
+                Op::CurveTo => &curve,
+                _ => &close,
+            };
+            if !self.body(proc)? {
+                break;
+            }
+        }
+        Ok(())
+    }
+
+    /// Append user path `up` to the current path: a procedure of path operators, or the encoded
+    /// form (numbers and a string of operator codes).
+    fn user_path(&mut self, up: Obj) -> Res {
+        let items = up.items().cloned().ok_or(PsError::Ps("typecheck", "a user path".into()))?;
+        let encoded = match (items.get(0), items.get(1), items.len()) {
+            (Some(nums @ (Obj::Array { .. } | Obj::Str(_))), Some(Obj::Str(ops)), 2) => Some((nums, ops.to_vec())),
+            _ => None,
+        };
+        let Some((nums, ops)) = encoded else { return self.call(Obj::Array { items, exec: true }) };
+        // The operators by code, with how many operands each takes.
+        const OPS: [(Op, usize); 12] = [
+            (Op::SetBBox, 4),
+            (Op::MoveTo, 2),
+            (Op::RMoveTo, 2),
+            (Op::LineTo, 2),
+            (Op::RLineTo, 2),
+            (Op::CurveTo, 6),
+            (Op::RCurveTo, 6),
+            (Op::Arc, 5),
+            (Op::Arcn, 5),
+            (Op::Arct, 5),
+            (Op::ClosePath, 0),
+            (Op::UCache, 0),
+        ];
+        let nums: Vec<f64> = match nums {
+            Obj::Array { items, .. } => items.borrow().iter().filter_map(Obj::as_num).collect(),
+            _ => return ps_err("typecheck", "an encoded user path"),
+        };
+        let mut next = nums.into_iter();
+        let mut repeat = 1usize;
+        for code in ops {
+            if code >= 32 {
+                repeat = usize::from(code - 32);
+                continue;
+            }
+            let &(op, n) = OPS.get(usize::from(code)).ok_or(PsError::Ps("rangecheck", "a user path".into()))?;
+            for _ in 0..std::mem::replace(&mut repeat, 1) {
+                for _ in 0..n {
+                    let v = next.next().ok_or(PsError::Ps("rangecheck", "a user path".into()))?;
+                    self.push_num(v)?;
+                }
+                self.op(op)?;
+            }
+        }
+        Ok(())
+    }
+
+    /// `ufill`, `ueofill`, `ustroke` (with an optional matrix): paint a user path, keeping the
+    /// current path.
+    fn paint_user_path(&mut self, op: Op) -> Res {
+        let m = match (op, self.stack.last()) {
+            (Op::UStroke, Some(Obj::Array { items, exec: false })) if items.len() == 6 && self.stack.len() >= 2 => Some(self.pop_matrix()?),
+            _ => None,
+        };
+        let up = self.pop()?;
+        self.gsave()?;
+        let depth = self.saved.len();
+        self.take_path();
+        let r = self.user_path(up).and_then(|()| {
+            if let Some(m) = m {
+                self.g.ctm *= m;
+            }
+            let bp = self.take_path();
+            match op {
+                Op::UStroke => {
+                    self.stroke_path(bp);
+                    Ok(())
+                }
+                _ => self.fill_path(bp, if op == Op::UEoFill { FillRule::EvenOdd } else { FillRule::NonZero }),
+            }
+        });
+        self.saved.truncate(depth);
+        self.grestore();
+        r
+    }
+
+    /// `upath`: the current path as a user path (a procedure, in user space).
+    fn upath(&mut self) -> Res {
+        self.pop_bool()?;
+        let elements = self.user_elements()?;
+        let b = self.xf().inverse().transform_rect_bbox(self.g.path.bounding_box());
+        let mut items: Vec<Obj> = [b.x0, b.y0, b.x1, b.y1].into_iter().map(Obj::Real).collect();
+        items.push(Obj::Op(Op::SetBBox));
+        for (op, pts) in elements {
+            items.extend(pts.iter().flat_map(|p| [Obj::Real(p.x), Obj::Real(p.y)]));
+            items.push(Obj::Op(op));
+        }
+        self.alloc(items.len() * std::mem::size_of::<Obj>())?;
+        self.push(Obj::proc(items))
+    }
+
+    /// `execform`: the form's `PaintProc` run with its matrix, clipped to its box.
+    fn exec_form(&mut self) -> Res {
+        let d = self.pop_dict()?;
+        let get = |k: &str| d.borrow().get(&Key::name(k)).cloned();
+        let m = get("Matrix").and_then(|o| o.items().and_then(|i| super::interp::matrix_of(&i.borrow()))).unwrap_or(Affine::IDENTITY);
+        let bbox: Vec<f64> = get("BBox").and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default();
+        let paint = get("PaintProc").ok_or(PsError::Ps("undefined", "PaintProc".into()))?;
+        self.gsave()?;
+        let depth = self.saved.len();
+        self.g.ctm *= m;
+        if let [x0, y0, x1, y1] = bbox[..] {
+            let bp = self.rect_path(x0, y0, x1 - x0, y1 - y0);
+            self.take_path();
+            self.clip_with(bp, FillRule::NonZero);
+        }
+        self.push(Obj::Dict(d))?;
+        let r = self.call(paint);
+        self.saved.truncate(depth);
+        self.grestore();
+        r
+    }
+
+    pub(super) fn take_path(&mut self) -> BezPath {
        self.g.cur = None;
        self.g.start = None;
        std::mem::take(&mut self.g.path)
    }

    fn clip_with(&mut self, path: BezPath, rule: FillRule) {
-        if let Some(c) = self.out.clip(path, rule) {
+        let Some(c) = self.out.clip(path, rule) else { return };
+        if self.g.clips.len() < MAX_NEST {
            self.g.clips.push(c);
+        } else {
+            self.out.warn(&deep_clips());
        }
    }

    /// The area the clip leaves, in document space (the page without a clip).
    fn clip_bounds(&self) -> Rect {
-        self.g.clips.last().map_or(self.out.frame, |c| c.path.bounding_box())
+        self.g.clips.iter().rev().find_map(|c| c.region.as_ref()).map_or(self.out.frame, |(p, _)| p.bounding_box())
    }

    // ---------- colour ----------

    /// A colour space operand.
-    fn space_of(&mut self, o: &Obj, depth: u32) -> Res<Space> {
+    pub(super) fn space_of(&mut self, o: &Obj, depth: u32) -> Res<Space> {
        if depth > 4 {
            return ps_err("limitcheck", "setcolorspace");
        }
@@ -503,7 +755,10 @@ impl Interp<'_> {
            "DeviceGray" | "CIEBasedA" | "CalGray" => Space::Gray,
            "DeviceRGB" | "CIEBasedABC" | "CalRGB" | "Lab" | "CIEBasedDEF" => Space::Rgb,
            "DeviceCMYK" | "CIEBasedDEFG" => Space::Cmyk,
-            "Pattern" => Space::Pattern,
+            "Pattern" => Space::Pattern(match items.get(1) {
+                Some(base) => Some(Rc::new(self.space_of(base, depth + 1)?)),
+                None => None,
+            }),
            "ICCBased" => match arg(1)? {
                Obj::Dict(d) => match d.borrow().get(&Key::name("N")).and_then(Obj::as_num) {
                    Some(1.0) => Space::Gray,
@@ -517,6 +772,9 @@ impl Interp<'_> {
                    Obj::Array { items, .. } => items.borrow().iter().filter_map(Obj::text).collect(),
                    o => o.text().into_iter().collect(),
                };
+                if names.len() > MAX_INKS {
+                    return ps_err("limitcheck", "DeviceN");
+                }
                let alt = self.space_of(&arg(2)?, depth + 1)?;
                Space::Inks { names, alt: Rc::new(alt), tint: arg(3)? }
            }
@@ -559,6 +817,7 @@ impl Interp<'_> {
    /// Set the colour to `comps` in the current space.
    fn set_comps(&mut self, comps: Vec<f64>) -> Res {
        let space = self.g.space.clone();
+        self.g.mesh = None;
        self.g.paint = self.paint_of(&space, &comps)?;
        self.g.comps = comps;
        Ok(())
@@ -601,7 +860,7 @@ impl Interp<'_> {
                let c = table.get(i * n..i * n + n).ok_or(PsError::Ps("rangecheck", "setcolor".into()))?.to_vec();
                Paint::solid(process(base, &c).unwrap_or(Color::BLACK))
            }
-            Space::Pattern => Paint::None,
+            Space::Pattern(_) => Paint::None,
            s => Paint::solid(process(s, comps).unwrap_or(Color::BLACK)),
        })
    }
@@ -625,29 +884,119 @@ impl Interp<'_> {
        self.g.paint.color().map_or([0.0; 3], |c| c.to_rgb_uncalibrated())
    }

-    /// A pattern colour: a shading pattern's gradient (others mid-grey).
-    fn pattern_paint(&mut self, d: &DictRef) -> Res<Paint> {
+    /// `setcolor` in a pattern space: the pattern operand, and before it an uncoloured
+    /// pattern's colour in the underlying space.
+    fn set_pattern(&mut self, base: Option<Rc<Space>>) -> Res {
+        let Obj::Dict(d) = self.pop()? else { return ps_err("typecheck", "") };
+        let uncoloured = d.borrow().get(&Key::name("PaintType")).and_then(Obj::as_num) == Some(2.0);
+        let under = match base.filter(|_| uncoloured) {
+            Some(base) => {
+                let mut c = vec![0.0; base.n()];
+                for slot in c.iter_mut().rev() {
+                    *slot = self.pop_num()?;
+                }
+                Some(self.paint_of(&base, &c)?)
+            }
+            None => None,
+        };
+        self.g.mesh = None;
+        self.g.paint = self.pattern_paint(&d, under)?;
+        Ok(())
+    }
+
+    /// A pattern colour: a shading pattern's gradient, a tiling pattern's swatch (`under`: the
+    /// colour an uncoloured one paints in).
+    fn pattern_paint(&mut self, d: &DictRef, under: Option<Paint>) -> Res<Paint> {
        let kind = d.borrow().get(&Key::name("PatternType")).and_then(Obj::as_num);
        let sh = d.borrow().get(&Key::name("Shading")).cloned();
+        let m = d.borrow().get(&Key::name("VCMatrix")).and_then(|o| o.items().and_then(|i| super::interp::matrix_of(&i.borrow())));
+        // Pattern space → the document.
+        let m = self.out.page * m.unwrap_or(self.g.ctm);
        match (kind, sh) {
-            (Some(2.0), Some(Obj::Dict(sh))) => {
-                let m = d.borrow().get(&Key::name("VCMatrix")).and_then(|o| o.items().and_then(|i| super::interp::matrix_of(&i.borrow())));
-                let m = self.out.page * m.unwrap_or(self.g.ctm);
-                Ok(self.gradient(&sh, m)?.map_or(Paint::None, |g| Paint::Gradient(Box::new(g))))
-            }
-            _ => {
-                self.out.warn(TILING_PATTERNS);
-                Ok(Paint::solid(Color::gray(0.5)))
+            (Some(2.0), Some(Obj::Dict(sh))) if is_mesh(&sh) => {
+                self.g.mesh = Some((sh, m));
+                Ok(Paint::None)
            }
+            (Some(2.0), Some(Obj::Dict(sh))) => Ok(self.gradient(&sh, m)?.map_or(Paint::None, |g| Paint::Gradient(Box::new(g)))),
+            (Some(2.0), _) => ps_err("typecheck", "Shading"),
+            _ => self.tiling(d, under, m),
        }
    }

+    /// A tiling pattern as a pattern swatch (made the first time): its `PaintProc` drawn in
+    /// pattern space, one cell of `XStep` × `YStep` from the corner of its `BBox`; `m` maps pattern
+    /// space onto the document.
+    fn tiling(&mut self, d: &DictRef, under: Option<Paint>, m: Affine) -> Res<Paint> {
+        let get = |k: &str| d.borrow().get(&Key::name(k)).cloned();
+        let bbox: Vec<f64> = get("BBox").and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default();
+        let [x0, y0, x1, y1] = bbox[..] else { return ps_err("rangecheck", "BBox") };
+        let step = |k: &str| get(k).and_then(|o| o.as_num()).map(f64::abs).filter(|v| v.is_finite() && *v > 1e-9 && *v < LIMIT);
+        let (Some(xs), Some(ys)) = (step("XStep"), step("YStep")) else { return ps_err("rangecheck", "XStep") };
+        let tile = Rect::from_origin_size((x0.min(x1), y0.min(y1)), (xs, ys));
+        let xf = m * Affine::translate(tile.origin().to_vec2());
+        let proc = get("PaintProc").ok_or(PsError::Ps("undefined", "PaintProc".into()))?;
+        let key = proc.items().cloned().ok_or(PsError::Ps("typecheck", "PaintProc".into()))?;
+        if let Some((.., name)) = self.out.tilings.iter().find(|(p, t, u, _)| p.same(&key) && *t == tile && *u == under) {
+            return Ok(Paint::Pattern { pattern: name.clone(), xf });
+        }
+        if self.out.apart >= MAX_APART {
+            self.out.warn(NESTED_PATTERNS);
+            return Ok(Paint::solid(Color::gray(0.5)));
+        }
+        let paint = under.clone();
+        let art = self.draw_apart(Rect::new(x0, y0, x1, y1).abs(), |it| {
+            if let Some(p) = paint {
+                it.g.paint = p;
+            }
+            it.push(Obj::Dict(d.clone()))?;
+            it.call(proc)
+        })?;
+        if art.is_empty() {
+            return Ok(Paint::None);
+        }
+        let name =
+            (self.out.doc.patterns.len() + 1..).map(|i| format!("Pattern {i}")).find(|n| self.out.doc.pattern(n).is_none()).unwrap_or_default();
+        let mut def = PatternDef::new(&name, art);
+        def.tile = tile;
+        self.out.doc.patterns.push(def);
+        self.out.tilings.push((key, tile, under, name.clone()));
+        Ok(Paint::Pattern { pattern: name, xf })
+    }
+
+    /// The art `draw` draws on its own, in its own space (user space is the document's, the page
+    /// `frame`), from a fresh graphics state with the current font: a pattern's cell, a glyph.
+    pub fn draw_apart(&mut self, frame: Rect, draw: impl FnOnce(&mut Self) -> Res) -> Res<Vec<Arc<Node>>> {
+        let fresh = GState { font: self.g.font.clone(), ..GState::default() };
+        let g = std::mem::replace(&mut self.g, fresh);
+        let saved = std::mem::take(&mut self.saved);
+        let drawn = std::mem::take(&mut self.out.drawn);
+        let page = std::mem::replace(&mut self.out.page, Affine::IDENTITY);
+        let frame = std::mem::replace(&mut self.out.frame, frame);
+        let merge = self.out.merge.take();
+        // The art isn't in the groups open around it.
+        let groups = std::mem::take(&mut self.out.groups);
+        let too_deep = std::mem::take(&mut self.out.too_deep);
+        self.out.apart += 1;
+        let r = draw(self);
+        self.out.apart -= 1;
+        let art = std::mem::replace(&mut self.out.drawn, drawn);
+        (self.out.page, self.out.frame, self.out.merge) = (page, frame, merge);
+        (self.out.groups, self.out.too_deep) = (groups, too_deep);
+        (self.g, self.saved) = (g, saved);
+        r?;
+        let mut nodes = vectorcraft_doc::clipnest::nest(&mut self.out.doc, art);
+        if !self.out.shadings.is_empty() {
+            collapse(&mut nodes, &self.out.shadings);
+        }
+        Ok(nodes)
+    }
+
    /// An axial or radial shading as a gradient, `m` mapping its space onto the document.
    fn gradient(&mut self, sh: &DictRef, m: Affine) -> Res<Option<GradientPaint>> {
        let get = |k: &str| sh.borrow().get(&Key::name(k)).cloned();
        let kind = get("ShadingType").and_then(|o| o.as_num()).unwrap_or(0.0);
-        if kind != 2.0 && kind != 3.0 {
-            self.out.warn("shadings other than axial and radial ones (meshes, functions) were left out");
+        if !is_gradient(sh) {
+            self.out.warn(UNKNOWN_SHADINGS);
            return Ok(None);
        }
        let space = self.space_of(&get("ColorSpace").ok_or(PsError::Ps("undefined", "ColorSpace".into()))?, 0)?;
@@ -674,7 +1023,7 @@ impl Interp<'_> {
        let (r0, r1) = (c(2).max(0.0), c(5).max(1e-6));
        let mut stops = Vec::with_capacity(ts.len());
        for t in ts {
-            let comps = self.eval(&f, d0 + (d1 - d0) * t, 0)?;
+            let comps = self.eval(&f, &[d0 + (d1 - d0) * t], 0)?;
            let paint = self.paint_of(&space, &comps)?;
            let offset = if radial { (r0 + (r1 - r0) * t) / r1 } else { t };
            let stop = match paint {
@@ -697,8 +1046,9 @@ impl Interp<'_> {
        Ok(Some(g))
    }

-    /// A function (types 2 and 3; an array of them, one per component) at `t`.
-    fn eval(&mut self, f: &Obj, t: f64, depth: u32) -> Res<Vec<f64>> {
+    /// A function (types 0, 2 and 3; an array of them, one per component) at `x` (types 2 and 3
+    /// take one input).
+    pub fn eval(&mut self, f: &Obj, x: &[f64], depth: u32) -> Res<Vec<f64>> {
        if depth > 8 {
            return ps_err("limitcheck", "Function");
        }
@@ -708,7 +1058,7 @@ impl Interp<'_> {
                let fs = items.to_vec();
                let mut out = vec![];
                for g in &fs {
-                    out.extend(self.eval(g, t, depth + 1)?.first().copied());
+                    out.extend(self.eval(g, x, depth + 1)?.first().copied());
                }
                return Ok(out);
            }
@@ -719,11 +1069,13 @@ impl Interp<'_> {
            o.and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default()
        };
        let domain = nums(get("Domain"));
+        let t = x.first().copied().unwrap_or(0.0);
        let t = match domain.as_slice() {
            [a, b, ..] => t.clamp(a.min(*b), a.max(*b)),
            _ => t,
        };
        match get("FunctionType").and_then(|o| o.as_num()) {
+            Some(0.0) => self.sampled(&d, x),
            Some(2.0) => {
                let c0 = nums(get("C0"));
                let c1 = nums(get("C1"));
@@ -743,10 +1095,10 @@ impl Interp<'_> {
                let (e0, e1) = (encode.get(2 * k).copied().unwrap_or(0.0), encode.get(2 * k + 1).copied().unwrap_or(1.0));
                let u = if b != a { e0 + (t - a) / (b - a) * (e1 - e0) } else { e0 };
                let g = fs.get(k).cloned().ok_or(PsError::Ps("rangecheck", "Functions".into()))?;
-                self.eval(&g, u, depth + 1)
+                self.eval(&g, &[u], depth + 1)
            }
            _ => {
-                self.out.warn(SAMPLED_FUNCTIONS);
+                self.out.warn(UNKNOWN_FUNCTIONS);
                let r = nums(get("Range"));
                Ok(r.chunks(2).map(|p| p.iter().sum::<f64>() / 2.0).collect())
            }
@@ -768,7 +1120,82 @@ impl Interp<'_> {
            }
            InitGraphics => {
                let font = self.g.font.take();
-                self.g = GState { font, ..GState::default() };
+                self.g = GState { font, null: self.g.null, ..GState::default() };
+            }
+            NullDevice => {
+                self.g.null = true;
+                self.g.ctm = Affine::IDENTITY;
+                self.g.clips.clear();
+            }
+            ExecForm => self.exec_form()?,
+            StrokePath => {
+                let bp = self.take_path();
+                let mut st = self.stroke_layer();
+                // A dash pattern far finer than the path would make countless pieces.
+                let period: f64 = st.dash.as_ref().map_or(0.0, |d| d.pattern.iter().sum());
+                if st.dash.is_some() && !(period > 0.0 && bp.perimeter(1e-3) / period < MAX_DASHES) {
+                    st.dash = None;
+                }
+                let tol = (0.01 / self.scale().max(1e-9)).clamp(1e-4, 1.0);
+                let outline = vectorcraft_effects::stroke::line_outline(&bp, &st, st.width, tol);
+                if outline.elements().len() >= MAX_PATH {
+                    return Err(PsError::Limit("a path has too many points"));
+                }
+                self.g.cur = outline.elements().iter().rev().find_map(|e| e.end_point());
+                self.g.start = self.g.cur;
+                self.g.path = outline;
+            }
+            PathForAll => self.path_for_all()?,
+            UFill | UEoFill | UStroke => self.paint_user_path(op)?,
+            UAppend => {
+                let up = self.pop()?;
+                self.user_path(up)?;
+            }
+            UPath => self.upath()?,
+            SetBBox => {
+                self.nums::<4>()?;
+            }
+            CurrentHsbColor => {
+                let [r, g, b] = self.current_rgb();
+                let (max, min) = (r.max(g).max(b), r.min(g).min(b));
+                let d = max - min;
+                let h = if d <= 0.0 {
+                    0.0
+                } else if max == r {
+                    ((g - b) / d).rem_euclid(6.0) / 6.0
+                } else if max == g {
+                    ((b - r) / d + 2.0) / 6.0
+                } else {
+                    ((r - g) / d + 4.0) / 6.0
+                };
+                let s = if max > 0.0 { d / max } else { 0.0 };
+                for v in [h, s, max] {
+                    self.push_num(f64::from(v))?;
+                }
+            }
+            CurrentColorRendering => {
+                let d = super::obj::Dict::from([(Key::name("ColorRenderingType"), Obj::Int(1))]);
+                self.push(Obj::dict(d))?;
+            }
+            FindColorRendering => {
+                self.pop()?;
+                self.push(Obj::name("DefaultColorRendering"))?;
+                self.push(Obj::Bool(false))?;
+            }
+            CurrentColorScreen => {
+                for _ in 0..4 {
+                    self.push(Obj::Real(60.0))?;
+                    self.push(Obj::Real(45.0))?;
+                    self.push(Obj::proc(vec![]))?;
+                }
+            }
+            CurrentSmoothness => self.push(Obj::Real(0.02))?,
+            SetHalftonePhase => {
+                self.nums::<2>()?;
+            }
+            CurrentHalftonePhase => {
+                self.push(Obj::Int(0))?;
+                self.push(Obj::Int(0))?;
            }
            GStateNew => self.push(Obj::GState(Rc::new(self.g.clone())))?,
            CurrentGState => {
@@ -856,9 +1283,8 @@ impl Interp<'_> {
                self.push(o)?;
            }
            SetColor => {
-                if matches!(*self.g.space, Space::Pattern) {
-                    let Obj::Dict(d) = self.pop()? else { return ps_err("typecheck", "") };
-                    self.g.paint = self.pattern_paint(&d)?;
+                if let Space::Pattern(base) = &*self.g.space {
+                    self.set_pattern(base.clone())?;
                } else {
                    let n = self.g.space.n();
                    let mut c = vec![0.0; n];
@@ -873,11 +1299,14 @@ impl Interp<'_> {
                    self.push_num(v)?;
                }
            }
+            // `[/Pattern <current space>] setcolorspace setcolor`, unless in a pattern space already.
            SetPattern => {
-                let Obj::Dict(d) = self.pop()? else { return ps_err("typecheck", "") };
-                self.g.space = Rc::new(Space::Pattern);
-                self.g.space_obj = Obj::name("Pattern");
-                self.g.paint = self.pattern_paint(&d)?;
+                if !matches!(*self.g.space, Space::Pattern(_)) {
+                    self.g.space = Rc::new(Space::Pattern(Some(self.g.space.clone())));
+                    self.g.space_obj = Obj::array(vec![Obj::name("Pattern"), self.g.space_obj.clone()]);
+                }
+                let Space::Pattern(base) = &*self.g.space else { return ps_err("typecheck", "") };
+                self.set_pattern(base.clone())?;
            }
            MakePattern => {
                let m = self.pop_matrix()?;
@@ -1132,7 +1561,7 @@ impl Interp<'_> {
            }
            Fill | EoFill => {
                let bp = self.take_path();
-                self.fill_path(bp, if op == EoFill { FillRule::EvenOdd } else { FillRule::NonZero });
+                self.fill_path(bp, if op == EoFill { FillRule::EvenOdd } else { FillRule::NonZero })?;
            }
            Stroke => {
                let bp = self.take_path();
@@ -1140,7 +1569,7 @@ impl Interp<'_> {
            }
            RectFill => {
                let bp = self.rects()?;
-                self.fill_path(bp, FillRule::NonZero);
+                self.fill_path(bp, FillRule::NonZero)?;
            }
            RectStroke => {
                let m = match self.stack.last() {
@@ -1156,6 +1585,13 @@ impl Interp<'_> {
            }
            ShFill => {
                let d = self.pop_dict()?;
+                if self.g.null {
+                    return Ok(());
+                }
+                if is_mesh(&d) {
+                    let m = self.xf();
+                    return self.mesh_fill(&d, m);
+                }
                let m = self.xf();
                if let Some(g) = self.gradient(&d, m)? {
                    let area = self.clip_bounds();
@@ -1174,6 +1610,16 @@ impl Interp<'_> {
    }
 }

+/// Is shading `sh` axial or radial (a gradient)?
+fn is_gradient(sh: &DictRef) -> bool {
+    matches!(sh.borrow().get(&Key::name("ShadingType")).and_then(Obj::as_num), Some(2.0 | 3.0))
+}
+
+/// Is shading `sh` one [`Interp::mesh_fill`] paints?
+fn is_mesh(sh: &DictRef) -> bool {
+    matches!(sh.borrow().get(&Key::name("ShadingType")).and_then(Obj::as_num), Some(1.0 | 4.0 | 5.0 | 6.0 | 7.0))
+}
+
 /// Where a stitched function of linear interpolations changes slope (its bounds), when it is
 /// one; `None` for functions that must be sampled.
 fn linear_points(f: &Obj) -> Option<Vec<f64>> {
@@ -10,7 +10,7 @@ use std::rc::Rc;
 use vectorcraft_geom::Affine;

 use super::graphics::{GState, Out};
-use super::lex::Lexer;
+use super::lex::{IMMEDIATE, Lexer};
 use super::obj::{Dict, DictRef, Key, Obj, Op, PsError, Res, Shared, ps_err};

 /// Most operations one file may run.
@@ -49,9 +49,39 @@ 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`).
+    pub glyph_width: Option<[f64; 2]>,
    pub g: GState,
    pub saved: Vec<GState>,
    pub out: Out,
+    /// The program is an Illustrator file's: its `u` … `U` (written at the top level, whatever
+    /// its prolog defines them as) are groups.
+    pub illustrator: bool,
+}
+
+/// Where a PostScript error was raised: the operator that raised it (none for an unknown name)
+/// and the named procedures it ran in, innermost first, so the user and we can see the cause.
+#[derive(Clone, Debug, Default, PartialEq)]
+pub(crate) struct Fault {
+    pub op: Option<&'static str>,
+    pub procs: Vec<Rc<str>>,
+}
+
+/// 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 {
@@ -125,9 +155,14 @@ impl<'a> Interp<'a> {
            ops: 0,
            allocated: 0,
            seed: 1,
+            saves: vec![],
+            journal: vec![],
+            fault: None,
+            glyph_width: None,
            g,
            saved: vec![],
            out,
+            illustrator: false,
        }
    }

@@ -135,10 +170,27 @@ impl<'a> Interp<'a> {
    pub fn run(&mut self) -> Res {
        loop {
            let Some(o) = self.lex.next()? else { return Ok(()) };
+            let o = self.scanned(o, self.lex.immediate)?;
+            // An Illustrator group begins before its `u` runs (`Some(true)`) and ends after its `U`
+            // has (`Some(false)`).
+            let group = match &o {
+                Obj::Exec(name) if self.illustrator => match &**name {
+                    "u" => Some(true),
+                    "U" => Some(false),
+                    _ => None,
+                },
+                _ => None,
+            };
+            if group == Some(true) {
+                self.out.begin_group();
+            }
            match self.exec_token(o) {
                Err(PsError::Quit) => return Ok(()),
                r => r?,
            }
+            if group == Some(false) {
+                self.out.end_group();
+            }
        }
    }

@@ -152,6 +204,7 @@ impl<'a> Interp<'a> {
        }
        self.dicts.clear();
        self.stack.clear();
+        self.journal.clear();
    }

    // ---------- the operand stack ----------
@@ -222,7 +275,7 @@ impl<'a> Interp<'a> {

    pub fn pop_str(&mut self) -> Res<Shared<u8>> {
        match self.pop()? {
-            Obj::Str(s) => Ok(s),
+            Obj::Str(s) | Obj::ExecStr(s) => Ok(s),
            _ => ps_err("typecheck", "a string"),
        }
    }
@@ -253,8 +306,12 @@ impl<'a> Interp<'a> {

    /// The value of name `name` on the dictionary stack.
    pub fn lookup(&self, name: &Rc<str>) -> Option<Obj> {
-        let key = Key::Name(name.clone());
-        self.dicts.iter().rev().find_map(|d| d.borrow().get(&key).cloned())
+        self.lookup_key(&Key::Name(name.clone()))
+    }
+
+    /// The value of any key (`load` takes numbers too) on the dictionary stack.
+    fn lookup_key(&self, key: &Key) -> Option<Obj> {
+        self.dicts.iter().rev().find_map(|d| d.borrow().get(key).cloned())
    }

    /// Count `bytes` the program makes against [`MAX_MEMORY`].
@@ -286,10 +343,24 @@ impl<'a> Interp<'a> {
        self.tick()?;
        match o {
            Obj::Exec(name) => {
-                let v = self.lookup(&name).ok_or_else(|| PsError::Ps("undefined", name.to_string()))?;
-                self.call(v)
+                let Some(v) = self.lookup(&name) else {
+                    self.fault.get_or_insert_default();
+                    return ps_err("undefined", &name);
+                };
+                let proc = matches!(v, Obj::Array { exec: true, .. });
+                let r = self.call(v);
+                if proc
+                    && matches!(r, Err(PsError::Ps(..)))
+                    && let Some(f) = self.fault.as_mut()
+                    && f.procs.len() < FAULT_PROCS
+                {
+                    f.procs.push(name);
+                }
+                r
            }
            Obj::Op(op) => self.op(op),
+            // An executable string runs, as an operator does (procedures are pushed).
+            s @ Obj::ExecStr(_) => self.call(s),
            o => self.push(o),
        }
    }
@@ -299,7 +370,11 @@ impl<'a> Interp<'a> {
    pub fn call(&mut self, v: Obj) -> Res {
        match v {
            Obj::Array { items, exec: true } => self.run_proc(&items),
-            Obj::File { stream, exec: true } => self.run_file(&stream),
+            Obj::File { stream, exec: true } => match self.program_of(&stream)? {
+                Some(program) => self.run_program(&program),
+                None => Ok(()),
+            },
+            Obj::ExecStr(s) => self.run_program(&s.to_vec()),
            Obj::Op(op) => self.op(op),
            Obj::Exec(name) => {
                self.enter()?;
@@ -329,15 +404,14 @@ impl<'a> Interp<'a> {
        r
    }

-    /// Run what is left of an executable file as a program, token by token.
-    fn run_file(&mut self, f: &Rc<RefCell<super::data::Stream>>) -> Res {
-        let Some(program) = self.program_of(f)? else { return Ok(()) };
+    /// Run `program` (what is left of an executable file, an executable string), token by token.
+    fn run_program(&mut self, program: &[u8]) -> Res {
        self.enter()?;
-        let mut lex = Lexer::new(&program);
+        let mut lex = Lexer::new(program);
        let r = loop {
            match lex.next() {
                Ok(Some(o)) => {
-                    if let Err(e) = self.exec_token(o) {
+                    if let Err(e) = self.scanned(o, lex.immediate).and_then(|o| self.exec_token(o)) {
                        break Err(e);
                    }
                }
@@ -349,6 +423,32 @@ impl<'a> Interp<'a> {
        r
    }

+    /// An object as the scanner gives it: with `immediate`, its `//name`s replaced by their
+    /// values (down through procedures), as they are when read.
+    pub fn scanned(&self, o: Obj, immediate: bool) -> Res<Obj> {
+        if immediate { self.resolve(o, 0) } else { Ok(o) }
+    }
+
+    fn resolve(&self, o: Obj, depth: usize) -> Res<Obj> {
+        match o {
+            Obj::Exec(n) if n.starts_with(IMMEDIATE) => {
+                let name = n.get(IMMEDIATE.len()..).unwrap_or_default();
+                self.lookup(&Rc::from(name)).ok_or_else(|| PsError::Ps("undefined", name.to_string()))
+            }
+            Obj::Array { items, exec: true } if depth < MAX_DEPTH as usize => {
+                for i in 0..items.len() {
+                    let Some(item) = items.get(i) else { break };
+                    if matches!(&item, Obj::Exec(n) if n.starts_with(IMMEDIATE)) || matches!(&item, Obj::Array { exec: true, .. }) {
+                        // A procedure the scanner just made: nothing else reads it.
+                        items.write(i, &[self.resolve(item, depth + 1)?]);
+                    }
+                }
+                Ok(Obj::Array { items, exec: true })
+            }
+            o => Ok(o),
+        }
+    }
+
    fn run_items(&mut self, items: &Shared<Obj>) -> Res {
        let mut i = 0;
        loop {
@@ -381,7 +481,11 @@ impl<'a> Interp<'a> {

    pub fn op(&mut self, op: Op) -> Res {
        self.op_inner(op).map_err(|e| match e {
-            PsError::Ps(name, at) if at.is_empty() => PsError::Ps(name, op.name().to_string()),
+            PsError::Ps(name, at) => {
+                // The innermost operator raised it (`exec` running a procedure doesn't).
+                self.fault.get_or_insert(Fault { op: Some(op.name()), procs: vec![] });
+                PsError::Ps(name, if at.is_empty() { op.name().to_string() } else { at })
+            }
            e => e,
        })
    }
@@ -663,6 +767,7 @@ impl<'a> Interp<'a> {
                    Ok(()) => self.push(Obj::Bool(false))?,
                    Err(PsError::Ps(..) | PsError::Stop | PsError::Exit) => {
                        self.depth = depth;
+                        self.fault = None;
                        self.push(Obj::Bool(true))?;
                    }
                    Err(e) => return Err(e),
@@ -679,6 +784,7 @@ impl<'a> Interp<'a> {
                let o = match self.pop()? {
                    Obj::Array { items, .. } => Obj::Array { items, exec: true },
                    Obj::File { stream, .. } => Obj::File { stream, exec: true },
+                    Obj::Str(s) => Obj::ExecStr(s),
                    Obj::Name(n) => Obj::Exec(n),
                    o => o,
                };
@@ -688,6 +794,7 @@ impl<'a> Interp<'a> {
                let o = match self.pop()? {
                    Obj::Array { items, .. } => Obj::Array { items, exec: false },
                    Obj::File { stream, .. } => Obj::File { stream, exec: false },
+                    Obj::ExecStr(s) => Obj::Str(s),
                    Obj::Exec(n) => Obj::Name(n),
                    o => o,
                };
@@ -695,7 +802,10 @@ impl<'a> Interp<'a> {
            }
            Xcheck => {
                let o = self.pop()?;
-                self.push(Obj::Bool(matches!(o, Obj::Array { exec: true, .. } | Obj::File { exec: true, .. } | Obj::Exec(_) | Obj::Op(_))))?;
+                self.push(Obj::Bool(matches!(
+                    o,
+                    Obj::Array { exec: true, .. } | Obj::File { exec: true, .. } | Obj::ExecStr(_) | Obj::Exec(_) | Obj::Op(_)
+                )))?;
            }
            Cvn => {
                let s = self.pop_str()?;
@@ -748,7 +858,7 @@ impl<'a> Interp<'a> {
            Length => {
                let n = match self.pop()? {
                    Obj::Array { items, .. } => items.len(),
-                    Obj::Str(s) => s.len(),
+                    Obj::Str(s) | Obj::ExecStr(s) => s.len(),
                    Obj::Dict(d) => d.borrow().len(),
                    Obj::Name(n) | Obj::Exec(n) => n.len(),
                    _ => return ps_err("typecheck", ""),
@@ -764,7 +874,7 @@ impl<'a> Interp<'a> {
                let k = self.pop()?;
                let o = match self.pop()? {
                    Obj::Array { items, .. } => items.get(index(&k)?).ok_or(PsError::Ps("rangecheck", String::new()))?,
-                    Obj::Str(s) => Obj::Int(i64::from(s.get(index(&k)?).ok_or(PsError::Ps("rangecheck", String::new()))?)),
+                    Obj::Str(s) | Obj::ExecStr(s) => Obj::Int(i64::from(s.get(index(&k)?).ok_or(PsError::Ps("rangecheck", String::new()))?)),
                    Obj::Dict(d) => {
                        let key = k.key().ok_or(PsError::Ps("typecheck", String::new()))?;
                        let v = d.borrow().get(&key).cloned();
@@ -784,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", ""),
@@ -873,12 +983,12 @@ 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()?;
-                let name = k.text().ok_or(PsError::Ps("typecheck", String::new()))?;
-                let v = self.lookup(&name).ok_or_else(|| PsError::Ps("undefined", name.to_string()))?;
+                let key = k.key().ok_or(PsError::Ps("typecheck", String::new()))?;
+                let v = self.lookup_key(&key).ok_or_else(|| PsError::Ps("undefined", show_text(&k)))?;
                self.push(v)?;
            }
            Store => {
@@ -886,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()))?;
@@ -906,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()))?;
@@ -939,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();
                }
            }
@@ -953,12 +1076,62 @@ impl<'a> Interp<'a> {
                }
            }
            Version => self.push(Obj::string(b"3010".to_vec()))?,
+            Revision => self.push(Obj::Int(1))?,
+            SerialNumber => self.push(Obj::Int(0))?,
            Product => self.push(Obj::string(b"VectorCraft".to_vec()))?,
            RealTime | UserTime => self.push(Obj::Int(0))?,
            Print | EqPrint | EqEqPrint => {
                self.pop()?;
            }
            Pstack | Stack | Flush => {}
+            // What every interpreter (not only a distiller) answers, as Ghostscript does: the marks
+            // are dropped.
+            PdfMark => {
+                self.pop_to_mark()?;
+            }
+            Gcheck | Scheck => {
+                self.pop()?;
+                self.push(Obj::Bool(false))?;
+            }
+            CurrentShared => self.push(Obj::Bool(false))?,
+            SetShared | SetVmThreshold | VmReclaim | Echo => {
+                self.pop()?;
+            }
+            ClearDictStack => self.dicts.truncate(3),
+            ExecStack => {
+                let items = self.pop_array()?;
+                self.push_interval(Obj::Array { items, exec: false }, 0, 0)?;
+            }
+            SetCacheParams => {
+                self.pop_to_mark()?;
+            }
+            CurrentCacheParams | UCacheStatus => {
+                self.push(Obj::Mark)?;
+                for _ in 0..if op == UCacheStatus { 5 } else { 2 } {
+                    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 v in [0, 1 << 20, 0, 1000, 0, 10_000, 25_000] {
+                    self.push(Obj::Int(v))?;
+                }
+            }
+            StartJob => {
+                self.pop()?;
+                self.pop()?;
+                self.push(Obj::Bool(false))?;
+            }
+            CurrentObjectFormat => self.push(Obj::Int(0))?,
+            SetDevParams => {
+                self.pop_dict()?;
+                self.pop()?;
+            }
+            CurrentDevParams => {
+                self.pop()?;
+                self.push(Obj::dict(Dict::new()))?;
+            }
            _ => self.graphics_op(op)?,
        }
        Ok(())
@@ -1000,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"),
@@ -1014,6 +1189,7 @@ impl<'a> Interp<'a> {
        let r = match o {
            Obj::Array { items, exec } => Obj::Array { items: items.sub(at, n).ok_or_else(range)?, exec },
            Obj::Str(s) => Obj::Str(s.sub(at, n).ok_or_else(range)?),
+            Obj::ExecStr(s) => Obj::ExecStr(s.sub(at, n).ok_or_else(range)?),
            _ => return ps_err("typecheck", "getinterval"),
        };
        self.push(r)
@@ -1032,7 +1208,7 @@ impl<'a> Interp<'a> {
                    }
                }
            }
-            Obj::Str(s) => {
+            Obj::Str(s) | Obj::ExecStr(s) => {
                for b in s.to_vec() {
                    self.push(Obj::Int(i64::from(b)))?;
                    if !self.body(&p)? {
@@ -1075,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`.
@@ -1149,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 {
@@ -1192,7 +1378,7 @@ fn show_text(o: &Obj) -> String {
        }
        Obj::Bool(b) => b.to_string(),
        Obj::Name(n) | Obj::Exec(n) => n.to_string(),
-        Obj::Str(s) => String::from_utf8_lossy(&s.borrow()).into_owned(),
+        Obj::Str(s) | Obj::ExecStr(s) => String::from_utf8_lossy(&s.borrow()).into_owned(),
        Obj::Op(op) => op.name().to_string(),
        _ => "--nostringval--".into(),
    }
@@ -15,8 +15,14 @@ pub(crate) struct Lexer<'a> {
    /// The whitespace character that ended the last token is still unread (data the program
    /// reads from itself starts after it).
    fresh: bool,
+    /// The last object read has immediately evaluated names (`//name`) in it, read as executable
+    /// names starting with [`IMMEDIATE`] for the interpreter to replace by their values.
+    pub immediate: bool,
 }

+/// How an immediately evaluated name (`//name`) is read, until the interpreter replaces it.
+pub(crate) const IMMEDIATE: &str = "//";
+
 fn is_space(b: u8) -> bool {
    matches!(b, b' ' | b'\t' | b'\r' | b'\n' | b'\x0c' | b'\0')
 }
@@ -31,7 +37,7 @@ fn syntax<T>(what: &str) -> Res<T> {

 impl<'a> Lexer<'a> {
    pub fn new(src: &'a [u8]) -> Self {
-        Self { src, pos: 0, fresh: false }
+        Self { src, pos: 0, fresh: false, immediate: false }
    }

    /// What is left to read.
@@ -86,6 +92,7 @@ impl<'a> Lexer<'a> {

    /// The next object at the top level (`None` at the end of the file).
    pub fn next(&mut self) -> Res<Option<Obj>> {
+        self.immediate = false;
        let t = self.token(0);
        self.fresh = true;
        t
@@ -140,13 +147,14 @@ impl<'a> Lexer<'a> {
            }
            b'}' | b')' => return syntax(&char::from(b).to_string()),
            b'/' => {
-                // `//name` is looked up when run (rather than when read).
+                // `//name` stands for the name's value when it is read.
                let immediate = self.peek() == Some(b'/');
                if immediate {
                    self.pos += 1;
+                    self.immediate = true;
                }
                let name = self.word();
-                if immediate { Obj::Exec(Rc::from(name.as_str())) } else { Obj::Name(Rc::from(name.as_str())) }
+                if immediate { Obj::Exec(Rc::from(format!("{IMMEDIATE}{name}").as_str())) } else { Obj::Name(Rc::from(name.as_str())) }
            }
            _ => {
                self.pos -= 1;
@@ -4,38 +4,53 @@
 //! - `lex`: the scanner; `obj`: objects, operators and errors; `interp`: the stacks, running
 //!   procedures, and the operators that don't draw.
 //! - `graphics`: the graphics state, coordinates, paths, colours (grey, RGB, CMYK, spot inks as
-//!   spot swatches at a tint, indexed), painting, clipping, and axial and radial shadings as
-//!   gradients.
+//!   spot swatches at a tint, indexed, patterns), painting, clipping, axial and radial shadings as
+//!   gradients and tiling patterns as pattern swatches.
+//! - `shading`: function-based and mesh shadings as gradient meshes, sampled functions.
 //! - `data`: data the program reads from itself through decoding filters, and images.
-//! - `text`: fonts by name and type as point type.
+//! - `text`: fonts by name and type as point type; Type 3 fonts' glyphs drawn by their procedures.
+//! - `preview`: the previews a file carries, for when its PostScript can't be read.
+//!
+//! Clipped art comes in as clipping groups. In an Illustrator file (Illustrator 3–8, written with
+//! the prolog that defines its operators), the groups it writes (`u` … `U`, nested) come in as
+//! groups.
 //!
 //! The page is the file's `%%BoundingBox` (`%%HiResBoundingBox` when it has one), the first page
 //! of a PostScript file without one. A file whose program can't be read (an operator the
-//! interpreter doesn't know, an error, a limit reached) or that draws nothing comes in as its TIFF
-//! preview, with a warning; without a preview, what was drawn before the error is kept (with a
-//! warning), else the file is refused.
+//! interpreter doesn't know, an error, a limit reached) or that draws nothing comes in as its
+//! preview (a TIFF image, a Windows metafile or an EPSI bitmap), with a warning that names the
+//! error, the operator and the procedures it ran in; without a preview, what was drawn before the
+//! error is kept (with that warning), else the file is refused.

 mod data;
 mod graphics;
 mod interp;
 mod lex;
 mod obj;
+mod preview;
+mod shading;
 mod text;

 #[cfg(test)]
 mod tests;
 #[cfg(test)]
 mod tests_fontnames;
+#[cfg(test)]
+mod tests_generators;
+#[cfg(test)]
+mod tests_illustrator;
+#[cfg(test)]
+mod tests_images;

 use std::sync::Arc;

 use vectorcraft_color::Paint;
 use vectorcraft_color::swatch::Swatch;
-use vectorcraft_doc::{ColorMode, Document, ImageBlob, ImageObject, LayerColor, Node, NodeKind};
+use vectorcraft_doc::{ColorMode, Document, LayerColor, Node};
 use vectorcraft_geom::{Affine, Rect};

 use graphics::{GState, Out};
-use interp::Interp;
+use interp::{Fault, Interp};
 use obj::PsError;

 pub use text::family_style;
@@ -60,6 +75,8 @@ struct Dsc {
    /// `llx lly urx ury` in PostScript's default space.
    bbox: Option<[f64; 4]>,
    pages: Option<u32>,
+    /// Written by Illustrator (or in its format): `%AI…` comments, or Illustrator the creator.
+    illustrator: bool,
 }

 /// The four numbers of a bounding box comment's value, when it has them and they make a box.
@@ -90,6 +107,10 @@ impl Dsc {
                }
            }
            let value = |key: &str| line.strip_prefix(key).map(str::trim);
+            let creator = value("%%Creator:").is_some_and(|v| v.contains("Illustrator")); // brand-ok: the creator its files name
+            if header && (line.starts_with("%AI") || line.starts_with("%%AI") || creator) {
+                d.illustrator = true;
+            }
            if let Some(v) = value("%%HiResBoundingBox:") {
                if header || atend {
                    hires = box_of(v).or(hires);
@@ -111,21 +132,33 @@ impl Dsc {
    }
 }

-/// What went wrong, for the user.
-fn reason(e: &PsError) -> String {
-    match e {
+/// What went wrong, for the user (and for us, reading a report): the PostScript error, the
+/// operator that raised it and the procedure it ran in (`fault`).
+fn reason(e: &PsError, fault: Option<&Fault>) -> String {
+    let what = match e {
        PsError::Ps("undefined", at) => format!("it uses `{at}`, which VectorCraft's PostScript reader doesn't know"),
-        PsError::Ps(name, at) if at.is_empty() => format!("a PostScript error ({name})"),
-        PsError::Ps(name, at) => format!("a PostScript error ({name} in `{at}`)"),
-        PsError::Limit(what) => what.to_string(),
-        PsError::Exit | PsError::Stop => "the program stopped with an error".into(),
-        PsError::Quit => "the program ended early".into(),
+        PsError::Ps(name, at) => match fault.and_then(|f| f.op) {
+            Some(op) if at.is_empty() || at == op => format!("a PostScript error ({name} in `{op}`)"),
+            Some(op) => format!("a PostScript error ({name} in `{op}`: {at})"),
+            None if at.is_empty() => format!("a PostScript error ({name})"),
+            None => format!("a PostScript error ({name} in `{at}`)"),
+        },
+        PsError::Limit(what) => return what.to_string(),
+        PsError::Exit | PsError::Stop => return "the program stopped with an error".into(),
+        PsError::Quit => return "the program ended early".into(),
+    };
+    match fault.map(|f| f.procs.as_slice()).unwrap_or_default() {
+        [] => what,
+        procs => {
+            let names: Vec<String> = procs.iter().map(|p| format!("`{p}`")).collect();
+            format!("{what}, in {}", names.join(" in "))
+        }
    }
 }

 /// Read an EPS or PostScript file (its first page).
 pub fn import(bytes: &[u8]) -> Result<Imported, String> {
-    let (ps, tiff) = crate::sections(bytes).ok_or("the file's preview header points outside the file")?;
+    let (ps, _) = crate::sections(bytes).ok_or("the file's preview header points outside the file")?;
    if !ps.starts_with(b"%!") {
        return Err("this is not a PostScript file".into());
    }
@@ -136,8 +169,10 @@ pub fn import(bytes: &[u8]) -> Result<Imported, String> {
    doc.layers.clear();
    let page = Affine::new([1.0, 0.0, 0.0, -1.0, -llx, ury]);
    let mut it = Interp::new(ps, GState::default(), Out::new(doc, page, frame));
+    it.illustrator = dsc.illustrator;
    let result = it.run();
    it.release();
+    let fault = it.fault.take();
    let mut out = it.out;
    if let Some(n) = dsc.pages.filter(|n| *n > 1) {
        out.warn(&format!("only the first of the file's {n} pages was read"));
@@ -146,11 +181,11 @@ pub fn import(bytes: &[u8]) -> Result<Imported, String> {
    let why = match (&result, drew) {
        (Ok(()), true) => return Ok(finish(out)),
        (Ok(()), false) => "it draws nothing VectorCraft's PostScript reader can show".to_string(),
-        (Err(e), _) => reason(e),
+        (Err(e), _) => reason(e, fault.as_ref()),
    };
-    if let Some(doc) = tiff.and_then(|t| preview(t, frame)) {
-        let warnings = vec![format!("this file's PostScript couldn't be read ({why}): its preview was placed instead, at screen resolution")];
-        return Ok(Imported { document: doc, warnings, preview: true });
+    if let Some(p) = preview::preview(bytes, ps, frame) {
+        let warnings = vec![format!("this file's PostScript couldn't be read ({why}): {}", p.what)];
+        return Ok(Imported { document: p.document, warnings, preview: true });
    }
    if drew {
        out.warnings.insert(0, format!("the file was read up to an error ({why}): what follows it was left out"));
@@ -161,12 +196,12 @@ pub fn import(bytes: &[u8]) -> Result<Imported, String> {
            out.warn("the file draws nothing");
            Ok(finish(out))
        }
-        Err(e) => Err(format!("this PostScript file can't be read ({}): save it as PDF or SVG in the app that made it", reason(&e))),
+        Err(e) => Err(format!("this PostScript file can't be read ({}): save it as PDF or SVG in the app that made it", reason(&e, fault.as_ref()))),
    }
 }

-/// The document of what `out` drew: one layer, clipped art in clipping groups, the spot inks as
-/// spot swatches, in CMYK when most process colours were.
+/// The document of what `out` drew: one layer, clipped art in clipping groups (grouped art in
+/// groups), the spot inks as spot swatches, in CMYK when most process colours were.
 fn finish(mut out: Out) -> Imported {
    let drawn = std::mem::take(&mut out.drawn);
    let mut children = vectorcraft_doc::clipnest::nest(&mut out.doc, drawn);
@@ -183,6 +218,12 @@ fn finish(mut out: Out) -> Imported {
            doc.swatches.push(Swatch { name, paint: Paint::solid(color), global: true, spot: true });
        }
    }
+    // Tiling patterns are pattern swatches.
+    for name in doc.patterns.iter().map(|p| p.name.clone()).collect::<Vec<_>>() {
+        if doc.swatch(&name).is_none() {
+            doc.swatches.push(Swatch { paint: Paint::Pattern { pattern: name.clone(), xf: Affine::IDENTITY }, name, global: false, spot: false });
+        }
+    }
    let mut layer = Node::layer(doc.alloc_id(), "Layer 1", LayerColor::Preset(0));
    if let Some(c) = layer.children_mut() {
        *c = children;
@@ -190,27 +231,3 @@ fn finish(mut out: Out) -> Imported {
    doc.layers = vec![Arc::new(layer)];
    Imported { document: doc, warnings: out.warnings, preview: false }
 }
-
-/// A document of `frame`'s size showing TIFF preview `tiff` stretched over it.
-fn preview(tiff: &[u8], frame: Rect) -> Option<Document> {
-    let img = match image::load_from_memory_with_format(tiff, image::ImageFormat::Tiff) {
-        Ok(img) => img.to_rgba8(),
-        Err(_) => crate::tiff::palette_rgba(tiff)?,
-    };
-    let (w, h) = img.dimensions();
-    if w == 0 || h == 0 {
-        return None;
-    }
-    let mut png = vec![];
-    img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).ok()?;
-    let mut doc = Document::new(frame.width(), frame.height());
-    let blob = ImageBlob::new("image/png", png);
-    let key = blob.content_key();
-    doc.images.insert(key.clone(), blob);
-    let xf = Affine::scale_non_uniform(frame.width() / f64::from(w), frame.height() / f64::from(h));
-    let mut n = Node::new(doc.alloc_id(), NodeKind::Image(ImageObject { key, width: w, height: h, xf, link: None, placement: Default::default() }));
-    n.name = Some("Preview".into());
-    let layer = doc.layers.first().map(|l| l.id)?;
-    doc.insert(Some(layer), 0, n).ok()?;
-    Some(doc)
-}
@@ -32,6 +32,8 @@ pub(crate) enum Obj {
    /// An executable name: looked up and run.
    Exec(Rc<str>),
    Str(Shared<u8>),
+    /// An executable string (`cvx`): run, it runs its text as a program.
+    ExecStr(Shared<u8>),
    /// An array; executable ones are procedures.
    Array {
        items: Shared<Obj>,
@@ -85,7 +87,7 @@ impl Obj {
    pub fn text(&self) -> Option<Rc<str>> {
        match self {
            Self::Name(n) | Self::Exec(n) => Some(n.clone()),
-            Self::Str(s) => Some(Rc::from(String::from_utf8_lossy(&s.borrow()).as_ref())),
+            Self::Str(s) | Self::ExecStr(s) => Some(Rc::from(String::from_utf8_lossy(&s.borrow()).as_ref())),
            _ => None,
        }
    }
@@ -117,7 +119,7 @@ impl Obj {
            Self::Int(_) => "integertype",
            Self::Real(_) => "realtype",
            Self::Name(_) | Self::Exec(_) => "nametype",
-            Self::Str(_) => "stringtype",
+            Self::Str(_) | Self::ExecStr(_) => "stringtype",
            Self::Array { .. } => "arraytype",
            Self::Dict(_) => "dicttype",
            Self::Op(_) => "operatortype",
@@ -326,5 +328,21 @@ ops! {
    ResourceForAll = "resourceforall", Show = "show", AShow = "ashow",
    WidthShow = "widthshow", AWidthShow = "awidthshow", XShow = "xshow", YShow = "yshow", XYShow = "xyshow",
    KShow = "kshow", CShow = "cshow", GlyphShow = "glyphshow", StringWidth = "stringwidth", CharPath = "charpath",
-    SetCacheDevice = "setcachedevice", SetCharWidth = "setcharwidth",
+    SetCacheDevice = "setcachedevice", SetCharWidth = "setcharwidth", SetCacheDevice2 = "setcachedevice2", RootFont = "rootfont",
+    // Forms, devices and files programs probe (no output device or file system here).
+    ExecForm = "execform", NullDevice = "nulldevice", PdfMark = "pdfmark", Status = "status", Token = "token",
+    BytesAvailable = "bytesavailable", ResetFile = "resetfile", Write = "write", WriteString = "writestring",
+    WriteHexString = "writehexstring", Echo = "echo", StrokePath = "strokepath", PathForAll = "pathforall",
+    // Queries and settings without an effect on the art.
+    CurrentHsbColor = "currenthsbcolor", CurrentColorRendering = "currentcolorrendering",
+    FindColorRendering = "findcolorrendering", CurrentColorScreen = "currentcolorscreen", CurrentSmoothness = "currentsmoothness",
+    SetHalftonePhase = "sethalftonephase", CurrentHalftonePhase = "currenthalftonephase", SetDevParams = "setdevparams",
+    CurrentDevParams = "currentdevparams", Gcheck = "gcheck", Scheck = "scheck", CurrentShared = "currentshared",
+    SetShared = "setshared", ClearDictStack = "cleardictstack", ExecStack = "execstack", SetCacheParams = "setcacheparams",
+    CurrentCacheParams = "currentcacheparams", CacheStatus = "cachestatus", UCacheStatus = "ucachestatus",
+    SetVmThreshold = "setvmthreshold", VmReclaim = "vmreclaim", StartJob = "startjob", CurrentObjectFormat = "currentobjectformat",
+    Revision = "revision", SerialNumber = "serialnumber", Read = "read", FilePosition = "fileposition",
+    SetFilePosition = "setfileposition", DeleteFile = "deletefile", RenameFile = "renamefile", Run = "run",
+    // User paths.
+    UFill = "ufill", UEoFill = "ueofill", UStroke = "ustroke", UAppend = "uappend", UPath = "upath", SetBBox = "setbbox",
 }
@@ -0,0 +1,110 @@
+//! The previews an EPS file carries for apps that don't read PostScript, opened when its
+//! PostScript can't be: a TIFF image or a Windows metafile behind the binary header, or an EPSI
+//! bitmap in comments, stretched over the page.
+
+use vectorcraft_doc::{Document, ImageBlob, ImageObject, Node, NodeKind};
+use vectorcraft_geom::{Affine, Rect};
+
+/// Largest EPSI bitmap side read (pixels).
+const MAX_EPSI: usize = 8192;
+
+/// A preview's document and how the user is told about it.
+pub(super) struct Preview {
+    pub document: Document,
+    /// What was opened instead ("its preview was placed instead, …").
+    pub what: &'static str,
+}
+
+/// The best preview of `bytes` (the whole file; `ps` its PostScript) over `frame`: the TIFF
+/// image, else the metafile's vectors, else the EPSI bitmap.
+pub(super) fn preview(bytes: &[u8], ps: &[u8], frame: Rect) -> Option<Preview> {
+    const IMAGE: &str = "its preview was placed instead, at screen resolution";
+    if let Some(document) = crate::sections(bytes).and_then(|(_, tiff)| tiff).and_then(tiff_rgba).and_then(|img| image_doc(img, frame)) {
+        return Some(Preview { document, what: IMAGE });
+    }
+    if let Some(document) = crate::metafile_preview(bytes).and_then(|wmf| metafile_doc(wmf, frame)) {
+        return Some(Preview { document, what: "its Windows metafile preview was opened instead, which may simplify the art" });
+    }
+    epsi(ps).and_then(|img| image_doc(img, frame)).map(|document| Preview { document, what: IMAGE })
+}
+
+fn tiff_rgba(tiff: &[u8]) -> Option<image::RgbaImage> {
+    match image::load_from_memory_with_format(tiff, image::ImageFormat::Tiff) {
+        Ok(img) => Some(img.to_rgba8()),
+        Err(_) => crate::tiff::palette_rgba(tiff),
+    }
+}
+
+/// A document of `frame`'s size showing `img` stretched over it.
+fn image_doc(img: image::RgbaImage, frame: Rect) -> Option<Document> {
+    let (w, h) = img.dimensions();
+    if w == 0 || h == 0 {
+        return None;
+    }
+    let mut png = vec![];
+    img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).ok()?;
+    let mut doc = Document::new(frame.width(), frame.height());
+    let blob = ImageBlob::new("image/png", png);
+    let key = blob.content_key();
+    doc.images.insert(key.clone(), blob);
+    let xf = Affine::scale_non_uniform(frame.width() / f64::from(w), frame.height() / f64::from(h));
+    let mut n = Node::new(doc.alloc_id(), NodeKind::Image(ImageObject { key, width: w, height: h, xf, link: None, placement: Default::default() }));
+    n.name = Some("Preview".into());
+    let layer = doc.layers.first().map(|l| l.id)?;
+    doc.insert(Some(layer), 0, n).ok()?;
+    Some(doc)
+}
+
+/// A document of `frame`'s size with the metafile's art stretched from its picture frame over it.
+fn metafile_doc(wmf: &[u8], frame: Rect) -> Option<Document> {
+    let mut doc = vectorcraft_metafile::import(wmf).ok()?.document;
+    let from = doc.artboards.first()?.rect;
+    if from.width() <= 0.0 || from.height() <= 0.0 {
+        return None;
+    }
+    let a = Affine::translate(frame.origin().to_vec2())
+        * Affine::scale_non_uniform(frame.width() / from.width(), frame.height() / from.height())
+        * Affine::translate(-from.origin().to_vec2());
+    for layer in &mut doc.layers {
+        let layer = std::sync::Arc::make_mut(layer);
+        for n in layer.children_mut().into_iter().flatten() {
+            std::sync::Arc::make_mut(n).transform(a, true);
+        }
+    }
+    if let Some(board) = doc.artboards.first_mut() {
+        board.rect = frame;
+    }
+    doc.layers.iter().any(|l| l.children().is_some_and(|c| !c.is_empty())).then_some(doc)
+}
+
+/// The EPSI preview in `ps`'s comments (`%%BeginPreview: width height depth lines`, hex rows,
+/// 0 white and the largest value black).
+fn epsi(ps: &[u8]) -> Option<image::RgbaImage> {
+    let text = String::from_utf8_lossy(ps);
+    let mut lines = text.lines();
+    let head = lines.find_map(|l| l.strip_prefix("%%BeginPreview:"))?;
+    let n: Vec<usize> = head.split_whitespace().map_while(|w| w.parse().ok()).collect();
+    let [w, h, depth, ..] = n[..] else { return None };
+    if !(1..=MAX_EPSI).contains(&w) || !(1..=MAX_EPSI).contains(&h) || ![1, 2, 4, 8].contains(&depth) {
+        return None;
+    }
+    let row = (w * depth).div_ceil(8);
+    let mut hex = Vec::with_capacity((row * h * 2).min(ps.len()));
+    for l in lines {
+        if l.starts_with("%%EndPreview") || hex.len() >= row * h * 2 {
+            break;
+        }
+        hex.extend(l.strip_prefix('%')?.bytes().filter(u8::is_ascii_hexdigit));
+    }
+    let bytes = super::lex::hex_decode(&hex)?;
+    let max = (1u32 << depth) - 1;
+    let mut img = image::RgbaImage::new(w as u32, h as u32);
+    for (x, y, px) in img.enumerate_pixels_mut() {
+        let bit = y as usize * row * 8 + x as usize * depth;
+        let byte = u32::from(bytes.get(bit / 8).copied().unwrap_or(0));
+        let v = (byte >> (8 - depth - bit % 8)) & max;
+        let grey = (255 - v * 255 / max) as u8;
+        *px = image::Rgba([grey, grey, grey, 255]);
+    }
+    Some(img)
+}
@@ -0,0 +1,376 @@
+//! Shadings that aren't gradients, as gradient meshes: function-based ones (type 1) sampled on a
+//! grid, free-form and lattice triangle meshes (types 4 and 5) and Coons and tensor patch meshes
+//! (types 6 and 7), their vertices read from an array or packed in a string or file; and sampled
+//! functions (type 0) that shadings and tint transforms use.
+
+use std::sync::Arc;
+
+use vectorcraft_color::{Color, Paint};
+use vectorcraft_doc::live::GradientMesh;
+use vectorcraft_doc::{Node, NodeId, NodeKind};
+use vectorcraft_geom::{Affine, Point};
+
+use super::graphics::Space;
+use super::interp::{Interp, matrix_of};
+use super::obj::{DictRef, Key, Obj, PsError, Res, ps_err};
+
+/// Most patches (or triangles) one shading makes: past it, it is left out with a warning.
+const MAX_PATCHES: usize = 4096;
+/// Rows and columns of the mesh a function-based shading is sampled on.
+const FUNCTION_GRID: u32 = 16;
+/// Most samples a sampled function has.
+const MAX_SAMPLES: usize = 1 << 24;
+/// Most outputs (colour components) a sampled function has.
+const MAX_OUTPUTS: usize = 32;
+/// Work one patch costs against the operation budget.
+const PATCH_OPS: u64 = 64;
+
+const TOO_MANY_PATCHES: &str = "shadings of more than 4096 patches or triangles were left out";
+
+/// The numbers of a shading's vertices: from an array, or packed in bits ([`Packed`]).
+enum Vertices {
+    Nums(Vec<f64>, usize),
+    Packed(Packed),
+}
+
+/// Vertex data packed in bits: flags, coordinates and colour components, each its own width and
+/// mapped through `Decode`.
+struct Packed {
+    bytes: Vec<u8>,
+    /// The next bit.
+    at: usize,
+    flag: u32,
+    coord: u32,
+    comp: u32,
+    decode: Vec<f64>,
+}
+
+impl Packed {
+    fn bits(&mut self, n: u32) -> Option<u64> {
+        if n == 0 || n > 32 || self.at.checked_add(n as usize)? > self.bytes.len() * 8 {
+            return None;
+        }
+        let mut v = 0u64;
+        for _ in 0..n {
+            let byte = *self.bytes.get(self.at / 8)?;
+            v = v << 1 | u64::from(byte >> (7 - self.at % 8) & 1);
+            self.at += 1;
+        }
+        Some(v)
+    }
+
+    /// A value of `n` bits through decode range `i` (`[min max]` pairs).
+    fn value(&mut self, n: u32, i: usize) -> Option<f64> {
+        let raw = self.bits(n)? as f64;
+        let max = ((1u64 << n) - 1) as f64;
+        let (lo, hi) = (self.decode.get(2 * i).copied().unwrap_or(0.0), self.decode.get(2 * i + 1).copied().unwrap_or(1.0));
+        Some(lo + raw * (hi - lo) / max)
+    }
+}
+
+impl Vertices {
+    fn flag(&mut self) -> Option<u32> {
+        match self {
+            Self::Nums(v, at) => {
+                let f = *v.get(*at)?;
+                *at += 1;
+                Some(f.max(0.0) as u32)
+            }
+            Self::Packed(p) => p.bits(p.flag).map(|f| f as u32),
+        }
+    }
+
+    fn num(&mut self, comp: bool, i: usize) -> Option<f64> {
+        match self {
+            Self::Nums(v, at) => {
+                let f = *v.get(*at)?;
+                *at += 1;
+                f.is_finite().then_some(f)
+            }
+            Self::Packed(p) => p.value(if comp { p.comp } else { p.coord }, i),
+        }
+    }
+
+    fn point(&mut self) -> Option<Point> {
+        Some(Point::new(self.num(false, 0)?, self.num(false, 1)?))
+    }
+
+    /// A vertex colour's `n` values (components, or the function's input).
+    fn color(&mut self, n: usize) -> Option<Vec<f64>> {
+        (0..n).map(|i| self.num(true, 2 + i)).collect()
+    }
+
+    /// Packed vertices start at a byte (triangle meshes).
+    fn align(&mut self) {
+        if let Self::Packed(p) = self {
+            p.at = p.at.div_ceil(8) * 8;
+        }
+    }
+}
+
+impl Interp<'_> {
+    /// Paint shading `sh` (types 1, 4–7) as gradient meshes, `m` mapping shading space onto the
+    /// document, under the current clip.
+    pub fn mesh_fill(&mut self, sh: &DictRef, m: Affine) -> Res {
+        let get = |k: &str| sh.borrow().get(&Key::name(k)).cloned();
+        let kind = get("ShadingType").and_then(|o| o.as_num()).unwrap_or(0.0);
+        let space = self.space_of(&get("ColorSpace").ok_or(PsError::Ps("undefined", "ColorSpace".into()))?, 0)?;
+        let function = get("Function");
+        let meshes = if kind == 1.0 { self.function_mesh(sh, &space, m)? } else { self.patch_mesh(sh, kind, &space, function.as_ref(), m)? };
+        let Some(meshes) = meshes else {
+            self.out.warn(TOO_MANY_PATCHES);
+            return Ok(());
+        };
+        let mut nodes: Vec<Node> = meshes.into_iter().map(|g| Node::new(NodeId(0), NodeKind::Mesh(g))).collect();
+        let node = match nodes.len() {
+            0 => return Ok(()),
+            1 => nodes.swap_remove(0),
+            _ => {
+                let children = nodes
+                    .into_iter()
+                    .map(|mut n| {
+                        n.id = self.out.doc.alloc_id();
+                        Arc::new(n)
+                    })
+                    .collect();
+                Node::group(NodeId(0), children)
+            }
+        };
+        let clips = self.g.clips.clone();
+        self.out.push(node, &clips);
+        Ok(())
+    }
+
+    /// The colour of a vertex's values `v`: through the shading's function when it has one.
+    fn vertex_color(&mut self, space: &Space, function: Option<&Obj>, v: &[f64]) -> Res<Color> {
+        let comps = match function {
+            Some(f) => self.eval(f, v, 0)?,
+            None => v.to_vec(),
+        };
+        Ok(match self.paint_of(space, &comps)? {
+            Paint::Solid { color, .. } => color,
+            _ => Color::BLACK,
+        })
+    }
+
+    /// A function-based shading (type 1) sampled on a grid over its domain.
+    fn function_mesh(&mut self, sh: &DictRef, space: &Space, m: Affine) -> Res<Option<Vec<GradientMesh>>> {
+        let get = |k: &str| sh.borrow().get(&Key::name(k)).cloned();
+        let domain: Vec<f64> = get("Domain").and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default();
+        let [x0, x1, y0, y1] = <[f64; 4]>::try_from(domain).unwrap_or([0.0, 1.0, 0.0, 1.0]);
+        let f = get("Function").ok_or(PsError::Ps("undefined", "Function".into()))?;
+        let matrix = get("Matrix").and_then(|o| o.items().and_then(|i| matrix_of(&i.borrow()))).unwrap_or(Affine::IDENTITY);
+        let n = FUNCTION_GRID as usize;
+        let at = |i: usize, lo: f64, hi: f64| lo + (hi - lo) * i as f64 / n as f64;
+        let mut colors = Vec::with_capacity((n + 1) * (n + 1));
+        for r in 0..=n {
+            for c in 0..=n {
+                self.spend(PATCH_OPS)?;
+                colors.push(self.vertex_color(space, Some(&f), &[at(c, x0, x1), at(r, y0, y1)])?);
+            }
+        }
+        let xf = m * matrix;
+        let surface = |u: f64, v: f64| xf * Point::new(x0 + (x1 - x0) * u, y0 + (y1 - y0) * v);
+        let color = |u: f64, v: f64| {
+            let (c, r) = ((u * n as f64).round() as usize, (v * n as f64).round() as usize);
+            colors.get(r * (n + 1) + c).copied().unwrap_or(Color::BLACK)
+        };
+        Ok(Some(vec![GradientMesh::from_surface(FUNCTION_GRID, FUNCTION_GRID, &surface, &color)]))
+    }
+
+    /// The vertices of a mesh shading's `DataSource`.
+    fn vertices(&mut self, sh: &DictRef, flags: bool) -> Res<Vertices> {
+        let get = |k: &str| sh.borrow().get(&Key::name(k)).cloned();
+        let bytes = match get("DataSource").ok_or(PsError::Ps("undefined", "DataSource".into()))? {
+            Obj::Array { items, .. } => {
+                let v: Option<Vec<f64>> = items.borrow().iter().map(Obj::as_num).collect();
+                return Ok(Vertices::Nums(v.ok_or(PsError::Ps("typecheck", "DataSource".into()))?, 0));
+            }
+            Obj::Str(s) => s.to_vec(),
+            Obj::File { stream, .. } => self.peek_all(&stream)?,
+            _ => return ps_err("typecheck", "DataSource"),
+        };
+        let bits = |k: &str| get(k).and_then(|o| o.as_num()).filter(|v| (1.0..=32.0).contains(v)).map(|v| v as u32);
+        let (Some(coord), Some(comp)) = (bits("BitsPerCoordinate"), bits("BitsPerComponent")) else {
+            return ps_err("rangecheck", "BitsPerCoordinate");
+        };
+        let flag = if flags { bits("BitsPerFlag").ok_or(PsError::Ps("rangecheck", "BitsPerFlag".into()))? } else { 0 };
+        let decode: Vec<f64> = get("Decode").and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default();
+        Ok(Vertices::Packed(Packed { bytes, at: 0, flag, coord, comp, decode }))
+    }
+
+    /// A triangle (types 4, 5) or patch (6, 7) mesh in the document (`m`); `None` past
+    /// [`MAX_PATCHES`].
+    fn patch_mesh(&mut self, sh: &DictRef, kind: f64, space: &Space, function: Option<&Obj>, m: Affine) -> Res<Option<Vec<GradientMesh>>> {
+        let n = if function.is_some() { 1 } else { space.n() };
+        let mut v = self.vertices(sh, kind != 5.0)?;
+        let mut corner = |it: &mut Self, v: &mut Vertices| -> Res<Option<Color>> {
+            match v.color(n) {
+                Some(c) => it.vertex_color(space, function, &c).map(Some),
+                None => Ok(None),
+            }
+        };
+        if kind == 6.0 || kind == 7.0 {
+            return self.patches(&mut v, kind == 7.0, m, &mut corner);
+        }
+        let per_row = sh.borrow().get(&Key::name("VerticesPerRow")).and_then(Obj::as_num).filter(|r| (2.0..=1e6).contains(r)).map(|r| r as usize);
+        let lattice = kind == 5.0;
+        let mut pts: Vec<(Point, Color)> = vec![];
+        let mut tris: Vec<[usize; 3]> = vec![];
+        // Free-form: vertices still to come of the triangle being made.
+        let mut left = 0;
+        loop {
+            let flag = if lattice { 0 } else { v.flag().unwrap_or(u32::MAX) };
+            let Some(p) = v.point().filter(|_| flag != u32::MAX) else { break };
+            let Some(color) = corner(self, &mut v)? else { break };
+            if !lattice {
+                v.align();
+            }
+            self.spend(PATCH_OPS)?;
+            pts.push((m * p, color));
+            let i = pts.len() - 1;
+            if lattice {
+                // Each cell between two rows is two triangles.
+                if let Some(w) = per_row
+                    && i >= w
+                    && !i.is_multiple_of(w)
+                {
+                    tris.push([i - w - 1, i - w, i - 1]);
+                    tris.push([i - w, i - 1, i]);
+                }
+            } else if left > 0 {
+                // A vertex ending a triangle begun with flag 0.
+                left -= 1;
+                if left == 0 && i >= 2 {
+                    tris.push([i - 2, i - 1, i]);
+                }
+            } else {
+                // A triangle on the last one's edge (flag 1: its second and third vertices, 2: its
+                // first and third), or the first vertex of a new one.
+                match (flag, tris.last().copied()) {
+                    (1, Some([_, b, c])) => tris.push([b, c, i]),
+                    (2, Some([a, _, c])) => tris.push([a, c, i]),
+                    _ => left = 2,
+                }
+            }
+            if tris.len() > MAX_PATCHES {
+                return Ok(None);
+            }
+        }
+        let at = |i: usize| pts.get(i).copied().unwrap_or((Point::ZERO, Color::BLACK));
+        Ok(Some(tris.iter().filter_map(|t| GradientMesh::triangle(t.map(at))).collect()))
+    }
+
+    /// Coons (`tensor`: tensor-product) patches: twelve boundary points (a tensor patch's four
+    /// inner ones are read and left out), four corner colours; a patch on the last one's edge
+    /// (flag 1–3) takes that edge's four points and two colours from it.
+    fn patches(
+        &mut self,
+        v: &mut Vertices,
+        tensor: bool,
+        m: Affine,
+        corner: &mut impl FnMut(&mut Self, &mut Vertices) -> Res<Option<Color>>,
+    ) -> Res<Option<Vec<GradientMesh>>> {
+        let mut out = vec![];
+        let mut prev: Option<([Point; 12], [Color; 4])> = None;
+        while let Some(flag) = v.flag() {
+            let shared = match (flag, &prev) {
+                (0, _) => None,
+                (1, Some((p, c))) => Some(([p[3], p[4], p[5], p[6]], [c[1], c[2]])),
+                (2, Some((p, c))) => Some(([p[6], p[7], p[8], p[9]], [c[2], c[3]])),
+                (3, Some((p, c))) => Some(([p[9], p[10], p[11], p[0]], [c[3], c[0]])),
+                _ => return ps_err("rangecheck", "a patch flag"),
+            };
+            let mut cp = [Point::ZERO; 12];
+            let mut colors = [Color::BLACK; 4];
+            let (first_point, first_color) = match shared {
+                Some((pts, cs)) => {
+                    cp[..4].copy_from_slice(&pts);
+                    colors[..2].copy_from_slice(&cs);
+                    (4, 2)
+                }
+                None => (0, 0),
+            };
+            for slot in cp.iter_mut().skip(first_point) {
+                let Some(p) = v.point() else { return Ok(Some(out)) };
+                *slot = m * p;
+            }
+            if tensor && (0..4).any(|_| v.point().is_none()) {
+                return Ok(Some(out));
+            }
+            for slot in colors.iter_mut().skip(first_color) {
+                let Some(c) = corner(self, v)? else { return Ok(Some(out)) };
+                *slot = c;
+            }
+            self.spend(PATCH_OPS)?;
+            if out.len() >= MAX_PATCHES {
+                return Ok(None);
+            }
+            out.extend(GradientMesh::coons(&cp, colors));
+            prev = Some((cp, colors));
+        }
+        Ok(Some(out))
+    }
+
+    /// A sampled function (type 0) at `x`: the samples around it, interpolated linearly for
+    /// one input, the nearest one for more.
+    pub(super) fn sampled(&mut self, f: &DictRef, x: &[f64]) -> Res<Vec<f64>> {
+        let get = |k: &str| f.borrow().get(&Key::name(k)).cloned();
+        let nums =
+            |k: &str| -> Vec<f64> { get(k).and_then(|o| o.items().map(|i| i.borrow().iter().filter_map(Obj::as_num).collect())).unwrap_or_default() };
+        let (domain, range, size) = (nums("Domain"), nums("Range"), nums("Size"));
+        let m = domain.len() / 2;
+        let outs = range.len() / 2;
+        if m == 0 || outs == 0 || outs > MAX_OUTPUTS || size.len() < m || size.iter().any(|s| !(1.0..=MAX_SAMPLES as f64).contains(s)) {
+            return ps_err("rangecheck", "a sampled function");
+        }
+        let bps =
+            get("BitsPerSample").and_then(|o| o.as_num()).filter(|b| [1.0, 2.0, 4.0, 8.0, 12.0, 16.0, 24.0, 32.0].contains(b)).map(|b| b as usize);
+        let bps = bps.ok_or(PsError::Ps("rangecheck", "BitsPerSample".into()))?;
+        if size.iter().take(m).try_fold(1usize, |acc, s| acc.checked_mul(*s as usize)).is_none_or(|t| t > MAX_SAMPLES) {
+            return ps_err("limitcheck", "Size");
+        }
+        let bytes = match get("DataSource") {
+            Some(Obj::Str(s)) => s.to_vec(),
+            Some(Obj::File { stream, .. }) => self.peek_all(&stream)?,
+            _ => return ps_err("typecheck", "DataSource"),
+        };
+        let (encode, decode) = (nums("Encode"), nums("Decode"));
+        let max = ((1u64 << bps) - 1) as f64;
+        let sample = |index: usize, j: usize| -> f64 {
+            let bit = (index as u64 * outs as u64 + j as u64) * bps as u64;
+            let raw = (0..bps as u64).fold(0u64, |v, k| {
+                let b = usize::try_from((bit + k) / 8).ok().and_then(|i| bytes.get(i)).copied().unwrap_or(0);
+                v << 1 | u64::from(b >> (7 - (bit + k) % 8) & 1)
+            }) as f64;
+            let (d0, d1) = (
+                decode.get(2 * j).or(range.get(2 * j)).copied().unwrap_or(0.0),
+                decode.get(2 * j + 1).or(range.get(2 * j + 1)).copied().unwrap_or(1.0),
+            );
+            let (r0, r1) = (range.get(2 * j).copied().unwrap_or(0.0), range.get(2 * j + 1).copied().unwrap_or(1.0));
+            (d0 + raw * (d1 - d0) / max).clamp(r0.min(r1), r0.max(r1))
+        };
+        // Each input into sample space.
+        let mut pos = Vec::with_capacity(m);
+        for i in 0..m {
+            let (a, b) = (domain.get(2 * i).copied().unwrap_or(0.0), domain.get(2 * i + 1).copied().unwrap_or(1.0));
+            let s = size.get(i).copied().unwrap_or(1.0);
+            let (e0, e1) = (encode.get(2 * i).copied().unwrap_or(0.0), encode.get(2 * i + 1).copied().unwrap_or(s - 1.0));
+            let xi = x.get(i).copied().unwrap_or(a).clamp(a.min(b), a.max(b));
+            let e = if b != a { e0 + (xi - a) * (e1 - e0) / (b - a) } else { e0 };
+            pos.push(e.clamp(0.0, s - 1.0));
+        }
+        if let ([p], Some(s)) = (pos.as_slice(), size.first()) {
+            let (lo, hi) = (p.floor() as usize, (p.ceil() as usize).min(*s as usize - 1));
+            let t = p - p.floor();
+            return Ok((0..outs).map(|j| sample(lo, j) * (1.0 - t) + sample(hi, j) * t).collect());
+        }
+        let mut index = 0;
+        let mut stride = 1;
+        for (i, p) in pos.iter().enumerate() {
+            index += p.round() as usize * stride;
+            stride *= size.get(i).copied().unwrap_or(1.0) as usize;
+        }
+        Ok((0..outs).map(|j| sample(index, j)).collect())
+    }
+}
@@ -11,21 +11,21 @@ use crate::import::{Dsc, import};
 use crate::{EpsOptions, Level, Preview, Raster};

 /// `body` as an EPS file with a 100 × 100 pt bounding box.
-fn eps(body: &str) -> Vec<u8> {
+pub(super) fn eps(body: &str) -> Vec<u8> {
    format!("%!PS-Adobe-3.0 EPSF-3.0\n%%BoundingBox: 0 0 100 100\n%%EndComments\n{body}\nshowpage\n%%EOF\n").into_bytes()
 }

-fn read(body: &str) -> crate::Imported {
+pub(super) fn read(body: &str) -> crate::Imported {
    import(&eps(body)).unwrap()
 }

 /// The objects of the document's layer.
-fn objects(d: &Document) -> Vec<Arc<Node>> {
+pub(super) fn objects(d: &Document) -> Vec<Arc<Node>> {
    d.layers[0].children().unwrap().clone()
 }

 /// Every object, down through groups, in order.
-fn all(d: &Document) -> Vec<Arc<Node>> {
+pub(super) fn all(d: &Document) -> Vec<Arc<Node>> {
    fn walk(n: &Arc<Node>, out: &mut Vec<Arc<Node>>) {
        out.push(n.clone());
        for c in n.children().into_iter().flatten() {
@@ -39,25 +39,25 @@ fn all(d: &Document) -> Vec<Arc<Node>> {
    out
 }

-fn fill(n: &Node) -> Option<&Paint> {
+pub(super) fn fill(n: &Node) -> Option<&Paint> {
    n.appearance.items.iter().find_map(|i| match i {
        AppearanceItem::Fill(f) => Some(&f.paint),
        _ => None,
    })
 }

-fn stroke(n: &Node) -> Option<&vectorcraft_doc::StrokeLayer> {
+pub(super) fn stroke(n: &Node) -> Option<&vectorcraft_doc::StrokeLayer> {
    n.appearance.items.iter().find_map(|i| match i {
        AppearanceItem::Stroke(s) => Some(s),
        _ => None,
    })
 }

-fn bounds(n: &Node) -> Rect {
+pub(super) fn bounds(n: &Node) -> Rect {
    n.geometric_bounds().unwrap()
 }

-fn near(a: Rect, b: Rect) -> bool {
+pub(super) fn near(a: Rect, b: Rect) -> bool {
    [(a.x0, b.x0), (a.y0, b.y0), (a.x1, b.x1), (a.y1, b.y1)].iter().all(|(x, y)| (x - y).abs() < 0.05)
 }

@@ -195,6 +195,20 @@ fn clips_become_clipping_groups() {
    assert!(matches!(o[0].kind, NodeKind::Group { clip: true, .. }));
 }

+#[test]
+fn clips_nest_only_so_deep() {
+    // Each clip inside the last one used to nest a clipping group one level deeper, past the stack.
+    let r = read("1 1 200000 { pop 0 0 50 50 rectclip } for 1 1 5 5 rectfill");
+    let mut depth = 0;
+    let mut n = objects(&r.document)[0].clone();
+    while let NodeKind::Group { children, clip: true } = &n.kind {
+        depth += 1;
+        n = children.last().unwrap().clone();
+    }
+    assert_eq!(depth, vectorcraft_doc::clipnest::MAX_NEST);
+    assert!(r.warnings.iter().any(|w| w.contains("clips nested more than")), "{:?}", r.warnings);
+}
+
 #[test]
 fn shadings_become_gradients() {
    let axial =
@@ -266,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]
@@ -463,7 +481,7 @@ fn blue(body: &str) {
 }

 /// Check that PostScript `cond` leaves `true`.
-fn check(cond: &str) {
+pub(super) fn check(cond: &str) {
    blue(&format!("{cond} {{ 0 0 1 setrgbcolor }} {{ 1 0 0 setrgbcolor }} ifelse"));
 }

@@ -0,0 +1,91 @@
+//! Illustrator files (Illustrator 3–8 and their EPS): the groups they write (`u` … `U`) come in
+//! as groups, nested as they were, between and inside clipping groups.
+
+use std::sync::Arc;
+
+use vectorcraft_doc::clipnest::MAX_NEST;
+use vectorcraft_doc::{Node, NodeKind};
+
+use crate::import::import;
+
+/// A minimal file in Illustrator's format: its header comments, a prolog of our own defining the
+/// operators `body` uses (`u` and `U` as `ugroup` and `Ugroup`), and `body`.
+fn ai(header: &str, ugroup: &str, body: &str) -> Vec<u8> {
+    format!(
+        "%!PS-Adobe-3.0 EPSF-3.0\n{header}%%BoundingBox: 0 0 100 100\n%%EndComments\n%%BeginProlog\n\
+         /m {{moveto}} def /L {{lineto}} def /f {{closepath fill}} def /S {{stroke}} def /g {{setgray}} def\n\
+         /u {{{ugroup}}} def /U {{{}}} def\n%%EndProlog\n{body}\nshowpage\n%%EOF\n",
+        if ugroup.contains("gsave") { "grestore" } else { "" }
+    )
+    .into_bytes()
+}
+
+const AI8: &str = "%%Creator: Adobe Illustrator(R) 8.0\n%AI5_FileFormat 4.0\n";
+
+/// A triangle filled at `x`.
+fn tri(x: u32) -> String {
+    format!("{x} {x} m {} {x} L {} {} L f", x + 5, x + 5, x + 5)
+}
+
+/// The layer's objects as a tree: `p` a path, `c` a clip path, `g[…]` a group, `k[…]` a clipping
+/// group.
+fn tree(nodes: &[Arc<Node>]) -> String {
+    let one = |n: &Arc<Node>| match &n.kind {
+        NodeKind::Group { children, clip: false } => format!("g[{}]", tree(children)),
+        NodeKind::Group { children, clip: true } => format!("k[{}]", tree(children)),
+        NodeKind::Path { clipping: true, .. } => "c".into(),
+        NodeKind::Path { .. } => "p".into(),
+        k => format!("{k:?}"),
+    };
+    nodes.iter().map(one).collect::<Vec<_>>().join(" ")
+}
+
+fn read(header: &str, ugroup: &str, body: &str) -> (String, Vec<String>) {
+    let r = import(&ai(header, ugroup, body)).unwrap();
+    (tree(r.document.layers[0].children().unwrap()), r.warnings)
+}
+
+#[test]
+fn groups_and_nested_groups_come_in_as_groups() {
+    let body = format!("u {} u {} {} U U {}", tri(10), tri(30), tri(50), tri(70));
+    assert_eq!(read(AI8, "", &body), ("g[p g[p p]] p".into(), vec![]));
+    // Illustrator 3's header names it only as the creator; a prolog whose groups save and restore
+    // the graphics state groups the same.
+    assert_eq!(read("%%Creator:Adobe Illustrator(TM) 3.2\n", "gsave", &body).0, "g[p g[p p]] p");
+    // Groups of one object, and groups next to each other.
+    assert_eq!(read(AI8, "", &format!("u {} U u {} U", tri(10), tri(30))).0, "g[p] g[p]");
+}
+
+#[test]
+fn groups_nest_with_clipping_groups() {
+    // A clipping group inside a group, a group inside a clipping group.
+    let clip = "gsave 0 0 m 50 0 L 50 50 L 0 50 L closepath clip newpath";
+    let body = format!("u {} {clip} u {} {} U grestore {} U", tri(10), tri(20), tri(30), tri(40));
+    assert_eq!(read(AI8, "", &body).0, "g[p k[c g[p p]] p]");
+    // A fill and a stroke of one path in a group stay one object.
+    let body = "u 10 10 m 20 10 L 20 20 L closepath gsave 0 g fill grestore S U";
+    let r = import(&ai(AI8, "", body)).unwrap();
+    let layer = r.document.layers[0].children().unwrap();
+    assert_eq!(tree(layer), "g[p]");
+    assert_eq!(layer[0].children().unwrap()[0].appearance.items.len(), 2);
+}
+
+#[test]
+fn other_postscript_keeps_its_own_u() {
+    // A program that isn't Illustrator's may name its own procedures `u` and `U`.
+    let body = format!("u {} {} U", tri(10), tri(30));
+    assert_eq!(read("%%Creator: some app\n", "", &body).0, "p p");
+}
+
+#[test]
+fn unbalanced_and_runaway_groups_are_read_safely() {
+    // Ends without a beginning end nothing; groups left open hold the rest.
+    assert_eq!(read(AI8, "", &format!("U U {} u {} u {}", tri(10), tri(20), tri(30))).0, "p g[p g[p]]");
+    // Groups nest only so deep: the deeper ones' art goes into the innermost group read, and the
+    // groups around them close where they should.
+    let n = MAX_NEST + 50;
+    let body = format!("{} {} {} {}", "u ".repeat(n), tri(10), "U ".repeat(n), tri(30));
+    let (t, warnings) = read(AI8, "", &body);
+    assert_eq!(t, format!("{}p{} p", "g[".repeat(MAX_NEST), "]".repeat(MAX_NEST)));
+    assert!(warnings.iter().any(|w| w.contains("nested more than")), "{warnings:?}");
+}
@@ -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);
+}
@@ -4,11 +4,14 @@

 use std::rc::Rc;

+use std::sync::Arc;
 use vectorcraft_color::Paint;
+
 use vectorcraft_doc::{CharStyle, Node, NodeId, NodeKind, TextObject};
 use vectorcraft_geom::{Affine, Point, Vec2};
 use vectorcraft_text::TextLayout;

+use super::graphics::MAX_APART;
 use super::interp::{Interp, matrix_obj, matrix_of};
 use super::obj::{Dict, DictRef, Key, Obj, Op, PsError, Res, ps_err};

@@ -17,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);
@@ -133,44 +141,19 @@ impl Interp<'_> {
                self.push(Obj::Bool(known))?;
            }
            ResourceForAll => self.resource_for_all()?,
-            Show => {
-                let s = self.pop_str()?.to_vec();
-                self.show(&s)?;
-            }
-            AShow => {
-                let s = self.pop_str()?.to_vec();
-                self.nums::<2>()?;
-                self.show(&s)?;
-            }
-            WidthShow => {
-                let s = self.pop_str()?.to_vec();
-                self.pop()?;
-                self.nums::<2>()?;
-                self.show(&s)?;
-            }
-            AWidthShow => {
-                let s = self.pop_str()?.to_vec();
-                self.nums::<2>()?;
-                self.pop()?;
-                self.nums::<2>()?;
-                self.show(&s)?;
-            }
-            XShow | YShow | XYShow => {
-                self.pop()?;
-                let s = self.pop_str()?.to_vec();
-                self.show(&s)?;
-            }
-            KShow => {
-                let s = self.pop_str()?.to_vec();
-                self.pop()?;
-                self.show(&s)?;
+            Show | AShow | WidthShow | AWidthShow | XShow | YShow | XYShow | KShow => {
+                let (s, spacing) = self.show_operands(op)?;
+                match self.type3_font() {
+                    Some(font) => self.show_type3(&font, &s, &spacing)?,
+                    None => self.show(&s)?,
+                }
            }
            CShow => {
                // The procedure shows or places each character: it gets its code and width.
                let s = self.pop_str()?.to_vec();
                let proc = self.pop_proc()?;
                for b in s {
-                    let (_, _, v) = self.set_type(&[b], Point::ZERO)?;
+                    let v = self.width_of(&[b])?;
                    self.push(Obj::Int(i64::from(b)))?;
                    self.push_num(v.x)?;
                    self.push_num(v.y)?;
@@ -181,12 +164,23 @@ impl Interp<'_> {
            }
            GlyphShow => {
                let name = self.pop()?.text().unwrap_or_else(|| Rc::from(""));
-                let ch = glyph_char(&name);
-                self.show(ch.encode_utf8(&mut [0; 4]).as_bytes())?;
+                match self.type3_font() {
+                    Some(font) => {
+                        let start = self.out.drawn.len();
+                        let at = self.user_point()?;
+                        let w = self.type3_glyph(&font, Glyph::Name(name.clone()), at, true)?;
+                        self.g.cur = Some(self.xf() * (at + w));
+                        self.group_glyphs(start, &name);
+                    }
+                    None => {
+                        let ch = glyph_char(&name);
+                        self.show(ch.encode_utf8(&mut [0; 4]).as_bytes())?;
+                    }
+                }
            }
            StringWidth => {
                let s = self.pop_str()?.to_vec();
-                let (_, _, v) = self.set_type(&s, Point::ZERO)?;
+                let v = self.width_of(&s)?;
                self.push_num(v.x)?;
                self.push_num(v.y)?;
            }
@@ -195,17 +189,169 @@ impl Interp<'_> {
                let s = self.pop_str()?.to_vec();
                self.char_path(&s)?;
            }
-            SetCacheDevice => {
-                self.nums::<6>()?;
-            }
-            SetCharWidth => {
-                self.nums::<2>()?;
+            // A glyph procedure gives its width (`w0x w0y` first).
+            SetCacheDevice => self.glyph_width = Some(self.nums::<6>()?[..2].try_into().unwrap_or_default()),
+            SetCharWidth => self.glyph_width = Some(self.nums::<2>()?),
+            SetCacheDevice2 => self.glyph_width = Some(self.nums::<10>()?[..2].try_into().unwrap_or_default()),
+            RootFont => {
+                let font = match self.g.font.clone() {
+                    Some(f) => f,
+                    None => self.find_font(&Obj::name(DEFAULT_FONT))?,
+                };
+                self.push(Obj::Dict(font))?;
            }
            _ => return ps_err("undefined", op.name()),
        }
        Ok(())
    }

+    /// The string of a show operator and how it spaces its glyphs.
+    fn show_operands(&mut self, op: Op) -> Res<(Vec<u8>, Spacing)> {
+        use Op::*;
+        let num_vec = |[x, y]: [f64; 2]| Vec2::new(x, y);
+        if matches!(op, XShow | YShow | XYShow) {
+            // A number array (an encoded number string spaces glyphs by their widths).
+            let widths = match self.pop()? {
+                Obj::Array { items, .. } => items.borrow().iter().filter_map(Obj::as_num).collect(),
+                _ => vec![],
+            };
+            let s = self.pop_str()?.to_vec();
+            return Ok((s, Spacing::Widths(widths, op)));
+        }
+        let s = self.pop_str()?.to_vec();
+        let spacing = match op {
+            AShow => Spacing::Add(num_vec(self.nums()?), None),
+            WidthShow => {
+                let ch = self.pop_int()?;
+                Spacing::Add(Vec2::ZERO, Some((ch, num_vec(self.nums()?))))
+            }
+            AWidthShow => {
+                let a = num_vec(self.nums()?);
+                let ch = self.pop_int()?;
+                Spacing::Add(a, Some((ch, num_vec(self.nums()?))))
+            }
+            KShow => Spacing::Kern(self.pop_proc()?),
+            _ => Spacing::Plain,
+        };
+        Ok((s, spacing))
+    }
+
+    /// The current font when it is a Type 3 font: its glyphs are drawn by its own procedures.
+    fn type3_font(&self) -> Option<DictRef> {
+        let font = self.g.font.clone()?;
+        let f = font.borrow();
+        let builds = f.contains_key(&Key::name("BuildGlyph")) || f.contains_key(&Key::name("BuildChar"));
+        let type3 = f.get(&Key::name("FontType")).and_then(Obj::as_num) == Some(3.0) && builds;
+        drop(f);
+        type3.then_some(font)
+    }
+
+    /// How far `s` moves the current point (user space).
+    fn width_of(&mut self, s: &[u8]) -> Res<Vec2> {
+        let Some(font) = self.type3_font() else { return Ok(self.set_type(s, Point::ZERO)?.2) };
+        let mut w = Vec2::ZERO;
+        for &code in s {
+            w += self.type3_glyph(&font, Glyph::Code(code), Point::new(w.x, w.y), false)?;
+        }
+        Ok(w)
+    }
+
+    /// `s` shown in Type 3 font `font`, glyph by glyph, spaced as `spacing` says.
+    fn show_type3(&mut self, font: &DictRef, s: &[u8], spacing: &Spacing) -> Res {
+        let start = self.out.drawn.len();
+        for (i, &code) in s.iter().enumerate() {
+            let at = self.user_point()?;
+            let w = self.type3_glyph(font, Glyph::Code(code), at, true)?;
+            let d = match spacing {
+                Spacing::Plain | Spacing::Kern(_) => w,
+                Spacing::Add(a, c) => w + *a + c.filter(|(ch, _)| *ch == i64::from(code)).map_or(Vec2::ZERO, |(_, v)| v),
+                Spacing::Widths(v, op) => {
+                    let n = |k: usize| v.get(k).copied();
+                    match op {
+                        Op::XShow => n(i).map(|x| Vec2::new(x, 0.0)),
+                        Op::YShow => n(i).map(|y| Vec2::new(0.0, y)),
+                        _ => n(2 * i).zip(n(2 * i + 1)).map(|(x, y)| Vec2::new(x, y)),
+                    }
+                    .unwrap_or(w)
+                }
+            };
+            self.g.cur = Some(self.xf() * (at + d));
+            if let (Spacing::Kern(p), Some(next)) = (spacing, s.get(i + 1)) {
+                self.push(Obj::Int(i64::from(code)))?;
+                self.push(Obj::Int(i64::from(*next)))?;
+                self.call(p.clone())?;
+            }
+        }
+        let text: String = s.iter().map(|b| char::from(*b)).filter(|c| !c.is_control()).collect();
+        self.group_glyphs(start, &text);
+        Ok(())
+    }
+
+    /// Glyph `glyph` of Type 3 font `font` drawn by its `BuildGlyph` (or `BuildChar`) procedure at
+    /// user point `at` (only measured unless `paint`) → its width (user space).
+    fn type3_glyph(&mut self, font: &DictRef, glyph: Glyph, at: Point, paint: bool) -> Res<Vec2> {
+        let (fm, build_glyph, build_char, encoding) = {
+            let f = font.borrow();
+            let get = |k: &str| f.get(&Key::name(k)).cloned();
+            let fm = get("FontMatrix").and_then(|o| o.items().and_then(|i| matrix_of(&i.borrow()))).unwrap_or(Affine::scale(0.001));
+            (fm, get("BuildGlyph"), get("BuildChar"), get("Encoding"))
+        };
+        let code_of = |name: &str| -> Option<u8> {
+            let items = encoding.as_ref()?.items()?.to_vec();
+            items.iter().position(|o| o.text().as_deref() == Some(name)).and_then(|i| u8::try_from(i).ok())
+        };
+        let (name, code) = match glyph {
+            Glyph::Code(c) => {
+                let name = encoding.as_ref().and_then(|e| e.items()?.get(usize::from(c))).and_then(|o| o.text());
+                (name.unwrap_or_else(|| Rc::from(".notdef")), Some(c))
+            }
+            Glyph::Name(n) => {
+                let code = code_of(&n);
+                (n, code)
+            }
+        };
+        let arg = match (build_glyph, build_char, code) {
+            (Some(p), ..) => Some((p, Obj::Name(name))),
+            (None, Some(p), Some(c)) => Some((p, Obj::Int(i64::from(c)))),
+            _ => None,
+        };
+        let Some((proc, arg)) = arg else { return Ok(Vec2::ZERO) };
+        // A glyph that shows type in its own font would draw itself without end.
+        if self.out.apart >= MAX_APART {
+            return ps_err("limitcheck", "a Type 3 glyph");
+        }
+        self.gsave()?;
+        let depth = self.saved.len();
+        self.g.ctm = self.g.ctm * Affine::translate(at.to_vec2()) * fm;
+        self.take_path();
+        self.g.null |= !paint;
+        self.glyph_width = None;
+        self.out.apart += 1;
+        let r = self.push(Obj::Dict(font.clone())).and_then(|()| self.push(arg)).and_then(|()| self.call(proc));
+        self.out.apart -= 1;
+        let [wx, wy] = self.glyph_width.take().unwrap_or_default();
+        self.saved.truncate(depth);
+        self.grestore();
+        r?;
+        Ok(fm * Point::new(wx, wy) - fm * Point::ZERO)
+    }
+
+    /// The objects drawn since `start` (one show's glyphs) as one group named `text`, when they
+    /// are several under the same clips.
+    fn group_glyphs(&mut self, start: usize, text: &str) {
+        let here = self.out.chain(&self.g.clips);
+        let Some(drawn) = self.out.drawn.get(start..) else { return };
+        let same = drawn.iter().all(|(c, _)| c.iter().map(|c| c.id).eq(here.iter().map(|c| c.id)));
+        if drawn.len() < 2 || !same {
+            return;
+        }
+        let children: Vec<Arc<Node>> = self.out.drawn.drain(start..).map(|(_, n)| Arc::new(n)).collect();
+        let mut group = Node::group(NodeId(0), children);
+        group.name = Some(text.chars().take(64).collect());
+        let clips = self.g.clips.clone();
+        self.out.push(group, &clips);
+    }
+
    /// The font named `k`: one the program defined, else a font of that name.
    fn find_font(&mut self, k: &Obj) -> Res<DictRef> {
        let key = k.key().ok_or(PsError::Ps("typecheck", "findfont".into()))?;
@@ -290,6 +436,26 @@ impl Interp<'_> {
    }
 }

+/// How a show operator spaces its glyphs (Type 3 fonts; type in other fonts is laid out as point
+/// type).
+enum Spacing {
+    /// By their widths.
+    Plain,
+    /// `ashow`, `widthshow`, `awidthshow`: by their widths plus a displacement, and another for one
+    /// character code.
+    Add(Vec2, Option<(i64, Vec2)>),
+    /// `xshow`, `yshow`, `xyshow` (the operator): by the numbers given.
+    Widths(Vec<f64>, Op),
+    /// `kshow`: by their widths, the procedure run between each two.
+    Kern(Obj),
+}
+
+/// A glyph of a Type 3 font, by character code or by name (`glyphshow`).
+enum Glyph {
+    Code(u8),
+    Name(Rc<str>),
+}
+
 /// A font scaled or transformed by `m` (`scalefont`, `makefont`).
 fn transformed(font: &DictRef, m: Affine) -> DictRef {
    let mut d = font.borrow().clone();
@@ -377,6 +377,19 @@ pub fn sections(bytes: &[u8]) -> Option<(&[u8], Option<&[u8]>)> {
    Some((ps, tiff))
 }

+/// The Windows metafile preview behind an EPS file's binary header, if it has one.
+pub fn metafile_preview(bytes: &[u8]) -> Option<&[u8]> {
+    if !bytes.starts_with(&DOS_MAGIC) {
+        return None;
+    }
+    let word = |at: usize| bytes.get(at..at + 4).and_then(|b| <[u8; 4]>::try_from(b).ok()).map(|b| u32::from_le_bytes(b) as usize);
+    let (start, len) = (word(12)?, word(16)?);
+    if start == 0 || len == 0 {
+        return None;
+    }
+    bytes.get(start..start.checked_add(len)?)
+}
+
 /// The native document an EPS file written by [`export`] carries, if any.
 pub fn native(bytes: &[u8]) -> Option<Vec<u8>> {
    let (ps, _) = sections(bytes)?;
@@ -184,3 +184,19 @@ fn pretty_files_are_indented_like_serde_json() {
    // The same JSON as the compact file.
    assert_eq!(json_of(&bytes), json_of(&save(&d, false)));
 }
+
+/// #451: a guide's artboard is written only for artboard guides, so canvas guides save as they
+/// did, and a file without it (an older version's) opens with canvas guides.
+#[test]
+fn artboard_guides_round_trip_and_canvas_guides_save_as_before() {
+    use vectorcraft_doc::Guide;
+    let mut d = Document::new(100.0, 100.0);
+    let id = d.artboards[0].id;
+    d.guides = vec![Guide::new(true, 10.0), Guide { artboard: Some(id), ..Guide::new(false, 20.0) }];
+    let mut v = json_of(&save(&d, false));
+    assert_eq!(v["document"]["guides"], json!([{"vertical": true, "pos": 10.0}, {"vertical": false, "pos": 20.0, "artboard": id}]));
+    assert_eq!(load(&save(&d, false)).unwrap().guides, d.guides);
+    v["document"]["guides"] = json!([{"vertical": false, "pos": 20.0}]);
+    let old = load(&serde_json::to_vec(&v).unwrap()).unwrap();
+    assert_eq!(old.guides, [Guide::new(false, 20.0)]);
+}
@@ -1,5 +1,7 @@
 //! The anchor-based editable path model.

+use std::collections::BTreeSet;
+
 use kurbo::{Affine, BezPath, CubicBez, ParamCurve, ParamCurveNearest, PathEl, Point, Rect, Shape};
 use serde::{Deserialize, Serialize};

@@ -268,6 +270,77 @@ impl SubPath {
        self.anchors.insert(seg + 1, mid);
        seg + 1
    }
+    /// Make anchor `i` smooth: handles in line with its neighbours (its one neighbour at an open
+    /// end), each a third of the way to that side's neighbour. A smooth anchor with both handles
+    /// keeps them. False when there is no such anchor or no direction (the neighbours coincide).
+    pub fn smooth_anchor(&mut self, i: usize) -> bool {
+        let n = self.anchors.len();
+        let prev = if i > 0 {
+            Some(i - 1)
+        } else if self.closed {
+            n.checked_sub(1)
+        } else {
+            None
+        };
+        let next = if i + 1 < n {
+            Some(i + 1)
+        } else if self.closed {
+            Some(0)
+        } else {
+            None
+        };
+        let at = |j: Option<usize>| j.and_then(|j| self.anchors.get(j)).map(|a| a.p);
+        let (prev, next) = (at(prev), at(next));
+        let Some(a) = self.anchors.get_mut(i) else { return false };
+        if a.kind == AnchorKind::Smooth && a.has_in() && a.has_out() {
+            return true;
+        }
+        let (pp, nn) = (prev.unwrap_or(a.p), next.unwrap_or(a.p));
+        let dir = nn - pp;
+        let l = dir.hypot();
+        if l <= 1e-9 {
+            return false;
+        }
+        let u = dir / l;
+        a.h_in = a.p - u * (a.p.distance(pp) / 3.0);
+        a.h_out = a.p + u * (a.p.distance(nn) / 3.0);
+        a.kind = AnchorKind::Smooth;
+        true
+    }
+    /// Cut at the anchors `at`: each becomes the end of one open piece and the start of the next,
+    /// its handle off each piece retracted (the shape doesn't change). A closed subpath opens at
+    /// its first cut, so one cut leaves one piece whose ends coincide. The ends of an open subpath
+    /// and indices past the end don't cut; with no cut left, the subpath comes back as it is.
+    pub fn cut_at(&self, at: &BTreeSet<usize>) -> Vec<SubPath> {
+        let n = self.anchors.len();
+        let mut cuts = at.iter().copied().filter(|&i| i < n && (self.closed || (i > 0 && i + 1 < n))).peekable();
+        let Some(&first) = cuts.peek().filter(|_| n >= 2) else { return vec![self.clone()] };
+        // A closed subpath's anchors from the first cut round to it again; an open one's as they are.
+        let (run, cuts): (Vec<Anchor>, BTreeSet<usize>) = if self.closed {
+            (self.anchors.iter().cycle().skip(first).take(n + 1).copied().collect(), cuts.map(|c| (c + n - first) % n).chain([n]).collect())
+        } else {
+            (self.anchors.clone(), cuts.collect())
+        };
+        let mut pieces = vec![];
+        let mut cur: Vec<Anchor> = vec![];
+        for (i, a) in run.into_iter().enumerate() {
+            if !cuts.contains(&i) {
+                cur.push(a);
+                continue;
+            }
+            if !cur.is_empty() {
+                cur.push(Anchor { h_out: a.p, kind: AnchorKind::Corner, ..a });
+                pieces.push(SubPath::new(std::mem::take(&mut cur), false));
+            }
+            if i < n {
+                cur.push(Anchor { h_in: a.p, kind: AnchorKind::Corner, ..a });
+            }
+        }
+        if cur.len() > 1 {
+            pieces.push(SubPath::new(cur, false));
+        }
+        pieces
+    }
    /// Signed area via the shoelace formula on the Bézier path (positive = clockwise in y-down).
    pub fn area(&self) -> f64 {
        let mut bp = BezPath::new();
@@ -47,6 +47,18 @@ impl CornerKind {
    }
 }

+/// The largest corner radius a `w` × `h` rectangle draws: half its shorter side.
+pub fn max_corner_radius(w: f64, h: f64) -> f64 {
+    w.abs().min(h.abs()) / 2.0
+}
+
+/// The radius a corner of a `w` × `h` rectangle is drawn with: `radius`, no larger than
+/// [`max_corner_radius`] (the same limit for every corner, so opposite corners match), 0 when
+/// negative or not a number.
+pub fn fitted_corner_radius(w: f64, h: f64, radius: f64) -> f64 {
+    radius.max(0.0).min(max_corner_radius(w, h))
+}
+
 /// Rectangle whose corners (top-left, top-right, bottom-right, bottom-left, y down) each have
 /// their own radius and kind, every radius clamped to half the shorter side. A corner without a
 /// radius is one anchor, the others two (where the cut meets each side). Clockwise from the
@@ -63,7 +75,6 @@ pub fn rectangle_anchor_corners(r: Rect, radii: [f64; 4]) -> Vec<usize> {
 /// The anchors of [`rectangle_with_corners`], each with its corner.
 fn corner_anchors(r: Rect, radii: [f64; 4], kinds: [CornerKind; 4]) -> Vec<(usize, Anchor)> {
    let r = r.abs();
-    let max = r.width().min(r.height()) / 2.0;
    // Each corner, with the directions of the side arriving at it and of the side leaving it.
    let corners = [
        (Point::new(r.x0, r.y0), Vec2::new(0.0, -1.0), Vec2::new(1.0, 0.0)),
@@ -74,7 +85,7 @@ fn corner_anchors(r: Rect, radii: [f64; 4], kinds: [CornerKind; 4]) -> Vec<(usiz
    let mut out = Vec::with_capacity(8);
    let mut top_left_start = None;
    for (k, ((c, din, dout), (rad, kind))) in corners.into_iter().zip(radii.into_iter().zip(kinds)).enumerate() {
-        let rad = rad.max(0.0).min(max);
+        let rad = fitted_corner_radius(r.width(), r.height(), rad);
        if rad <= 1e-9 {
            out.push((k, Anchor::corner(c)));
            continue;
@@ -312,6 +323,24 @@ mod tests {
        assert_eq!(CornerKind::ALL.map(CornerKind::next), [CornerKind::InvertedRound, CornerKind::Chamfer, CornerKind::Round]);
    }

+    /// #442: on a rectangle that isn't square, every corner is a circular arc of the same radius,
+    /// and radii past the limit stop at half the shorter side, whichever side a corner is on.
+    #[test]
+    fn corners_of_a_non_square_rectangle_are_alike() {
+        let r = Rect::new(0.0, 0.0, 200.0, 80.0);
+        assert_eq!(max_corner_radius(-200.0, 80.0), 40.0);
+        assert_eq!([30.0, 60.0, -1.0, f64::NAN].map(|x| fitted_corner_radius(200.0, 80.0, x)), [30.0, 40.0, 0.0, 0.0]);
+        for (radius, drawn) in [(30.0, 30.0), (60.0, 40.0)] {
+            for kinds in [[CornerKind::Round; 4], [CornerKind::Chamfer, CornerKind::InvertedRound, CornerKind::Round, CornerKind::Chamfer]] {
+                let a: Vec<Point> = rectangle_with_corners(r, [radius; 4], kinds).subpaths[0].anchors.iter().map(|a| a.p).collect();
+                for (i, j) in [(7, 0), (1, 2), (3, 4), (5, 6)] {
+                    let (x, y) = ((a[j].x - a[i].x).abs(), (a[j].y - a[i].y).abs());
+                    assert!((x - drawn).abs() < 1e-9 && (y - drawn).abs() < 1e-9, "radius {radius}: a corner spans {x} × {y}");
+                }
+            }
+        }
+    }
+
    #[test]
    fn polygon_first_vertex_up() {
        let p = polygon(Point::new(0.0, 0.0), 10.0, 6, 0.0);
@@ -179,6 +179,35 @@ proptest! {
        prop_assert!((q.length() - p.length()).abs() < 1e-3 * p.length().max(1.0));
    }

+    /// Cutting at anchors keeps every segment as it was, in order (a closed subpath's from its
+    /// first cut), in open pieces of two or more anchors. A smoothed corner gets handles on a line
+    /// through it.
+    #[test]
+    fn cut_at_keeps_the_segments(p in arb_path_data(), cuts in proptest::collection::btree_set(0usize..12, 0..4), pick in 0usize..100) {
+        let sp = &p.subpaths[pick % p.subpaths.len()];
+        let n = sp.anchors.len();
+        let pieces = sp.cut_at(&cuts);
+        let segs = |s: &vectorcraft_geom::SubPath| (0..s.segment_count()).map(|i| s.segment(i)).collect::<Vec<_>>();
+        let mut want = segs(sp);
+        if pieces.len() > 1 || pieces.first().is_some_and(|q| q.closed != sp.closed) {
+            prop_assert!(pieces.iter().all(|q| !q.closed && q.anchors.len() >= 2));
+            if sp.closed {
+                want.rotate_left(cuts.iter().copied().find(|&c| c < n).unwrap_or(0));
+            }
+        } else {
+            prop_assert_eq!(&pieces, &vec![sp.clone()]);
+        }
+        prop_assert_eq!(pieces.iter().flat_map(segs).collect::<Vec<_>>(), want);
+        let mut s = sp.clone();
+        let i = pick % n.max(1);
+        let corner = s.anchors.get(i).is_some_and(|a| a.kind == vectorcraft_geom::AnchorKind::Corner);
+        if s.smooth_anchor(i) && corner {
+            let a = s.anchors[i];
+            let (u, v) = (a.h_in - a.p, a.h_out - a.p);
+            prop_assert!(u.cross(v).abs() <= 1e-6 * (1.0 + u.hypot() * v.hypot()) && u.dot(v) <= 0.0, "{a:?}");
+        }
+    }
+
    /// Polygon area via the shoelace formula equals the path's signed area magnitude and
    /// SubPath::area.
    #[test]
@@ -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]
@@ -262,7 +262,7 @@ pub fn tool_definitions() -> Vec<Value> {
            "open_file",
            "Open file",
            &format!(
-                "Open a file as a new, active document: .{} (see run_command document.formats). Templates (.ait, native templates) open as a new untitled document.",
+                "Open a file as a new, active document: .{} (see run_command document.formats). Templates (.ait, native templates) open as a new untitled document. The reply's `warnings` say what didn't come in as it was (an EPS shown as its preview image says why its PostScript couldn't be read).",
                OPEN_EXTS.join(", .")
            ),
            obj(json!({"path": string("File path")}), &["path"]),
@@ -13,7 +13,7 @@ mod wmf;
 use std::sync::Arc;

 use vectorcraft_color::{Color, Paint};
-use vectorcraft_doc::clipnest::{Clip, Drawn, nest};
+use vectorcraft_doc::clipnest::{Clip, Drawn, MAX_NEST, deep_clips, nest};
 use vectorcraft_doc::{
    Appearance, AppearanceItem, CharStyle, Dash, Document, FillLayer, ImageBlob, ImageObject, Justify, LayerColor, LineCap, LineJoin, Node, NodeKind,
    StrokeLayer, TextObject,
@@ -696,8 +696,11 @@ impl Player {
        if lines && path.elements().len() <= 6 && around.contains(self.frame.origin()) && around.contains(Point::new(self.frame.x1, self.frame.y1)) {
            return;
        }
+        if self.dc.clips.len() >= MAX_NEST {
+            return self.warn(&deep_clips());
+        }
        self.next_clip += 1;
-        self.dc.clips.push(Arc::new(Clip { id: self.next_clip, path, rule }));
+        self.dc.clips.push(Arc::new(Clip { id: self.next_clip, region: Some((path, rule)) }));
    }

    /// SelectClipPath (`mode`: 1 and, 5 copy; the others cut out, which isn't read).
@@ -309,3 +309,19 @@ fn damaged_files_fail_or_import_partly() {
    let huge = hand_wmf(100, 100, &[(0x0324, le16(&[i16::MAX])), (0x0538, le16(&[-1]))]);
    assert!(import(&huge).is_ok());
 }
+
+#[test]
+fn clips_nest_only_so_deep() {
+    // Each clip inside the last one used to nest a clipping group one level deeper, past the stack.
+    let mut records = vec![(30, le(&[0, 0, 1500, 1500])); 200_000];
+    records.push((43, le(&[100, 100, 200, 200])));
+    let back = import(&hand_emf(5000, 3000, &records)).unwrap();
+    let mut depth = 0;
+    let mut n = back.document.layers[0].children().unwrap()[0].clone();
+    while let NodeKind::Group { children, clip: true } = &n.kind {
+        depth += 1;
+        n = children.last().unwrap().clone();
+    }
+    assert_eq!(depth, vectorcraft_doc::clipnest::MAX_NEST);
+    assert!(back.warnings.iter().any(|w| w.contains("clips nested more than")), "{:?}", back.warnings);
+}
@@ -20,7 +20,7 @@ pub use edit::{
 };
 pub use offset::{Cap, Join, offset_path, outline_stroke, stroke_region};
 pub use pathfinder::{PathfinderOp, Region, Shape, merge_regions, pathfinder, region_at, regions};
-pub use planar::{SHAPE_BUILDER_MAX_SEGMENTS, interior_point, live_paint, shape_builder};
+pub use planar::{BuilderArrangement, SHAPE_BUILDER_MAX_SEGMENTS, cut_out, encloses_area, interior_point, live_paint, shape_builder};

 /// Errors from fallible operations.
 #[derive(Clone, Copy, Debug, PartialEq, Eq, thiserror::Error)]
@@ -21,7 +21,7 @@ use std::collections::HashMap;

 use kurbo::{Affine, BezPath, CubicBez, ParamCurve, PathSeg, Point, Shape as _};
 use linesweeper::topology::{Topology, WindingNumber};
-use vectorcraft_geom::{FillRule, PathData};
+use vectorcraft_geom::{FillRule, PathData, SubPath};

 use crate::boolean::{DEFAULT_PRECISION, Seg, Tidy, eps_for, is_sliver, segs_to_subpath, snap_horizontals, tidy_segments, to_seg};
 use crate::pathfinder::{Region, Shape};
@@ -102,7 +102,12 @@ struct Outlines {

 impl Outlines {
    fn new(inputs: &[(BezPath, usize)], eps: f64) -> Self {
-        let segs = inputs.iter().flat_map(|(bp, i)| bp.segments().map(move |s| (s.bounding_box(), s, *i))).collect();
+        // A zero-length segment (a point) is the source of no edge, even one running through it.
+        let segs = inputs
+            .iter()
+            .flat_map(|(bp, i)| bp.segments().map(move |s| (s.bounding_box(), s, *i)))
+            .filter(|(r, ..)| r.width() > 0.0 || r.height() > 0.0)
+            .collect();
        // The sweep moves points by a few `eps` at most.
        Self { segs, tol: 16.0 * eps }
    }
@@ -292,26 +297,172 @@ pub fn live_paint(shapes: &[Shape]) -> (Vec<Region>, Vec<Shape>) {
 /// than the filled areas' arrangement, so past this only the filled areas count.
 pub const SHAPE_BUILDER_MAX_SEGMENTS: usize = 4096;

-/// Shape Builder regions of `shapes` (back → front), and the pieces of their open paths.
+/// The Shape Builder's arrangement: see [`shape_builder`].
+#[derive(Clone, Debug, Default, PartialEq)]
+pub struct BuilderArrangement {
+    pub regions: Vec<Region>,
+    /// The pieces of the paths with no closed subpath, keyed by input index.
+    pub lines: Vec<Shape>,
+    /// The pieces of the other paths' outlines, keyed by input index (the front-most where inputs
+    /// share one); only when asked for.
+    pub edges: Vec<Shape>,
+}
+
+/// Shape Builder regions of `shapes` (back → front), the pieces of their open paths and, with
+/// `edges`, the pieces of their outlines (what erasing an edge deletes).
 ///
 /// Closed paths bound regions with their filled areas, as in [`regions`](crate::regions). Open
 /// paths (the caller closes the ones whose fill should count) are cutting edges: a line across a
 /// shape splits it, lines around an area enclose a region nothing fills (empty `sources`), and each
 /// path with no closed subpath comes back cut wherever another path meets it, as pieces keyed by
-/// its index in `shapes`. With no open path, more than [`SHAPE_BUILDER_MAX_SEGMENTS`] segments or
-/// a map that can't be built, only the filled areas count and there are no pieces.
-pub fn shape_builder(shapes: &[Shape]) -> (Vec<Region>, Vec<Shape>) {
+/// its index in `shapes`. Outlines are cut the same way. With no open path, more than
+/// [`SHAPE_BUILDER_MAX_SEGMENTS`] segments or a map that can't be built, only the filled areas
+/// count and there are no pieces.
+pub fn shape_builder(shapes: &[Shape], edges: bool) -> BuilderArrangement {
    let has_open = shapes.iter().flat_map(|s| &s.path.subpaths).any(|sp| !sp.closed && sp.anchors.len() >= 2);
    let segments: usize = shapes.iter().flat_map(|s| &s.path.subpaths).map(|sp| sp.segment_count()).sum();
-    if has_open && segments <= SHAPE_BUILDER_MAX_SEGMENTS {
-        let keyed: Vec<Shape> = shapes.iter().enumerate().map(|(i, s)| Shape::new(s.path.clone(), s.rule, i as u64)).collect();
-        let (faces, edges) = live_paint(&keyed);
-        if !faces.is_empty() || !edges.is_empty() {
-            let is_line = |i: u64| shapes.get(i as usize).is_some_and(|s| !s.path.subpaths.iter().any(|sp| sp.closed));
-            return (faces, edges.into_iter().filter(|e| is_line(e.key)).collect());
+    let planar = ((has_open || edges) && segments <= SHAPE_BUILDER_MAX_SEGMENTS)
+        .then(|| {
+            let keyed: Vec<Shape> = shapes.iter().enumerate().map(|(i, s)| Shape::new(s.path.clone(), s.rule, i as u64)).collect();
+            live_paint(&keyed)
+        })
+        .filter(|(faces, pieces)| !faces.is_empty() || !pieces.is_empty());
+    let Some((faces, pieces)) = planar else {
+        return BuilderArrangement { regions: crate::regions(shapes), ..Default::default() };
+    };
+    let is_line = |i: u64| shapes.get(i as usize).is_some_and(|s| !s.path.subpaths.iter().any(|sp| sp.closed));
+    let (lines, outline): (Vec<Shape>, Vec<Shape>) = pieces.into_iter().partition(|e| is_line(e.key));
+    BuilderArrangement {
+        regions: if has_open { faces } else { crate::regions(shapes) },
+        lines: if has_open { lines } else { Vec::new() },
+        edges: if edges { outline } else { Vec::new() },
+    }
+}
+
+/// Does `sp`, closed, enclose an area (rather than retrace itself)? The Shape Builder closes the
+/// open subpaths of filled paths that do.
+pub fn encloses_area(sp: &SubPath) -> bool {
+    let mut closed = sp.clone();
+    closed.closed = true;
+    let mut bp = BezPath::new();
+    closed.to_bezpath_into(&mut bp);
+    let size = bp.bounding_box().size();
+    bp.area().abs() > 1e-9 * (size.width * size.width + size.height * size.height)
+}
+
+/// `path` without `piece`, a run along one of its subpaths between two points (a Shape Builder
+/// edge): a closed subpath opens there, an open one splits in two (or loses an end), and a piece
+/// that runs all the way round takes its subpath. With `fill_closes`, open subpaths that enclose an
+/// area ([`encloses_area`]) run on round an invisible closing edge, as the Shape Builder sees a
+/// filled path: a piece may run over it, and it never comes back as a visible segment. None when
+/// the piece doesn't lie on `path` within `tol`.
+pub fn cut_out(path: &PathData, piece: &SubPath, fill_closes: bool, tol: f64) -> Option<PathData> {
+    let n = piece.segment_count();
+    if n == 0 {
+        return None;
+    }
+    // A point well inside the piece: the middle of its longest segment.
+    let arclen = |k: usize| kurbo::ParamCurveArclen::arclen(&piece.segment(k), 1e-3);
+    let mid = (0..n).map(|k| (arclen(k), k)).max_by(|x, y| x.0.total_cmp(&y.0)).map(|(_, k)| piece.segment(k).eval(0.5))?;
+    let (a, b) = (piece.anchors.first()?.p, piece.anchors.last()?.p);
+    let mut bp = BezPath::new();
+    piece.to_bezpath_into(&mut bp);
+    if bp.perimeter(1e-6) <= tol {
+        // A speck (where paths touch): there's nothing to cut.
+        return None;
+    }
+    // A piece that ends where it starts runs all the way round.
+    let whole = piece.closed || a.distance(b) <= tol;
+    // Each subpath as the piece may run along it: round its closing edge when it has one.
+    let ring = |sp: &SubPath| SubPath { anchors: sp.anchors.clone(), closed: sp.closed || (fill_closes && encloses_area(sp)) };
+    let (si, geom, um) = path
+        .subpaths
+        .iter()
+        .enumerate()
+        .filter_map(|(i, sp)| {
+            let g = ring(sp);
+            let (u, d) = nearest_u(&g, mid)?;
+            (d <= tol).then_some((i, g, u, d))
+        })
+        .min_by(|x, y| x.3.total_cmp(&y.3))
+        .map(|(i, g, u, _)| (i, g, u))?;
+    let len = geom.segment_count() as f64;
+    let real = path.subpaths.get(si)?.segment_count() as f64;
+    let at = |p: Point| nearest_u(&geom, p).filter(|(_, d)| *d <= tol).map(|(u, _)| u);
+    // The parameter spans of `geom` that stay (unrolled past the end of a ring).
+    let keep: Vec<(f64, f64)> = if whole {
+        Vec::new()
+    } else if geom.closed {
+        let (ua, ub) = (at(a)?, at(b)?);
+        let fwd = |from: f64, to: f64| (to - from).rem_euclid(len);
+        // The piece runs from one end through `mid` to the other; what stays runs on round.
+        let (start, end) = if fwd(ua, um) <= fwd(ua, ub) { (ub, ua) } else { (ua, ub) };
+        let rest = fwd(start, end);
+        if rest <= 1e-9 || len - rest <= 1e-9 {
+            Vec::new()
+        } else {
+            // Where the ring closes with an invisible edge (`real..len`), what stays stops at it.
+            let parts: &[(f64, f64)] = if real >= len { &[(0.0, 2.0 * len)] } else { &[(0.0, real), (len, len + real)] };
+            parts.iter().map(|&(lo, hi)| (start.max(lo), (start + rest).min(hi))).filter(|(x, y)| y - x > 1e-9).collect()
+        }
+    } else {
+        let (ua, ub) = (at(a)?, at(b)?);
+        let (lo, hi) = (ua.min(ub), ua.max(ub));
+        if !(lo - 1e-9..=hi + 1e-9).contains(&um) {
+            return None;
+        }
+        [(0.0, lo), (hi, len)].into_iter().filter(|(x, y)| y - x > 1e-9).collect()
+    };
+    let mut subpaths: Vec<SubPath> = path.subpaths.iter().take(si).cloned().collect();
+    subpaths.extend(keep.into_iter().filter_map(|(u0, u1)| span(&geom, u0, u1)).map(|sp| snap_ends(sp, [a, b], tol)));
+    subpaths.extend(path.subpaths.iter().skip(si + 1).cloned());
+    Some(PathData::new(subpaths))
+}
+
+/// The point of `sp` nearest `p`, as a parameter `segment + t`, with its distance.
+fn nearest_u(sp: &SubPath, p: Point) -> Option<(f64, f64)> {
+    use kurbo::ParamCurveNearest;
+    (0..sp.segment_count())
+        .map(|k| {
+            let n = sp.segment(k).nearest(p, 1e-9);
+            (k as f64 + n.t, n.distance_sq.sqrt())
+        })
+        .min_by(|x, y| x.1.total_cmp(&y.1))
+}
+
+/// `sp` with its end anchors within `tol` of one of `to` put exactly on it (where the planar map
+/// put the junction a piece ends at), handles moving with them.
+fn snap_ends(mut sp: SubPath, to: [Point; 2], tol: f64) -> SubPath {
+    let last = sp.anchors.len().saturating_sub(1);
+    for i in [0, last] {
+        if let Some(an) = sp.anchors.get_mut(i)
+            && let Some(q) = to.iter().find(|q| q.distance(an.p) <= tol)
+        {
+            let d = *q - an.p;
+            an.p = *q;
+            an.h_in += d;
+            an.h_out += d;
        }
    }
-    (crate::regions(shapes), Vec::new())
+    sp
+}
+
+/// The run of `sp` from parameter `u0` to `u1` (`u0 < u1`, unrolled past the end of a closed one),
+/// open.
+fn span(sp: &SubPath, u0: f64, u1: f64) -> Option<SubPath> {
+    let n = sp.segment_count();
+    if n == 0 || !(u0.is_finite() && u1.is_finite()) {
+        return None;
+    }
+    let first = u0.floor().max(0.0) as usize;
+    let last = (u1.ceil().max(0.0) as usize).min(first + 2 * n);
+    let segs: Vec<Seg> = (first..last)
+        .filter_map(|k| {
+            let (t0, t1) = ((u0 - k as f64).clamp(0.0, 1.0), (u1 - k as f64).clamp(0.0, 1.0));
+            (t1 - t0 > 1e-12).then(|| Seg { c: sp.segment(k % n).subsegment(t0..t1), line: sp.segment_is_line(k % n) })
+        })
+        .collect();
+    segs_to_subpath(&segs, false)
 }

 fn build(shapes: &[Shape]) -> Option<(Vec<Region>, Vec<Shape>)> {
@@ -618,7 +769,7 @@ pub fn interior_point(path: &PathData) -> Option<Point> {
 mod tests {
    use super::*;
    use proptest::prelude::*;
-    use vectorcraft_geom::{Rect, SubPath, shapes};
+    use vectorcraft_geom::{Rect, shapes};

    fn line(a: (f64, f64), b: (f64, f64), key: u64) -> Shape {
        Shape::new(PathData::single(SubPath::polyline(&[Point::new(a.0, a.1), Point::new(b.0, b.1)], false)), FillRule::NonZero, key)
@@ -766,14 +917,14 @@ mod tests {
    fn shape_builder_lines_cut_regions() {
        // A line across a rectangle: two regions, the line in three pieces keyed by its index.
        let s = [rect(0.0, 0.0, 100.0, 50.0, 7), line((40.0, -20.0), (60.0, 70.0), 8)];
-        let (regions, lines) = shape_builder(&s);
+        let BuilderArrangement { regions, lines, .. } = shape_builder(&s, false);
        assert_eq!(regions.len(), 2);
        assert!(regions.iter().all(|r| r.sources == [0]));
        assert_eq!(lines.len(), 3);
        assert!(lines.iter().all(|l| l.key == 1 && !l.path.is_closed()));
        // Lines alone enclose a region nothing fills.
        let s = [line((0.0, 0.0), (100.0, 100.0), 0), line((100.0, 0.0), (0.0, 100.0), 0), line((-10.0, 80.0), (110.0, 80.0), 0)];
-        let (regions, lines) = shape_builder(&s);
+        let BuilderArrangement { regions, lines, .. } = shape_builder(&s, false);
        assert_eq!(regions.len(), 1);
        assert!(regions[0].sources.is_empty() && regions[0].top().is_none());
        assert_eq!(lines.len(), 9);
@@ -782,10 +933,10 @@ mod tests {
    #[test]
    fn shape_builder_closed_only_or_degenerate_is_the_filled_arrangement() {
        let s = [rect(0.0, 0.0, 100.0, 100.0, 0), rect(50.0, 0.0, 150.0, 100.0, 1)];
-        assert_eq!(shape_builder(&s), (crate::regions(&s), vec![]));
+        assert_eq!(shape_builder(&s, false), BuilderArrangement { regions: crate::regions(&s), ..Default::default() });
        // A broken line can't be swept: what the filled areas give (nothing here, without a panic).
        let s = [rect(0.0, 0.0, 100.0, 100.0, 0), line((0.0, 0.0), (f64::NAN, 1.0), 1)];
-        assert_eq!(shape_builder(&s), (crate::regions(&s), vec![]));
+        assert_eq!(shape_builder(&s, false), BuilderArrangement { regions: crate::regions(&s), ..Default::default() });
        // Zero-length and doubled-back lines don't break it either.
        let s = [
            rect(0.0, 0.0, 100.0, 100.0, 0),
@@ -793,7 +944,7 @@ mod tests {
            line((0.0, 0.0), (100.0, 0.0), 2),
            line((50.0, 0.0), (50.0, 100.0), 3),
        ];
-        let (regions, _) = shape_builder(&s);
+        let regions = shape_builder(&s, false).regions;
        assert_eq!(regions.len(), 2);
        assert!((regions.iter().map(area).sum::<f64>() - 10000.0).abs() < 1e-6);
    }
@@ -815,14 +966,75 @@ mod tests {
            s.push(line((-150.0, y), (150.0, y + 7.0), 1));
        }
        let started = std::time::Instant::now();
-        let (regions, lines) = shape_builder(&s);
+        let BuilderArrangement { regions, lines, .. } = shape_builder(&s, false);
        assert!(regions.len() >= 5, "the ring cut in five bands at least (the waves make pockets)");
        assert!(lines.len() >= 12, "{}", lines.len());
        assert!(started.elapsed().as_secs_f64() < 5.0, "{:?}", started.elapsed());
        // Past the cap, only the filled areas count.
        s.push(line((0.0, 0.0), (1.0, 1.0), 2));
        s[0].path.subpaths[0].anchors.extend((0..16).map(|k| vectorcraft_geom::Anchor::corner(Point::new(100.0, f64::from(k)))));
-        assert!(shape_builder(&s).1.is_empty());
+        assert!(shape_builder(&s, false).lines.is_empty());
+    }
+
+    fn poly(pts: &[(f64, f64)], closed: bool) -> SubPath {
+        SubPath::polyline(&pts.iter().map(|&(x, y)| Point::new(x, y)).collect::<Vec<_>>(), closed)
+    }
+
+    fn ends(sp: &SubPath) -> (Point, Point) {
+        (sp.anchors[0].p, sp.anchors[sp.anchors.len() - 1].p)
+    }
+
+    #[test]
+    fn shape_builder_edges_are_the_outlines_cut_where_paths_meet() {
+        // Two overlapping squares: each outline in two pieces, cut where the other crosses it.
+        let s = [rect(0.0, 0.0, 100.0, 100.0, 0), rect(50.0, 50.0, 150.0, 150.0, 1)];
+        let with = shape_builder(&s, true);
+        assert_eq!(with.regions, shape_builder(&s, false).regions, "the regions don't change");
+        assert!(with.lines.is_empty() && shape_builder(&s, false).edges.is_empty());
+        assert_eq!(with.edges.len(), 4);
+        for key in [0, 1] {
+            assert_eq!(with.edges.iter().filter(|e| e.key == key && !e.path.is_closed()).count(), 2);
+        }
+        let inner = with.edges.iter().find(|e| e.key == 0 && e.path.bounds() == Some(Rect::new(50.0, 50.0, 100.0, 100.0))).expect("A inside B");
+        // Erasing it opens A there.
+        let cut = cut_out(&s[0].path, &inner.path.subpaths[0], false, 1e-3).expect("on A");
+        assert_eq!(cut.subpaths.len(), 1);
+        let sp = &cut.subpaths[0];
+        assert!(!sp.closed && sp.anchors.len() == 5, "{sp:?}");
+        let (a, b) = ends(sp);
+        assert!([a, b].contains(&Point::new(100.0, 50.0)) && [a, b].contains(&Point::new(50.0, 100.0)), "{a:?} {b:?}");
+        assert!((cut.length() - 300.0).abs() < 1e-6, "{}", cut.length());
+        // Not on B.
+        assert_eq!(cut_out(&s[1].path, &inner.path.subpaths[0], false, 1e-3), None);
+        // A lone square's edge is its whole outline: erasing it leaves nothing.
+        let lone = shape_builder(&s[..1], true);
+        assert_eq!(lone.edges.len(), 1);
+        assert!(cut_out(&s[0].path, &lone.edges[0].path.subpaths[0], false, 1e-3).unwrap().is_empty());
+    }
+
+    #[test]
+    fn cut_out_splits_open_paths_and_keeps_closing_edges_invisible() {
+        let open = PathData::single(poly(&[(0.0, 0.0), (100.0, 0.0)], false));
+        let cut = cut_out(&open, &poly(&[(60.0, 0.0), (30.0, 0.0)], false), false, 1e-3).unwrap();
+        let mut parts: Vec<(Point, Point)> = cut.subpaths.iter().map(ends).collect();
+        parts.sort_by(|a, b| a.0.x.total_cmp(&b.0.x));
+        assert_eq!(parts, vec![(Point::new(0.0, 0.0), Point::new(30.0, 0.0)), (Point::new(60.0, 0.0), Point::new(100.0, 0.0))]);
+        // An end piece only shortens it.
+        let cut = cut_out(&open, &poly(&[(70.0, 0.0), (100.0, 0.0)], false), false, 1e-3).unwrap();
+        assert_eq!(cut.subpaths.iter().map(ends).collect::<Vec<_>>(), vec![(Point::new(0.0, 0.0), Point::new(70.0, 0.0))]);
+
+        // A filled open path runs on round its invisible closing edge (100,100) → (0,0).
+        let corner = PathData::single(poly(&[(0.0, 0.0), (100.0, 0.0), (100.0, 100.0)], false));
+        let piece = poly(&[(100.0, 50.0), (100.0, 100.0), (50.0, 50.0)], false);
+        assert_eq!(cut_out(&corner, &piece, false, 1e-3), None, "without the fill it isn't on the path");
+        let cut = cut_out(&corner, &piece, true, 1e-3).unwrap();
+        assert_eq!(cut.subpaths.len(), 1);
+        assert_eq!(cut.subpaths[0].anchors.iter().map(|a| a.p).collect::<Vec<_>>(), [(0.0, 0.0), (100.0, 0.0), (100.0, 50.0)].map(Point::from));
+        // Cut elsewhere, the closing edge stays invisible: two open runs, not one through it.
+        let cut = cut_out(&corner, &poly(&[(20.0, 0.0), (60.0, 0.0)], false), true, 1e-3).unwrap();
+        assert_eq!(cut.subpaths.len(), 2);
+        assert!(cut.subpaths.iter().all(|sp| !sp.closed));
+        assert!((cut.length() - 160.0).abs() < 1e-6, "{}", cut.length());
    }

    fn arb_segment() -> impl Strategy<Value = Shape> {
@@ -872,6 +1084,26 @@ mod tests {
            prop_assert!((filled - regions).abs() <= 1e-9 + DEFAULT_PRECISION * outlines, "{} vs {}", filled, regions);
        }

+        /// Every edge and line piece cuts out of the input it is keyed by, which loses its length
+        /// and nothing else.
+        #[test]
+        fn pieces_cut_out_of_their_inputs(shapes in prop::collection::vec(arb_segment(), 1..6)) {
+            let arr = shape_builder(&shapes, true);
+            for e in arr.edges.iter().chain(&arr.lines) {
+                let (Some(s), Some(piece)) = (shapes.get(e.key as usize), e.path.subpaths.first()) else { continue };
+                let len = e.path.length();
+                let cut = cut_out(&s.path, piece, false, 0.05);
+                if len <= 0.05 {
+                    // A speck where two paths touch.
+                    prop_assert!(cut.is_none());
+                    continue;
+                }
+                prop_assert!(cut.is_some(), "{:?} not on {:?}", piece, s.path);
+                let lost = s.path.length() - cut.map_or(0.0, |c| c.length());
+                prop_assert!((lost - len).abs() <= 0.05 + 1e-3 * len, "lost {} for a piece {} long", lost, len);
+            }
+        }
+
        /// Lines anywhere (not on a grid): faces stay disjoint, and nothing panics.
        #[test]
        fn free_lines_make_disjoint_faces(pts in prop::collection::vec((-50.0..150.0f64, -50.0..150.0f64, -50.0..150.0f64, -50.0..150.0f64), 2..9)) {
@@ -103,6 +103,11 @@ fn group_layer(
    Some(l)
 }

+/// The note on a file carrying an editor's private data (#472): its PDF part, the one read, holds
+/// only the art on its artboards (art on the pasteboard is in the private data alone).
+pub(crate) const OFF_ARTBOARD_NOTE: &str =
+    "only the PDF-compatible part of this file was read: art outside its artboards is kept in the editor's private data alone, so it doesn't open";
+
 /// Import a PDF, returning the document plus warnings about content that was approximated or skipped.
 pub fn import_with_report(bytes: &[u8], opts: &ImportOptions) -> Result<ImportReport, PdfError> {
    let original = crate::pages::open(bytes, opts.password.as_deref())?;
@@ -177,6 +182,7 @@ pub fn import_with_report(bytes: &[u8], opts: &ImportOptions) -> Result<ImportRe
        let ai = crate::pages::has_private_data(page);
        if ai {
            drop_page_fill(&mut parts, xf.transform_rect_bbox(crate::pages::page_box(page, CropTo::Crop)));
+            b.warn(OFF_ARTBOARD_NOTE);
        }
        // A file with several artboards writes, on each page, the art of its neighbours that
        // reaches into the page's box: art lying wholly outside this page is theirs (each page
@@ -9,7 +9,7 @@ use hayro_interpret::pattern::ShadingPattern;
 use hayro_interpret::shading::{ShadingFunction, ShadingType};
 use kurbo::{BezPath, Circle, Point, Rect, Shape, Vec2};
 use vectorcraft_color::{Color, Gradient, GradientGeom, GradientKind, GradientPaint, GradientStop, Paint};
-use vectorcraft_doc::live::{GradientMesh, H_DOWN, H_LEFT, H_RIGHT, H_UP, MeshPoint, lerp_color};
+use vectorcraft_doc::live::{GradientMesh, lerp_color};
 use vectorcraft_doc::{Node, NodeKind, OpacityMask};

 use crate::import::round3;
@@ -150,40 +150,6 @@ fn mesh_color(v: &[f32], function: Option<&ShadingFunction>, sp: &ShadingPattern
    })
 }

-/// A 1×1 gradient mesh from a patch's four corners (bottom-left, top-left, top-right,
-/// bottom-right in the patch's u/v order), each with its handles towards its neighbours.
-fn patch_mesh(corners: [(Point, [Vec2; 4], Color); 4]) -> GradientMesh {
-    let point = |(p, handles, color): (Point, [Vec2; 4], Color)| MeshPoint { p, color, opacity: 1.0, handles };
-    let [a, b, c, d] = corners;
-    // Row 0 is v = 0 (corners a, d), row 1 is v = 1 (b, c); columns follow u.
-    GradientMesh { rows: 1, cols: 1, points: vec![point(a), point(d), point(b), point(c)] }
-}
-
-/// Handles of a mesh corner: right, left, down, up (unused ones stay at the point).
-fn handles(right: Vec2, left: Vec2, down: Vec2, up: Vec2) -> [Vec2; 4] {
-    let mut h = [Vec2::ZERO; 4];
-    (h[H_RIGHT], h[H_LEFT], h[H_DOWN], h[H_UP]) = (right, left, down, up);
-    h
-}
-
-/// A 1×1 mesh from a patch's twelve boundary points (in the PDF's order: u runs cp0 → cp9 along
-/// cp11 and cp10, v runs cp0 → cp3 along cp1 and cp2) and its corner colours (at cp0, cp3, cp6,
-/// cp9); `None` if a point isn't finite.
-fn boundary_mesh(cp: &[Point], colors: [Color; 4]) -> Option<GradientMesh> {
-    let cp: &[Point; 12] = cp.get(..12)?.try_into().ok()?;
-    if !cp.iter().all(|p| p.is_finite()) {
-        return None;
-    }
-    let h = |a: usize, b: usize| cp[b] - cp[a];
-    let [c0, c1, c2, c3] = colors;
-    Some(patch_mesh([
-        (cp[0], handles(h(0, 11), Vec2::ZERO, h(0, 1), Vec2::ZERO), c0),
-        (cp[3], handles(h(3, 4), Vec2::ZERO, Vec2::ZERO, h(3, 2)), c1),
-        (cp[6], handles(Vec2::ZERO, h(6, 5), Vec2::ZERO, h(6, 7)), c2),
-        (cp[9], handles(Vec2::ZERO, h(9, 10), h(9, 8), Vec2::ZERO), c3),
-    ]))
-}
-
 /// A patch mesh or triangle mesh shading as gradient meshes in document space (one per patch;
 /// a triangle is a patch with two corners together). `None`: not a mesh, or too big.
 pub(crate) fn mesh_shading(sp: &ShadingPattern, colors: &mut Colors<'_>) -> Option<Vec<GradientMesh>> {
@@ -196,7 +162,7 @@ pub(crate) fn mesh_shading(sp: &ShadingPattern, colors: &mut Colors<'_>) -> Opti
            }
            for p in patches {
                let colors = [0, 1, 2, 3].map(|i| mesh_color(p.colors.get(i).map_or(&[][..], |c| c.as_slice()), function.as_ref(), sp, colors));
-                out.extend(boundary_mesh(&p.control_points.map(|q| m * q), colors));
+                out.extend(GradientMesh::coons(&p.control_points.map(|q| m * q), colors));
            }
        }
        // A tensor patch's boundary is a Coons patch's (its four inner points are dropped).
@@ -206,7 +172,7 @@ pub(crate) fn mesh_shading(sp: &ShadingPattern, colors: &mut Colors<'_>) -> Opti
            }
            for p in patches {
                let colors = [0, 1, 2, 3].map(|i| mesh_color(p.colors.get(i).map_or(&[][..], |c| c.as_slice()), function.as_ref(), sp, colors));
-                out.extend(boundary_mesh(&p.control_points.map(|q| m * q), colors));
+                out.extend(p.control_points.map(|q| m * q).first_chunk::<12>().and_then(|cp| GradientMesh::coons(cp, colors)));
            }
        }
        ShadingType::TriangleMesh { triangles, function } => {
@@ -215,16 +181,7 @@ pub(crate) fn mesh_shading(sp: &ShadingPattern, colors: &mut Colors<'_>) -> Opti
            }
            for t in triangles {
                let v = [&t.p0, &t.p1, &t.p2].map(|v| (m * v.point, mesh_color(v.colors.as_slice(), function.as_ref(), sp, colors)));
-                if !v.iter().all(|(p, _)| p.is_finite()) {
-                    continue;
-                }
-                let [a, b, c] = v;
-                out.push(patch_mesh([
-                    (a.0, [Vec2::ZERO; 4], a.1),
-                    (b.0, [Vec2::ZERO; 4], b.1),
-                    (c.0, [Vec2::ZERO; 4], c.1),
-                    (c.0, [Vec2::ZERO; 4], c.1),
-                ]));
+                out.extend(GradientMesh::triangle(v));
            }
        }
        _ => return None,
@@ -434,6 +434,20 @@ fn import_handmade_pdf() {
    assert!(close(l[2].geometric_bounds().unwrap(), Rect::new(150.0, 270.0, 190.0, 300.0), 1e-6));
 }

+/// Art off the page opens on the pasteboard round its artboard, not cut away (#472).
+#[test]
+fn import_keeps_art_outside_the_page() {
+    let content = "0 0 1 rg 10 10 50 30 re f 0 1 0 rg -300 -300 50 50 re f 1 0 0 rg 500 500 20 20 re f";
+    let d = import(&handmade_pdf(content, "[0 0 200 300]")).unwrap();
+    assert!(close(d.artboards[0].rect, Rect::new(0.0, 0.0, 200.0, 300.0), 1e-9));
+    let bounds: Vec<Rect> = leaves(&d).iter().map(|n| n.geometric_bounds().unwrap()).collect();
+    let want = [Rect::new(10.0, 260.0, 60.0, 290.0), Rect::new(-300.0, 550.0, -250.0, 600.0), Rect::new(500.0, -220.0, 520.0, -200.0)];
+    assert_eq!(bounds.len(), want.len(), "{bounds:?}");
+    for (b, w) in bounds.iter().zip(want) {
+        assert!(close(*b, w, 1e-6), "{b:?} vs {w:?}");
+    }
+}
+
 #[test]
 fn import_invalid_dash_array_strokes_solid() {
    // A dash array with a negative value is invalid (PDF 32000-1 §8.4.3.6): the line is solid. A valid
@@ -151,6 +151,20 @@ fn page_fill(before: &str, after: &str, ai: bool) -> Document {
    import(&pdf_with_catalog(&[page], &[&objs[0], &objs[1]], &catalog, None)).unwrap()
 }

+/// A file with an editor's private data says that art off its artboards isn't in the part read
+/// (#472); a plain PDF has nothing to say.
+#[test]
+fn an_ai_file_notes_that_its_art_off_the_artboards_is_not_read() {
+    for ai in [false, true] {
+        let page = PdfPage {
+            entries: if ai { "/PieceInfo << /Illustrator << /Private << /AIPrivateData1 7 /NumBlock 1 >> >> >>".into() } else { String::new() },
+            ..PdfPage::new(100.0, 100.0, "1 0 0 rg 10 10 30 30 re f")
+        };
+        let r = import_with_report(&pdf_with_catalog(&[page], &[], "", None), &ImportOptions::default()).unwrap();
+        assert_eq!(r.warnings, if ai { vec![crate::import::OFF_ARTBOARD_NOTE.to_string()] } else { vec![] });
+    }
+}
+
 fn path_count(d: &Document) -> usize {
    let mut n = 0;
    d.walk(|c| n += usize::from(matches!(c.kind, NodeKind::Path { .. })));
@@ -10,7 +10,7 @@ use serde::{Deserialize, Serialize};
 use vectorcraft_color::{BlendMode, Color, GradientKind, GradientPaint, Paint};
 use vectorcraft_doc::{AppearanceItem, CharStyle, Document, Justify, LineCap, LiveShape, Node, NodeId, NodeKind, StrokeAlign, StrokeLayer, TextKind};
 use vectorcraft_effects::RasterFx;
-use vectorcraft_geom::shapes::CornerKind;
+use vectorcraft_geom::shapes::{self, CornerKind};
 use vectorcraft_geom::{Affine, PathData, Point, Rect};

 use crate::export::sanitize_id;
@@ -600,19 +600,21 @@ fn corners(path: &PathData, live: Option<&LiveShape>) -> Option<Corners> {
        let [_, b, c, _, _, _] = xf.as_coeffs();
        b.abs() < 1e-9 && c.abs() < 1e-9
    };
-    match live {
+    // Sizes and radii in document units.
+    match live.map(LiveShape::folded).as_ref() {
        // CSS rounds corners only: an inverted round or chamfered corner has no border radius.
-        Some(LiveShape::Rectangle { radii, kinds, xf, .. })
+        Some(LiveShape::Rectangle { w, h, radii, kinds, xf })
            if upright(xf) && radii.iter().zip(kinds).all(|(r, k)| *r <= 0.0 || *k == CornerKind::Round) =>
        {
-            let [a, _, _, d, _, _] = xf.as_coeffs();
-            let s = (a * d).abs().sqrt();
+            // The radii as drawn, none past half the shorter side (CSS draws one further when its
+            // neighbours leave room).
+            let radii = radii.map(|r| shapes::fitted_corner_radius(*w, *h, r));
            if radii.iter().all(|r| *r <= 0.0) {
                Some(Corners::Square)
            } else if radii.iter().all(|r| (r - radii[0]).abs() < 1e-9) {
-                Some(Corners::Round(vec![radii[0] * s]))
+                Some(Corners::Round(vec![radii[0]]))
            } else {
-                Some(Corners::Round(radii.iter().map(|r| r.max(0.0) * s).collect()))
+                Some(Corners::Round(radii.to_vec()))
            }
        }
        Some(LiveShape::Ellipse { pie, xf, .. }) if upright(xf) => {
@@ -84,6 +84,13 @@ fn live_corners_give_per_corner_radii_and_only_round_ones() {
        kinds[1] = CornerKind::InvertedRound;
    }
    assert!(prop(&one(&d, id, &CssOptions::default()), "border-radius").is_none(), "CSS can't cut a corner in");
+    // A radius past half the shorter side is drawn at half of it (#442), and exported so: CSS
+    // would draw it larger, its neighbours leaving room.
+    if let Some(NodeKind::Path { live: Some(LiveShape::Rectangle { radii, kinds, .. }), .. }) = d.node_mut(id).map(|n| &mut n.kind) {
+        *radii = [60.0, 8.0, 0.0, 4.0];
+        *kinds = Default::default();
+    }
+    assert_eq!(prop(&one(&d, id, &CssOptions::default()), "border-radius"), Some("25px 8px 0 4px"));
 }

 #[test]
@@ -31,3 +31,8 @@ test-fonts = ["dep:write-fonts"]

 [dev-dependencies]
 write-fonts = "0.48"
+
+# Fonts registered with Windows outside its font folders ("install as shortcut", installers);
+# MIT OR Apache-2.0, a safe wrapper of the registry API from the windows-rs project.
+[target.'cfg(windows)'.dependencies]
+windows-registry = "0.6"
@@ -238,9 +238,9 @@ pub struct FontDb {
    catalog: RwLock<Catalog>,
    /// The installed faces by PostScript name (documents name fonts so: PDF, EPS, .ai).
    postscript: RwLock<PostScriptNames>,
-    /// The folders the system font scan reads (the platform's font folders for [`FontDb::global`]).
+    /// Where the system font scan looks.
    #[cfg_attr(target_arch = "wasm32", allow(dead_code))]
-    font_dirs: Vec<PathBuf>,
+    font_paths: FontPaths,
    /// The installed fonts' other names (localized, legacy, PostScript) by normalized name.
    aliases: RwLock<HashMap<String, Vec<Alias>>>,
    /// Set once the font folders have been scanned. Lookups by family name wait for the first
@@ -254,6 +254,41 @@ pub struct FontDb {
    /// System fallback state: characters no system font covers.
    #[cfg(not(target_arch = "wasm32"))]
    sys: Mutex<SysFallback>,
+    /// What the last scan read, to tell when fonts were installed or removed since.
+    #[cfg(not(target_arch = "wasm32"))]
+    stamp: Mutex<Option<ScanStamp>>,
+}
+
+/// Where a database's system font scan looks: folders (read with their subfolders) and font files.
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+enum FontPaths {
+    Fixed(Vec<PathBuf>),
+    /// The platform's ([`system_font_dirs`]), looked up again by each scan: fonts registered and
+    /// font folders added since count too.
+    System,
+}
+
+#[cfg_attr(target_arch = "wasm32", allow(dead_code))]
+impl FontPaths {
+    fn get(&self) -> Vec<PathBuf> {
+        match self {
+            FontPaths::Fixed(paths) => paths.clone(),
+            FontPaths::System => system_font_dirs(),
+        }
+    }
+}
+
+/// What a system font scan read: the paths it started from, and when each folder it listed (and
+/// font file named by itself) last changed. Installing or removing a font changes its folder's.
+#[cfg(not(target_arch = "wasm32"))]
+struct ScanStamp {
+    paths: Vec<PathBuf>,
+    modified: Vec<(PathBuf, Option<std::time::SystemTime>)>,
+}
+
+#[cfg(not(target_arch = "wasm32"))]
+fn modified(path: &Path) -> Option<std::time::SystemTime> {
+    std::fs::metadata(path).and_then(|m| m.modified()).ok()
 }

 #[cfg(not(target_arch = "wasm32"))]
@@ -747,7 +782,8 @@ pub(crate) fn sfnt_of(tables: &[(&[u8; 4], &[u8])]) -> Option<Vec<u8>> {
    Some(font)
 }

-/// The platform's font folders (the system's and the user's), scanned by [`FontDb::global`].
+/// The platform's font folders (the system's and the user's) and, on Windows, the font files
+/// registered with it outside them, scanned by [`FontDb::global`].
 pub fn system_font_dirs() -> Vec<PathBuf> {
    let mut dirs: Vec<PathBuf> = Vec::new();
    if cfg!(target_arch = "wasm32") {
@@ -755,7 +791,7 @@ pub fn system_font_dirs() -> Vec<PathBuf> {
    }
    let home = std::env::var_os("HOME").map(PathBuf::from);
    if cfg!(target_os = "macos") {
-        dirs.extend(["/System/Library/Fonts", "/Library/Fonts"].map(Into::into));
+        dirs.extend(["/System/Library/Fonts", "/Library/Fonts", "/Network/Library/Fonts"].map(Into::into));
        if let Some(h) = &home {
            dirs.push(h.join("Library/Fonts"));
        }
@@ -769,19 +805,65 @@ pub fn system_font_dirs() -> Vec<PathBuf> {
    } else if cfg!(windows) {
        let root = std::env::var_os("WINDIR").map(PathBuf::from).unwrap_or_else(|| "C:\\Windows".into());
        dirs.push(root.join("Fonts"));
+        // Fonts installed for the current user only (what Install does without administrator rights).
        if let Some(l) = std::env::var_os("LOCALAPPDATA") {
            dirs.push(PathBuf::from(l).join("Microsoft\\Windows\\Fonts"));
        }
+        #[cfg(windows)]
+        dirs.extend(registered_font_files(&dirs));
    } else {
        dirs.extend(["/usr/share/fonts", "/usr/local/share/fonts"].map(Into::into));
+        // The XDG data folders' `fonts` (fontconfig's user folder; Flatpak, Snap, NixOS and Guix
+        // list their own data folders), relative paths ignored as the XDG spec says.
+        let xdg = |var| std::env::var_os(var).map(|v| std::env::split_paths(&v).filter(|p| p.is_absolute()).collect::<Vec<_>>()).unwrap_or_default();
+        let data_home = xdg("XDG_DATA_HOME").into_iter().next().or_else(|| home.as_ref().map(|h| h.join(".local/share")));
+        dirs.extend(data_home.into_iter().chain(xdg("XDG_DATA_DIRS")).map(|d| d.join("fonts")));
        if let Some(h) = &home {
            dirs.push(h.join(".fonts"));
-            dirs.push(h.join(".local/share/fonts"));
        }
+        // In a Flatpak sandbox, the host's fonts (system, local and the user's).
+        dirs.extend(["/run/host/fonts", "/run/host/local-fonts", "/run/host/user-fonts"].map(Into::into));
    }
    dirs
 }

+/// The registry key listing the fonts installed on Windows (for all users under the local
+/// machine's key, for the current user under theirs): one value per face, holding its file's
+/// name in the Windows font folder or its full path.
+#[cfg(windows)]
+const REGISTERED_FONTS: &str = r"Software\Microsoft\Windows NT\CurrentVersion\Fonts";
+
+/// The font files registered with Windows outside `font_dirs` (fonts installed as shortcuts to
+/// where they are, or by programs into their own folders), which apps find by the registry.
+#[cfg(windows)]
+fn registered_font_files(font_dirs: &[PathBuf]) -> Vec<PathBuf> {
+    use windows_registry::{CURRENT_USER, LOCAL_MACHINE};
+    let values = [LOCAL_MACHINE, CURRENT_USER].into_iter().filter_map(|root| root.open(REGISTERED_FONTS).ok()).flat_map(|key| {
+        // A value that isn't a string isn't a font file.
+        key.values().map(|vs| vs.filter_map(|(_, v)| String::try_from(v).ok()).collect::<Vec<_>>()).unwrap_or_default()
+    });
+    fonts_outside(values, font_dirs)
+}
+
+/// The full paths among `registered` (font registrations' data) that aren't in `font_dirs`
+/// (ignoring case, as Windows paths do), sorted and deduplicated. File names alone are files in
+/// the Windows font folder, which is scanned anyway. The count is capped.
+#[cfg(any(windows, test))]
+pub(crate) fn fonts_outside(registered: impl IntoIterator<Item = String>, font_dirs: &[PathBuf]) -> Vec<PathBuf> {
+    const MAX_REGISTERED: usize = 1 << 16;
+    let lower = |p: &Path| PathBuf::from(p.to_string_lossy().to_lowercase());
+    let dirs: Vec<PathBuf> = font_dirs.iter().map(|d| lower(d)).collect();
+    let mut files: Vec<PathBuf> = registered
+        .into_iter()
+        .take(MAX_REGISTERED)
+        .map(PathBuf::from)
+        .filter(|p| p.is_absolute() && !dirs.iter().any(|d| lower(p).starts_with(d)))
+        .collect();
+    files.sort();
+    files.dedup();
+    files
+}
+
 fn make_face(bytes: FontBytes, index: u32, spec: FaceStyle, path: Option<std::path::PathBuf>) -> Option<FontFace> {
    let data: &[u8] = match &bytes {
        FontBytes::Static(b) => b,
@@ -860,8 +942,13 @@ fn style_italic(style: &str) -> bool {
 type MenuFamilies = (Arc<[String]>, Arc<[String]>);

 impl FontDb {
-    /// A database holding the bundled fonts, whose system font scan reads `font_dirs`.
+    /// A database holding the bundled fonts, whose system font scan reads `font_dirs` (folders,
+    /// read with their subfolders, and font files).
    pub fn with_font_dirs(font_dirs: Vec<PathBuf>) -> Self {
+        Self::new(FontPaths::Fixed(font_dirs))
+    }
+
+    fn new(font_paths: FontPaths) -> Self {
        let mut faces = Vec::new();
        // The bundled fonts, then the Japanese craft-fonts faces (when built with them), Mincho
        // first: fallbacks for Japanese text after the requested and bundled fonts.
@@ -878,7 +965,7 @@ impl FontDb {
            outlines: Mutex::new(HashMap::new()),
            catalog: RwLock::new(Catalog::new()),
            postscript: RwLock::new(PostScriptNames::new()),
-            font_dirs,
+            font_paths,
            aliases: RwLock::new(HashMap::new()),
            #[cfg(not(target_arch = "wasm32"))]
            cataloged: std::sync::OnceLock::new(),
@@ -887,6 +974,8 @@ impl FontDb {
            generation: AtomicU64::new(0),
            #[cfg(not(target_arch = "wasm32"))]
            sys: Mutex::new(SysFallback { enabled: true, ..Default::default() }),
+            #[cfg(not(target_arch = "wasm32"))]
+            stamp: Mutex::new(None),
        }
    }

@@ -906,7 +995,7 @@ impl FontDb {
    /// [`FontDb::scan_in_background`]).
    pub fn global() -> &'static FontDb {
        static DB: std::sync::OnceLock<FontDb> = std::sync::OnceLock::new();
-        DB.get_or_init(|| FontDb::with_font_dirs(system_font_dirs()))
+        DB.get_or_init(|| FontDb::new(FontPaths::System))
    }

    fn read_faces(&self) -> std::sync::RwLockReadGuard<'_, Vec<Arc<FontFace>>> {
@@ -1042,50 +1131,78 @@ impl FontDb {
        first.unwrap_or_else(|| self.scan_font_dirs())
    }

+    /// Whether fonts were installed or removed since the last scan (a font folder or font file it
+    /// read changed, or a new one is to be read), for [`FontDb::load_system_fonts`] to catalog
+    /// them. Costs a look at each folder the scan read, not a scan. `false` before the first scan
+    /// and on wasm.
+    pub fn installed_fonts_changed(&self) -> bool {
+        #[cfg(not(target_arch = "wasm32"))]
+        {
+            let paths = self.font_paths.get();
+            let stamp = self.stamp.lock().unwrap_or_else(|e| e.into_inner());
+            stamp.as_ref().is_some_and(|s| s.paths != paths || s.modified.iter().any(|(p, t)| modified(p) != *t))
+        }
+        #[cfg(target_arch = "wasm32")]
+        false
+    }
+
    #[cfg(not(target_arch = "wasm32"))]
    fn scan_font_dirs(&self) -> usize {
        let mut catalog = Catalog::new();
        let mut aliases: HashMap<String, Vec<Alias>> = HashMap::new();
        let mut postscript = PostScriptNames::new();
        let mut n = 0;
-        let mut stack = self.font_dirs.clone();
+        let paths = self.font_paths.get();
+        let mut modified_at = Vec::new();
+        let mut files = Vec::new();
+        let mut stack = paths.clone();
        // Each folder once, however links lead back to it.
        let mut visited = std::collections::HashSet::new();
        while let Some(d) = stack.pop() {
            if !visited.insert(std::fs::canonicalize(&d).unwrap_or_else(|_| d.clone())) {
                continue;
            }
-            let Ok(rd) = std::fs::read_dir(&d) else { continue };
+            // Before listing it: a font installed meanwhile changes it after this.
+            modified_at.push((d.clone(), modified(&d)));
+            // Not a folder: a font file named by itself (or nothing, yet).
+            let Ok(rd) = std::fs::read_dir(&d) else {
+                files.push(d);
+                continue;
+            };
            for e in rd.flatten() {
                let p = e.path();
                if p.is_dir() {
                    stack.push(p);
-                    continue;
-                }
-                let ext = p.extension().and_then(|e| e.to_str()).map(|e| e.to_ascii_lowercase());
-                if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
-                    continue;
-                }
-                for FaceStyle { family, style, keys, weight, italic, traits, .. } in file_face_names(&p) {
-                    for (k, a) in Alias::of(&family, &style, &keys) {
-                        aliases.entry(k).or_default().push(a);
-                    }
-                    // `keys.postscript` is normalized ([`norm`]), as `by_postscript_name` looks it up.
-                    for ps in &keys.postscript {
-                        postscript.insert(ps.clone(), (family.clone(), style.clone()));
-                    }
-                    let entry = catalog.entry(family.to_ascii_lowercase()).or_default();
-                    entry.traits.get_or_insert(traits);
-                    if entry.name.is_empty() {
-                        entry.name = family;
-                    }
-                    let (weight, italic) = (weight.unwrap_or_else(|| style_weight(&style)), italic || style_italic(&style));
-                    entry.faces.push(CatalogFace { style, path: p.clone(), weight, italic });
-                    n += 1;
+                } else {
+                    files.push(p);
                }
            }
        }
+        for p in files {
+            let ext = p.extension().and_then(|e| e.to_str()).map(|e| e.to_ascii_lowercase());
+            if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
+                continue;
+            }
+            for FaceStyle { family, style, keys, weight, italic, traits, .. } in file_face_names(&p) {
+                for (k, a) in Alias::of(&family, &style, &keys) {
+                    aliases.entry(k).or_default().push(a);
+                }
+                // `keys.postscript` is normalized ([`norm`]), as `by_postscript_name` looks it up.
+                for ps in &keys.postscript {
+                    postscript.insert(ps.clone(), (family.clone(), style.clone()));
+                }
+                let entry = catalog.entry(family.to_ascii_lowercase()).or_default();
+                entry.traits.get_or_insert(traits);
+                if entry.name.is_empty() {
+                    entry.name = family;
+                }
+                let (weight, italic) = (weight.unwrap_or_else(|| style_weight(&style)), italic || style_italic(&style));
+                entry.faces.push(CatalogFace { style, path: p.clone(), weight, italic });
+                n += 1;
+            }
+        }
        log::debug!("cataloged {n} system font faces");
+        *self.stamp.lock().unwrap_or_else(|e| e.into_inner()) = Some(ScanStamp { paths, modified: modified_at });
        *self.catalog.write().unwrap_or_else(|e| e.into_inner()) = catalog;
        *self.aliases.write().unwrap_or_else(|e| e.into_inner()) = aliases;
        *self.postscript.write().unwrap_or_else(|e| e.into_inner()) = postscript;
@@ -4,7 +4,9 @@ use std::ops::Range;

 use kurbo::{Affine, BezPath, PathEl, Point, Rect, Shape, Vec2};
 use unicode_bidi::{BidiInfo, Level};
-use vectorcraft_doc::{CharStyle, Justify, LeadingModel, Mojikumi, ParaDirection, ParaStyle, PathAlign, PathEffect, TextKind, TextObject};
+use vectorcraft_doc::{
+    Burasagari, CharStyle, Justify, LeadingModel, Mojikumi, ParaDirection, ParaStyle, PathAlign, PathEffect, TextKind, TextObject,
+};
 use vectorcraft_geom::{ArcPath, PathData};

 use crate::composer::{Breakpoint, compose};
@@ -749,7 +751,8 @@ fn tab_advance(tabs: &[vectorcraft_doc::TabStop], origin: f64, x: f64, rest: &[S
 }

 /// Greedy break: returns (end glyph index, hyphenated) for a line starting at `i` of `width`.
-fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool) -> (usize, bool) {
+/// With burasagari, a comma or full stop that doesn't fit ends the line, hanging outside it.
+fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool, burasagari: Burasagari) -> (usize, bool) {
    if !width.is_finite() {
        return (g.len(), false);
    }
@@ -759,6 +762,14 @@ fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool) -
    while j < g.len() {
        let gl = &g[j];
        if j > i && !gl.is_space() && x + gl.adv > width + EPS {
+            // It ends the line with the spaces after it.
+            if burasagari != Burasagari::None && hangs(gl) && kinsoku_allows(g, j) && g.get(j + 1).is_none_or(|n| n.byte != gl.byte) {
+                let mut end = j + 1;
+                while g.get(end).is_some_and(SGlyph::is_space) {
+                    end += 1;
+                }
+                return (end, false);
+            }
            break;
        }
        x += gl.adv;
@@ -805,6 +816,13 @@ fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool) -
    (end, hy)
 }

+/// Can glyph `g` hang outside the line (burasagari)? An East Asian comma or full stop, full width
+/// (、。，．) or half width (､｡); not a closing bracket, nor Latin punctuation (Latin text keeps
+/// its line breaks and composer).
+fn hangs(g: &SGlyph) -> bool {
+    matches!(g.ch, '、' | '。' | '，' | '．' | '､' | '｡') && g.tcy.is_none()
+}
+
 /// Does kinsoku allow a line break after glyph `j`? Not after an opening bracket, nor before a
 /// closing one, a comma, a full stop, a small kana… (the character is pushed to the next line
 /// with the one before it).
@@ -900,7 +918,10 @@ fn candidates(text: &str, g: &[SGlyph], hyphenate: bool) -> Vec<Breakpoint> {
 /// line metrics); `None` falls back to the greedy single-line composer.
 fn compose_para(cx: &Ctx<'_>, sg: &[SGlyph], para: &ParaStyle, pen: &Pen<'_>) -> Option<Vec<(usize, bool)>> {
    let justified = !matches!(para.justify, Justify::Auto | Justify::Left | Justify::Center | Justify::Right);
-    if cx.opts.composer != Composer::EveryLine || !justified || pen.regions.is_none() || sg.len() < 2 {
+    // A paragraph whose commas or full stops may hang is composed line by line (as the Japanese
+    // single-line composer does).
+    let may_hang = para.burasagari != Burasagari::None && sg.iter().any(hangs);
+    if cx.opts.composer != Composer::EveryLine || !justified || pen.regions.is_none() || sg.len() < 2 || may_hang {
        return None;
    }
    let m = Metrics::of(&sg[0]);
@@ -994,7 +1015,7 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
                let width = x1 - x0 - ind_l - para.right_indent;
                let (end, hyph) = match composed.as_ref().and_then(|c| c.get(li_para)) {
                    Some(&(e, h)) if e > i => (e, h),
-                    _ if i < n => break_line(cx.text, &sg, i, width, para.hyphenate),
+                    _ if i < n => break_line(cx.text, &sg, i, width, para.hyphenate, para.burasagari),
                    _ => (n, false),
                };
                let m = Metrics::max(&sg[i..end]).unwrap_or(pm);
@@ -1038,6 +1059,21 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
                None => 0.0,
            };
            let w: f64 = sg[i..trimmed].iter().map(|g| g.adv).sum::<f64>() + hyphen.as_ref().map_or(0.0, |h| h.adv) - end_trim;
+            // Burasagari: a comma or full stop ending an area type line hangs outside it (Standard:
+            // when it doesn't fit; Forced: always). The rest of the line is aligned and justified
+            // without it, and it follows the line's last character.
+            let hang = (regions.is_some() && !rtl && hyphen.is_none() && trimmed > i + 1)
+                .then(|| sg.get(trimmed - 1))
+                .flatten()
+                .filter(|g| hangs(g))
+                .map(|g| g.adv - end_trim)
+                .filter(|_| match para.burasagari {
+                    Burasagari::None => false,
+                    Burasagari::Standard => w > width + EPS,
+                    Burasagari::Forced => true,
+                });
+            let body = if hang.is_some() { trimmed - 1 } else { trimmed };
+            let w = w - hang.unwrap_or(0.0);
            let (align, justify) = match para.justify {
                Justify::Auto => (if rtl { 2 } else { 0 }, false),
                Justify::Left => (0, false),
@@ -1050,17 +1086,17 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
            };
            let justify = justify && regions.is_some();
            let (mut per_space, mut per_gap, mut per_cjk) = (0.0, 0.0, 0.0);
-            let spaces = sg[i..trimmed].iter().filter(|g| g.is_space()).count();
+            let spaces = sg[i..body].iter().filter(|g| g.is_space()).count();
            // Japanese (and Chinese) lines are justified between their characters (JLREQ 3.8): the
            // gaps next to a CJK character, not inside a Latin word or a tate-chu-yoko block.
            let cjk_gap = |j: usize| {
-                j + 1 < trimmed
+                j + 1 < body
                    && sg
                        .get(j)
                        .zip(sg.get(j + 1))
                        .is_some_and(|(a, b)| !a.is_space() && !b.is_space() && !b.continues_tcy() && a.ch != '\t' && (is_cjk(a.ch) || is_cjk(b.ch)))
            };
-            let cjk_gaps = (i..trimmed).filter(|&j| cjk_gap(j)).count();
+            let cjk_gaps = (i..body).filter(|&j| cjk_gap(j)).count();
            if justify && (width - w).abs() > EPS {
                if cjk_gaps > 0 && width > w {
                    // Spread over the CJK gaps and the word spaces alike.
@@ -1069,9 +1105,9 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
                } else if spaces > 0 {
                    // Composed lines may shrink word spaces (never below zero).
                    per_space =
-                        ((width - w) / spaces as f64).max(-sg[i..trimmed].iter().filter(|g| g.is_space()).map(|g| g.adv).fold(f64::MAX, f64::min));
+                        ((width - w) / spaces as f64).max(-sg[i..body].iter().filter(|g| g.is_space()).map(|g| g.adv).fold(f64::MAX, f64::min));
                } else if para.justify == Justify::JustifyAll && width > w {
-                    let gaps = sg.get(i + 1..trimmed).map_or(0, |s| s.iter().filter(|g| !g.continues_tcy()).count());
+                    let gaps = sg.get(i + 1..body).map_or(0, |s| s.iter().filter(|g| !g.continues_tcy()).count());
                    if gaps > 0 {
                        per_gap = (width - w) / gaps as f64;
                    }
@@ -1116,14 +1152,14 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
                }
                if g.ch == '\t' {
                    adv = tab_advance(&para.tabs, tab_origin, x, &sg[j + 1..trimmed.max(j + 1)]);
-                } else if j < trimmed {
+                } else if j < body {
                    if g.is_space() {
                        adv += per_space;
                    } else if per_cjk != 0.0 {
                        if cjk_gap(j) {
                            adv += per_cjk;
                        }
-                    } else if j + 1 < trimmed && sg.get(j + 1).is_some_and(|next| !next.continues_tcy()) {
+                    } else if j + 1 < body && sg.get(j + 1).is_some_and(|next| !next.continues_tcy()) {
                        // Between glyphs, never inside a tate-chu-yoko block (one cell).
                        adv += per_gap;
                    }
@@ -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();
@@ -585,3 +585,23 @@ fn character_alignment_lines_small_characters_up_with_the_largest_em_box() {
        assert!(near(place(CharAlign::EmBoxBottom), -0.12 * 20.0), "bottom: {}", place(CharAlign::EmBoxBottom));
    }
 }
+
+/// Burasagari leaves Latin punctuation alone: in a measure of exactly "abcd", the full stop of
+/// "abcd. ef" doesn't hang with Standard or Forced (the line breaks as it does with None), and a
+/// Latin line ending in a full stop isn't shortened by Forced.
+#[test]
+fn burasagari_leaves_latin_commas_and_full_stops_inside_the_line() {
+    use vectorcraft_doc::Burasagari;
+    let measure = width(&point("abcd", style(20.0)));
+    let lay = |text: &str, b: Burasagari| {
+        let mut t = area(text, style(20.0), Rect::new(0.0, 0.0, measure + 0.01, 400.0), Justify::JustifyLeft);
+        t.para.burasagari = b;
+        layout(db(), &t).glyphs.iter().map(|g| (g.line, (g.origin.x * 100.0).round())).collect::<Vec<_>>()
+    };
+    for text in ["abcd. ef", "a b. efgh", "ab, cd, efgh"] {
+        let none = lay(text, Burasagari::None);
+        for b in [Burasagari::Standard, Burasagari::Forced] {
+            assert_eq!(lay(text, b), none, "{text} {b:?}");
+        }
+    }
+}
@@ -4,6 +4,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;

 use super::*;
+use crate::fontdb::fonts_outside;

 const FAMILY: &str = "Sysfont Sans3";

@@ -184,3 +185,55 @@ fn installed_faces_are_found_by_postscript_name() {
    assert_eq!(db.by_postscript_name("sourcesans3-regular"), Some((FAMILY.to_string(), "Regular".to_string())), "any case");
    assert_eq!(db.by_postscript_name("Rounded-X-Mplus-1c-black"), None);
 }
+
+/// Windows lists fonts installed as shortcuts, or by programs into their own folders, by their
+/// files' full paths: those files are scanned too (#443).
+#[test]
+fn a_font_file_named_by_itself_is_scanned() {
+    let dir = font_dir("file");
+    let db = FontDb::with_font_dirs(vec![dir.join("Sub/Sysfont-Bold.TTF"), dir.join("No Such Font.ttf")]);
+    assert_eq!(db.styles(FAMILY), ["Bold"]);
+    assert_eq!(db.load_system_fonts(), 1);
+}
+
+#[test]
+fn registered_fonts_outside_the_font_folders_are_their_full_paths() {
+    let dir = std::env::temp_dir().join("Fonts");
+    let elsewhere = std::env::temp_dir().join("Downloads").join("Montserrat-Regular.ttf");
+    let registered = [
+        // A file in the Windows font folder, by name.
+        "arial.ttf".into(),
+        // A file in a font folder (ignoring case).
+        dir.join("Lato-Regular.ttf").to_string_lossy().to_uppercase(),
+        elsewhere.to_string_lossy().into_owned(),
+        elsewhere.to_string_lossy().into_owned(),
+    ];
+    assert_eq!(fonts_outside(registered, &[dir]), [elsewhere]);
+}
+
+/// Fonts installed while the app runs are found when it comes back to the front, without
+/// scanning every time (#443).
+#[test]
+fn the_database_tells_when_fonts_were_installed_or_removed_since_its_scan() {
+    let dir = font_dir("changed");
+    let db = FontDb::with_font_dirs(vec![dir.clone(), dir.join("Later")]);
+    assert!(!db.installed_fonts_changed(), "nothing to compare with before the first scan");
+    assert!(!db.has_family("Other Sans 33"));
+    assert!(!db.installed_fonts_changed());
+    // Past the file system's clock tick, so the folders' times differ from the scan's.
+    let tick = || std::thread::sleep(std::time::Duration::from_millis(50));
+    tick();
+    std::fs::write(dir.join("Sub/Other.ttf"), renamed_to("SourceSans3-Regular.ttf", "Other Sans 33")).unwrap();
+    assert!(db.installed_fonts_changed(), "a font installed into a subfolder");
+    assert_eq!(db.load_system_fonts(), 3);
+    assert!(db.has_family("Other Sans 33") && !db.installed_fonts_changed());
+    tick();
+    std::fs::create_dir_all(dir.join("Later")).unwrap();
+    assert!(db.installed_fonts_changed(), "a font folder that didn't exist");
+    db.load_system_fonts();
+    tick();
+    std::fs::remove_file(dir.join("Sysfont-Regular.ttf")).unwrap();
+    assert!(db.installed_fonts_changed(), "a font removed");
+    assert_eq!(db.load_system_fonts(), 2);
+    assert_eq!(db.styles(FAMILY), ["Bold"]);
+}
@@ -262,6 +262,22 @@ fn every_line_composer_is_more_even() {
    assert!(kp <= greedy + 1e-6, "every-line worst space {kp} vs greedy {greedy}");
 }

+/// Burasagari (new type's Standard) leaves Latin paragraphs to the every-line composer: only a
+/// paragraph with a Japanese comma or full stop is composed line by line.
+#[test]
+fn burasagari_keeps_the_every_line_composer_for_latin_text() {
+    // A measure where the two composers break the copy differently.
+    let mut t = area(&COPY.repeat(2), style(12.0), Rect::new(0.0, 0.0, 300.0, 4000.0), Justify::JustifyLeft);
+    let ends = |t: &TextObject, c: Composer| {
+        let l = layout_with(db(), t, &LayoutOptions { composer: c, ..Default::default() });
+        l.lines.iter().map(|li| li.glyph_end).collect::<Vec<_>>()
+    };
+    let every_line = ends(&t, Composer::EveryLine);
+    assert_ne!(every_line, ends(&t, Composer::SingleLine));
+    t.para.burasagari = vectorcraft_doc::Burasagari::Standard;
+    assert_eq!(ends(&t, Composer::EveryLine), every_line);
+}
+
 #[test]
 fn hyphenation_rules() {
    assert_eq!(hyphen::hyphenate_word("typography"), "typo-gra-phy");
				`@@ -0,0 +1 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M3 20 C5 11 8 7 12 7 S19 11 21 20"/><path d="M5 7 H19"/><circle cx="5" cy="7" r="1.4" fill="currentColor"/><circle cx="19" cy="7" r="1.4" fill="currentColor"/><rect x="10" y="5" width="4" height="4" fill="currentColor"/></svg>`
				`@@ -1 +0,0 @@`
				`<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M12 19l-7-7 3-6 8 3 3 7-7 3z" /><path d="M5 12l5-5"/><circle cx="11" cy="11" r="1.5"/><path d="M19 3v5M16.5 5.5h5"/></svg>`