EPS tests: interpreter programs written from the PostScript Language Reference

Two EPS import tests become programs written from the PostScript Language
Reference (3rd ed.), with their own names and structure, covering the
interpreter features the importer relies on:
- `level_2_and_3_probes_read_as_vectors`: a resource category made from
  Generic, resources defined and found in it (§3.9), local and global VM
  (`currentglobal`, `setglobal`, `gcheck`, §3.7.2), `internaldict` probed
  through `stopped`, a halftone dictionary set and restored, `cachestatus`,
  `rootfont` and `currentcolorrendering`, drawing with its own procedures.
- `executable_strings_and_integer_keys`: shading dictionaries closed by an
  executable string (`(>>) cvx`, or a Level 1 builder with `counttomark`),
  procedures kept under integer keys run with `load` through `stopped`,
  `cvx`/`cvlit`/`xcheck` on strings.
Each was mutation-checked: making any of findresource, defineresource,
currentglobal, setglobal, gcheck, internaldict, sethalftone,
currenthalftone, currentcolorrendering, cachestatus, rootfont, stopped,
cvx, load, counttomark, cvlit or xcheck unknown fails a test, and so do
strings that `cvx` leaves literal, `load` refusing integer keys and
`gcheck` answering true.

The ROADMAP's EPS paragraph, file-formats row and last-updated line state
the PostScript features the reader supports; the legacy `.ai` comments in
the import module and the interpreter cite that format's published
specification (PRONOM fmt/423) for the `%AI` header comments and `u`/`U`
group operators the reader keys on.

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

README.md

@@ -194,7 +194,7 @@ milestones, and honest time-to-parity estimates.
 "a power user can't tell the difference". Everyday vector illustration is close to usable: drawing and path tools,
 Pathfinder and Shape Builder, paint, gradients, appearance and transparency, type with styles, threading and Hebrew/Arabic bidirectional layout, and
 files (SVG, PDF and PDF-compatible `.ai` with PDF/X, EPS, DXF, EMF/WMF, raster formats and PSD, Print, Package). The interface
