#1007: Reverse Gradient mirrors off-centre midpoints

Reversal read the midpoints after Gradient::reverse had reordered the stops, so each stop
took the wrong segment's midpoint: red-to-blue with its midpoint at 20% reversed to a 50%
midpoint instead of 80%, moving the transition.

Gradient::reverse now mirrors each segment's midpoint with it, so a reversed gradient is the
same ramp the other way round; paint.editGradient's own (wrong) pass is gone, and the SVG
importer's reflect spread, which had a correct copy of the same mirroring, uses it too.

Tests: two- and three-stop gradients with off-centre midpoints sample the same reversed (t vs
1 - t) and come back after two reversals; paint.editGradient reverse turns a 0.2 midpoint into
0.8.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

# Conflicts:
#	ROADMAP.md

AGENTS.md

@@ -5,7 +5,7 @@ VectorCraft is a clean-room, open-source, Rust-native vector illustration app ta
 Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format": "drawcraft"` headers still open (`vectorcraft_format::LEGACY_EXTENSION`), and preferences migrate from the old config folder. Keep those paths working; use the new name everywhere else.
 
 ## Start every session here
-1. Read the [honest assessment in `ROADMAP.md`](ROADMAP.md#honest-assessment-2026-10-05): where we stand by dimension, **where we're lacking** (the prioritized gap list) and **where we're going**. Unless the user gives you a task, pick work from that list.
+1. Read [`ROADMAP.md`](ROADMAP.md) (stage, numbers by dimension, what's next) and the ranked work list in [`docs/gaps.md`](docs/gaps.md). Unless the user gives you a task, pick work from that list.
 2. Read `plan/STATUS.md` (local session notes, may lag the ROADMAP), then the task in `plan/execution-plan.md` §3 and the relevant `plan/architecture.md` section. Behaviour reference: public documentation only (see Clean-room below); `plan/illustrator/*.md` holds notes from it.
 3. Follow the autonomous operation protocol (`plan/execution-plan.md` §7): orient → plan → implement + test → verify → record → commit. Don't stop to ask unless §7 lists the decision as the user's.
 
@@ -56,10 +56,15 @@ Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format
 - Shell gotcha: `mv`/`cp` are aliased interactive here — use `/bin/mv -f` / `/bin/cp -f`.
 - Parallel agents: separate `CARGO_TARGET_DIR` per agent; edit only the crates you own; write manifests atomically. Each target dir grows to ~30 GB: delete yours when you finish (a full disk fails links with `errno=28`).
 
-## Roadmap
-`ROADMAP.md` (committed) is the shared picture of where VectorCraft stands. It holds status, the honest assessment (by dimension, the gap list, the direction), milestones, the parity table and time-to-parity estimates.
-- When a task lands, update it in the same PR: the milestone row, the parity-table row (score, missing items, hours), "Shipped so far", and the gap list if the gap closed or shrank.
-- Grade by behaviour against the public documentation (`plan/illustrator/` notes), not by whether a menu item exists. Scores are self-assessed, so err low.
+## Roadmap and progress docs
+The progress docs follow craftrules' [`standards/progress-docs.md`](https://github.com/storytold/craftrules/blob/main/standards/progress-docs.md):
+- [`ROADMAP.md`](ROADMAP.md): stage, headline numbers, dimensions, features, languages, upcoming, progress log.
+- [`docs/target-app-parity.md`](docs/target-app-parity.md): the authoritative parity assessment (area table, methodology, calibration, evidence of what ships).
+- [`docs/gaps.md`](docs/gaps.md): every known shortfall, ranked; the work list. [`docs/roadmap.md`](docs/roadmap.md): milestones and current focus.
+- Checklists: [`ui-parity.md`](docs/ui-parity.md), [`file-format-parity.md`](docs/file-format-parity.md), [`hardware-parity.md`](docs/hardware-parity.md), [`localization-parity.md`](docs/localization-parity.md), [`effects-parity.md`](docs/effects-parity.md), [`type-parity.md`](docs/type-parity.md); [`architecture.md`](docs/architecture.md).
+
+When a task lands, update in the same PR: the area row in `docs/target-app-parity.md` (score, missing items, hours) and its evidence list, the gap entry in `docs/gaps.md` if it closed or shrank, the checklist it belongs to, the milestone row in `docs/roadmap.md`, and the ROADMAP's tables and progress log when a headline number moves. Update each touched doc's status line and revision history.
+- Grade by behaviour against the public documentation (`plan/illustrator/` notes), not by whether a menu item exists. Scores are self-assessed, so err low; mark each number measured or estimated.
 - Keep the README's Status section in step with the ROADMAP headline.
 
 ## Contributor credits (About window)

CLAUDE.md

@@ -5,7 +5,7 @@ VectorCraft is a clean-room, open-source, Rust-native vector illustration app ta
 Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format": "drawcraft"` headers still open (`vectorcraft_format::LEGACY_EXTENSION`), and preferences migrate from the old config folder. Keep those paths working; use the new name everywhere else.
 
 ## Start every session here
-1. Read the [honest assessment in `ROADMAP.md`](ROADMAP.md#honest-assessment-2026-10-05): where we stand by dimension, **where we're lacking** (the prioritized gap list) and **where we're going**. Unless the user gives you a task, pick work from that list.
+1. Read [`ROADMAP.md`](ROADMAP.md) (stage, numbers by dimension, what's next) and the ranked work list in [`docs/gaps.md`](docs/gaps.md). Unless the user gives you a task, pick work from that list.
 2. Read `plan/STATUS.md` (local session notes, may lag the ROADMAP), then the task in `plan/execution-plan.md` §3 and the relevant `plan/architecture.md` section. Behaviour reference: public documentation only (see Clean-room below); `plan/illustrator/*.md` holds notes from it.
 3. Follow the autonomous operation protocol (`plan/execution-plan.md` §7): orient → plan → implement + test → verify → record → commit. Don't stop to ask unless §7 lists the decision as the user's.
 
@@ -56,8 +56,13 @@ Formerly **DrawCraft** (renamed 2026-10-01): old `.drawcraft` files and `"format
 - Shell gotcha: `mv`/`cp` are aliased interactive here — use `/bin/mv -f` / `/bin/cp -f`.
 - Parallel agents: separate `CARGO_TARGET_DIR` per agent; edit only the crates you own; write manifests atomically. Each target dir grows to ~30 GB: delete yours when you finish (a full disk fails links with `errno=28`).
 
-## Roadmap
-`ROADMAP.md` (committed) is the shared picture of where VectorCraft stands. It holds status, the honest assessment (by dimension, the gap list, the direction), milestones, the parity table and time-to-parity estimates.
-- When a task lands, update it in the same PR: the milestone row, the parity-table row (score, missing items, hours), "Shipped so far", and the gap list if the gap closed or shrank.
-- Grade by behaviour against the public documentation (`plan/illustrator/` notes), not by whether a menu item exists. Scores are self-assessed, so err low.
+## Roadmap and progress docs
+The progress docs follow craftrules' [`standards/progress-docs.md`](https://github.com/storytold/craftrules/blob/main/standards/progress-docs.md):
+- [`ROADMAP.md`](ROADMAP.md): stage, headline numbers, dimensions, features, languages, upcoming, progress log.
+- [`docs/target-app-parity.md`](docs/target-app-parity.md): the authoritative parity assessment (area table, methodology, calibration, evidence of what ships).
+- [`docs/gaps.md`](docs/gaps.md): every known shortfall, ranked; the work list. [`docs/roadmap.md`](docs/roadmap.md): milestones and current focus.
+- Checklists: [`ui-parity.md`](docs/ui-parity.md), [`file-format-parity.md`](docs/file-format-parity.md), [`hardware-parity.md`](docs/hardware-parity.md), [`localization-parity.md`](docs/localization-parity.md), [`effects-parity.md`](docs/effects-parity.md), [`type-parity.md`](docs/type-parity.md); [`architecture.md`](docs/architecture.md).
+
+When a task lands, update in the same PR: the area row in `docs/target-app-parity.md` (score, missing items, hours) and its evidence list, the gap entry in `docs/gaps.md` if it closed or shrank, the checklist it belongs to, the milestone row in `docs/roadmap.md`, and the ROADMAP's tables and progress log when a headline number moves. Update each touched doc's status line and revision history.
+- Grade by behaviour against the public documentation (`plan/illustrator/` notes), not by whether a menu item exists. Scores are self-assessed, so err low; mark each number measured or estimated.
 - Keep the README's Status section in step with the ROADMAP headline.

Cargo.lock

@@ -4335,6 +4335,7 @@ dependencies = [
  "objc2-core-foundation",
  "objc2-core-text",
  "objc2-foundation 0.3.2",
+ "raw-window-handle",
  "rfd",
  "serde_json",
  "vectorcraft-engine",
@@ -4448,6 +4449,7 @@ dependencies = [
  "vectorcraft-pathops",
  "vectorcraft-plugins",
  "vectorcraft-text",
+ "vectorcraft-three-d",
 ]
 
 [[package]]
@@ -4703,6 +4705,13 @@ dependencies = [
  "write-fonts",
 ]
 
+[[package]]
+name = "vectorcraft-three-d"
+version = "0.8.0"
+dependencies = [
+ "vectorcraft-geom",
+]
+
 [[package]]
 name = "vectorcraft-tools"
 version = "0.8.0"
@@ -4757,6 +4766,7 @@ dependencies = [
  "vectorcraft-svg",
  "vectorcraft-testkit",
  "vectorcraft-text",
+ "vectorcraft-three-d",
  "vectorcraft-tools",
  "wat",
 ]

Cargo.toml

@@ -20,6 +20,7 @@ vectorcraft-brush = { path = "crates/brush" }
 vectorcraft-trace = { path = "crates/trace" }
 vectorcraft-text = { path = "crates/text" }
 vectorcraft-effects = { path = "crates/effects" }
+vectorcraft-three-d = { path = "crates/three-d" }
 vectorcraft-render = { path = "crates/render" }
 vectorcraft-svg = { path = "crates/svg" }
 vectorcraft-pdf = { path = "crates/pdf" }

README.md

@@ -198,11 +198,14 @@ For the experimental, unsupported 64-bit Windows 7 build, see [Windows 7 instruc
 
 ## Status
 
-VectorCraft is under active development. [**ROADMAP.md**](ROADMAP.md) covers what ships today, the
-milestones, and honest time-to-parity estimates.
+VectorCraft is under active development. [**ROADMAP.md**](ROADMAP.md) has the stage, the numbers by dimension
+and what's next; [`docs/target-app-parity.md`](docs/target-app-parity.md) the full parity assessment and
+[`docs/gaps.md`](docs/gaps.md) the ranked list of what's missing.
 
-**Where we are (2026-10-10):** roughly 69–75% of Illustrator's features exist and work, and about 40–55% of
-"a power user can't tell the difference". Everyday vector illustration is close to usable: drawing and path tools,
+**Where we are (2026-10-10): alpha.** About 88% of Illustrator 2026's menu items, tools, effects and formats exist
+(92.5% of menu items do something), feature depth is ~75%, and we estimate ~65% "ready for real work" for a mainstream illustrator (~62% against
+all of Illustrator): everyday
+vector illustration is close to usable: drawing and path tools,
 Pathfinder and Shape Builder, paint, gradients, appearance and transparency, type with styles, threading and Hebrew/Arabic bidirectional layout, and
 files (SVG, PDF and PDF-compatible `.ai` with PDF/X, EPS, DXF, EMF/WMF, raster formats, PSD out and PSD/PSB in as their merged image, Print, Package).
 Affinity documents (`.af` from Affinity 3, `.afdesign`, `.afpub` and, by their content, `.afphoto` from Affinity 1 and 2) open
@@ -213,23 +216,25 @@ doesn't write Affinity files. Current `.af` validation includes 33 pinned files,
 and every-board SVG/PDF/PSD export, with fixes for Affinity 3 artboards, source-backed JPEGs and text runs.
 [Scope and limits](crates/affinity/README.md); [source audit and remaining gaps](docs/affinity-validation.md).
 The interface
-speaks English, Japanese, Traditional and Simplified Chinese, Spanish, French, Italian, Russian and Ukrainian (and Czech and Brazilian Portuguese in the menus).
-The scores are
-self-assessed, so the [honest assessment](ROADMAP.md#honest-assessment-2026-10-05) explains how far to trust them.
+speaks English, German, Japanese, Traditional and Simplified Chinese, Spanish, French, Italian, Russian and Ukrainian (and Czech and Brazilian Portuguese in the menus);
+[localization-parity.md](docs/localization-parity.md) has the details.
+The scores are self-assessed from our code against Illustrator's public documentation;
+[target-app-parity.md](docs/target-app-parity.md#how-this-was-measured-2026-10-10) explains how far to trust them.
 
 **What's missing:**
-- 3D and Materials;
-- the Photoshop-style raster effects (Effect Gallery);
-- CJK composition for vertical type (vertical type itself has initial support, with a Japanese interface);
-- Variables and scripting;
+- reliable exchange of Illustrator's own `.ai` files (layer structure in real files; Illustrator's editing data isn't written);
 - an interaction-fidelity pass covering every tool's modifiers and small behaviours;
-- packaging for Windows and Linux.
+- 3D and Materials beyond the initial live Revolve (Extrude & Bevel, Inflate, Rotate, materials);
+- about half of the Photoshop-style raster effects (29 of 57 still missing) and the Effect Gallery;
+- CJK composition for vertical type (vertical type itself has initial support, with a Japanese interface);
+- scripting, and the rest of Variables (image and graph kinds, dataset import);
+- generative AI features.
 
-**Where we're going:** next is the interaction-fidelity pass alongside the raster-effects package, then 3D and
-advanced type, then hardening and packaging for 1.0. The prioritized list is in
-[Where we're lacking](ROADMAP.md#where-were-lacking-in-priority-order).
+**Where we're going:** next is the interaction-fidelity pass, `.ai` files from real users and start-up stability,
+alongside the raster-effects package; then type, the Illustrator 2026 additions and 3D. The ranked list is in
+[`docs/gaps.md`](docs/gaps.md).
 
-**Workspace:** `crates/{geom, color, doc, pathops, text, effects, trace, brush, render, svg, pdf, eps, cad, metafile, format, tools, engine, ui-egui, mcp, testkit}`
+**Workspace:** `crates/{geom, color, doc, pathops, text, effects, three-d, trace, brush, render, svg, pdf, eps, cad, metafile, format, tools, engine, ui-egui, mcp, testkit}`
 and `apps/{vectorcraft, vectorcraft-cli, vectorcraft-web}`. The egui frontend is its own crate, so
 the UI can be swapped without touching the engine.
 

ROADMAP.md

@@ -1,272 +1,149 @@
 # VectorCraft Roadmap
 
-VectorCraft is a clean-room, open-source, pure-Rust reimplementation of the Adobe Illustrator workflow. It runs on macOS, Windows, Linux and the web (WASM), and agents can drive it fully over a JSON control channel and MCP.
+**Stage: alpha** · next: beta, ~13 points (ready for real work ~62% → ~75%, and reliable `.ai` exchange) and ~170–270 h away
 
-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 reviewed:** 2026-10-10 · **Last updated:** 2026-10-11 · **Change:** minor (Effect › Brush Strokes landed: Photoshop-style filters 28 of 57, raster effects 40% → 48%) · **Target:** Adobe Illustrator 2026 (30.x)
 
-_Last updated: 2026-10-10 (after placed documents (File › Place of a `.vectorcraft` file, linked), 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 import running more of PostScript Level 3 (patterns, Type 3 fonts, mesh shadings, masked images, VM and resource probes), 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 windoLine truncated
+VectorCraft is a clean-room, open-source, pure-Rust reimplementation of the Adobe Illustrator workflow. It runs
+on macOS, Windows, Linux, FreeBSD and the web (WASM), and agents can drive all of it over MCP, the CLI and a JSON
+control channel. This page is the summary; the evidence is in [`docs/target-app-parity.md`](docs/target-app-parity.md)
+and the work list in [`docs/gaps.md`](docs/gaps.md).
 
-## Where we are
+**Why alpha:** the core workflows exist end to end (drawing and path editing, Pathfinder, paint and appearance,
+type, SVG/PDF/EPS, print, export) and feature depth is ~75%, but a professional can't yet switch: Illustrator's
+own `.ai` files open with a wrong layer structure in real cases and can't be saved back with Illustrator's
+editing data, the interaction details have never been checked side by side, and some machines fail to start the
+app. Beta needs those closed (the beta list in [gaps.md](docs/gaps.md)). It passes the core-workflow
+gate: all six core workflows (path drawing and editing, paint and style, type, layers/artboards/export, print
+production, file exchange) work end to end on macOS with save and reopen, and only the last is partial, without
+blocking it ([Alpha gate](docs/roadmap.md#alpha-gate)).
 
-| Dimension | Status |
-|---|---|
-| Infrastructure (engine, command registry, history, render, formats, MCP, web, packaging, tests) | **~90%** |
-| Look & feel vs Illustrator 2026 default workspace (measured) | **~75–80%** |
-| Feature surface vs full Illustrator (weighted, see below) | **~75%** on the rubric · **69–75%** honest range (self-graded, see [Honest assessment](#honest-assessment-2026-10-05)) |
-| Parity including interaction fidelity and hardening ("a power user can't tell the difference, but faster") | **~40–55%** |
-| Time to **feature parity** (every menu item, tool, panel, effect and dialog functional) | **~210–330 h** one agent · **~55–95 h** with 4–6 agents |
-| Time to **full parity** (feature parity + interaction-fidelity pass + hardening) | **~320–500 h** one agent · **~80–145 h** with 4–6 agents |
+## Headline numbers
 
-## Honest assessment (2026-10-05)
-
-**In one line:** about two-thirds to three-quarters of Illustrator's features exist and work, and for everyday
-vector illustration (drawing, paths, paint and appearance, SVG/PDF/print) VectorCraft is close to usable. Measured
-against "a power user can't tell the difference", it is closer to 40–55%. What stands between here and "anyone can
-switch" is a handful of large subsystems plus a fidelity pass, not a long tail of small fixes.
-
-**How much to trust the numbers:** area scores are graded by the agents that built the features, from behaviour docs
-(`plan/illustrator/`) and tests, not by side-by-side use of Illustrator. Treat them as upper bounds. Look & feel is
-the only dimension measured against the reference app. Performance budgets haven't been re-run on an idle machine
-since 2026-10-01.
-
-### By dimension
-
-| Dimension | Estimate | Evidence and what's missing |
+| | Value | Kind |
 |---|---|---|
-| **Breadth:** menus, tools and panels exist | ~90% | 13 menu items still stubbed; every tool implemented except Touch Type; 51 panel modules |
-| **Depth:** each feature behaves like Illustrator | ~69–75% | Strong: paint, appearance and colour (M3), Pathfinder and booleans, selection, drawing, files (M4). Weak: advanced type (~45%; inline symbols in text are beyond parity and don't raise it), brushes and symbols (in progress), raster effects (~20%) |
-| **Large missing subsystems** | 0–20% | 3D & Materials (0%), Photoshop-style raster effects and the Effect Gallery (~10 of ~56 filters), SVG Filters, CJK composition (vertical type with kinsoku, tate-chu-yoko and the font's vertical metrics; ruby, mojikumi and proportional vertical metrics open), Variables (data merge), scripting |
-| **Interaction fidelity:** modifiers, cursors, small behaviours | ~30–40% | The dedicated pass hasn't started, and there has been no side-by-side session with Illustrator yet. A power user notices this first |
-| **Look & feel** | ~75–80% | Measured against Illustrator 2026 screenshots (2026-10-02); the panels added since haven't been re-measured |
-| **File interop** | ~85% | SVG/SVGZ, PDF and PDF-compatible `.ai`, EPS, DXF, EMF/WMF, raster formats, PSD export and PSD/PSB placement (merged image), Place and Links, Package, Print, clipboard flavours. Affinity documents (Affinity 1–3) open natively as editable art, checked against 51 pinned public files (33 current `.af`), with selected saved-thumbnail comparisons and every-board native/SVG/PDF/PSD checks for current files; Affinity export is missing and effects, adjustments and brushes don't import. Affinity isn't an Illustrator feature, so this doesn't raise the parity score. The editing copy inside an Illustrator EPS or `.ai` is read for its structure: layers, groups, names, hidden objects and type, colours, gradients, transparency, images and every artboard (see Out of scope for what it doesn't read yet); DWG has no open spec |
-| **Bundled content:** brush, symbol, style and swatch libraries | ~30% | Ours are original and generated in code, and far fewer than Illustrator ships; brush and symbol libraries are still missing |
-| **Performance** | unverified | Multithreaded, off-thread rendering and caches are in place. The last budget run (2026-10-01, loaded machine) measured 290 ms for a 50k-path fit against a 16 ms budget. Re-run `vectorcraft-cli perf` on an idle machine |
-| **Robustness** | good, new | ~2,840 tests, property tests, no panics in shipped code (lints, the `guard` safety net, import fuzzing), Data Recovery. Missing: a corpus of real-world files, Windows/Linux/browser QA |
-| **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); on macOS the menus are in the system menu bar, laid out as a Mac app's, with the in-window menus as a fallback (`--in-window-menus`; verified on Windows and by cross-compilation, not yet by hand on a Mac); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Windows starts on Direct3D 12, falling back to OpenGL, and loads no Vulkan driver unless `WGPU_BACKEND` asks for it (#545: Vulkan flickered black on an Intel GPU, DX12 and OpenGL didn't; #806: a faulty Vulkan driver crashed the app before its window appeared; verified by unit tests and the reporter's runs with `WGPU_BACKEND`), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only); on Linux the Paste menu checks the system clipboard on a background thread, so a clipboard owner that never answers no longer freezes the window, while Windows and macOS keep their quick in-line check (#510; the X11 hang verified by the contributor, here by headless tests); 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; what an agent reads and writes on disk can be confined to chosen folders (`--automation-read-root` / `--automation-write-root`, as in PhotoCraft, #832) |
-| **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) |
+| **Feature breadth** (Illustrator's menu items, tools, effects, formats exist) | **~88%** | measured in part: menu items 348/375 wired (92.8%), tools 89/92, Illustrator effects 44/50, Photoshop effects 28/57, 3D 1/4 (initial Revolve) |
+| **Feature depth** (weighted by use, scored by behaviour) | **~75%** | estimated |
+| **To beta** | **~170–270 h** one agent · ~50–80 h with 4–6 agents | estimated |
+| **To full parity** | **~360–590 h** one agent · ~95–165 h with 4–6 agents | estimated |
 
-### Where we're lacking (in priority order)
+**Readiness by audience** (all estimated; method in [target-app-parity.md](docs/target-app-parity.md#ready-for-real-work)):
 
-Ordered by how much each gap blocks someone from switching. Sizes are one-agent hours from the parity table.
+| Audience | Ready % | Opus 5.5 agent hours to ~95% (one agent) | With 4–6 agents | Work that dominates |
+|---|---:|---:|---:|---|
+| **Full Illustrator** (ready for real work; decides the stage) | **~62%** (57–67%) | **~340–560 h** | ~95–160 h | the mainstream work below, plus 3D (50–85 h), raster effects (24–40 h), advanced type (20–28 h), generative AI (30–60 h), localization (70–110 h) and ecosystem |
+| **Mainstream illustrator** | **~65%** (60–70%) | **~230–380 h** | ~65–110 h | the interaction-fidelity pass (60–90 h), hardening and QA (30–50 h), stability (20–35 h), performance budgets (15–25 h), `.ai` exchange (10–20 h), the remaining depth of the everyday areas |
+| **Essentials user** | **~75%** (70–80%) | **~60–105 h** | ~25–45 h | launch and stability on Windows (20–35 h), in-app help and onboarding (8–15 h), basic QA (10–15 h), Shape Builder regions (4–8 h), UI polish |
 
-1. **Interaction fidelity:** go tool by tool and panel by panel against `plan/illustrator/05-tools.md`,
-   `06-panels.md` and `09-shortcuts.md`, covering modifier keys, cursors, the Properties panel per context and
-   isolation mode. The Shaper’s rough-square recognition and shape orientation steps are corrected; Shaper Groups now retain editable originals for region merges/punches and separate fill/stroke edits; their construction-mode widget and gesture refinements remain. 60–90 h.
-2. **Photoshop-style raster effects and the Effect Gallery:** about 45 filters (Artistic, Brush Strokes, Distort,
-   Sketch, Stylize, Texture) and the Effect Gallery. The pixel-filter pipeline is in place
-   (`vectorcraft_effects::pixel`: the object rendered offscreen, filtered in stack order with Gaussian Blur and
-   Feather, cached while panning, images in PDF/SVG/Expand Appearance) with Blur › Radial Blur and Smart Blur
-   (Normal mode only), Pixelate › Color Halftone, Crystallize, Mezzotint and Pointillize, Sharpen › Unsharp Mask,
-   Stylize › Glowing Edges and Video › De-Interlace and NTSC Colors; each new filter is now one function, a catalogue row, menu and translations. Parallelizes
-   well across agents. 23–36 h.
-3. **3D and Materials:** Extrude & Bevel, Revolve, Inflate and Rotate with lighting and materials, using a software
-   renderer in its own crate (layering allows it below L6), with output in SVG/PDF as rasters or projected vectors.
-   The largest single gap. 50–80 h.
-4. **Advanced type:** CJK composition for vertical type (ruby, mojikumi, proportional vertical metrics, manual
-   tate-chu-yoko), Optical Margin Alignment, the hyphenation and justification options (the Every-line/Single-line
-   composer choice is done), tab leaders, a
-   spell-check dictionary (open licence), Touch Type and Snap to Glyph. Vertical point, area and path type have
-   initial support. 34–47 h across type core and advanced.
-5. **Brushes, symbols and libraries:** brush options depth (Brush Options exist for every brush type, Calligraphic
-   and Scatter with pen pressure; still missing are the Art brush's Overlap, auto-generated Pattern brush corners,
-   new tile art picked in Pattern Brush Options and the Key Color eyedropper); original brush, symbol and
-   graphic-style libraries generated in code (never Adobe's); dynamic symbols; Start Global Edit; brushes driven by
-   pen tilt, bearing and barrel rotation (6D art pens, #372), which needs tablet input beyond pressure on every
-   platform. 17–28 h.
-6. **Automation:** Variables (data merge), a scripting surface over the command registry, batch. 8–12 h.
-7. **Views and windows:** multiple windows and arrange, Consolidate All Windows, video
-   rulers. 15–25 h.
-8. **Hardening at scale:** a corpus of real-world SVG/PDF/EPS files, Affinity files from more versions and platforms
-   (51 pinned files now include 28 original Affinity 3.2.3 feature probes; large interacting documents,
-   complex typography and independently paired `.af`/PSD renders reopened in Affinity remain missing), idle-machine perf budgets, Windows, Linux and
-   browser QA, pen tablets on Wayland and pen pressure beyond Windows (winit 0.31's tablet input, #491), accessibility, packaging. 50–80 h.
+Hours are Opus 5.5 agent wall-clock hours, calibrated from this repo's merged-PR timestamps (e.g. 0.7–1.2 h per
+Photoshop-style filter, ~0.8 h per medium feature); see [calibration](docs/target-app-parity.md#calibration).
+The installed Illustrator was **not** inspected: the clean-room rule in [`AGENTS.md`](AGENTS.md) forbids it, so
+everything is measured from our code against Illustrator's public documentation.
 
-### Where we're going
+## By dimension
 
-- **Next:** start the interaction-fidelity pass (1) in parallel with the raster-effects package (2). Both are broad,
-  so they split well across agents, and they move the "can't tell the difference" number most.
-- **Then:** 3D (3) and advanced type (4), each a focused milestone with its own plan in `plan/` before coding.
-- **Alongside:** keep closing the stubbed menu items. Run `vectorcraft-cli perf` on an idle machine, and fix any
-  budget it misses before 1.0.
-- **1.0:** feature parity plus the fidelity pass, hardening (8) and packaging for all three desktop OSes and the web.
+| Dimension | % | One agent (h) | Doc |
+|---|---:|---:|---|
+| Features (depth) | 75% | 220–360 | [target-app-parity.md](docs/target-app-parity.md) |
+| UI/UX fidelity | 55% | 70–110 | [ui-parity.md](docs/ui-parity.md) |
+| File formats | 75% | 15–30 | [file-format-parity.md](docs/file-format-parity.md) |
+| Hardware (GPU, pen, touch, displays) | 35% | 25–45 | [hardware-parity.md](docs/hardware-parity.md) |
+| Localization (12 key languages) | 54% (measured) | 70–110 | [localization-parity.md](docs/localization-parity.md) |
+| Performance | ~60% | 15–25 | [gaps.md › G15](docs/gaps.md#g15-performance-budgets-and-a-gpu-renderer) |
+| Stability | ~60% | 30–50 | [gaps.md › G10](docs/gaps.md#g10-launch-and-stability-on-real-machines) |
+| Platforms | 80% | 15–25 | [gaps.md › G8](docs/gaps.md#g8-hardening-at-scale) |
+| Ecosystem and plug-ins | 15% | 30–60 | [gaps.md › G17](docs/gaps.md#g17-ecosystem-third-party-plug-ins) |
+| AI features (generative) | 0% | 30–60 + owner decision | [gaps.md › G18](docs/gaps.md#g18-generative-ai-features) |
+| Agent automation | beyond Illustrator | — | [mcp.md](docs/mcp.md) |
 
-**For agents:** pick work from the list above (or the milestone rows below), and write a task plan before coding.
-When a task lands, update this section, the parity table and "Shipped so far" in the same PR. Keep the scores honest:
-grade by behaviour against `plan/illustrator/`, not by whether a menu item exists.
+The dimension hours overlap (feature rows hold some UI, format and AI work), so they don't add up to the total.
 
-## Shipped so far
+## Features
 
-- **Architecture:** 19+ crates with enforced layering (`cargo xtask layers`). Every action is a command (~400 engine + ~50 UI). Undo is unlimited via structural sharing. `command.batch` runs several commands as one transaction.
-- **Automation:**
-  - Actions panel (record/playback, persisted), generic parameter dialogs for every "…" command.
-  - JSON-lines control channel with real egui pointer and keyboard injection.
-  - MCP server with 25 tools (drawing, text, effects, Pathfinder, transforms, graphs, text wrap, export, screenshots, any command), attached to the running app or headless. Tool descriptions and replies agree with the engine: format lists come from its format table, `save_file` says it keeps the document's own format, `inspect_document` reports the paint type's characters show, and selection exports report the encoder's warnings. `--automation-read-root` / `--automation-write-root` (on `vectorcraft-cli mcp` and on `vectorcraft --control`) confine the files commands read and write to chosen folders, links followed, with the flags PhotoCraft takes (#832).
-  - MCP protocol: five prompts (`prompts/list` / `prompts/get`: poster, icon set, recolour, trace-and-style, export set), `completion/complete` for prompt arguments and template variables read from the live catalogues (formats, effect ids, command ids, trace presets, swatch and object ids), four resource templates (`vectorcraft://object/{id}`, `//command/{id}`, `//effect/{id}`, `//swatch/{name}`) so an agent reads one thing instead of the whole document, and `logging/setLevel` with `notifications/message`. `window.panel` ids are case-insensitive (display labels work too), `vectorcraft://object/{id}` reads through `document.node {summary: true}` (the same reply bytes from one lookup instead of summarizing the whole document: a leaf read on a 2,000-object document drops from ~20 ms to ~0.06 ms), large containers slice with `document.node {depth?, childLimit?}` (truncated levels report `childCount`), `document.inspect` and the `inspect_document` tool slice the same way so a depth-0 read is the layer skeleton (~9.7 KB instead of ~2 MB on a 2,000-object document), `document.find` locates nodes by name/kind/text with ancestor paths, and the CLI sweeps the protocol surface over stdio against the compiled binary. `docs/mcp.md` has a Protocol section covering the capability table and what is deliberately absent (subscriptions, progress, cancellation, sampling, elicitation, Streamable HTTP — all of which need the transport to interleave reads).
-  - Headless CLI (`vectorcraft-cli run`, `convert`, `info`, `bench`, `perf`, `mcp`). A `run` step, like a `command_batch` step over MCP, can use an earlier step's result (`"$1.id"`, #785).
-  - Actions panel that records and plays back commands.
-- **UI:** Illustrator 2026 layout restyled to measured values:
-  - Medium Dark theme, categorized and Advanced toolbars (a tool group's flyout opens on a right press, a long press or a press on its corner triangle), 35 pt document tabs, 33 pt panel tabs.
-  - Hint bar, contextual task bar, 19 dock panels with ≡ menus.
-  - The contextual task bar's handle drags it anywhere on the canvas (kept whole on it as the window resizes); unpinned it keeps that offset as it follows the selection, and its More Options menu hides it, pins its position across selection changes (`window.taskBar.pin`), resets it under the selection (`window.taskBar.reset`) and shows the Properties panel. As in Illustrator the position isn't kept across launches. Not done: the bar's tool-specific variants (only the selection tools show it).
-  - Tool flyouts tear off: dragging or clicking the tear-off bar on a flyout's right side (or releasing the long press over it) floats its group as a strip of tool buttons, moved by the same bar and put back in the toolbar by the × at its top (`window.floatTools`). While a group floats, the presses that would open its flyout raise the strip instead. Floating strips are kept with the preferences and in user workspaces. Not done: turning a strip vertical, docking it.
-  - Panels undock (#495): a dock tab, a panel icon or a popped-out panel's title dragged out of the dock floats that panel inside the window, and the strip right of the dock's tabs floats the whole tabbed group. A floating group moves by its title bar, a tab dragged out of it floats on its own, and dropped on another group's title bar or tabs it stacks with that group; dropped on the dock, which lights up under the pointer, its panels go back where they live (the tabbed group or the icon column), as its × and the panel menus' Float Panel / Dock Panel do (`window.panel.float`, `window.panel.dock`). The Tools panel floats by its title bar and docks again on the window's left edge. Floating panels and the Tools panel's position are kept with the preferences and in user workspaces, and clamped into a smaller window. Not done: panels in separate OS windows, docking a panel into a dock group it doesn't belong to, reordering tabs by dragging, collapsing a floating group to icons, resizing floating panels.
-  - The dock's double arrow collapses Properties, Layers and Libraries to icons at the top of the icon column, popping out like the other icon panels, and expands them again (`window.collapseDock`, kept with the preferences and in saved workspaces). The icon column's own arrow (expanding the icon panels into a full column) is not done.
-  - Localised UI: menus (in-window and native), panels, dialogs, toolbar and Preferences read from per-language catalogs (`crates/ui-egui/src/i18n`, see `docs/development.md`); Traditional Chinese (Taiwan), Simplified Chinese (mainland), Japanese, Spanish, French, Italian, Russian and Ukrainian 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. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8).
-  - The macOS menu bar is built from the in-window menus (one model, `native_menu`) and laid out as a Mac app's: the VectorCraft menu holds About, Settings ▸ (each Preferences page, General… ⌘K), Language ▸, Appearance ▸ (UI brightness), Services, Hide VectorCraft ⌃⌘H (⌘H stays Hide Edges), Hide Others, Show All and Quit; Window gains Minimize ⌃⌘M, Zoom and Bring All to Front, and Help the system's search field. Its key equivalents go back to egui as key presses, so user shortcuts, focused text fields and the Type tool's input method behave as in the window, and nothing fires twice; enabled, check marks and labels update in place. `--in-window-menus` or `VECTORCRAFT_IN_WINDOW_MENUS=1` keeps the menus in the window; `ui.inspect` reports `nativeMenuBar`.
-  - macOS: Finder opens every format File › Open reads with VectorCraft (double-click, Open With, a drop on the Dock icon, `open -a`), at launch or while it runs; the release and `cargo xtask bundle` apps share one `Info.plist` that declares those document types, owning only VectorCraft's own formats. The DMG opens on a designed Finder window, VectorCraft.app beside the `Applications` link over a background with the app icon (#493).
-  - A canvas context menu: right-click selects the object under the pointer and lists what applies to the selection (Undo/Redo, clipboard, group, isolation, join, Remove Anchor Points when anchors are selected, masks, compound paths, guides, Transform, Arrange, Select, Export Selection), or the view commands on empty canvas.
-  - Save / Don't Save / Cancel before closing or quitting with unsaved documents (tabs, Close, Close All, Quit, window close).
-  - Four brightness themes, persistent preferences.
-  - Preferences that act (#394, in part): Show Tool Tips, Double Click To Isolate, Zoom with Mouse Wheel (the wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; Alt/Option-wheel and a trackpad pinch zoom about the pointer either way), Use Precise Cursors; Selection & Anchor Display › Tolerance (objects, anchors and handles), Object Selection by Path Only, Command Click to Select Objects Behind (cycling down the stack), Zoom to Selection, anchor Size, Highlight anchors on mouse over; Type › Number of Recent Fonts (up to 15); Guides & Grid › guide and grid Color and Style (lines or dots) and Grids In Back. Then Snap to Point (its distance, for moves, drawn points and reference points), Move Locked and Hidden Artwork with Artboard, Enable Rubber Band for the Pen and Curvature tools, Handles style, Show handles when multiple anchors are selected, Hide Corner Widget for angles greater than; General › Transform Pattern Tiles (the transforms' and dialogs' Transform Patterns) and Select Same Tint %; Type › Size/Leading, Tracking and Baseline Shift increments (`type.step`, Cmd+Shift+. and Cmd+Shift+, for the size, the Type tool's Alt+arrows), Enable Missing Glyph Protection and Fill New Type Objects With Placeholder Text. Then Smart Guides › Color, Alignment Guides, Anchor/Path Labels, Measurement Labels, Transform Tools, Object Highlighting (with Smart Guides on) and Snapping Tolerance (4 px by default, for every smart guide snap), then Construction Guides and their Angles (#506: a drawn point near a line at one of those angles through the point it leaves from lands on it). 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). Then Performance › Animated Zoom (on, with GPU Performance, which it needs and which dims it when off: the Zoom tool dragged sideways zooms about the press, right in and left out, and held still zooms on, Alt out; off, a drag zooms to the area dragged across, now drawn as a marquee), User Interface › Large Tabs (taller document tabs) and Scale Cursor Proportional to UI (off, the tool cursors keep their size whatever the UI Scaling), and File Handling › Display Bitmaps as Anti-aliased Images in Pixel Preview (off by default: Pixel Preview draws images with each pixel taking its nearest image pixel). Type › Auto Size New Area Type works too (new area type gets Auto Size). They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). Then Smart Guides › Spacing Guides (moves space the selection evenly with its row or column, see Drawing aids). Then Hyphenation › Exceptions (comma-separated words that never break, or break only at their hyphens; `prefs.set` and restore push them into the hyphenator, #394). Then Type › Show Font Names in English (off, font menus label a family by its native-language name when the font has one; documents still use the English family, #394). Then General › Display Print Size at 100% Zoom (off by default: View › Actual Size is one document point per screen point; on, one document inch fills 96 screen points, an inch at the reference density display scaling is set against; `view.actualSize` / `prefs.set`, #394). About 17 stored options still do nothing yet (the rest of #394: Highlight Alternate Glyphs, Identify Objects By, East Asian Type units, Open Documents As Tabs, Real-time Drawing and Editing, GPU Performance beyond Animated Zoom, hyphenation language, scratch disks, the legacy clipboard, Appearance of Black, Touch Workspace).
-  - Dialogs move by dragging their heading (the band down from the top edge, as a title bar), stay on screen and keep where they were moved for the session; the form dialogs' choices are dropdowns (Offset Path's Joins, Average's and Shear's and Reflect's axis), and Offset Path lists Offset, Joins, Miter Limit and previews (#423).
-  - Dialogs open with their first field focused and its value selected: type a value and press Enter (Move, Rotate, Scale…). Number fields in panels, the Control bar and dialogs (preferences too) step with Up/Down, or with the mouse wheel over the focused field (#485: a notch a step; the panel under it then stays put, and an unfocused field leaves the wheel to scrolling) (Shift: ten, Ctrl/Cmd: a tenth of their unit), applied at once.
-  - Scrubby labels (#400, beyond Illustrator, as in Photoshop): dragging a numeric field's label left or right (the ↔ cursor shows over it) steps the value one unit every 2 points (Shift: ten, Ctrl/Cmd: a tenth; counts stay whole), in the field's unit and within its limits, applied live as the art follows; the whole drag is one undo step and Escape puts the value back. A click on the label focuses the field; the text box itself never scrubs, and a field with no label doesn't. Text labels before a field (Transform, Properties, Control bar, Stroke, Transparency, form rows in dialogs) and the Character and Paragraph panels' icons act as labels. Preferences › General › Scrub Numeric Fields by Dragging (on by default) turns it off.
-  - The Control bar's underlined Transform link opens the Transform panel in a popover under it (reference point, X/Y/W/H, Rotate and Shear with their icons and angle presets, flips, shape properties, Scale Corners and Scale Strokes & Effects), as its Stroke link does the Stroke panel; X/Y/W/H also show inline while the bar has room. The reference point locator is nine squares, the outer eight joined around the box.
-  - 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, and elsewhere the in-window menus' do: the field that had the keyboard when the menu opened gets them, with its selection, and the keyboard back (#516). 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:**
-  - **Shaper:** uneven squares and rectangles become live rectangles even when drawing begins mid-edge. Recognition uses uniformly spaced samples and closed-loop corners, fits rectangle edges/angles rather than requiring a nearly perfect bounding-box fill, and includes the pointer-release position. Rectangles/squares and ellipses snap to 45° steps, hexagons to 90°, and triangles point up or down; lines keep their free angle even with Shift. Shaper Groups retain the live originals, merge regions with the gesture-origin fill, punch fills independently from strokes, remove boundaries on exiting scribbles and trim protruding stroke pieces. Source moves/resizes re-evaluate the result in the same undo step; double-click enters construction editing. Native save/reopen, face recoloring, Release and Expand are covered. The construction-mode widget and finer gesture heuristics remain.
-  - **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).
-    Agent selection commands validate every object id before changing the selection and report the resulting count and ids (#784).
-    Clear deletes individual selected compound-path members without deleting their siblings, and explicit object ids work without a selection; Cut still removes the same objects it copies (#786).
-  - **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. The Pen continues any open path from the end clicked, and while drawing, a click on an end of another open path joins the two into one (#776). The Curvature tool edits any selected path, whatever drew it, keeping its shape except where edited (#798): a click on a point makes it current and a drag moves it, re-curving only its two segments; Alt-click or double-click toggles it smooth or corner and Delete removes it; a click on a segment adds a point without changing the shape; with an end of an open path current, clicks go on from it and its other end closes it (`path.curvatureEdit`). Every point a drawing tool places snaps to Smart Guides through one snapper (#506): the Pen's and Curvature tool's anchors, the Pencil's ends, the shape tools' start and dragged corner or radius (Rectangle, Rounded Rectangle, Ellipse, Polygon, Star, Line Segment, Arc, Spiral, the grids), the Type tool's click and frame, a new artboard's corners.
-  - **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). An ellipse's Pie Start and End Angle and Invert Pie (Transform and Properties panels' Ellipse Properties, `object.setLiveShape {pieStart, pieEnd, invertPie}`) cut it as a pie (#812; the on-canvas pie widget is still to come). A live polygon's Polygon Properties there: side count, angle, corner type and radius, radius, side length and Make Sides Equal once an uneven scale has made its sides differ (`object.setLiveShape {sides, polygonAngle, polygonRadius, sideLength, makeSidesEqual}`, part of #812); a star is a plain path, as in Illustrator. The Flare Tool Options last as the tool's options: the next flare dragged out uses them, a click's dialog shows them and double-clicking the tool opens them (part of #812).
-  - **Cutting:** Eraser, Scissors, Knife, Mirror & Cut, Line Cut and Rectangle Cut (real geometry, compound paths keep their holes).
-  - **Transform:** Rotate, Reflect, Scale, Shear (click or Alt-click snaps the reference point to anchors and centres; Alt-click opens the tool's dialog, and a drag with Alt down at the release, from the press or pressed mid-drag, transforms a copy), Reshape, Free Transform (free and perspective distort and shear, switched by the keys held during a handle drag).
-  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. On a rectangle that isn't square every corner is the same circle: a radius past half the shorter side stops there for all of them, the widgets sit on the corners as drawn and turn the edited corners red at that limit, CSS export writes the drawn radii, and rectangles saved stretched by older versions get circular corners when their corners are next set (#442). Live Corners work on any path's corners too, as on a rectangle's (#511): a star's, a live polygon's (which also shows them to the Selection tool, has a Corner Radius field in the Properties and Transform panels and keeps its radius as its sides change) and a pen path's, wherever two straight sides meet at an anchor. Direct Selection shows the widgets of every corner, or of the corners holding selected anchors; each corner is a circle tangent to both sides, drawn no larger than takes its cut halfway along its shorter side; a path keeps its uncut outline so its corners stay editable, and the same command, dialog, angle preference and View › Hide Corner Widget apply.
-  - **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. A press on the first anchor of the path being drawn closes it whatever the drag then does: the drag shapes the closing curve (symmetric handles, Alt breaks them) and the release closes the path wherever it ends (#501). 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, dragging a segment reshapes it; drawing then goes on. Cmd (Ctrl) held drags with the selection tool chosen last, Direct Selection until one is (handles, anchors and segments of the path being drawn or another), and the Pen then goes on drawing its path while that stays selected; the pointer shows that tool's while Cmd is held. The same holds for agents (`pointer_gesture` with `mods.cmd`), as the borrowing now lives in the engine (#494).
-  - **Path editing (#494):** the handles shown are the handles that drag: Direct Selection drags those of a path selected as a whole (as the Pen leaves it), the Anchor Point tool and Pen+Alt no longer grab handles that Show handles when multiple anchors are selected hides, a handle shorter than the tolerance leaves its anchor to be picked, and the anchor tools pick within Selection & Anchor Display › Tolerance. A dragged segment keeps a smooth anchor at either end smooth. With Direct Selection, the Pen, the Curvature and the anchor tools, a path selected as a whole shows all its anchors selected, and the Control bar and the Properties panel offer Convert (corner, smooth) for them too; Remove and Cut wait for anchors direct-selected (#504). A handle drag gathers its snap targets once per drag (it took 21 ms per pointer move on a 20,000-path document, now 1 ms; `vectorcraft-cli perf` measures handle and segment drags on a 5,000-anchor path).
-  - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type. A series starts in greyscale; Group Selection's fill and stroke are kept separately on the graph and reapplied when its data, type or size changes, and through save, open and undo. Graph Type's Override Calculated Values (both `axisMin` and `axisMax`) uses exactly that value-axis range, split into the tick count (5 when automatic). Line graphs take Edge-to-Edge Lines (off by default: the points sit at the centres of their categories; graphs saved before the option keep their edge-to-edge lines), and radar graphs follow Mark Data Points and Connect Data Points. Blank cells (an empty CSV cell or `null`) are values left out, not zeros: columns, bars and stacked segments skip them, lines and scatter lines break around them and the value axis ignores them, while area, pie and radar draw them as 0; a number in straight quotes is a label, and the data window writes it back quoted. Graph Design, Column and Marker artwork remain open.
-  - **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; Object › Artboards › Rearrange All Artboards lays them out in a grid by row or by column, in one row or one column, left to right or right to left, from the menu, the Artboards panel or Properties' Rearrange All, #681; Scale Artwork with Artboard, in the Control bar and Properties beside Move Artwork with Artboard, resizes the artboard proportionally with the art fully inside it and its guides, strokes and corners per the Scale preferences, #602), 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, the Pencil, Paintbrush, Smooth, Blob Brush and Eraser tools their Tool Options (Fidelity, fill, the tolerances, the brush size), and (#812) the Flare tool its Flare Tool Options, the Artboard tool the active artboard's Artboard Options, the graph tools Graph Type for the selected graph, the Symbolism tools the Symbolism Tools Options (Diameter, Intensity, Symbol Set Density) and the Magic Wand tool its panel.
-- **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. A document opens with only its top-level layers open; the rows left open are saved in the native file (nothing is written for the default) and reopen that way. Only the rows scrolled into view are laid out, from a row list made once per change: a layer of 5,000 groups of 10 paths, all open, draws the panel in 0.4 ms a frame instead of about 29 s (#638).
-- **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"); with Smart Guides › Spacing Guides, a moved selection that lines up with nothing along an axis lands as far from its neighbour as two other objects of its row or column are apart, or halfway between its two neighbours, the equal gaps marked; with View › Snap to Grid on, a moved selection lands on the grid instead, by whichever of its edges or its centre is nearest a gridline on each axis, #740; 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; drawn points, #506: hovering shows where the press goes, the point lands on the other objects' anchors, centres and paths ("anchor", "center", "path") or lines up with their anchors, edges and centres ("align"), the Pen's on the path being drawn too, near a construction guide through the anchor before it on that guide (Preferences › Smart Guides › Construction Guides and Angles), and with Shift kept to its 45° step or a square's diagonal it slides along that way into line; the targets are gathered once per document state, from the art in the window, and the anchors, centres and lines near the pointer are found by bisection, so hovering never rescans the document), 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), a right-click on either ruler or the origin box to pick the document's units (the current one checked; `document.setUnits`, one undo step, #528), 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). View › Pixel Preview shows the art as the document pixels it rasterizes to, one per point and hard-edged when magnified, turning with a rotated view (it used to draw the smooth vectors, with only the pixel grid over them).
-- **Geometry and effects:**
-  - Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart.
-  - 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), paragraph attributes per paragraph (alignment, indents, spacing, hyphenation, hanging punctuation, tab stops, paragraph style, direction, mojikumi and leading model; the Paragraph, Tabs and Paragraph Styles panels act on the paragraphs the Type tool's selection or caret touches, Return continues the paragraph's style, threads and SVG keep them), Area Type Options (rows/columns/inset/first baseline, vertical Align Top/Center/Bottom/Justify per row/column, reflowing non-rectangular frames and text wrap), threaded text across any closed shapes, Fit Headline, the Every-line Composer for justified and ragged text (paragraph-wide breaks for an even rag, Single-line per object from the Paragraph panel menu or `text.setFormat {composer}`). 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. Auto Size: the frame height follows the text after every edit, in the same undo step (rectangular frames of horizontal type in one row; columns get the least height that holds them; a height set by hand or threading turns it off), and the "Auto Size New Area Type" preference gives it to new area type. Shrink Text to Fit (beyond Illustrator): overflowing area type scales its sizes, leading and baseline shifts down by the largest factor (in 0.1 pt steps of the first run, down to a minimum percentage) that fits, at layout time so every export sees it. `text.areaOptions` and `document.inspect` report overflow and the shrink factor. 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. Beyond Illustrator: inline graphics (`text.insertInline`, Type ▸ Insert Inline Symbol) set a document symbol in a run of type as one character that flows, wraps and justifies like a glyph (InDesign-style inline objects, e.g. mana symbols in card rules text): sized to a multiple of the font size, centred on the cap height, opening up tall lines, following Redefine Symbol; a character of its run's size for Character Alignment and Top-to-Top leading, placed by the bidi reordering in right-to-left text (a neutral U+FFFC); drawn on the canvas, kept as live text plus a `<use>` in SVG and as vector art in PDF; Backspace removes it whole. 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. Arabic typefaces: builds made with a craft-fonts checkout that holds its Arabic families (Noto Sans Arabic, the Arabic fallback, plus Cairo, Tajawal, Almarai, IBM Plex Sans Arabic, Noto Kufi Arabic, Amiri, Alexandria, Fustat, Reem Kufi, Aref Ruqaa and Gulzar once craft-fonts adds them, storytold/craft-fonts#11; releases get them when their craft-fonts pin moves) list them in the font menus on desktop; the web build fetches them from beside the wasm (Noto Sans Arabic before start, so Arabic never shows as boxes, the rest in the background). 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). Type › Bold and Italic (beyond Illustrator, as page layout apps have them; Cmd+Shift+B / Cmd+Shift+I while the Type tool edits text) switch the selected type to its family's own Bold or Italic face and Line truncated
-- **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, Spanish (neutral international Spanish, for every `es-*` locale), French (every `fr-*` locale), Italian (every `it-*` locale) Russian (every `ru-*` locale) and Ukrainian (every `uk-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish, French, Italian, Japanese, Russian and Ukrainian also translate 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, Spanish, French, Italian, Russian and Ukrainian 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 applies to horizontal and vertical Japanese (Paragraph panel › Kinsoku Set, `text.setFormat {kinsoku}`: Hard, the default, keeps closing marks, iteration marks, the prolonged sound mark and small kana off the line start and opening brackets off its end; Soft lets 々, ー and small kana start a line as JLREQ's level 3 rules do; None turns it off), 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 line flush with its start (a paragraph's first line at its first-line indent, JIS X 4051's principle in JLREQ 3.1.5), 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 (new type in a Japanese interface starts top to top, with em box centre character alignment, #432); 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, the em box top/right, centre or bottom/left, or the ICF (ideographic character face) top/right or bottom/left, from the font's BASE table or, without one, the average ink box of some ideographs and kana; 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.
-- **Image Trace Flat Logo mode:** a fourth mode beside Black and White, Grayscale and Color, for flat-colour logos. Each pixel is read as a blend of the logo's colours (found automatically or named), the blend is interpolated smoothly and every outline is placed where two colours are equally present, so edges are accurate to a fraction of a pixel. Outlines are then cleaned: corners the blur rounded are put back, near-straight runs and near-circular arcs become exact lines and arcs, the rest is fitted with as few Béziers as the tolerance allows, touching colours overlap by a hair so no gap opens, and an outline that strays from the raw contour is fitted plainly instead. Gradients and photos are refused with advice to use Color. *Measured* (a local experiment, not run in CI): a flat-colour logo's vector original was rendered down to a soft 199 × 100 px transparent PNG, traced, and the result compared with the original at 1600 px wide. The built-in colour presets (6 Colors, 16 Colors, High Fidelity Photo, Low Fidelity Photo) had a mean edge error of 2.5 to 3.4 px and region overlap of 0.88 to 0.91; Flat Logo had 0.78 px and 0.966 (0.48 px and 0.975 from a crisp source), in about 0.1 s. Limits: flat-colour art only; needle-thin sharp tips are shortened by about 1.7 source pixels because the blur erases them; it works at no more than 1024 px on the long side (larger images are averaged down first); only one logo family has been scored against a vector original.
-- **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, colour layers traced in parallel; a trace past two million anchor points or an image over 64 megapixels is refused with advice rather than running out of memory, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; 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 (a crop box on the image, starting on its part over the artboard, dragged by its handles or inside it, the outside dimmed, with X/Y/W/H, Apply and Cancel in the Control bar, Enter and Escape, #734; `object.cropImage {rect}` for agents, `{trim: true}` cuts an image to its pixels that aren't fully transparent, pixel for pixel) and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), View, the Image Trace panel and Expand, plus Release in Properties; the five View modes (Tracing Result, with Outlines, Outlines, Outlines with Source Image, Source Image) redraw a trace on screen without tracing again, are saved with it and `imageTrace.setView` sets them, while exports and Expand keep the result; the panel's Advanced section is a header that stays open or closed as it was left (part of #641); Color mode's Palette: Limited, Full Tone (as many colours as the tones need, Less … More), Automatic (flat art with its own colours, else Full Tone; a heuristic) and Document Library (the most used colours of the document's swatches or a swatch library, filled with the swatch colours as they are), part of #641; Advanced › Create: Fills and/or Strokes, where lines up to the Stroke width trace as stroked centre lines (distance transform, thinning, a skeleton graph with spurs pruned, curve fitting; one width per line; without Fills, wider areas become stroked outlines), part of #641), 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 as `.vcswatches`, `.gpl`, swatch exchange (`.ase`) or CSS, and loaded from `.vcswatches`, `.gpl` and `.ase` files (`.ase` both ways: RGB, CMYK, Lab and Gray; global, spot and process; groups) and from color books (`.acb`, read only: the RGB, CMYK or Lab colors of a book such as a Pantone book a user owns, named with its prefix and suffix, spot unless it says process, #831); `swatch.library.copyToUser` copies a loaded library into the User Defined folder without replacing a file, and a file with the same extension and bytes as a User Defined library opens as that library. Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate.
-  - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers (the Properties panel has the Control bar's Fill and Stroke chips, Stroke link and weight spinner, with nothing selected too), panels have Illustrator's Window menu keys (Align Shift+F7, Transform Shift+F8, Pathfinder Cmd+Shift+F9, Layers F7, Character Cmd+T…; every panel can be given one in Edit › Keyboard Shortcuts), and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). An ICC CMYK profile converts straight into the RGB working space (not through sRGB, so a wider space such as Wide Gamut RGB keeps colours sRGB can't hold) with the colour settings' black-point compensation, on the canvas and in RGB exports alike. 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.
-  - **Brushes (part of #852):** double-clicking a brush in the Brushes panel (or the panel menu's Brush Options…) opens Calligraphic Brush Options (Name; Angle, Roundness and Size, each Fixed, Random or Pressure with its Variation; live previews of the nib and of a light–heavy–light stroke) or Bristle Brush Options (Shape and the bristle sliders); OK edits the brush and every stroke painted with it. The Paintbrush records the pen pressure along each stroke (kept with the path, saved, and joined when a stroke continues a path); a Calligraphic value on Pressure goes from value − variation at the lightest pressure to value + variation at the heaviest, on the canvas and in SVG, PDF and the other exports. Brushes saved before keep their look. Scatter Brush Options (Size, Spacing, Scatter and Rotation, each Fixed, Random between two values or Pressure from the first at the lightest pressure to the second at the heaviest; Rotation relative to Page or Path), Art Brush Options (Width, Scale Proportionately, Stretch to Fit Stroke Length or Stretch Between Guides with the guides' start and end, the four Directions, Flip Along and Across) and Pattern Brush Options (Scale, Spacing, the five tiles shown, Flip Along and Across, Stretch to fit, Add space to fit or Approximate path) each have Colorization (None, Tints, Tints and Shades, Hue Shift with its Key Color picked from the art's colours) and a live stroke preview; values from files and commands are clamped to their ranges. Still to come: the Art brush's Overlap, auto-generated Pattern brush corners, new tile art picked in Pattern Brush Options, Stylus Wheel, Tilt, Bearing and Rotation, and pen pressure on macOS.
-  - **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.
-  - **Masks and clipping:** opacity-mask controls work while the mask is being edited; transparency commands take ids and work without a selection; clipping sets clip by compound paths, even-odd paths, text and groups on screen and in raster export, matching SVG/PDF. Alt-click shows only the mask; SVG masks keep Clip and Invert; the transparency grid is per-document state; a clipping path's own fill and stroke paint behind and over the clipped art; layers can be clipping masks.
-  - **Transparency:** three-state Knockout Group (on, neutral, off), Opacity & Mask Define Knockout Shape, Page Isolated Blending and Page Knockout Group, on screen and in SVG/PDF. Blend modes match the standard formulas on screen, in SVG and in PDF, and non-isolated groups blend with the art below. Flatten Transparency with presets, a dialog and a Flattener Preview panel.
-  - **Graphic styles:** styles keep opacity and blend mode, capture groups and type, apply on top with Alt, and link to the objects using them; Redefine, Break Link, Graphic Style Options, Select All Unused, Sort by Name, and Select > Same Graphic Style / Appearance Attribute. The panel has list and thumbnail views with rendered previews, merge, reorder and drag and drop, plus a Control bar Style picker; six generated style libraries save and load as `.vcstyles`.
-  - **Neutral wording:** labels, MCP tool text, docs and packaging use neutral names, and `cargo xtask brands` (part of `cargo xtask ci`) fails on vendor names.
-- **Colour, type and file workflows:** Recolor Artwork (dialog with harmonies), Edit Colors, Find & Replace, Change Case, Smart Punctuation, Guides, Lock/Hide Above, Transform Each, Rasterize.
-- **Fonts:** a font is found by any of its names (family and style in every language of its name table, legacy family/style pairs, PostScript name), so documents from other apps open with the font they name; Find Font and `text.fonts` say for each font whether it was found exactly, by another name, substituted or missing, and how many glyphs are missing. PDF and `.ai` import brings Japanese text back as live type: CID fonts without a ToUnicode map read through the standard CMaps, vertical columns (WMode 1) as vertical type, letter spacing as tracking; a glyph is live type only when the installed font (in the closest style of its family) draws the same glyph, and text in a font that isn't installed comes in as live type shown in the fallback font until the font is installed (exports that draw it — PDF, EPS, EMF/WMF, raster, SVG outlines or embedded fonts — warn that they wrote the fallback font; `textAs: outlines` keeps the PDF's embedded glyphs). Two installed versions of one family and style (a font library keeping an old file beside a new one) both load, the first staying the one the family and style resolve to; PDF and `.ai` import tries each version when the glyphs differ, and type set in a version other than that one names it (`CharStyle::font_version`), which layout, the substituted-glyph highlight, Find Font, Package and Document Info follow. Fonts outside the font folders are listed too: those font services such as Adobe Fonts load on Windows, through DirectWrite, and those apps and font managers register with CoreText on macOS (#579). When a document opens with fonts that aren't available, fonts used only in symbols included, a Missing Fonts dialog lists them after the linked-file questions, with Find Fonts (Type › Find Font on them) and Close. Its Find in Folder… (in Find Font too) searches a folder on several threads, reads only what the font scan reads of font files and skips app packages, the Program Files and ProgramData folders, the system's folders and the app data folders in a home folder; Add Fonts copies the font files the user chooses, suitcase fonts with their resource fork, into VectorCraft's own Fonts folder, which the desktop app and `vectorcraft-cli` read (`text.missingFonts`, `text.findFontFiles`, `text.addFontFiles`).
-- **Files (M4):**
-  - `.vectorcraft` (lossless JSON, compressed, atomic saves, save down to v1), Save As with a format chooser, Save a Copy, Revert, templates, Data Recovery after a crash (browser tabs hold their copies with Web Locks too, so a background tab's copies are never taken for a crash's, and a tab repairs copies another removed when it resumes: #367), background save and export. The desktop app writes its warnings and errors (graphics adapter, a lost graphics device, panics the guard recovered from) to standard error and to `logs/vectorcraft.log` next to the preferences, the two previous runs kept and each file capped at 16 MiB, so a launch without a terminal still leaves something to attach to a bug report (#465).
-  - SVG/SVGZ in and out with SVG Options, Preserve Editing, symbols, filters, rich text and physical units (SVG type under a transform or `viewBox` scale opens at the size it draws at, the scale moved into its size, leading, baseline shift and strokes, a stretch, skew or rotation kept as its transform: #396; a top-level group with a clip path, such as a clipped Inkscape layer, opens as a layer with a clipping mask, its name kept: #420; hidden objects written hidden on Save and `convert`, and `data-*` attributes kept as the objects' own data: #522; top-level groups open as layers named from `data-name`, else the id, also when one more group (a transform on all the art, a `<switch>`) wraps them, hidden ones hidden, and a file whose art sits loose under a root `<svg>` with an id (or `data-name`), as one-layer exports write it, opens with its one layer named from it; nested groups stay groups, except the sublayers VectorCraft writes, marked `data-vc-layer`, and Inkscape sublayers, which open as sublayers in their layer's colour: #372); 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; a type object's stroke written as each glyph's outline stroked back on the type, so it stays one editable object; lines wrapped in a frame (each wrapped line ending in a space, one left edge, leading and font) back as one area type object, left aligned or justified with its paragraph spacing, where laying it out breaks the lines where the file does; glyphs set apart by gaps wider than a space (a barcode's digit groups) keeping their places; layers stacked as the pages mark them even when one first paints on a later page, art ending a layer's marked content or a clip closing in a later layer kept in its own layer, and layers with no art kept empty: #508; art reaching past a plain PDF's page clipped to its crop box, as PDF viewers show it, each such object in a clip group of its own (a PDF-compatible `.ai` opens whole: #675); 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). A masked CMYK image (`/SMask`, `/Mask` or a colour key) keeps its inks too, its alpha coming in as a greyscale opacity mask.
-  - 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; PSD and PSB files open and place, linked or embedded, as their merged image in every colour mode and depth (#918). EPS import runs a PostScript Level 3 interpreter written from the PostScript Language Reference: resource categories and `resourceforall`, local and global VM (`currentglobal`/`setglobal`/`gcheck`), `clipsave`/`cliprestore`, subarrays and substrings that share storage, the standard dictionaries in `systemdict`, `dictstack`, `internaldict`, executable filters and strings, `load` by any key, `//name` immediate names, `token`, `execform`, user paths, `cshow`, `rootfont`, `cachestatus`, colour rendering and halftone queries, file `status` and data read with `flushfile`, and `pdfmark` marks dropped (Discord feedback, #466, #469, #474). Masked images (`ImageType 3` in its three interleavings) and reusable streams are read, and an image's several data sources are read in turn, as the reference defines (procedures that read one file get their own rows: such images came in banded, #498). `restore` puts dictionaries back as they were at the `save`, so programs that count their saves in a dictionary read to their end (part of #505). 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. It is tested with programs written from the specification in the ways common generators use these features; Inkscape/cairo EPS files open as vectors. 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). PDF export writes type as real, searchable text in embedded subset fonts by default, as Illustrator's PDF presets do (Convert Text to Outlines is an option; printer's marks stay shapes), so text-heavy PDFs stay small (#733). DXF export writes each fill as its outlines followed by its hatch, so laser and cutter software, which skips hatches, gets filled art and type too (#546).
-  - Affinity documents in (AF.1–AF.4): `.af` (Affinity 3) and `.afdesign`/`.afphoto`/`.afpub` (Affinity 1 and 2, container versions 8–12) open and place as editable art: layers and sublayers, groups (pass-through or isolated), artboards (with their names and backgrounds) and Publisher pages side by side, curves with live corners, parametric shapes (rectangles with corner radii, ellipses, polygons, stars, pies, triangles, trapezoids), compound shapes, solid/linear/elliptical gradient fills and strokes (weight, dashes, alignment, scale-with-object), clipping by nesting, vector and pixel masks, artistic and frame text with fonts, sizes, tracking, leading and alignment, placed images (their original JPEG/PNG) and pixel layers (8/16-bit RGB, CMYK), opacity, visibility, locking and blend modes, at the document's resolution in points. Effects, adjustments, brushes and pressure profiles, transparency gradients, master pages, symbol instances (imported as their cached picture), special shapes (cloud, heart, cog…, imported as ellipses) and Affinity-only blend modes are named in the import warning. A file whose native data can't be read opens as its embedded preview with the reason, and that preview can't be placed. Save never writes back over the Affinity file and there is no Affinity export. AF.4 adds Affinity 3 artboard recognition and actual-outline clipping, source-backed JPEG/PNG raster tiles, Unicode text-run recovery, stored fallback/exact installed fonts, OpenType feature flags and compound-geometry limits. 51 public CC0/MIT/Apache-2.0 files (33 current `.af`), pinned and sha256-verified (`cargo xtask corpus --affinity`), test native retention and every-board native/SVG/PDF/PSD output for current files; selected files compare their saved thumbnails. No Affinity reopen or independent paired PSD oracle was available; [source audit and complex-font gaps](docs/affinity-validation.md); [scope, provenance and limits](crates/affinity/README.md).
-  - Placed documents: File › Place of a `.vectorcraft` file links to it by default (`file.place`'s `link`): one locked object showing an artboard of the document (or its art's bounds), read the way placing it without Link reads it, its symbols, patterns and images kept apart from the document's; without Link (or from bytes, not a file) it is an editable copy as before. It stays vectors in every output (SVG, PDF, EPS, EMF, DXF), and so do placed documents inside it, read from their own files up to 8 levels deep (documents that place each other stop there). On screen they draw from bitmaps cached per file and zoom step, shared by every copy and made in the background (a placeholder until ready), so a sheet of them redraws in about a millisecond; exports and prints draw them exactly. Like linked images, a save keeps only a preview of each (JPEG when opaque) unless Include Linked Files; output, and zooming past the preview, read the file again, falling back to the preview with a warning when it is gone or changed. Saves for older versions write them as plain art. Links check, update, relink, Update Links on open, Link Info (the artboard's size), Placement Options, Break Link (also Embed, Object › Expand: the editable copy placing without Link gives, its resources joining the document), Edit Original (the document in a new tab) and the Links panel cover them; saving a document updates the open documents that place it. The native format (v4) keeps data of 8 KB or more after the JSON instead of base64 in it.
-  - Place and the Links panel, Package (placed `.vectorcraft` documents packaged with their own linked files and fonts, relinked to the copies: #777), 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); on Linux the Paste menu checks the clipboard off the UI thread, so an X11 owner that never answers can't freeze the window (#510); 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 any GPU that can show the window will do. Preferences › Performance › Graphics Processor (`gpuPreference`) is Automatic by default: the power-saving GPU on Windows and macOS (the integrated one on hybrid-graphics laptops, where presenting from the discrete GPU made the window flicker, #306), and the GPU the desktop runs on under Linux, where KWin on an NVIDIA GPU refused frames from a Ryzen's integrated GPU and 0.5.0 crashed at startup (#502). Power Saving and High Performance pick a kind of GPU; `WGPU_POWER_PREF`, `WGPU_ADAPTER_NAME` and `WGPU_BACKEND` override them. The app picks among the adapters that can present to the window (native backends before OpenGL, hardware before software, and on Windows a GPU's DX12 adapter before its Vulkan one: Intel's Vulkan driver made the whole window flicker black, #545), and if the window fails on one while starting up it starts again without it instead of crashing; Help › About, `ui.inspect` and the log name the adapter in use. When the browser drops the page's WebGPU device or WebGL context, the web build writes recovery copies, starts again on new graphics with the same app and uploads its textures again; if it can't, it removes the stale canvas and says to reload, which offers the copies back. The desktop app writes the copies and says to restart (#369). On Windows and Linux the tools' cursors are OS cursors (bitmaps rasterized once per display scale), which the system moves itself: painted into the window, they trailed the pointer by the frames waiting to be shown, and the window now queues one frame instead of two (#444). macOS and the web still paint them (macOS sizes cursor bitmaps in points, eframe has no bitmap cursors on the web). Pens and touch drive the tools as the mouse does, and a tap pressed and lifted within one frame clicks where it tapped (#491); pen pressure reaches the Liquify tools' Use Pressure Pen on Windows, while winit 0.30 reports none on macOS or Linux and egui none on the web. On Linux, see `docs/development.md` for pens under Wayland.
-- **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`).
+| Area | % | One agent (h) |
+|---|---:|---:|
+| Selection, transform & align | 85% | 4–6 |
+| Drawing tools | 85% | 8–13 |
+| Path operations, Pathfinder, Shape Builder, Live Paint | 80% | 4–8 |
+| Colour, swatches, gradients, patterns, mesh, recolor | 92% | 4–7 |
+| Strokes, brushes, width profiles | 88% | 8–15 |
+| Appearance, transparency, graphic styles, masks | 97% | 1–2 |
+| Live vector effects | 85% | 6–10 |
+| Raster effects (Effect Gallery) — [effects-parity.md](docs/effects-parity.md) | 48% | 24–40 |
+| 3D and Materials | ~8% | 50–85 |
+| Type core — [type-parity.md](docs/type-parity.md) | 80% | 14–19 |
+| Type advanced (CJK, spelling, Touch Type) | 50% | 20–28 |
+| Symbols, blends, envelopes, Repeat, perspective | 85% | 6–10 |
+| Image Trace, graphs, image tools | 75% | 5–8 |
+| Layers, artboards, document setup | 78% | 5–8 |
+| View & navigation | 70% | 9–14 |
+| Guides, grids, smart guides, snapping | 80% | 4–7 |
+| File formats — [file-format-parity.md](docs/file-format-parity.md) | 75% | 10–20 |
+| Export for Screens, Asset Export, slices | 85% | 2–4 |
+| Print, colour management, separations | 80% | 2–4 |
+| Automation (Actions, Variables, scripting) | 60% | 8–14 |
+| UI chrome (panels, Properties, preferences) | 80% | 13–20 |
+| Libraries, Links, Package | 82% | 2–3 |
+| Generative AI | 0% | 30–60 |
 
-## Milestones and estimates
+Weights, evidence and the missing items per area: [target-app-parity.md](docs/target-app-parity.md#feature-areas).
 
-| # | Milestone | Status | Est. remaining, one agent (h) |
-|---|---|---|---|
-| M0 | Skeleton + vertical slice | ✅ done | — |
-| M1 | Selection, transform, layers, MCP (common command tools, strict keys, session resources and version-aware result hints) | ✅ mostly done (transform reference point snaps to anchors/centres; rotated objects keep a rotated bounding box and their angle; Free Transform, Scale and Reflect along a rotated box pending) | 4–6 |
-| M2 | Drawing tools + smart guides | ✅ mostly done (Flare, Reshape, Live Corners widget dragging and per-corner radii and kinds landed, on any path's corners; Shaper rough-shape recognition and orientation steps, the remaining Pen modifier nuances; Shaper Groups with editable sources and separate fill/stroke edits landed; construction widget/refinements pending) | 12–18 |
-| M3 | Paint & appearance (swatches, color, gradient, stroke, appearance, transparency, styles) | ✅ done (M3.7–M3.98): swatches, groups, libraries, tints, Lab spots and Registration; Color Picker, Color panel, Color Guide, Color Themes, Edit Colors and Recolor Artwork; gradients that follow every transform, the annotator, linked stops, freeform gradients, focal points, gradients on strokes and Expand; stroke geometry, arrowheads, dashes fitted to corners, stroke on type, width profiles and the Width tool, Scale Strokes and preview bounds; Appearance targeting, container appearance, target circles, Expand Appearance; knockout, isolation, blend accuracy, CMYK blending, overprint, Attributes, masks and clipping, Flatten Transparency; graphic styles, links and libraries. Left: freeform and mixed spot/process gradients export as stops or process colours to SVG/PDF; confirm the Scale Strokes & Effects default | 4–8 |
-| M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out, EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, Asset Export, clipboard flavours, File Info; AF.1–AF.4 add Affinity import (native layers, artboards, vectors, text and images from Affinity 1–3 files; the embedded preview only as a warned fallback; AF.4 expands current `.af` fixtures and every-board round-trip validation). Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, Affinity export, polish | 3–6 (existing scope; Affinity export unestimated) |
-| 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, per-paragraph paragraph attributes, Area Type Options (with Width/Height, Auto Size and Shrink Text to Fit; overflow reported to agents and vertical Align), 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 (Above Text floats it over the selected text, its ruler at the canvas zoom so stops line up with the columns, #729), inline symbols in text (beyond parity), Hebrew/Arabic bidirectional text, Paragraph Direction, Every-line/Single-line Composer per object (ragged text too) done; tab leaders, spell check, vertical type pending | 45–60 |
-| M8 | Transform & distort (Puppet Warp, Liquify tools, Envelopes, Blends, Perspective Grid) | ✅ done (M8.1–M8.20 on 2026-10-06, fidelity pass): Liquify Tool Options with one shared brush, pen pressure, hold-to-apply, a safe scope and incremental strokes; tool options that last; Puppet Warp rotation, multi-select, Control bar and a rest-shape session that follows Undo; Width tool on compound paths; Envelope dialogs with preview, Reset with Warp/Mesh, full Envelope Options, type/images/symbols/appearance/gradients/patterns distorted on canvas and in every export, warps that keep their frame, Edit Contents, mesh handles and Control bar; Blend Options, anchor-targeted Blend tool, editable spine, keys picked on the canvas, faithful interpolation and knockout; Perspective Grid with Define Grid, presets, lock/snap/rulers, widgets, the 1–4 plane switch, movable planes, Perspective Selection scale/copy/perpendicular/Transform Again, and type and symbols truly projected with Edit Text. Left: Anti-Alias and Preserve Shape output, warp-envelope point editing, brush interpolation in blends, Free Transform/Scale/Reflect along a rotated box | 2–4 |
-| M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder and Color Adjustments; SVG Filters, Document Raster Effects Settings, 3D pending | 86–135 |
-| M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG `<pattern>`/PDF export) and live Repeat (radial/grid/mirror) done; brushes/symbols in progress | 23–37 |
-| M11 | Artboards & views (artboard panel/tool with Move Artwork for X/Y fields and Artboard Options, Trim View, middle-button pan, print tiling and the status bar's artboard navigator done; multiple windows, presentation polish) | 🟡 | 15–25 |
-| M12 | Advanced color & art (CMYK/ICC, separations, Gradient Mesh, Live Paint, Image Trace, Graphs) | 🟡 Gradient Mesh, Live Paint, Image Trace (13 presets, 18 ms/1k² image; the Flat Logo mode places edges to a fraction of a pixel, restores sharp corners, snaps lines and circles, and refuses gradients), Recolor Artwork, colour management (ICC, soft proofing, separations preview), Graphs (all 9 tools, Graph Data/Type, group-selected series colours persist through regenerate/save/open) done; graph Design/Column/Marker designs pending | 6–10 |
-| M13 | Automation (Actions ✅ record/playback, persisted; variables, scripting, batch) | 🟡 | 18–27 |
-| M14 | 1.0 polish (preferences, shortcut editor, workspaces, accessibility, packaging for all OSes) | 🟡 Preferences, shortcut editor (chords with Shift and a punctuation key fire as typed), workspaces, a custom title bar on Windows/Linux with a Home button, content-sized dialogs, menus that scroll when longer than the window and macOS native menu dismissal done (M14.8); an experimental, unsupported Windows 7 x64 portable OpenGL build (not verified by maintainers); accessibility and broader Windows/Linux packaging/QA pending | 18–28 |
-| — | Interaction fidelity pass (every tool's modifiers, Properties panel per context, isolation, nuance) | ⬜ | 60–90 |
-| — | Hardening at scale (big-file corpus, fuzzing, cross-platform + browser QA) | 🟡 | 50–80 |
-| | **Total to full parity** (one agent; re-derived from the [Parity estimate](#parity-estimate) table) | | **~320–500** |
+## Languages
 
-## Parity estimate
+| Language | Code | Status | Translated |
+|---|---|---|---:|
+| English | `en` | full | 100% |
+| Simplified Chinese | `zh-hans` | partial (messages in English) | 85% |
+| Spanish | `es` | full | 100% |
+| Hindi | `hi` | none | 0% |
+| Arabic | `ar` | none (no right-to-left interface) | 0% |
+| French | `fr` | full | 100% |
+| Portuguese (Brazil) | `pt-br` | partial | 68% |
+| Indonesian | `id` | none | 0% |
+| Japanese | `ja` | full | 100% |
+| German | `de` | full | 98% |
+| Korean | `ko` | none | 0% |
+| Vietnamese | `vi` | none | 0% |
 
-_Method (2026-10-02; M3 rows re-derived 2026-10-04, file, export, print, links and UI-chrome rows after M4 on 2026-10-05):_ Illustrator's feature surface is split into 22 areas, weighted by how much of the app (and of
-real users' work) each represents. Each area is scored by depth of behaviour, not by presence of a menu item: an area
-is 100% only when every feature in it behaves like Illustrator. Feature parity = Σ weight × score / Σ weight. Remaining
-time is counted per area from what is missing, calibrated on measured throughput: in the last session one agent landed
-about 20 medium features (Text Wrap, Graphs, Effect → Pathfinder, export baking…) in ~16 h wall clock including builds
-and CI on a heavily loaded machine — about 0.8 h per medium feature; large subsystems (3D, raster filters, vertical type)
-are counted bottom-up. The M3 rows (colour, strokes, appearance) come from a detailed 92-task M3 plan whose review
-found more missing depth than the first estimate; all 92 tasks landed on 2026-10-04 and 2026-10-05 with 6–8 agents in parallel; its packages, planned at 5–11 h each, took
-about 1–1.5 agent-hours each, so the other rows (estimated on the older scale) are likely high.
+Also shipped: Traditional Chinese (partial, 80%), Italian, Russian and Ukrainian (full), Czech (menus only).
+No catalog has had a native speaker's review. Details: [localization-parity.md](docs/localization-parity.md).
 
-| Area | Weight | Done | Missing (main items) | One agent (h) |
-|---|---:|---:|---|---:|
-| Selection, transform & align tools | 6 | 85% | Free Transform/Scale/Reflect along a rotated box, Start Global Edit, transform nuances (the rotated persistent bounding box is done) | 4–6 |
-| Drawing tools | 7 | 85% | rough-square Shaper recognition and orientation steps corrected; editable Shaper Groups landed; remaining: Shaper construction widget/gesture refinements, 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 corners between curved sides (and Relative rounding) | 8–13 |
-| 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 | 90% | the Art brush's Overlap, auto-generated Pattern brush corners and new tile art in Pattern Brush Options (Brush Options for every brush type done), brush libraries (generated in code), pen pressure on macOS (the windowing layer reports none there), brushes driven by pen tilt, bearing and barrel rotation (6D art pens) | 8–15 |
-| Appearance, transparency, graphic styles, masks | 5 | 98% | raster effect reach in preview bounds (flattener presets apply in PDF, EPS and print) | 1–2 |
-| Live vector effects | 5 | 85% | Outline Object, Pathfinder Hard/Soft Mix and Trap, SVG Filters, the Transform effect's Transform Objects/Patterns and Scale Strokes & Effects options | 6–10 |
-| Raster effects (Effect Gallery, Document Raster Effects Settings) | 4 | 29% | ~45 Photoshop-style filters (Artistic, Brush Strokes, Distort, Sketch, Stylize, Texture), Smart Blur's Edge Only / Overlay Edge modes and the Effect Gallery; Document Raster Effects Settings, raster effects in PDF, the pixel-filter pipeline, Radial Blur, Smart Blur, Unsharp Mask, Glowing Edges, Pixelate (Color Halftone, Crystallize, Mezzotint, Pointillize) and Video (De-Interlace, NTSC Colors) are done | 23–36 |
-| 3D and Materials | 4 | 0% | Extrude & Bevel, Revolve, Inflate, Rotate, lighting, materials (software renderer) | 50–80 |
-| Type core | 9 | 80% | 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); Hyphenation… and Justification… options (Every-line Composer for justified and ragged text, per object, is done; it is tuned by eye, not yet compared side by side with Illustrator; mixed type sizes in a paragraph still break single-line), Optical Margin Alignment, paragraph spacing limit for vertically justified area type, hidden characters, paragraph attributes in the Type tool's copy and paste (the characters keep their styles, the paragraphs take the destination's), mixed-value display in the Paragraph panel for a selection across differing paragraphs, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 14–19 |
-| 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), custom kinsoku sets (beyond Hard, Soft and None) and the Mojikumi Settings dialog —, proportional vertical metrics, manual tate-chu-yoko), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support (beyond parity, not scored: inline symbols in text) | 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 | 72% | graph Design/Column/Marker artwork (series colours set with Group Selection are done), Create Object Mosaic, per-feature stroke/fill choice and varying widths in Image Trace's Create Strokes (Vector Halftone and the Image Trace View modes, Palette and Create Strokes are 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 preset polish (Move Artwork for artboard X/Y edits, Rearrange All Artboards, 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 | 85% | global/video rulers, Spacing Guides' distance readouts and spacing for resized or drawn art, Smart Guides' angle and distance readouts while drawing, 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; the drawing tools snapping, with Construction Guides, #506; Spacing Guides for moves, #394; moves snapping to the grid, #740; ruler guides pulling drawn points with Smart Guides on, and "center" and "anchor" labels while hovering with the Selection tool, #812) | 2–4 |
-| File formats | 6 | 85% | Affinity export, and the rest of Affinity import (effects, adjustments, brushes, master pages, live symbol instances), DWG (no open spec: DXF instead), PSD placement as layers (Photoshop Import Options; the merged image is done), EPS checked against more real files users send (Inkscape files open as vectors; other generators' constructs are tested with programs written from the PostScript Language Reference 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 rest of Illustrator's editing data (appearances and live effects, symbols, pattern fills, brushes, placed files: #637), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers, presets and Affinity import are done | 6–10 (existing scope; Affinity export unestimated) |
-| 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% | macOS native menu dismissal fixed (M14.8); remaining: Variables, SVG Interactivity, Properties per context, Consolidate All Windows, floating panels outside the app window and docked into any group, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 17 Preferences options stored but not yet acted on (#394: Highlight Alternate Glyphs, Open Documents As Tabs, Real-time Drawing, hyphenation language, Appearance of Black, devices…) | 14–22 |
-| Libraries, Links, Package | 2 | 82% | the Libraries panel is local only (no cloud by design: libraries are files on this machine) and has no shared libraries, linked graphics or gradients and patterns as items yet; its graphics, colours and text styles (#745) and its search, groups and library export/import as `.vclibrary` files (#926) are done; Links and Package are done; placed VectorCraft documents are done (linked by default, vectors in every output, previews, Break Link, Expand, Edit Original, refresh on save) | 2–3 |
-| **Feature parity** | **103** | **~75%** | | **~210–330** |
-| Interaction-fidelity pass (side by side with Illustrator: every tool modifier, cursor, dialog, Properties context) | | | | 60–90 |
-| Hardening (big-file corpus, fuzzing, cross-platform and browser QA, accessibility, packaging) | | | | 50–80 |
-| **Full parity** | | **~56%** | | **~320–500** |
+## Upcoming
 
-With 4–6 agents working on disjoint crates (as the layering allows) the wall-clock time divides by roughly 3.5–4
-(integration, review and shared files such as `menus.rs` serialize some work): **~55–95 h** to feature parity,
-**~80–145 h** to full parity.
+Ranked; detail in [docs/roadmap.md](docs/roadmap.md) and [docs/gaps.md](docs/gaps.md).
 
-_Inventories (2026-10-07):_ 13 menu items still stubbed (`todo(…)` in `crates/ui-egui/src/menus.rs`); every tool
-implemented except Touch Type; 51 panel modules; Illustrator-style live
-effects ~44/54, Photoshop-style raster effects ~4/56, 3D 0/5; ~2,840 tests; ~221k lines of Rust.
+1. **Interaction-fidelity pass** (G1), tool by tool from [ui-parity.md](docs/ui-parity.md): 60–90 h.
+2. **`.ai` files from real users** (G9): layer structure, guides, speed: 10–20 h.
+3. **Launch and stability on real machines** (G10): 20–35 h.
+4. **Core-tool correctness** (G11: Shape Builder regions, Asset Export borders): 8–15 h.
+5. **Raster effects** (G2) alongside: 29 filters and the Effect Gallery, 24–40 h.
+6. **Then:** type core and advanced type (G4), the Illustrator 2026 additions (G13), 3D (G3).
 
-_Where we already beat Illustrator:_ exact curve booleans, off-thread multithreaded rendering, undo that never runs out,
-lossless SVG/PDF export of live effects with SVG filters, a documented JSON format, the same app on the web, and every
-command, gesture and dialog drivable by agents (MCP, CLI, control channel).
+## Progress log
 
-## Out of scope (by design or by law)
-- **Native `.ai` private data, beyond its structure:** the app's own editing copy of a file (an EPS after its `%%EOF`, a `.ai`'s `AIPrivateData` streams, Zstandard or zlib, the EPS's in ASCII85) is not documented as a whole. VectorCraft reads its structure: layers and sublayers (names, order, visibility, lock, printing, preview, dimming, colour), groups as they were nested, compound paths, clipping groups and layer clipping, object names, hidden and locked objects, fills and strokes (grey, CMYK, RGB, named and spot colours), linear and radial gradients, opacity, blend modes, isolation and knockout, embedded images with their alpha channel, guides, and every artboard where it is. An object with several fills or strokes, effects or a brush comes in as its drawn look (a group named after it). Type is made from the file's text document, whole and editable, shown or not: point type, area type (a story in several frames as threaded type) and type on a path, with its characters, fonts, size, leading, tracking, scaling, baseline shift, fill and stroke (grey, RGB or CMYK), alignment, indents and paragraph spacing; the page's drawing of it (often in pieces) is left out. Where the text document can't say (a frame of another kind, or a document that doesn't agree with the page), type that shows comes from the page into its text object's place (no group around it), and hidden type is left out with a note. Kerning, underline and the other character and paragraph options aren't read yet. A `.ai` saved without PDF compatibility (a placeholder page) opens from its editing data alone, its point type, area type and type on a path made from the text document. Symbols, pattern fills, placed files and anything else it doesn't read make the file come in as its page (on a layer that doesn't show, they are left out of that layer), with a warning saying what. The layers' art is also compared with the page (by lightness, so colours written as their CMYK equivalents compare alike, and by whether a pixel is inked at all); the page is used when they differ by more than 5%, where one draws an object the other doesn't (away from type, whose lines may be laid out afresh), and when an EPS whose page is its art's box has art printed outside it (#735). `textAs: "outlines"` opens a `.ai` whose type shows from its PDF part, which has the outlines; `editingData: false` opens any of them as its page or PDF part only, for print pipelines (#735). A file whose import left something out (hidden text, art or layers) is never written over by an export or Save As to its own path unless `acknowledgeLoss: true` (`convert --replace-lossy`), so the original keeps what the document lacks. Where a `.ai` can't be read that way (or its layers are turned off in the import options), we read its 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). That part also has no paragraphs: area type is written line by line, and comes back as area type only where its font is installed and lays the lines out with the same breaks, else as a point type object per line (#508). 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.
+| Date | What landed |
+|---|---|
+| 2026-10-11 | Effect › Brush Strokes: Accented Edges, Angled Strokes, Crosshatch, Dark Strokes, Ink Outlines, Spatter, Sprayed Strokes, Sumi-e (G2). Command parameters from agents and files checked before anything changes (paint, place, cuts, dashes, crop, asset ids, anchors, paths, distort; #984–#999); command dialogs keep whole numbers whole, so Create Object Mosaic takes the tiles typed (#1000); stepper arrows take Shift (×10) and Ctrl/Cmd (÷10) like the arrow keys (#991). Exports and Rasterize supersample Art Optimized edges, so shapes meeting edge to edge leave no seam (#983). Character and paragraph styles take leading, kerning, mojikumi and the other attributes left out at their defaults (#1001). Drawing, typing and pasting with no layer shown and unlocked is refused instead of adding art to a hidden or locked layer (#1002). MCP `add_text` gives type on or in a path the colour asked for (#1003). MCP `screenshot` of a connected app renders the artboard asked for (#1004). `vectorcraft-cli run` ends quietly when its reader closes early (#1005). Select › All on Active Artboard selects on the artboard made active, not always the first (#1006). Reverse Gradient keeps off-centre midpoints, mirrored (#1007). |
+| 2026-10-10 | Initial live Revolve (Effect › 3D and Materials, #846, #605), in its own `three-d` crate. Progress docs re-measured and restructured to the craftrules standard (this page, `docs/target-app-parity.md`, `gaps.md`, `ui-parity.md`, the format, hardware, localization, effects and type checklists). Same day: v0.8.0; Effect › Distort, Pixelate and Texture filters (13); German interface; Variables (data merge); Graph Type value axes and tick marks; restart when the first frame never reaches the screen (#964) |
+| 2026-10-09 | Radial Blur, Smart Blur, Unsharp Mask (gap 2 begins); 340 commits, the busiest day |
+| 2026-10-08 | v0.5.0–v0.7.0; community contributions: Pen and shape-tool modifiers, Layers, Artboards, Japanese composition, Hebrew/Arabic type, interface languages, saved selections |
+| 2026-10-07 | v0.4.0; issue fixes; Layers panel rework |
+| 2026-10-06 | M8 transform and distort fidelity pass (M8.1–M8.20) |
+| 2026-10-05 | M4 files done (M4.14–M4.98); M3 paint and appearance done (92 tasks over two days) |
+| 2026-10-02 | First weighted parity estimate (22 areas); look and feel measured against public screenshots |
+| 2026-10-01 | Renamed from DrawCraft to VectorCraft |
+| 2026-09-30 | Repository history begins |
 
-## Where we aim to be better than Illustrator
-- **Speed:** off-thread multithreaded rendering, instant startup, a responsive UI on huge files.
-- **Robustness:** exact curve booleans (no "cannot perform operation"), property-tested undo/redo and file round trips.
-- **Openness:** a documented native format, first-class SVG, and the same app in the browser.
-- **Automation:** every command, gesture, dialog and widget is drivable by agents (JSON channel + MCP), with headless batch mode.
+The full pre-standard record of what landed is kept in [docs/roadmap.md](docs/roadmap.md#progress-log-before-the-progress-docs-standard).
 
-## How to update this file
-After each milestone task lands, update the status column and remaining estimates, and move items into "Shipped so far". Keep estimates honest: re-derive them from what remains, never from wishful velocity.
+## Revision history
+
+| Date | Change | Summary |
+|---|---|---|
+| 2026-10-10 | minor | Method aligned with the standard, no new evidence: full ready for real work is the additive weighted sum, ~62%; hours per audience; beta ~13 points away |
+| 2026-10-10 | minor | Added the essentials-user readiness score (~75%) |
+| 2026-10-10 | minor | Ready for real work re-examined against the issue tracker and user feedback: 50% → 55% (full), 65% mainstream added; see target-app-parity.md |
+| 2026-10-10 | minor | Applied the core-workflow gate (docs/roadmap.md › Alpha gate): passes, stage stays alpha |
+| 2026-10-10 | major | Re-measured against Illustrator 2026 (30.x) from code counts, 71 open issues and public docs; stage set to alpha; moved the parity estimate, honest assessment and "Shipped so far" to `docs/target-app-parity.md`, the gap list to `docs/gaps.md`, milestones to `docs/roadmap.md`, the `.ai` scope to `docs/file-format-parity.md` |
+| 2026-10-05 | major | Honest assessment by dimension and the prioritized gap list |
+| 2026-10-02 | major | First 22-area weighted parity estimate |

apps/vectorcraft-cli/src/main.rs

@@ -292,7 +292,21 @@ fn run(args: &[String]) -> Result<(), String> {
 
     let mut h = Headless::new();
     let mut out = std::io::stdout().lock();
-    let mut emit = |v: Value| writeln!(out, "{v}").map_err(|e| e.to_string());
+    // A reader that stopped early (a closed pipe) isn't an error, and the batch goes on: its later
+    // steps (an export…) still run, unprinted.
+    let mut closed = false;
+    let mut emit = |v: Value| {
+        if closed {
+            return Ok(());
+        }
+        match writeln!(out, "{v}") {
+            Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => {
+                closed = true;
+                Ok(())
+            }
+            r => r.map_err(|e| e.to_string()),
+        }
+    };
     if let Some(path) = &input {
         let r = h.call("app.open", json!({"path": path})).map_err(|e| format!("open {path}: {e}"))?;
         emit(json!({"step": "open", "path": path, "result": r}))?;

apps/vectorcraft-cli/tests/cli.rs

@@ -297,3 +297,21 @@ fn closed_stdout_ends_quietly() {
     let err = String::from_utf8_lossy(&out.stderr);
     assert!(out.status.success() && !err.contains("panicked"), "{:?}: {err}", out.status);
 }
+
+/// #1005: `run` whose reader has gone (`vectorcraft-cli run … | true`) ends quietly with status 0,
+/// and its later steps still run; a failing step still fails.
+#[test]
+fn run_with_a_closed_stdout_ends_quietly_and_finishes_the_batch() {
+    let svg = tmp("closed-run.svg");
+    let _ = std::fs::remove_file(&svg);
+    let rect = r#"{"x":1,"y":1,"width":5,"height":5}"#;
+    let args = ["run", "--cmd", "document.json", "--cmd", "shape.rectangle", "--params", rect, "--export", svg.to_str().unwrap()];
+    let mut child = Command::new(BIN).args(args).stdout(Stdio::piped()).stderr(Stdio::piped()).spawn().unwrap();
+    drop(child.stdout.take());
+    let out = child.wait_with_output().unwrap();
+    let err = String::from_utf8_lossy(&out.stderr);
+    assert!(out.status.success() && err.is_empty(), "{:?}: {err}", out.status);
+    assert!(svg.is_file(), "the export after the closed reader still ran");
+    let out = Command::new(BIN).args(["run", "--cmd", "not-a-command"]).stdout(Stdio::null()).output().unwrap();
+    assert!(!out.status.success());
+}

apps/vectorcraft/Cargo.toml

@@ -51,10 +51,13 @@ windows = { version = "0.62", features = ["Win32_Graphics_DirectWrite"] }
 # with default features off). Pinned exactly: review the diff before bumping.
 muda = { version = "=0.21.1", default-features = false }
 objc2 = "0.6"
-objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSMenu", "NSEvent", "NSPasteboard", "NSResponder", "NSTextInputContext"] }
+objc2-app-kit = { version = "0.3", default-features = false, features = ["std", "NSApplication", "NSButton", "NSControl", "NSMenu", "NSEvent", "NSPasteboard", "NSResponder", "NSTextInputContext", "NSView", "NSWindow"] }
 # 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"] }
+objc2-foundation = { version = "0.3", default-features = false, features = ["std", "block2", "NSArray", "NSData", "NSGeometry", "NSNotification", "NSOperation", "NSString", "NSURL"] }
 block2 = "0.6"
+# The window's AppKit view, to centre its buttons on the app bar (src/mac_window.rs). MIT OR
+# Apache-2.0 OR Zlib, already in the build through eframe and winit.
+raw-window-handle = "0.6"
 # CoreText's font manager (src/mac_fonts.rs): fonts that apps and font managers register from their
 # own folders (#579). Zlib OR Apache-2.0 OR MIT; objc2-core-foundation already comes with
 # objc2-foundation.

apps/vectorcraft/src/gpu.rs

@@ -26,9 +26,16 @@
 //! the graphics fail while the window is starting up, [`finish`] starts the app again without
 //! that adapter, as the next one in the order would be tried. Each restart leaves out one more
 //! adapter, so it ends when none is left.
+//!
+//! An adapter can also hang instead of failing: on a hybrid laptop with High Performance chosen,
+//! the discrete GPU never put the window's first frame on the screen, with no error and no panic,
+//! and the app stayed in the background without a window (#964). [`watch_first_frame`] gives the
+//! first frame [`FIRST_FRAME_TIMEOUT`] once the app is created and, when it doesn't come, starts
+//! the app again without that adapter in the same way.
 
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::{Arc, OnceLock};
+use std::time::{Duration, Instant};
 
 use eframe::egui_wgpu::NativeAdapterSelectorMethod;
 use eframe::wgpu::{self, Backend, Backends, DeviceType, PowerPreference};
@@ -50,6 +57,11 @@ const HELP: &str =
 /// window is something else (such as the compositor restarting).
 pub const STARTUP_FRAMES: u64 = 10;
 
+/// How long the window's first frame may take to reach the screen, from the app's creation,
+/// before its adapter counts as hanging ([`watch_first_frame`]). The first frame draws the whole
+/// interface and compiles its shaders, a second at most on a slow machine.
+pub const FIRST_FRAME_TIMEOUT: Duration = Duration::from_secs(20);
+
 /// The preference used when Preferences say Automatic. Windows and macOS show frames from any GPU
 /// (the integrated one avoids the flicker of #306). Elsewhere, the system's own order: Mesa's
 /// device-select layer puts the GPU the desktop runs on first (the integrated one on hybrid
@@ -311,6 +323,8 @@ pub struct Startup {
     adapter: OnceLock<String>,
     /// The UI's context, which counts the frames run.
     ui: OnceLock<egui::Context>,
+    /// When the app was created, the files named at the start opened: the first frame is due.
+    ready: OnceLock<Instant>,
 }
 
 impl Startup {
@@ -319,6 +333,71 @@ impl Startup {
         // Set once; the window is created once.
         let _ = self.ui.set(ctx.clone());
     }
+
+    /// The app is ready to draw its first frame.
+    pub fn ready(&self) {
+        // Set once, like `created`.
+        let _ = self.ready.set(Instant::now());
+    }
+}
+
+/// What [`watch_first_frame`] makes of the window's start.
+#[derive(Debug, PartialEq, Eq)]
+enum FirstFrame {
+    /// Not due yet.
+    Wait,
+    /// On the screen (the second frame began, so the first was presented), or the window was
+    /// minimized at the start: nothing to watch.
+    Shown,
+    /// Overdue.
+    Hung,
+}
+
+/// The window's start after `frames` frames run, `since` its first frame was due.
+fn first_frame(frames: u64, since: Duration, minimized: bool) -> FirstFrame {
+    if frames >= 2 || minimized {
+        FirstFrame::Shown
+    } else if since >= FIRST_FRAME_TIMEOUT {
+        FirstFrame::Hung
+    } else {
+        FirstFrame::Wait
+    }
+}
+
+/// Watch the window's first frame from another thread: when it hasn't reached the screen
+/// [`FIRST_FRAME_TIMEOUT`] after the app was created ([`Startup::ready`]), start the app again
+/// without the adapter, as [`finish`] does for one that failed, and end this process, whose UI
+/// thread is stuck in the graphics driver.
+pub fn watch_first_frame(startup: Arc<Startup>) {
+    let watch = move || loop {
+        std::thread::sleep(Duration::from_millis(250));
+        let Some(due) = startup.ready.get() else { continue };
+        let ui = startup.ui.get();
+        let frames = ui.map_or(0, egui::Context::cumulative_frame_nr);
+        let minimized = ui.and_then(|c| c.input(|i| i.viewport().minimized)).unwrap_or(false);
+        match first_frame(frames, due.elapsed(), minimized) {
+            FirstFrame::Wait => continue,
+            FirstFrame::Shown => return,
+            FirstFrame::Hung => {}
+        }
+        let mut skip = skipped();
+        let Some(failed) = restart_without(true, frames, startup.adapter.get().map(String::as_str), &skip) else { return };
+        log::error!(
+            "the window's first frame didn't reach the screen in {}s on graphics adapter {failed}: starting again without it",
+            FIRST_FRAME_TIMEOUT.as_secs()
+        );
+        skip.push(failed.to_string());
+        match restart(&skip.join(",")) {
+            Ok(()) => std::process::exit(0),
+            Err(e) => {
+                log::error!("starting again failed: {e}");
+                return;
+            }
+        }
+    };
+    if let Err(e) = std::thread::Builder::new().name("first frame".into()).spawn(watch) {
+        log::warn!("no watch on the window's first frame: {e}");
+    }
 }
 
 /// eframe's adapter choice: the first of [`adapter_order`] for `power`, the GPUs that drive a
@@ -729,6 +808,24 @@ mod tests {
         assert_eq!(parse_skip(&key(Backend::Gl, 0, 0, "Mesa, llvmpipe")), ["Gl:Mesa  llvmpipe"]);
     }
 
+    #[test]
+    fn a_first_frame_that_never_reaches_the_screen_hangs_its_adapter() {
+        let s = Duration::from_secs;
+        // The second frame began: the first was presented.
+        assert_eq!(first_frame(2, s(60), false), FirstFrame::Shown);
+        // Still drawing (or presenting) the first frame: waited for, then given up on (#964).
+        for frames in [0, 1] {
+            assert_eq!(first_frame(frames, s(3), false), FirstFrame::Wait);
+            assert_eq!(first_frame(frames, FIRST_FRAME_TIMEOUT, false), FirstFrame::Hung);
+        }
+        // A window minimized at the start may not draw again until restored.
+        assert_eq!(first_frame(1, s(60), true), FirstFrame::Shown);
+        // A hung adapter is left out once, like one that failed.
+        let skip = vec!["Dx12:10de:28a0".to_string()];
+        assert_eq!(restart_without(true, 1, Some("Dx12:10de:28a0"), &skip), None);
+        assert_eq!(restart_without(true, 1, Some("Dx12:8086:a7a8"), &skip), Some("Dx12:8086:a7a8"));
+    }
+
     #[test]
     fn a_restart_tries_the_next_adapter() {
         let c = issue_502();

apps/vectorcraft/src/mac_window.rs

@@ -0,0 +1,74 @@
+//! macOS: the window buttons (close, minimize, zoom) centred on the app bar (#968).
+//!
+//! AppKit puts the buttons in a standard title bar, shorter than the app bar they sit over, so they
+//! rode high on it. [`center_buttons`] moves them to the middle of the bar, inset from its left as
+//! far as from its top, and makes the title bar as tall as the app bar so they stay clickable.
+//! AppKit lays its title bar out again when the window resizes or leaves full screen, so this runs
+//! every frame and moves the buttons only when they are out of place.
+//!
+//! Reaching the title bar's views from the window's content view has no safe API, hence the scoped
+//! `unsafe_code` allowance.
+#![allow(unsafe_code)]
+
+use objc2::runtime::AnyObject;
+use objc2_app_kit::{NSView, NSWindowButton, NSWindowStyleMask};
+use objc2_foundation::NSPoint;
+use raw_window_handle::{HasWindowHandle, RawWindowHandle};
+
+/// The room the app bar keeps at its left for the buttons in AppKit's own place, before they are
+/// centred (and in full screen, where AppKit shows them elsewhere): their width and a gap.
+pub const DEFAULT_INSET: f32 = 78.0;
+
+/// Differences below this (in points) leave a frame as it is, so a frame in place isn't set again.
+const SLACK: f64 = 0.25;
+
+/// Centre the window's buttons on an app bar `bar` egui points tall, at the window's `zoom` factor
+/// (native points per egui point). Returns the room the app bar keeps clear at its left for them,
+/// in egui points, or `None` when they aren't over the bar (full screen) or can't be found.
+pub fn center_buttons(frame: &eframe::Frame, zoom: f32, bar: f32) -> Option<f32> {
+    let RawWindowHandle::AppKit(handle) = frame.window_handle().ok()?.as_raw() else {
+        return None;
+    };
+    // SAFETY: the handle's view is the window's content view, which AppKit keeps alive while the
+    // window is open, and eframe hands out the handle only while it is.
+    let view = unsafe { handle.ns_view.cast::<NSView>().as_ref() };
+    let window = view.window()?;
+    if window.styleMask().contains(NSWindowStyleMask::FullScreen) {
+        return None;
+    }
+    let close = window.standardWindowButton(NSWindowButton::CloseButton)?;
+    let minimize = window.standardWindowButton(NSWindowButton::MiniaturizeButton)?;
+    let zoom_button = window.standardWindowButton(NSWindowButton::ZoomButton)?;
+    // The buttons sit in the title bar view, inside the title bar container that sets its height.
+    // SAFETY: both views belong to the window, alive while it is; used right away.
+    let container = unsafe { close.superview().and_then(|titlebar| titlebar.superview()) }?;
+    // Another layout (a later macOS) is left as AppKit made it.
+    if AnyObject::class(&container).name() != c"NSTitlebarContainerView" {
+        return None;
+    }
+    let size = close.frame().size;
+    let gap = minimize.frame().origin.x - (close.frame().origin.x + size.width);
+    let height = f64::from(bar * zoom);
+    let margin = (height - size.height) / 2.0;
+    if !(margin.is_finite() && margin > 0.0 && gap.is_finite() && gap >= 0.0 && zoom > 0.0) {
+        return None;
+    }
+    let mut bounds = container.frame();
+    let top = window.frame().size.height - height;
+    if (bounds.size.height - height).abs() > SLACK || (bounds.origin.y - top).abs() > SLACK {
+        bounds.size.height = height;
+        bounds.origin.y = top;
+        container.setFrame(bounds);
+    }
+    let mut x = margin;
+    for button in [close, minimize, zoom_button] {
+        let at = NSPoint::new(x, (height - button.frame().size.height) / 2.0);
+        let now = button.frame().origin;
+        if (now.x - at.x).abs() > SLACK || (now.y - at.y).abs() > SLACK {
+            button.setFrameOrigin(at);
+        }
+        x += size.width + gap;
+    }
+    // The last button's right edge (`x` steps one gap past it) and the margin again after it.
+    Some(((x - gap + margin) / f64::from(zoom)) as f32)
+}

apps/vectorcraft/src/main.rs

@@ -31,6 +31,8 @@ mod mac_fonts;
 #[cfg(target_os = "macos")]
 mod mac_menu;
 #[cfg(target_os = "macos")]
+mod mac_window;
+#[cfg(target_os = "macos")]
 mod open_documents;
 mod prefs_dir;
 mod printing;
@@ -69,7 +71,14 @@ impl eframe::App for App {
         }
         file_access::unconfined(|| self.app.raw_input_hook(raw));
     }
-    fn ui(&mut self, ui: &mut egui::Ui, _frame: &mut eframe::Frame) {
+    #[cfg_attr(not(target_os = "macos"), allow(unused_variables))]
+    fn ui(&mut self, ui: &mut egui::Ui, frame: &mut eframe::Frame) {
+        #[cfg(target_os = "macos")]
+        {
+            let bar = vectorcraft_ui_egui::chrome::APP_BAR_HEIGHT;
+            let inset = mac_window::center_buttons(frame, ui.ctx().zoom_factor(), bar);
+            self.app.titlebar_inset = inset.unwrap_or(mac_window::DEFAULT_INSET);
+        }
         file_access::unconfined(|| self.app.ui(ui));
         #[cfg(target_os = "macos")]
         if self.app.take_ime_discard() {
@@ -391,6 +400,32 @@ fn adapter_summary(info: &eframe::wgpu::AdapterInfo) -> String {
 /// macOS keeps its traffic lights over the integrated title strip.
 const CUSTOM_TITLEBAR: bool = !cfg!(target_os = "macos");
 
+/// Whether this start draws its own title bar: Windows and Linux do, unless Preferences ›
+/// User Interface › System Title Bar asks for the system's. Read from the saved preferences
+/// before the window opens; a missing or unreadable value keeps the default.
+fn custom_titlebar(saved: Option<&vectorcraft_ui_egui::UiState>) -> bool {
+    CUSTOM_TITLEBAR && !saved.map(|ui| ui.engine_prefs.get("systemTitleBar").and_then(serde_json::Value::as_bool).unwrap_or(false)).unwrap_or(false)
+}
+
+fn native_options(custom_titlebar: bool) -> eframe::NativeOptions {
+    eframe::NativeOptions {
+        viewport: egui::ViewportBuilder::default()
+            .with_title("VectorCraft")
+            .with_inner_size(window::DEFAULT_SIZE)
+            .with_min_inner_size(window::MIN_SIZE)
+            .with_drag_and_drop(true)
+            .with_decorations(!custom_titlebar)
+            .with_fullsize_content_view(true)
+            .with_titlebar_shown(false)
+            .with_title_shown(false)
+            .with_icon(app_icon())
+            .with_app_id("ai.storyteller.vectorcraft"),
+        #[cfg(feature = "windows7")]
+        renderer: eframe::Renderer::Glow,
+        ..Default::default()
+    }
+}
+
 fn main() -> std::process::ExitCode {
     // First, so every start-up warning is recorded (`logging`).
     let logger = logging::install();
@@ -469,7 +504,9 @@ fn main() -> std::process::ExitCode {
     #[cfg(feature = "wgpu")]
     let displays = gpu::preferred_displays(gpu_pref, power_env);
     #[cfg(feature = "wgpu")]
-    if gpu::automatic(gpu_pref, power_env) {
+    let chosen_gpu = !gpu::automatic(gpu_pref, power_env);
+    #[cfg(feature = "wgpu")]
+    if !chosen_gpu {
         let listed: Vec<String> = displays.iter().map(ToString::to_string).collect();
         log::info!("display GPUs (PCI vendor:device): {}", if listed.is_empty() { "unknown".to_string() } else { listed.join(", ") });
     } else {
@@ -477,22 +514,8 @@ fn main() -> std::process::ExitCode {
     }
     #[cfg(feature = "wgpu")]
     let startup = std::sync::Arc::new(gpu::Startup::default());
-    let options = eframe::NativeOptions {
-        viewport: egui::ViewportBuilder::default()
-            .with_title("VectorCraft")
-            .with_inner_size(window::DEFAULT_SIZE)
-            .with_min_inner_size(window::MIN_SIZE)
-            .with_drag_and_drop(true)
-            .with_decorations(!CUSTOM_TITLEBAR)
-            .with_fullsize_content_view(true)
-            .with_titlebar_shown(false)
-            .with_title_shown(false)
-            .with_icon(app_icon())
-            .with_app_id("ai.storyteller.vectorcraft"),
-        #[cfg(feature = "windows7")]
-        renderer: eframe::Renderer::Glow,
-        ..Default::default()
-    };
+    let custom_titlebar = custom_titlebar(saved.as_ref());
+    let options = native_options(custom_titlebar);
     #[cfg(feature = "wgpu")]
     let options = {
         let mut options = options;
@@ -513,6 +536,8 @@ fn main() -> std::process::ExitCode {
     };
     #[cfg(feature = "wgpu")]
     gpu::watch_panics();
+    #[cfg(feature = "wgpu")]
+    gpu::watch_first_frame(startup.clone());
     // Files opened from Finder and the Dock arrive as events, not arguments.
     #[cfg(target_os = "macos")]
     open_documents::install();
@@ -556,7 +581,15 @@ fn main() -> std::process::ExitCode {
                     log::info!("rendering with {summary} (power preference {power:?})");
                     created.created(&cc.egui_ctx);
                     if !gpu::skipped().is_empty() {
-                        app.status(format!("The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}"));
+                        // A processor chosen in Settings can be the one that can't show the window.
+                        let hint = if chosen_gpu {
+                            " (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)"
+                        } else {
+                            ""
+                        };
+                        app.status(format!(
+                            "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}{hint}"
+                        ));
                     }
                     app.graphics_adapter = Some(summary);
                     let (loss, ctx) = (graphics_loss.clone(), cc.egui_ctx.clone());
@@ -566,8 +599,7 @@ fn main() -> std::process::ExitCode {
                 {
                     app.graphics_adapter = Some("OpenGL (Windows 7 compatibility)".into());
                 }
-                app.integrated_titlebar = cfg!(target_os = "macos");
-                app.custom_titlebar = CUSTOM_TITLEBAR;
+                app.custom_titlebar = custom_titlebar;
                 if let Some(port) = control_port {
                     let rx = control_server::start(port, cc.egui_ctx.clone());
                     app = app.with_control(rx).with_automation_roots(roots.clone());
@@ -589,6 +621,9 @@ fn main() -> std::process::ExitCode {
                 #[cfg(not(target_os = "macos"))]
                 let _ = in_window_menus;
                 file_access::unconfined(|| open_files(&mut app, files));
+                // The first frame is due from now (`gpu::watch_first_frame`).
+                #[cfg(feature = "wgpu")]
+                created.ready();
                 Ok(Box::new(App { app, graphics_loss, graphics_lost: false, frames: 0 }))
             }),
         )
@@ -610,6 +645,25 @@ fn main() -> std::process::ExitCode {
 mod tests {
     use super::*;
 
+    fn ui_state_with_prefs(engine_prefs: serde_json::Value) -> vectorcraft_ui_egui::UiState {
+        vectorcraft_ui_egui::UiState { engine_prefs, ..Default::default() }
+    }
+
+    #[test]
+    fn the_system_title_bar_preference_keeps_the_window_decorations() {
+        // Preferences › User Interface › System Title Bar gives the window back its system
+        // decorations on Windows and Linux; macOS always has them.
+        assert_eq!(super::custom_titlebar(None), super::CUSTOM_TITLEBAR, "no preferences: the default");
+        let off = ui_state_with_prefs(serde_json::json!({"systemTitleBar": false}));
+        assert_eq!(super::custom_titlebar(Some(&off)), super::CUSTOM_TITLEBAR);
+        let on = ui_state_with_prefs(serde_json::json!({"systemTitleBar": true}));
+        assert!(!super::custom_titlebar(Some(&on)));
+        assert_eq!(super::native_options(false).viewport.decorations, Some(true));
+        if super::CUSTOM_TITLEBAR {
+            assert_eq!(super::native_options(true).viewport.decorations, Some(false));
+        }
+    }
+
     /// The file extensions the macOS bundle declares: its document types and its own exported type.
     fn plist_extensions(plist: &str) -> Vec<&str> {
         ["<key>CFBundleTypeExtensions</key>", "<key>public.filename-extension</key>"]

contributors/people.toml

@@ -26,6 +26,9 @@ sync_github_name = false
 real_name = "Riccardo Balloch"
 sync_github_name = false
 
+[people.crqch]
+sync_github_name = true
+
 [people.mo0kid]
 sync_github_name = true
 

crates/color/src/gradient.rs

@@ -131,10 +131,18 @@ impl Gradient {
             std::iter::once((s.offset, s.color, s.opacity, None)).chain(mid)
         })
     }
+    /// The same ramp the other way round: the stops in reverse order at mirrored offsets, each
+    /// segment's midpoint mirrored with it.
     pub fn reverse(&mut self) {
         self.stops.reverse();
-        for s in &mut self.stops {
-            s.offset = 1.0 - s.offset;
+        for i in 0..self.stops.len() {
+            // A midpoint belongs to the segment after its stop: reversed, stop i's segment is the
+            // one the next stop (not yet mirrored) had, measured from the other end.
+            let mid = self.stops.get(i + 1).map_or(0.5, |n| 1.0 - n.midpoint);
+            if let Some(s) = self.stops.get_mut(i) {
+                s.offset = 1.0 - s.offset;
+                s.midpoint = mid;
+            }
         }
     }
     pub fn sort(&mut self) {
@@ -569,6 +577,32 @@ mod tests {
         assert_eq!(g.stops[0].offset, 0.0);
     }
 
+    /// #1007: reversing mirrors off-centre midpoints with their segments, so the ramp is the same
+    /// the other way round.
+    #[test]
+    fn reverse_mirrors_midpoints() {
+        let stop = |offset, hex, midpoint| GradientStop { midpoint, ..GradientStop::new(offset, Color::from_hex(hex).unwrap()) };
+        let two = Gradient { kind: GradientKind::Linear, stops: vec![stop(0.0, "#ff0000", 0.2), stop(1.0, "#0000ff", 0.5)] };
+        let three =
+            Gradient { kind: GradientKind::Linear, stops: vec![stop(0.0, "#ff0000", 0.2), stop(0.3, "#00ff00", 0.8), stop(1.0, "#0000ff", 0.5)] };
+        for g in [two, three] {
+            let mut r = g.clone();
+            r.reverse();
+            let mids: Vec<f32> = r.stops.iter().map(|s| s.midpoint).collect();
+            let want: Vec<f32> = g.stops.iter().rev().skip(1).map(|s| 1.0 - s.midpoint).chain([0.5]).collect();
+            assert!(mids.iter().zip(&want).all(|(a, b)| (a - b).abs() < 1e-6), "{mids:?} {want:?}");
+            for i in 0..=20 {
+                let t = i as f32 / 20.0;
+                let ((a, ao), (b, bo)) = (g.sample(t), r.sample(1.0 - t));
+                let same = a.to_rgba8(1.0).iter().zip(b.to_rgba8(1.0)).all(|(x, y)| x.abs_diff(y) <= 1);
+                assert!(same && (ao - bo).abs() < 1e-6, "t {t}: {a:?} vs {b:?}");
+            }
+            r.reverse();
+            let back = r.stops.iter().zip(&g.stops).all(|(a, b)| (a.offset - b.offset).abs() < 1e-6 && (a.midpoint - b.midpoint).abs() < 1e-6);
+            assert!(back, "reversed twice, it is as it was: {:?}", r.stops);
+        }
+    }
+
     fn close(a: Point, b: Point) -> bool {
         a.distance(b) < 1e-9
     }

crates/doc/src/graph.rs

@@ -69,6 +69,70 @@ impl GraphKind {
             GraphKind::Radar => "Radar",
         }
     }
+    /// Whether a series of this type can be drawn in a graph of type `graph` (Combine different graph types): the
+    /// column, stacked column, line and area types share a vertical value axis, the bar types a horizontal one.
+    /// Scatter, pie and radar lay their data out on their own and take no other types.
+    pub fn combines_with(self, graph: GraphKind) -> bool {
+        use GraphKind::*;
+        let vertical = |k| matches!(k, Column | StackedColumn | Line | Area);
+        let horizontal = |k| matches!(k, Bar | StackedBar);
+        self == graph || (vertical(self) && vertical(graph)) || (horizontal(self) && horizontal(graph))
+    }
+}
+
+/// Graph Type › Value Axis: which side of the plot the value axis is drawn on.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum ValueAxisSide {
+    #[default]
+    Left,
+    Right,
+    Both,
+}
+
+impl ValueAxisSide {
+    pub fn id(self) -> &'static str {
+        match self {
+            ValueAxisSide::Left => "left",
+            ValueAxisSide::Right => "right",
+            ValueAxisSide::Both => "both",
+        }
+    }
+    pub fn parse(s: &str) -> Option<Self> {
+        [ValueAxisSide::Left, ValueAxisSide::Right, ValueAxisSide::Both].into_iter().find(|k| k.id().eq_ignore_ascii_case(s))
+    }
+    fn is_left(&self) -> bool {
+        *self == ValueAxisSide::Left
+    }
+}
+
+/// Graph Type › Tick Marks › Length: no tick marks, short ones outside the axis, or lines across the whole plot.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum TickLength {
+    None,
+    #[default]
+    Short,
+    Full,
+}
+
+impl TickLength {
+    pub fn id(self) -> &'static str {
+        match self {
+            TickLength::None => "none",
+            TickLength::Short => "short",
+            TickLength::Full => "full",
+        }
+    }
+    pub fn parse(s: &str) -> Option<Self> {
+        [TickLength::None, TickLength::Short, TickLength::Full].into_iter().find(|k| k.id().eq_ignore_ascii_case(s))
+    }
+    fn is_short(&self) -> bool {
+        *self == TickLength::Short
+    }
+    fn is_none(&self) -> bool {
+        *self == TickLength::None
+    }
 }
 
 /// The fill and stroke captured from one series' generated marks. An absent paint keeps whatever
@@ -95,6 +159,10 @@ pub struct GraphSpec {
     /// entries keep the generator's own fill and stroke.
     pub series_paints: Vec<SeriesPaint>,
     pub kind: GraphKind,
+    /// Graph types chosen for single series (Combine different graph types), by series index; `None` and missing
+    /// entries draw as [`Self::kind`].
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub series_kinds: Vec<Option<GraphKind>>,
     /// The plot rectangle (the area the graph tool dragged), document points.
     pub rect: Rect,
     pub series: Vec<String>,
@@ -114,6 +182,50 @@ pub struct GraphSpec {
     pub ticks: usize,
     pub axis_min: Option<f64>,
     pub axis_max: Option<f64>,
+    /// Graph Type › Value Axis side. Column, stacked column, line, area and scatter graphs (the bar graphs' value axis
+    /// runs along the bottom and stays there).
+    #[serde(skip_serializing_if = "ValueAxisSide::is_left")]
+    pub value_axis: ValueAxisSide,
+    /// Graph Type › Separate Scales: with the value axis on both sides, the series on the right axis
+    /// ([`Self::right_series`]) get a scale of their own there.
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub separate_scales: bool,
+    /// Indexes of the series assigned to the right value axis.
+    #[serde(skip_serializing_if = "Vec::is_empty")]
+    pub right_series: Vec<usize>,
+    /// The right value axis' tick values, used with separate scales: tick count (0 = automatic) and min/max override.
+    #[serde(skip_serializing_if = "is_zero")]
+    pub right_ticks: usize,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub right_axis_min: Option<f64>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub right_axis_max: Option<f64>,
+    /// Graph Type › Tick Marks for the value axis (the left one, or the bottom one of bar graphs) and the right one:
+    /// length, and tick marks per division (0 and 1 = one, at the labels).
+    #[serde(skip_serializing_if = "TickLength::is_short")]
+    pub tick_length: TickLength,
+    #[serde(skip_serializing_if = "at_most_one")]
+    pub tick_marks: usize,
+    #[serde(skip_serializing_if = "TickLength::is_short")]
+    pub right_tick_length: TickLength,
+    #[serde(skip_serializing_if = "at_most_one")]
+    pub right_tick_marks: usize,
+    /// Tick Marks for the category axis (none by default), and Draw Tick Marks Between Labels.
+    #[serde(skip_serializing_if = "TickLength::is_none")]
+    pub category_tick_length: TickLength,
+    #[serde(skip_serializing_if = "at_most_one")]
+    pub category_tick_marks: usize,
+    #[serde(skip_serializing_if = "std::ops::Not::not")]
+    pub ticks_between_labels: bool,
+    /// Graph Type › Add Labels: text before and after the value axes' numbers.
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub prefix: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub suffix: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub right_prefix: String,
+    #[serde(skip_serializing_if = "String::is_empty")]
+    pub right_suffix: String,
     /// Line, scatter and radar graphs: mark data points, connect them.
     pub mark_points: bool,
     pub connect_points: bool,
@@ -127,12 +239,25 @@ pub struct GraphSpec {
     pub placed: Option<Rect>,
 }
 
+fn at_most_one(n: &usize) -> bool {
+    *n <= 1
+}
+
+fn is_zero(n: &usize) -> bool {
+    *n == 0
+}
+
 /// Edge-to-Edge Lines for a graph saved before the option existed: on, as it was drawn then.
 fn edge_to_edge_before_the_option() -> bool {
     true
 }
 
 impl GraphSpec {
+    /// The type series `s` is drawn as: its own type when it combines with the graph's, else the graph's.
+    pub fn series_kind(&self, s: usize) -> GraphKind {
+        self.series_kinds.get(s).copied().flatten().filter(|k| k.combines_with(self.kind)).unwrap_or(self.kind)
+    }
+
     /// The data with blank cells as `None`, every row as long as the longest (at most [`MAX_GRAPH_CATEGORIES`] rows
     /// of [`MAX_GRAPH_SERIES`] cells).
     pub fn cells(&self) -> Vec<Vec<Option<f64>>> {
@@ -159,6 +284,7 @@ impl Default for GraphSpec {
         Self {
             series_paints: vec![],
             kind: GraphKind::Column,
+            series_kinds: vec![],
             rect: Rect::new(0.0, 0.0, 200.0, 150.0),
             series: vec![],
             categories: vec![],
@@ -170,6 +296,23 @@ impl Default for GraphSpec {
             ticks: 0,
             axis_min: None,
             axis_max: None,
+            value_axis: ValueAxisSide::Left,
+            separate_scales: false,
+            right_series: vec![],
+            right_ticks: 0,
+            right_axis_min: None,
+            right_axis_max: None,
+            tick_length: TickLength::Short,
+            tick_marks: 1,
+            right_tick_length: TickLength::Short,
+            right_tick_marks: 1,
+            category_tick_length: TickLength::None,
+            category_tick_marks: 1,
+            ticks_between_labels: false,
+            prefix: String::new(),
+            suffix: String::new(),
+            right_prefix: String::new(),
+            right_suffix: String::new(),
             mark_points: true,
             connect_points: true,
             edge_to_edge: false,

crates/doc/src/lib.rs

@@ -41,6 +41,7 @@ pub mod style_libs;
 pub mod swatches;
 pub mod text;
 pub mod trace;
+pub mod variables;
 
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -65,7 +66,7 @@ pub use appearance::{
 };
 pub use assets::ExportAsset;
 pub use corners::LiveCorners;
-pub use graph::{GraphKind, GraphSpec, MAX_GRAPH_CATEGORIES, MAX_GRAPH_SERIES, SeriesPaint};
+pub use graph::{GraphKind, GraphSpec, MAX_GRAPH_CATEGORIES, MAX_GRAPH_SERIES, SeriesPaint, TickLength, ValueAxisSide};
 pub use hit::{Hit, HitKind};
 pub use links::{LinkInfo, PlacementOptions};
 pub use live::{BlendOrientation, BlendSpacing, BlendSpec, EnvelopeKind, GradientMesh, MeshPoint};
@@ -91,6 +92,7 @@ pub use text::{
     TextWrap, VerticalAlign, WrapShape,
 };
 pub use trace::TraceView;
+pub use variables::{DataSet, DataValue, Variable, VariableKind, Variables};
 pub use vectorcraft_color as color;
 pub use vectorcraft_geom as geom;
 
@@ -561,6 +563,9 @@ pub struct Document {
     /// Select → Save Selection… (at most [`SavedSelection::MAX`]); saved with the document.
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub saved_selections: Vec<SavedSelection>,
+    /// Variables (data merge): named values bound to objects, applied per dataset.
+    #[serde(default, skip_serializing_if = "crate::skip::is_default")]
+    pub variables: Variables,
     #[serde(default)]
     pub grid: GridPrefs,
     #[serde(default = "ppi72")]
@@ -693,6 +698,7 @@ impl Document {
             guides: vec![],
             views: vec![],
             saved_selections: vec![],
+            variables: Variables::default(),
             grid: GridPrefs::default(),
             raster_effects_ppi: 72.0,
             images: BTreeMap::new(),

crates/doc/src/variables.rs

@@ -0,0 +1,207 @@
+//! Variables (data merge): named values bound to objects, with datasets that apply
+//! them all at once. One template document produces many variants (badges, price
+//! lists, localized copies) by selecting a dataset instead of editing each object.
+
+use std::collections::{BTreeMap, BTreeSet};
+
+use serde::{Deserialize, Serialize};
+
+use super::{Document, NodeId, NodeKind};
+
+/// What a variable drives.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum VariableKind {
+    /// A type object's characters.
+    #[default]
+    Text,
+    /// Whether bound objects show.
+    Visibility,
+}
+
+impl VariableKind {
+    /// Parse the `kind` of `variable.define`: `text` or `visibility` (`visible` is accepted
+    /// as the same thing, as the panel and the docs call it both).
+    pub fn parse(s: &str) -> Option<Self> {
+        match s.to_ascii_lowercase().as_str() {
+            "text" => Some(Self::Text),
+            "visibility" | "visible" => Some(Self::Visibility),
+            _ => None,
+        }
+    }
+
+    /// The kind's own name, as `variable.define` takes it and `variable.list` reports it.
+    pub fn label(self) -> &'static str {
+        match self {
+            Self::Text => "text",
+            Self::Visibility => "visibility",
+        }
+    }
+}
+
+/// One named variable.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+pub struct Variable {
+    pub name: String,
+    pub kind: VariableKind,
+}
+
+/// One value a dataset gives a variable.
+#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum DataValue {
+    Text(String),
+    Visible(bool),
+}
+
+impl DataValue {
+    /// Whether this value fits the variable's kind (a dataset may carry values for
+    /// variables of either kind; each binding takes what fits it).
+    pub fn fits(&self, kind: VariableKind) -> bool {
+        matches!((self, kind), (Self::Text(_), VariableKind::Text) | (Self::Visible(_), VariableKind::Visibility))
+    }
+}
+
+/// One named row of values, applied with `dataset.select`.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct DataSet {
+    pub name: String,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub values: BTreeMap<String, DataValue>,
+}
+
+impl DataSet {
+    /// Whether the art, as [`Document::captured_values`] read it, still holds what this row
+    /// says. A value the art can't report (its object is locked or gone) isn't drift: the row
+    /// keeps it, and applying it again would skip it too.
+    pub fn matches(&self, current: &BTreeMap<String, DataValue>) -> bool {
+        self.values.iter().all(|(k, v)| current.get(k).is_none_or(|c| c == v))
+    }
+}
+
+/// The variable state of a document: definitions, datasets, bindings
+/// (object id → the variables bound to it) and which dataset is active.
+///
+/// An object may be driven by several variables — the reference app binds the selected object
+/// to the selected variable, one click at a time, and never says a second binding replaces the
+/// first — so a binding is a set. `dataset.select` applies them in the order the variables are
+/// defined, which is what makes two text variables on one object deterministic: the last one
+/// wins, and `applied` counts both.
+#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)]
+pub struct Variables {
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub variables: Vec<Variable>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub datasets: Vec<DataSet>,
+    #[serde(default, skip_serializing_if = "BTreeMap::is_empty")]
+    pub bindings: BTreeMap<NodeId, BTreeSet<String>>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub active_dataset: Option<String>,
+}
+
+impl Variables {
+    /// The variable `name`, if the document defines it.
+    pub fn variable(&self, name: &str) -> Option<&Variable> {
+        self.variables.iter().find(|v| v.name == name)
+    }
+
+    /// The dataset `name`, if the document has it.
+    pub fn dataset(&self, name: &str) -> Option<&DataSet> {
+        self.datasets.iter().find(|d| d.name == name)
+    }
+
+    /// Bind `id` to the variable `name`. True when it was not bound to it already.
+    pub fn bind(&mut self, id: NodeId, name: &str) -> bool {
+        self.bindings.entry(id).or_default().insert(name.to_string())
+    }
+
+    /// Drop `id`'s binding to `name` (and the binding itself when that was its last variable).
+    /// True when there was one.
+    pub fn unbind(&mut self, id: NodeId, name: &str) -> bool {
+        let Some(bound) = self.bindings.get_mut(&id) else { return false };
+        let dropped = bound.remove(name);
+        if bound.is_empty() {
+            self.bindings.remove(&id);
+        }
+        dropped
+    }
+
+    /// The objects bound to the variable `name`, in document order.
+    pub fn objects_of(&self, name: &str) -> Vec<NodeId> {
+        let mut ids: Vec<NodeId> = self.bindings.iter().filter(|(_, v)| v.contains(name)).map(|(id, _)| *id).collect();
+        ids.sort_unstable();
+        ids
+    }
+
+    /// Drop the variables `names`, the dataset values that name them and the bindings to
+    /// them. Datasets named here are left alone: their names are their own namespace (the
+    /// active one is dropped by whoever deletes the dataset).
+    pub fn prune(&mut self, names: &[String]) -> usize {
+        // A set, so a long list of names costs a lookup per value rather than a scan.
+        let names: BTreeSet<&str> = names.iter().map(String::as_str).collect();
+        let before = self.variables.len();
+        self.variables.retain(|v| !names.contains(v.name.as_str()));
+        for dataset in &mut self.datasets {
+            dataset.values.retain(|k, _| !names.contains(k.as_str()));
+        }
+        for bound in self.bindings.values_mut() {
+            bound.retain(|v| !names.contains(v.as_str()));
+        }
+        self.bindings.retain(|_, v| !v.is_empty());
+        before - self.variables.len()
+    }
+}
+
+impl Document {
+    /// Forget the bindings of objects that are no longer in the document (after every edit),
+    /// like [`Document::prune_assets`] does for Asset Export's. A binding outliving its object
+    /// would count as a skip in every dataset application and grow the saved file forever.
+    pub fn prune_variable_bindings(&mut self) {
+        if self.variables.bindings.keys().all(|id| self.node(*id).is_some()) {
+            return;
+        }
+        let mut bindings = std::mem::take(&mut self.variables.bindings);
+        bindings.retain(|id, _| self.node(*id).is_some());
+        self.variables.bindings = bindings;
+    }
+
+    /// Whether a variable may read and rewrite the object `id`: it is in the document, neither
+    /// it nor anything above it is locked, and nothing above it is hidden. Its own visibility
+    /// doesn't count, as that is what a visibility variable drives: a row that hid it must be
+    /// able to show it again, and a capture must record it hidden.
+    pub fn variable_target(&self, id: NodeId) -> bool {
+        self.ancestry(id).is_some_and(|a| a.iter().all(|i| self.node(*i).is_some_and(|n| !n.locked && (n.visible || *i == id))))
+    }
+
+    /// What the object `id` holds for the variable of `kind`: its characters, or whether it
+    /// shows. `None` when the object is gone, is not of that kind, or is locked or on a hidden
+    /// or locked layer (the document's value is whatever it was left at).
+    pub fn variable_value(&self, id: NodeId, kind: VariableKind) -> Option<DataValue> {
+        if !self.variable_target(id) {
+            return None;
+        }
+        let node = self.node(id)?;
+        match (kind, &node.kind) {
+            (VariableKind::Text, NodeKind::Text(t)) => Some(DataValue::Text(t.plain_text())),
+            (VariableKind::Visibility, _) => Some(DataValue::Visible(node.visible)),
+            (VariableKind::Text, _) => None,
+        }
+    }
+
+    /// The values a dataset captured right now: what each bound object holds, in the order the
+    /// variables are defined. `dataset.capture` writes these into a new row and
+    /// `dataset.update` into the active one; the Variables panel compares the active row with
+    /// them to tell whether the art still matches what it says.
+    pub fn captured_values(&self) -> BTreeMap<String, DataValue> {
+        let mut out = BTreeMap::new();
+        for v in &self.variables.variables {
+            // An object driven by several variables of the same kind reads from the first one
+            // bound, so a capture is one value per variable and applies back the same way.
+            let value = self.variables.objects_of(&v.name).into_iter().find_map(|id| self.variable_value(id, v.kind));
+            if let Some(value) = value {
+                out.insert(v.name.clone(), value);
+            }
+        }
+        out
+    }
+}

crates/effects/Cargo.toml

@@ -10,6 +10,7 @@ workspace = true
 
 [dependencies]
 vectorcraft-geom = { workspace = true }
+vectorcraft-three-d = { workspace = true }
 vectorcraft-doc = { workspace = true }
 vectorcraft-pathops = { workspace = true }
 vectorcraft-text = { workspace = true }

crates/effects/src/bake.rs

@@ -39,7 +39,8 @@ fn clear_item_effects(item: &mut AppearanceItem) {
 
 /// Does anything in `n`'s subtree need baking?
 pub fn needs_bake(n: &Node) -> bool {
-    has_adjustment(n)
+    crate::has_revolve(n)
+        || has_adjustment(n)
         || has_crop_marks(n)
         || has_pathfinder(n)
         || has_own_paint(n)
@@ -92,6 +93,10 @@ fn bake_node(d: &mut Document, n: &Node) -> Option<Node> {
     if let Some(m) = crop_marks_art(n) {
         return Some(bake_pieces(d, m));
     }
+    if let Some(m) = crate::revolve_art(n) {
+        let m = evaluate_container(&m).unwrap_or(m);
+        return Some(bake_pieces(d, m));
+    }
     // Type, images, symbol instances and live objects: reshaped through their outlines.
     if needs_outline(n) && (has_geometry(&n.appearance.effects) || n.projection().is_some()) {
         let symbol = match &n.kind {
@@ -226,6 +231,10 @@ pub type StrokeArt<'a> = &'a mut dyn FnMut(&mut Document, &PathData, FillRule, &
 /// without transparency or effects of its own takes `n`'s place itself. Hidden fills, strokes and
 /// effects are dropped. `None` for other kinds of objects.
 pub fn expand_leaf(d: &mut Document, n: &Node, stroke_art: StrokeArt) -> Option<Node> {
+    if let Some(m) = crate::revolve::expand_revolve_art(n) {
+        let m = evaluate_container(&m).unwrap_or(m);
+        return Some(bake_pieces(d, m));
+    }
     let (g, rule, ctx, mut m) = leaf_base(n)?;
     m.appearance.effects.retain(|e| e.visible);
     let mut pieces = vec![];
@@ -289,6 +298,9 @@ pub fn expand_art(d: &mut Document, n: &mut Node, stroke_art: StrokeArt) {
 /// the members of a group keeping `n`'s id, transparency, opacity mask and raster effects. `None`
 /// when it has neither a stroke to outline nor a geometry effect, so bending first changes nothing.
 pub fn bake_appearance(n: &Node) -> Option<Node> {
+    if let Some(m) = crate::revolve_art(n) {
+        return Some(m);
+    }
     if !matches!(n.kind, NodeKind::Path { clipping: false, guide: false, .. } | NodeKind::Compound { .. }) {
         return None;
     }

crates/effects/src/lib.rs

@@ -42,6 +42,7 @@ mod marks;
 pub mod pixel;
 mod raster;
 mod reshape;
+mod revolve;
 pub mod stroke;
 mod stylize;
 mod util;
@@ -68,6 +69,7 @@ pub use marks::{CROP_MARKS, crop_marks_art, has_crop_marks};
 pub use pixel::{PIXEL_EFFECTS, PixelFx, PixelSpace};
 pub use raster::{RasterFx, outset, raster_effects};
 pub use reshape::{expand_outlined, needs_outline, outline_art, outline_text, reshape};
+pub use revolve::{REVOLVE, has_revolve, revolve_art, revolve_options, validate_revolve};
 pub use warp::{WarpStyle, warp_point};
 
 /// Catalogue entry for one effect.
@@ -122,14 +124,24 @@ fn lengths_of(id: &str) -> Lengths {
         "distort.tweak" => Lengths { always: &[], absolute: &["h", "v"] },
         "distort.transform" => always(&["moveH", "moveV"]),
         "path.offsetPath" => always(&["offset"]),
+        "threeD.revolve" => always(&["offset"]),
         "path.outlineStroke" => always(&["width"]),
         "stylize.roundCorners" | "stylize.feather" | "blur.gaussian" | "blur.smart" | "sharpen.unsharpMask" => always(&["radius"]),
         "stylize.scribble" => always(&["overlap", "strokeWidth", "spacing", "variation"]),
         "stylize.dropShadow" => always(&["x", "y", "blur"]),
         "stylize.innerGlow" | "stylize.outerGlow" => always(&["blur"]),
         "stylize.glowingEdges" => always(&["edgeWidth", "smoothness"]),
+        "brushStrokes.accentedEdges" => always(&["edgeWidth"]),
+        "brushStrokes.angledStrokes" | "brushStrokes.crosshatch" | "brushStrokes.inkOutlines" => always(&["strokeLength"]),
+        "brushStrokes.spatter" => always(&["sprayRadius"]),
+        "brushStrokes.sprayedStrokes" => always(&["strokeLength", "sprayRadius"]),
+        "brushStrokes.sumiE" => always(&["strokeWidth"]),
         "pixelate.colorHalftone" => always(&["maxRadius"]),
         "pixelate.crystallize" | "pixelate.pointillize" => always(&["cellSize"]),
+        "texture.craquelure" => always(&["crackSpacing"]),
+        "texture.mosaicTiles" => always(&["tileSize"]),
+        "texture.patchwork" => always(&["squareSize"]),
+        "texture.stainedGlass" => always(&["cellSize"]),
         _ => Lengths::default(),
     }
 }
@@ -142,8 +154,11 @@ const SHAPE: &[&str] = &["Effect", "Convert to Shape"];
 const STYLIZE: &[&str] = &["Effect", "Stylize"];
 const WARP: &[&str] = &["Effect", "Warp"];
 const BLUR: &[&str] = &["Effect", "Blur"];
+const BRUSH_STROKES: &[&str] = &["Effect", "Brush Strokes"];
+const DISTORT: &[&str] = &["Effect", "Distort"];
 const SHARPEN: &[&str] = &["Effect", "Sharpen"];
 const PIXELATE: &[&str] = &["Effect", "Pixelate"];
+const TEXTURE: &[&str] = &["Effect", "Texture"];
 const VIDEO: &[&str] = &["Effect", "Video"];
 const PATHFINDER: &[&str] = &["Effect", "Pathfinder"];
 const PLUGINS: &[&str] = &["Effect", "Plug-ins"];
@@ -173,6 +188,13 @@ pub fn effect_catalog() -> Vec<EffectInfo> {
     let g = |id, label, menu, params, defaults| EffectInfo { id, label, menu, params, defaults, raster: false, lengths: lengths_of(id) };
     let r = |id, label, menu, params, defaults| EffectInfo { id, label, menu, params, defaults, raster: true, lengths: lengths_of(id) };
     let mut v = vec![
+        g(
+            REVOLVE,
+            "Revolve…",
+            &["Effect", "3D and Materials"],
+            "{angle: degrees (0..360, 360), offset: pt (0..100000, 0), edge: left|right, rotationX: degrees (0), rotationY: degrees (0), rotationZ: degrees (0), perspective: % (0..100, 0), segments: integer (8..128, 64), shade: bool (true), lightAzimuth: degrees (-45), lightElevation: degrees (45), lightIntensity: % (80), ambient: % (25), expandVisibleOnly: bool (true, trim covered opaque solid surfaces only on Expand Appearance)}. Open paths create uncapped surfaces; intersecting profiles use approximate painter visibility.",
+            json!({"angle":360.0,"offset":0.0,"edge":"left","rotationX":0.0,"rotationY":0.0,"rotationZ":0.0,"perspective":0.0,"segments":64,"shade":true,"lightAzimuth":-45.0,"lightElevation":45.0,"lightIntensity":80.0,"ambient":25.0,"expandVisibleOnly":true}),
+        ),
         g(
             "convertToShape.rectangle",
             "Rectangle…",
@@ -264,7 +286,7 @@ pub fn effect_catalog() -> Vec<EffectInfo> {
             "stylize.innerGlow",
             "Inner Glow…",
             STYLIZE,
-            "{mode: blend mode (\"screen\"), opacity: % (75), blur: pt (5), color: \"#rrggbb\" (\"#ffffff\"), source: \"edge\"|\"center\"}",
+            "{mode: blend mode (\"screen\"), opacity: % (75), blur: pt (5), color: \"#rrggbb\" (\"#ffffff\"), source: \"center\"|\"edge\" (\"edge\")}",
             json!({"mode": "screen", "opacity": 75.0, "blur": 5.0, "color": "#ffffff", "source": "edge"}),
         ),
         r(
@@ -290,6 +312,83 @@ pub fn effect_catalog() -> Vec<EffectInfo> {
             "{radius: pt 0.1..100 (3), threshold: levels 0.1..100 (25; only colours closer than this blur together, so edges stay sharp), quality: \"low\"|\"medium\"|\"high\" (\"medium\"; 5, 7 or 9 samples across)} (Normal mode)",
             json!({"radius": 3.0, "threshold": 25.0, "quality": "medium"}),
         ),
+        r(
+            "brushStrokes.accentedEdges",
+            "Accented Edges…",
+            BRUSH_STROKES,
+            "{edgeWidth: pt 1..14 (2), edgeBrightness: 0..50 (38; high: white chalk, low: black ink), smoothness: 1..15 (5; softens the object first and leaves its faint edges out)} accentuates the object's edges",
+            json!({"edgeWidth": 2.0, "edgeBrightness": 38.0, "smoothness": 5.0}),
+        ),
+        r(
+            "brushStrokes.angledStrokes",
+            "Angled Strokes…",
+            BRUSH_STROKES,
+            "{directionBalance: 0..100 (50; 0: every stroke a left diagonal, 100: every stroke a right diagonal, between: light areas right, dark areas left), strokeLength: pt 3..50 (15), sharpness: 0..10 (3)} repaints the object with diagonal strokes, the light areas' going the opposite way to the dark areas'",
+            json!({"directionBalance": 50.0, "strokeLength": 15.0, "sharpness": 3.0}),
+        ),
+        r(
+            "brushStrokes.crosshatch",
+            "Crosshatch…",
+            BRUSH_STROKES,
+            "{strokeLength: pt 3..50 (9), sharpness: 0..20 (6), strength: 1..3 (1; passes of hatching)} keeps the object's detail under pencil hatching along both diagonals and roughens its edges",
+            json!({"strokeLength": 9.0, "sharpness": 6.0, "strength": 1.0}),
+        ),
+        r(
+            "brushStrokes.darkStrokes",
+            "Dark Strokes…",
+            BRUSH_STROKES,
+            "{balance: 0..10 (5; the higher, the more of the object counts as dark), blackIntensity: 0..10 (6), whiteIntensity: 0..10 (2)} paints the dark areas closer to black with short strokes and the light areas with long white strokes",
+            json!({"balance": 5.0, "blackIntensity": 6.0, "whiteIntensity": 2.0}),
+        ),
+        r(
+            "brushStrokes.inkOutlines",
+            "Ink Outlines…",
+            BRUSH_STROKES,
+            "{strokeLength: pt 1..50 (4), darkIntensity: 0..50 (20), lightIntensity: 0..50 (10)} redraws the object in pen and ink: fine outlines over its edges and ink strokes in its shadows",
+            json!({"strokeLength": 4.0, "darkIntensity": 20.0, "lightIntensity": 10.0}),
+        ),
+        r(
+            "brushStrokes.spatter",
+            "Spatter…",
+            BRUSH_STROKES,
+            "{sprayRadius: pt 0..25 (10; colours scattered up to 0.4 × this), smoothness: 1..15 (5; larger, smoother grains)} renders the object as if sprayed with a spatter airbrush",
+            json!({"sprayRadius": 10.0, "smoothness": 5.0}),
+        ),
+        r(
+            "brushStrokes.sprayedStrokes",
+            "Sprayed Strokes…",
+            BRUSH_STROKES,
+            "{strokeLength: pt 0..20 (12), sprayRadius: pt 0..25 (7; strokes scattered up to 0.3 × this), strokeDirection: \"rightDiagonal\"|\"horizontal\"|\"leftDiagonal\"|\"vertical\" (\"rightDiagonal\")} repaints the object with sprayed, angled strokes of its main colours",
+            json!({"strokeLength": 12.0, "sprayRadius": 7.0, "strokeDirection": "rightDiagonal"}),
+        ),
+        r(
+            "brushStrokes.sumiE",
+            "Sumi-e…",
+            BRUSH_STROKES,
+            "{strokeWidth: pt 3..15 (10), strokePressure: 0..15 (2; more ink), contrast: 0..40 (16)} paints the object in the Japanese style, as if with a wet brush full of black ink on rice paper: soft, blurred edges and rich blacks, the colours keeping their hue and the object its shape",
+            json!({"strokeWidth": 10.0, "strokePressure": 2.0, "contrast": 16.0}),
+        ),
+        r(
+            "distort.diffuseGlow",
+            "Diffuse Glow…",
+            DISTORT,
+            "{graininess: 0..10 (6; white grain, thicker in the glow), glowAmount: 0..20 (10), clearAmount: 0..20 (15; the higher, the more of the image stays clear of glow)} renders the object as if seen through a soft diffusion filter: its highlights glow white under see-through white grain",
+            json!({"graininess": 6.0, "glowAmount": 10.0, "clearAmount": 15.0}),
+        ),
+        r(
+            "distort.glass",
+            "Glass…",
+            DISTORT,
+            "{distortion: 0..20 (5), smoothness: 1..15 (3), texture: \"blocks\"|\"canvas\"|\"frosted\"|\"tinyLens\" (\"frosted\"; surfaces made in code), scaling: % 50..200 (100), invert: bool (false; turns the surface's heights over)} makes the object look as if seen through glass",
+            json!({"distortion": 5.0, "smoothness": 3.0, "texture": "frosted", "scaling": 100.0, "invert": false}),
+        ),
+        r(
+            "distort.oceanRipple",
+            "Ocean Ripple…",
+            DISTORT,
+            "{rippleSize: 1..15 (9), rippleMagnitude: 0..20 (9)} adds randomly spaced ripples, as if the object were under water",
+            json!({"rippleSize": 9.0, "rippleMagnitude": 9.0}),
+        ),
         r(
             "sharpen.unsharpMask",
             "Unsharp Mask…",
@@ -332,6 +431,48 @@ pub fn effect_catalog() -> Vec<EffectInfo> {
             "{cellSize: pt 3..300 (5)} redraws the object as randomly placed dots of its colours on a white canvas",
             json!({"cellSize": 5.0}),
         ),
+        r(
+            "texture.craquelure",
+            "Craquelure…",
+            TEXTURE,
+            "{crackSpacing: pt 2..100 (15; how far apart the cracks are), crackDepth: 0..10 (6; how deep and wide the cracks are, and how high the plates and the tones stand), crackBrightness: 0..10 (9; how brightly the plaster is lit)} paints the object on relief plaster cracked into plates and along the contours of its tones",
+            json!({"crackSpacing": 15.0, "crackDepth": 6.0, "crackBrightness": 9.0}),
+        ),
+        r(
+            "texture.grain",
+            "Grain…",
+            TEXTURE,
+            "{intensity: 0..100 (40), contrast: 0..100 (50; the image's contrast, 50 leaves it as it is), grainType: \"regular\"|\"soft\"|\"sprinkles\"|\"clumped\"|\"contrasty\"|\"enlarged\"|\"stippled\"|\"horizontal\"|\"vertical\"|\"speckle\" (\"regular\")} adds grain in 1 pt grains (2 pt Enlarged, clumps Clumped, streaks Horizontal and Vertical); Sprinkles and Stippled use the background colour, white",
+            json!({"intensity": 40.0, "contrast": 50.0, "grainType": "regular"}),
+        ),
+        r(
+            "texture.mosaicTiles",
+            "Mosaic Tiles…",
+            TEXTURE,
+            "{tileSize: pt 2..100 (12), groutWidth: 1..15 (3; the grout is half a point wide per step), lightenGrout: 0..10 (9; how light the grout is)} lays the object in irregular tiles bevelled at their edges, with sunken grout between them",
+            json!({"tileSize": 12.0, "groutWidth": 3.0, "lightenGrout": 9.0}),
+        ),
+        r(
+            "texture.patchwork",
+            "Patchwork…",
+            TEXTURE,
+            "{squareSize: pt 0..10 (4; 0 draws 1 pt squares), relief: 0..25 (8)} redraws the object in squares of the colour around their centres, raised to heights that follow its highlights and shadows, a little more or less at random, lit from the top left",
+            json!({"squareSize": 4.0, "relief": 8.0}),
+        ),
+        r(
+            "texture.stainedGlass",
+            "Stained Glass…",
+            TEXTURE,
+            "{cellSize: pt 2..50 (10), borderThickness: 1..20 (4; the lead between the panes, half a point wide per step, in the foreground colour: black), lightIntensity: 0..10 (3; a light behind the object's centre, fading out towards its corners)} redraws the object as single-coloured panes around random points about cellSize apart",
+            json!({"cellSize": 10.0, "borderThickness": 4.0, "lightIntensity": 3.0}),
+        ),
+        r(
+            "texture.texturizer",
+            "Texturizer…",
+            TEXTURE,
+            "{texture: \"brick\"|\"burlap\"|\"canvas\"|\"sandstone\" (\"canvas\"; surfaces made in code), scaling: % 50..200 (100), relief: 0..50 (4), lightDirection: \"bottom\"|\"bottomLeft\"|\"left\"|\"topLeft\"|\"top\"|\"topRight\"|\"right\"|\"bottomRight\" (\"top\"), invert: bool (false; turns the surface's heights over)} paints the object on a surface in relief",
+            json!({"texture": "canvas", "scaling": 100.0, "relief": 4.0, "lightDirection": "top", "invert": false}),
+        ),
         r(
             "video.deinterlace",
             "De-Interlace…",
@@ -520,6 +661,7 @@ pub fn is_geometry(id: &str) -> bool {
         && !is_pathfinder(id)
         && !is_adjustment(id)
         && id != CROP_MARKS
+        && id != REVOLVE
         && (catalog_index().contains_key(id) || vectorcraft_plugins::effect::plugin_id(id).is_some())
 }
 

crates/effects/src/pixel/brushstrokes.rs

@@ -0,0 +1,518 @@
+//! Effect › Brush Strokes (Accented Edges, Angled Strokes, Crosshatch, Dark Strokes, Ink Outlines,
+//! Spatter, Sprayed Strokes, Sumi-e).
+//!
+//! The stroke filters repaint the object with brush strokes: each pixel takes the object's colour
+//! averaged along a segment through it ([`Smear`], a bounded number of samples whatever the
+//! length). Strokes lie in rows across their direction, each row starting at random and each
+//! stroke shifted along itself at random, so they begin and end like separate strokes; a streaked
+//! noise along them gives them their bristle texture. Accented Edges and Ink Outlines find edges
+//! with Glowing Edges' Sobel operator over the softened object; Spatter and Sprayed Strokes shift
+//! the content by noise as Ocean Ripple does. Every pattern lies in document space around the
+//! object's centre, as the Texture filters' do.
+
+use std::f64::consts::{FRAC_1_SQRT_2, TAU};
+
+use vectorcraft_geom::{Point, Vec2};
+
+use super::distort::displace;
+use super::edges::sobel;
+use super::pixelate::{Place, cell, rand, value_noise};
+use super::texture::{Tones, luma, premultiply, smooth_noise, straight};
+use super::{PixelSpace, blur_plane, gaussian, pick, to16};
+
+const SALT_ANGLED: u64 = 144;
+const SALT_CROSS: u64 = 152;
+const SALT_DARK: u64 = 160;
+const SALT_INK: u64 = 168;
+const SALT_SPATTER: u64 = 176;
+const SALT_SPRAYED: u64 = 184;
+const SALT_SUMI: u64 = 192;
+
+/// Sprayed Strokes' stroke directions, in its Stroke Direction menu's order: (label, parameter
+/// value).
+pub const STROKE_DIRECTIONS: [(&str, &str); 4] =
+    [("Right Diagonal", "rightDiagonal"), ("Horizontal", "horizontal"), ("Left Diagonal", "leftDiagonal"), ("Vertical", "vertical")];
+
+/// The way Sprayed Strokes are painted.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum StrokeDirection {
+    RightDiagonal,
+    Horizontal,
+    LeftDiagonal,
+    Vertical,
+}
+
+impl StrokeDirection {
+    const ALL: [StrokeDirection; 4] =
+        [StrokeDirection::RightDiagonal, StrokeDirection::Horizontal, StrokeDirection::LeftDiagonal, StrokeDirection::Vertical];
+
+    /// The direction of `value` (a [`STROKE_DIRECTIONS`] value, any case); Right Diagonal
+    /// otherwise.
+    pub fn parse(value: &str) -> Self {
+        pick(&STROKE_DIRECTIONS, &Self::ALL, value, StrokeDirection::RightDiagonal)
+    }
+
+    /// The unit vector along the strokes (document axes, y down).
+    fn along(self) -> Vec2 {
+        match self {
+            StrokeDirection::RightDiagonal => RIGHT,
+            StrokeDirection::Horizontal => Vec2::new(1.0, 0.0),
+            StrokeDirection::LeftDiagonal => LEFT,
+            StrokeDirection::Vertical => Vec2::new(0.0, 1.0),
+        }
+    }
+}
+
+/// Along a right diagonal stroke, rising to the right (y down).
+const RIGHT: Vec2 = Vec2::new(FRAC_1_SQRT_2, -FRAC_1_SQRT_2);
+/// Along a left diagonal stroke, falling to the right.
+const LEFT: Vec2 = Vec2::new(FRAC_1_SQRT_2, FRAC_1_SQRT_2);
+
+/// The most samples a stroke averages, whatever its length.
+const MAX_SAMPLES: usize = 16;
+
+/// The share of its length by which a stroke is shifted along itself at random, at most.
+const JITTER: f64 = 0.25;
+
+/// How soft (points, the σ) the tones are that decide which strokes a pixel gets.
+const TONE_SOFTNESS: f64 = 1.0;
+
+/// Dark Strokes' short dark strokes and long light ones (points).
+pub(super) const DARK_LENGTH: f64 = 3.0;
+pub(super) const LIGHT_LENGTH: f64 = 9.0;
+
+/// How soft (points, the σ) Ink Outlines' outlines are.
+const INK_SOFTNESS: f64 = 0.6;
+
+/// A pixel at 72 ppi (points): how far the neighbours of the Sobel operator and of sampling
+/// between pixels add to a filter's reach.
+const MARGIN: f64 = 1.0;
+
+/// How far (document units) strokes `len` long reach: half their length, their random shift, the
+/// softening between their samples and the pixels a sample is taken between.
+pub(super) fn stroke_reach(len: f64) -> f64 {
+    let len = if len.is_finite() { len.max(0.0) } else { 0.0 };
+    (0.5 + JITTER + 1.5 / (MAX_SAMPLES - 1) as f64) * len + MARGIN
+}
+
+/// How far (document units) the tones reach that the stroke filters choose their strokes by.
+pub(super) const TONE_REACH: f64 = 3.0 * TONE_SOFTNESS + MARGIN;
+
+/// How far Sumi-e reaches with strokes `width` across: the strokes, and the wet ink bleeding from
+/// 3 σ of 0.2 × the width.
+pub(super) fn sumi_reach(width: f64) -> f64 {
+    stroke_reach(width).max(0.6 * width + MARGIN)
+}
+
+/// The σ (points) Accented Edges softens the object by before finding its edges, for Edge Width
+/// `width` (1..14) and Smoothness `smoothness` (1..15).
+pub(super) fn accent_softness(width: f64, smoothness: f64) -> f64 {
+    0.35 * width.clamp(1.0, 14.0) + 0.1 * smoothness.clamp(1.0, 15.0)
+}
+
+/// How far Accented Edges reaches for Edge Width `width` and Smoothness `smoothness`.
+pub(super) fn accent_reach(width: f64, smoothness: f64) -> f64 {
+    3.0 * accent_softness(width, smoothness) + MARGIN
+}
+
+/// How far Ink Outlines reaches with strokes `len` long.
+pub(super) fn ink_reach(len: f64) -> f64 {
+    stroke_reach(len).max(3.0 * INK_SOFTNESS + MARGIN)
+}
+
+/// How far (points) Crosshatch roughens the edges, with strokes `len` long.
+pub(super) fn rough(len: f64) -> f64 {
+    0.1 * if len.is_finite() { len.max(0.0) } else { 0.0 }
+}
+
+/// The longest shift (points) Spatter gives at Spray Radius `radius` (0..25).
+pub(super) fn spatter_shift(radius: f64) -> f64 {
+    0.4 * radius.clamp(0.0, 25.0)
+}
+
+/// The longest shift (points) Sprayed Strokes' spray gives at Spray Radius `radius` (0..25).
+pub(super) fn spray_shift(radius: f64) -> f64 {
+    0.3 * radius.clamp(0.0, 25.0)
+}
+
+/// The object's colours averaged along strokes `len` long: [`MAX_SAMPLES`] at most, the object
+/// softened first when they lie more than a pixel apart.
+struct Smear<'a> {
+    /// Premultiplied colours (0..1).
+    src: Vec<[f32; 4]>,
+    w: usize,
+    h: usize,
+    place: &'a Place,
+    len: f64,
+    n: usize,
+}
+
+impl<'a> Smear<'a> {
+    fn new(px: &[[u8; 4]], w: usize, h: usize, place: &'a Place, len: f64) -> Self {
+        let len = if len.is_finite() { len.max(0.0) } else { 0.0 };
+        let span = len / place.px;
+        let n = if span.is_finite() { (span.ceil() as usize).saturating_add(1).clamp(1, MAX_SAMPLES) } else { MAX_SAMPLES };
+        let gap = if n > 1 { span / (n - 1) as f64 } else { 0.0 };
+        let mut wide = to16(px);
+        if gap > 1.0 {
+            gaussian(&mut wide, w, 0.5 * gap);
+        }
+        let src = wide.iter().map(|p| p.map(|v| f32::from(v) / 65535.0)).collect();
+        Self { src, w, h, place, len, n }
+    }
+
+    /// The premultiplied colour (0..1) averaged along the stroke through `centre` (relative to the
+    /// object's centre) along `dir`.
+    fn at(&self, centre: Point, dir: Vec2) -> [f32; 4] {
+        let half = dir * (0.5 * self.len);
+        let (a, b) = (self.place.to_px * (centre - half), self.place.to_px * (centre + half));
+        if !(a.x.is_finite() && a.y.is_finite() && b.x.is_finite() && b.y.is_finite()) {
+            return [0.0; 4];
+        }
+        // Pixel centres at whole coordinates.
+        let (mut x, mut y, step) = match self.n {
+            0 | 1 => (0.5 * (a.x + b.x) - 0.5, 0.5 * (a.y + b.y) - 0.5, (0.0, 0.0)),
+            n => (a.x - 0.5, a.y - 0.5, ((b.x - a.x) / (n - 1) as f64, (b.y - a.y) / (n - 1) as f64)),
+        };
+        let mut acc = [0.0f32; 4];
+        for _ in 0..self.n {
+            self.add(&mut acc, x, y);
+            x += step.0;
+            y += step.1;
+        }
+        acc.map(|v| v / self.n.max(1) as f32)
+    }
+
+    /// Add the colour at (`x`, `y`) (pixel centres at whole coordinates), interpolated between the
+    /// four pixels around it, to `acc`; transparent outside.
+    fn add(&self, acc: &mut [f32; 4], x: f64, y: f64) {
+        let (x0, y0) = (x.floor(), y.floor());
+        if !(x0 >= -1.0 && y0 >= -1.0 && x0 < self.w as f64 && y0 < self.h as f64) {
+            return;
+        }
+        let (fx, fy) = ((x - x0) as f32, (y - y0) as f32);
+        let (i, j) = (x0 as isize, y0 as isize);
+        // Inside the raster: the four pixels as two pairs.
+        if i >= 0 && j >= 0 && (i as usize) + 1 < self.w && (j as usize) + 1 < self.h {
+            let at = j as usize * self.w + i as usize;
+            if let (Some([p00, p10]), Some([p01, p11])) = (self.src.get(at..at + 2), self.src.get(at + self.w..at + self.w + 2)) {
+                let (k00, k10, k01, k11) = ((1.0 - fx) * (1.0 - fy), fx * (1.0 - fy), (1.0 - fx) * fy, fx * fy);
+                for (c, a) in acc.iter_mut().enumerate() {
+                    *a += p00[c] * k00 + p10[c] * k10 + p01[c] * k01 + p11[c] * k11;
+                }
+            }
+            return;
+        }
+        for (row, wy) in [(j, 1.0 - fy), (j + 1, fy)] {
+            let Some(row) = usize::try_from(row).ok().filter(|r| *r < self.h) else { continue };
+            for (col, wx) in [(i, 1.0 - fx), (i + 1, fx)] {
+                let Some(col) = usize::try_from(col).ok().filter(|c| *c < self.w) else { continue };
+                if let Some(p) = self.src.get(row * self.w + col) {
+                    let k = wx * wy;
+                    for (a, v) in acc.iter_mut().zip(p) {
+                        *a += v * k;
+                    }
+                }
+            }
+        }
+    }
+
+    /// The stroke of pattern `salt` through `q` along `dir`, its rows `width` apart.
+    fn stroke(&self, salt: u64, q: Point, dir: Vec2, width: f64) -> [f32; 4] {
+        self.at(q + dir * stroke_shift(salt, q, dir, self.len, width), dir)
+    }
+}
+
+/// `q`'s coordinates along `dir` (unit) and across it.
+fn frame(q: Point, dir: Vec2) -> (f64, f64) {
+    (q.x * dir.x + q.y * dir.y, q.y * dir.x - q.x * dir.y)
+}
+
+/// How far along `dir` the stroke through `q` is shifted: strokes `len` long lie in rows `width`
+/// apart across `dir`, each row starting at random, each stroke shifted by up to [`JITTER`] ×
+/// `len`.
+fn stroke_shift(salt: u64, q: Point, dir: Vec2, len: f64, width: f64) -> f64 {
+    if !(len > 0.0 && width > 0.0) {
+        return 0.0;
+    }
+    let (u, v) = frame(q, dir);
+    let Some(row) = cell(v / width) else { return 0.0 };
+    let Some(col) = cell(u / len + rand(salt, row, 0, 0)) else { return 0.0 };
+    (2.0 * rand(salt, col, row, 1) - 1.0) * JITTER * len
+}
+
+/// Smooth noise in [-1, 1) streaked along `dir`: blobs `along` long and `across` wide.
+fn streak(salt: u64, q: Point, dir: Vec2, along: f64, across: f64) -> f64 {
+    let (u, v) = frame(q, dir);
+    2.0 * value_noise(salt, u / along.max(1e-3), v / across.max(1e-3)) - 1.0
+}
+
+/// The straight colour and coverage of premultiplied `pm` (0..1).
+fn unpremultiply(pm: [f32; 4]) -> ([f32; 3], f32) {
+    let a = pm[3].clamp(0.0, 1.0);
+    if a > 1e-6 { ([pm[0], pm[1], pm[2]].map(|v| (v / a).clamp(0.0, 1.0)), a) } else { ([0.0; 3], 0.0) }
+}
+
+/// `a` + (`b` − `a`) × `t`, channel by channel.
+fn mix<const N: usize>(a: [f32; N], b: [f32; N], t: f32) -> [f32; N] {
+    std::array::from_fn(|k| a[k] + (b[k] - a[k]) * t)
+}
+
+/// A smooth step from 0 at `t` ≤ 0 to 1 at `t` ≥ 1.
+fn ramp(t: f64) -> f64 {
+    let t = if t.is_finite() { t.clamp(0.0, 1.0) } else { 0.0 };
+    t * t * (3.0 - 2.0 * t)
+}
+
+/// Pixel `p` (premultiplied 0..255) as premultiplied 0..1.
+fn unit(p: [u8; 4]) -> [f32; 4] {
+    p.map(|v| f32::from(v) / 255.0)
+}
+
+/// The object's edges after softening it by `sigma` (document units): about 1 across a step from
+/// black to white or from clear to opaque, the same at any resolution. Empty when the sizes don't
+/// match.
+fn edges(px: &[[u8; 4]], w: usize, h: usize, place: &Place, sigma: f64) -> Vec<f32> {
+    let mut tone: Vec<f32> = px.iter().map(|p| luma(straight(*p)) * f32::from(p[3]) / 255.0).collect();
+    let mut cover: Vec<f32> = px.iter().map(|p| f32::from(p[3]) / 255.0).collect();
+    let s = sigma / place.px;
+    blur_plane(&mut tone, w, h, s);
+    blur_plane(&mut cover, w, h, s);
+    // A step softened by σ pixels rises by 1 / (σ √(2π)) per pixel at most, and Sobel gives 8 ×
+    // the slope; a pixel is the least it softens by.
+    let norm = (s.max(0.8) * TAU.sqrt() / 8.0) as f32;
+    let norm = if norm.is_finite() { norm } else { 0.0 };
+    sobel(&tone, w, h).iter().zip(sobel(&cover, w, h)).map(|(t, c)| t.max(c) * norm).collect()
+}
+
+/// Accented Edges: the object's edges accented in white chalk when `brightness` (0..50) is high,
+/// in black ink when it's low, about `width` (1..14) wide; `smoothness` (1..15) softens the object
+/// first and leaves out its fainter edges.
+pub(super) fn accented_edges(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, width: f64, brightness: f64, smoothness: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let found = edges(px, w, h, &place, accent_softness(width, smoothness));
+    let faint = (0.02 * smoothness.clamp(1.0, 15.0)) as f32;
+    let level = (brightness / 50.0).clamp(0.0, 1.0) as f32;
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let e = found.get(y * w + x).copied().unwrap_or(0.0);
+        let e = (2.5 * (e - faint) / (1.0 - faint)).clamp(0.0, 1.0);
+        let c = straight(*p);
+        // Chalk or ink of the brightness level, a little of the colour showing through.
+        let accent = c.map(|v| 0.9 * level + 0.1 * v);
+        *p = premultiply(mix(c, accent, e), f32::from(p[3]) / 255.0);
+    });
+}
+
+/// Angled Strokes: the object repainted in diagonal strokes `len` long, light areas in right
+/// diagonal strokes and dark areas in left diagonal ones; `balance` (0..100) moves the split
+/// (0 all left diagonal, 100 all right diagonal) and `sharpness` (0..10) brings the detail and
+/// the bristles out.
+pub(super) fn angled_strokes(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, balance: f64, len: f64, sharpness: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let smear = Smear::new(px, w, h, &place, len);
+    let tones = Tones::new(px, w, h, TONE_SOFTNESS / place.px);
+    let split = 1.07 - 1.14 * (balance / 100.0).clamp(0.0, 1.0);
+    let sharp = sharpness.clamp(0.0, 10.0);
+    let (detail, bristle) = ((0.05 * sharp) as f32, 0.03 + 0.012 * sharp);
+    let row = (0.2 * smear.len).max(1.0);
+    let src = px.to_vec();
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        // The split between the directions wanders along the strokes, so they interlock.
+        let right = tones.get(x, y) > split + 0.06 * streak(SALT_ANGLED + 3, q, RIGHT, row, row);
+        let (dir, salt) = if right { (RIGHT, SALT_ANGLED) } else { (LEFT, SALT_ANGLED + 1) };
+        let pm = smear.stroke(salt, q, dir, row);
+        let pm = mix(pm, unit(src.get(y * w + x).copied().unwrap_or([0; 4])), detail);
+        let (c, a) = unpremultiply(pm);
+        let n = (bristle * streak(SALT_ANGLED + 2, q, dir, 0.5 * smear.len.max(1.0), 0.6)) as f32;
+        *p = premultiply(c.map(|v| v + n), a);
+    });
+}
+
+/// Crosshatch: the object's detail kept under pencil hatching along both diagonals, strokes `len`
+/// long, roughening its edges; `sharpness` (0..20) sets how crisp and dark the hatching is,
+/// `passes` (1..3) how many layers of it there are.
+pub(super) fn crosshatch(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, len: f64, sharpness: f64, passes: u32) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let smear = Smear::new(px, w, h, &place, len);
+    let tones = Tones::new(px, w, h, TONE_SOFTNESS / place.px);
+    let sharp = sharpness.clamp(0.0, 20.0);
+    let (amount, crisp) = (0.05 + 0.01 * sharp, 1.0 + 0.3 * sharp);
+    let row = (0.2 * smear.len).max(1.0);
+    let roughen = rough(smear.len);
+    let src = px.to_vec();
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let line = |k: u32| {
+            let dir = if k.is_multiple_of(2) { RIGHT } else { LEFT };
+            streak(SALT_CROSS + u64::from(k), q, dir, smear.len.max(1.0), 0.7 + 0.3 * f64::from(k))
+        };
+        let first = line(0);
+        // The edges roughened along the first hatching.
+        let o = q + RIGHT * (roughen * first);
+        let strokes = mix(smear.stroke(SALT_CROSS + 4, o, RIGHT, row), smear.stroke(SALT_CROSS + 5, o, LEFT, row), 0.5);
+        let pm = mix(unit(src.get(y * w + x).copied().unwrap_or([0; 4])), strokes, 0.5);
+        let (mut c, a) = unpremultiply(pm);
+        if a <= 0.0 {
+            *p = [0; 4];
+            return;
+        }
+        let shade = 1.3 - tones.get(x, y);
+        for k in 0..passes.clamp(1, 3) {
+            let v = (if k == 0 { first } else { line(k) } * crisp).clamp(-1.0, 1.0);
+            // Dark pencil lines and the light paper between them.
+            let s = if v > 0.0 { -(amount * v * shade) } else { -0.6 * amount * v };
+            let s = s.clamp(-1.0, 1.0) as f32;
+            c = c.map(|v| if s < 0.0 { v * (1.0 + s) } else { v + (1.0 - v) * s });
+        }
+        *p = premultiply(c, a);
+    });
+}
+
+/// Dark Strokes: dark areas painted closer to black with short strokes, light areas with long
+/// strokes closer to white; `balance` (0..10) moves the tone between them up, `black` (0..10) and
+/// `white` (0..10) set how dark and how light they get.
+pub(super) fn dark_strokes(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, balance: f64, black: f64, white: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let short = Smear::new(px, w, h, &place, DARK_LENGTH);
+    let long = Smear::new(px, w, h, &place, LIGHT_LENGTH);
+    let tones = Tones::new(px, w, h, TONE_SOFTNESS / place.px);
+    let split = 0.15 + 0.07 * balance.clamp(0.0, 10.0);
+    let (black, white) = (0.085 * black.clamp(0.0, 10.0), 0.085 * white.clamp(0.0, 10.0));
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let dark = 1.0 - ramp((tones.get(x, y) - split) / 0.12 + 0.5);
+        let painted = |light: bool| {
+            let (smear, dir, salt) = if light { (&long, RIGHT, SALT_DARK) } else { (&short, LEFT, SALT_DARK + 1) };
+            let (c, a) = unpremultiply(smear.stroke(salt, q, dir, 1.0));
+            let n = 0.7 + 0.3 * streak(salt + 2, q, dir, 0.5 * smear.len, 0.5);
+            let c = if light {
+                let s = (white * n).clamp(0.0, 1.0) as f32;
+                c.map(|v| v + (1.0 - v) * s)
+            } else {
+                let s = (black * n).clamp(0.0, 1.0) as f32;
+                c.map(|v| v * (1.0 - s))
+            };
+            [c[0] * a, c[1] * a, c[2] * a, a]
+        };
+        let pm = if dark >= 1.0 {
+            painted(false)
+        } else if dark <= 0.0 {
+            painted(true)
+        } else {
+            mix(painted(true), painted(false), dark as f32)
+        };
+        let (c, a) = unpremultiply(pm);
+        *p = premultiply(c, a);
+    });
+}
+
+/// Ink Outlines: the object redrawn in pen and ink, fine outlines over its edges and ink strokes
+/// `len` long in its shadows; `dark` (0..50) darkens the shadows, `light` (0..50) lightens the
+/// highlights.
+pub(super) fn ink_outlines(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, len: f64, dark: f64, light: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let smear = Smear::new(px, w, h, &place, len);
+    let found = edges(px, w, h, &place, INK_SOFTNESS);
+    let (dark, light) = ((dark / 50.0).clamp(0.0, 1.0), (light / 50.0).clamp(0.0, 1.0));
+    let row = (0.25 * smear.len).max(0.75);
+    let src = px.to_vec();
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let pm = mix(unit(src.get(y * w + x).copied().unwrap_or([0; 4])), smear.stroke(SALT_INK, q, LEFT, row), 0.5);
+        let (c, a) = unpremultiply(pm);
+        if a <= 0.0 {
+            *p = [0; 4];
+            return;
+        }
+        let l = f64::from(luma(c));
+        let (shadow, highlight) = (((0.75 - l) / 0.75).clamp(0.0, 1.0), ((l - 0.45) / 0.55).clamp(0.0, 1.0));
+        let (down, up) = ((0.7 * dark * shadow) as f32, (0.7 * light * highlight) as f32);
+        let c = c.map(|v| v * (1.0 - down)).map(|v| v + (1.0 - v) * up);
+        // Ink lines along the strokes in the shadows, and the outlines.
+        let hatch = ramp(2.0 * streak(SALT_INK + 1, q, LEFT, 1.5 * smear.len.max(1.0), 0.5) + 0.2) * shadow * (0.4 + 1.2 * dark);
+        let outline = (1.5 * f64::from(found.get(y * w + x).copied().unwrap_or(0.0)) - 0.15).clamp(0.0, 1.0);
+        let ink = (0.9 * outline).max(0.8 * hatch).min(1.0) as f32;
+        *p = premultiply(c.map(|v| v * (1.0 - ink)), a);
+    });
+}
+
+/// Spatter: the object as if sprayed with a spatter airbrush, each pixel taking the colour of one
+/// up to [`spatter_shift`] away; `smoothness` (1..15) makes the spatter's grains larger and
+/// smoother.
+pub(super) fn spatter(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, radius: f64, smoothness: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let grain = 0.3 + 0.15 * smoothness.clamp(1.0, 15.0);
+    let most = spatter_shift(radius);
+    displace(px, w, h, &place, most, |q| {
+        let n = |salt: u64| 0.6 * smooth_noise(salt, q, grain) + 0.4 * smooth_noise(salt + 2, q, 0.4 * grain);
+        Vec2::new(n(SALT_SPATTER), n(SALT_SPATTER + 1)) * (1.8 * most)
+    });
+}
+
+/// Sprayed Strokes: the object repainted in sprayed strokes `len` long along `dir`, scattered by
+/// up to [`spray_shift`].
+pub(super) fn sprayed_strokes(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, len: f64, radius: f64, dir: StrokeDirection) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let smear = Smear::new(px, w, h, &place, len);
+    let (dir, spray) = (dir.along(), spray_shift(radius));
+    let along = (0.5 * smear.len).max(0.5);
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let n = |salt: u64| streak(salt, q, dir, along, 0.5);
+        let mut d = Vec2::new(n(SALT_SPRAYED), n(SALT_SPRAYED + 1)) * (1.6 * spray);
+        let l = d.hypot();
+        if l > spray && l.is_finite() {
+            d *= spray / l;
+        }
+        let (c, a) = unpremultiply(smear.stroke(SALT_SPRAYED + 2, q + d, dir, (0.2 * smear.len).max(1.0)));
+        *p = premultiply(c, a);
+    });
+}
+
+/// Sumi-e: the object as if painted with a wet brush on rice paper, in strokes `width` (3..15)
+/// across with soft, bleeding edges and rich blacks; `pressure` (0..15) loads the brush with more
+/// ink and `contrast` (0..40) sets the contrast. It works in the ink (the value): the colours keep
+/// their hue and saturation, and the object keeps its shape.
+pub(super) fn sumi_e(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, width: f64, pressure: f64, contrast: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let smear = Smear::new(px, w, h, &place, width);
+    // The ink around each pixel: the object's darkness by its coverage, softened.
+    let mut wet: Vec<f32> = px.iter().map(|p| (1.0 - luma(straight(*p))) * f32::from(p[3]) / 255.0).collect();
+    blur_plane(&mut wet, w, h, 0.2 * smear.len / place.px);
+    let load = 1.0 + 0.06 * pressure.clamp(0.0, 15.0);
+    // How far the ink moves along an S curve: up to once at 20, twice at 40.
+    let gain = contrast.clamp(0.0, 40.0) / 20.0;
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let q = place.at(x, y);
+        let (c, a) = unpremultiply(smear.stroke(SALT_SUMI, q, LEFT, (0.3 * smear.len).max(1.0)));
+        // Where the stroke brings no paint, the pixel's own colour.
+        let c = if a > 0.0 { c } else { straight(*p) };
+        let l = f64::from(luma(c));
+        // The ink bleeds into the paper around the darks, along its fibres.
+        let bleed = 0.85 * f64::from(wet.get(y * w + x).copied().unwrap_or(0.0));
+        let fibre = 1.0 + 0.1 * streak(SALT_SUMI + 1, q, Vec2::new(1.0, 0.0), 2.0, 0.35);
+        let mut ink = ((1.0 - l).max(bleed) * load * fibre).clamp(0.0, 1.0);
+        let mut left = gain;
+        while left > 0.0 {
+            ink += (ramp(ink) - ink) * left.min(1.0);
+            left -= 1.0;
+        }
+        let tone = (1.0 - ink).clamp(0.0, 1.0);
+        // Darker towards black, lighter towards the paper's white: the hue stays.
+        let out = if tone <= l {
+            let k = if l > 1e-3 { (tone / l) as f32 } else { 0.0 };
+            c.map(|v| v * k)
+        } else {
+            let k = ((tone - l) / (1.0 - l).max(1e-3)).clamp(0.0, 1.0) as f32;
+            c.map(|v| v + (1.0 - v) * k)
+        };
+        *p = premultiply(out, f32::from(p[3]) / 255.0);
+    });
+}

crates/effects/src/pixel/distort.rs

@@ -0,0 +1,200 @@
+//! Effect › Distort (Diffuse Glow, Glass, Ocean Ripple).
+//!
+//! Glass and Ocean Ripple move each pixel's content by a shift that a surface decides (the slope
+//! of Glass's texture, smooth noise for the ripples), sampling the object bilinearly. The shift is
+//! capped, so the object reaches no farther than [`glass_shift`] or [`ripple_shift`] past its
+//! bounds. Diffuse Glow brightens the object's highlights towards white and sprinkles it with
+//! white grain. Every surface lies in document space around the object's centre, as the Texture
+//! filters' do.
+
+use vectorcraft_geom::{Point, Vec2};
+
+use super::pixelate::{Place, value_noise};
+use super::texture::{Texture, cell_noise, luma, premultiply, smooth_noise, straight};
+use super::{PixelSpace, blur_plane, pick};
+
+const SALT_GLOW: u64 = 120;
+const SALT_FROST: u64 = 128;
+const SALT_RIPPLE: u64 = 136;
+
+/// Glass's surfaces, in its Texture menu's order: (label, parameter value).
+pub const GLASS_TEXTURES: [(&str, &str); 4] = [("Blocks", "blocks"), ("Canvas", "canvas"), ("Frosted", "frosted"), ("Tiny Lens", "tinyLens")];
+
+/// A Glass surface.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum GlassTexture {
+    Blocks,
+    Canvas,
+    Frosted,
+    TinyLens,
+}
+
+impl GlassTexture {
+    const ALL: [GlassTexture; 4] = [GlassTexture::Blocks, GlassTexture::Canvas, GlassTexture::Frosted, GlassTexture::TinyLens];
+
+    /// The surface of `value` (a [`GLASS_TEXTURES`] value, any case); Frosted otherwise.
+    pub fn parse(value: &str) -> Self {
+        pick(&GLASS_TEXTURES, &Self::ALL, value, GlassTexture::Frosted)
+    }
+
+    /// The surface's height at `p` (points at 100 %), in points: slopes of about 1 at most.
+    fn height(self, p: Point) -> f64 {
+        match self {
+            GlassTexture::Blocks => blocks(p),
+            GlassTexture::Canvas => Texture::Canvas.height(p),
+            GlassTexture::Frosted => frosted(p),
+            GlassTexture::TinyLens => tiny_lens(p),
+        }
+    }
+}
+
+/// Square glass blocks 10 points across, flat on top with 2.5-point bevels.
+fn blocks(p: Point) -> f64 {
+    const SIZE: f64 = 10.0;
+    const BEVEL: f64 = 2.5;
+    let to_edge = |v: f64| {
+        let t = v.rem_euclid(SIZE);
+        t.min(SIZE - t)
+    };
+    to_edge(p.x).min(to_edge(p.y)).min(BEVEL)
+}
+
+/// Frosted glass: two octaves of fine smooth noise (1.2 and 0.5 points).
+fn frosted(p: Point) -> f64 {
+    0.8 * value_noise(SALT_FROST, p.x / 1.2, p.y / 1.2) + 0.2 * value_noise(SALT_FROST + 1, p.x / 0.5, p.y / 0.5)
+}
+
+/// Tiny lenses 4 points across in rows and columns, each a shallow dome.
+fn tiny_lens(p: Point) -> f64 {
+    const SIZE: f64 = 4.0;
+    let r = 0.5 * SIZE;
+    let off = |v: f64| v.rem_euclid(SIZE) - r;
+    let d2 = off(p.x).powi(2) + off(p.y).powi(2);
+    0.5 * r * (1.0 - d2 / (r * r)).max(0.0)
+}
+
+/// The longest shift (points) Glass gives at `distortion` (0..20).
+pub(super) fn glass_shift(distortion: f64) -> f64 {
+    0.5 * distortion.clamp(0.0, 20.0)
+}
+
+/// The ripples' size (points) for Ripple Size `size` (1..15).
+fn ripple_wave(size: f64) -> f64 {
+    2.0 + size.clamp(1.0, 15.0)
+}
+
+/// The longest shift (points) Ocean Ripple gives for Ripple Size `size` (1..15) and Ripple
+/// Magnitude `magnitude` (0..20).
+pub(super) fn ripple_shift(size: f64, magnitude: f64) -> f64 {
+    0.03 * magnitude.clamp(0.0, 20.0) * ripple_wave(size)
+}
+
+/// How far (points) Diffuse Glow spreads the highlights (the σ of their blur).
+pub(super) const GLOW_SPREAD: f64 = 2.0;
+
+/// Glass: the object seen through a `texture` surface scaled by `scaling` (0.5..2), bent by
+/// `distortion` (0..20) and smoothed by `smoothness` (1..15); `invert` turns the surface's heights
+/// over.
+#[allow(clippy::too_many_arguments)] // the effect's five options
+pub(super) fn glass(
+    px: &mut [[u8; 4]],
+    w: usize,
+    h: usize,
+    space: &PixelSpace,
+    distortion: f64,
+    smoothness: f64,
+    texture: GlassTexture,
+    scaling: f64,
+    invert: bool,
+) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    if !(scaling.is_finite() && scaling > 0.0 && smoothness.is_finite()) {
+        return;
+    }
+    // Slopes over a quarter point of the surface per step of Smoothness, or half a pixel where
+    // pixels are larger: a smoother glass bends the image more gently.
+    let step = (0.25 * smoothness.clamp(1.0, 15.0)).max(0.5 * place.px / scaling);
+    let gain = 0.25 * distortion.clamp(0.0, 20.0) * if invert { -1.0 } else { 1.0 };
+    displace(px, w, h, &place, glass_shift(distortion), |q| {
+        let t = Point::new(q.x / scaling, q.y / scaling);
+        let at = |dx: f64, dy: f64| texture.height(Point::new(t.x + dx, t.y + dy));
+        Vec2::new(at(step, 0.0) - at(-step, 0.0), at(0.0, step) - at(0.0, -step)) * (gain / (2.0 * step))
+    });
+}
+
+/// Ocean Ripple: the object as if under rippling water, ripples about `size` (1..15) points plus
+/// two across, shifting it by up to [`ripple_shift`].
+pub(super) fn ocean_ripple(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, size: f64, magnitude: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let (wave, most) = (ripple_wave(size), ripple_shift(size, magnitude));
+    displace(px, w, h, &place, most, |q| {
+        let n = |salt: u64| 0.7 * smooth_noise(salt, q, wave) + 0.3 * smooth_noise(salt + 2, q, 0.5 * wave);
+        Vec2::new(n(SALT_RIPPLE), n(SALT_RIPPLE + 1)) * most
+    });
+}
+
+/// Diffuse Glow: the object as seen through a soft diffusion filter. Its highlights, softened over
+/// [`GLOW_SPREAD`], glow white as strongly as `glow` (0..20) says, from the brightness that
+/// `clear` (0..20) leaves clear of glow; white grain as dense as `graininess` (0..10) says is
+/// sprinkled over it, thicker in the glow.
+pub(super) fn diffuse_glow(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, graininess: f64, glow: f64, clear: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let mut light: Vec<f32> = px.iter().map(|p| luma(straight(*p)) * f32::from(p[3]) / 255.0).collect();
+    blur_plane(&mut light, w, h, GLOW_SPREAD / place.px);
+    let amount = (glow / 20.0).clamp(0.0, 1.0) as f32;
+    let from = (0.9 * clear / 20.0).clamp(0.0, 0.9) as f32;
+    let grain = (graininess / 10.0).clamp(0.0, 1.0);
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let g = ((light.get(y * w + x).copied().unwrap_or(0.0) - from) / (1.0 - from)).clamp(0.0, 1.0);
+        let chance = 0.5 * (cell_noise(SALT_GLOW, place.at(x, y), 1.0, 0) + 1.0);
+        let dot = if chance < grain * (0.08 + 0.32 * f64::from(g)) { 0.55 } else { 0.0 };
+        let white = (amount * g + dot).min(1.0);
+        *p = premultiply(straight(*p).map(|v| v + (1.0 - v) * white), f32::from(p[3]) / 255.0);
+    });
+}
+
+/// Move the object's content by `shift(q)` (document units; `q` a pixel's centre relative to the
+/// object's centre, its length capped at `most`): each pixel takes the colour `shift` away from it,
+/// interpolated between pixels, transparent beyond the raster.
+pub(super) fn displace(px: &mut [[u8; 4]], w: usize, h: usize, place: &Place, most: f64, shift: impl Fn(Point) -> Vec2) {
+    if !(most.is_finite() && most > 0.0) {
+        return;
+    }
+    let src = px.to_vec();
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let d = shift(q);
+        if !(d.x.is_finite() && d.y.is_finite()) {
+            return;
+        }
+        let len = d.hypot();
+        let d = if len > most { d * (most / len) } else { d };
+        let s = place.to_px * (q + d);
+        *p = sample(&src, w, h, s.x - 0.5, s.y - 0.5);
+    });
+}
+
+/// The premultiplied colour at (`x`, `y`) of `w` × `h` pixels (pixel centres at whole
+/// coordinates), interpolated between the four around it, transparent outside.
+fn sample(src: &[[u8; 4]], w: usize, h: usize, x: f64, y: f64) -> [u8; 4] {
+    if !(x.is_finite() && y.is_finite()) {
+        return [0; 4];
+    }
+    let (x0, y0) = (x.floor(), y.floor());
+    let (fx, fy) = (x - x0, y - y0);
+    let at = |i: f64, j: f64| -> [f64; 4] {
+        if i < 0.0 || j < 0.0 || i >= w as f64 || j >= h as f64 {
+            return [0.0; 4];
+        }
+        src.get(j as usize * w + i as usize).map_or([0.0; 4], |p| p.map(f64::from))
+    };
+    let (a, b, c, d) = (at(x0, y0), at(x0 + 1.0, y0), at(x0, y0 + 1.0), at(x0 + 1.0, y0 + 1.0));
+    std::array::from_fn(|k| {
+        let top = a[k] + (b[k] - a[k]) * fx;
+        let bottom = c[k] + (d[k] - c[k]) * fx;
+        (top + (bottom - top) * fy).round().clamp(0.0, 255.0) as u8
+    })
+}

crates/effects/src/pixel/edges.rs

@@ -21,38 +21,20 @@ pub(super) fn glow(px: &mut [[u8; 4]], w: usize, h: usize, width: f64, brightnes
             if alpha > 0.0 { [f32::from(p[0]) / 255.0 / alpha, f32::from(p[1]) / 255.0 / alpha, f32::from(p[2]) / 255.0 / alpha] } else { [0.0; 3] };
         (straight, alpha)
     };
-    let signal = |x: isize, y: isize| {
-        let (rgb, alpha) = pixel(x, y);
-        (0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2]) * alpha
-    };
-    let mut edges = vec![0.0f32; px.len()];
+    let signal: Vec<f32> = (0..px.len())
+        .map(|i| {
+            let (rgb, alpha) = pixel((i % w) as isize, (i / w) as isize);
+            (0.2126 * rgb[0] + 0.7152 * rgb[1] + 0.0722 * rgb[2]) * alpha
+        })
+        .collect();
+    let coverage: Vec<f32> = src.iter().map(|p| f32::from(p[3]) / 255.0).collect();
+    let mut edges: Vec<f32> = sobel(&signal, w, h).iter().zip(sobel(&coverage, w, h)).map(|(s, a)| s.max(a).clamp(0.0, 1.0)).collect();
     let mut colours: [Vec<f32>; 3] = std::array::from_fn(|_| vec![0.0; px.len()]);
-    for y in 0..h {
-        for x in 0..w {
-            let x = x as isize;
-            let y = y as isize;
-            let gx = -signal(x - 1, y - 1) + signal(x + 1, y - 1) - 2.0 * signal(x - 1, y) + 2.0 * signal(x + 1, y) - signal(x - 1, y + 1)
-                + signal(x + 1, y + 1);
-            let gy = -signal(x - 1, y - 1) - 2.0 * signal(x, y - 1) - signal(x + 1, y - 1)
-                + signal(x - 1, y + 1)
-                + 2.0 * signal(x, y + 1)
-                + signal(x + 1, y + 1);
-            let alpha_signal = |x, y| pixel(x, y).1;
-            let agx = -alpha_signal(x - 1, y - 1) + alpha_signal(x + 1, y - 1) - 2.0 * alpha_signal(x - 1, y) + 2.0 * alpha_signal(x + 1, y)
-                - alpha_signal(x - 1, y + 1)
-                + alpha_signal(x + 1, y + 1);
-            let agy = -alpha_signal(x - 1, y - 1) - 2.0 * alpha_signal(x, y - 1) - alpha_signal(x + 1, y - 1)
-                + alpha_signal(x - 1, y + 1)
-                + 2.0 * alpha_signal(x, y + 1)
-                + alpha_signal(x + 1, y + 1);
-            let index = y as usize * w + x as usize;
-            let edge = gx.hypot(gy).max(agx.hypot(agy)).clamp(0.0, 1.0);
-            if let Some(value) = edges.get_mut(index) {
-                *value = edge;
-                let (rgb, alpha) = pixel(x, y);
-                for channel in 0..3 {
-                    colours[channel][index] = rgb[channel] * alpha * edge;
-                }
+    for (index, edge) in edges.iter().enumerate() {
+        let (rgb, alpha) = pixel((index % w) as isize, (index / w) as isize);
+        for (colour, v) in colours.iter_mut().zip(rgb) {
+            if let Some(c) = colour.get_mut(index) {
+                *c = v * alpha * edge;
             }
         }
     }
@@ -85,3 +67,25 @@ pub(super) fn glow(px: &mut [[u8; 4]], w: usize, h: usize, width: f64, brightnes
         ];
     }
 }
+
+/// The Sobel gradient's length over a `w` × `h` plane of values (zero beyond its edges): 8 × the
+/// slope per pixel on a ramp, 4 × the step at a sharp edge. Empty when the sizes don't match.
+pub(super) fn sobel(v: &[f32], w: usize, h: usize) -> Vec<f32> {
+    if w == 0 || w.checked_mul(h) != Some(v.len()) {
+        return Vec::new();
+    }
+    let at = |x: usize, dx: isize, y: usize, dy: isize| -> f32 {
+        match (x.checked_add_signed(dx), y.checked_add_signed(dy)) {
+            (Some(x), Some(y)) if x < w && y < h => v.get(y * w + x).copied().unwrap_or(0.0),
+            _ => 0.0,
+        }
+    };
+    (0..v.len())
+        .map(|i| {
+            let (x, y) = (i % w, i / w);
+            let gx = at(x, 1, y, -1) - at(x, -1, y, -1) + 2.0 * (at(x, 1, y, 0) - at(x, -1, y, 0)) + at(x, 1, y, 1) - at(x, -1, y, 1);
+            let gy = at(x, -1, y, 1) - at(x, -1, y, -1) + 2.0 * (at(x, 0, y, 1) - at(x, 0, y, -1)) + at(x, 1, y, 1) - at(x, 1, y, -1);
+            gx.hypot(gy)
+        })
+        .collect()
+}

crates/effects/src/pixel/mod.rs

@@ -1,6 +1,9 @@
-//! Photoshop-style raster effects (Effect › Blur › Radial Blur and Smart Blur, Pixelate › Color
-//! Halftone, Crystallize, Mezzotint and Pointillize, Sharpen › Unsharp Mask, Stylize › Glowing
-//! Edges, and Video › De-Interlace and NTSC Colors): filters over premultiplied RGBA8 pixels.
+//! Photoshop-style raster effects (Effect › Blur › Radial Blur and Smart Blur, Brush Strokes ›
+//! Accented Edges, Angled Strokes, Crosshatch, Dark Strokes, Ink Outlines, Spatter, Sprayed Strokes
+//! and Sumi-e, Distort › Diffuse Glow, Glass and Ocean Ripple, Pixelate › Color Halftone,
+//! Crystallize, Mezzotint and Pointillize, Sharpen › Unsharp Mask, Stylize › Glowing Edges, Texture
+//! › Craquelure, Grain, Mosaic Tiles, Patchwork, Stained Glass and Texturizer, and Video ›
+//! De-Interlace and NTSC Colors): filters over premultiplied RGBA8 pixels.
 //!
 //! - Every distance is in document units (points) and becomes pixels through the raster's
 //!   [`PixelSpace::px`], so an effect looks the same at any zoom and at any Document Raster Effects
@@ -10,28 +13,51 @@
 //! - Beyond the raster's edges is transparency.
 
 mod blur;
+mod brushstrokes;
+mod distort;
 mod edges;
 mod pixelate;
 mod sharpen;
+mod texture;
 mod video;
 
 use serde_json::Value;
 use vectorcraft_geom::{Affine, Point, Rect};
 
-use crate::util::{num, text};
+use crate::util::{flag, num, text};
 
+pub use brushstrokes::{STROKE_DIRECTIONS, StrokeDirection};
+pub use distort::{GLASS_TEXTURES, GlassTexture};
 pub use pixelate::{MEZZOTINT_TYPES, Mezzotint};
+pub use texture::{GRAIN_TYPES, Grain, LIGHT_DIRECTIONS, Light, TEXTURES, Texture};
 
 /// The Photoshop-style effect ids (all raster effects, see [`crate::is_raster`]).
-pub const PIXEL_EFFECTS: [&str; 10] = [
+pub const PIXEL_EFFECTS: [&str; 27] = [
     "blur.radial",
     "blur.smart",
+    "brushStrokes.accentedEdges",
+    "brushStrokes.angledStrokes",
+    "brushStrokes.crosshatch",
+    "brushStrokes.darkStrokes",
+    "brushStrokes.inkOutlines",
+    "brushStrokes.spatter",
+    "brushStrokes.sprayedStrokes",
+    "brushStrokes.sumiE",
+    "distort.diffuseGlow",
+    "distort.glass",
+    "distort.oceanRipple",
     "pixelate.colorHalftone",
     "pixelate.crystallize",
     "pixelate.mezzotint",
     "pixelate.pointillize",
     "sharpen.unsharpMask",
     "stylize.glowingEdges",
+    "texture.craquelure",
+    "texture.grain",
+    "texture.mosaicTiles",
+    "texture.patchwork",
+    "texture.stainedGlass",
+    "texture.texturizer",
     "video.deinterlace",
     "video.ntscColors",
 ];
@@ -47,6 +73,42 @@ pub enum PixelFx {
     /// whose colour differs from its own by no more than `threshold` levels, over a grid of
     /// `samples` × `samples` neighbours at most.
     SmartBlur { radius: f64, threshold: f64, samples: u32 },
+    /// Brush Strokes › Accented Edges: the edges, about `width` (1..14) wide, accented towards
+    /// white chalk or black ink as `brightness` (0..50) says; `smoothness` (1..15) softens them.
+    AccentedEdges { width: f64, brightness: f64, smoothness: f64 },
+    /// Brush Strokes › Angled Strokes: diagonal strokes `length` long, the light areas' and the
+    /// dark areas' going opposite ways, split as `balance` (0..100) says, as crisp as `sharpness`
+    /// (0..10).
+    AngledStrokes { balance: f64, length: f64, sharpness: f64 },
+    /// Brush Strokes › Crosshatch: pencil hatching `length` long along both diagonals, as crisp
+    /// as `sharpness` (0..20), in `strength` (1..3) passes.
+    Crosshatch { length: f64, sharpness: f64, strength: u32 },
+    /// Brush Strokes › Dark Strokes: short strokes towards black in the dark areas, long ones
+    /// towards white in the light areas, split by `balance` (0..10), as dark as `black` (0..10)
+    /// and as light as `white` (0..10).
+    DarkStrokes { balance: f64, black: f64, white: f64 },
+    /// Brush Strokes › Ink Outlines: pen-and-ink outlines and strokes `length` long, the shadows
+    /// darkened by `dark` (0..50) and the highlights lightened by `light` (0..50).
+    InkOutlines { length: f64, dark: f64, light: f64 },
+    /// Brush Strokes › Spatter: a spatter airbrush spraying within `radius` (0..25), its grains as
+    /// smooth as `smoothness` (1..15).
+    Spatter { radius: f64, smoothness: f64 },
+    /// Brush Strokes › Sprayed Strokes: sprayed strokes `length` long along `direction`, scattered
+    /// as `radius` (0..25) says.
+    SprayedStrokes { length: f64, radius: f64, direction: StrokeDirection },
+    /// Brush Strokes › Sumi-e: wet black brush strokes `width` (3..15) across on rice paper, as
+    /// loaded as `pressure` (0..15) says, with `contrast` (0..40).
+    SumiE { width: f64, pressure: f64, contrast: f64 },
+    /// Distort › Diffuse Glow: the highlights glow white as strongly as `glow` (0..20), from the
+    /// brightness `clear` (0..20) leaves clear, under white grain as dense as `graininess` (0..10).
+    DiffuseGlow { graininess: f64, glow: f64, clear: f64 },
+    /// Distort › Glass: the object seen through a `texture` surface scaled by `scaling` (0.5..2),
+    /// bent by `distortion` (0..20), smoothed by `smoothness` (1..15), its heights turned over when
+    /// `invert`.
+    Glass { distortion: f64, smoothness: f64, texture: GlassTexture, scaling: f64, invert: bool },
+    /// Distort › Ocean Ripple: the object under ripples of `size` (1..15) shifting it as much as
+    /// `magnitude` (0..20) says.
+    OceanRipple { size: f64, magnitude: f64 },
     /// Sharpen › Unsharp Mask: colours pushed away from a Gaussian blur of σ = `radius` by `amount`
     /// (1 = 100 %), where they differ from it by at least `threshold` levels.
     UnsharpMask { amount: f64, radius: f64, threshold: f64 },
@@ -62,6 +124,24 @@ pub enum PixelFx {
     /// Pixelate › Pointillize: random dots about `cell` across of the object's colours on a white
     /// canvas.
     Pointillize { cell: f64 },
+    /// Texture › Craquelure: cracked relief plaster, plates about `spacing` apart, cracks as deep
+    /// as `depth` (0..10), lit as brightly as `brightness` (0..10).
+    Craquelure { spacing: f64, depth: f64, brightness: f64 },
+    /// Texture › Grain: noise of `kind` as strong as `intensity` (0..100), the image's contrast
+    /// set by `contrast` (0..100, 50 leaves it).
+    Grain { intensity: f64, contrast: f64, kind: Grain },
+    /// Texture › Mosaic Tiles: irregular tiles about `tile` across with sunken grout `grout` / 2
+    /// wide (1..15), lightened by `lighten` (0..10).
+    MosaicTiles { tile: f64, grout: f64, lighten: f64 },
+    /// Texture › Patchwork: squares `square` across of the colour around their centres, raised by
+    /// up to `relief` (0..25).
+    Patchwork { square: f64, relief: f64 },
+    /// Texture › Stained Glass: panes about `cell` across leaded `border` / 2 wide (1..20) in
+    /// black, lit at the centre by `light` (0..10).
+    StainedGlass { cell: f64, border: f64, light: f64 },
+    /// Texture › Texturizer: a `texture` surface scaled by `scaling` (0.5..2), in relief as strong
+    /// as `relief` (0..50), lit from `light`, its heights turned over when `invert`.
+    Texturizer { texture: Texture, scaling: f64, relief: f64, light: Light, invert: bool },
     /// Video › De-Interlace: the odd (or `even`) field lines made again from the others, by
     /// duplication or, with `interpolate`, by averaging.
     DeInterlace { even: bool, interpolate: bool },
@@ -100,6 +180,9 @@ pub struct PixelSpace {
     /// The height of a line of the document's raster grid (document units: 72 / Document Raster
     /// Effects Settings › Resolution), the fields De-Interlace works on.
     pub line: f64,
+    /// How far the corners of the object's bounds lie from its centre (document units): Stained
+    /// Glass's light fades out over it.
+    pub extent: f64,
 }
 
 /// Effect `id`'s parameters `p` (defaults merged in) as a [`PixelFx`]; `None` for other effects.
@@ -119,6 +202,59 @@ pub(crate) fn parse(id: &str, p: &Value) -> Option<PixelFx> {
             threshold: num(p, "threshold", 25.0).clamp(0.1, 100.0),
             samples: quality([("low", 5), ("medium", 7), ("high", 9)], 7),
         },
+        "brushStrokes.accentedEdges" => PixelFx::AccentedEdges {
+            width: num(p, "edgeWidth", 2.0).clamp(1.0, 14.0),
+            brightness: num(p, "edgeBrightness", 38.0).clamp(0.0, 50.0),
+            smoothness: num(p, "smoothness", 5.0).clamp(1.0, 15.0),
+        },
+        "brushStrokes.angledStrokes" => PixelFx::AngledStrokes {
+            balance: num(p, "directionBalance", 50.0).clamp(0.0, 100.0),
+            length: num(p, "strokeLength", 15.0).clamp(3.0, 50.0),
+            sharpness: num(p, "sharpness", 3.0).clamp(0.0, 10.0),
+        },
+        "brushStrokes.crosshatch" => PixelFx::Crosshatch {
+            length: num(p, "strokeLength", 9.0).clamp(3.0, 50.0),
+            sharpness: num(p, "sharpness", 6.0).clamp(0.0, 20.0),
+            strength: num(p, "strength", 1.0).clamp(1.0, 3.0).round() as u32,
+        },
+        "brushStrokes.darkStrokes" => PixelFx::DarkStrokes {
+            balance: num(p, "balance", 5.0).clamp(0.0, 10.0),
+            black: num(p, "blackIntensity", 6.0).clamp(0.0, 10.0),
+            white: num(p, "whiteIntensity", 2.0).clamp(0.0, 10.0),
+        },
+        "brushStrokes.inkOutlines" => PixelFx::InkOutlines {
+            length: num(p, "strokeLength", 4.0).clamp(1.0, 50.0),
+            dark: num(p, "darkIntensity", 20.0).clamp(0.0, 50.0),
+            light: num(p, "lightIntensity", 10.0).clamp(0.0, 50.0),
+        },
+        "brushStrokes.spatter" => {
+            PixelFx::Spatter { radius: num(p, "sprayRadius", 10.0).clamp(0.0, 25.0), smoothness: num(p, "smoothness", 5.0).clamp(1.0, 15.0) }
+        }
+        "brushStrokes.sprayedStrokes" => PixelFx::SprayedStrokes {
+            length: num(p, "strokeLength", 12.0).clamp(0.0, 20.0),
+            radius: num(p, "sprayRadius", 7.0).clamp(0.0, 25.0),
+            direction: StrokeDirection::parse(text(p, "strokeDirection", "rightDiagonal")),
+        },
+        "brushStrokes.sumiE" => PixelFx::SumiE {
+            width: num(p, "strokeWidth", 10.0).clamp(3.0, 15.0),
+            pressure: num(p, "strokePressure", 2.0).clamp(0.0, 15.0),
+            contrast: num(p, "contrast", 16.0).clamp(0.0, 40.0),
+        },
+        "distort.diffuseGlow" => PixelFx::DiffuseGlow {
+            graininess: num(p, "graininess", 6.0).clamp(0.0, 10.0),
+            glow: num(p, "glowAmount", 10.0).clamp(0.0, 20.0),
+            clear: num(p, "clearAmount", 15.0).clamp(0.0, 20.0),
+        },
+        "distort.glass" => PixelFx::Glass {
+            distortion: num(p, "distortion", 5.0).clamp(0.0, 20.0),
+            smoothness: num(p, "smoothness", 3.0).clamp(1.0, 15.0),
+            texture: GlassTexture::parse(text(p, "texture", "frosted")),
+            scaling: num(p, "scaling", 100.0).clamp(50.0, 200.0) / 100.0,
+            invert: flag(p, "invert", false),
+        },
+        "distort.oceanRipple" => {
+            PixelFx::OceanRipple { size: num(p, "rippleSize", 9.0).clamp(1.0, 15.0), magnitude: num(p, "rippleMagnitude", 9.0).clamp(0.0, 20.0) }
+        }
         "sharpen.unsharpMask" => PixelFx::UnsharpMask {
             amount: num(p, "amount", 50.0).clamp(1.0, 500.0) / 100.0,
             radius: num(p, "radius", 1.0).clamp(0.1, 250.0),
@@ -137,6 +273,36 @@ pub(crate) fn parse(id: &str, p: &Value) -> Option<PixelFx> {
         "pixelate.crystallize" => PixelFx::Crystallize { cell: num(p, "cellSize", 10.0).clamp(3.0, 300.0) },
         "pixelate.mezzotint" => PixelFx::Mezzotint { kind: Mezzotint::parse(text(p, "type", "fineDots")) },
         "pixelate.pointillize" => PixelFx::Pointillize { cell: num(p, "cellSize", 5.0).clamp(3.0, 300.0) },
+        "texture.craquelure" => PixelFx::Craquelure {
+            spacing: num(p, "crackSpacing", 15.0).clamp(2.0, 100.0),
+            depth: num(p, "crackDepth", 6.0).clamp(0.0, 10.0),
+            brightness: num(p, "crackBrightness", 9.0).clamp(0.0, 10.0),
+        },
+        "texture.grain" => PixelFx::Grain {
+            intensity: num(p, "intensity", 40.0).clamp(0.0, 100.0),
+            contrast: num(p, "contrast", 50.0).clamp(0.0, 100.0),
+            kind: Grain::parse(text(p, "grainType", "regular")),
+        },
+        "texture.mosaicTiles" => PixelFx::MosaicTiles {
+            tile: num(p, "tileSize", 12.0).clamp(2.0, 100.0),
+            grout: num(p, "groutWidth", 3.0).clamp(1.0, 15.0),
+            lighten: num(p, "lightenGrout", 9.0).clamp(0.0, 10.0),
+        },
+        "texture.patchwork" => {
+            PixelFx::Patchwork { square: num(p, "squareSize", 4.0).clamp(0.0, 10.0), relief: num(p, "relief", 8.0).clamp(0.0, 25.0) }
+        }
+        "texture.stainedGlass" => PixelFx::StainedGlass {
+            cell: num(p, "cellSize", 10.0).clamp(2.0, 50.0),
+            border: num(p, "borderThickness", 4.0).clamp(1.0, 20.0),
+            light: num(p, "lightIntensity", 3.0).clamp(0.0, 10.0),
+        },
+        "texture.texturizer" => PixelFx::Texturizer {
+            texture: Texture::parse(text(p, "texture", "canvas")),
+            scaling: num(p, "scaling", 100.0).clamp(50.0, 200.0) / 100.0,
+            relief: num(p, "relief", 4.0).clamp(0.0, 50.0),
+            light: Light::parse(text(p, "lightDirection", "top")),
+            invert: flag(p, "invert", false),
+        },
         "video.deinterlace" => PixelFx::DeInterlace {
             even: text(p, "eliminate", "odd").eq_ignore_ascii_case("even"),
             interpolate: text(p, "create", "duplication").eq_ignore_ascii_case("interpolation"),
@@ -157,11 +323,33 @@ impl PixelFx {
             PixelFx::RadialBlur { zoom: false, .. } => (far - near).max(0.0),
             PixelFx::RadialBlur { amount, zoom: true, .. } => far * (blur::zoom_extent(amount).exp() - 1.0),
             PixelFx::SmartBlur { radius, .. } => radius,
+            PixelFx::AccentedEdges { .. } => 0.0,
+            // Strokes reach out of the object as far as they reach into it.
+            PixelFx::AngledStrokes { length, .. } | PixelFx::InkOutlines { length, .. } => brushstrokes::stroke_reach(length),
+            PixelFx::Crosshatch { length, .. } => brushstrokes::stroke_reach(length) + brushstrokes::rough(length),
+            PixelFx::DarkStrokes { .. } => brushstrokes::stroke_reach(brushstrokes::LIGHT_LENGTH),
+            PixelFx::Spatter { radius, .. } => brushstrokes::spatter_shift(radius),
+            PixelFx::SprayedStrokes { length, radius, .. } => brushstrokes::stroke_reach(length) + brushstrokes::spray_shift(radius),
+            // Sumi-e keeps the object's shape.
+            PixelFx::SumiE { .. } => 0.0,
+            PixelFx::DiffuseGlow { .. } => 0.0,
+            // Content shifted outwards reaches past the bounds by as much as the shift.
+            PixelFx::Glass { distortion, .. } => distort::glass_shift(distortion),
+            PixelFx::OceanRipple { size, magnitude } => distort::ripple_shift(size, magnitude),
             PixelFx::UnsharpMask { .. } => 0.0,
             PixelFx::GlowingEdges { width, smoothness, .. } => width.max(smoothness * 3.0),
-            PixelFx::ColorHalftone { .. } | PixelFx::Mezzotint { .. } | PixelFx::DeInterlace { .. } | PixelFx::NtscColors => 0.0,
-            // A crystal's or dot's point inside the object reaches out by up to its cell.
-            PixelFx::Crystallize { cell } | PixelFx::Pointillize { cell } => 1.5 * cell,
+            PixelFx::ColorHalftone { .. }
+            | PixelFx::Mezzotint { .. }
+            | PixelFx::Craquelure { .. }
+            | PixelFx::Grain { .. }
+            | PixelFx::MosaicTiles { .. }
+            | PixelFx::Texturizer { .. }
+            | PixelFx::DeInterlace { .. }
+            | PixelFx::NtscColors => 0.0,
+            // A crystal's, dot's or pane's point inside the object reaches out by up to its cell.
+            PixelFx::Crystallize { cell } | PixelFx::Pointillize { cell } | PixelFx::StainedGlass { cell, .. } => 1.5 * cell,
+            // A square whose centre is on the object is drawn whole.
+            PixelFx::Patchwork { square, .. } => square.max(1.0),
         }
     }
 
@@ -171,6 +359,20 @@ impl PixelFx {
         match *self {
             PixelFx::RadialBlur { .. } => None,
             PixelFx::SmartBlur { radius, .. } => Some(radius),
+            PixelFx::AccentedEdges { width, smoothness, .. } => Some(brushstrokes::accent_reach(width, smoothness)),
+            // The strokes, and the softened tones that choose them.
+            PixelFx::AngledStrokes { length, .. } => Some(brushstrokes::stroke_reach(length).max(brushstrokes::TONE_REACH)),
+            PixelFx::Crosshatch { length, .. } => {
+                Some((brushstrokes::stroke_reach(length) + brushstrokes::rough(length)).max(brushstrokes::TONE_REACH))
+            }
+            PixelFx::DarkStrokes { .. } => Some(brushstrokes::stroke_reach(brushstrokes::LIGHT_LENGTH).max(brushstrokes::TONE_REACH)),
+            PixelFx::InkOutlines { length, .. } => Some(brushstrokes::ink_reach(length)),
+            PixelFx::Spatter { radius, .. } => Some(brushstrokes::spatter_shift(radius)),
+            PixelFx::SprayedStrokes { length, radius, .. } => Some(brushstrokes::stroke_reach(length) + brushstrokes::spray_shift(radius)),
+            PixelFx::SumiE { width, .. } => Some(brushstrokes::sumi_reach(width)),
+            PixelFx::DiffuseGlow { .. } => Some(3.0 * distort::GLOW_SPREAD),
+            PixelFx::Glass { distortion, .. } => Some(distort::glass_shift(distortion)),
+            PixelFx::OceanRipple { size, magnitude } => Some(distort::ripple_shift(size, magnitude)),
             PixelFx::UnsharpMask { radius, .. } => Some(3.0 * radius),
             PixelFx::GlowingEdges { width, smoothness, .. } => Some(width.max(smoothness * 3.0)),
             // The cells around the pixel's, and the cells around theirs.
@@ -179,6 +381,12 @@ impl PixelFx {
             PixelFx::Mezzotint { .. } => Some(0.0),
             // The dots' points, and the softened colour around them.
             PixelFx::Pointillize { cell } => Some(2.5 * cell),
+            // The softened tones around the pixel.
+            PixelFx::Craquelure { spacing, .. } => Some(3.0 * texture::CONTOUR_SOFTNESS * spacing),
+            PixelFx::Grain { .. } | PixelFx::MosaicTiles { .. } | PixelFx::Texturizer { .. } => Some(0.0),
+            // The square's or pane's point, and the softened colour around it.
+            PixelFx::Patchwork { square, .. } => Some(2.0 * square.max(1.0)),
+            PixelFx::StainedGlass { cell, .. } => Some(2.5 * cell),
             // The lines above and below.
             PixelFx::DeInterlace { .. } => Some(video::MAX_LINE),
             PixelFx::NtscColors => Some(0.0),
@@ -193,18 +401,45 @@ impl PixelFx {
         match *self {
             PixelFx::RadialBlur { amount, zoom, passes } => blur::radial(px, w, h, space, amount, zoom, passes),
             PixelFx::SmartBlur { radius, threshold, samples } => blur::smart(px, w, h, to_px(radius), threshold, samples),
+            PixelFx::AccentedEdges { width, brightness, smoothness } => brushstrokes::accented_edges(px, w, h, space, width, brightness, smoothness),
+            PixelFx::AngledStrokes { balance, length, sharpness } => brushstrokes::angled_strokes(px, w, h, space, balance, length, sharpness),
+            PixelFx::Crosshatch { length, sharpness, strength } => brushstrokes::crosshatch(px, w, h, space, length, sharpness, strength),
+            PixelFx::DarkStrokes { balance, black, white } => brushstrokes::dark_strokes(px, w, h, space, balance, black, white),
+            PixelFx::InkOutlines { length, dark, light } => brushstrokes::ink_outlines(px, w, h, space, length, dark, light),
+            PixelFx::Spatter { radius, smoothness } => brushstrokes::spatter(px, w, h, space, radius, smoothness),
+            PixelFx::SprayedStrokes { length, radius, direction } => brushstrokes::sprayed_strokes(px, w, h, space, length, radius, direction),
+            PixelFx::SumiE { width, pressure, contrast } => brushstrokes::sumi_e(px, w, h, space, width, pressure, contrast),
+            PixelFx::DiffuseGlow { graininess, glow, clear } => distort::diffuse_glow(px, w, h, space, graininess, glow, clear),
+            PixelFx::Glass { distortion, smoothness, texture, scaling, invert } => {
+                distort::glass(px, w, h, space, distortion, smoothness, texture, scaling, invert)
+            }
+            PixelFx::OceanRipple { size, magnitude } => distort::ocean_ripple(px, w, h, space, size, magnitude),
             PixelFx::UnsharpMask { amount, radius, threshold } => sharpen::unsharp(px, w, h, amount, to_px(radius), threshold),
             PixelFx::GlowingEdges { width, brightness, smoothness } => edges::glow(px, w, h, to_px(width), brightness, to_px(smoothness)),
             PixelFx::ColorHalftone { max_radius, angles } => pixelate::color_halftone(px, w, h, space, max_radius, angles),
             PixelFx::Crystallize { cell } => pixelate::crystallize(px, w, h, space, cell),
             PixelFx::Mezzotint { kind } => pixelate::mezzotint(px, w, h, space, kind),
             PixelFx::Pointillize { cell } => pixelate::pointillize(px, w, h, space, cell),
+            PixelFx::Craquelure { spacing, depth, brightness } => texture::craquelure(px, w, h, space, spacing, depth, brightness),
+            PixelFx::Grain { intensity, contrast, kind } => texture::grain(px, w, h, space, intensity, contrast, kind),
+            PixelFx::MosaicTiles { tile, grout, lighten } => texture::mosaic_tiles(px, w, h, space, tile, grout, lighten),
+            PixelFx::Patchwork { square, relief } => texture::patchwork(px, w, h, space, square, relief),
+            PixelFx::StainedGlass { cell, border, light } => texture::stained_glass(px, w, h, space, cell, border, light),
+            PixelFx::Texturizer { texture, scaling, relief, light, invert } => {
+                texture::texturizer(px, w, h, space, texture, scaling, relief, light, invert)
+            }
             PixelFx::DeInterlace { even, interpolate } => video::deinterlace(px, w, h, space, even, interpolate),
             PixelFx::NtscColors => video::ntsc(px),
         }
     }
 }
 
+/// The entry of `all` whose value in `table` (the same order) is `value`, any case; `default`
+/// otherwise.
+fn pick<T: Copy>(table: &[(&str, &str)], all: &[T], value: &str, default: T) -> T {
+    table.iter().zip(all).find(|((_, v), _)| v.eq_ignore_ascii_case(value)).map_or(default, |(_, t)| *t)
+}
+
 /// `data` as `w` × `h` RGBA pixels, `None` when it isn't that size (or is empty).
 fn pixels(data: &mut [u8], w: usize, h: usize) -> Option<&mut [[u8; 4]]> {
     let (px, rest) = data.as_chunks_mut::<4>();

crates/effects/src/pixel/pixelate.rs

@@ -8,7 +8,7 @@ use std::sync::OnceLock;
 
 use vectorcraft_geom::{Affine, Point};
 
-use super::{Channels, PixelSpace, gaussian, to16};
+use super::{Channels, PixelSpace, Px16, gaussian, pick, to16};
 use crate::util::noise;
 
 /// Mezzotint's patterns, in its Type menu's order: (label, parameter value).
@@ -62,7 +62,7 @@ impl Mezzotint {
 
     /// The pattern of Type `value` (a [`MEZZOTINT_TYPES`] value, any case); Fine Dots otherwise.
     pub fn parse(value: &str) -> Self {
-        MEZZOTINT_TYPES.iter().zip(MEZZOTINT_KINDS).find(|((_, v), _)| v.eq_ignore_ascii_case(value)).map_or(Self::FINE_DOTS, |(_, kind)| kind)
+        pick(&MEZZOTINT_TYPES, &MEZZOTINT_KINDS, value, Self::FINE_DOTS)
     }
 }
 
@@ -70,48 +70,48 @@ impl Mezzotint {
 const SEED: u64 = 0x5049_5845_4C41_5445;
 
 /// A random number in [0, 1) for cell (`i`, `j`) of pattern `salt`; `k` picks one of several.
-fn rand(salt: u64, i: i64, j: i64, k: u64) -> f64 {
+pub(super) fn rand(salt: u64, i: i64, j: i64, k: u64) -> f64 {
     0.5 * (noise(SEED ^ salt, i as u64, j as u64, k) + 1.0)
 }
 
 /// The cell holding coordinate `v` (in cells); `None` far beyond any raster (or not finite).
-fn cell(v: f64) -> Option<i64> {
+pub(super) fn cell(v: f64) -> Option<i64> {
     let f = v.floor();
     (f.abs() < 1e15).then_some(f as i64)
 }
 
 /// Where a raster's pixels lie relative to the object's centre, in document units.
-struct Place {
+pub(super) struct Place {
     /// Pixel coordinates → document coordinates relative to the centre.
-    to_rel: Affine,
+    pub(super) to_rel: Affine,
     /// The other way.
-    to_px: Affine,
+    pub(super) to_px: Affine,
     /// A pixel's size in document units.
-    px: f64,
+    pub(super) px: f64,
     w: usize,
     h: usize,
 }
 
 impl Place {
-    fn new(space: &PixelSpace, w: usize, h: usize) -> Option<Self> {
+    pub(super) fn new(space: &PixelSpace, w: usize, h: usize) -> Option<Self> {
         let to_rel = Affine::translate(-space.center.to_vec2()) * space.to_doc;
         let to_px = to_rel.inverse();
         (to_rel.is_finite() && to_px.is_finite() && space.px.is_finite() && space.px > 0.0).then_some(Self { to_rel, to_px, px: space.px, w, h })
     }
 
     /// The centre of pixel (`x`, `y`).
-    fn at(&self, x: usize, y: usize) -> Point {
+    pub(super) fn at(&self, x: usize, y: usize) -> Point {
         self.to_rel * Point::new(x as f64 + 0.5, y as f64 + 0.5)
     }
 
     /// The index of the pixel holding point `p`; `None` outside the raster.
-    fn index(&self, p: Point) -> Option<usize> {
+    pub(super) fn index(&self, p: Point) -> Option<usize> {
         let q = self.to_px * p;
         (q.x >= 0.0 && q.y >= 0.0 && q.x < self.w as f64 && q.y < self.h as f64).then(|| q.y as usize * self.w + q.x as usize)
     }
 
     /// Run `f(x, y, pixel)` on every pixel.
-    fn each(&self, px: &mut [[u8; 4]], mut f: impl FnMut(usize, usize, &mut [u8; 4])) {
+    pub(super) fn each(&self, px: &mut [[u8; 4]], mut f: impl FnMut(usize, usize, &mut [u8; 4])) {
         for (y, row) in px.chunks_exact_mut(self.w.max(1)).enumerate().take(self.h) {
             for (x, p) in row.iter_mut().enumerate() {
                 f(x, y, p);
@@ -122,7 +122,7 @@ impl Place {
 
 /// The cells around a pixel's cell, in the order they can hold its nearest random point: the
 /// cell itself, its 8 neighbours, then the ring around them.
-const AROUND: [(i64, i64); 25] = [
+pub(super) const AROUND: [(i64, i64); 25] = [
     (0, 0),
     (-1, 0),
     (1, 0),
@@ -152,18 +152,18 @@ const AROUND: [(i64, i64); 25] = [
 
 /// What the cells [`AROUND`] one cell hold, made when first asked for and kept while consecutive
 /// pixels stay in that cell.
-struct Around<T> {
+pub(super) struct Around<T> {
     cell: Option<(i64, i64)>,
     items: [Option<T>; 25],
 }
 
 impl<T: Copy> Around<T> {
-    fn new() -> Self {
+    pub(super) fn new() -> Self {
         Self { cell: None, items: [None; 25] }
     }
 
     /// Item `k` of [`AROUND`] cell (`i`, `j`): `make(cell i', j')`.
-    fn get(&mut self, (i, j): (i64, i64), k: usize, make: impl FnOnce(i64, i64) -> T) -> Option<T> {
+    pub(super) fn get(&mut self, (i, j): (i64, i64), k: usize, make: impl FnOnce(i64, i64) -> T) -> Option<T> {
         if self.cell != Some((i, j)) {
             self.cell = Some((i, j));
             self.items = [None; 25];
@@ -175,10 +175,26 @@ impl<T: Copy> Around<T> {
 }
 
 /// The random point of cell (`i`, `j`) of pattern `salt`, in cells.
-fn point_in(salt: u64, i: i64, j: i64) -> Point {
+pub(super) fn point_in(salt: u64, i: i64, j: i64) -> Point {
     Point::new(i as f64 + rand(salt, i, j, 0), j as f64 + rand(salt, i, j, 1))
 }
 
+/// How far cell `c` lies from coordinate `t` (in cells) along one axis.
+pub(super) fn gap(c: i64, t: f64) -> f64 {
+    (c as f64 - t).max(t - c as f64 - 1.0).max(0.0)
+}
+
+/// Smooth random values in [0, 1) of pattern `salt` at whole coordinates, blended between them.
+pub(super) fn value_noise(salt: u64, x: f64, y: f64) -> f64 {
+    let (Some(i), Some(j)) = (cell(x), cell(y)) else { return 0.5 };
+    let smooth = |t: f64| t * t * (3.0 - 2.0 * t);
+    let (fx, fy) = (smooth(x - i as f64), smooth(y - j as f64));
+    let at = |di: i64, dj: i64| rand(salt, i.wrapping_add(di), j.wrapping_add(dj), 0);
+    let top = at(0, 0) + (at(1, 0) - at(0, 0)) * fx;
+    let bottom = at(0, 1) + (at(1, 1) - at(0, 1)) * fx;
+    top + (bottom - top) * fy
+}
+
 /// Crystallize: every pixel takes the colour at the nearest of one random point per `cell` ×
 /// `cell` square (a Voronoi diagram over a jittered grid): polygon crystals of solid colour.
 pub(super) fn crystallize(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, cell_size: f64) {
@@ -188,8 +204,6 @@ pub(super) fn crystallize(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelS
     }
     let src = px.to_vec();
     let mut around = Around::new();
-    // How far cell `c` lies from coordinate `t` (in cells) along one axis.
-    let gap = |c: i64, t: f64| (c as f64 - t).max(t - c as f64 - 1.0).max(0.0);
     place.each(px, |x, y, out| {
         let q = place.at(x, y);
         let (u, v) = (q.x / cell_size, q.y / cell_size);
@@ -215,6 +229,34 @@ pub(super) fn crystallize(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelS
     });
 }
 
+/// The object's colours softened by a Gaussian of `sigma` pixels, with its coverage as it is: what
+/// the cell filters (Pointillize, Patchwork, Stained Glass) fill their cells with.
+pub(super) struct Soft {
+    colour: Vec<Px16>,
+    alpha: Vec<u8>,
+}
+
+impl Soft {
+    pub(super) fn new(px: &[[u8; 4]], w: usize, sigma: f64) -> Self {
+        let mut colour = to16(px);
+        gaussian(&mut colour, w, sigma);
+        Self { colour, alpha: px.iter().map(|p| p[3]).collect() }
+    }
+
+    /// The colour around pixel `k` (premultiplied, 0..1), as opaque as the object is at `k`; clear
+    /// outside the raster.
+    pub(super) fn at(&self, k: Option<usize>) -> [f32; 4] {
+        let a = k.and_then(|k| self.alpha.get(k)).map_or(0.0, |a| f32::from(*a) / 255.0);
+        match k.and_then(|k| self.colour.get(k)) {
+            Some(p) if p[3] > 0 => {
+                let s = a / f32::from(p[3]);
+                [f32::from(p[0]) * s, f32::from(p[1]) * s, f32::from(p[2]) * s, a]
+            }
+            _ => [0.0; 4],
+        }
+    }
+}
+
 /// One of Pointillize's dots: where (in cells), its radius (document units), its stacking order
 /// and its colour (premultiplied, 0..1).
 #[derive(Clone, Copy)]
@@ -237,20 +279,10 @@ pub(super) fn pointillize(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelS
     }
     // Each dot takes the colour around its centre, not of a single pixel there, and is as opaque
     // as the object at its centre (whole dots on the object, none beside it).
-    let alpha: Vec<u8> = px.iter().map(|p| p[3]).collect();
-    let mut soft = to16(px);
-    gaussian(&mut soft, w, cell_size / place.px / 4.0);
+    let soft = Soft::new(px, w, cell_size / place.px / 4.0);
     let dot = |i: i64, j: i64| {
         let at = point_in(2, i, j);
-        let k = place.index(Point::new(at.x * cell_size, at.y * cell_size));
-        let a = k.and_then(|k| alpha.get(k)).map_or(0.0, |a| f32::from(*a) / 255.0);
-        let colour = match k.and_then(|k| soft.get(k)) {
-            Some(p) if p[3] > 0 => {
-                let s = a / f32::from(p[3]);
-                [f32::from(p[0]) * s, f32::from(p[1]) * s, f32::from(p[2]) * s, a]
-            }
-            _ => [0.0; 4],
-        };
+        let colour = soft.at(place.index(Point::new(at.x * cell_size, at.y * cell_size)));
         Dot { at, radius: (DOT_RADIUS.0 + DOT_RADIUS.1 * rand(2, i, j, 2)) * cell_size, z: rand(2, i, j, 3), colour }
     };
     let mut around = Around::new();
@@ -499,19 +531,6 @@ pub(super) fn mezzotint(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpa
 /// Mezzotint's threshold in [0, 1) at point `q` (document units around the centre) of pattern
 /// `salt`.
 fn threshold(kind: Mezzotint, salt: u64, q: Point) -> f64 {
-    let smooth = |t: f64| t * t * (3.0 - 2.0 * t);
-    // Random values at whole coordinates, blended smoothly between them along x (and y).
-    let blend = |x: f64, y: f64, along_y: bool| {
-        let (Some(i), Some(j)) = (cell(x), cell(y)) else { return 0.5 };
-        let (fx, fy) = (smooth(x - i as f64), smooth(y - j as f64));
-        let at = |di: i64, dj: i64| rand(salt, i.wrapping_add(di), j.wrapping_add(dj), 0);
-        let top = at(0, 0) + (at(1, 0) - at(0, 0)) * fx;
-        if !along_y {
-            return top;
-        }
-        let bottom = at(0, 1) + (at(1, 1) - at(0, 1)) * fx;
-        top + (bottom - top) * fy
-    };
     let grain = |size: f64| match (cell(q.x / size), cell(q.y / size)) {
         (Some(i), Some(j)) => rand(salt, i, j, 1),
         _ => 0.5,
@@ -520,12 +539,10 @@ fn threshold(kind: Mezzotint, salt: u64, q: Point) -> f64 {
         Mezzotint::Dots { size, smooth: false, .. } => grain(f64::from(size)),
         Mezzotint::Dots { size, grainy, .. } => {
             let s = f64::from(size);
-            let blob = blend(q.x / s, q.y / s, true);
+            let blob = value_noise(salt, q.x / s, q.y / s);
             if grainy { 0.5 * (blob + grain(1.0)) } else { blob }
         }
-        Mezzotint::Lines { length, width } => {
-            let row = (q.y / f64::from(width)).floor();
-            blend(q.x / f64::from(length), row, false)
-        }
+        // Blended along x only: whole rows.
+        Mezzotint::Lines { length, width } => value_noise(salt, q.x / f64::from(length), (q.y / f64::from(width)).floor()),
     }
 }

crates/effects/src/pixel/tests.rs

@@ -5,9 +5,17 @@ use vectorcraft_geom::{Affine, Point, Rect};
 use super::*;
 use crate::{RasterFx, raster_effects};
 
-/// A `w` × `h` raster whose pixels are document points (origin top-left).
+/// A `w` × `h` raster whose pixels are document points (origin top-left), of an object that fills it.
 fn space(w: usize, h: usize) -> PixelSpace {
-    PixelSpace { to_doc: Affine::IDENTITY, px: 1.0, center: Point::new(w as f64 / 2.0, h as f64 / 2.0), channels: Channels::Rgb, line: 1.0 }
+    let (w, h) = (w as f64, h as f64);
+    PixelSpace {
+        to_doc: Affine::IDENTITY,
+        px: 1.0,
+        center: Point::new(w / 2.0, h / 2.0),
+        channels: Channels::Rgb,
+        line: 1.0,
+        extent: 0.5 * w.hypot(h),
+    }
 }
 
 fn image(w: usize, h: usize, f: impl Fn(usize, usize) -> [u8; 4]) -> Vec<u8> {
@@ -224,8 +232,14 @@ fn lengths_are_document_units() {
     let edge = |scale: usize| image(40 * scale, 4, move |x, _| grey(if x < 20 * scale { 100 } else { 150 }));
     let run = |scale: usize| {
         let mut d = edge(scale);
-        let s =
-            PixelSpace { to_doc: Affine::scale(1.0 / scale as f64), px: 1.0 / scale as f64, center: Point::ZERO, channels: Channels::Rgb, line: 1.0 };
+        let s = PixelSpace {
+            to_doc: Affine::scale(1.0 / scale as f64),
+            px: 1.0 / scale as f64,
+            center: Point::ZERO,
+            channels: Channels::Rgb,
+            line: 1.0,
+            extent: 0.0,
+        };
         fx("sharpen.unsharpMask", json!({"amount": 100, "radius": 2})).apply(&mut d, 40 * scale, 4, &s);
         (0..40 * scale).filter(|x| at(&d, 40 * scale, *x, 2)[0] < 99).count()
     };
@@ -254,7 +268,7 @@ fn gaussian_and_plane_blurs_keep_their_mass() {
 fn pixel_timings() {
     let (w, h) = (2000, 2000);
     let src = image(w, h, |x, y| [(x % 256) as u8, (y % 256) as u8, ((x ^ y) % 256) as u8, 255]);
-    let s = PixelSpace { to_doc: Affine::IDENTITY, px: 1.0, center: Point::new(1000.0, 1000.0), channels: Channels::Rgb, line: 1.0 };
+    let s = PixelSpace { to_doc: Affine::IDENTITY, px: 1.0, center: Point::new(1000.0, 1000.0), channels: Channels::Rgb, line: 1.0, extent: 0.0 };
     let cases = [
         ("blur.radial", json!({"quality": "draft"})),
         ("blur.radial", json!({"quality": "good"})),
@@ -262,12 +276,28 @@ fn pixel_timings() {
         ("blur.smart", json!({"quality": "low"})),
         ("blur.smart", json!({"quality": "high", "radius": 30})),
         ("sharpen.unsharpMask", json!({"radius": 20})),
+        ("brushStrokes.accentedEdges", json!({"edgeWidth": 14})),
+        ("brushStrokes.angledStrokes", json!({"strokeLength": 50})),
+        ("brushStrokes.crosshatch", json!({"strokeLength": 50, "strength": 3})),
+        ("brushStrokes.darkStrokes", json!({})),
+        ("brushStrokes.inkOutlines", json!({"strokeLength": 50})),
+        ("brushStrokes.spatter", json!({"sprayRadius": 25})),
+        ("brushStrokes.sprayedStrokes", json!({"strokeLength": 20, "sprayRadius": 25})),
+        ("brushStrokes.sumiE", json!({"strokeWidth": 15})),
         ("pixelate.colorHalftone", json!({"maxRadius": 4})),
         ("pixelate.crystallize", json!({"cellSize": 3})),
         ("pixelate.crystallize", json!({"cellSize": 300})),
         ("pixelate.mezzotint", json!({"type": "grainyDots"})),
         ("pixelate.pointillize", json!({"cellSize": 3})),
         ("pixelate.pointillize", json!({"cellSize": 300})),
+        ("texture.craquelure", json!({"crackSpacing": 2})),
+        ("texture.craquelure", json!({"crackSpacing": 100})),
+        ("texture.grain", json!({"grainType": "clumped"})),
+        ("texture.mosaicTiles", json!({"tileSize": 2})),
+        ("texture.patchwork", json!({"squareSize": 0})),
+        ("texture.stainedGlass", json!({"cellSize": 2})),
+        ("texture.texturizer", json!({"texture": "sandstone", "scaling": 50})),
+        ("texture.texturizer", json!({"texture": "burlap"})),
     ];
     for (id, p) in cases {
         let mut d = src.clone();
@@ -525,3 +555,757 @@ fn ntsc_colors_tame_only_colours_too_strong_for_the_signal() {
         assert!((luma(a) - luma(b)).abs() < 3.0, "{x}: as bright {a:?} {b:?}");
     }
 }
+
+#[test]
+fn texture_params_take_defaults_and_stay_in_range() {
+    assert_eq!(fx("texture.craquelure", json!({})), PixelFx::Craquelure { spacing: 15.0, depth: 6.0, brightness: 9.0 });
+    assert_eq!(
+        fx("texture.craquelure", json!({"crackSpacing": 1e9, "crackDepth": -1, "crackBrightness": "x"})),
+        PixelFx::Craquelure { spacing: 100.0, depth: 0.0, brightness: 9.0 }
+    );
+    assert_eq!(fx("texture.grain", json!({})), PixelFx::Grain { intensity: 40.0, contrast: 50.0, kind: Grain::Regular });
+    assert_eq!(
+        fx("texture.grain", json!({"intensity": 1e300, "contrast": -5, "grainType": "SPECKLE"})),
+        PixelFx::Grain { intensity: 100.0, contrast: 0.0, kind: Grain::Speckle }
+    );
+    assert_eq!(fx("texture.mosaicTiles", json!({})), PixelFx::MosaicTiles { tile: 12.0, grout: 3.0, lighten: 9.0 });
+    assert_eq!(
+        fx("texture.mosaicTiles", json!({"tileSize": 0, "groutWidth": 99, "lightenGrout": 11})),
+        PixelFx::MosaicTiles { tile: 2.0, grout: 15.0, lighten: 10.0 }
+    );
+    assert_eq!(fx("texture.patchwork", json!({})), PixelFx::Patchwork { square: 4.0, relief: 8.0 });
+    assert_eq!(fx("texture.patchwork", json!({"squareSize": -1, "relief": 26})), PixelFx::Patchwork { square: 0.0, relief: 25.0 });
+    assert_eq!(fx("texture.stainedGlass", json!({})), PixelFx::StainedGlass { cell: 10.0, border: 4.0, light: 3.0 });
+    assert_eq!(
+        fx("texture.stainedGlass", json!({"cellSize": 1, "borderThickness": 21, "lightIntensity": "1e999"})),
+        PixelFx::StainedGlass { cell: 2.0, border: 20.0, light: 3.0 }
+    );
+    let canvas = PixelFx::Texturizer { texture: Texture::Canvas, scaling: 1.0, relief: 4.0, light: Light::Top, invert: false };
+    assert_eq!(fx("texture.texturizer", json!({})), canvas);
+    assert_eq!(
+        fx("texture.texturizer", json!({"texture": "Brick", "scaling": 10, "relief": 60, "lightDirection": "bottomRight", "invert": true})),
+        PixelFx::Texturizer { texture: Texture::Brick, scaling: 0.5, relief: 50.0, light: Light::BottomRight, invert: true }
+    );
+    assert_eq!(
+        fx("texture.texturizer", json!({"texture": 3, "lightDirection": "up", "scaling": 1e9})),
+        PixelFx::Texturizer { texture: Texture::Canvas, scaling: 2.0, relief: 4.0, light: Light::Top, invert: false }
+    );
+    assert_eq!(fx("texture.grain", json!({"grainType": ["x"]})), fx("texture.grain", json!({})));
+    // Every menu value is documented in the catalogue and parses to a choice of its own.
+    for (id, key, table) in [
+        ("texture.grain", "grainType", GRAIN_TYPES.as_slice()),
+        ("texture.texturizer", "texture", TEXTURES.as_slice()),
+        ("texture.texturizer", "lightDirection", LIGHT_DIRECTIONS.as_slice()),
+    ] {
+        let doc = crate::effect_info(id).unwrap().params;
+        let parsed: Vec<PixelFx> = table.iter().map(|(_, v)| fx(id, json!({ key: v }))).collect();
+        for (i, (_, v)) in table.iter().enumerate() {
+            assert!(doc.contains(&format!("\"{v}\"")), "{id} {v}");
+            assert!(parsed.iter().skip(i + 1).all(|p| *p != parsed[i]), "{id} {v}");
+        }
+    }
+    // Panes and squares reach beyond the object; the surfaces stay on it.
+    let b = Rect::new(0.0, 0.0, 100.0, 50.0);
+    assert_eq!(fx("texture.stainedGlass", json!({"cellSize": 20})).outset(b), 30.0);
+    assert_eq!(fx("texture.patchwork", json!({"squareSize": 0})).outset(b), 1.0);
+    for id in ["texture.craquelure", "texture.grain", "texture.mosaicTiles", "texture.texturizer"] {
+        assert_eq!(fx(id, json!({})).outset(b), 0.0, "{id}");
+    }
+    assert_eq!(fx("texture.grain", json!({})).reach(), Some(0.0));
+    assert_eq!(fx("texture.craquelure", json!({"crackSpacing": 12})).reach(), Some(6.0));
+}
+
+/// The pixels of `d` (`w` wide) in the square `lo..hi` on both axes.
+fn square(d: &[u8], w: usize, lo: usize, hi: usize) -> Vec<[u8; 4]> {
+    (lo..hi).flat_map(|y| (lo..hi).map(move |x| (x, y))).map(|(x, y)| at(d, w, x, y)).collect()
+}
+
+/// A `w`-square raster of one colour.
+fn flat(w: usize, c: [u8; 4]) -> Vec<u8> {
+    image(w, w, |_, _| c)
+}
+
+#[test]
+fn craquelure_cracks_plates_and_contours() {
+    let w = 96;
+    let tan = [180, 150, 110, 255];
+    let mut d = flat(w, tan);
+    fx("texture.craquelure", json!({"crackBrightness": 10})).apply(&mut d, w, w, &space(w, w));
+    let px = square(&d, w, 16, 80);
+    let dark = px.iter().filter(|p| p[0] < 120).count() as f64 / px.len() as f64;
+    assert!((0.03..0.4).contains(&dark), "a network of dark cracks: {dark}");
+    assert!(px.iter().all(|p| p[3] == 255 && p[0] >= p[1] && p[1] >= p[2]), "the colour stays, darkened or lit");
+    assert!(px.iter().any(|p| p[0] > 182), "plate edges catch the light");
+    // Without depth there are no cracks and no relief; brightness lights the surface.
+    let mut flat_lit = flat(w, tan);
+    fx("texture.craquelure", json!({"crackDepth": 0, "crackBrightness": 10})).apply(&mut flat_lit, w, w, &space(w, w));
+    assert_eq!(flat_lit, flat(w, tan));
+    let mut dim = flat(w, tan);
+    fx("texture.craquelure", json!({"crackDepth": 0, "crackBrightness": 0})).apply(&mut dim, w, w, &space(w, w));
+    assert_eq!(at(&dim, w, 40, 40), [90, 75, 55, 255]);
+    // A dark half and a light half: a crack follows the contour between them, straight down (a
+    // dark line between lighter pixels in nearly every row), where one tone has none.
+    let craquelure = fx("texture.craquelure", json!({"crackSpacing": 100, "crackBrightness": 10}));
+    let rows_cracked = |src: Vec<u8>| {
+        let mut d = src;
+        craquelure.apply(&mut d, w, w, &space(w, w));
+        let v = |x: usize, y: usize| i32::from(at(&d, w, x, y)[0]);
+        (20..76).filter(|y| (26..35).any(|x| v(x, *y) + 8 < v(x - 2, *y) && v(x, *y) + 8 < v(x + 2, *y))).count()
+    };
+    let (contour, plain) = (rows_cracked(image(w, w, |x, _| grey(if x < 30 { 60 } else { 200 }))), rows_cracked(flat(w, grey(200))));
+    assert!(contour >= 48 && contour >= plain + 25, "{contour} rows cracked along the contour, {plain} without one");
+}
+
+#[test]
+fn grain_types_each_add_their_own_noise() {
+    let w = 48;
+    let mid = grey(128);
+    let mut seen: Vec<Vec<u8>> = Vec::new();
+    for (_, kind) in GRAIN_TYPES {
+        let mut d = flat(w, mid);
+        fx("texture.grain", json!({ "grainType": kind })).apply(&mut d, w, w, &space(w, w));
+        assert_ne!(d, flat(w, mid), "{kind} adds grain");
+        assert!(d.as_chunks::<4>().0.iter().all(|p| p[3] == 255), "{kind}: coverage stays");
+        assert!(!seen.contains(&d), "{kind}: a grain of its own");
+        seen.push(d);
+    }
+    // Regular grain is 1-point grains of every colour around the image's own.
+    let mut d = flat(w, mid);
+    fx("texture.grain", json!({})).apply(&mut d, w, w, &space(w, w));
+    let px = d.as_chunks::<4>().0;
+    let mean = px.iter().map(|p| f64::from(p[0])).sum::<f64>() / px.len() as f64;
+    assert!((mean - 128.0).abs() < 8.0, "{mean}");
+    assert!(px.iter().any(|p| p[0] != p[1]), "coloured grains");
+    // Horizontal grain runs in streaks along the rows.
+    let mut d = flat(w, mid);
+    fx("texture.grain", json!({"grainType": "horizontal", "intensity": 100})).apply(&mut d, w, w, &space(w, w));
+    let along = (0..w - 1).map(|x| u32::from(at(&d, w, x, 10)[0].abs_diff(at(&d, w, x + 1, 10)[0]))).sum::<u32>();
+    let across = (0..w - 1).map(|y| u32::from(at(&d, w, 10, y)[0].abs_diff(at(&d, w, 10, y + 1)[0]))).sum::<u32>();
+    assert!(along * 3 < across, "{along} along, {across} across");
+    // No intensity at neutral contrast leaves the image; contrast spreads its tones.
+    let ramp = image(w, w, |x, _| grey((x * 5) as u8));
+    let mut d = ramp.clone();
+    fx("texture.grain", json!({"intensity": 0})).apply(&mut d, w, w, &space(w, w));
+    assert_eq!(d, ramp);
+    fx("texture.grain", json!({"intensity": 0, "contrast": 100})).apply(&mut d, w, w, &space(w, w));
+    assert!(at(&d, w, 2, 0)[0] < at(&ramp, w, 2, 0)[0] && at(&d, w, 45, 0)[0] > at(&ramp, w, 45, 0)[0]);
+    // Sprinkles are the background colour, white.
+    let mut d = flat(w, [0, 0, 160, 255]);
+    fx("texture.grain", json!({"grainType": "sprinkles", "intensity": 100})).apply(&mut d, w, w, &space(w, w));
+    assert!(d.as_chunks::<4>().0.iter().any(|p| p[0] > 200 && p[2] > 240));
+}
+
+#[test]
+fn mosaic_tiles_lay_tiles_in_light_grout() {
+    let w = 96;
+    let blue = [40, 60, 160, 255];
+    let mut d = flat(w, blue);
+    fx("texture.mosaicTiles", json!({})).apply(&mut d, w, w, &space(w, w));
+    let px = square(&d, w, 8, 88);
+    let grout = px.iter().filter(|p| p[0] > 170).count() as f64 / px.len() as f64;
+    assert!((0.08..0.5).contains(&grout), "light grout between the tiles: {grout}");
+    assert!(px.iter().filter(|p| **p == blue).count() > px.len() / 10, "tile faces keep the colour");
+    // Dark grout without lightening.
+    let mut d = flat(w, blue);
+    fx("texture.mosaicTiles", json!({"lightenGrout": 0})).apply(&mut d, w, w, &space(w, w));
+    let px = square(&d, w, 8, 88);
+    let grout = px.iter().filter(|p| p[2] < 100).count() as f64 / px.len() as f64;
+    assert!((0.08..0.5).contains(&grout) && px.iter().all(|p| p[0] < 170), "dark grout: {grout}");
+    // Transparency around the object stays.
+    let mut d = image(w, w, |x, _| if x < 48 { blue } else { [0; 4] });
+    fx("texture.mosaicTiles", json!({})).apply(&mut d, w, w, &space(w, w));
+    assert!((0..w).all(|y| (48..w).all(|x| at(&d, w, x, y) == [0; 4])));
+}
+
+#[test]
+fn patchwork_fills_squares_with_one_colour_in_relief() {
+    let w = 64;
+    let src = image(w, w, |x, y| [(x * 4) as u8, (y * 4) as u8, 90, 255]);
+    let mut d = src.clone();
+    fx("texture.patchwork", json!({"squareSize": 8, "relief": 0})).apply(&mut d, w, w, &space(w, w));
+    // Squares of 8 points (the object's centre is a corner), each one colour.
+    for (i, j) in [(1, 1), (2, 5), (6, 3)] {
+        let first = at(&d, w, 8 * i, 8 * j);
+        assert!((0..8).all(|y| (0..8).all(|x| at(&d, w, 8 * i + x, 8 * j + y) == first)), "square {i} {j}");
+    }
+    assert_ne!(at(&d, w, 8, 8), at(&d, w, 16, 8));
+    // In relief, the squares' sides catch the light from the top left and fall into shade.
+    let mut lit = src.clone();
+    fx("texture.patchwork", json!({"squareSize": 8, "relief": 25})).apply(&mut lit, w, w, &space(w, w));
+    let (face, top, bottom) = (at(&lit, w, 28, 28)[1], at(&lit, w, 28, 24)[1], at(&lit, w, 28, 31)[1]);
+    assert!(top > face && bottom < face, "{top} {face} {bottom}");
+    // Squares around the object's edge are drawn whole.
+    let mut d = image(w, w, |x, _| if x < 30 { [200, 0, 0, 255] } else { [0; 4] });
+    fx("texture.patchwork", json!({"squareSize": 8, "relief": 0})).apply(&mut d, w, w, &space(w, w));
+    assert!((0..w).all(|y| at(&d, w, 31, y)[3] == 255 && at(&d, w, 33, y)[3] == 0));
+}
+
+#[test]
+fn stained_glass_leads_panes_and_lights_the_centre() {
+    let w = 96;
+    let src = image(w, w, |x, y| [(40 + x) as u8, (40 + y) as u8, 120, 255]);
+    let mut d = src.clone();
+    fx("texture.stainedGlass", json!({"lightIntensity": 0})).apply(&mut d, w, w, &space(w, w));
+    let px = square(&d, w, 16, 80);
+    let lead = px.iter().filter(|p| p[0] == 0 && p[1] == 0 && p[2] == 0).count() as f64 / px.len() as f64;
+    assert!((0.1..0.6).contains(&lead), "black lead: {lead}");
+    let same = (16..80).flat_map(|y| (16..79).map(move |x| (x, y))).filter(|(x, y)| at(&d, w, *x, *y) == at(&d, w, x + 1, *y)).count();
+    assert!(same * 5 > 2 * 64 * 63, "single-coloured panes: {same}");
+    assert!(px.iter().all(|p| p[3] == 255));
+    // The light shines through the middle, not the corners.
+    let mut lit = src.clone();
+    fx("texture.stainedGlass", json!({"lightIntensity": 10})).apply(&mut lit, w, w, &space(w, w));
+    let brighter = |x: usize, y: usize| i32::from(at(&lit, w, x, y)[2]) - i32::from(at(&d, w, x, y)[2]);
+    let centre = (44..52).flat_map(|y| (44..52).map(move |x| (x, y))).map(|(x, y)| brighter(x, y)).max().unwrap();
+    let corner = (0..6).flat_map(|y| (0..6).map(move |x| (x, y))).map(|(x, y)| brighter(x, y)).max().unwrap();
+    assert!(centre > 40 && corner * 3 < centre, "{centre} at the centre, {corner} in the corner");
+    // Panes beyond the object stay clear; lead outlines it.
+    let mut d = image(w, w, |x, y| if (24..72).contains(&x) && (24..72).contains(&y) { [200, 40, 40, 255] } else { [0; 4] });
+    fx("texture.stainedGlass", json!({})).apply(&mut d, w, w, &space(w, w));
+    assert!((0..6).all(|y| (0..w).all(|x| at(&d, w, x, y) == [0; 4])));
+    assert!(d.as_chunks::<4>().0.iter().all(|p| p[0] <= p[3] && p[1] <= p[3] && p[2] <= p[3]));
+}
+
+#[test]
+fn texturizer_lights_each_surface_from_its_side() {
+    let w = 64;
+    let mid = grey(150);
+    let run = |p: serde_json::Value| {
+        let mut d = flat(w, mid);
+        fx("texture.texturizer", p).apply(&mut d, w, w, &space(w, w));
+        d
+    };
+    let mut seen: Vec<Vec<u8>> = Vec::new();
+    for (_, texture) in TEXTURES {
+        let d = run(json!({ "texture": texture, "relief": 20 }));
+        assert_ne!(d, flat(w, mid), "{texture}");
+        assert!(!seen.contains(&d), "{texture}: a surface of its own");
+        // Inverted, the lit slopes are the shaded ones, and the other way round.
+        let inv = run(json!({ "texture": texture, "relief": 20, "invert": true }));
+        let shift = |d: &[u8]| d.as_chunks::<4>().0.iter().map(|p| i32::from(p[0]) - 150).collect::<Vec<_>>();
+        let (a, b) = (shift(&d), shift(&inv));
+        let opposite = a.iter().zip(&b).filter(|(a, b)| a.abs() > 4 && b.abs() > 4 && a.signum() != b.signum()).count();
+        let lit_or_shaded = a.iter().filter(|a| a.abs() > 4).count();
+        assert!(lit_or_shaded > 100 && opposite * 10 > lit_or_shaded * 8, "{texture}: {opposite} of {lit_or_shaded}");
+        // From the other side as well.
+        assert_ne!(run(json!({ "texture": texture, "relief": 20, "lightDirection": "bottom" })), d, "{texture}");
+        // No relief, no change.
+        assert_eq!(run(json!({ "texture": texture, "relief": 0 })), flat(w, mid), "{texture}");
+        seen.push(d);
+    }
+    // Scaling enlarges the surface: 200 % at 2 points a pixel draws as 100 % at 1.
+    let mut big = flat(w, mid);
+    let coarse = PixelSpace { to_doc: Affine::scale(2.0), px: 2.0, center: Point::new(64.0, 64.0), ..space(w, w) };
+    fx("texture.texturizer", json!({"texture": "brick", "scaling": 200, "relief": 20})).apply(&mut big, w, w, &coarse);
+    assert_eq!(big, run(json!({"texture": "brick", "relief": 20})));
+}
+
+/// The Texture filters' patterns lie in document space around the object's centre: the same at
+/// twice the resolution, and moving with the object.
+#[test]
+fn texture_patterns_follow_the_object_at_any_resolution() {
+    let (w, h) = (48, 48);
+    let art = |x: f64, y: f64| -> [u8; 4] {
+        if (8.0..40.0).contains(&x) && (8.0..40.0).contains(&y) { [(x * 5.0) as u8, (y * 5.0) as u8, 120, 255] } else { [0; 4] }
+    };
+    for (id, p) in [
+        ("texture.craquelure", json!({"crackSpacing": 8})),
+        ("texture.grain", json!({"grainType": "enlarged"})),
+        ("texture.mosaicTiles", json!({"tileSize": 8, "groutWidth": 2})),
+        ("texture.patchwork", json!({"squareSize": 6})),
+        ("texture.stainedGlass", json!({"cellSize": 8, "borderThickness": 2})),
+        ("texture.texturizer", json!({"texture": "sandstone", "relief": 10})),
+    ] {
+        let f = fx(id, p);
+        let mut one = image(w, h, |x, y| art(x as f64 + 0.5, y as f64 + 0.5));
+        f.apply(&mut one, w, h, &space(w, h));
+        let mut two = image(2 * w, 2 * h, |x, y| art((x as f64 + 0.5) / 2.0, (y as f64 + 0.5) / 2.0));
+        let fine = PixelSpace { to_doc: Affine::scale(0.5), px: 0.5, ..space(w, h) };
+        f.apply(&mut two, 2 * w, 2 * h, &fine);
+        let down = image(w, h, |x, y| {
+            let q = [(0, 0), (1, 0), (0, 1), (1, 1)].map(|(dx, dy)| at(&two, 2 * w, 2 * x + dx, 2 * y + dy));
+            std::array::from_fn(|c| (q.iter().map(|p| u32::from(p[c])).sum::<u32>() / 4) as u8)
+        });
+        let diff = one.iter().zip(&down).map(|(a, b)| f64::from(a.abs_diff(*b))).sum::<f64>() / one.len() as f64;
+        assert!(diff < 12.0, "{id}: {diff}");
+        let moved = PixelSpace { to_doc: Affine::translate((7.0, 3.0)), center: Point::new(31.0, 27.0), ..space(w, h) };
+        let mut shifted = image(w, h, |x, y| art(x as f64 + 0.5, y as f64 + 0.5));
+        f.apply(&mut shifted, w, h, &moved);
+        assert_eq!(shifted, one, "{id}");
+    }
+}
+
+#[test]
+fn distort_params_take_defaults_and_stay_in_range() {
+    assert_eq!(fx("distort.diffuseGlow", json!({})), PixelFx::DiffuseGlow { graininess: 6.0, glow: 10.0, clear: 15.0 });
+    assert_eq!(
+        fx("distort.diffuseGlow", json!({"graininess": 1e9, "glowAmount": -3, "clearAmount": "x"})),
+        PixelFx::DiffuseGlow { graininess: 10.0, glow: 0.0, clear: 15.0 }
+    );
+    assert_eq!(
+        fx("distort.glass", json!({})),
+        PixelFx::Glass { distortion: 5.0, smoothness: 3.0, texture: GlassTexture::Frosted, scaling: 1.0, invert: false }
+    );
+    assert_eq!(
+        fx("distort.glass", json!({"distortion": 1e308, "smoothness": 0, "texture": "TINYLENS", "scaling": 1, "invert": true})),
+        PixelFx::Glass { distortion: 20.0, smoothness: 1.0, texture: GlassTexture::TinyLens, scaling: 0.5, invert: true }
+    );
+    assert_eq!(fx("distort.glass", json!({"texture": "bubbles"})), fx("distort.glass", json!({})));
+    assert_eq!(fx("distort.oceanRipple", json!({})), PixelFx::OceanRipple { size: 9.0, magnitude: 9.0 });
+    assert_eq!(fx("distort.oceanRipple", json!({"rippleSize": 99, "rippleMagnitude": -1})), PixelFx::OceanRipple { size: 15.0, magnitude: 0.0 });
+    // Shifted content reaches past the bounds by the longest shift, and comes from as far.
+    let b = Rect::new(0.0, 0.0, 100.0, 50.0);
+    let glass = fx("distort.glass", json!({"distortion": 20}));
+    assert_eq!((glass.outset(b), glass.reach()), (10.0, Some(10.0)));
+    let ripple = fx("distort.oceanRipple", json!({}));
+    assert!((ripple.outset(b) - 0.03 * 9.0 * 11.0).abs() < 1e-9 && ripple.reach() == Some(ripple.outset(b)));
+    assert_eq!(fx("distort.diffuseGlow", json!({})).outset(b), 0.0);
+}
+
+/// Vertical stripes 5 points wide (out of step with every glass surface), alternately light and
+/// dark, over the whole raster.
+fn stripes(w: usize, h: usize) -> Vec<u8> {
+    image(w, h, |x, _| if (x / 5) % 2 == 0 { [230, 200, 60, 255] } else { [20, 40, 120, 255] })
+}
+
+#[test]
+fn glass_bends_the_image_by_its_texture() {
+    let (w, h) = (48, 40);
+    let src = stripes(w, h);
+    let run = |p: serde_json::Value| {
+        let mut d = src.clone();
+        fx("distort.glass", p).apply(&mut d, w, h, &space(w, h));
+        d
+    };
+    // No distortion, no change.
+    assert_eq!(run(json!({"distortion": 0})), src);
+    let mut seen = vec![];
+    for (_, texture) in GLASS_TEXTURES {
+        let bent = run(json!({"texture": texture, "distortion": 12}));
+        assert_ne!(bent, src, "{texture}");
+        assert!(!seen.contains(&bent), "{texture} differs from the other textures");
+        assert_ne!(run(json!({"texture": texture, "distortion": 12, "invert": true})), bent, "{texture} inverted");
+        // A colour moves; none is invented: every pixel blends two neighbouring stripes at most
+        // (those within a shift of the raster's edges also take in the transparency beyond it).
+        for (x, y) in (6..w - 6).flat_map(|x| (6..h - 6).map(move |y| (x, y))) {
+            let p = at(&bent, w, x, y);
+            assert!(p[3] == 255 && p[0] >= 20 && p[0] <= 230, "{texture} at ({x}, {y}): {p:?}");
+        }
+        seen.push(bent);
+    }
+    // Smoother glass bends the stripes differently (more gently).
+    assert_ne!(run(json!({"distortion": 12, "smoothness": 15})), run(json!({"distortion": 12, "smoothness": 1})));
+}
+
+#[test]
+fn ocean_ripple_moves_content_no_farther_than_its_magnitude() {
+    let (w, h) = (64, 32);
+    // The left half white, the right half transparent.
+    let src = image(w, h, |x, _| if x < 32 { grey(255) } else { [0; 4] });
+    let mut d = src.clone();
+    fx("distort.oceanRipple", json!({"rippleMagnitude": 0})).apply(&mut d, w, h, &space(w, h));
+    assert_eq!(d, src, "no magnitude, no ripples");
+    let f = fx("distort.oceanRipple", json!({"rippleSize": 6, "rippleMagnitude": 20}));
+    let most = f.reach().unwrap();
+    let mut d = src.clone();
+    f.apply(&mut d, w, h, &space(w, h));
+    assert_ne!(d, src);
+    // Away from the white's edge, and from the raster's (beyond which is transparency), nothing
+    // changes.
+    let inside = |v: usize, n: usize| (v as f64 + 0.5).min(n as f64 - v as f64 - 0.5) > most + 1.0;
+    for y in (0..h).filter(|y| inside(*y, h)) {
+        for x in (0..w).filter(|x| inside(*x, w)) {
+            let to_edge = (x as f64 + 0.5 - 32.0).abs();
+            if to_edge > most + 1.0 {
+                assert_eq!(at(&d, w, x, y), at(&src, w, x, y), "({x}, {y}) is {to_edge} from the edge, past {most}");
+            }
+        }
+    }
+    // The edge wanders: some rows reach farther right than others.
+    let ends: Vec<usize> = (0..h).map(|y| (0..w).filter(|x| at(&d, w, *x, y)[3] > 127).count()).collect();
+    assert!(ends.iter().min() != ends.iter().max(), "{ends:?}");
+}
+
+#[test]
+fn diffuse_glow_whitens_the_highlights_and_sprinkles_grain() {
+    let (w, h) = (48, 48);
+    // Dark on the left, light on the right, a transparent margin round them.
+    let src = image(w, h, |x, y| {
+        if !(4..44).contains(&x) || !(4..44).contains(&y) {
+            [0; 4]
+        } else if x < 24 {
+            [30, 30, 60, 255]
+        } else {
+            [200, 190, 170, 255]
+        }
+    });
+    let run = |p: serde_json::Value| {
+        let mut d = src.clone();
+        fx("distort.diffuseGlow", p).apply(&mut d, w, h, &space(w, h));
+        d
+    };
+    let clean = run(json!({"graininess": 0}));
+    // Transparency stays; the shadows stay clear; the highlights glow.
+    for (a, b) in clean.as_chunks::<4>().0.iter().zip(src.as_chunks::<4>().0) {
+        assert_eq!(a[3], b[3]);
+    }
+    assert_eq!(at(&clean, w, 10, 24), at(&src, w, 10, 24));
+    let (lit, before) = (at(&clean, w, 36, 24), at(&src, w, 36, 24));
+    assert!((0..3).all(|c| lit[c] > before[c]), "{lit:?} brighter than {before:?}");
+    // More Clear Amount leaves more of the image clear of glow.
+    assert!(at(&run(json!({"graininess": 0, "clearAmount": 20})), w, 36, 24)[0] < lit[0]);
+    assert_eq!(run(json!({"graininess": 0, "glowAmount": 0})), src);
+    // Grain: white specks, in the shadows too.
+    let grainy = run(json!({"graininess": 10}));
+    let specks = (4..24).flat_map(|x| (4..44).map(move |y| (x, y))).filter(|(x, y)| at(&grainy, w, *x, *y)[0] > 100).count();
+    assert!(specks > 10, "{specks} white specks in the shadows");
+}
+
+#[test]
+fn distort_patterns_follow_the_object_at_any_resolution() {
+    let (w, h) = (48, 48);
+    let art = |x: f64, y: f64| -> [u8; 4] {
+        if (8.0..40.0).contains(&x) && (8.0..40.0).contains(&y) { [(x * 5.0) as u8, (y * 5.0) as u8, 120, 255] } else { [0; 4] }
+    };
+    for (id, p) in [
+        ("distort.diffuseGlow", json!({"clearAmount": 5})),
+        ("distort.glass", json!({"texture": "blocks", "distortion": 8})),
+        ("distort.oceanRipple", json!({"rippleMagnitude": 12})),
+    ] {
+        let f = fx(id, p);
+        let mut one = image(w, h, |x, y| art(x as f64 + 0.5, y as f64 + 0.5));
+        f.apply(&mut one, w, h, &space(w, h));
+        let mut two = image(2 * w, 2 * h, |x, y| art((x as f64 + 0.5) / 2.0, (y as f64 + 0.5) / 2.0));
+        let fine = PixelSpace { to_doc: Affine::scale(0.5), px: 0.5, ..space(w, h) };
+        f.apply(&mut two, 2 * w, 2 * h, &fine);
+        let down = image(w, h, |x, y| {
+            let q = [(0, 0), (1, 0), (0, 1), (1, 1)].map(|(dx, dy)| at(&two, 2 * w, 2 * x + dx, 2 * y + dy));
+            std::array::from_fn(|c| (q.iter().map(|p| u32::from(p[c])).sum::<u32>() / 4) as u8)
+        });
+        let diff = one.iter().zip(&down).map(|(a, b)| f64::from(a.abs_diff(*b))).sum::<f64>() / one.len() as f64;
+        assert!(diff < 12.0, "{id}: {diff}");
+        let moved = PixelSpace { to_doc: Affine::translate((7.0, 3.0)), center: Point::new(31.0, 27.0), ..space(w, h) };
+        let mut shifted = image(w, h, |x, y| art(x as f64 + 0.5, y as f64 + 0.5));
+        f.apply(&mut shifted, w, h, &moved);
+        assert_eq!(shifted, one, "{id}");
+    }
+}
+
+/// The Brush Strokes effect ids.
+fn brush_strokes() -> impl Iterator<Item = &'static str> {
+    PIXEL_EFFECTS.into_iter().filter(|id| id.starts_with("brushStrokes."))
+}
+
+#[test]
+fn brush_strokes_params_take_defaults_and_stay_in_range() {
+    assert_eq!(fx("brushStrokes.accentedEdges", json!({})), PixelFx::AccentedEdges { width: 2.0, brightness: 38.0, smoothness: 5.0 });
+    assert_eq!(
+        fx("brushStrokes.accentedEdges", json!({"edgeWidth": 99, "edgeBrightness": -1, "smoothness": "x"})),
+        PixelFx::AccentedEdges { width: 14.0, brightness: 0.0, smoothness: 5.0 }
+    );
+    assert_eq!(fx("brushStrokes.angledStrokes", json!({})), PixelFx::AngledStrokes { balance: 50.0, length: 15.0, sharpness: 3.0 });
+    assert_eq!(
+        fx("brushStrokes.angledStrokes", json!({"directionBalance": 1e308, "strokeLength": 0, "sharpness": 11})),
+        PixelFx::AngledStrokes { balance: 100.0, length: 3.0, sharpness: 10.0 }
+    );
+    assert_eq!(fx("brushStrokes.crosshatch", json!({})), PixelFx::Crosshatch { length: 9.0, sharpness: 6.0, strength: 1 });
+    assert_eq!(
+        fx("brushStrokes.crosshatch", json!({"strokeLength": 51, "sharpness": -1, "strength": 2.6})),
+        PixelFx::Crosshatch { length: 50.0, sharpness: 0.0, strength: 3 }
+    );
+    assert_eq!(fx("brushStrokes.crosshatch", json!({"strength": -7})), PixelFx::Crosshatch { length: 9.0, sharpness: 6.0, strength: 1 });
+    assert_eq!(fx("brushStrokes.darkStrokes", json!({})), PixelFx::DarkStrokes { balance: 5.0, black: 6.0, white: 2.0 });
+    assert_eq!(
+        fx("brushStrokes.darkStrokes", json!({"balance": 11, "blackIntensity": -1, "whiteIntensity": 1e9})),
+        PixelFx::DarkStrokes { balance: 10.0, black: 0.0, white: 10.0 }
+    );
+    assert_eq!(fx("brushStrokes.inkOutlines", json!({})), PixelFx::InkOutlines { length: 4.0, dark: 20.0, light: 10.0 });
+    assert_eq!(
+        fx("brushStrokes.inkOutlines", json!({"strokeLength": 0, "darkIntensity": 51, "lightIntensity": -5})),
+        PixelFx::InkOutlines { length: 1.0, dark: 50.0, light: 0.0 }
+    );
+    assert_eq!(fx("brushStrokes.spatter", json!({})), PixelFx::Spatter { radius: 10.0, smoothness: 5.0 });
+    assert_eq!(fx("brushStrokes.spatter", json!({"sprayRadius": 26, "smoothness": 0})), PixelFx::Spatter { radius: 25.0, smoothness: 1.0 });
+    assert_eq!(
+        fx("brushStrokes.sprayedStrokes", json!({})),
+        PixelFx::SprayedStrokes { length: 12.0, radius: 7.0, direction: StrokeDirection::RightDiagonal }
+    );
+    assert_eq!(
+        fx("brushStrokes.sprayedStrokes", json!({"strokeLength": -1, "sprayRadius": 1e308, "strokeDirection": "VERTICAL"})),
+        PixelFx::SprayedStrokes { length: 0.0, radius: 25.0, direction: StrokeDirection::Vertical }
+    );
+    assert_eq!(fx("brushStrokes.sprayedStrokes", json!({"strokeDirection": "diagonal"})), fx("brushStrokes.sprayedStrokes", json!({})));
+    assert_eq!(fx("brushStrokes.sumiE", json!({})), PixelFx::SumiE { width: 10.0, pressure: 2.0, contrast: 16.0 });
+    assert_eq!(
+        fx("brushStrokes.sumiE", json!({"strokeWidth": 2, "strokePressure": 16, "contrast": -1})),
+        PixelFx::SumiE { width: 3.0, pressure: 15.0, contrast: 0.0 }
+    );
+    // Outsets: the strokes and the shifts reach out of the object as far as into it; Accented
+    // Edges and Sumi-e keep the object's shape.
+    let b = Rect::new(0.0, 0.0, 100.0, 50.0);
+    let reach = brushstrokes::stroke_reach;
+    assert!((reach(20.0) - (0.75 * 20.0 + 1.5 / 15.0 * 20.0 + 1.0)).abs() < 1e-9);
+    assert_eq!(fx("brushStrokes.accentedEdges", json!({})).outset(b), 0.0);
+    assert_eq!(fx("brushStrokes.accentedEdges", json!({})).reach(), Some(3.0 * (0.35 * 2.0 + 0.5) + 1.0));
+    assert_eq!(fx("brushStrokes.angledStrokes", json!({})).outset(b), reach(15.0));
+    assert_eq!(fx("brushStrokes.crosshatch", json!({})).outset(b), reach(9.0) + 0.9);
+    assert_eq!(fx("brushStrokes.darkStrokes", json!({})).outset(b), reach(9.0));
+    assert_eq!(fx("brushStrokes.inkOutlines", json!({"strokeLength": 50})).outset(b), reach(50.0));
+    let spatter = fx("brushStrokes.spatter", json!({}));
+    assert_eq!((spatter.outset(b), spatter.reach()), (4.0, Some(4.0)));
+    assert_eq!(fx("brushStrokes.spatter", json!({"sprayRadius": 0})).outset(b), 0.0);
+    assert_eq!(fx("brushStrokes.sprayedStrokes", json!({})).outset(b), reach(12.0) + 0.3 * 7.0);
+    assert_eq!(fx("brushStrokes.sumiE", json!({})).outset(b), 0.0);
+    for id in brush_strokes() {
+        let f = fx(id, json!({}));
+        assert!(f.reach().is_some_and(|r| r >= f.outset(b)), "{id}");
+    }
+}
+
+/// A light square in a darker ground with a ramp across it, over the whole raster: edges,
+/// shadows and highlights for the strokes to work on.
+fn scene(w: usize, h: usize) -> Vec<u8> {
+    image(w, h, |x, y| if (12..36).contains(&x) && (12..36).contains(&y) { [235, 220, 190, 255] } else { [(30 + x) as u8, 40, 90, 255] })
+}
+
+/// `src` (`w` × `h`) through effect `id` with parameters `p`.
+fn run_fx(src: &[u8], w: usize, h: usize, id: &str, p: serde_json::Value) -> Vec<u8> {
+    let mut d = src.to_vec();
+    fx(id, p).apply(&mut d, w, h, &space(w, h));
+    d
+}
+
+#[test]
+fn brush_strokes_each_repaint_the_art_their_own_way() {
+    let (w, h) = (48, 48);
+    let src = scene(w, h);
+    let mut seen: Vec<(&str, Vec<u8>)> = vec![];
+    for id in brush_strokes() {
+        let d = run_fx(&src, w, h, id, json!({}));
+        assert_ne!(d, src, "{id} changes the art");
+        for (other, o) in &seen {
+            assert_ne!(&d, o, "{id} differs from {other}");
+        }
+        seen.push((id, d));
+    }
+    assert_eq!(seen.len(), 8);
+    // Each stroke direction paints its own way.
+    let mut ways: Vec<Vec<u8>> = vec![];
+    for (_, way) in STROKE_DIRECTIONS {
+        let d = run_fx(&src, w, h, "brushStrokes.sprayedStrokes", json!({"strokeDirection": way}));
+        assert!(!ways.contains(&d), "{way} differs from the other directions");
+        ways.push(d);
+    }
+    // Every option shows.
+    for (id, a, b) in [
+        ("brushStrokes.accentedEdges", json!({"edgeWidth": 1}), json!({"edgeWidth": 14})),
+        ("brushStrokes.accentedEdges", json!({"smoothness": 1}), json!({"smoothness": 15})),
+        ("brushStrokes.angledStrokes", json!({"directionBalance": 0}), json!({"directionBalance": 100})),
+        ("brushStrokes.angledStrokes", json!({"strokeLength": 3}), json!({"strokeLength": 50})),
+        ("brushStrokes.angledStrokes", json!({"sharpness": 0}), json!({"sharpness": 10})),
+        ("brushStrokes.crosshatch", json!({"strokeLength": 3}), json!({"strokeLength": 50})),
+        ("brushStrokes.crosshatch", json!({"sharpness": 0}), json!({"sharpness": 20})),
+        ("brushStrokes.crosshatch", json!({"strength": 1}), json!({"strength": 3})),
+        ("brushStrokes.darkStrokes", json!({"balance": 0}), json!({"balance": 10})),
+        ("brushStrokes.darkStrokes", json!({"blackIntensity": 0}), json!({"blackIntensity": 10})),
+        ("brushStrokes.darkStrokes", json!({"whiteIntensity": 0}), json!({"whiteIntensity": 10})),
+        ("brushStrokes.inkOutlines", json!({"strokeLength": 1}), json!({"strokeLength": 50})),
+        ("brushStrokes.inkOutlines", json!({"darkIntensity": 0}), json!({"darkIntensity": 50})),
+        ("brushStrokes.inkOutlines", json!({"lightIntensity": 0}), json!({"lightIntensity": 50})),
+        ("brushStrokes.spatter", json!({"sprayRadius": 5}), json!({"sprayRadius": 25})),
+        ("brushStrokes.spatter", json!({"smoothness": 1}), json!({"smoothness": 15})),
+        ("brushStrokes.sprayedStrokes", json!({"strokeLength": 0}), json!({"strokeLength": 20})),
+        ("brushStrokes.sprayedStrokes", json!({"sprayRadius": 0}), json!({"sprayRadius": 25})),
+        ("brushStrokes.sumiE", json!({"strokeWidth": 3}), json!({"strokeWidth": 15})),
+        ("brushStrokes.sumiE", json!({"strokePressure": 0}), json!({"strokePressure": 15})),
+        ("brushStrokes.sumiE", json!({"contrast": 0}), json!({"contrast": 40})),
+    ] {
+        assert_ne!(run_fx(&src, w, h, id, a.clone()), run_fx(&src, w, h, id, b.clone()), "{id}: {a} and {b}");
+    }
+}
+
+/// The mean of the colour channels over columns `xs` and rows `ys` (0..255).
+fn mean_tone(d: &[u8], w: usize, xs: std::ops::Range<usize>, ys: std::ops::Range<usize>) -> f64 {
+    let px: Vec<[u8; 4]> = ys.flat_map(|y| xs.clone().map(move |x| (x, y))).map(|(x, y)| at(d, w, x, y)).collect();
+    px.iter().map(|p| f64::from(p[0]) + f64::from(p[1]) + f64::from(p[2])).sum::<f64>() / (3.0 * px.len().max(1) as f64)
+}
+
+/// Dark on the left, light on the right, opaque over the whole raster.
+fn halves(w: usize, h: usize) -> Vec<u8> {
+    image(w, h, |x, _| if x < w / 2 { [50, 60, 100, 255] } else { [210, 200, 180, 255] })
+}
+
+#[test]
+fn accented_edges_draw_chalk_or_ink_on_the_edges_only() {
+    let (w, h) = (48, 48);
+    // The halves inside a transparent margin.
+    let both = halves(w, h);
+    let src = image(w, h, |x, y| if (4..44).contains(&x) && (4..44).contains(&y) { at(&both, w, x, y) } else { [0; 4] });
+    let chalk = run_fx(&src, w, h, "brushStrokes.accentedEdges", json!({"edgeBrightness": 50}));
+    let ink = run_fx(&src, w, h, "brushStrokes.accentedEdges", json!({"edgeBrightness": 0}));
+    let sum = |p: [u8; 4]| u32::from(p[0]) + u32::from(p[1]) + u32::from(p[2]);
+    // Along the edge between the halves: white chalk on the dark side, black ink on the light.
+    assert!(sum(at(&chalk, w, 23, 24)) > sum(at(&src, w, 23, 24)) + 150, "{:?}", at(&chalk, w, 23, 24));
+    assert!(sum(at(&ink, w, 24, 24)) + 150 < sum(at(&src, w, 24, 24)), "{:?}", at(&ink, w, 24, 24));
+    // Away from the edges nothing changes, and the object keeps its shape.
+    for (x, y) in [(13, 24), (34, 24), (13, 13)] {
+        assert_eq!(at(&chalk, w, x, y), at(&src, w, x, y), "({x}, {y})");
+    }
+    for (a, b) in chalk.as_chunks::<4>().0.iter().zip(src.as_chunks::<4>().0) {
+        assert_eq!(a[3], b[3]);
+    }
+}
+
+#[test]
+fn dark_and_ink_strokes_darken_the_shadows_and_sumi_e_inks_them_black() {
+    let (w, h) = (64, 48);
+    let src = halves(w, h);
+    let (shadow, light) = (8..24, 40..56);
+    let tone = |d: &[u8], xs: std::ops::Range<usize>| mean_tone(d, w, xs, 8..40);
+    let dark = run_fx(&src, w, h, "brushStrokes.darkStrokes", json!({}));
+    assert!(tone(&dark, shadow.clone()) < tone(&src, shadow.clone()) - 20.0, "dark strokes in the shadows");
+    assert!(tone(&dark, light.clone()) > tone(&src, light.clone()) + 5.0, "white strokes in the light");
+    let ink = run_fx(&src, w, h, "brushStrokes.inkOutlines", json!({}));
+    assert!(tone(&ink, shadow.clone()) < tone(&src, shadow.clone()) - 10.0, "ink in the shadows");
+    // The outline along the edge is darker than the light side around it.
+    assert!(tone(&ink, 32..34) + 40.0 < tone(&ink, light.clone()), "an ink outline along the edge");
+    let sumi = run_fx(&src, w, h, "brushStrokes.sumiE", json!({}));
+    assert!(tone(&sumi, shadow.clone()) < 0.4 * tone(&src, shadow.clone()), "rich blacks: {}", tone(&sumi, shadow.clone()));
+    assert!(tone(&sumi, 50..56) > 150.0, "the light stays light: {}", tone(&sumi, 50..56));
+}
+
+#[test]
+fn sumi_e_keeps_the_shape_and_the_hues() {
+    let (w, h) = (48, 48);
+    // A strong yellow square and a dark blue one in a transparent margin.
+    let src = image(w, h, |x, y| match (x, y) {
+        (8..24, 8..40) => [230, 200, 40, 255],
+        (24..40, 8..40) => [30, 40, 120, 255],
+        _ => [0; 4],
+    });
+    let d = run_fx(&src, w, h, "brushStrokes.sumiE", json!({"contrast": 40, "strokePressure": 15}));
+    // Transparency stays transparent and the coverage stays as it was: no fringe.
+    for (a, b) in d.as_chunks::<4>().0.iter().zip(src.as_chunks::<4>().0) {
+        assert_eq!(a[3], b[3]);
+        if b[3] == 0 {
+            assert_eq!(*a, [0; 4]);
+        }
+    }
+    // The yellow stays yellow, no more saturated than it was.
+    let sat = |p: [u8; 4]| {
+        let (hi, lo) = (p[..3].iter().max().copied().unwrap(), p[..3].iter().min().copied().unwrap());
+        f64::from(hi - lo) / f64::from(hi.max(1))
+    };
+    let y = at(&d, w, 12, 24);
+    assert!(y[0] > y[2] + 80 && y[1] > y[2] + 80, "{y:?}");
+    assert!(sat(y) <= sat([230, 200, 40, 255]) + 0.02, "{y:?}");
+    // The dark blue is inked darker, still blue.
+    let b = at(&d, w, 34, 24);
+    assert!(b[2] < 120 && b[2] >= b[0] && b[2] >= b[1], "{b:?}");
+}
+
+#[test]
+fn crosshatch_hatches_flat_colour_and_keeps_its_tone() {
+    let (w, h) = (48, 48);
+    let src = image(w, h, |_, _| grey(128));
+    let spread = |d: &[u8]| {
+        let m = mean_tone(d, w, 8..40, 8..40);
+        let var = (8..40).flat_map(|x| (8..40).map(move |y| (x, y))).map(|(x, y)| (f64::from(at(d, w, x, y)[0]) - m).powi(2)).sum::<f64>() / 1024.0;
+        (m, var.sqrt())
+    };
+    let (one, three) =
+        (run_fx(&src, w, h, "brushStrokes.crosshatch", json!({})), run_fx(&src, w, h, "brushStrokes.crosshatch", json!({"strength": 3})));
+    let ((m1, s1), (_, s3)) = (spread(&one), spread(&three));
+    assert!((m1 - 128.0).abs() < 25.0 && s1 > 3.0, "{m1} ± {s1}");
+    assert!(s3 > s1, "more passes, more hatching: {s3} vs {s1}");
+}
+
+#[test]
+fn stroke_directions_smear_along_themselves() {
+    let (w, h) = (48, 48);
+    // A white line two pixels thick across black.
+    let src = image(w, h, |_, y| if (23..25).contains(&y) { grey(255) } else { grey(0) });
+    let row = |d: &[u8], y: usize| mean_tone(d, w, 12..36, y..y + 1);
+    let along = run_fx(&src, w, h, "brushStrokes.sprayedStrokes", json!({"sprayRadius": 0, "strokeDirection": "horizontal"}));
+    let across = run_fx(&src, w, h, "brushStrokes.sprayedStrokes", json!({"sprayRadius": 0, "strokeDirection": "vertical"}));
+    assert!(row(&along, 20) < 1.0 && row(&along, 24) > 250.0, "strokes along the line keep it");
+    assert!(row(&across, 20) > 15.0 && row(&across, 24) < 200.0, "strokes across it spread it: {} {}", row(&across, 20), row(&across, 24));
+    // Diagonal strokes spread it too, along the diagonal.
+    let diagonal = run_fx(&src, w, h, "brushStrokes.sprayedStrokes", json!({"sprayRadius": 0}));
+    assert!(row(&diagonal, 20) > 5.0);
+}
+
+#[test]
+fn spatter_scatters_content_no_farther_than_its_radius() {
+    let (w, h) = (64, 32);
+    // The left half white, the right half transparent.
+    let src = image(w, h, |x, _| if x < 32 { grey(255) } else { [0; 4] });
+    assert_eq!(run_fx(&src, w, h, "brushStrokes.spatter", json!({"sprayRadius": 0})), src, "no radius, no spatter");
+    let f = fx("brushStrokes.spatter", json!({"sprayRadius": 15}));
+    let most = f.reach().unwrap();
+    let d = run_fx(&src, w, h, "brushStrokes.spatter", json!({"sprayRadius": 15}));
+    assert_ne!(d, src);
+    let inside = |v: usize, n: usize| (v as f64 + 0.5).min(n as f64 - v as f64 - 0.5) > most + 1.0;
+    for y in (0..h).filter(|y| inside(*y, h)) {
+        for x in (0..w).filter(|x| inside(*x, w) && (*x as f64 + 0.5 - 32.0).abs() > most + 1.0) {
+            assert_eq!(at(&d, w, x, y), at(&src, w, x, y), "({x}, {y})");
+        }
+    }
+    // The edge is spattered: white specks past it and holes before it.
+    let past = (33..36).flat_map(|x| (8..24).map(move |y| (x, y))).filter(|(x, y)| at(&d, w, *x, *y)[3] > 127).count();
+    let holes = (28..31).flat_map(|x| (8..24).map(move |y| (x, y))).filter(|(x, y)| at(&d, w, *x, *y)[3] < 128).count();
+    assert!(past > 0 && holes > 0, "{past} specks past the edge, {holes} holes before it");
+}
+
+#[test]
+fn brush_strokes_look_no_farther_than_their_reach() {
+    let (w, h) = (200, 24);
+    let base = image(w, h, |x, y| [(x * 7 % 256) as u8, (y * 11 % 256) as u8, 120, 255]);
+    let cases = brush_strokes().map(|id| (id, json!({}))).chain([
+        ("brushStrokes.accentedEdges", json!({"edgeWidth": 14, "smoothness": 15})),
+        ("brushStrokes.angledStrokes", json!({"strokeLength": 50})),
+        ("brushStrokes.crosshatch", json!({"strokeLength": 50, "strength": 3})),
+        ("brushStrokes.inkOutlines", json!({"strokeLength": 50})),
+        ("brushStrokes.spatter", json!({"sprayRadius": 25, "smoothness": 15})),
+        ("brushStrokes.sprayedStrokes", json!({"strokeLength": 20, "sprayRadius": 25, "strokeDirection": "horizontal"})),
+        ("brushStrokes.sumiE", json!({"strokeWidth": 15})),
+    ]);
+    for (id, p) in cases {
+        let reach = fx(id, p.clone()).reach().unwrap();
+        // Everything from `cut` on differs; the pixels left of 20 can't tell.
+        let cut = 20 + reach.ceil() as usize + 1;
+        assert!(cut < w, "{id}");
+        let other = image(w, h, |x, y| if x >= cut { [255 - (x * 5 % 256) as u8, 30, (y * 9 % 256) as u8, 200] } else { at(&base, w, x, y) });
+        let (a, b) = (run_fx(&base, w, h, id, p.clone()), run_fx(&other, w, h, id, p.clone()));
+        for (x, y) in (0..20).flat_map(|x| (0..h).map(move |y| (x, y))) {
+            let (pa, pb) = (at(&a, w, x, y), at(&b, w, x, y));
+            assert!(pa.iter().zip(pb).all(|(u, v)| u.abs_diff(v) <= 2), "{id} {p}: ({x}, {y}) {pa:?} vs {pb:?}, reach {reach}");
+        }
+    }
+}
+
+#[test]
+fn brush_strokes_follow_the_object_at_any_resolution() {
+    let (w, h) = (48, 48);
+    let art = |x: f64, y: f64| -> [u8; 4] {
+        if (8.0..40.0).contains(&x) && (8.0..40.0).contains(&y) { [(x * 5.0) as u8, (y * 5.0) as u8, 120, 255] } else { [0; 4] }
+    };
+    for id in brush_strokes() {
+        let f = fx(id, json!({}));
+        let mut one = image(w, h, |x, y| art(x as f64 + 0.5, y as f64 + 0.5));
+        f.apply(&mut one, w, h, &space(w, h));
+        let mut two = image(2 * w, 2 * h, |x, y| art((x as f64 + 0.5) / 2.0, (y as f64 + 0.5) / 2.0));
+        let fine = PixelSpace { to_doc: Affine::scale(0.5), px: 0.5, ..space(w, h) };
+        f.apply(&mut two, 2 * w, 2 * h, &fine);
+        let down = image(w, h, |x, y| {
+            let q = [(0, 0), (1, 0), (0, 1), (1, 1)].map(|(dx, dy)| at(&two, 2 * w, 2 * x + dx, 2 * y + dy));
+            std::array::from_fn(|c| (q.iter().map(|p| u32::from(p[c])).sum::<u32>() / 4) as u8)
+        });
+        let diff = one.iter().zip(&down).map(|(a, b)| f64::from(a.abs_diff(*b))).sum::<f64>() / one.len() as f64;
+        assert!(diff < 12.0, "{id}: {diff}");
+        let moved = PixelSpace { to_doc: Affine::translate((7.0, 3.0)), center: Point::new(31.0, 27.0), ..space(w, h) };
+        let mut shifted = image(w, h, |x, y| art(x as f64 + 0.5, y as f64 + 0.5));
+        f.apply(&mut shifted, w, h, &moved);
+        assert_eq!(shifted, one, "{id}");
+    }
+}

crates/effects/src/pixel/texture.rs

@@ -0,0 +1,576 @@
+//! Texture › Craquelure, Grain, Mosaic Tiles, Patchwork, Stained Glass and Texturizer.
+//!
+//! Like the Pixelate filters' patterns, theirs (cracks, grain, tiles, squares, panes and the
+//! Texturizer's surfaces, all generated here, no image files) lie in document space around the
+//! object's centre: the same at any zoom or resolution, moving with the object, and the same on
+//! every redraw (hash noise of the pattern's cell indices). Surfaces in relief are height fields
+//! whose slopes, taken in document units, are lit from one side.
+
+use std::f64::consts::{FRAC_1_SQRT_2, PI};
+
+use vectorcraft_geom::{Point, Vec2};
+
+use super::pixelate::{AROUND, Around, Place, Soft, cell, gap, point_in, rand, value_noise};
+use super::{PixelSpace, blur_plane, pick};
+
+/// Grain's types, in its Grain Type menu's order: (label, parameter value).
+pub const GRAIN_TYPES: [(&str, &str); 10] = [
+    ("Regular", "regular"),
+    ("Soft", "soft"),
+    ("Sprinkles", "sprinkles"),
+    ("Clumped", "clumped"),
+    ("Contrasty", "contrasty"),
+    ("Enlarged", "enlarged"),
+    ("Stippled", "stippled"),
+    ("Horizontal", "horizontal"),
+    ("Vertical", "vertical"),
+    ("Speckle", "speckle"),
+];
+
+/// A Grain type ([`GRAIN_TYPES`]).
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Grain {
+    Regular,
+    Soft,
+    Sprinkles,
+    Clumped,
+    Contrasty,
+    Enlarged,
+    Stippled,
+    Horizontal,
+    Vertical,
+    Speckle,
+}
+
+impl Grain {
+    const ALL: [Grain; 10] = [
+        Grain::Regular,
+        Grain::Soft,
+        Grain::Sprinkles,
+        Grain::Clumped,
+        Grain::Contrasty,
+        Grain::Enlarged,
+        Grain::Stippled,
+        Grain::Horizontal,
+        Grain::Vertical,
+        Grain::Speckle,
+    ];
+
+    /// The type of Grain Type `value` (a [`GRAIN_TYPES`] value, any case); Regular otherwise.
+    pub fn parse(value: &str) -> Self {
+        pick(&GRAIN_TYPES, &Self::ALL, value, Grain::Regular)
+    }
+}
+
+/// Texturizer's textures, in its Texture menu's order: (label, parameter value).
+pub const TEXTURES: [(&str, &str); 4] = [("Brick", "brick"), ("Burlap", "burlap"), ("Canvas", "canvas"), ("Sandstone", "sandstone")];
+
+/// A Texturizer surface ([`TEXTURES`]), made in code.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Texture {
+    Brick,
+    Burlap,
+    Canvas,
+    Sandstone,
+}
+
+impl Texture {
+    const ALL: [Texture; 4] = [Texture::Brick, Texture::Burlap, Texture::Canvas, Texture::Sandstone];
+
+    /// The texture of `value` (a [`TEXTURES`] value, any case); Canvas otherwise.
+    pub fn parse(value: &str) -> Self {
+        pick(&TEXTURES, &Self::ALL, value, Texture::Canvas)
+    }
+
+    /// The surface's height at `p` (points at 100 %), in points: slopes of about 1 at most.
+    pub(super) fn height(self, p: Point) -> f64 {
+        match self {
+            Texture::Brick => brick(p),
+            Texture::Burlap => weave(p, 7.0, true),
+            Texture::Canvas => weave(p, 4.0, false),
+            Texture::Sandstone => sandstone(p),
+        }
+    }
+}
+
+/// Texturizer's light directions, in its Light menu's order: (label, parameter value).
+pub const LIGHT_DIRECTIONS: [(&str, &str); 8] = [
+    ("Bottom", "bottom"),
+    ("Bottom Left", "bottomLeft"),
+    ("Left", "left"),
+    ("Top Left", "topLeft"),
+    ("Top", "top"),
+    ("Top Right", "topRight"),
+    ("Right", "right"),
+    ("Bottom Right", "bottomRight"),
+];
+
+/// Where a surface is lit from ([`LIGHT_DIRECTIONS`]), on the page.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub enum Light {
+    Bottom,
+    BottomLeft,
+    Left,
+    TopLeft,
+    Top,
+    TopRight,
+    Right,
+    BottomRight,
+}
+
+impl Light {
+    const ALL: [Light; 8] =
+        [Light::Bottom, Light::BottomLeft, Light::Left, Light::TopLeft, Light::Top, Light::TopRight, Light::Right, Light::BottomRight];
+
+    /// The direction of `value` (a [`LIGHT_DIRECTIONS`] value, any case); Top otherwise.
+    pub fn parse(value: &str) -> Self {
+        pick(&LIGHT_DIRECTIONS, &Self::ALL, value, Light::Top)
+    }
+
+    /// The unit vector towards the light (document axes, y down).
+    fn toward(self) -> Vec2 {
+        let d = FRAC_1_SQRT_2;
+        match self {
+            Light::Bottom => Vec2::new(0.0, 1.0),
+            Light::BottomLeft => Vec2::new(-d, d),
+            Light::Left => Vec2::new(-1.0, 0.0),
+            Light::TopLeft => Vec2::new(-d, -d),
+            Light::Top => Vec2::new(0.0, -1.0),
+            Light::TopRight => Vec2::new(d, -d),
+            Light::Right => Vec2::new(1.0, 0.0),
+            Light::BottomRight => Vec2::new(d, d),
+        }
+    }
+}
+
+/// Seeds of the Texture filters' patterns (Pixelate's use smaller salts).
+const SALT_CRACKS: u64 = 64;
+const SALT_GRAIN: u64 = 72;
+const SALT_TILES: u64 = 88;
+const SALT_PATCH: u64 = 96;
+const SALT_GLASS: u64 = 104;
+const SALT_SURFACE: u64 = 112;
+
+/// How soft Craquelure's tones are, as a share of the crack spacing: their contours become cracks.
+pub(super) const CONTOUR_SOFTNESS: f64 = 1.0 / 6.0;
+
+/// A pixel's straight colour (0..1).
+pub(super) fn straight(p: [u8; 4]) -> [f32; 3] {
+    let a = f32::from(p[3]);
+    [p[0], p[1], p[2]].map(|v| if a > 0.0 { (f32::from(v) / a).min(1.0) } else { 0.0 })
+}
+
+/// The pixel of straight colour `c` at coverage `alpha` (0..1), premultiplied.
+pub(super) fn premultiply(c: [f32; 3], alpha: f32) -> [u8; 4] {
+    let a = (alpha.clamp(0.0, 1.0) * 255.0).round();
+    let [r, g, b] = c.map(|v| (v.clamp(0.0, 1.0) * a).round().min(a) as u8);
+    [r, g, b, a as u8]
+}
+
+/// Colour `c` lit by `s`: darkened towards black below 0, lightened towards white above.
+fn lit(c: [f32; 3], s: f64) -> [f32; 3] {
+    let s = if s.is_finite() { s.clamp(-1.0, 1.0) as f32 } else { 0.0 };
+    c.map(|v| if s < 0.0 { v * (1.0 + s) } else { v + (1.0 - v) * s })
+}
+
+/// How a surface whose height rises along `slope` (height per length) faces a light from
+/// `toward`: 0 flat, positive facing it, negative turned away.
+fn facing(slope: Vec2, toward: Vec2) -> f64 {
+    -slope.dot(toward)
+}
+
+/// The share of a pixel `px` wide that lies within `d` of a line (negative `d`: beyond it).
+fn cover(d: f64, px: f64) -> f64 {
+    (d / px + 0.5).clamp(0.0, 1.0)
+}
+
+/// The luma of colour `c` (Rec. 601 weights).
+pub(super) fn luma(c: [f32; 3]) -> f32 {
+    0.299 * c[0] + 0.587 * c[1] + 0.114 * c[2]
+}
+
+/// The two random points nearest to (`u`, `v`) (in cells), `point(i, j)` being cell (`i`, `j`)'s,
+/// found among the cells [`AROUND`] the one holding it.
+fn nearest_two(u: f64, v: f64, around: &mut Around<Point>, point: impl Fn(i64, i64) -> Point) -> Option<(Point, Point)> {
+    let (i, j) = (cell(u)?, cell(v)?);
+    let mut best: [(f64, Option<Point>); 2] = [(f64::INFINITY, None); 2];
+    for (k, (di, dj)) in AROUND.iter().enumerate() {
+        // A cell farther than the second point so far can't hold a nearer one.
+        if gap(i.wrapping_add(*di), u).hypot(gap(j.wrapping_add(*dj), v)) >= best[1].0 {
+            continue;
+        }
+        let Some(p) = around.get((i, j), k, &point) else { continue };
+        let d = (p.x - u).hypot(p.y - v);
+        if d < best[0].0 {
+            best = [(d, Some(p)), best[0]];
+        } else if d < best[1].0 {
+            best[1] = (d, Some(p));
+        }
+    }
+    Some((best[0].1?, best[1].1?))
+}
+
+/// How far (`u`, `v`) lies from the border between the cells of `near` and `next` (its nearest
+/// points, [`nearest_two`]), and the way away from it (unit), in cells.
+fn edge(u: f64, v: f64, near: Point, next: Point) -> (f64, Vec2) {
+    let q = Point::new(u, v);
+    let apart = near - next;
+    let len = apart.hypot();
+    if !(len.is_finite() && len > 1e-12) {
+        return (0.0, Vec2::ZERO);
+    }
+    (((q - next).hypot2() - (q - near).hypot2()) / (2.0 * len), apart / len)
+}
+
+/// The slope of a rise of 1 over `width` from a border at distance `d` (smooth at both ends).
+fn bevel(d: f64, width: f64) -> f64 {
+    if !(width.is_finite() && width > 0.0) {
+        return 0.0;
+    }
+    let t = (d / width).clamp(0.0, 1.0);
+    6.0 * t * (1.0 - t)
+}
+
+/// The object's straight luminance (0..1) softened by a Gaussian of `sigma` pixels, weighted by
+/// coverage so the transparency around it doesn't darken its edges.
+pub(super) struct Tones {
+    v: Vec<f32>,
+    w: usize,
+    h: usize,
+}
+
+impl Tones {
+    pub(super) fn new(px: &[[u8; 4]], w: usize, h: usize, sigma: f64) -> Self {
+        let mut l: Vec<f32> = px.iter().map(|p| luma([p[0], p[1], p[2]].map(f32::from)) / 255.0).collect();
+        let mut a: Vec<f32> = px.iter().map(|p| f32::from(p[3]) / 255.0).collect();
+        blur_plane(&mut l, w, h, sigma);
+        blur_plane(&mut a, w, h, sigma);
+        let v = l.iter().zip(&a).map(|(l, a)| if *a > 1e-4 { (l / a).clamp(0.0, 1.0) } else { 0.0 }).collect();
+        Self { v, w, h }
+    }
+
+    pub(super) fn get(&self, x: usize, y: usize) -> f64 {
+        let (x, y) = (x.min(self.w.saturating_sub(1)), y.min(self.h.saturating_sub(1)));
+        self.v.get(y * self.w + x).map_or(0.0, |v| f64::from(*v))
+    }
+
+    /// The tone at pixel (`x`, `y`) and its slope per document unit along the document's axes.
+    fn slope(&self, x: usize, y: usize, place: &Place) -> (f64, Vec2) {
+        let gx = 0.5 * (self.get(x + 1, y) - self.get(x.saturating_sub(1), y));
+        let gy = 0.5 * (self.get(x, y + 1) - self.get(x, y.saturating_sub(1)));
+        // Per pixel → per document unit: through the transpose of the document → pixel map.
+        let [a, b, c, d, _, _] = place.to_px.as_coeffs();
+        (self.get(x, y), Vec2::new(gx * a + gy * b, gx * c + gy * d))
+    }
+}
+
+/// Craquelure: the object painted on relief plaster that cracks into plates about `spacing` apart
+/// and along the contours of its tones. `depth` (0..10) sets how deep and wide the cracks are and
+/// how high the plates and the tones stand; `brightness` (0..10) how brightly the surface is lit.
+pub(super) fn craquelure(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, spacing: f64, depth: f64, brightness: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    if !(spacing.is_finite() && spacing > 0.0) {
+        return;
+    }
+    let depth = (depth / 10.0).clamp(0.0, 1.0);
+    let light = (0.5 + 0.05 * brightness.clamp(0.0, 10.0)) as f32;
+    let soft = CONTOUR_SOFTNESS * spacing;
+    let tones = Tones::new(px, w, h, soft / place.px);
+    let half = (0.15 + 0.6 * depth).min(0.15 * spacing);
+    let rise = (3.0 * half).max(0.12 * spacing);
+    let toward = Light::TopLeft.toward();
+    let mut around = Around::new();
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let q = place.at(x, y);
+        let (u, v) = (q.x / spacing, q.y / spacing);
+        // The cracks between the plates; each plate's edge bevels down into them.
+        let (mut crack, mut slope) = (0.0, Vec2::ZERO);
+        if let Some((near, next)) = nearest_two(u, v, &mut around, |i, j| point_in(SALT_CRACKS, i, j)) {
+            let (e, away) = edge(u, v, near, next);
+            crack = cover(half - e * spacing, place.px);
+            slope = away * (0.6 * bevel(e * spacing - half, rise));
+        }
+        // The cracks along the tones' contours (quarter, half and three-quarter tone).
+        let (tone, grad) = tones.slope(x, y, &place);
+        let steep = grad.hypot();
+        if steep > 1e-4 {
+            let level = (tone * 4.0).round().clamp(1.0, 3.0) / 4.0;
+            crack = crack.max(cover(0.8 * half - (tone - level).abs() / steep, place.px));
+        }
+        slope += grad * (0.8 * soft);
+        let c = lit(straight(*p), 0.5 * depth * facing(slope, toward));
+        let dark = (1.0 - 0.85 * crack * depth) as f32;
+        *p = premultiply(c.map(|v| v * light * dark), f32::from(p[3]) / 255.0);
+    });
+}
+
+/// A random value in [-1, 1) for the `size`-point cell holding `q`; `k` picks one of several.
+pub(super) fn cell_noise(salt: u64, q: Point, size: f64, k: u64) -> f64 {
+    match (cell(q.x / size), cell(q.y / size)) {
+        (Some(i), Some(j)) => 2.0 * rand(salt, i, j, k) - 1.0,
+        _ => 0.0,
+    }
+}
+
+/// [`value_noise`] in [-1, 1) over cells `size` points wide.
+pub(super) fn smooth_noise(salt: u64, q: Point, size: f64) -> f64 {
+    2.0 * value_noise(salt, q.x / size, q.y / size) - 1.0
+}
+
+/// Grain: noise of `kind` over the object in 1-point grains (2 for Enlarged, clumps for Clumped),
+/// as strong as `intensity` (0..100); `contrast` (0..100, 50 leaves it) sets the image's
+/// contrast. Sprinkles and Stippled use the background colour, white.
+pub(super) fn grain(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, intensity: f64, contrast: f64, kind: Grain) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let a = (intensity / 100.0).clamp(0.0, 1.0);
+    let k = (0.5 + contrast / 100.0).clamp(0.5, 1.5) as f32;
+    let s = SALT_GRAIN;
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let q = place.at(x, y);
+        let mut c = straight(*p).map(|v| (v - 0.5) * k + 0.5);
+        let chance = 0.5 * (cell_noise(s, q, 1.0, 3) + 1.0);
+        match kind {
+            Grain::Regular => add(&mut c, |ch| cell_noise(s, q, 1.0, ch), 0.5 * a),
+            Grain::Soft => add(&mut c, |ch| smooth_noise(s + ch, q, 1.0), 0.4 * a),
+            Grain::Clumped => add(&mut c, |ch| 0.65 * smooth_noise(s + ch, q, 3.0) + 0.35 * cell_noise(s, q, 1.0, ch), 0.6 * a),
+            Grain::Enlarged => add(&mut c, |ch| 0.5 * (smooth_noise(s + ch, q, 2.0) + cell_noise(s, q, 2.0, ch)), 0.5 * a),
+            Grain::Contrasty => {
+                c = c.map(|v| (v - 0.5) * 1.4 + 0.5);
+                add(&mut c, |_| cell_noise(s, q, 1.0, 4), 0.6 * a);
+            }
+            Grain::Horizontal | Grain::Vertical => {
+                // Streaks one point thick: a value per row (column) drifting along it.
+                let (along, across) = if kind == Grain::Horizontal { (q.x, q.y) } else { (q.y, q.x) };
+                let line = cell(across).unwrap_or(0);
+                let n = 0.6 * (2.0 * rand(s, 0, line, 6) - 1.0) + 0.4 * (2.0 * value_noise(s + 7, along / 12.0, line as f64) - 1.0);
+                add(&mut c, |_| n, 0.5 * a);
+            }
+            Grain::Sprinkles => {
+                if chance < 0.35 * a {
+                    c = c.map(|v| v + (1.0 - v) * 0.9);
+                }
+            }
+            Grain::Speckle => {
+                if chance < 0.25 * a {
+                    c = c.map(|v| v * 0.25);
+                } else {
+                    add(&mut c, |_| cell_noise(s, q, 1.0, 5), 0.1 * a);
+                }
+            }
+            Grain::Stippled => {
+                // Dots of the colour where it is dark, the background between them.
+                let dots = f64::from(1.0 - luma(c).clamp(0.0, 1.0)) * (0.35 + 0.65 * a);
+                c = if chance < dots { c.map(|v| v * 0.6) } else { [1.0; 3] };
+            }
+        }
+        *p = premultiply(c, f32::from(p[3]) / 255.0);
+    });
+}
+
+/// Add noise `n(channel)` (-1..1) times `amount` to colour `c`.
+fn add(c: &mut [f32; 3], n: impl Fn(u64) -> f64, amount: f64) {
+    for (ch, v) in c.iter_mut().enumerate() {
+        *v += (amount * n(ch as u64)) as f32;
+    }
+}
+
+/// A random point of cell (`i`, `j`) of pattern `salt` within `jitter` (0..1, a share of the
+/// cell) of its centre, in cells.
+fn jittered(salt: u64, i: i64, j: i64, jitter: f64) -> Point {
+    Point::new(i as f64 + 0.5 + jitter * (rand(salt, i, j, 0) - 0.5), j as f64 + 0.5 + jitter * (rand(salt, i, j, 1) - 0.5))
+}
+
+/// Mosaic Tiles: the object laid in irregular tiles about `tile` across, bevelled at their edges,
+/// with sunken grout between them half a point wide per step of `grout` (1..15), as light as
+/// `lighten` (0..10) says.
+pub(super) fn mosaic_tiles(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, tile: f64, grout: f64, lighten: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    if !(tile.is_finite() && tile > 0.0 && grout.is_finite()) {
+        return;
+    }
+    let half = (0.25 * grout).clamp(0.0, 0.225 * tile);
+    let rise = (1.2 * half).max(0.08 * tile);
+    let lighten = (0.08 * lighten.clamp(0.0, 10.0)) as f32;
+    let toward = Light::TopLeft.toward();
+    let mut around = Around::new();
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let q = place.at(x, y);
+        let (u, v) = (q.x / tile, q.y / tile);
+        let Some((near, next)) = nearest_two(u, v, &mut around, |i, j| jittered(SALT_TILES, i, j, 0.5)) else { return };
+        let (e, away) = edge(u, v, near, next);
+        let e = e * tile;
+        let c = straight(*p);
+        let face = lit(c, 0.35 * facing(away * bevel(e - half, rise), toward));
+        // Sunk in shade, then lightened.
+        let sunk = c.map(|v| 0.5 * v + (1.0 - 0.5 * v) * lighten);
+        let g = cover(half - e, place.px) as f32;
+        let mut out = face;
+        for (o, s) in out.iter_mut().zip(sunk) {
+            *o = *o * (1.0 - g) + s * g;
+        }
+        *p = premultiply(out, f32::from(p[3]) / 255.0);
+    });
+}
+
+/// Patchwork: the object in squares `square` points across, each filled with the colour around
+/// its centre and raised to a height of its own (brighter squares stand higher, each a little
+/// more or less at random), its bevelled sides lit from the top left as strongly as `relief`
+/// (0..25) says.
+pub(super) fn patchwork(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, square: f64, relief: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    let side = square.max(1.0);
+    if !side.is_finite() {
+        return;
+    }
+    let soft = Soft::new(px, w, side / 3.0 / place.px);
+    let relief = (relief / 25.0).clamp(0.0, 1.0);
+    let rise = 0.25 * side;
+    let toward = Light::TopLeft.toward();
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let (Some(i), Some(j)) = (cell(q.x / side), cell(q.y / side)) else { return };
+        let (x0, y0) = (i as f64 * side, j as f64 * side);
+        let [r, g, b, alpha] = soft.at(place.index(Point::new(x0 + 0.5 * side, y0 + 0.5 * side)));
+        if alpha <= 0.0 {
+            *p = [0; 4];
+            return;
+        }
+        let c = [r, g, b].map(|v| v / alpha);
+        let height = relief * (0.35 + 0.65 * (0.5 * rand(SALT_PATCH, i, j, 0) + 0.5 * f64::from(luma(c))));
+        // The bevels rise inwards from each side.
+        let (fx, fy) = (q.x - x0, q.y - y0);
+        let ramp = |d: f64| cover(rise - d, place.px);
+        let slope = Vec2::new(ramp(fx) - ramp(side - fx), ramp(fy) - ramp(side - fy)) * (1.5 * height);
+        *p = premultiply(lit(c, 0.9 * facing(slope, toward)), alpha);
+    });
+}
+
+/// Stained Glass: the object as panes of single colours around random points about `cell_size`
+/// apart, leaded in the foreground colour (black) half a point wide per step of `border` (1..20),
+/// lit from behind at its centre as strongly as `light` (0..10) says, fading out towards its
+/// corners.
+pub(super) fn stained_glass(px: &mut [[u8; 4]], w: usize, h: usize, space: &PixelSpace, cell_size: f64, border: f64, light: f64) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    if !(cell_size.is_finite() && cell_size > 0.0 && border.is_finite()) {
+        return;
+    }
+    let soft = Soft::new(px, w, cell_size / place.px / 4.0);
+    let half = (0.25 * border).clamp(0.0, 0.25 * cell_size);
+    let light = (light / 10.0).clamp(0.0, 1.0);
+    let extent = space.extent;
+    let mut around = Around::new();
+    place.each(px, |x, y, p| {
+        let q = place.at(x, y);
+        let (u, v) = (q.x / cell_size, q.y / cell_size);
+        let Some((near, next)) = nearest_two(u, v, &mut around, |i, j| point_in(SALT_GLASS, i, j)) else { return };
+        let pane = |at: Point| soft.at(place.index(Point::new(at.x * cell_size, at.y * cell_size)));
+        let (glass, other) = (pane(near), pane(next));
+        let (e, _) = edge(u, v, near, next);
+        let lead = cover(half - e * cell_size, place.px) as f32;
+        let glow = if extent.is_finite() && extent > 0.0 { light * (1.0 - (q.to_vec2().hypot() / extent).powi(2)).max(0.0) } else { 0.0 };
+        let [r, g, b, a] = glass;
+        let c = if a > 0.0 { lit([r, g, b].map(|v| v / a), 0.6 * glow) } else { [0.0; 3] };
+        // The lead holds the panes on both sides of it, as opaque as the more opaque one.
+        let alpha = a * (1.0 - lead) + a.max(other[3]) * lead;
+        let rgb = c.map(|v| v * a * (1.0 - lead));
+        *p = if alpha > 0.0 { premultiply(rgb.map(|v| v / alpha), alpha) } else { [0; 4] };
+    });
+}
+
+/// Brick in stretcher bond (bricks 20 × 8 points, 1.5-point mortar): each brick raised with
+/// 1-point bevels and a little higher or lower than the next, rough faced, the mortar sandy.
+fn brick(p: Point) -> f64 {
+    const LENGTH: f64 = 20.0;
+    const COURSE: f64 = 8.0;
+    const MORTAR: f64 = 1.5;
+    let Some(row) = cell(p.y / COURSE) else { return 0.0 };
+    let x = p.x + if row.rem_euclid(2) == 1 { 0.5 * LENGTH } else { 0.0 };
+    let Some(col) = cell(x / LENGTH) else { return 0.0 };
+    let (fx, fy) = (x - col as f64 * LENGTH, p.y - row as f64 * COURSE);
+    let edge = fx.min(LENGTH - fx).min(fy).min(COURSE - fy) - 0.5 * MORTAR;
+    if edge <= 0.0 {
+        return 0.2 * value_noise(SALT_SURFACE, p.x / 0.6, p.y / 0.6);
+    }
+    edge.min(1.0) + 0.4 * rand(SALT_SURFACE, col, row, 2) + 0.3 * value_noise(SALT_SURFACE + 1, p.x / 1.5, p.y / 1.5)
+}
+
+/// A plain weave of threads `period` points apart, each passing over one thread and under the
+/// next; `coarse` threads (burlap) wander and are hairy, fine ones (canvas) are even.
+fn weave(p: Point, period: f64, coarse: bool) -> f64 {
+    let (wander, hair) = if coarse { (0.35, 0.35) } else { (0.08, 0.12) };
+    let drift = |salt: u64, t: f64| wander * (2.0 * value_noise(salt, t / (4.0 * period), 0.5) - 1.0);
+    let x = p.x / period + drift(SALT_SURFACE + 3, p.y);
+    let y = p.y / period + drift(SALT_SURFACE + 4, p.x);
+    let (Some(i), Some(j)) = (cell(x), cell(y)) else { return 0.0 };
+    let (fx, fy) = (x - i as f64, y - j as f64);
+    // Each thread is round across and rises and falls along its length, over one crossing thread
+    // and under the next; the higher of the two threads shows.
+    let profile = |t: f64| (PI * t).sin().max(0.0).sqrt();
+    let over = if i.wrapping_add(j).rem_euclid(2) == 0 { 0.5 } else { -0.5 };
+    let down = profile(fx) * (0.5 + over * (PI * fy).sin());
+    let across = profile(fy) * (0.5 - over * (PI * fx).sin());
+    let thread = down.max(across);
+    let fibres = hair * value_noise(SALT_SURFACE + 5, p.x / (0.25 * period), p.y / (0.25 * period));
+    (thread + fibres) * period / PI
+}
+
+/// Sandstone: four octaves of smooth noise (8 down to 1 point) over a fine sandy grain.
+fn sandstone(p: Point) -> f64 {
+    let (mut h, mut size, mut amp) = (0.0, 8.0, 1.6);
+    for octave in 0..4 {
+        h += amp * value_noise(SALT_SURFACE + 8 + octave, p.x / size, p.y / size);
+        size *= 0.5;
+        amp *= 0.5;
+    }
+    h + 0.06 * cell_noise(SALT_SURFACE + 12, p, 0.5, 0)
+}
+
+/// Texturizer: the object on a `texture` surface scaled by `scaling` (0.5..2), in relief as
+/// strong as `relief` (0..50) and lit from `light`; `invert` turns the surface's heights over.
+#[allow(clippy::too_many_arguments)] // the effect's five options
+pub(super) fn texturizer(
+    px: &mut [[u8; 4]],
+    w: usize,
+    h: usize,
+    space: &PixelSpace,
+    texture: Texture,
+    scaling: f64,
+    relief: f64,
+    light: Light,
+    invert: bool,
+) {
+    let Some(place) = Place::new(space, w, h) else { return };
+    if !(scaling.is_finite() && scaling > 0.0) {
+        return;
+    }
+    // Slopes over a quarter point of the texture, or half a pixel where pixels are larger.
+    let step = (0.25f64).max(0.5 * place.px / scaling);
+    let strength = 0.1 * relief.clamp(0.0, 50.0) * if invert { -1.0 } else { 1.0 };
+    let toward = light.toward();
+    place.each(px, |x, y, p| {
+        if p[3] == 0 {
+            return;
+        }
+        let q = place.at(x, y);
+        let t = Point::new(q.x / scaling, q.y / scaling);
+        if !(t.x.is_finite() && t.y.is_finite()) {
+            return;
+        }
+        let at = |dx: f64, dy: f64| texture.height(Point::new(t.x + dx, t.y + dy));
+        let (left, right, up, down) = (at(-step, 0.0), at(step, 0.0), at(0.0, -step), at(0.0, step));
+        let slope = Vec2::new(right - left, down - up) / (2.0 * step);
+        // Ridges catch some light from any side and hollows stay in shade, so the surface shows
+        // whichever way it runs.
+        let ridge = (at(0.0, 0.0) - 0.25 * (left + right + up + down)) / step;
+        *p = premultiply(lit(straight(*p), strength * (facing(slope, toward) + ridge)), f32::from(p[3]) / 255.0);
+    });
+}

crates/effects/src/revolve.rs

@@ -0,0 +1,319 @@
+//! Revolve as live, shaded vector art, shared by the canvas and every exporter.
+use std::sync::Arc;
+
+use serde_json::Value;
+use vectorcraft_doc::color::{Color, Paint};
+use vectorcraft_doc::{Appearance, AppearanceItem, Effect, FillLayer, Node, NodeKind, StrokeLayer};
+use vectorcraft_geom::{PathData, Rect};
+use vectorcraft_three_d::{Edge, Revolve};
+
+use crate::util::{flag, num, text};
+use crate::{GeomContext, apply_geometry_with, is_geometry, merged_params};
+
+pub const REVOLVE: &str = "threeD.revolve";
+
+fn visible(fx: &[Effect]) -> bool {
+    fx.iter().any(|e| e.visible && e.id == REVOLVE)
+}
+
+pub fn has_revolve(n: &Node) -> bool {
+    visible(&n.appearance.effects) || n.appearance.items.iter().any(|i| i.visible() && visible(i.effects()))
+}
+
+/// Shared document-parameter conversion for rendering and interactive preview guides.
+pub fn revolve_options(p: &Value) -> Revolve {
+    Revolve {
+        angle: num(p, "angle", 360.0),
+        offset: num(p, "offset", 0.0),
+        edge: if text(p, "edge", "left") == "right" { Edge::Right } else { Edge::Left },
+        rotation_x: num(p, "rotationX", 0.0),
+        rotation_y: num(p, "rotationY", 0.0),
+        rotation_z: num(p, "rotationZ", 0.0),
+        perspective: num(p, "perspective", 0.0) / 100.0,
+        segments: num(p, "segments", 64.0).clamp(8.0, 128.0) as usize,
+        light_azimuth: num(p, "lightAzimuth", -45.0),
+        light_elevation: num(p, "lightElevation", 45.0),
+        light_intensity: num(p, "lightIntensity", 80.0) / 100.0,
+        ambient: num(p, "ambient", 25.0) / 100.0,
+        shade: flag(p, "shade", true),
+    }
+}
+
+/// Validate before a command mutates the document. Loading external files is still bounded
+/// by the evaluator; unsupported source kinds remain unchanged when rendered.
+pub fn validate_revolve(n: &Node, p: &Value) -> Result<(), String> {
+    let path = profile(n).ok_or("Revolve currently requires a path or compound path. Select a profile drawn with the Pen tool.")?;
+    let b = path.bounds().ok_or("Revolve requires a profile with at least two anchors")?;
+    if !path.subpaths.iter().any(|sp| sp.anchors.len() >= 2) {
+        return Err("Revolve requires at least two anchors".into());
+    }
+    if p.get("edge").is_some_and(|v| v.as_str() != Some("left") && v.as_str() != Some("right")) {
+        return Err("Revolve edge must be left or right".into());
+    }
+    vectorcraft_three_d::revolve(&path, b, revolve_options(p)).map(|_| ())
+}
+
+fn profile(n: &Node) -> Option<PathData> {
+    match &n.kind {
+        NodeKind::Path { path, guide: false, clipping: false, .. } => Some(path.clone()),
+        NodeKind::Compound { children, .. } => {
+            Some(PathData::new(children.iter().filter_map(|c| c.path_data()).flat_map(|p| p.subpaths.iter().cloned()).collect()))
+        }
+        _ => None,
+    }
+}
+
+fn geometry(path: &PathData, fx: &[Effect], ctx: &GeomContext) -> PathData {
+    apply_geometry_with(fx, path, path.bounds().unwrap_or(Rect::ZERO), ctx)
+}
+
+#[allow(clippy::too_many_arguments)]
+fn surface(
+    n: &Node,
+    path: &PathData,
+    fx: &Effect,
+    paint: Paint,
+    opacity: f32,
+    blend: vectorcraft_doc::color::BlendMode,
+    expand: bool,
+) -> Option<Node> {
+    let b = path.bounds()?;
+    // A loaded file or a profile edited past the limits keeps drawing its source path instead
+    // of crashing the frame. Commands validate the same evaluator and report its errors.
+    let faces = vectorcraft_three_d::revolve(path, b, revolve_options(&merged_params(REVOLVE, &fx.params))).ok()?;
+    // Visibility is an expansion option, never a change to live geometry or export baking.
+    // Keep all faces for paints whose coverage we cannot prove opaque. A bounded visibility
+    // failure also retains the complete surface rather than losing any of the user's art.
+    let visible = (expand
+        && flag(&fx.params, "expandVisibleOnly", true)
+        && paint.color().is_some()
+        && opacity == 1.0
+        && blend == Default::default()
+        && n.has_default_transparency())
+    .then(|| vectorcraft_three_d::visible_faces(&faces).ok())
+    .flatten();
+    let faces = visible.unwrap_or_else(|| {
+        faces.into_iter().map(|f| vectorcraft_three_d::VisibleFace { path: f.path(), brightness: f.brightness, depth: f.depth }).collect()
+    });
+    let children = faces
+        .into_iter()
+        .map(|face| {
+            let mut fill = FillLayer::new(paint.clone());
+            let mut items = vec![];
+            if let Some(c) = paint.color() {
+                let [r, g, b] = c.to_rgb();
+                let s = face.brightness as f32;
+                fill.paint = Paint::solid(Color::rgb(r * s, g * s, b * s));
+                items.push(AppearanceItem::Fill(fill));
+            } else {
+                items.push(AppearanceItem::Fill(fill));
+                let mut shadow = FillLayer::new(Paint::solid(Color::BLACK));
+                shadow.opacity = (1.0 - face.brightness) as f32;
+                items.push(AppearanceItem::Fill(shadow));
+            }
+            // Independently antialiased adjacent polygons otherwise leave a hairline grid.
+            // Matching narrow edge paint overlaps their coverage in the canvas and exporters.
+            // Keep opacity on the surface group so these edges never accumulate transparency.
+            let items = items
+                .into_iter()
+                .flat_map(|item| {
+                    let AppearanceItem::Fill(fill) = &item else { return vec![item] };
+                    let mut edge = StrokeLayer::new(fill.paint.clone(), 0.75);
+                    edge.opacity = fill.opacity;
+                    vec![item, AppearanceItem::Stroke(edge)]
+                })
+                .collect();
+            Arc::new(Node::path(n.id, face.path, Appearance { items, ..Default::default() }))
+        })
+        .collect();
+    let mut group = Node::group(n.id, children);
+    group.opacity = opacity;
+    group.blend = blend;
+    Some(group)
+}
+
+fn paint_of(item: &AppearanceItem) -> (Paint, f32, vectorcraft_doc::color::BlendMode) {
+    match item {
+        AppearanceItem::Fill(f) => (f.paint.clone(), f.opacity, f.blend),
+        AppearanceItem::Stroke(s) => (s.paint.clone(), s.opacity, s.blend),
+    }
+}
+
+/// Evaluated art keeps the source's identity and transparency. Each item's opacity belongs
+/// to its entire surface, not to each face, so overlapping faces don't accumulate alpha.
+pub fn revolve_art(n: &Node) -> Option<Node> {
+    art(n, false)
+}
+
+/// Revolve's own Expand Appearance path. The shared command and UI remain unchanged.
+pub(crate) fn expand_revolve_art(n: &Node) -> Option<Node> {
+    art(n, true)
+}
+
+fn art(n: &Node, expand: bool) -> Option<Node> {
+    if !has_revolve(n) {
+        return None;
+    }
+    let path = profile(n)?;
+    let ctx = GeomContext::of(n);
+    let mut children = vec![];
+    let mut remaining = n.appearance.effects.clone();
+    if let Some(index) = n.appearance.effects.iter().position(|e| e.visible && e.id == REVOLVE) {
+        let fx = n.appearance.effects.get(index)?;
+        let path = geometry(&path, n.appearance.effects.get(..index)?, &ctx);
+        // An object's surface uses its top visible fill, falling back to its stroke.
+        let item = n
+            .appearance
+            .items
+            .iter()
+            .rev()
+            .find(|i| matches!(i, AppearanceItem::Fill(_)) && crate::paints(i))
+            .or_else(|| n.appearance.items.iter().rev().find(|i| crate::paints(i)))?;
+        let (paint, opacity, blend) = paint_of(item);
+        let expand = expand && !n.appearance.effects.iter().skip(index + 1).any(|e| e.visible && is_geometry(&e.id));
+        children.push(Arc::new(surface(n, &path, fx, paint, opacity, blend, expand)?));
+        // Later geometry acts on the projected art as a whole through container evaluation.
+        remaining = n
+            .appearance
+            .effects
+            .iter()
+            .enumerate()
+            .filter(|(i, e)| e.id != REVOLVE && (!is_geometry(&e.id) || *i > index))
+            .map(|(_, e)| e.clone())
+            .collect();
+    } else {
+        let path = geometry(&path, &n.appearance.effects, &ctx);
+        remaining.retain(|e| !is_geometry(&e.id));
+        for item in n.appearance.items.iter().filter(|i| crate::paints(i)) {
+            if let Some(index) = item.effects().iter().position(|e| e.visible && e.id == REVOLVE) {
+                let fx = item.effects().get(index)?;
+                let p = geometry(&path, item.effects().get(..index)?, &ctx.item(item));
+                let (paint, opacity, blend) = paint_of(item);
+                let expand = expand && !item.effects().iter().skip(index + 1).any(|e| e.visible && is_geometry(&e.id));
+                let mut art = surface(n, &p, fx, paint, opacity, blend, expand)?;
+                art.appearance.effects = item.effects().iter().skip(index + 1).filter(|e| e.id != REVOLVE).cloned().collect();
+                children.push(Arc::new(art));
+            } else {
+                children.push(Arc::new(Node::path(n.id, path.clone(), Appearance { items: vec![item.clone()], ..Default::default() })));
+            }
+        }
+    }
+    let mut art = n.clone();
+    art.kind = NodeKind::Group { children, clip: false };
+    art.appearance = Appearance { effects: remaining, ..Default::default() };
+    Some(art)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use serde_json::json;
+    use vectorcraft_doc::{Document, NodeId};
+    use vectorcraft_geom::{Affine, BezPath};
+    fn profile_node() -> Node {
+        let mut b = BezPath::new();
+        b.move_to((100.0, 40.0));
+        b.line_to((130.0, 60.0));
+        b.line_to((130.0, 140.0));
+        b.line_to((100.0, 160.0));
+        Node::path(NodeId(1), PathData::from_bezpath(&b), Appearance::basic(Paint::solid(Color::rgb(0.8, 0.2, 0.1)), Paint::None, 0.0))
+    }
+    fn fx() -> Effect {
+        crate::new_effect(REVOLVE, &json!({})).unwrap()
+    }
+    #[test]
+    fn source_stays_editable_surface_moves_and_hidden_effect_restores_it() {
+        let mut n = profile_node();
+        let before = n.path_data().unwrap().clone();
+        n.appearance.effects.push(fx());
+        let a = revolve_art(&n).unwrap();
+        assert!(!a.children().unwrap().is_empty());
+        assert_eq!(n.path_data().unwrap(), &before);
+        let b = a.visual_bounds().unwrap();
+        n.transform(Affine::translate((80.0, 20.0)), false);
+        let moved = revolve_art(&n).unwrap().visual_bounds().unwrap();
+        assert!((moved.x0 - b.x0 - 80.0).abs() < 1e-6 && (moved.y0 - b.y0 - 20.0).abs() < 1e-6);
+        n.appearance.effects[0].visible = false;
+        assert!(revolve_art(&n).is_none());
+    }
+    #[test]
+    fn item_effect_and_transparency_are_scoped_to_whole_surface() {
+        let mut n = profile_node();
+        n.opacity = 0.6;
+        n.appearance.items[0].effects_mut().push(fx());
+        if let AppearanceItem::Fill(f) = &mut n.appearance.items[0] {
+            f.opacity = 0.4;
+        }
+        let a = revolve_art(&n).unwrap();
+        assert_eq!(a.opacity, 0.6);
+        let surface = &a.children().unwrap()[0];
+        assert_eq!(surface.opacity, 0.4);
+        assert!(surface.children().unwrap().iter().all(|c| c.opacity == 1.0 && !has_revolve(c)));
+    }
+    #[test]
+    fn export_bakes_faces_with_unique_ids_and_no_revolve_effects() {
+        let mut d = Document::new(300.0, 300.0);
+        let mut n = profile_node();
+        n.id = d.alloc_id();
+        n.appearance.effects.push(fx());
+        let mut stroke = |_: &mut Document, _: &PathData, _: vectorcraft_geom::FillRule, _: &vectorcraft_doc::StrokeLayer| None;
+        let art = crate::expand_leaf(&mut d, &n, &mut stroke).unwrap();
+        let mut ids = std::collections::HashSet::new();
+        fn visit(n: &Node, ids: &mut std::collections::HashSet<NodeId>) {
+            assert!(ids.insert(n.id));
+            assert!(!has_revolve(n));
+            for c in n.children().into_iter().flatten() {
+                visit(c, ids);
+            }
+        }
+        visit(&art, &mut ids);
+        assert!(ids.len() > 50);
+    }
+
+    #[test]
+    fn visible_surface_option_only_affects_expansion_and_can_keep_all_faces() {
+        let mut n = profile_node();
+        n.appearance.effects.push(fx());
+        let source = n.path_data().unwrap().clone();
+        let live = revolve_art(&n).unwrap();
+        let expanded = expand_revolve_art(&n).unwrap();
+        let count = |n: &Node| n.children().unwrap()[0].children().unwrap().len();
+        assert!(count(&expanded) < count(&live) * 3 / 4, "hidden back surfaces are removed");
+        assert_eq!(crate::bake_appearance(&n), Some(live.clone()), "other baking retains the full surface");
+        n.appearance.effects[0].params["expandVisibleOnly"] = json!(false);
+        assert_eq!(revolve_art(&n), Some(live.clone()), "the live view ignores the expansion setting");
+        assert_eq!(expand_revolve_art(&n), Some(live));
+        assert_eq!(n.path_data(), Some(&source));
+        n.appearance.effects[0].params["expandVisibleOnly"] = json!(true);
+        assert_eq!(expand_revolve_art(&n), Some(expanded.clone()));
+        // Per-item Revolve uses the same option, without trimming another item's artwork.
+        let effect = n.appearance.effects.remove(0);
+        n.appearance.items[0].effects_mut().push(effect);
+        assert_eq!(expand_revolve_art(&n).unwrap().children().unwrap()[0], expanded.children().unwrap()[0]);
+    }
+
+    #[test]
+    fn transparency_unknown_paints_and_later_distortion_keep_complete_surfaces() {
+        let mut n = profile_node();
+        n.appearance.effects.push(fx());
+        for change in 0..4 {
+            let mut sample = n.clone();
+            match change {
+                0 => sample.opacity = 0.5,
+                1 => {
+                    if let AppearanceItem::Fill(f) = &mut sample.appearance.items[0] {
+                        f.opacity = 0.4;
+                    }
+                }
+                2 => sample.blend = vectorcraft_doc::color::BlendMode::Multiply,
+                _ => sample.appearance.effects.push(crate::new_effect("distort.twist", &json!({"angle":45})).unwrap()),
+            }
+            assert_eq!(expand_revolve_art(&sample), revolve_art(&sample), "preserve surface for case {change}");
+        }
+        let mut sample = n;
+        if let AppearanceItem::Fill(f) = &mut sample.appearance.items[0] {
+            f.paint = Paint::Pattern { pattern: "unknown transparency".into(), xf: Affine::IDENTITY };
+        }
+        assert_eq!(expand_revolve_art(&sample), revolve_art(&sample));
+    }
+}

crates/engine/src/cmd/assets.rs

@@ -80,12 +80,13 @@ fn clean_name(name: &str) -> Option<String> {
 
 fn add(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "assets.add";
-    let ids = match ids_param(p, "ids") {
-        Some(ids) => {
-            let d = &s.doc()?.doc;
-            roots_of(d, d.paint_order(ids))
-        }
-        None => selected_roots(s)?,
+    let ids = if p.get("ids").is_some_and(|v| !v.is_null()) {
+        // An explicit list is authoritative: never silently drop malformed or stale ids.
+        let ids = checked_ids_param(s, p, "ids", C)?;
+        let d = &s.doc()?.doc;
+        roots_of(d, d.paint_order(ids))
+    } else {
+        selected_roots(s)?
     };
     if ids.is_empty() {
         return Err(bad(C, "select the art to collect (or give its ids)"));

crates/engine/src/cmd/brushsym.rs

@@ -603,7 +603,7 @@ fn symbol_place(s: &mut Session, p: &Value) -> Result<Value> {
     let centre = d.artboards.first().map(|a| a.rect.center()).unwrap_or(Point::ZERO);
     let c = Point::new(f64_or(p, "x", centre.x), f64_or(p, "y", centre.y));
     let size = natural_size(d, &name);
-    let parent = s.doc()?.insertion_parent();
+    let parent = s.doc()?.target_parent()?;
     let id = s.edit("Place Symbol Instance", |d, sel| {
         let id = d.alloc_id();
         d.insert(parent, usize::MAX, Node::new(id, NodeKind::SymbolInstance { symbol: name.clone(), xf: place_xf(c, size) }))?;
@@ -843,7 +843,8 @@ fn symbol_spray(s: &mut Session, p: &Value) -> Result<Value> {
     let alt = bool_or(p, "alt", false);
     let size = natural_size(&st.doc, &name);
     let set = st.selection.objects.first().copied().filter(|id| st.selection.len() == 1 && st.doc.node(*id).is_some_and(is_symbol_set));
-    let parent = st.insertion_parent();
+    // Only a new Symbol Set needs a layer that takes new art.
+    let parent = if alt || set.is_some() { st.insertion_parent() } else { st.target_parent()? };
     if alt {
         // Remove instances of this symbol under the brush (within the set, or anywhere).
         let d = &st.doc;

crates/engine/src/cmd/create.rs

@@ -79,7 +79,7 @@ pub(crate) fn add_node(s: &mut Session, label: &str, kind: NodeKind, appearance:
 
 /// Insert a new object looking like `look` (drawing modes apply); select it.
 pub(crate) fn add_look(s: &mut Session, label: &str, kind: NodeKind, look: NewArt, name: Option<String>) -> Result<Value> {
-    let parent = s.doc()?.insertion_parent();
+    let parent = s.doc()?.target_parent()?;
     let mode = s.draw_mode;
     let inside = s.draw_inside;
     let behind_of = s.doc()?.selection.in_paint_order(&s.doc()?.doc).first().copied();
@@ -298,7 +298,7 @@ fn flare(s: &mut Session, p: &Value) -> Result<Value> {
         };
         parts.push(("Ring", circle(at, rr), radial(at, rr, stops), 1.0));
     }
-    let parent = s.doc()?.insertion_parent();
+    let parent = s.doc()?.target_parent()?;
     let id = s.edit("Flare", |d, sel| {
         let children = parts
             .into_iter()
@@ -352,7 +352,7 @@ fn arc(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 fn grid_group(s: &mut Session, label: &str, paths: Vec<PathData>) -> Result<Value> {
-    let parent = s.doc()?.insertion_parent();
+    let parent = s.doc()?.target_parent()?;
     let look = s.new_art_look(vectorcraft_color::Paint::None, s.paint.stroke.clone(), s.paint.stroke_width);
     let id = s.edit(label, |d, sel| {
         let children = paths
@@ -385,15 +385,24 @@ fn polar_grid(s: &mut Session, p: &Value) -> Result<Value> {
     grid_group(s, "Polar Grid", shapes::polar_grid(r, c, rad))
 }
 
-pub(crate) fn anchor_from_json(v: &Value) -> Option<Anchor> {
-    let p = Point::new(v.get("x")?.as_f64()?, v.get("y")?.as_f64()?);
-    let h_in = point_param(v, "in").unwrap_or(p);
-    let h_out = point_param(v, "out").unwrap_or(p);
-    let mut a = Anchor::with_handles(p, h_in, h_out);
-    if v.get("smooth").and_then(Value::as_bool) == Some(true) {
-        a.kind = AnchorKind::Smooth;
+/// An anchor `{x, y, in?, out?, smooth?}` given to `cmd` (handles `[x, y]`, at the anchor when
+/// absent or null): anything malformed fails rather than being left out or replaced by a default,
+/// which would change the path's shape.
+pub(crate) fn anchor_from_json(v: &Value, cmd: &str) -> Result<Anchor> {
+    let coord =
+        |key: &str| v.get(key).and_then(Value::as_f64).filter(|n| n.is_finite()).ok_or_else(|| bad(cmd, format!("anchor `{key}` must be a number")));
+    let p = Point::new(coord("x")?, coord("y")?);
+    let handle = |key: &str| match v.get(key).filter(|h| !h.is_null()) {
+        None => Ok(p),
+        Some(h) => finite_numbers(h).map(|[x, y]| Point::new(x, y)).ok_or_else(|| bad(cmd, format!("anchor `{key}` must be [x, y]"))),
+    };
+    let mut anchor = Anchor::with_handles(p, handle("in")?, handle("out")?);
+    match v.get("smooth").filter(|b| !b.is_null()) {
+        None | Some(Value::Bool(false)) => {}
+        Some(Value::Bool(true)) => anchor.kind = AnchorKind::Smooth,
+        Some(_) => return Err(bad(cmd, "anchor `smooth` must be true or false")),
     }
-    Some(a)
+    Ok(anchor)
 }
 
 fn path_create(s: &mut Session, p: &Value) -> Result<Value> {
@@ -406,8 +415,8 @@ fn path_create(s: &mut Session, p: &Value) -> Result<Value> {
             .and_then(Value::as_array)
             .ok_or_else(|| bad("path.create", "missing anchors"))?
             .iter()
-            .filter_map(anchor_from_json)
-            .collect();
+            .map(|a| anchor_from_json(a, "path.create"))
+            .collect::<Result<_>>()?;
         if anchors.is_empty() {
             return Err(bad("path.create", "need at least one anchor"));
         }

crates/engine/src/cmd/cut.rs

@@ -221,8 +221,8 @@ fn rect_cut(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "path.rectCut";
     let rect = match p.get("rect") {
         Some(v) => {
-            let a: Vec<f64> = v.as_array().map(|a| a.iter().filter_map(Value::as_f64).collect()).unwrap_or_default();
-            let [x, y, w, h] = a[..] else { return Err(bad(C, "rect must be [x, y, width, height]")) };
+            // All four or nothing: a malformed entry dropped would cut a different region.
+            let [x, y, w, h] = finite_numbers(v).ok_or_else(|| bad(C, "rect must be [x, y, width, height]"))?;
             Rect::new(x, y, x + w, y + h).abs()
         }
         None => Rect::from_points(point_req(p, "from", C)?, point_req(p, "to", C)?),

crates/engine/src/cmd/edit.rs

@@ -346,7 +346,7 @@ fn paste_clip(s: &mut Session, p: &Value, mode: PasteMode, clip: &Clipboard, cho
     let off = s.prefs.paste_offset;
     let st = s.doc()?;
     let same_doc = clip.source_doc == Some(st.uid);
-    let parent = st.insertion_parent();
+    let parent = st.target_parent()?;
     // A copied artboard comes back with its art: right of the last artboard, or where it was
     // (Paste in Place, in Front, in Back). Paste on All Artboards pastes only the art.
     let board = clip

crates/engine/src/cmd/effectcmd.rs

@@ -107,6 +107,7 @@ fn edit_effects(
             let Some(n) = d.node_mut(*id) else { continue };
             let index = item.effects_item(&n.appearance, cmd)?;
             if n.appearance.effects_mut(index).is_some_and(&mut f) {
+                check_revolve_count(n, cmd)?;
                 done.push(*id);
             }
         }
@@ -117,6 +118,14 @@ fn edit_effects(
     })
 }
 
+fn check_revolve_count(n: &Node, cmd: &str) -> Result<()> {
+    let count = n.appearance.effects.iter().chain(n.appearance.items.iter().flat_map(|i| i.effects())).filter(|e| e.id == effects::REVOLVE).count();
+    if count > 1 {
+        return Err(bad(cmd, "A profile supports one Revolve effect. Edit the existing effect's options instead."));
+    }
+    Ok(())
+}
+
 pub(crate) fn apply(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "effect.apply";
     let id = str_param(p, "effect").or_else(|| str_param(p, "id")).ok_or_else(|| bad(C, "missing `effect` id"))?;
@@ -140,6 +149,15 @@ pub(crate) fn apply(s: &mut Session, p: &Value) -> Result<Value> {
         return Ok(json!({ "ids": [gid.0], "index": 0, "item": null, "grouped": true }));
     }
     let item = item_target(s, p, C)?;
+    if id == effects::REVOLVE {
+        for id in appearance_targets(s, p)? {
+            let n = s.doc()?.doc.node(id).ok_or(EngineError::NoNode(id))?;
+            effects::validate_revolve(n, &effect.params).map_err(|e| bad(C, e))?;
+            if effects::has_revolve(n) {
+                return Err(bad(C, "A profile supports one Revolve effect. Edit the existing effect's options instead."));
+            }
+        }
+    }
     let mut index = 0;
     let ids = edit_effects(s, p, item, C, &label, "Apply Effect: select objects", |fx| {
         fx.push(effect.clone());
@@ -237,6 +255,7 @@ fn move_effect(s: &mut Session, p: &Value) -> Result<Value> {
             let Some(fx) = n.appearance.effects_mut(di) else { continue };
             let at = to.min(fx.len());
             fx.insert(at, e);
+            check_revolve_count(n, C)?;
             landed.get_or_insert((at, di));
             done.push(*id);
         }
@@ -258,6 +277,20 @@ fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
     }
     let visible = p.get("visible").and_then(Value::as_bool);
     let item = item_target(s, p, C)?;
+    for id in appearance_targets(s, p)? {
+        let n = s.doc()?.doc.node(id).ok_or(EngineError::NoNode(id))?;
+        let target = item.effects_item(&n.appearance, C)?;
+        if let Some(e) = n.appearance.effects_at(target).and_then(|fx| fx.get(index))
+            && e.id == effects::REVOLVE
+            && visible != Some(false)
+        {
+            let mut prospective = effects::merged_params(&e.id, &e.params);
+            if let (Some(cur), Some(new)) = (prospective.as_object_mut(), params.as_object()) {
+                cur.extend(new.clone());
+            }
+            effects::validate_revolve(n, &prospective).map_err(|e| bad(C, e))?;
+        }
+    }
     let ids = edit_effects(s, p, item, C, "Effect Options", &format!("{C}: no effect at index {index}"), |fx| {
         let Some(e) = fx.get_mut(index) else { return false };
         if let (Value::Object(new), cur) = (&params, &mut e.params) {
@@ -454,6 +487,7 @@ fn expand_appearance(s: &mut Session, p: &Value) -> Result<Value> {
 mod tests {
     use serde_json::json;
     use vectorcraft_doc::NodeKind;
+    use vectorcraft_render::effects;
 
     use crate::{NodeId, Session};
 
@@ -468,6 +502,71 @@ mod tests {
         s.doc().unwrap().doc.node(id).cloned().unwrap()
     }
 
+    #[test]
+    fn revolve_commands_keep_profile_live_edit_options_expand_and_undo() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width":300,"height":300})).unwrap();
+        let r = s.execute("path.create", &json!({"d":"M 150 40 L 180 60 L 180 140 L 150 160"})).unwrap();
+        let id = NodeId(r["id"].as_u64().unwrap());
+        let source = node(&s, id).path_data().unwrap().clone();
+        s.execute("effect.apply", &json!({"effect":"threeD.revolve","ids":[id.0],"item":null})).unwrap();
+        let before = effects_for_test(&s, id);
+        assert_eq!(node(&s, id).path_data(), Some(&source));
+        let doc = &s.doc().unwrap().doc;
+        let restored = vectorcraft_format::load(&vectorcraft_format::save(doc, false)).unwrap();
+        assert_eq!(restored.node(id).unwrap().path_data(), Some(&source));
+        assert_eq!(effects::revolve_art(restored.node(id).unwrap()).unwrap(), before);
+        let pdf = s.execute("document.serialize", &json!({"format":"pdf"})).unwrap();
+        let bytes = vectorcraft_format::base64_decode(pdf["dataBase64"].as_str().unwrap()).unwrap();
+        assert!(bytes.starts_with(b"%PDF"));
+        assert!(s.execute("effect.apply", &json!({"effect":"threeD.revolve","ids":[id.0],"item":null})).is_err());
+        assert!(s.execute("effect.duplicate", &json!({"index":0,"ids":[id.0],"item":null})).is_err());
+        s.execute("effect.setParams", &json!({"index":0,"params":{"angle":180,"offset":10},"ids":[id.0],"item":null})).unwrap();
+        assert_ne!(effects_for_test(&s, id), before);
+        assert!(s.execute("effect.setParams", &json!({"index":0,"params":{"edge":"invalid"},"ids":[id.0],"item":null})).is_err());
+        s.execute("effect.expandAppearance", &json!({"ids":[id.0]})).unwrap();
+        assert!(matches!(node(&s, id).kind, NodeKind::Group { .. }));
+        assert!(!effects::has_revolve(&node(&s, id)));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(node(&s, id).path_data(), Some(&source));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(effects_for_test(&s, id), before);
+    }
+
+    fn effects_for_test(s: &Session, id: NodeId) -> vectorcraft_doc::Node {
+        effects::revolve_art(&node(s, id)).unwrap()
+    }
+
+    #[test]
+    fn revolve_visibility_parameter_saves_expands_and_undoes_without_other_appearance_changes() {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width":300,"height":300})).unwrap();
+        let r = s.execute("path.create", &json!({"d":"M 150 40 L 180 60 L 180 140 L 150 160"})).unwrap();
+        let id = NodeId(r["id"].as_u64().unwrap());
+        s.execute("effect.apply", &json!({"effect":"threeD.revolve","ids":[id.0],"item":null})).unwrap();
+        let live = node(&s, id);
+        let restored = vectorcraft_format::load(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap();
+        assert_eq!(restored.node(id).unwrap().appearance.effects[0].params["expandVisibleOnly"], json!(true));
+        let count = |n: &vectorcraft_doc::Node| n.children().unwrap()[0].children().unwrap().len();
+        s.execute("effect.expandAppearance", &json!({"ids":[id.0]})).unwrap();
+        let visible = count(&node(&s, id));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(node(&s, id), live);
+        s.execute("effect.setParams", &json!({"index":0,"item":null,"ids":[id.0],"params":{"expandVisibleOnly":false}})).unwrap();
+        s.execute("effect.expandAppearance", &json!({"ids":[id.0]})).unwrap();
+        assert!(count(&node(&s, id)) > visible);
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(node(&s, id).appearance.effects[0].params["expandVisibleOnly"], json!(false));
+        s.execute("edit.undo", &json!({})).unwrap();
+        assert_eq!(node(&s, id), live);
+        // The shared command still expands ordinary multiple-fill artwork as before.
+        let r = s.execute("shape.rectangle", &json!({"x":10,"y":10,"width":20,"height":20})).unwrap();
+        let ordinary = NodeId(r["id"].as_u64().unwrap());
+        s.execute("effect.apply", &json!({"effect":"distort.twist","ids":[ordinary.0],"params":{"angle":15}})).unwrap();
+        s.execute("effect.expandAppearance", &json!({"ids":[ordinary.0]})).unwrap();
+        assert!(node(&s, ordinary).appearance.effects.is_empty());
+    }
+
     #[test]
     fn apply_uses_catalog_defaults_and_undoes() {
         let (mut s, id) = session_with_rect();

crates/engine/src/cmd/gradient.rs

@@ -270,13 +270,8 @@ pub(crate) fn apply_gradient_edit_in(
         gp.swatch = None;
     }
     if bool_or(p, "reverse", false) {
+        // Midpoints mirrored with their segments.
         gp.gradient.reverse();
-        // Midpoints belong to the segment to the right; mirror them.
-        let n = gp.gradient.stops.len();
-        let mids: Vec<f32> = gp.gradient.stops.iter().map(|s| s.midpoint).collect();
-        for i in 0..n {
-            gp.gradient.stops[i].midpoint = if i + 1 < n { 1.0 - mids[n - 2 - i] } else { 0.5 };
-        }
     }
     // Angle and aspect edits keep the focal point in its place in the extent ellipse.
     let before = gp.geom;

crates/engine/src/cmd/links.rs

@@ -52,6 +52,15 @@ pub fn specs() -> Vec<CommandSpec> {
             has_doc,
             update
         ),
+        cmd!(
+            "links.updateChanged",
+            "Update Changed Links",
+            [],
+            None,
+            "{} read again the active document's linked files that changed on disk since they were last seen (size or modification time), whatever Preferences → File Handling → Update Links says; the desktop app looks every two seconds and follows that preference. Files seen for the first time are only remembered. One undo step → {updated: [ids], ask: [], modified: []}",
+            has_doc,
+            crate::link_watch::update_changed
+        ),
         cmd!(
             "links.relink",
             "Relink",
@@ -158,6 +167,11 @@ fn linked(n: &Node) -> Option<(&LinkInfo, &str, Option<bool>)> {
     }
 }
 
+/// Every linked file of `d` with the ids of the objects showing it (for [`crate::link_watch`]).
+pub(crate) fn linked_groups(d: &Document) -> Vec<(String, Vec<u64>)> {
+    groups(d, None).into_iter().filter(|g| !g.ids.is_empty()).map(|g| (g.link.path, ids_json(&g.ids))).collect()
+}
+
 /// The linked images and placed documents of `d` by file and content: those in the layers (only `ids` when
 /// given), then, without `ids`, the ones only symbols and patterns show.
 fn groups(d: &Document, ids: Option<&[NodeId]>) -> Vec<Group> {

crates/engine/src/cmd/menucmds.rs

@@ -702,7 +702,7 @@ fn trim_marks(s: &mut Session, p: &Value) -> Result<Value> {
     if rects.is_empty() {
         return Err(bad(C, "nothing to mark"));
     }
-    let parent = s.doc()?.insertion_parent();
+    let parent = s.doc()?.target_parent()?;
     let ids = s.edit("Create Trim Marks", |d, sel| {
         let mut ids = vec![];
         for r in &rects {

crates/engine/src/cmd/mod.rs

@@ -77,6 +77,7 @@ pub(crate) mod textwrap;
 pub(crate) mod threads;
 pub(crate) mod typecmd;
 mod typemenu;
+mod variablecmds;
 pub(crate) mod views;
 pub mod wand;
 pub mod webexport;
@@ -235,6 +236,7 @@ pub fn command_specs() -> &'static [CommandSpec] {
         v.extend(maskedit::specs());
         v.extend(tabs::specs());
         v.extend(docmenu::specs());
+        v.extend(variablecmds::specs());
         v.extend(docinfo::specs());
         v.extend(panelcmds::specs());
         v.extend(buildcmds::specs());
@@ -322,6 +324,17 @@ pub(crate) fn checked_id(s: &Session, value: &Value, command: &str) -> Result<No
     Ok(id)
 }
 
+/// `v` as exactly `N` finite numbers (`[x, y]`, `[x, y, width, height]`…): `None` when it isn't an
+/// array of that length or an entry isn't a number, so nothing malformed is left out or padded.
+pub(crate) fn finite_numbers<const N: usize>(v: &Value) -> Option<[f64; N]> {
+    let a = v.as_array().filter(|a| a.len() == N)?;
+    let mut out = [0.0; N];
+    for (o, n) in out.iter_mut().zip(a) {
+        *o = n.as_f64().filter(|n| n.is_finite())?;
+    }
+    Some(out)
+}
+
 pub(crate) fn point_param(p: &Value, key: &str) -> Option<Point> {
     let a = p.get(key)?.as_array()?;
     Some(Point::new(a.first()?.as_f64()?, a.get(1)?.as_f64()?))

crates/engine/src/cmd/paint.rs

@@ -375,15 +375,7 @@ fn apply_to_proxy(s: &mut Session, p: &Value, paint: Paint) -> Result<Value> {
 /// remember the paint.
 fn apply_paint(s: &mut Session, p: &Value, paint: Paint, fill: bool) -> Result<Value> {
     let cmd = if fill { "paint.setFill" } else { "paint.setStroke" };
-    // New art gets the paint fitted to itself, not placed where this one is.
-    if fill {
-        s.paint.fill = unplaced(&paint);
-    } else {
-        s.paint.stroke = unplaced(&paint);
-    }
-    if bool_or(p, "focus", true) {
-        s.fill_active = fill;
-    }
+    // Resolve the requested targets before mutating defaults or the active proxy.
     let item = item_target(s, p, cmd)?.of_kind(s, fill);
     let selected = item.targets(s, p)?;
     let ids = super::graph::paint_targets(&s.doc()?.doc, &selected);
@@ -423,6 +415,16 @@ fn apply_paint(s: &mut Session, p: &Value, paint: Paint, fill: bool) -> Result<V
             Ok(())
         },
     )?;
+    // Rejected edits leave the next shape's appearance and active proxy untouched.
+    // New art takes an unplaced gradient so that it fits the new object's own bounds.
+    if fill {
+        s.paint.fill = unplaced(&paint);
+    } else {
+        s.paint.stroke = unplaced(&paint);
+    }
+    if bool_or(p, "focus", true) {
+        s.fill_active = fill;
+    }
     s.remember_paint(&paint);
     ok()
 }
@@ -436,7 +438,6 @@ fn set_run_stroke(style: &mut CharStyle, paint: Paint) {
 }
 
 fn swap(s: &mut Session, p: &Value) -> Result<Value> {
-    std::mem::swap(&mut s.paint.fill, &mut s.paint.stroke);
     let ids = paint_targets(s, p)?;
     if !ids.is_empty() {
         s.edit("Swap Fill and Stroke", |d, _| {
@@ -458,11 +459,11 @@ fn swap(s: &mut Session, p: &Value) -> Result<Value> {
             Ok(())
         })?;
     }
+    std::mem::swap(&mut s.paint.fill, &mut s.paint.stroke);
     ok()
 }
 
 fn default_paint(s: &mut Session, p: &Value) -> Result<Value> {
-    super::newart::reset(s);
     let ids = paint_targets(s, p)?;
     if !ids.is_empty() {
         s.edit("Default Fill and Stroke", |d, _| {
@@ -481,6 +482,7 @@ fn default_paint(s: &mut Session, p: &Value) -> Result<Value> {
             Ok(())
         })?;
     }
+    super::newart::reset(s);
     ok()
 }
 

crates/engine/src/cmd/path.rs

@@ -129,7 +129,7 @@ fn path_mut(d: &mut vectorcraft_doc::Document, id: NodeId) -> Result<&mut PathDa
 
 fn append_anchor(s: &mut Session, p: &Value) -> Result<Value> {
     let id = id_param(p, "id").ok_or_else(|| bad("path.appendAnchor", "missing id"))?;
-    let a = anchor_from_json(p).ok_or_else(|| bad("path.appendAnchor", "missing x/y"))?;
+    let a = anchor_from_json(p, "path.appendAnchor")?;
     s.edit("Pen", |d, sel| {
         let path = path_mut(d, id)?;
         match path.subpaths.last_mut() {
@@ -217,12 +217,21 @@ fn set_anchors(s: &mut Session, p: &Value) -> Result<Value> {
     let data = PathData::new(
         subs.iter()
             .map(|sp| {
-                SubPath::new(
-                    sp.get("anchors").and_then(Value::as_array).map(|a| a.iter().filter_map(anchor_from_json).collect()).unwrap_or_default(),
-                    bool_or(sp, "closed", false),
-                )
+                let anchors = sp
+                    .get("anchors")
+                    .and_then(Value::as_array)
+                    .ok_or_else(|| bad("path.setAnchors", "each subpath needs an anchors array"))?
+                    .iter()
+                    .map(|a| anchor_from_json(a, "path.setAnchors"))
+                    .collect::<Result<Vec<_>>>()?;
+                let closed = match sp.get("closed") {
+                    None | Some(Value::Null) => false,
+                    Some(Value::Bool(v)) => *v,
+                    Some(_) => return Err(bad("path.setAnchors", "closed must be a boolean")),
+                };
+                Ok(SubPath::new(anchors, closed))
             })
-            .collect(),
+            .collect::<Result<Vec<_>>>()?,
     );
     s.edit("Reshape", |d, _| {
         *path_mut(d, id)? = data;

crates/engine/src/cmd/place/mod.rs

@@ -309,13 +309,22 @@ fn transformed(mut node: Node, m: Affine) -> Node {
 /// `[x, y, width, height]` with a positive size.
 fn rect_param(p: &Value) -> Result<Option<Rect>> {
     let Some(v) = p.get("rect") else { return Ok(None) };
-    let n: Vec<f64> = v.as_array().map(|a| a.iter().filter_map(Value::as_f64).collect()).unwrap_or_default();
-    match n[..] {
-        [x, y, w, h] if w > 0.0 && h > 0.0 => Ok(Some(Rect::new(x, y, x + w, y + h))),
+    // All four or nothing: a malformed entry dropped would shift the others ([0, "bad", 10, 40, 50]).
+    match finite_numbers(v) {
+        Some([x, y, w, h]) if w > 0.0 && h > 0.0 => Ok(Some(Rect::new(x, y, x + w, y + h))),
         _ => Err(bad(PLACE, "rect must be [x, y, width, height] with a positive width and height")),
     }
 }
 
+/// `at`, the `[x, y]` the art is centred on (absent or null: none); anything else fails rather than
+/// placing the art as if no point were given.
+fn at_param(p: &Value) -> Result<Option<Point>> {
+    p.get("at")
+        .filter(|v| !v.is_null())
+        .map(|v| finite_numbers(v).map(|[x, y]| Point::new(x, y)).ok_or_else(|| bad(PLACE, "at must be [x, y]")))
+        .transpose()
+}
+
 /// The transform that puts new art with the natural box `natural` where `old` is: an image's scale
 /// and rotation relative to its 100% size (its resolution's) and its centre are kept (with
 /// `image_xf`); other objects keep their centre.
@@ -342,7 +351,7 @@ fn fit(natural: Rect, r: Rect) -> Affine {
 fn place(s: &mut Session, p: &Value) -> Result<Value> {
     let replace = bool_or(p, "replace", false);
     let template = bool_or(p, "template", false);
-    let at = point_param(p, "at");
+    let at = at_param(p)?;
     let rect = rect_param(p)?;
     if replace && (template || at.is_some() || rect.is_some()) {
         return Err(bad(PLACE, "replace keeps the replaced object's place and transform: drop template, at and rect"));

crates/engine/src/cmd/prefscmds.rs

@@ -278,6 +278,7 @@ pub const PREF_SPECS: &[PrefSpec] = &[
     p!("toolGroupLabels", "User Interface", "", "Show Tool Group Labels", bool),
     p!("openDocumentsAsTabs", "User Interface", "", "Open Documents As Tabs", bool),
     p!("largeTabs", "User Interface", "", "Large Tabs", bool),
+    p!("systemTitleBar", "User Interface", "", "System Title Bar", bool),
     p!("uiScaling", "User Interface", "UI Scaling", "Scale", num(0.75, 2.0, "×")),
     p!("scaleCursorWithUi", "User Interface", "UI Scaling", "Scale Cursor Proportional to UI", bool),
     // `auto` or a language code the shell registers (`zh-hant`); the shell shows it as a dropdown.

crates/engine/src/cmd/rasterfx.rs

@@ -152,7 +152,8 @@ fn render(doc: &Document, nodes: Vec<Node>, region: Rect, scale: f64, anti_alias
     tmp.layers = vec![Arc::new(layer)];
     let mut r = vectorcraft_render::Renderer::new();
     r.threads = 0;
-    r.render_region_with(&tmp, region, scale, &RenderOptions { skip_templates: true, anti_alias, ..Default::default() })
+    // Art Optimized is supersampled, as in exports: shapes meeting edge to edge leave no seam.
+    r.render_region_with(&tmp, region, scale, &RenderOptions { skip_templates: true, anti_alias, supersample: true, ..Default::default() })
 }
 
 /// Pixels per point of raster effects rendered as images (the document's raster effects

crates/engine/src/cmd/select.rs

@@ -294,17 +294,35 @@ fn key(s: &mut Session, p: &Value) -> Result<Value> {
     ok()
 }
 
-/// `[[subpath, anchor]…]` anchor references (malformed entries are left out).
-pub(crate) fn parse_refs(v: Option<&Value>) -> Vec<(usize, usize)> {
-    v.and_then(Value::as_array)
-        .map(|a| a.iter().filter_map(|x| Some((x.get(0)?.as_u64()? as usize, x.get(1)?.as_u64()? as usize))).collect())
-        .unwrap_or_default()
+/// `[[subpath, anchor]…]` anchor references of `cmd`: a malformed entry fails rather than being
+/// left out, which would act on other anchors than the ones given.
+pub(crate) fn checked_refs(v: Option<&Value>, cmd: &str) -> Result<Vec<(usize, usize)>> {
+    let refs = v.and_then(Value::as_array).ok_or_else(|| bad(cmd, "`anchors` must be an array of [subpath, anchor] pairs"))?;
+    refs.iter()
+        .map(|v| {
+            let Some([subpath, anchor]) = v.as_array().map(Vec::as_slice) else {
+                return Err(bad(cmd, format!("invalid anchor reference {v}: expected [subpath, anchor]")));
+            };
+            let coordinate = |v: &Value| {
+                v.as_u64()
+                    .and_then(|n| usize::try_from(n).ok())
+                    .ok_or_else(|| bad(cmd, format!("invalid anchor index {v}: expected a non-negative integer")))
+            };
+            Ok((coordinate(subpath)?, coordinate(anchor)?))
+        })
+        .collect()
 }
 
 fn anchors(s: &mut Session, p: &Value) -> Result<Value> {
-    let id = id_param(p, "id").ok_or_else(|| bad("select.anchors", "missing id"))?;
-    let refs = parse_refs(p.get("anchors"));
-    let mode = str_param(p, "mode").unwrap_or("set").to_string();
+    const C: &str = "select.anchors";
+    let id = checked_id(s, p.get("id").ok_or_else(|| bad(C, "missing id"))?, C)?;
+    let refs = checked_refs(p.get("anchors"), C)?;
+    let mode = match str_param(p, "mode") {
+        None | Some("set") => "set",
+        Some("add") => "add",
+        Some("toggle") => "toggle",
+        Some(m) => return Err(bad(C, format!("unknown mode {m:?}"))),
+    };
     s.select(|_, sel| {
         if mode == "set" {
             sel.clear();
@@ -323,11 +341,16 @@ fn anchors(s: &mut Session, p: &Value) -> Result<Value> {
 }
 
 fn anchors_many(s: &mut Session, p: &Value) -> Result<Value> {
-    let items: Vec<(NodeId, BTreeSet<(usize, usize)>)> = p
-        .get("items")
-        .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();
+    const C: &str = "select.anchorsMany";
+    let raw = p.get("items").and_then(Value::as_array).ok_or_else(|| bad(C, "`items` must be an array of {id, anchors}"))?;
+    let items: Vec<(NodeId, BTreeSet<(usize, usize)>)> = raw
+        .iter()
+        .map(|it| {
+            let id = checked_id(s, it.get("id").ok_or_else(|| bad(C, "each item needs an id"))?, C)?;
+            let refs = checked_refs(it.get("anchors"), C)?;
+            Ok((id, refs.into_iter().collect()))
+        })
+        .collect::<Result<_>>()?;
     // `add: true` is the older spelling of mode add.
     let mode = match str_param(p, "mode") {
         Some(m @ ("set" | "add" | "toggle" | "subtract")) => m,

crates/engine/src/cmd/stroke.rs

@@ -100,7 +100,12 @@ impl StrokeChange {
         let dash = match p.get("dash") {
             None => None,
             Some(Value::Null) => Some(None),
-            Some(Value::Array(a)) => Some(Some(a.iter().filter_map(Value::as_f64).collect::<Vec<_>>()).filter(|d| !d.is_empty())),
+            Some(Value::Array(a)) => {
+                // Do not silently omit malformed segments and change the user's dash pattern.
+                let values: Vec<f64> =
+                    a.iter().map(|v| v.as_f64().ok_or_else(|| bad(cmd, format!("dash lengths must be numbers, got {v}")))).collect::<Result<_>>()?;
+                Some(Some(values).filter(|d| !d.is_empty()))
+            }
             Some(v) => return Err(bad(cmd, format!("dash must be a list of lengths or null, got {v}"))),
         };
         Ok(Self {
@@ -167,9 +172,6 @@ fn no_targets(ids: &[vectorcraft_doc::NodeId], p: &Value) -> bool {
 fn stroke_set(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "stroke.set";
     let change = StrokeChange::parse(p, C)?;
-    if let Some(w) = change.weight {
-        s.paint.stroke_width = w;
-    }
     let item = item_target(s, p, C)?.of_kind(s, false);
     let mut ids = item.targets(s, p)?;
     let new_art = no_targets(&ids, p);
@@ -216,10 +218,6 @@ fn stroke_set(s: &mut Session, p: &Value) -> Result<Value> {
             st.profile = pr.clone();
         }
     };
-    // With nothing selected the Stroke panel sets up the next object drawn.
-    if new_art && let Some(st) = s.new_art_stroke_mut() {
-        set(st);
-    }
     edit_items(s, &ids, item, C, "Stroke", false, |n, index| {
         if index.is_none()
             && let NodeKind::Text(t) = &mut n.kind
@@ -235,6 +233,14 @@ fn stroke_set(s: &mut Session, p: &Value) -> Result<Value> {
         }
         Ok(())
     })?;
+    // Commit the new-art template only after the complete request is validated
+    // and the selected artwork edit has succeeded.
+    if let Some(w) = change.weight {
+        s.paint.stroke_width = w;
+    }
+    if new_art && let Some(st) = s.new_art_stroke_mut() {
+        set(st);
+    }
     ok()
 }
 

crates/engine/src/cmd/textedit.rs

@@ -45,7 +45,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Area / Path Type",
             [],
             None,
-            "{path: id, mode: \"area\"|\"onPath\", text?: \"\", vertical?: bool = false, at?: [x, y] (on-path start: nearest point), size?, font?, fit?: none|autoHeight|shrinkText, fitMinPercent? (area: as text.areaOptions; default autoHeight when the autoSizeAreaType preference is on), placeholder?: bool (placeholder text instead, as text.create), leadingModel?, charAlign? (as text.create)} turn a path into an area-type frame or a type-on-a-path baseline (the path's paint is dropped) → {id}",
+            "{path: id, mode: \"area\"|\"onPath\", text?: \"\", vertical?: bool = false, at?: [x, y] (on-path start: nearest point), size?, font?, style?, color? (as text.create), fit?: none|autoHeight|shrinkText, fitMinPercent? (area: as text.areaOptions; default autoHeight when the autoSizeAreaType preference is on), placeholder?: bool (placeholder text instead, as text.create), leadingModel?, charAlign? (as text.create)} turn a path into an area-type frame or a type-on-a-path baseline (the path's paint is dropped) → {id}",
             has_doc,
             create_in_path
         ),
@@ -112,6 +112,23 @@ fn text_ref(s: &Session, id: NodeId) -> Result<TextObject> {
     }
 }
 
+/// Replace a type object's whole content: the new text takes the replaced text's
+/// style and paragraph styles follow, exactly as `text.editRange` over the full
+/// range does. Dataset apply and friends share this so Variables edits behave
+/// like Type tool edits.
+pub(crate) fn set_plain_text(d: &mut vectorcraft_doc::Document, id: NodeId, text: &str) -> Result<()> {
+    let len = match d.node(id).map(|n| &n.kind) {
+        Some(NodeKind::Text(t)) => edit::runs_len(&t.runs),
+        Some(_) => return Err(EngineError::Other(format!("node {} is not text", id.0))),
+        None => return Err(EngineError::NoNode(id)),
+    };
+    let t = text_mut(d, id).ok_or(EngineError::NoNode(id))?;
+    t.splice_paras(0, len, text);
+    edit::replace_range(&mut t.runs, 0, len, text);
+    refresh_bounds(t);
+    Ok(())
+}
+
 fn byte_param(p: &Value, k: &str) -> Option<usize> {
     p.get(k).and_then(Value::as_u64).map(|v| v as usize)
 }
@@ -468,16 +485,7 @@ fn create_in_path(s: &mut Session, p: &Value) -> Result<Value> {
     if !on_path && !path.is_closed() && path.bounds().is_none_or(|b| b.width() < 1.0 || b.height() < 1.0) {
         return Err(bad(C, "area type needs a path that encloses an area"));
     }
-    let mut style = CharStyle::default();
-    if let Some(v) = p.get("size").and_then(Value::as_f64) {
-        style.size = v.clamp(0.1, 1296.0);
-    }
-    if let Some(f) = str_param(p, "font") {
-        style.font_family = f.to_string();
-    }
-    if !s.paint.fill.is_none() && s.paint.fill != Paint::solid(vectorcraft_color::Color::WHITE) {
-        style.fill = s.paint.fill.clone();
-    }
+    let style = super::create::new_type_style(s, p);
     let text = str_param(p, "text").unwrap_or("").to_string();
     let start = match point_param(p, "at") {
         Some(at) if on_path => vectorcraft_geom::ArcPath::new(path).fraction_at(at).unwrap_or(0.0),

crates/engine/src/cmd/textstyles.rs

@@ -133,14 +133,44 @@ fn to_attrs<T: Serialize>(v: &T) -> Map<String, Value> {
     m
 }
 
+/// Every attribute name `T` reads, including those its JSON leaves out at their defaults (Auto
+/// leading and kerning, no mojikumi…): the field names serde's derive hands `deserialize_struct`.
+/// Not `justify_auto`, which [`to_map`] turns into `"justify": "Auto"`.
+fn attr_names<T: DeserializeOwned>() -> Vec<&'static str> {
+    use serde::de::{Error as _, Visitor, value::Error};
+
+    struct Names<'a>(&'a mut &'static [&'static str]);
+    impl<'de> serde::Deserializer<'de> for Names<'_> {
+        type Error = Error;
+        fn deserialize_any<V: Visitor<'de>>(self, _: V) -> std::result::Result<V::Value, Error> {
+            Err(Error::custom("not a struct"))
+        }
+        fn deserialize_struct<V: Visitor<'de>>(self, _: &'static str, fields: &'static [&'static str], _: V) -> std::result::Result<V::Value, Error> {
+            *self.0 = fields;
+            Err(Error::custom("field names only"))
+        }
+        serde::forward_to_deserialize_any! {
+            bool i8 i16 i32 i64 i128 u8 u16 u32 u64 u128 f32 f64 char str string bytes byte_buf option unit
+            unit_struct newtype_struct seq tuple tuple_struct map enum identifier ignored_any
+        }
+    }
+
+    let mut fields: &'static [&'static str] = &[];
+    // Always an error: the probe only records the names.
+    let _ = T::deserialize(Names(&mut fields));
+    fields.iter().copied().filter(|&f| f != "justify_auto").collect()
+}
+
 /// `base` with `attrs` written over it (unknown or ill-typed attributes are an error).
 fn with_attrs<T: Serialize + DeserializeOwned>(base: &T, attrs: &Map<String, Value>, cmd: &str) -> Result<T> {
     let mut m = to_attrs(base);
     if let Some(full) = to_map(base) {
         m.insert("style_name".into(), full.get("style_name").cloned().unwrap_or(Value::Null));
     }
+    let names = attr_names::<T>();
     for (k, v) in attrs {
-        if !m.contains_key(k) {
+        // Not only the keys `base` writes: those at their defaults (Auto leading…) are left out.
+        if !m.contains_key(k) && !names.contains(&k.as_str()) {
             return Err(bad(cmd, format!("unknown attribute `{k}`")));
         }
         m.insert(k.clone(), v.clone());
@@ -575,6 +605,44 @@ mod tests {
         assert_eq!(s.doc().unwrap().doc.char_styles.iter().find(|d| d.name == "Pink").unwrap().attrs["fill"], fill);
     }
 
+    /// #1001: attributes their JSON leaves out at the defaults (Auto leading and kerning, no
+    /// mojikumi) are still attributes a style can set, and a style captured with one applies to
+    /// text at the default, is duplicated and comes back out of a library.
+    #[test]
+    fn styles_take_attributes_left_out_at_their_defaults() {
+        let (mut s, id) = session_with_text("A");
+        s.execute("charStyle.new", &json!({"name": "Kerned", "attrs": {"kerning": 40, "leading": 30}})).unwrap();
+        s.execute("charStyle.setAttrs", &json!({"name": "Kerned", "attrs": {"kerning": 20, "small_caps": 70}})).unwrap();
+        s.execute("paraStyle.new", &json!({"name": "Punctuation", "attrs": {"mojikumi": "lineEndHalf"}})).unwrap();
+        s.execute("paraStyle.setAttrs", &json!({"name": "Punctuation", "attrs": {"direction": "rightToLeft"}})).unwrap();
+        for bad in [json!({"nope": 1}), json!({"justify_auto": true})] {
+            assert!(s.execute("paraStyle.new", &json!({"name": "Bad", "attrs": bad})).is_err(), "{bad}");
+        }
+        // Captured from text with explicit leading, applied to fresh Auto-leading text.
+        s.execute("text.setStyle", &json!({"leading": 30})).unwrap();
+        s.execute("charStyle.new", &json!({"name": "Spaced"})).unwrap();
+        let fresh = s.execute("text.create", &json!({"x": 10, "y": 90, "text": "B"})).unwrap()["id"].as_u64().unwrap();
+        assert_eq!(runs(&s, fresh)[0].style.leading, None);
+        for clear in [false, true] {
+            s.execute("charStyle.apply", &json!({"name": "Spaced", "id": fresh, "clearOverrides": clear})).unwrap();
+            assert_eq!(runs(&s, fresh)[0].style.leading, Some(30.0));
+        }
+        let copy = s.execute("charStyle.duplicate", &json!({"name": "Spaced"})).unwrap()["name"].as_str().unwrap().to_string();
+        assert_eq!(s.doc().unwrap().doc.char_styles.iter().find(|d| d.name == copy).unwrap().attrs["leading"], 30.0);
+        s.execute("charStyle.apply", &json!({"name": "Kerned", "id": fresh})).unwrap();
+        let st = runs(&s, fresh)[0].style.clone();
+        assert_eq!((st.kerning, st.small_caps), (Some(20.0), Some(70.0)));
+        s.execute("paraStyle.apply", &json!({"name": "Punctuation", "id": id})).unwrap();
+        let NodeKind::Text(t) = &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind else { panic!() };
+        assert_eq!((t.para.mojikumi, t.para.direction), (vectorcraft_doc::Mojikumi::LineEndHalf, Some(vectorcraft_doc::ParaDirection::RightToLeft)));
+        // A library keeps the captured attributes and makes the style again where it's used.
+        s.execute("select.set", &json!({"ids": [id]})).unwrap();
+        let lib = s.execute("library.add", &json!({"kind": "charStyle", "name": "Lib Spaced"})).unwrap();
+        let other = s.execute("text.create", &json!({"x": 10, "y": 150, "text": "C"})).unwrap()["id"].as_u64().unwrap();
+        s.execute("library.use", &json!({"library": lib["library"], "kind": "charStyle", "item": lib["name"]})).unwrap();
+        assert_eq!(runs(&s, other)[0].style.leading, Some(30.0));
+    }
+
     #[test]
     fn paragraph_styles_and_survive_save() {
         let (mut s, id) = session_with_text("Body");

crates/engine/src/cmd/typecmd.rs

@@ -628,7 +628,7 @@ fn area_options(s: &mut Session, p: &Value) -> Result<Value> {
 fn reshape_area(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "text.reshapeArea";
     let id = id_param(p, "id").ok_or_else(|| bad(C, "missing id"))?;
-    let mut refs = super::select::parse_refs(p.get("anchors"));
+    let mut refs = super::select::checked_refs(p.get("anchors"), C)?;
     refs.sort_unstable();
     refs.dedup();
     if refs.is_empty() {

crates/engine/src/cmd/variablecmds.rs

@@ -0,0 +1,590 @@
+//! Variables (data merge): named values bound to objects, applied per dataset.
+//!
+//! One template document produces many variants: bind a type object to a `text`
+//! variable and anything to a `visibility` variable, put a row of values in each
+//! dataset, and `dataset.select` swaps the whole document to that row in one undo
+//! step. Agents reach every command through `run_command`, like all engine commands.
+
+use std::collections::BTreeMap;
+
+use serde_json::{Value, json};
+use vectorcraft_doc::{DataSet, DataValue, NodeId, NodeKind, Variable, VariableKind, Variables};
+
+use super::edit::selected_roots;
+use super::textedit::set_plain_text;
+use super::*;
+
+/// The longest variable or dataset name, in characters (names arrive from MCP and files).
+const MAX_NAME: usize = 255;
+
+fn var_name(p: &Value, cmd: &str) -> Result<String> {
+    named(str_param(p, "name"), "name", cmd)
+}
+
+/// `key`'s value, as a name: trimmed, not empty and at most [`MAX_NAME`] characters.
+fn named(v: Option<&str>, key: &str, cmd: &str) -> Result<String> {
+    match v.map(str::trim).filter(|v| !v.is_empty()) {
+        Some(v) if v.chars().count() > MAX_NAME => Err(bad(cmd, format!("`{key}` is longer than {MAX_NAME} characters"))),
+        Some(v) => Ok(v.to_string()),
+        None => Err(bad(cmd, format!("missing `{key}`"))),
+    }
+}
+
+/// `key`'s value as a name, or `None` when it is missing or empty.
+fn optional_name(p: &Value, key: &str, cmd: &str) -> Result<Option<String>> {
+    match str_param(p, key).map(str::trim).filter(|v| !v.is_empty()) {
+        Some(v) => named(Some(v), key, cmd).map(Some),
+        None => Ok(None),
+    }
+}
+
+/// The `names` of a delete, or without them `fallback` (what the panel acts on) as the one name.
+fn names_param(p: &Value, cmd: &str, fallback: Option<String>, nothing: &str) -> Result<Vec<String>> {
+    let Some(given) = p.get("names") else {
+        return fallback.map(|n| vec![n]).ok_or_else(|| bad(cmd, nothing.to_string()));
+    };
+    match given.as_array() {
+        Some(names) if !names.is_empty() => names.iter().map(|n| named(n.as_str(), "names", cmd)).collect(),
+        _ => Err(bad(cmd, "`names` must be a list of names")),
+    }
+}
+
+/// The objects a bind acts on: `ids` when given (every one checked), else the selection.
+fn target_ids(s: &Session, p: &Value, cmd: &str) -> Result<Vec<NodeId>> {
+    if p.get("ids").is_some() { checked_ids_param(s, p, "ids", cmd) } else { selected_roots(s) }
+}
+
+/// Refuse what a variable of `kind` can't drive: art that is locked or on a hidden or locked
+/// layer is not the document's to rewrite, and a text variable only drives type.
+fn check_bindable(doc: &vectorcraft_doc::Document, ids: &[NodeId], kind: VariableKind, cmd: &str) -> Result<()> {
+    for id in ids {
+        match doc.node(*id) {
+            None => return Err(EngineError::NoNode(*id)),
+            Some(_) if !doc.variable_target(*id) => return Err(bad(cmd, format!("node {} is locked", id.0))),
+            Some(n) if kind == VariableKind::Text && !matches!(n.kind, NodeKind::Text(_)) => {
+                return Err(bad(cmd, format!("node {} is not type", id.0)));
+            }
+            Some(_) => {}
+        }
+    }
+    Ok(())
+}
+
+fn dataset_value(cmd: &str, var: &str, kind: VariableKind, v: &Value) -> Result<DataValue> {
+    match kind {
+        VariableKind::Text => v.as_str().map(|t| DataValue::Text(t.to_string())),
+        VariableKind::Visibility => v.as_bool().map(DataValue::Visible),
+    }
+    .ok_or_else(|| bad(cmd, format!("value for `{var}` must match its variable kind")))
+}
+
+/// The `values` object of `dataset.new` / `dataset.set`, each entry checked against its
+/// variable's kind. Every name must be a variable the document defines: a value nothing
+/// reads is a typo, not a value to keep.
+fn values_param(vars: &Variables, p: &Value, cmd: &str) -> Result<BTreeMap<String, DataValue>> {
+    let mut out = BTreeMap::new();
+    let Some(given) = p.get("values") else { return Ok(out) };
+    let Some(obj) = given.as_object() else { return Err(bad(cmd, "`values` must be an object")) };
+    for (var, v) in obj {
+        let kind = vars.variable(var).map(|d| d.kind).ok_or_else(|| bad(cmd, format!("no variable named `{var}`")))?;
+        out.insert(var.clone(), dataset_value(cmd, var, kind, v)?);
+    }
+    Ok(out)
+}
+
+fn define(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "variable.define";
+    let name = var_name(p, C)?;
+    let kind = str_param(p, "kind").and_then(VariableKind::parse).ok_or_else(|| bad(C, "`kind` must be `text` or `visibility`"))?;
+    if s.doc()?.doc.variables.variable(&name).is_some() {
+        return Err(bad(C, format!("variable `{name}` is already defined")));
+    }
+    s.edit("New Variable", |d, _| {
+        d.variables.variables.push(Variable { name: name.clone(), kind });
+        Ok(())
+    })?;
+    Ok(json!({"name": name, "kind": kind.label()}))
+}
+
+fn rename(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "variable.rename";
+    let from = var_name(p, C)?;
+    let to = named(p.get("newName").and_then(Value::as_str), "newName", C)?;
+    let st = s.doc()?;
+    if st.doc.variables.variable(&to).is_some() {
+        return Err(bad(C, format!("variable `{to}` already exists")));
+    }
+    s.edit("Rename Variable", |d, _| {
+        let v = d.variables.variables.iter_mut().find(|v| v.name == from).ok_or_else(|| bad(C, format!("no variable named `{from}`")))?;
+        v.name = to.clone();
+        for bound in d.variables.bindings.values_mut() {
+            if bound.remove(&from) {
+                bound.insert(to.clone());
+            }
+        }
+        for ds in &mut d.variables.datasets {
+            if let Some(value) = ds.values.remove(&from) {
+                ds.values.insert(to.clone(), value);
+            }
+        }
+        Ok(())
+    })?;
+    // The highlight names a variable, so it follows the rename rather than going stale.
+    let st = s.doc_mut()?;
+    if st.variables_highlight.as_deref() == Some(from.as_str()) {
+        st.variables_highlight = Some(to.clone());
+    }
+    st.revision += 1;
+    Ok(json!({"from": from, "name": to}))
+}
+
+/// Make Text Dynamic / Make Visibility Dynamic: define a variable of that kind and bind the
+/// selection to it in one step, naming it after what it drives — the panel's buttons.
+fn make_dynamic(s: &mut Session, kind: VariableKind, stem: &str) -> Result<Value> {
+    const C: &str = "variable.makeDynamic";
+    let ids = selected_roots(s)?;
+    if ids.is_empty() {
+        return Err(bad(C, "select the objects to bind"));
+    }
+    let doc = &s.doc()?.doc;
+    check_bindable(doc, &ids, kind, C)?;
+    // Named after the first object it drives, as the reference panel does; a second variable
+    // over the same art takes a number rather than colliding.
+    let shown = ids.first().and_then(|id| doc.node(*id)).map(|n| n.display_name()).unwrap_or_default();
+    let base: String = match shown.trim() {
+        "" => stem.to_string(),
+        b => b.chars().take(MAX_NAME - 8).collect(),
+    };
+    let mut name = base.clone();
+    let mut n = 2;
+    while doc.variables.variable(&name).is_some() {
+        name = format!("{base} {n}");
+        n += 1;
+    }
+    s.edit("Make Dynamic", |d, _| {
+        d.variables.variables.push(Variable { name: name.clone(), kind });
+        for id in &ids {
+            d.variables.bind(*id, &name);
+        }
+        Ok(())
+    })?;
+    Ok(json!({"name": name, "kind": kind.label(), "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>()}))
+}
+
+fn delete(s: &mut Session, p: &Value) -> Result<Value> {
+    // Without `names`, the highlighted variable: what the panel's bin and the menu item delete.
+    let highlighted = s.doc()?.variables_highlight.clone();
+    let names = names_param(p, "variable.delete", highlighted, "no variable highlighted")?;
+    let n = s.edit("Delete Variables", |d, _| Ok(d.variables.prune(&names)))?;
+    // A highlight of a variable that is gone highlights nothing.
+    let st = s.doc_mut()?;
+    if st.variables_highlight.as_ref().is_some_and(|h| st.doc.variables.variable(h).is_none()) {
+        st.variables_highlight = None;
+    }
+    st.revision += 1;
+    Ok(json!({"deleted": n}))
+}
+
+fn list(s: &mut Session, _p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let variables: Vec<Value> = st
+        .doc
+        .variables
+        .variables
+        .iter()
+        .map(|v| {
+            let bindings = st.doc.variables.objects_of(&v.name).len();
+            json!({"name": v.name, "kind": v.kind.label(), "bindings": bindings})
+        })
+        .collect();
+    Ok(json!({"variables": variables}))
+}
+
+fn bind(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "variable.bind";
+    let name = named(str_param(p, "variable"), "variable", C)?;
+    let ids = target_ids(s, p, C)?;
+    if ids.is_empty() {
+        return Err(bad(C, "nothing to bind"));
+    }
+    let doc = &s.doc()?.doc;
+    let kind = doc.variables.variable(&name).map(|v| v.kind).ok_or_else(|| bad(C, format!("no variable named `{name}`")))?;
+    check_bindable(doc, &ids, kind, C)?;
+    // Binding again is not a second binding, and says so rather than counting as a change.
+    let already: Vec<u64> = ids.iter().filter(|id| doc.variables.objects_of(&name).contains(id)).map(|id| id.0).collect();
+    let n = s.edit("Bind Variable", |d, _| Ok(ids.iter().filter(|id| d.variables.bind(**id, &name)).count()))?;
+    Ok(json!({"variable": name, "ids": ids.iter().map(|i| i.0).collect::<Vec<_>>(), "bound": n, "already": already}))
+}
+
+fn unbind(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "variable.unbind";
+    let ids = target_ids(s, p, C)?;
+    let name = defined_variable(s, p, C)?;
+    let n = s.edit("Unbind Variable", |d, _| {
+        let mut n = 0;
+        for id in &ids {
+            // With `variable` only that one binding goes; without it, every one the object has.
+            match &name {
+                Some(v) => n += usize::from(d.variables.unbind(*id, v)),
+                None => n += usize::from(d.variables.bindings.remove(id).is_some()),
+            }
+        }
+        Ok(n)
+    })?;
+    Ok(json!({"unbound": n}))
+}
+
+/// The `variable` a command names, which must be defined; `None` when it names none.
+fn defined_variable(s: &Session, p: &Value, cmd: &str) -> Result<Option<String>> {
+    let name = optional_name(p, "variable", cmd)?;
+    if let Some(v) = &name
+        && s.doc()?.doc.variables.variable(v).is_none()
+    {
+        return Err(bad(cmd, format!("no variable named `{v}`")));
+    }
+    Ok(name)
+}
+
+/// Highlight one Variables panel row: what the panel's Delete, Options… and Select Bound
+/// Object act on. Panel state, not art selection: not saved, not an undo step (an empty
+/// or missing `variable` clears it), like `layer.highlight`.
+fn highlight(s: &mut Session, p: &Value) -> Result<Value> {
+    let name = defined_variable(s, p, "variable.highlight")?;
+    let st = s.doc_mut()?;
+    st.variables_highlight = name.clone();
+    st.revision += 1;
+    Ok(json!({"variable": name}))
+}
+
+fn dataset_new(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "dataset.new";
+    let name = var_name(p, C)?;
+    let st = s.doc()?;
+    // A dataset and a variable are separate namespaces, so a dataset may share a variable's
+    // name; it is its own row of values either way.
+    let values = values_param(&st.doc.variables, p, C)?;
+    if st.doc.variables.dataset(&name).is_some() {
+        return Err(bad(C, format!("dataset `{name}` already exists")));
+    }
+    s.edit("New Data Set", |d, _| {
+        d.variables.datasets.push(DataSet { name: name.clone(), values: values.clone() });
+        Ok(())
+    })?;
+    Ok(json!({"name": name}))
+}
+
+/// Replace a dataset's values. A variable left out of `values` loses its value in this row,
+/// so the dataset ends up holding exactly what the call asked for.
+fn dataset_set(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "dataset.set";
+    let name = var_name(p, C)?;
+    let values = values_param(&s.doc()?.doc.variables, p, C)?;
+    let (set, removed) = s.edit("Edit Data Set", |d, _| {
+        let ds = d.variables.datasets.iter_mut().find(|x| x.name == name).ok_or_else(|| bad(C, format!("no dataset named `{name}`")))?;
+        let removed: Vec<String> = ds.values.keys().filter(|k| !values.contains_key(*k)).cloned().collect();
+        ds.values = values.clone();
+        Ok((values.len(), removed))
+    })?;
+    Ok(json!({"name": name, "values": set, "removed": removed}))
+}
+
+fn dataset_rename(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "dataset.rename";
+    let from = var_name(p, C)?;
+    let to = named(p.get("newName").and_then(Value::as_str), "newName", C)?;
+    let st = s.doc()?;
+    if st.doc.variables.dataset(&to).is_some() {
+        return Err(bad(C, format!("dataset `{to}` already exists")));
+    }
+    s.edit("Rename Data Set", |d, _| {
+        let ds = d.variables.datasets.iter_mut().find(|d| d.name == from).ok_or_else(|| bad(C, format!("no dataset named `{from}`")))?;
+        ds.name = to.clone();
+        if d.variables.active_dataset.as_deref() == Some(from.as_str()) {
+            d.variables.active_dataset = Some(to.clone());
+        }
+        Ok(())
+    })?;
+    Ok(json!({"from": from, "name": to}))
+}
+
+/// Capture Data Set: record what the bound objects hold right now as a new row. This, rather
+/// than typing values, is how rows are made — change the art, then capture it.
+fn dataset_capture(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "dataset.capture";
+    let st = s.doc()?;
+    let values = st.doc.captured_values();
+    if values.is_empty() {
+        return Err(bad(C, "bind something to a variable first"));
+    }
+    let name = match optional_name(p, "name", C)? {
+        Some(n) => n,
+        // "Data Set 1", the first free number, as the reference panel's rows are named.
+        None => (1..).map(|i| format!("Data Set {i}")).find(|n| st.doc.variables.dataset(n).is_none()).unwrap_or_default(),
+    };
+    if s.doc()?.doc.variables.dataset(&name).is_some() {
+        return Err(bad(C, format!("dataset `{name}` already exists")));
+    }
+    s.edit("Capture Data Set", |d, _| {
+        d.variables.datasets.push(DataSet { name: name.clone(), values: values.clone() });
+        d.variables.active_dataset = Some(name.clone());
+        Ok(())
+    })?;
+    Ok(json!({"name": name, "values": values.len()}))
+}
+
+/// Update Data Set: write what the bound objects hold now into the row that is active. Without
+/// an active row there is nothing to update, so say so rather than picking one.
+fn dataset_update(s: &mut Session, _p: &Value) -> Result<Value> {
+    const C: &str = "dataset.update";
+    let values = s.doc()?.doc.captured_values();
+    let Some(name) = s.doc()?.doc.variables.active_dataset.clone() else {
+        return Err(bad(C, "no active data set"));
+    };
+    if values.is_empty() {
+        return Err(bad(C, "bind something to a variable first"));
+    }
+    s.edit("Update Data Set", |d, _| {
+        let ds = d.variables.datasets.iter_mut().find(|d| d.name == name).ok_or_else(|| bad(C, format!("no dataset named `{name}`")))?;
+        ds.values = values.clone();
+        Ok(())
+    })?;
+    Ok(json!({"name": name, "values": values.len()}))
+}
+
+fn dataset_delete(s: &mut Session, p: &Value) -> Result<Value> {
+    // Without `names`, the active dataset: what the panel's Delete Data Set deletes.
+    let active = s.doc()?.doc.variables.active_dataset.clone();
+    let names = names_param(p, "dataset.delete", active, "no active data set")?;
+    let n = s.edit("Delete Data Sets", |d, _| {
+        let before = d.variables.datasets.len();
+        d.variables.datasets.retain(|d| !names.contains(&d.name));
+        // The active dataset's own name is the one that goes, not a variable's.
+        if d.variables.active_dataset.as_ref().is_some_and(|a| names.contains(a)) {
+            d.variables.active_dataset = None;
+        }
+        Ok(before - d.variables.datasets.len())
+    })?;
+    Ok(json!({"deleted": n}))
+}
+
+fn dataset_list(s: &mut Session, _p: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let current = st.doc.captured_values();
+    let datasets: Vec<Value> = st
+        .doc
+        .variables
+        .datasets
+        .iter()
+        // `matches` says whether the art still holds what the row says, which is what the
+        // panel shows in italics.
+        .map(|d| json!({"name": d.name, "values": d.values, "matches": d.matches(&current)}))
+        .collect();
+    Ok(json!({"datasets": datasets, "active": st.doc.variables.active_dataset}))
+}
+
+fn apply_dataset(s: &mut Session, name: &str) -> Result<Value> {
+    const C: &str = "dataset.select";
+    let (applied, skipped) = s.edit("Apply Data Set", |d, _| {
+        let ds = d.variables.dataset(name).cloned().ok_or_else(|| bad(C, format!("no dataset named `{name}`")))?;
+        // One object may be driven by several variables; walk them in definition order, so two
+        // text variables on the same object land the later one's value and both are counted.
+        let mut pairs: Vec<(NodeId, String)> = Vec::new();
+        for v in &d.variables.variables {
+            pairs.extend(d.variables.objects_of(&v.name).into_iter().map(|id| (id, v.name.clone())));
+        }
+        let mut applied = 0usize;
+        let mut skipped = 0usize;
+        for (id, var) in pairs {
+            // A binding whose variable is gone, whose value this row doesn't carry, or whose
+            // value doesn't fit the variable's kind, is left alone and counted, never
+            // silently reinterpreted.
+            let (kind, value) = match (d.variables.variable(&var).map(|v| v.kind), ds.values.get(&var)) {
+                (Some(kind), Some(value)) if value.fits(kind) => (kind, value.clone()),
+                _ => {
+                    skipped += 1;
+                    continue;
+                }
+            };
+            // Locked art, art on a locked or hidden layer, and text whose object is gone, can't
+            // be rewritten: skipped and counted, like the rest. A hidden object is rewritten: a
+            // row that hid it shows it again.
+            if !d.variable_target(id) {
+                skipped += 1;
+                continue;
+            }
+            let done = match (kind, &value) {
+                // The Type tool's own whole-range replace, so a dataset's text is styled and
+                // laid out exactly as typing it would be.
+                (VariableKind::Text, DataValue::Text(text)) => set_plain_text(d, id, text).is_ok(),
+                (VariableKind::Visibility, DataValue::Visible(show)) => d.node_mut(id).is_some_and(|n| {
+                    n.visible = *show;
+                    true
+                }),
+                _ => false,
+            };
+            if done {
+                applied += 1;
+            } else {
+                skipped += 1;
+            }
+        }
+        d.variables.active_dataset = Some(name.to_string());
+        Ok((applied, skipped))
+    })?;
+    Ok(json!({"name": name, "applied": applied, "skipped": skipped}))
+}
+
+fn dataset_select(s: &mut Session, p: &Value) -> Result<Value> {
+    apply_dataset(s, &var_name(p, "dataset.select")?)
+}
+
+fn dataset_step(s: &mut Session, cmd: &str, forward: bool) -> Result<Value> {
+    let st = s.doc()?;
+    let n = st.doc.variables.datasets.len();
+    if n == 0 {
+        return Err(bad(cmd, "no datasets"));
+    }
+    let at = st.doc.variables.active_dataset.as_deref().and_then(|a| st.doc.variables.datasets.iter().position(|d| d.name == a));
+    let next = match (at, forward) {
+        (Some(i), true) => (i + 1) % n,
+        (Some(i), false) => (i + n - 1) % n,
+        (None, true) => 0,
+        (None, false) => n - 1,
+    };
+    let name = st.doc.variables.datasets.get(next).map(|d| d.name.clone()).ok_or_else(|| bad(cmd, "no datasets"))?;
+    apply_dataset(s, &name)
+}
+
+pub fn specs() -> Vec<CommandSpec> {
+    vec![
+        cmd!("variable.define", "New Variable…", ["Window", "Variables"], None, "{name, kind: text|visibility} define a variable", has_doc, define),
+        cmd!(
+            "variable.delete",
+            "Delete Variable",
+            ["Window", "Variables"],
+            None,
+            "{names?} delete variables with their bindings and values (default: the highlighted one)",
+            has_doc,
+            delete
+        ),
+        cmd!(
+            "variable.rename",
+            "Rename Variable",
+            ["Window", "Variables"],
+            None,
+            "{name, newName} rename a variable, with its bindings and its values in every dataset",
+            has_doc,
+            rename
+        ),
+        cmd!(query "variable.list", "List Variables", [], None, "{} → variables with kinds and binding counts", has_doc, list),
+        cmd!(
+            "variable.makeTextDynamic",
+            "Make Text Dynamic",
+            ["Window", "Variables"],
+            None,
+            "{} define a text variable over the selection, named after it and bound to it",
+            has_selection,
+            |s, _| make_dynamic(s, VariableKind::Text, "Text")
+        ),
+        cmd!(
+            "variable.makeVisibilityDynamic",
+            "Make Visibility Dynamic",
+            ["Window", "Variables"],
+            None,
+            "{} define a visibility variable over the selection, named after it and bound to it",
+            has_selection,
+            |s, _| make_dynamic(s, VariableKind::Visibility, "Visibility")
+        ),
+        cmd!(
+            "variable.bind",
+            "Bind Variable",
+            ["Window", "Variables"],
+            None,
+            "{variable, ids?} bind objects (default: the selection) to a variable; text needs type, locked art is refused. An object may hold several variables, and binding it to one it already has changes nothing → {bound, already}",
+            has_doc,
+            bind
+        ),
+        cmd!(
+            "variable.unbind",
+            "Unbind Variable",
+            ["Window", "Variables"],
+            None,
+            "{ids?, variable?} drop bindings (default: the selection): `variable` drops that one, else every variable the object has",
+            has_doc,
+            unbind
+        ),
+        cmd!(
+            "variable.highlight",
+            "Highlight Variable",
+            [],
+            None,
+            "{variable?} highlight one Variables panel row (a click); what the panel's Delete, Options… and Select Bound Object act on. An empty or missing `variable` clears it. Not an undo step → {variable}",
+            has_doc,
+            highlight
+        ),
+        cmd!("dataset.new", "New Data Set…", ["Window", "Variables"], None, "{name, values?: {variable: value}} add a dataset", has_doc, dataset_new),
+        cmd!(
+            "dataset.set",
+            "Edit Data Set…",
+            ["Window", "Variables"],
+            None,
+            "{name, values?: {variable: value}} replace a dataset's values; a variable left out loses its value in this row → {values, removed}",
+            has_doc,
+            dataset_set
+        ),
+        cmd!("dataset.rename", "Rename Data Set", ["Window", "Variables"], None, "{name, newName} rename a dataset", has_doc, dataset_rename),
+        cmd!(
+            "dataset.capture",
+            "Capture Data Set",
+            ["Window", "Variables"],
+            None,
+            "{name?} record what the bound objects hold right now as a new dataset (Data Set 1…), and make it the active one",
+            has_doc,
+            dataset_capture
+        ),
+        cmd!(
+            "dataset.update",
+            "Update Data Set",
+            ["Window", "Variables"],
+            None,
+            "{} write what the bound objects hold now into the active dataset",
+            has_doc,
+            dataset_update
+        ),
+        cmd!(
+            "dataset.delete",
+            "Delete Data Set",
+            ["Window", "Variables"],
+            None,
+            "{names?} delete datasets (default: the active one)",
+            has_doc,
+            dataset_delete
+        ),
+        cmd!(
+            query "dataset.list",
+            "List Data Sets",
+            [],
+            None,
+            "{} → datasets with their values, the active one, and which rows the art still matches",
+            has_doc,
+            dataset_list
+        ),
+        cmd!(
+            "dataset.select",
+            "Select Data Set",
+            ["Window", "Variables"],
+            None,
+            "{name} apply a dataset in one undo step → {applied, skipped}",
+            has_doc,
+            dataset_select
+        ),
+        cmd!("dataset.next", "Next Data Set", ["Window", "Variables"], None, "{} apply the next dataset, wrapping", has_doc, |s, _| dataset_step(
+            s,
+            "dataset.next",
+            true
+        )),
+        cmd!("dataset.prev", "Previous Data Set", ["Window", "Variables"], None, "{} apply the previous dataset, wrapping", has_doc, |s, _| {
+            dataset_step(s, "dataset.prev", false)
+        }),
+    ]
+}

crates/engine/src/cmd/webexport.rs

@@ -582,8 +582,14 @@ pub fn render(doc: &Document, s: &WebSettings) -> std::result::Result<WebRender,
     let doc = doc.without_edit_modes();
     let (region, scale) = region(&doc, s)?;
     let page = (doc.setup.background == vectorcraft_doc::Background::White).then_some([255; 4]);
-    let opts =
-        vectorcraft_render::RenderOptions { background: page, skip_templates: true, anti_alias: s.anti_alias, precise: true, ..Default::default() };
+    let opts = vectorcraft_render::RenderOptions {
+        background: page,
+        skip_templates: true,
+        anti_alias: s.anti_alias,
+        precise: true,
+        supersample: true,
+        ..Default::default()
+    };
     let img = vectorcraft_render::Renderer::new().render_region_with(&doc, region, scale, &opts);
     Ok(WebRender { rgba: img.to_straight(), width: img.width, height: img.height, region, scale })
 }

crates/engine/src/cmd/xform.rs

@@ -132,32 +132,29 @@ fn warp_node(n: &mut Node, pr: &Projective) {
 }
 
 fn distort(s: &mut Session, p: &Value) -> Result<Value> {
-    let corners: Vec<Point> = p
+    const C: &str = "object.distort";
+    // All four corners or nothing, each exactly [x, y]: nothing malformed is left out.
+    let corners: Option<Vec<Point>> = p
         .get("corners")
         .and_then(Value::as_array)
-        .map(|a| a.iter().filter_map(|c| Some(Point::new(c.get(0)?.as_f64()?, c.get(1)?.as_f64()?))).collect())
-        .unwrap_or_default();
-    if corners.len() != 4 {
-        return Err(bad("object.distort", "corners must be 4 [x,y] points (TL, TR, BR, BL)"));
+        .filter(|a| a.len() == 4)
+        .and_then(|a| a.iter().map(|c| finite_numbers(c).map(|[x, y]| Point::new(x, y))).collect());
+    let Some(&[tl, tr, br, bl]) = corners.as_deref() else { return Err(bad(C, "corners must be 4 [x, y] points (TL, TR, BR, BL)")) };
+    let ids = if p.get("ids").is_some_and(|v| !v.is_null()) { checked_ids_param(s, p, "ids", C)? } else { selected_roots(s)? };
+    if ids.is_empty() {
+        return Err(bad(C, "nothing to distort"));
     }
-    let ids = match ids_param(p, "ids") {
-        Some(v) => v,
-        None => selected_roots(s)?,
-    };
-    let src = match p.get("from").and_then(Value::as_array) {
-        Some(a) if a.len() == 4 => {
-            let f: Vec<f64> = a.iter().filter_map(Value::as_f64).collect();
-            if f.len() != 4 {
-                return Err(bad("object.distort", "from must be [x0,y0,x1,y1]"));
-            }
-            Rect::new(f[0], f[1], f[2], f[3])
+    let src = match p.get("from").filter(|v| !v.is_null()) {
+        None => s.doc()?.doc.bounds_of(&ids, false).ok_or_else(|| bad(C, "nothing to distort"))?,
+        Some(v) => {
+            let [x0, y0, x1, y1] = finite_numbers(v).ok_or_else(|| bad(C, "from must be [x0, y0, x1, y1]"))?;
+            Rect::new(x0, y0, x1, y1)
         }
-        _ => s.doc()?.doc.bounds_of(&ids, false).ok_or_else(|| EngineError::Other("nothing to distort".into()))?,
     };
-    if src.width().abs() < 1e-9 || src.height().abs() < 1e-9 {
-        return Err(EngineError::Other("cannot distort a zero-size bounding box".into()));
+    if !src.width().is_finite() || !src.height().is_finite() || src.width().abs() < 1e-9 || src.height().abs() < 1e-9 {
+        return Err(bad(C, "cannot distort a zero-size or non-finite bounding box"));
     }
-    let pr = Projective::from_rect(src, [corners[0], corners[1], corners[2], corners[3]]);
+    let pr = Projective::from_rect(src, [tl, tr, br, bl]);
     s.edit("Free Distort", |d, _| {
         for id in &ids {
             if let Some(n) = d.node_mut(*id) {

crates/engine/src/lib.rs

@@ -10,6 +10,7 @@ pub mod cmd;
 pub mod file_access;
 pub mod guard;
 pub mod inspect;
+pub mod link_watch;
 pub mod steps;
 mod tooling;
 pub mod units;
@@ -85,6 +86,7 @@ pub struct Interaction {
     /// isolation).
     pub active_layer: Option<NodeId>,
     pub layer_rows: Vec<NodeId>,
+    pub variables_highlight: Option<String>,
     pub isolation: Option<NodeId>,
     /// The perspective transform the previews make (`perspective.transform` params): Transform
     /// Again repeats it once the drag is committed.
@@ -120,6 +122,10 @@ pub struct DocState {
     /// Panel state, not art selection: not saved, not undoable (`layer.setCurrent`,
     /// `layer.highlight`).
     pub layer_rows: Vec<NodeId>,
+    /// The variable highlighted in the Variables panel: what its Delete, Options… and Select
+    /// Bound Object act on. Panel state, not art selection: not saved, not undoable
+    /// (`variable.highlight`). A name, so renaming a variable moves the highlight with it.
+    pub variables_highlight: Option<String>,
     /// Isolation mode container.
     pub isolation: Option<NodeId>,
     pub interaction: Option<Interaction>,
@@ -235,6 +241,7 @@ impl DocState {
             revision: 1,
             active_layer,
             layer_rows: vec![],
+            variables_highlight: None,
             isolation: None,
             interaction: None,
             undo_group: None,
@@ -299,6 +306,7 @@ impl DocState {
             self.selection = it.selection;
             self.active_layer = it.active_layer;
             self.layer_rows = it.layer_rows;
+            self.variables_highlight = it.variables_highlight;
             self.isolation = it.isolation;
             self.revision += 1;
         }
@@ -338,6 +346,14 @@ impl DocState {
         // A sublayer takes new art only while it and the layers around it are shown and unlocked.
         self.active_layer.filter(|l| self.doc.node(*l).is_some_and(|n| n.is_layer()) && self.doc.is_editable(*l)).or_else(|| self.doc.default_layer())
     }
+    /// [`Self::insertion_parent`] for new art, which a locked or hidden layer never takes: an error
+    /// when no layer is shown and unlocked, so the art is refused rather than hidden or locked away.
+    pub fn target_parent(&self) -> Result<Option<NodeId>> {
+        match self.insertion_parent() {
+            Some(p) if !self.doc.is_editable(p) => Err(EngineError::Other("the target layer is locked or hidden".into())),
+            parent => Ok(parent),
+        }
+    }
     /// The highlighted Layers panel rows that still exist (ids are reused after undo, so a
     /// remembered row must still be in the document).
     pub fn highlighted_rows(&self) -> Vec<NodeId> {
@@ -511,6 +527,10 @@ pub struct Prefs {
     /// UI language: `auto` (follow the system locale) or a language code such as `en`, `zh-hant`.
     /// The list of languages belongs to the shell (`ui-egui` i18n); an unknown code reads as `auto`.
     pub interface_language: String,
+    /// Windows and Linux: use the system's title bar and window buttons instead of the app bar
+    /// acting as the title bar (tiling window managers, desktops that draw their own decorations).
+    /// Read when the app starts. macOS always uses the system's.
+    pub system_title_bar: bool,
     // Performance
     pub gpu_performance: bool,
     pub animated_zoom: bool,
@@ -725,6 +745,7 @@ impl Default for Prefs {
             ui_scaling: 1.0,
             scale_cursor_with_ui: false,
             interface_language: s("auto"),
+            system_title_bar: false,
             gpu_performance: true,
             animated_zoom: true,
             gpu_preference: s("automatic"),
@@ -873,6 +894,11 @@ pub struct Session {
     /// The walker threads a folder search starts; `None`: [`cmd::findfiles::threads`]. Tests set
     /// it.
     pub search_threads: Option<usize>,
+    /// Each open document's linked files' size and modification time when last seen (linked
+    /// files changing while the document is open, [`link_watch`]).
+    pub link_stamps: std::collections::HashMap<(u64, String), link_watch::Stamp>,
+    /// The stamps being taken on a worker thread ([`Session::start_link_scan`]).
+    pub link_scan: Option<link_watch::LinkScan>,
 }
 
 impl Default for Session {
@@ -928,6 +954,8 @@ impl Session {
             font_search: None,
             search_rules: None,
             search_threads: None,
+            link_stamps: Default::default(),
+            link_scan: None,
         }
     }
 
@@ -1213,6 +1241,10 @@ impl Session {
                     if !st.doc.assets.is_empty() {
                         Arc::make_mut(&mut st.doc).prune_assets();
                     }
+                    // Variables: bindings let go of deleted art.
+                    if !st.doc.variables.bindings.is_empty() {
+                        Arc::make_mut(&mut st.doc).prune_variable_bindings();
+                    }
                     if doc_sane(&st.doc, &st.selection) {
                         Ok(v)
                     } else {
@@ -1277,6 +1309,7 @@ impl Session {
             preview: None,
             active_layer: st.active_layer,
             layer_rows: st.layer_rows.clone(),
+            variables_highlight: st.variables_highlight.clone(),
             isolation: st.isolation,
             perspective_again: None,
         });
@@ -1506,6 +1539,8 @@ mod tests_links;
 #[cfg(test)]
 mod tests_linkspanel;
 #[cfg(test)]
+mod tests_linkwatch;
+#[cfg(test)]
 mod tests_liquify;
 #[cfg(test)]
 mod tests_live;
@@ -1648,6 +1683,8 @@ mod tests_typearea;
 #[cfg(test)]
 mod tests_units;
 #[cfg(test)]
+mod tests_variables;
+#[cfg(test)]
 mod tests_webexport;
 #[cfg(test)]
 mod tests_widthpoints;

crates/engine/src/link_watch.rs

@@ -0,0 +1,150 @@
+//! Linked files that change while their document is open (another app saved them: PhotoCraft,
+//! LightCraft, Photoshop, a placed VectorCraft document): Preferences › File Handling › Update
+//! Links decides, as it does when a document opens. Automatically reads them again
+//! (`links.update`, an undo step), Ask When Modified offers to, Manually leaves them modified in
+//! the Links panel.
+//!
+//! The active document's linked files are compared by size and modification time with what they
+//! were when last seen. The desktop app takes the stamps every two seconds and when its window
+//! comes back to the front, on a worker thread so a file on a slow network share never holds up
+//! the interface ([`Session::start_link_scan`], [`Session::poll_link_scan`]);
+//! `links.updateChanged` takes them on the spot and reads the changed files again (CLI, agents).
+//!
+//! Stamps are kept per document: one in the background is looked at when it comes to the front.
+//! A file seen for the first time is only remembered (one modified while its document was closed
+//! is handled when the document opens); one that can't be read yet (another app is still writing
+//! it) keeps its old stamp, so the next look tries again. A change is acted on once: undoing an
+//! update, or answering No, leaves the link modified until the file changes again.
+
+use std::collections::{BTreeSet, HashMap, HashSet};
+use std::sync::{Arc, Mutex, PoisonError};
+
+use serde_json::{Value, json};
+
+use crate::{Result, Session};
+
+/// A file's size and modification time (nanoseconds since 1970).
+pub type Stamp = (u64, u128);
+
+/// Stamps of a document's linked files taken on a worker thread: (document uid, [(file,
+/// object ids, stamp)]).
+pub type LinkScan = Arc<Mutex<Option<(u64, Vec<(String, Vec<u64>, Option<Stamp>)>)>>>;
+
+#[cfg(not(target_arch = "wasm32"))]
+fn stamp(path: &str) -> Option<Stamp> {
+    let meta = std::fs::metadata(path).ok()?;
+    let modified = meta.modified().ok()?.duration_since(std::time::UNIX_EPOCH).ok()?;
+    Some((meta.len(), modified.as_nanos()))
+}
+
+#[cfg(target_arch = "wasm32")]
+fn stamp(_: &str) -> Option<Stamp> {
+    None
+}
+
+/// The linked files of `d` with the ids of the objects showing them.
+pub fn linked_files(d: &vectorcraft_doc::Document) -> Vec<(String, Vec<u64>)> {
+    crate::cmd::links::linked_groups(d)
+}
+
+/// `links.updateChanged`: stamp the active document's linked files now and read the changed
+/// ones again, whatever Update Links says.
+pub(crate) fn update_changed(s: &mut Session, _: &Value) -> Result<Value> {
+    let st = s.doc()?;
+    let (uid, files) = (st.uid, crate::cmd::links::linked_groups(&st.doc));
+    let now = files.into_iter().map(|(p, ids)| (p.clone(), ids, stamp(&p))).collect();
+    s.apply_link_stamps(uid, now, true)
+}
+
+impl Session {
+    /// Start stamping the active document's linked files on a worker thread, unless a look is
+    /// still running (or the build has no files to look at: the web app).
+    pub fn start_link_scan(&mut self) {
+        if self.link_scan.is_some() || cfg!(target_arch = "wasm32") {
+            return;
+        }
+        let Some(st) = self.active() else { return };
+        let (uid, files) = (st.uid, crate::cmd::links::linked_groups(&st.doc));
+        if files.is_empty() {
+            return;
+        }
+        let slot: LinkScan = Arc::default();
+        let out = slot.clone();
+        let spawned = std::thread::Builder::new().name("link-watch".into()).spawn(move || {
+            let stamps = files.into_iter().map(|(p, ids)| (p.clone(), ids, stamp(&p))).collect();
+            *out.lock().unwrap_or_else(PoisonError::into_inner) = Some((uid, stamps));
+        });
+        if spawned.is_ok() {
+            self.link_scan = Some(slot);
+        }
+    }
+
+    /// Apply a finished look (`None` while there is none, or it is still running): see
+    /// [`Session::apply_link_stamps`].
+    pub fn poll_link_scan(&mut self) -> Option<Result<Value>> {
+        let (uid, stamps) = self.link_scan.as_ref()?.lock().unwrap_or_else(PoisonError::into_inner).take()?;
+        self.link_scan = None;
+        Some(self.apply_link_stamps(uid, stamps, false))
+    }
+
+    /// Compare the stamps of document `uid`'s linked files with the ones last seen and act on
+    /// the changed ones as Update Links says (`update`: read them again regardless). Returns
+    /// `{updated: [ids], ask: [ids], modified: [ids]}`: read again, to offer (Ask When Modified),
+    /// or left modified (Manually).
+    pub fn apply_link_stamps(&mut self, uid: u64, now: Vec<(String, Vec<u64>, Option<Stamp>)>, update: bool) -> Result<Value> {
+        let none = || json!({"updated": [], "ask": [], "modified": []});
+        // The document went to the back meanwhile: it's looked at when it's in front again.
+        if self.active().map(|d| d.uid) != Some(uid) {
+            return Ok(none());
+        }
+        // This document's last stamps; those of closed documents are dropped.
+        let open: HashSet<u64> = self.documents().iter().map(|d| d.uid).collect();
+        let mut before: HashMap<String, Stamp> = HashMap::new();
+        self.link_stamps.retain(|(u, p), s| {
+            if *u == uid {
+                before.insert(p.clone(), *s);
+                false
+            } else {
+                open.contains(u)
+            }
+        });
+        let mut changed: Vec<(String, Vec<u64>)> = Vec::new();
+        for (path, ids, stamp) in now {
+            match (before.get(&path), stamp) {
+                // Not there right now (an app saving by delete and rename): keep the last stamp.
+                (Some(old), None) => {
+                    self.link_stamps.insert((uid, path), *old);
+                }
+                (old, Some(new)) => {
+                    if old.is_some_and(|o| *o != new) {
+                        changed.push((path.clone(), ids));
+                    }
+                    self.link_stamps.insert((uid, path), new);
+                }
+                (None, None) => {}
+            }
+        }
+        if changed.is_empty() {
+            return Ok(none());
+        }
+        let ids: Vec<u64> = changed.iter().flat_map(|(_, ids)| ids.iter().copied()).collect();
+        let mode = if update { "automatically" } else { self.prefs.update_links.as_str() };
+        match mode {
+            "automatically" => {
+                let r = self.execute("links.update", &json!({"ids": ids}))?;
+                // Not readable yet (still being written): the next look tries again.
+                let unread: BTreeSet<u64> = r["missing"].as_array().map(|a| a.iter().filter_map(Value::as_u64).collect()).unwrap_or_default();
+                for (path, ids) in &changed {
+                    if ids.iter().any(|i| unread.contains(i))
+                        && let Some(old) = before.get(path)
+                    {
+                        self.link_stamps.insert((uid, path.clone()), *old);
+                    }
+                }
+                Ok(json!({"updated": r["updated"], "ask": [], "modified": []}))
+            }
+            "askWhenModified" => Ok(json!({"updated": [], "ask": ids, "modified": []})),
+            _ => Ok(json!({"updated": [], "ask": [], "modified": ids})),
+        }
+    }
+}

crates/engine/src/tests.rs

@@ -134,6 +134,74 @@ fn fill_and_stroke_commands() {
     s.execute("paint.setFill", &json!({"gradient": {"kind": "radial"}})).unwrap();
 }
 
+#[test]
+fn stroke_rejects_invalid_dash_components_and_preserves_defaults_on_error() {
+    let mut s = session();
+    let id = rect(&mut s, 0.0, 0.0, 40.0, 30.0);
+    s.execute("stroke.set", &json!({"weight": 3, "dash": [6, 3]})).unwrap();
+    let previous_weight = s.paint.stroke_width;
+    let previous_stroke = s.doc().unwrap().doc.node(id).unwrap().appearance.stroke().cloned();
+
+    for params in [
+        json!({"weight": 10, "dash": [6, "not a number", 3]}),
+        json!({"weight": 10, "ids": "not an array"}),
+        json!({"weight": 10, "item": "invalid"}),
+        json!({"weight": 10, "arrowAlign": "unknown"}),
+    ] {
+        assert!(s.execute("stroke.set", &params).is_err(), "{params} must fail");
+        assert_eq!(s.paint.stroke_width, previous_weight, "failed stroke edit changed new-art defaults");
+        assert_eq!(s.doc().unwrap().doc.node(id).unwrap().appearance.stroke().cloned(), previous_stroke);
+    }
+
+    // A valid dash list still updates the selected stroke and new-art default width.
+    s.execute("stroke.set", &json!({"weight": 7, "dash": [4, 2]})).unwrap();
+    assert_eq!(s.paint.stroke_width, 7.0);
+    assert_eq!(s.doc().unwrap().doc.node(id).unwrap().appearance.stroke().unwrap().width, 7.0);
+
+    // With nothing selected the panel sets up the next object drawn: a rejected edit doesn't.
+    s.execute("select.none", &json!({})).unwrap();
+    let next = s.new_art();
+    assert!(s.execute("stroke.set", &json!({"weight": 12, "dash": [2, 2], "arrowAlign": "unknown"})).is_err());
+    assert_eq!(s.new_art(), next);
+    s.execute("stroke.set", &json!({"weight": 12, "dash": [2, 2]})).unwrap();
+    let next = s.new_art();
+    let stroke = next.stroke().unwrap();
+    assert_eq!((stroke.width, stroke.dash.as_ref().map(|d| d.pattern.clone())), (12.0, Some(vec![2.0, 2.0])));
+}
+
+#[test]
+fn rejected_paint_edits_leave_new_art_defaults_and_focus_unchanged() {
+    let mut s = session();
+    let id = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
+    s.execute("paint.setFill", &json!({"color": "#00ff00"})).unwrap();
+    s.execute("paint.setStroke", &json!({"color": "#ff0000"})).unwrap();
+    let defaults = s.paint.clone();
+    let focused = s.fill_active;
+    let original_fill = s.doc().unwrap().doc.node(id).unwrap().appearance.fill_paint();
+    let original_stroke = s.doc().unwrap().doc.node(id).unwrap().appearance.stroke_paint();
+
+    // Both shortcut commands used to change defaults before checking invalid ids.
+    for (command, params) in [
+        ("paint.swap", json!({"ids": "not an array"})),
+        ("paint.default", json!({"ids": ["not an object id"]})),
+        ("paint.setFill", json!({"color": "#123456", "ids": [false]})),
+        ("paint.setStroke", json!({"color": "#123456", "ids": "not an array"})),
+        ("paint.setFill", json!({"color": "#123456", "item": "invalid"})),
+    ] {
+        assert!(s.execute(command, &params).is_err(), "{command} should reject {params}");
+        assert_eq!(s.paint, defaults, "{command} changed new-art defaults on failure");
+        assert_eq!(s.fill_active, focused, "{command} changed the active proxy on failure");
+        let appearance = &s.doc().unwrap().doc.node(id).unwrap().appearance;
+        assert_eq!(appearance.fill_paint(), original_fill);
+        assert_eq!(appearance.stroke_paint(), original_stroke);
+    }
+
+    // Successful operations still update both the selected object and new-art defaults.
+    s.execute("paint.swap", &json!({})).unwrap();
+    assert_eq!(s.paint.fill, defaults.stroke);
+    assert_eq!(s.paint.stroke, defaults.fill);
+}
+
 #[test]
 fn select_same_fill() {
     let mut s = session();
@@ -892,3 +960,66 @@ fn given_targets_are_used_as_given_and_range_style_takes_the_selected_type() {
     assert!(s.execute("text.setRangeStyle", &json!({"start": 0, "end": 3, "size": 40})).is_err(), "two type objects: which one?");
     assert!(s.execute("text.setRangeStyle", &json!({"id": "two", "size": 40})).is_err());
 }
+
+#[test]
+fn malformed_anchor_selection_never_replaces_or_partially_changes_selection() {
+    let mut s = session();
+    let a = rect(&mut s, 10.0, 10.0, 30.0, 20.0);
+    let b = rect(&mut s, 50.0, 10.0, 30.0, 20.0);
+    let expected = s.doc().unwrap().selection.objects.clone();
+    let expected_anchors = s.doc().unwrap().selection.anchors.clone();
+    for p in [
+        json!({"id": a.0, "anchors": [[0, 0], ["bad", 2]]}),
+        json!({"id": a.0, "anchors": [[0, 0, 1]]}),
+        json!({"id": a.0, "anchors": "not an array"}),
+        json!({"id": u64::MAX, "anchors": []}),
+        json!({"id": a.0, "anchors": [], "mode": "missing"}),
+    ] {
+        assert!(s.execute("select.anchors", &p).is_err(), "{p}");
+        assert_eq!(s.doc().unwrap().selection.objects, expected);
+        assert_eq!(s.doc().unwrap().selection.anchors, expected_anchors);
+    }
+    for p in [
+        json!({"items": [{"id": a.0, "anchors": [[0, 0]]}, {"id": b.0, "anchors": [[0, "bad"]]}]}),
+        json!({"items": [{"id": a.0, "anchors": [[0, 0]]}, {"id": "bad", "anchors": [[0, 0]]}]}),
+        json!({"items": [{"id": u64::MAX, "anchors": []}]}),
+        json!({"items": [{"id": a.0}]}),
+    ] {
+        assert!(s.execute("select.anchorsMany", &p).is_err(), "{p}");
+        assert_eq!(s.doc().unwrap().selection.objects, expected);
+        assert_eq!(s.doc().unwrap().selection.anchors, expected_anchors);
+    }
+    s.execute("select.anchorsMany", &json!({"items": [{"id": a.0, "anchors": [[0, 0]]}]})).unwrap();
+    assert!(s.doc().unwrap().selection.contains(a));
+    assert!(!s.doc().unwrap().selection.contains(b));
+}
+
+#[test]
+fn path_commands_reject_bad_anchors_before_modifying_geometry() {
+    let mut s = session();
+    let a = rect(&mut s, 10.0, 20.0, 50.0, 30.0);
+    let original_points: Vec<_> = s.doc().unwrap().doc.node(a).unwrap().path_data().unwrap().anchors().map(|(_, _, an)| an.p).collect();
+    let history = s.doc().unwrap().history.undo.len();
+    let valid = json!({"x": 10, "y": 20});
+    for invalid in [
+        json!({"x": "bad", "y": 40}),
+        json!({"x": 50}),
+        json!({"x": 50, "y": 40, "in": [0]}),
+        json!({"x": 50, "y": 40, "out": [1, "bad"]}),
+        json!({"x": 50, "y": 40, "smooth": "yes"}),
+    ] {
+        let anchors = json!([valid.clone(), invalid]);
+        assert!(s.execute("path.create", &json!({"anchors": anchors})).is_err(), "{anchors}");
+        assert!(s.execute("path.setAnchors", &json!({"id": a.0, "subpaths": [{"anchors": anchors}]})).is_err(), "{anchors}");
+        let points: Vec<_> = s.doc().unwrap().doc.node(a).unwrap().path_data().unwrap().anchors().map(|(_, _, an)| an.p).collect();
+        assert_eq!(points, original_points);
+        assert_eq!(s.doc().unwrap().history.undo.len(), history);
+    }
+    assert!(s.execute("path.setAnchors", &json!({"id": a.0, "subpaths": [{"anchors": []}, {"closed": true}]})).is_err());
+    assert!(s.execute("path.setAnchors", &json!({"id": a.0, "subpaths": [{"anchors": [valid.clone()], "closed": "yes"}]})).is_err());
+    // The Pen's append reads its anchor the same way.
+    assert!(s.execute("path.appendAnchor", &json!({"id": a.0, "x": 5, "y": 5, "out": [1]})).is_err());
+    assert_eq!(s.doc().unwrap().history.undo.len(), history);
+    s.execute("path.setAnchors", &json!({"id": a.0, "subpaths": [{"anchors": [{"x": 0, "y": 0}, {"x": 30, "y": 40}], "closed": false}]})).unwrap();
+    assert_eq!(s.doc().unwrap().doc.node(a).unwrap().path_data().unwrap().anchor_count(), 2);
+}

crates/engine/src/tests_assets.rs

@@ -265,3 +265,21 @@ fn assets_export_into_a_folder() {
     assert!(dir.join("2x/Logo@2x.png").is_file() && dir.join("PDF/Logo.pdf").is_file());
     let _ = std::fs::remove_dir_all(&dir);
 }
+
+#[test]
+fn collecting_explicit_assets_rejects_invalid_ids_without_adding_anything() {
+    let mut s = session();
+    let a = rect(&mut s, 10.0, 10.0, 20.0, 20.0);
+    let b = rect(&mut s, 50.0, 10.0, 20.0, 20.0);
+    let original_selection = s.doc().unwrap().selection.objects.clone();
+    let before = undo_len(&s);
+    for ids in [json!([a, "not an object"]), json!([a, 3.5]), json!([a, u64::MAX]), json!({"id": a})] {
+        assert!(s.execute("assets.add", &json!({"ids": ids})).is_err(), "invalid ids: {ids}");
+        assert!(assets(&mut s).is_empty(), "invalid ids must not collect only the valid subset");
+        assert_eq!(undo_len(&s), before);
+        assert_eq!(s.doc().unwrap().selection.objects, original_selection);
+    }
+    // Valid ids still collect art in document paint order.
+    assert_eq!(run(&mut s, "assets.add", json!({"ids": [b, a]}))["added"], 2);
+    assert_eq!(assets(&mut s).len(), 2);
+}

crates/engine/src/tests_cut.rs

@@ -118,6 +118,24 @@ fn line_cut_that_misses_changes_nothing() {
     assert!(s.execute("path.lineCut", &json!({"from": [5, 5]})).is_err());
 }
 
+#[test]
+fn rect_cut_rejects_non_numeric_rectangle_elements_without_modifying_art() {
+    let mut s = session();
+    let id = rect(&mut s, 0.0, 0.0, 100.0, 100.0);
+    select(&mut s, &[id]);
+    let original = bounds(&s, id);
+    let history = undo_depth(&s);
+    // The old parser dropped the string and used the four remaining values.
+    for params in [json!([0, "ignored", 10, 50, 50]), json!([0, 10, 50, null, 50]), json!([0, 10, 50, 50, 5])] {
+        assert!(s.execute("path.rectCut", &json!({"rect": params})).is_err());
+        assert!(near(bounds(&s, id), original), "failed cut must not change geometry");
+        assert_eq!(undo_depth(&s), history, "failed cut must not add undo history");
+    }
+    // Proper rectangular cuts still work.
+    s.execute("path.rectCut", &json!({"rect": [10, 10, 70, 70]})).unwrap();
+    assert!(near(bounds(&s, id), Rect::new(10.0, 10.0, 80.0, 80.0)));
+}
+
 #[test]
 fn rect_cut_crops_to_real_geometry() {
     let mut s = session();

crates/engine/src/tests_layers.rs

@@ -78,6 +78,36 @@ fn art_in_a_sublayer_is_selected_as_objects_not_the_sublayer() {
     assert!(s.doc().unwrap().doc.node(a).is_none());
 }
 
+/// #1002: with no layer shown and unlocked, new art is refused (the document unchanged) rather
+/// than put on a hidden or locked layer; another layer that takes art still gets it.
+#[test]
+fn new_art_is_refused_when_no_layer_is_shown_and_unlocked() {
+    for prop in ["visible", "locked"] {
+        let mut s = session();
+        let layer = s.doc().unwrap().doc.layers[0].id;
+        let copied = rect(&mut s, 0.0);
+        run(&mut s, "select.set", json!({"ids": [copied.0]}));
+        run(&mut s, "edit.copy", json!({}));
+        run(&mut s, "select.none", json!({}));
+        run(&mut s, "layer.setProps", json!({"ids": [layer.0], prop: prop == "locked"}));
+        let before = s.doc().unwrap().doc.clone();
+        for (cmd, p) in [
+            ("shape.ellipse", json!({"x": 10, "y": 10, "width": 20, "height": 20})),
+            ("shape.polarGrid", json!({"x": 10, "y": 10, "width": 20, "height": 20})),
+            ("text.create", json!({"x": 10, "y": 40, "text": "A"})),
+            ("edit.paste", json!({})),
+        ] {
+            let e = s.execute(cmd, &p).unwrap_err();
+            assert_eq!(e.to_string(), "the target layer is locked or hidden", "{prop} {cmd}");
+        }
+        assert_eq!(s.doc().unwrap().doc.layers, before.layers, "{prop}: nothing was added");
+        let other = id(&run(&mut s, "layer.new", json!({})));
+        run(&mut s, "layer.setCurrent", json!({"id": layer.0}));
+        let n = rect(&mut s, 50.0);
+        assert_eq!(parent(&s, n), Some(other), "{prop}");
+    }
+}
+
 #[test]
 fn clicking_rows_at_any_depth_highlights_them_and_sets_the_current_layer() {
     let mut s = session();

crates/engine/src/tests_linkwatch.rs

@@ -0,0 +1,88 @@
+//! Linked files changing while their document is open (`link_watch`): `links.updateChanged`,
+//! and the background look following Preferences → File Handling → Update Links.
+
+use serde_json::{Value, json};
+
+use super::*;
+use crate::tests_links::{BLUE, Folder, RED, centre_colour, place, png, session};
+
+/// Write `bytes` to `path` so its modification time moves even on coarse file systems.
+fn save(path: &str, bytes: &[u8]) {
+    std::thread::sleep(std::time::Duration::from_millis(30));
+    std::fs::write(path, bytes).unwrap();
+}
+
+fn colour(s: &Session) -> [u8; 3] {
+    centre_colour(&s.doc().unwrap().doc)
+}
+
+/// One background look, waited for.
+fn look(s: &mut Session) -> Value {
+    s.start_link_scan();
+    let t0 = std::time::Instant::now();
+    loop {
+        if let Some(r) = s.poll_link_scan() {
+            return r.unwrap();
+        }
+        assert!(t0.elapsed().as_secs() < 10, "the look never finished");
+        std::thread::yield_now();
+    }
+}
+
+#[test]
+fn update_changed_reads_changed_files_again_once() {
+    let dir = Folder::new("watch-update");
+    let path = dir.file("art.png");
+    std::fs::write(&path, png(40, 40, RED)).unwrap();
+    let mut s = session();
+    let id = place(&mut s, &path);
+    // First look: remembered, nothing to read.
+    assert_eq!(s.execute("links.updateChanged", &json!({})).unwrap()["updated"], json!([]));
+    save(&path, &png(40, 40, BLUE));
+    assert_eq!(s.execute("links.updateChanged", &json!({})).unwrap()["updated"], json!([id.0]));
+    assert_eq!(colour(&s), BLUE);
+    // Undoing it is respected: the link stays modified until the file changes again.
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(colour(&s), RED);
+    assert_eq!(s.execute("links.updateChanged", &json!({})).unwrap()["updated"], json!([]));
+    assert_eq!(s.execute("links.check", &json!({})).unwrap()["modified"], 1);
+}
+
+#[test]
+fn a_background_look_follows_update_links() {
+    for (mode, key) in [("automatically", "updated"), ("askWhenModified", "ask"), ("manually", "modified")] {
+        let dir = Folder::new(&format!("watch-{mode}"));
+        let path = dir.file("art.png");
+        std::fs::write(&path, png(40, 40, RED)).unwrap();
+        let mut s = session();
+        s.prefs.update_links = mode.into();
+        let id = place(&mut s, &path);
+        assert_eq!(look(&mut s), json!({"updated": [], "ask": [], "modified": []}), "{mode}");
+        save(&path, &png(40, 40, BLUE));
+        let r = look(&mut s);
+        assert_eq!(r[key], json!([id.0]), "{mode}: {r}");
+        assert_eq!(colour(&s), if mode == "automatically" { BLUE } else { RED }, "{mode}");
+        // Acted on once: the next look finds nothing new.
+        assert_eq!(look(&mut s), json!({"updated": [], "ask": [], "modified": []}), "{mode}");
+        assert!(s.link_scan.is_none());
+    }
+}
+
+#[test]
+fn a_file_still_being_written_is_tried_again() {
+    let dir = Folder::new("watch-partial");
+    let path = dir.file("art.png");
+    std::fs::write(&path, png(40, 40, RED)).unwrap();
+    let mut s = session();
+    s.prefs.update_links = "automatically".into();
+    let id = place(&mut s, &path);
+    look(&mut s);
+    // Another app has only written the start of the file so far.
+    let full = png(40, 40, BLUE);
+    save(&path, &full[..16]);
+    assert_eq!(look(&mut s)["updated"], json!([]));
+    assert_eq!(colour(&s), RED, "the last good pixels stay");
+    save(&path, &full);
+    assert_eq!(look(&mut s)["updated"], json!([id.0]));
+    assert_eq!(colour(&s), BLUE);
+}

crates/engine/src/tests_panelcmds.rs

@@ -56,6 +56,13 @@ fn edit_gradient_angle_reverse_and_errors() {
     s.execute("paint.editGradient", &json!({"stroke": false, "reverse": true})).unwrap();
     let Paint::Gradient(g) = node(&s, id).appearance.fill_paint() else { panic!() };
     assert_eq!(g.gradient.stops[0].color.to_hex(), "#000000");
+    // #1007: an off-centre midpoint is mirrored, not reset.
+    let stops = json!([{"offset": 0, "color": "#ff0000", "midpoint": 0.2}, {"offset": 1, "color": "#0000ff"}]);
+    s.execute("paint.editGradient", &json!({"stroke": false, "stops": stops})).unwrap();
+    s.execute("paint.editGradient", &json!({"stroke": false, "reverse": true})).unwrap();
+    let Paint::Gradient(g) = node(&s, id).appearance.fill_paint() else { panic!() };
+    assert_eq!(g.gradient.stops[0].color.to_hex(), "#0000ff");
+    assert!((g.gradient.stops[0].midpoint - 0.8).abs() < 1e-6, "{:?}", g.gradient.stops);
     assert!(s.execute("paint.editGradient", &json!({"stops": [{"offset": 0, "color": "#fff"}]})).is_err());
     assert!(s.execute("paint.editGradient", &json!({"kind": "conic"})).is_err());
 }

crates/engine/src/tests_place.rs

@@ -57,6 +57,37 @@ fn serialize(s: &mut Session, format: &str) -> Vec<u8> {
     vectorcraft_format::base64_decode(v["dataBase64"].as_str().unwrap()).unwrap()
 }
 
+#[test]
+fn malformed_place_coordinates_are_rejected_instead_of_silently_changed() {
+    let mut s = session();
+    let png = png(4, 2, [20, 40, 60, 255], None);
+    let original = s.doc().unwrap().doc.layers.clone();
+    // Previously filter_map dropped the string from a five-element rectangle and
+    // treated the remaining four values as a different, valid placement.
+    for rect in [json!([0, "ignored", 10, 40, 50]), json!([10, 20, 40, null, 50]), json!([10, 20, 40, 50, 60])] {
+        let mut params = file("tiny.png", &png);
+        params["rect"] = rect;
+        assert!(s.execute("file.place", &params).is_err(), "{params}");
+        assert_eq!(s.doc().unwrap().doc.layers, original, "failed Place must not add art");
+    }
+    // An explicitly supplied invalid position formerly behaved as though no
+    // position were supplied and centred the image on the artboard.
+    for at in [json!(["not-a-number", 20]), json!([10, null]), json!([10, 20, 30]), json!("invalid")] {
+        let mut params = file("tiny.png", &png);
+        params["at"] = at;
+        assert!(s.execute("file.place", &params).is_err(), "{params}");
+        assert_eq!(s.doc().unwrap().doc.layers, original);
+    }
+    let mut params = file("tiny.png", &png);
+    params["rect"] = json!([10, 20, 80, 60]);
+    let placed = s.execute("file.place", &params).unwrap();
+    assert_eq!(placed["ids"].as_array().unwrap().len(), 1);
+    // A null position is no position, as for the other optional params.
+    let mut params = file("tiny.png", &png);
+    params["at"] = Value::Null;
+    assert_eq!(s.execute("file.place", &params).unwrap()["ids"].as_array().unwrap().len(), 1);
+}
+
 #[test]
 fn a_300_px_png_at_300_ppi_places_as_72_pt_centred_selected_and_undoable() {
     let mut s = session();

crates/engine/src/tests_rasterfilters.rs

@@ -1,5 +1,6 @@
-//! The Photoshop-style raster effects (Effect › Blur › Radial Blur and Smart Blur, Pixelate ›
-//! Color Halftone, Crystallize, Mezzotint and Pointillize, Sharpen › Unsharp Mask): applied and
+//! The Photoshop-style raster effects (Effect › Blur › Radial Blur and Smart Blur, Brush Strokes,
+//! Distort › Diffuse Glow, Glass and Ocean Ripple, Pixelate › Color Halftone, Crystallize, Mezzotint and Pointillize, Sharpen › Unsharp Mask, Texture ›
+//! Craquelure, Grain, Mosaic Tiles, Patchwork, Stained Glass and Texturizer, Video): applied and
 //! edited as commands, listed in the catalogue, drawn on the canvas, and written to PDF and SVG
 //! as images of the effected object.
 
@@ -17,10 +18,37 @@ const EFFECTS: [(&str, &str); 3] = [
     ("sharpen.unsharpMask", r#"{"amount": 300, "radius": 3}"#),
 ];
 
+/// Effect › Brush Strokes, at their defaults.
+const BRUSH_STROKES: [(&str, &str); 8] = [
+    ("brushStrokes.accentedEdges", "{}"),
+    ("brushStrokes.angledStrokes", "{}"),
+    ("brushStrokes.crosshatch", "{}"),
+    ("brushStrokes.darkStrokes", "{}"),
+    ("brushStrokes.inkOutlines", "{}"),
+    ("brushStrokes.spatter", "{}"),
+    ("brushStrokes.sprayedStrokes", "{}"),
+    ("brushStrokes.sumiE", "{}"),
+];
+
+/// Effect › Distort (Diffuse Glow with its highlights glowing from a low brightness up, as the
+/// striped art's reds are dark).
+const DISTORT: [(&str, &str); 3] =
+    [("distort.diffuseGlow", r#"{"clearAmount": 0, "glowAmount": 20}"#), ("distort.glass", "{}"), ("distort.oceanRipple", "{}")];
+
 /// Effect › Pixelate, at their defaults.
 const PIXELATE: [(&str, &str); 4] =
     [("pixelate.colorHalftone", "{}"), ("pixelate.crystallize", "{}"), ("pixelate.mezzotint", "{}"), ("pixelate.pointillize", "{}")];
 
+/// Effect › Texture, at their defaults.
+const TEXTURE: [(&str, &str); 6] = [
+    ("texture.craquelure", "{}"),
+    ("texture.grain", "{}"),
+    ("texture.mosaicTiles", "{}"),
+    ("texture.patchwork", "{}"),
+    ("texture.stainedGlass", "{}"),
+    ("texture.texturizer", "{}"),
+];
+
 /// Effect › Video (NTSC Colors leaves the striped art's legal colours as they are: see
 /// `ntsc_colors_draws_saturated_yellow_safer`).
 const VIDEO: [(&str, &str); 1] = [("video.deinterlace", r#"{"create": "interpolation"}"#)];
@@ -61,7 +89,14 @@ fn listed_applied_edited_and_undone() {
     let menus: Vec<Value> =
         EFFECTS.iter().map(|(id, _)| list["catalog"].as_array().unwrap().iter().find(|e| e["id"] == *id).unwrap()["menu"].clone()).collect();
     assert_eq!(menus, [json!(["Effect", "Blur"]), json!(["Effect", "Blur"]), json!(["Effect", "Sharpen"])]);
-    for (group, menu) in [(PIXELATE.as_slice(), "Pixelate"), (VIDEO.as_slice(), "Video"), ([("video.ntscColors", "{}")].as_slice(), "Video")] {
+    for (group, menu) in [
+        (BRUSH_STROKES.as_slice(), "Brush Strokes"),
+        (DISTORT.as_slice(), "Distort"),
+        (PIXELATE.as_slice(), "Pixelate"),
+        (TEXTURE.as_slice(), "Texture"),
+        (VIDEO.as_slice(), "Video"),
+        ([("video.ntscColors", "{}")].as_slice(), "Video"),
+    ] {
         for (id, _) in group {
             let e = list["catalog"].as_array().unwrap().iter().find(|e| e["id"] == *id).unwrap_or_else(|| panic!("{id} listed"));
             assert_eq!((&e["raster"], &e["menu"]), (&json!(true), &json!(["Effect", menu])), "{id}");
@@ -86,7 +121,7 @@ fn listed_applied_edited_and_undone() {
 
 #[test]
 fn each_effect_changes_the_canvas_and_draws_the_same_twice() {
-    for (id, params) in EFFECTS.into_iter().chain(PIXELATE).chain(VIDEO) {
+    for (id, params) in EFFECTS.into_iter().chain(BRUSH_STROKES).chain(DISTORT).chain(PIXELATE).chain(TEXTURE).chain(VIDEO) {
         let (mut s, g) = striped();
         let plain = render(&s);
         let params: Value = serde_json::from_str(params).unwrap();
@@ -115,7 +150,7 @@ fn spin_blur_reaches_past_the_corners() {
 
 #[test]
 fn pdf_and_svg_write_the_effected_object_as_an_image() {
-    for (id, params) in EFFECTS.into_iter().chain(PIXELATE).chain(VIDEO) {
+    for (id, params) in EFFECTS.into_iter().chain(BRUSH_STROKES).chain(DISTORT).chain(PIXELATE).chain(TEXTURE).chain(VIDEO) {
         let (mut s, g) = striped();
         let params: Value = serde_json::from_str(params).unwrap();
         s.execute("effect.apply", &json!({"effect": id, "ids": [g], "params": params})).unwrap();

crates/engine/src/tests_typearea.rs

@@ -236,6 +236,9 @@ fn reshape_area_takes_untrusted_params() {
         json!({"id": id.0, "dx": 1, "dy": 1}),
         json!({"id": id.0, "anchors": [], "dx": 1, "dy": 1}),
         json!({"id": id.0, "anchors": [["a", 1], [0], "x"], "dx": 1, "dy": 1}),
+        // A malformed reference among good ones fails rather than moving only the good ones.
+        json!({"id": id.0, "anchors": [[0, 2], [0, "3"]], "dx": 1, "dy": 1}),
+        json!({"id": id.0, "anchors": [[0, 2], [0, 3, 1]], "dx": 1, "dy": 1}),
         json!({"id": id.0, "anchors": [[0, 9]], "dx": 1, "dy": 1}),
         json!({"id": id.0, "anchors": [[0, 1], [7, 0]], "dx": 1, "dy": 1}),
         json!({"id": id.0, "anchors": [[0, 2]], "dy": 1}),

crates/engine/src/tests_variables.rs

@@ -0,0 +1,591 @@
+//! Variables (data merge): definitions with kinds, bindings to objects, datasets
+//! applied in one undo step, and validation that rejects instead of reinterpreting.
+
+use serde_json::{Value, json};
+use vectorcraft_doc::NodeId;
+
+use super::*;
+
+fn session() -> Session {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
+    s
+}
+
+fn text(s: &mut Session, content: &str) -> NodeId {
+    let r = s.execute("text.create", &json!({"x": 10, "y": 10, "text": content})).unwrap();
+    NodeId(r["id"].as_u64().unwrap())
+}
+
+fn rect(s: &mut Session) -> NodeId {
+    let r = s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 50, "height": 40})).unwrap();
+    NodeId(r["id"].as_u64().unwrap())
+}
+
+fn plain(s: &Session, id: NodeId) -> String {
+    match &s.doc().unwrap().doc.node(id).unwrap().kind {
+        vectorcraft_doc::NodeKind::Text(t) => t.plain_text(),
+        _ => panic!("not text"),
+    }
+}
+
+#[test]
+fn text_and_visibility_datasets_apply_in_one_undo_step() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Show", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Show", "ids": [r.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "B", "values": {"Name": "Bob", "Show": false}})).unwrap();
+
+    let v = s.execute("dataset.select", &json!({"name": "B"})).unwrap();
+    assert_eq!((v["applied"].as_u64(), v["skipped"].as_u64()), (Some(2), Some(0)));
+    assert_eq!(plain(&s, t), "Bob");
+    assert!(!s.doc().unwrap().doc.node(r).unwrap().visible);
+
+    // One undo step covers the whole dataset application.
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "Alice");
+    assert!(s.doc().unwrap().doc.node(r).unwrap().visible);
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "Bob");
+}
+
+#[test]
+fn dataset_next_and_prev_wrap_around() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    for name in ["A", "B"] {
+        s.execute("dataset.new", &json!({"name": name, "values": {"Name": name}})).unwrap();
+    }
+    s.execute("dataset.next", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "A");
+    s.execute("dataset.next", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "B");
+    s.execute("dataset.next", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "A");
+    s.execute("dataset.prev", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "B");
+    let v = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(v["active"], "B");
+}
+
+#[test]
+fn mismatched_and_missing_bindings_are_skipped_and_counted() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    // A text variable bound to a rectangle applies to nothing; a dataset value for an
+    // unbound variable is ignored.
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "y", "Ghost": "z"}})).unwrap_err();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "y"}})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [r.0]})).unwrap_err();
+    let v = s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+    assert_eq!((v["applied"].as_u64(), v["skipped"].as_u64()), (Some(1), Some(0)));
+    assert_eq!(plain(&s, t), "y");
+}
+
+#[test]
+fn deleting_a_variable_cleans_bindings_values_and_leaves_datasets_alone() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "y"}})).unwrap();
+    s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+    s.execute("variable.delete", &json!({"names": ["Name"]})).unwrap();
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!(vars["variables"].as_array().map(Vec::len), Some(0));
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert!(sets["datasets"][0].get("values").is_none_or(|v| v == &json!({})));
+    // The dataset named "D" is still the active one: `variable.delete` prunes variables, and
+    // the dataset's own name is its own namespace.
+    assert_eq!(sets["active"], "D");
+    s.execute("dataset.delete", &json!({"names": ["D"]})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"].as_array().map(Vec::len), Some(0));
+    assert!(sets["active"].is_null());
+    let v: Value = serde_json::from_str(&serde_json::to_string(&s.doc().unwrap().doc).unwrap()).unwrap();
+    assert!(v["variables"].get("bindings").is_none_or(|v| v == &json!({})));
+}
+
+/// A dataset may share a variable's name: they are separate namespaces, and deleting the
+/// variable must not silently unselect the dataset that happens to be called the same.
+#[test]
+fn a_dataset_survives_a_variable_of_the_same_name_being_deleted() {
+    let mut s = session();
+    s.execute("variable.define", &json!({"name": "Row", "kind": "text"})).unwrap();
+    s.execute("dataset.new", &json!({"name": "Row", "values": {"Row": "y"}})).unwrap();
+    s.execute("dataset.select", &json!({"name": "Row"})).unwrap();
+    s.execute("variable.delete", &json!({"names": ["Row"]})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"][0]["name"], "Row", "the dataset is not a variable");
+    assert_eq!(sets["active"], "Row", "the active dataset keeps its name");
+}
+
+/// Deleting art lets its bindings go, as it does for Asset Export's assets: a binding that
+/// outlived its object would count as a skip in every dataset application and grow the file.
+#[test]
+fn deleted_art_lets_its_bindings_go() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Show", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Show", "ids": [r.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "y", "Show": false}})).unwrap();
+
+    s.execute("select.set", &json!({"ids": [t.0]})).unwrap();
+    s.execute("edit.clear", &json!({})).unwrap();
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    let of = |name: &str| vars["variables"].as_array().map(|a| a.iter().find(|v| v["name"] == name).unwrap()["bindings"].as_u64().unwrap()).unwrap();
+    assert_eq!(of("Name"), 0, "the deleted text object took its binding with it");
+    assert_eq!(of("Show"), 1, "the rectangle is still bound");
+    // Nothing stale is left for the application to skip.
+    let v = s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+    assert_eq!((v["applied"].as_u64(), v["skipped"].as_u64()), (Some(1), Some(0)));
+}
+
+/// `deleted` counts what was deleted, not what was asked for.
+#[test]
+fn delete_reports_what_it_actually_removed() {
+    let mut s = session();
+    s.execute("variable.define", &json!({"name": "A", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "B", "kind": "text"})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D"})).unwrap();
+    assert_eq!(s.execute("variable.delete", &json!({"names": ["A"]})).unwrap()["deleted"], 1);
+    assert_eq!(s.execute("variable.delete", &json!({"names": ["A"]})).unwrap()["deleted"], 0, "already gone");
+    assert_eq!(s.execute("variable.delete", &json!({"names": ["A", "B"]})).unwrap()["deleted"], 1, "only B was left");
+    assert_eq!(s.execute("dataset.delete", &json!({"names": ["D"]})).unwrap()["deleted"], 1);
+    assert_eq!(s.execute("dataset.delete", &json!({"names": ["D"]})).unwrap()["deleted"], 0);
+}
+
+/// An object may be driven by several variables, so binding it again adds to what it has
+/// instead of quietly dropping the earlier one.
+#[test]
+fn one_object_can_be_driven_by_several_variables() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Title", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Price", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Badge", "kind": "visibility"})).unwrap();
+
+    // A text object driven by two text variables keeps both.
+    assert_eq!(s.execute("variable.bind", &json!({"variable": "Title", "ids": [t.0]})).unwrap()["bound"], 1);
+    let v = s.execute("variable.bind", &json!({"variable": "Price", "ids": [t.0]})).unwrap();
+    assert_eq!((v["bound"].clone(), v["already"].clone()), (json!(1), json!([])), "Title is untouched");
+    // A rectangle driven by a visibility variable as well as nothing else yet.
+    s.execute("variable.bind", &json!({"variable": "Badge", "ids": [r.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Title": "Hat", "Price": "9.99", "Badge": false}})).unwrap();
+
+    let v = s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+    assert_eq!((v["applied"].as_u64(), v["skipped"].as_u64()), (Some(3), Some(0)), "every binding applied");
+    // Both text variables are counted; the later one in definition order is what is left.
+    assert_eq!(plain(&s, t), "9.99");
+    assert!(!s.doc().unwrap().doc.node(r).unwrap().visible);
+
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    let of = |n: &str| vars["variables"].as_array().unwrap().iter().find(|v| v["name"] == n).unwrap()["bindings"].as_u64();
+    assert_eq!((of("Title"), of("Price"), of("Badge")), (Some(1), Some(1), Some(1)));
+
+    // Binding again to one it already has is not a change, and says so.
+    let v = s.execute("variable.bind", &json!({"variable": "Price", "ids": [t.0]})).unwrap();
+    assert_eq!((v["bound"].clone(), v["already"].clone()), (json!(0), json!([t.0])));
+    // Unbinding one variable leaves the object's others alone.
+    assert_eq!(s.execute("variable.unbind", &json!({"ids": [t.0], "variable": "Price"})).unwrap()["unbound"], 1);
+    s.execute("edit.undo", &json!({})).unwrap();
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!(vars["variables"][1]["bindings"], 1, "the other binding is still there");
+    assert!(s.execute("variable.unbind", &json!({"ids": [t.0], "variable": "Ghost"})).is_err());
+
+    // Deleting a variable drops only its own binding.
+    s.execute("variable.delete", &json!({"names": ["Price"]})).unwrap();
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!(vars["variables"][0]["bindings"], 1, "Title still drives the text");
+}
+
+/// `unbound` counts what was actually dropped, like `variable.delete` does.
+#[test]
+fn unbind_reports_what_it_actually_removed() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    s.execute("variable.define", &json!({"name": "Title", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Price", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Title", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Price", "ids": [t.0]})).unwrap();
+    assert_eq!(s.execute("variable.unbind", &json!({"ids": [t.0], "variable": "Title"})).unwrap()["unbound"], 1);
+    assert_eq!(s.execute("variable.unbind", &json!({"ids": [t.0], "variable": "Title"})).unwrap()["unbound"], 0, "already gone");
+    // Without `variable` the object's last binding goes and the entry with it.
+    assert_eq!(s.execute("variable.unbind", &json!({"ids": [t.0]})).unwrap()["unbound"], 1);
+    assert_eq!(s.execute("variable.unbind", &json!({"ids": [t.0]})).unwrap()["unbound"], 0);
+    // An object with no binding left is not kept as an empty set.
+    let v: Value = serde_json::from_str(&serde_json::to_string(&s.doc().unwrap().doc).unwrap()).unwrap();
+    assert!(v["variables"].get("bindings").is_none_or(|v| v == &json!({})), "{v}");
+}
+
+/// Locked art is the document's to rewrite only while it isn't locked.
+#[test]
+fn locked_art_is_neither_bound_nor_rewritten() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Show", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Show", "ids": [r.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "y", "Show": false}})).unwrap();
+
+    s.execute("select.set", &json!({"ids": [t.0]})).unwrap();
+    s.execute("object.lock", &json!({})).unwrap();
+    assert!(s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).is_err(), "locked art takes no new binding");
+    // The bindings made before the lock still count, and the application skips the locked art.
+    let v = s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+    assert_eq!((v["applied"].as_u64(), v["skipped"].as_u64()), (Some(1), Some(1)));
+    assert_eq!(plain(&s, t), "x", "the locked text was left alone");
+    assert!(!s.doc().unwrap().doc.node(r).unwrap().visible, "the unlocked rectangle still applied");
+}
+
+/// Make Text Dynamic / Make Visibility Dynamic: what the panel's buttons run. One step from a
+/// selection to a bound variable, named after what it drives.
+#[test]
+fn making_a_selection_dynamic_names_and_binds_it() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    let r = rect(&mut s);
+
+    s.execute("select.set", &json!({"ids": [t.0]})).unwrap();
+    let v = s.execute("variable.makeTextDynamic", &json!({})).unwrap();
+    assert_eq!(v["name"], "Alice", "named after the text it drives");
+    assert_eq!(v["ids"], json!([t.0]));
+
+    s.execute("select.set", &json!({"ids": [r.0]})).unwrap();
+    let v = s.execute("variable.makeVisibilityDynamic", &json!({})).unwrap();
+    assert_eq!(v["kind"], "visibility");
+
+    // The same object twice takes a number rather than colliding with the first variable.
+    s.execute("select.set", &json!({"ids": [t.0]})).unwrap();
+    let again = s.execute("variable.makeTextDynamic", &json!({})).unwrap();
+    assert_eq!(again["name"], "Alice 2");
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!(vars["variables"].as_array().map(Vec::len), Some(3));
+
+    // Nothing selected, art that can't take the kind, and locked art are errors.
+    s.execute("select.none", &json!({})).unwrap();
+    assert!(s.execute("variable.makeTextDynamic", &json!({})).is_err());
+    s.execute("select.set", &json!({"ids": [r.0]})).unwrap();
+    assert!(s.execute("variable.makeTextDynamic", &json!({})).is_err(), "a rectangle is not type");
+}
+
+/// Capture Data Set records what the art holds now, which is how rows are made — the art is
+/// edited and captured, rather than the values typed.
+#[test]
+fn capturing_records_what_the_art_holds_now() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Show", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Show", "ids": [r.0]})).unwrap();
+
+    let v = s.execute("dataset.capture", &json!({})).unwrap();
+    assert_eq!((v["name"].clone(), v["values"].clone()), (json!("Data Set 1"), json!(2)));
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"][0]["values"]["Name"], json!({"text": "Alice"}));
+    assert_eq!(sets["datasets"][0]["values"]["Show"], json!({"visible": true}));
+    assert_eq!(sets["active"], "Data Set 1");
+
+    // Change the art, capture again: a second row, and the first still matches its own text.
+    s.execute("text.editRange", &json!({"id": t.0, "insert": "Bob"})).unwrap();
+    assert_eq!(s.execute("dataset.list", &json!({})).unwrap()["datasets"][0]["matches"], json!(false), "the art moved on");
+    s.execute("dataset.capture", &json!({})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"][1]["name"], "Data Set 2");
+    assert_eq!(sets["datasets"][1]["values"]["Name"], json!({"text": "Bob"}));
+    assert_eq!(sets["datasets"][0]["matches"], json!(false), "row 1 still describes the old text");
+
+    // A named capture, and a name that is taken is an error rather than a second row.
+    s.execute("dataset.capture", &json!({"name": "Winter"})).unwrap();
+    assert!(s.execute("dataset.capture", &json!({"name": "Winter"})).is_err());
+
+    // Nothing bound is nothing to capture.
+    let mut empty = session();
+    empty.execute("variable.define", &json!({"name": "V", "kind": "text"})).unwrap();
+    assert!(empty.execute("dataset.capture", &json!({})).is_err());
+}
+
+/// Update Data Set writes the art's current values into the row that is active.
+#[test]
+fn updating_writes_the_art_into_the_active_row() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+
+    // No active row yet: say so rather than quietly writing into some other one.
+    assert!(s.execute("dataset.update", &json!({})).is_err());
+    s.execute("dataset.capture", &json!({})).unwrap();
+    s.execute("text.editRange", &json!({"id": t.0, "insert": "Bob"})).unwrap();
+    let v = s.execute("dataset.update", &json!({})).unwrap();
+    assert_eq!((v["name"].clone(), v["values"].clone()), (json!("Data Set 1"), json!(1)));
+    assert_eq!(s.execute("dataset.list", &json!({})).unwrap()["datasets"][0]["matches"], json!(true));
+    // One undo step puts the row back as it was.
+    s.execute("text.editRange", &json!({"id": t.0, "insert": "Caz"})).unwrap();
+    s.execute("dataset.update", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "Caz");
+}
+
+/// Renaming carries the variable's bindings and its values in every row with it — a name is
+/// how a variable is referred to, so leaving the old one behind would orphan both.
+#[test]
+fn renaming_carries_the_bindings_and_values_with_it() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "Bob"}})).unwrap();
+    s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+
+    s.execute("variable.rename", &json!({"name": "Name", "newName": "Title"})).unwrap();
+    assert_eq!(plain(&s, t), "Bob", "the row still applied");
+    assert_eq!(s.execute("dataset.list", &json!({})).unwrap()["datasets"][0]["values"]["Title"], json!({"text": "Bob"}));
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!((vars["variables"][0]["name"].clone(), vars["variables"][0]["bindings"].clone()), (json!("Title"), json!(1)));
+
+    // Renaming a dataset keeps it active and keeps its values.
+    s.execute("dataset.rename", &json!({"name": "D", "newName": "Row 1"})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!((sets["active"].clone(), sets["datasets"][0]["name"].clone()), (json!("Row 1"), json!("Row 1")));
+
+    // Taken and missing names are errors.
+    s.execute("variable.define", &json!({"name": "Other", "kind": "text"})).unwrap();
+    assert!(s.execute("variable.rename", &json!({"name": "Title", "newName": "Other"})).is_err());
+    assert!(s.execute("variable.rename", &json!({"name": "Ghost", "newName": "X"})).is_err());
+    assert!(s.execute("dataset.rename", &json!({"name": "Ghost", "newName": "X"})).is_err());
+    // A dataset and a variable are separate namespaces: a dataset may take a variable's name,
+    // and a variable may take a dataset's.
+    s.execute("dataset.rename", &json!({"name": "Row 1", "newName": "Title"})).unwrap();
+    assert_eq!(s.execute("dataset.list", &json!({})).unwrap()["active"], "Title");
+    s.execute("dataset.new", &json!({"name": "Taken"})).unwrap();
+    assert!(s.execute("dataset.rename", &json!({"name": "Title", "newName": "Taken"})).is_err());
+}
+
+/// `dataset.set` is how a value changes after the row exists: replacing it must not need the
+/// dataset to be deleted and rebuilt (which loses its place in the list and the active one).
+#[test]
+fn dataset_set_replaces_the_row_and_reports_what_it_dropped() {
+    let mut s = session();
+    let t = text(&mut s, "x");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Show", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Show", "ids": [r.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "D", "values": {"Name": "y", "Show": false}})).unwrap();
+
+    // The dataset keeps its place and stays active while its values change.
+    let v = s.execute("dataset.set", &json!({"name": "D", "values": {"Name": "z"}})).unwrap();
+    assert_eq!((v["values"].clone(), v["removed"].clone()), (json!(1), json!(["Show"])));
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"].as_array().map(Vec::len), Some(1));
+    assert_eq!(sets["datasets"][0]["values"], json!({"Name": {"text": "z"}}));
+
+    s.execute("dataset.select", &json!({"name": "D"})).unwrap();
+    assert_eq!(plain(&s, t), "z");
+    assert!(s.doc().unwrap().doc.node(r).unwrap().visible, "`Show` has no value in this row now");
+
+    // Errors are errors, not a silent rewrite of some other row.
+    assert!(s.execute("dataset.set", &json!({"name": "Missing"})).is_err());
+    assert!(s.execute("dataset.set", &json!({"name": "D", "values": {"Ghost": "z"}})).is_err());
+    assert!(s.execute("dataset.set", &json!({"name": "D", "values": {"Show": "yes"}})).is_err());
+    assert!(s.execute("dataset.set", &json!({"name": "D", "values": []})).is_err());
+    // One step, so one undo puts the row back as it was.
+    s.execute("dataset.set", &json!({"name": "D", "values": {"Name": "w"}})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(plain(&s, t), "z");
+}
+
+#[test]
+fn bad_variables_requests_are_errors_not_panics() {
+    let mut s = session();
+    s.execute("variable.define", &json!({"name": "N", "kind": "text"})).unwrap();
+    for (cmd, params) in [
+        ("variable.define", json!({})),
+        ("variable.define", json!({"name": "", "kind": "text"})),
+        ("variable.define", json!({"name": "N", "kind": "colour"})),
+        ("variable.define", json!({"name": "N", "kind": "text"})),
+        ("variable.delete", json!({})),
+        ("variable.bind", json!({})),
+        ("variable.bind", json!({"variable": "N"})),
+        ("variable.bind", json!({"variable": "Missing", "ids": [1]})),
+        ("dataset.new", json!({})),
+        ("dataset.new", json!({"name": "D", "values": []})),
+        ("dataset.new", json!({"name": "D", "values": {"N": 5}})),
+        ("dataset.select", json!({"name": "Missing"})),
+        ("dataset.next", json!({})),
+    ] {
+        assert!(s.execute(cmd, &params).is_err(), "{cmd} {params}");
+    }
+}
+
+#[test]
+fn highlight_selects_without_unbinding_and_deletes_leave_the_rest() {
+    // The reviewer's regression case: two variables, two rows.
+    let mut s = session();
+    let a = text(&mut s, "Alice");
+    let b = text(&mut s, "Bob");
+    for (name, id) in [("Name", a), ("Other", b)] {
+        s.execute("variable.define", &json!({"name": name, "kind": "text"})).unwrap();
+        s.execute("variable.bind", &json!({"variable": name, "ids": [id.0]})).unwrap();
+    }
+    s.execute("dataset.new", &json!({"name": "One", "values": {"Name": "Alice", "Other": "Bob"}})).unwrap();
+    s.execute("dataset.new", &json!({"name": "Two", "values": {"Name": "A2", "Other": "B2"}})).unwrap();
+    s.execute("dataset.select", &json!({"name": "One"})).unwrap();
+
+    // What a row click runs (highlight), then what Select Bound Object runs (select).
+    s.execute("variable.highlight", &json!({"variable": "Name"})).unwrap();
+    let bound: Vec<u64> = s.doc().unwrap().doc.variables.objects_of("Name").iter().map(|i| i.0).collect();
+    s.execute("select.set", &json!({"ids": bound})).unwrap();
+    assert_eq!(s.doc().unwrap().selection.objects, vec![a]);
+    // …and the binding is still there: selecting never unbinds.
+    assert_eq!(s.doc().unwrap().doc.variables.objects_of("Name"), vec![a]);
+
+    // Deleting one variable leaves the other; deleting the current dataset leaves the other.
+    s.execute("variable.delete", &json!({"names": ["Name"]})).unwrap();
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!(vars["variables"].as_array().unwrap().len(), 1);
+    assert_eq!(vars["variables"][0]["name"], "Other");
+    s.execute("dataset.delete", &json!({"names": ["One"]})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"].as_array().unwrap().len(), 1);
+    assert_eq!(sets["datasets"][0]["name"], "Two");
+}
+
+#[test]
+fn highlight_follows_rename_and_clears_with_delete() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    assert!(s.execute("variable.highlight", &json!({"variable": "Missing"})).is_err(), "unknown names stay errors");
+    let v = s.execute("variable.highlight", &json!({"variable": "Name"})).unwrap();
+    assert_eq!(v["variable"], "Name");
+    // The highlight names a variable, so the rename carries it along.
+    s.execute("variable.rename", &json!({"name": "Name", "newName": "Title"})).unwrap();
+    assert_eq!(s.doc().unwrap().variables_highlight.as_deref(), Some("Title"));
+    // Empty clears it, and deleting the highlighted variable clears it too.
+    s.execute("variable.highlight", &json!({})).unwrap();
+    assert!(s.doc().unwrap().variables_highlight.is_none());
+    s.execute("variable.highlight", &json!({"variable": "Title"})).unwrap();
+    s.execute("variable.delete", &json!({"names": ["Title"]})).unwrap();
+    assert!(s.doc().unwrap().variables_highlight.is_none(), "a highlight of a deleted variable highlights nothing");
+}
+
+/// A row that hides an object must be able to show it again, and hiding it on the artboard
+/// (as the Layers panel does) is what a capture records: a visibility variable reads and
+/// writes its object's own visibility, which therefore never makes the object off limits.
+#[test]
+fn a_hidden_object_comes_back_and_is_captured_hidden() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    let r = rect(&mut s);
+    s.execute("variable.define", &json!({"name": "Name", "kind": "text"})).unwrap();
+    s.execute("variable.define", &json!({"name": "Show", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Name", "ids": [t.0]})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Show", "ids": [r.0, t.0]})).unwrap();
+    s.execute("dataset.new", &json!({"name": "Shown", "values": {"Name": "Alice", "Show": true}})).unwrap();
+    s.execute("dataset.new", &json!({"name": "Hidden", "values": {"Name": "Bob", "Show": false}})).unwrap();
+
+    s.execute("dataset.select", &json!({"name": "Hidden"})).unwrap();
+    assert!(!s.doc().unwrap().doc.node(r).unwrap().visible);
+    let v = s.execute("dataset.select", &json!({"name": "Shown"})).unwrap();
+    assert_eq!(v["skipped"], json!(0), "{v}");
+    assert!(s.doc().unwrap().doc.node(r).unwrap().visible, "the row shows it again");
+    assert_eq!(plain(&s, t), "Alice", "and rewrites the text of the object it had hidden");
+
+    // Hidden on the artboard, then captured: the row says hidden, and it matches the art.
+    s.execute("select.set", &json!({"ids": [t.0, r.0]})).unwrap();
+    s.execute("object.hide", &json!({})).unwrap();
+    s.execute("dataset.capture", &json!({"name": "Captured"})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    let captured = sets["datasets"].as_array().unwrap().iter().find(|d| d["name"] == "Captured").unwrap().clone();
+    assert_eq!(captured["values"]["Show"], json!({"visible": false}), "{captured}");
+    assert_eq!(captured["matches"], json!(true));
+
+    // A hidden object can still be bound by id.
+    s.execute("variable.define", &json!({"name": "More", "kind": "visibility"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "More", "ids": [r.0]})).unwrap();
+}
+
+/// Variables and datasets are separate namespaces: renaming a variable leaves a dataset of
+/// the same name, and which dataset is active, alone.
+#[test]
+fn renaming_a_variable_leaves_a_dataset_of_the_same_name_active() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    s.execute("variable.define", &json!({"name": "Title", "kind": "text"})).unwrap();
+    s.execute("variable.bind", &json!({"variable": "Title", "ids": [t.0]})).unwrap();
+    s.execute("dataset.capture", &json!({"name": "Title"})).unwrap();
+    s.execute("variable.rename", &json!({"name": "Title", "newName": "Heading"})).unwrap();
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!((sets["active"].clone(), sets["datasets"][0]["name"].clone()), (json!("Title"), json!("Title")));
+    s.execute("dataset.update", &json!({})).unwrap();
+}
+
+/// Without `names`, the deletes act on what the panel shows as current: the highlighted
+/// variable and the active dataset (Window › Variables runs them with no params).
+#[test]
+fn deletes_without_names_take_the_highlight_and_the_active_dataset() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    for name in ["A", "B"] {
+        s.execute("variable.define", &json!({"name": name, "kind": "text"})).unwrap();
+    }
+    s.execute("variable.bind", &json!({"variable": "A", "ids": [t.0]})).unwrap();
+    s.execute("dataset.capture", &json!({})).unwrap();
+    s.execute("dataset.capture", &json!({})).unwrap();
+    assert!(s.execute("variable.delete", &json!({})).is_err(), "nothing highlighted");
+
+    s.execute("variable.highlight", &json!({"variable": "B"})).unwrap();
+    assert_eq!(s.execute("variable.delete", &json!({})).unwrap()["deleted"], json!(1));
+    let vars = s.execute("variable.list", &json!({})).unwrap();
+    assert_eq!(vars["variables"].as_array().map(Vec::len), Some(1));
+    assert_eq!(vars["variables"][0]["name"], "A");
+
+    assert_eq!(s.execute("dataset.delete", &json!({})).unwrap()["deleted"], json!(1));
+    let sets = s.execute("dataset.list", &json!({})).unwrap();
+    assert_eq!(sets["datasets"].as_array().map(Vec::len), Some(1));
+    assert_eq!(sets["datasets"][0]["name"], "Data Set 1");
+    assert!(s.execute("dataset.delete", &json!({})).is_err(), "no active dataset left");
+}
+
+/// Ids and names from an agent are checked, never reinterpreted: an `ids` that isn't a list
+/// of objects is an error rather than the selection, and names are trimmed and capped.
+#[test]
+fn ids_and_names_from_an_agent_are_checked() {
+    let mut s = session();
+    let t = text(&mut s, "Alice");
+    s.execute("variable.define", &json!({"name": "  Name  ", "kind": "text"})).unwrap();
+    assert_eq!(s.execute("variable.list", &json!({})).unwrap()["variables"][0]["name"], "Name");
+    s.execute("select.set", &json!({"ids": [t.0]})).unwrap();
+    for params in
+        [json!({"variable": "Name", "ids": 5}), json!({"variable": "Name", "ids": [t.0, "x"]}), json!({"variable": "Name", "ids": [999_999]})]
+    {
+        assert!(s.execute("variable.bind", &params).is_err(), "{params}");
+    }
+    assert!(s.doc().unwrap().doc.variables.objects_of("Name").is_empty(), "nothing was bound");
+    assert!(s.execute("variable.unbind", &json!({"ids": "all"})).is_err());
+    assert!(s.execute("variable.define", &json!({"name": "x".repeat(256), "kind": "text"})).is_err());
+    s.execute("variable.define", &json!({"name": "x".repeat(255), "kind": "text"})).unwrap();
+    assert!(s.execute("variable.delete", &json!({"names": []})).is_err());
+    assert!(s.execute("variable.delete", &json!({"names": [5]})).is_err());
+}

crates/engine/src/tests_xform.rs

@@ -572,3 +572,27 @@ fn copy_from_requires_source() {
     assert!(s.execute("appearance.copyFrom", &json!({})).is_err());
     assert!(s.execute("appearance.copyFrom", &json!({"source": 9999})).is_err());
 }
+
+#[test]
+fn distort_rejects_malformed_coordinates_and_ids_without_editing_art() {
+    let mut s = session();
+    let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0);
+    let original = bounds(&s, a);
+    let history = undo_len(&s);
+    let corners = json!([[10, 0], [90, 0], [100, 100], [0, 100]]);
+    for p in [
+        json!({"corners": [[10, 0, 50], [90, 0], [100, 100], [0, 100]]}),
+        json!({"corners": [[10, 0], [90, 0], ["bad", 100], [0, 100]]}),
+        json!({"corners": [[10, 0], [90, 0], [100, 100], [0, 100], ["bad"]]}),
+        json!({"corners": corners, "from": [0, 0, 100]}),
+        json!({"corners": corners, "from": "not bounds"}),
+        json!({"corners": corners, "ids": [a.0, "bad"]}),
+        json!({"corners": corners, "ids": [a.0, u64::MAX]}),
+    ] {
+        assert!(s.execute("object.distort", &p).is_err(), "invalid input: {p}");
+        assert!(close(bounds(&s, a), original));
+        assert_eq!(undo_len(&s), history);
+    }
+    s.execute("object.distort", &json!({"corners": corners, "from": [0, 0, 100, 100], "ids": [a.0]})).unwrap();
+    assert_eq!(undo_len(&s), history + 1);
+}

crates/engine/tests/command_sweep.rs

@@ -292,12 +292,44 @@ fn structured_junk() {
         ("effect.apply", json!({"effect": "blur.radial", "params": {"amount": 1e308, "method": 5, "quality": "best"}})),
         ("effect.apply", json!({"effect": "blur.smart", "params": {"radius": 1e308, "threshold": -1e308, "quality": null}})),
         ("effect.apply", json!({"effect": "sharpen.unsharpMask", "params": {"amount": -1, "radius": "1e999", "threshold": 1e308}})),
+        (
+            "effect.apply",
+            json!({"effect": "brushStrokes.accentedEdges", "params": {"edgeWidth": 1e308, "edgeBrightness": "NaN", "smoothness": -1e308}}),
+        ),
+        (
+            "effect.apply",
+            json!({"effect": "brushStrokes.angledStrokes", "params": {"directionBalance": [1], "strokeLength": 1e308, "sharpness": null}}),
+        ),
+        ("effect.apply", json!({"effect": "brushStrokes.crosshatch", "params": {"strokeLength": "1e999", "sharpness": 1e308, "strength": -1e308}})),
+        ("effect.apply", json!({"effect": "brushStrokes.darkStrokes", "params": {"balance": -1e308, "blackIntensity": {}, "whiteIntensity": 1e308}})),
+        (
+            "effect.apply",
+            json!({"effect": "brushStrokes.inkOutlines", "params": {"strokeLength": -1, "darkIntensity": 1e308, "lightIntensity": "x"}}),
+        ),
+        ("effect.apply", json!({"effect": "brushStrokes.spatter", "params": {"sprayRadius": 1e308, "smoothness": "NaN"}})),
+        (
+            "effect.apply",
+            json!({"effect": "brushStrokes.sprayedStrokes", "params": {"strokeLength": 1e308, "sprayRadius": -1e308, "strokeDirection": 3}}),
+        ),
+        ("effect.apply", json!({"effect": "brushStrokes.sumiE", "params": {"strokeWidth": 0, "strokePressure": 1e308, "contrast": [1]}})),
         ("effect.apply", json!({"effect": "pixelate.colorHalftone", "params": {"maxRadius": 1e308, "channel1": "1e999", "channel4": null}})),
         ("effect.apply", json!({"effect": "pixelate.crystallize", "params": {"cellSize": -1e308}})),
         ("effect.apply", json!({"effect": "pixelate.mezzotint", "params": {"type": 5}})),
         ("effect.apply", json!({"effect": "pixelate.pointillize", "params": {"cellSize": "NaN"}})),
+        ("effect.apply", json!({"effect": "texture.craquelure", "params": {"crackSpacing": -1e308, "crackDepth": "NaN", "crackBrightness": 1e308}})),
+        ("effect.apply", json!({"effect": "texture.grain", "params": {"intensity": 1e308, "contrast": [1], "grainType": 7}})),
+        ("effect.apply", json!({"effect": "texture.mosaicTiles", "params": {"tileSize": "1e999", "groutWidth": -1, "lightenGrout": null}})),
+        ("effect.apply", json!({"effect": "texture.patchwork", "params": {"squareSize": 1e308, "relief": -1e308}})),
+        ("effect.apply", json!({"effect": "texture.stainedGlass", "params": {"cellSize": 0, "borderThickness": 1e308, "lightIntensity": "x"}})),
+        (
+            "effect.apply",
+            json!({"effect": "texture.texturizer", "params": {"texture": {}, "scaling": -1e308, "relief": 1e308, "lightDirection": 3, "invert": "yes"}}),
+        ),
         ("effect.apply", json!({"effect": "video.deinterlace", "params": {"eliminate": 7, "create": ["x"]}})),
         ("effect.apply", json!({"effect": "video.ntscColors", "params": {"junk": 1e308}})),
+        ("effect.apply", json!({"effect": "distort.diffuseGlow", "params": {"graininess": "x", "glowAmount": 1e308, "clearAmount": -1e308}})),
+        ("effect.apply", json!({"effect": "distort.glass", "params": {"distortion": 1e308, "smoothness": "NaN", "texture": 3, "scaling": -1}})),
+        ("effect.apply", json!({"effect": "distort.oceanRipple", "params": {"rippleSize": [1], "rippleMagnitude": 1e308}})),
         ("effect.apply", json!({"effect": "no.such.effect"})),
         ("effect.remove", json!({"index": 99})),
         ("effect.setParams", json!({"index": 0, "params": null})),

crates/mcp/src/tests.rs

@@ -312,6 +312,22 @@ fn inspect_document_reports_the_paint_of_type() {
     assert_eq!((t["fill"].as_str(), t["stroke"].as_str(), t["strokeWidth"].as_f64()), (Some("#0000ff"), Some("#00ff00"), Some(3.0)), "{t}");
 }
 
+/// #1003: type made on or in a path takes add_text's `color` too, over the current fill.
+#[test]
+fn add_text_on_or_in_a_path_takes_its_color() {
+    for mode in ["onPath", "area"] {
+        let mut s = server();
+        let r = call(&mut s, 2, "draw_shape", json!({"shape": "rectangle", "x": 40, "y": 40, "width": 180, "height": 60, "fill": "#0000ff"}));
+        let path = serde_json::from_str::<Value>(&text_of(&r)).unwrap()["id"].clone();
+        let r = call(&mut s, 3, "add_text", json!({"text": "Hello", "path": path, "mode": mode, "color": "#ff0000"}));
+        assert_eq!(r["isError"], false, "{r}");
+        let id = serde_json::from_str::<Value>(&text_of(&r)).unwrap()["id"].clone();
+        let v: Value = serde_json::from_str(&text_of(&call(&mut s, 4, "inspect_document", json!({})))).unwrap();
+        let t = v["layers"][0]["children"].as_array().unwrap().iter().find(|c| c["id"] == id).cloned().unwrap();
+        assert_eq!(t["fill"].as_str(), Some("#ff0000"), "{mode}: {t}");
+    }
+}
+
 /// save_file says it saves in the document's own format or the one the path's extension picks.
 #[test]
 fn save_file_describes_the_formats_it_writes() {

crates/mcp/src/tools.rs

@@ -574,7 +574,7 @@ fn select_ids(b: &mut dyn Backend, a: &Args) -> Result<(), String> {
 fn add_text(b: &mut dyn Backend, a: &Args) -> Result<Value, String> {
     let text = a.get("text").and_then(Value::as_str).ok_or("missing string argument `text`")?;
     let mut style = json!({});
-    for k in ["size", "font"] {
+    for k in ["size", "font", "color"] {
         if let Some(v) = a.get(k) {
             style[k] = v.clone();
         }
@@ -592,9 +592,6 @@ fn add_text(b: &mut dyn Backend, a: &Args) -> Result<Value, String> {
         for (k, v) in style.as_object().into_iter().flatten() {
             p[k.as_str()] = v.clone();
         }
-        if let Some(c) = a.get("color") {
-            p["color"] = c.clone();
-        }
         if let (Some(w), Some(h)) = (a.get("width"), a.get("height")) {
             p["area"] = json!({"width": w, "height": h});
         }

crates/render/src/encode/mod.rs

@@ -97,6 +97,8 @@ impl RasterExportOptions {
             anti_alias: self.anti_alias,
             // Opaque art stays exactly opaque where translucent edges cross it (#787).
             precise: true,
+            // Shapes meeting edge to edge leave no seam (#983).
+            supersample: true,
             ..Default::default()
         }
     }

crates/render/src/fx.rs

@@ -61,6 +61,7 @@ pub(crate) fn has_object_fx(n: &Node) -> bool {
         || effects::has_container_appearance(n)
         || effects::has_crop_marks(n)
         || effects::has_adjustment(n)
+        || effects::has_revolve(n)
 }
 
 /// Is `n` a group or layer (whose evaluated art keeps its knockout setting)?
@@ -123,6 +124,12 @@ fn item_effects(item: &AppearanceItem) -> &[Effect] {
 
 /// Visual bounds including geometry effects, stroke outsets and shadows/glows.
 pub(crate) fn visual_bounds(n: &Node) -> Option<Rect> {
+    if let Some(art) = effects::revolve_art(n) {
+        return cull_bounds(&art).map(|b| {
+            let o = effects::outset(&n.appearance.effects, b);
+            b.inflate(o, o)
+        });
+    }
     let bp = node_bezpath(n)?;
     let ctx = GeomContext::of(n);
     let g = effected_path(n, &bp);
@@ -408,12 +415,13 @@ impl Renderer {
             _ => None,
         };
         let container = is_container(a);
-        let art = match effects::crop_marks_art(a).or_else(|| effects::reshape(a, symbol.as_ref())) {
+        let art = match effects::crop_marks_art(a).or_else(|| effects::revolve_art(a)).or_else(|| effects::reshape(a, symbol.as_ref())) {
             Some(r) => r,
             None if container => effects::evaluate_container(a).unwrap_or_else(|| (**a).clone()),
             None if matches!(a.kind, NodeKind::Text(_) | NodeKind::Image(_) | NodeKind::Path { .. } | NodeKind::Compound { .. }) => (**a).clone(),
             None => effects::outline_art(a, symbol.as_ref()).unwrap_or_else(|| Node::group(a.id, vec![])),
         };
+        let art = if effects::has_revolve(a) { effects::evaluate_container(&art).unwrap_or(art) } else { art };
         let mut art = self.adjusted_art(doc, art, effects::color_map(&a.appearance.effects).as_ref());
         // A path's geometry effects still apply when it is drawn.
         let path = matches!(art.kind, NodeKind::Path { .. } | NodeKind::Compound { .. });
@@ -603,7 +611,8 @@ impl Renderer {
         };
         // De-Interlace's field lines: the rows of the document's raster grid (1 to 2400 ppi).
         let ppi = Some(f.doc.raster_effects_ppi).filter(|v| v.is_finite()).unwrap_or(72.0).clamp(1.0, 2400.0);
-        let space = effects::PixelSpace { to_doc, px, center: content.reach.center(), channels, line: 72.0 / ppi };
+        let (center, extent) = (content.reach.center(), 0.5 * content.reach.width().hypot(content.reach.height()));
+        let space = effects::PixelSpace { to_doc, px, center, channels, line: 72.0 / ppi, extent };
         let (wz, hz) = (wu as usize, hu as usize);
         for fx in chain {
             match fx {

crates/render/src/lib.rs

@@ -114,6 +114,11 @@ pub struct RenderOptions {
     /// opaque, where 8-bit compositing leaves alpha 254 on some anti-aliased edges (#787). Off,
     /// the faster 8-bit pipeline (the canvas).
     pub precise: bool,
+    /// Exports: Art Optimized edges are supersampled ([`supersample_factor`]): the art is drawn
+    /// with hard edges at several times the size and averaged down, so shapes that meet edge to
+    /// edge leave no seam of the background between them (#983). Off, edges are smoothed shape by
+    /// shape (the canvas).
+    pub supersample: bool,
 }
 
 /// The opacity of the art around an isolated group or layer.
@@ -186,10 +191,48 @@ impl Default for RenderOptions {
             smooth_images: true,
             isolated: None,
             precise: false,
+            supersample: false,
         }
     }
 }
 
+/// The most pixels a supersampled render draws (the frame and its compositing buffers hold a few
+/// times this many bytes).
+const MAX_SUPERSAMPLED_PIXELS: u64 = 40_000_000;
+
+/// How many times wider and taller a `w`×`h` render is drawn when supersampled: 4, or less where
+/// that would pass [`MAX_SUPERSAMPLED_PIXELS`] or the renderer's 65,535-pixel side; `None` when not
+/// even twice fits (the edges are then smoothed shape by shape).
+pub fn supersample_factor(w: u32, h: u32) -> Option<u32> {
+    (2..=4u32).rev().find(|k| {
+        let (sw, sh) = (u64::from(w) * u64::from(*k), u64::from(h) * u64::from(*k));
+        sw <= u64::from(u16::MAX) && sh <= u64::from(u16::MAX) && sw * sh <= MAX_SUPERSAMPLED_PIXELS
+    })
+}
+
+/// Average each `k`×`k` block of `src` (`w`×`h` pixels of 4 premultiplied bytes) into one pixel.
+fn downsample(src: &[u8], w: usize, h: usize, k: usize) -> Vec<u8> {
+    let (ow, oh) = (w / k.max(1), h / k.max(1));
+    let n = (k * k).max(1) as u32;
+    let mut out = vec![0u8; ow * oh * 4];
+    for (o, px) in out.as_chunks_mut::<4>().0.iter_mut().enumerate() {
+        let (ox, oy) = (o % ow.max(1), o / ow.max(1));
+        let mut acc = [0u32; 4];
+        for y in oy * k..(oy + 1) * k {
+            let row = y * w + ox * k;
+            for p in src.get(row * 4..(row + k) * 4).unwrap_or_default().as_chunks::<4>().0 {
+                for (a, v) in acc.iter_mut().zip(p) {
+                    *a += u32::from(*v);
+                }
+            }
+        }
+        for (d, a) in px.iter_mut().zip(acc) {
+            *d = ((a + n / 2) / n).min(255) as u8;
+        }
+    }
+    out
+}
+
 /// A rendered image (premultiplied RGBA8, row-major).
 pub struct Rendered {
     pub width: u32,
@@ -476,6 +519,16 @@ impl Renderer {
     /// screen colours (4 bytes a pixel, see [`Self::render_region_inks`]).
     fn render_as(&mut self, doc: &Document, width: u32, height: u32, view: Affine, opts: &RenderOptions, inks: bool) -> Rendered {
         let start = now();
+        if opts.supersample && opts.anti_alias == AntiAlias::Art && opts.mask_view.is_none() {
+            let (w, h) = (width.clamp(1, u16::MAX as u32), height.clamp(1, u16::MAX as u32));
+            if let Some(k) = supersample_factor(w, h) {
+                let hard = RenderOptions { anti_alias: AntiAlias::None, supersample: false, ..opts.clone() };
+                let big = self.render_as(doc, w * k, h * k, Affine::scale(f64::from(k)) * view, &hard, inks);
+                let pixels = downsample(&big.pixels, big.width as usize, big.height as usize, k as usize);
+                self.stats.micros = now().saturating_sub(start);
+                return Rendered { width: w, height: h, pixels };
+            }
+        }
         let prepared = proof::prepare(doc, opts);
         let doc: &Document = &prepared;
         let w = width.clamp(1, u16::MAX as u32) as u16;

crates/render/src/tests.rs

@@ -385,3 +385,41 @@ fn images_take_their_nearest_pixel_without_smoothing() {
     assert!(greys(true) >= 4, "smooth: a ramp from black to white");
     assert_eq!(greys(false), 0, "nearest: black, then white");
 }
+
+/// Art Optimized exports are supersampled (#983): two red shapes meeting along a diagonal leave no
+/// seam of the white background between them, where shape-by-shape smoothing shows one; the outer
+/// edges stay smooth.
+#[test]
+fn supersampled_art_leaves_no_seam_between_shapes_that_meet() {
+    let red = || Paint::solid(Color::rgb(1.0, 0.0, 0.0));
+    let mut d = Document::new(100.0, 100.0);
+    let layer = d.layers[0].id;
+    // Two triangles sharing the diagonal of the square (10, 10)–(90, 90).
+    for pts in [[(10.0, 10.0), (90.0, 10.0), (90.0, 90.0)], [(10.0, 10.0), (90.0, 90.0), (10.0, 90.0)]] {
+        let mut b = vectorcraft_geom::BezPath::new();
+        b.move_to(pts[0]);
+        b.line_to(pts[1]);
+        b.line_to(pts[2]);
+        b.close_path();
+        let id = d.alloc_id();
+        d.insert(Some(layer), 0, Node::path(id, vectorcraft_geom::PathData::from_bezpath(&b), Appearance::basic(red(), Paint::None, 0.0))).unwrap();
+    }
+    let draw = |supersample: bool| {
+        let opts = RenderOptions { background: Some([255, 255, 255, 255]), precise: true, supersample, ..Default::default() };
+        Renderer::new().render(&d, 100, 100, Affine::IDENTITY, &opts)
+    };
+    // The palest pixel on the shared diagonal, away from the corners.
+    let palest = |r: &Rendered| (20..80).map(|i| r.pixel(i, i)[1].max(r.pixel(i + 1, i)[1])).max().unwrap();
+    assert!(palest(&draw(false)) > 20, "shape-by-shape smoothing shows the seam");
+    assert_eq!(palest(&draw(true)), 0, "supersampled: no seam");
+    // The outer edge is still smoothed: a pixel half covered is between white and red.
+    let ss = draw(true);
+    let edge = ss.pixel(50, 9);
+    assert!(edge == [255, 255, 255, 255] || (edge[1] > 0 && edge[1] < 255) || ss.pixel(50, 10)[1] < 255, "{edge:?}");
+    // The factor fits the size and the renderer's limits.
+    assert_eq!(supersample_factor(100, 100), Some(4));
+    assert_eq!(supersample_factor(2000, 2000), Some(3));
+    assert_eq!(supersample_factor(3000, 3000), Some(2));
+    assert_eq!(supersample_factor(5000, 5000), None);
+    assert_eq!(supersample_factor(40_000, 10), None);
+}

crates/render/src/tests_objectfx.rs

@@ -40,6 +40,69 @@ fn lum(p: [u8; 4]) -> u32 {
 
 const WHITE: u32 = 765;
 
+#[test]
+fn revolve_canvas_matches_baked_art_and_shades_its_surface() {
+    let mut bp = vectorcraft_geom::BezPath::new();
+    bp.move_to((50.0, 15.0));
+    bp.line_to((75.0, 30.0));
+    bp.line_to((75.0, 75.0));
+    bp.line_to((50.0, 90.0));
+    let mut n = Node::path(
+        NodeId(0),
+        vectorcraft_geom::PathData::from_bezpath(&bp),
+        Appearance::basic(Paint::solid(Color::rgb(0.9, 0.2, 0.1)), Paint::None, 0.0),
+    );
+    n.appearance.effects.push(fx("threeD.revolve", json!({"rotationX":0,"rotationY":0})));
+    let d = doc_with(Document::new(100.0, 100.0), n);
+    let live = render(&d);
+    let baked = vectorcraft_effects::bake_document(&d).unwrap();
+    let exported = render(&baked);
+    assert_eq!(live.pixels, exported.pixels, "canvas and baked/exported faces agree");
+    let reds: Vec<_> =
+        live.pixels.as_chunks::<4>().0.iter().filter(|p| p[0] as u16 > p[1] as u16 * 2 && p[0] as u16 > p[2] as u16 * 2).map(|p| p[0]).collect();
+    assert!(reds.len() > 1500, "a filled surface, rather than the open source path");
+    assert!(reds.iter().max().unwrap() - reds.iter().min().unwrap() > 80, "lighting varies across the surface");
+    assert_eq!(live.pixels, render_threads(&d, 4).pixels);
+}
+
+#[test]
+fn revolve_visible_surface_expansion_preserves_the_view_and_transparent_art() {
+    let mut bp = vectorcraft_geom::BezPath::new();
+    bp.move_to((50.0, 15.0));
+    bp.curve_to((80.0, 25.0), (80.0, 75.0), (50.0, 90.0));
+    let mut n = Node::path(
+        NodeId(0),
+        vectorcraft_geom::PathData::from_bezpath(&bp),
+        Appearance::basic(Paint::solid(Color::rgb(0.2, 0.55, 0.9)), Paint::None, 0.0),
+    );
+    for (angle, rotation, perspective, opacity) in
+        [(360.0, 0.0, 0.0, 1.0), (360.0, -35.0, 55.0, 1.0), (150.0, -28.0, 40.0, 1.0), (360.0, -35.0, 55.0, 0.5)]
+    {
+        n.opacity = opacity;
+        n.appearance.effects = vec![fx(
+            "threeD.revolve",
+            json!({"angle":angle,"rotationX":rotation,"rotationY":25,"perspective":perspective,"segments":32,"expandVisibleOnly":true}),
+        )];
+        let d = doc_with(Document::new(100.0, 100.0), n.clone());
+        let live = render(&d);
+        let mut expanded = d.clone();
+        let id = expanded.layers[0].children().unwrap()[0].id;
+        let source = expanded.node(id).unwrap().clone();
+        let mut stroke = |_: &mut Document, _: &vectorcraft_geom::PathData, _: vectorcraft_geom::FillRule, _: &vectorcraft_doc::StrokeLayer| None;
+        let art = vectorcraft_effects::expand_leaf(&mut expanded, &source, &mut stroke).unwrap();
+        *expanded.node_mut(id).unwrap() = art;
+        let flat = render(&expanded);
+        let difference: u64 = live.pixels.iter().zip(&flat.pixels).map(|(a, b)| a.abs_diff(*b) as u64).sum();
+        let average = difference as f64 / live.pixels.len() as f64;
+        assert!(average < 1.0, "appearance differs by {average} channel levels: angle {angle}, rotation {rotation}, opacity {opacity}");
+        if opacity < 1.0 {
+            assert_eq!(live.pixels, flat.pixels);
+        }
+        // Export baking keeps every face, even when the expansion checkbox is checked.
+        assert_eq!(live.pixels, render(&vectorcraft_effects::bake_document(&d).unwrap()).pixels);
+    }
+}
+
 /// A 30×30 red image placed at (20, 20).
 fn image_doc(effects: Vec<Effect>) -> Document {
     let mut d = Document::new(100.0, 100.0);

crates/svg/src/import/spread.rs

@@ -2,7 +2,7 @@
 //! repeated (every other period mirrored, for reflect) as many times as the painted area needs,
 //! and the gradient stretched over those periods.
 
-use vectorcraft_color::{GradientGeom, GradientKind, GradientStop};
+use vectorcraft_color::{Gradient, GradientGeom, GradientKind, GradientStop};
 use vectorcraft_geom::{Point, Rect};
 
 /// Most periods a gradient is expanded to.
@@ -80,17 +80,9 @@ fn whole_period(stops: &[GradientStop]) -> Vec<GradientStop> {
 
 /// A period mirrored: the stops in reverse, each midpoint measured from the other side.
 fn mirror(period: &[GradientStop]) -> Vec<GradientStop> {
-    let rev: Vec<&GradientStop> = period.iter().rev().collect();
-    rev.iter()
-        .enumerate()
-        .map(|(i, s)| GradientStop {
-            offset: 1.0 - s.offset,
-            // The midpoint from this stop to the next one is the mirror of the one the next stop
-            // had towards this one.
-            midpoint: rev.get(i + 1).map_or(0.5, |next| 1.0 - next.midpoint),
-            ..(*s).clone()
-        })
-        .collect()
+    let mut g = Gradient { kind: GradientKind::Linear, stops: period.to_vec() };
+    g.reverse();
+    g.stops
 }
 
 #[cfg(test)]

crates/svg/tests/effects_export.rs

@@ -21,6 +21,23 @@ fn fx(id: &str) -> Effect {
     Effect { id: id.into(), params: json!({}), visible: true }
 }
 
+#[test]
+fn revolve_exports_shaded_vector_faces_and_keeps_the_source_live() {
+    let bp = vectorcraft_geom::BezPath::from_svg("M100 30 L130 50 L130 140 L100 160").unwrap();
+    let mut n = Node::path(
+        NodeId(0),
+        vectorcraft_geom::PathData::from_bezpath(&bp),
+        Appearance::basic(Paint::solid(Color::rgb(0.8, 0.2, 0.1)), Paint::None, 0.0),
+    );
+    n.appearance.effects.push(fx("threeD.revolve"));
+    let d = doc_with(n);
+    let before = d.clone();
+    let svg = export(&d, &ExportOptions::default());
+    assert!(svg.matches("<path").count() > 50, "Revolve should export vector surfaces");
+    assert!(!svg.contains("<image"), "no raster fallback");
+    assert_eq!(d, before, "export leaves source editable");
+}
+
 #[test]
 fn a_strokes_own_glow_filters_the_stroke_element_only() {
     let mut n = Node::path(

crates/testkit/src/fixtures.rs

@@ -154,6 +154,15 @@ pub fn rich_session() -> Session {
     exec(&mut s, "symbol.new", json!({"name": "Dot"}));
     let t = id_of(&exec(&mut s, "text.create", json!({"x": 250, "y": 370, "text": "Tap  to add", "size": 18})));
     exec(&mut s, "text.insertInline", json!({"id": t.0, "at": 4, "symbol": "Dot"}));
+    // Variables (data merge): both kinds, bound to art, with two dataset rows and one applied,
+    // so format round trips cover the definitions, the bindings and the rows.
+    exec(&mut s, "variable.define", json!({"name": "Title", "kind": "text"}));
+    exec(&mut s, "variable.define", json!({"name": "Badge", "kind": "visibility"}));
+    exec(&mut s, "variable.bind", json!({"variable": "Title", "ids": [tx.0]}));
+    exec(&mut s, "variable.bind", json!({"variable": "Badge", "ids": [a]}));
+    exec(&mut s, "dataset.new", json!({"name": "Row 1", "values": {"Title": "Merged", "Badge": true}}));
+    exec(&mut s, "dataset.new", json!({"name": "Row 2", "values": {"Title": "Other"}}));
+    exec(&mut s, "dataset.select", json!({"name": "Row 1"}));
     let _ = (a, b, c, l);
     exec(&mut s, "select.none", json!({}));
     s

crates/three-d/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "vectorcraft-three-d"
+version.workspace = true
+edition.workspace = true
+license.workspace = true
+description = "Portable surface-of-revolution geometry and projected vector shading"
+
+[lints]
+workspace = true
+
+[dependencies]
+vectorcraft-geom = { workspace = true }

crates/three-d/src/lib.rs

@@ -0,0 +1,419 @@
+//! A portable surface-of-revolution evaluator. No windowing, GPU or document dependencies.
+//!
+//! Open profiles generate uncapped surfaces. Faces are projected and sorted back to front,
+//! then flat shaded. This vector preview uses a painter's algorithm, not a depth buffer:
+//! intersecting profiles can have ambiguous visibility and are not solid modelling inputs.
+#![forbid(unsafe_code)]
+
+mod visibility;
+pub use visibility::{VisibleFace, visible_faces};
+
+use vectorcraft_geom::{BezPath, ParamCurve, PathData, Point, Rect};
+
+/// Resource limits shared by desktop, CLI and browser evaluation.
+const MAX_PROFILE_POINTS: usize = 1024;
+const MAX_FACES: usize = 32768;
+
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+struct V3(f64, f64, f64);
+
+impl V3 {
+    fn sub(self, b: Self) -> Self {
+        Self(self.0 - b.0, self.1 - b.1, self.2 - b.2)
+    }
+    fn cross(self, b: Self) -> Self {
+        Self(self.1 * b.2 - self.2 * b.1, self.2 * b.0 - self.0 * b.2, self.0 * b.1 - self.1 * b.0)
+    }
+    fn dot(self, b: Self) -> f64 {
+        self.0 * b.0 + self.1 * b.1 + self.2 * b.2
+    }
+    fn unit(self) -> Self {
+        let l = self.dot(self).sqrt();
+        if l < 1e-12 { Self::default() } else { Self(self.0 / l, self.1 / l, self.2 / l) }
+    }
+}
+
+/// The vertical axis is offset outward from the selected edge of the profile's bounds.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum Edge {
+    #[default]
+    Left,
+    Right,
+}
+
+/// All angles are degrees; offset is in document points, lighting values are 0..1.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Revolve {
+    pub angle: f64,
+    pub offset: f64,
+    pub edge: Edge,
+    pub rotation_x: f64,
+    pub rotation_y: f64,
+    pub rotation_z: f64,
+    /// Perspective strength, 0 for orthographic projection, up to 1.
+    pub perspective: f64,
+    /// Radial subdivisions for a full turn, clamped to 8..128.
+    pub segments: usize,
+    pub light_azimuth: f64,
+    pub light_elevation: f64,
+    pub light_intensity: f64,
+    pub ambient: f64,
+    pub shade: bool,
+}
+
+impl Default for Revolve {
+    fn default() -> Self {
+        Self {
+            angle: 360.0,
+            offset: 0.0,
+            edge: Edge::Left,
+            rotation_x: 0.0,
+            rotation_y: 0.0,
+            rotation_z: 0.0,
+            perspective: 0.0,
+            segments: 64,
+            light_azimuth: -45.0,
+            light_elevation: 45.0,
+            light_intensity: 0.8,
+            ambient: 0.25,
+            shade: true,
+        }
+    }
+}
+
+fn finite(v: f64, fallback: f64, min: f64, max: f64) -> f64 {
+    if v.is_finite() { v.clamp(min, max) } else { fallback }
+}
+
+impl Revolve {
+    /// Unit bases of the rings that adjust the Euler X, Y and Z view parameters.
+    /// X turns before Y and Z, Y before Z, and Z turns in the screen plane.
+    /// Each pair has a cross product pointing along that parameter's rotation axis.
+    pub fn rotation_planes(self) -> [[[f64; 3]; 2]; 3] {
+        let o = self.sanitized();
+        let x_frame = Self { rotation_x: 0.0, ..o };
+        let y_frame = Self { rotation_x: 0.0, rotation_y: 0.0, ..o };
+        [
+            [x_frame.rotate(V3(0.0, 1.0, 0.0)), x_frame.rotate(V3(0.0, 0.0, 1.0))],
+            [y_frame.rotate(V3(1.0, 0.0, 0.0)), y_frame.rotate(V3(0.0, 0.0, -1.0))],
+            [V3(1.0, 0.0, 0.0), V3(0.0, 1.0, 0.0)],
+        ]
+        .map(|plane| plane.map(|v| [v.0, v.1, v.2]))
+    }
+
+    /// The fixed centre of view rotation, in document coordinates.
+    pub fn rotation_origin(self, bounds: Rect) -> Point {
+        let o = self.sanitized();
+        Point::new(if o.edge == Edge::Left { bounds.x0 - o.offset } else { bounds.x1 + o.offset }, bounds.center().y)
+    }
+
+    /// Rotated unit axes for a view-orientation guide (screen Y points down).
+    pub fn view_axes(self) -> [Point; 3] {
+        [V3(1.0, 0.0, 0.0), V3(0.0, 1.0, 0.0), V3(0.0, 0.0, 1.0)].map(|v| {
+            let p = self.sanitized().rotate(v);
+            Point::new(p.0, p.1)
+        })
+    }
+
+    /// The same projected vertical axis used by the surface evaluator.
+    pub fn projected_axis(self, bounds: Rect) -> [Point; 2] {
+        let o = self.sanitized();
+        let axis = match o.edge {
+            Edge::Left => bounds.x0 - o.offset,
+            Edge::Right => bounds.x1 + o.offset,
+        };
+        let center_y = bounds.center().y;
+        let radius = (bounds.x0 - axis).abs().max((bounds.x1 - axis).abs());
+        let distance = 4.0 * radius.max(bounds.height().abs()).max(1.0);
+        [bounds.y0, bounds.y1].map(|y| {
+            let v = o.rotate(V3(0.0, y - center_y, 0.0));
+            let factor = distance / (distance - v.2 * o.perspective);
+            Point::new(axis + v.0 * factor, center_y + v.1 * factor)
+        })
+    }
+
+    /// Directional light in view space, shared by shading and interactive guides.
+    pub fn light_direction(self) -> [f64; 3] {
+        let o = self.sanitized();
+        let (sl, cl) = o.light_elevation.to_radians().sin_cos();
+        let (sa, ca) = o.light_azimuth.to_radians().sin_cos();
+        [cl * sa, -sl, cl * ca]
+    }
+
+    /// Light-direction orbits as (centre, cosine basis, sine basis), in view space.
+    /// The first changes azimuth at the current elevation. The second changes elevation
+    /// at the current azimuth. The meridian's valid parameter range is -90..90 degrees.
+    pub fn light_orbits(self) -> [[[f64; 3]; 3]; 2] {
+        let o = self.sanitized();
+        let (se, ce) = o.light_elevation.to_radians().sin_cos();
+        let (sa, ca) = o.light_azimuth.to_radians().sin_cos();
+        [[[0.0, -se, 0.0], [0.0, 0.0, ce], [ce, 0.0, 0.0]], [[0.0, 0.0, 0.0], [sa, 0.0, ca], [0.0, -1.0, 0.0]]]
+    }
+
+    /// Move a light on its current hemisphere, preserving the azimuth at the poles.
+    /// A light behind the object stays behind when its projected handle is dragged.
+    pub fn light_at_on_side(self, point: Point) -> [f64; 2] {
+        let o = self.sanitized();
+        let point = Point::new(finite(point.x, 0.0, -1e8, 1e8), finite(point.y, 0.0, -1e8, 1e8));
+        let length = point.x.hypot(point.y).max(1.0);
+        let (x, y) = (point.x / length, point.y / length);
+        let z = (1.0 - x * x - y * y).max(0.0).sqrt().copysign(o.light_direction()[2]);
+        let azimuth = if x.hypot(z) < 1e-9 { o.light_azimuth } else { x.atan2(z).to_degrees() };
+        [azimuth, (-y).clamp(-1.0, 1.0).asin().to_degrees()]
+    }
+
+    /// A dragged light position on the front hemisphere, in normalized view coordinates.
+    pub fn light_at(point: Point) -> [f64; 2] {
+        let length = point.x.hypot(point.y).max(1.0);
+        let (x, y) = (point.x / length, point.y / length);
+        let z = (1.0 - x * x - y * y).max(0.0).sqrt();
+        [x.atan2(z).to_degrees(), (-y).clamp(-1.0, 1.0).asin().to_degrees()]
+    }
+
+    fn sanitized(self) -> Self {
+        Self {
+            angle: finite(self.angle, 360.0, 0.0, 360.0),
+            offset: finite(self.offset, 0.0, 0.0, 1e5),
+            rotation_x: finite(self.rotation_x, 0.0, -360.0, 360.0),
+            rotation_y: finite(self.rotation_y, 0.0, -360.0, 360.0),
+            rotation_z: finite(self.rotation_z, 0.0, -360.0, 360.0),
+            perspective: finite(self.perspective, 0.0, 0.0, 1.0),
+            segments: self.segments.clamp(8, 128),
+            light_azimuth: finite(self.light_azimuth, -45.0, -360.0, 360.0),
+            light_elevation: finite(self.light_elevation, 45.0, -90.0, 90.0),
+            light_intensity: finite(self.light_intensity, 0.8, 0.0, 1.0),
+            ambient: finite(self.ambient, 0.25, 0.0, 1.0),
+            ..self
+        }
+    }
+    fn rotate(self, v: V3) -> V3 {
+        let (sx, cx) = self.rotation_x.to_radians().sin_cos();
+        let (sy, cy) = self.rotation_y.to_radians().sin_cos();
+        let (sz, cz) = self.rotation_z.to_radians().sin_cos();
+        let v = V3(v.0, cx * v.1 - sx * v.2, sx * v.1 + cx * v.2);
+        let v = V3(cy * v.0 + sy * v.2, v.1, -sy * v.0 + cy * v.2);
+        V3(cz * v.0 - sz * v.1, sz * v.0 + cz * v.1, v.2)
+    }
+}
+
+/// One opaque vector polygon, already projected. Brightness multiplies the source colour.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Face {
+    pub points: Vec<Point>,
+    pub depth: f64,
+    pub brightness: f64,
+}
+
+impl Face {
+    pub fn path(&self) -> PathData {
+        let mut bp = BezPath::new();
+        if let Some(first) = self.points.first() {
+            bp.move_to(*first);
+            for p in self.points.iter().skip(1) {
+                bp.line_to(*p);
+            }
+            bp.close_path();
+        }
+        PathData::from_bezpath(&bp)
+    }
+}
+
+/// Evaluate a profile in document space. All subpaths share one axis from `bounds`.
+/// Invalid or excessively complex inputs return an error, never a partial surface.
+pub fn revolve(path: &PathData, bounds: Rect, options: Revolve) -> Result<Vec<Face>, String> {
+    let o = options.sanitized();
+    if ![bounds.x0, bounds.y0, bounds.x1, bounds.y1].iter().all(|v| v.is_finite() && v.abs() <= 1e8) {
+        return Err("Revolve requires finite profile coordinates within 100 million points".into());
+    }
+    let axis = match o.edge {
+        Edge::Left => bounds.x0 - o.offset,
+        Edge::Right => bounds.x1 + o.offset,
+    };
+    let center_y = (bounds.y0 + bounds.y1) * 0.5;
+    let radius = (bounds.x0 - axis).abs().max((bounds.x1 - axis).abs());
+    let distance = 4.0 * radius.max(bounds.height().abs()).max(1.0);
+    let steps = ((o.segments as f64 * o.angle / 360.0).ceil() as usize).max(1);
+    let sweep = o.angle.to_radians();
+    let [lx, ly, lz] = o.light_direction();
+    let light = V3(lx, ly, lz);
+    let mut faces = Vec::new();
+    let mut count = 0;
+    for sp in &path.subpaths {
+        let mut profile = Vec::new();
+        if let Some(first) = sp.anchors.first() {
+            profile.push(first.p);
+            count += 1;
+            if count > MAX_PROFILE_POINTS {
+                return Err("Revolve profile is too complex".into());
+            }
+        }
+        let segments = if sp.closed { sp.anchors.len() } else { sp.anchors.len().saturating_sub(1) };
+        // Bound work before sampling any data. Curves get sixteen samples, straight edges one.
+        if segments > MAX_PROFILE_POINTS {
+            return Err("Revolve profile is too complex".into());
+        }
+        for i in 0..segments {
+            let curve = sp.segment(i);
+            let samples = if sp.segment_is_line(i) { 1 } else { 16 };
+            for k in 1..=samples {
+                profile.push(curve.eval(k as f64 / samples as f64));
+                count += 1;
+                if count > MAX_PROFILE_POINTS {
+                    return Err("Revolve profile is too complex".into());
+                }
+            }
+        }
+        for pair in profile.windows(2) {
+            let [a, b] = pair else { continue };
+            if ![a.x, a.y, b.x, b.y].iter().all(|v| v.is_finite() && v.abs() <= 1e8) {
+                return Err("Revolve profile contains invalid coordinates".into());
+            }
+            for j in 0..steps {
+                let vertex = |p: Point, step: usize| {
+                    let (s, c) = (sweep * step as f64 / steps as f64).sin_cos();
+                    o.rotate(V3((p.x - axis) * c, p.y - center_y, (p.x - axis) * s))
+                };
+                let vertices = [vertex(*a, j), vertex(*b, j), vertex(*b, j + 1), vertex(*a, j + 1)];
+                // The diagonal gives a nonzero normal even when one profile endpoint is on-axis.
+                let mut normal = vertices[1].sub(vertices[0]).cross(vertices[2].sub(vertices[0])).unit();
+                if normal.dot(normal) < 0.5 {
+                    normal = vertices[2].sub(vertices[0]).cross(vertices[3].sub(vertices[0])).unit();
+                }
+                if normal.dot(normal) < 0.5 {
+                    continue;
+                }
+                // Profiles may run up or down. Shade the visible side of this two-sided surface.
+                if normal.2 < 0.0 {
+                    normal = V3(-normal.0, -normal.1, -normal.2);
+                }
+                let brightness = if o.shade { (o.ambient + o.light_intensity * normal.dot(light).max(0.0)).clamp(0.0, 1.0) } else { 1.0 };
+                let points: Vec<_> = vertices
+                    .iter()
+                    .map(|v| {
+                        let factor = distance / (distance - v.2 * o.perspective);
+                        Point::new(axis + v.0 * factor, center_y + v.1 * factor)
+                    })
+                    .collect();
+                if points.iter().any(|p| !p.x.is_finite() || !p.y.is_finite()) {
+                    return Err("Revolve projection is not finite".into());
+                }
+                let area = points
+                    .iter()
+                    .zip(points.iter().cycle().skip(1))
+                    .take(4)
+                    .map(|(a, b)| (a.x - axis) * (b.y - center_y) - (b.x - axis) * (a.y - center_y))
+                    .sum::<f64>();
+                if area.abs() < 1e-10 {
+                    continue;
+                }
+                faces.push(Face { points, depth: vertices.iter().map(|v| v.2).sum::<f64>() / 4.0, brightness });
+                if faces.len() > MAX_FACES {
+                    return Err("Revolve surface is too complex; reduce Segments or simplify the profile".into());
+                }
+            }
+        }
+    }
+    faces.sort_by(|a, b| a.depth.total_cmp(&b.depth));
+    Ok(faces)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    #[test]
+    fn light_orbits_and_handle_projection_match_the_shading_direction_on_both_sides() {
+        for azimuth in [-170.0f64, -45.0, 0.0, 83.0, 167.0] {
+            for elevation in [-85.0f64, -30.0, 0.0, 45.0, 90.0] {
+                let o = Revolve { light_azimuth: azimuth, light_elevation: elevation, ..Default::default() };
+                let direction = o.light_direction();
+                for ([center, u, v], angle) in o.light_orbits().into_iter().zip([azimuth, elevation]) {
+                    let (s, c) = angle.to_radians().sin_cos();
+                    for i in 0..3 {
+                        assert!((center[i] + u[i] * c + v[i] * s - direction[i]).abs() < 1e-12);
+                    }
+                }
+                let [a, e] = o.light_at_on_side(Point::new(direction[0], direction[1]));
+                assert!((a - azimuth).abs() < 1e-9 && (e - elevation).abs() < 1e-9, "{azimuth}, {elevation} -> {a}, {e}");
+            }
+        }
+        let o = Revolve { light_azimuth: 135.0, ..Default::default() };
+        let [azimuth, elevation] = o.light_at_on_side(Point::new(0.3, -0.4));
+        let [x, y, z] = Revolve { light_azimuth: azimuth, light_elevation: elevation, ..o }.light_direction();
+        assert!((x - 0.3).abs() < 1e-12 && (y + 0.4).abs() < 1e-12 && z < 0.0);
+        let [a, e] = o.light_at_on_side(Point::new(f64::NAN, f64::INFINITY));
+        assert!(a.is_finite() && e.is_finite());
+    }
+
+    #[test]
+    fn ring_axes_match_euler_parameter_rotation_and_origin_stays_fixed() {
+        let o = Revolve { rotation_x: 27.0, rotation_y: -39.0, rotation_z: 53.0, ..Default::default() };
+        let seed = V3(0.3, -0.5, 0.7);
+        let before = o.rotate(seed);
+        let planes = o.rotation_planes();
+        for (axis, [u, v]) in planes.iter().enumerate() {
+            let normal = V3(u[0], u[1], u[2]).cross(V3(v[0], v[1], v[2]));
+            assert!((normal.dot(normal) - 1.0).abs() < 1e-12);
+            let mut changed = o;
+            match axis {
+                0 => changed.rotation_x += 0.0001,
+                1 => changed.rotation_y += 0.0001,
+                _ => changed.rotation_z += 0.0001,
+            }
+            let actual = changed.rotate(seed).sub(before);
+            let expected = normal.cross(before);
+            let step = 0.0001f64.to_radians();
+            for (a, b) in [(actual.0 / step, expected.0), (actual.1 / step, expected.1), (actual.2 / step, expected.2)] {
+                assert!((a - b).abs() < 1e-5);
+            }
+        }
+        assert_eq!(Revolve { edge: Edge::Right, offset: 12.0, ..o }.rotation_origin(Rect::new(20.0, 30.0, 80.0, 100.0)), Point::new(92.0, 65.0));
+    }
+    #[test]
+    fn guides_match_projection_and_dragged_light_matches_shading_direction() {
+        let o = Revolve { rotation_x: 0.0, rotation_y: 0.0, rotation_z: 0.0, offset: 10.0, ..Default::default() };
+        assert_eq!(o.view_axes(), [Point::new(1.0, 0.0), Point::new(0.0, 1.0), Point::new(0.0, 0.0)]);
+        assert_eq!(o.projected_axis(Rect::new(20.0, 30.0, 80.0, 100.0)), [Point::new(10.0, 30.0), Point::new(10.0, 100.0)]);
+        let [azimuth, elevation] = Revolve::light_at(Point::new(0.3, -0.4));
+        let [x, y, z] = Revolve { light_azimuth: azimuth, light_elevation: elevation, ..o }.light_direction();
+        assert!((x - 0.3).abs() < 1e-9 && (y + 0.4).abs() < 1e-9 && z > 0.0);
+        let [azimuth, elevation] = Revolve::light_at(Point::new(2.0, -2.0));
+        assert!(azimuth.is_finite() && elevation.is_finite() && elevation.abs() <= 90.0);
+    }
+    fn cylinder() -> (PathData, Rect) {
+        let mut bp = BezPath::new();
+        bp.move_to((40.0, 10.0));
+        bp.line_to((40.0, 90.0));
+        (PathData::from_bezpath(&bp), Rect::new(0.0, 10.0, 40.0, 90.0))
+    }
+    #[test]
+    fn cylinder_has_expected_silhouette_depth_order_and_shading() {
+        let (p, b) = cylinder();
+        let faces = revolve(&p, b, Revolve { rotation_x: 0.0, rotation_y: 0.0, ..Default::default() }).unwrap();
+        let points: Vec<_> = faces.iter().flat_map(|f| &f.points).collect();
+        assert!((points.iter().map(|p| p.x).fold(f64::INFINITY, f64::min) + 40.0).abs() < 1e-6);
+        assert!((points.iter().map(|p| p.x).fold(f64::NEG_INFINITY, f64::max) - 40.0).abs() < 1e-6);
+        assert!(faces.windows(2).all(|w| w[0].depth <= w[1].depth));
+        assert!(faces.iter().any(|f| f.brightness > 0.8) && faces.iter().any(|f| f.brightness < 0.4));
+    }
+    #[test]
+    fn edge_offset_sweep_and_rotation_change_the_surface() {
+        let (p, b) = cylinder();
+        let base = revolve(&p, b, Revolve::default()).unwrap();
+        for o in [
+            Revolve { edge: Edge::Right, offset: 20.0, ..Default::default() },
+            Revolve { angle: 120.0, ..Default::default() },
+            Revolve { rotation_z: 60.0, perspective: 0.8, ..Default::default() },
+        ] {
+            assert_ne!(base, revolve(&p, b, o).unwrap());
+        }
+        assert!(revolve(&p, b, Revolve { angle: 0.0, ..Default::default() }).unwrap().is_empty());
+    }
+    #[test]
+    fn malformed_and_degenerate_inputs_are_bounded() {
+        let (p, b) = cylinder();
+        let f = revolve(&p, b, Revolve { segments: usize::MAX, angle: f64::NAN, offset: f64::INFINITY, ..Default::default() }).unwrap();
+        assert!(f.len() <= 128);
+        assert!(revolve(&p, Rect::new(f64::NAN, 0.0, 1.0, 1.0), Revolve::default()).is_err());
+        assert!(revolve(&PathData::default(), b, Revolve::default()).unwrap().is_empty());
+    }
+}

crates/three-d/src/visibility.rs

@@ -0,0 +1,325 @@
+//! Vector visibility in the evaluator's paint order. Convex projected faces are cut by the
+//! nearer faces covering them, irrespective of their winding or which side faces the camera.
+//! This preserves interiors visible through open ends and partial sweeps.
+
+use vectorcraft_geom::{PathData, Point, Rect, SubPath};
+
+use crate::{Face, MAX_FACES};
+
+const GRID: usize = 32;
+const MAX_GRID_REFS: usize = 2_000_000;
+const MAX_WORK: usize = 16_000_000;
+const MAX_FRAGMENTS: usize = 256;
+const MAX_OUTPUT_POINTS: usize = 262_144;
+
+/// The visible portions of one source face, with its original shading and paint order.
+#[derive(Clone, Debug, PartialEq)]
+pub struct VisibleFace {
+    pub path: PathData,
+    pub brightness: f64,
+    pub depth: f64,
+}
+
+struct Polygon {
+    points: Vec<Point>,
+    bounds: Rect,
+}
+
+fn bounds(points: &[Point]) -> Rect {
+    let Some(first) = points.first() else { return Rect::ZERO };
+    points.iter().fold(Rect::from_points(*first, *first), |b, p| b.union_pt(*p))
+}
+
+fn area(points: &[Point]) -> f64 {
+    let Some(origin) = points.first() else { return 0.0 };
+    points.iter().zip(points.iter().cycle().skip(1)).take(points.len()).map(|(a, b)| (*a - *origin).cross(*b - *origin)).sum::<f64>() / 2.0
+}
+
+fn clean(mut points: Vec<Point>, epsilon: f64) -> Vec<Point> {
+    points.dedup_by(|a, b| a.distance(*b) <= epsilon);
+    if points.len() > 1 && points.first().zip(points.last()).is_some_and(|(a, b)| a.distance(*b) <= epsilon) {
+        points.pop();
+    }
+    if points.len() < 3 || area(&points).abs() <= epsilon * epsilon {
+        return vec![];
+    }
+    if area(&points) < 0.0 {
+        points.reverse();
+    }
+    points
+}
+
+fn overlaps(a: Rect, b: Rect) -> bool {
+    a.x0 < b.x1 && b.x0 < a.x1 && a.y0 < b.y1 && b.y0 < a.y1
+}
+
+/// Split a convex polygon at an occluder's edge. Boundary vertices belong to both halves,
+/// so independently clipped neighbours share precisely the same intersection positions.
+fn split(points: &[Point], a: Point, b: Point, epsilon: f64) -> (Vec<Point>, Vec<Point>) {
+    let edge = b - a;
+    let mut inside = vec![];
+    let mut outside = vec![];
+    for (p, q) in points.iter().zip(points.iter().cycle().skip(1)).take(points.len()) {
+        let dp = edge.cross(*p - a);
+        let dq = edge.cross(*q - a);
+        if dp >= 0.0 {
+            inside.push(*p);
+        }
+        if dp <= 0.0 {
+            outside.push(*p);
+        }
+        if (dp > 0.0 && dq < 0.0) || (dp < 0.0 && dq > 0.0) {
+            let intersection = p.lerp(*q, dp / (dp - dq));
+            inside.push(intersection);
+            outside.push(intersection);
+        }
+    }
+    (clean(inside, epsilon), clean(outside, epsilon))
+}
+
+fn subtract(points: Vec<Point>, cover: &Polygon, epsilon: f64, work: &mut usize) -> Result<Vec<Vec<Point>>, String> {
+    if !overlaps(bounds(&points), cover.bounds) {
+        return Ok(vec![points]);
+    }
+    let mut remaining = points;
+    let mut visible = vec![];
+    for (a, b) in cover.points.iter().zip(cover.points.iter().cycle().skip(1)).take(cover.points.len()) {
+        *work += remaining.len();
+        if *work > MAX_WORK {
+            return Err("Revolve visibility exceeds its geometry work limit".into());
+        }
+        let (inside, outside) = split(&remaining, *a, *b, epsilon);
+        if !outside.is_empty() {
+            visible.push(outside);
+        }
+        remaining = inside;
+        if remaining.is_empty() {
+            break;
+        }
+    }
+    Ok(visible)
+}
+
+struct Index {
+    cells: Vec<Vec<usize>>,
+    bounds: Rect,
+    refs: usize,
+}
+
+impl Index {
+    fn tiles(&self, b: Rect) -> impl Iterator<Item = usize> {
+        let cell = |v: f64, lo: f64, size: f64| (((v - lo) / size * GRID as f64).floor() as usize).min(GRID - 1);
+        let x0 = cell(b.x0, self.bounds.x0, self.bounds.width());
+        let x1 = cell(b.x1, self.bounds.x0, self.bounds.width());
+        let y0 = cell(b.y0, self.bounds.y0, self.bounds.height());
+        let y1 = cell(b.y1, self.bounds.y0, self.bounds.height());
+        (y0..=y1).flat_map(move |y| (x0..=x1).map(move |x| y * GRID + x))
+    }
+
+    fn insert(&mut self, b: Rect, face: usize) -> Result<(), String> {
+        let tiles: Vec<_> = self.tiles(b).collect();
+        self.refs += tiles.len();
+        if self.refs > MAX_GRID_REFS {
+            return Err("Revolve visibility exceeds its spatial index limit".into());
+        }
+        for tile in tiles {
+            if let Some(cell) = self.cells.get_mut(tile) {
+                cell.push(face);
+            }
+        }
+        Ok(())
+    }
+}
+
+/// Remove covered portions of opaque faces in back-to-front paint order. This follows the
+/// live evaluator's painter visibility, including its approximation for intersecting surfaces.
+/// Resource limits return an error; callers can retain the original complete surface safely.
+pub fn visible_faces(faces: &[Face]) -> Result<Vec<VisibleFace>, String> {
+    if faces.len() > MAX_FACES {
+        return Err("Too many Revolve faces for visibility evaluation".into());
+    }
+    if faces.iter().any(|f| {
+        f.points.len() > 4
+            || !f.brightness.is_finite()
+            || !f.depth.is_finite()
+            || f.points.iter().any(|p| !p.x.is_finite() || !p.y.is_finite() || p.x.abs().max(p.y.abs()) > 1e8)
+    }) {
+        return Err("Revolve visibility requires finite projected convex faces".into());
+    }
+    let all = faces.iter().flat_map(|f| &f.points).copied().collect::<Vec<_>>();
+    let total = bounds(&all);
+    if total.width() <= 0.0 || total.height() <= 0.0 {
+        return Ok(vec![]);
+    }
+    let epsilon = (total.width().max(total.height()) * 1e-10).clamp(1e-8, 1e-3);
+    let polygons: Vec<_> = faces
+        .iter()
+        .map(|f| {
+            let points = clean(f.points.clone(), epsilon);
+            Polygon { bounds: bounds(&points), points }
+        })
+        .collect();
+    // Generated quads are convex. Validate the public helper rather than accepting concave
+    // callers and silently deleting geometry they can see.
+    for p in &polygons {
+        if p.points.iter().enumerate().any(|(i, a)| {
+            let Some(b) = p.points.get((i + 1) % p.points.len()) else { return false };
+            let Some(c) = p.points.get((i + 2) % p.points.len()) else { return false };
+            (*b - *a).cross(*c - *b) < -epsilon * b.distance(*a).max(1.0)
+        }) {
+            return Err("Revolve visibility requires convex projected faces".into());
+        }
+    }
+    let mut index = Index { cells: vec![vec![]; GRID * GRID], bounds: total, refs: 0 };
+    let mut seen = vec![usize::MAX; faces.len()];
+    let (mut out, mut work, mut output_points) = (vec![], 0, 0);
+    for (source, (face, polygon)) in faces.iter().zip(&polygons).enumerate().rev() {
+        if polygon.points.is_empty() {
+            continue;
+        }
+        let mut fragments = vec![polygon.points.clone()];
+        'covers: for tile in index.tiles(polygon.bounds) {
+            for &candidate in index.cells.get(tile).into_iter().flatten() {
+                work += 1;
+                if work > MAX_WORK {
+                    return Err("Revolve visibility exceeds its geometry work limit".into());
+                }
+                if let Some(mark) = seen.get_mut(candidate)
+                    && *mark != source
+                {
+                    *mark = source;
+                    if let Some(cover) = polygons.get(candidate)
+                        && overlaps(polygon.bounds, cover.bounds)
+                    {
+                        let mut remaining = vec![];
+                        for fragment in fragments {
+                            remaining.extend(subtract(fragment, cover, epsilon, &mut work)?);
+                            if remaining.len() > MAX_FRAGMENTS {
+                                return Err("Revolve visibility creates too many fragments".into());
+                            }
+                        }
+                        fragments = remaining;
+                        if fragments.is_empty() {
+                            break 'covers;
+                        }
+                    }
+                }
+            }
+        }
+        if fragments.is_empty() {
+            continue;
+        }
+        output_points += fragments.iter().map(Vec::len).sum::<usize>();
+        if output_points > MAX_OUTPUT_POINTS {
+            return Err("Revolve visibility creates too many vector anchors".into());
+        }
+        let path = PathData::new(fragments.into_iter().map(|p| SubPath::polyline(&p, true)).collect());
+        out.push(VisibleFace { path, brightness: face.brightness, depth: face.depth });
+        // A completely covered face need not occupy the grid. Its coverage already belongs
+        // to nearer faces; this keeps repeated overlapping surfaces bounded in practice.
+        index.insert(polygon.bounds, source)?;
+    }
+    out.reverse();
+    Ok(out)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{Edge, Revolve, revolve};
+    use vectorcraft_geom::{BezPath, Shape};
+
+    fn face(rect: Rect, brightness: f64) -> Face {
+        Face {
+            points: vec![Point::new(rect.x0, rect.y0), Point::new(rect.x1, rect.y0), Point::new(rect.x1, rect.y1), Point::new(rect.x0, rect.y1)],
+            depth: brightness,
+            brightness,
+        }
+    }
+
+    #[test]
+    fn covered_faces_disappear_and_partial_faces_are_trimmed_in_paint_order() {
+        let faces =
+            vec![face(Rect::new(2.0, 2.0, 8.0, 8.0), 0.1), face(Rect::new(0.0, 0.0, 10.0, 10.0), 0.2), face(Rect::new(5.0, 0.0, 15.0, 10.0), 0.8)];
+        let visible = visible_faces(&faces).unwrap();
+        assert_eq!(visible.len(), 2);
+        assert_eq!(visible[0].brightness, 0.2);
+        assert_eq!(visible[0].path.bounds(), Some(Rect::new(0.0, 0.0, 5.0, 10.0)));
+        assert!((visible[0].path.to_bezpath().area() - 50.0).abs() < 1e-8);
+        assert!((visible[1].path.to_bezpath().area() - 100.0).abs() < 1e-8);
+        // Winding and equal depth do not determine visibility; actual paint order does.
+        let mut flipped = faces.clone();
+        for f in &mut flipped {
+            f.points.reverse();
+            f.depth = 0.0;
+        }
+        let other = visible_faces(&flipped).unwrap();
+        assert_eq!(visible.iter().map(|f| f.brightness).collect::<Vec<_>>(), other.iter().map(|f| f.brightness).collect::<Vec<_>>());
+        assert_eq!(visible[0].path.bounds(), other[0].path.bounds());
+    }
+
+    #[test]
+    fn an_interior_surface_remains_visible_through_an_opening() {
+        let faces = vec![
+            face(Rect::new(0.0, 0.0, 10.0, 10.0), 0.1),
+            face(Rect::new(0.0, 0.0, 10.0, 3.0), 0.2),
+            face(Rect::new(0.0, 7.0, 10.0, 10.0), 0.3),
+            face(Rect::new(0.0, 3.0, 3.0, 7.0), 0.4),
+            face(Rect::new(7.0, 3.0, 10.0, 7.0), 0.5),
+        ];
+        let visible = visible_faces(&faces).unwrap();
+        assert_eq!(visible[0].brightness, 0.1);
+        assert_eq!(visible[0].path.bounds(), Some(Rect::new(3.0, 3.0, 7.0, 7.0)));
+        assert_eq!(visible[0].path.to_bezpath().winding(Point::new(5.0, 5.0)), 1);
+        assert_eq!(visible[0].path.to_bezpath().winding(Point::new(1.0, 1.0)), 0);
+    }
+
+    #[test]
+    fn revolved_open_profiles_match_visible_paint_for_both_axis_sides_and_perspective() {
+        let mut bp = BezPath::new();
+        bp.move_to((40.0, 10.0));
+        bp.curve_to((75.0, 20.0), (75.0, 80.0), (40.0, 90.0));
+        let path = PathData::from_bezpath(&bp);
+        for edge in [Edge::Left, Edge::Right] {
+            for angle in [155.0, 360.0] {
+                let options = Revolve {
+                    edge,
+                    angle,
+                    offset: 8.0,
+                    segments: 32,
+                    rotation_x: -32.0,
+                    rotation_y: 24.0,
+                    rotation_z: 19.0,
+                    perspective: 0.7,
+                    ..Default::default()
+                };
+                let faces = revolve(&path, path.bounds().unwrap(), options).unwrap();
+                let visible = visible_faces(&faces).unwrap();
+                assert!(visible.len() <= faces.len());
+                let all: Vec<_> = faces.iter().map(|f| (f.path().to_bezpath(), f.brightness)).collect();
+                let cut: Vec<_> = visible.iter().map(|f| (f.path.to_bezpath(), f.brightness)).collect();
+                let b = bounds(&faces.iter().flat_map(|f| &f.points).copied().collect::<Vec<_>>());
+                for x in 0..48 {
+                    for y in 0..48 {
+                        let p = Point::new(b.x0 + b.width() * (x as f64 + 0.337) / 48.0, b.y0 + b.height() * (y as f64 + 0.413) / 48.0);
+                        let expected = all.iter().rev().find(|(bp, _)| bp.winding(p) != 0).map(|(_, value)| value);
+                        let actual = cut.iter().rev().find(|(bp, _)| bp.winding(p) != 0).map(|(_, value)| value);
+                        assert_eq!(actual, expected, "{edge:?}, {angle}, {p:?}");
+                        assert!(cut.iter().filter(|(bp, _)| bp.winding(p) != 0).count() <= 1, "expanded surfaces do not cover hidden regions");
+                    }
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn visibility_is_bounded_for_repeated_faces_and_rejects_invalid_input() {
+        let faces = vec![face(Rect::new(0.0, 0.0, 10.0, 10.0), 0.5); MAX_FACES];
+        assert_eq!(visible_faces(&faces).unwrap().len(), 1);
+        assert!(visible_faces(&vec![faces[0].clone(); MAX_FACES + 1]).is_err());
+        let mut bad = faces[0].clone();
+        bad.points[0].x = f64::NAN;
+        assert!(visible_faces(&[bad]).is_err());
+        assert!(visible_faces(&[]).unwrap().is_empty());
+    }
+}

crates/tools/src/cropimage.rs

@@ -232,9 +232,15 @@ impl Tool for CropImageTool {
         if key != "rect" {
             return;
         }
-        let n: Vec<f64> = value.as_array().map(|v| v.iter().filter_map(Value::as_f64).filter(|n| n.is_finite()).collect()).unwrap_or_default();
-        self.rect = match n.as_slice() {
-            [x, y, w, h] => Some((None, Rect::new(*x, *y, x + w, y + h))),
+        // Invalid components must discard the whole box, not silently shift the
+        // coordinates by dropping a non-numeric entry.
+        let numbers = value
+            .as_array()
+            .filter(|a| a.len() == 4)
+            .and_then(|a| a.iter().map(Value::as_f64).collect::<Option<Vec<_>>>())
+            .filter(|a| a.iter().all(|n| n.is_finite()));
+        self.rect = match numbers.as_deref() {
+            Some([x, y, w, h]) => Some((None, Rect::new(*x, *y, x + w, y + h))),
             _ => None,
         };
     }
@@ -336,6 +342,17 @@ mod tests {
         assert!(t.overlays(&cx).is_empty() && !t.claims_key(&cx, ToolKey::Enter));
     }
 
+    #[test]
+    fn crop_box_option_requires_exactly_four_finite_numeric_values() {
+        let mut tool = CropImageTool::default();
+        for invalid in [json!([10, "ignored", 20, 30, 40]), json!([10, 20, 30, null, 40]), json!([10, 20, 30, 40, 50]), json!("not a rectangle")] {
+            tool.set_option("rect", &invalid);
+            assert!(tool.options().get("rect").is_none(), "invalid box should reset crop: {invalid}");
+        }
+        tool.set_option("rect", &json!([10, 20, 30, 40]));
+        assert_eq!(tool.options()["rect"], json!([10.0, 20.0, 30.0, 40.0]));
+    }
+
     #[test]
     fn the_tool_is_made_by_its_id() {
         assert_eq!(crate::create(ID).id(), ID);

crates/ui-egui/Cargo.toml

@@ -19,6 +19,7 @@ vectorcraft-tools = { workspace = true }
 vectorcraft-engine = { workspace = true }
 vectorcraft-svg = { workspace = true }
 vectorcraft-effects = { workspace = true }
+vectorcraft-three-d = { workspace = true }
 vectorcraft-plugins = { workspace = true }
 vectorcraft-pdf = { workspace = true }
 vectorcraft-cad = { workspace = true }

crates/ui-egui/src/brand.rs

@@ -1,6 +1,6 @@
 //! The VectorCraft brand mark: the app icon (the engraved dragon, `assets/app-icon/`, see its
 //! README). The PNG carries the icon's rounded corners; it is decoded once per context into a
-//! mipmapped texture, so it stays crisp from the 22 pt app-bar mark to the About box.
+//! mipmapped texture, so it stays crisp from the 18 pt app-bar mark to the About box.
 
 use egui::{Color32, Context, Id, Rect, TextureHandle, TextureOptions, Ui, pos2};
 
@@ -36,6 +36,12 @@ pub fn paint_mark(ui: &Ui, r: Rect) {
     ui.painter().image(texture(ui.ctx()).id(), r, uv, Color32::WHITE);
 }
 
+/// The mark's texture id (tests: find the painted marks among the shapes).
+#[cfg(test)]
+pub fn texture_id(ctx: &Context) -> egui::TextureId {
+    texture(ctx).id()
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -55,6 +61,9 @@ mod tests {
         let ctx = Context::default();
         crate::theme::install_fonts(&ctx);
         let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        // The system title bar hides the in-app mark (the OS draws its own icon), so paint the
+        // app-drawn bar here.
+        app.custom_titlebar = true;
         let mut frame = || {
             let mut out = ctx.run_ui(egui::RawInput::default(), |ui| crate::chrome::app_bar(&mut app, ui));
             let uploads = out.textures_delta.set.values().flat_map(|d| d.iter()).filter(|d| d.image.size() == [128, 128]).count();
@@ -72,7 +81,7 @@ mod tests {
         let (uploads, marks) = frame();
         assert_eq!(uploads, 1);
         assert_eq!(marks.len(), 1);
-        assert_eq!(marks[0].size(), egui::vec2(22.0, 22.0));
+        assert_eq!(marks[0].size(), egui::vec2(18.0, 18.0));
         // Later frames reuse the texture.
         let (uploads, marks) = frame();
         assert_eq!((uploads, marks.len()), (0, 1));

crates/ui-egui/src/canvas.rs

@@ -175,7 +175,10 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     let resp = ui.interact(rect, egui::Id::new("canvas"), Sense::click_and_drag());
     // A press on the canvas while the context menu is open only closes it (a drag too, which egui
     // alone would leave open); the tool doesn't get it.
-    if resp.context_menu_opened() && resp.hovered() && ui.input(|i| i.pointer.any_pressed()) {
+    if app.ui.dialog.as_ref().is_some_and(crate::dialogs::revolve_gizmo::active) {
+        // The artboard's 3D gizmo owns these gestures while its options are open.
+        // Do not let a ring drag also move or deselect the editable source path.
+    } else if resp.context_menu_opened() && resp.hovered() && ui.input(|i| i.pointer.any_pressed()) {
         egui::Popup::close_all(ui.ctx());
     } else {
         handle_input(app, ui, &resp, rect);
@@ -401,7 +404,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     }
 
     // Selection visuals and tool overlays.
-    if app.ui.view.edges {
+    let revolve_edit = app.ui.dialog.as_ref().is_some_and(crate::dialogs::revolve_gizmo::active);
+    if app.ui.view.edges && !revolve_edit {
         hover_highlight(app, &painter, &xf);
         selection_overlay(app, &painter, &xf);
         if app.ui.view.text_threads {
@@ -413,7 +417,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     }
     let view_info = app.view_info();
     // View → Hide Gradient Annotator hides the Gradient tool's annotator.
-    if app.session.tool_id() != "gradient" || app.ui.view.gradient_annotator {
+    if !revolve_edit && (app.session.tool_id() != "gradient" || app.ui.view.gradient_annotator) {
         let overlays = app.session.overlays(view_info);
         draw_overlays(&painter, &xf, &overlays, &t, HandleLook::of(&app.session.prefs));
     }
@@ -423,7 +427,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     if app.ui.view.rulers && app.ui.screen_mode < 3 {
         rulers(ui, full, &xf, app.hover_doc, app.session.general_unit(), &t);
     }
-    if app.ui.task_bar && !app.session.tool_busy() && app.ui.screen_mode < 3 {
+    if app.ui.task_bar && !revolve_edit && !app.session.tool_busy() && app.ui.screen_mode < 3 {
         task_bar(app, ui, &xf);
     }
     if app.ui.screen_mode < 3 {

crates/ui-egui/src/chrome.rs

@@ -2,7 +2,7 @@
 
 use std::borrow::Cow;
 
-use egui::{CornerRadius, Sense, Stroke, StrokeKind, Ui, vec2};
+use egui::{CornerRadius, Sense, Stroke, Ui, vec2};
 use serde_json::json;
 use vectorcraft_doc::NodeKind;
 
@@ -12,25 +12,37 @@ use crate::theme::{self, Tokens};
 use crate::widgets;
 use crate::{VectorcraftApp, icons, menus, titlebar};
 
+/// The application bar's height, in points (compact, as in PhotoCraft).
+pub const APP_BAR_HEIGHT: f32 = 32.0;
+/// The brand mark's side.
+const MARK: f32 = 18.0;
+/// Height of the workspace switcher.
+const WIDGET_H: f32 = 22.0;
+
 /// The application bar: brand mark, Home, menus, then Discord, search and the workspace switcher
 /// at the right. With [`VectorcraftApp::custom_titlebar`] it is also the window's title bar
 /// ([`titlebar`]): the caption buttons take the right end and the rest of the bar drags the window.
+/// With the system title bar (Windows and Linux, `system_title_bar`) the OS draws its own icon and
+/// title, so the in-app bar shows Home, menus and workspace controls only: no brand mark.
 pub fn app_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
     let custom = app.custom_titlebar;
-    let left = if app.integrated_titlebar { 78 } else { 8 };
+    let system = system_title_bar(app);
+    let left = app.titlebar_inset.clamp(8.0, f32::from(i8::MAX)) as i8;
     let frame = egui::Frame::NONE.fill(t.app_bar).inner_margin(egui::Margin { left, right: if custom { 0 } else { 14 }, top: 0, bottom: 0 });
-    let bar = egui::Panel::top("app_bar").exact_size(44.0).frame(frame.stroke(Stroke::new(1.0, t.border))).show(ui, |ui| {
+    let bar = egui::Panel::top("app_bar").exact_size(APP_BAR_HEIGHT).frame(frame.stroke(Stroke::new(1.0, t.border))).show(ui, |ui| {
         if custom {
             titlebar::drag_area(ui, ui.max_rect());
         }
         ui.horizontal_centered(|ui| {
-            // Brand mark: the app icon.
-            let (r, _) = ui.allocate_exact_size(vec2(22.0, 22.0), Sense::hover());
-            crate::brand::paint_mark(ui, r);
-            ui.add_space(4.0);
+            // With the system title bar the OS draws its own icon: no in-app brand mark.
+            if !system {
+                let (r, _) = ui.allocate_exact_size(vec2(MARK, MARK), Sense::hover());
+                crate::brand::paint_mark(ui, r);
+                ui.add_space(6.0);
+            }
             let on_home = menus::home_showing(app);
-            if widgets::icon_button(ui, "house", tl!("Home"), on_home, 24.0).clicked() {
+            if widgets::icon_button(ui, "house", tl!("Home"), on_home, 20.0).clicked() {
                 app.run("app.home", json!({})).ok();
             }
             ui.add_space(2.0);
@@ -43,8 +55,8 @@ pub fn app_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
                 menus::menu_bar(app, ui)
             };
             // The right-side group fills the space after the menus from the right; when it runs
-            // short, Discord goes first (it is also under Help), then the search box becomes an
-            // icon, then the workspace switcher narrows.
+            // short, Discord goes first (it is also under Help), then the search icon (the palette
+            // stays under its shortcut), then the workspace switcher narrows.
             let full = ui.max_rect();
             let right_edge = if custom { full.right() - titlebar::WIDTH - 10.0 } else { full.right() };
             let right = egui::Rect::from_min_max(egui::pos2(menus_end + 8.0, full.top()), egui::pos2(right_edge, full.bottom()));
@@ -55,45 +67,31 @@ pub fn app_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
             let ws = ui.painter().layout_no_wrap(ws_name, egui::FontId::proportional(12.0), t.text);
             let ws_w = (ws.size().x + 36.0).clamp(112.0, 190.0);
             let gap = ui.spacing().item_spacing.x;
-            let with_search = ws_w + 8.0 + gap + 200.0;
-            let search_full = room >= with_search;
-            let discord = room >= with_search + 10.0 + gap + crate::community::discord_width(ui, false);
-            let ws_w = if search_full { ws_w } else { ws_w.min(room - 8.0 - gap - 24.0).max(64.0) };
+            // The search icon, as in PhotoCraft: shown while a minimal switcher fits beside it.
+            let icon = 28.0;
+            let search = room >= 64.0 + 8.0 + gap + icon;
+            let ws_w = ws_w.min(room - 8.0 - gap - if search { icon } else { 0.0 }).max(64.0);
+            let discord = search && room >= ws_w + 8.0 + gap + icon + 10.0 + gap + crate::community::discord_width(ui, false);
             let mut rui = ui.new_child(egui::UiBuilder::new().max_rect(right).layout(egui::Layout::right_to_left(egui::Align::Center)));
             let ui = &mut rui;
             // Workspace switcher: shows the current workspace, opens Window → Workspace.
-            let (wr, wresp) = ui.allocate_exact_size(vec2(ws_w, 24.0), Sense::click());
+            let (wr, wresp) = ui.allocate_exact_size(vec2(ws_w, WIDGET_H), Sense::click());
             ui.painter().rect_filled(wr, CornerRadius::same(4), if wresp.hovered() { t.hover } else { t.panel });
             ui.painter().with_clip_rect(wr.shrink2(vec2(4.0, 0.0))).galley(wr.left_center() + vec2(10.0, -ws.size().y / 2.0), ws, t.text);
             icons::paint(ui, "chevron-down", egui::Rect::from_center_size(wr.right_center() - vec2(12.0, 0.0), vec2(12.0, 12.0)), t.text_dim);
             let wresp = wresp.on_hover_text(tl!("Switch workspace"));
             egui::Popup::menu(&wresp).show(|ui| crate::workspaces::popup(app, ui));
             ui.add_space(8.0);
-            // Search box → command palette.
-            let open_palette = if search_full {
-                let (r, resp) = ui.allocate_exact_size(vec2(200.0, 24.0), Sense::click());
-                ui.painter().rect_filled(r, CornerRadius::same(12), t.input);
-                ui.painter().rect_stroke(
-                    r,
-                    CornerRadius::same(12),
-                    Stroke::new(1.0, if resp.hovered() { t.input_border } else { t.divider }),
-                    StrokeKind::Inside,
-                );
-                icons::paint(ui, "search", egui::Rect::from_center_size(r.left_center() + vec2(14.0, 0.0), vec2(13.0, 13.0)), t.text_dim);
-                ui.painter().text(
-                    r.left_center() + vec2(26.0, 0.0),
-                    egui::Align2::LEFT_CENTER,
-                    tl!("Search commands and tools"),
-                    egui::FontId::proportional(11.5),
-                    t.text_dim,
-                );
-                resp.clicked()
-            } else {
-                widgets::icon_button(ui, "search", tl!("Search commands and tools"), false, 24.0).clicked()
-            };
-            if open_palette {
-                app.ui.palette_open = true;
-                app.ui.palette_query.clear();
+            // Search → command palette (its shortcut opens it too).
+            if search {
+                let tip = match menus::shortcut_of("help.commandPalette") {
+                    Some(sc) => format!("{}  ({})", tl!("Search commands and tools"), menus::pretty_shortcut(sc)),
+                    None => tl!("Search commands and tools").to_string(),
+                };
+                if widgets::icon_button(ui, "search", &tip, app.ui.palette_open, icon).clicked() {
+                    app.ui.palette_open = !app.ui.palette_open;
+                    app.ui.palette_query.clear();
+                }
             }
             if discord {
                 ui.add_space(10.0);
@@ -106,6 +104,38 @@ pub fn app_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
     }
 }
 
+/// Whether the window shows the system's title bar instead of the app drawing its own: Windows
+/// and Linux with Preferences › User Interface › System Title Bar. macOS always has system
+/// decorations, but keeps the in-app brand mark, so it never counts as system mode here; nor
+/// does the web build (the browser tab has no document title), nor an embedder that never
+/// turned the preference on.
+pub fn system_title_bar(app: &VectorcraftApp) -> bool {
+    !app.custom_titlebar && app.session.prefs.system_title_bar && !cfg!(any(target_os = "macos", target_arch = "wasm32"))
+}
+
+/// The OS window title: the active document's name suffixed with the app name (a `*` prefix
+/// marks unsaved changes, like the `*` in the document tabs), or just the app name with no
+/// document open.
+pub fn window_title(app: &VectorcraftApp) -> String {
+    app.session
+        .active()
+        .map(|d| format!("{}{} \u{2014} VectorCraft", if d.is_dirty() { "*" } else { "" }, d.title()))
+        .unwrap_or_else(|| "VectorCraft".into())
+}
+
+/// Keep the OS window title (and the taskbar / Alt-Tab entry) on the active file. Sends
+/// `ViewportCommand::Title` only when the title changed since the last frame.
+pub fn sync_window_title(app: &mut VectorcraftApp, ctx: &egui::Context) {
+    let want = window_title(app);
+    if app.last_window_title != want {
+        app.last_window_title = want.clone();
+        ctx.send_viewport_cmd(egui::ViewportCommand::Title(want));
+        // One more frame: a new title makes AppKit lay its title bar out again, putting the window
+        // buttons back where it keeps them until the next frame centres them on the bar (#968).
+        ctx.request_repaint();
+    }
+}
+
 /// An anchor button: icon, tooltip, command and the convert command's `to`.
 type AnchorButton<'a> = (&'a str, &'a str, &'a str, Option<&'a str>);
 
@@ -779,10 +809,14 @@ pub fn hint_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
                 ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, "?", theme::semibold(11.0), t.text);
                 ui.add_space(6.0);
                 let mut job = egui::text::LayoutJob::default();
-                let tool = app.session.tool_id();
-                // The Zoom tool's drag zooms to an area, or with Animated Zoom zooms as it goes.
-                let hint = if tool == "zoom" && crate::canvas::animated_zoom(&app.session.prefs) { ANIMATED_ZOOM_HINT } else { tool };
-                for (txt, bold) in hint_segments(hint) {
+                let segments = if let Some(d) = app.ui.dialog.as_ref().filter(|d| crate::dialogs::revolve_gizmo::active(d)) {
+                    vec![(crate::dialogs::revolve_gizmo::hint(d).into(), false)]
+                } else {
+                    let tool = app.session.tool_id();
+                    let hint = if tool == "zoom" && crate::canvas::animated_zoom(&app.session.prefs) { ANIMATED_ZOOM_HINT } else { tool };
+                    hint_segments(hint)
+                };
+                for (txt, bold) in segments {
                     let font = if bold { theme::semibold(12.5) } else { egui::FontId::proportional(12.5) };
                     job.append(&txt, 0.0, egui::TextFormat { font_id: font, color: if bold { t.text_strong } else { t.text }, ..Default::default() });
                 }
@@ -962,4 +996,81 @@ mod tests {
         let off = hint(&mut app);
         assert!(off.contains(" to zoom into an area") && !off.contains("Hold"), "{off}");
     }
+
+    fn title_test_app(custom_titlebar: bool) -> crate::VectorcraftApp {
+        let mut app = crate::VectorcraftApp::new(Session::new(), Default::default());
+        app.custom_titlebar = custom_titlebar;
+        // The preference that makes the shell launch without its own title bar.
+        app.run("prefs.set", json!({"key": "systemTitleBar", "value": !custom_titlebar})).unwrap();
+        app
+    }
+
+    #[test]
+    fn without_the_preference_the_mark_stays() {
+        // The default (e.g. the web build): no custom bar, no preference.
+        let app = crate::VectorcraftApp::new(Session::new(), Default::default());
+        assert!(!super::system_title_bar(&app));
+    }
+
+    #[test]
+    fn window_title_with_no_document_is_the_app_name() {
+        assert_eq!(super::window_title(&title_test_app(true)), "VectorCraft");
+    }
+
+    #[test]
+    fn window_title_follows_the_active_file() {
+        let mut app = title_test_app(true);
+        app.run("file.new", json!({"width": 100, "height": 100, "name": "foo.svg"})).unwrap();
+        assert_eq!(super::window_title(&app), "foo.svg \u{2014} VectorCraft");
+        // Unsaved changes gain a `*` prefix, like the `*` in the document tabs.
+        app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap();
+        assert_eq!(super::window_title(&app), "*foo.svg \u{2014} VectorCraft");
+    }
+
+    #[test]
+    fn system_mode_hides_the_mark() {
+        for custom in [true, false] {
+            let mut app = title_test_app(custom);
+            app.run("file.new", json!({"width": 100, "height": 100, "name": "foo.svg"})).unwrap();
+            let ctx = egui::Context::default();
+            crate::theme::install_fonts(&ctx);
+            let mut out = ctx.run_ui(egui::RawInput::default(), |ui| super::app_bar(&mut app, ui));
+            let uploads = out.textures_delta.set.values().flat_map(|d| d.iter()).filter(|d| d.image.size() == [128, 128]).count();
+            out.textures_delta.clear();
+            let marks: Vec<egui::Rect> = out
+                .shapes
+                .iter()
+                .filter_map(|c| match &c.shape {
+                    egui::Shape::Mesh(m) if m.texture_id == crate::brand::texture_id(&ctx) => Some(m.calc_bounds()),
+                    _ => None,
+                })
+                .collect();
+            let system = super::system_title_bar(&app);
+            assert_eq!(system, !custom && !cfg!(target_os = "macos"));
+            assert_eq!(marks.is_empty(), system, "mark in system mode (custom={custom})");
+            assert_eq!(uploads, if system { 0 } else { 1 }, "mark texture in system mode (custom={custom})");
+        }
+    }
+
+    #[test]
+    fn sync_window_title_sends_only_on_change() {
+        let mut app = title_test_app(true);
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        super::sync_window_title(&mut app, &ctx);
+        assert_eq!(app.last_window_title, "VectorCraft");
+        let mut out = ctx.run_ui(egui::RawInput::default(), |_| {});
+        out.textures_delta.clear();
+        let cmds = out.viewport_output.remove(&egui::ViewportId::ROOT).map(|v| v.commands).unwrap_or_default();
+        assert!(cmds.iter().any(|c| matches!(c, egui::ViewportCommand::Title(t) if t == "VectorCraft")), "{cmds:?}");
+        // Same document state again: the cached title stops a repeat command.
+        super::sync_window_title(&mut app, &ctx);
+        let mut out = ctx.run_ui(egui::RawInput::default(), |_| {});
+        out.textures_delta.clear();
+        let cmds = out.viewport_output.remove(&egui::ViewportId::ROOT).map(|v| v.commands).unwrap_or_default();
+        assert!(!cmds.iter().any(|c| matches!(c, egui::ViewportCommand::Title(_))), "repeat Title: {cmds:?}");
+        app.run("file.new", json!({"width": 100, "height": 100, "name": "foo.svg"})).unwrap();
+        super::sync_window_title(&mut app, &ctx);
+        assert_eq!(app.last_window_title, "foo.svg \u{2014} VectorCraft");
+    }
 }

crates/ui-egui/src/control.rs

@@ -16,8 +16,8 @@
 //! - `ui.dialog.set {field, value}` / `ui.dialog.confirm` / `ui.dialog.cancel`
 //! - `ui.resize {width, height}`, `ui.focus`, `ui.screenshot {path?, data?}` (`data: true`: the PNG
 //!   comes back as `pngBase64` as well)
-//! - `ui.render {path?, scale?, data?}`: render the active artboard headlessly (PNG; without a path,
-//!   or with `data: true`, as `pngBase64`)
+//! - `ui.render {path?, scale?, artboard?, data?}`: render an artboard headlessly (`artboard`: its
+//!   0-based index, default the first; PNG; without a path, or with `data: true`, as `pngBase64`)
 //! - `app.open {path}` (any readable format) / `app.save {path?, svg?: {…SVG options}}` / `app.quit`
 //!   (`file.close`, `file.closeAll` and `app.quit` first open a `saveChanges` dialog for each
 //!   modified document: `ui.dialog.confirm` saves, set `discard: true` then confirm to discard)
@@ -321,7 +321,9 @@ pub fn handle(app: &mut VectorcraftApp, ctx: &egui::Context, req: &ControlReques
         "ui.render" => {
             let Some(st) = app.session.active() else { return err("no document") };
             let doc = st.doc.clone();
-            let Some(r) = doc.artboards.first().map(|a| a.rect) else { return err("no artboard") };
+            // The artboard asked for (0-based, as headless), else the first.
+            let index = p.get("artboard").and_then(Value::as_u64).map_or(Some(0), |i| usize::try_from(i).ok());
+            let Some(r) = index.and_then(|i| doc.artboards.get(i)).map(|a| a.rect) else { return err("no such artboard") };
             let scale = p.get("scale").and_then(Value::as_f64).unwrap_or(1.0);
             if let Err(e) = vectorcraft_render::raster_size(r, scale) {
                 return err(e);
@@ -390,3 +392,42 @@ pub fn save_screenshot(app: &mut VectorcraftApp, image: &egui::ColorImage, path:
         None => json!({"ok": false, "error": "no writer configured"}),
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use serde_json::{Value, json};
+    use vectorcraft_engine::Session;
+
+    use super::ControlRequest;
+    use crate::{Services, VectorcraftApp};
+
+    /// #1004: `ui.render` (the MCP `screenshot` of a connected app) renders the artboard asked
+    /// for, at the scale asked for; the first without one.
+    #[test]
+    fn render_takes_the_artboard_asked_for() {
+        let (tx, rx) = std::sync::mpsc::channel();
+        let mut app = VectorcraftApp::new(Session::new(), Services::default()).with_control(rx);
+        let mut request = |method: &str, params: Value| {
+            let (req, reply) = ControlRequest::new(method, params);
+            tx.send(req).unwrap();
+            app.drain_control(&egui::Context::default());
+            reply.try_recv().unwrap()
+        };
+        let new = json!({"width": 64, "height": 64, "units": "Points", "artboards": 2});
+        request("engine.execute", json!({"command": "file.new", "params": new}));
+        let board = json!({"index": 1, "x": 100, "y": 0, "width": 96, "height": 48});
+        let r = request("engine.execute", json!({"command": "artboard.setProps", "params": board}));
+        assert_eq!(r["ok"], true, "{r}");
+        for (params, size) in [
+            (json!({}), [64, 64]),
+            (json!({"artboard": 0}), [64, 64]),
+            (json!({"artboard": 1}), [96, 48]),
+            (json!({"artboard": 1, "scale": 0.5}), [48, 24]),
+        ] {
+            let r = request("ui.render", params.clone());
+            let got = [&r["result"]["width"], &r["result"]["height"]].map(Value::as_u64);
+            assert_eq!(got, size.map(Some), "{params}: {r}");
+        }
+        assert!(request("ui.render", json!({"artboard": 2}))["error"].is_string());
+    }
+}

crates/ui-egui/src/credits.rs

@@ -7,6 +7,8 @@ use std::cmp::Ordering;
 
 use egui::RichText;
 
+use crate::VectorcraftApp;
+
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct Contributor {
     pub login: &'static str,
@@ -214,7 +216,7 @@ impl Default for View {
 }
 
 /// About ▸ Contributors: a name toggle, a sort, and the list as a grab bag or a table.
-pub fn contributors_ui(ui: &mut egui::Ui) {
+pub fn contributors_ui(app: &mut VectorcraftApp, ui: &mut egui::Ui) {
     let id = egui::Id::new("credits_view");
     let mut v = ui.data_mut(|d| d.get_temp::<View>(id)).unwrap_or_default();
     ui.horizontal_wrapped(|ui| {
@@ -254,14 +256,14 @@ pub fn contributors_ui(ui: &mut egui::Ui) {
         if list.is_empty() {
             ui.label(tl!("No contributor data was built into this copy."));
         } else if v.table {
-            table(ui, &list, &mut v);
+            table(app, ui, &list, &mut v);
         } else {
             ui.horizontal_wrapped(|ui| {
                 for (i, c) in list.iter().enumerate() {
                     if i > 0 {
                         ui.label(RichText::new("·").weak());
                     }
-                    ui.hyperlink_to(c.name(v.names), format!("https://github.com/{}", c.login)).on_hover_text(c.summary());
+                    link(app, ui, c, v.names);
                 }
             });
         }
@@ -269,7 +271,16 @@ pub fn contributors_ui(ui: &mut egui::Ui) {
     ui.data_mut(|d| d.insert_temp(id, v));
 }
 
-fn table(ui: &mut egui::Ui, list: &[&Contributor], v: &mut View) {
+fn link(app: &mut VectorcraftApp, ui: &mut egui::Ui, c: &Contributor, names: NameMode) -> egui::Response {
+    let url = format!("https://github.com/{}", c.login);
+    let r = ui.add(egui::Link::new(c.name(names))).on_hover_text(c.summary());
+    if r.clicked() {
+        app.open_url(&url);
+    }
+    r
+}
+
+fn table(app: &mut VectorcraftApp, ui: &mut egui::Ui, list: &[&Contributor], v: &mut View) {
     egui::Grid::new("credits_table").striped(true).num_columns(SortKey::ALL.len()).show(ui, |ui| {
         for k in SortKey::ALL {
             let arrow = if v.key == k { if v.ascending { " ▲" } else { " ▼" } } else { "" };
@@ -284,7 +295,7 @@ fn table(ui: &mut egui::Ui, list: &[&Contributor], v: &mut View) {
         }
         ui.end_row();
         for c in list {
-            ui.hyperlink_to(c.name(v.names), format!("https://github.com/{}", c.login)).on_hover_text(c.summary());
+            link(app, ui, c, v.names);
             ui.label(group(c.prs));
             ui.label(group(c.commits));
             ui.label(group(c.lines_added));

crates/ui-egui/src/dialogs/about.rs

@@ -33,7 +33,7 @@ pub(super) fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
             match tab {
                 1 => {
                     ui.set_width(660.0);
-                    crate::credits::contributors_ui(ui);
+                    crate::credits::contributors_ui(app, ui);
                 }
                 2 => {
                     ui.set_width(660.0);

crates/ui-egui/src/dialogs/command.rs

@@ -40,6 +40,8 @@ fn choices(command: &str, key: &str) -> Option<form::Choices> {
         ("text.areaOptions", "fit") => Some(AREA_FIT),
         ("text.areaOptions", "firstBaseline") => Some(FIRST_BASELINE),
         ("text.areaOptions", "verticalAlign") => Some(VERTICAL_ALIGN),
+        ("graph.setType", "valueAxis") => Some(GRAPH_VALUE_AXIS),
+        ("graph.setType", "tickLength" | "rightTickLength" | "categoryTickLength") => Some(GRAPH_TICK_LENGTH),
         _ => None,
     }
 }
@@ -57,6 +59,12 @@ const FIRST_BASELINE: form::Choices =
 /// Area Type Options › Align (vertical alignment of the lines in each row/column).
 const VERTICAL_ALIGN: form::Choices = &[("Top", "top"), ("Center", "center"), ("Bottom", "bottom"), ("Justify", "justify")];
 
+/// Graph Type › Value Axis (series picked on both axes show none, and OK leaves each where it is).
+const GRAPH_VALUE_AXIS: form::Choices = &[("On Left Side", "left"), ("On Right Side", "right"), ("On Both Sides", "both")];
+
+/// Graph Type › Tick Marks › Length.
+const GRAPH_TICK_LENGTH: form::Choices = &[("None", "none"), ("Short", "short"), ("Full Width", "full")];
+
 /// Closes before running, so a dialog the command opens stays open.
 fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
     let cmd = d.str("__command");
@@ -113,4 +121,21 @@ mod tests {
         let NodeKind::Text(t) = &app.session.doc().unwrap().doc.node(vectorcraft_doc::NodeId(id)).unwrap().kind else { panic!("text") };
         assert_eq!(t.area.vertical_align, VerticalAlign::Center);
     }
+
+    /// Graph Type › Value Axis is a dropdown of the values `graph.setType` takes, and OK puts the
+    /// value axis on the side picked.
+    #[test]
+    fn graph_type_value_axis_is_a_dropdown_of_its_sides() {
+        let doc = vectorcraft_engine::find_command("graph.setType").unwrap().params;
+        let values: Vec<&str> = choices("graph.setType", "valueAxis").unwrap().iter().map(|(_, v)| *v).collect();
+        assert!(doc.contains(&format!("valueAxis?: {}", values.join("|"))), "{values:?}");
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width": 400, "height": 400})).unwrap();
+        app.run("graph.create", json!({"type": "column", "x": 0, "y": 0, "width": 200, "height": 150})).unwrap();
+        crate::menus::graph_dialog(&mut app, "graph.setType").unwrap();
+        assert_eq!(app.ui.dialog.as_ref().unwrap().str("valueAxis"), "left");
+        app.ui.dialog.as_mut().unwrap().fields.insert("valueAxis".into(), json!("both"));
+        crate::dialogs::confirm(&mut app).unwrap();
+        assert_eq!(app.session.execute("graph.setType", &json!({})).unwrap()["valueAxis"], "both");
+    }
 }

crates/ui-egui/src/dialogs/effect.rs

@@ -127,6 +127,12 @@ fn confirm_exists(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String>
 
 fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
     let (id, relative) = (d.str("__effect"), d.bool("relative"));
+    if id == vectorcraft_effects::REVOLVE {
+        super::revolve::body(app, ui, d);
+        let (cmd, params) = command(d);
+        form::preview(app, ui, d, &d.str("__label"), cmd, params);
+        return false;
+    }
     // Plug-in effects get fields from their parameter schema; colour adjustments their sliders.
     let changed = match vectorcraft_plugins::effect::installed(&id) {
         Some(plugin) => form::schema_fields(ui, d, &plugin.manifest().params),
@@ -159,9 +165,15 @@ fn choices(effect: &str, key: &str) -> Option<form::Choices> {
         ("blur.radial", "method") => Some(&[("Spin", "spin"), ("Zoom", "zoom")]),
         ("blur.radial", "quality") => Some(&[("Draft", "draft"), ("Good", "good"), ("Best", "best")]),
         ("blur.smart", "quality") => Some(&[("Low", "low"), ("Medium", "medium"), ("High", "high")]),
+        ("brushStrokes.sprayedStrokes", "strokeDirection") => Some(&vectorcraft_effects::pixel::STROKE_DIRECTIONS),
+        ("distort.glass", "texture") => Some(&vectorcraft_effects::pixel::GLASS_TEXTURES),
         ("pixelate.mezzotint", "type") => Some(&vectorcraft_effects::pixel::MEZZOTINT_TYPES),
+        ("texture.grain", "grainType") => Some(&vectorcraft_effects::pixel::GRAIN_TYPES),
+        ("texture.texturizer", "texture") => Some(&vectorcraft_effects::pixel::TEXTURES),
+        ("texture.texturizer", "lightDirection") => Some(&vectorcraft_effects::pixel::LIGHT_DIRECTIONS),
         ("video.deinterlace", "eliminate") => Some(&[("Odd Fields", "odd"), ("Even Fields", "even")]),
         ("video.deinterlace", "create") => Some(&[("Duplication", "duplication"), ("Interpolation", "interpolation")]),
+        ("stylize.innerGlow", "source") => Some(&[("Center", "center"), ("Edge", "edge")]),
         ("path.offsetPath", "joins") => Some(&[("Miter", "miter"), ("Round", "round"), ("Bevel", "bevel")]),
         ("distort.roughen" | "distort.zigZag", "points") => Some(&[("Smooth", "smooth"), ("Corner", "corner")]),
         _ => None,
@@ -415,7 +427,9 @@ mod tests {
     #[test]
     fn fields_that_pick_a_value_are_dropdowns_of_its_values() {
         // The values come from the effect's parameter documentation (`joins: "miter"|"round"|…`).
-        for (effect, key) in [("path.offsetPath", "joins"), ("distort.zigZag", "points"), ("distort.roughen", "points")] {
+        for (effect, key) in
+            [("path.offsetPath", "joins"), ("distort.zigZag", "points"), ("distort.roughen", "points"), ("stylize.innerGlow", "source")]
+        {
             let doc = vectorcraft_effects::effect_info(effect).unwrap().params;
             let listed = doc.split(&format!("{key}: ")).nth(1).unwrap().split([',', '}', ' ']).next().unwrap().to_string();
             let values: Vec<String> = choices(effect, key).unwrap().iter().map(|(_, v)| format!("\"{v}\"")).collect();

crates/ui-egui/src/dialogs/form.rs

@@ -232,10 +232,13 @@ pub(super) fn param_fields(
                 continue;
             }
             if let Some(options) = choices(&k) {
+                // In the "effect" context: some languages read the plain Soft, Horizontal and
+                // Vertical (Grain's types) as type settings.
+                let shown = |label: &'static str| crate::i18n::tr_ctx(crate::i18n::current(), "effect", label);
                 let cur = v.as_str().unwrap_or_default();
-                let label = options.iter().find(|(_, value)| *value == cur).map_or(cur, |(l, _)| *l);
-                let labels: Vec<&str> = options.iter().map(|(l, _)| *l).collect();
-                if let Some((_, value)) = crate::widgets::dropdown(ui, ("fx-choice", &k), label, &labels, 140.0).and_then(|i| options.get(i)) {
+                let label = options.iter().find(|(_, value)| *value == cur).map_or(cur, |(l, _)| shown(l));
+                let labels: Vec<&str> = options.iter().map(|(l, _)| shown(l)).collect();
+                if let Some((_, value)) = crate::widgets::dropdown_names(ui, ("fx-choice", &k), label, &labels, 140.0).and_then(|i| options.get(i)) {
                     d.fields.insert(k, json!(value));
                     changed = true;
                 }
@@ -245,7 +248,7 @@ pub(super) fn param_fields(
             match v {
                 Value::Number(n) => {
                     if let Some(x) = crate::widgets::plain_field(ui, ("fx-num", &k), n.as_f64().unwrap_or(0.0), "", 3, 140.0) {
-                        d.fields.insert(k, json!(x));
+                        d.fields.insert(k, typed_number(x));
                         changed = true;
                     }
                 }
@@ -288,6 +291,13 @@ pub(super) fn param_fields(
     changed
 }
 
+/// A number typed in a command's dialog as JSON: a whole number as an integer, as counts are read
+/// (`as_u64`: Object Mosaic's columns and rows, #1000), which `12.0` isn't; a fraction stays one.
+/// Commands that take any number read either.
+fn typed_number(x: f64) -> Value {
+    if x.fract() == 0.0 && x.abs() < 1e15 { json!(x as i64) } else { json!(x) }
+}
+
 /// Editor for a plug-in's parameters from its schema (plug-in filter and effect dialogs): numbers
 /// within their range, whole numbers, checkboxes and dropdowns, in declaration order. Returns
 /// true when a value changed. The labels (from the parameter keys) and choices are the plug-in's
@@ -549,3 +559,19 @@ pub(super) fn caption(ui: &mut egui::Ui, text: &str) {
     let t = Tokens::get(ui.ctx());
     ui.label(egui::RichText::new(tl!(text)).size(11.0).color(t.text_dim));
 }
+
+#[cfg(test)]
+mod typed_number_tests {
+    use super::*;
+
+    #[test]
+    fn whole_numbers_are_integers_and_fractions_stay_fractions() {
+        // Whatever the field held before: a count typed after a fraction is a count again.
+        assert_eq!(typed_number(24.0).as_u64(), Some(24));
+        assert_eq!(typed_number(-4.0), json!(-4));
+        assert_eq!(typed_number(0.0), json!(0));
+        assert_eq!(typed_number(2.5), json!(2.5));
+        // Numbers past exact integers stay floats.
+        assert!(typed_number(1e20).is_f64());
+    }
+}

crates/ui-egui/src/dialogs/missing_fonts.rs

@@ -733,7 +733,7 @@ mod tests {
         let fr = crate::i18n::Lang::from_code("fr").unwrap();
         let shown = crate::i18n::message(fr, "2 font file(s) are now in /Fonts; 1 couldn't be added: a.otf: larger than 256 MB");
         assert!(shown.contains("se trouvent maintenant dans /Fonts") && shown.contains("a.otf") && shown.contains("plus de 256 Mo"), "{shown}");
-        for code in ["es", "fr", "it", "ru"] {
+        for code in ["de", "es", "fr", "it", "ru"] {
             let lang = crate::i18n::Lang::from_code(code).unwrap();
             for s in [
                 "every search thread stopped on an internal error (please report this bug)",

crates/ui-egui/src/dialogs/missing_links.rs

@@ -2,8 +2,8 @@
 //! (`links.relink`), and with Apply to All the other missing files are looked for by name in its
 //! folder; Ignore keeps the images showing their saved preview, and with Apply to All ignores the
 //! rest. Afterwards, with Preferences › Update Links: Ask When Modified, the modified links are
-//! offered for update (`links.update`). Files changed while the app was in the background are
-//! checked when its window comes back to the front ([`after_focus`]).
+//! offered for update (`links.update`). Files another app changes while the document is open are
+//! offered the same way ([`ask_update_changed`], from [`vectorcraft_engine::link_watch`]).
 //!
 //! Fields: `missing` (`[{name, path, ids}]`, the one asked about first), `modified` (the ids of
 //! images whose file was modified), `applyToAll`, `path` (the replacement file; picked when empty)
@@ -61,6 +61,16 @@ fn open(app: &mut VectorcraftApp, missing: Vec<Value>, modified: Vec<Value>) {
 
 /// With Update Links: Ask When Modified, offer to read the modified linked files `ids` again.
 fn ask_update(app: &mut VectorcraftApp, ids: Vec<Value>) {
+    ask(app, ids, tl!("{count} linked image(s) changed since this document was saved. Show the new versions?"));
+}
+
+/// The same offer for linked files another app changed while the document is open
+/// ([`vectorcraft_engine::link_watch`]).
+pub(crate) fn ask_update_changed(app: &mut VectorcraftApp, ids: Vec<Value>) {
+    ask(app, ids, tl!("{count} linked image(s) changed on disk. Show the new versions?"));
+}
+
+fn ask(app: &mut VectorcraftApp, ids: Vec<Value>, question: &str) {
     if ids.is_empty() {
         return;
     }
@@ -68,46 +78,10 @@ fn ask_update(app: &mut VectorcraftApp, ids: Vec<Value>) {
         app.status(format!("{} linked image(s) changed on disk: Update Links shows the new versions", ids.len()));
         return;
     }
-    let detail = crate::i18n::fmt(
-        tl!("{count} linked image(s) changed since this document was saved. Show the new versions?"),
-        &[("count", &ids.len().to_string())],
-    );
+    let detail = crate::i18n::fmt(question, &[("count", &ids.len().to_string())]);
     super::confirm::ask(app, tl!("Update Modified Links"), &detail, "links.update", json!({ "ids": ids }));
 }
 
-/// A linked file as last seen: its path, and its size and modification time when it exists.
-pub(crate) type FileStamp = (String, Option<(u64, Option<std::time::SystemTime>)>);
-
-/// The window came back to the front (#925): linked files of the active document changed
-/// meanwhile are read again with Update Links: Automatically, offered for update with Ask When
-/// Modified (once per change of a file), and left to the Links panel with Manually. Nothing is
-/// asked while a dialog is open.
-pub fn after_focus(app: &mut VectorcraftApp) {
-    if cfg!(target_arch = "wasm32") || app.session.prefs.update_links == "manually" || app.ui.dialog.is_some() || app.session.active().is_none() {
-        return;
-    }
-    let Ok(r) = app.session.execute("links.check", &json!({})) else { return };
-    let rows: Vec<Value> = r["links"].as_array().into_iter().flatten().filter(|l| l["status"] == "modified").cloned().collect();
-    if rows.is_empty() {
-        return;
-    }
-    if app.session.prefs.update_links == "automatically" {
-        // A failure shows in the status bar, as the Links panel's Update Link does.
-        let _ = app.run("links.update", json!({ "ids": ids(&rows) }));
-        return;
-    }
-    // The file each link reads (one found elsewhere after a move), its size and when it was last
-    // changed (two changes can share a time on file systems that keep it coarsely).
-    let stamp = |l: &Value| -> FileStamp {
-        let path = l["found"].as_str().or(l["path"].as_str()).unwrap_or_default().to_string();
-        let meta = std::fs::metadata(&path).ok();
-        let at = meta.as_ref().map(|m| (m.len(), m.modified().ok()));
-        (path, at)
-    };
-    let new: Vec<Value> = rows.into_iter().filter(|l| app.links_asked.insert(stamp(l))).collect();
-    ask_update(app, ids(&new));
-}
-
 fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
     let t = Tokens::get(ui.ctx());
     let missing = d.fields.get("missing").and_then(Value::as_array).map_or(&[][..], Vec::as_slice);
@@ -296,58 +270,4 @@ mod tests {
         assert!(app.ui.dialog.is_none());
         let _ = std::fs::remove_dir_all(dir);
     }
-
-    /// #925: a linked file changed while the app was in the background follows Update Links when
-    /// the window comes back to the front.
-    #[test]
-    fn a_link_changed_in_the_background_follows_update_links_on_focus() {
-        let dir = std::env::temp_dir().join(format!("vectorcraft-focus-links-{}", std::process::id()));
-        std::fs::create_dir_all(&dir).unwrap();
-        let mut app = VectorcraftApp::new(Session::new(), Default::default());
-        app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
-        app.run("file.new", json!({"width": 400, "height": 300})).unwrap();
-        let pic = dir.join("a.png");
-        // Each version a different size, so no two share a length and modification time.
-        let mut version = 0;
-        let mut change = || {
-            version += 1;
-            let mut out = vec![];
-            image::RgbaImage::from_pixel(100 + version, 50, image::Rgba([40 * version as u8, 0, 0, 255]))
-                .write_to(&mut std::io::Cursor::new(&mut out), image::ImageFormat::Png)
-                .unwrap();
-            std::fs::write(&pic, out).unwrap();
-        };
-        change();
-        app.run("file.place", json!({"path": pic.to_string_lossy()})).unwrap();
-        let modified = |app: &mut VectorcraftApp| app.run("links.check", json!({})).unwrap()["modified"].as_u64().unwrap();
-        // The window coming to the front asks for the check.
-        let mut raw = egui::RawInput { events: vec![egui::Event::WindowFocused(true)], ..Default::default() };
-        app.raw_input_hook(&mut raw);
-        assert!(app.links_check);
-        // Ask When Modified (the default): asked once per change.
-        change();
-        after_focus(&mut app);
-        let d = app.ui.dialog.take().expect("asks");
-        assert_eq!(d.str("__command"), "links.update");
-        after_focus(&mut app);
-        assert!(app.ui.dialog.is_none(), "not twice for the same change");
-        change();
-        after_focus(&mut app);
-        assert!(app.ui.dialog.is_some(), "a new change asks again");
-        super::super::confirm(&mut app).unwrap();
-        assert_eq!(modified(&mut app), 0);
-        // Automatically: read again without asking.
-        app.run("prefs.set", json!({"key": "updateLinks", "value": "automatically"})).unwrap();
-        change();
-        after_focus(&mut app);
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(modified(&mut app), 0);
-        // Manually: left to the Links panel.
-        app.run("prefs.set", json!({"key": "updateLinks", "value": "manually"})).unwrap();
-        change();
-        after_focus(&mut app);
-        assert!(app.ui.dialog.is_none());
-        assert_eq!(modified(&mut app), 1);
-        let _ = std::fs::remove_dir_all(dir);
-    }
 }

crates/ui-egui/src/dialogs/mod.rs

@@ -67,6 +67,8 @@ pub mod raster_effects;
 pub mod rearrange_artboards;
 pub mod recolor;
 mod recovery;
+mod revolve;
+pub(crate) mod revolve_gizmo;
 pub mod saturate;
 mod save_changes;
 pub mod save_for_web;
@@ -88,6 +90,7 @@ pub mod tile_edge_color;
 mod tools;
 mod transform;
 pub mod transform_each;
+pub mod variables;
 pub mod width_point;
 
 use serde_json::{Value, json};
@@ -212,6 +215,7 @@ registry! {
     ExportForScreens: ["exportForScreens"] => export_for_screens::SPEC,
     Recolor: [recolor::KIND] => recolor::SPEC,
     Command: ["command"] => command::SPEC,
+    Variables: [variables::KIND] => variables::SPEC,
     Effect: ["effect"] => effect::SPEC,
     SaveChanges: [crate::unsaved::KIND] => save_changes::SPEC,
     Preferences: ["preferences"] => DialogSpec::window(crate::prefs_dialog::show, |app, _| crate::prefs_dialog::confirm(app)),
@@ -353,6 +357,7 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
     // its first field is to take the keyboard focus (`focus_id`, until a field takes it).
     let (shown_id, focus_id) = (egui::Id::new("dialog-shown"), egui::Id::new("dialog-focus-pending"));
     let Some(mut d) = app.ui.dialog.clone() else {
+        revolve_gizmo::clear(ctx);
         app.ui.dialog_file = None;
         ctx.data_mut(|m| {
             m.remove::<String>(shown_id);
@@ -360,6 +365,9 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
         });
         return;
     };
+    if !revolve_gizmo::active(&d) {
+        revolve_gizmo::clear(ctx);
+    }
     let focus_first = ctx.data_mut(|m| {
         if m.get_temp::<String>(shown_id).as_deref() != Some(d.kind.as_str()) {
             m.insert_temp(shown_id, d.kind.clone());
@@ -375,7 +383,14 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
     let mut cancel = false;
     let mut discard = false;
     let heading = (spec.heading)(&d);
-    modal::show(ctx, &heading, egui::Id::new(("dialog", d.kind.as_str())), -40.0, MARGIN, |ui| {
+    let revolves = revolve_gizmo::active(&d);
+    if revolves {
+        revolve_gizmo::show(app, ctx, &mut d);
+    }
+    let initial = if revolves { egui::vec2((ctx.content_rect().width() / 2.0 - 226.0).max(0.0), -40.0) } else { egui::vec2(0.0, -40.0) };
+    let id = egui::Id::new(("dialog", d.kind.as_str()));
+    let id = if revolves { id.with("revolve") } else { id };
+    modal::show_at(ctx, &heading, id, initial, MARGIN, |ui| {
         // Never wider than the window (a large UI scale in a small window): the text wraps.
         let room = (ctx.content_rect().width() - 2.0 * (f32::from(MARGIN) + EDGE_GAP)).max(EDGE_GAP);
         ui.set_min_width(spec.min_width.min(room));

crates/ui-egui/src/dialogs/modal.rs

@@ -11,6 +11,11 @@ use crate::theme::{self, Tokens};
 /// screen's centre until it is moved, with `margin` inside its frame. `add` draws the contents and
 /// should start with [`heading`] (or [`drag_band`]) so the window can be moved.
 pub(crate) fn show<R>(ctx: &egui::Context, title: &str, id: Id, nudge: f32, margin: i8, add: impl FnOnce(&mut egui::Ui) -> R) -> Option<R> {
+    show_at(ctx, title, id, egui::vec2(0.0, nudge), margin, add)
+}
+
+/// A modal that starts at a chosen offset, then keeps the user's dragged position.
+pub(crate) fn show_at<R>(ctx: &egui::Context, title: &str, id: Id, initial: Vec2, margin: i8, add: impl FnOnce(&mut egui::Ui) -> R) -> Option<R> {
     let t = Tokens::get(ctx);
     let dim = backdrop();
     egui::Area::new(dim.id).order(dim.order).fixed_pos(egui::Pos2::ZERO).show(ctx, |ui| {
@@ -23,7 +28,7 @@ pub(crate) fn show<R>(ctx: &egui::Context, title: &str, id: Id, nudge: f32, marg
         .collapsible(false)
         .resizable(false)
         .title_bar(false)
-        .anchor(egui::Align2::CENTER_CENTER, offset(ctx, id, nudge))
+        .anchor(egui::Align2::CENTER_CENTER, offset(ctx, id, initial))
         .frame(egui::Frame::window(&ctx.global_style()).fill(t.panel).inner_margin(egui::Margin::same(margin)))
         .show(ctx, add)
         .and_then(|r| r.inner)
@@ -67,9 +72,9 @@ fn handle(id: Id) -> Id {
 /// its [`drag_band`] is dragged, where it sat when the drag began plus how far the pointer has moved
 /// since the press, kept on screen (applied before the window places itself, so it follows the
 /// pointer without a frame's lag).
-fn offset(ctx: &egui::Context, id: Id, nudge: f32) -> Vec2 {
+fn offset(ctx: &egui::Context, id: Id, initial: Vec2) -> Vec2 {
     let (key, start_key) = (id.with("modal-offset"), id.with("modal-drag-start"));
-    let offset = ctx.data(|m| m.get_temp::<Vec2>(key)).unwrap_or(egui::vec2(0.0, nudge));
+    let offset = ctx.data(|m| m.get_temp::<Vec2>(key)).unwrap_or(initial);
     let dragged = ctx.read_response(handle(id)).is_some_and(|r| r.dragged());
     let moved = ctx.input(|i| Some(i.pointer.latest_pos()? - i.pointer.press_origin()?));
     let (true, Some(moved), Some(rect)) = (dragged, moved, ctx.memory(|m| m.area_rect(id))) else {

crates/ui-egui/src/dialogs/revolve.rs

@@ -0,0 +1,233 @@
+//! Compact Revolve controls. The object and rotation gizmo live on the artboard.
+//! All document changes run through the effect dialog's existing preview/commit commands.
+
+use egui::{Align2, FontId, Id, Pos2, Sense, Stroke, vec2};
+use serde_json::{Value, json};
+use vectorcraft_doc::Unit;
+use vectorcraft_effects::REVOLVE;
+
+use crate::state::Dialog;
+use crate::theme::Tokens;
+use crate::{VectorcraftApp, scrub, widgets};
+
+const LABEL_W: f32 = 102.0;
+const VALUE_W: f32 = 74.0;
+const SIDE_W: f32 = 354.0;
+
+/// Sized to the screen, with scrolling inside the body so OK and Cancel stay reachable.
+pub(super) fn body(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) {
+    // Values start in drag mode; clicking or Tab enters their text editor.
+    ui.data_mut(|m| m.remove::<bool>(widgets::dialog_focus_flag()));
+    let screen = ui.ctx().content_rect();
+    let width = (screen.width() - 64.0).clamp(240.0, SIDE_W);
+    let height = (screen.height() - 240.0).clamp(120.0, 340.0);
+    ui.set_width(width);
+    egui::ScrollArea::vertical().id_salt("revolve-body").max_height(height).auto_shrink([false, true]).show(ui, |ui| {
+        controls(app, ui, d);
+    });
+    ui.add_space(6.0);
+    ui.horizontal(|ui| {
+        let t = Tokens::get(ui.ctx());
+        ui.allocate_ui_with_layout(vec2((width - 100.0).max(80.0), 32.0), egui::Layout::left_to_right(egui::Align::Center), |ui| {
+            ui.add(egui::Label::new(egui::RichText::new(super::revolve_gizmo::hint(d)).size(11.0).color(t.text_dim)).wrap());
+        });
+        ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
+            let defaults = vectorcraft_effects::default_params(REVOLVE).unwrap_or(json!({}));
+            let changed = defaults.as_object().is_some_and(|m| {
+                m.iter().any(|(k, v)| v.as_f64().map_or_else(|| d.fields.get(k) != Some(v), |default| (d.f64(k, default) - default).abs() > 1e-6))
+            });
+            let (r, _) = ui.allocate_exact_size(vec2(88.0, 24.0), Sense::hover());
+            let response = ui.interact(r, Id::new("revolve-reset-all"), Sense::click());
+            response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), tl!("Reset all")));
+            if response.hovered() {
+                ui.painter().rect_filled(r, 3.0, t.hover);
+            }
+            ui.painter().text(r.left_center() + vec2(4.0, 0.0), Align2::LEFT_CENTER, tl!("Reset all"), FontId::proportional(11.5), t.text);
+            dot(ui, r.right_center() - vec2(10.0, 0.0), changed);
+            if response.on_hover_text(tl!("Reset all Revolve settings to their defaults.")).clicked()
+                && let Some(defaults) = defaults.as_object()
+            {
+                d.fields.extend(defaults.clone());
+            }
+        });
+    });
+}
+
+fn controls(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) {
+    ui.spacing_mut().item_spacing.y = 4.0;
+    let lighting = super::revolve_gizmo::lighting(d);
+    if let Some(tab) = widgets::tab_bar(ui, &[tl!("Rotation"), tl!("Lighting")], usize::from(lighting)) {
+        d.fields.insert("__gizmo".into(), json!(if tab == 1 { "light" } else { "rotation" }));
+    }
+    ui.add_space(8.0);
+    if super::revolve_gizmo::lighting(d) {
+        lighting_controls(ui, d);
+        return;
+    }
+    let unit = app.session.general_unit();
+    heading(ui, tl!("Shape"));
+    number(ui, d, "angle", tl!("Revolve angle"), (0.0, 360.0), "°", 1, None);
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 6.0;
+        label(ui, tl!("Axis side"));
+        let edge = d.str("edge");
+        let current = if edge == "right" { tl!("Right") } else { tl!("Left") };
+        let width = VALUE_W + rail_width(ui) + 6.0;
+        if let Some(k) = widgets::dropdown(ui, "revolve-edge", current, &[tl!("Left"), tl!("Right")], width) {
+            d.fields.insert("edge".into(), json!(if k == 0 { "left" } else { "right" }));
+        }
+        if reset_dot(ui, "edge", edge != "left", tl!("Left")) {
+            d.fields.insert("edge".into(), json!("left"));
+        }
+    });
+    number(ui, d, "offset", tl!("Offset"), (0.0, 100000.0), "", 1, Some(unit));
+    ui.add_space(10.0);
+    heading(ui, tl!("View"));
+    for (key, name) in [("rotationX", tl!("Rotation X")), ("rotationY", tl!("Rotation Y")), ("rotationZ", tl!("Rotation Z"))] {
+        number(ui, d, key, name, (-360.0, 360.0), "°", 1, None);
+    }
+    number(ui, d, "perspective", tl!("Perspective"), (0.0, 100.0), "%", 1, None);
+    ui.add_space(6.0);
+    egui::CollapsingHeader::new(tl!("Advanced")).id_salt("revolve-advanced").show(ui, |ui| {
+        number(ui, d, "segments", tl!("Segments"), (8.0, 128.0), "", 0, None);
+        super::form::check(ui, d, "__showAxis", tl!("Show axis"));
+        ui.add_space(6.0);
+        ui.horizontal(|ui| {
+            let mut visible = d.fields.get("expandVisibleOnly").and_then(Value::as_bool).unwrap_or(true);
+            let response = ui.allocate_ui_with_layout(
+                vec2((ui.available_width() - 30.0).max(100.0), 24.0), egui::Layout::left_to_right(egui::Align::Center), |ui| {
+                    ui.checkbox(&mut visible, egui::RichText::new(tl!("Keep visible surfaces only when expanding")).size(12.0))
+                },
+            ).inner;
+            if response.on_hover_text(tl!("Trim covered geometry on Expand Appearance. Live preview keeps the full surface. Transparent paints and surfaces exceeding visibility limits retain all faces.")).changed() {
+                d.fields.insert("expandVisibleOnly".into(), json!(visible));
+            }
+            if reset_dot(ui, "expandVisibleOnly", !visible, "true") {
+                d.fields.insert("expandVisibleOnly".into(), json!(true));
+            }
+        });
+    });
+}
+
+fn lighting_controls(ui: &mut egui::Ui, d: &mut Dialog) {
+    ui.horizontal(|ui| {
+        let mut shade = d.bool("shade");
+        if ui.checkbox(&mut shade, tl!("Shading")).changed() {
+            d.fields.insert("shade".into(), json!(shade));
+        }
+        ui.add_space((ui.available_width() - 24.0).max(0.0));
+        if reset_dot(ui, "shade", !shade, "true") {
+            d.fields.insert("shade".into(), json!(true));
+        }
+    });
+    ui.add_enabled_ui(d.bool("shade"), |ui| {
+        number(ui, d, "lightAzimuth", tl!("Direction"), (-360.0, 360.0), "°", 1, None);
+        number(ui, d, "lightElevation", tl!("Elevation"), (-90.0, 90.0), "°", 1, None);
+        number(ui, d, "lightIntensity", tl!("Intensity"), (0.0, 100.0), "%", 1, None);
+        number(ui, d, "ambient", tl!("Ambient"), (0.0, 100.0), "%", 1, None);
+    });
+}
+
+fn heading(ui: &mut egui::Ui, text: &str) {
+    let t = Tokens::get(ui.ctx());
+    ui.label(egui::RichText::new(text).font(crate::theme::semibold(13.0)).color(t.text));
+}
+
+fn label(ui: &mut egui::Ui, name: &str) {
+    let t = Tokens::get(ui.ctx());
+    let (r, _) = ui.allocate_exact_size(vec2(LABEL_W, 24.0), Sense::hover());
+    ui.put(r, egui::Label::new(egui::RichText::new(name).size(12.5).color(t.text)).halign(egui::Align::Min).truncate()).on_hover_text(name);
+    scrub::note_label(ui, r);
+}
+
+fn rail_width(ui: &egui::Ui) -> f32 {
+    (ui.available_width() - VALUE_W - 24.0 - 18.0).clamp(40.0, 134.0)
+}
+
+/// A value can be typed, dragged, scrubbed by its label, or moved on its slider.
+#[allow(clippy::too_many_arguments)]
+fn number(ui: &mut egui::Ui, d: &mut Dialog, key: &str, name: &str, range: (f64, f64), suffix: &str, decimals: usize, unit: Option<Unit>) {
+    let default = vectorcraft_effects::default_params(REVOLVE).and_then(|p| p.get(key).and_then(Value::as_f64)).unwrap_or(0.0);
+    let from = |n| unit.map_or(n, |u| u.from_pt(n));
+    let to = |n| unit.map_or(n, |u| u.to_pt(n));
+    let typed = unit.map(|u| widgets::typed_unit(ui.ctx(), u));
+    let mut value = from(d.f64(key, default)).clamp(from(range.0), from(range.1));
+    let suffix = unit.map_or_else(|| suffix.to_string(), |u| format!(" {}", u.suffix()));
+    let mut next = None;
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = 6.0;
+        label(ui, name);
+        let t = Tokens::get(ui.ctx());
+        let response = ui
+            .scope(|ui| {
+                ui.visuals_mut().widgets.inactive.weak_bg_fill = t.input;
+                ui.visuals_mut().widgets.inactive.bg_stroke = Stroke::new(1.0, t.input_border);
+                ui.add_sized(
+                    [VALUE_W, 24.0],
+                    egui::DragValue::new(&mut value)
+                        .range(from(range.0)..=from(range.1))
+                        .speed(if decimals == 0 { 1.0 } else { 0.25 })
+                        .max_decimals(decimals)
+                        .suffix(&suffix)
+                        .update_while_editing(false)
+                        .custom_parser(|s| {
+                            unit.map_or_else(
+                                || vectorcraft_doc::parse_number(&s.replace(['°', '%'], "")),
+                                |u| typed.unwrap_or(u).parse(s).map(|v| u.from_pt(v)),
+                            )
+                        }),
+                )
+            })
+            .inner;
+        response.clone().on_hover_text(tl!("Drag values or labels. Double-click a value to type."));
+        if response.changed() {
+            next = Some(value);
+        }
+        if let Some(n) = scrub::field(ui, response.id, response.rect, &value.to_string(), Some(value), decimals as i32) {
+            next = Some(n);
+        }
+        // Offset's rail covers a useful working range; larger values can still be typed.
+        let rail_max = if key == "offset" { from(500.0) } else { from(range.1) };
+        let rail_min = from(range.0);
+        let rail = rail_width(ui) + VALUE_W;
+        let slider =
+            widgets::color_slider(ui, ("revolve-slider", key), ((value - rail_min) / (rail_max - rail_min)).clamp(0.0, 1.0) as f32, rail, &|_| {
+                t.input_border
+            });
+        if let (Some(n), _) = slider {
+            next = Some(rail_min + f64::from(n) * (rail_max - rail_min));
+        }
+        if reset_dot(ui, key, (to(value) - default).abs() > 1e-6, &format!("{}{}", from(default), suffix)) {
+            next = Some(from(default));
+        }
+    });
+    if let Some(n) = next.filter(|n| n.is_finite()) {
+        let factor = 10f64.powi(decimals as i32);
+        let n = (n * factor).round() / factor;
+        d.fields.insert(key.into(), json!(to(n.clamp(from(range.0), from(range.1)))));
+    }
+}
+
+fn dot(ui: &egui::Ui, p: Pos2, changed: bool) {
+    let t = Tokens::get(ui.ctx());
+    if changed {
+        ui.painter().circle_filled(p, 3.0, if ui.is_enabled() { t.accent } else { t.text_disabled });
+    } else {
+        ui.painter().circle_stroke(p, 3.0, Stroke::new(1.0, t.text_disabled));
+    }
+}
+
+fn reset_dot(ui: &mut egui::Ui, key: &str, changed: bool, default: &str) -> bool {
+    let (r, _) = ui.allocate_exact_size(vec2(24.0, 24.0), Sense::hover());
+    let response = ui.interact(r, Id::new(("revolve-reset", key)), Sense::click());
+    response.widget_info(|| egui::WidgetInfo::labeled(egui::WidgetType::Button, ui.is_enabled(), tl!("Reset to default")));
+    if response.hovered() {
+        ui.painter().rect_filled(r, 3.0, Tokens::get(ui.ctx()).hover);
+    }
+    dot(ui, r.center(), changed);
+    response.on_hover_text(format!("{}: {default}", tl!("Reset to default"))).clicked()
+}
+
+#[cfg(test)]
+#[path = "tests_revolve.rs"]
+mod tests;

crates/ui-egui/src/dialogs/revolve_gizmo.rs

@@ -0,0 +1,425 @@
+//! Artboard rotation and light controls for the active Revolve dialog. Gestures edit fields;
+//! the existing effect preview applies commands and owns OK, Cancel and undo.
+use egui::{Align2, FontId, Id, Pos2, Rect, Sense, Stroke, Vec2, vec2};
+use serde_json::json;
+use vectorcraft_effects::{REVOLVE, revolve_options};
+use vectorcraft_geom::Point;
+use vectorcraft_three_d::Revolve;
+
+use crate::{VectorcraftApp, canvas::Xf, state::Dialog, theme::Tokens};
+
+const KEYS: [&str; 3] = ["rotationX", "rotationY", "rotationZ"];
+const SAMPLES: usize = 96;
+
+pub(crate) fn active(d: &Dialog) -> bool {
+    d.kind == "effect" && d.str("__effect") == REVOLVE
+}
+
+pub(crate) fn lighting(d: &Dialog) -> bool {
+    d.str("__gizmo") == "light"
+}
+
+pub(crate) fn hint(d: &Dialog) -> &'static str {
+    if !d.bool("preview") || (lighting(d) && !d.bool("shade")) {
+        tl!("Drag values or labels. Double-click a value to type.")
+    } else if lighting(d) {
+        tl!("Drag the light, or its rings. Shift snaps to 15°.")
+    } else {
+        tl!("Drag rings to rotate. Shift snaps to 15°.")
+    }
+}
+
+fn drag_id() -> Id {
+    Id::new("revolve-gizmo-drag")
+}
+
+pub(crate) fn dragging(ctx: &egui::Context) -> bool {
+    ctx.data(|m| m.get_temp::<Drag>(drag_id())).is_some()
+}
+
+pub(super) fn clear(ctx: &egui::Context) {
+    ctx.data_mut(|m| m.remove::<Drag>(drag_id()));
+}
+
+#[derive(Clone, Copy)]
+struct Ring {
+    center: Vec2,
+    u: Vec2,
+    v: Vec2,
+    depth: [f32; 2],
+}
+
+impl Ring {
+    fn point(self, angle: f32) -> Vec2 {
+        self.center + self.u * angle.cos() + self.v * angle.sin()
+    }
+    fn tangent(self, angle: f32) -> Vec2 {
+        -self.u * angle.sin() + self.v * angle.cos()
+    }
+    fn phase(self, p: Vec2) -> Option<f32> {
+        let p = p - self.center;
+        let det = self.u.x * self.v.y - self.u.y * self.v.x;
+        // Near edge-on, an ellipse's inverse magnifies tiny pointer movements.
+        if det.abs() < self.u.length().max(self.v.length()).powi(2) * 0.15 {
+            return None;
+        }
+        let x = (p.x * self.v.y - p.y * self.v.x) / det;
+        let y = (p.y * self.u.x - p.x * self.u.y) / det;
+        (x.hypot(y) > 0.1).then(|| y.atan2(x))
+    }
+}
+
+#[derive(Clone, Copy)]
+struct Geometry {
+    center: Pos2,
+    radius: f32,
+    rings: [Ring; 3],
+    xf: Xf,
+    bounds: vectorcraft_geom::Rect,
+}
+
+impl Geometry {
+    fn new(app: &VectorcraftApp, d: &Dialog) -> Option<Self> {
+        let state = app.session.active()?;
+        let node = state.doc.node(*state.selection.objects.first()?)?;
+        let bounds = node.geometric_bounds()?;
+        let xf = Xf::new(app.canvas_rect?, app.view()?);
+        let options = revolve_options(&super::form::params(d));
+        let center = xf.to_screen(options.rotation_origin(bounds));
+        if !center.x.is_finite() || !center.y.is_finite() || !xf.rect.contains(center) {
+            return None;
+        }
+        let radius = (bounds.height().abs() * xf.zoom * 0.24).clamp(76.0, 116.0) as f32;
+        let (s, c) = (xf.rot as f32).sin_cos();
+        let screen = |p: [f64; 3], scale: f32| vec2(c * p[0] as f32 - s * p[1] as f32, s * p[0] as f32 + c * p[1] as f32) * radius * scale;
+        let rings = std::array::from_fn(|i| {
+            let [u, v] = options.rotation_planes()[i];
+            let scale = if i == 2 { 1.12 } else { 1.0 };
+            Ring { center: Vec2::ZERO, u: screen(u, scale), v: screen(v, scale), depth: [u[2] as f32, v[2] as f32] }
+        });
+        Some(Self { center, radius, rings, xf, bounds })
+    }
+
+    fn hit(self, p: Pos2) -> Option<(usize, f32)> {
+        let mut best = None;
+        let mut distance = 9.0;
+        for (axis, ring) in self.rings.iter().enumerate() {
+            for i in 0..SAMPLES {
+                let a = i as f32 * std::f32::consts::TAU / SAMPLES as f32;
+                let b = a + std::f32::consts::TAU / SAMPLES as f32;
+                let (start, end) = (self.center + ring.point(a), self.center + ring.point(b));
+                let line = end - start;
+                let t = ((p - start).dot(line) / line.length_sq().max(1e-6)).clamp(0.0, 1.0);
+                let d = p.distance(start + line * t);
+                if d < distance {
+                    distance = d;
+                    best = Some((axis, a + (b - a) * t));
+                }
+            }
+        }
+        best
+    }
+
+    fn light_rings(self, options: Revolve) -> [Ring; 2] {
+        let (s, c) = (self.xf.rot as f32).sin_cos();
+        let screen = |p: [f64; 3]| vec2(c * p[0] as f32 - s * p[1] as f32, s * p[0] as f32 + c * p[1] as f32) * self.radius * 1.4;
+        options.light_orbits().map(|[center, u, v]| Ring { center: screen(center), u: screen(u), v: screen(v), depth: [u[2] as f32, v[2] as f32] })
+    }
+
+    fn light_labels(self) -> [Rect; 2] {
+        [
+            Rect::from_center_size(self.center + vec2(0.0, self.radius * 1.4 + 24.0), vec2(88.0, 26.0)),
+            Rect::from_center_size(self.center - vec2(self.radius * 1.4 + 32.0, 0.0), vec2(78.0, 26.0)),
+        ]
+    }
+
+    fn light_hit(self, p: Pos2, options: Revolve) -> Option<usize> {
+        if let Some(axis) = self.light_labels().iter().position(|r| r.contains(p)) {
+            return Some(axis);
+        }
+        let mut best = None;
+        let mut distance = 9.0;
+        for (axis, ring) in self.light_rings(options).iter().enumerate() {
+            let (start, span) = if axis == 0 { (0.0, std::f32::consts::TAU) } else { (-std::f32::consts::FRAC_PI_2, std::f32::consts::PI) };
+            for i in 0..SAMPLES {
+                let a = start + i as f32 * span / SAMPLES as f32;
+                let (from, to) = (self.center + ring.point(a), self.center + ring.point(a + span / SAMPLES as f32));
+                let line = to - from;
+                let t = ((p - from).dot(line) / line.length_sq().max(1e-6)).clamp(0.0, 1.0);
+                let d = p.distance(from + line * t);
+                if d < distance {
+                    distance = d;
+                    best = Some(axis);
+                }
+            }
+        }
+        best
+    }
+}
+
+#[derive(Clone, Copy)]
+enum Mode {
+    Ring { axis: usize, ring: Ring, phase: f32, degrees: f64 },
+    Orbit,
+    Light,
+    LightRing { axis: usize },
+}
+
+#[derive(Clone)]
+struct Drag {
+    mode: Mode,
+    geometry: Geometry,
+    last: Pos2,
+    origin: Pos2,
+    fields: serde_json::Map<String, serde_json::Value>,
+}
+
+fn wrap(n: f64, snap: bool) -> f64 {
+    let n = if snap { (n / 15.0).round() * 15.0 } else { n };
+    (n + 180.0).rem_euclid(360.0) - 180.0
+}
+
+pub(super) fn show(app: &VectorcraftApp, ctx: &egui::Context, d: &mut Dialog) {
+    let light_mode = lighting(d);
+    if !d.bool("preview") || (light_mode && !d.bool("shade")) {
+        clear(ctx);
+        return;
+    }
+    let Some(geometry) = Geometry::new(app, d) else { return };
+    let geometry = ctx.data(|m| m.get_temp::<Drag>(drag_id())).map_or(geometry, |drag| drag.geometry);
+    let mut rect = Rect::from_center_size(geometry.center, Vec2::splat(geometry.radius * 3.0 + 48.0));
+    if light_mode {
+        for label in geometry.light_labels() {
+            rect = rect.union(label.expand(2.0));
+        }
+    }
+    egui::Area::new(Id::new("revolve-gizmo-area")).order(egui::Order::Foreground).fixed_pos(rect.min).movable(false).show(ctx, |ui| {
+        ui.set_clip_rect(geometry.xf.rect);
+        let response = ui.allocate_rect(rect.intersect(geometry.xf.rect), Sense::drag());
+        let options = revolve_options(&super::form::params(d));
+        let light = light_position(geometry, options);
+        let hovered = response
+            .hovered()
+            .then(|| response.hover_pos())
+            .flatten()
+            .and_then(|p| if light_mode { geometry.light_hit(p, options).map(|axis| (axis, 0.0)) } else { geometry.hit(p) });
+        if response.drag_started()
+            && let Some(origin) = ui.input(|i| i.pointer.press_origin())
+        {
+            let mode = if light_mode {
+                if origin.distance(light) <= 18.0 {
+                    Mode::Light
+                } else if let Some(axis) = geometry.light_hit(origin, options) {
+                    Mode::LightRing { axis }
+                } else {
+                    Mode::Light
+                }
+            } else if origin.distance(geometry.center) <= 14.0 {
+                Mode::Orbit
+            } else if let Some((axis, phase)) = geometry.hit(origin) {
+                Mode::Ring { axis, ring: geometry.rings[axis], phase, degrees: 0.0 }
+            } else {
+                Mode::Orbit
+            };
+            ui.ctx().memory_mut(|m| m.stop_text_input());
+            ui.data_mut(|m| m.insert_temp(drag_id(), Drag { mode, geometry, last: origin, origin, fields: d.fields.clone() }));
+        }
+        let mut drag = ui.data(|m| m.get_temp::<Drag>(drag_id()));
+        if let Some(current) = &mut drag {
+            if ui.input_mut(|i| i.consume_key(i.modifiers, egui::Key::Escape)) {
+                d.fields = current.fields.clone();
+                d.fields.remove(super::form::PREVIEWED);
+                ui.data_mut(|m| m.remove::<Drag>(drag_id()));
+                drag = None;
+            } else if let Some(p) = response.interact_pointer_pos() {
+                let snap = ui.input(|i| i.modifiers.shift);
+                match &mut current.mode {
+                    Mode::Ring { axis, ring, phase, degrees } => {
+                        let step = if let Some(next) = ring.phase(p - geometry.center) {
+                            let step = (next - *phase + std::f32::consts::PI).rem_euclid(std::f32::consts::TAU) - std::f32::consts::PI;
+                            *phase = next;
+                            step
+                        } else {
+                            let tangent = ring.tangent(*phase);
+                            let step = (p - current.last).dot(tangent) / tangent.length_sq().max(144.0);
+                            *phase += step;
+                            step
+                        };
+                        *degrees += f64::from(step.to_degrees());
+                        if let Some(key) = KEYS.get(*axis) {
+                            let start = current.fields.get(*key).and_then(|v| v.as_f64()).unwrap_or(0.0);
+                            d.fields.insert((*key).into(), json!(wrap(start + *degrees, snap)));
+                        }
+                    }
+                    Mode::Orbit => {
+                        let delta = geometry.xf.delta_to_doc(p - current.origin) * geometry.xf.zoom;
+                        for (key, delta) in [("rotationX", delta.y * 0.5), ("rotationY", delta.x * 0.5)] {
+                            let start = current.fields.get(key).and_then(|v| v.as_f64()).unwrap_or(0.0);
+                            d.fields.insert(key.into(), json!(wrap(start + delta, snap)));
+                        }
+                    }
+                    Mode::Light => {
+                        let start = revolve_options(&serde_json::Value::Object(current.fields.clone()));
+                        let projected = light_position(geometry, start) + (p - current.origin);
+                        let point = geometry.xf.delta_to_doc(projected - geometry.center) * (geometry.xf.zoom / f64::from(geometry.radius * 1.4));
+                        let [azimuth, elevation] = start.light_at_on_side(Point::new(point.x, point.y));
+                        d.fields.insert("lightAzimuth".into(), json!(wrap(azimuth, snap)));
+                        d.fields.insert(
+                            "lightElevation".into(),
+                            json!((if snap { (elevation / 15.0).round() * 15.0 } else { elevation }).clamp(-90.0, 90.0)),
+                        );
+                    }
+                    Mode::LightRing { axis } => {
+                        let delta = geometry.xf.delta_to_doc(p - current.origin) * geometry.xf.zoom;
+                        let start = revolve_options(&serde_json::Value::Object(current.fields.clone()));
+                        if *axis == 0 {
+                            d.fields.insert("lightAzimuth".into(), json!(wrap(start.light_azimuth + delta.x * 0.6, snap)));
+                        } else {
+                            let elevation = start.light_elevation - delta.y * 0.6;
+                            d.fields.insert(
+                                "lightElevation".into(),
+                                json!((if snap { (elevation / 15.0).round() * 15.0 } else { elevation }).clamp(-90.0, 90.0)),
+                            );
+                        }
+                    }
+                }
+                current.last = p;
+                ui.data_mut(|m| m.insert_temp(drag_id(), current.clone()));
+            }
+        }
+        if response.drag_stopped() || !ui.input(|i| i.pointer.primary_down()) {
+            ui.data_mut(|m| m.remove::<Drag>(drag_id()));
+        }
+        if response.hovered() || drag.is_some() {
+            ui.ctx().set_cursor_icon(if drag.is_some() { egui::CursorIcon::Grabbing } else { egui::CursorIcon::Grab });
+        }
+        let active = match drag.as_ref().map(|d| d.mode) {
+            Some(Mode::Ring { axis, .. }) => Some(axis),
+            Some(Mode::LightRing { axis }) => Some(axis),
+            _ => hovered.map(|h| h.0),
+        };
+        paint(ui, d, Geometry::new(app, d).unwrap_or(geometry), active, drag.as_ref());
+        response.on_hover_text(hint(d));
+    });
+}
+
+fn light_position(g: Geometry, options: Revolve) -> Pos2 {
+    let [x, y, _] = options.light_direction();
+    let (s, c) = (g.xf.rot as f32).sin_cos();
+    g.center + vec2(c * x as f32 - s * y as f32, s * x as f32 + c * y as f32) * g.radius * 1.4
+}
+
+fn paint(ui: &egui::Ui, d: &Dialog, g: Geometry, active: Option<usize>, drag: Option<&Drag>) {
+    if lighting(d) {
+        paint_light(ui, d, g, active, drag);
+        return;
+    }
+    let t = Tokens::get(ui.ctx());
+    let painter = ui.painter();
+    let colors = [t.axis_x, t.axis_y, t.axis_z];
+    for (axis, ring) in g.rings.iter().enumerate() {
+        let color = if active == Some(axis) { t.warning } else { colors[axis] };
+        for i in 0..SAMPLES {
+            let angle = i as f32 * std::f32::consts::TAU / SAMPLES as f32;
+            let behind = ring.depth[0] * angle.cos() + ring.depth[1] * angle.sin() < -0.05;
+            if behind && i % 3 == 0 {
+                continue;
+            }
+            let points = [g.center + ring.point(angle), g.center + ring.point(angle + std::f32::consts::TAU / SAMPLES as f32)];
+            painter.line_segment(points, Stroke::new(4.0, t.input.gamma_multiply(0.55)));
+            painter.line_segment(
+                points,
+                Stroke::new(if active == Some(axis) { 2.5 } else { 1.75 }, color.gamma_multiply(if behind { 0.55 } else { 1.0 })),
+            );
+        }
+        // Letters make the axes distinguishable without relying on colour alone.
+        let phase = match axis {
+            0 => 0.75,
+            1 => 2.25,
+            _ => 4.7,
+        };
+        let p = g.center + ring.point(phase);
+        painter.circle_filled(p, 9.0, t.panel);
+        painter.text(p, Align2::CENTER_CENTER, ["X", "Y", "Z"][axis], FontId::proportional(11.0), color);
+    }
+    painter.circle(g.center, 8.0, t.panel.gamma_multiply(0.8), Stroke::new(1.5, t.text_dim));
+    painter.line_segment([g.center - vec2(4.0, 0.0), g.center + vec2(4.0, 0.0)], Stroke::new(1.0, t.text_dim));
+    painter.line_segment([g.center - vec2(0.0, 4.0), g.center + vec2(0.0, 4.0)], Stroke::new(1.0, t.text_dim));
+    let options = revolve_options(&super::form::params(d));
+    if d.bool("__showAxis") {
+        painter.line_segment(options.projected_axis(g.bounds).map(|p| g.xf.to_screen(p)), Stroke::new(1.0, t.warning));
+    }
+    if let Some(Drag { mode: Mode::Ring { axis, .. }, .. }) = drag
+        && let Some(key) = KEYS.get(*axis)
+    {
+        let text = format!("{}  {:.1}°", ["X", "Y", "Z"].get(*axis).unwrap_or(&""), d.f64(key, 0.0));
+        let pos = g.center + vec2(0.0, g.radius * 1.12 + 18.0);
+        let galley = painter.layout_no_wrap(text, FontId::proportional(12.0), t.text_strong);
+        painter.rect_filled(Rect::from_center_size(pos, galley.size() + vec2(14.0, 8.0)), 4.0, t.panel);
+        painter.galley(pos - galley.size() * 0.5, galley, t.text_strong);
+    }
+}
+
+fn paint_light(ui: &egui::Ui, d: &Dialog, g: Geometry, active: Option<usize>, drag: Option<&Drag>) {
+    let t = Tokens::get(ui.ctx());
+    let painter = ui.painter();
+    let options = revolve_options(&super::form::params(d));
+    let radius = g.radius * 1.4;
+    painter.circle_stroke(g.center, radius, Stroke::new(1.0, t.text_dim.gamma_multiply(0.3)));
+    let labels = g.light_labels();
+    for (axis, ring) in g.light_rings(options).iter().enumerate() {
+        let (start, span) = if axis == 0 { (0.0, std::f32::consts::TAU) } else { (-std::f32::consts::FRAC_PI_2, std::f32::consts::PI) };
+        for i in 0..SAMPLES {
+            let a = start + i as f32 * span / SAMPLES as f32;
+            let behind = ring.depth[0] * a.cos() + ring.depth[1] * a.sin() < -0.05;
+            if behind && i % 3 == 0 {
+                continue;
+            }
+            let points = [g.center + ring.point(a), g.center + ring.point(a + span / SAMPLES as f32)];
+            painter.line_segment(points, Stroke::new(4.0, t.panel.gamma_multiply(0.4)));
+            painter.line_segment(
+                points,
+                Stroke::new(if active == Some(axis) { 2.5 } else { 1.5 }, t.warning.gamma_multiply(if behind { 0.45 } else { 0.85 })),
+            );
+        }
+        let label = labels[axis];
+        painter.rect_filled(label, 4.0, if active == Some(axis) { t.hover } else { t.panel });
+        let text = if axis == 0 { tl!("Direction") } else { tl!("Elevation") };
+        painter.text(label.center(), Align2::CENTER_CENTER, text, FontId::proportional(11.0), t.warning);
+    }
+    let p = light_position(g, options);
+    let delta = g.center - p;
+    if delta.length() > 24.0 {
+        let direction = delta.normalized();
+        let normal = vec2(-direction.y, direction.x);
+        let tip = g.center - direction * 12.0;
+        painter.line_segment([p, tip], Stroke::new(1.25, t.warning.gamma_multiply(0.6)));
+        painter.line_segment([tip, tip - direction * 8.0 + normal * 4.0], Stroke::new(1.25, t.warning));
+        painter.line_segment([tip, tip - direction * 8.0 - normal * 4.0], Stroke::new(1.25, t.warning));
+    }
+    painter.circle(g.center, 4.0, t.panel, Stroke::new(1.0, t.text_dim));
+    // An original sun handle. A back light is hollow; the guide's back half is dashed.
+    let front = options.light_direction()[2] >= 0.0;
+    painter.circle(p, 9.0, if front { t.warning } else { t.panel }, Stroke::new(2.0, t.warning));
+    for i in 0..8 {
+        let angle = i as f32 * std::f32::consts::TAU / 8.0;
+        let direction = vec2(angle.cos(), angle.sin());
+        painter.line_segment([p + direction * 13.0, p + direction * 17.0], Stroke::new(1.5, t.warning));
+    }
+    let name = crate::i18n::tr_ctx(crate::i18n::current(), "lighting", "Light");
+    let galley = painter.layout_no_wrap(name.to_string(), FontId::proportional(11.0), t.warning);
+    let name_pos = p - vec2(galley.size().x * 0.5, 25.0 + galley.size().y);
+    painter.rect_filled(Rect::from_min_size(name_pos - vec2(4.0, 2.0), galley.size() + vec2(8.0, 4.0)), 3.0, t.panel);
+    painter.galley(name_pos, galley, t.warning);
+    if drag.is_some() {
+        let text = format!("{} {:.1}°   {} {:.1}°", tl!("Direction"), d.f64("lightAzimuth", -45.0), tl!("Elevation"), d.f64("lightElevation", 45.0));
+        let galley = painter.layout_no_wrap(text, FontId::proportional(11.5), t.text_strong);
+        let pos = g.center + vec2(0.0, radius + 56.0);
+        painter.rect_filled(Rect::from_center_size(pos, galley.size() + vec2(12.0, 6.0)), 4.0, t.panel);
+        painter.galley(pos - galley.size() * 0.5, galley, t.text_strong);
+    }
+}
+
+#[cfg(test)]
+#[path = "tests_revolve_gizmo.rs"]
+mod tests;

crates/ui-egui/src/dialogs/tests.rs

@@ -176,6 +176,12 @@ fn raster_filter_dialogs_preview_and_apply() {
         ("pixelate.crystallize", "cellSize", "20"),
         ("pixelate.mezzotint", "type", "longLines"),
         ("pixelate.pointillize", "cellSize", "12"),
+        ("texture.craquelure", "crackDepth", "9"),
+        ("texture.grain", "grainType", "stippled"),
+        ("texture.mosaicTiles", "tileSize", "20"),
+        ("texture.patchwork", "relief", "20"),
+        ("texture.stainedGlass", "borderThickness", "2"),
+        ("texture.texturizer", "lightDirection", "bottomLeft"),
     ] {
         let mut app = app();
         let id = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 50, "height": 50})).unwrap()["id"].as_u64().unwrap();
@@ -203,6 +209,10 @@ fn raster_filter_dialogs_preview_and_apply() {
     assert_eq!(super::form::humanize("maxRadius"), "Max. Radius:");
     assert_eq!(super::form::humanize("channel3"), "Channel 3:");
     assert_eq!(super::form::humanize("cellSize"), "Cell Size:");
+    assert_eq!(super::form::humanize("lightDirection"), "Light Direction:");
+    let doc = vectorcraft_effects::effect_info("texture.texturizer").unwrap().params;
+    let ranks: Vec<usize> = ["texture", "scaling", "relief", "lightDirection", "invert"].iter().map(|k| super::effect::doc_rank(doc, k)).collect();
+    assert!(ranks.windows(2).all(|w| w[0] < w[1]) && ranks[4] < usize::MAX, "{ranks:?}");
 }
 
 #[test]
@@ -218,6 +228,26 @@ fn effect_dialog_applies_to_its_appearance_item() {
     assert!(n.appearance.effects.is_empty() && n.appearance.items[0].effects().is_empty());
 }
 
+#[test]
+fn revolve_dialog_preview_cancel_confirm_and_undo() {
+    let mut app = app();
+    app.run("path.create", json!({"d":"M150 40 L180 60 L180 140 L150 160"})).unwrap();
+    app.run("select.all", json!({})).unwrap();
+    let before = app.session.doc().unwrap().doc.clone();
+    app.run("effect.dialog", json!({"effect":"threeD.revolve","item":null})).unwrap();
+    frame(&mut app, Default::default());
+    assert!(app.session.in_interaction());
+    cancel(&mut app);
+    assert_eq!(app.session.doc().unwrap().doc, before);
+    app.run("effect.dialog", json!({"effect":"threeD.revolve","item":null})).unwrap();
+    app.ui.dialog.as_mut().unwrap().fields.insert("angle".into(), json!(180));
+    frame(&mut app, Default::default());
+    confirm(&mut app).unwrap();
+    assert_ne!(app.session.doc().unwrap().doc, before);
+    app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(app.session.doc().unwrap().doc, before);
+}
+
 #[test]
 fn dialogs_are_as_tall_as_their_content() {
     // The save prompt, shown after a taller dialog, is as tall as its text and buttons: no empty
@@ -404,6 +434,38 @@ fn a_dialog_opens_with_its_first_field_focused_so_typing_and_enter_apply() {
     assert_eq!(node.appearance.effects.last().map(|e| e.params["scaleH"].clone()), Some(json!(50.0)));
 }
 
+/// #1000: a count typed in Object › Create Object Mosaic… reaches the command (a whole number typed
+/// in a command's dialog is an integer), so the mosaic has that many columns, not the 10 × 10 grid.
+#[test]
+fn object_mosaic_makes_the_grid_typed_in_its_dialog() {
+    let mut app = app();
+    app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 60, "height": 40})).unwrap();
+    app.run("object.rasterize", json!({"ppi": 72})).unwrap();
+    let ctx = egui::Context::default();
+    theme::install_fonts(&ctx);
+    theme::apply(&ctx, Default::default());
+    let frame = |app: &mut VectorcraftApp, events: Vec<egui::Event>| {
+        let mut out = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| show(app, ui.ctx()));
+        out.textures_delta.clear();
+    };
+    let entry = crate::menus::menu_entries(&app).into_iter().find(|e| e.label == "Create Object Mosaic…").expect("menu item");
+    let (cmd, params) = crate::menus::click_target(&entry.label, entry.command.as_deref().unwrap(), &entry.params);
+    crate::menus::invoke(&mut app, &cmd, params);
+    // Its first field, Columns, is focused: type 3 over it and press Enter.
+    frame(&mut app, vec![]);
+    frame(&mut app, vec![egui::Event::Text("3".into())]);
+    let enter = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() };
+    frame(&mut app, vec![enter]);
+    assert!(app.ui.dialog.is_none());
+    let mut tiles = None;
+    app.session.doc().unwrap().doc.walk(|n| {
+        if n.name.as_deref() == Some("Object Mosaic") {
+            tiles = n.children().map(|c| c.len());
+        }
+    });
+    assert_eq!(tiles, Some(3 * 10));
+}
+
 /// #793: Artboard Options lists its fields as Name, Width, Height, not by key.
 #[test]
 fn artboard_options_lists_name_then_width_and_height() {

crates/ui-egui/src/dialogs/tests_revolve.rs

@@ -0,0 +1,201 @@
+//! Real pointer interaction with Revolve's compact controls.
+use super::*;
+use crate::{dialogs, theme};
+use egui::{Event, PointerButton, Rect, Vec2, pos2};
+use vectorcraft_engine::Session;
+
+struct Harness {
+    app: VectorcraftApp,
+    ctx: egui::Context,
+    screen: Vec2,
+    texts: Vec<(String, Rect)>,
+}
+
+impl Harness {
+    fn new(screen: Vec2) -> Self {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width":300,"height":300})).unwrap();
+        app.run("path.create", json!({"d":"M150 40 L180 60 L180 140 L150 160"})).unwrap();
+        app.run("paint.setFill", json!({"color":"#338ad6"})).unwrap();
+        app.run("effect.dialog", json!({"effect":REVOLVE,"item":null})).unwrap();
+        let ctx = egui::Context::default();
+        theme::install_fonts(&ctx);
+        theme::apply(&ctx, Default::default());
+        Self { app, ctx, screen, texts: vec![] }
+    }
+
+    fn frame(&mut self, events: Vec<Event>) {
+        let input = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, self.screen)), events, ..Default::default() };
+        let mut out = self.ctx.run_ui(input, |ui| dialogs::show(&mut self.app, ui.ctx()));
+        out.textures_delta.clear();
+        fn collect(shape: &egui::Shape, clip: Rect, texts: &mut Vec<(String, Rect)>) {
+            match shape {
+                egui::Shape::Text(t) if clip.contains_rect(t.visual_bounding_rect()) => {
+                    texts.push((t.galley.text().to_string(), t.visual_bounding_rect()))
+                }
+                egui::Shape::Vec(shapes) => shapes.iter().for_each(|s| collect(s, clip, texts)),
+                _ => {}
+            }
+        }
+        self.texts.clear();
+        out.shapes.iter().for_each(|s| collect(&s.shape, s.clip_rect, &mut self.texts));
+    }
+
+    fn settle(&mut self) {
+        for _ in 0..5 {
+            self.frame(vec![]);
+        }
+    }
+
+    fn rect(&self, text: &str) -> Rect {
+        self.texts.iter().find(|(s, _)| s == text).map(|(_, r)| *r).unwrap_or_else(|| panic!("missing text {text:?}"))
+    }
+
+    fn response(&self, id: impl std::hash::Hash + std::fmt::Debug) -> Rect {
+        self.ctx.read_response(Id::new(id)).unwrap().rect
+    }
+
+    fn click(&mut self, p: Pos2) {
+        self.frame(vec![Event::PointerMoved(p), button(p, true)]);
+        self.frame(vec![button(p, false)]);
+        self.settle();
+    }
+
+    fn drag(&mut self, p: Pos2, delta: Vec2) {
+        self.frame(vec![Event::PointerMoved(p), button(p, true)]);
+        for i in 1..=5 {
+            self.frame(vec![Event::PointerMoved(p + delta * (i as f32 / 5.0))]);
+        }
+        self.frame(vec![button(p + delta, false)]);
+        self.settle();
+    }
+
+    fn value(&self, key: &str) -> f64 {
+        self.app.ui.dialog.as_ref().unwrap().f64(key, 0.0)
+    }
+}
+
+fn button(pos: Pos2, pressed: bool) -> Event {
+    Event::PointerButton { pos, button: PointerButton::Primary, pressed, modifiers: Default::default() }
+}
+
+#[test]
+fn values_labels_sliders_and_reset_dots_change_the_live_effect_in_one_undo_step() {
+    let mut h = Harness::new(vec2(1280.0, 900.0));
+    let before = h.app.session.doc().unwrap().doc.clone();
+    h.settle();
+    assert!(!h.rect("Advanced").is_negative(), "Advanced is visible without scrolling in a normal window");
+    let panel = h.ctx.memory(|m| m.area_rect(Id::new(("dialog", "effect")).with("revolve"))).unwrap();
+    assert!(panel.width() < 420.0 && panel.height() < 540.0, "compact controls: {panel:?}");
+    let label = h.rect("Rotation X");
+    h.drag(pos2(label.left() + LABEL_W + 6.0 + VALUE_W / 2.0, label.center().y), vec2(40.0, 0.0));
+    assert!(h.value("rotationX") > 0.0, "the value itself drags");
+    let label = h.rect("Rotation Y");
+    h.drag(label.center(), vec2(40.0, 0.0));
+    assert!(h.value("rotationY") > 0.0, "the label scrubs");
+    let label = h.rect("Revolve angle");
+    h.click(pos2(label.left() + LABEL_W + VALUE_W + 24.0, label.center().y));
+    assert!(h.value("angle") < 180.0, "the slider changes the sweep");
+    h.click(h.response(("revolve-reset", "rotationX")).center());
+    assert_eq!(h.value("rotationX"), 0.0);
+    assert!(h.value("angle") < 180.0, "a dot resets only its own setting");
+    let node = h.app.session.doc().unwrap().doc.node(h.app.session.doc().unwrap().selection.objects[0]).unwrap();
+    assert_eq!(node.appearance.effects[0].params["angle"], json!(h.value("angle")));
+    h.click(h.response("revolve-reset-all").center());
+    let defaults = vectorcraft_effects::default_params(REVOLVE).unwrap();
+    let dialog = h.app.ui.dialog.as_ref().unwrap();
+    for (key, value) in defaults.as_object().unwrap() {
+        assert_eq!(dialog.fields.get(key), Some(value), "reset all: {key}");
+    }
+    dialogs::confirm(&mut h.app).unwrap();
+    h.app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(h.app.session.doc().unwrap().doc, before);
+}
+
+#[test]
+fn preview_off_changes_fields_without_changing_the_document() {
+    let mut h = Harness::new(vec2(1280.0, 900.0));
+    h.app.ui.dialog.as_mut().unwrap().fields.insert("preview".into(), json!(false));
+    let before = h.app.session.doc().unwrap().doc.clone();
+    h.settle();
+    h.drag(h.rect("Rotation Y").center(), vec2(40.0, 0.0));
+    assert!(h.value("rotationY") > 0.0);
+    assert_eq!(h.app.session.doc().unwrap().doc, before);
+    dialogs::cancel(&mut h.app);
+    assert_eq!(h.app.session.doc().unwrap().doc, before);
+}
+
+#[test]
+fn command_driven_fields_preview_and_small_windows_keep_the_buttons_reachable() {
+    let mut h = Harness::new(vec2(640.0, 480.0));
+    h.settle();
+    let dialog = h.app.ui.dialog.as_mut().unwrap();
+    dialog.fields.insert("angle".into(), json!(180));
+    h.settle();
+    let state = h.app.session.doc().unwrap();
+    let node = state.doc.node(state.selection.objects[0]).unwrap();
+    assert_eq!(node.appearance.effects[0].params["angle"], json!(180));
+    let screen = Rect::from_min_size(Pos2::ZERO, h.screen);
+    assert!(screen.contains_rect(h.rect("OK")) && screen.contains_rect(h.rect("Cancel")));
+    dialogs::cancel(&mut h.app);
+    assert!(!h.app.session.in_interaction());
+}
+
+#[test]
+fn lighting_tab_shows_light_fields_and_keeps_the_dialog_compact() {
+    let mut h = Harness::new(vec2(1280.0, 900.0));
+    h.settle();
+    h.click(h.rect("Lighting").center());
+    assert_eq!(h.app.ui.dialog.as_ref().unwrap().str("__gizmo"), "light");
+    for label in ["Shading", "Direction", "Elevation", "Intensity", "Ambient"] {
+        assert!(Rect::from_min_size(Pos2::ZERO, h.screen).contains_rect(h.rect(label)));
+    }
+    let panel = h.ctx.memory(|m| m.area_rect(Id::new(("dialog", "effect")).with("revolve"))).unwrap();
+    assert!(panel.width() < 420.0 && panel.height() < 460.0, "compact lighting controls: {panel:?}");
+    h.drag(h.rect("Direction").center(), vec2(24.0, 0.0));
+    assert_ne!(h.value("lightAzimuth"), -45.0);
+    h.click(h.response(("revolve-reset", "lightAzimuth")).center());
+    assert_eq!(h.value("lightAzimuth"), -45.0);
+    h.click(h.rect("Rotation").center());
+    assert_eq!(h.app.ui.dialog.as_ref().unwrap().str("__gizmo"), "rotation");
+    assert!(!h.rect("Rotation X").is_negative());
+}
+
+#[test]
+fn advanced_visibility_option_is_saved_resettable_and_leaves_preview_geometry_complete() {
+    let mut h = Harness::new(vec2(1280.0, 1000.0));
+    h.settle();
+    h.click(h.rect("Advanced").center());
+    let panel = h.ctx.memory(|m| m.area_rect(Id::new(("dialog", "effect")).with("revolve"))).unwrap();
+    h.frame(vec![
+        Event::PointerMoved(panel.center()),
+        Event::MouseWheel {
+            unit: egui::MouseWheelUnit::Point,
+            delta: vec2(0.0, -220.0),
+            phase: egui::TouchPhase::Move,
+            modifiers: Default::default(),
+        },
+    ]);
+    h.settle();
+    let before = vectorcraft_effects::revolve_art({
+        let state = h.app.session.doc().unwrap();
+        state.doc.node(state.selection.objects[0]).unwrap()
+    })
+    .unwrap();
+    let checkbox = h.rect("Keep visible surfaces only when expanding");
+    h.click(checkbox.center());
+    assert!(!h.app.ui.dialog.as_ref().unwrap().bool("expandVisibleOnly"));
+    let state = h.app.session.doc().unwrap();
+    let node = state.doc.node(state.selection.objects[0]).unwrap();
+    assert_eq!(node.appearance.effects[0].params["expandVisibleOnly"], json!(false));
+    assert_eq!(vectorcraft_effects::revolve_art(node), Some(before));
+    h.click(h.response(("revolve-reset", "expandVisibleOnly")).center());
+    assert!(h.app.ui.dialog.as_ref().unwrap().bool("expandVisibleOnly"));
+    h.click(h.rect("Keep visible surfaces only when expanding").center());
+    h.click(h.response("revolve-reset-all").center());
+    assert!(h.app.ui.dialog.as_ref().unwrap().bool("expandVisibleOnly"));
+    dialogs::confirm(&mut h.app).unwrap();
+    let state = h.app.session.doc().unwrap();
+    let loaded = vectorcraft_format::load(&vectorcraft_format::save(&state.doc, false)).unwrap();
+    assert_eq!(loaded.node(state.selection.objects[0]).unwrap().appearance.effects[0].params["expandVisibleOnly"], json!(true));
+}

crates/ui-egui/src/dialogs/tests_revolve_gizmo.rs

@@ -0,0 +1,250 @@
+//! Pointer gestures exercise the real artboard overlay and command preview, including rollback.
+use super::*;
+use crate::{dialogs, theme};
+use egui::{Event, Modifiers, PointerButton};
+use vectorcraft_engine::Session;
+
+struct Harness {
+    app: VectorcraftApp,
+    ctx: egui::Context,
+}
+
+impl Harness {
+    fn new() -> Self {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width":300,"height":300})).unwrap();
+        app.run("path.create", json!({"d":"M150 40 L180 60 L180 140 L150 160"})).unwrap();
+        app.run("paint.setFill", json!({"color":"#338ad6"})).unwrap();
+        app.run("effect.dialog", json!({"effect":REVOLVE,"item":null})).unwrap();
+        app.canvas_rect = Some(Rect::from_min_size(Pos2::ZERO, vec2(1280.0, 900.0)));
+        let v = app.view_mut().unwrap();
+        v.center = Point::new(270.0, 150.0);
+        v.zoom = 2.0;
+        v.fitted = true;
+        let ctx = egui::Context::default();
+        theme::install_fonts(&ctx);
+        theme::apply(&ctx, Default::default());
+        let mut h = Self { app, ctx };
+        h.settle();
+        h
+    }
+
+    fn frame(&mut self, events: Vec<Event>, modifiers: Modifiers) {
+        let events = std::iter::once(Event::ModifiersChanged(modifiers)).chain(events).collect();
+        let input = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(1280.0, 900.0))), events, ..Default::default() };
+        let mut out = self.ctx.run_ui(input, |ui| {
+            crate::shortcuts::handle(&mut self.app, ui.ctx());
+            egui::CentralPanel::default().show(ui, |ui| crate::canvas::show(&mut self.app, ui));
+            dialogs::show(&mut self.app, ui.ctx());
+        });
+        out.textures_delta.clear();
+    }
+
+    fn settle(&mut self) {
+        for _ in 0..5 {
+            self.frame(vec![], Modifiers::NONE);
+        }
+    }
+
+    fn geometry(&self) -> Geometry {
+        Geometry::new(&self.app, self.app.ui.dialog.as_ref().unwrap()).unwrap()
+    }
+
+    fn value(&self, key: &str) -> f64 {
+        self.app.ui.dialog.as_ref().unwrap().f64(key, 0.0)
+    }
+
+    fn start(&mut self, p: Pos2, modifiers: Modifiers) {
+        self.frame(vec![Event::PointerMoved(p)], modifiers);
+        self.frame(vec![button(p, true, modifiers)], modifiers);
+    }
+
+    fn release(&mut self, p: Pos2, modifiers: Modifiers) {
+        self.frame(vec![button(p, false, modifiers)], modifiers);
+        self.settle();
+    }
+
+    fn ring_drag(&mut self, axis: usize, modifiers: Modifiers) {
+        let g = self.geometry();
+        let ring = g.rings[axis];
+        // Choose a visible point belonging only to this ring, away from crossings.
+        let phase = (0..SAMPLES)
+            .map(|i| i as f32 * std::f32::consts::TAU / SAMPLES as f32)
+            .find(|a| g.hit(g.center + ring.point(*a)).is_some_and(|h| h.0 == axis) && ring.tangent(*a).length() > 40.0)
+            .unwrap();
+        let from = g.center + ring.point(phase);
+        self.start(from, modifiers);
+        let mut p = from;
+        for i in 1..=8 {
+            p = g.center + ring.point(phase + i as f32 * 0.045);
+            self.frame(vec![Event::PointerMoved(p)], modifiers);
+        }
+        self.release(p, modifiers);
+    }
+}
+
+fn button(pos: Pos2, pressed: bool, modifiers: Modifiers) -> Event {
+    Event::PointerButton { pos, pressed, button: PointerButton::Primary, modifiers }
+}
+fn escape() -> Event {
+    Event::Key { key: egui::Key::Escape, physical_key: None, pressed: true, repeat: false, modifiers: Modifiers::NONE }
+}
+
+#[test]
+fn each_ring_changes_only_its_rotation_field_and_cancel_restores_the_source() {
+    for (axis, key) in KEYS.iter().enumerate() {
+        let mut h = Harness::new();
+        let before = h.app.session.active().unwrap().interaction.as_ref().unwrap().doc.clone();
+        let original = KEYS.map(|key| h.value(key));
+        h.ring_drag(axis, Modifiers::NONE);
+        for (k, key) in KEYS.iter().enumerate() {
+            if k == axis {
+                assert!(h.value(key) > original[k] + 10.0, "axis {axis}, {}", h.value(key));
+            } else {
+                assert_eq!(h.value(key), original[k]);
+            }
+        }
+        let state = h.app.session.active().unwrap();
+        let node = state.doc.node(state.selection.objects[0]).unwrap();
+        assert_eq!(node.path_data(), before.node(node.id).unwrap().path_data(), "ring drags must not move source anchors");
+        assert_eq!(node.appearance.effects[0].params[*key], json!(h.value(key)));
+        dialogs::cancel(&mut h.app);
+        assert_eq!(h.app.session.doc().unwrap().doc, before);
+    }
+}
+
+#[test]
+fn ring_drag_snaps_and_confirm_is_one_undo_step() {
+    let mut h = Harness::new();
+    let before = h.app.session.active().unwrap().interaction.as_ref().unwrap().doc.clone();
+    h.ring_drag(2, Modifiers::SHIFT);
+    assert!(h.value("rotationZ") > 0.0);
+    assert_eq!(h.value("rotationZ") % 15.0, 0.0);
+    dialogs::confirm(&mut h.app).unwrap();
+    h.app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(h.app.session.doc().unwrap().doc, before);
+}
+
+#[test]
+fn free_orbit_and_light_drag_update_the_canvas_and_escape_restores_only_the_gesture() {
+    let mut h = Harness::new();
+    let before = super::super::form::params(h.app.ui.dialog.as_ref().unwrap());
+    let center = h.geometry().center;
+    h.start(center, Modifiers::NONE);
+    let p = center + vec2(50.0, 30.0);
+    h.frame(vec![Event::PointerMoved(p)], Modifiers::NONE);
+    assert_ne!(h.value("rotationX"), before["rotationX"].as_f64().unwrap());
+    assert_ne!(h.value("rotationY"), before["rotationY"].as_f64().unwrap());
+    h.frame(vec![escape()], Modifiers::NONE);
+    h.release(p, Modifiers::NONE);
+    assert!(h.app.ui.dialog.is_some());
+    assert_eq!(super::super::form::params(h.app.ui.dialog.as_ref().unwrap()), before);
+    let state = h.app.session.active().unwrap();
+    let node = state.doc.node(state.selection.objects[0]).unwrap();
+    assert_eq!(node.appearance.effects[0].params["rotationX"], before["rotationX"]);
+    assert_eq!(node.appearance.effects[0].params["rotationY"], before["rotationY"]);
+    h.app.ui.dialog.as_mut().unwrap().fields.insert("__gizmo".into(), json!("light"));
+    h.settle();
+    let light = light_position(h.geometry(), revolve_options(&before));
+    h.start(light, Modifiers::NONE);
+    let p = light + vec2(20.0, 25.0);
+    h.frame(vec![Event::PointerMoved(p)], Modifiers::NONE);
+    h.release(p, Modifiers::NONE);
+    assert_ne!(h.value("lightAzimuth"), -45.0);
+    assert_ne!(h.value("lightElevation"), 45.0);
+    h.frame(vec![escape()], Modifiers::NONE);
+    assert!(h.app.ui.dialog.is_none() && !h.app.session.in_interaction());
+}
+
+#[test]
+fn preview_off_has_no_gizmo_and_edge_on_rings_remain_finite() {
+    let mut h = Harness::new();
+    let d = h.app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("rotationX".into(), json!(0.0));
+    d.fields.insert("rotationY".into(), json!(0.0));
+    d.fields.insert("rotationZ".into(), json!(0.0));
+    h.settle();
+    h.ring_drag(0, Modifiers::NONE);
+    assert!(h.value("rotationX").is_finite() && h.value("rotationX").abs() > 1.0);
+    h.app.ui.dialog.as_mut().unwrap().fields.insert("preview".into(), json!(false));
+    h.settle();
+    assert!(!h.app.session.in_interaction());
+    let before = super::super::form::params(h.app.ui.dialog.as_ref().unwrap());
+    h.ring_drag(2, Modifiers::NONE);
+    assert_eq!(super::super::form::params(h.app.ui.dialog.as_ref().unwrap()), before);
+}
+
+#[test]
+fn light_rings_adjust_only_their_angle_and_snap_without_rotating_the_object() {
+    for (axis, key) in ["lightAzimuth", "lightElevation"].iter().enumerate() {
+        let mut h = Harness::new();
+        h.app.ui.dialog.as_mut().unwrap().fields.insert("__gizmo".into(), json!("light"));
+        h.settle();
+        let before = super::super::form::params(h.app.ui.dialog.as_ref().unwrap());
+        let from = h.geometry().light_labels()[axis].center();
+        h.start(from, Modifiers::SHIFT);
+        let delta = if axis == 0 { vec2(68.0, 0.0) } else { vec2(0.0, -43.0) };
+        h.frame(vec![Event::PointerMoved(from + delta)], Modifiers::SHIFT);
+        h.release(from + delta, Modifiers::SHIFT);
+        assert_ne!(h.value(key), before[*key].as_f64().unwrap());
+        assert_eq!(h.value(key) % 15.0, 0.0);
+        for unchanged in ["rotationX", "rotationY", "rotationZ", "lightIntensity", "ambient"] {
+            assert_eq!(h.value(unchanged), before[unchanged].as_f64().unwrap());
+        }
+        let other = if axis == 0 { "lightElevation" } else { "lightAzimuth" };
+        assert_eq!(h.value(other), before[other].as_f64().unwrap());
+        let state = h.app.session.active().unwrap();
+        let node = state.doc.node(state.selection.objects[0]).unwrap();
+        assert_eq!(node.appearance.effects[0].params[*key], json!(h.value(key)));
+    }
+}
+
+#[test]
+fn light_handle_preserves_the_back_side_and_escape_cancel_and_undo_restore_changes() {
+    let mut h = Harness::new();
+    let original = h.app.session.active().unwrap().interaction.as_ref().unwrap().doc.clone();
+    let d = h.app.ui.dialog.as_mut().unwrap();
+    d.fields.insert("__gizmo".into(), json!("light"));
+    d.fields.insert("lightAzimuth".into(), json!(135.0));
+    h.settle();
+    let before = super::super::form::params(h.app.ui.dialog.as_ref().unwrap());
+    let light = light_position(h.geometry(), revolve_options(&before));
+    h.start(light, Modifiers::NONE);
+    let to = light + vec2(-15.0, 12.0);
+    h.frame(vec![Event::PointerMoved(to)], Modifiers::NONE);
+    assert!(revolve_options(&super::super::form::params(h.app.ui.dialog.as_ref().unwrap())).light_direction()[2] < 0.0);
+    assert_ne!(h.value("lightElevation"), 45.0);
+    h.frame(vec![escape()], Modifiers::NONE);
+    h.release(to, Modifiers::NONE);
+    assert_eq!(super::super::form::params(h.app.ui.dialog.as_ref().unwrap()), before);
+    let state = h.app.session.active().unwrap();
+    assert_eq!(state.doc.node(state.selection.objects[0]).unwrap().appearance.effects[0].params["lightAzimuth"], before["lightAzimuth"]);
+    // A second gesture is kept by OK, and the whole dialog is one undo step.
+    let from = h.geometry().light_labels()[0].center();
+    h.start(from, Modifiers::NONE);
+    h.frame(vec![Event::PointerMoved(from + vec2(35.0, 0.0))], Modifiers::NONE);
+    h.release(from + vec2(35.0, 0.0), Modifiers::NONE);
+    dialogs::confirm(&mut h.app).unwrap();
+    h.app.run("edit.undo", json!({})).unwrap();
+    assert_eq!(h.app.session.doc().unwrap().doc, original);
+}
+
+#[test]
+fn light_elevation_is_bounded_and_shading_off_disables_the_light_gizmo() {
+    let mut h = Harness::new();
+    h.app.ui.dialog.as_mut().unwrap().fields.insert("__gizmo".into(), json!("light"));
+    h.settle();
+    let from = h.geometry().light_labels()[1].center();
+    h.start(from, Modifiers::NONE);
+    h.frame(vec![Event::PointerMoved(from - vec2(0.0, 400.0))], Modifiers::NONE);
+    h.release(from - vec2(0.0, 400.0), Modifiers::NONE);
+    assert_eq!(h.value("lightElevation"), 90.0);
+    h.app.ui.dialog.as_mut().unwrap().fields.insert("shade".into(), json!(false));
+    h.settle();
+    let before = super::super::form::params(h.app.ui.dialog.as_ref().unwrap());
+    let from = h.geometry().light_labels()[0].center();
+    h.start(from, Modifiers::NONE);
+    h.frame(vec![Event::PointerMoved(from + vec2(40.0, 0.0))], Modifiers::NONE);
+    h.release(from + vec2(40.0, 0.0), Modifiers::NONE);
+    assert_eq!(super::super::form::params(h.app.ui.dialog.as_ref().unwrap()), before);
+}

crates/ui-egui/src/dialogs/variables.rs

@@ -0,0 +1,388 @@
+//! The Variables dialogs (`variable.define`, `variable.bind`, `dataset.new`, `dataset.set`
+//! and `dataset.select`), opened from Window › Variables or the command palette.
+//!
+//! One dialog covers all of them: what it shows is what the command takes. A variable is a
+//! name and a kind; a dataset is a name and one field per variable — a text field for a
+//! `text` variable, a checkbox for a `visibility` one. `dataset.set` opens with the row's
+//! current values, so editing a row is editing what it already says.
+
+use serde_json::{Value, json};
+use vectorcraft_doc::{DataValue, VariableKind, Variables};
+
+use super::{DialogSpec, run_and_close};
+use crate::VectorcraftApp;
+use crate::state::Dialog;
+use crate::theme::Tokens;
+use crate::widgets;
+
+/// The dialog kind of every Variables dialog.
+pub const KIND: &str = "variables";
+
+/// The kinds a variable can have, as `variable.define` names them.
+const KINDS: [&str; 2] = ["text", "visibility"];
+
+/// What the dialog shows for each of [`KINDS`].
+fn kind_labels() -> [&'static str; 2] {
+    [tl!("Text"), tl!("Visibility")]
+}
+
+pub(super) const SPEC: DialogSpec =
+    DialogSpec { heading: |d| tl!(&d.str("__label")).to_string(), body, confirm, min_width: 380.0, ..DialogSpec::FORM };
+
+/// The command the dialog runs and what it is called.
+fn opened(id: &str) -> Option<&'static str> {
+    Some(match id {
+        "variable.define" => "New Variable",
+        "variable.rename" => "Variable Options",
+        "variable.bind" => "Bind Variable",
+        "dataset.new" => "New Data Set",
+        "dataset.set" => "Edit Data Set",
+        "dataset.rename" => "Rename Data Set",
+        "dataset.select" => "Select Data Set",
+        _ => return None,
+    })
+}
+
+/// The row `id` renames, which the dialog offers as a dropdown when the document has more than
+/// one. Variable Options renames the one the panel has highlighted, so it starts there.
+fn rename_of(id: &str) -> Option<&'static str> {
+    Some(match id {
+        "variable.rename" => "variable",
+        "dataset.rename" => "name",
+        _ => return None,
+    })
+}
+
+/// Open `id`'s dialog: OK runs the command with the fields below. `preselect` names the row
+/// a rename starts on (the panel's highlighted variable, the active dataset); without it, or
+/// when it no longer exists, the first row — the dialog still offers the dropdown.
+pub fn open(app: &mut VectorcraftApp, id: &str, preselect: Option<&str>) -> bool {
+    let Some(label) = opened(id) else { return false };
+    let Some(st) = app.session.active() else {
+        app.status(tl!("no document").to_string());
+        return true;
+    };
+    let vars = st.doc.variables.clone();
+    let mut fields = serde_json::Map::new();
+    match id {
+        "variable.define" => {
+            fields.insert("name".into(), json!(""));
+            fields.insert("kind".into(), json!(KINDS[0]));
+        }
+        "variable.bind" => {
+            fields.insert("variable".into(), json!(""));
+        }
+        "dataset.new" => {
+            fields.insert("name".into(), json!(""));
+            value_fields(&vars, vars.datasets.first().map(|d| &d.values), &mut fields);
+        }
+        "dataset.set" => {
+            // Without a row to edit there is nothing to open.
+            let Some(name) = vars.active_dataset.clone().or_else(|| vars.datasets.first().map(|d| d.name.clone())) else {
+                app.status(tl!("no data set to edit").to_string());
+                return true;
+            };
+            let Some(current) = vars.dataset(&name) else { return true };
+            fields.insert("name".into(), json!(name));
+            value_fields(&vars, Some(&current.values), &mut fields);
+        }
+        "dataset.select" => {
+            fields.insert("name".into(), json!(""));
+        }
+        _ => {
+            // A rename: which row, and its new name.
+            let key = rename_of(id).unwrap_or("name");
+            let names: Vec<&str> = if key == "variable" {
+                vars.variables.iter().map(|v| v.name.as_str()).collect()
+            } else {
+                vars.datasets.iter().map(|d| d.name.as_str()).collect()
+            };
+            if names.is_empty() {
+                app.status(if key == "variable" { tl!("no variable to rename").to_string() } else { tl!("no data set to rename").to_string() });
+                return true;
+            }
+            fields.insert(key.into(), json!(preselect.filter(|p| names.contains(p)).or(names.first().copied()).unwrap_or_default()));
+            fields.insert("newName".into(), json!(""));
+        }
+    }
+    fields.insert("__command".into(), json!(id));
+    fields.insert("__label".into(), json!(label));
+    app.ui.dialog = Some(Dialog::new(KIND, Value::Object(fields)));
+    true
+}
+
+/// Whether `id` opens one of these dialogs.
+pub fn opens(id: &str) -> bool {
+    opened(id).is_some()
+}
+
+/// One field per variable, prefilled from `current` (the row being edited, else the first row
+/// so a new one starts from something rather than from nothing).
+fn value_fields(vars: &Variables, current: Option<&std::collections::BTreeMap<String, DataValue>>, out: &mut serde_json::Map<String, Value>) {
+    for v in &vars.variables {
+        let value = match (current.and_then(|c| c.get(&v.name)), v.kind) {
+            (Some(DataValue::Text(t)), _) => json!(t),
+            (Some(DataValue::Visible(b)), _) => json!(b),
+            // Without a value in the row a text field starts empty (no value in this row) and
+            // a visibility one starts shown: its false is a value, so it is never "unset".
+            (None, VariableKind::Text) => json!(""),
+            (None, VariableKind::Visibility) => json!(true),
+        };
+        out.insert(value_key(&v.name), value);
+    }
+}
+
+/// A variable name as a field key. A field key shares the dialog's flat namespace with the
+/// command's own parameters, so names are prefixed to stay clear of `name` and `values`.
+fn value_key(name: &str) -> String {
+    format!("value:{name}")
+}
+
+fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
+    let t = Tokens::get(ui.ctx());
+    let Some(st) = app.session.active() else {
+        widgets::dim_label(ui, tl!("No document"));
+        return false;
+    };
+    let vars = &st.doc.variables;
+    let variable_names: Vec<&str> = vars.variables.iter().map(|v| v.name.as_str()).collect();
+    let dataset_names: Vec<&str> = vars.datasets.iter().map(|x| x.name.as_str()).collect();
+    egui::Grid::new("variables-grid").num_columns(2).spacing([12.0, 8.0]).show(ui, |ui| {
+        let label = |ui: &mut egui::Ui, text: &str| widgets::field_label(ui, egui::RichText::new(text).color(t.text));
+        match d.str("__command").as_str() {
+            "variable.define" => {
+                label(ui, tl!("Name"));
+                text(ui, d, "name", 220.0);
+                ui.end_row();
+                label(ui, tl!("Kind"));
+                // The kinds by their translated names; the field keeps the command's own word.
+                let labels = kind_labels();
+                let shown = KINDS.iter().position(|k| *k == d.str("kind")).and_then(|i| labels.get(i)).copied().unwrap_or_default();
+                if let Some(kind) = widgets::dropdown_names(ui, ("variables-dd", "kind"), shown, &labels, 220.0).and_then(|i| KINDS.get(i)) {
+                    d.fields.insert("kind".into(), json!(kind));
+                }
+                ui.end_row();
+            }
+            "variable.bind" => {
+                label(ui, tl!("Variable"));
+                dropdown(ui, d, "variable", &variable_names, 220.0);
+                ui.end_row();
+            }
+            "dataset.select" => {
+                label(ui, tl!("Data Set"));
+                dropdown(ui, d, "name", &dataset_names, 220.0);
+                ui.end_row();
+            }
+            // A rename: which row, and its new name.
+            "variable.rename" | "dataset.rename" => {
+                let (key, label_text, names) = if d.str("__command") == "variable.rename" {
+                    ("variable", tl!("Variable").to_string(), &variable_names)
+                } else {
+                    ("name", tl!("Data Set").to_string(), &dataset_names)
+                };
+                label(ui, &label_text);
+                dropdown(ui, d, key, names, 220.0);
+                ui.end_row();
+                label(ui, tl!("New Name"));
+                text(ui, d, "newName", 220.0);
+                ui.end_row();
+            }
+            _ => {
+                label(ui, tl!("Name"));
+                text(ui, d, "name", 220.0);
+                ui.end_row();
+                if vars.variables.is_empty() {
+                    widgets::dim_label(ui, tl!("Define a variable first"));
+                    ui.end_row();
+                    return;
+                }
+                // One row per variable, in the order they are defined, each with the editor
+                // its kind takes.
+                for v in &vars.variables {
+                    label(ui, &v.name);
+                    let key = value_key(&v.name);
+                    match v.kind {
+                        VariableKind::Text => text(ui, d, &key, 220.0),
+                        VariableKind::Visibility => checkbox(ui, d, &key),
+                    };
+                    ui.end_row();
+                }
+            }
+        }
+    });
+    false
+}
+
+/// A text field for `key`, written back as it is typed.
+fn text(ui: &mut egui::Ui, d: &mut Dialog, key: &str, width: f32) -> egui::Response {
+    let mut s = d.str(key);
+    let r = ui.add(egui::TextEdit::singleline(&mut s).desired_width(width));
+    if r.changed() {
+        d.fields.insert(key.into(), json!(s));
+    }
+    r
+}
+
+/// A checkbox for `key`, written back as it is toggled.
+fn checkbox(ui: &mut egui::Ui, d: &mut Dialog, key: &str) -> egui::Response {
+    let mut b = d.bool(key);
+    let r = ui.checkbox(&mut b, "");
+    if r.changed() {
+        d.fields.insert(key.into(), json!(b));
+    }
+    r
+}
+
+/// A dropdown over the document's names `options` (shown as they are, never translated) for
+/// `key`, written back as it changes. The empty option is first so a fresh dialog can still be
+/// filled in; a name that is no longer offered reads as empty rather than being silently
+/// swapped for another one.
+fn dropdown(ui: &mut egui::Ui, d: &mut Dialog, key: &str, options: &[&str], width: f32) {
+    let cur = d.str(key);
+    let mut labels: Vec<&str> = vec![""];
+    labels.extend_from_slice(options);
+    let shown = if cur.is_empty() || options.contains(&cur.as_str()) { cur.as_str() } else { "" };
+    if let Some(i) = widgets::dropdown_names(ui, ("variables-dd", key), shown, &labels, width) {
+        // The empty option (0) empties the field; the rest are `options`, one along.
+        d.fields.insert(key.into(), json!(i.checked_sub(1).and_then(|i| options.get(i)).copied().unwrap_or_default()));
+    }
+}
+
+/// The `values` object the dialog's fields mean: a text variable whose field is empty carries
+/// no value in this row, and a visibility checkbox is always a value — its false, too.
+fn values_of(d: &Dialog, vars: &Variables) -> Value {
+    let mut out = serde_json::Map::new();
+    for v in &vars.variables {
+        let key = value_key(&v.name);
+        if v.kind == VariableKind::Text {
+            let text = d.str(&key);
+            if !text.is_empty() {
+                out.insert(v.name.clone(), json!(text));
+            }
+        } else {
+            out.insert(v.name.clone(), json!(d.bool(&key)));
+        }
+    }
+    Value::Object(out)
+}
+
+fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
+    let cmd = d.str("__command");
+    let name = d.str("name");
+    let p = match cmd.as_str() {
+        "variable.define" => json!({"name": name, "kind": d.str("kind")}),
+        "variable.bind" => json!({"variable": d.str("variable")}),
+        "variable.rename" => json!({"name": d.str("variable"), "newName": d.str("newName")}),
+        "dataset.rename" => json!({"name": name, "newName": d.str("newName")}),
+        "dataset.new" | "dataset.set" => {
+            let values = app.session.active().map(|st| values_of(d, &st.doc.variables)).unwrap_or_else(|| json!({}));
+            json!({"name": name, "values": values})
+        }
+        "dataset.select" => json!({"name": name}),
+        _ => json!({}),
+    };
+    run_and_close(app, &cmd, p)
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+    use vectorcraft_engine::Session;
+
+    use super::*;
+
+    fn app_with_variables() -> VectorcraftApp {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width": 200, "height": 200})).unwrap();
+        app.run("variable.define", json!({"name": "Title", "kind": "text"})).unwrap();
+        app.run("variable.define", json!({"name": "Badge", "kind": "visibility"})).unwrap();
+        app
+    }
+
+    #[test]
+    fn defining_a_variable_from_the_dialog_works() {
+        let mut app = app_with_variables();
+        assert!(open(&mut app, "variable.define", None));
+        {
+            let d = app.ui.dialog.as_ref().unwrap();
+            assert_eq!(d.kind, KIND);
+            assert_eq!(d.str("name"), "");
+            assert_eq!(d.str("kind"), "text", "text is the default kind");
+        }
+        app.ui.dialog.as_mut().unwrap().fields.insert("name".into(), json!("Price"));
+        crate::dialogs::confirm(&mut app).unwrap();
+        let vars = app.run("variable.list", json!({})).unwrap();
+        assert!(vars["variables"].as_array().unwrap().iter().any(|v| v["name"] == "Price"));
+    }
+
+    #[test]
+    fn a_new_dataset_carries_the_dialogs_values_and_omits_the_empty_ones() {
+        let mut app = app_with_variables();
+        open(&mut app, "dataset.new", None);
+        {
+            let d = app.ui.dialog.as_mut().unwrap();
+            d.fields.insert("name".into(), json!("Row 1"));
+            d.fields.insert(value_key("Title"), json!("Hello"));
+            d.fields.insert(value_key("Badge"), json!(false));
+        }
+        crate::dialogs::confirm(&mut app).unwrap();
+        let sets = app.run("dataset.list", json!({})).unwrap();
+        assert_eq!(sets["datasets"][0]["name"], "Row 1");
+        assert_eq!(sets["datasets"][0]["values"]["Title"], json!({"text": "Hello"}));
+        assert_eq!(sets["datasets"][0]["values"]["Badge"], json!({"visible": false}));
+    }
+
+    #[test]
+    fn editing_a_dataset_opens_with_the_rows_own_values() {
+        let mut app = app_with_variables();
+        app.run("dataset.new", json!({"name": "Row 1", "values": {"Title": "Hello", "Badge": false}})).unwrap();
+        app.run("dataset.set", json!({"name": "Row 1", "values": {"Badge": true}})).unwrap();
+        open(&mut app, "dataset.set", None);
+        {
+            let d = app.ui.dialog.as_ref().unwrap();
+            assert_eq!(d.str("name"), "Row 1");
+            assert_eq!(d.str(&value_key("Title")), "", "the row carries no value for it");
+            assert!(d.bool(&value_key("Badge")), "the row's own value");
+        }
+        app.ui.dialog.as_mut().unwrap().fields.insert(value_key("Title"), json!("Changed"));
+        crate::dialogs::confirm(&mut app).unwrap();
+        let sets = app.run("dataset.list", json!({})).unwrap();
+        assert_eq!(sets["datasets"][0]["values"]["Title"], json!({"text": "Changed"}));
+        assert_eq!(sets["datasets"][0]["values"]["Badge"], json!({"visible": true}));
+    }
+
+    #[test]
+    fn selecting_a_dataset_from_the_dialog_applies_it() {
+        let mut app = app_with_variables();
+        let id = app.run("text.create", json!({"x": 10, "y": 10, "text": "x"})).unwrap()["id"].as_u64().unwrap();
+        app.run("variable.bind", json!({"variable": "Title", "ids": [id]})).unwrap();
+        app.run("dataset.new", json!({"name": "Row 1", "values": {"Title": "Hi"}})).unwrap();
+        open(&mut app, "dataset.select", None);
+        assert_eq!(app.ui.dialog.as_ref().unwrap().str("name"), "");
+        app.ui.dialog.as_mut().unwrap().fields.insert("name".into(), json!("Row 1"));
+        crate::dialogs::confirm(&mut app).unwrap();
+        assert_eq!(app.run("text.getRange", json!({"id": id})).unwrap()["text"], "Hi");
+    }
+
+    #[test]
+    fn only_the_variables_commands_open_one() {
+        let mut app = app_with_variables();
+        assert!(opens("dataset.set") && opens("variable.define"));
+        assert!(!opens("dataset.list") && !opens("dataset.next"), "no dialog for a query or a step");
+        assert!(!open(&mut app, "dataset.list", None), "and it opens nothing");
+        assert!(app.ui.dialog.is_none());
+    }
+
+    #[test]
+    fn rename_dialogs_start_on_the_preselected_row() {
+        let mut app = app_with_variables();
+        app.run("dataset.new", json!({"name": "Row 1", "values": {"Title": "Hello"}})).unwrap();
+        open(&mut app, "variable.rename", Some("Badge"));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().str("variable"), "Badge");
+        // A preselect the document no longer has falls back to the first row.
+        open(&mut app, "variable.rename", Some("Gone"));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().str("variable"), "Title");
+        open(&mut app, "dataset.rename", Some("Row 1"));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().str("name"), "Row 1");
+    }
+}