Fix #506: drawing tools snap to Smart Guides as the Selection tool does

Every drawing tool now asks one snapper (guides::DrawSnap) for the points it
places: the Pen's and Curvature tool's anchors, the Pencil's ends, the shape
tools' start and dragged corner or radius (Rectangle, Rounded Rectangle,
Ellipse, Polygon, Star, Line Segment, Arc, Spiral, the grids), the Type tool's
click and frame and a new artboard's corners. Points land on other objects'
anchors, centres and paths ("anchor", "center", "path") or line up with their
anchors, edges and centres ("align"); hovering shows it before the press, the
Pen's guides end its rubber band, and the Pen lands on the path being drawn
too. Shift keeps a point to its 45-degree step (from Constrain Angle) or a
box's diagonal and slides it along that way into line with a target.
Preferences > Smart Guides > Construction Guides and Angles now act: a drawn
point near a guide through the point it leaves from lands on it.

Before, the Pen snapped only its press and showed nothing, and the shape tools
re-gathered targets on every drag step from the document showing their own
preview, so the dragged corner stuck to where the last step left it.

Performance: targets are gathered once per document state (keyed on the
document's uid and revision, now in ToolContext), from the art in the window,
and sorted, so the anchors, centres and lines near the pointer are found by
bisection. Leaving objects out of the targets no longer looks up each node's
ancestry (quadratic in the document's size): one pruned walk does it, which
also speeds up the Selection tool's moves and resizes.

The direction handles' HandleSnap (#494) is now a DrawSnap holding its own
targets (Targets::for_handle) for the drag: one cache, one lookup.

Co-Authored-By: Claude Opus 5.5 <[email protected]>

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 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
 
 ## Where we are
 
@@ -42,7 +42,7 @@ since 2026-10-01.
 | **Bundled content:** brush, symbol, style and swatch libraries | ~30% | Ours are original and generated in code, and far fewer than Illustrator ships; brush and symbol libraries are still missing |
 | **Performance** | unverified | Multithreaded, off-thread rendering and caches are in place. The last budget run (2026-10-01, loaded machine) measured 290 ms for a 50k-path fit against a 16 ms budget. Re-run `vectorcraft-cli perf` on an idle machine |
 | **Robustness** | good, new | ~2,840 tests, property tests, no panics in shipped code (lints, the `guard` safety net, import fuzzing), Data Recovery. Missing: a corpus of real-world files, Windows/Linux/browser QA |
-| **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only); on KDE Plasma 6.3+ under Wayland, pens and pen displays reach the app only under XWayland (`WAYLAND_DISPLAY=`) or with KWin's `KWIN_WAYLAND_EMULATE_TABLET=1`, since winit 0.30 has no Wayland tablet input (#491, not verified on hardware); Windows/Linux packaging and accessibility are pending; an experimental, unsupported Windows 7 x64 OpenGL build exists (community-contributed, not verified by maintainers) |
+| **Platforms and 1.0 polish** | ~60% | The macOS app and the web build work, and Finder opens every readable format with the macOS app (#295, #354); hybrid-graphics laptops render on the power-saving GPU by default on Windows and macOS (#306), and Linux on the GPU the desktop runs on, since a Wayland compositor may refuse frames from the other one; a window that fails on its GPU while starting up starts again on the next one instead of crashing (#502; the dual-GPU Wayland case is verified by unit tests and cross-compilation, not on such hardware); web drops land in the document they were dropped on (#359); desktop drops carry no pointer position (winit 0.30), so a dropped document opens as a tab of its own and a picture or text is placed in the middle of the view, while the web places anything dropped on the canvas and opens what is dropped off it, as Illustrator does (#472); a web page that loses its WebGPU device or WebGL context restarts its graphics with the same documents (#369); on Linux/Wayland the clipboard reads the compositor's own (data-control) and copied image files paste, but files can't be dropped on the window under Wayland until eframe moves to winit 0.31 (#398; the Wayland side is verified by compilation only); on Linux the Paste menu checks the system clipboard on a background thread, so a clipboard owner that never answers no longer freezes the window, while Windows and macOS keep their quick in-line check (#510; the X11 hang verified by the contributor, here by headless tests); on KDE Plasma 6.3+ under Wayland, pens and pen displays reach the app only under XWayland (`WAYLAND_DISPLAY=`) or with KWin's `KWIN_WAYLAND_EMULATE_TABLET=1`, since winit 0.30 has no Wayland tablet input (#491, not verified on hardware); Windows/Linux packaging and accessibility are pending; an experimental, unsupported Windows 7 x64 OpenGL build exists (community-contributed, not verified by maintainers) |
 | **Agent automation** | beyond Illustrator | Every command, gesture and dialog is drivable over MCP, the CLI and the control channel |
 | **Scrubby numeric fields** | beyond Illustrator | As in Photoshop, dragging a numeric field's label (`W:`, `Opacity:`, the Character panel's icons) left or right steps its value live; one undo step per drag, Escape cancels (#400) |
 
@@ -101,13 +101,13 @@ 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.
   - Save / Don't Save / Cancel before closing or quitting with unsaved documents (tabs, Close, Close All, Quit, window close).
   - Four brightness themes, persistent preferences.
-  - Preferences that act (#394, in part): Show Tool Tips, Double Click To Isolate, Zoom with Mouse Wheel (the wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; Alt/Option-wheel and a trackpad pinch zoom about the pointer either way), Use Precise Cursors; Selection & Anchor Display › Tolerance (objects, anchors and handles), Object Selection by Path Only, Command Click to Select Objects Behind (cycling down the stack), Zoom to Selection, anchor Size, Highlight anchors on mouse over; Type › Number of Recent Fonts (up to 15); Guides & Grid › guide and grid Color and Style (lines or dots) and Grids In Back. Then Snap to Point (its distance, for moves, drawn points and reference points), Move Locked and Hidden Artwork with Artboard, Enable Rubber Band for the Pen and Curvature tools, Handles style, Show handles when multiple anchors are selected, Hide Corner Widget for angles greater than; General › Transform Pattern Tiles (the transforms' and dialogs' Transform Patterns) and Select Same Tint %; Type › Size/Leading, Tracking and Baseline Shift increments (`type.step`, Cmd+Shift+. and Cmd+Shift+, for the size, the Type tool's Alt+arrows), Enable Missing Glyph Protection and Fill New Type Objects With Placeholder Text. Then Smart Guides › Color, Alignment Guides, Anchor/Path Labels, Measurement Labels, Transform Tools, Object Highlighting (with Smart Guides on) and Snapping Tolerance (4 px by default, for every smart guide snap). Then Type › Type Object Selection by Path Only (type is picked on the baseline of any of its lines, area type's frame or the path of type on a path, no longer anywhere in its bounds; the Type tools and the Eyedropper still take a click among the characters). Then General › Anti-aliased Artwork (off, the canvas draws the art with hard edges). Then Guides & Grid › Show Pixel Grid (Above 600% Zoom), a line at every document pixel over the art in Pixel Preview, turning with a rotated view as the document grid now does too. Then General › Show The Home Screen When No Documents Are Open (off, closing the last document leaves an empty window; the Home button still opens the screen). Then Units › Numbers Without Units Are Points (on by default: a number typed with no unit into a field in picas is read in points, a typed unit still wins; dimmed unless a unit is Picas). Then User Interface › Auto-Collapse Iconic Panels (off by default: on, a click away from a panel popped out of the icon column puts it away). They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). About 32 stored options still do nothing yet (the rest of #394: Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, Construction and Spacing Guides, performance, devices…).
+  - Preferences that act (#394, in part): Show Tool Tips, Double Click To Isolate, Zoom with Mouse Wheel (the wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; Alt/Option-wheel and a trackpad pinch zoom about the pointer either way), Use Precise Cursors; Selection & Anchor Display › Tolerance (objects, anchors and handles), Object Selection by Path Only, Command Click to Select Objects Behind (cycling down the stack), Zoom to Selection, anchor Size, Highlight anchors on mouse over; Type › Number of Recent Fonts (up to 15); Guides & Grid › guide and grid Color and Style (lines or dots) and Grids In Back. Then Snap to Point (its distance, for moves, drawn points and reference points), Move Locked and Hidden Artwork with Artboard, Enable Rubber Band for the Pen and Curvature tools, Handles style, Show handles when multiple anchors are selected, Hide Corner Widget for angles greater than; General › Transform Pattern Tiles (the transforms' and dialogs' Transform Patterns) and Select Same Tint %; Type › Size/Leading, Tracking and Baseline Shift increments (`type.step`, Cmd+Shift+. and Cmd+Shift+, for the size, the Type tool's Alt+arrows), Enable Missing Glyph Protection and Fill New Type Objects With Placeholder Text. Then Smart Guides › Color, Alignment Guides, Anchor/Path Labels, Measurement Labels, Transform Tools, Object Highlighting (with Smart Guides on) and Snapping Tolerance (4 px by default, for every smart guide snap), then Construction Guides and their Angles (#506: a drawn point near a line at one of those angles through the point it leaves from lands on it). Then Type › Type Object Selection by Path Only (type is picked on the baseline of any of its lines, area type's frame or the path of type on a path, no longer anywhere in its bounds; the Type tools and the Eyedropper still take a click among the characters). Then General › Anti-aliased Artwork (off, the canvas draws the art with hard edges). Then Guides & Grid › Show Pixel Grid (Above 600% Zoom), a line at every document pixel over the art in Pixel Preview, turning with a rotated view as the document grid now does too. Then General › Show The Home Screen When No Documents Are Open (off, closing the last document leaves an empty window; the Home button still opens the screen). Then Units › Numbers Without Units Are Points (on by default: a number typed with no unit into a field in picas is read in points, a typed unit still wins; dimmed unless a unit is Picas). Then User Interface › Auto-Collapse Iconic Panels (off by default: on, a click away from a panel popped out of the icon column puts it away). They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). About 30 stored options still do nothing yet (the rest of #394: Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, Spacing Guides, performance, devices…).
   - Dialogs move by dragging their heading (the band down from the top edge, as a title bar), stay on screen and keep where they were moved for the session; the form dialogs' choices are dropdowns (Offset Path's Joins, Average's and Shear's and Reflect's axis), and Offset Path lists Offset, Joins, Miter Limit and previews (#423).
   - Dialogs open with their first field focused and its value selected: type a value and press Enter (Move, Rotate, Scale…). Number fields in panels, the Control bar and dialogs (preferences too) step with Up/Down, or with the mouse wheel over the focused field (#485: a notch a step; the panel under it then stays put, and an unfocused field leaves the wheel to scrolling) (Shift: ten, Ctrl/Cmd: a tenth of their unit), applied at once.
   - Scrubby labels (#400, beyond Illustrator, as in Photoshop): dragging a numeric field's label left or right (the ↔ cursor shows over it) steps the value one unit every 2 points (Shift: ten, Ctrl/Cmd: a tenth; counts stay whole), in the field's unit and within its limits, applied live as the art follows; the whole drag is one undo step and Escape puts the value back. A click on the label focuses the field; the text box itself never scrubs, and a field with no label doesn't. Text labels before a field (Transform, Properties, Control bar, Stroke, Transparency, form rows in dialogs) and the Character and Paragraph panels' icons act as labels. Preferences › General › Scrub Numeric Fields by Dragging (on by default) turns it off.
@@ -117,13 +117,13 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **Tools:**
   - **Selection:** Selection, Direct/Group Selection, Magic Wand, Lasso. A Shift-drag marquee toggles what it reaches: objects with the Selection tool, anchors with Direct and Group Selection (#483); the Lasso adds with Shift and subtracts with Alt. Dragging a path segment with Direct Selection bends it when it's curved (its anchors stay) and moves its two anchors when it's straight, one undo step; the fill, Shift or Alt still pick the whole path (Alt-drag copies it).
   - **Saved selections:** Select ▸ Save Selection… asks for a name and keeps the selection in the document (saved with the file, undoable, up to 25); each one is listed at the bottom of the Select menu and a click selects its objects again; Edit Selection… lists them to rename or delete, applied together on OK. A file's saved selections are capped and checked against its objects when it opens. Not yet: Update Selection and the Layers panel's saved-selection menu.
-  - **Drawing:** Pen, Curvature, anchor tools, Pencil, Paintbrush, Blob Brush, Smooth, Path Eraser, Join. Direction handles dragged with Direct Selection or the Anchor Point tool snap to smart guides, and Shift keeps them at 45° steps from their anchor.
+  - **Drawing:** Pen, Curvature, anchor tools, Pencil, Paintbrush, Blob Brush, Smooth, Path Eraser, Join. Direction handles dragged with Direct Selection or the Anchor Point tool snap to smart guides, and Shift keeps them at 45° steps from their anchor. Every point a drawing tool places snaps to Smart Guides through one snapper (#506): the Pen's and Curvature tool's anchors, the Pencil's ends, the shape tools' start and dragged corner or radius (Rectangle, Rounded Rectangle, Ellipse, Polygon, Star, Line Segment, Arc, Spiral, the grids), the Type tool's click and frame, a new artboard's corners.
   - **Shapes:** all shape tools (including Flare) and the line, arc, spiral and grid tools. Space held while dragging out a shape, line, arc, spiral or grid moves it at its current size. While a grid is dragged out, Up/Down change its rows (concentric dividers) and Left/Right its columns (radial dividers).
   - **Cutting:** Eraser, Scissors, Knife, Mirror & Cut, Line Cut and Rectangle Cut (real geometry, compound paths keep their holes).
   - **Transform:** Rotate, Reflect, Scale, Shear (click or Alt-click snaps the reference point to anchors and centres; Alt-click opens the tool's dialog, and a drag with Alt down at the release, from the press or pressed mid-drag, transforms a copy), Reshape, Free Transform (free and perspective distort and shear, switched by the keys held during a handle drag).
   - **Live Corners:** drag a live rectangle's corner widgets (Selection or Direct Selection) to round all corners, with a radius readout; with Direct Selection, select corner anchors to show and round just those corners (#381). Each corner keeps its own radius and kind (Round, Inverted Round, Chamfer): Alt-click a widget to cycle the kind, double-click it for the Corners dialog, and the Properties and Transform radius fields set the selected corners (`object.setLiveShape {corners, radius, kind}`). Corners stay circular when the rectangle is scaled unevenly or along its own sides when rotated (the radius keeps its size, or scales by the mean scale with Scale Corners on); only a shear distorts them. On a rectangle that isn't square every corner is the same circle: a radius past half the shorter side stops there for all of them, the widgets sit on the corners as drawn and turn the edited corners red at that limit, CSS export writes the drawn radii, and rectangles saved stretched by older versions get circular corners when their corners are next set (#442).
   - **Pen:** Alt pressed in the middle of dragging out an anchor splits its handles and keeps the curve already shaped into it (only the outgoing handle follows the pointer); Space held while dragging out an anchor moves it, handles and all. 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. 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).
+  - **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.
   - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on; Copy, Cut and Paste take the artboard with its art, Paste right of the last artboard, Paste in Place where it was, into this or another document, #446), Measure, Type, Hand, Zoom, Rotate View.
   - **Editing type:** double-clicking type with a selection tool switches to the Type tool with the caret where it was clicked.
@@ -131,13 +131,13 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
   - **Panel drag and drop:** art dragged off the canvas onto the Symbols panel becomes a symbol, onto the Swatches panel a pattern swatch and onto the Brushes panel an Art brush; a symbol dragged onto the canvas places an instance where it is dropped, and a brush dragged onto a path is applied to it.
   - **Tool double-clicks:** double-clicking a tool's button opens its options: Hand fits the artboard in the window, Zoom shows 100 %, Rotate, Scale, Reflect and Shear open their Object › Transform dialogs, the Selection, Direct Selection and Group Selection tools the Move dialog (Enter opens these seven tools' dialogs too), Gradient, Eyedropper, Blend and the Liquify tools their panels or options, and the Pencil, Paintbrush, Smooth, Blob Brush and Eraser tools their Tool Options (Fidelity, fill, the tolerances, the brush size).
 - **Layers panel:** every layer, sublayer, group and object is a clickable row at any depth: a click highlights it and makes its layer current (new art goes there), Shift-click a range, Ctrl/Cmd-click toggles. Sublayers are no longer treated as objects: clicks, marquees, Select All and the Select menu take the art inside them, and each sublayer selects in its own colour. Selection squares on rows with selected art (click selects a row's art, Shift adds or removes; dragging the square moves the selection to another row, Alt copies), the eye and lock on every row with drag-down-the-column (one undo step), Ctrl/Cmd-click an eye for per-layer Outline, Alt-click an eye or lock to hide or lock the other layers (again: show or unlock them all), triangles with Alt to open or close everything inside, drag and drop rows above, below or into layers and groups with a drop line (Alt copies) and a dimmed copy of the row under the pointer (dropped on the trash rows are deleted, on New Layer duplicated, as in Illustrator), inline rename, Delete key on highlighted rows. Buttons and the full panel menu: New Layer/Sublayer (Alt: options, Ctrl: on top), Duplicate, Delete, Options for Selection, clipping mask, isolation, Locate Object, Merge Selected, Flatten Artwork, Collect in New Layer, Release to Layers (Sequence and Build), Reverse Order, Template, Hide/Outline/Lock Others and Show/Preview/Unlock All, Paste Remembers Layers, Panel Options (row size, thumbnails per kind, Show Layers Only). Layer Options: name, colour (presets, each with a chip of its colour, or custom), Template, Lock, Show, Print, Preview (outline drawing and clicking) and Dim Images to %. Every operation is a command (`layer.move`, `layer.highlight`, `layer.merge`…) with validation against cycles and invalid nesting.
-- **Drawing aids:** Smart Guides and snapping (moving, with the Selection, Group Selection or Direct Selection tool, and resizing by the bounding-box handles with the Selection or Free Transform tool, Shift and Alt too: the dragged corner or side lands on the other objects' anchors and centres ("anchor", "center") or lines up with their edges and centres (a line and "align"); the Rotate, Scale, Shear and Reflect tools drag from the anchor they grab and snap the pointer the same way, so a corner dragged onto another object's anchor scales exactly onto it, #482; anchors dragged with Direct Selection: the one pressed on lands on other anchors, its own path's that stay put among them, on path segments or in line with them, the others following, Shift keeps 45° steps, and with Smart Guides off Snap to Point pulls it onto anchors; the Artboard tool snaps artboards, and their bleed, to other artboards, bleeds and art, the grid or whole pixels while moving, copying and resizing them, and the Transform panel shows and edits the active artboard's X/Y/W/H), guides dragged out of the rulers (#451: they snap as moved guides do, Shift to the ruler's ticks; with the Artboard tool they are artboard guides, which run across their artboard only and move, copy and delete with it, `guide.add {artboard}`) that the Selection, Direct Selection and Group Selection tools then pick and drag (#414: the selected guides highlight and move together, Alt copies them, Shift snaps the dragged one to the ticks, otherwise it snaps to pixels, the grid or the edges, centres (so the sides' midpoints) and anchors of the art and the artboards, or with Smart Guides off Snap to Point pulls it onto anchors; the arrow keys nudge them, Delete deletes them, dragging one back onto its ruler deletes it, Lock Guides and Hide Guides leave them alone; `guide.list`, `guide.select`, `guide.move` and `guide.remove` reach agents), and Draw Normal / Behind / Inside modes.
+- **Drawing aids:** Smart Guides and snapping (moving, with the Selection, Group Selection or Direct Selection tool, and resizing by the bounding-box handles with the Selection or Free Transform tool, Shift and Alt too: the dragged corner or side lands on the other objects' anchors and centres ("anchor", "center") or lines up with their edges and centres (a line and "align"); the Rotate, Scale, Shear and Reflect tools drag from the anchor they grab and snap the pointer the same way, so a corner dragged onto another object's anchor scales exactly onto it, #482; anchors dragged with Direct Selection: the one pressed on lands on other anchors, its own path's that stay put among them, on path segments or in line with them, the others following, Shift keeps 45° steps, and with Smart Guides off Snap to Point pulls it onto anchors; the Artboard tool snaps artboards, and their bleed, to other artboards, bleeds and art, the grid or whole pixels while moving, copying and resizing them, and the Transform panel shows and edits the active artboard's X/Y/W/H; drawn points, #506: hovering shows where the press goes, the point lands on the other objects' anchors, centres and paths ("anchor", "center", "path") or lines up with their anchors, edges and centres ("align"), the Pen's on the path being drawn too, near a construction guide through the anchor before it on that guide (Preferences › Smart Guides › Construction Guides and Angles), and with Shift kept to its 45° step or a square's diagonal it slides along that way into line; the targets are gathered once per document state, from the art in the window, and the anchors, centres and lines near the pointer are found by bisection, so hovering never rescans the document), guides dragged out of the rulers (#451: they snap as moved guides do, Shift to the ruler's ticks; with the Artboard tool they are artboard guides, which run across their artboard only and move, copy and delete with it, `guide.add {artboard}`) that the Selection, Direct Selection and Group Selection tools then pick and drag (#414: the selected guides highlight and move together, Alt copies them, Shift snaps the dragged one to the ticks, otherwise it snaps to pixels, the grid or the edges, centres (so the sides' midpoints) and anchors of the art and the artboards, or with Smart Guides off Snap to Point pulls it onto anchors; the arrow keys nudge them, Delete deletes them, dragging one back onto its ruler deletes it, Lock Guides and Hide Guides leave them alone; `guide.list`, `guide.select`, `guide.move` and `guide.remove` reach agents), and Draw Normal / Behind / Inside modes.
 - **Views:** the status bar's artboard navigator (first, previous, next, last; `view.goToArtboard`) goes to an artboard and fits it, and Fit Artboard in Window and Actual Size show the navigator's artboard. The Artboards panel highlights that active artboard: clicking a row makes it active (the Artboard tool's too, while it is chosen) as does clicking an artboard with the Artboard tool, double-clicking its number also fits it in the window and double-clicking its name renames it. Duplicate Artboards, or a row dragged onto New Artboard, copies the artboard with its art (#446). Escape leaves Presentation Mode, F from it goes back to Normal Screen Mode, and the screen mode isn't saved with the preferences: the app always starts in Normal Screen Mode with its menus and panels (#472).
 - **Geometry and effects:**
   - Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart.
   - 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):**
@@ -154,9 +154,9 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **Fonts:** a font is found by any of its names (family and style in every language of its name table, legacy family/style pairs, PostScript name), so documents from other apps open with the font they name; Find Font and `text.fonts` say for each font whether it was found exactly, by another name, substituted or missing, and how many glyphs are missing. PDF and `.ai` import brings Japanese text back as live type: CID fonts without a ToUnicode map read through the standard CMaps, vertical columns (WMode 1) as vertical type, letter spacing as tracking; a glyph is live type only when the installed font (in the closest style of its family) draws the same glyph, and text in a font that isn't installed comes in as live type shown in the fallback font until the font is installed (exports that draw it — PDF, EPS, EMF/WMF, raster, SVG outlines or embedded fonts — warn that they wrote the fallback font; `textAs: outlines` keeps the PDF's embedded glyphs).
 - **Files (M4):**
   - `.vectorcraft` (lossless JSON, compressed, atomic saves, save down to v1), Save As with a format chooser, Save a Copy, Revert, templates, Data Recovery after a crash (browser tabs hold their copies with Web Locks too, so a background tab's copies are never taken for a crash's, and a tab repairs copies another removed when it resumes: #367), background save and export. The desktop app writes its warnings and errors (graphics adapter, a lost graphics device, panics the guard recovered from) to standard error and to `logs/vectorcraft.log` next to the preferences, the two previous runs kept and each file capped at 16 MiB, so a launch without a terminal still leaves something to attach to a bug report (#465).
-  - SVG/SVGZ in and out with SVG Options, Preserve Editing, symbols, filters, rich text and physical units (SVG type under a transform or `viewBox` scale opens at the size it draws at, the scale moved into its size, leading, baseline shift and strokes, a stretch, skew or rotation kept as its transform: #396; a top-level group with a clip path, such as a clipped Inkscape layer, opens as a layer with a clipping mask, its name kept: #420); PDF and PDF-compatible `.ai` in and out (layers, with hidden ones kept hidden with their art and nested ones as sublayers, on pages of up to 64 million operators, art whose layer can't be told going to a hidden, non-printing layer rather than showing or printing: #419; strokes kept live, a fill and a stroke of one outline as one object; masks, editable text with type set along a curve coming back as type on a path, each artboard's art on its own page only, an `.ai`'s white page under its layers left out rather than coming in as art, spot colours, presets, security, marks and bleed, ICC output intents, raster effects, subset fonts, PDF/X, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3). CMYK images keep their ink amounts from PDF import (and from placed CMYK TIFFs) to PDF export: a CMYK JPEG passes through unchanged, others stay CMYK (DeviceCMYK, or ICC-based CMYK in PDF/X-3/X-4) unless the Output settings convert them; the canvas shows them through the working CMYK profile (#320).
+  - 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).
-  - Place and the Links panel, Package, File Info, Print with print presets, PostScript output and print tiling, slices and Save for Web, Export for Screens and Asset Export, CSS Properties, PNG/PDF/SVG/text clipboard flavours; files copied in a file manager paste as art (SVG, PDF, EMF/WMF, bitmaps) on every desktop platform, and Linux/Wayland reads the compositor's clipboard (#398); screenshots and other copied pictures paste as embedded images at the view centre everywhere, the web included (#457).
+  - 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.
 - **Tests and robustness:** ~2,840 automated tests: model-based property tests, a junk-parameter sweep over every command, import fuzzing (SVG, PDF, libraries), golden renders, and MCP end-to-end tests over stdio. Shipped code never panics (workspace lints and a rollback safety net; see `docs/development.md`).
@@ -213,12 +213,12 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image) (Vector Halftone is done) | 6–10 |
 | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, Collect for Export, row context menus, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers, drag-scrolling a long panel while dragging rows; artboard presets/rearrange polish (Document Setup, New Document and the rest of the Layers panel are done) | 4–7 |
 | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 |
-| Guides, grids, smart guides, snapping, rulers | 3 | 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 |
+| Guides, grids, smart guides, snapping, rulers | 3 | 84% | global/video rulers, Spacing Guides, Smart Guides' angle and distance readouts while drawing, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451; the drawing tools snapping, with Construction Guides, #506) | 2–4 |
 | File formats | 6 | 85% | DWG (no open spec: DXF instead), PSD placement as layers, EPS checked against more real files (Illustrator 2026 and Inkscape files open as vectors; CorelDRAW, Affinity, LibreOffice, matplotlib and Ghostscript output checked with synthetic programs only; CID-keyed CJK type and `CCITTFaxDecode` images not read), legacy `.ai` files saved without the prolog that defines their operators (their own operator set isn't read yet), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers and presets are done | 6–10 |
 | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | polish only (all four are done) | 2–4 |
 | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity (flattener presets in PDF and print, overprint in PDF and composite print, Print dialog, presets, PostScript, marks, separations, Print Tiling, print overprint/flattener/bitmap options and printer profile are done) | 1–2 |
 | Automation | 3 | 60% | Variables (data merge), scripting surface, batch | 8–12 |
-| UI chrome (panels, contextual Properties, workspaces, prefs) | 6 | 78% | Variables, SVG Interactivity, Properties per context, Consolidate All Windows, floating panels outside the app window and docked into any group, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 32 Preferences options stored but not yet acted on (#394: Construction and Spacing Guides, Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, performance, devices…) | 14–22 |
+| UI chrome (panels, contextual Properties, workspaces, prefs) | 6 | 78% | Variables, SVG Interactivity, Properties per context, Consolidate All Windows, floating panels outside the app window and docked into any group, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 30 Preferences options stored but not yet acted on (#394: Spacing Guides, Auto Size New Area Type, Show Font Names in English, Highlight Alternate Glyphs, performance, devices…) | 14–22 |
 | Libraries, Links, Package | 2 | 50% | a local Libraries panel (no cloud by design); Links and Package are done | 5–8 |
 | **Feature parity** | **103** | **~75%** | | **~210–330** |
 | Interaction-fidelity pass (side by side with Illustrator: every tool modifier, cursor, dialog, Properties context) | | | | 60–90 |
@@ -238,7 +238,7 @@ lossless SVG/PDF export of live effects with SVG filters, a documented JSON form
 command, gesture and dialog drivable by agents (MCP, CLI, control channel).
 
 ## Out of scope (by design or by law)
-- **Native `.ai` private data:** it's undocumented. We read the PDF-compatible part, so Illustrator-only live objects arrive as appearance, and plain groups arrive ungrouped: that part draws each object on its own and marks only layers, clipping groups and groups with opacity, blending or a mask (those come back). Art outside the artboards isn't in that part at all (Illustrator's PDF part leaves it out), so it doesn't open; the import says so in a note (#472). Art off the page that a PDF does draw opens on the pasteboard.
+- **Native `.ai` private data:** it's undocumented. We read the PDF-compatible part, so Illustrator-only live objects arrive as appearance, and plain groups arrive ungrouped: that part draws each object on its own and marks only layers, clipping groups and groups with opacity, blending or a mask (those come back). Art outside the artboards isn't in that part at all (Illustrator's PDF part leaves it out), so it doesn't open; the import says so in a note (#472). That part also has no paragraphs: area type is written line by line, and comes back as area type only where its font is installed and lays the lines out with the same breaks, else as a point type object per line (#508). Art off the page that a PDF does draw opens on the pasteboard.
 - **Adobe cloud services** (Libraries sync, Adobe Fonts, Firefly/generative): these are pluggable provider APIs, not built in.
 - **Adobe's bundled assets** (swatch/brush/symbol libraries, presets, icons): ours are original.
 

apps/vectorcraft/src/main.rs

@@ -29,7 +29,7 @@ mod window;
 use vectorcraft_engine::Session;
 use vectorcraft_engine::cmd::fileio;
 use vectorcraft_ui_egui::graphics::GraphicsLoss;
-use vectorcraft_ui_egui::{FilePick, Services, VectorcraftApp};
+use vectorcraft_ui_egui::{ClipboardProbeFactory, FilePick, Services, VectorcraftApp};
 
 struct App {
     app: VectorcraftApp,
@@ -256,6 +256,10 @@ fn services() -> Services {
         write_shared: Some(std::sync::Arc::new(write_file)),
         // Every format Copy offers and Paste reads (menu-bar Paste never sees egui's Paste event).
         system_clipboard: Some(clipboard::system_clipboard()),
+        // Linux checks whether Paste has something to take on a background thread: an X11 clipboard
+        // owner that never answers holds a read for up to 4 s. Windows only asks which formats the
+        // clipboard holds and macOS asks the pasteboard server, so they check in line.
+        clipboard_probe: cfg!(target_os = "linux").then(|| Box::new(clipboard::system_clipboard) as ClipboardProbeFactory),
         // Help → Discord / website / GitHub, the Discord button, About and Home links.
         open_url: Some(Box::new(|url: &str| {
             let _ = webbrowser::open(url);

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/engine/src/cmd/fileio/mod.rs

@@ -78,7 +78,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Open Document",
             [],
             None,
-            "{path} or {name, dataBase64}, PDF/.ai: pages?: \"2-3, 5\" (1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page) | false (one layer per page, without the art that is off; Save then asks for a name), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), DXF: dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its pixel size), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwork is imported and the first warning says why. Templates (native templates, .ait) open as a new untitled document; a restored .ai keeps its path (Save writes .ai again). Linked images are read from their files (looked for at their path, then relative to the document): missing ones show their saved preview (links.relink), modified ones are read again only with Preferences › Update Links: Automatically (else links.update). An SVG's <image> files (relative links from the SVG's folder) stay linked, SVG files become art, missing ones a placeholder in their box (a warning and missingLinks)",
+            "{path} or {name, dataBase64}, PDF/.ai: pages?: \"2-3, 5\" (1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, lines wrapped in a frame as area type where they lay out the same, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page) | false (one layer per page, without the art that is off; Save then asks for a name), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), DXF: dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its pixel size), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwork is imported and the first warning says why. Templates (native templates, .ait) open as a new untitled document; a restored .ai keeps its path (Save writes .ai again). Linked images are read from their files (looked for at their path, then relative to the document): missing ones show their saved preview (links.relink), modified ones are read again only with Preferences › Update Links: Automatically (else links.update). An SVG's <image> files (relative links from the SVG's folder) stay linked, SVG files become art, missing ones a placeholder in their box (a warning and missingLinks)",
             always,
             load::open
         ),

crates/engine/src/lib.rs

@@ -634,7 +634,7 @@ impl Default for Prefs {
             object_highlighting: true,
             transform_tools_guides: true,
             construction_guides: true,
-            construction_angles: s("90° & 45° Angles"),
+            construction_angles: s(vectorcraft_tools::guides::DEFAULT_CONSTRUCTION_ANGLES),
             anchor_path_labels: true,
             measurement_labels: true,
             spacing_guides: true,
@@ -1477,6 +1477,8 @@ mod tests_scalestrokes;
 #[cfg(test)]
 mod tests_slices;
 #[cfg(test)]
+mod tests_smartguides;
+#[cfg(test)]
 mod tests_strokegeom;
 #[cfg(test)]
 mod tests_strokegradient;

crates/engine/src/tests_draw2.rs

@@ -766,3 +766,27 @@ fn pen_drag_from_the_first_anchor_closes_the_path() {
     gesture(&mut s, &[(500.0, 500.0)], none);
     assert_eq!(paths(&s).len(), 2);
 }
+
+#[test]
+fn pen_with_alt_converts_the_anchors_of_the_path_being_drawn() {
+    // #504: while drawing, Alt-click on a smooth anchor of the path makes it a corner and Alt-drag
+    // on a corner one pulls out smooth handles; the next click goes on drawing the path.
+    let (none, alt) = (Mods::default(), Mods { alt: true, ..Mods::default() });
+    let v = view();
+    let mut s = session();
+    s.select_tool("pen", v).unwrap();
+    gesture(&mut s, &[(100.0, 300.0)], none);
+    gesture(&mut s, &[(200.0, 300.0), (240.0, 300.0)], none);
+    gesture(&mut s, &[(300.0, 400.0)], none);
+    gesture(&mut s, &[(400.0, 300.0)], none);
+    let id = s.doc().unwrap().selection.objects[0];
+    assert!(smooth(path(&s, id).subpaths[0].anchors[1]));
+    assert_eq!(gesture(&mut s, &[(200.0, 300.0)], alt), 1);
+    let a = path(&s, id).subpaths[0].anchors[1];
+    assert!(!a.has_in() && !a.has_out(), "a corner: {a:?}");
+    assert_eq!(gesture(&mut s, &[(300.0, 400.0), (320.0, 400.0), (340.0, 400.0)], alt), 1);
+    let a = path(&s, id).subpaths[0].anchors[2];
+    assert!(smooth(a) && a.h_out == Point::new(340.0, 400.0), "smooth: {a:?}");
+    gesture(&mut s, &[(500.0, 400.0)], none);
+    assert_eq!((paths(&s).len(), path(&s, id).subpaths[0].anchors.len()), (1, 5));
+}

crates/engine/src/tests_smartguides.rs

@@ -0,0 +1,109 @@
+//! Smart Guides for the drawing tools, driven through the session (#506): where the Rectangle
+//! tool's corners and the Pen's anchors land, and the guides they show.
+
+use serde_json::json;
+use vectorcraft_doc::NodeId;
+use vectorcraft_geom::{Point, Rect};
+use vectorcraft_tools::{Mods, Overlay, PointerEvent, PointerKind};
+
+use super::*;
+use crate::tooling::ViewInfo;
+
+/// An 800 × 600 document with a 100 × 100 square at (100, 100), nothing selected.
+fn session() -> Session {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
+    s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 100, "height": 100})).unwrap();
+    s.execute("select.none", &json!({})).unwrap();
+    s
+}
+
+fn pointer(s: &mut Session, kind: PointerKind, x: f64, y: f64) {
+    s.pointer(&PointerEvent::new(kind, x, y), ViewInfo::default()).unwrap();
+}
+
+fn labels(s: &mut Session) -> Vec<(String, Point)> {
+    s.overlays(ViewInfo::default()).into_iter().filter_map(|o| if let Overlay::Label { text, p, .. } = o { Some((text, p)) } else { None }).collect()
+}
+
+/// The bounds of the object the last gesture made (it is selected).
+fn made(s: &Session) -> Rect {
+    let d = s.doc().unwrap();
+    let id: NodeId = d.selection.objects[0];
+    d.doc.node(id).unwrap().geometric_bounds().unwrap()
+}
+
+#[test]
+fn a_rectangle_corner_lands_on_another_objects_anchor() {
+    let mut s = session();
+    s.select_tool("rectangle", ViewInfo::default()).unwrap();
+    // Hovering near the square's corner already says where the press goes.
+    pointer(&mut s, PointerKind::Move, 302.0, 297.0);
+    pointer(&mut s, PointerKind::Move, 202.0, 203.0);
+    assert_eq!(labels(&mut s), [("anchor".to_string(), Point::new(200.0, 200.0))]);
+    pointer(&mut s, PointerKind::Down, 302.0, 297.0);
+    pointer(&mut s, PointerKind::Drag, 250.0, 250.0);
+    pointer(&mut s, PointerKind::Drag, 202.0, 203.0);
+    assert_eq!(labels(&mut s), [("anchor".to_string(), Point::new(200.0, 200.0))]);
+    let measure = s.overlays(ViewInfo::default()).into_iter().find_map(|o| if let Overlay::Measure { text, .. } = o { Some(text) } else { None });
+    assert!(measure.as_deref().is_some_and(|t| t.starts_with("W: 102") && t.contains("H: 100")), "{measure:?}");
+    pointer(&mut s, PointerKind::Up, 202.0, 203.0);
+    // The start lined up with the artboard's centre (y = 300), the corner on the anchor.
+    assert_eq!(made(&s), Rect::new(200.0, 200.0, 302.0, 300.0));
+}
+
+/// The corner being dragged never snaps to the rectangle's own preview: dragged slowly, it follows
+/// the pointer instead of sticking where the last step left it.
+#[test]
+fn a_rectangle_does_not_snap_to_itself_while_drawn() {
+    let mut s = session();
+    s.select_tool("rectangle", ViewInfo::default()).unwrap();
+    pointer(&mut s, PointerKind::Down, 320.0, 420.0);
+    for x in 370..=380 {
+        pointer(&mut s, PointerKind::Drag, f64::from(x), 470.0 + f64::from(x - 370));
+    }
+    pointer(&mut s, PointerKind::Up, 380.0, 480.0);
+    assert_eq!(made(&s), Rect::new(320.0, 420.0, 380.0, 480.0));
+}
+
+#[test]
+fn a_pen_anchor_lines_up_with_another_objects_centre() {
+    let mut s = session();
+    s.select_tool("pen", ViewInfo::default()).unwrap();
+    pointer(&mut s, PointerKind::Down, 300.0, 420.0);
+    pointer(&mut s, PointerKind::Up, 300.0, 420.0);
+    // Hovering: in line with the square's centre (150, 150), the guide running from it.
+    pointer(&mut s, PointerKind::Move, 151.5, 431.0);
+    let ov = s.overlays(ViewInfo::default());
+    assert!(ov.iter().any(|o| matches!(o, Overlay::Line { a, b, .. } if *a == Point::new(150.0, 150.0) && *b == Point::new(150.0, 431.0))), "{ov:?}");
+    assert_eq!(labels(&mut s), [("align".to_string(), Point::new(150.0, 431.0))]);
+    pointer(&mut s, PointerKind::Down, 151.5, 431.0);
+    pointer(&mut s, PointerKind::Up, 151.5, 431.0);
+    // Shift: along the 45° step from it, slid into line with the square's left side (x = 100).
+    s.pointer(&PointerEvent::new(PointerKind::Down, 103.0, 386.0).with_mods(Mods { shift: true, ..Mods::default() }), ViewInfo::default()).unwrap();
+    pointer(&mut s, PointerKind::Up, 103.0, 386.0);
+    let d = s.doc().unwrap();
+    let path = d.doc.node(d.selection.objects[0]).unwrap().path_data().unwrap();
+    let pts: Vec<Point> = path.subpaths[0].anchors.iter().map(|a| a.p).collect();
+    assert_eq!(pts[..2], [Point::new(300.0, 420.0), Point::new(150.0, 431.0)]);
+    assert!((pts[2] - Point::new(100.0, 381.0)).hypot() < 1e-9, "{pts:?}");
+}
+
+/// Preferences › Smart Guides › Construction Guides: on (the default), a Pen anchor near the
+/// 45° guide through the last one lands on it; off, it stays where it was clicked.
+#[test]
+fn construction_guides_follow_the_preference() {
+    for on in [true, false] {
+        let mut s = session();
+        s.execute("prefs.set", &json!({"key": "constructionGuides", "value": on})).unwrap();
+        s.select_tool("pen", ViewInfo::default()).unwrap();
+        pointer(&mut s, PointerKind::Down, 500.0, 500.0);
+        pointer(&mut s, PointerKind::Up, 500.0, 500.0);
+        pointer(&mut s, PointerKind::Down, 561.0, 438.0);
+        pointer(&mut s, PointerKind::Up, 561.0, 438.0);
+        let d = s.doc().unwrap();
+        let last = d.doc.node(d.selection.objects[0]).unwrap().path_data().unwrap().subpaths[0].anchors[1].p;
+        let want = if on { Point::new(561.5, 438.5) } else { Point::new(561.0, 438.0) };
+        assert!((last - want).hypot() < 1e-9, "{on}: {last:?}");
+    }
+}

crates/engine/src/tooling.rs

@@ -178,6 +178,7 @@ impl Session {
         let (unit, stroke_unit) = (self.general_unit(), self.stroke_unit());
         let cx = ToolContext {
             doc: &st.doc,
+            revision: (st.uid, st.revision),
             selection: &st.selection,
             zoom: view.zoom,
             isolation: st.isolation,
@@ -222,6 +223,11 @@ impl Session {
             measurement_labels: self.prefs.measurement_labels,
             transform_tools_guides: self.prefs.transform_tools_guides,
             snapping_tolerance: self.prefs.snapping_tolerance,
+            construction_angles: if self.prefs.construction_guides {
+                vectorcraft_tools::guides::construction_angles(&self.prefs.construction_angles)
+            } else {
+                &[]
+            },
             screen: view.screen,
             plane_widget: self.prefs.perspective_widget.show.then_some(self.prefs.perspective_widget.position),
         };

crates/engine/tests/import_fuzz.rs

@@ -488,6 +488,10 @@ fn arb_rich_op() -> impl Strategy<Value = String> {
             "/Sh0 sh",
             "/Sh1 sh",
             "BT /F1 12 Tf 10 10 Td (Hi there) Tj [(a) -900 (b)] TJ ET",
+            // Lines wrapped in a frame, digits set apart by gaps, glyph outlines stroked (#508).
+            "BT /F1 10 Tf 10 80 Td (Wrapped line ) Tj 0 -12 Td (and its next ) Tj 0 -12 Td (end.) Tj ET",
+            "BT /F1 10 Tf 10 40 Td (3) Tj 20 0 Td (5331) Tj 40 0 Td (0106) Tj ET",
+            "0.5 w 10 10 m 14 18 l 18 10 l h S",
             "7 Tr",
             "q 10 10 50 50 re W n",
             "Q",

crates/mcp/src/tests.rs

@@ -588,3 +588,30 @@ fn type_preferences_apply_to_agents() {
     assert_eq!(r["isError"], false, "{r}");
     assert_eq!(style(&mut s, 6), (size + 4.0, tracking + 50.0));
 }
+
+/// The drawing tools snap to Smart Guides over MCP as with the mouse (#506): a Rectangle drawn
+/// from near another object's corner starts on it, and a Pen anchor placed beside that object's
+/// centre lines up with it.
+#[test]
+fn drawing_gestures_snap_to_smart_guides() {
+    let mut s = server();
+    let r = call(&mut s, 1, "run_command", json!({"command": "file.new", "params": {"width": 800, "height": 600}}));
+    assert_eq!(r["isError"], false, "{r}");
+    let r = call(&mut s, 2, "draw_shape", json!({"shape": "rectangle", "x": 100, "y": 100, "width": 100, "height": 100}));
+    assert_eq!(r["isError"], false, "{r}");
+    let bounds = |s: &mut Server, n: u64, events: Value, tool: &str| {
+        let r = call(s, n, "pointer_gesture", json!({"tool": tool, "events": events}));
+        assert_eq!(r["isError"], false, "{r}");
+        let id = serde_json::from_str::<Value>(&text_of(&r)).unwrap()["selection"][0].clone();
+        let doc: Value = serde_json::from_str(&text_of(&call(s, n + 1, "inspect_document", json!({})))).unwrap();
+        let made = doc["layers"][0]["children"].as_array().unwrap().iter().find(|c| c["id"] == id).expect("drawn").clone();
+        let b = &made["bounds"];
+        [&b["x"], &b["y"], &b["width"], &b["height"]].map(|v| v.as_f64().unwrap())
+    };
+    let events = json!([{"kind": "move", "x": 202, "y": 203}, {"kind": "down", "x": 202, "y": 203}, {"kind": "drag", "x": 330, "y": 341}, {"kind": "up", "x": 330, "y": 341}]);
+    assert_eq!(bounds(&mut s, 3, events, "rectangle"), [200.0, 200.0, 130.0, 141.0]);
+    let r = call(&mut s, 5, "run_command", json!({"command": "select.none", "params": {}}));
+    assert_eq!(r["isError"], false, "{r}");
+    let events = json!([{"kind": "down", "x": 300, "y": 420}, {"kind": "up", "x": 300, "y": 420}, {"kind": "move", "x": 151.5, "y": 431}, {"kind": "down", "x": 151.5, "y": 431}, {"kind": "up", "x": 151.5, "y": 431}]);
+    assert_eq!(bounds(&mut s, 6, events, "pen"), [150.0, 420.0, 150.0, 11.0]);
+}

crates/pdf/src/import.rs

@@ -23,7 +23,7 @@ use crate::import_color::{Colors, Native};
 use crate::import_mask::{MaskSpec, contains, is_rectangle, luminance, mask_spec, white_cover};
 use crate::import_scan::{MAX_NESTING, Ocgs, Scan, all_on, hides_forms, scan_page, tag_key};
 use crate::import_shading::{clipped, extend_clip, fold_stop_opacity, mesh_shading, shading_gradient};
-use crate::import_text::{Families, Look, Placement, TextLine, Upright};
+use crate::import_text::{Families, LineFacts, Look, Placement, TextLine, Upright};
 use crate::{CropTo, ImportOptions, ImportReport, PdfError, TextAs};
 
 /// The name of the paths text imports as.
@@ -76,6 +76,33 @@ fn place_group(g: usize, ocgs: &Ocgs, slots: &mut Vec<Slot>, nesting: &mut Nesti
     slots.push(Slot::Group(child));
 }
 
+/// The top-level group that group `g` is listed under (`g` itself when it isn't a sublayer).
+fn top_group(g: usize, ocgs: &Ocgs) -> usize {
+    let mut top = g;
+    for _ in 0..=MAX_NESTING {
+        match ocgs.list.get(top).and_then(|o| o.parent) {
+            Some(parent) => top = parent,
+            None => break,
+        }
+    }
+    top
+}
+
+/// Merge the top-level groups a page marks (`page`, in the order it first marks each, its empty
+/// ones too) into the stacking order of the pages before (`order`, bottom first; `known`: its
+/// groups). A group new to it goes right below the first group the page marks after it that it
+/// has: a layer whose art starts on a later page keeps its place among the others (#508).
+fn merge_order(order: &mut Vec<usize>, known: &mut HashSet<usize>, page: &[usize]) {
+    let mut above = None;
+    for &g in page.iter().rev() {
+        if known.insert(g) {
+            let at = above.and_then(|a| order.iter().position(|&x| x == a)).unwrap_or(order.len());
+            order.insert(at, g);
+        }
+        above = Some(g);
+    }
+}
+
 /// The layer of group `g`, in `color`: its art and sublayers. `None` for a group that isn't read.
 fn group_layer(
     b: &mut Builder<'_>,
@@ -166,6 +193,8 @@ pub fn import_with_report(bytes: &[u8], opts: &ImportOptions) -> Result<ImportRe
     let mut slots: Vec<Slot> = vec![];
     let mut group_art: HashMap<usize, Vec<Arc<Node>>> = HashMap::new();
     let mut nesting = Nesting::new();
+    // The top-level groups in the order the pages mark them, bottom first.
+    let (mut order, mut known) = (vec![], HashSet::new());
     for (i, &number) in picked.iter().enumerate() {
         let Some(page) = pages.get(number) else { continue };
         // The chosen box sits at (x, 0); the page draws round it.
@@ -175,6 +204,11 @@ pub fn import_with_report(bytes: &[u8], opts: &ImportOptions) -> Result<ImportRe
         let mut ctx = Context::new(xf, ab, &cache, pdf.xref(), settings.clone());
         b.page = ab;
         let scan = scan_page(page, &mut ocgs, all_on, &mut b.fonts);
+        if route {
+            let mut seen = HashSet::new();
+            let marked: Vec<usize> = scan.tags.iter().filter_map(|(_, g)| g.map(|g| top_group(g, &ocgs))).filter(|g| seen.insert(*g)).collect();
+            merge_order(&mut order, &mut known, &marked);
+        }
         b.begin_page(scan);
         interpret_page(page, &mut ctx, &mut b);
         let mut parts = b.end_page();
@@ -239,8 +273,25 @@ pub fn import_with_report(bytes: &[u8], opts: &ImportOptions) -> Result<ImportRe
     if placeholder {
         return Err(PdfError::PlaceholderOnly);
     }
+    // A group the pages mark but draw nothing in is an empty layer, as the editor had it.
+    for &g in &order {
+        if !nesting.contains_key(&g) {
+            slots.push(Slot::Group(g));
+        }
+    }
+    // The groups' layers stack as the pages mark them (the art outside them stays where it was
+    // drawn): a group that first paints on a later page doesn't go on top of the others.
+    let rank: HashMap<usize, usize> = order.iter().enumerate().map(|(i, &g)| (g, i)).collect();
+    let at: Vec<usize> = slots.iter().enumerate().filter(|(_, s)| matches!(s, Slot::Group(_))).map(|(i, _)| i).collect();
+    let mut stacked: Vec<usize> = slots.iter().filter_map(|s| if let Slot::Group(g) = s { Some(*g) } else { None }).collect();
+    stacked.sort_by_key(|g| rank.get(g).copied().unwrap_or(usize::MAX));
+    for (i, g) in at.into_iter().zip(stacked) {
+        if let Some(s) = slots.get_mut(i) {
+            *s = Slot::Group(g);
+        }
+    }
     for (n, slot) in slots.into_iter().enumerate() {
-        let layer = match slot {
+        let mut layer = match slot {
             Slot::Page(l) => *l,
             // Sublayers take their top-level layer's colour.
             Slot::Group(g) => match group_layer(&mut b, g, &ocgs, &nesting, &mut group_art, LayerColor::Preset((n % 27) as u8)) {
@@ -248,6 +299,9 @@ pub fn import_with_report(bytes: &[u8], opts: &ImportOptions) -> Result<ImportRe
                 None => continue,
             },
         };
+        if let Some(art) = layer.children_mut() {
+            crate::import_lines::rebuild(art, &b.lines);
+        }
         doc.layers.push(Arc::new(layer));
     }
     for (k, blob) in b.images.drain() {
@@ -567,6 +621,8 @@ struct Builder<'p> {
     nested: u32,
     /// The last filled path: its node and its outline (a stroke of the same outline joins it).
     last_fill: Option<(NodeId, BezPath)>,
+    /// What each line of type made tells beyond its text object ([`crate::import_lines`]).
+    lines: HashMap<NodeId, LineFacts>,
 }
 
 fn blend(b: hayro_interpret::BlendMode) -> BlendMode {
@@ -701,6 +757,7 @@ impl<'p> Builder<'p> {
             pending: false,
             nested: 0,
             last_fill: None,
+            lines: HashMap::new(),
         }
     }
 
@@ -786,10 +843,11 @@ impl<'p> Builder<'p> {
         let current = self.current_group();
         let Some(f) = self.stack.last_mut() else { return };
         f.children.push(n);
+        // A frame's art goes where its first art was drawn (a clip can end in a later group).
         if root {
             self.root_groups.push(group.or(current));
         } else if f.group.is_none() {
-            f.group = group;
+            f.group = group.or(current);
         }
     }
 
@@ -955,9 +1013,10 @@ impl<'p> Builder<'p> {
     }
 
     fn flush_text(&mut self) {
-        let Some((t, opacity)) = self.text.take().and_then(TextLine::finish) else { return };
+        let Some((t, opacity, facts)) = self.text.take().and_then(TextLine::finish) else { return };
         let mut n = Node::new(self.id(), NodeKind::Text(Box::new(t)));
         n.opacity = opacity;
+        self.lines.insert(n.id, facts);
         self.push_node(n);
     }
 
@@ -1227,6 +1286,14 @@ impl<'p> Builder<'p> {
             place(&mut line);
             self.text = Some(line);
         }
+        // Its ink: a stroke the file draws as outlines of the glyphs is told by it.
+        let mut ink = o.outline();
+        if let Some(line) = &mut self.text
+            && !ink.elements().is_empty()
+        {
+            ink.apply_affine(m);
+            line.ink.push(ink.bounding_box());
+        }
         true
     }
 }
@@ -1570,8 +1637,10 @@ impl<'a> Device<'a> for Builder<'_> {
         if self.nested > 0 {
             return;
         }
-        if self.marked.pop().flatten().is_some() {
+        // The runs gathered within a layer's sequence are its art: finish them before it ends.
+        if self.marked.last().copied().flatten().is_some() {
             self.flush();
         }
+        self.marked.pop();
     }
 }

crates/pdf/src/import_lines.rs

@@ -0,0 +1,254 @@
+//! What a file's lines of type were, beyond what each line says on its own (#508). An editor
+//! writes what PDF text can't say as more art next to the text, and the type it wrapped in a
+//! frame as lines:
+//! - a stroke added to a type object (above or below its characters) comes as the outline of each
+//!   glyph stroked, one path per glyph, right after the type (or right before it): it is the
+//!   type's stroke again, so the type stays one object;
+//! - area type comes as a line of point type per line, each wrapped line ending in a space. Lines
+//!   in a row sharing a left edge, font, size and leading (and paragraph spacing) are one area
+//!   type object again, aligned left or justified, where laying its text out in the frame breaks
+//!   it where the file does: else, as where its font isn't installed, they stay lines.
+
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use kurbo::{Point, Rect, Shape};
+use vectorcraft_color::BlendMode;
+use vectorcraft_doc::{AppearanceItem, Justify, Node, NodeId, NodeKind, TextKind, TextObject, TextRun};
+use vectorcraft_geom::shapes;
+
+use crate::import_text::LineFacts;
+
+/// Rebuild the type among `nodes` (and in their groups) from what its lines tell (`lines`).
+pub(crate) fn rebuild(nodes: &mut Vec<Arc<Node>>, lines: &HashMap<NodeId, LineFacts>) {
+    if lines.is_empty() {
+        return;
+    }
+    for n in nodes.iter_mut() {
+        if n.children().is_some_and(|c| !c.is_empty())
+            && let Some(children) = Arc::make_mut(n).children_mut()
+        {
+            rebuild(children, lines);
+        }
+    }
+    join_strokes(nodes, lines);
+    join_paragraphs(nodes, lines);
+}
+
+/// The stroke paths `nodes` draw when they are the outlines of the glyphs whose ink boxes are
+/// `ink`, stroked one by one alike (no fill, mask or blending, fully opaque).
+fn outline_stroke(nodes: &[Arc<Node>], ink: &[Rect]) -> Option<AppearanceItem> {
+    let first = nodes.first()?;
+    let [stroke @ AppearanceItem::Stroke(_)] = first.appearance.items.as_slice() else { return None };
+    let on_glyph = |n: &Node, r: &Rect| {
+        let tol = 0.01 * (r.width() + r.height()) + 0.01;
+        let NodeKind::Path { path, clipping: false, guide: false, live: None, .. } = &n.kind else { return false };
+        let b = path.to_bezpath().bounding_box();
+        n.appearance == first.appearance
+            && n.mask.is_none()
+            && n.opacity >= 0.999
+            && n.blend == BlendMode::Normal
+            && [(b.x0, r.x0), (b.y0, r.y0), (b.x1, r.x1), (b.y1, r.y1)].iter().all(|(a, b)| (a - b).abs() <= tol)
+    };
+    (nodes.len() == ink.len() && nodes.iter().zip(ink).all(|(n, r)| on_glyph(n, r))).then(|| stroke.clone())
+}
+
+/// Each type object among `nodes` whose glyphs' outlines are stroked by the paths right after it
+/// (or right before it) takes that stroke above (or below) its characters, and the paths go.
+fn join_strokes(nodes: &mut Vec<Arc<Node>>, lines: &HashMap<NodeId, LineFacts>) {
+    let mut i = 0;
+    while i < nodes.len() {
+        let ink = nodes
+            .get(i)
+            .filter(|n| matches!(n.kind, NodeKind::Text(_)) && n.appearance.items.is_empty())
+            .and_then(|n| lines.get(&n.id))
+            .map_or(&[][..], |f| f.ink.as_slice());
+        let k = ink.len();
+        if k > 0 {
+            if let Some(stroke) = nodes.get(i + 1..i + 1 + k).and_then(|after| outline_stroke(after, ink)) {
+                nodes.drain(i + 1..i + 1 + k);
+                if let Some(t) = nodes.get_mut(i) {
+                    Arc::make_mut(t).appearance.items.push(stroke);
+                }
+            } else if let Some(stroke) = i.checked_sub(k).and_then(|from| nodes.get(from..i)).and_then(|before| outline_stroke(before, ink)) {
+                nodes.drain(i - k..i);
+                i -= k;
+                if let Some(t) = nodes.get_mut(i) {
+                    let ap = &mut Arc::make_mut(t).appearance;
+                    ap.items.insert(0, stroke);
+                    ap.set_contents_at(1);
+                }
+            }
+        }
+        i += 1;
+    }
+}
+
+/// `n` as a line that can be part of area type: horizontal point type, with what its line told.
+fn line<'a>(n: &'a Node, lines: &'a HashMap<NodeId, LineFacts>) -> Option<(&'a TextObject, &'a LineFacts)> {
+    let NodeKind::Text(t) = &n.kind else { return None };
+    let point = matches!(t.kind, TextKind::Point) && !t.vertical && n.mask.is_none() && !t.runs.is_empty();
+    point.then_some(())?;
+    Some((t, lines.get(&n.id)?))
+}
+
+/// Lines of type in a row that may be one area type object.
+struct Block {
+    /// The step from a wrapped line's baseline to the next.
+    leading: f64,
+    /// The extra step after a line ending a paragraph.
+    space: f64,
+    /// Each line's baseline below the first (text space).
+    ys: Vec<f64>,
+}
+
+/// The lines from `nodes`' first on that share its left edge, angle, font and size, its look
+/// (opacity, blending, appearance) and steps down by one leading after a wrapped line and by
+/// another (the leading and paragraph spacing) after a line ending a paragraph: how many, and
+/// the block they make unless none of them was wrapped (0 and `None`: the first isn't a line).
+fn block(nodes: &[Arc<Node>], lines: &HashMap<NodeId, LineFacts>) -> (usize, Option<Block>) {
+    let Some((head, (t0, f0))) = nodes.first().and_then(|n| Some((n, line(n, lines)?))) else { return (0, None) };
+    let st = t0.first_style();
+    let size = st.size;
+    let inv = t0.xf.inverse();
+    let lin = |t: &TextObject| {
+        let [a, b, c, d, ..] = t.xf.as_coeffs();
+        [a, b, c, d]
+    };
+    let (mut ys, mut wraps) = (vec![0.0], f0.wraps);
+    let (mut leading, mut para): (Option<f64>, Option<f64>) = (None, None);
+    for n in nodes.iter().skip(1) {
+        let Some((t, f)) = line(n, lines) else { break };
+        let s = t.first_style();
+        let alike = n.opacity == head.opacity
+            && n.blend == head.blend
+            && n.appearance == head.appearance
+            && s.font_family == st.font_family
+            && s.font_style == st.font_style
+            && (s.size - size).abs() <= size * 0.01
+            && t.para == t0.para
+            && lin(t).iter().zip(lin(t0)).all(|(a, b)| (a - b).abs() < 1e-6);
+        let at = inv * (t.xf * Point::ZERO);
+        let step = at.y - ys.last().copied().unwrap_or_default();
+        if !alike || at.x.abs() > size * 0.02 || !(step > size * 0.5 && step < size * 4.0) {
+            break;
+        }
+        let slot = if wraps { &mut leading } else { &mut para };
+        match *slot {
+            Some(s) if (s - step).abs() > size * 0.01 => break,
+            Some(_) => {}
+            None => *slot = Some(step),
+        }
+        ys.push(at.y);
+        wraps = f.wraps;
+    }
+    let count = ys.len();
+    let Some(leading) = leading else { return (count, None) };
+    let space = para.map_or(0.0, |p| p - leading);
+    (count, (space > -size * 0.01).then_some(Block { leading, space: space.max(0.0), ys }))
+}
+
+/// Lines `nodes` of block `b` as one area type object, aligned left or justified, when laying it
+/// out breaks its lines where the file does.
+fn area_type(nodes: &[Arc<Node>], lines: &HashMap<NodeId, LineFacts>, b: &Block) -> Option<TextObject> {
+    let texts: Vec<(&TextObject, &LineFacts)> = nodes.iter().map(|n| line(n, lines)).collect::<Option<_>>()?;
+    let (first, _) = texts.first()?;
+    let size = first.first_style().size;
+    // Each line's tracking (a line with spaces tracked apart was set by hand).
+    let trackings: Vec<f64> = texts
+        .iter()
+        .map(|(t, _)| {
+            let mut all = t.runs.iter().map(|r| r.style.tracking);
+            let one = all.next()?;
+            all.all(|x| x == one).then_some(one)
+        })
+        .collect::<Option<_>>()?;
+    let median = |mut v: Vec<f64>| {
+        v.sort_by(f64::total_cmp);
+        v.get(v.len() / 2).copied()
+    };
+    let wrapped: Vec<f64> = texts.iter().filter(|(_, f)| f.wraps).map(|(_, f)| f.length).collect();
+    let longest = |v: &[f64]| v.iter().copied().fold(0.0, f64::max);
+    let mut tries = vec![];
+    // Wrapped lines all as long: justified (a paragraph's last line aligned left), tracked as the
+    // lines that end paragraphs are (the others are spaced out).
+    let full = longest(&wrapped);
+    if wrapped.len() >= 2 && wrapped.iter().all(|l| (full - l).abs() <= size * 0.02) {
+        let ends: Vec<f64> = texts.iter().zip(&trackings).filter(|((_, f), _)| !f.wraps).map(|(_, t)| *t).collect();
+        let tracking = median(ends).or_else(|| trackings.iter().copied().reduce(f64::min))?;
+        tries.push((Justify::JustifyLeft, full, tracking));
+    }
+    let all: Vec<f64> = texts.iter().map(|(_, f)| f.length).collect();
+    tries.push((Justify::Left, longest(&all) + size * 0.02, median(trackings)?));
+    tries.into_iter().find_map(|(justify, width, tracking)| laid_out(&texts, b, justify, width, tracking))
+}
+
+/// The area type of lines `texts` (block `b`): `width` wide, aligned `justify`, its characters
+/// tracked `tracking`; `None` when it doesn't lay out as the lines did.
+fn laid_out(texts: &[(&TextObject, &LineFacts)], b: &Block, justify: Justify, width: f64, tracking: f64) -> Option<TextObject> {
+    let (first, _) = texts.first()?;
+    let size = first.first_style().size;
+    // Leading as set, unless it is Auto's (120% of the size).
+    let explicit =
+        (b.leading - size * 1.2).abs() > size * 1e-3 || texts.iter().any(|(t, _)| t.runs.iter().any(|r| (r.style.size - size).abs() > 1e-9));
+    let mut runs: Vec<TextRun> = vec![];
+    for (k, (t, f)) in texts.iter().enumerate() {
+        for r in &t.runs {
+            let mut style = r.style.clone();
+            style.tracking = tracking;
+            style.leading = explicit.then_some((b.leading * 1000.0).round() / 1000.0);
+            match runs.last_mut() {
+                Some(last) if last.style == style => last.text.push_str(&r.text),
+                _ => runs.push(TextRun { text: r.text.clone(), style }),
+            }
+        }
+        // A wrapped line's space, or the end of a paragraph.
+        if k + 1 < texts.len()
+            && let Some(last) = runs.last_mut()
+        {
+            last.text.push(if f.wraps { ' ' } else { '\n' });
+        }
+    }
+    let mut t = (*first).clone();
+    t.runs = runs;
+    t.para.justify = justify;
+    t.para.space_before = b.space;
+    let last = b.ys.last().copied()?;
+    let db = vectorcraft_text::FontDb::global();
+    // The frame's top puts the first baseline where the file has it.
+    t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, width, last + b.leading.max(size) + size)) };
+    let top = -vectorcraft_text::layout(db, &t).lines.first()?.baseline;
+    t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, top, width, last + b.leading.max(size))) };
+    let laid = vectorcraft_text::layout(db, &t);
+    let plain = t.plain_text();
+    let same = !laid.overflow
+        && laid.lines.len() == texts.len()
+        && laid.lines.iter().zip(texts).zip(&b.ys).all(|((l, (line, f)), y)| {
+            let text = plain.get(l.start..l.end).unwrap_or_default();
+            text.trim() == line.plain_text().trim()
+                && (l.baseline - y).abs() <= size * 0.05
+                && (justify != Justify::JustifyLeft || !f.wraps || (l.x1 - f.length).abs() <= size * 0.05)
+        });
+    t.cached_bounds = Some(laid.bounds);
+    same.then_some(t)
+}
+
+/// Lines of point type in a row among `nodes` that were wrapped in a frame become one area type
+/// object again (see [`area_type`]).
+fn join_paragraphs(nodes: &mut Vec<Arc<Node>>, lines: &HashMap<NodeId, LineFacts>) {
+    let mut i = 0;
+    while i < nodes.len() {
+        let (count, b) = nodes.get(i..).map_or((0, None), |rest| block(rest, lines));
+        let area = b.filter(|_| count > 1).and_then(|b| area_type(nodes.get(i..i + count)?, lines, &b));
+        if let Some(area) = area
+            && let Some(head) = nodes.get_mut(i)
+        {
+            Arc::make_mut(head).kind = NodeKind::Text(Box::new(area));
+            nodes.drain(i + 1..i + count);
+            i += 1;
+        } else {
+            // Lines that don't make area type: none of them starts it either.
+            i += count.max(1);
+        }
+    }
+}

crates/pdf/src/import_text.rs

@@ -9,9 +9,10 @@
 
 use std::collections::HashMap;
 
-use kurbo::{Affine, BezPath, Point, Vec2};
+use kurbo::{Affine, BezPath, Point, Rect, Vec2};
 use vectorcraft_color::Paint;
 use vectorcraft_doc::{CharStyle, ParaDirection, TextKind, TextObject, TextRun};
+use vectorcraft_text::TextLayout;
 
 /// One glyph's placement: its baseline origin, advance direction, size and horizontal scale.
 #[derive(Clone, Copy, Debug)]
@@ -103,6 +104,8 @@ pub(crate) struct TextLine {
     next: Point,
     /// The last glyph's origin.
     last: Point,
+    /// Where the last glyph that isn't a space ends.
+    visible: Point,
     /// The last glyph's baseline direction.
     last_dir: Vec2,
     /// Each glyph's baseline origin, then where the last one ends.
@@ -112,6 +115,24 @@ pub(crate) struct TextLine {
     upright: Option<Upright>,
     /// The glyphs make a column (vertical type), each below the last.
     column: bool,
+    /// Each glyph's ink box as drawn (document space), in drawing order; glyphs without ink are
+    /// left out.
+    pub ink: Vec<Rect>,
+    /// The spaces read from gaps between glyphs: their byte offset in the text, and the gap from
+    /// the end of the glyph before to the start of the next (points).
+    gaps: Vec<(usize, f64)>,
+}
+
+/// What a finished line of type tells beyond its text object (see [`crate::import_lines`]).
+#[derive(Clone, Debug, Default)]
+pub(crate) struct LineFacts {
+    /// [`TextLine::ink`].
+    pub ink: Vec<Rect>,
+    /// Horizontal point type: it ended in a space (as a line an editor wrapped in a frame does).
+    pub wraps: bool,
+    /// Horizontal point type: how long the file set it, from its first glyph's origin to the end
+    /// of its last glyph that isn't a space (points, along the baseline).
+    pub length: f64,
 }
 
 /// The most a glyph on a curve turns from the one before it (about 20°).
@@ -119,7 +140,20 @@ const CURVE_TURN_COS: f64 = 0.94;
 
 impl TextLine {
     pub fn new(at: Placement, opacity: f32) -> Self {
-        Self { at, opacity, next: at.origin, last: at.origin, last_dir: at.dir, baseline: vec![], runs: vec![], upright: None, column: false }
+        Self {
+            at,
+            opacity,
+            next: at.origin,
+            last: at.origin,
+            visible: at.origin,
+            last_dir: at.dir,
+            baseline: vec![],
+            runs: vec![],
+            upright: None,
+            column: false,
+            ink: vec![],
+            gaps: vec![],
+        }
     }
 
     /// Add glyph `text` set vertically (`upright`) if it continues this column (or makes this
@@ -171,6 +205,7 @@ impl TextLine {
         if self.column || self.upright.is_some() {
             return false;
         }
+        let bytes: usize = self.runs.iter().map(|(_, t)| t.len()).sum();
         if let Some((last, run)) = self.runs.last_mut() {
             let size = self.at.size.max(at.size);
             let gap = (at.origin - self.next).dot(self.last_dir);
@@ -192,6 +227,9 @@ impl TextLine {
             // A gap wider than a fifth of an em reads as a space.
             if gap > size * 0.2 && !run.ends_with(' ') && !text.starts_with(' ') {
                 run.push(' ');
+                if on_line {
+                    self.gaps.push((bytes, gap));
+                }
             }
             if last.takes(look) {
                 run.push_str(text);
@@ -202,6 +240,9 @@ impl TextLine {
             self.runs.push((look.clone(), text.to_string()));
         }
         self.next = at.origin + at.dir * advance;
+        if !text.trim().is_empty() {
+            self.visible = self.next;
+        }
         self.last = at.origin;
         self.last_dir = at.dir;
         self.baseline.push(at.origin);
@@ -247,10 +288,12 @@ impl TextLine {
         true
     }
 
-    /// The point type object and its opacity.
-    pub fn finish(mut self) -> Option<(TextObject, f32)> {
+    /// The point type object, its opacity and what else the line tells.
+    pub fn finish(mut self) -> Option<(TextObject, f32, LineFacts)> {
+        let mut facts = LineFacts { ink: std::mem::take(&mut self.ink), ..LineFacts::default() };
         // Turned along a curve: type on a path through the glyphs.
         let path = if self.curved() { self.baseline_path() } else { None };
+        facts.wraps = path.is_none() && self.upright.is_none() && self.runs.last().is_some_and(|(_, t)| t.ends_with(' '));
         if let Some((_, last)) = self.runs.last_mut() {
             last.truncate(last.trim_end().len());
         }
@@ -272,7 +315,7 @@ impl TextLine {
             t.kind = TextKind::OnPath { path: vectorcraft_geom::PathData::from_bezpath(&path), start: 0.0, end: None };
             t.xf = Affine::IDENTITY;
             t.cached_bounds = Some(vectorcraft_text::layout(db, &t).bounds);
-            return Some((t, self.opacity));
+            return Some((t, self.opacity, facts));
         }
         let (start, along) = match self.upright {
             // Vertical point type (a column, or a single upright glyph) is anchored at the top
@@ -286,26 +329,87 @@ impl TextLine {
         };
         // Tracking that makes the line as long as in the file: the PDF placed each glyph, the
         // layout sets them by their advances. Spread over the gaps between characters (tracking
-        // follows each character, the last one's past the end of the line).
-        let length = (self.next - start).dot(along);
+        // follows each character, the last one's past the end of the line). A horizontal line is
+        // measured to its last glyph that isn't a space: the spaces after it were dropped.
+        let length = (if t.vertical { self.next } else { self.visible } - start).dot(along);
+        if !t.vertical {
+            facts.length = length;
+        }
         let laid = vectorcraft_text::layout(db, &t);
         let natural: f64 = laid.glyphs.iter().map(|g| g.advance).sum();
         let chars: usize = t.runs.iter().map(|r| r.text.chars().count()).sum();
         let size = self.at.size;
         let mut bounds = laid.bounds;
         if chars > 1 && length.is_finite() && (length - natural).abs() > size * 0.01 {
-            let tracking = ((length - natural) / (chars - 1) as f64 / size * 1000.0).clamp(-1000.0, 1000.0).round();
-            for r in &mut t.runs {
-                r.style.tracking = tracking;
-            }
+            // The spaces read from gaps keep their own place only in text left in the file's order.
+            let total: usize = t.runs.iter().map(|r| r.text.len()).sum();
+            let gaps: Vec<(usize, f64)> =
+                if t.para.direction.is_none() { self.gaps.into_iter().filter(|(b, _)| *b < total).collect() } else { vec![] };
+            let (tracking, spaces) = spacing(&laid, &gaps, length - natural, chars, size);
+            t.runs = tracked(std::mem::take(&mut t.runs), tracking, &spaces);
             // Tracked: laid out again for its bounds.
             bounds = vectorcraft_text::layout(db, &t).bounds;
         }
         t.cached_bounds = Some(bounds);
-        Some((t, self.opacity))
+        Some((t, self.opacity, facts))
     }
 }
 
+/// The tracking (thousandths of an em) that sets a line of `chars` characters, laid out untracked
+/// as `laid`, `extra` points longer, as the file set it: the same after every character, except
+/// the spaces read from gaps (`gaps`: byte offset, gap in points) where that would put the glyphs
+/// after them more than a tenth of an em off (a barcode's digits, set in groups apart). Those take
+/// their own tracking, given with their byte offsets.
+fn spacing(laid: &TextLayout, gaps: &[(usize, f64)], extra: f64, chars: usize, size: f64) -> (f64, Vec<(usize, f64)>) {
+    let pairs = chars.saturating_sub(1).max(1) as f64;
+    // The space and the character before it take `need` (the gap less the space) between them;
+    // tracking gives them twice its share.
+    let space = |b: usize| laid.glyphs.iter().find(|g| g.byte == b).map(|g| g.advance);
+    let needs: Vec<(usize, f64)> = gaps.iter().filter_map(|&(b, gap)| Some((b, gap - space(b)?))).collect();
+    let mut own: Vec<(usize, f64)> = vec![];
+    let mut tracking = extra / pairs;
+    // Each space taken apart changes the others' share: until no more are.
+    loop {
+        let more: Vec<(usize, f64)> =
+            needs.iter().filter(|(b, need)| !own.iter().any(|(o, _)| o == b) && (need - 2.0 * tracking).abs() > size * 0.1).copied().collect();
+        if more.is_empty() {
+            break;
+        }
+        own.extend(more);
+        let rest = pairs - 2.0 * own.len() as f64;
+        tracking = if rest >= 1.0 { (extra - own.iter().map(|(_, need)| need).sum::<f64>()) / rest } else { 0.0 };
+    }
+    own.sort_by_key(|(b, _)| *b);
+    let em = |pts: f64| (pts / size * 1000.0).clamp(-1000.0, 1000.0).round();
+    (em(tracking), own.into_iter().map(|(b, need)| (b, em(need - tracking))).collect())
+}
+
+/// `runs` with tracking `tracking`, and each space at a byte offset of `spaces` (in order) a run
+/// of its own with the tracking given with it.
+fn tracked(runs: Vec<TextRun>, tracking: f64, spaces: &[(usize, f64)]) -> Vec<TextRun> {
+    let mut out = Vec::with_capacity(runs.len() + 2 * spaces.len());
+    let mut off = 0;
+    for r in runs {
+        let style = CharStyle { tracking, ..r.style };
+        let end = off + r.text.len();
+        let mut from = 0;
+        for &(b, own) in spaces.iter().filter(|(b, _)| (off..end).contains(b)) {
+            let at = b - off;
+            let (Some(before), Some(space)) = (r.text.get(from..at), r.text.get(at..at + 1)) else { continue };
+            if !before.is_empty() {
+                out.push(TextRun { text: before.to_string(), style: style.clone() });
+            }
+            out.push(TextRun { text: space.to_string(), style: CharStyle { tracking: own, ..style.clone() } });
+            from = at + 1;
+        }
+        if let Some(rest) = r.text.get(from..).filter(|t| !t.is_empty()) {
+            out.push(TextRun { text: rest.to_string(), style });
+        }
+        off = end;
+    }
+    out
+}
+
 fn round(v: f64) -> f64 {
     (v * 1000.0).round() / 1000.0
 }

crates/pdf/src/lib.rs

@@ -48,6 +48,7 @@ mod images;
 mod import;
 mod import_color;
 mod import_image;
+mod import_lines;
 mod import_mask;
 mod import_scan;
 mod import_shading;
@@ -231,6 +232,8 @@ mod tests_import_fidelity;
 #[cfg(test)]
 mod tests_import_layers;
 #[cfg(test)]
+mod tests_import_lines;
+#[cfg(test)]
 mod tests_import_options;
 #[cfg(test)]
 mod tests_layers;

crates/pdf/src/tests_import_fidelity.rs

@@ -242,11 +242,13 @@ fn text_becomes_point_type() {
     // The baseline origin, in y-down page space.
     let o = t[0].xf * kurbo::Point::ORIGIN;
     assert!((o.x - 10.0).abs() < 0.01 && (o.y - 70.0).abs() < 0.01, "{o:?}");
-    // A gap of an em between words reads as a space; another font on the line is another run.
+    // A gap of an em between words reads as a space, tracked on its own to keep the gap's width
+    // (#508); another font on the line is another run.
     assert_eq!(text(&t[1]), "Next line in bold");
     let runs: Vec<(&str, &str)> = t[1].runs.iter().map(|r| (r.text.as_str(), r.style.font_style.as_str())).collect();
-    assert_eq!(runs, [("Next line", "Regular"), (" in bold", "Bold")]);
-    assert_eq!(t[1].runs[1].style.fill.color(), Some(Color::rgb(0.0, 0.0, 1.0)));
+    assert_eq!(runs, [("Next", "Regular"), (" ", "Regular"), ("line", "Regular"), (" in bold", "Bold")]);
+    assert!(t[1].runs[1].style.tracking > t[1].runs[0].style.tracking + 100.0, "{:?}", t[1].runs);
+    assert_eq!(t[1].runs[3].style.fill.color(), Some(Color::rgb(0.0, 0.0, 1.0)));
     assert!(!r.warnings.iter().any(|w| w.contains("outlines")), "{:?}", r.warnings);
     // As outlines: paths, no type.
     let r = open_with(&bytes, |o| o.text_as = TextAs::Outlines);

crates/pdf/src/tests_import_lines.rs

@@ -0,0 +1,203 @@
+//! What a file's lines of type were (#508): the layer art ending a group's marked content belongs
+//! to, layers ordered as the pages mark them, a stroke written as stroked glyph outlines, spaces
+//! read from wide gaps, and lines wrapped in a frame rebuilt as area type.
+
+use kurbo::{BezPath, PathEl, Point, Shape};
+use serde_json::json;
+use vectorcraft_color::{Color, Paint};
+use vectorcraft_doc::{AppearanceItem, CharStyle, Document, Justify, Node, NodeKind, TextKind, TextObject};
+use vectorcraft_geom::{Affine, Rect, shapes};
+use vectorcraft_testkit::pdf::{PdfPage, first_extra, pdf_with_catalog};
+
+use crate::*;
+
+const HELVETICA: &str = "/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >>";
+
+/// Groups "A" and "B" (A painted first) for a file of `pages` pages, and the catalog entries.
+fn groups(pages: usize) -> ([String; 2], String, String) {
+    let (a, b) = (first_extra(pages), first_extra(pages) + 1);
+    let objs = ["<< /Type /OCG /Name (A) >>".to_string(), "<< /Type /OCG /Name (B) >>".to_string()];
+    let catalog = format!("/OCProperties << /OCGs [{a} 0 R {b} 0 R] /D << /Order [{b} 0 R {a} 0 R] >> >> ");
+    let resources = format!("/Properties << /MC0 {a} 0 R /MC1 {b} 0 R >> {HELVETICA}");
+    (objs, catalog, resources)
+}
+
+/// A file of 100 × 100 pt pages drawing `contents`, with groups A (`/MC0`) and B (`/MC1`).
+fn layered(contents: &[&str]) -> Document {
+    let (objs, catalog, resources) = groups(contents.len());
+    let pages: Vec<PdfPage> = contents.iter().map(|c| PdfPage { resources: resources.clone(), ..PdfPage::new(100.0, 100.0, c) }).collect();
+    import(&pdf_with_catalog(&pages, &[&objs[0], &objs[1]], &catalog, None)).unwrap()
+}
+
+/// The layers' names, bottom first, and the kinds of their art.
+fn layers(d: &Document) -> Vec<(String, Vec<&'static str>)> {
+    let kind = |n: &std::sync::Arc<Node>| match n.kind {
+        NodeKind::Text(_) => "text",
+        NodeKind::Group { .. } => "group",
+        _ => "path",
+    };
+    d.layers.iter().map(|l| (l.name.clone().unwrap_or_default(), l.children().map_or(vec![], |c| c.iter().map(kind).collect()))).collect()
+}
+
+fn texts(d: &Document) -> Vec<TextObject> {
+    let mut v = vec![];
+    d.walk(|n| {
+        if let NodeKind::Text(t) = &n.kind {
+            v.push((**t).clone());
+        }
+    });
+    v
+}
+
+fn named(layers: &[(&str, &[&'static str])]) -> Vec<(String, Vec<&'static str>)> {
+    layers.iter().map(|(n, k)| (n.to_string(), k.to_vec())).collect()
+}
+
+#[test]
+fn type_ending_a_layers_marked_content_stays_in_its_layer() {
+    // The line is still being gathered when the group's sequence ends.
+    let d = layered(&["/OC /MC0 BDC 0 0 1 rg 0 0 10 10 re f BT /F1 12 Tf 10 50 Td (Lead) Tj ET EMC /OC /MC1 BDC EMC"]);
+    assert_eq!(layers(&d), named(&[("A", &["path", "text"]), ("B", &[])]));
+}
+
+#[test]
+fn a_clip_ending_in_a_later_group_stays_with_its_art() {
+    // The clip opens in A, its art is drawn in A, and it closes after B's (empty) sequence.
+    let d = layered(&["/OC /MC0 BDC q 0 0 50 50 re W n 1 0 0 rg 40 40 20 20 re f EMC /OC /MC1 BDC EMC Q"]);
+    assert_eq!(layers(&d), named(&[("A", &["group"]), ("B", &[])]));
+}
+
+#[test]
+fn layers_stack_as_the_pages_mark_them_when_one_first_paints_on_a_later_page() {
+    // A, the bottom layer, is empty on page 1 and has art on page 2 only.
+    let d = layered(&["/OC /MC0 BDC EMC /OC /MC1 BDC 1 0 0 rg 0 0 10 10 re f EMC", "/OC /MC0 BDC 0 0 1 rg 0 0 10 10 re f EMC /OC /MC1 BDC EMC"]);
+    assert_eq!(layers(&d), named(&[("A", &["path"]), ("B", &["path"])]));
+    // A group marked with no art on any page is an empty layer in its place.
+    let d = layered(&["/OC /MC0 BDC EMC /OC /MC1 BDC 1 0 0 rg 0 0 10 10 re f EMC"]);
+    assert_eq!(layers(&d), named(&[("A", &[]), ("B", &["path"])]));
+}
+
+/// A 100 × 100 pt page drawing `content` in Helvetica.
+fn page(content: &str) -> Vec<u8> {
+    vectorcraft_testkit::pdf::pdf(&[PdfPage { resources: HELVETICA.into(), ..PdfPage::new(100.0, 100.0, content) }], None)
+}
+
+/// The outline of glyph `c` drawn at 24 pt from (x, 50), in PDF operators (y up), stroked.
+fn outline(c: char, x: f64) -> String {
+    let opts = ImportOptions { text_as: TextAs::Outlines, ..Default::default() };
+    let d = import_with_report(&page(&format!("BT /F1 24 Tf {x} 50 Td ({c}) Tj ET")), &opts).unwrap().document;
+    let mut p: Option<BezPath> = None;
+    d.walk(|n| {
+        if let NodeKind::Path { path, .. } = &n.kind {
+            p = Some(path.to_bezpath());
+        }
+    });
+    let pt = |q: Point| format!("{:.3} {:.3}", q.x, 100.0 - q.y);
+    let ops: String = p
+        .unwrap()
+        .elements()
+        .iter()
+        .map(|e| match e {
+            PathEl::MoveTo(a) => format!("{} m ", pt(*a)),
+            PathEl::LineTo(a) => format!("{} l ", pt(*a)),
+            PathEl::QuadTo(a, b) => format!("{} {} {} c ", pt(*a), pt(*b), pt(*b)),
+            PathEl::CurveTo(a, b, c) => format!("{} {} {} c ", pt(*a), pt(*b), pt(*c)),
+            PathEl::ClosePath => "h ".into(),
+        })
+        .collect();
+    ops + "S "
+}
+
+#[test]
+fn a_stroke_written_as_stroked_glyph_outlines_is_the_types_stroke() {
+    // "Hi": the H is 722 units wide in Helvetica.
+    let strokes = format!("0 0 1 RG 0.5 w {}{}", outline('H', 10.0), outline('i', 10.0 + 0.722 * 24.0));
+    let text = "BT 1 0 0 rg /F1 24 Tf 10 50 Td (Hi) Tj ET ";
+    for (content, below) in [(format!("{text}{strokes}"), false), (format!("{strokes}{text}"), true)] {
+        let d = import(&page(&content)).unwrap();
+        let art = d.layers[0].children().unwrap();
+        assert_eq!(art.len(), 1, "one object: {art:?}");
+        let NodeKind::Text(t) = &art[0].kind else { panic!("{:?}", art[0].kind) };
+        assert_eq!(t.plain_text(), "Hi");
+        assert_eq!(t.first_style().fill.color(), Some(Color::rgb(1.0, 0.0, 0.0)));
+        let ap = &art[0].appearance;
+        let [AppearanceItem::Stroke(st)] = ap.items.as_slice() else { panic!("{ap:?}") };
+        assert_eq!(st.paint.color(), Some(Color::rgb(0.0, 0.0, 1.0)));
+        assert!((st.width - 0.5).abs() < 1e-6);
+        assert_eq!(ap.contents_at(), usize::from(below), "a stroke drawn first paints below the characters");
+    }
+    // A stroke that isn't on the glyphs stays a path.
+    let d = import(&page(&format!("{text}0 0 1 RG 0.5 w {}", outline('H', 40.0)))).unwrap();
+    assert_eq!(d.layers[0].children().unwrap().len(), 2);
+}
+
+/// A 300 × 200 pt page with `lines` of (x, y from the top, size, text) in Source Sans 3.
+fn source_sans(lines: &[(f32, f32, f32, &str)]) -> Vec<u8> {
+    crate::tests_live_text::text_pdf(lines, false)
+}
+
+#[test]
+fn spaces_read_from_wide_gaps_keep_the_glyphs_after_them_in_place() {
+    // A barcode's digits in three groups, set apart by more than a space.
+    let (x1, x2) = (29.0, 69.0);
+    let bytes = source_sans(&[(20.0, 50.0, 10.0, "3"), (x1, 50.0, 10.0, "533121"), (x2, 50.0, 10.0, "010629")]);
+    let t = texts(&import(&bytes).unwrap());
+    assert_eq!(t.len(), 1);
+    assert_eq!(t[0].plain_text(), "3 533121 010629");
+    let laid = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t[0]);
+    let at = |byte: usize| (t[0].xf * laid.glyphs.iter().find(|g| g.byte == byte).unwrap().origin).x;
+    assert!((at(2) - f64::from(x1)).abs() < 0.05, "the second group starts where the file has it: {} vs {x1}", at(2));
+    assert!((at(9) - f64::from(x2)).abs() < 0.05, "the third group starts where the file has it: {} vs {x2}", at(9));
+}
+
+/// A document of area type `text` (Source Sans 3, 10 pt) `width` wide at (20, 30).
+fn area_doc(text: &str, justify: Justify, width: f64, space_before: f64) -> Document {
+    let style = CharStyle { size: 10.0, fill: Paint::solid(Color::BLACK), ..Default::default() };
+    let mut t = TextObject::point(Point::ORIGIN, text, style);
+    t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, width, 200.0)) };
+    t.xf = Affine::translate((20.0, 30.0));
+    t.para.justify = justify;
+    t.para.space_before = space_before;
+    let mut d = Document::new(300.0, 300.0);
+    let l = d.layers[0].id;
+    let n = Node::new(d.alloc_id(), NodeKind::Text(Box::new(t)));
+    d.insert(Some(l), 0, n).unwrap();
+    d
+}
+
+/// `d` exported (real text) and imported again.
+fn round_trip(d: &Document) -> Document {
+    let settings: PdfSettings = serde_json::from_value(json!({"compression": {"compressText": false}, "advanced": {"outlineText": false}})).unwrap();
+    let bytes = export_with_report(d, &PdfOptions { settings, ..Default::default() }).unwrap().bytes;
+    import(&bytes).unwrap()
+}
+
+const PROSE: &str = "Stop losing your sinkers on the cast: the clip holds the lead until a snag pulls it free, \
+                     so the fish swims on without the weight.\nIt works on every running rig and leaves the line clear.";
+
+#[test]
+fn lines_wrapped_in_a_frame_come_back_as_area_type() {
+    for (justify, space) in [(Justify::Left, 0.0), (Justify::JustifyLeft, 4.0)] {
+        let d = round_trip(&area_doc(PROSE, justify, 120.0, space));
+        let t = texts(&d);
+        assert_eq!(t.len(), 1, "{justify:?}: one object, not a line each: {:?}", t.iter().map(TextObject::plain_text).collect::<Vec<_>>());
+        assert_eq!(t[0].plain_text(), PROSE);
+        assert_eq!(t[0].para.justify, justify);
+        assert!((t[0].para.space_before - space).abs() < 0.01, "{}", t[0].para.space_before);
+        let TextKind::Area { frame } = &t[0].kind else { panic!("{:?}", t[0].kind) };
+        let w = frame.to_bezpath().bounding_box().width();
+        assert!(w <= 120.5 && w > 100.0, "{w}");
+        let origin = t[0].xf * Point::ZERO;
+        assert!((origin.x - 20.0).abs() < 0.05, "{origin:?}");
+    }
+}
+
+#[test]
+fn lines_that_were_not_wrapped_stay_point_type() {
+    // A list: each line its own, none ending in a space.
+    let bytes = source_sans(&[(20.0, 50.0, 10.0, "Hooks"), (20.0, 62.0, 10.0, "Swivels"), (20.0, 74.0, 10.0, "Leads")]);
+    assert_eq!(texts(&import(&bytes).unwrap()).len(), 3);
+    // Wrapped lines whose breaks a frame doesn't give again (a line far short of the others).
+    let bytes = source_sans(&[(20.0, 50.0, 10.0, "One two three four five six "), (20.0, 62.0, 10.0, "a "), (20.0, 74.0, 10.0, "seven")]);
+    assert_eq!(texts(&import(&bytes).unwrap()).len(), 3);
+}

crates/pdf/src/tests_live_text.rs

@@ -13,7 +13,7 @@ const SOURCE_SERIF: &[u8] = include_bytes!("../../../assets/fonts/SourceSerif4-R
 
 /// A 300 × 200 pt page with `lines` of (x, y from the top, size, text) in Source Sans 3, and the
 /// same rotated 90° when `rotated`.
-fn text_pdf(lines: &[(f32, f32, f32, &str)], rotated: bool) -> Vec<u8> {
+pub(crate) fn text_pdf(lines: &[(f32, f32, f32, &str)], rotated: bool) -> Vec<u8> {
     let mut pdf = krilla::Document::new();
     let mut page = pdf.start_page_with(PageSettings::from_wh(300.0, 200.0).unwrap());
     let mut s = page.surface();
@@ -269,7 +269,7 @@ fn a_single_upright_glyph_comes_in_as_vertical_type_and_takes_no_horizontal_glyp
     let mut line = TextLine::new(at(100.0, 100.0), 1.0);
     assert!(line.push_upright(&look, at(100.0, 100.0), 1.0, Upright { top: Point::new(110.0, 82.0) }, "§"));
     assert!(!line.push(&look, at(130.0, 100.0), 1.0, 10.0, "a"), "a horizontal glyph starts another line");
-    let (t, _) = line.finish().unwrap();
+    let (t, ..) = line.finish().unwrap();
     assert!(t.vertical, "one upright glyph is vertical type");
     assert_eq!(t.plain_text(), "§");
 }
@@ -294,7 +294,7 @@ fn letter_spaced_vertical_type_keeps_its_characters_together() {
         let y = 100.0 + 30.0 * i as f64;
         assert!(line.push_upright(&look, at(y), 1.0, Upright { top: Point::new(110.0, y - 18.0) }, c));
     }
-    let (t, _) = line.finish().unwrap();
+    let (t, ..) = line.finish().unwrap();
     assert!(t.vertical);
     assert_eq!(t.plain_text(), "§§§", "letter spacing isn't a space");
 }

crates/tools/src/draw2/curvature.rs

@@ -3,13 +3,15 @@
 //! Each click adds a point and the path curves smoothly through all points. Alt-click or
 //! double-click a point toggles it between smooth and corner; drag a point to move it; click the
 //! first point to close; Backspace/Delete removes the last touched point; Esc/Enter ends the path.
-//! A rubber band shows the curve to the cursor (Enable Rubber Band for Curvature Tool).
+//! A rubber band shows the curve to the cursor (Enable Rubber Band for Curvature Tool). Each point
+//! placed or dragged snaps to Smart Guides ([`DrawSnap`]), as the Pen's anchors do.
 
 use serde_json::{Value, json};
-use vectorcraft_doc::NodeId;
+use vectorcraft_doc::{NodeId, Selection};
 use vectorcraft_geom::Point;
 
 use super::{FEEDBACK, catmull_rom};
+use crate::guides::{DrawSnap, Leave, Targets};
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 #[derive(Default)]
@@ -22,6 +24,7 @@ pub struct CurvatureTool {
     /// Last touched point (Backspace removes it).
     current: Option<usize>,
     hover: Option<Point>,
+    snap: DrawSnap,
 }
 
 impl CurvatureTool {
@@ -55,6 +58,12 @@ impl CurvatureTool {
         self.id = None;
         self.drag = None;
         self.current = None;
+        self.snap.clear();
+    }
+
+    /// The segment to the next point leaves the last one.
+    fn leave(&self, cx: &ToolContext) -> Option<Leave> {
+        self.pts.last().map(|(p, _)| Leave::segment(cx, *p, false))
     }
 }
 
@@ -73,11 +82,12 @@ impl Tool for CurvatureTool {
         }
         match ev.kind {
             PointerKind::Move => {
-                self.hover = Some(p);
+                let from = active.and_then(|_| self.leave(cx));
+                self.hover = Some(self.snap.hover(cx, p, active.as_slice(), from.as_ref()));
                 vec![]
             }
             PointerKind::Down => {
-                if active.is_some() {
+                if let Some(id) = active {
                     if let Some(i) = self.hit_point(cx, p) {
                         self.current = Some(i);
                         if ev.mods.alt {
@@ -88,10 +98,15 @@ impl Tool for CurvatureTool {
                             self.closed = true;
                             return vec![Action::Exec("path.curvature".into(), self.params())];
                         }
+                        // The point dragged and the curve through it move: the rest pull.
+                        let sel = Selection { objects: vec![id], anchors: [(id, [(0, i)].into())].into(), ..Selection::default() };
+                        self.snap.hold(cx, || Targets::for_anchor_drag(cx.doc, &sel));
                         self.drag = Some((i, p, false));
                         return vec![];
                     }
                     if !self.closed {
+                        let from = self.leave(cx);
+                        let p = self.snap.press(cx, p, &[id], from.as_ref());
                         self.pts.push((p, ev.mods.alt));
                         self.current = Some(self.pts.len() - 1);
                         return vec![Action::Exec("path.curvature".into(), self.params())];
@@ -99,6 +114,7 @@ impl Tool for CurvatureTool {
                 }
                 // Start a new path.
                 self.reset();
+                let p = self.snap.press(cx, p, &[], None);
                 self.pts.push((p, false));
                 self.current = Some(0);
                 vec![Action::Exec("path.curvature".into(), self.params()), Action::Notify("created".into())]
@@ -113,16 +129,20 @@ impl Tool for CurvatureTool {
                     out.push(Action::Begin("Curvature".into()));
                     self.drag = Some((i, start, true));
                 }
+                let p = self.snap.drag(cx, p, None);
                 if let Some(pt) = self.pts.get_mut(i) {
                     pt.0 = p;
                 }
                 out.push(Action::Preview("path.curvature".into(), self.params()));
                 out
             }
-            PointerKind::Up => match self.drag.take() {
-                Some((_, _, true)) => vec![Action::Commit],
-                _ => vec![],
-            },
+            PointerKind::Up => {
+                self.snap.clear();
+                match self.drag.take() {
+                    Some((_, _, true)) => vec![Action::Commit],
+                    _ => vec![],
+                }
+            }
             PointerKind::DoubleClick => {
                 if active.is_none() {
                     return vec![];
@@ -163,10 +183,10 @@ impl Tool for CurvatureTool {
         if dragging { vec![Action::Commit] } else { vec![] }
     }
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
+        let mut o = self.snap.guides().to_vec();
         if self.active(cx).is_none() {
-            return vec![];
+            return o;
         }
-        let mut o = vec![];
         if cx.curvature_rubber_band
             && !self.closed
             && self.drag.is_none()
@@ -217,4 +237,19 @@ mod tests {
         let a = t.pointer(&cx2, &PointerEvent::new(PointerKind::Down, 400.0, 400.0));
         assert!(matches!(&a[0], Action::Exec(_, v) if v["id"] == id.0 && v["points"].as_array().unwrap().len() == 5));
     }
+
+    /// Points snap to Smart Guides (#506): the first lands on another object's anchor and says so.
+    #[test]
+    fn points_snap_to_smart_guides() {
+        let (d, _) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let mut t = CurvatureTool::default();
+        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 202.0, 99.0));
+        assert!(matches!(&a[0], Action::Exec(_, v) if v["points"][0]["x"] == 200.0 && v["points"][0]["y"] == 100.0), "{a:?}");
+        assert!(t.overlays(&cx).iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "anchor")));
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 202.0, 99.0));
+        assert!(t.overlays(&cx).is_empty());
+    }
 }

crates/tools/src/draw2/family.rs

@@ -1,13 +1,16 @@
 //! Line Segment family drag tools: Arc, Spiral, Rectangular Grid and Polar Grid.
 //!
 //! Drag draws (Shift = equal axes / square, Alt = from the centre for arc and grids, Space held
-//! moves the shape being drawn); a click without dragging asks the UI for the options dialog.
+//! moves the shape being drawn); a click without dragging asks the UI for the options dialog. The
+//! start point and the dragged corner snap to Smart Guides ([`DrawSnap`]), hovering too.
 //! While dragging, ↑/↓ change the spiral's segments, the grid rows or the concentric dividers; ←/→
 //! change grid columns / radial dividers.
 
 use serde_json::{Value, json};
-use vectorcraft_geom::{Point, Rect, Vec2};
+use vectorcraft_geom::Point;
 
+use crate::guides::{DrawSnap, Leave, square};
+use crate::shape::drag_rect;
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 pub struct FamilyTool {
@@ -24,6 +27,7 @@ pub struct FamilyTool {
     pub rows: u32,
     /// Columns / radial dividers.
     pub columns: u32,
+    snap: DrawSnap,
 }
 
 impl FamilyTool {
@@ -46,6 +50,7 @@ impl FamilyTool {
             clockwise: true,
             rows: 5,
             columns: 5,
+            snap: DrawSnap::default(),
         }
     }
 
@@ -58,13 +63,10 @@ impl FamilyTool {
         }
     }
 
-    fn rect(start: Point, p: Point, m: Mods) -> Rect {
-        let mut d = p - start;
-        if m.shift {
-            let s = d.x.abs().max(d.y.abs());
-            d = Vec2::new(s * d.x.signum(), s * d.y.signum());
-        }
-        if m.alt { Rect::from_points(start - d, start + d) } else { Rect::from_points(start, start + d) }
+    /// How the dragged point keeps to the start: a spiral's radius goes anywhere, the arc's and
+    /// the grids' corner keeps to a diagonal with Shift.
+    fn leave(&self, start: Point, m: Mods) -> Option<Leave> {
+        (self.id != "spiral").then(|| Leave::diagonal(start, m.shift))
     }
 
     /// The command for a drag from `start` to `p`.
@@ -78,25 +80,21 @@ impl FamilyTool {
                 )
             }
             "rectangularGrid" => {
-                let r = Self::rect(start, p, m);
+                let r = drag_rect(start, p, m);
                 (
                     "shape.rectangularGrid".into(),
                     json!({"x": r.x0, "y": r.y0, "width": r.width(), "height": r.height(), "rows": self.rows, "columns": self.columns}),
                 )
             }
             "polarGrid" => {
-                let r = Self::rect(start, p, m);
+                let r = drag_rect(start, p, m);
                 (
                     "shape.polarGrid".into(),
                     json!({"x": r.x0, "y": r.y0, "width": r.width(), "height": r.height(), "concentric": self.rows, "radial": self.columns}),
                 )
             }
             _ => {
-                let mut d = p - start;
-                if m.shift {
-                    let s = d.x.abs().max(d.y.abs());
-                    d = Vec2::new(s * d.x.signum(), s * d.y.signum());
-                }
+                let d = if m.shift { square(p - start) } else { p - start };
                 let (a, b) = if m.alt { (start - d, start + d) } else { (start, start + d) };
                 ("shape.arc".into(), json!({"x1": a.x, "y1": a.y, "x2": b.x, "y2": b.y, "closed": self.closed}))
             }
@@ -113,8 +111,12 @@ impl Tool for FamilyTool {
     }
     fn pointer(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
         match ev.kind {
+            PointerKind::Move => {
+                self.snap.hover(cx, ev.pos, &[], None);
+                vec![]
+            }
             PointerKind::Down => {
-                let (p, _) = crate::guides::snap_draw(cx, ev.pos, &[]);
+                let p = self.snap.press(cx, ev.pos, &[], None);
                 self.start = Some(p);
                 self.last = p;
                 self.began = false;
@@ -122,6 +124,8 @@ impl Tool for FamilyTool {
             }
             PointerKind::Drag => {
                 let Some(mut s) = self.start else { return vec![] };
+                let pos = self.snap.drag(cx, ev.pos, self.leave(s, ev.mods).as_ref());
+                let ev = &PointerEvent { pos, ..*ev };
                 crate::shape::space_moves(&mut s, &mut self.last, ev, self.began);
                 self.start = Some(s);
                 self.mods = ev.mods;
@@ -139,6 +143,7 @@ impl Tool for FamilyTool {
             }
             PointerKind::Up => {
                 let Some(s) = self.start.take() else { return vec![] };
+                self.snap.clear();
                 if std::mem::take(&mut self.began) { vec![Action::Commit] } else { vec![Action::Dialog(self.id.into(), json!({"x": s.x, "y": s.y}))] }
             }
             _ => vec![],
@@ -179,19 +184,21 @@ impl Tool for FamilyTool {
         } else if key == ToolKey::Escape {
             self.start = None;
             self.began = false;
+            self.snap.clear();
             vec![Action::Cancel]
         } else {
             vec![]
         }
     }
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
-        match self.start {
-            Some(s) if self.began && cx.measurement_labels => {
-                let d = self.last - s;
-                vec![Overlay::Measure { p: self.last, text: cx.size_label(d.x.abs(), d.y.abs()) }]
-            }
-            _ => vec![],
+        let mut o = self.snap.guides().to_vec();
+        if let Some(s) = self.start.filter(|_| self.began && cx.measurement_labels) {
+            // The size as drawn (from the centre with Alt, square with Shift).
+            let r = drag_rect(s, self.last, self.mods);
+            let (w, h) = if self.id == "spiral" { ((self.last - s).x.abs(), (self.last - s).y.abs()) } else { (r.width(), r.height()) };
+            o.push(Overlay::Measure { p: self.last, text: cx.size_label(w, h) });
         }
+        o
     }
     fn cursor(&self, _cx: &ToolContext, _p: Point, _m: Mods) -> Cursor {
         Cursor::Crosshair
@@ -267,4 +274,23 @@ mod tests {
         assert_eq!(c, "shape.arc");
         assert_eq!(v, json!({"x1": 0.0, "y1": 0.0, "x2": 10.0, "y2": 10.0, "closed": false}));
     }
+
+    /// The start and the dragged corner snap to Smart Guides (#506), Shift sliding the corner of
+    /// a square grid along its diagonal into line.
+    #[test]
+    fn corners_snap_to_smart_guides() {
+        let (d, _) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let mut t = FamilyTool::new("rectangularGrid");
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 202.0, 99.0));
+        let shift = Mods { shift: true, ..Mods::default() };
+        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 255.0, 147.0).with_mods(shift));
+        assert!(
+            matches!(&a[..], [Action::Begin(_), Action::Preview(_, v)] if v["x"] == 200.0 && v["y"] == 100.0 && v["width"] == 50.0 && v["height"] == 50.0),
+            "{a:?}"
+        );
+        assert!(t.overlays(&cx).iter().any(|o| matches!(o, Overlay::Label { text, .. } if text == "align")));
+    }
 }

crates/tools/src/draw2/gesture.rs

@@ -3,14 +3,17 @@
 //!
 //! Pencil and Paintbrush preview the fitted path live (`path.freehand` re-applied on the snapshot)
 //! and commit on release; Alt on release (or ending near the start) closes the path, and starting
-//! near an end of a selected open path continues it. The other tools collect the drag polyline
-//! (shown as an overlay) and run one command on release.
+//! near an end of a selected open path continues it. The Pencil's new path starts and ends on
+//! Smart Guides ([`DrawSnap`]: an anchor, a path, in line with the art), hovering too; the points
+//! between follow the hand. The other tools collect the drag polyline (shown as an overlay) and run
+//! one command on release.
 
 use serde_json::{Value, json};
 use vectorcraft_doc::NodeId;
 use vectorcraft_geom::Point;
 
 use super::{FEEDBACK, points_json, polyline};
+use crate::guides::DrawSnap;
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 pub struct GestureTool {
@@ -30,6 +33,8 @@ pub struct GestureTool {
     pub edit_within: f64,
     /// "Close paths when ends are within N pixels".
     pub close_within: f64,
+    /// Smart Guides for the Pencil's ends.
+    snap: DrawSnap,
 }
 
 impl GestureTool {
@@ -56,9 +61,15 @@ impl GestureTool {
             fill: false,
             edit_within: 12.0,
             close_within: 15.0,
+            snap: DrawSnap::default(),
         }
     }
 
+    /// Do the ends of its strokes snap (the Pencil)?
+    fn snaps(&self) -> bool {
+        self.id == "pencil"
+    }
+
     fn draws_path(&self) -> bool {
         matches!(self.id, "pencil" | "paintbrush")
     }
@@ -147,17 +158,27 @@ impl Tool for GestureTool {
     fn pointer(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
         let p = ev.pos;
         match ev.kind {
+            PointerKind::Move if self.snaps() => {
+                self.snap.hover(cx, p, &[], None);
+                vec![]
+            }
             PointerKind::Down => {
-                self.points = vec![p];
                 self.active = true;
                 self.began = false;
                 self.extend = if self.draws_path() { self.find_extend(cx, p) } else { None };
+                // A path continued starts at its end; a new one where it snaps.
+                let start = if self.snaps() && self.extend.is_none() { self.snap.press(cx, p, &[], None) } else { p };
+                self.points = vec![start];
                 vec![]
             }
             PointerKind::Drag => {
                 if !self.active {
                     return vec![];
                 }
+                if self.snaps() {
+                    // Where the stroke would end: shown, taken on release.
+                    self.snap.drag(cx, p, None);
+                }
                 if self.points.last().is_some_and(|l| l.distance(p) < cx.tol(1.0)) {
                     return vec![];
                 }
@@ -177,8 +198,16 @@ impl Tool for GestureTool {
                 if !self.active {
                     return vec![];
                 }
+                let end = if self.snaps() { self.snap.drag(cx, p, None) } else { p };
+                self.snap.clear();
                 if self.points.last().is_some_and(|l| l.distance(p) >= cx.tol(1.0)) {
-                    self.points.push(p);
+                    self.points.push(end);
+                } else if self.snaps()
+                    && self.points.len() > 1
+                    && let Some(last) = self.points.last_mut()
+                {
+                    // The last step was where the button went up: it moves where that snaps.
+                    *last = end;
                 }
                 let out = self.finish(cx, ev.mods);
                 self.active = false;
@@ -194,6 +223,7 @@ impl Tool for GestureTool {
         match key {
             ToolKey::Escape if self.active => {
                 let began = self.began;
+                self.snap.clear();
                 self.active = false;
                 self.began = false;
                 self.points.clear();
@@ -212,21 +242,24 @@ impl Tool for GestureTool {
     }
     fn deactivate(&mut self, _cx: &ToolContext) -> Vec<Action> {
         let began = self.began;
+        self.snap.clear();
         self.active = false;
         self.began = false;
         self.points.clear();
         if began { vec![Action::Commit] } else { vec![] }
     }
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
+        let mut o = self.snap.guides().to_vec();
         if !self.active || self.points.len() < 2 || self.began {
-            return vec![];
+            return o;
         }
         let width = match self.id {
             "blobBrush" | "eraser" => (self.size * cx.zoom) as f32,
             _ => 1.0,
         };
         let color = if self.id == "eraser" { [0x80, 0x80, 0x80] } else { FEEDBACK };
-        vec![Overlay::Path { path: polyline(&self.points), color, width, dashed: self.id == "knife" }]
+        o.push(Overlay::Path { path: polyline(&self.points), color, width, dashed: self.id == "knife" });
+        o
     }
     fn cursor(&self, _cx: &ToolContext, _p: Point, _m: Mods) -> Cursor {
         Cursor::Crosshair
@@ -269,6 +302,25 @@ mod tests {
         v
     }
 
+    /// The Pencil's new path starts and ends on Smart Guides (#506), the points between where
+    /// the hand went.
+    #[test]
+    fn pencil_ends_snap_to_smart_guides() {
+        let (d, _) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let mut t = GestureTool::new("pencil");
+        let acts = drag(&mut t, &cx, &[(102.0, 98.0), (151.0, 300.0), (250.0, 320.0), (198.0, 203.0)], Mods::default());
+        let Some(Action::Preview(_, v)) = acts.last().and_then(|a| a.first()) else { panic!("{acts:?}") };
+        assert_eq!(v["points"], json!([[100.0, 100.0], [151.0, 300.0], [250.0, 320.0], [200.0, 200.0]]));
+        // The Paintbrush follows the hand all the way.
+        let mut t = GestureTool::new("paintbrush");
+        let acts = drag(&mut t, &cx, &[(102.0, 98.0), (151.0, 300.0)], Mods::default());
+        let Some(Action::Preview(_, v)) = acts.last().and_then(|a| a.first()) else { panic!("{acts:?}") };
+        assert_eq!(v["points"][0], json!([102.0, 98.0]));
+    }
+
     #[test]
     fn pencil_previews_and_commits() {
         let (d, _) = doc_with_rect();

crates/tools/src/guides.rs

@@ -1,15 +1,23 @@
-//! Smart Guides: snapping to anchors, path segments (for dragged anchors), object bounds
-//! (edges/centres), artboards, with the magenta construction lines and labels Illustrator users
-//! expect. Preferences › Smart Guides sets their colour, which of them show ([`GuideStyle`]) and
-//! how near a target pulls (`ToolContext::snapping_tolerance`).
+//! Smart Guides: snapping to anchors, path segments (for dragged anchors and drawn points), object
+//! bounds (edges/centres), artboards, with the magenta construction lines and labels Illustrator
+//! users expect. Preferences › Smart Guides sets their colour, which of them show ([`GuideStyle`]),
+//! how near a target pulls (`ToolContext::snapping_tolerance`) and the angles of the construction
+//! guides drawn points land on (`ToolContext::construction_angles`).
+//!
+//! The drawing tools (Pen, Curvature, Pencil, the shape tools, Type, Artboard) all snap the points
+//! they place through one [`DrawSnap`]: their targets are gathered once per document state, sorted,
+//! and each pointer move looks up the few near the pointer by bisection.
+
+use std::collections::HashSet;
+use std::sync::Arc;
 
 use vectorcraft_doc::hit::{HitOptions, hit_test};
-use vectorcraft_doc::{Document, NodeId, NodeKind, OrientedBox, Selection};
+use vectorcraft_doc::{Document, Node, NodeId, NodeKind, OrientedBox, Selection};
 use vectorcraft_geom::kurbo::ParamCurveNearest;
-use vectorcraft_geom::{Affine, Line, ParamCurve, PathSeg, Point, Rect, SubPath, Vec2};
+use vectorcraft_geom::{Affine, Line, ParamCurve, PathSeg, Point, Rect, SubPath, Vec2, constrain_angle_from};
 
 use crate::bbox::Handle;
-use crate::{Overlay, ToolContext};
+use crate::{Overlay, ScreenFrame, ToolContext};
 
 pub const MAGENTA: [u8; 3] = [0xff, 0x3d, 0xfc];
 
@@ -102,9 +110,93 @@ impl Ruler {
 /// How many anchors, and how many segments, the targets gather at most.
 const BUDGET: usize = 20_000;
 
+/// What [`Targets::collect_inner`] gathers from each path besides its anchors and bounds.
+#[derive(Clone, Copy, PartialEq)]
+enum Gather {
+    /// Nothing more: a moved or resized selection lines up with bounds.
+    Bounds,
+    /// Its segments, which a dragged anchor lands on.
+    Segments,
+    /// Its segments, and its anchors as lines too: a drawn point lines up with them.
+    Drawing,
+}
+
+/// The entries of `sorted` (ascending by `key`) whose key is within `tol` of `v`, found by
+/// bisection.
+fn within<T>(sorted: &[T], key: impl Fn(&T) -> f64, v: f64, tol: f64) -> &[T] {
+    let lo = sorted.partition_point(|e| key(e) < v - tol);
+    let hi = sorted.partition_point(|e| key(e) <= v + tol);
+    sorted.get(lo..hi).unwrap_or_default()
+}
+
+/// Visit `nodes` and everything inside them, but the nodes in `skip` and everything inside those:
+/// one pass, however many are skipped.
+fn walk_but<'a>(nodes: &'a [Arc<Node>], skip: &HashSet<NodeId>, f: &mut impl FnMut(&'a Node)) {
+    for n in nodes.iter().filter(|n| !skip.contains(&n.id)) {
+        f(n);
+        if let Some(ch) = n.children() {
+            walk_but(ch, skip, f);
+        }
+    }
+}
+
+/// The lines of `lines` (sorted by where they run) within `tol` of `v`.
+fn lines_near(lines: &[(f64, Point, Kind)], v: f64, tol: f64) -> &[(f64, Point, Kind)] {
+    within(lines, |l| l.0, v, tol)
+}
+
 impl Targets {
     pub fn collect(doc: &Document, exclude: &[NodeId], visible: Option<Rect>) -> Self {
-        Self::collect_inner(doc, exclude, None, visible, false)
+        Self::collect_inner(doc, exclude, None, visible, Gather::Bounds)
+    }
+
+    /// Targets for a drawn point: the art in `visible` (all of it for None) but `exclude`, its
+    /// anchors, centres, edges and path segments, its anchors in line too. The anchors and
+    /// segments of `exclude` (the path being drawn, whose bounds grow with it) stay targets.
+    pub fn for_drawing(doc: &Document, exclude: &[NodeId], visible: Option<Rect>) -> Self {
+        let mut t = Self::collect_inner(doc, exclude, None, visible, Gather::Drawing);
+        t.push_paths(doc, exclude, true);
+        t.index()
+    }
+
+    /// Targets for a dragged direction handle of path `id`: the other art, and the anchors of `id`
+    /// (its bounds and the segments through the handle move with it, so they would chase it).
+    pub fn for_handle(doc: &Document, id: NodeId) -> Self {
+        let mut t = Self::collect_inner(doc, &[id], None, None, Gather::Bounds);
+        t.push_paths(doc, &[id], false);
+        t.index()
+    }
+
+    /// The anchors of the paths `ids` as targets, on them and in line, and their segments too
+    /// when `segments`: at most [`BUDGET`] of each.
+    fn push_paths(&mut self, doc: &Document, ids: &[NodeId], segments: bool) {
+        let (mut anchors, mut segment_budget) = (BUDGET, if segments { BUDGET } else { 0 });
+        for path in ids.iter().filter_map(|id| doc.node(*id)?.path_data()) {
+            for sp in &path.subpaths {
+                for a in sp.anchors.iter().take(anchors) {
+                    self.push_anchor(a.p);
+                    anchors -= 1;
+                }
+                self.push_segments(sp, |_| false, &mut segment_budget);
+            }
+        }
+    }
+
+    /// Sort the targets so that [`within`] finds those near a point by bisection: the anchors
+    /// and centres by x, the lines by where they run. Every constructor ends with it (the sort
+    /// is stable: of targets alike, the first gathered still wins).
+    fn index(mut self) -> Self {
+        self.points.sort_by(|a, b| a.0.x.total_cmp(&b.0.x));
+        self.xs.sort_by(|a, b| a.0.total_cmp(&b.0));
+        self.ys.sort_by(|a, b| a.0.total_cmp(&b.0));
+        self
+    }
+
+    /// Anchor `a` as a target: a point lands on it and lines up with it.
+    fn push_anchor(&mut self, a: Point) {
+        self.points.push((a, Kind::Anchor));
+        self.xs.push((a.x, a, Kind::Anchor));
+        self.ys.push((a.y, a, Kind::Anchor));
     }
 
     /// The same targets drawing their guides as the Smart Guides preferences in `cx` ask
@@ -127,29 +219,27 @@ impl Targets {
     /// Targets for dragging artboard `index`: everything except that artboard and `exclude` (the
     /// art that moves along with it).
     pub fn for_artboard(doc: &Document, index: usize, exclude: &[NodeId]) -> Self {
-        Self::collect_inner(doc, exclude, Some(index), None, false)
+        Self::collect_inner(doc, exclude, Some(index), None, Gather::Bounds)
     }
 
     /// Targets for dragging the direct-selected anchors of `sel` (and its objects selected as a
     /// whole): the other art, its path segments too, and the anchors and segments that stay put on
     /// the paths being reshaped (their bounds move along, so they are no targets).
     pub fn for_anchor_drag(doc: &Document, sel: &Selection) -> Self {
-        let mut t = Self::collect_inner(doc, &sel.objects, None, None, true);
+        let mut t = Self::collect_inner(doc, &sel.objects, None, None, Gather::Segments);
         let (mut anchors, mut segments) = (BUDGET, BUDGET);
         for (id, set) in &sel.anchors {
             let Some(path) = doc.node(*id).and_then(|n| n.path_data()) else { continue };
             for (si, sp) in path.subpaths.iter().enumerate() {
                 let moving = |ai: usize| set.contains(&(si, ai));
                 for a in sp.anchors.iter().enumerate().filter(|(ai, _)| !moving(*ai)).map(|(_, a)| a.p).take(anchors) {
-                    t.points.push((a, Kind::Anchor));
-                    t.xs.push((a.x, a, Kind::Anchor));
-                    t.ys.push((a.y, a, Kind::Anchor));
+                    t.push_anchor(a);
                     anchors -= 1;
                 }
                 t.push_segments(sp, moving, &mut segments);
             }
         }
-        t
+        t.index()
     }
 
     /// The segments of `sp` that stay put while the anchors `moving` accepts move, as targets, at
@@ -171,9 +261,8 @@ impl Targets {
         }
     }
 
-    fn collect_inner(doc: &Document, exclude: &[NodeId], skip_artboard: Option<usize>, visible: Option<Rect>, segments: bool) -> Self {
+    fn collect_inner(doc: &Document, exclude: &[NodeId], skip_artboard: Option<usize>, visible: Option<Rect>, gather: Gather) -> Self {
         let mut t = Targets::default();
-        let excluded = |id: NodeId| exclude.iter().any(|e| doc.ancestry(id).is_some_and(|a| a.contains(e)));
         let add_rect = |t: &mut Targets, r: Rect, kind: Kind| {
             let c = r.center();
             for p in [Point::new(r.x0, r.y0), Point::new(r.x1, r.y0), Point::new(r.x1, r.y1), Point::new(r.x0, r.y1)] {
@@ -194,8 +283,8 @@ impl Targets {
             }
         }
         let (mut budget, mut segment_budget) = (BUDGET, BUDGET);
-        doc.walk(|n| {
-            if budget == 0 || n.is_container() || !n.visible || excluded(n.id) {
+        walk_but(&doc.layers, &exclude.iter().copied().collect(), &mut |n| {
+            if budget == 0 || n.is_container() || !n.visible {
                 return;
             }
             let Some(b) = n.geometric_bounds() else { return };
@@ -207,10 +296,14 @@ impl Targets {
             }
             if let NodeKind::Path { path, .. } = &n.kind {
                 for (_, _, a) in path.anchors() {
-                    t.points.push((a.p, Kind::Anchor));
+                    if gather == Gather::Drawing {
+                        t.push_anchor(a.p);
+                    } else {
+                        t.points.push((a.p, Kind::Anchor));
+                    }
                     budget = budget.saturating_sub(1);
                 }
-                if segments {
+                if gather != Gather::Bounds {
                     for sp in &path.subpaths {
                         t.push_segments(sp, |_| false, &mut segment_budget);
                     }
@@ -218,7 +311,7 @@ impl Targets {
             }
             add_rect(&mut t, b, Kind::Edge);
         });
-        t
+        t.index()
     }
 
     /// Only these targets' anchors pull (View → Snap to Point).
@@ -265,25 +358,55 @@ impl Targets {
                 t.points.push((b.center(), Kind::Center));
             });
         }
-        t
+        t.index()
     }
 
     /// Snap a single point: onto the nearest anchor or centre, else onto the nearest segment, else
     /// into line with targets. Returns the snapped point and guide overlays.
     pub fn snap_point(&self, p: Point, tol: f64) -> (Point, Vec<Overlay>) {
+        self.snap_from(p, None, tol)
+    }
+
+    /// Snap a drawn point `p` as [`Self::snap_point`] does, and when it leaves `from` (the anchor
+    /// before it, a shape's start): with Shift held it keeps to its angles round it, sliding along
+    /// that way into line with the nearest target; else, before lining up, it lands on a
+    /// construction guide through it, where a target's line crosses the guide if one does nearby.
+    pub fn snap_from(&self, p: Point, from: Option<&Leave>, tol: f64) -> (Point, Vec<Overlay>) {
+        if let Some(f) = from
+            && let Some(q) = f.constrained(p)
+        {
+            return match self.slide(f.at, q - f.at, q, tol, true) {
+                Some((q, target)) => (q, self.lined_up(q, target)),
+                None => (q, vec![]),
+            };
+        }
         if let Some((q, k)) = self.nearest_point(p, tol) {
             return (q, self.label(q, k.label()).into_iter().collect());
         }
         if let Some(q) = self.on_segment(p, tol) {
             return (q, self.label(q, Kind::Edge.label()).into_iter().collect());
         }
+        if let Some(f) = from
+            && let Some((dir, q)) = f.construction(p, tol)
+        {
+            let construction = |q: Point| Overlay::Line { a: f.at, b: q, color: self.style.color, dashed: false };
+            return match self.slide(f.at, dir, q, tol, false) {
+                Some((q, target)) => (q, std::iter::once(construction(q)).chain(self.lined_up(q, target)).collect()),
+                None => (q, vec![construction(q)]),
+            };
+        }
         let mut out = p;
         let mut ov = vec![];
         // The targets' lines along one axis and the ruler guides running past `p`, the nearest
         // within reach of `v`.
         let nearest = |lines: &[(f64, Point, Kind)], vertical: bool, v: f64| {
             let rulers = self.rulers.iter().filter(|r| r.vertical == vertical).filter_map(|r| r.line_at(p, tol));
-            lines.iter().copied().chain(rulers).filter(|(t, ..)| (t - v).abs() <= tol).min_by(|a, b| (a.0 - v).abs().total_cmp(&(b.0 - v).abs()))
+            lines_near(lines, v, tol)
+                .iter()
+                .copied()
+                .chain(rulers)
+                .filter(|(t, ..)| (t - v).abs() <= tol)
+                .min_by(|a, b| (a.0 - v).abs().total_cmp(&(b.0 - v).abs()))
         };
         let mut aligned = false;
         if let Some((x, from, _)) = nearest(&self.xs, true, p.x) {
@@ -304,7 +427,47 @@ impl Targets {
 
     /// The anchor or centre nearest `p`, within `tol`.
     fn nearest_point(&self, p: Point, tol: f64) -> Option<(Point, Kind)> {
-        self.points.iter().copied().filter(|(q, _)| q.distance(p) <= tol).min_by(|a, b| a.0.distance(p).total_cmp(&b.0.distance(p)))
+        within(&self.points, |q| q.0.x, p.x, tol)
+            .iter()
+            .copied()
+            .filter(|(q, _)| q.distance(p) <= tol)
+            .min_by(|a, b| a.0.distance(p).total_cmp(&b.0.distance(p)))
+    }
+
+    /// Slide `q`, on the line through `at` along `dir` (beyond `at` only, for a `ray`), to where
+    /// the nearest target line crosses it, at most twice `tol` away: where it lands and the
+    /// target's own point (where its line starts).
+    fn slide(&self, at: Point, dir: Vec2, q: Point, tol: f64, ray: bool) -> Option<(Point, Point)> {
+        if !dir.hypot2().is_finite() || dir.hypot2() <= 1e-18 {
+            return None;
+        }
+        let reach = 2.0 * tol;
+        let mut best: Option<(f64, Point, Point)> = None;
+        for (vertical, lines, d, a, v) in [(true, &self.xs, dir.x, at.x, q.x), (false, &self.ys, dir.y, at.y, q.y)] {
+            if d.abs() <= 1e-9 {
+                continue;
+            }
+            // A line that far across the way crosses it at least that far along.
+            for (t, from, _) in lines_near(lines, v, reach) {
+                let s = (t - a) / d;
+                // Exactly on the line, whatever the rounding along the way.
+                let hit = if vertical { Point::new(*t, at.y + dir.y * s) } else { Point::new(at.x + dir.x * s, *t) };
+                let moved = hit.distance(q);
+                if moved <= reach && (!ray || s > 0.0) && best.is_none_or(|b| moved < b.0) {
+                    best = Some((moved, hit, *from));
+                }
+            }
+        }
+        best.map(|(_, hit, from)| (hit, from))
+    }
+
+    /// The guides of a point `q` slid into line with the target at `from`: the line from it and
+    /// "align", or the target's own label when `q` sits right on it.
+    fn lined_up(&self, q: Point, from: Point) -> Vec<Overlay> {
+        if let Some((on, k)) = self.nearest_point(q, 1e-9) {
+            return self.label(on, k.label()).into_iter().collect();
+        }
+        self.line(from, q).into_iter().chain(self.label(q, "align")).collect()
     }
 
     /// The nearest point within `tol` of `p` on a target segment.
@@ -323,7 +486,7 @@ impl Targets {
     pub fn snap_guide(&self, vertical: bool, v: f64, tol: f64) -> (f64, Vec<Overlay>) {
         let along = |q: &Point| if vertical { q.x } else { q.y };
         let lines = if vertical { &self.xs } else { &self.ys };
-        let best = lines
+        let best = lines_near(lines, v, tol)
             .iter()
             .map(|(t, from, k)| (*t, *from, *k))
             .chain(self.points.iter().map(|(q, k)| (along(q), *q, *k)))
@@ -370,7 +533,7 @@ impl Targets {
             rects
                 .iter()
                 .flat_map(|r| along(r).into_iter().map(move |v| (v, *r)))
-                .flat_map(|(v, r)| targets.iter().map(move |(t, from, _)| (t - v, *from, v, r)))
+                .flat_map(|(v, r)| lines_near(targets, v, tol).iter().map(move |(t, from, _)| (t - v, *from, v, r)))
                 .filter(|(d, ..)| d.abs() <= tol)
                 .min_by(|a, b| a.0.abs().total_cmp(&b.0.abs()))
         };
@@ -410,7 +573,11 @@ impl Targets {
         // A scale that collapses or flips the box is no snap.
         let valid = |n: f64, s: f64| n.is_finite() && n * s > 0.0;
         let nearest = |v: f64, ts: &[(f64, Point, Kind)]| -> Hit {
-            ts.iter().map(|(t, from, _)| (*t, *from)).filter(|(t, _)| (t - v).abs() <= tol).min_by(|p, q| (p.0 - v).abs().total_cmp(&(q.0 - v).abs()))
+            lines_near(ts, v, tol)
+                .iter()
+                .map(|(t, from, _)| (*t, *from))
+                .filter(|(t, _)| (t - v).abs() <= tol)
+                .min_by(|p, q| (p.0 - v).abs().total_cmp(&(q.0 - v).abs()))
         };
         let (mut nx, mut ny) = (sx, sy);
         let mut snap: Snap = (None, None, None);
@@ -540,24 +707,225 @@ impl PointSnap {
 
     /// Where `p` goes, and the guides showing why.
     pub fn snap(&self, cx: &ToolContext, p: Point) -> (Point, Vec<Overlay>) {
+        self.snap_from(cx, p, None)
+    }
+
+    /// Where a drawn point `p` leaving `from` goes ([`Targets::snap_from`]), and the guides
+    /// showing why. Pixels and the grid round it before Shift turns it onto its angle.
+    pub fn snap_from(&self, cx: &ToolContext, p: Point, from: Option<&Leave>) -> (Point, Vec<Overlay>) {
+        let keep = |q: Point| from.and_then(|f| f.constrained(q)).unwrap_or(q);
         if cx.snap_to_pixel {
-            return (Point::new(p.x.round(), p.y.round()), vec![]);
+            return (keep(Point::new(p.x.round(), p.y.round())), vec![]);
         }
         if cx.snap_to_grid {
-            return (vectorcraft_geom::snap::snap_point_to_grid(p, cx.grid_step()), vec![]);
+            return (keep(vectorcraft_geom::snap::snap_point_to_grid(p, cx.grid_step())), vec![]);
         }
         match &self.targets {
-            Some((t, tol)) => t.snap_point(p, cx.tol(*tol)),
-            None => (p, vec![]),
+            Some((t, tol)) => t.snap_from(p, from, cx.tol(*tol)),
+            None => (keep(p), vec![]),
         }
     }
 }
 
-/// Snapping for a dragged direction handle: Shift keeps it at 45° steps round its anchor, else it
-/// snaps as a drawn point does. The targets are gathered on the first move that needs them and
-/// kept for the rest of the drag (gathering them takes as long as the document is big).
+/// The Construction Guides angle set new preferences start with.
+pub const DEFAULT_CONSTRUCTION_ANGLES: &str = "90° & 45° Angles";
+
+/// The angles (degrees) of the construction guides of a Smart Guides › Angles set: "90°" gives the
+/// horizontal and the vertical, "45°" the diagonals, "60°" and "30°" their multiples between those.
+pub fn construction_angles(set: &str) -> &'static [f64] {
+    match set {
+        "30° Angles" => &[30.0, 60.0, 120.0, 150.0],
+        "45° Angles" => &[45.0, 135.0],
+        "60° Angles" => &[60.0, 120.0],
+        "90° Angles" => &[0.0, 90.0],
+        "90° & 45° & 30° Angles" => &[0.0, 30.0, 45.0, 60.0, 90.0, 120.0, 135.0, 150.0],
+        _ => &[0.0, 45.0, 90.0, 135.0],
+    }
+}
+
+/// How Shift keeps a drawn point to the point it leaves from.
+#[derive(Clone, Copy, Debug, PartialEq)]
+enum Keep {
+    /// At steps of `step` degrees counted from `base` (a segment).
+    Angle { step: f64, base: f64 },
+    /// On a diagonal, as far along as the pointer's farther axis (a square's corner).
+    Square,
+}
+
+/// The point a drawn point leaves from (the anchor before it, a shape's start) and how it keeps
+/// to it: with Shift held at fixed angles round it, and onto the construction guides through it
+/// (Smart Guides › Construction Guides).
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct Leave {
+    pub at: Point,
+    /// Shift held: how the point keeps to `at`.
+    shift: Option<Keep>,
+    /// The angles of the construction guides through `at` (none with them off).
+    angles: &'static [f64],
+}
+
+impl Leave {
+    /// A segment from `at` (Pen, Curvature, Line Segment): Shift keeps it at 45° steps from
+    /// General › Constrain Angle; with Smart Guides on it lands on the construction guides.
+    pub fn segment(cx: &ToolContext, at: Point, shift: bool) -> Self {
+        Self {
+            at,
+            shift: shift.then_some(Keep::Angle { step: 45.0, base: cx.constrain_angle }),
+            angles: if cx.smart_guides { cx.construction_angles } else { &[] },
+        }
+    }
+
+    /// A box dragged from its corner or centre `at` (Rectangle, Ellipse, Arc, the grids,
+    /// Artboard): Shift keeps the dragged corner on a diagonal, the box a square.
+    pub fn diagonal(at: Point, shift: bool) -> Self {
+        Self { at, shift: shift.then_some(Keep::Square), angles: &[] }
+    }
+
+    /// Where Shift puts `p`: none without it.
+    fn constrained(&self, p: Point) -> Option<Point> {
+        let v = p - self.at;
+        Some(match self.shift? {
+            Keep::Angle { step, base } => self.at + constrain_angle_from(v, step, base),
+            Keep::Square => self.at + square(v),
+        })
+    }
+
+    /// The construction guide through `at` nearest `p`, within `tol` of it (and `p` farther than
+    /// that from `at`, where every guide meets): its direction and where `p` lands on it.
+    fn construction(&self, p: Point, tol: f64) -> Option<(Vec2, Point)> {
+        let v = p - self.at;
+        if v.hypot() <= tol {
+            return None;
+        }
+        self.angles
+            .iter()
+            // Counter-clockwise as seen on the y-down page.
+            .map(|a| Vec2::new(a.to_radians().cos(), -a.to_radians().sin()))
+            .map(|d| (d, self.at + d * v.dot(d)))
+            .map(|(d, q)| (d, q, q.distance(p)))
+            .filter(|(.., dist)| *dist <= tol)
+            .min_by(|a, b| a.2.total_cmp(&b.2))
+            .map(|(d, q, _)| (d, q))
+    }
+}
+
+/// `d` made square: as long on both axes as on its longer one, each keeping its sign.
+pub fn square(d: Vec2) -> Vec2 {
+    let s = d.x.abs().max(d.y.abs());
+    Vec2::new(s * d.x.signum(), s * d.y.signum())
+}
+
+/// Smart Guides for the points a drawing tool places: the Pen's and Curvature tool's anchors,
+/// the Pencil's ends, the shape tools' start and dragged corner, the Type tool's click and the
+/// Artboard tool's new artboard. Each such tool keeps one and asks it for every point, hovering
+/// too, so they all snap alike, and shows its [`Self::guides`].
+///
+/// The targets ([`Targets::for_drawing`], the art in the window) are gathered once per document
+/// state: hovering gathers them again only after the document, the selection, what is left out,
+/// the window or the snapping options changed; a press always gathers them afresh, and the drag
+/// it starts keeps them, the document then showing the drag's own previews.
 #[derive(Default)]
-pub struct HandleSnap(Option<PointSnap>);
+pub struct DrawSnap {
+    /// The targets, and what they were gathered for (none: for one drag only).
+    targets: Option<(Option<SnapKey>, PointSnap)>,
+    guides: Vec<Overlay>,
+}
+
+/// What a [`DrawSnap`]'s targets were gathered for: the document state, the art left out, the
+/// window and every option [`PointSnap::new`] reads.
+#[derive(PartialEq)]
+struct SnapKey {
+    revision: (u64, u64),
+    exclude: Vec<NodeId>,
+    screen: Option<ScreenFrame>,
+    view: [bool; 5],
+    style: GuideStyle,
+    tolerances: [f64; 2],
+}
+
+impl SnapKey {
+    fn of(cx: &ToolContext, exclude: &[NodeId]) -> Self {
+        Self {
+            revision: cx.revision,
+            exclude: exclude.to_vec(),
+            screen: cx.screen,
+            view: [cx.smart_guides, cx.snap_to_point, cx.snap_to_pixel, cx.snap_to_grid, cx.guides],
+            style: GuideStyle::of(cx),
+            tolerances: [cx.snapping_tolerance, cx.snap_tolerance],
+        }
+    }
+}
+
+/// The part of the document the window shows (none headless: all of it).
+fn visible(cx: &ToolContext) -> Option<Rect> {
+    let s = cx.screen?;
+    let (w, h) = s.size;
+    Some(Rect::from_points(s.at(0.0, 0.0), s.at(w, h)).union_pt(s.at(w, 0.0)).union_pt(s.at(0.0, h)))
+}
+
+impl DrawSnap {
+    /// Snap the pointer hovering at `p` (the art but `exclude` as targets, the anchors of
+    /// `exclude` still pulling), reusing the targets while nothing they depend on changed.
+    pub fn hover(&mut self, cx: &ToolContext, p: Point, exclude: &[NodeId], from: Option<&Leave>) -> Point {
+        let key = SnapKey::of(cx, exclude);
+        if self.targets.as_ref().is_none_or(|(k, _)| k.as_ref() != Some(&key)) {
+            self.gather(cx, key);
+        }
+        self.snap(cx, p, from)
+    }
+
+    /// Snap the point pressed at `p`, the targets gathered afresh: the drag that follows keeps
+    /// them ([`Self::drag`]).
+    pub fn press(&mut self, cx: &ToolContext, p: Point, exclude: &[NodeId], from: Option<&Leave>) -> Point {
+        self.gather(cx, SnapKey::of(cx, exclude));
+        self.snap(cx, p, from)
+    }
+
+    /// Gather `targets` other than the art for the drag a press starts (a point being dragged
+    /// leaves itself out); the next hover gathers its own again.
+    pub fn hold(&mut self, cx: &ToolContext, targets: impl FnOnce() -> Targets) {
+        self.targets = Some((None, PointSnap::new(cx, targets)));
+        self.guides.clear();
+    }
+
+    /// Snap `p`, dragged since the press, with the targets the press gathered.
+    pub fn drag(&mut self, cx: &ToolContext, p: Point, from: Option<&Leave>) -> Point {
+        if self.targets.is_none() {
+            self.gather(cx, SnapKey::of(cx, &[]));
+        }
+        self.snap(cx, p, from)
+    }
+
+    /// The guides of the last snap.
+    pub fn guides(&self) -> &[Overlay] {
+        &self.guides
+    }
+
+    /// Hide the guides (the gesture ended).
+    pub fn clear(&mut self) {
+        self.guides.clear();
+    }
+
+    fn gather(&mut self, cx: &ToolContext, key: SnapKey) {
+        let snap = PointSnap::new(cx, || Targets::for_drawing(cx.doc, &key.exclude, visible(cx)));
+        self.targets = Some((Some(key), snap));
+    }
+
+    fn snap(&mut self, cx: &ToolContext, p: Point, from: Option<&Leave>) -> Point {
+        let (q, guides) = match &self.targets {
+            Some((_, t)) => t.snap_from(cx, p, from),
+            None => (p, vec![]),
+        };
+        self.guides = guides;
+        q
+    }
+}
+
+/// Snapping for a dragged direction handle: Shift keeps it at 45° steps round its anchor, else it
+/// snaps as a drawn point does ([`DrawSnap`]). The targets ([`Targets::for_handle`]) are gathered
+/// on the first move that needs them and kept for the rest of the drag.
+#[derive(Default)]
+pub struct HandleSnap(DrawSnap);
 
 impl HandleSnap {
     /// Where the handle of anchor `ai` of subpath `si` of path `id` goes with the pointer at `p`,
@@ -565,22 +933,13 @@ impl HandleSnap {
     pub fn snap(&mut self, cx: &ToolContext, (id, si, ai): (NodeId, usize, usize), p: Point, shift: bool) -> (Point, Vec<Overlay>) {
         let path = cx.doc.node(id).and_then(|n| n.path_data());
         if shift && let Some(a) = path.and_then(|pd| pd.subpaths.get(si)?.anchors.get(ai)) {
-            return (a.p + vectorcraft_geom::constrain_angle_from(p - a.p, 45.0, cx.constrain_angle), vec![]);
+            return (a.p + constrain_angle_from(p - a.p, 45.0, cx.constrain_angle), vec![]);
         }
-        let snap = self.0.get_or_insert_with(|| {
-            PointSnap::new(cx, || {
-                // The path's bounds move with the handle, so they would chase it: its anchors
-                // (which stay put) are the targets instead, the handle lining up with them too.
-                let mut t = Targets::collect(cx.doc, &[id], None);
-                for (_, _, a) in path.into_iter().flat_map(|pd| pd.anchors()).take(20_000) {
-                    t.points.push((a.p, Kind::Anchor));
-                    t.xs.push((a.p.x, a.p, Kind::Anchor));
-                    t.ys.push((a.p.y, a.p, Kind::Anchor));
-                }
-                t
-            })
-        });
-        snap.snap(cx, p)
+        if self.0.targets.is_none() {
+            self.0.hold(cx, || Targets::for_handle(cx.doc, id));
+        }
+        let q = self.0.drag(cx, p, None);
+        (q, self.0.guides().to_vec())
     }
 }
 
@@ -758,9 +1117,138 @@ mod tests {
         s.anchors.insert(id, [(0, 0)].into_iter().collect());
         let t = Targets::for_anchor_drag(&d, &s);
         let anchors: Vec<Point> = t.points.iter().filter(|(_, k)| *k == Kind::Anchor).map(|(p, _)| *p).collect();
-        assert_eq!(anchors, [Point::new(200.0, 100.0), Point::new(200.0, 200.0), Point::new(100.0, 200.0)]);
+        assert_eq!(anchors, [Point::new(100.0, 200.0), Point::new(200.0, 100.0), Point::new(200.0, 200.0)], "by x");
         assert_eq!(t.segments.len(), 2);
         assert!(!t.points.iter().any(|(p, k)| *k == Kind::Center && *p == Point::new(150.0, 150.0)), "the rect's centre moves");
         assert_eq!(t.snap_point(Point::new(101.0, 99.0), 4.0).0, Point::new(100.0, 100.0), "in line with its neighbours, not on itself");
     }
+
+    fn labels(ov: &[Overlay]) -> Vec<&str> {
+        ov.iter().filter_map(|o| if let Overlay::Label { text, .. } = o { Some(text.as_str()) } else { None }).collect()
+    }
+
+    fn lines(ov: &[Overlay]) -> Vec<(Point, Point)> {
+        ov.iter().filter_map(|o| if let Overlay::Line { a, b, .. } = o { Some((*a, *b)) } else { None }).collect()
+    }
+
+    /// A drawn point (#506): on another object's anchors, in line with them too (not only with its
+    /// bounds), onto its paths; Shift slides it along its 45° step into line; near a construction
+    /// guide through the point it leaves from it lands on the guide, where a target's line crosses
+    /// it if one does nearby.
+    #[test]
+    fn drawn_points_land_on_anchors_paths_alignments_and_construction_guides() {
+        let (d, _) = doc_with_rect();
+        let (s, p) = (Selection::default(), paint());
+        let c = cx(&d, &s, &p);
+        let t = Targets::for_drawing(&d, &[], None).styled(&c);
+        // The rect is 100..200: its corner, a point on its side, and in line with an anchor.
+        let (q, ov) = t.snap_from(Point::new(202.0, 198.0), None, 4.0);
+        assert_eq!((q, labels(&ov)), (Point::new(200.0, 200.0), vec!["anchor"]));
+        let (q, ov) = t.snap_from(Point::new(202.0, 160.0), None, 4.0);
+        assert_eq!((q, labels(&ov)), (Point::new(200.0, 160.0), vec!["path"]));
+        let (q, ov) = t.snap_from(Point::new(330.0, 102.0), None, 4.0);
+        assert_eq!((q, labels(&ov)), (Point::new(330.0, 100.0), vec!["align"]));
+        // Shift from (300, 300): the pointer at 2° keeps to 0°, then slides onto x = 200.
+        let shift = Leave::segment(&c, Point::new(300.0, 300.0), true);
+        let (q, ov) = t.snap_from(Point::new(203.0, 303.0), Some(&shift), 4.0);
+        assert!((q - Point::new(200.0, 300.0)).hypot() < 1e-9, "{q:?}");
+        assert_eq!(labels(&ov), ["align"]);
+        assert_eq!(lines(&ov).len(), 1, "{ov:?}");
+        // Nothing in reach: on its angle, as far as the pointer.
+        let (q, ov) = t.snap_from(Point::new(300.0, 380.0), Some(&shift), 4.0);
+        assert_eq!((q, ov.len()), (Point::new(300.0, 380.0), 0));
+        // Construction guides through (300, 320): onto the 135° one…
+        let from = Leave::segment(&c, Point::new(300.0, 320.0), false);
+        let (q, ov) = t.snap_from(Point::new(352.0, 373.0), Some(&from), 4.0);
+        assert!((q - Point::new(352.5, 372.5)).hypot() < 1e-9, "{q:?}");
+        assert_eq!(lines(&ov), vec![(Point::new(300.0, 320.0), q)]);
+        // …where x = 200 crosses it.
+        let (q, ov) = t.snap_from(Point::new(203.0, 222.5), Some(&from), 4.0);
+        assert!((q - Point::new(200.0, 220.0)).hypot() < 1e-9, "{q:?}");
+        assert_eq!((lines(&ov).len(), labels(&ov)), (2, vec!["align"]));
+        // Construction Guides off (or Smart Guides off): in line, not on a guide.
+        let off = ToolContext { construction_angles: &[], ..cx(&d, &s, &p) };
+        let (q, _) = t.snap_from(Point::new(352.0, 373.0), Some(&Leave::segment(&off, Point::new(300.0, 320.0), false)), 4.0);
+        assert_eq!(q, Point::new(352.0, 373.0));
+        // A box's corner keeps to a diagonal with Shift, the farther axis giving its size.
+        let (q, _) = t.snap_from(Point::new(340.0, 310.0), Some(&Leave::diagonal(Point::new(300.0, 300.0), true)), 4.0);
+        assert_eq!(q, Point::new(340.0, 340.0));
+    }
+
+    /// The angle sets of Preferences › Smart Guides › Construction Guides.
+    #[test]
+    fn construction_angle_sets() {
+        assert_eq!(construction_angles(DEFAULT_CONSTRUCTION_ANGLES), [0.0, 45.0, 90.0, 135.0]);
+        assert_eq!(construction_angles("90° Angles"), [0.0, 90.0]);
+        assert_eq!(construction_angles("30° Angles"), [30.0, 60.0, 120.0, 150.0]);
+        assert_eq!(construction_angles("90° & 45° & 30° Angles").len(), 8);
+        assert_eq!(construction_angles("nonsense"), construction_angles(DEFAULT_CONSTRUCTION_ANGLES));
+    }
+
+    /// The sorted targets find by bisection just what a scan of all of them finds, whatever
+    /// gathered them.
+    #[test]
+    fn bisection_finds_what_a_scan_finds() {
+        use vectorcraft_doc::{Appearance, Node};
+        let (mut d, id) = doc_with_rect();
+        let l = d.layers[0].id;
+        for i in 0..60 {
+            let (x, y) = ((i * 37 % 450) as f64, (i * 53 % 430) as f64);
+            let tri = vectorcraft_geom::PathData::single(SubPath::polyline(
+                &[Point::new(x, y), Point::new(x + 13.0, y + 3.0), Point::new(x + 5.0, y + 17.0)],
+                true,
+            ));
+            let n = d.alloc_id();
+            d.insert(Some(l), 1, Node::path(n, tri, Appearance::default_art())).unwrap();
+        }
+        let mut s = Selection::default();
+        s.set([id]);
+        s.anchors.insert(id, [(0, 1)].into_iter().collect());
+        for t in [Targets::collect(&d, &[], None), Targets::for_drawing(&d, &[id], None), Targets::for_anchor_drag(&d, &s)] {
+            for q in (0..40).flat_map(|i| (0..40).map(move |j| Point::new(i as f64 * 12.7, j as f64 * 11.3))) {
+                let scan = t.points.iter().copied().filter(|(a, _)| a.distance(q) <= 6.0).min_by(|a, b| a.0.distance(q).total_cmp(&b.0.distance(q)));
+                assert_eq!(t.nearest_point(q, 6.0).map(|h| h.0.distance(q)), scan.map(|h| h.0.distance(q)), "{q:?}");
+                for (lines, v) in [(&t.xs, q.x), (&t.ys, q.y)] {
+                    let mut near: Vec<f64> = lines_near(lines, v, 6.0).iter().map(|l| l.0).collect();
+                    let mut all: Vec<f64> = lines.iter().map(|l| l.0).filter(|w| (w - v).abs() <= 6.0).collect();
+                    near.sort_by(f64::total_cmp);
+                    all.sort_by(f64::total_cmp);
+                    assert_eq!(near, all);
+                }
+            }
+        }
+    }
+
+    /// A drawing tool's snapper reuses its targets while hovering over the same document state, and
+    /// gathers them again when it changes, and on every press.
+    #[test]
+    fn draw_snap_gathers_once_per_document_state() {
+        let (d, _) = doc_with_rect();
+        let empty = vectorcraft_doc::Document::new(500.0, 500.0);
+        let (s, p) = (Selection::default(), paint());
+        let at = Point::new(202.0, 198.0);
+        let mut snap = DrawSnap::default();
+        let c = ToolContext { revision: (1, 1), ..cx(&d, &s, &p) };
+        assert_eq!(snap.hover(&c, at, &[], None), Point::new(200.0, 200.0));
+        assert_eq!(labels(snap.guides()), ["anchor"]);
+        // The same revision: the targets are the ones gathered (the document isn't read again).
+        let c = ToolContext { revision: (1, 1), ..cx(&empty, &s, &p) };
+        assert_eq!(snap.hover(&c, at, &[], None), Point::new(200.0, 200.0));
+        // A new revision, or a press, reads it.
+        let c = ToolContext { revision: (1, 2), ..cx(&empty, &s, &p) };
+        assert_eq!(snap.hover(&c, at, &[], None), at);
+        assert!(snap.guides().is_empty());
+        let c = ToolContext { revision: (1, 2), ..cx(&d, &s, &p) };
+        assert_eq!(snap.press(&c, at, &[], None), Point::new(200.0, 200.0));
+        // The drag keeps what the press gathered, though the document now shows its preview.
+        let c = ToolContext { revision: (1, 3), ..cx(&empty, &s, &p) };
+        assert_eq!(snap.drag(&c, at, None), Point::new(200.0, 200.0));
+        snap.clear();
+        assert!(snap.guides().is_empty());
+        // Snap to Grid wins over Smart Guides, Shift still keeping the angle.
+        let c = ToolContext { snap_to_grid: true, ..cx(&d, &s, &p) };
+        let from = Leave::segment(&c, Point::ZERO, true);
+        let q = snap.press(&c, Point::new(31.0, 2.0), &[], Some(&from));
+        assert!((q.y - 0.0).abs() < 1e-9, "{q:?}");
+    }
 }

crates/tools/src/lib.rs

@@ -216,6 +216,10 @@ impl ScreenFrame {
 /// Read-only context a tool sees.
 pub struct ToolContext<'a> {
     pub doc: &'a Document,
+    /// Which open document `doc` is (its process-unique id) and its revision, which moves with
+    /// every change of the document or the selection: what a tool keeps between pointer events
+    /// for the document as it is (the snap targets of hovering) is keyed on it.
+    pub revision: (u64, u64),
     pub selection: &'a Selection,
     /// Screen pixels per document point.
     pub zoom: f64,
@@ -319,6 +323,10 @@ pub struct ToolContext<'a> {
     /// Smart Guides → Snapping Tolerance (screen pixels): how near a smart guide target pulls the
     /// pointer, a dragged edge or a drawn point.
     pub snapping_tolerance: f64,
+    /// Smart Guides → Construction Guides: the angles (degrees, counter-clockwise from the x axis
+    /// as seen on the page) of the lines through the point a drawn point leaves from, onto which a
+    /// point near one lands ([`guides::construction_angles`]); none with the option off.
+    pub construction_angles: &'static [f64],
     /// The document window (none headless): screen-fixed widgets sit in it.
     pub screen: Option<ScreenFrame>,
     /// Where the Plane Switching Widget sits (Perspective Grid Options); None while it's hidden.
@@ -631,6 +639,7 @@ pub(crate) mod testutil {
     pub fn cx<'a>(d: &'a Document, s: &'a Selection, p: &'a PaintDefaults) -> ToolContext<'a> {
         ToolContext {
             doc: d,
+            revision: (0, 0),
             selection: s,
             zoom: 1.0,
             isolation: None,
@@ -675,6 +684,7 @@ pub(crate) mod testutil {
             measurement_labels: true,
             transform_tools_guides: true,
             snapping_tolerance: 4.0,
+            construction_angles: guides::construction_angles(guides::DEFAULT_CONSTRUCTION_ANGLES),
             screen: None,
             plane_widget: Some(Default::default()),
         }

crates/tools/src/pen.rs

@@ -16,6 +16,10 @@
 //! segment of a selected path adds an anchor there and a click on one of its anchors deletes it
 //! (Shift held or General → Disable Auto Add/Delete starts a new path instead). On a selected
 //! blend's spine a click adds a point (on a point no key object sits on: deletes it).
+//! Each anchor placed snaps to Smart Guides ([`DrawSnap`]): onto the anchors, centres and paths of
+//! the other art and of the path being drawn, into line with them, onto the construction guides
+//! through the last anchor; with Shift held it slides along its 45° step into line. Hovering shows
+//! where the next one would go.
 
 use serde_json::json;
 use vectorcraft_doc::{NodeId, NodeKind};
@@ -23,6 +27,7 @@ use vectorcraft_geom::{BezPath, Point};
 
 use crate::direct::hit_handle;
 use crate::draw2::AnchorTool;
+use crate::guides::{DrawSnap, Leave};
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 #[derive(Default)]
@@ -43,6 +48,8 @@ pub struct PenTool {
     handle: Option<(NodeId, usize, usize, Point)>,
     /// The Anchor Point tool, while an Alt gesture on a selected path's handle or anchor lasts.
     convert: Option<AnchorTool>,
+    /// Smart Guides for the anchors placed (and the pointer hovering).
+    snap: DrawSnap,
 }
 
 /// An anchor being placed, as the press decided: where it is, the path it goes on (none: the
@@ -116,8 +123,6 @@ impl Tool for PenTool {
         self.drag.is_some() || self.handle.is_some() || self.convert.is_some()
     }
     fn pointer(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
-        let exclude: Vec<vectorcraft_doc::NodeId> = if self.drawing { cx.selection.objects.clone() } else { vec![] };
-        let (mut p, _) = if matches!(ev.kind, PointerKind::Down) { crate::guides::snap_draw(cx, ev.pos, &exclude) } else { (ev.pos, vec![]) };
         let tol = cx.tol(5.0);
         // The path a press began is the selected one by the next event.
         if self.drawing && self.path.is_none() {
@@ -127,6 +132,14 @@ impl Tool for PenTool {
         if self.drawing && active.is_none() && ev.kind == PointerKind::Down {
             self.stop();
         }
+        // The path being drawn moves its bounds as it grows: only its anchors and segments pull.
+        let drawn = active.map(|a| a.0);
+        let from = active.map(|(_, _, last, _)| Leave::segment(cx, last, ev.mods.shift));
+        let p = match ev.kind {
+            PointerKind::Move => self.snap.hover(cx, ev.pos, drawn.as_slice(), from.as_ref()),
+            PointerKind::Down => self.snap.press(cx, ev.pos, drawn.as_slice(), from.as_ref()),
+            _ => ev.pos,
+        };
         match ev.kind {
             PointerKind::Move => {
                 self.hover = Some(p);
@@ -135,9 +148,6 @@ impl Tool for PenTool {
             PointerKind::Down => {
                 self.last = ev.pos;
                 if let Some((id, first, last, _)) = active {
-                    if ev.mods.shift {
-                        p = last + vectorcraft_geom::constrain_angle(p - last, 45.0);
-                    }
                     let end = last_anchor(cx, id);
                     // A one-anchor path doesn't close on itself: its anchor is the last one too.
                     if p.distance(first) <= tol && end.is_some_and(|(_, ai)| ai > 0) {
@@ -230,6 +240,7 @@ impl Tool for PenTool {
                 )]
             }
             PointerKind::Up => {
+                self.snap.clear();
                 if let Some(mut t) = self.convert.take() {
                     return t.pointer(cx, ev);
                 }
@@ -251,6 +262,7 @@ impl Tool for PenTool {
                 self.stop();
                 self.drag = None;
                 self.handle = None;
+                self.snap.clear();
                 // An Alt gesture under way ends as it stands.
                 self.convert.take().map(|mut t| t.deactivate(cx)).unwrap_or_default()
             }
@@ -259,25 +271,30 @@ impl Tool for PenTool {
     }
     fn deactivate(&mut self, cx: &ToolContext) -> Vec<Action> {
         self.stop();
+        self.snap.clear();
         self.convert.take().map(|mut t| t.deactivate(cx)).unwrap_or_default()
     }
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
         if let Some(t) = &self.convert {
             return t.overlays(cx);
         }
-        if !cx.pen_rubber_band || self.drag.is_some() || self.handle.is_some() {
-            return vec![];
+        let mut o = vec![];
+        if cx.pen_rubber_band
+            && self.drag.is_none()
+            && self.handle.is_none()
+            && let (Some((id, _, last, out)), Some(h)) = (self.active(cx), self.hover)
+        {
+            let mut bp = BezPath::new();
+            bp.move_to(last);
+            if out.distance(last) > 1e-9 {
+                bp.quad_to(out, h);
+            } else {
+                bp.line_to(h);
+            }
+            o.push(Overlay::Path { path: bp, color: cx.doc.layer_color(id), width: 1.0, dashed: false });
         }
-        let (Some((id, _, last, out)), Some(h)) = (self.active(cx), self.hover) else { return vec![] };
-        let mut bp = BezPath::new();
-        bp.move_to(last);
-        if out.distance(last) > 1e-9 {
-            bp.quad_to(out, h);
-        } else {
-            bp.line_to(h);
-        }
-        let c = cx.doc.layer_color(id);
-        vec![Overlay::Path { path: bp, color: c, width: 1.0, dashed: false }]
+        o.extend_from_slice(self.snap.guides());
+        o
     }
     fn cursor(&self, cx: &ToolContext, p: Point, m: Mods) -> Cursor {
         let tol = cx.tol(5.0);
@@ -614,6 +631,31 @@ mod tests {
         assert!(matches!(&a[..], [Action::Begin(_), Action::Preview(c, _)] if c == "path.create"), "{a:?}");
     }
 
+    /// Each anchor snaps to Smart Guides (#506): hovering shows where it goes (the rubber band ends
+    /// there), in line with another object's centre; Shift slides it along its 45° step into line.
+    #[test]
+    fn anchors_snap_to_smart_guides() {
+        let (d, id, s) = drawing(vectorcraft_geom::SubPath::polyline(&[Point::new(10.0, 300.0), Point::new(60.0, 300.0)], false));
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let mut t = PenTool { drawing: true, ..PenTool::default() };
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Move, 152.0, 318.0));
+        let o = t.overlays(&cx);
+        assert!(o.iter().any(|o| matches!(o, Overlay::Label { text, p, .. } if text == "align" && *p == Point::new(150.0, 318.0))), "{o:?}");
+        assert!(o.iter().any(
+            |o| matches!(o, Overlay::Path { path, .. } if path.elements().last().and_then(|e| e.end_point()) == Some(Point::new(150.0, 318.0)))
+        ));
+        let a = click(&mut t, &cx, 152.0, 318.0, Mods::default());
+        assert_eq!(a[1], Action::Preview("path.appendAnchor".into(), json!({"id": id.0, "x": 150.0, "y": 318.0})));
+        let shift = Mods { shift: true, ..Mods::default() };
+        let a = click(&mut t, &cx, 152.0, 310.0, shift);
+        assert_eq!(a[1], Action::Preview("path.appendAnchor".into(), json!({"id": id.0, "x": 150.0, "y": 300.0})));
+        // The first anchor of a new path lands on the rect's corner.
+        let mut t = PenTool::default();
+        let a = click(&mut t, &cx, 102.0, 99.0, Mods::default());
+        assert_eq!(a[1], Action::Preview("path.create".into(), json!({"anchors": [{"x": 100.0, "y": 100.0}]})));
+    }
+
     #[test]
     fn alt_over_a_shown_handle_or_an_anchor_converts() {
         // The middle anchor is smooth: handles at (150, 100) and (250, 100) round (200, 100).

crates/tools/src/shape.rs

@@ -2,11 +2,13 @@
 //!
 //! Drag draws (Shift constrains to square/circle/45°, Alt draws from the centre, Space held moves
 //! the shape being drawn); a click without a drag asks the UI for the size dialog (like
-//! Illustrator). ↑/↓ during a polygon/star drag change the side/point count.
+//! Illustrator). ↑/↓ during a polygon/star drag change the side/point count. The start point and
+//! the dragged corner snap to Smart Guides ([`DrawSnap`]), hovering before the press too.
 
 use serde_json::{Value, json};
 use vectorcraft_geom::{Point, Rect};
 
+use crate::guides::{DrawSnap, Leave, square};
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 pub struct ShapeTool {
@@ -20,7 +22,7 @@ pub struct ShapeTool {
     pub corner_radius: f64,
     /// Star inner radius as a fraction of the outer radius.
     pub star_ratio: f64,
-    guides: Vec<Overlay>,
+    snap: DrawSnap,
 }
 
 impl ShapeTool {
@@ -43,7 +45,7 @@ impl ShapeTool {
             points: 5,
             corner_radius: 12.0,
             star_ratio: 0.5,
-            guides: vec![],
+            snap: DrawSnap::default(),
         }
     }
 
@@ -58,7 +60,18 @@ impl ShapeTool {
         }
     }
 
-    /// The command for the current drag.
+    /// How the dragged point keeps to the start: a polygon's or star's radius goes anywhere, a
+    /// line is a segment (Shift: 45° steps), the rest are boxes (Shift: a square).
+    fn leave(&self, cx: &ToolContext, start: Point, m: Mods) -> Option<Leave> {
+        match self.id {
+            "polygon" | "star" => None,
+            "lineSegment" => Some(Leave::segment(cx, start, m.shift)),
+            _ => Some(Leave::diagonal(start, m.shift)),
+        }
+    }
+
+    /// The command for a drag from `start` to `p` (snapped: a line's end already keeps Shift's
+    /// angle).
     pub fn command(&self, start: Point, p: Point, m: Mods) -> (String, Value) {
         match self.id {
             "polygon" | "star" => {
@@ -76,7 +89,6 @@ impl ShapeTool {
             }
             "lineSegment" => {
                 let (a, b) = if m.alt { (start - (p - start), p) } else { (start, p) };
-                let b = if m.shift { a + vectorcraft_geom::constrain_angle(b - a, 45.0) } else { b };
                 ("shape.line".into(), json!({ "x1": a.x, "y1": a.y, "x2": b.x, "y2": b.y }))
             }
             _ => {
@@ -104,11 +116,7 @@ pub(crate) fn space_moves(start: &mut Point, last: &mut Point, ev: &PointerEvent
 /// The rectangle a drag from `start` to `p` draws: Shift makes it a square, Alt draws it from its
 /// centre.
 pub(crate) fn drag_rect(start: Point, p: Point, m: Mods) -> Rect {
-    let mut d = p - start;
-    if m.shift {
-        let s = d.x.abs().max(d.y.abs());
-        d = vectorcraft_geom::Vec2::new(s * d.x.signum(), s * d.y.signum());
-    }
+    let d = if m.shift { square(p - start) } else { p - start };
     if m.alt { Rect::from_points(start - d, start + d) } else { Rect::from_points(start, start + d) }
 }
 
@@ -121,8 +129,12 @@ impl Tool for ShapeTool {
     }
     fn pointer(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec<Action> {
         match ev.kind {
+            PointerKind::Move => {
+                self.snap.hover(cx, ev.pos, &[], None);
+                vec![]
+            }
             PointerKind::Down => {
-                let (p, _) = crate::guides::snap_draw(cx, ev.pos, &[]);
+                let p = self.snap.press(cx, ev.pos, &[], None);
                 self.start = Some(p);
                 self.last = ev.pos;
                 self.began = false;
@@ -130,8 +142,7 @@ impl Tool for ShapeTool {
             }
             PointerKind::Drag => {
                 let Some(mut s) = self.start else { return vec![] };
-                let (pos, g) = crate::guides::snap_draw(cx, ev.pos, &[]);
-                self.guides = g;
+                let pos = self.snap.drag(cx, ev.pos, self.leave(cx, s, ev.mods).as_ref());
                 let ev = &PointerEvent { pos, ..*ev };
                 space_moves(&mut s, &mut self.last, ev, self.began);
                 self.start = Some(s);
@@ -150,7 +161,7 @@ impl Tool for ShapeTool {
             }
             PointerKind::Up => {
                 let Some(s) = self.start.take() else { return vec![] };
-                self.guides.clear();
+                self.snap.clear();
                 if self.began {
                     self.began = false;
                     vec![Action::Commit]
@@ -196,23 +207,26 @@ impl Tool for ShapeTool {
         } else if key == ToolKey::Escape {
             self.start = None;
             self.began = false;
+            self.snap.clear();
             vec![Action::Cancel]
         } else {
             vec![]
         }
     }
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
-        match self.start {
-            Some(s) if self.began => {
-                let d = self.last - s;
-                let mut o = self.guides.clone();
-                if cx.measurement_labels {
-                    o.push(Overlay::Measure { p: self.last, text: cx.size_label(d.x.abs(), d.y.abs()) });
+        let mut o = self.snap.guides().to_vec();
+        if let Some(s) = self.start.filter(|_| self.began && cx.measurement_labels) {
+            // A box's size as drawn (from its centre with Alt, square with Shift).
+            let (w, h) = match self.id {
+                "polygon" | "star" | "lineSegment" => ((self.last - s).x.abs(), (self.last - s).y.abs()),
+                _ => {
+                    let r = drag_rect(s, self.last, self.mods);
+                    (r.width(), r.height())
                 }
-                o
-            }
-            _ => vec![],
+            };
+            o.push(Overlay::Measure { p: self.last, text: cx.size_label(w, h) });
         }
+        o
     }
     fn cursor(&self, _cx: &ToolContext, _p: Point, _m: Mods) -> Cursor {
         Cursor::Crosshair
@@ -310,4 +324,36 @@ mod tests {
         let a = t.key(&cx, ToolKey::Up, Mods::default());
         assert!(matches!(&a[0], Action::Preview(_, v) if v["sides"] == 7));
     }
+
+    /// The start and the dragged corner land on another object's anchors (#506), hovering shows
+    /// it before the press, and the measurement label gives the size drawn.
+    #[test]
+    fn corners_snap_to_smart_guides() {
+        let (d, _) = doc_with_rect();
+        let s = Selection::default();
+        let p = paint();
+        let cx = cx(&d, &s, &p);
+        let mut t = ShapeTool::new("rectangle");
+        let anchor = |o: &[Overlay], at: Point| o.iter().any(|o| matches!(o, Overlay::Label { text, p, .. } if text == "anchor" && *p == at));
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Move, 98.0, 102.0));
+        assert!(anchor(&t.overlays(&cx), Point::new(100.0, 100.0)));
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 98.0, 102.0));
+        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 198.0, 202.0));
+        assert_eq!(a[1], Action::Preview("shape.rectangle".into(), json!({"x": 100.0, "y": 100.0, "width": 100.0, "height": 100.0})));
+        let o = t.overlays(&cx);
+        assert!(anchor(&o, Point::new(200.0, 200.0)), "{o:?}");
+        assert!(o.iter().any(|o| matches!(o, Overlay::Measure { text, .. } if text == &cx.size_label(100.0, 100.0))));
+        // Alt draws from the centre: the label gives the whole size.
+        let alt = Mods { alt: true, ..Mods::default() };
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 198.0, 202.0).with_mods(alt));
+        assert!(t.overlays(&cx).iter().any(|o| matches!(o, Overlay::Measure { text, .. } if text == &cx.size_label(200.0, 200.0))));
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 198.0, 202.0));
+        assert!(t.overlays(&cx).is_empty());
+        // A line with Shift keeps to 45° steps, sliding into line with the rect's right side.
+        let mut t = ShapeTool::new("lineSegment");
+        t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 300.0, 300.0));
+        let shift = Mods { shift: true, ..Mods::default() };
+        let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 203.0, 302.0).with_mods(shift));
+        assert!(matches!(&a[..], [_, Action::Preview(_, v)] if v["x2"] == 200.0 && (v["y2"].as_f64().unwrap() - 300.0).abs() < 1e-9), "{a:?}");
+    }
 }

crates/tools/src/text.rs

@@ -3,7 +3,8 @@
 //! Type: click places point type, drag draws an area-type frame, clicking into existing text
 //! places the caret. Area Type / Type on a Path: click a path to turn it into a text frame or a
 //! baseline (`text.createInPath`). Point type placed by a click and left empty is discarded when
-//! editing ends (`text.discardEmpty`); frames keep their shape.
+//! editing ends (`text.discardEmpty`); frames keep their shape. Where new type goes (the click, the
+//! frame's corners) snaps to Smart Guides ([`DrawSnap`]), hovering too.
 //!
 //! While editing: caret movement by character / word (Cmd or Alt) / line (Up/Down) / line ends
 //! (Home/End; Cmd = whole text), Shift extends the selection, drag selects, double-click selects a
@@ -27,6 +28,7 @@ use vectorcraft_doc::{NodeId, NodeKind, TextKind, TextObject, TextRun};
 use vectorcraft_geom::{BezPath, Point, Rect, Shape};
 use vectorcraft_text::{FontDb, TextLayout, edit};
 
+use crate::guides::DrawSnap;
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 /// Which of the Type tools this is.
@@ -68,8 +70,12 @@ pub struct TypeTool {
     goal_x: Option<f64>,
     typing: Option<Typing>,
     preedit: Option<Preedit>,
-    press: Option<Point>,
+    /// Where the button went down, and where new type goes from there (snapped to Smart Guides).
+    press: Option<(Point, Point)>,
+    /// The other corner of an area dragged out (snapped).
     drag: Option<Point>,
+    /// Smart Guides for where new type goes.
+    snap: DrawSnap,
     /// The press landed in the edited text: dragging selects.
     selecting: bool,
     /// Click counting for double/triple click (position of the last click, count).
@@ -252,7 +258,8 @@ impl TypeTool {
         Some(out)
     }
 
-    fn on_up(&mut self, cx: &ToolContext, start: Point) -> Vec<Action> {
+    /// The button released after a press at `start` (new type goes at `at`).
+    fn on_up(&mut self, cx: &ToolContext, start: Point, at: Point) -> Vec<Action> {
         // Click into existing text: place the caret.
         if let Some(out) = self.edit_at(cx, start) {
             return out;
@@ -272,10 +279,10 @@ impl TypeTool {
                 return out;
             }
         }
-        let area = drag.map(|d| Rect::from_points(start, d)).filter(|r| r.width() > cx.tol(6.0) && r.height() > cx.tol(6.0));
+        let area = drag.map(|d| Rect::from_points(at, d)).filter(|r| r.width() > cx.tol(6.0) && r.height() > cx.tol(6.0));
         let mut params = match area {
             Some(r) => json!({"x": r.x0, "y": r.y0, "text": "", "area": {"width": r.width(), "height": r.height()}}),
-            None => json!({"x": start.x, "y": start.y, "text": ""}),
+            None => json!({"x": at.x, "y": at.y, "text": ""}),
         };
         params["vertical"] = json!(self.vertical);
         params["placeholder"] = json!(cx.placeholder_text);
@@ -386,7 +393,7 @@ impl Tool for TypeTool {
                     self.selecting = true;
                     return out;
                 }
-                self.press = Some(ev.pos);
+                self.press = Some((ev.pos, self.snap.press(cx, ev.pos, self.editing.as_slice(), None)));
                 self.drag = None;
                 vec![]
             }
@@ -398,7 +405,7 @@ impl Tool for TypeTool {
                         self.clicks = (None, 0);
                     }
                 } else if self.press.is_some() {
-                    self.drag = Some(ev.pos);
+                    self.drag = Some(self.snap.drag(cx, ev.pos, None));
                 }
                 vec![]
             }
@@ -407,8 +414,9 @@ impl Tool for TypeTool {
                     self.selecting = false;
                     return vec![];
                 }
-                let Some(start) = self.press.take() else { return vec![] };
-                self.on_up(cx, start)
+                self.snap.clear();
+                let Some((start, at)) = self.press.take() else { return vec![] };
+                self.on_up(cx, start, at)
             }
             PointerKind::DoubleClick => {
                 if self.editing.is_some() && self.hit_edited(cx, ev.pos).is_some() {
@@ -417,7 +425,11 @@ impl Tool for TypeTool {
                 }
                 vec![]
             }
-            PointerKind::Move => vec![],
+            PointerKind::Move => {
+                // The type being edited is no target: its guides would only point at itself.
+                self.snap.hover(cx, ev.pos, self.editing.as_slice(), None);
+                vec![]
+            }
         }
     }
     fn text_input(&mut self, cx: &ToolContext, s: &str) -> Vec<Action> {
@@ -700,8 +712,8 @@ impl Tool for TypeTool {
         }
     }
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
-        let mut o = vec![];
-        if let (Some(s), Some(d)) = (self.press, self.drag) {
+        let mut o = self.snap.guides().to_vec();
+        if let (Some((_, s)), Some(d)) = (self.press, self.drag) {
             o.push(Overlay::Marquee(Rect::from_points(s, d)));
         }
         // Overflow markers on selected text.

crates/tools/src/text_tests.rs

@@ -335,3 +335,24 @@ fn hebrew_typing_and_visual_arrows_keep_logical_text() {
     let NodeKind::Text(t) = &d.node(id).unwrap().kind else { panic!() };
     assert_eq!(t.plain_text(), "שלום");
 }
+
+/// Where new type goes snaps to Smart Guides (#506): a click beside a rect lines up with its
+/// centre, and hovering shows it first; an area's corners land on its anchors.
+#[test]
+fn new_type_snaps_to_smart_guides() {
+    let (d, _) = crate::testutil::doc_with_rect();
+    let (sel, p) = (Selection::default(), paint());
+    let c = cx(&d, &sel, &p);
+    let mut tool = TypeTool::new("type");
+    tool.pointer(&c, &PointerEvent::new(PointerKind::Move, 151.0, 330.0));
+    assert!(tool.overlays(&c).iter().any(|o| matches!(o, Overlay::Label { text, p, .. } if text == "align" && *p == Point::new(150.0, 330.0))));
+    tool.pointer(&c, &PointerEvent::new(PointerKind::Down, 151.0, 330.0));
+    let acts = tool.pointer(&c, &PointerEvent::new(PointerKind::Up, 151.0, 330.0));
+    assert!(acts.iter().any(|a| matches!(a, Action::Exec(cmd, v) if cmd == "text.create" && v["x"] == 150.0 && v["y"] == 330.0)), "{acts:?}");
+    let mut tool = TypeTool::new("type");
+    tool.pointer(&c, &PointerEvent::new(PointerKind::Down, 102.0, 98.0));
+    tool.pointer(&c, &PointerEvent::new(PointerKind::Drag, 199.0, 202.0));
+    let acts = tool.pointer(&c, &PointerEvent::new(PointerKind::Up, 199.0, 202.0));
+    let area = json!({"width": 100.0, "height": 100.0});
+    assert!(acts.iter().any(|a| matches!(a, Action::Exec(cmd, v) if cmd == "text.create" && v["x"] == 100.0 && v["area"] == area)), "{acts:?}");
+}

crates/tools/src/xform/artboard.rs

@@ -8,14 +8,14 @@
 //! the Selection tool. Moving and resizing snap like drawing
 //! does: to whole pixels, to the grid, or with Smart Guides to other artboards, their bleed and
 //! objects (never to the dragged artboard or the art moving with it); the artboard's own bleed edges
-//! snap too.
+//! snap too. A new artboard's corners snap as drawn points do ([`DrawSnap`]).
 
 use serde_json::{Value, json};
 use vectorcraft_geom::{Point, Rect, Vec2};
 
 use super::{BLUE, polygon, rect_corners};
 use crate::bbox::{Handle, hit_handle, move_delta, scale_for_drag};
-use crate::guides::Targets;
+use crate::guides::{DrawSnap, Leave, Targets};
 use crate::{Action, Cursor, Mods, Overlay, PointerEvent, PointerKind, Tool, ToolContext, ToolKey};
 
 #[derive(Clone, Copy, Debug)]
@@ -57,11 +57,13 @@ pub struct ArtboardTool {
     copy_targets: Option<Targets>,
     /// Smart Guides shown while dragging.
     guides: Vec<Overlay>,
+    /// Smart Guides for the corners of a new artboard.
+    draw: DrawSnap,
 }
 
 impl Default for ArtboardTool {
     fn default() -> Self {
-        Self { active: 0, move_art: true, drag: None, preview: None, targets: None, copy_targets: None, guides: vec![] }
+        Self { active: 0, move_art: true, drag: None, preview: None, targets: None, copy_targets: None, guides: vec![], draw: DrawSnap::default() }
     }
 }
 
@@ -134,6 +136,7 @@ impl ArtboardTool {
         self.targets = None;
         self.copy_targets = None;
         self.guides.clear();
+        self.draw.clear();
     }
 }
 
@@ -171,7 +174,7 @@ impl Tool for ArtboardTool {
                     self.active = i;
                     self.drag = Some(Drag::Move { index: i, start: p, rect: a.rect, began: false, copy: false });
                 } else {
-                    let (p, _) = crate::guides::snap_draw(cx, p, &[]);
+                    let p = self.draw.press(cx, p, &[], None);
                     self.drag = Some(Drag::Create { start: p, cur: p });
                 }
                 vec![]
@@ -213,12 +216,7 @@ impl Tool for ArtboardTool {
                 out
             }
             (PointerKind::Drag, Some(Drag::Create { start, .. })) => {
-                let (mut cur, _) = crate::guides::snap_draw(cx, p, &[]);
-                if m.shift {
-                    let d = cur - start;
-                    let s = d.x.abs().max(d.y.abs());
-                    cur = start + Vec2::new(s.copysign(d.x), s.copysign(d.y));
-                }
+                let cur = self.draw.drag(cx, p, Some(&Leave::diagonal(start, m.shift)));
                 self.drag = Some(Drag::Create { start, cur });
                 vec![]
             }
@@ -289,6 +287,7 @@ impl Tool for ArtboardTool {
     fn overlays(&self, cx: &ToolContext) -> Vec<Overlay> {
         let mut o = vec![];
         if let Some(Drag::Create { start, cur }) = self.drag {
+            o.extend_from_slice(self.draw.guides());
             let r = Rect::from_points(start, cur);
             o.push(Overlay::Marquee(r));
             if cx.measurement_labels {

crates/ui-egui/src/chrome.rs

@@ -108,10 +108,32 @@ pub fn app_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
 /// An anchor button: icon, tooltip, command and the convert command's `to`.
 type AnchorButton<'a> = (&'a str, &'a str, &'a str, Option<&'a str>);
 
-/// What the Control bar and the Properties panel offer for direct-selected anchors: "Convert:"
-/// corner or smooth, then "Anchors:" remove, connect (Join) and cut. Each group is a row of its
-/// own: inline in the Control bar, one under the other in a panel.
-pub fn anchor_buttons(app: &mut VectorcraftApp, ui: &mut Ui) {
+/// The anchor controls the Control bar and the Properties panel show.
+#[derive(Clone, Copy, PartialEq, Eq)]
+pub enum AnchorControls {
+    None,
+    /// Paths selected as a whole with a tool that edits anchors (Direct Selection, the Pen…),
+    /// which shows all their anchors selected: "Convert:" only, as removing or cutting at every
+    /// anchor isn't what they're for.
+    Convert,
+    /// Anchors direct-selected: "Convert:" and "Anchors:".
+    All,
+}
+
+/// Which anchor controls show for the selection and the active tool.
+pub fn anchor_controls(app: &VectorcraftApp) -> AnchorControls {
+    let Some(st) = app.session.active() else { return AnchorControls::None };
+    if !st.selection.anchors.is_empty() {
+        return AnchorControls::All;
+    }
+    let paths = st.selection.objects.iter().any(|id| st.doc.node(*id).is_some_and(|n| matches!(n.kind, NodeKind::Path { .. })));
+    if paths && vectorcraft_tools::catalog::edits_anchors(app.session.tool_id()) { AnchorControls::Convert } else { AnchorControls::None }
+}
+
+/// What the Control bar and the Properties panel offer for selected anchors ([`anchor_controls`]):
+/// "Convert:" corner or smooth, then "Anchors:" remove, connect (Join) and cut. Each group is a
+/// row of its own: inline in the Control bar, one under the other in a panel.
+pub fn anchor_buttons(app: &mut VectorcraftApp, ui: &mut Ui, controls: AnchorControls) {
     let t = Tokens::get(ui.ctx());
     let mut run = None;
     let groups: [(&str, &[AnchorButton]); 2] = [
@@ -131,7 +153,12 @@ pub fn anchor_buttons(app: &mut VectorcraftApp, ui: &mut Ui) {
             ],
         ),
     ];
-    for (label, buttons) in groups {
+    let shown = match controls {
+        AnchorControls::None => 0,
+        AnchorControls::Convert => 1,
+        AnchorControls::All => groups.len(),
+    };
+    for (label, buttons) in groups.into_iter().take(shown) {
         ui.horizontal(|ui| {
             ui.label(egui::RichText::new(label).size(12.0).color(t.text));
             for &(icon, tip, id, to) in buttons {
@@ -166,9 +193,9 @@ pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
                 let sel = st.selection.objects.clone();
                 let units = app.session.general_unit();
                 let first = sel.first().and_then(|id| st.doc.node(*id)).cloned();
-                let anchor_mode = !st.selection.anchors.is_empty();
+                let anchors = anchor_controls(app);
                 let label = match &first {
-                    Some(_) if sel.len() == 1 && anchor_mode => tl!("Anchor Point"),
+                    Some(_) if sel.len() == 1 && anchors != AnchorControls::None => tl!("Anchor Point"),
                     Some(vectorcraft_doc::Node { kind: NodeKind::Image(im), .. }) if sel.len() == 1 => {
                         if im.link.is_some() {
                             tl!("Linked File")
@@ -180,8 +207,8 @@ pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
                     _ => tl!(crate::panels::appearance::object_label(app)),
                 };
                 ui.label(egui::RichText::new(label).font(theme::semibold(12.0)).color(t.text));
-                if anchor_mode {
-                    anchor_buttons(app, ui);
+                if anchors != AnchorControls::None {
+                    anchor_buttons(app, ui, anchors);
                 }
                 ui.add_space(6.0);
                 // An image or an Image Trace object shows its own controls in place of Fill and Stroke.

crates/ui-egui/src/clipboard_probe.rs

@@ -0,0 +1,99 @@
+//! Checks the system clipboard for Paste off the UI thread. `has()` can block for seconds when the
+//! clipboard owner never answers (an unresponsive X11 client), so it must not run on the thread that
+//! draws the window: a worker owns a second clipboard handle, sends its verdict when it changes, and
+//! the UI only reads the latest one. Without a worker the check stays in line, as before (the web,
+//! and hosts that don't install a factory).
+
+use std::sync::mpsc::{Receiver, RecvTimeoutError, Sender, TryRecvError};
+use std::time::{Duration, Instant};
+
+use vectorcraft_engine::cmd::clipboard::PASTE_ORDER;
+
+use crate::sysclip::ClipboardProbeFactory;
+
+/// How often the worker looks at the clipboard while the UI wants to know.
+const PROBE_INTERVAL: Duration = Duration::from_millis(250);
+
+/// How long dropping the probe waits for the worker to let go of its clipboard handle.
+const STOP_WAIT: Duration = Duration::from_millis(250);
+
+/// The background clipboard check ([`crate::VectorcraftApp`]'s `clipboard_probe`).
+pub(crate) struct Probe {
+    /// Tells the worker whether Paste depends on the system clipboard; dropped to stop it.
+    wants: Option<Sender<bool>>,
+    wanted: bool,
+    verdicts: Receiver<bool>,
+    /// The worker's last verdict.
+    last: bool,
+}
+
+impl Probe {
+    /// Start the worker. `None` on wasm, or when the thread can't be spawned: the caller then falls
+    /// back to the in-line check.
+    pub(crate) fn start(make: ClipboardProbeFactory, ctx: egui::Context) -> Option<Self> {
+        if cfg!(target_arch = "wasm32") {
+            return None;
+        }
+        let (wants, wanted_rx) = std::sync::mpsc::channel();
+        let (tx, verdicts) = std::sync::mpsc::channel();
+        std::thread::Builder::new()
+            .name("vectorcraft-clip".into())
+            .spawn(move || {
+                let mut clipboard = make();
+                let (mut wanted, mut sent) = (false, None);
+                loop {
+                    if wanted {
+                        // This thread may wait here for a slow owner; the UI's never does.
+                        let verdict = clipboard.has(&PASTE_ORDER);
+                        if sent != Some(verdict) {
+                            if tx.send(verdict).is_err() {
+                                break;
+                            }
+                            sent = Some(verdict);
+                            ctx.request_repaint();
+                        }
+                    }
+                    // Sleep until the next look (no looks while unwanted) or the UI's next word.
+                    let next =
+                        if wanted { wanted_rx.recv_timeout(PROBE_INTERVAL) } else { wanted_rx.recv().map_err(|_| RecvTimeoutError::Disconnected) };
+                    match next {
+                        Ok(w) => wanted = w,
+                        Err(RecvTimeoutError::Timeout) => {}
+                        Err(RecvTimeoutError::Disconnected) => break,
+                    }
+                }
+                // The handle goes before the app stops waiting (`Drop`): on X11 the last one alive
+                // hands what the app copied to the clipboard manager, which must finish before exit.
+                drop(clipboard);
+                drop(tx);
+            })
+            .ok()?;
+        Some(Self { wants: Some(wants), wanted: false, verdicts, last: false })
+    }
+
+    /// Paste can take from the system clipboard: `wanted` (nothing copied in the app, a document
+    /// open) and the worker's latest verdict says so. Never blocks. `None` once the worker is gone.
+    pub(crate) fn pasteable(&mut self, wanted: bool) -> Option<bool> {
+        if wanted != self.wanted {
+            self.wants.as_ref()?.send(wanted).ok()?;
+            self.wanted = wanted;
+        }
+        loop {
+            match self.verdicts.try_recv() {
+                Ok(verdict) => self.last = verdict,
+                Err(TryRecvError::Empty) => return Some(wanted && self.last),
+                Err(TryRecvError::Disconnected) => return None,
+            }
+        }
+    }
+}
+
+impl Drop for Probe {
+    /// Wake the worker to stop and wait (a moment at most: it may be stuck on an owner that never
+    /// answers) until it has let go of its clipboard handle.
+    fn drop(&mut self) {
+        self.wants = None;
+        let end = Instant::now() + STOP_WAIT;
+        while self.verdicts.recv_timeout(end.saturating_duration_since(Instant::now())).is_ok() {}
+    }
+}

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/lib.rs

@@ -17,6 +17,7 @@ pub mod background;
 mod brand;
 pub mod canvas;
 pub mod chrome;
+mod clipboard_probe;
 pub mod community;
 pub mod control;
 pub mod credits;
@@ -129,6 +130,8 @@ mod tests_sysclip;
 #[cfg(test)]
 mod tests_sysclip_emf;
 #[cfg(test)]
+mod tests_sysclip_probe;
+#[cfg(test)]
 mod tests_transparencygrid;
 #[cfg(test)]
 mod tests_widthtool;
@@ -142,7 +145,7 @@ use vectorcraft_engine::{Session, ViewInfo};
 
 pub use control::{ControlRequest, ControlResponse};
 pub use state::{UiState, View};
-pub use sysclip::SystemClipboard;
+pub use sysclip::{ClipboardProbeFactory, SystemClipboard};
 
 /// What a file dialog shows: a suggested file name (save dialogs), the folder to start in and the
 /// file-type filters.
@@ -205,6 +208,10 @@ pub struct Services {
     /// Paste takes SVG, PDF, text and bitmaps from other apps. Without it, SVG text only (through
     /// egui and `clipboard_read`).
     pub system_clipboard: Option<Box<dyn SystemClipboard>>,
+    /// A second system-clipboard handle, for checking whether Paste has something to take on a
+    /// background thread (Linux: an X11 clipboard owner that never answers would freeze the UI).
+    /// Taken on the first frame. Without it the check runs on the UI thread.
+    pub clipboard_probe: Option<ClipboardProbeFactory>,
     /// File → Show in Folder: select a file in the system file manager (desktop).
     pub reveal: Option<RevealFn>,
     /// Write a file from any thread (desktop): lets Background Save and Export write off the UI
@@ -327,8 +334,11 @@ pub struct VectorcraftApp {
     /// (SVG without a `system_clipboard`) while the internal clipboard is empty. It enables the
     /// Paste menu items.
     pub(crate) system_paste: bool,
-    /// When `system_paste` was last checked (app time, s; at most once per frame).
+    /// When `system_paste` was last checked in line (app time, s; at most once per frame).
     system_paste_at: f64,
+    /// The thread that checks the system clipboard for `system_paste` instead
+    /// ([`Services::clipboard_probe`]).
+    clipboard_probe: Option<clipboard_probe::Probe>,
     /// Keyboard pastes of something other than text (see [`shortcuts::PasteChord`]).
     pub(crate) paste_chord: shortcuts::PasteChord,
     /// Saves and exports running in the background (Preferences → File Handling).
@@ -404,6 +414,7 @@ impl VectorcraftApp {
             place: Default::default(),
             system_paste: false,
             system_paste_at: f64::NEG_INFINITY,
+            clipboard_probe: None,
             paste_chord: Default::default(),
             background: Default::default(),
             recovery: Default::default(),
@@ -729,11 +740,20 @@ impl VectorcraftApp {
         }
         self.last_time = now;
         self.sync_views();
-        // Read the system clipboard only when that alone decides whether Paste is enabled, and at
-        // most a few times a second (opening it locks it against other apps on some systems).
-        if !(0.0..SYSTEM_CLIPBOARD_POLL).contains(&(now - self.system_paste_at)) {
+        // Read the system clipboard only when that alone decides whether Paste is enabled. A
+        // background thread reads it where the host installs one (an unresponsive owner must never
+        // stall the frame loop); otherwise, or once that thread is gone, it is read here, at most a
+        // few times a second (opening it locks it against other apps on some systems).
+        let wanted = self.session.clipboard.is_empty() && self.session.active().is_some();
+        if let Some(make) = self.services.clipboard_probe.take() {
+            self.clipboard_probe = clipboard_probe::Probe::start(make, ctx.clone());
+        }
+        if let Some(pasteable) = self.clipboard_probe.as_mut().and_then(|p| p.pasteable(wanted)) {
+            self.system_paste = pasteable;
+        } else if !(0.0..SYSTEM_CLIPBOARD_POLL).contains(&(now - self.system_paste_at)) {
+            self.clipboard_probe = None;
             self.system_paste_at = now;
-            self.system_paste = self.session.clipboard.is_empty() && self.session.active().is_some() && self.system_clipboard_pasteable();
+            self.system_paste = wanted && self.system_clipboard_pasteable();
         }
         background::poll(self);
         if !self.background.jobs.is_empty() {

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

@@ -16,7 +16,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
         return;
     };
     let n_sel = st.selection.len();
-    let anchor_mode = !st.selection.anchors.is_empty();
+    let anchors = crate::chrome::anchor_controls(app);
     let first = first_selected(app);
     let label = match (&first, n_sel) {
         (None, _) => tl!("Document").to_string(),
@@ -85,10 +85,10 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
             }
         });
     }
-    if anchor_mode {
+    if anchors != crate::chrome::AnchorControls::None {
         divider(ui);
         section_header(ui, tl!("Anchor Point"));
-        crate::chrome::anchor_buttons(app, ui);
+        crate::chrome::anchor_buttons(app, ui, anchors);
     }
     divider(ui);
     section_header(ui, tl!("Quick Actions"));

crates/ui-egui/src/sysclip.rs

@@ -24,6 +24,11 @@ pub trait SystemClipboard {
     fn has(&mut self, mimes: &[&'static str]) -> bool;
 }
 
+/// Makes a second system-clipboard handle, to check off the UI thread whether Paste has something
+/// to take ([`Services::clipboard_probe`](crate::Services::clipboard_probe)). It is called on that
+/// thread and the handle lives and dies there, so the handle needn't be `Send`.
+pub type ClipboardProbeFactory = Box<dyn FnOnce() -> Box<dyn SystemClipboard> + Send>;
+
 /// The command (and its params) that loads `f` into the internal clipboard, centred on `center`.
 pub(crate) fn import_command(f: &Flavour, center: Option<[f64; 2]>) -> (&'static str, Value) {
     let b64 = || vectorcraft_format::base64_encode(&f.data);

crates/ui-egui/src/tests_removeanchors.rs

@@ -205,3 +205,26 @@ fn the_control_bar_converts_connects_and_cuts_selected_anchors() {
     assert!(app.session.active().unwrap().doc.node(id).unwrap().path_data().unwrap().subpaths[0].closed);
     assert_eq!(anchor_count(&app, id), 4, "the coincident ends merge");
 }
+
+/// #504: with a tool that edits anchors (Direct Selection, the Pen…), a path selected as a whole
+/// shows all its anchors selected, and the Control bar and the Properties panel offer to convert
+/// them; removing and cutting wait for anchors direct-selected. The Selection tool shows neither.
+#[test]
+fn a_whole_path_converts_with_the_tools_that_edit_anchors() {
+    let mut app = app();
+    let id = rect(&mut app);
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx);
+    app.select_tool("selection");
+    assert!(!has(&control_frame(&mut app, &ctx, vec![]), "Convert:"));
+    for tool in ["directSelection", "pen"] {
+        app.select_tool(tool);
+        let texts = control_frame(&mut app, &ctx, vec![]);
+        assert!(has(&texts, "Convert:") && !has(&texts, "Anchors:"), "{tool}: {texts:?}");
+        let props = crate::tests_labels::painted_text(&mut app, crate::panels::properties::show);
+        assert!(props.contains("Convert:") && !props.contains("Anchors:"), "{tool}: {props}");
+    }
+    click_button(&mut app, &ctx, "Convert:", 1);
+    let sp = app.session.active().unwrap().doc.node(id).unwrap().path_data().unwrap().subpaths[0].clone();
+    assert!(sp.anchors.iter().all(|a| a.has_in() && a.has_out()), "every corner made smooth: {sp:?}");
+}

crates/ui-egui/src/tests_sysclip.rs

@@ -66,7 +66,7 @@ pub(super) fn run(app: &mut VectorcraftApp, id: &str, p: Value) -> Value {
     app.run(id, p).unwrap_or_else(|e| panic!("{id}: {e}"))
 }
 
-fn copy_rect(app: &mut VectorcraftApp) {
+pub(super) fn copy_rect(app: &mut VectorcraftApp) {
     let id = run(app, "shape.rectangle", json!({"x": 10, "y": 10, "width": 40, "height": 20}))["id"].clone();
     run(app, "paint.setFill", json!({"color": "#ff0000"}));
     run(app, "select.set", json!({"ids": [id]}));

crates/ui-egui/src/tests_sysclip_probe.rs

@@ -0,0 +1,156 @@
+//! The system clipboard is checked for Paste off the UI thread where the host installs a probe
+//! (Linux): an X11 clipboard owner that never answers used to block the frame loop for seconds, so
+//! the window stopped drawing and could not even be closed. The in-line check (no probe: the web,
+//! Windows, macOS) is covered by `tests_clipboard` and `tests_sysclip`.
+
+use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::{Arc, Mutex};
+use std::time::{Duration, Instant};
+
+use serde_json::json;
+use vectorcraft_engine::Session;
+use vectorcraft_engine::cmd::clipboard::Flavour;
+
+use crate::tests_sysclip::{copy_rect, run};
+use crate::{Services, SystemClipboard, VectorcraftApp, menus};
+
+/// What the clipboard handles saw: the thread each `has()` ran on, and how many handles are alive.
+#[derive(Default)]
+struct Recorder {
+    threads: Mutex<Vec<Option<String>>>,
+    alive: AtomicUsize,
+}
+
+impl Recorder {
+    fn looks(&self) -> usize {
+        self.threads.lock().unwrap().len()
+    }
+}
+
+/// A system clipboard whose `has()` takes `delay` (an owner slow to answer) and answers `verdict`,
+/// or panics without one (a bug in the platform code).
+struct Slow {
+    rec: Arc<Recorder>,
+    delay: Duration,
+    verdict: Option<bool>,
+}
+
+impl Slow {
+    fn boxed(rec: &Arc<Recorder>, delay: Duration, verdict: Option<bool>) -> Box<dyn SystemClipboard> {
+        rec.alive.fetch_add(1, Ordering::SeqCst);
+        Box::new(Self { rec: Arc::clone(rec), delay, verdict })
+    }
+}
+
+impl Drop for Slow {
+    fn drop(&mut self) {
+        self.rec.alive.fetch_sub(1, Ordering::SeqCst);
+    }
+}
+
+impl SystemClipboard for Slow {
+    fn write(&mut self, _flavours: &[Flavour]) -> Result<(), String> {
+        Ok(())
+    }
+    fn holds_ours(&mut self) -> bool {
+        false
+    }
+    fn read(&mut self, _mimes: &[&'static str]) -> Option<Flavour> {
+        None
+    }
+    fn has(&mut self, _mimes: &[&'static str]) -> bool {
+        self.rec.threads.lock().unwrap().push(std::thread::current().name().map(str::to_owned));
+        std::thread::sleep(self.delay);
+        self.verdict.expect("the clipboard failed")
+    }
+}
+
+/// An app whose two clipboard handles record into `rec`: the UI's says `inline`, the probe's
+/// `probe`, each after `delay`.
+fn app(rec: &Arc<Recorder>, delay: Duration, inline: bool, probe: Option<bool>) -> VectorcraftApp {
+    let make = {
+        let rec = Arc::clone(rec);
+        move || Slow::boxed(&rec, delay, probe)
+    };
+    let services =
+        Services { system_clipboard: Some(Slow::boxed(rec, delay, Some(inline))), clipboard_probe: Some(Box::new(make)), ..Default::default() };
+    VectorcraftApp::new(Session::new(), services)
+}
+
+/// One headless frame of app logic in the test's one context (a new one would restart the fonts),
+/// half a second after the last: past the in-line check's throttle, so it would run every frame.
+fn frame(app: &mut VectorcraftApp) {
+    thread_local! {
+        static CTX: egui::Context = egui::Context::default();
+        static NOW: std::cell::Cell<f64> = const { std::cell::Cell::new(0.0) };
+    }
+    let time = NOW.with(|t| {
+        t.set(t.get() + 0.5);
+        t.get()
+    });
+    let input = egui::RawInput { time: Some(time), ..Default::default() };
+    CTX.with(|ctx| ctx.run_ui(input, |ui| app.logic(ui.ctx())).textures_delta.clear());
+}
+
+/// Frames for `wait`, or until `done` holds; whether it does.
+fn frames_until(app: &mut VectorcraftApp, wait: Duration, done: impl Fn(&VectorcraftApp) -> bool) -> bool {
+    let end = Instant::now() + wait;
+    loop {
+        frame(app);
+        if done(app) || Instant::now() > end {
+            return done(app);
+        }
+        std::thread::sleep(Duration::from_millis(5));
+    }
+}
+
+#[test]
+fn a_slow_clipboard_is_read_off_the_ui_thread() {
+    let rec = Arc::new(Recorder::default());
+    let mut app = app(&rec, Duration::from_secs(1), false, Some(true));
+    // The first frames install the UI fonts. Without a document Paste is off whatever the clipboard
+    // holds: nobody looks.
+    assert!(!frames_until(&mut app, Duration::from_millis(100), |_| rec.looks() > 0));
+    run(&mut app, "file.new", json!({"width": 100, "height": 100}));
+    frame(&mut app);
+    let t0 = Instant::now();
+    frame(&mut app);
+    assert!(t0.elapsed() < Duration::from_millis(300), "the frame waited on the clipboard: {:?}", t0.elapsed());
+    // The probe's verdict (the UI's own handle would say no) enables Paste once it arrives.
+    assert!(frames_until(&mut app, Duration::from_secs(3), |app| app.system_paste), "the probe's verdict never arrived");
+    assert!(menus::enabled(&app, "edit.paste"));
+    let threads = rec.threads.lock().unwrap().clone();
+    assert!(threads.iter().all(|n| n.as_deref() == Some("vectorcraft-clip")), "checked on: {threads:?}");
+}
+
+#[test]
+fn the_probe_rests_after_a_copy_and_stops_with_the_app() {
+    let rec = Arc::new(Recorder::default());
+    let mut app = app(&rec, Duration::ZERO, false, Some(true));
+    run(&mut app, "file.new", json!({"width": 100, "height": 100}));
+    assert!(frames_until(&mut app, Duration::from_secs(2), |app| app.system_paste));
+    // Something copied in the app enables Paste alone: the clipboard isn't read any more.
+    copy_rect(&mut app);
+    frames_until(&mut app, Duration::from_millis(50), |_| false);
+    let looks = rec.looks();
+    frames_until(&mut app, Duration::from_millis(600), |_| false);
+    assert_eq!(rec.looks(), looks);
+    assert!(!app.system_paste && menus::enabled(&app, "edit.paste"));
+    // Quitting waits until the probe's thread has let go of its handle: on X11 the last handle
+    // alive hands what the app copied to the clipboard manager.
+    assert_eq!(rec.alive.load(Ordering::SeqCst), 2);
+    drop(app);
+    assert_eq!(rec.alive.load(Ordering::SeqCst), 0, "the probe's thread kept its clipboard");
+}
+
+#[test]
+fn without_its_thread_the_check_runs_in_line_again() {
+    let rec = Arc::new(Recorder::default());
+    // The probe's clipboard panics: its thread ends.
+    let mut app = app(&rec, Duration::ZERO, true, None);
+    run(&mut app, "file.new", json!({"width": 100, "height": 100}));
+    assert!(frames_until(&mut app, Duration::from_secs(2), |app| app.system_paste), "no fallback");
+    assert!(app.clipboard_probe.is_none());
+    let threads = rec.threads.lock().unwrap().clone();
+    assert_eq!(threads.first().cloned().flatten().as_deref(), Some("vectorcraft-clip"), "{threads:?}");
+}

docs/development.md

@@ -74,6 +74,7 @@ By default VectorCraft's own crates log at `info` and everything else at `warn`.
 The window runs natively on Wayland (eframe's `wayland` feature) and on X11. On machines with two GPUs it renders on the one the desktop runs on unless Preferences say otherwise; see [Desktop graphics processor](#desktop-graphics-processor) (#502). The system clipboard (`apps/vectorcraft/src/clipboard.rs`) is arboard with its `wayland-data-control` feature:
 
 - **Clipboard:** under Wayland arboard talks to the compositor through the data-control protocol (wlroots compositors such as Sway and Hyprland, KDE Plasma), so bitmaps (`image/png`), SVG markup and text copied in any app paste (#398). Where the compositor lacks the protocol (GNOME's Mutter, [arboard#223](https://github.com/1Password/arboard/issues/223)), arboard falls back to the X11 clipboard through XWayland, which only holds what X11 apps copied. egui's own text paste into fields goes through smithay-clipboard and works either way.
+- **Clipboard owners that never answer (#510):** reading the clipboard waits on the app that owns it: arboard gives up on an X11 owner after 4 s, and a Wayland read waits for the owner to send its data. So on Linux the check that enables the Paste menu items runs on a background thread with a second clipboard handle (`crates/ui-egui/src/clipboard_probe.rs`, installed as `Services::clipboard_probe`), only while nothing is copied in the app and a document is open, and the window keeps drawing. A paste itself still reads on the UI thread, so pasting from such an owner waits for it once. Windows and macOS keep the check on the UI thread: Windows only asks which formats the clipboard holds, macOS asks the pasteboard server.
 - **Copied files:** files copied in a file manager (`text/uri-list`; `CF_HDROP` on Windows, file URLs on macOS) paste as the first one that is art (SVG, PDF, EMF/WMF or a bitmap), before the clipboard's other formats (which include the files' paths as text).
 - **Dropping files on the window does not work under Wayland:** winit 0.30, which eframe 0.36 runs on, has no Wayland drag and drop ([winit#1881](https://github.com/rust-windowing/winit/issues/1881), added in winit 0.31; [egui#1563](https://github.com/emilk/egui/issues/1563)), so no `dropped_files` arrive. Until eframe moves to winit 0.31: copy the files in the file manager and paste them, use File › Place or Open, or run the app under XWayland, where drops work (`WAYLAND_DISPLAY= vectorcraft`).
 - **Pens and pen displays under Wayland (#491):** winit 0.30 doesn't bind the Wayland tablet protocol (`zwp_tablet_v2`; tablet input arrives in winit 0.31, [winit#4318](https://github.com/rust-windowing/winit/pull/4318), [egui#7731](https://github.com/emilk/egui/pull/7731)). Since Plasma 6.3, KWin no longer turns tablet input into pointer input for such apps ([kwin!6336](https://invent.kde.org/plasma/kwin/-/merge_requests/6336)): the pen moves the compositor's cursor over the window, but the app gets no motion or presses and shows none of its own cursors. Until eframe moves to winit 0.31, either run the app under XWayland, which supports the tablet protocol and hands the pen to X11 apps as a pointer (`WAYLAND_DISPLAY= vectorcraft`, or `env -u WAYLAND_DISPLAY vectorcraft`; for a desktop launcher, put `env WAYLAND_DISPLAY=` before the command in its `Exec=` line), or turn KWin's deprecated emulation back on for the whole session by setting `KWIN_WAYLAND_EMULATE_TABLET=1` in KWin's environment (for example in a file under `~/.config/environment.d/` or in `/etc/environment`) and logging in again. The pen then works as a mouse, without pressure: winit 0.30 reads pen pressure on Windows only (Windows Ink, which reaches the Liquify tools' Use Pressure Pen). Other compositors that don't emulate a pointer for tablets behave the same way.
@@ -123,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
@@ -151,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

@@ -402,11 +402,14 @@ their stop opacity and stop where the shading doesn't extend. Text becomes point
 the file's font (by name; fonts that aren't available are listed in `warnings` and show in the fallback font, and
 every export that draws that type — PDF, EPS, EMF/WMF, raster images, SVG with outlined or embedded fonts — says in
 its `warnings` that it wrote the fallback font) — `textAs: "outlines"` keeps the glyph outlines the file draws instead
-(its embedded fonts, installed or not). Strokes stay live strokes (width, cap, join, miter limit, dash and paint), and
+(its embedded fonts, installed or not). Lines wrapped in a frame (each wrapped line ending in a space, sharing a left
+edge, font and leading) come back as one area type object, left aligned or justified, where laying it out breaks the
+lines where the file does; a stroke written as each glyph's outline stroked is the type object's stroke; glyphs set
+apart by gaps wider than a space keep their places. Strokes stay live strokes (width, cap, join, miter limit, dash and paint), and
 an object written as a fill and then a stroke of the same outline is one path with both. Optional content groups (the
 layers of PDF and PDF-compatible `.ai` files) become layers with their name, visibility (the default configuration's,
-or a view state that is off), print state and lock, nested as sublayers the way the file's layer order nests them; art
-that is off comes in as a hidden layer. Art outside them goes to a layer per page (except the opaque white page a `.ai`
+or a view state that is off), print state and lock, nested as sublayers the way the file's layer order nests them, stacked as the pages mark them
+(layers with no art come in empty); art that is off comes in as a hidden layer. Art outside them goes to a layer per page (except the opaque white page a `.ai`
 paints under its layers, which isn't art). `layers: false` gives one layer per page of only what shows:
 
 ```json
@@ -1212,8 +1215,8 @@ off, an empty window, and the Home button or `app.home` still shows the screen)
 default: on, a click away from a panel popped out of the icon column puts it away).
 
 The Smart Guides preferences (Preferences › Smart Guides) apply to `pointer_gesture` with Smart Guides on (the
-default view) and to the mouse; they change what the tools show and how far a target pulls, never where a snapped
-point lands:
+default view) and to the mouse; they change what the tools show and how far a target pulls, and only Construction
+Guides change where a snapped point lands:
 
 - `smartGuideColor` (`#ff3dfc` by default): the colour of the smart guides' lines and labels.
 - `alignmentGuides` (on by default): off, no line is drawn along the edge or centre the art lines up with; the art
@@ -1228,6 +1231,11 @@ point lands:
 - `snappingTolerance` (0–40 px, 4 by default): how near an anchor, edge, centre or artboard edge pulls a drawn point,
   a dragged selection, a bounding-box handle, a ruler guide or an artboard. With Smart Guides off, Snap to Point uses
   `snapToPointTolerance` instead.
+- `constructionGuides` (on by default) and `constructionAngles` (`90° & 45° Angles` by default; also `90° Angles`,
+  `45° Angles`, `60° Angles`, `30° Angles`, `90° & 45° & 30° Angles`): a point drawn near a line at one of those
+  angles through the point it leaves from (the Pen's or Curvature tool's last anchor, a line's start) lands on that
+  line, where a target's alignment line crosses it if one does nearby. "90°" gives the horizontal and the vertical,
+  "45°" the diagonals, "60°" and "30°" the multiples of those angles in between. Off, the point only lines up.
 
 With Smart Guides on, a bounding-box handle dragged with the Selection or Free Transform tool (`mods.shift`
 proportional, `mods.alt` from the centre) lands on another object's anchor or centre (labelled "anchor" or
@@ -1239,7 +1247,26 @@ snap the pointer as drawing tools do, so dragging a corner onto another object's
 {"name":"pointer_gesture","arguments":{"tool":"scale","events":[{"kind":"down","x":100,"y":100},{"kind":"up","x":100,"y":100},{"kind":"down","x":199,"y":198},{"kind":"drag","x":302,"y":262},{"kind":"up","x":302,"y":262}]}}
 ```
 
-Not read yet: Construction Guides and their Angles, and Spacing Guides (the tools draw neither).
+Every point a drawing tool places snaps the same way, through one snapper (#506): the Pen's and Curvature tool's
+anchors, the Pencil's first and last point, the shape tools' start and dragged corner or radius (`rectangle`,
+`roundedRectangle`, `ellipse`, `polygon`, `star`, `lineSegment`, `arc`, `spiral`, `rectangularGrid`, `polarGrid`), the
+Type tool's click and frame, and a new artboard's corners. The point lands on another object's anchor, centre or
+path ("anchor", "center", "path"), else lines up with the anchors, edges and centres of the art and the artboards (a
+line from the target and "align"); the Pen's lands on the path being drawn too, so a click on its first anchor closes
+it exactly. With `mods.shift` the point keeps to its 45° step from the anchor before it (from `constrainAngle`; a box
+dragged keeps its corner on a diagonal) and slides along that way into line with the nearest target. A `move` event
+before the press shows where it would go, as hovering does with the mouse. The targets are the art in the window (all
+of it headless), gathered once per document state; the shape being drawn is never one of them:
+
+```json
+{"name":"pointer_gesture","arguments":{"tool":"rectangle","events":[{"kind":"down","x":202,"y":203},{"kind":"drag","x":330,"y":341},{"kind":"up","x":330,"y":341}]}}
+{"name":"pointer_gesture","arguments":{"tool":"pen","events":[{"kind":"down","x":300,"y":420},{"kind":"up","x":300,"y":420},{"kind":"down","x":151.5,"y":431},{"kind":"up","x":151.5,"y":431}]}}
+```
+
+With a 100 × 100 square at (100, 100), the first starts the rectangle on its corner (200, 200); the second puts the
+Pen's second anchor at (150, 431), in line with the square's centre.
+
+Not read yet: Spacing Guides (the tools draw none).
 
 ## Type preferences