-speaks English, Japanese, Traditional and Simplified Chinese and Spanish (and Czech and Brazilian Portuguese in the menus).
+speaks English, Japanese, Traditional and Simplified Chinese, Spanish and Italian (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.
 

ROADMAP.md

@@ -4,7 +4,7 @@ VectorCraft is a clean-room, open-source, pure-Rust reimplementation of the Adob
 
 This file tracks **how far we are and what's left**. Time estimates are wall-clock hours of continuous Claude Opus 5.5 agent work (including builds and the CI gate), given both for **one agent** and for **4–6 parallel agents** on disjoint crates. They are counted from the remaining work (see [Parity estimate](#parity-estimate)), calibrated against measured throughput, and updated as work lands.
 
-_Last updated: 2026-10-08 (after M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS files from Illustrator 2026, Inkscape/cairo, matplotlib, CorelDRAW, Affinity, LibreOffice and Ghostscript opening as vectors, and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482), Shift-drag marquees that toggle the objects or anchors they reach and a Lasso whose Alt subtraction keeps the rest of the selection (#483), the mouse wheel stepping the focused numeric field, the dialogs' and preferences' drag values made such fields (#485), Show The Home Screen When No Documents Are Open (#394), Numbers Without Units Are Points (#394), Auto-Collapse Iconic Panels (#394), the Contextual Task Bar moved by its handle and its More Options menu pinning and resetting its position, a designed macOS DMG window (#493), panels, panel groups and the Tools panel undocking intLine truncated
+_Last updated: 2026-10-08 (after M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS 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 window (#493), panels, panel groups and the Tools panel undocking into flLine truncated
 
 ## Where we are
 
@@ -101,7 +101,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
   - Tool flyouts tear off: dragging or clicking the tear-off bar on a flyout's right side (or releasing the long press over it) floats its group as a strip of tool buttons, moved by the same bar and put back in the toolbar by the × at its top (`window.floatTools`). While a group floats, the presses that would open its flyout raise the strip instead. Floating strips are kept with the preferences and in user workspaces. Not done: turning a strip vertical, docking it.
   - Panels undock (#495): a dock tab, a panel icon or a popped-out panel's title dragged out of the dock floats that panel inside the window, and the strip right of the dock's tabs floats the whole tabbed group. A floating group moves by its title bar, a tab dragged out of it floats on its own, and dropped on another group's title bar or tabs it stacks with that group; dropped on the dock, which lights up under the pointer, its panels go back where they live (the tabbed group or the icon column), as its × and the panel menus' Float Panel / Dock Panel do (`window.panel.float`, `window.panel.dock`). The Tools panel floats by its title bar and docks again on the window's left edge. Floating panels and the Tools panel's position are kept with the preferences and in user workspaces, and clamped into a smaller window. Not done: panels in separate OS windows, docking a panel into a dock group it doesn't belong to, reordering tabs by dragging, collapsing a floating group to icons, resizing floating panels.
   - The dock's double arrow collapses Properties, Layers and Libraries to icons at the top of the icon column, popping out like the other icon panels, and expands them again (`window.collapseDock`, kept with the preferences and in saved workspaces). The icon column's own arrow (expanding the icon panels into a full column) is not done.
-  - Localised UI: menus (in-window and native), panels, dialogs, toolbar and Preferences read from per-language catalogs (`crates/ui-egui/src/i18n`, see `docs/development.md`); Traditional Chinese (Taiwan), Simplified Chinese (mainland), Japanese and Spanish ship complete, and Czech and Brazilian Portuguese cover every menu label (and more), with system-locale detection on macOS, Windows, Linux and the web (the browser's languages, or `?lang=`), a VectorCraft ▸ Language menu and a Language preference. Names are never translated (fonts and their styles, layers, artboards, saved presets, user libraries, custom workspaces, recent files, plug-ins).
+  - Localised UI: menus (in-window and native), panels, dialogs, toolbar and Preferences read from per-language catalogs (`crates/ui-egui/src/i18n`, see `docs/development.md`); Traditional Chinese (Taiwan), Simplified Chinese (mainland), Japanese, Spanish and Italian ship complete, and Czech and Brazilian Portuguese cover every menu label (and more), with system-locale detection on macOS, Windows, Linux and the web (the browser's languages, or `?lang=`), a VectorCraft ▸ Language menu and a Language preference. Names are never translated (fonts and their styles, layers, artboards, saved presets, user libraries, custom workspaces, recent files, plug-ins).
   - Native macOS menu bar, vector tool cursors, a ⌘K command palette, middle-button panning with any tool.
   - macOS: Finder opens every format File › Open reads with VectorCraft (double-click, Open With, a drop on the Dock icon, `open -a`), at launch or while it runs; the release and `cargo xtask bundle` apps share one `Info.plist` that declares those document types, owning only VectorCraft's own formats. 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.
@@ -121,7 +121,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
   - **Shapes:** all shape tools (including Flare) and the line, arc, spiral and grid tools. Space held while dragging out a shape, line, arc, spiral or grid moves it at its current size. While a grid is dragged out, Up/Down change its rows (concentric dividers) and Left/Right its columns (radial dividers).
   - **Cutting:** Eraser, Scissors, Knife, Mirror & Cut, Line Cut and Rectangle Cut (real geometry, compound paths keep their holes).
   - **Transform:** Rotate, Reflect, Scale, Shear (click or Alt-click snaps the reference point to anchors and centres; Alt-click opens the tool's dialog, and a drag with Alt down at the release, from the press or pressed mid-drag, transforms a copy), Reshape, Free Transform (free and perspective distort and shear, switched by the keys held during a handle drag).
-  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. 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.
+  - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. On a rectangle that isn't square every corner is the same circle: a radius past half the shorter side stops there for all of them, the widgets sit on the corners as drawn and turn the edited corners red at that limit, CSS export writes the drawn radii, and rectangles saved stretched by older versions get circular corners when their corners are next set (#442).
   - **Pen:** Alt pressed in the middle of dragging out an anchor splits its handles and keeps the curve already shaped into it (only the outgoing handle follows the pointer); Space held while dragging out an anchor moves it, handles and all. 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.
@@ -137,7 +137,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
   - Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart.
   - Live effects with previewing dialogs: Distort & Transform, Path, Convert to Shape, 15 Warp styles, Round Corners, Scribble, Effect → Pathfinder (all 10 operations, live on groups; several loose objects are grouped first, in one undo step), Color Adjustments (Brightness/Contrast, Curves, Levels, Hue/Saturation, Shift to Color, Temperature/Tint, on vectors, live type and embedded images), and raster drop shadow, glows and feather. SVG and PDF export keep live effects (geometry baked; SVG raster effects as filters).
 - **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline), threaded text across any closed shapes, Fit Headline. Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. Font Size and Leading are combo boxes in the Character and Properties panels (Font Size in the Control bar too, beside the Character link, font family and style): type, step with ↑/↓ or the spinner, scrub the label, or pick a preset (6–72 pt, shown in the type unit; Leading also Auto), each pick one undo step; Kerning and Tracking list -100…200; a size, leading, kerning or tracking the selected text doesn't share shows blank (#458).
-- **Interface languages, vertical type:** VectorCraft ▸ Language (or Preferences ▸ User Interface) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese and Spanish (neutral international Spanish, for every `es-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish also translates status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech and Spanish ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese, and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a wrapped line flush with its start, and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline; Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline or the em box top/right, centre or bottom/left (ICF top and bottom not yet); Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
+- **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) and Italian (every `it-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish and Italian 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 and Italian ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line); kinsoku (the strict set) applies to horizontal and vertical Japanese, and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a wrapped line flush with its start, and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline; Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline or the em box top/right, centre or bottom/left (ICF top and bottom not yet); Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
 - **Transparency:** opacity masks (clip/invert/disable/link), exported as SVG `<mask>` and PDF soft masks.
 - **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), the Image Trace panel and Expand, plus Release in Properties; the View modes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
 - **Paint and appearance (M3):**
@@ -155,7 +155,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **Files (M4):**
   - `.vectorcraft` (lossless JSON, compressed, atomic saves, save down to v1), Save As with a format chooser, Save a Copy, Revert, templates, Data Recovery after a crash (browser tabs hold their copies with Web Locks too, so a background tab's copies are never taken for a crash's, and a tab repairs copies another removed when it resumes: #367), background save and export. The desktop app writes its warnings and errors (graphics adapter, a lost graphics device, panics the guard recovered from) to standard error and to `logs/vectorcraft.log` next to the preferences, the two previous runs kept and each file capped at 16 MiB, so a launch without a terminal still leaves something to attach to a bug report (#465).
   - SVG/SVGZ in and out with SVG Options, Preserve Editing, symbols, filters, rich text and physical units (SVG type under a transform or `viewBox` scale opens at the size it draws at, the scale moved into its size, leading, baseline shift and strokes, a stretch, skew or rotation kept as its transform: #396; a top-level group with a clip path, such as a clipped Inkscape layer, opens as a layer with a clipping mask, its name kept: #420); PDF and PDF-compatible `.ai` in and out (layers, with hidden ones kept hidden with their art and nested ones as sublayers, on pages of up to 64 million operators, art whose layer can't be told going to a hidden, non-printing layer rather than showing or printing: #419; strokes kept live, a fill and a stroke of one outline as one object; 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; masks, editable text with type set along a curve coming back as type on a path, each artboard's art on its own page only, an `.ai`'s white page under its layers left out rather than coming in as art, spot colours, presets, security, marks and bleed, ICC output intents, raster effects, subset fonts, PDF/X, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3). CMYK images keep their ink amounts from PDF import (and from placed CMYK TIFFs) to PDF export: a CMYK JPEG passes through unchanged, others stay CMYK (DeviceCMYK, or ICC-based CMYK in PDF/X-3/X-4) unless the Output settings convert them; the canvas shows them through the working CMYK profile (#320).
-  - EPS and DXF in and out, EMF/WMF in and out; PNG (with PNG-8), JPEG, WebP, GIF, TIFF, BMP, Targa and layered PSD export. EPS import runs Illustrator's AGM/CoolType prologs (resource categories, `resourceforall`, `clipsave`/`cliprestore`, subarrays and substrings that share storage, the standard dictionaries in `systemdict`, `dictstack`, `internaldict`, executable filters, `cshow`, metadata skipped with `flushfile`), so Illustrator 30 EPS files open as vectors. It also runs what other generators write (Discord feedback, #466, #469): Illustrator 2026's procsets (`gcheck`, `rootfont`, `currentcolorrendering`: every Illustrator 2026 EPS fell back to its preview before), cairo/Inkscape (`status`/`flushfile`, images with a mask, `ImageType 3`, reusable streams), matplotlib's Type 3 fonts, Illustrator 8 EPS (stock art's usual format: executable strings such as its gradients' `ed`, `load` by integer keys, #474), Ghostscript's `//name` immediate names, `pdfmark`, `token`, `execform` and user paths. Tiling patterns come in as pattern swatches, uncoloured ones too; Type 3 fonts' glyphs as their outlines, spaced by `ashow`/`widthshow`/`xshow`/`kshow`; mesh and function-based shadings (types 1, 4–7) as gradient meshes; sampled functions (type 0) and Flate/LZW predictors are read. When a file's PostScript still can't be read, it opens as its TIFF preview, its Windows metafile preview (as vectors) or its EPSI preview, and the warning (in the status bar, `document.open`/`app.open`/MCP `open_file` replies and `vectorcraft-cli info`) names the error, the operator that raised it and the procedures it ran in. Legacy PostScript `.ai` files (Illustrator 3–8, written with the prolog that defines their operators) keep their groups and nested groups (`u` … `U`), between and inside clipping groups; EPS and EMF/WMF import nest clips (and groups) at most 128 deep, so a hostile file can't exhaust the stack. DXF TEXT justified Fit or Aligned spans its two points (stretched, or scaled as a whole).
+  - EPS and DXF in and out, EMF/WMF in and out; PNG (with PNG-8), JPEG, WebP, GIF, TIFF, BMP, Targa and layered PSD export. EPS import runs 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. 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).
   - Place and the Links panel, Package, File Info, Print with print presets, PostScript output and print tiling, slices and Save for Web, Export for Screens and Asset Export, CSS Properties, PNG/PDF/SVG/text clipboard flavours; files copied in a file manager paste as art (SVG, PDF, EMF/WMF, bitmaps) on every desktop platform, and Linux/Wayland reads the compositor's clipboard (#398); 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 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.
@@ -167,7 +167,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 |---|---|---|---|
 | M0 | Skeleton + vertical slice | ✅ done | — |
 | M1 | Selection, transform, layers, MCP | ✅ mostly done (transform reference point snaps to anchors/centres; rotated objects keep a rotated bounding box and their angle; Free Transform, Scale and Reflect along a rotated box pending) | 4–6 |
-| M2 | Drawing tools + smart guides | ✅ mostly done (Flare, Reshape, Live Corners widget dragging and per-corner radii and kinds landed, on any path's corners; Shaper, the remaining Pen modifier nuances) | 15–20 |
+| M2 | Drawing tools + smart guides | ✅ mostly done (Flare, Reshape, Live Corners widget dragging and per-corner radii and kinds landed; Shaper, the remaining Pen modifier nuances) | 15–20 |
 | M3 | Paint & appearance (swatches, color, gradient, stroke, appearance, transparency, styles) | ✅ done (M3.7–M3.98): swatches, groups, libraries, tints, Lab spots and Registration; Color Picker, Color panel, Color Guide, Color Themes, Edit Colors and Recolor Artwork; gradients that follow every transform, the annotator, linked stops, freeform gradients, focal points, gradients on strokes and Expand; stroke geometry, arrowheads, dashes fitted to corners, stroke on type, width profiles and the Width tool, Scale Strokes and preview bounds; Appearance targeting, container appearance, target circles, Expand Appearance; knockout, isolation, blend accuracy, CMYK blending, overprint, Attributes, masks and clipping, Flatten Transparency; graphic styles, links and libraries. Left: freeform and mixed spot/process gradients export as stops or process colours to SVG/PDF; confirm the Scale Strokes & Effects default | 4–8 |
 | M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out, EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, Asset Export, clipboard flavours, File Info. Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, polish | 3–6 |
 | M5 | Performance | 🟡 background render + caches + MT done; `vectorcraft-cli bench` and `vectorcraft-cli perf` (budget suite); file format v2 opens 3× faster (50k paths: 722 → 244 ms); raster effects (glows, shadows, blur, feather) no longer force the whole frame single-threaded (filtered offscreen per effect, verified equal to the single-threaded reference); effect-heavy demos need a clean-machine benchmark; dirty-region rendering, GPU backend spike pending | 15–25 |
@@ -199,7 +199,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Area | Weight | Done | Missing (main items) | One agent (h) |
 |---|---:|---:|---|---:|
 | Selection, transform & align tools | 6 | 85% | Free Transform/Scale/Reflect along a rotated box, Start Global Edit, transform nuances (the rotated persistent bounding box is done) | 4–6 |
-| Drawing tools | 7 | 85% | Shaper Groups (merge/punch overlapping shapes), pencil and the remaining pen modifier nuances, the freehand Tool Options' Keep selected, Alt to the Smooth tool, Blob Brush Merge Only with Selection and brush angle/roundness, Touch Type, Live Corners on corners between curved sides (and Relative rounding) | 10–15 |
+| Drawing tools | 7 | 85% | Shaper Groups (merge/punch overlapping shapes), pencil and the remaining pen modifier nuances, the freehand Tool Options' Keep selected, Alt to the Smooth tool, Blob Brush Merge Only with Selection and brush angle/roundness, Touch Type, Live Corners on plain paths and polygons (and Relative rounding) | 10–15 |
 | Path operations, Pathfinder, Shape Builder, Live Paint | 5 | 86% | Live Paint gap options, Shape Builder gap detection, options (Tool Options dialog, clicking a stroke in merge mode) and Shift-drag marquee | 3–6 |
 | Colour, swatches, gradients, patterns, mesh, recolor | 7 | 96% | freeform and mixed spot/process gradients in SVG/PDF (exported as stops or process colours), pattern fills in Expand | 2–4 |
 | Strokes, brushes, width profiles | 5 | 88% | brush options depth, brush libraries (generated in code), brushes driven by pen tilt, bearing and barrel rotation (6D art pens) | 12–20 |
@@ -214,7 +214,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, Collect for Export, row context menus, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers, drag-scrolling a long panel while dragging rows; artboard presets/rearrange polish (Document Setup, New Document and the rest of the Layers panel are done) | 4–7 |
 | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 |
 | Guides, grids, smart guides, snapping, rulers | 3 | 82% | global/video rulers, smart-guide preference depth, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451) | 3–5 |
-| File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, EPS checked against more real files (Illustrator 2026 and Inkscape files open as vectors; CorelDRAW, Affinity, LibreOffice, matplotlib and Ghostscript output checked with synthetic programs only; CID-keyed CJK type and `CCITTFaxDecode` images not read), legacy `.ai` files saved without the prolog that defines their operators (their own operator set isn't read yet), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
+| File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, 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 remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
 | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | polish only (all four are done) | 2–4 |
 | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity (flattener presets in PDF and print, overprint in PDF and composite print, Print dialog, presets, PostScript, marks, separations, Print Tiling, print overprint/flattener/bitmap options and printer profile are done) | 1–2 |
 | Automation | 3 | 60% | Variables (data merge), scripting surface, batch | 8–12 |

contributors/people.toml

@@ -21,3 +21,7 @@
 real_name = "Brandon Thomas"
 display_name = "Brandon Thomas"
 sync_github_name = false
+
+[people.callmeBalloch]
+real_name = "Riccardo Balloch"
+sync_github_name = false

crates/doc/src/corners.rs

@@ -1,271 +0,0 @@
-//! Live Corners on any path: the corners of its uncut outline (a live rectangle's or polygon's, a
-//! live path's, or a plain path's own), each one's radius and kind, and the anchors of the path as
-//! drawn that belong to each. [`set_corners`] edits them.
-
-use std::borrow::Cow;
-use std::collections::BTreeSet;
-
-use vectorcraft_geom::corners::{Corner, cut_corners, path_corners};
-use vectorcraft_geom::shapes::{self, CornerKind};
-use vectorcraft_geom::{Affine, PathData, Rect};
-
-use crate::node::{LiveShape, Node, NodeKind};
-use crate::selection::AnchorRef;
-
-/// The Live Corners of a path.
-#[derive(Clone, Debug)]
-pub struct LiveCorners<'a> {
-    /// The path with its corners uncut, in the corners' own space: a live rectangle's (its size
-    /// and radii in document units, see [`LiveShape::folded`]), else the document's.
-    pub base: Cow<'a, PathData>,
-    /// Maps `base` into the document.
-    pub xf: Affine,
-    /// The corners that can be cut, in anchor order ([`path_corners`] of `base`).
-    pub corners: Vec<Corner>,
-    radii: Vec<f64>,
-    kinds: Vec<CornerKind>,
-    /// For each anchor of the path as drawn (per subpath), the anchor of `base` it comes from.
-    sources: Vec<Vec<usize>>,
-}
-
-impl<'a> LiveCorners<'a> {
-    /// The Live Corners of `path` and its live shape; `None` for shapes without corners (ellipses,
-    /// lines).
-    pub fn new(path: &'a PathData, live: Option<&'a LiveShape>) -> Option<Self> {
-        let (base, xf, radii, kinds) = match live {
-            None => (Cow::Borrowed(path), Affine::IDENTITY, vec![], vec![]),
-            Some(l @ LiveShape::Rectangle { .. }) => {
-                let LiveShape::Rectangle { w, h, radii, kinds, xf } = l.folded() else { return None };
-                (Cow::Owned(shapes::rectangle(Rect::new(0.0, 0.0, w, h))), xf, radii.to_vec(), kinds.to_vec())
-            }
-            Some(l @ LiveShape::Polygon { radii, kinds, .. }) => (Cow::Owned(l.polygon_outline()), Affine::IDENTITY, radii.clone(), kinds.clone()),
-            Some(LiveShape::Path { base, radii, kinds }) => (Cow::Borrowed(base), Affine::IDENTITY, radii.clone(), kinds.clone()),
-            Some(LiveShape::Ellipse { .. } | LiveShape::Line { .. }) => return None,
-        };
-        let sources = if radii.iter().any(|r| *r > 0.0) {
-            cut_corners(&base, &radii, &kinds).1
-        } else {
-            let mut first = 0;
-            base.subpaths
-                .iter()
-                .map(|sp| {
-                    first += sp.anchors.len();
-                    (first - sp.anchors.len()..first).collect()
-                })
-                .collect()
-        };
-        Some(Self { corners: path_corners(&base), base, xf, radii, kinds, sources })
-    }
-
-    /// The Live Corners of a path object.
-    pub fn of(node: &'a Node) -> Option<Self> {
-        let NodeKind::Path { path, live, .. } = &node.kind else { return None };
-        Self::new(path, live.as_ref())
-    }
-
-    /// The corner at anchor `index` of `base`.
-    pub fn corner(&self, index: usize) -> Option<&Corner> {
-        self.corners.binary_search_by_key(&index, |c| c.index).ok().and_then(|i| self.corners.get(i))
-    }
-
-    /// The radius corner `index` is set to, in document units (drawn no larger than fits).
-    pub fn radius(&self, index: usize) -> f64 {
-        self.radii.get(index).copied().unwrap_or(0.0)
-    }
-
-    /// The kind corner `index` is cut with.
-    pub fn kind(&self, index: usize) -> CornerKind {
-        self.kinds.get(index).copied().unwrap_or_default()
-    }
-
-    /// Every corner.
-    pub fn all(&self) -> BTreeSet<usize> {
-        self.corners.iter().map(|c| c.index).collect()
-    }
-
-    /// The corners holding one of `anchors` (of the path as drawn).
-    pub fn corners_of(&self, anchors: &BTreeSet<AnchorRef>) -> BTreeSet<usize> {
-        anchors.iter().filter_map(|(si, ai)| self.sources.get(*si)?.get(*ai).copied()).filter(|k| self.corner(*k).is_some()).collect()
-    }
-
-    /// The corners Live Corners edit for a selection: those holding a selected anchor when the
-    /// path is partly selected (Direct Selection), else every corner.
-    pub fn picked(&self, partial: Option<&BTreeSet<AnchorRef>>) -> BTreeSet<usize> {
-        let picked = partial.map(|a| self.corners_of(a)).unwrap_or_default();
-        if picked.is_empty() { self.all() } else { picked }
-    }
-
-    /// The anchors of the path as drawn that belong to `corners` (to keep them selected as the
-    /// path changes).
-    pub fn anchors_of(&self, corners: &BTreeSet<usize>) -> BTreeSet<AnchorRef> {
-        let mut out = BTreeSet::new();
-        for (si, from) in self.sources.iter().enumerate() {
-            out.extend(from.iter().enumerate().filter(|(_, k)| corners.contains(k)).map(|(ai, _)| (si, ai)));
-        }
-        out
-    }
-
-    /// For each anchor of the path as drawn (per subpath), the anchor of `base` it comes from.
-    pub fn sources(&self) -> &[Vec<usize>] {
-        &self.sources
-    }
-
-    /// The radius (document units) and kind `corners` share (each `None` when they differ, or
-    /// for no corners).
-    pub fn style(&self, corners: &BTreeSet<usize>) -> (Option<f64>, Option<CornerKind>) {
-        fn shared<T: Copy>(mut it: impl Iterator<Item = T>, same: impl Fn(T, T) -> bool) -> Option<T> {
-            let first = it.next()?;
-            it.all(|x| same(x, first)).then_some(first)
-        }
-        let radius = shared(corners.iter().map(|k| self.radius(*k)), |a, b| (a - b).abs() < 1e-9);
-        (radius, shared(corners.iter().map(|k| self.kind(*k)), |a, b| a == b))
-    }
-}
-
-/// Set `radius` (document units; negative: 0) and/or `kind` on the `corners` (anchor indices of
-/// the uncut outline, see [`LiveCorners`]) of a path and its live shape, then cut the path again.
-/// A path that isn't a live shape keeps its uncut outline as a [`LiveShape::Path`], which is a
-/// plain path again once no corner is cut. Ellipses and lines have no corners: they stay as they
-/// are.
-pub fn set_corners(path: &mut PathData, live: &mut Option<LiveShape>, corners: &BTreeSet<usize>, radius: Option<f64>, kind: Option<CornerKind>) {
-    fn edit(radii: &mut [f64], kinds: &mut [CornerKind], corners: &BTreeSet<usize>, radius: Option<f64>, kind: Option<CornerKind>) {
-        for k in corners {
-            if let (Some(r), Some(slot)) = (radius, radii.get_mut(*k)) {
-                *slot = r.max(0.0);
-            }
-            if let (Some(kind), Some(slot)) = (kind, kinds.get_mut(*k)) {
-                *slot = kind;
-            }
-        }
-    }
-    /// One radius and kind per corner of an outline of `n` anchors while editing; none saved
-    /// when all are sharp or round.
-    fn edit_vec(
-        n: usize,
-        radii: &mut Vec<f64>,
-        kinds: &mut Vec<CornerKind>,
-        corners: &BTreeSet<usize>,
-        radius: Option<f64>,
-        kind: Option<CornerKind>,
-    ) {
-        radii.resize(n, 0.0);
-        kinds.resize(n, CornerKind::Round);
-        edit(radii, kinds, corners, radius, kind);
-        if radii.iter().all(|r| *r <= 0.0) {
-            radii.clear();
-        }
-        if kinds.iter().all(|k| *k == CornerKind::Round) {
-            kinds.clear();
-        }
-    }
-    let l = live.get_or_insert_with(|| LiveShape::Path { base: path.clone(), radii: vec![], kinds: vec![] });
-    // Radii are document lengths and corners circular, also on a rectangle from a file that kept
-    // an uneven scale in its transform (#442).
-    l.fold_scale();
-    match l {
-        LiveShape::Rectangle { radii, kinds, .. } => edit(radii, kinds, corners, radius, kind),
-        LiveShape::Polygon { sides, radii, kinds, .. } => edit_vec(*sides as usize, radii, kinds, corners, radius, kind),
-        LiveShape::Path { base, radii, kinds } => edit_vec(base.anchor_count(), radii, kinds, corners, radius, kind),
-        LiveShape::Ellipse { .. } | LiveShape::Line { .. } => return,
-    }
-    match live {
-        Some(LiveShape::Path { base, radii, kinds }) if radii.is_empty() && kinds.is_empty() => {
-            *path = std::mem::take(base);
-            *live = None;
-        }
-        Some(l) => *path = l.to_path(),
-        None => {}
-    }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use vectorcraft_geom::{Point, SubPath};
-
-    fn set(v: &[usize]) -> BTreeSet<usize> {
-        v.iter().copied().collect()
-    }
-
-    fn anchors(v: &[usize]) -> BTreeSet<AnchorRef> {
-        v.iter().map(|ai| (0, *ai)).collect()
-    }
-
-    #[test]
-    fn rectangle_corners_map_to_their_anchors() {
-        let l = LiveShape::Rectangle { w: 100.0, h: 50.0, radii: [0.0, 10.0, 0.0, 0.0], kinds: Default::default(), xf: Affine::IDENTITY };
-        let path = l.to_path();
-        let c = LiveCorners::new(&path, Some(&l)).unwrap();
-        // Anchors: top-left, the top-right corner's two, bottom-right, bottom-left.
-        assert_eq!(c.sources(), [vec![0, 1, 1, 2, 3]]);
-        assert_eq!(path.anchor_count(), 5);
-        assert_eq!(c.corners_of(&anchors(&[2, 4])), set(&[1, 3]));
-        assert!(c.corners_of(&anchors(&[9])).is_empty(), "out of range");
-        assert_eq!(c.anchors_of(&set(&[1, 3])), anchors(&[1, 2, 4]));
-        // Partly selected: the corners of the selected anchors; wholly (or no anchor): all four.
-        assert_eq!(c.picked(Some(&anchors(&[0]))), set(&[0]));
-        assert_eq!(c.picked(None), set(&[0, 1, 2, 3]));
-        assert_eq!(c.picked(Some(&anchors(&[]))), set(&[0, 1, 2, 3]));
-        assert_eq!(c.style(&set(&[1])), (Some(10.0), Some(CornerKind::Round)));
-        assert_eq!(c.style(&set(&[0, 1])), (None, Some(CornerKind::Round)));
-        assert_eq!(c.style(&set(&[0, 2, 3])), (Some(0.0), Some(CornerKind::Round)));
-        let e = LiveShape::Ellipse { w: 1.0, h: 1.0, pie: (0.0, 360.0), xf: Affine::IDENTITY };
-        assert!(LiveCorners::new(&e.to_path(), Some(&e)).is_none());
-    }
-
-    /// #511: a plain path (a star) rounds its corners and keeps them editable; with none cut it
-    /// is plain again.
-    #[test]
-    fn a_plain_path_keeps_its_cut_corners_live() {
-        let star = shapes::star(Point::new(100.0, 100.0), 50.0, 25.0, 5, 0.0);
-        let (mut path, mut live) = (star.clone(), None);
-        set_corners(&mut path, &mut live, &set(&[0, 2]), Some(5.0), None);
-        let Some(LiveShape::Path { base, radii, kinds }) = &live else { panic!("live corners: {live:?}") };
-        assert_eq!((base, radii.len(), kinds.len()), (&star, 10, 0));
-        assert_eq!(path.anchor_count(), 12, "two corners cut");
-        let c = LiveCorners::new(&path, live.as_ref()).unwrap();
-        assert_eq!(c.style(&set(&[0, 2])), (Some(5.0), Some(CornerKind::Round)));
-        assert_eq!(c.corners_of(&anchors(&[0, 11])), set(&[0]), "the first corner's cut ends the path");
-        // Kinds alone keep it live; squaring every corner makes it the plain star again.
-        set_corners(&mut path, &mut live, &set(&[0, 2]), Some(0.0), Some(CornerKind::Chamfer));
-        assert!(matches!(&live, Some(LiveShape::Path { radii, .. }) if radii.is_empty()));
-        set_corners(&mut path, &mut live, &set(&[0, 2]), None, Some(CornerKind::Round));
-        assert_eq!((path, live), (star, None));
-    }
-
-    /// A polygon's corners are cut in the document and survive a change of sides when shared.
-    #[test]
-    fn polygon_corners_follow_their_sides() {
-        let mut l = LiveShape::Polygon { radius: 50.0, sides: 6, xf: Affine::translate((100.0, 100.0)), radii: vec![], kinds: vec![] };
-        let (mut path, mut live) = (l.to_path(), Some(l.clone()));
-        set_corners(&mut path, &mut live, &set(&[0, 1, 2, 3, 4, 5]), Some(8.0), None);
-        assert_eq!(path.anchor_count(), 12);
-        l = live.clone().unwrap();
-        l.set_sides(8);
-        assert!(matches!(&l, LiveShape::Polygon { radii, .. } if *radii == vec![8.0; 8]));
-        assert_eq!(l.to_path().anchor_count(), 16);
-        // Mixed radii: the new corners are sharp.
-        set_corners(&mut path, &mut live, &set(&[1]), Some(3.0), None);
-        let mut l = live.unwrap();
-        l.set_sides(7);
-        assert!(matches!(&l, LiveShape::Polygon { radii, .. } if *radii == [8.0, 3.0, 8.0, 8.0, 8.0, 8.0, 0.0]));
-        // An uneven scale keeps the cuts circular: the radius scales by the mean scale.
-        let mut p = l.clone();
-        assert!(p.transform(Affine::scale_non_uniform(4.0, 1.0)));
-        assert!(matches!(&p, LiveShape::Polygon { radii, .. } if (radii[0] - 16.0).abs() < 1e-9));
-        assert!(!p.transform(Affine::translate((5.0, 0.0))), "a move needs no new cuts");
-    }
-
-    #[test]
-    fn open_paths_and_curves_keep_their_ends_and_smooth_anchors() {
-        let pen = PathData::single(SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(100.0, 0.0), Point::new(100.0, 80.0)], false));
-        let c = LiveCorners::new(&pen, None).unwrap();
-        assert_eq!(c.all(), set(&[1]));
-        assert_eq!(c.picked(Some(&anchors(&[0]))), set(&[1]), "an end is no corner: every corner");
-        let (mut path, mut live) = (pen.clone(), None);
-        set_corners(&mut path, &mut live, &c.all(), Some(10.0), None);
-        assert_eq!(path.anchor_count(), 4);
-        assert_eq!(path.subpaths[0].anchors[0].p, Point::new(0.0, 0.0));
-        assert_eq!(path.subpaths[0].anchors[3].p, Point::new(100.0, 80.0));
-    }
-}

crates/doc/src/lib.rs

@@ -10,7 +10,6 @@ pub mod assets;
 pub mod blend;
 pub mod clipnest;
 pub mod cmyk;
-pub mod corners;
 pub mod graph;
 pub mod hit;
 pub mod inks;
@@ -59,7 +58,6 @@ pub use appearance::{
     StrokeLayer, WidthProfile,
 };
 pub use assets::ExportAsset;
-pub use corners::LiveCorners;
 pub use graph::{GraphKind, GraphSpec};
 pub use hit::{Hit, HitKind};
 pub use links::{LinkInfo, PlacementOptions};

crates/doc/src/node.rs

@@ -1,16 +1,17 @@
 //! Document nodes.
 
+use std::collections::BTreeSet;
 use std::sync::Arc;
 
 use serde::{Deserialize, Serialize};
 use vectorcraft_color::BlendMode;
-use vectorcraft_geom::corners::cut_corners;
 use vectorcraft_geom::shapes::{self, CornerKind};
 use vectorcraft_geom::{Affine, BezPath, FillRule, PathData, Point, Rect};
 
 use crate::appearance::Appearance;
 use crate::live::{BlendSpec, EnvelopeKind, GradientMesh, Outliner};
 use crate::pattern::RepeatSpec;
+use crate::selection::AnchorRef;
 use crate::text::TextObject;
 
 /// Stable per-document object id. Never reused.
@@ -103,30 +104,11 @@ pub enum LiveShape {
         radius: f64,
         sides: u32,
         xf: Affine,
-        /// Corner radii in document units, by vertex from the first one clockwise (none: sharp).
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        radii: Vec<f64>,
-        /// Corner kinds, in the same order (none: round).
-        #[serde(default, skip_serializing_if = "all_round")]
-        kinds: Vec<CornerKind>,
     },
     Line {
         a: Point,
         b: Point,
     },
-    /// Any other path whose corners Live Corners cut (a star, a pen path): it keeps its uncut
-    /// outline so the corners stay editable. Without a cut corner it is a plain path again.
-    Path {
-        /// The path with its corners uncut, in the document.
-        base: PathData,
-        /// Corner radii in document units, by anchor index of `base` (counting every subpath's
-        /// anchors in order; missing: sharp).
-        #[serde(default, skip_serializing_if = "Vec::is_empty")]
-        radii: Vec<f64>,
-        /// Corner kinds, in the same order (missing: round).
-        #[serde(default, skip_serializing_if = "all_round")]
-        kinds: Vec<CornerKind>,
-    },
 }
 
 impl LiveShape {
@@ -137,7 +119,6 @@ impl LiveShape {
             LiveShape::Ellipse { .. } => "Ellipse",
             LiveShape::Polygon { .. } => "Polygon",
             LiveShape::Line { .. } => "Line",
-            LiveShape::Path { .. } => "Path",
         }
     }
     /// Regenerate the path.
@@ -147,33 +128,10 @@ impl LiveShape {
                 shapes::rectangle_with_corners(Rect::new(0.0, 0.0, *w, *h), *radii, *kinds).transformed(*xf)
             }
             LiveShape::Ellipse { w, h, xf, .. } => shapes::ellipse(Rect::new(0.0, 0.0, *w, *h)).transformed(*xf),
-            LiveShape::Polygon { radii, kinds, .. } => cut_corners(&self.polygon_outline(), radii, kinds).0,
+            LiveShape::Polygon { radius, sides, xf } => shapes::polygon(Point::ZERO, *radius, *sides, 0.0).transformed(*xf),
             LiveShape::Line { a, b } => shapes::line(*a, *b),
-            LiveShape::Path { base, radii, kinds } => cut_corners(base, radii, kinds).0,
         }
     }
-    /// A polygon's outline with its corners uncut, in the document (empty for other shapes).
-    pub fn polygon_outline(&self) -> PathData {
-        match self {
-            LiveShape::Polygon { radius, sides, xf, .. } => shapes::polygon(Point::ZERO, *radius, *sides, 0.0).transformed(*xf),
-            _ => PathData::default(),
-        }
-    }
-    /// Give a polygon `n` sides (3–1000). Its corners keep the radius and kind they shared; else
-    /// the corners past the old last one are sharp.
-    pub fn set_sides(&mut self, n: u64) {
-        let LiveShape::Polygon { sides, radii, kinds, .. } = self else { return };
-        *sides = n.clamp(3, 1000) as u32;
-        fn spread<T: Copy + PartialEq + Default>(v: &mut Vec<T>, n: usize) {
-            match v.first().copied() {
-                Some(x) if v.iter().all(|y| *y == x) => *v = vec![x; n],
-                Some(_) => v.resize(n, T::default()),
-                None => {}
-            }
-        }
-        spread(radii, *sides as usize);
-        spread(kinds, *sides as usize);
-    }
     /// Apply `a` to the shape. True when the shape is no longer `a` applied to the old path, so
     /// the caller must regenerate the path with [`LiveShape::to_path`].
     ///
@@ -182,27 +140,19 @@ impl LiveShape {
     /// only the rotation, reflection and position. The radii scale by the mean scale (the square
     /// root of the determinant), which [`LiveShape::keep_corners`] undoes for Scale Corners off.
     /// A shear can't keep circular corners: `xf` takes it, as do moves (so files saved with a
-    /// scale in `xf` keep their exact geometry until they're next transformed). A polygon's or a
-    /// path's corner radii are document lengths: they scale by the mean scale and the corners are
-    /// cut again, circular whatever `a` does.
+    /// scale in `xf` keep their exact geometry until they're next transformed).
     pub fn transform(&mut self, a: Affine) -> bool {
         match self {
             LiveShape::Rectangle { xf, .. } => {
                 *xf = a * *xf;
-                !moves_only(a) && self.fold_scale()
+                let [a0, a1, a2, a3, _, _] = a.as_coeffs();
+                let moves_only = (a0 - 1.0).abs() < 1e-12 && a1.abs() < 1e-12 && a2.abs() < 1e-12 && (a3 - 1.0).abs() < 1e-12;
+                !moves_only && self.fold_scale()
             }
-            LiveShape::Ellipse { xf, .. } => {
+            LiveShape::Ellipse { xf, .. } | LiveShape::Polygon { xf, .. } => {
                 *xf = a * *xf;
                 false
             }
-            LiveShape::Polygon { xf, radii, .. } => {
-                *xf = a * *xf;
-                scale_radii(radii, a)
-            }
-            LiveShape::Path { base, radii, .. } => {
-                base.transform(a);
-                scale_radii(radii, a)
-            }
             LiveShape::Line { a: p, b } => {
                 *p = a * *p;
                 *b = a * *b;
@@ -242,16 +192,52 @@ impl LiveShape {
     /// Divide live corner radii by `k`, the mean scale of a transform just applied, so the corners
     /// keep their size (Scale Corners off). False when nothing changed.
     pub fn keep_corners(&mut self, k: f64) -> bool {
-        let radii: &mut [f64] = match self {
-            LiveShape::Rectangle { radii, .. } => radii,
-            LiveShape::Polygon { radii, .. } | LiveShape::Path { radii, .. } => radii,
-            LiveShape::Ellipse { .. } | LiveShape::Line { .. } => return false,
-        };
-        if !radii.iter().any(|r| *r > 0.0) || k <= 1e-12 {
-            return false;
+        match self {
+            LiveShape::Rectangle { radii, .. } if radii.iter().any(|r| *r > 0.0) && k > 1e-12 => {
+                radii.iter_mut().for_each(|r| *r /= k);
+                true
+            }
+            _ => false,
         }
-        radii.iter_mut().for_each(|r| *r /= k);
-        true
+    }
+    /// The corner (radii order) of each anchor of a rectangle's path; empty for other shapes.
+    pub fn anchor_corners(&self) -> Vec<usize> {
+        match self {
+            LiveShape::Rectangle { w, h, radii, .. } => shapes::rectangle_anchor_corners(Rect::new(0.0, 0.0, *w, *h), *radii),
+            _ => vec![],
+        }
+    }
+    /// The corners of a rectangle that hold one of `anchors` (of its only subpath).
+    pub fn corners_of(&self, anchors: &BTreeSet<AnchorRef>) -> [bool; 4] {
+        let map = self.anchor_corners();
+        let mut out = [false; 4];
+        for k in anchors.iter().filter(|(si, _)| *si == 0).filter_map(|(_, ai)| map.get(*ai)) {
+            if let Some(c) = out.get_mut(*k) {
+                *c = true;
+            }
+        }
+        out
+    }
+    /// The corners Live Corners edit for a selection: those holding a selected anchor when the
+    /// shape is partly selected (Direct Selection), else all four.
+    pub fn picked_corners(&self, partial: Option<&BTreeSet<AnchorRef>>) -> [bool; 4] {
+        let picked = partial.map_or([true; 4], |a| self.corners_of(a));
+        if picked.contains(&true) { picked } else { [true; 4] }
+    }
+    /// The anchors of a rectangle's `corners` (to keep them selected as its path changes).
+    pub fn corner_anchors(&self, corners: [bool; 4]) -> BTreeSet<AnchorRef> {
+        self.anchor_corners().into_iter().enumerate().filter(|(_, k)| corners.get(*k) == Some(&true)).map(|(ai, _)| (0, ai)).collect()
+    }
+    /// The radius (in document units, see [`LiveShape::folded`]) and kind the `corners` of a
+    /// rectangle share (each `None` when they differ).
+    pub fn corner_style(&self, corners: [bool; 4]) -> (Option<f64>, Option<CornerKind>) {
+        let LiveShape::Rectangle { radii, kinds, .. } = self.folded() else { return (None, None) };
+        fn shared<T: Copy>(v: [T; 4], corners: [bool; 4], same: impl Fn(T, T) -> bool) -> Option<T> {
+            let mut it = v.into_iter().zip(corners).filter(|(_, on)| *on).map(|(x, _)| x);
+            let first = it.next()?;
+            it.all(|x| same(x, first)).then_some(first)
+        }
+        (shared(radii, corners, |a, b| (a - b).abs() < 1e-9), shared(kinds, corners, |a, b| a == b))
     }
     /// Rotation angle of the live shape in degrees (shown in the Properties panel).
     pub fn angle_deg(&self) -> f64 {
@@ -261,33 +247,14 @@ impl LiveShape {
                 c[1].atan2(c[0]).to_degrees()
             }
             LiveShape::Line { a, b } => (b.y - a.y).atan2(b.x - a.x).to_degrees(),
-            LiveShape::Path { .. } => 0.0,
         }
     }
 }
 
-fn all_round(kinds: &[CornerKind]) -> bool {
+fn all_round(kinds: &[CornerKind; 4]) -> bool {
     kinds.iter().all(|k| *k == CornerKind::Round)
 }
 
-/// Whether `a` only moves (no rotation, scale, shear or reflection).
-fn moves_only(a: Affine) -> bool {
-    let [a0, a1, a2, a3, _, _] = a.as_coeffs();
-    (a0 - 1.0).abs() < 1e-12 && a1.abs() < 1e-12 && a2.abs() < 1e-12 && (a3 - 1.0).abs() < 1e-12
-}
-
-/// Scale corner radii in document units by the mean scale of `a`, applied to their path. True
-/// when the path must be cut again: some corner is cut and `a` does more than move it (an
-/// uneven scale would otherwise make the cuts elliptical).
-fn scale_radii(radii: &mut [f64], a: Affine) -> bool {
-    if moves_only(a) || !radii.iter().any(|r| *r > 0.0) {
-        return false;
-    }
-    let k = a.determinant().abs().sqrt();
-    radii.iter_mut().for_each(|r| *r *= k);
-    true
-}
-
 /// What a transform scales besides geometry, by its mean scale (the square root of its
 /// determinant). `Scaling::default()` (and `false`) scales nothing else; `true` scales stroke
 /// weights and dashes only. Transforms the user asks for take theirs from Scale Strokes & Effects
@@ -1247,7 +1214,7 @@ impl Node {
 
     /// Shapes drawn with the shape tools (live rectangles, ellipses and polygons) show their centre.
     pub fn shows_center_by_default(&self) -> bool {
-        matches!(&self.kind, NodeKind::Path { live: Some(l), .. } if !matches!(l, LiveShape::Line { .. } | LiveShape::Path { .. }))
+        matches!(&self.kind, NodeKind::Path { live: Some(l), .. } if !matches!(l, LiveShape::Line { .. }))
     }
 
     /// Change this object's attributes with `f`; all-default attributes are dropped.
@@ -1309,9 +1276,23 @@ mod tests {
     }
 
     #[test]
-    fn corner_kinds_save_only_when_some_corner_isnt_round() {
+    fn rectangle_corners_map_to_their_anchors() {
         let mut l = LiveShape::Rectangle { w: 100.0, h: 50.0, radii: [0.0, 10.0, 0.0, 0.0], kinds: Default::default(), xf: Affine::IDENTITY };
-        // Older files read as round.
+        // Anchors: top-left, the top-right corner's two, bottom-right, bottom-left.
+        assert_eq!(l.anchor_corners(), [0, 1, 1, 2, 3]);
+        assert_eq!(l.to_path().anchor_count(), 5);
+        let set = |v: &[usize]| v.iter().map(|ai| (0, *ai)).collect::<BTreeSet<AnchorRef>>();
+        assert_eq!(l.corners_of(&set(&[2, 4])), [false, true, false, true]);
+        assert_eq!(l.corners_of(&set(&[9])), [false; 4], "out of range");
+        assert_eq!(l.corner_anchors([false, true, false, true]), set(&[1, 2, 4]));
+        // Partly selected: the corners of the selected anchors; wholly (or no anchor): all four.
+        assert_eq!(l.picked_corners(Some(&set(&[0]))), [true, false, false, false]);
+        assert_eq!(l.picked_corners(None), [true; 4]);
+        assert_eq!(l.picked_corners(Some(&set(&[]))), [true; 4]);
+        assert_eq!(l.corner_style([false, true, false, false]), (Some(10.0), Some(CornerKind::Round)));
+        assert_eq!(l.corner_style([true, true, false, false]), (None, Some(CornerKind::Round)));
+        assert_eq!(l.corner_style([true, false, true, true]), (Some(0.0), Some(CornerKind::Round)));
+        // Corner kinds save only when some corner isn't round, and older files read as round.
         let json = serde_json::to_value(&l).unwrap();
         assert!(json.get("kinds").is_none(), "{json}");
         assert_eq!(serde_json::from_value::<LiveShape>(json).unwrap(), l);
@@ -1321,16 +1302,7 @@ mod tests {
         let json = serde_json::to_value(&l).unwrap();
         assert_eq!(json["kinds"], serde_json::json!(["round", "chamfer", "round", "round"]));
         assert_eq!(serde_json::from_value::<LiveShape>(json).unwrap(), l);
-        // Polygons saved before Live Corners cut theirs read as sharp; a live path round-trips.
-        let p: LiveShape =
-            serde_json::from_value(serde_json::json!({"shape": "polygon", "radius": 10.0, "sides": 5, "xf": [1, 0, 0, 1, 0, 0]})).unwrap();
-        assert_eq!(p, LiveShape::Polygon { radius: 10.0, sides: 5, xf: Affine::IDENTITY, radii: vec![], kinds: vec![] });
-        let star = shapes::star(Point::new(0.0, 0.0), 20.0, 10.0, 5, 0.0);
-        let path = LiveShape::Path { base: star, radii: vec![2.0; 10], kinds: vec![] };
-        let json = serde_json::to_value(&path).unwrap();
-        assert_eq!((json["shape"].as_str(), json.get("kinds")), (Some("path"), None));
-        assert_eq!(serde_json::from_value::<LiveShape>(json).unwrap(), path);
-        assert_eq!(path.label(), "Path");
+        assert!(LiveShape::Ellipse { w: 1.0, h: 1.0, pie: (0.0, 360.0), xf: Affine::IDENTITY }.anchor_corners().is_empty());
     }
 
     /// A node holding a live rectangle (`w` × `h`, all radii `r`, placed by `xf`) and its path.
@@ -1455,8 +1427,7 @@ mod tests {
         assert!(near_xf(*xf, Affine::translate((5.0, 5.0))));
         let (a, b) = (folded.to_path().bounds().unwrap(), live.to_path().bounds().unwrap());
         assert!(near(a.x0, b.x0) && near(a.y0, b.y0) && near(a.x1, b.x1) && near(a.y1, b.y1), "same place and size: {a:?} {b:?}");
-        let corners = crate::LiveCorners::of(&n).unwrap();
-        assert_eq!(corners.style(&corners.all()).0, Some(40.0), "the radius in document units");
+        assert_eq!(live.corner_style([true; 4]).0, Some(40.0), "the radius in document units");
         // Nothing to fold: a moved, rotated or reflected rectangle and a sheared one stay as they are.
         let place = Affine::translate((5.0, 5.0)) * Affine::rotate(0.5) * Affine::scale_non_uniform(-1.0, 1.0);
         let shear = Affine::new([1.0, 0.0, 0.5, 1.0, 0.0, 0.0]);

crates/engine/src/cmd/create.rs

@@ -188,8 +188,7 @@ fn polygon(s: &mut Session, p: &Value) -> Result<Value> {
     let r = f64_req(p, "radius", "shape.polygon")?.abs();
     let sides = p.get("sides").and_then(Value::as_u64).unwrap_or(6).clamp(3, 1000) as u32;
     let rot = f64_or(p, "rotation", 0.0);
-    let xf = Affine::translate(c.to_vec2()) * Affine::rotate(rot.to_radians());
-    let live = LiveShape::Polygon { radius: r, sides, xf, radii: vec![], kinds: vec![] };
+    let live = LiveShape::Polygon { radius: r, sides, xf: Affine::translate(c.to_vec2()) * Affine::rotate(rot.to_radians()) };
     add_art(s, "Polygon", path_kind(live.to_path(), Some(live)), None)
 }
 

crates/engine/src/cmd/object.rs

@@ -1,13 +1,11 @@
 //! Object menu: transforms, arrange, group, lock/hide, compound paths, clipping masks, isolation,
 //! align & distribute, object properties.
 
-use std::collections::BTreeSet;
 use std::sync::Arc;
 
 use serde_json::{Value, json};
 use vectorcraft_color::{BlendMode, Paint};
-use vectorcraft_doc::corners::set_corners;
-use vectorcraft_doc::{Appearance, Document, Knockout, LiveCorners, LiveShape, Node, NodeId, NodeKind, OrientedBox, Scaling};
+use vectorcraft_doc::{Appearance, Document, Knockout, Node, NodeId, NodeKind, OrientedBox, Scaling};
 use vectorcraft_geom::shapes::CornerKind;
 use vectorcraft_geom::{Affine, FillRule, Point, Rect, Vec2};
 
@@ -196,7 +194,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Live Shape Properties",
             [],
             None,
-            "{id?, ids?, radius?: pt, kind?: \"round\"|\"invertedRound\"|\"chamfer\", corners?: [i…], sides?: n} (Live Corners on any path: radius and kind set its corners (anchors without handles between two straight sides): `corners` (anchor indices of the path with its corners uncut, counting every subpath's anchors in order: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; a polygon's from the first vertex clockwise), else the corners with a Direct-Selected anchor, else every corner; each radius is drawn no larger than half the corner's shorter side allows; a path that isn't a live shape keeps its uncut outline so its corners stay editable, and is plain again once none is cut; sides: a polygon's, which keep the radius they shared)",
+            "{id?, ids?, radius?: pt, kind?: \"round\"|\"invertedRound\"|\"chamfer\", corners?: [0..3…], sides?: n} (Live Corners: radius and kind set a rectangle's corners: `corners` (0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left), else the corners with a Direct-Selected anchor, else all four; sides: a polygon's)",
             has_selection,
             set_live_shape
         ),
@@ -1008,12 +1006,21 @@ fn expand_shape(s: &mut Session, _: &Value) -> Result<Value> {
     ok()
 }
 
-/// The `corners` of `object.setLiveShape`: anchor indices of a path's uncut outline.
-fn corners_param(p: &Value) -> Result<Option<BTreeSet<usize>>> {
+/// The `corners` of `object.setLiveShape`: a mask of corner indices 0–3.
+fn corners_param(p: &Value) -> Result<Option<[bool; 4]>> {
     let Some(v) = p.get("corners").filter(|v| !v.is_null()) else { return Ok(None) };
-    let err = || bad("object.setLiveShape", format!("`corners` must list anchor indices (0, 1, 2…), not {v}"));
-    let list = v.as_array().ok_or_else(err)?;
-    list.iter().map(|k| k.as_u64().and_then(|k| usize::try_from(k).ok()).ok_or_else(err)).collect::<Result<_>>().map(Some)
+    let err = || {
+        bad(
+            "object.setLiveShape",
+            format!("`corners` must list corner indices 0–3 (0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left), not {v}"),
+        )
+    };
+    let mut mask = [false; 4];
+    for k in v.as_array().ok_or_else(err)? {
+        let slot = k.as_u64().and_then(|k| mask.get_mut(usize::try_from(k).ok()?)).ok_or_else(err)?;
+        *slot = true;
+    }
+    Ok(Some(mask))
 }
 
 fn set_live_shape(s: &mut Session, p: &Value) -> Result<Value> {
@@ -1028,37 +1035,39 @@ fn set_live_shape(s: &mut Session, p: &Value) -> Result<Value> {
         })
         .transpose()?;
     let radius = p.get("radius").and_then(Value::as_f64);
-    let sides = p.get("sides").and_then(Value::as_u64);
     s.edit("Live Shape", |d, sel| {
         for id in &ids {
-            let Some(NodeKind::Path { path, live, .. }) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
-            if let (Some(l @ LiveShape::Polygon { .. }), Some(n)) = (live.as_mut(), sides) {
-                l.set_sides(n);
-                *path = l.to_path();
-            }
-            if radius.is_none() && kind.is_none() {
-                continue;
-            }
+            let Some(NodeKind::Path { path, live: Some(live), .. }) = d.node_mut(*id).map(|n| &mut n.kind) else { continue };
+            // Radii are document lengths and corners circular, also on a rectangle from a file
+            // that kept an uneven scale in its transform (#442).
+            live.fold_scale();
             let partial = sel.anchors.get_mut(id);
-            // The corners to edit, the Direct-Selected ones and the anchor layout before the edit.
-            let Some(c) = LiveCorners::new(path, live.as_ref()) else { continue };
-            let picked = match &corners {
-                Some(k) if k.last().is_some_and(|k| *k >= c.base.anchor_count()) => {
-                    let n = c.base.anchor_count();
-                    let past: Vec<_> = k.range(n..).collect();
-                    return Err(bad("object.setLiveShape", format!("object {id} has anchors 0–{} for `corners`, not {past:?}", n.saturating_sub(1))));
+            let picked = corners.unwrap_or_else(|| live.picked_corners(partial.as_deref()));
+            let (layout, selected) = (live.anchor_corners(), partial.as_deref().map(|a| live.corners_of(a)));
+            match live {
+                vectorcraft_doc::LiveShape::Rectangle { radii, kinds, .. } => {
+                    for ((_, r), k) in picked.iter().zip(radii.iter_mut()).zip(kinds.iter_mut()).filter(|((on, _), _)| **on) {
+                        if let Some(radius) = radius {
+                            *r = radius.max(0.0);
+                        }
+                        if let Some(kind) = kind {
+                            *k = kind;
+                        }
+                    }
                 }
-                Some(k) => k.clone(),
-                None => c.picked(partial.as_deref()),
-            };
-            let (selected, layout) = (partial.as_deref().map(|a| c.corners_of(a)), c.sources().to_vec());
-            set_corners(path, live, &picked, radius, kind);
+                vectorcraft_doc::LiveShape::Polygon { sides, .. } => {
+                    if let Some(n) = p.get("sides").and_then(Value::as_u64) {
+                        *sides = n.clamp(3, 1000) as u32;
+                    }
+                }
+                _ => {}
+            }
+            *path = live.to_path();
             // Direct-Selected corners stay selected as they gain or lose anchors.
             if let (Some(anchors), Some(selected)) = (partial, selected)
-                && let Some(c) = LiveCorners::new(path, live.as_ref())
-                && c.sources() != layout
+                && live.anchor_corners() != layout
             {
-                *anchors = c.anchors_of(&selected);
+                *anchors = live.corner_anchors(selected);
             }
         }
         Ok(())

crates/engine/src/tests_livecorners.rs

@@ -1,11 +1,10 @@
-//! Live Corners: `object.setLiveShape` rounds the given corners of a live rectangle, the
-//! Direct-Selected ones or all four, sets corner kinds, and keeps selected corners selected; and
-//! does the same on any path's corners: a star, a live polygon, a pen path (#511).
+//! Live Corners on live rectangles: `object.setLiveShape` rounds the given corners, the
+//! Direct-Selected ones or all four, sets corner kinds, and keeps selected corners selected.
 
 use std::collections::BTreeSet;
 
 use serde_json::{Value, json};
-use vectorcraft_doc::{AnchorRef, LiveCorners, LiveShape, NodeKind};
+use vectorcraft_doc::{AnchorRef, LiveShape, NodeKind};
 use vectorcraft_geom::Affine;
 use vectorcraft_geom::shapes::CornerKind;
 
@@ -151,131 +150,3 @@ fn corners_of_a_non_square_rectangle_are_alike_circles() {
     run(&mut s, json!({"radius": 8}));
     assert_spans(&s, id, [8.0; 4]);
 }
-
-/// A selected five-pointed star at (200, 200) of radii 60 and 30: a plain path.
-fn star(s: &mut Session) -> NodeId {
-    NodeId(s.execute("shape.star", &json!({"cx": 200, "cy": 200, "radius1": 60, "radius2": 30})).unwrap()["id"].as_u64().unwrap())
-}
-
-fn node_path(s: &Session, id: NodeId) -> (vectorcraft_geom::PathData, Option<LiveShape>) {
-    let NodeKind::Path { path, live, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("not a path") };
-    (path.clone(), live.clone())
-}
-
-/// The radius and kind every corner of `id` shares, and how many corners it has.
-fn style(s: &Session, id: NodeId) -> (Option<f64>, Option<CornerKind>, usize) {
-    let c = LiveCorners::of(s.doc().unwrap().doc.node(id).unwrap()).unwrap();
-    let (r, k) = c.style(&c.all());
-    (r, k, c.corners.len())
-}
-
-/// The radius set on each of the first `N` corners of `id`.
-fn radii<const N: usize>(s: &Session, id: NodeId) -> [f64; N] {
-    let c = LiveCorners::of(s.doc().unwrap().doc.node(id).unwrap()).unwrap();
-    std::array::from_fn(|k| c.radius(k))
-}
-
-/// #511: a star (a plain path) rounds all ten corners as one step, keeps them editable (a new
-/// radius cuts the outline again rather than the cut path), and is the plain star again at 0.
-#[test]
-fn a_star_rounds_its_corners_and_keeps_them_live() {
-    let (mut s, _) = session();
-    let id = star(&mut s);
-    let (sharp, _) = node_path(&s, id);
-    assert_eq!(style(&s, id), (Some(0.0), Some(CornerKind::Round), 10));
-    let undo = s.doc().unwrap().history.undo.len();
-    run(&mut s, json!({"radius": 4}));
-    assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1);
-    let (path, live) = node_path(&s, id);
-    assert_eq!(path.anchor_count(), 20);
-    assert!(matches!(&live, Some(LiveShape::Path { base, .. }) if *base == sharp), "{live:?}");
-    assert_eq!(style(&s, id), (Some(4.0), Some(CornerKind::Round), 10));
-    assert_eq!(s.doc().unwrap().doc.node(id).unwrap().kind_label(), "Path");
-    run(&mut s, json!({"radius": 6, "kind": "chamfer"}));
-    assert_eq!((node_path(&s, id).0.anchor_count(), style(&s, id)), (20, (Some(6.0), Some(CornerKind::Chamfer), 10)));
-    run(&mut s, json!({"radius": 0, "kind": "round"}));
-    assert_eq!(node_path(&s, id), (sharp, None));
-    s.execute("edit.undo", &json!({})).unwrap();
-    assert_eq!(style(&s, id).0, Some(6.0));
-}
-
-/// Each corner stops at its own limit: its cut reaches halfway along its shorter side, so a
-/// star's neighbouring corners meet without overlapping.
-#[test]
-fn star_corners_stop_at_their_own_limit() {
-    let (mut s, _) = session();
-    let id = star(&mut s);
-    run(&mut s, json!({"radius": 1000}));
-    let (path, live) = node_path(&s, id);
-    let Some(LiveShape::Path { base, .. }) = live else { panic!("live corners") };
-    // Every cut ends at the middle of a side: each side's two cuts meet there.
-    let sp = &base.subpaths[0];
-    for (i, a) in sp.anchors.iter().enumerate() {
-        let mid = a.p.midpoint(sp.anchors[(i + 1) % 10].p);
-        assert!(path.anchors().any(|(_, _, b)| b.p.distance(mid) < 1e-9), "a cut ends at {mid:?}");
-    }
-    assert_eq!(style(&s, id).0, Some(1000.0), "the radius set is kept; it draws as large as fits");
-}
-
-/// #511: Direct Selection picks one of the star's anchors: that corner alone rounds, and both of
-/// its new anchors stay selected.
-#[test]
-fn a_direct_selected_star_anchor_rounds_its_corner_alone() {
-    let (mut s, _) = session();
-    let id = star(&mut s);
-    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 0]], "mode": "set"})).unwrap();
-    run(&mut s, json!({"radius": 5}));
-    assert_eq!(node_path(&s, id).0.anchor_count(), 11);
-    // The top tip's cut ends the path and starts it.
-    assert_eq!(selected_anchors(&s, id), Some(anchors(&[0, 10])));
-    assert_eq!(radii::<2>(&s, id), [5.0, 0.0]);
-    // Explicit corners, as MCP and the widgets give them.
-    run(&mut s, json!({"id": id.0, "corners": [1, 3], "radius": 2}));
-    assert_eq!(radii::<4>(&s, id), [5.0, 2.0, 0.0, 2.0]);
-    // Past the outline's last anchor is an error, and nothing changes.
-    assert!(s.execute("object.setLiveShape", &json!({"id": id.0, "corners": [10], "radius": 1})).is_err());
-    assert_eq!(node_path(&s, id).0.anchor_count(), 13);
-}
-
-/// A live polygon stays live with cut corners, which keep their radius as its sides change and
-/// stay circular when it is scaled unevenly (the radius scales by the mean scale).
-#[test]
-fn a_polygon_keeps_its_corners_through_sides_and_scales() {
-    let (mut s, _) = session();
-    let id = NodeId(s.execute("shape.polygon", &json!({"cx": 200, "cy": 200, "radius": 80, "sides": 6})).unwrap()["id"].as_u64().unwrap());
-    run(&mut s, json!({"radius": 10}));
-    let (path, live) = node_path(&s, id);
-    assert_eq!(path.anchor_count(), 12);
-    assert!(matches!(live, Some(LiveShape::Polygon { sides: 6, .. })));
-    run(&mut s, json!({"sides": 8}));
-    assert_eq!((node_path(&s, id).0.anchor_count(), style(&s, id)), (16, (Some(10.0), Some(CornerKind::Round), 8)));
-    s.execute("object.scale", &json!({"sx": 400, "sy": 100, "corners": true})).unwrap();
-    assert!(matches!(node_path(&s, id).1, Some(LiveShape::Polygon { .. })));
-    assert!((style(&s, id).0.unwrap() - 20.0).abs() < 1e-9);
-    // Every cut is a circle of that radius: its ends are as far from its centre.
-    let path = node_path(&s, id).0;
-    let c = LiveCorners::of(s.doc().unwrap().doc.node(id).unwrap()).unwrap();
-    for k in &c.corners {
-        let centre = k.on_bisector(20.0 / k.sin());
-        let ends = path.anchors().filter(|(_, _, a)| (a.p.distance(centre) - 20.0).abs() < 1e-6).count();
-        assert_eq!(ends, 2, "corner {} is circular", k.index);
-    }
-}
-
-/// #511: a pen path's corners round; its ends don't. An ellipse has no corners to round.
-#[test]
-fn a_pen_path_rounds_its_corners_but_not_its_ends() {
-    let (mut s, _) = session();
-    let pen = json!({"anchors": [{"x": 10, "y": 200}, {"x": 110, "y": 100}, {"x": 210, "y": 200}, {"x": 310, "y": 100}]});
-    let id = NodeId(s.execute("path.create", &pen).unwrap()["id"].as_u64().unwrap());
-    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
-    run(&mut s, json!({"radius": 8}));
-    let path = node_path(&s, id).0;
-    assert_eq!(path.anchor_count(), 6);
-    let sp = &path.subpaths[0];
-    assert_eq!((sp.anchors[0].p.x, sp.anchors[5].p.x), (10.0, 310.0), "the ends stay");
-    let e = NodeId(s.execute("shape.ellipse", &json!({"x": 0, "y": 0, "width": 50, "height": 30})).unwrap()["id"].as_u64().unwrap());
-    let before = node_path(&s, e);
-    run(&mut s, json!({"id": e.0, "radius": 8}));
-    assert_eq!(node_path(&s, e), before);
-}

crates/engine/tests/import_fuzz.rs

@@ -878,7 +878,8 @@ proptest! {
     }
 
     /// Hostile PostScript programs: operators in any order with any operands, opened and placed;
-    /// as Illustrator's too, its groups (`u` … `U`) unbalanced, deep and among clips.
+    /// as files in the legacy Illustrator format too (the creator line is what turns on its
+    /// documented `u` … `U` groups), the groups unbalanced, deep and among clips.
     #[test]
     fn eps_hostile_programs_never_panic(tokens in prop::collection::vec(arb_ps_token(), 0..60), illustrator in any::<bool>()) {
         let head = if illustrator { "%%Creator: Adobe Illustrator(R) 8.0\n%%EndComments\n/u {} def /U {} def" } else { "%%EndComments" };
@@ -952,7 +953,7 @@ fn arb_ps_token() -> impl Strategy<Value = String> {
             "/T3 << /FontType 3 /FontMatrix [0.1 0 0 0.1 0 0] /FontBBox [0 0 9 9] /Encoding [/a /b] /BuildChar { pop pop 9 0 setcharwidth 0 0 5 5 rectfill } >> definefont setfont",
             "/T4 << /FontType 3 /FontMatrix [1 0 0 1 0 0] /BuildGlyph { pop pop (x) show } /Encoding [/a] >> definefont setfont",
             "glyphshow", "xshow", "xyshow", "awidthshow", "kshow", "/a", "[1 2 3]",
-            // Executable strings and integer keys (Illustrator 8's procsets).
+            // Executable strings and keys other than names (PLRM 3rd ed., `cvx`, `load`).
             "(>>) cvx", "(1 2 add) cvx exec", "(x) cvx dup exec", "0 load", "1 { } def", "(mark) cvx cvlit"
         ])
         .prop_map(str::to_string),

crates/eps/src/import/interp.rs

@@ -56,8 +56,8 @@ pub(crate) struct Interp<'a> {
     pub g: GState,
     pub saved: Vec<GState>,
     pub out: Out,
-    /// The program is an Illustrator file's: its `u` … `U` (written at the top level, whatever
-    /// its prolog defines them as) are groups.
+    /// The program is in the legacy Illustrator format: its group operators `u` … `U` (at the top
+    /// level, whatever its prolog defines them as) are groups (see the module docs of `import`).
     pub illustrator: bool,
 }
 
@@ -157,7 +157,7 @@ impl<'a> Interp<'a> {
         loop {
             let Some(o) = self.lex.next()? else { return Ok(()) };
             let o = self.scanned(o, self.lex.immediate)?;
-            // An Illustrator group begins before its `u` runs (`Some(true)`) and ends after its `U`
+            // A group begins before its `u` runs (`Some(true)`) and ends after its `U`
             // has (`Some(false)`).
             let group = match &o {
                 Obj::Exec(name) if self.illustrator => match &**name {

crates/eps/src/import/mod.rs

@@ -11,9 +11,11 @@
 //! - `text`: fonts by name and type as point type; Type 3 fonts' glyphs drawn by their procedures.
 //! - `preview`: the previews a file carries, for when its PostScript can't be read.
 //!
-//! Clipped art comes in as clipping groups. In an Illustrator file (Illustrator 3–8, written with
-//! the prolog that defines its operators), the groups it writes (`u` … `U`, nested) come in as
-//! groups.
+//! Clipped art comes in as clipping groups. In a file in the legacy Illustrator format (versions
+//! 3–8, with the prolog that defines its operators), the group operators `u` … `U` (nested) come in
+//! as groups. The format's published specification documents its header comments (`%AI…`,
+//! `%%Creator`) and these operators: Adobe Illustrator File Format Specification, version 7.0
+//! (1998), listed by PRONOM at https://www.nationalarchives.gov.uk/PRONOM/fmt/423.
 //!
 //! The page is the file's `%%BoundingBox` (`%%HiResBoundingBox` when it has one), the first page
 //! of a PostScript file without one. A file whose program can't be read (an operator the
@@ -73,7 +75,8 @@ struct Dsc {
     /// `llx lly urx ury` in PostScript's default space.
     bbox: Option<[f64; 4]>,
     pages: Option<u32>,
-    /// Written by Illustrator (or in its format): `%AI…` comments, or Illustrator the creator.
+    /// In the legacy Illustrator format: its header has `%AI…` comments or names the app as the
+    /// creator (see the module docs for the specification).
     illustrator: bool,
 }
 

crates/eps/src/import/tests_generators.rs

@@ -592,105 +592,52 @@ showpage"##;
     assert!(near(bounds(&meshes[1]), Rect::new(150.0, 90.0, 190.0, 140.0)), "{:?}", bounds(&meshes[1]));
 }
 
-/// Illustrator's EPS (CS and later, through 2026): procsets that define helpers with
-/// `bdf`/`ndf`/`ddf`, probe the level and version (`{version cvr} stopped`), switch VM with
-/// `currentglobal`/`setglobal`, save and restore the whole graphics state through
-/// `currentcolorrendering`, `rootfont`, the colour transfers, half-tone and flatness, set up
-/// categories and keep fonts by VM (`gcheck`), while the art is drawn with procedures of their own.
+/// A procset written as the PostScript Language Reference (3rd ed.) describes the Level 2 and 3
+/// facilities programs probe before drawing: a resource category made from `Generic` and
+/// resources defined and found in it (§3.9), local and global VM (`currentglobal`, `setglobal`,
+/// `gcheck`, §3.7.2), `internaldict` (§8.2), a halftone dictionary (§7.4), the font cache
+/// (`cachestatus`), `rootfont` and the colour rendering dictionary (§7.1), each guarded or
+/// probed through `stopped` (§3.10), saving the state they change and drawing with procedures of
+/// their own.
 #[test]
-fn illustrator_procsets_read_as_vectors() {
+fn level_2_and_3_probes_read_as_vectors() {
     let program = r##"%%BeginProlog
-%%BeginResource: procset Adobe_AGM_Utils 1.0 0
-systemdict /setpacking known { currentpacking true setpacking } if
-userdict /Adobe_AGM_Utils 75 dict dup begin put
-/bdf { bind def } bind def
-/nd { null def } bdf
-/xdf { exch def } bdf
-/ddf { put } bdf
-/xddf { 3 -1 roll put } bdf
-/ndf { exch dup where { pop pop pop } { xdf } ifelse } def
-/gx { get exec } bdf
-/ps_level /languagelevel where { pop systemdict /languagelevel gx } { 1 } ifelse def
-/level2 ps_level 2 ge def
-/level3 ps_level 3 ge def
-/ps_version { version cvr } stopped { -1 } if def
-/set_gvm { currentglobal exch setglobal } bdf
-/reset_gvm { setglobal } bdf
-/makereadonlyarray { /packedarray where { pop packedarray } { array astore readonly } ifelse } bdf
-/GSTATE 22 dict def
-/get_gstate {
-  GSTATE begin
-  /clr_spc currentcolorspace def
-  mark currentcolor counttomark array astore /clr_comps xdf pop
-  /fnt rootfont def
-  /lw currentlinewidth def /lc currentlinecap def /lj currentlinejoin def /ml currentmiterlimit def
-  currentdash /dsh_o xdf /dsh_a xdf
-  /sa currentstrokeadjust def
-  /crd currentcolorrendering def
-  /op currentoverprint def
-  /bg currentblackgeneration cvlit def
-  /ucr currentundercolorremoval cvlit def
-  currentcolortransfer cvlit /gy_x xdf cvlit /b_x xdf cvlit /g_x xdf cvlit /r_x xdf
-  /ht currenthalftone def
-  /flt currentflat def
-  end
-} def
-/set_gstate {
-  GSTATE begin
-  clr_spc setcolorspace clr_comps aload pop setcolor
-  fnt setfont lw setlinewidth lc setlinecap lj setlinejoin ml setmiterlimit dsh_a dsh_o setdash
-  sa setstrokeadjust crd setcolorrendering op setoverprint
-  bg cvx setblackgeneration ucr cvx setundercolorremoval
-  r_x cvx g_x cvx b_x cvx gy_x cvx setcolortransfer
-  ht /HalftoneType get dup 9 eq exch 100 eq or { ht sethalftone } if
-  flt setflat
-  end
-} def
-/ct_tst { 1183615869 internaldict pop } stopped pop
-currentdict readonly pop
+/ExampleKit 40 dict def ExampleKit begin
+/defp { bind def } bind def
+% A category of our own, implemented by a copy of Generic's dictionary (§3.9.2).
+/Generic /Category findresource dup length dict copy /ExampleShapes exch /Category defineresource pop
+/Card << /W 80 /H 50 >> /ExampleShapes defineresource pop
+% VM: a dictionary made in global VM, then the VM mode put back.
+/wasglobal currentglobal def true setglobal /Shared 4 dict def wasglobal setglobal
+/vm Shared gcheck { (global) } { (local) } ifelse def
+% Probes that fail on some interpreters, inside stopped.
+/hasinternal { 1183615869 internaldict } stopped { false } { pop true } ifelse def
+/screen << /HalftoneType 1 /Frequency 85 /Angle 15 /SpotFunction { 180 mul cos exch 180 mul cos add 2 div } >> def
+/oldscreen currenthalftone def
+/rendering currentcolorrendering def
+/cache [ cachestatus ] def
+/frame { /h exch def /w exch def moveto w 0 rlineto 0 h rlineto w neg 0 rlineto closepath } defp
 end
-systemdict /setpacking known { setpacking } if
-%%EndResource
-%%BeginResource: procset Adobe_AGM_Core 2.0 0
-userdict /Adobe_AGM_Core 200 dict dup begin put
-/AGMCORE_str256 256 string def
-/AGMCORE_deviceDPI 72 0 matrix defaultmatrix dtransform dup mul exch dup mul add sqrt def
-/AGMCORE_distilling /product where { pop systemdict /setdistillerparams known product (Adobe PostScript Parser) ne and } { false } ifelse def
-/AGMCORE_producing_seps currentpagedevice /Separations 2 copy known { get } { pop pop false } ifelse def
-/AGMCORE_page_size currentpagedevice /PageSize get def
-/Generic /Category findresource dup length dict copy /Category defineresource pop
-/AGMCORE_mo { moveto } def /AGMCORE_li { lineto } def /AGMCORE_cv { curveto } def /AGMCORE_cp { closepath } def
-/AGMCORE_rgb { setrgbcolor } def /AGMCORE_cmyk { setcmykcolor } def
-/doc_setup { Adobe_AGM_Utils begin get_gstate end } def
-/page_setup { Adobe_AGM_Utils begin set_gstate end } def
-end
-%%EndResource
-%%BeginResource: procset Adobe_CoolType_Core 2.31 0
-userdict /CT_Core 20 dict dup begin put
-/GVMFonts 10 dict def /LVMFonts 10 dict def
-/VMDictPut { dup gcheck { GVMFonts } { LVMFonts } ifelse 3 1 roll put } bind def
-/copyfont { currentglobal exch dup gcheck setglobal dup length dict copy exch setglobal } bind def
-end
-%%EndResource
 %%EndProlog
 %%BeginSetup
-Adobe_AGM_Core /doc_setup get exec
-CT_Core begin /Body /Helvetica findfont copyfont VMDictPut end
+ExampleKit begin
+screen sethalftone
+/Helvetica 12 selectfont
+/face rootfont /FontName get def
 %%EndSetup
 %%Page: 1 1
-%%BeginPageSetup
-Adobe_AGM_Core /page_setup get exec
-%%EndPageSetup
-Adobe_AGM_Core begin
-/mo { AGMCORE_mo } def /li { AGMCORE_li } def /cv { AGMCORE_cv } def /cp { AGMCORE_cp } def
-0 0.94 0.94 0.12 AGMCORE_cmyk
-10 140 mo 90 140 li 90 90 li 10 90 li cp fill
-0.2 0.4 0.8 AGMCORE_rgb
-100 20 mo 150 80 180 0 190 60 cv 2 setlinewidth stroke
-0 setgray CT_Core /LVMFonts get /Body get 12 scalefont setfont 10 30 moveto (Art) show
+gsave
+0 0.94 0.94 0.12 setcmykcolor
+10 90 /Card /ExampleShapes findresource dup /W get exch /H get frame fill
+0.2 0.4 0.8 setrgbcolor 2 setlinewidth 100 20 moveto 150 80 180 0 190 60 curveto stroke
+grestore
+% Each probe answered as the reference says: draw only when it did.
+vm length 5 eq hasinternal and rendering type /dicttype eq and cache length 7 eq and face /Helvetica eq and
+{ 0 setgray 10 30 moveto (Art) show } if
+oldscreen sethalftone
 end
 showpage"##;
-    let r = open("Adobe Illustrator(R) 30.0", program);
+    let r = open("Example Generator 1.0", program);
     let d = &r.document;
     let rect = all(d).into_iter().find(|n| fill(n).and_then(Paint::color) == Some(Color::cmyk(0.0, 0.94, 0.94, 0.12))).unwrap();
     assert!(near(bounds(&rect), Rect::new(10.0, 10.0, 90.0, 60.0)), "{:?}", bounds(&rect));
@@ -950,44 +897,38 @@ fn hostile_patterns_glyphs_and_shadings_end() {
     assert_eq!(objects(&r.document).len(), 1);
 }
 
-/// Illustrator 8 EPS (what stock art often comes as, #474): its gradient procset builds shading
-/// dictionaries with `bd` … `ed`, where `ed` is an executable string (`(>>) cvx`, or a Level 1
-/// dictionary builder), and its `discard` runs procedures it `load`s by integer keys.
+/// Executable strings and keys other than names (#474): `cvx` makes a string executable, and
+/// running it runs its text (PLRM 3rd ed. §3.3.1, `cvx`, `exec`); `load` takes any key (§8.2).
+/// A program closes its shading dictionaries with an executable string (`>>` at Level 2 and up,
+/// else a dictionary built with `counttomark`), and runs procedures it keeps under integer keys
+/// through `stopped`.
 #[test]
-fn illustrator_8_gradients_and_executable_strings() {
+fn executable_strings_and_integer_keys() {
     let program = r##"%%BeginProlog
-userdict /AGM_Gradient 20 dict dup begin put
-/AGM_Gradient_private 201 dict def
-/initialize {
-  AGM_Gradient begin AGM_Gradient_private begin
-  /bd systemdict /mark get def
-  /ed /languagelevel where { pop languagelevel 2 ge } { false } ifelse
-    { (>>) } { (counttomark 2 idiv dup dict begin {def} repeat pop currentdict end) } ifelse cvx def
-  /ed1 (counttomark 2 idiv dup dict begin {def} repeat pop currentdict end) cvx def
-  end end
-} def
-userdict /discardDict 4 dict dup begin put
-0 { 0 1 0 setrgbcolor } def
-2 { 0 0 1 setrgbcolor } def
+/ShadeKit 12 dict def ShadeKit begin
+% A Level 1 way to make a dictionary of the pairs above a mark.
+/pairs (counttomark 2 idiv dict begin { counttomark 0 eq { exit } if def } loop pop currentdict end) cvx def
+/close /languagelevel where { pop languagelevel 2 ge } { false } ifelse { (>>) } { (pairs) } ifelse cvx def
+/open /mark load def
+/actions 3 dict def actions begin 0 { 0 1 0 setrgbcolor } def 1 { 1 0 0 setrgbcolor } def end
+/act { actions 1 index known { actions begin load end stopped pop } { pop } ifelse } bind def
 end
-/gt38? false def
-/discard { discardDict begin /endString exch def gt38? { 2 add } if load stopped pop end } bind def
 %%EndProlog
-initialize
-AGM_Gradient begin AGM_Gradient_private begin
-bd /ShadingType 3 /ColorSpace /DeviceRGB
-  /Function bd /FunctionType 2 /Domain [0 1] /C0 [1 1 0] /C1 [0 0.5 0] /N 1 ed
-  /Extend [true true] /Coords [50 50 0 50 50 40] ed
+ShadeKit begin
+open /ShadingType 3 /ColorSpace /DeviceRGB
+  /Function open /FunctionType 2 /Domain [0 1] /C0 [1 1 0] /C1 [0 0.5 0] /N 1 close
+  /Extend [true true] /Coords [50 50 0 50 50 40] close
 gsave 10 10 80 80 rectclip shfill grestore
-bd /Width 3 ed1 /Width get 3 eq { 0 (%AI5_EndPalette) discard 10 10 20 20 rectfill } if
-end end
+mark /Width 3 pairs /Width get 3 eq { 0 act 10 10 20 20 rectfill } if
+2 act
+end
 (x) cvx xcheck (x) cvx cvlit xcheck not and { 50 50 10 10 rectfill } if
 showpage"##;
-    let r = open("Adobe Illustrator(R) 8.0", program);
+    let r = open("Example Generator 1.0", program);
     let d = &r.document;
     let Some(Paint::Gradient(g)) = all(d).into_iter().find_map(|n| fill(&n).cloned()) else { panic!("no gradient") };
     assert_eq!(g.gradient.kind, vectorcraft_color::GradientKind::Radial);
-    // `discard` ran the procedure under key 0 (green), not the one under 2.
+    // `act` ran the procedure under key 0 (green); there is none under key 2.
     assert!(all(d).iter().any(|n| fill(n).and_then(Paint::color) == Some(Color::rgb(0.0, 1.0, 0.0))));
     assert_eq!(objects(d).len(), 3);
 }

crates/eps/src/import/tests_illustrator.rs

@@ -20,6 +20,9 @@ fn ai(header: &str, ugroup: &str, body: &str) -> Vec<u8> {
     .into_bytes()
 }
 
+/// A legacy Illustrator format header: the reader takes `u` … `U` as groups only in files whose
+/// header says they are in that format (`%AI…` comments or the creator, which the format's
+/// published specification documents; see the `import` module docs).
 const AI8: &str = "%%Creator: Adobe Illustrator(R) 8.0\n%AI5_FileFormat 4.0\n";
 
 /// A triangle filled at `x`.

crates/geom/src/corners.rs

@@ -1,283 +0,0 @@
-//! Live Corners on any path: the anchors where two straight sides meet at an angle, and the path
-//! with those corners cut round, inverted round or chamfered. Rectangles cut theirs the same way.
-
-use kurbo::{Point, Vec2};
-
-use crate::path::{Anchor, AnchorKind, PathData, SubPath};
-use crate::shapes::{CornerKind, KAPPA};
-
-/// Lengths and radii at or below this are none at all.
-const EPS: f64 = 1e-9;
-/// Sides closer than this to straight on (or folded back), as the sine of their angle, make no corner.
-const MIN_SINE: f64 = 1e-6;
-
-/// A corner Live Corners can cut: an anchor without handles between two straight sides that
-/// meet at an angle.
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub struct Corner {
-    /// The anchor's index in its path, counting the anchors of every subpath in order.
-    pub index: usize,
-    /// Where the sides meet.
-    pub at: Point,
-    /// Unit directions along the sides: towards the previous anchor, then towards the next one.
-    pub u: Vec2,
-    pub v: Vec2,
-    /// The sides' lengths, in the same order.
-    pub lu: f64,
-    pub lv: f64,
-}
-
-impl Corner {
-    /// The corner of anchor `i` of `sp`, whose index in the path is `index`; `None` when the
-    /// anchor is an end of an open subpath, has handles or is smooth, when a side curves or has
-    /// no length, or when the sides run straight on.
-    fn of(sp: &SubPath, i: usize, index: usize) -> Option<Self> {
-        let n = sp.anchors.len();
-        let (prev, next) = if sp.closed { ((i + n).checked_sub(1)? % n, (i + 1) % n) } else { (i.checked_sub(1)?, i + 1) };
-        let (a, prev, next) = (sp.anchors.get(i)?, sp.anchors.get(prev)?, sp.anchors.get(next)?);
-        if a.kind == AnchorKind::Smooth || a.has_in() || a.has_out() || prev.has_out() || next.has_in() {
-            return None;
-        }
-        let (du, dv) = (prev.p - a.p, next.p - a.p);
-        let (lu, lv) = (du.hypot(), dv.hypot());
-        if !(lu > EPS && lv > EPS && lu.is_finite() && lv.is_finite()) {
-            return None;
-        }
-        let c = Self { index, at: a.p, u: du / lu, v: dv / lv, lu, lv };
-        (c.sin() > MIN_SINE).then_some(c)
-    }
-
-    /// The cosine of the angle between the sides.
-    pub fn cos(&self) -> f64 {
-        self.u.dot(self.v)
-    }
-
-    /// The sine of the angle between the sides.
-    pub fn sin(&self) -> f64 {
-        self.u.cross(self.v).abs()
-    }
-
-    /// The angle between the sides, in degrees (90 at a rectangle's corners).
-    pub fn angle_deg(&self) -> f64 {
-        self.sin().atan2(self.cos()).to_degrees()
-    }
-
-    /// How far from the corner a round cut of radius `r` meets each side: r / tan(angle / 2).
-    pub fn setback(&self, r: f64) -> f64 {
-        r * (1.0 + self.cos()) / self.sin()
-    }
-
-    /// The largest radius the corner draws: its cut then reaches halfway along the shorter side,
-    /// so neighbouring corners at their largest meet without overlapping (half the shorter side
-    /// at a rectangle's corners).
-    pub fn max_radius(&self) -> f64 {
-        self.lu.min(self.lv) / 2.0 * self.sin() / (1.0 + self.cos())
-    }
-
-    /// The radius the corner is drawn with: `radius`, no larger than [`Corner::max_radius`], 0 when
-    /// negative or not a number.
-    pub fn fitted(&self, radius: f64) -> f64 {
-        radius.max(0.0).min(self.max_radius())
-    }
-
-    /// The point `k` along the bisector, measured in (u + v): the centre of a round cut of radius
-    /// `r` is at `k = r / sin`.
-    pub fn on_bisector(&self, k: f64) -> Point {
-        self.at + (self.u + self.v) * k
-    }
-
-    /// How much the radius grows when the centre of the round cut moves by `d`: `d`'s part along
-    /// the bisector, in radius units.
-    pub fn radius_change(&self, d: Vec2) -> f64 {
-        d.dot(self.u + self.v) * self.sin() / (2.0 + 2.0 * self.cos())
-    }
-
-    /// The two anchors replacing the corner when cut with `radius` (> 0, fitted): where the cut
-    /// meets the arriving side, then the leaving one.
-    fn cut(&self, radius: f64, kind: CornerKind) -> [Anchor; 2] {
-        let t = self.setback(radius);
-        let (start, end) = (self.at + self.u * t, self.at + self.v * t);
-        let (h_out, h_in) = match kind {
-            // An arc of `radius` tangent to both sides, turning by 180° less the angle.
-            CornerKind::Round => {
-                let h = radius * arc_handle(-self.cos());
-                (start - self.u * h, end - self.v * h)
-            }
-            // An arc centred on the corner through both ends, spanning the angle.
-            CornerKind::InvertedRound => {
-                let h = t * arc_handle(self.cos());
-                (start + square_to(self.u, self.v) * h, end + square_to(self.v, self.u) * h)
-            }
-            CornerKind::Chamfer => (start, end),
-        };
-        [Anchor { p: start, h_in: start, h_out, kind: AnchorKind::Corner }, Anchor { p: end, h_in, h_out: end, kind: AnchorKind::Corner }]
-    }
-}
-
-/// The unit direction square to unit `a`, on `b`'s side.
-fn square_to(a: Vec2, b: Vec2) -> Vec2 {
-    let w = b - a * a.dot(b);
-    w / w.hypot()
-}
-
-/// The handle length, per unit of radius, of a cubic drawing a circular arc that spans an angle
-/// whose cosine is `cos`: 4/3 · tan(angle / 4) ([`KAPPA`] for a quarter circle).
-fn arc_handle(cos: f64) -> f64 {
-    if cos.abs() < 1e-12 {
-        return KAPPA;
-    }
-    let (sin_half, cos_half) = (((1.0 - cos) / 2.0).max(0.0).sqrt(), ((1.0 + cos) / 2.0).max(0.0).sqrt());
-    4.0 / 3.0 * sin_half / (1.0 + cos_half)
-}
-
-/// The corners of `path` Live Corners can cut, in anchor order.
-pub fn path_corners(path: &PathData) -> Vec<Corner> {
-    let mut out = vec![];
-    let mut first = 0;
-    for sp in &path.subpaths {
-        out.extend((0..sp.anchors.len()).filter_map(|i| Corner::of(sp, i, first + i)));
-        first += sp.anchors.len();
-    }
-    out
-}
-
-/// `path` with each of its corners ([`path_corners`]) cut by the radius in `radii` and the kind in
-/// `kinds` at its anchor index (missing: 0 and round), each radius no larger than fits
-/// ([`Corner::fitted`]). A cut corner becomes two anchors; a closed subpath whose first corner
-/// is cut starts where that cut ends, so the cut closes it. Also returns, per subpath, the
-/// anchor index in `path` each anchor comes from.
-pub fn cut_corners(path: &PathData, radii: &[f64], kinds: &[CornerKind]) -> (PathData, Vec<Vec<usize>>) {
-    let corners = path_corners(path);
-    let mut corners = corners.iter().peekable();
-    let (mut subpaths, mut sources) = (Vec::with_capacity(path.subpaths.len()), Vec::with_capacity(path.subpaths.len()));
-    let mut first = 0;
-    for sp in &path.subpaths {
-        let (mut anchors, mut from) = (Vec::with_capacity(sp.anchors.len()), Vec::with_capacity(sp.anchors.len()));
-        let mut closing = None;
-        for (i, a) in sp.anchors.iter().enumerate() {
-            let index = first + i;
-            let corner = corners.next_if(|c| c.index == index);
-            let radius = corner.map_or(0.0, |c| c.fitted(radii.get(index).copied().unwrap_or(0.0)));
-            match corner {
-                Some(c) if radius > EPS => {
-                    let [start, end] = c.cut(radius, kinds.get(index).copied().unwrap_or_default());
-                    if i == 0 && sp.closed {
-                        closing = Some(start);
-                    } else {
-                        anchors.push(start);
-                        from.push(index);
-                    }
-                    anchors.push(end);
-                    from.push(index);
-                }
-                _ => {
-                    anchors.push(*a);
-                    from.push(index);
-                }
-            }
-        }
-        if let Some(a) = closing {
-            anchors.push(a);
-            from.push(first);
-        }
-        first += sp.anchors.len();
-        subpaths.push(SubPath::new(anchors, sp.closed));
-        sources.push(from);
-    }
-    (PathData::new(subpaths), sources)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::shapes;
-    use kurbo::Rect;
-
-    fn near(a: Point, b: Point) -> bool {
-        a.distance(b) < 1e-9
-    }
-
-    /// A five-pointed star's tips are acute corners, its inner corners obtuse: all ten cut, each
-    /// a circle of the radius tangent to both sides.
-    #[test]
-    fn a_star_has_ten_corners_cut_as_circles() {
-        let star = shapes::star(Point::new(100.0, 100.0), 50.0, 25.0, 5, 0.0);
-        let corners = path_corners(&star);
-        assert_eq!(corners.len(), 10);
-        let angles: Vec<_> = corners.iter().map(|c| c.angle_deg()).collect();
-        assert!(angles.iter().step_by(2).all(|a| *a < 90.0), "tips are acute: {angles:?}");
-        assert!(angles.iter().skip(1).step_by(2).all(|a| *a > 90.0), "inner corners are obtuse: {angles:?}");
-        let (cut, from) = cut_corners(&star, &[4.0; 10], &[]);
-        assert_eq!(cut.anchor_count(), 20);
-        assert_eq!(from, [vec![0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 0]]);
-        for c in &corners {
-            // Both ends of the cut lie `setback` along the sides, as far from the arc's centre as
-            // the radius, and that centre is `radius` from either side.
-            let t = c.setback(4.0);
-            let o = c.on_bisector(4.0 / c.sin());
-            for p in [c.at + c.u * t, c.at + c.v * t] {
-                assert!((p.distance(o) - 4.0).abs() < 1e-9);
-                assert!(cut.anchors().any(|(_, _, a)| near(a.p, p)), "{p:?} is an anchor");
-            }
-        }
-    }
-
-    #[test]
-    fn radii_stop_at_half_the_shorter_side_per_corner() {
-        let tri = PathData::single(SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(100.0, 0.0), Point::new(0.0, 40.0)], true));
-        let corners = path_corners(&tri);
-        assert_eq!(corners.len(), 3);
-        for c in &corners {
-            let max = c.max_radius();
-            assert!((c.setback(max) - c.lu.min(c.lv) / 2.0).abs() < 1e-9);
-            assert_eq!(c.fitted(1e6), max);
-            assert_eq!(c.fitted(-3.0), 0.0);
-            assert_eq!(c.fitted(f64::NAN), 0.0);
-        }
-        // The right angle at (0, 0) takes up to 20, half its shorter side.
-        assert!((corners[0].max_radius() - 20.0).abs() < 1e-9);
-    }
-
-    #[test]
-    fn ends_curves_smooth_and_straight_anchors_are_no_corners() {
-        // An open zig-zag: its ends aren't corners, nor is the anchor its sides run straight on through.
-        let open = PathData::single(SubPath::polyline(
-            &[Point::new(0.0, 0.0), Point::new(50.0, 0.0), Point::new(100.0, 0.0), Point::new(100.0, 50.0), Point::new(150.0, 80.0)],
-            false,
-        ));
-        assert_eq!(path_corners(&open).iter().map(|c| c.index).collect::<Vec<_>>(), [2, 3]);
-        // A curve on either side, or handles on the anchor, leave it alone.
-        let mut sp = SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(100.0, 0.0), Point::new(100.0, 100.0), Point::new(0.0, 100.0)], true);
-        sp.anchors[1].h_out = Point::new(110.0, 10.0);
-        let p = PathData::single(sp);
-        assert_eq!(path_corners(&p).iter().map(|c| c.index).collect::<Vec<_>>(), [0, 3]);
-        assert!(path_corners(&shapes::ellipse(Rect::new(0.0, 0.0, 10.0, 10.0))).is_empty());
-        // A second subpath counts on from the first one's anchors.
-        let two = PathData::new(vec![
-            SubPath::polyline(&[Point::new(0.0, 0.0), Point::new(10.0, 0.0), Point::new(0.0, 10.0)], true),
-            SubPath::polyline(&[Point::new(50.0, 0.0), Point::new(60.0, 0.0), Point::new(50.0, 10.0)], true),
-        ]);
-        let (cut, from) = cut_corners(&two, &[0.0, 0.0, 0.0, 1.0], &[]);
-        assert_eq!(from, [vec![0, 1, 2], vec![3, 4, 5, 3]]);
-        assert_eq!(cut.anchor_count(), 7);
-    }
-
-    /// Inverted round and chamfer cuts end where the round one does, at any angle.
-    #[test]
-    fn kinds_share_their_ends() {
-        let star = shapes::star(Point::new(0.0, 0.0), 50.0, 25.0, 5, 0.0);
-        let ends = |k: CornerKind| -> Vec<Point> { cut_corners(&star, &[3.0; 10], &[k; 10]).0.anchors().map(|(_, _, a)| a.p).collect() };
-        let round = ends(CornerKind::Round);
-        assert_eq!(ends(CornerKind::InvertedRound), round);
-        assert_eq!(ends(CornerKind::Chamfer), round);
-        // The inverted arc stays on the circle about the corner.
-        let c = path_corners(&star)[0];
-        let [s, e] = c.cut(3.0, CornerKind::InvertedRound);
-        let bez = kurbo::CubicBez::new(s.p, s.h_out, e.h_in, e.p);
-        let r = c.setback(3.0);
-        for t in [0.25, 0.5, 0.75] {
-            use kurbo::ParamCurve;
-            assert!((bez.eval(t).distance(c.at) - r).abs() < r * 1e-3);
-        }
-    }
-}

crates/geom/src/lib.rs

@@ -9,7 +9,6 @@
 
 pub mod arc;
 pub mod bez;
-pub mod corners;
 pub mod hit;
 pub mod path;
 pub mod projective;

crates/geom/src/shapes.rs

@@ -62,10 +62,52 @@ pub fn fitted_corner_radius(w: f64, h: f64, radius: f64) -> f64 {
 /// Rectangle whose corners (top-left, top-right, bottom-right, bottom-left, y down) each have
 /// their own radius and kind, every radius clamped to half the shorter side. A corner without a
 /// radius is one anchor, the others two (where the cut meets each side). Clockwise from the
-/// top-left corner, its anchor on the top side first. Cut as any path's corners are
-/// ([`crate::corners::cut_corners`]).
+/// top-left corner, its anchor on the top side first.
 pub fn rectangle_with_corners(r: Rect, radii: [f64; 4], kinds: [CornerKind; 4]) -> PathData {
-    crate::corners::cut_corners(&rectangle(r), &radii, &kinds).0
+    PathData::single(SubPath::new(corner_anchors(r, radii, kinds).into_iter().map(|(_, a)| a).collect(), true))
+}
+
+/// The corner (index into `radii`) of each anchor of [`rectangle_with_corners`].
+pub fn rectangle_anchor_corners(r: Rect, radii: [f64; 4]) -> Vec<usize> {
+    corner_anchors(r, radii, [CornerKind::Round; 4]).into_iter().map(|(k, _)| k).collect()
+}
+
+/// The anchors of [`rectangle_with_corners`], each with its corner.
+fn corner_anchors(r: Rect, radii: [f64; 4], kinds: [CornerKind; 4]) -> Vec<(usize, Anchor)> {
+    let r = r.abs();
+    // Each corner, with the directions of the side arriving at it and of the side leaving it.
+    let corners = [
+        (Point::new(r.x0, r.y0), Vec2::new(0.0, -1.0), Vec2::new(1.0, 0.0)),
+        (Point::new(r.x1, r.y0), Vec2::new(1.0, 0.0), Vec2::new(0.0, 1.0)),
+        (Point::new(r.x1, r.y1), Vec2::new(0.0, 1.0), Vec2::new(-1.0, 0.0)),
+        (Point::new(r.x0, r.y1), Vec2::new(-1.0, 0.0), Vec2::new(0.0, -1.0)),
+    ];
+    let mut out = Vec::with_capacity(8);
+    let mut top_left_start = None;
+    for (k, ((c, din, dout), (rad, kind))) in corners.into_iter().zip(radii.into_iter().zip(kinds)).enumerate() {
+        let rad = fitted_corner_radius(r.width(), r.height(), rad);
+        if rad <= 1e-9 {
+            out.push((k, Anchor::corner(c)));
+            continue;
+        }
+        // The cut runs from `start` on the arriving side to `end` on the leaving one.
+        let (start, end, h) = (c - din * rad, c + dout * rad, rad * KAPPA);
+        let (h_out, h_in) = match kind {
+            CornerKind::Round => (start + din * h, end - dout * h),
+            CornerKind::InvertedRound => (start + dout * h, end - din * h),
+            CornerKind::Chamfer => (start, end),
+        };
+        let start = Anchor { p: start, h_in: start, h_out, kind: AnchorKind::Corner };
+        let end = Anchor { p: end, h_in, h_out: end, kind: AnchorKind::Corner };
+        if k == 0 {
+            top_left_start = Some(start);
+        } else {
+            out.push((k, start));
+        }
+        out.push((k, end));
+    }
+    out.extend(top_left_start.map(|a| (0, a)));
+    out
 }
 
 /// Ellipse inscribed in `r` with 4 smooth anchors (left, top, right, bottom).
@@ -202,11 +244,6 @@ pub fn polar_grid(r: Rect, concentric: u32, radial: u32) -> Vec<PathData> {
 mod tests {
     use super::*;
 
-    /// The corner (index into `radii`) of each anchor of [`rectangle_with_corners`].
-    fn corner_sources(r: Rect, radii: [f64; 4]) -> Vec<usize> {
-        crate::corners::cut_corners(&rectangle(r), &radii, &[]).1.concat()
-    }
-
     #[test]
     fn rect_is_4_corners_clockwise() {
         let p = rectangle(Rect::new(0.0, 0.0, 100.0, 50.0));
@@ -256,7 +293,7 @@ mod tests {
             a((x0, y0 + rad), (x0, y0 + rad), (x0, y0 + rad - k)),
         ];
         assert_eq!(rounded_rectangle(r, rad).subpaths[0].anchors, want);
-        assert_eq!(corner_sources(r, [rad; 4]), [0, 1, 1, 2, 2, 3, 3, 0]);
+        assert_eq!(rectangle_anchor_corners(r, [rad; 4]), [0, 1, 1, 2, 2, 3, 3, 0]);
         assert_eq!(rounded_rectangle(r, 0.0), rectangle(r));
     }
 
@@ -268,11 +305,11 @@ mod tests {
         let p = rectangle_with_corners(r, radii, [CornerKind::Round; 4]);
         let pts: Vec<Point> = p.subpaths[0].anchors.iter().map(|a| a.p).collect();
         assert_eq!(pts, [Point::new(0.0, 0.0), Point::new(90.0, 0.0), Point::new(100.0, 10.0), Point::new(100.0, 60.0), Point::new(0.0, 60.0)]);
-        assert_eq!(corner_sources(r, radii), [0, 1, 1, 2, 3]);
+        assert_eq!(rectangle_anchor_corners(r, radii), [0, 1, 1, 2, 3]);
         let quarter = PI * 25.0;
         assert!((p.subpaths[0].area() - (6000.0 - 100.0 + quarter)).abs() < 0.1, "a quarter circle off one corner");
         // The top-left corner rounded: its top-side anchor first, its left-side one last.
-        assert_eq!(corner_sources(r, [10.0, 0.0, 0.0, 200.0]), [0, 1, 2, 3, 3, 0]);
+        assert_eq!(rectangle_anchor_corners(r, [10.0, 0.0, 0.0, 200.0]), [0, 1, 2, 3, 3, 0]);
         // Inverted round cuts a quarter circle out; a chamfer cuts a triangle.
         let inverted = rectangle_with_corners(r, radii, [CornerKind::InvertedRound; 4]);
         assert!((inverted.subpaths[0].area() - (6000.0 - quarter)).abs() < 0.1);

crates/svg/src/css.rs

@@ -621,9 +621,7 @@ fn corners(path: &PathData, live: Option<&LiveShape>) -> Option<Corners> {
             let sweep = (pie.1 - pie.0).abs();
             (sweep < 1e-6 || (sweep - 360.0).abs() < 1e-6).then_some(Corners::Ellipse)
         }
-        Some(
-            LiveShape::Rectangle { .. } | LiveShape::Ellipse { .. } | LiveShape::Polygon { .. } | LiveShape::Line { .. } | LiveShape::Path { .. },
-        ) => None,
+        Some(LiveShape::Rectangle { .. } | LiveShape::Ellipse { .. } | LiveShape::Polygon { .. } | LiveShape::Line { .. }) => None,
         None => is_upright_rectangle(path).then_some(Corners::Square),
     }
 }

crates/tools/src/corners.rs

@@ -1,231 +1,187 @@
-//! Live Corners: the widgets inside the corners of a selected path. The Selection tool shows them
-//! on a live rectangle or polygon, Direct Selection on any path (a star, a pen path) at each corner
-//! anchor: one without handles between two straight sides. Dragging one rounds (or sharpens) the
-//! corners whose widgets show together: every corner when the whole path is selected, those with a
-//! selected anchor when Direct Selection picked some. Alt-clicking a widget cycles their corner
-//! kind (round, inverted round, chamfer); double-clicking one opens the Corners dialog. The
-//! Selection and Direct Selection tools share this, and the canvas draws the widgets from the same
-//! geometry.
+//! Live Corners: the widgets inside the corners of a selected live rectangle. Dragging one rounds
+//! (or sharpens) the corners whose widgets show together: all four when the whole shape is
+//! selected, those with a selected anchor when Direct Selection picked some. Alt-clicking a widget
+//! cycles their corner kind (round, inverted round, chamfer); double-clicking one opens the
+//! Corners dialog. The Selection and Direct Selection tools share this, and the canvas draws the
+//! widgets from the same geometry.
 
 use serde_json::{Map, Value, json};
-use vectorcraft_doc::{Document, LiveCorners, LiveShape, NodeId, NodeKind, Selection};
-use vectorcraft_geom::corners::{Corner, cut_corners};
-use vectorcraft_geom::shapes::CornerKind;
-use vectorcraft_geom::{Affine, BezPath, PathData, Point, Vec2};
+use vectorcraft_doc::{Document, LiveShape, NodeId, NodeKind, Selection};
+use vectorcraft_geom::shapes::{self, CornerKind};
+use vectorcraft_geom::{Affine, BezPath, Point, Rect, Vec2};
 
 use crate::{Action, Overlay, PointerEvent, ToolContext};
 
 /// The dialog a double-click on a corner widget opens: `{id, corners}`.
 pub const DIALOG: &str = "corners";
 
-/// Widgets sit at least this far inside their corner along each side of a right angle (screen px;
-/// √2 times it along the bisector, at any angle), further in once the radius is.
+/// Widgets sit at least this far inside their corner (screen px), further in once the radius is.
 const MIN_INSET_PX: f64 = 10.0;
-/// Corners with a side shorter than this on screen (px) hide their widgets.
+/// Shapes whose shorter side is smaller than this on screen (px) hide their widgets.
 const MIN_SIDE_PX: f64 = 3.0 * MIN_INSET_PX;
+/// Corners in radii order (top-left, top-right, bottom-right, bottom-left): position as factors
+/// of (w, h) and the inward diagonal.
+const CORNERS: [((f64, f64), (f64, f64)); 4] =
+    [((0.0, 0.0), (1.0, 1.0)), ((1.0, 0.0), (-1.0, 1.0)), ((1.0, 1.0), (-1.0, -1.0)), ((0.0, 1.0), (1.0, -1.0))];
 
-/// One corner's widget.
+/// The corner widgets of a selection that is exactly one editable live rectangle.
 #[derive(Clone, Copy, Debug, PartialEq)]
-struct Widget {
-    /// The corner, in the corners' own space.
-    corner: Corner,
-    /// The radius it is set to (document units) and its kind.
-    radius: f64,
-    kind: CornerKind,
-    /// The angle between its sides in the document, in degrees.
-    angle: f64,
-    /// The widget's centre in the document.
-    at: Point,
-}
-
-/// The corner widgets of a selection that is exactly one editable path with corners.
-#[derive(Clone, Debug, PartialEq)]
 pub struct CornerWidgets {
     pub id: NodeId,
-    /// Maps the corners' space into the document (a live rectangle's own; else none).
+    w: f64,
+    h: f64,
+    radii: [f64; 4],
+    kinds: [CornerKind; 4],
     xf: Affine,
-    /// The widgets that show (and which a drag edits), in anchor order.
-    widgets: Vec<Widget>,
-    /// Every corner of the path shows its widget.
-    all: bool,
+    /// Widget centres in document coordinates, in radii order.
+    pub points: [Point; 4],
+    /// The corners whose widgets show (and which a drag edits).
+    pub shown: [bool; 4],
 }
 
 impl CornerWidgets {
-    /// The widgets at `zoom` (screen px per document point), if the selection has them: on any
-    /// path with Direct Selection (`any_path`), on live rectangles and polygons with Selection.
-    pub fn of(doc: &Document, selection: &Selection, zoom: f64, any_path: bool) -> Option<Self> {
+    /// The widgets at `zoom` (screen px per document point), if the selection has them.
+    pub fn of(doc: &Document, selection: &Selection, zoom: f64) -> Option<Self> {
         let [id] = selection.objects[..] else { return None };
         if !doc.is_editable(id) {
             return None;
         }
-        let NodeKind::Path { path, live, .. } = &doc.node(id)?.kind else { return None };
-        if !any_path && !matches!(live, Some(LiveShape::Rectangle { .. } | LiveShape::Polygon { .. })) {
+        let Some(NodeKind::Path { live: Some(live), .. }) = doc.node(id).map(|n| &n.kind) else { return None };
+        // In document units, as `object.setLiveShape` edits them.
+        let LiveShape::Rectangle { w, h, radii, kinds, xf } = live.folded() else { return None };
+        // Screen pixels per shape unit along each side (the shape may be scaled or skewed).
+        let c = xf.as_coeffs();
+        let (px, py) = (Vec2::new(c[0], c[1]).hypot() * zoom, Vec2::new(c[2], c[3]).hypot() * zoom);
+        if xf.determinant().abs() < 1e-12 || (w * px).min(h * py) < MIN_SIDE_PX {
             return None;
         }
-        let lc = LiveCorners::new(path, live.as_ref())?;
-        let det = lc.xf.determinant().abs();
-        if det < 1e-12 {
-            return None;
-        }
-        // Screen pixels per unit of the corners' space (a rectangle's may be skewed).
-        let scale = zoom * det.sqrt();
-        let picked = lc.picked(selection.partial(id));
-        let widgets: Vec<_> = lc
-            .corners
-            .iter()
-            .filter(|c| picked.contains(&c.index) && c.lu.min(c.lv) * scale >= MIN_SIDE_PX)
-            .map(|c| {
-                // On the bisector at the centre of the arc as drawn, at least the minimum inset
-                // in and at most half the shorter side.
-                let radius = lc.radius(c.index);
-                let k = (c.fitted(radius) / c.sin()).max(MIN_INSET_PX / (scale * (1.0 + c.cos()).sqrt())).min(c.lu.min(c.lv) / 2.0);
-                Widget { corner: *c, radius, kind: lc.kind(c.index), angle: angle_in(lc.xf, c), at: lc.xf * c.on_bisector(k) }
-            })
-            .collect();
-        let all = widgets.len() == lc.corners.len();
-        (!widgets.is_empty()).then_some(Self { id, xf: lc.xf, widgets, all })
+        // Each widget sits on its corner's diagonal, at the centre of the arc as drawn.
+        let points = std::array::from_fn(|k| {
+            let ((fx, fy), (sx, sy)) = CORNERS[k];
+            let r = shapes::fitted_corner_radius(w, h, radii[k]);
+            let ix = r.max(MIN_INSET_PX / px).min(w / 2.0);
+            let iy = r.max(MIN_INSET_PX / py).min(h / 2.0);
+            xf * Point::new(fx * w + sx * ix, fy * h + sy * iy)
+        });
+        Some(Self { id, w, h, radii, kinds, xf, points, shown: live.picked_corners(selection.partial(id)) })
     }
 
     /// Selection & Anchor Display → Hide Corner Widget for angles greater than: the widgets of
-    /// corners wider than `max` degrees (in the document) hide; none if all do.
+    /// corners wider than `max` degrees (a skewed rectangle's obtuse ones) hide; none if all do.
     pub fn within_angle(mut self, max: f64) -> Option<Self> {
-        let n = self.widgets.len();
-        self.widgets.retain(|w| w.angle <= max + 1e-9);
-        self.all &= self.widgets.len() == n;
-        (!self.widgets.is_empty()).then_some(self)
+        // The angle between the shape's sides where they meet at the top-left corner; the
+        // top-right and bottom-left corners are its supplement.
+        let c = self.xf.as_coeffs();
+        let (u, v) = (Vec2::new(c[0], c[1]), Vec2::new(c[2], c[3]));
+        let a = u.cross(v).abs().atan2(u.dot(v)).to_degrees();
+        for (k, shown) in self.shown.iter_mut().enumerate() {
+            let angle = if k % 2 == 0 { a } else { 180.0 - a };
+            *shown &= angle <= max + 1e-9;
+        }
+        self.shown.contains(&true).then_some(self)
     }
 
-    /// The widgets on show: [`Self::of`] with View → Show Corner Widget `on`, less those wider
-    /// than `max_angle` ([`Self::within_angle`]).
-    pub fn showing(doc: &Document, selection: &Selection, zoom: f64, any_path: bool, on: bool, max_angle: f64) -> Option<Self> {
-        if !on {
+    /// The widgets the active tool can drag (View → Show Corner Widget on).
+    pub fn for_tool(cx: &ToolContext) -> Option<Self> {
+        if !cx.corner_widgets {
             return None;
         }
-        Self::of(doc, selection, zoom, any_path)?.within_angle(max_angle)
-    }
-
-    /// The widgets the active tool can drag (Direct Selection: `any_path`).
-    pub fn for_tool(cx: &ToolContext, any_path: bool) -> Option<Self> {
-        Self::showing(cx.doc, cx.selection, cx.zoom, any_path, cx.corner_widgets, cx.corner_widget_max_angle)
+        Self::of(cx.doc, cx.selection, cx.zoom)?.within_angle(cx.corner_widget_max_angle)
     }
 
     /// The centres of the widgets that show.
     pub fn visible(&self) -> impl Iterator<Item = Point> + '_ {
-        self.widgets.iter().map(|w| w.at)
+        self.points.iter().zip(self.shown).filter(|(_, on)| *on).map(|(p, _)| *p)
     }
 
-    /// The corners whose widgets show: anchor indices of the path's uncut outline.
-    pub fn corners(&self) -> Vec<usize> {
-        self.widgets.iter().map(|w| w.corner.index).collect()
+    /// The indices of the shown corners.
+    fn shown_indices(&self) -> Value {
+        (0..4).filter(|k| self.shown[*k]).collect()
     }
 
-    /// The widget nearest to `p` within `tol` (document units).
-    fn hit(&self, p: Point, tol: f64) -> Option<usize> {
-        let d = |k: &usize| self.widgets.get(*k).map_or(f64::INFINITY, |w| w.at.distance(p));
-        (0..self.widgets.len()).filter(|k| d(k) <= tol).min_by(|a, b| d(a).total_cmp(&d(b)))
+    /// Index of the shown widget nearest to `p` within `tol` (document units).
+    pub fn hit(&self, p: Point, tol: f64) -> Option<usize> {
+        let d = |k: &usize| self.points[*k].distance(p);
+        (0..4).filter(|k| self.shown[*k] && d(k) <= tol).min_by(|a, b| d(a).total_cmp(&d(b)))
     }
 
-    /// `object.setLiveShape` params setting `key` on the shown corners (every corner unless some
-    /// are hidden, which `corners` then leaves out).
+    /// `object.setLiveShape` params setting `key` on the shown corners (all four unless some are
+    /// hidden, which `corners` then leaves out).
     fn command(&self, key: &str, value: Value) -> Value {
         let mut p = Map::new();
         p.insert("id".into(), json!(self.id.0));
         p.insert(key.into(), value);
-        if !self.all {
-            p.insert("corners".into(), json!(self.corners()));
+        if self.shown != [true; 4] {
+            p.insert("corners".into(), self.shown_indices());
         }
         Value::Object(p)
     }
 }
 
-/// The angle between corner `c`'s sides once `xf` maps them into the document, in degrees.
-fn angle_in(xf: Affine, c: &Corner) -> f64 {
-    let [a, b, cc, d, _, _] = xf.as_coeffs();
-    let map = |v: Vec2| Vec2::new(a * v.x + cc * v.y, b * v.x + d * v.y);
-    let (u, v) = (map(c.u), map(c.v));
-    u.cross(v).abs().atan2(u.dot(v)).to_degrees()
-}
-
-/// Is `p` over a corner widget the active tool would drag (Direct Selection: `any_path`)?
-pub fn over_widget(cx: &ToolContext, p: Point, any_path: bool) -> bool {
-    CornerWidgets::for_tool(cx, any_path).and_then(|w| w.hit(p, cx.tol(5.0))).is_some()
+/// Is `p` over a corner widget the active tool would drag?
+pub fn over_widget(cx: &ToolContext, p: Point) -> bool {
+    CornerWidgets::for_tool(cx).and_then(|w| w.hit(p, cx.tol(5.0))).is_some()
 }
 
 /// A double-click on a corner widget opens the Corners dialog for the shown corners.
-pub fn double_click(cx: &ToolContext, p: Point, any_path: bool) -> Option<Action> {
-    let w = CornerWidgets::for_tool(cx, any_path)?;
+pub fn double_click(cx: &ToolContext, p: Point) -> Option<Action> {
+    let w = CornerWidgets::for_tool(cx)?;
     w.hit(p, cx.tol(5.0))?;
-    Some(Action::Dialog(DIALOG.into(), json!({ "id": w.id.0, "corners": w.corners() })))
+    Some(Action::Dialog(DIALOG.into(), json!({ "id": w.id.0, "corners": w.shown_indices() })))
 }
 
-/// Dragging a corner widget: the radius follows the pointer along the corner's bisector. An
+/// Dragging a corner widget: the radius follows the pointer along the corner's diagonal. An
 /// Alt-click (no drag) cycles the corner kind instead.
-#[derive(Clone, Debug)]
+#[derive(Clone, Copy, Debug)]
 pub struct CornerDrag {
     widgets: CornerWidgets,
-    /// The dragged widget (index into the shown ones).
-    widget: usize,
-    /// The path's uncut outline with its corners' radii and kinds (to outline the corners at
-    /// their largest).
-    base: PathData,
-    radii: Vec<f64>,
-    kinds: Vec<CornerKind>,
+    corner: usize,
     start: Point,
     began: bool,
     alt: bool,
     radius: f64,
-    /// The pointer went past fully round: the dragged corner is at its largest radius.
+    /// The pointer went past fully round: the corners are at their largest radius.
     at_limit: bool,
     at: Point,
 }
 
 impl CornerDrag {
-    /// Start a drag when the press `ev` is on a widget of the selection (Direct Selection:
-    /// `any_path`).
-    pub fn hit(cx: &ToolContext, ev: &PointerEvent, any_path: bool) -> Option<Self> {
-        let (widgets, p) = (CornerWidgets::for_tool(cx, any_path)?, ev.pos);
-        let widget = widgets.hit(p, cx.tol(5.0))?;
-        let radius = widgets.widgets.get(widget)?.radius;
-        let lc = cx.doc.node(widgets.id).and_then(LiveCorners::of)?;
-        let n = lc.base.anchor_count();
-        let (radii, kinds) = ((0..n).map(|k| lc.radius(k)).collect(), (0..n).map(|k| lc.kind(k)).collect());
-        let base = lc.base.into_owned();
-        Some(Self { widgets, widget, base, radii, kinds, start: p, began: false, alt: ev.mods.alt, radius, at_limit: false, at: p })
+    /// Start a drag when the press `ev` is on a widget of the selection.
+    pub fn hit(cx: &ToolContext, ev: &PointerEvent) -> Option<Self> {
+        let (widgets, p) = (CornerWidgets::for_tool(cx)?, ev.pos);
+        let corner = widgets.hit(p, cx.tol(5.0))?;
+        Some(Self { widgets, corner, start: p, began: false, alt: ev.mods.alt, radius: widgets.radii[corner], at_limit: false, at: p })
     }
 
     /// The start radius (as drawn: no larger than fits) plus the pointer's travel along the
-    /// corner's bisector (in the corners' own units), from square to fully round; and whether the
-    /// travel reached fully round.
+    /// corner's inward diagonal (in the shape's own units), from square to fully round; and
+    /// whether the travel reached fully round (the limit every corner shares).
     fn radius_at(&self, p: Point) -> (f64, bool) {
-        let Some(w) = self.widgets.widgets.get(self.widget) else { return (self.radius, self.at_limit) };
-        let inv = self.widgets.xf.inverse();
-        let max = w.corner.max_radius();
-        let r = w.corner.fitted(w.radius) + w.corner.radius_change(inv * p - inv * self.start);
+        let w = &self.widgets;
+        let inv = w.xf.inverse();
+        let d = inv * p - inv * self.start;
+        let (_, (sx, sy)) = CORNERS[self.corner];
+        let max = shapes::max_corner_radius(w.w, w.h);
+        let r = shapes::fitted_corner_radius(w.w, w.h, w.radii[self.corner]) + (d.x * sx + d.y * sy) / 2.0;
         (r.min(max).max(0.0), max > 0.0 && r >= max)
     }
 
-    /// The cuts of the edited corners that are at their largest radius, in document coordinates.
-    fn corners_at_limit(&self) -> BezPath {
-        let shown = &self.widgets.widgets;
-        let mut radii = self.radii.clone();
-        for w in shown {
-            if let Some(r) = radii.get_mut(w.corner.index) {
-                *r = self.radius;
-            }
-        }
-        let full = |k: &usize| shown.iter().any(|w| w.corner.index == *k && self.radius >= w.corner.max_radius() - 1e-9);
-        let (path, sources) = cut_corners(&self.base, &radii, &self.kinds);
+    /// The edited corners' cuts at the dragged radius, in document coordinates.
+    fn edited_corners(&self) -> BezPath {
+        let w = &self.widgets;
+        let rect = Rect::new(0.0, 0.0, w.w, w.h);
+        let radii = std::array::from_fn(|k| if w.shown[k] { self.radius } else { w.radii[k] });
+        let corner_of = shapes::rectangle_anchor_corners(rect, radii);
+        let path = shapes::rectangle_with_corners(rect, radii, w.kinds).transformed(w.xf);
         let mut out = BezPath::new();
-        for (sp, from) in path.transformed(self.widgets.xf).subpaths.iter().zip(&sources) {
-            // A corner's cut is the segment between its two anchors (the last one, for a closed
-            // subpath's first corner).
-            for i in 0..sp.segment_count() {
-                let (a, b) = (from.get(i), from.get(i + 1).or(from.first()));
-                if a == b && a.is_some_and(full) {
-                    let c = sp.segment(i);
-                    out.move_to(c.p0);
-                    out.curve_to(c.p1, c.p2, c.p3);
-                }
+        let Some(sp) = path.subpaths.first() else { return out };
+        // A corner's cut is the segment between its two anchors (the last one, for the top-left).
+        for i in 0..sp.segment_count() {
+            let (a, b) = (corner_of.get(i), corner_of.get(i + 1).or(corner_of.first()));
+            if a == b && a.is_some_and(|k| w.shown.get(*k) == Some(&true)) {
+                let c = sp.segment(i);
+                out.move_to(c.p0);
+                out.curve_to(c.p1, c.p2, c.p3);
             }
         }
         out
@@ -249,21 +205,22 @@ impl CornerDrag {
     pub fn finish(self) -> Vec<Action> {
         if self.began {
             vec![Action::Commit]
-        } else if let Some(w) = self.widgets.widgets.get(self.widget).filter(|_| self.alt) {
-            vec![Action::Exec("object.setLiveShape".into(), self.widgets.command("kind", json!(w.kind.next())))]
+        } else if self.alt {
+            let kind = self.widgets.kinds[self.corner].next();
+            vec![Action::Exec("object.setLiveShape".into(), self.widgets.command("kind", json!(kind)))]
         } else {
             vec![]
         }
     }
 
-    /// The radius readout next to the pointer; at the largest radius, the corners there in red.
+    /// The radius readout next to the pointer; at the largest radius, the edited corners in red.
     pub fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
         if !self.began {
             return vec![];
         }
         let mut out = vec![Overlay::Measure { p: self.at, text: format!("Radius: {}", cx.len(self.radius)) }];
         if self.at_limit {
-            out.push(Overlay::Path { path: self.corners_at_limit(), color: crate::builder::HIGHLIGHT_RED, width: 2.0, dashed: false });
+            out.push(Overlay::Path { path: self.edited_corners(), color: crate::builder::HIGHLIGHT_RED, width: 2.0, dashed: false });
         }
         out
     }
@@ -283,38 +240,24 @@ mod tests {
 
     /// A live `w` × `h` rectangle with corner radius `r`.
     fn live_shape(w: f64, h: f64, r: f64, xf: Affine) -> (Document, NodeId) {
-        let live = LiveShape::Rectangle { w, h, radii: [r; 4], kinds: Default::default(), xf };
-        doc_with(live.to_path(), Some(live))
-    }
-
-    /// A document holding one path with its live shape.
-    fn doc_with(path: PathData, live: Option<LiveShape>) -> (Document, NodeId) {
         let mut d = Document::new(500.0, 500.0);
         let l = d.layers[0].id;
         let id = d.alloc_id();
-        let mut n = Node::path(id, path, Appearance::default_art());
+        let live = LiveShape::Rectangle { w, h, radii: [r; 4], kinds: Default::default(), xf };
+        let mut n = Node::path(id, live.to_path(), Appearance::default_art());
         if let NodeKind::Path { live: slot, .. } = &mut n.kind {
-            *slot = live;
+            *slot = Some(live);
         }
         d.insert(Some(l), 0, n).unwrap();
         (d, id)
     }
 
-    /// A five-pointed star at (200, 200) of radii 60 and 30 (#511): a plain path.
-    fn star() -> (Document, NodeId) {
-        doc_with(vectorcraft_geom::shapes::star(Point::new(200.0, 200.0), 60.0, 30.0, 5, 0.0), None)
-    }
-
     fn selected(id: NodeId) -> Selection {
         let mut s = Selection::default();
         s.add(id);
         s
     }
 
-    fn pts(w: &CornerWidgets) -> Vec<Point> {
-        w.visible().collect()
-    }
-
     fn radius(a: &Action) -> f64 {
         let Action::Preview(c, v) = a else { panic!("not a preview: {a:?}") };
         assert_eq!(c, "object.setLiveShape");
@@ -324,19 +267,17 @@ mod tests {
     #[test]
     fn widgets_sit_inside_each_corner() {
         let (d, id) = live_rect(0.0, Affine::translate((100.0, 100.0)));
-        let w = CornerWidgets::of(&d, &selected(id), 1.0, false).unwrap();
-        assert_eq!(pts(&w), [Point::new(110.0, 110.0), Point::new(190.0, 110.0), Point::new(190.0, 190.0), Point::new(110.0, 190.0)]);
+        let w = CornerWidgets::of(&d, &selected(id), 1.0).unwrap();
+        assert_eq!(w.points, [Point::new(110.0, 110.0), Point::new(190.0, 110.0), Point::new(190.0, 190.0), Point::new(110.0, 190.0)]);
         // A larger radius moves them to the arc centres; zooming in keeps a 10 px minimum.
         let (d, id) = live_rect(20.0, Affine::translate((100.0, 100.0)));
-        assert_eq!(pts(&CornerWidgets::of(&d, &selected(id), 1.0, false).unwrap())[0], Point::new(120.0, 120.0));
-        assert_eq!(pts(&CornerWidgets::of(&d, &selected(id), 4.0, false).unwrap())[2], Point::new(180.0, 180.0));
-        // Hidden when the shape is tiny on screen and without a single selection; a plain path
-        // shows them with Direct Selection only.
-        assert!(CornerWidgets::of(&d, &selected(id), 0.2, true).is_none());
+        assert_eq!(CornerWidgets::of(&d, &selected(id), 1.0).unwrap().points[0], Point::new(120.0, 120.0));
+        assert_eq!(CornerWidgets::of(&d, &selected(id), 4.0).unwrap().points[2], Point::new(180.0, 180.0));
+        // Hidden when the shape is tiny on screen, for plain paths and without a single selection.
+        assert!(CornerWidgets::of(&d, &selected(id), 0.2).is_none());
         let (d, id) = doc_with_rect();
-        assert!(CornerWidgets::of(&d, &selected(id), 1.0, false).is_none());
-        assert_eq!(pts(&CornerWidgets::of(&d, &selected(id), 1.0, true).unwrap())[0], Point::new(110.0, 110.0));
-        assert!(CornerWidgets::of(&d, &Selection::default(), 1.0, true).is_none());
+        assert!(CornerWidgets::of(&d, &selected(id), 1.0).is_none());
+        assert!(CornerWidgets::of(&d, &Selection::default(), 1.0).is_none());
     }
 
     #[test]
@@ -366,9 +307,9 @@ mod tests {
     fn widgets_of_a_non_square_rectangle_follow_the_drawn_corners() {
         let (d, id) = live_shape(200.0, 80.0, 60.0, Affine::translate((100.0, 100.0)));
         let s = selected(id);
-        let w = CornerWidgets::of(&d, &s, 1.0, false).unwrap();
+        let w = CornerWidgets::of(&d, &s, 1.0).unwrap();
         let centres = [Point::new(140.0, 140.0), Point::new(260.0, 140.0), Point::new(260.0, 140.0), Point::new(140.0, 140.0)];
-        assert_eq!(pts(&w), centres);
+        assert_eq!(w.points, centres);
         let p = paint();
         let cx = cx(&d, &s, &p);
         let red = |t: &dyn crate::Tool| {
@@ -398,8 +339,8 @@ mod tests {
         // 50 × 80 with 10 pt corners stretched 4 × 1: drawn 200 × 80, a mean radius of 20.
         let (d, id) = live_shape(50.0, 80.0, 10.0, Affine::translate((100.0, 100.0)) * Affine::scale_non_uniform(4.0, 1.0));
         let s = selected(id);
-        let w = CornerWidgets::of(&d, &s, 1.0, false).unwrap();
-        assert_eq!(pts(&w)[0], Point::new(120.0, 120.0));
+        let w = CornerWidgets::of(&d, &s, 1.0).unwrap();
+        assert_eq!(w.points[0], Point::new(120.0, 120.0));
         let p = paint();
         let cx = cx(&d, &s, &p);
         let mut t = crate::create("directSelection");
@@ -416,8 +357,8 @@ mod tests {
         let s = selected(id);
         let p = paint();
         let cx = cx(&d, &s, &p);
-        let w = CornerWidgets::of(&d, &s, 1.0, false).unwrap();
-        assert!(pts(&w)[0].distance(Point::new(190.0, 110.0)) < 1e-9);
+        let w = CornerWidgets::of(&d, &s, 1.0).unwrap();
+        assert!(w.points[0].distance(Point::new(190.0, 110.0)) < 1e-9);
         let mut t = crate::create("directSelection");
         t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 190.0, 110.0));
         let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 180.0, 120.0));
@@ -436,10 +377,10 @@ mod tests {
         s.anchors.insert(id, [(0, 2)].into());
         let p = paint();
         let cx = cx(&d, &s, &p);
-        let w = CornerWidgets::of(&d, &s, 1.0, true).unwrap();
-        assert_eq!(w.corners(), [2]);
-        assert_eq!(pts(&w), [Point::new(190.0, 190.0)]);
-        assert!(!over_widget(&cx, Point::new(110.0, 110.0), true), "the other corners hide theirs");
+        let w = CornerWidgets::of(&d, &s, 1.0).unwrap();
+        assert_eq!(w.shown, [false, false, true, false]);
+        assert_eq!(w.visible().collect::<Vec<_>>(), [Point::new(190.0, 190.0)]);
+        assert!(!over_widget(&cx, Point::new(110.0, 110.0)), "the other corners hide theirs");
         let mut t = crate::create("directSelection");
         assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 190.0, 191.0)).is_empty());
         let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 175.0, 176.0));
@@ -482,20 +423,20 @@ mod tests {
     #[test]
     fn corners_wider_than_the_preference_hide_their_widgets() {
         let (d, id) = live_rect(0.0, Affine::translate((100.0, 100.0)));
-        let w = CornerWidgets::of(&d, &selected(id), 1.0, false).unwrap();
-        assert_eq!(w.clone().within_angle(177.0).map(|w| w.corners()), Some(vec![0, 1, 2, 3]));
-        assert_eq!(w.clone().within_angle(90.0).map(|w| w.corners()), Some(vec![0, 1, 2, 3]));
+        let w = CornerWidgets::of(&d, &selected(id), 1.0).unwrap();
+        assert_eq!(w.within_angle(177.0).map(|w| w.shown), Some([true; 4]));
+        assert_eq!(w.within_angle(90.0).map(|w| w.shown), Some([true; 4]));
         assert!(w.within_angle(89.0).is_none());
         // Sheared by 30°: 60° at the top-left and bottom-right corners, 120° at the others.
         let shear = Affine::translate((100.0, 100.0)) * Affine::new([1.0, 0.0, 30f64.to_radians().tan(), 1.0, 0.0, 0.0]);
         let (d, id) = live_rect(0.0, shear);
-        let w = CornerWidgets::of(&d, &selected(id), 1.0, false).unwrap();
-        assert_eq!(w.clone().within_angle(100.0).map(|w| w.corners()), Some(vec![0, 2]));
+        let w = CornerWidgets::of(&d, &selected(id), 1.0).unwrap();
+        assert_eq!(w.within_angle(100.0).map(|w| w.shown), Some([true, false, true, false]));
         let s = selected(id);
         let p = paint();
         let c = ToolContext { corner_widget_max_angle: 100.0, ..cx(&d, &s, &p) };
-        assert!(over_widget(&c, pts(&w)[0], false));
-        assert!(!over_widget(&c, pts(&w)[1], false), "the 120° corner's widget is hidden");
+        assert!(over_widget(&c, w.points[0]));
+        assert!(!over_widget(&c, w.points[1]), "the 120° corner's widget is hidden");
     }
 
     #[test]
@@ -504,113 +445,14 @@ mod tests {
         let s = selected(id);
         let p = paint();
         let mut c = cx(&d, &s, &p);
-        assert!(over_widget(&c, Point::new(110.0, 110.0), false));
-        assert!(!over_widget(&c, Point::new(150.0, 150.0), false));
+        assert!(over_widget(&c, Point::new(110.0, 110.0)));
+        assert!(!over_widget(&c, Point::new(150.0, 150.0)));
         c.corner_widgets = false;
-        assert!(!over_widget(&c, Point::new(110.0, 110.0), true));
+        assert!(!over_widget(&c, Point::new(110.0, 110.0)));
         // With the widgets hidden, a drag from the same spot moves the object.
         let mut t = crate::create("selection");
         t.pointer(&c, &PointerEvent::new(PointerKind::Down, 110.0, 110.0));
         let a = t.pointer(&c, &PointerEvent::new(PointerKind::Drag, 130.0, 110.0));
         assert_eq!(a[0], Action::Begin("Move".into()));
     }
-
-    /// #511: Direct Selection shows a widget in each of a star's ten corners (the Selection tool
-    /// none: a star isn't a live shape); dragging a tip's inward rounds them all as one step.
-    #[test]
-    fn a_star_shows_widgets_in_every_corner_with_direct_selection() {
-        let (d, id) = star();
-        let s = selected(id);
-        let p = paint();
-        let cx = cx(&d, &s, &p);
-        assert!(CornerWidgets::for_tool(&cx, false).is_none());
-        let w = CornerWidgets::for_tool(&cx, true).expect("widgets on a plain path");
-        assert_eq!(w.corners(), (0..10).collect::<Vec<_>>());
-        // The top tip's widget sits 10 √2 px down its bisector.
-        let tip = pts(&w)[0];
-        assert!(tip.distance(Point::new(200.0, 140.0 + 10.0 * 2f64.sqrt())) < 1e-9, "{tip:?}");
-        let mut t = crate::create("directSelection");
-        assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Down, tip.x, tip.y)).is_empty());
-        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, tip.x, tip.y + 10.0));
-        assert_eq!(a[0], Action::Begin("Corner Radius".into()));
-        // The widget follows the arc's centre: r / sin(angle / 2) along the bisector.
-        let c = vectorcraft_geom::corners::path_corners(&star_path(&d, id))[0];
-        let want = 10.0 * (c.angle_deg() / 2.0).to_radians().sin();
-        assert!((radius(&a[1]) - want).abs() < 1e-9, "{a:?} want {want}");
-        assert!(matches!(&a[1], Action::Preview(_, v) if v["id"] == id.0 && v.get("corners").is_none()), "every corner: {a:?}");
-        // The Selection tool drags the star instead.
-        let mut t = crate::create("selection");
-        t.pointer(&cx, &PointerEvent::new(PointerKind::Down, tip.x, tip.y));
-        assert_eq!(t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, tip.x, tip.y + 10.0))[0], Action::Begin("Move".into()));
-    }
-
-    fn star_path(d: &Document, id: NodeId) -> PathData {
-        let Some(NodeKind::Path { path, .. }) = d.node(id).map(|n| &n.kind) else { panic!("not a path") };
-        path.clone()
-    }
-
-    /// #511: a Direct-Selected anchor of the star shows its corner's widget alone, and the
-    /// preference hides the star's wide inner corners (about 125°) below their angle.
-    #[test]
-    fn star_corners_follow_the_anchors_and_the_angle_preference() {
-        let (d, id) = star();
-        let mut s = selected(id);
-        s.anchors.insert(id, [(0, 3)].into());
-        let p = paint();
-        let c = cx(&d, &s, &p);
-        let w = CornerWidgets::for_tool(&c, true).unwrap();
-        assert_eq!(w.corners(), [3]);
-        let mut t = crate::create("directSelection");
-        let at = pts(&w)[0];
-        t.pointer(&c, &PointerEvent::new(PointerKind::Down, at.x, at.y));
-        let a = t.pointer(&c, &PointerEvent::new(PointerKind::Drag, at.x + 20.0, at.y + 20.0));
-        assert!(matches!(&a[1], Action::Preview(_, v) if v["corners"] == json!([3])), "{a:?}");
-        // Corners wider than 90° hide: the five tips keep theirs.
-        let whole = selected(id);
-        let c = ToolContext { corner_widget_max_angle: 90.0, ..cx(&d, &whole, &p) };
-        let w = CornerWidgets::for_tool(&c, true).unwrap();
-        assert_eq!(w.corners(), [0, 2, 4, 6, 8]);
-        assert_eq!(w.command("radius", json!(4.0))["corners"], json!([0, 2, 4, 6, 8]));
-    }
-
-    /// A live polygon shows its widgets to the Selection tool too; past every corner's limit the
-    /// cuts outline in red.
-    #[test]
-    fn a_live_polygon_rounds_with_either_tool() {
-        let live = LiveShape::Polygon { radius: 80.0, sides: 6, xf: Affine::translate((200.0, 200.0)), radii: vec![], kinds: vec![] };
-        let (d, id) = doc_with(live.to_path(), Some(live));
-        let s = selected(id);
-        let p = paint();
-        let cx = cx(&d, &s, &p);
-        for any_path in [false, true] {
-            assert_eq!(CornerWidgets::for_tool(&cx, any_path).unwrap().corners().len(), 6);
-        }
-        let tip = pts(&CornerWidgets::for_tool(&cx, false).unwrap())[0];
-        let mut t = crate::create("selection");
-        t.pointer(&cx, &PointerEvent::new(PointerKind::Down, tip.x, tip.y));
-        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 200.0, 300.0));
-        // A hexagon's 120° corners stop where their cuts meet: 40 · tan 60°.
-        assert!((radius(&a[1]) - 40.0 * 3f64.sqrt()).abs() < 1e-9, "{a:?}");
-        let red = t
-            .overlays(&cx)
-            .into_iter()
-            .any(|o| matches!(o, Overlay::Path { color, path, .. } if color == crate::builder::HIGHLIGHT_RED && path.elements().len() == 12));
-        assert!(red, "six arcs at the limit");
-    }
-
-    /// A pen path's middle corner shows a widget; its ends and curved corners don't.
-    #[test]
-    fn a_pen_path_shows_widgets_on_its_corners_only() {
-        let mut sp = vectorcraft_geom::SubPath::polyline(
-            &[Point::new(100.0, 100.0), Point::new(300.0, 100.0), Point::new(300.0, 300.0), Point::new(100.0, 300.0)],
-            false,
-        );
-        sp.anchors[2].h_out = Point::new(250.0, 350.0);
-        let (d, id) = doc_with(PathData::single(sp), None);
-        let s = selected(id);
-        let p = paint();
-        let w = CornerWidgets::for_tool(&cx(&d, &s, &p), true).unwrap();
-        assert_eq!(w.corners(), [1]);
-        assert_eq!(pts(&w), [Point::new(290.0, 110.0)]);
-    }
 }

crates/tools/src/direct.rs

@@ -6,7 +6,7 @@
 //! steps), drag a direction handle to
 //! reshape (Shift keeps it at 45° steps round its anchor, Alt moves it alone; smart guides snap
 //! it), marquee to select anchors (Shift-drag toggles them: the selected ones inside are
-//! deselected, the others selected), drag a corner widget of any path (a star, a pen path) to round its corners
+//! deselected, the others selected), drag a live rectangle's corner widget to round its corners
 //! (the selected ones when anchors are selected; Alt-click cycles their kind, double-click opens
 //! the Corners dialog).
 //! Group Selection: click selects the leaf; each further click on it adds the next enclosing group;
@@ -317,13 +317,13 @@ impl Tool for DirectSelectionTool {
                     vec![Action::Exec("select.set".into(), json!({"ids": [target.0]}))]
                 }
             }
-            (PointerKind::DoubleClick, _) if !self.group => corners::double_click(cx, p, true).into_iter().collect(),
+            (PointerKind::DoubleClick, _) if !self.group => corners::double_click(cx, p).into_iter().collect(),
             (PointerKind::Move, State::Idle) => {
                 self.hover = if self.group || !cx.highlight_anchors { None } else { hovered_anchor(cx, p) };
                 vec![]
             }
             (PointerKind::Down, _) => {
-                if let Some(c) = CornerDrag::hit(cx, ev, true) {
+                if let Some(c) = CornerDrag::hit(cx, ev) {
                     self.state = State::Corner(c);
                     return vec![];
                 }
@@ -597,7 +597,7 @@ impl Tool for DirectSelectionTool {
         }
     }
     fn cursor(&self, cx: &ToolContext, p: Point, _m: Mods) -> Cursor {
-        if !self.group && (matches!(self.state, State::Corner(_)) || over_widget(cx, p, true)) {
+        if !self.group && (matches!(self.state, State::Corner(_)) || over_widget(cx, p)) {
             return Cursor::CornerRadius;
         }
         if !self.group && (matches!(self.state, State::Bracket(_)) || over_bracket(cx, p)) {

crates/tools/src/lib.rs

@@ -234,7 +234,7 @@ pub struct ToolContext<'a> {
     /// points (a transform's reference point) land on anchors and ruler guides within
     /// [`Self::snap_tolerance`].
     pub snap_to_point: bool,
-    /// View → Show Corner Widget: paths show draggable Live Corners widgets in their corners.
+    /// View → Show Corner Widget: live rectangles show draggable Live Corners widgets.
     pub corner_widgets: bool,
     /// Which paint proxy is in front (true = Fill): the one the Gradient tool edits.
     pub fill_active: bool,

crates/tools/src/select.rs

@@ -2,7 +2,7 @@
 //! the selected ones are deselected, the others selected), move (Alt copies, Shift constrains; Smart
 //! Guides, or with them off View › Snap to Point, snap it),
 //! bounding-box scale (Shift proportional, Alt from centre) and rotate (outside corners, Shift 45°),
-//! drag a live rectangle's or polygon's corner widget to round its corners (Alt-click cycles their kind,
+//! drag a live rectangle's corner widget to round its corners (Alt-click cycles their kind,
 //! double-click opens the Corners dialog), double-click to enter isolation mode (Double Click To
 //! Isolate), Cmd/Ctrl-click to select the object behind (Command Click to Select Objects Behind),
 //! click or drag a ruler guide ([`crate::rulerguide`]), drag the brackets of type on a path
@@ -169,7 +169,7 @@ impl Tool for SelectionTool {
         match (ev.kind, self.state.clone()) {
             (PointerKind::DoubleClick, _) => {
                 self.state = State::Idle;
-                if let Some(a) = corners::double_click(cx, p, false).or_else(|| typewidget::double_click(cx, p)) {
+                if let Some(a) = corners::double_click(cx, p).or_else(|| typewidget::double_click(cx, p)) {
                     return vec![a];
                 }
                 if crate::rulerguide::guide_at(cx, p).is_some() {
@@ -191,7 +191,7 @@ impl Tool for SelectionTool {
             (PointerKind::Down, _) => {
                 // 1. Live Corners widgets and type on a path's brackets, then the bounding-box
                 // handles of the current selection.
-                if let Some(c) = CornerDrag::hit(cx, ev, false) {
+                if let Some(c) = CornerDrag::hit(cx, ev) {
                     self.state = State::Corner(c);
                     return vec![];
                 }
@@ -381,7 +381,7 @@ impl Tool for SelectionTool {
         if self.guide.busy() {
             return self.guide.cursor(cx, p).unwrap_or_default();
         }
-        if over_widget(cx, p, false) {
+        if over_widget(cx, p) {
             return Cursor::CornerRadius;
         }
         if over_bracket(cx, p) {

crates/ui-egui/src/canvas.rs

@@ -1419,16 +1419,11 @@ fn selection_overlay(app: &mut VectorcraftApp, p: &egui::Painter, xf: &Xf) {
             anchor_square(p, xf.to_screen(a.p), color, false, anchor(direct));
         }
     }
-    // Live Corners widgets (Selection on a live rectangle or polygon, Direct Selection on any path).
+    // Live Corners widgets (Selection / Direct Selection on a single live rectangle).
     if matches!(tool, "selection" | "directSelection")
-        && let Some(w) = vectorcraft_tools::corners::CornerWidgets::showing(
-            &st.doc,
-            &st.selection,
-            xf.zoom,
-            tool == "directSelection",
-            app.ui.view.corner_widgets,
-            app.session.prefs.hide_corner_widget_above,
-        )
+        && app.ui.view.corner_widgets
+        && let Some(w) = vectorcraft_tools::corners::CornerWidgets::of(&st.doc, &st.selection, xf.zoom)
+            .and_then(|w| w.within_angle(app.session.prefs.hide_corner_widget_above))
     {
         let color = c32(st.doc.layer_color(w.id));
         for sp in w.visible().map(|q| xf.to_screen(q)) {
@@ -2254,25 +2249,6 @@ mod tests {
         assert_eq!(widgets(&mut app), 0);
     }
 
-    /// #511: a star shows a widget in each of its ten corners with Direct Selection (none with
-    /// the Selection tool: it isn't a live shape); View → Hide Corner Widget hides them.
-    #[test]
-    fn a_star_shows_corner_widgets_with_direct_selection() {
-        let mut app = VectorcraftApp::new(Session::new(), Default::default());
-        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
-        app.session.execute("shape.star", &json!({"cx": 200, "cy": 150, "radius1": 80, "radius2": 40})).unwrap();
-        let ctx = egui::Context::default();
-        let widgets = |app: &mut VectorcraftApp| {
-            shapes(app, &ctx).iter().filter(|s| matches!(s, Shape::Circle(c) if c.radius == 3.0 && c.fill == Color32::WHITE)).count()
-        };
-        app.select_tool("selection");
-        assert_eq!(widgets(&mut app), 0);
-        app.select_tool("directSelection");
-        assert_eq!(widgets(&mut app), 10);
-        app.run("view.cornerWidget", json!({})).unwrap();
-        assert_eq!(widgets(&mut app), 0);
-    }
-
     /// The type widget beside selected type's bounding box: hollow (white) on point type, filled
     /// in the layer colour on area type.
     #[test]

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

@@ -1,16 +1,13 @@
 //! Corners: double-clicking a Live Corners widget (or `ui.corners`) sets the corner kind and
-//! radius of a path's corners: those whose widgets show (the Direct-Selected ones, else every
-//! corner). OK runs `object.setLiveShape` for them, one undo step.
+//! radius of a live rectangle's corners: those whose widgets show (the Direct-Selected ones, else
+//! all four). OK runs `object.setLiveShape` for them, one undo step.
 //!
-//! Fields: `id`, `corners` (anchor indices of the path with its corners uncut: a rectangle's 0–3
-//! from the top-left clockwise), `kind` ("round", "invertedRound" or "chamfer") and `radius`
-//! (pt). While the corners differ in kind or radius, that field is absent and OK leaves it as it
-//! is.
-
-use std::collections::BTreeSet;
+//! Fields: `id`, `corners` (indices 0–3: top-left, top-right, bottom-right, bottom-left), `kind`
+//! ("round", "invertedRound" or "chamfer") and `radius` (pt). While the corners differ in kind
+//! or radius, that field is absent and OK leaves it as it is.
 
 use serde_json::{Value, json};
-use vectorcraft_engine::doc::{LiveCorners, NodeId};
+use vectorcraft_engine::doc::{NodeId, NodeKind};
 use vectorcraft_geom::shapes::CornerKind;
 
 use super::swatch_options::{grid, label};
@@ -23,7 +20,7 @@ pub const KIND: &str = vectorcraft_tools::corners::DIALOG;
 
 pub(super) const SPEC: DialogSpec = DialogSpec { heading: |_| tl!("Corners").into(), body, confirm, min_width: 280.0, ..DialogSpec::FORM };
 
-/// Open Corners for `{id?, corners?}`: the path `id` (default: the selected one) and its
+/// Open Corners for `{id?, corners?}`: the live rectangle `id` (default: the selected one) and its
 /// `corners` (default: the selected corners), filled in with their kind and radius.
 pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
     let st = app.session.active().ok_or("no document")?;
@@ -31,21 +28,22 @@ pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
         Some(id) => NodeId(id),
         None => match st.selection.objects[..] {
             [id] => id,
-            _ => return Err("select one path, or give its `id`".into()),
+            _ => return Err("select one live rectangle, or give its `id`".into()),
         },
     };
-    let Some(live) = st.doc.node(id).and_then(LiveCorners::of) else {
-        return Err("Corners edits the corners of a path".into());
+    let Some(NodeKind::Path { live: Some(live @ vectorcraft_engine::doc::LiveShape::Rectangle { .. }), .. }) = st.doc.node(id).map(|n| &n.kind)
+    else {
+        return Err("Corners edits a live rectangle".into());
     };
-    let corners: BTreeSet<usize> = match p.get("corners").and_then(Value::as_array) {
-        Some(a) => a.iter().filter_map(Value::as_u64).filter_map(|k| usize::try_from(k).ok()).filter(|k| live.corner(*k).is_some()).collect(),
-        None => live.picked(st.selection.partial(id)),
+    let corners = match p.get("corners").and_then(Value::as_array) {
+        Some(a) => std::array::from_fn(|k| a.iter().any(|v| v.as_u64() == Some(k as u64))),
+        None => live.picked_corners(st.selection.partial(id)),
     };
-    if corners.is_empty() {
-        return Err("give corners of the path: anchors between two straight sides".into());
+    if !corners.contains(&true) {
+        return Err("give corners 0–3".into());
     }
-    let (radius, kind) = live.style(&corners);
-    let mut fields = json!({"id": id.0, "corners": corners});
+    let (radius, kind) = live.corner_style(corners);
+    let mut fields = json!({"id": id.0, "corners": (0..4).filter(|k| corners[*k]).collect::<Vec<_>>()});
     if let Some(k) = kind {
         fields["kind"] = json!(k);
     }
@@ -96,7 +94,7 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
 mod tests {
     use super::*;
     use vectorcraft_engine::Session;
-    use vectorcraft_engine::doc::{LiveShape, NodeKind};
+    use vectorcraft_engine::doc::LiveShape;
     use vectorcraft_tools::corners::CornerWidgets;
     use vectorcraft_tools::{PointerEvent, PointerKind};
 
@@ -123,7 +121,7 @@ mod tests {
     /// The radius the Properties panel's Corner Radius field shows.
     fn panel_radius(app: &VectorcraftApp, id: u64) -> Option<f64> {
         let n = app.session.active().unwrap().doc.node(NodeId(id)).unwrap().clone();
-        crate::panels::corner_radius(app, &n)
+        crate::panels::corner_radius(app, &n, &live(app, id))
     }
 
     fn shown(app: &mut VectorcraftApp) -> Vec<String> {
@@ -153,7 +151,7 @@ mod tests {
         app.select_tool("directSelection");
         let view = app.view_info();
         let st = app.session.active().unwrap();
-        let at: Vec<_> = CornerWidgets::of(&st.doc, &st.selection, view.zoom, true).unwrap().visible().collect();
+        let at: Vec<_> = CornerWidgets::of(&st.doc, &st.selection, view.zoom).unwrap().visible().collect();
         assert_eq!(at.len(), 1);
         crate::canvas::dispatch(&mut app, &PointerEvent::new(PointerKind::DoubleClick, at[0].x, at[0].y), view);
         let d = app.ui.dialog.clone().expect("Corners opened");
@@ -194,25 +192,8 @@ mod tests {
         app.ui.dialog.as_mut().unwrap().fields.insert("radius".into(), json!("3 pt"));
         super::super::confirm(&mut app).unwrap();
         assert_eq!(corners(&app, id), ([3.0; 4], before.1));
-        // Only paths, and only real corners.
+        // Only live rectangles, and only real corners.
         assert!(app.run("ui.corners", json!({"id": 9999})).is_err());
         assert!(app.run("ui.corners", json!({"corners": [7]})).is_err());
-        let e = app.run("shape.ellipse", json!({"x": 0, "y": 0, "width": 50, "height": 30})).unwrap()["id"].as_u64().unwrap();
-        assert!(app.run("ui.corners", json!({"id": e})).is_err());
-    }
-
-    /// #511: a star's corners open in Corners too; OK rounds them.
-    #[test]
-    fn corners_edits_a_star() {
-        let (mut app, _) = app();
-        let id = app.run("shape.star", json!({"cx": 200, "cy": 200, "radius1": 60, "radius2": 30})).unwrap()["id"].as_u64().unwrap();
-        app.run("ui.corners", json!({})).unwrap();
-        let d = app.ui.dialog.as_mut().unwrap();
-        assert_eq!((d.fields.get("corners"), d.f64("radius", -1.0)), (Some(&json!((0..10).collect::<Vec<_>>())), 0.0));
-        d.fields.insert("radius".into(), json!(5));
-        super::super::confirm(&mut app).unwrap();
-        let n = app.session.active().unwrap().doc.node(NodeId(id)).unwrap().clone();
-        assert!(matches!(&n.kind, NodeKind::Path { live: Some(LiveShape::Path { .. }), .. }));
-        assert_eq!(crate::panels::corner_radius(&app, &n), Some(5.0));
     }
 }

crates/ui-egui/src/i18n/es.tsv

@@ -3072,7 +3072,7 @@ axis	Both	Ambos
 @msg	Convert to Artboards: selection has no area	Convertir en mesas de trabajo: la selección no tiene área
 @msg	Convert to Shape: no rectangles or ellipses selected	Convertir en forma: no hay rectángulos ni elipses seleccionados
 @msg	Copied the CSS of {rules} object(s)	Se copió el CSS de {rules} objeto(s)
-@msg	Corners edits the corners of a path	Esquinas edita las esquinas de un trazado
+@msg	Corners edits a live rectangle	Esquinas edita un rectángulo interactivo
 @msg	Couldn't copy to the system clipboard: {e}	No se pudo copiar al portapapeles del sistema: {e}
 @msg	Couldn't open {name}: {e}	No se pudo abrir {name}: {e}
 @msg	Couldn't place {name}: the document it was dropped on was closed	No se pudo colocar {name}: se cerró el documento en el que se soltó
@@ -3238,7 +3238,7 @@ axis	Both	Ambos
 @msg	file version {0} is newer than this VectorCraft supports ({VERSION})	la versión de archivo {0} es más reciente de lo que admite este VectorCraft ({VERSION})
 @msg	freeform point {i} needs `at` [x, y] and a valid `color`	el punto de forma libre {i} necesita `at` [x, y] y un `color` válido
 @msg	give both `start` and `end` [x, y] (or neither)	indica `start` y `end` [x, y] (o ninguno de los dos)
-@msg	give corners of the path: anchors between two straight sides	indica esquinas del trazado: puntos de ancla entre dos lados rectos
+@msg	give corners 0–3	indica esquinas de 0 a 3
 @msg	give the path `id` and the width point `index`	indica el `id` del trazado y el `index` del punto de anchura
 @msg	guides are locked	las guías están bloqueadas
 @msg	image '{key}' has no pixels and was left out	la imagen '{key}' no tiene píxeles y se omitió
@@ -3422,7 +3422,7 @@ axis	Both	Ambos
 @msg	select artwork (or a colour group) to recolor	selecciona la ilustración (o un grupo de colores) que quieres volver a colorear
 @msg	select at least two objects	selecciona al menos dos objetos
 @msg	select objects, not layers	selecciona objetos, no capas
-@msg	select one path, or give its `id`	selecciona un trazado o indica su `id`
+@msg	select one live rectangle, or give its `id`	selecciona un rectángulo interactivo o indica su `id`
 @msg	select paths to join	selecciona los trazados que quieres unir
 @msg	select the art to repeat	selecciona la ilustración que quieres repetir
 @msg	select the artwork to warp	selecciona la ilustración que quieres deformar

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

@@ -64,7 +64,7 @@ fn plural_czech(n: u64) -> usize {
 }
 
 /// The registry. English first: it is the fallback and the source language.
-pub static LANGUAGES: [LangInfo; 7] = [
+pub static LANGUAGES: [LangInfo; 8] = [
     LangInfo { code: "en", name: "English", source: "", plural: plural_one_other, complete_menus: false, catalog: OnceLock::new() },
     // Japanese: the whole interface (every menu string and `tl!` literal), keeping the product,
     // workspace and perspective preset names in English (`MENU_KEEP_AS_IS`).
@@ -81,6 +81,16 @@ pub static LANGUAGES: [LangInfo; 7] = [
         complete_menus: true,
         catalog: OnceLock::new(),
     },
+    // Italian: the whole interface and the status and error messages, keeping the same names in
+    // English as Spanish; every `it-*` locale (`it-IT`, `it-CH`, `it-SM` …) resolves here.
+    LangInfo {
+        code: "it",
+        name: "Italiano",
+        source: include_str!("it.tsv"),
+        plural: plural_one_other,
+        complete_menus: true,
+        catalog: OnceLock::new(),
+    },
     // Brazilian Portuguese: every menu label (`menu_catalogs_translate_every_menu_label`), every
     // `tl!` literal and the plural messages; left English on purpose are the `MENU_KEEP_AS_IS`
     // strings (product name, language names, workspace names, perspective grid presets).

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

@@ -15,6 +15,10 @@ fn tags_map_to_languages() {
     for tag in ["es", "es_ES.UTF-8", "es-MX", "es_AR", "es-419", "es-US"] {
         assert_eq!(lang_from_tag(tag), Lang::from_code("es"), "{tag}");
     }
+    // Italian: Italy, Switzerland and San Marino share the one catalog.
+    for tag in ["it", "it_IT.UTF-8", "it-CH", "it_SM"] {
+        assert_eq!(lang_from_tag(tag), Lang::from_code("it"), "{tag}");
+    }
     // Traditional Chinese: by region, by script, and with a region after the script.
     assert_eq!(lang_from_tag("zh_TW.UTF-8"), Some(ZH()));
     assert_eq!(lang_from_tag("zh-TW"), Some(ZH()));
@@ -391,9 +395,9 @@ fn cs() -> Lang {
 }
 
 /// Languages whose catalogs leave [`MENU_KEEP_AS_IS`] in English.
-const KEEPS_MENU_NAMES: [&str; 4] = ["cs", "es", "ja", "pt-br"];
+const KEEPS_MENU_NAMES: [&str; 5] = ["cs", "es", "it", "ja", "pt-br"];
 
-/// Menu labels the menu-complete catalogs (Czech, Spanish, Japanese, Brazilian Portuguese) show as they are: the product name, a format name, the built-in workspace
+/// Menu labels the menu-complete catalogs (Czech, Spanish, Italian, Japanese, Brazilian Portuguese) show as they are: the product name, a format name, the built-in workspace
 /// names and the perspective grid presets (names, shown untranslated wherever else they appear).
 /// Each language's own name in the Language menu is left alone too.
 const MENU_KEEP_AS_IS: &[&str] = &[
@@ -483,7 +487,7 @@ fn toggled_labels() -> Vec<String> {
     labels
 }
 
-/// Czech, Spanish, Japanese and Brazilian Portuguese cover every menu label, the Show/Hide pairs
+/// Czech, Spanish, Italian, Japanese and Brazilian Portuguese cover every menu label, the Show/Hide pairs
 /// and the canvas context menu included (panels and dialogs not yet).
 #[test]
 fn menu_catalogs_translate_every_menu_label() {
@@ -514,12 +518,17 @@ fn menu_catalogs_translate_every_menu_label() {
     assert_eq!(tr(Lang::from_code("ja").expect("ja"), "File"), "ファイル");
     assert_eq!(tr(Lang::from_code("pt-br").expect("pt-br"), "File"), "Arquivo");
     assert_eq!(tr(es(), "File"), "Archivo");
+    assert_eq!(tr(it(), "Edit"), "Modifica");
 }
 
 fn es() -> Lang {
     Lang::from_code("es").expect("es registered")
 }
 
+fn it() -> Lang {
+    Lang::from_code("it").expect("it registered")
+}
+
 /// Spanish uses the vector-illustration vocabulary its users know, has two plural forms like
 /// English, and reads the same in the menus and in the panels.
 #[test]
@@ -541,6 +550,27 @@ fn spanish_reads_as_spanish() {
     assert_eq!(trn(es(), 3, "{n} Layer", "{n} Layers"), "3 capas");
 }
 
+/// Italian uses the vector-illustration vocabulary its users know, has two plural forms like
+/// English (zero takes the plural), and reads the same in the menus and in the panels.
+#[test]
+fn italian_reads_as_italian() {
+    for (en, want) in [
+        ("Artboard Tool", "Strumento Tavola da disegno"),
+        ("Swatches", "Campioni"),
+        ("Pathfinder", "Elaborazione tracciati"),
+        ("Stroke", "Traccia"),
+        ("Fill", "Riempimento"),
+        ("Direct Selection Tool", "Strumento Selezione diretta"),
+        ("Save As…", "Salva con nome…"),
+        ("Undo", "Annulla"),
+    ] {
+        assert_eq!(tr(it(), en), want);
+    }
+    assert_eq!(trn(it(), 1, "{n} Layer", "{n} Layers"), "1 livello");
+    assert_eq!(trn(it(), 0, "{n} Layer", "{n} Layers"), "0 livelli");
+    assert_eq!(trn(it(), 3, "{n} Layer", "{n} Layers"), "3 livelli");
+}
+
 /// Catalogs written with spaces between words keep a fragment's leading and trailing spaces: the
 /// hint bar and a few labels are joined from pieces (" to finish", "Press ").
 #[test]
@@ -559,11 +589,11 @@ fn czech_plurals_have_three_forms() {
     assert_eq!(forms, [2, 0, 1, 1, 2, 2, 2]);
 }
 
-/// Czech and Spanish letters (and the punctuation their text uses) come from each family's own first font, not
+/// Czech, Spanish and Italian letters (and the punctuation their text uses) come from each family's own first font, not
 /// from a fallback further down the stack. (`has_glyph` can't tell: it counts characters of the
 /// face that draws missing glyphs, the first one, as missing.)
 #[test]
-fn czech_and_spanish_glyphs_are_available_without_system_fonts() {
+fn czech_spanish_and_italian_glyphs_are_available_without_system_fonts() {
     let ctx = egui::Context::default();
     crate::theme::install_fonts(&ctx);
     let mut output = ctx.run_ui(egui::RawInput::default(), |_| {});
@@ -574,7 +604,8 @@ fn czech_and_spanish_glyphs_are_available_without_system_fonts() {
             let first = first.unwrap();
             let mut font = fonts.fonts.font(&family);
             let chars = font.characters();
-            for ch in "áčďéěíňóřšťúůýžÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ„“‚‘…–ñÑüÜ¿¡”".chars() {
+            for ch in "áčďéěíňóřšťúůýžÁČĎÉĚÍŇÓŘŠŤÚŮÝŽ„“‚‘…–ñÑüÜ¿¡”àèìòùÀÈÌÒÙ«»’".chars()
+            {
                 assert!(chars.get(&ch).is_some_and(|fonts| fonts.contains(&first)), "{first} ({family:?}) has no {ch}");
             }
         }
@@ -651,7 +682,7 @@ fn complete_languages_translate_every_message() {
 }
 
 /// Languages whose catalogs cover every status and error message.
-const COMPLETE_MESSAGES: &[&str] = &["es"];
+const COMPLETE_MESSAGES: &[&str] = &["es", "it"];
 
 /// Crates whose error and status messages reach the status bar.
 const MESSAGE_CRATES: &[&str] = &["ui-egui", "engine", "doc", "format", "svg", "pdf", "eps", "text", "plugins", "metafile", "cad"];

crates/ui-egui/src/menus.rs

@@ -485,7 +485,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "ui.corners",
         "Corners…",
         "",
-        "{id?, corners?: [i…]} open Corners for path `id` (default: the selected one) and its corners (anchor indices of the path with its corners uncut, as object.setLiveShape takes them: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; default: the Direct-Selected corners, else every corner) (dialog `corners`: kind (round|invertedRound|chamfer), radius (pt); double-clicking a corner widget opens it too): OK runs object.setLiveShape",
+        "{id?, corners?: [0..3…]} open Corners for live rectangle `id` (default: the selected one) and its corners (0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; default: the Direct-Selected corners, else all four) (dialog `corners`: kind (round|invertedRound|chamfer), radius (pt); double-clicking a corner widget opens it too): OK runs object.setLiveShape",
     ),
     (
         "ui.colorGuideLimit",

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

@@ -45,7 +45,7 @@ pub mod transparency;
 use egui::{Rect, Sense, Ui, vec2};
 use serde_json::{Value, json};
 use vectorcraft_color::{BlendMode, Color, Paint};
-use vectorcraft_doc::{LiveCorners, Node, StrokeLayer};
+use vectorcraft_doc::{LiveShape, Node, StrokeLayer};
 use vectorcraft_engine::inspect::StrokeMixed;
 
 use crate::theme::Tokens;
@@ -57,24 +57,11 @@ pub fn first_selected(app: &VectorcraftApp) -> Option<Node> {
     first_node(app).cloned()
 }
 
-/// The radius the Live Corners of path `n` show in the panels: that of the corners the panels set
-/// (the Direct-Selected ones, else every corner), blank when they differ.
-pub(crate) fn corner_radius(app: &VectorcraftApp, n: &Node) -> Option<f64> {
+/// The radius the Live Corners of live rectangle `n` show in the panels: that of the corners the
+/// panels set (the Direct-Selected ones, else all four), blank when they differ.
+pub(crate) fn corner_radius(app: &VectorcraftApp, n: &Node, live: &LiveShape) -> Option<f64> {
     let partial = app.session.active().and_then(|d| d.selection.partial(n.id));
-    let corners = LiveCorners::of(n)?;
-    corners.style(&corners.picked(partial)).0
-}
-
-/// The Corner Radius field of a live rectangle's or polygon's properties: [`corner_radius`],
-/// which a new value sets on those corners.
-pub(crate) fn corner_radius_row(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, id: &str) {
-    let units = app.session.general_unit();
-    ui.horizontal(|ui| {
-        dim_label(ui, tl!("Corner Radius:"));
-        if let Some(r) = crate::widgets::num_field(ui, id, corner_radius(app, n), units, 80.0) {
-            app.run("object.setLiveShape", json!({"radius": r})).ok();
-        }
-    });
+    live.corner_style(live.picked_corners(partial)).0
 }
 
 /// Number of selected objects.

crates/ui-egui/src/panels/properties.rs

@@ -2,9 +2,9 @@
 
 use egui::Ui;
 use serde_json::json;
-use vectorcraft_doc::{LiveShape, NodeKind, Unit};
+use vectorcraft_doc::{NodeKind, Unit};
 
-use super::{corner_radius_row, first_selected, pstate, set_pstate};
+use super::{corner_radius, first_selected, pstate, set_pstate};
 use crate::theme::Tokens;
 use crate::widgets::{self, dim_label, divider, section_header};
 use crate::{VectorcraftApp, icons};
@@ -93,7 +93,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     divider(ui);
     section_header(ui, tl!("Quick Actions"));
     let is_group = matches!(first.as_ref().map(|n| &n.kind), Some(NodeKind::Group { .. }));
-    let is_live = matches!(first.as_ref().map(|n| &n.kind), Some(NodeKind::Path { live: Some(l), .. }) if !matches!(l, LiveShape::Path { .. }));
+    let is_live = matches!(first.as_ref().map(|n| &n.kind), Some(NodeKind::Path { live: Some(_), .. }));
     let mut actions: Vec<(&str, &str)> = vec![];
     if n_sel > 1 {
         actions.push((tl!("Group"), "object.group"));
@@ -335,7 +335,14 @@ pub fn transform_section(app: &mut VectorcraftApp, ui: &mut Ui) {
         && let NodeKind::Path { live: Some(live), .. } = &n.kind
     {
         match live {
-            vectorcraft_doc::LiveShape::Rectangle { .. } => corner_radius_row(app, ui, &n, "radius"),
+            vectorcraft_doc::LiveShape::Rectangle { .. } => {
+                ui.horizontal(|ui| {
+                    dim_label(ui, tl!("Corner Radius:"));
+                    if let Some(r) = widgets::num_field(ui, "radius", corner_radius(app, &n, live), units, 80.0) {
+                        app.run("object.setLiveShape", json!({"radius": r})).ok();
+                    }
+                });
+            }
             vectorcraft_doc::LiveShape::Polygon { sides, .. } => {
                 ui.horizontal(|ui| {
                     dim_label(ui, tl!("Sides:"));
@@ -343,7 +350,6 @@ pub fn transform_section(app: &mut VectorcraftApp, ui: &mut Ui) {
                         app.run("object.setLiveShape", json!({"sides": s as u32})).ok();
                     }
                 });
-                corner_radius_row(app, ui, &n, "radius");
             }
             _ => {}
         }

crates/ui-egui/src/panels/transform.rs

@@ -7,7 +7,7 @@ use serde_json::json;
 use vectorcraft_doc::NodeKind;
 use vectorcraft_geom::Rect;
 
-use super::{corner_radius_row, first_selected, pstate, set_pstate};
+use super::{corner_radius, first_selected, pstate, set_pstate};
 use crate::theme::Tokens;
 use crate::widgets::{self, menu_item};
 use crate::{VectorcraftApp, icons};
@@ -166,16 +166,20 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
             app.run("object.reflect", json!({"axis": "horizontal", "origin": origin})).ok();
         }
     });
-    // Live shape properties (a path with live corners is no shape).
+    // Live shape properties.
     if let Some(n) = first_selected(app)
         && let NodeKind::Path { live: Some(live), .. } = &n.kind
-        && !matches!(live, vectorcraft_doc::LiveShape::Path { .. })
     {
         widgets::divider(ui);
         match live {
             vectorcraft_doc::LiveShape::Rectangle { .. } => {
                 widgets::subheader(ui, tl!("Rectangle Properties:"));
-                corner_radius_row(app, ui, &n, "xfp-radius");
+                ui.horizontal(|ui| {
+                    widgets::dim_label(ui, tl!("Corner Radius:"));
+                    if let Some(r) = widgets::num_field(ui, "xfp-radius", corner_radius(app, &n, live), units, 80.0) {
+                        app.run("object.setLiveShape", json!({"radius": r})).ok();
+                    }
+                });
             }
             vectorcraft_doc::LiveShape::Polygon { sides, .. } => {
                 widgets::subheader(ui, tl!("Polygon Properties:"));
@@ -185,7 +189,6 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
                         app.run("object.setLiveShape", json!({"sides": s.clamp(3.0, 20.0) as u32})).ok();
                     }
                 });
-                corner_radius_row(app, ui, &n, "xfp-radius");
             }
             _ => {
                 widgets::subheader(ui, tl!("Shape Properties:"));

docs/control-protocol.md

@@ -291,9 +291,9 @@ Width Point Edit: double-clicking a width point with the Width tool, or `ui.widt
 value: true}` then confirm (the Delete button) removes the point with `stroke.widthPoint.remove`.
 
 Corners: double-clicking a Live Corners widget with the Selection or Direct Selection tool, or `ui.corners {id?,
-corners?}`, opens the `corners` dialog for a path's corners (the Direct-Selected ones, else every corner; fields `id`,
-`corners`: anchor indices of the path with its corners uncut, a rectangle's 0–3 clockwise from the top-left, `kind`:
-round, invertedRound or chamfer, `radius` in points; `kind` or `radius` is absent while the corners differ). `ui.dialog.confirm` runs `object.setLiveShape` with them.
+corners?}`, opens the `corners` dialog for a live rectangle's corners (the Direct-Selected ones, else all four; fields
+`id`, `corners`: indices 0–3 clockwise from the top-left, `kind`: round, invertedRound or chamfer, `radius` in points;
+`kind` or `radius` is absent while the corners differ). `ui.dialog.confirm` runs `object.setLiveShape` with them.
 
 Perspective plane options: double-clicking a plane widget of the perspective grid, or `ui.perspectivePlane {plane}`,
 opens the `perspectivePlane` dialog (fields `plane`: left, right or ground; `location`: points along the plane's

docs/development.md

@@ -124,7 +124,8 @@ Languages shipped: English (`en`, the source), Traditional Chinese (`zh-hant`, c
 in Taiwan; `zh-TW`, `zh-HK`, `zh-MO` and `zh-Hant-*` locales all resolve to it), Simplified Chinese (`zh-hans`,
 complete, in the vocabulary used in mainland China; `zh-CN`, `zh-SG`, `zh-Hans-*` and a bare `zh` resolve to it,
 so the two scripts never mix), Japanese (`ja`, complete), Spanish (`es`, complete, in neutral
-international Spanish; every `es-*` locale such as `es-ES`, `es-MX`, `es-AR` or `es-419` resolves to it), Czech (`cs`, every menu label) and Brazilian Portuguese
+international Spanish; every `es-*` locale such as `es-ES`, `es-MX`, `es-AR` or `es-419` resolves to it), Italian (`it`,
+complete; `it-IT`, `it-CH` and every other `it-*` locale resolve to it), Czech (`cs`, every menu label) and Brazilian Portuguese
 (`pt-br`, every menu label and every `tl!` literal). Untranslated text falls back to English until its rows are added.
 
 - `tl!("…")` translates a literal into the language the UI is drawn in; `i18n::t(s)` is the same for a
@@ -152,10 +153,10 @@ international Spanish; every `es-*` locale such as `es-ES`, `es-MX`, `es-AR` or
   control channel, MCP and tests read them) and are translated only where the status bar draws them
   (`i18n::msg`). `@msg` catalog rows hold a whole message or a template such as
   `Couldn't open {name}: {e}`; `{_1}`, `{_2}` … stand for the format string's `{}`, and the values in the
-  placeholders are translated in turn (the reason after `: {e}` is often a message too). Spanish covers every
+  placeholders are translated in turn (the reason after `: {e}` is often a message too). Spanish and Italian cover every
   message literal the test scan finds (`complete_languages_translate_every_message`, languages listed in
   `COMPLETE_MESSAGES`): a new `Err("…")`, `Other(…)`, `#[error(…)]` or `status(…)` message needs an `es.tsv`
-  row (`VECTORCRAFT_I18N_DUMP_MESSAGES=messages.txt cargo test -p vectorcraft-ui-egui
+  and an `it.tsv` row (`VECTORCRAFT_I18N_DUMP_MESSAGES=messages.txt cargo test -p vectorcraft-ui-egui
   complete_languages_translate_every_message` lists them all). Other languages show messages in English
   until they add `@msg` rows.
 - Not translated on purpose: names that are user data (layers, swatches, fonts, documents), the tab

docs/mcp.md

@@ -1135,32 +1135,21 @@ size. The journal entry of a scaling command records the `strokes` and `corners`
 
 ## Live Corners
 
-`object.setLiveShape {id?, ids?, radius?, kind?, corners?}` sets the corners of any path (one undo step): a live
-rectangle's or polygon's, a star's, a pen path's. A corner is an anchor without handles between two straight sides
-(not an open path's ends, not a smooth anchor, not one the sides run straight on through). `radius` (pt) and `kind`
-(`round`, `invertedRound` or `chamfer`) go to the `corners` given, else to the corners holding a Direct-Selected
-anchor (`select.anchors`), else to every corner. `corners` are anchor indices of the path with its corners uncut,
-counting every subpath's anchors in order: a rectangle's 0 top-left, 1 top-right, 2 bottom-right, 3 bottom-left; a
-polygon's from its first vertex clockwise; a star's from its first tip; an index past the last anchor is an error.
-Each corner keeps its own radius and kind (the shape's `live` in queries has `radii` and, when a corner isn't round,
-`kinds`); a corner with no radius is one anchor, a cut one two, and Direct-Selected corners stay selected as that
-changes. A path that isn't a live shape keeps its uncut outline (`live` `{"shape": "path", "base", "radii"}`) so its
-corners stay editable, and is a plain path again once no corner is cut; a polygon stays a live polygon, its corners
-keeping the radius they shared when `sides` changes. Every corner is a circular arc tangent to both sides: a radius
-draws no larger than takes the cut halfway along the corner's shorter side (half the shorter side of a rectangle, the
-same limit for its four corners), the corners stay circular through uneven scales (the radius scales by the mean scale,
-or keeps its size with Scale Corners off), and a rectangle from a file that kept an uneven scale in its transform
-(elliptical corners) gets circular ones in document units when its corners are next set. Dragging a corner widget
-rounds the corners whose widgets show (every corner, or the Direct-Selected ones), outlining in red those that reach
-their limit; the Selection tool shows the widgets of live rectangles and polygons, the Direct Selection tool those of
-any path. Alt-clicking one cycles their kind and double-clicking one opens Corners (`ui.corners {id?, corners?}`,
-dialog `corners`: `kind`, `radius`; OK runs `object.setLiveShape`).
+`object.setLiveShape {id?, ids?, radius?, kind?, corners?}` sets the corners of live rectangles (one undo step):
+`radius` (pt) and `kind` (`round`, `invertedRound` or `chamfer`) go to the `corners` given (0 top-left, 1 top-right,
+2 bottom-right, 3 bottom-left), else to the corners holding a Direct-Selected anchor (`select.anchors`), else to all
+four. Each corner keeps its own radius and kind (the shape's `live` in queries has `radii` and, when a corner isn't
+round, `kinds`); a corner with no radius is one anchor, a cut one two, and Direct-Selected corners stay selected as
+that changes. Every corner is a circular arc, whatever the rectangle's proportions: a radius past half the shorter
+side draws at half of it (the same limit for every corner), and a rectangle from a file that kept an uneven scale in its
+transform (elliptical corners) gets circular ones in document units when its corners are next set. With the Selection or
+Direct Selection tool, dragging a corner widget rounds the corners whose widgets show (all four, or the Direct-Selected
+ones), outlining them in red once they reach that limit; Alt-clicking one cycles their kind and double-clicking one
+opens Corners (`ui.corners {id?, corners?}`, dialog `corners`: `kind`, `radius`; OK runs `object.setLiveShape`).
 
 ```json
 {"name":"run_command","arguments":{"command":"object.setLiveShape","params":{"id":12,"corners":[1],"radius":16}}}
 {"name":"run_command","arguments":{"command":"object.setLiveShape","params":{"id":12,"corners":[0,3],"radius":8,"kind":"chamfer"}}}
-{"name":"run_command","arguments":{"command":"shape.star","params":{"cx":200,"cy":200,"radius1":60,"radius2":30}}}
-{"name":"run_command","arguments":{"command":"object.setLiveShape","params":{"radius":5}}}
 ```
 
 ## Use Preview Bounds