Part of #394: Animated Zoom, Large Tabs, Scale Cursor and anti-aliased bitmaps act

- Performance › Animated Zoom (with GPU Performance, which dims it when
  off): the Zoom tool dragged sideways zooms about the press (right in,
  left out) and held still zooms on (Alt: out); a click still steps. Off,
  a drag zooms to the area dragged across, now drawn as a marquee. The
  hint bar says which.
- User Interface › Large Tabs: taller document tabs with larger titles.
- User Interface › Scale Cursor Proportional to UI: off, the tool cursors
  keep their size whatever the UI Scaling (OS and painted cursors alike).
- File Handling › Display Bitmaps as Anti-aliased Images in Pixel
  Preview: off (the default), Pixel Preview samples images nearest-pixel
  (`RenderOptions::smooth_images`).

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

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-09 (after placed documents (File › Place of a `.vectorcraft` file, linked), M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS import running more of PostScript Level 3 (patterns, Type 3 fonts, mesh shadings, masked images, VM and resource probes), and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482), Shift-drag marquees that toggle the objects or anchors they reach and a Lasso whose Alt subtraction keeps the rest of the selection (#483), the mouse wheel stepping the focused numeric field, the dialogs' and preferences' drag values made such fields (#485), Show The Home Screen When No Documents Are Open (#394), Numbers Without Units Are Points (#394), Auto-Collapse Iconic Panels (#394), the Contextual Task Bar moved by its handle and its More Options menu pinning and resetting its position, a designed macOS DMG windoLine truncated
+_Last updated: 2026-10-09 (after placed documents (File › Place of a `.vectorcraft` file, linked), M4.14–M4.98, M8.1–M8.20, M14.4–M14.7, the MCP prompts, resource templates, completions and logging, the 2026-10-07 issue fixes, the Layers panel rework and the 2026-10-08 community contributions: Pen and shape-tool modifiers, path editing, Layers, Artboards, Swatches/Brushes and dialogs, Japanese composition and PDF text, Hebrew/Arabic type, interface languages (Spanish among them), the font menu, saved selections, MCP and EPS, the missing-font export warning (#319), open paths in the Shape Builder (#374), PDF/`.ai` import keeping strokes live and hidden and nested layers (#372), per-corner Live Corners (#381), SVG type opening at the size it draws at (#396), the Wayland clipboard with copied-file paste (#398), ruler guides that can be selected, moved and deleted (#414), two batches of Preferences options that were stored but unused (#394), skeleton reads with `document.find` for large documents over MCP (#416) and anchors dragged with Direct Selection snapping to points, segments and smart guides, clipped SVG layers opening as clipping layers (#420), PDF/`.ai` layers read on pages of tens of millions of operators (#419), Document Color Mode putting RGB greys on the black plate on request and converting pattern tiles (#421) and movable dialogs with Offset Path's Joins dropdown (#423) and numeric fields scrubbed by dragging their label (#400), stroke weight presets in the stroke unit (#426), the Appearance panel's Opacity popup (#430), type on a path brackets, flip and Type on a Path Options that keep the type in place (#429), Layers rows dragged with a ghost and dropped on the trash or New Layer (#435), tool flyouts opening on a right or corner press (#436), tool flyouts torn off into floating toolbars (#437), the Shape Builder's erase mode deleting edges too (#439), installed fonts registered outside the font folders and fonts installed while the app runs listed in the font menus (#443), alike circular corners on rectangles that aren't square (#442), tool cursors as OS cursors so the pointer no longer trails over the canvas (#444), artboards copied and pasted with their art (#446), guides dragged out of the rulers snapping to the art's side midpoints and the artboards, artboard guides (#451), the toolbar's double arrow and Window › Toolbars › Double Column switching between one and two columns in any window height (#455), the Smart Guides display options and Snapping Tolerance (#394), Font Size and Leading combo boxes with preset lists in the Character and Properties panels and the Control bar (#458), screenshots pasted from the clipboard on macOS, Windows and the web (#457), the Properties panel's Fill and Stroke matching the Control bar's, Illustrator's Window menu panel keys (Shift+F7 for Align…) and Alt-wheel zoom whatever the wheel preference (Discord feedback), the point/area type widget (Discord feedback), groups in legacy Illustrator .ai files (Discord feedback), a rotating desktop log file (#465), image controls in the Control bar and Properties panel: Image Trace with its presets, Mask, Crop Image, Embed/Unembed, and an Image Trace object's preset, Expand and Release (Discord feedback), the Pen working as the Anchor Point tool with Alt held over a selected path's handles and anchors, and anchor buttons that convert, connect and cut paths at the selected anchors (Discord feedback), Japanese hanging punctuation (burasagari, #463), Escape leaving Presentation Mode with no screen mode saved across restarts, documents dropped on the desktop app opening as tabs of their own and a note that an `.ai` file's art off its artboards isn't in the part read (#472), Add/Delete Anchor Point tool icons drawn from the Pen tool's (#479), EPS import running more of PostScript Level 3 (patterns, Type 3 fonts, mesh shadings, masked images, VM and resource probes), and a preview that stands in saying why (Discord feedback, #466, #469, #474), chords with modifiers recorded in Edit › Keyboard Shortcuts (#487), Type Object Selection by Path Only (#394), Anti-aliased Artwork (#394), Show Pixel Grid (#394), pen and touch taps pressed and lifted within one frame clicking where they tapped and the Linux/Wayland pen-tablet workaround (#491), bounding-box resizes landing on the other objects' anchors and centres with labels, and the Rotate, Scale, Shear and Reflect tools snapping their drags (#482), Shift-drag marquees that toggle the objects or anchors they reach and a Lasso whose Alt subtraction keeps the rest of the selection (#483), the mouse wheel stepping the focused numeric field, the dialogs' and preferences' drag values made such fields (#485), Show The Home Screen When No Documents Are Open (#394), Numbers Without Units Are Points (#394), Auto-Collapse Iconic Panels (#394), the Contextual Task Bar moved by its handle and its More Options menu pinning and resetting its position, a designed macOS DMG windoLine truncated
 
 ## Where we are
 
@@ -109,7 +109,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
   - A canvas context menu: right-click selects the object under the pointer and lists what applies to the selection (Undo/Redo, clipboard, group, isolation, join, Remove Anchor Points when anchors are selected, masks, compound paths, guides, Transform, Arrange, Select, Export Selection), or the view commands on empty canvas.
   - Save / Don't Save / Cancel before closing or quitting with unsaved documents (tabs, Close, Close All, Quit, window close).
   - Four brightness themes, persistent preferences.
-  - Preferences that act (#394, in part): Show Tool Tips, Double Click To Isolate, Zoom with Mouse Wheel (the wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; Alt/Option-wheel and a trackpad pinch zoom about the pointer either way), Use Precise Cursors; Selection & Anchor Display › Tolerance (objects, anchors and handles), Object Selection by Path Only, Command Click to Select Objects Behind (cycling down the stack), Zoom to Selection, anchor Size, Highlight anchors on mouse over; Type › Number of Recent Fonts (up to 15); Guides & Grid › guide and grid Color and Style (lines or dots) and Grids In Back. Then Snap to Point (its distance, for moves, drawn points and reference points), Move Locked and Hidden Artwork with Artboard, Enable Rubber Band for the Pen and Curvature tools, Handles style, Show handles when multiple anchors are selected, Hide Corner Widget for angles greater than; General › Transform Pattern Tiles (the transforms' and dialogs' Transform Patterns) and Select Same Tint %; Type › Size/Leading, Tracking and Baseline Shift increments (`type.step`, Cmd+Shift+. and Cmd+Shift+, for the size, the Type tool's Alt+arrows), Enable Missing Glyph Protection and Fill New Type Objects With Placeholder Text. Then Smart Guides › Color, Alignment Guides, Anchor/Path Labels, Measurement Labels, Transform Tools, Object Highlighting (with Smart Guides on) and Snapping Tolerance (4 px by default, for every smart guide snap), then Construction Guides and their Angles (#506: a drawn point near a line at one of those angles through the point it leaves from lands on it). Then Type › Type Object Selection by Path Only (type is picked on the baseline of any of its lines, area type's frame or the path of type on a path, no longer anywhere in its bounds; the Type tools and the Eyedropper still take a click among the characters). Then General › Anti-aliased Artwork (off, the canvas draws the art with hard edges). Then Guides & Grid › Show Pixel Grid (Above 600% Zoom), a line at every document pixel over the art in Pixel Preview, turning with a rotated view as the document grid now does too. Then General › Show The Home Screen When No Documents Are Open (off, closing the last document leaves an empty window; the Home button still opens the screen). Then Units › Numbers Without Units Are Points (on by default: a number typed with no unit into a field in picas is read in points, a typed unit still wins; dimmed unless a unit is Picas). Then User Interface › Auto-Collapse Iconic Panels (off by default: on, a click away from a panel popped out of the icon column puts it away). 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…).
+  - Preferences that act (#394, in part): Show Tool Tips, Double Click To Isolate, Zoom with Mouse Wheel (the wheel zooms about the pointer, Shift-wheel scrolls up and down, Cmd/Ctrl-wheel sideways; Alt/Option-wheel and a trackpad pinch zoom about the pointer either way), Use Precise Cursors; Selection & Anchor Display › Tolerance (objects, anchors and handles), Object Selection by Path Only, Command Click to Select Objects Behind (cycling down the stack), Zoom to Selection, anchor Size, Highlight anchors on mouse over; Type › Number of Recent Fonts (up to 15); Guides & Grid › guide and grid Color and Style (lines or dots) and Grids In Back. Then Snap to Point (its distance, for moves, drawn points and reference points), Move Locked and Hidden Artwork with Artboard, Enable Rubber Band for the Pen and Curvature tools, Handles style, Show handles when multiple anchors are selected, Hide Corner Widget for angles greater than; General › Transform Pattern Tiles (the transforms' and dialogs' Transform Patterns) and Select Same Tint %; Type › Size/Leading, Tracking and Baseline Shift increments (`type.step`, Cmd+Shift+. and Cmd+Shift+, for the size, the Type tool's Alt+arrows), Enable Missing Glyph Protection and Fill New Type Objects With Placeholder Text. Then Smart Guides › Color, Alignment Guides, Anchor/Path Labels, Measurement Labels, Transform Tools, Object Highlighting (with Smart Guides on) and Snapping Tolerance (4 px by default, for every smart guide snap), then Construction Guides and their Angles (#506: a drawn point near a line at one of those angles through the point it leaves from lands on it). Then Type › Type Object Selection by Path Only (type is picked on the baseline of any of its lines, area type's frame or the path of type on a path, no longer anywhere in its bounds; the Type tools and the Eyedropper still take a click among the characters). Then General › Anti-aliased Artwork (off, the canvas draws the art with hard edges). Then Guides & Grid › Show Pixel Grid (Above 600% Zoom), a line at every document pixel over the art in Pixel Preview, turning with a rotated view as the document grid now does too. Then General › Show The Home Screen When No Documents Are Open (off, closing the last document leaves an empty window; the Home button still opens the screen). Then Units › Numbers Without Units Are Points (on by default: a number typed with no unit into a field in picas is read in points, a typed unit still wins; dimmed unless a unit is Picas). Then User Interface › Auto-Collapse Iconic Panels (off by default: on, a click away from a panel popped out of the icon column puts it away). Then Performance › Animated Zoom (on, with GPU Performance, which it needs and which dims it when off: the Zoom tool dragged sideways zooms about the press, right in and left out, and held still zooms on, Alt out; off, a drag zooms to the area dragged across, now drawn as a marquee), User Interface › Large Tabs (taller document tabs) and Scale Cursor Proportional to UI (off, the tool cursors keep their size whatever the UI Scaling), and File Handling › Display Bitmaps as Anti-aliased Images in Pixel Preview (off by default: Pixel Preview draws images with each pixel taking its nearest image pixel). Type › Auto Size New Area Type works too (new area type gets Auto Size). They reach agents too (`prefs.set`, then `pointer_gesture` or `press_key`; `ui.wheel` on the control channel). About 20 stored options still do nothing yet (the rest of #394: Spacing Guides, Show Font Names in English, Highlight Alternate Glyphs, Display Print Size at 100% Zoom, Identify Objects By, East Asian Type units, Open Documents As Tabs, Real-time Drawing and Editing, GPU Performance beyond Animated Zoom, hyphenation, scratch disks, the legacy clipboard, Appearance of Black, Touch Workspace).
   - Dialogs move by dragging their heading (the band down from the top edge, as a title bar), stay on screen and keep where they were moved for the session; the form dialogs' choices are dropdowns (Offset Path's Joins, Average's and Shear's and Reflect's axis), and Offset Path lists Offset, Joins, Miter Limit and previews (#423).
   - Dialogs open with their first field focused and its value selected: type a value and press Enter (Move, Rotate, Scale…). Number fields in panels, the Control bar and dialogs (preferences too) step with Up/Down, or with the mouse wheel over the focused field (#485: a notch a step; the panel under it then stays put, and an unfocused field leaves the wheel to scrolling) (Shift: ten, Ctrl/Cmd: a tenth of their unit), applied at once.
   - Scrubby labels (#400, beyond Illustrator, as in Photoshop): dragging a numeric field's label left or right (the ↔ cursor shows over it) steps the value one unit every 2 points (Shift: ten, Ctrl/Cmd: a tenth; counts stay whole), in the field's unit and within its limits, applied live as the art follows; the whole drag is one undo step and Escape puts the value back. A click on the label focuses the field; the text box itself never scrubs, and a field with no label doesn't. Text labels before a field (Transform, Properties, Control bar, Stroke, Transparency, form rows in dialogs) and the Character and Paragraph panels' icons act as labels. Preferences › General › Scrub Numeric Fields by Dragging (on by default) turns it off.
@@ -143,7 +143,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), paragraph attributes per paragraph (alignment, indents, spacing, hyphenation, hanging punctuation, tab stops, paragraph style, direction, mojikumi and leading model; the Paragraph, Tabs and Paragraph Styles panels act on the paragraphs the Type tool's selection or caret touches, Return continues the paragraph's style, threads and SVG keep them), Area Type Options (rows/columns/inset/first baseline, vertical Align Top/Center/Bottom/Justify per row/column, reflowing non-rectangular frames and text wrap), threaded text across any closed shapes, Fit Headline, the Every-line Composer for justified and ragged text (paragraph-wide breaks for an even rag, Single-line per object from the Paragraph panel menu or `text.setFormat {composer}`). Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. Auto Size: the frame height follows the text after every edit, in the same undo step (rectangular frames of horizontal type in one row; columns get the least height that holds them; a height set by hand or threading turns it off), and the "Auto Size New Area Type" preference gives it to new area type. Shrink Text to Fit (beyond Illustrator): overflowing area type scales its sizes, leading and baseline shifts down by the largest factor (in 0.1 pt steps of the first run, down to a minimum percentage) that fits, at layout time so every export sees it. `text.areaOptions` and `document.inspect` report overflow and the shrink factor. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Beyond Illustrator: inline graphics (`text.insertInline`, Type ▸ Insert Inline Symbol) set a document symbol in a run of type as one character that flows, wraps and justifies like a glyph (InDesign-style inline objects, e.g. mana symbols in card rules text): sized to a multiple of the font size, centred on the cap height, opening up tall lines, following Redefine Symbol; a character of its run's size for Character Alignment and Top-to-Top leading, placed by the bidi reordering in right-to-left text (a neutral U+FFFC); drawn on the canvas, kept as live text plus a `<use>` in SVG and as vector art in PDF; Backspace removes it whole. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. 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, Spanish (neutral international Spanish, for every `es-*` locale), French (every `fr-*` locale), Italian (every `it-*` locale) and Russian (every `ru-*` locale) cover the whole interface, Czech and Brazilian Portuguese every menu label, Brazilian Portuguese the shell's `tl!` literals too (tested); Spanish, French, Italian and Russian also translate status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech, Spanish, French, Italian and Russian 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 (new type in a Japanese interface starts top to top, with em box centre character alignment, #432); Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline, the em box top/right, centre or bottom/left, or the ICF (ideographic character face) top/right or bottom/left, from the font's BASE table or, without one, the average ink box of some ideographs and kana; Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
 - **Transparency:** opacity masks (clip/invert/disable/link), exported as SVG `<mask>` and PDF soft masks.
-- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, colour layers traced in parallel; a trace past two million anchor points or an image over 64 megapixels is refused with advice rather than running out of memory, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image 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; Advanced › Create: Fills and/or Strokes, where lines up to the Stroke width trace as stroked centre lines (distance transform, thinning, a skeleton graph with spurs pruned, curve fitting; one width per line; without Fills, wider areas become stroked outlines), part of #641; the View modes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
+- **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, colour layers traced in parallel; a trace past two million anchor points or an image over 64 megapixels is refused with advice rather than running out of memory, and a selection too large to outline shows its bounds (#525); Object › Image Trace › Make and Make and Expand trace at once with the Default preset, #543; with an image selected the Control bar and the Properties panel show Image Trace, whose arrow traces with any preset, Mask (`object.maskImage`: a clipping path on the image's outline, selected so its handles crop), Crop Image and Embed or Unembed in place of Fill and Stroke; with an Image Trace object selected, its Preset (choosing another traces again), View, the Image Trace panel and Expand, plus Release in Properties; the five View modes (Tracing Result, with Outlines, Outlines, Outlines with Source Image, Source Image) redraw a trace on screen without tracing again, are saved with it and `imageTrace.setView` sets them, while exports and Expand keep the result; the panel's Advanced section is a header that stays open or closed as it was left (part of #641); Color mode's Palette: Limited, Full Tone (as many colours as the tones need, Less … More), Automatic (flat art with its own colours, else Full Tone; a heuristic) and Document Library (the most used colours of the document's swatches or a swatch library, filled with the swatch colours as they are), part of #641; Advanced › Create: Fills and/or Strokes, where lines up to the Stroke width trace as stroked centre lines (distance transform, thinning, a skeleton graph with spurs pruned, curve fitting; one width per line; without Fills, wider areas become stroked outlines), part of #641), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
 - **Paint and appearance (M3):**
   - **Swatches:** names follow the colour model and are unique; Swatch Options (process/spot, Global, Gray/RGB/HSB/CMYK/Web, live preview); editing a global or spot swatch recolours every linked fill, stroke and text run in one undo step; multi-select and delete with confirmation; New Swatch and New Color Group dialogs (a group from the selected artwork's colours); swatches in colour groups convert, separate and count like any other. The Swatches panel selects ranges and whole groups, has a find field, and drags swatches to reorder, regroup or paint art; Add Used Colors, Select All Unused, Merge, Ungroup and Sort by Kind; a CMYK document keeps applied colours in CMYK. Swatch libraries: nine generated colour libraries and five gradient libraries in a library panel, saved as `.vcswatches`, `.gpl` or CSS, and loaded from `.vcswatches`, `.gpl` and swatch exchange (`.ase`) files (RGB, CMYK, Lab and Gray; global, spot and process; groups). Tints of global and spot colours ("Name 40%") stay linked and separate as a percentage of their plate. Spot colours can be defined in Lab (Spot Colors options). A built-in [Registration] swatch prints on every plate.
   - **Colour:** a Color Picker (colour field, H/S/B/R/G/B channel slider, HSB/RGB/Lab/CMYK fields, hex, web-only snapping, out-of-gamut correction); the Color panel follows each colour's own model and Alt-click paints the other proxy; proxies look through groups and show "?" for mixed paint; Invert, Complement, Apply Last Color (`,`) and Apply Last Gradient (`.`) keep the colour model; every paint command feeds the recent colours. The Color Guide has 21 harmony rules, Steps and Variation options and Limit to Library. Adjust Color Balance (its Global mode shifts tints) and Saturate preview live; Edit Colors and Recolor also reach meshes, images and patterns. Recolor Artwork has colour reduction, five recolour methods, presets, Limit to Library, a colour-wheel Edit tab and Edit Color Group; a local Color Themes panel saves five-colour themes. Fill/Stroke chips open swatch and mixer popovers (the Properties panel has the Control bar's Fill and Stroke chips, Stroke link and weight spinner, with nothing selected too), panels have Illustrator's Window menu keys (Align Shift+F7, Transform Shift+F8, Pathfinder Cmd+Shift+F9, Layers F7, Character Cmd+T…; every panel can be given one in Edit › Keyboard Shortcuts), and Eyedropper Options pick up and apply chosen attributes (Alt and Shift+Alt, image pixels). Fills and strokes can overprint (Attributes panel, Overprint Black options), and CMYK documents blend in inks on screen, in PDF and when flattening. Document Color Mode converts the art, symbols, pattern tiles and swatches through the colour settings: Gray stays Gray, RGB greys separate into four-colour greys and a rich black as Illustrator does, or go on the black plate only with `grays: "black"` (also for `document.open {colorMode}`).
@@ -215,7 +215,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Type core | 9 | 80% | Middle Eastern features beyond bidi layout and Paragraph Direction (Character Direction, digit types, kashidas, the Middle Eastern composers, editable bidirectional SVG text, a split caret where directions meet); Hyphenation… and Justification… options (Every-line Composer for justified and ragged text, per object, is done; it is tuned by eye, not yet compared side by side with Illustrator; mixed type sizes in a paragraph still break single-line), Optical Margin Alignment, paragraph spacing limit for vertically justified area type, hidden characters, paragraph attributes in the Type tool's copy and paste (the characters keep their styles, the paragraphs take the destination's), mixed-value display in the Paragraph panel for a selection across differing paragraphs, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 14–19 |
 | Type advanced | 4 | 50% | CJK composition for vertical type (ruby, mojikumi beyond Line-end Punctuation Half Width — the other sets (and their paragraph-start bracket and indent rules), kinsoku sets and the Mojikumi Settings dialog —, proportional vertical metrics, manual tate-chu-yoko), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support (beyond parity, not scored: inline symbols in text) | 20–28 |
 | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | symbol libraries (original), dynamic symbols, envelope Anti-Alias/Preserve Shape output and warp point editing, brush interpolation in blends (M8 fidelity pass done) | 5–8 |
-| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image), per-feature stroke/fill choice and varying widths in Create Strokes (Vector Halftone is done) | 6–10 |
+| Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), per-feature stroke/fill choice and varying widths in Image Trace's Create Strokes (Vector Halftone and the Image Trace View modes, Palette and Create Strokes are done) | 6–10 |
 | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, Collect for Export, row context menus, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers, drag-scrolling a long panel while dragging rows; artboard 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 | 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 |
@@ -223,7 +223,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | polish only (all four are done) | 2–4 |
 | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity (flattener presets in PDF and print, overprint in PDF and composite print, Print dialog, presets, PostScript, marks, separations, Print Tiling, print overprint/flattener/bitmap options and printer profile are done) | 1–2 |
 | Automation | 3 | 60% | Variables (data merge), scripting surface, batch | 8–12 |
-| UI chrome (panels, contextual Properties, workspaces, prefs) | 6 | 78% | macOS native menu dismissal fixed (M14.8); remaining: Variables, SVG Interactivity, Properties per context, Consolidate All Windows, floating panels outside the app window and docked into any group, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 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 |
+| UI chrome (panels, contextual Properties, workspaces, prefs) | 6 | 78% | macOS native menu dismissal fixed (M14.8); remaining: Variables, SVG Interactivity, Properties per context, Consolidate All Windows, floating panels outside the app window and docked into any group, context menus beyond the canvas (Links, Asset Export, CSS Properties, Attributes and the canvas context menu are done), about 20 Preferences options stored but not yet acted on (#394: Spacing Guides, Show Font Names in English, Highlight Alternate Glyphs, Display Print Size, Open Documents As Tabs, Real-time Drawing, hyphenation, Appearance of Black, devices…) | 14–22 |
 | Libraries, Links, Package | 2 | 50% | a local Libraries panel (no cloud by design); Links and Package are done; placed VectorCraft documents are done (linked by default, vectors in every output, previews, Break Link, Expand, Edit Original, refresh on save) | 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 |

apps/vectorcraft/src/gpu.rs

@@ -22,8 +22,9 @@ use std::sync::{Arc, OnceLock};
 use eframe::egui_wgpu::NativeAdapterSelectorMethod;
 use eframe::wgpu::{self, Backend, DeviceType, PowerPreference};
 
-/// The adapters a restart leaves out, those the window failed on, as comma-separated
-/// `backend:vendor:device` keys (`Vulkan:1002:164e`). Set by the app itself when it starts again.
+/// The adapters a restart leaves out, those the window failed on, as comma-separated [`key`]s
+/// (`Vulkan:1002:164e`, `Metal:Intel Iris Pro Graphics`). Set by the app itself when it starts
+/// again.
 pub const SKIP_ENV: &str = "VECTORCRAFT_GPU_SKIP";
 
 /// wgpu's variable for choosing an adapter by (part of) its name, any case.
@@ -60,7 +61,7 @@ pub fn power_preference(pref: Option<&str>, env: Option<PowerPreference>) -> Pow
 /// One adapter, as [`adapter_order`] sees it.
 #[derive(Clone, Debug)]
 pub struct Candidate {
-    /// Identifies the adapter across a restart: `backend:vendor:device` ([`key`]).
+    /// Identifies the adapter across a restart ([`key`]).
     pub key: String,
     pub name: String,
     pub backend: Backend,
@@ -73,7 +74,7 @@ impl Candidate {
     fn new(adapter: &wgpu::Adapter, surface: Option<&wgpu::Surface<'_>>) -> Self {
         let info = adapter.get_info();
         Self {
-            key: key(info.backend, info.vendor, info.device),
+            key: key(info.backend, info.vendor, info.device, &info.name),
             presents: surface.is_none_or(|s| adapter.is_surface_supported(s)),
             name: info.name,
             backend: info.backend,
@@ -83,8 +84,15 @@ impl Candidate {
 }
 
 /// `backend:vendor:device`, e.g. `Vulkan:1002:164e` (PCI ids, as `MESA_VK_DEVICE_SELECT` takes them).
-fn key(backend: Backend, vendor: u32, device: u32) -> String {
-    format!("{backend:?}:{vendor:04x}:{device:04x}")
+/// Metal reports no ids (`0000:0000` for every GPU), so an adapter without them is `backend:name`
+/// (`Metal:Intel Iris Pro Graphics`): otherwise leaving out the one that failed would leave out
+/// every GPU of a dual-GPU Mac (#651). Commas, which separate [`SKIP_ENV`]'s keys, become spaces.
+fn key(backend: Backend, vendor: u32, device: u32, name: &str) -> String {
+    if vendor == 0 && device == 0 {
+        format!("{backend:?}:{}", name.replace(',', " ").trim())
+    } else {
+        format!("{backend:?}:{vendor:04x}:{device:04x}")
+    }
 }
 
 /// The order to try `candidates` in (their indices): only those that present to the window and
@@ -307,6 +315,27 @@ mod tests {
 
     /// A restart leaves out the adapter the window failed on, so Power Saving on the machine of
     /// #502 ends up on the NVIDIA GPU, and once every adapter failed there is nothing to try.
+    /// A dual-GPU Mac reports both GPUs under Metal with no PCI ids (#651): their keys still
+    /// differ, so when the integrated GPU fails, the restart renders on the discrete one.
+    #[test]
+    fn gpus_without_pci_ids_are_told_apart_by_name() {
+        let mac = |name: &str, device_type| Candidate {
+            key: key(Backend::Metal, 0, 0, name),
+            name: name.into(),
+            backend: Backend::Metal,
+            device_type,
+            presents: true,
+        };
+        let c = vec![mac("NVIDIA GeForce GT 750M", DeviceType::DiscreteGpu), mac("Intel Iris Pro Graphics", DeviceType::IntegratedGpu)];
+        assert_eq!((c[0].key.as_str(), c[1].key.as_str()), ("Metal:NVIDIA GeForce GT 750M", "Metal:Intel Iris Pro Graphics"));
+        let first = adapter_order(&c, PowerPreference::LowPower, None, &[]);
+        assert_eq!(names(&c, &first)[0], "Intel Iris Pro Graphics");
+        let skip = parse_skip(&c[first[0]].key);
+        assert_eq!(names(&c, &adapter_order(&c, PowerPreference::LowPower, None, &skip)), ["NVIDIA GeForce GT 750M"]);
+        // A comma in a name can't split the list.
+        assert_eq!(parse_skip(&key(Backend::Gl, 0, 0, "Mesa, llvmpipe")), ["Gl:Mesa  llvmpipe"]);
+    }
+
     #[test]
     fn a_restart_tries_the_next_adapter() {
         let c = issue_502();
@@ -433,8 +462,8 @@ mod tests {
     fn skipped_adapters_parse_from_a_comma_separated_list() {
         assert_eq!(parse_skip("Vulkan:1002:164e, Gl:10de:2f04,,"), ["Vulkan:1002:164e", "Gl:10de:2f04"]);
         assert!(parse_skip("").is_empty());
-        assert_eq!(key(Backend::Vulkan, 0x1002, 0x164e), "Vulkan:1002:164e");
-        assert_eq!(key(Backend::Gl, 0x10de, 0x2f04), "Gl:10de:2f04");
+        assert_eq!(key(Backend::Vulkan, 0x1002, 0x164e, "AMD Radeon"), "Vulkan:1002:164e");
+        assert_eq!(key(Backend::Gl, 0x10de, 0x2f04, "NVIDIA"), "Gl:10de:2f04");
     }
 
     #[test]

apps/vectorcraft/src/main.rs

@@ -423,6 +423,11 @@ fn main() -> std::process::ExitCode {
         // Only adapters that can show the window, in the order `gpu` gives (#306, #502).
         if let eframe::egui_wgpu::WgpuSetup::CreateNew(create) = &mut options.wgpu_options.wgpu_setup {
             create.native_adapter_selector = Some(gpu::selector(power, startup.clone()));
+            // Nothing draws or dispatches indirectly, so wgpu's check of indirect arguments only
+            // costs a compute shader at start-up, one some drivers can't compile (OCLP-patched
+            // Metal on an Iris Pro, #651). `WGPU_VALIDATION_INDIRECT_CALL=1` turns it back on.
+            create.instance_descriptor.flags =
+                (eframe::wgpu::InstanceFlags::from_build_config() - eframe::wgpu::InstanceFlags::VALIDATION_INDIRECT_CALL).with_env();
         }
         options
     };

crates/doc/src/lib.rs

@@ -40,6 +40,7 @@ pub mod slices;
 pub mod style_libs;
 pub mod swatches;
 pub mod text;
+pub mod trace;
 
 use std::collections::BTreeMap;
 use std::sync::Arc;
@@ -89,6 +90,7 @@ pub use text::{
     ParaDirection, ParaStyle, PathAlign, PathEffect, ScriptMetrics, TabAlign, TabStop, TextKind, TextObject, TextRun, TextStyleDef, TextWrap,
     VerticalAlign, WrapShape,
 };
+pub use trace::TraceView;
 pub use vectorcraft_color as color;
 pub use vectorcraft_geom as geom;
 

crates/doc/src/node.rs

@@ -463,7 +463,8 @@ pub struct Node {
     /// Opacity mask (Transparency panel). Its art lives here, outside the layer tree.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub mask: Option<Box<OpacityMask>>,
-    /// Image Trace object: `{preset, params}` it was traced with (the Image Trace panel shows them).
+    /// Image Trace object: `{preset, params, view?}` it was traced with (the Image Trace panel shows
+    /// them; `view` is its [`crate::TraceView`] id, absent for the tracing result).
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub trace: Option<Box<serde_json::Value>>,
     /// Object → Text Wrap: area type below this object (in the same layer) flows around it.

crates/doc/src/trace.rs

@@ -0,0 +1,92 @@
+//! Image Trace objects' View: how a live trace draws on screen.
+//!
+//! An Image Trace object is a group whose `trace` holds `{preset, params, view}` (see
+//! `imageTrace.make`). The view is a viewing aid only: exports, printing and Expand always use the
+//! tracing result, whatever it is set to.
+
+use crate::node::Node;
+
+/// Image Trace › View.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
+pub enum TraceView {
+    /// The traced shapes as they are filled.
+    #[default]
+    Result,
+    /// The traced shapes, with their outlines over them.
+    ResultWithOutlines,
+    /// Only the traced shapes' outlines.
+    Outlines,
+    /// The source image, with the traced shapes' outlines over it.
+    OutlinesWithSource,
+    /// Only the source image.
+    Source,
+}
+
+impl TraceView {
+    /// Panel order.
+    pub const ALL: [Self; 5] = [Self::Result, Self::ResultWithOutlines, Self::Outlines, Self::OutlinesWithSource, Self::Source];
+
+    /// The id used in command params and in the saved `trace` object.
+    pub fn id(self) -> &'static str {
+        match self {
+            Self::Result => "tracingResult",
+            Self::ResultWithOutlines => "tracingResultWithOutlines",
+            Self::Outlines => "outlines",
+            Self::OutlinesWithSource => "outlinesWithSourceImage",
+            Self::Source => "sourceImage",
+        }
+    }
+
+    /// The view an id names (any case).
+    pub fn from_id(id: &str) -> Option<Self> {
+        Self::ALL.into_iter().find(|v| v.id().eq_ignore_ascii_case(id))
+    }
+
+    /// The view an Image Trace object's `trace` settings ask for (the tracing result when they
+    /// name none, or an unknown one).
+    pub fn of(trace: &serde_json::Value) -> Self {
+        trace.get("view").and_then(serde_json::Value::as_str).and_then(Self::from_id).unwrap_or_default()
+    }
+
+    /// Whether the source image shows.
+    pub fn shows_source(self) -> bool {
+        matches!(self, Self::OutlinesWithSource | Self::Source)
+    }
+
+    /// Whether the traced shapes show filled.
+    pub fn shows_result(self) -> bool {
+        matches!(self, Self::Result | Self::ResultWithOutlines)
+    }
+
+    /// Whether the traced shapes' outlines show.
+    pub fn shows_outlines(self) -> bool {
+        matches!(self, Self::ResultWithOutlines | Self::Outlines | Self::OutlinesWithSource)
+    }
+}
+
+impl Node {
+    /// The View of an Image Trace object (the tracing result for anything else, or an unknown id).
+    pub fn trace_view(&self) -> TraceView {
+        self.trace.as_deref().map(TraceView::of).unwrap_or_default()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn ids_round_trip_and_unknown_views_show_the_result() {
+        for v in TraceView::ALL {
+            assert_eq!(TraceView::from_id(v.id()), Some(v));
+            assert_eq!(TraceView::from_id(&v.id().to_ascii_uppercase()), Some(v));
+            assert!(v.shows_result() || v.shows_outlines() || v.shows_source(), "{v:?} shows something");
+        }
+        let mut g = Node::group(crate::NodeId(1), vec![]);
+        assert_eq!(g.trace_view(), TraceView::Result);
+        g.trace = Some(Box::new(serde_json::json!({"view": "outlines"})));
+        assert_eq!(g.trace_view(), TraceView::Outlines);
+        g.trace = Some(Box::new(serde_json::json!({"view": "sepia"})));
+        assert_eq!(g.trace_view(), TraceView::Result);
+    }
+}

crates/engine/src/cmd/buildcmds.rs

@@ -15,7 +15,7 @@ use std::sync::Arc;
 use serde_json::{Value, json};
 use vectorcraft_color::{Color, Paint};
 use vectorcraft_doc::appearance::{AppearanceItem, FillLayer, LineCap, LineJoin, StrokeLayer};
-use vectorcraft_doc::{Appearance, Document, Node, NodeId, NodeKind, Selection};
+use vectorcraft_doc::{Appearance, Document, Node, NodeId, NodeKind, Selection, TraceView};
 use vectorcraft_geom::{FillRule, PathData, Point, Rect, SubPath};
 use vectorcraft_pathops as po;
 use vectorcraft_tools::builder::{
@@ -120,7 +120,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Make",
             ["Object", "Image Trace"],
             None,
-            "{id?: image or Image Trace group (default: selection), preset?: name (imageTrace.presets), params?: {mode: \"blackAndWhite\"|\"grayscale\"|\"color\", threshold: 0-255, colors: 2-256, paths: 0-100, corners: 0-100, noise: px, method: \"abutting\"|\"overlapping\", ignoreWhite, snapCurvesToLines, fills: true, strokes: false (Create: lines up to strokeWidth wide become stroked centre lines; without fills, wider areas become stroked outlines), strokeWidth: px (10)}} → {id, paths, anchors, colors}",
+            "{id?: image or Image Trace group (default: selection), preset?: name (imageTrace.presets), params?: {mode: \"blackAndWhite\"|\"grayscale\"|\"color\", threshold: 0-255, palette: \"limited\"|\"fullTone\"|\"automatic\"|\"documentLibrary\" (color mode; limited: the `colors` best colours, fullTone: as many as the tones need, more with colorDetail, automatic: flat art with its own colours, else fullTone, documentLibrary: at most `colors` of the library's colours, as they are), colors: 2-256, colorDetail: 0-100 (fullTone, automatic), library: \"document\" (the document's swatches) or a swatch library id or name (swatch.library.list; documentLibrary), paths: 0-100, corners: 0-100, noise: px, method: \"abutting\"|\"overlapping\", ignoreWhite, snapCurvesToLines, fills: true, strokes: false (Create: lines up to strokeWidth wide become stroked centre lines; without fills, wider areas become stroked outlines), strokeWidth: px (10)}, view?: as imageTrace.setView (default: the traced object's own, else tracingResult)} → {id, paths, anchors, colors}",
             has_selection_or_ids,
             |s, p| trace_make(s, p, false)
         ),
@@ -151,6 +151,15 @@ pub fn specs() -> Vec<CommandSpec> {
             has_selection_or_ids,
             trace_expand
         ),
+        cmd!(
+            "imageTrace.setView",
+            "Image Trace View",
+            [],
+            None,
+            "{id?|ids?: Image Trace objects (default: selection), view: \"tracingResult\"|\"tracingResultWithOutlines\"|\"outlines\"|\"outlinesWithSourceImage\"|\"sourceImage\"} how they draw on screen; exports, printing and Expand keep the tracing result → {ids, view}",
+            has_selection_or_ids,
+            trace_set_view
+        ),
         cmd!(query "imageTrace.presets", "Image Trace Presets", [], None, "{} → {presets: [{name, params}]}", always, |_, _| {
             Ok(json!({ "presets": tr::presets().into_iter().map(|(n, p)| json!({ "name": n, "params": p })).collect::<Vec<_>>() }))
         }),
@@ -639,6 +648,13 @@ fn is_trace_group(n: &Node) -> bool {
         && n.children().is_some_and(|c| c.first().is_some_and(|i| matches!(i.kind, NodeKind::Image(_))))
 }
 
+/// The `view` param ([`TraceView`] id), if given.
+fn view_param(cmd: &str, p: &Value) -> Result<Option<TraceView>> {
+    let Some(v) = p.get("view").filter(|v| !v.is_null()) else { return Ok(None) };
+    let ids = || TraceView::ALL.map(TraceView::id).join(", ");
+    v.as_str().and_then(TraceView::from_id).map(Some).ok_or_else(|| bad(cmd, format!("view must be one of {}", ids())))
+}
+
 fn trace_params(p: &Value) -> Result<tr::TraceParams> {
     let name = str_param(p, "preset").unwrap_or("Default");
     let base = tr::preset(name).ok_or_else(|| bad("imageTrace.make", format!("unknown preset `{name}` (see imageTrace.presets)")))?;
@@ -658,6 +674,30 @@ fn trace_params(p: &Value) -> Result<tr::TraceParams> {
     Ok(params)
 }
 
+/// Document Library in Color mode: look the library's colours up into `params.swatches` → each
+/// one as traced (sRGB) with the colour to fill with.
+fn trace_library(s: &Session, params: &mut tr::TraceParams) -> Result<Vec<([u8; 3], Color)>> {
+    const C: &str = "imageTrace.make";
+    if params.mode != tr::Mode::Color || params.palette != tr::Palette::DocumentLibrary {
+        return Ok(vec![]);
+    }
+    let key = params.library.as_str();
+    let colors = super::swatchlib::library_colors(s, key)
+        .ok_or_else(|| bad(C, format!("no swatch library `{key}` (see swatch.library.list; \"document\": the document's swatches)")))?;
+    if colors.is_empty() {
+        return Err(bad(C, format!("`{key}` has no colours")));
+    }
+    let library: Vec<([u8; 3], Color)> = colors
+        .into_iter()
+        .map(|c| {
+            let [r, g, b, _] = c.to_rgba8(1.0);
+            ([r, g, b], c)
+        })
+        .collect();
+    params.swatches = library.iter().map(|l| l.0).collect();
+    Ok(library)
+}
+
 /// The most anchor points an Image Trace may make: a photo traced at high fidelity can make
 /// millions, more than the canvas draws smoothly or a laptop has memory for, so the trace is
 /// refused with advice instead (#525).
@@ -665,7 +705,8 @@ pub const MAX_TRACE_ANCHORS: usize = 2_000_000;
 
 fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result<Value> {
     const C: &str = "imageTrace.make";
-    let params = trace_params(p)?;
+    let mut params = trace_params(p)?;
+    let view = view_param(C, p)?;
     let params_json = serde_json::to_value(&params).map_err(|e| EngineError::Other(e.to_string()))?;
     // The preset's name if the parameters are exactly that preset's, else "Custom".
     let named = str_param(p, "preset").unwrap_or("Default");
@@ -694,6 +735,7 @@ fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result<Value> {
     };
     let blob = s.doc()?.doc.images.get(&img.key).ok_or_else(|| EngineError::Other(format!("image data `{}` is missing", img.key)))?;
     let raster = tr::Raster::decode(&blob.bytes).map_err(|e| EngineError::Other(e.to_string()))?;
+    let library = trace_library(s, &mut params)?;
     let res = tr::trace_within(&raster, &params, MAX_TRACE_ANCHORS).map_err(|e| EngineError::Other(e.to_string()))?;
     // Pixel space of the decoded raster → the image object's pixel space → document.
     let sx = img.width.max(1) as f64 / raster.width.max(1) as f64;
@@ -723,7 +765,9 @@ fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result<Value> {
         for tp in res.paths {
             let path = tp.path.transformed(xf);
             let mut n = shape_node(d, path, None);
-            let paint = Paint::solid(Color::rgb8(tp.color[0], tp.color[1], tp.color[2]));
+            // A library colour fills with the swatch's own colour (its model kept).
+            let color = library.iter().find(|(rgb, _)| *rgb == tp.color).map_or_else(|| Color::rgb8(tp.color[0], tp.color[1], tp.color[2]), |l| l.1);
+            let paint = Paint::solid(color);
             n.appearance = match tp.stroke {
                 // Traced lines: round ends and corners, as drawn lines have.
                 Some(width) => Appearance {
@@ -742,7 +786,9 @@ fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result<Value> {
         let mut g = Node::group(gid, children);
         g.name = if expand { None } else { Some(TRACE_NAME.into()) };
         if !expand {
-            g.trace = Some(Box::new(json!({ "preset": preset_label, "params": params_json })));
+            // Tracing again keeps the object's view unless another is asked for.
+            let view = view.unwrap_or_else(|| src.trace_view());
+            g.trace = Some(Box::new(json!({ "preset": preset_label, "params": params_json, "view": view.id() })));
         }
         let (par, idx, _) = d.position(target).ok_or(EngineError::NoNode(target))?;
         d.remove(target)?;
@@ -762,6 +808,28 @@ fn trace_targets(s: &Session, p: &Value) -> Result<Vec<NodeId>> {
     Ok(v)
 }
 
+fn trace_set_view(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "imageTrace.setView";
+    let view = view_param(C, p)?.ok_or_else(|| bad(C, "view is required"))?;
+    let targets = trace_targets(s, p)?;
+    let d = &s.doc()?.doc;
+    if targets.iter().all(|g| d.node(*g).is_some_and(|n| n.trace_view() == view)) {
+        return Ok(json!({ "ids": ids_json(&targets), "view": view.id() }));
+    }
+    s.edit("Image Trace View", |d, _| {
+        for g in &targets {
+            let n = d.node_mut(*g).ok_or(EngineError::NoNode(*g))?;
+            if let Some(t) = n.trace.as_deref_mut().and_then(Value::as_object_mut) {
+                t.insert("view".into(), json!(view.id()));
+            } else {
+                n.trace = Some(Box::new(json!({ "preset": "Custom", "view": view.id() })));
+            }
+        }
+        Ok(())
+    })?;
+    Ok(json!({ "ids": ids_json(&targets), "view": view.id() }))
+}
+
 fn trace_release(s: &mut Session, p: &Value) -> Result<Value> {
     let targets = trace_targets(s, p)?;
     let ids = s.edit("Release Image Trace", |d, sel| {

crates/engine/src/cmd/swatchlib.rs

@@ -276,11 +276,18 @@ pub const DOCUMENT_SWATCHES: &str = "document";
 /// [`DOCUMENT_SWATCHES`], of the active document's swatches and colour groups. `None` when there is
 /// no such library (or document).
 pub fn limit_palette(s: &Session, key: &str) -> Option<Palette> {
+    Some(Palette::new(library_colors(s, key)?))
+}
+
+/// The solid colours of library `key` (an id or name) or, for [`DOCUMENT_SWATCHES`], of the
+/// active document's swatches and colour groups. `None` when there is no such library (or
+/// document).
+pub fn library_colors(s: &Session, key: &str) -> Option<Vec<Color>> {
     let colors = |sw: &Swatch| sw.paint.color();
     if key == DOCUMENT_SWATCHES {
-        return Some(Palette::new(s.active()?.doc.swatches_iter().filter_map(colors)));
+        return Some(s.active()?.doc.swatches_iter().filter_map(colors).collect());
     }
-    Some(Palette::new(library(s, key)?.1.iter().filter_map(colors)))
+    Some(library(s, key)?.1.iter().filter_map(colors).collect())
 }
 
 /// The `limitTo` parameter's palette ([`limit_palette`]); `None` without one (or for "").

crates/engine/src/cmd/typecmd.rs

@@ -147,6 +147,8 @@ fn auto_height(t: &mut TextObject) -> bool {
     let col_w = if cols > 1 { ((b.width() - t.area.gutter.max(0.0) * (cols - 1) as f64) / cols as f64).max(1.0) } else { b.width() };
     with_size(&mut probe, col_w, tall);
     probe.area.columns = 1;
+    // Measured from the top: aligned in the tall probe the lines would sit far below.
+    probe.area.vertical_align = vectorcraft_doc::VerticalAlign::Top;
     let lay = vectorcraft_text::layout(db, &probe);
     let inset = t.area.inset.max(0.0);
     let Some(bottom) = lay.lines.iter().map(|l| l.baseline + l.descent).filter(|y| y.is_finite()).reduce(f64::max) else { return false };

crates/engine/src/lib.rs

@@ -1586,6 +1586,8 @@ mod tests_swatchlib;
 #[cfg(test)]
 mod tests_targeting;
 #[cfg(test)]
+mod tests_textcombos;
+#[cfg(test)]
 mod tests_textedit;
 #[cfg(test)]
 mod tests_textimport;

crates/engine/src/tests_build.rs

@@ -669,6 +669,49 @@ fn image_trace_make_and_expand_and_color_presets() {
     assert!(s.execute("imageTrace.make", &json!({"params": {"mode": "rainbow"}})).is_err());
 }
 
+#[test]
+fn image_trace_palettes_and_swatch_libraries() {
+    let mut s = session();
+    let quads = vectorcraft_trace::Raster::from_fn(60, 60, |x, y| match (x < 30, y < 30) {
+        (true, true) => [230, 20, 20, 255],
+        (false, true) => [20, 200, 30, 255],
+        (true, false) => [20, 30, 220, 255],
+        (false, false) => [250, 230, 10, 255],
+    });
+    add_image(&mut s, &quads, Affine::IDENTITY);
+    let fills = |s: &Session, id: &Value| -> Vec<Color> {
+        traced_paths(&node(s, NodeId(id.as_u64().unwrap()))).iter().filter_map(|n| n.appearance.fill_paint().color()).collect()
+    };
+    // Document Library: every fill is one of the document's swatch colours, as it is.
+    let r = s.execute("imageTrace.make", &json!({"preset": "6 Colors", "params": {"palette": "documentLibrary"}})).unwrap();
+    let doc = crate::cmd::swatchlib::library_colors(&s, "document").unwrap();
+    let got = fills(&s, &r["id"]);
+    assert!(!got.is_empty() && got.iter().all(|c| doc.contains(c)), "{got:?}");
+    let t = node(&s, NodeId(r["id"].as_u64().unwrap())).trace.unwrap();
+    assert_eq!((t["params"]["palette"].as_str(), t["params"]["library"].as_str()), (Some("documentLibrary"), Some("document")));
+    assert!(t["params"].get("swatches").is_none(), "looked up again at every trace");
+    // A swatch library by id: the web-safe colours.
+    let r = s
+        .execute(
+            "imageTrace.make",
+            &json!({"id": r["id"], "preset": "6 Colors", "params": {"palette": "documentLibrary", "library": "web-safe-216", "colors": 3}}),
+        )
+        .unwrap();
+    let got = fills(&s, &r["id"]);
+    assert!((1..=3).contains(&got.len()), "{got:?}");
+    assert!(got.iter().all(|c| c.to_rgba8(1.0)[..3].iter().all(|v| v % 51 == 0)), "{got:?}");
+    // Full Tone and Automatic keep the four flat colours.
+    let mut id = r["id"].clone();
+    for palette in ["fullTone", "automatic"] {
+        let r = s.execute("imageTrace.make", &json!({"id": id, "preset": "6 Colors", "params": {"palette": palette, "colorDetail": 50}})).unwrap();
+        assert_eq!(r["colors"], 4, "{palette}");
+        id = r["id"].clone();
+    }
+    let mut bad = |p: Value| s.execute("imageTrace.make", &json!({"preset": "6 Colors", "params": p})).is_err();
+    assert!(bad(json!({"palette": "documentLibrary", "library": "No Such Library"})));
+    assert!(bad(json!({"palette": "rainbow"})));
+}
+
 #[test]
 fn image_trace_create_strokes_makes_stroked_centre_lines() {
     let mut s = session();
@@ -738,6 +781,85 @@ fn image_trace_object_remembers_its_settings() {
     assert!(st.doc.node(id).unwrap().trace.is_none());
 }
 
+/// A black disc (r = 30 px) on light blue, 100 × 100 px, placed at 2× from (50, 50): traced in
+/// Black and White with Ignore White, the blue drops out and one disc (r = 60 pt at (150, 150))
+/// remains.
+fn disc_on_blue(s: &mut Session) -> NodeId {
+    let r = vectorcraft_trace::Raster::from_fn(100, 100, |x, y| {
+        let (dx, dy) = (x as f64 + 0.5 - 50.0, y as f64 + 0.5 - 50.0);
+        if dx * dx + dy * dy <= 900.0 { [0, 0, 0, 255] } else { [170, 210, 255, 255] }
+    });
+    add_image(s, &r, Affine::translate((50.0, 50.0)) * Affine::scale(2.0));
+    let r = s.execute("imageTrace.make", &json!({"params": {"ignoreWhite": true}})).unwrap();
+    assert_eq!(r["paths"], 1);
+    NodeId(r["id"].as_u64().unwrap())
+}
+
+/// The document rendered as the canvas draws it (`trace_views`) or as exports do.
+fn render_doc(s: &Session, trace_views: bool) -> vectorcraft_render::Rendered {
+    let opts = vectorcraft_render::RenderOptions { background: Some([255, 255, 255, 255]), trace_views, ..Default::default() };
+    vectorcraft_render::Renderer::new().render(&s.doc().unwrap().doc, 300, 300, Affine::IDENTITY, &opts)
+}
+
+#[test]
+fn image_trace_view_is_stored_kept_and_validated() {
+    let mut s = session();
+    let g = disc_on_blue(&mut s);
+    assert_eq!(node(&s, g).trace.unwrap()["view"], "tracingResult");
+    let r = s.execute("imageTrace.setView", &json!({"view": "outlinesWithSourceImage"})).unwrap();
+    assert_eq!((ids(&r), r["view"].as_str()), (vec![g], Some("outlinesWithSourceImage")));
+    assert_eq!(node(&s, g).trace_view(), vectorcraft_doc::TraceView::OutlinesWithSource);
+    // Setting the view it has already adds no undo step.
+    let steps = s.doc().unwrap().history.undo.len();
+    s.execute("imageTrace.setView", &json!({"id": g.0, "view": "outlinesWithSourceImage"})).unwrap();
+    assert_eq!(s.doc().unwrap().history.undo.len(), steps);
+    // Tracing again keeps it, unless another one is asked for; it survives save and open.
+    let g = NodeId(s.execute("imageTrace.make", &json!({"id": g.0, "params": {"ignoreWhite": true, "noise": 30}})).unwrap()["id"].as_u64().unwrap());
+    assert_eq!(node(&s, g).trace_view(), vectorcraft_doc::TraceView::OutlinesWithSource);
+    let g = NodeId(s.execute("imageTrace.make", &json!({"id": g.0, "view": "SourceImage"})).unwrap()["id"].as_u64().unwrap());
+    let back = vectorcraft_format::load(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap();
+    assert_eq!(back.node(g).unwrap().trace_view(), vectorcraft_doc::TraceView::Source);
+    // Bad views and other objects are refused.
+    assert!(s.execute("imageTrace.setView", &json!({"view": "sepia"})).is_err());
+    assert!(s.execute("imageTrace.setView", &json!({})).is_err());
+    assert!(s.execute("imageTrace.make", &json!({"view": 3})).is_err());
+    let a = rect(&mut s, 0.0, 0.0, 10.0, 10.0);
+    assert!(s.execute("imageTrace.setView", &json!({"id": a.0, "view": "outlines"})).is_err());
+}
+
+#[test]
+fn image_trace_views_draw_on_screen_only_and_expand_to_the_result() {
+    let mut s = session();
+    let g = disc_on_blue(&mut s);
+    let dark = |p: [u8; 4]| p[0] < 60 && p[1] < 60 && p[2] < 60;
+    let white = |p: [u8; 4]| p[0] > 245 && p[1] > 245 && p[2] > 245;
+    let blue = |p: [u8; 4]| p[0] < 200 && p[2] > 245;
+    let (centre, beside) = ((150, 150), (70, 70));
+    let at = |img: &vectorcraft_render::Rendered, (x, y): (u32, u32)| img.pixel(x, y);
+    // The outline is a 1 px line where the disc's right side is (x = 210, anti-aliased).
+    let outlined = |img: &vectorcraft_render::Rendered| (205..=215).any(|x| img.pixel(x, 150)[0] < 128);
+    let mut expanded = None;
+    for view in vectorcraft_doc::TraceView::ALL {
+        s.execute("imageTrace.setView", &json!({"id": g.0, "view": view.id()})).unwrap();
+        let screen = render_doc(&s, true);
+        let (c, b) = (at(&screen, centre), at(&screen, beside));
+        assert_eq!(dark(c), view.shows_result() || view.shows_source(), "{view:?}: the disc's middle {c:?}");
+        assert_eq!(blue(b), view.shows_source(), "{view:?}: the image's background {b:?}");
+        assert!(view.shows_source() || white(b), "{view:?}: nothing beside the disc {b:?}");
+        if view == vectorcraft_doc::TraceView::Outlines {
+            assert!(outlined(&screen), "{view:?}: the disc's outline");
+        }
+        // Exports draw the tracing result whatever the view.
+        let export = render_doc(&s, false);
+        assert!(dark(at(&export, centre)) && white(at(&export, beside)), "{view:?}: export");
+        // Expand keeps the traced shapes, as traced, whatever the view.
+        s.execute("imageTrace.expand", &json!({"id": g.0})).unwrap();
+        let shapes: Vec<_> = node(&s, g).children().unwrap().iter().map(|c| (c.path_data().cloned(), c.appearance.clone())).collect();
+        assert_eq!(*expanded.get_or_insert_with(|| shapes.clone()), shapes, "{view:?}: expanded");
+        s.execute("edit.undo", &json!({})).unwrap();
+    }
+}
+
 /// #569: merging the regions of a rosette of unfilled ellipses (each off the centre, petals
 /// overlapping) merges every region the drags touch into one shape whose outline is only the
 /// merged area's border: no edge between merged regions stays in, as a stray line or a spur.

crates/engine/src/tests_textcombos.rs

@@ -0,0 +1,310 @@
+//! The text engine's newer features combined through commands: Auto Size and Shrink Text to Fit
+//! with inline graphics, per-paragraph attributes, the paragraph composer and vertical
+//! alignment; editing and undo across them; and a save round trip with all of them on.
+//! (`vectorcraft_text`'s `tests_combos` covers the layout side.)
+
+use serde_json::{Value, json};
+use vectorcraft_doc::text::INLINE_CHAR;
+use vectorcraft_doc::{AreaFit, Composer, Justify, NodeKind, TextKind, TextObject, VerticalAlign};
+use vectorcraft_geom::Rect;
+
+use super::*;
+
+const STORY: &str = "The quick brown fox jumps over the lazy dog. A second sentence follows the first one here. Then a third one ends it.";
+
+fn session() -> Session {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 800, "height": 600})).unwrap();
+    s
+}
+
+/// A symbol `name`: a circle `d` points across, its instance deleted.
+fn circle_symbol(s: &mut Session, name: &str, d: f64) {
+    s.execute("shape.ellipse", &json!({"x": 600, "y": 500, "width": d, "height": d})).unwrap();
+    s.execute("symbol.new", &json!({"name": name})).unwrap();
+    s.execute("edit.clear", &json!({})).unwrap();
+}
+
+/// Area type at (40, 40), `w` × `h`, size 12, with `extra` area options; selected.
+fn area(s: &mut Session, w: f64, h: f64, text: &str, extra: Value) -> NodeId {
+    let mut a = json!({"width": w, "height": h});
+    if let (Some(a), Some(e)) = (a.as_object_mut(), extra.as_object()) {
+        a.extend(e.clone());
+    }
+    let id = NodeId(s.execute("text.create", &json!({"x": 40, "y": 40, "size": 12, "area": a, "text": text})).unwrap()["id"].as_u64().unwrap());
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    id
+}
+
+fn text(s: &Session, id: NodeId) -> TextObject {
+    match &s.doc().unwrap().doc.node(id).unwrap().kind {
+        NodeKind::Text(t) => (**t).clone(),
+        k => panic!("not text: {k:?}"),
+    }
+}
+
+fn frame(s: &Session, id: NodeId) -> Rect {
+    match text(s, id).kind {
+        TextKind::Area { frame } => frame.bounds().unwrap(),
+        k => panic!("not area type: {k:?}"),
+    }
+}
+
+fn lay(t: &TextObject) -> vectorcraft_text::TextLayout {
+    vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t)
+}
+
+/// Auto Size's frame is tight: the text fits, and a point less overflows.
+fn assert_tight(s: &Session, id: NodeId, what: &str) {
+    let t = text(s, id);
+    assert!(!lay(&t).overflow, "{what}: the frame holds the text");
+    let b = frame(s, id);
+    let mut less = t.clone();
+    less.area.fit = AreaFit::None;
+    less.kind = TextKind::Area {
+        frame: vectorcraft_geom::PathData::from_bezpath(&vectorcraft_geom::Shape::to_path(&Rect::new(b.x0, b.y0, b.x1, b.y1 - 1.0), 0.1)),
+    };
+    assert!(lay(&less).overflow, "{what}: a point less overflows ({b:?})");
+}
+
+fn undo(s: &mut Session) {
+    s.execute("edit.undo", &json!({})).unwrap();
+}
+
+fn redo(s: &mut Session) {
+    s.execute("edit.redo", &json!({})).unwrap();
+}
+
+fn query(s: &mut Session) -> Value {
+    s.execute("text.areaOptions", &json!({})).unwrap()
+}
+
+#[test]
+fn auto_height_x_inline_graphics() {
+    let mut s = session();
+    circle_symbol(&mut s, "Tap", 10.0);
+    let id = area(&mut s, 200.0, 300.0, "Tap: add one mana.", json!({"fit": "autoHeight"}));
+    let one = frame(&s, id);
+    assert_tight(&s, id, "one line");
+    // Art taller than the line makes the line, and so the frame, taller: in the same undo step.
+    let n = s.doc().unwrap().history.undo.len();
+    s.execute("text.insertInline", &json!({"id": id.0, "at": 0, "symbol": "Tap", "scale": 3})).unwrap();
+    assert_eq!(s.doc().unwrap().history.undo.len(), n + 1);
+    let tall = frame(&s, id);
+    assert!(tall.height() > one.height() + 5.0, "{one:?} → {tall:?}");
+    assert_tight(&s, id, "tall art");
+    // Enough art to wrap: another line.
+    for _ in 0..12 {
+        s.execute("text.insertInline", &json!({"id": id.0, "at": 0, "symbol": "Tap", "scale": 1})).unwrap();
+    }
+    assert!(lay(&text(&s, id)).lines.len() > 1);
+    assert_tight(&s, id, "wrapped art");
+    // Deleting the art shrinks it back; undo restores each step exactly.
+    let wrapped = frame(&s, id);
+    let all = text(&s, id).plain_text().rfind(INLINE_CHAR).unwrap() + INLINE_CHAR.len_utf8();
+    s.execute("text.editRange", &json!({"id": id.0, "start": 0, "end": all})).unwrap();
+    assert_eq!(text(&s, id).plain_text(), "Tap: add one mana.");
+    assert_eq!(frame(&s, id), one);
+    undo(&mut s);
+    assert_eq!(frame(&s, id), wrapped);
+    for _ in 0..13 {
+        undo(&mut s);
+    }
+    assert_eq!(frame(&s, id), one);
+    redo(&mut s);
+    assert_eq!(frame(&s, id), tall);
+}
+
+#[test]
+fn auto_height_x_paragraph_attrs() {
+    let mut s = session();
+    let id = area(&mut s, 200.0, 300.0, "One\nTwo", json!({"fit": "autoHeight"}));
+    let h0 = frame(&s, id).height();
+    // Space before on the second paragraph only: the frame grows by exactly that.
+    s.execute("text.setFormat", &json!({"ids": [id.0], "spaceBefore": 30, "start": 4, "end": 4})).unwrap();
+    let t = text(&s, id);
+    assert_eq!((t.para_at(0).space_before, t.para_at(1).space_before), (0.0, 30.0));
+    let h1 = frame(&s, id).height();
+    assert!((h1 - h0 - 30.0).abs() < 1e-6, "{h0} → {h1}");
+    assert_tight(&s, id, "space before");
+    // Return in the spaced paragraph: the new one inherits the spacing, the frame follows.
+    s.execute("text.editRange", &json!({"id": id.0, "start": 7, "end": 7, "insert": "\nThree"})).unwrap();
+    let t = text(&s, id);
+    assert_eq!(t.paragraph_styles().iter().map(|p| p.space_before).collect::<Vec<_>>(), [0.0, 30.0, 30.0]);
+    assert!(frame(&s, id).height() > h1 + 30.0);
+    assert_tight(&s, id, "three paragraphs");
+    // Merging paragraphs: the first one's attributes win, the frame shrinks.
+    s.execute("text.editRange", &json!({"id": id.0, "start": 3, "end": 4})).unwrap();
+    let t = text(&s, id);
+    assert_eq!(t.paragraph_styles().iter().map(|p| p.space_before).collect::<Vec<_>>(), [0.0, 30.0]);
+    assert_tight(&s, id, "merged");
+    undo(&mut s);
+    undo(&mut s);
+    assert!((frame(&s, id).height() - h1).abs() < 1e-9);
+    undo(&mut s);
+    assert!((frame(&s, id).height() - h0).abs() < 1e-9);
+    assert!(text(&s, id).paras.is_empty(), "back to one style for all");
+}
+
+#[test]
+fn auto_height_x_composer() {
+    // Switching the composer of one paragraph rebreaks it; Auto Size follows either way.
+    let mut s = session();
+    let story = format!("{STORY} {STORY}\n{STORY}");
+    let id = area(&mut s, 130.0, 100.0, &story, json!({"fit": "autoHeight"}));
+    assert_tight(&s, id, "every-line");
+    for composer in ["singleLine", "everyLine", "singleLine"] {
+        s.execute("text.setFormat", &json!({"ids": [id.0], "composer": composer, "start": 0, "end": 0})).unwrap();
+        let t = text(&s, id);
+        assert_eq!(t.para_at(1).composer, Composer::EveryLine, "the second paragraph keeps its own");
+        assert_tight(&s, id, composer);
+    }
+    s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "singleLine"})).unwrap();
+    s.execute("text.setStyle", &json!({"id": id.0, "justify": "justifyAll"})).unwrap();
+    assert!(text(&s, id).paragraph_styles().iter().all(|p| p.composer == Composer::SingleLine && p.justify == Justify::JustifyAll));
+    assert_tight(&s, id, "justified");
+}
+
+#[test]
+fn auto_height_x_vertical_align() {
+    // An Auto Size frame has no space to spare: every alignment sets the lines as Top does, and
+    // the frame is as tall as with Top.
+    let mut s = session();
+    let id = area(&mut s, 160.0, 100.0, STORY, json!({"fit": "autoHeight"}));
+    let top_frame = frame(&s, id);
+    let top = lay(&text(&s, id));
+    for a in ["center", "bottom", "justify"] {
+        s.execute("text.areaOptions", &json!({"verticalAlign": a})).unwrap();
+        assert_eq!(frame(&s, id), top_frame, "{a}");
+        let l = lay(&text(&s, id));
+        for (li, l0) in l.lines.iter().zip(&top.lines) {
+            assert!((li.baseline - l0.baseline).abs() < 1e-6, "{a}: {} vs {}", li.baseline, l0.baseline);
+        }
+        assert_tight(&s, id, a);
+    }
+    // Editing with the alignment on keeps the frame tight.
+    s.execute("text.editRange", &json!({"id": id.0, "start": 0, "end": 0, "insert": format!("{STORY} ")})).unwrap();
+    assert_eq!(text(&s, id).area.vertical_align, VerticalAlign::Justify);
+    assert_tight(&s, id, "longer, justified");
+}
+
+#[test]
+fn shrink_text_x_inline_graphics_and_paragraphs() {
+    let mut s = session();
+    circle_symbol(&mut s, "Dot", 8.0);
+    let id = area(&mut s, 160.0, 60.0, "Short rules.\nFlavor.", json!({"fit": "shrinkText", "fitMinPercent": 20}));
+    assert_eq!(query(&mut s)["fitScale"], 1.0);
+    // Inline art and per-paragraph spacing push it over; shrinking makes it fit.
+    s.execute("text.setFormat", &json!({"ids": [id.0], "spaceBefore": 12, "start": 13, "end": 13})).unwrap();
+    for i in 0..10 {
+        s.execute("text.insertInline", &json!({"id": id.0, "at": 0, "symbol": "Dot", "scale": 1.0 + i as f64 * 0.2})).unwrap();
+        s.execute("text.editRange", &json!({"id": id.0, "start": 0, "end": 0, "insert": "Add "})).unwrap();
+    }
+    let q = query(&mut s);
+    assert_eq!(q["overflow"], false, "{q}");
+    let f = q["fitScale"].as_f64().unwrap();
+    assert!((0.2..1.0).contains(&f), "{f}");
+    let t = text(&s, id);
+    assert_eq!(t.paragraph_count(), 2);
+    assert_eq!(t.para_at(1).space_before, 12.0, "inserting in the first paragraph keeps the second's attributes");
+    assert_eq!(t.runs[0].style.size, 12.0, "the stored size stays");
+    let l = lay(&t);
+    assert_eq!(l.inlines.len(), 10);
+    assert!(l.inlines.iter().all(|i| i.bounds.height() < 12.0 * 2.8 * f + 1e-6));
+    // Undo walks the fit back up.
+    for _ in 0..20 {
+        undo(&mut s);
+    }
+    assert_eq!(query(&mut s)["fitScale"], 1.0);
+}
+
+#[test]
+fn paragraph_attrs_x_inline_editing() {
+    // An inline graphic opening a paragraph belongs to it: inserting it keeps the paragraph's
+    // attributes, deleting it with the paragraph break merges into the paragraph before.
+    let mut s = session();
+    circle_symbol(&mut s, "Tap", 10.0);
+    let id = area(&mut s, 300.0, 200.0, "Rules\nFlavor", json!({}));
+    s.execute("text.setStyle", &json!({"id": id.0, "justify": "center", "start": 6, "end": 6})).unwrap();
+    s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "singleLine", "start": 6, "end": 6})).unwrap();
+    s.execute("text.insertInline", &json!({"id": id.0, "at": 6, "symbol": "Tap"})).unwrap();
+    let t = text(&s, id);
+    assert_eq!(t.plain_text(), format!("Rules\n{INLINE_CHAR}Flavor"));
+    assert_eq!((t.para_at(0).justify, t.para_at(1).justify), (Justify::Auto, Justify::Center));
+    assert_eq!(t.para_at(1).composer, Composer::SingleLine);
+    // The art's line is centred.
+    let l = lay(&t);
+    let g = &l.glyphs[l.inlines[0].glyph];
+    let line = &l.lines[g.line];
+    assert!(((line.x0 + line.x1) * 0.5 - 150.0).abs() < 1e-6, "centred in the 300 pt frame: {line:?}");
+    assert!((l.inlines[0].bounds.x0 - g.origin.x).abs() < 1e-6);
+    // Return just before the art: the new paragraph (holding the art) continues the centred one.
+    s.execute("text.editRange", &json!({"id": id.0, "start": 6, "end": 6, "insert": "Text\n"})).unwrap();
+    let t = text(&s, id);
+    assert_eq!(t.paragraph_styles().iter().map(|p| p.justify).collect::<Vec<_>>(), [Justify::Auto, Justify::Center, Justify::Center]);
+    undo(&mut s);
+    // Delete the break and the art together: one paragraph, the first one's attributes.
+    let end = 6 + INLINE_CHAR.len_utf8();
+    s.execute("text.editRange", &json!({"id": id.0, "start": 5, "end": end})).unwrap();
+    let t = text(&s, id);
+    assert_eq!(t.plain_text(), "RulesFlavor");
+    assert!(t.paras.is_empty() && t.para.justify == Justify::Auto && t.para.composer == Composer::EveryLine);
+    assert!(t.runs.iter().all(|r| r.inline.is_none()));
+    undo(&mut s);
+    let t = text(&s, id);
+    assert_eq!(t.plain_text(), format!("Rules\n{INLINE_CHAR}Flavor"));
+    assert_eq!(t.para_at(1).justify, Justify::Center);
+    assert_eq!(t.runs.iter().filter(|r| r.inline.is_some()).count(), 1);
+}
+
+#[test]
+fn vertical_align_x_inline_graphics_in_the_document() {
+    // The art the renderer draws (the layout's inline placements) moves with centred lines.
+    let mut s = session();
+    circle_symbol(&mut s, "Tap", 10.0);
+    let id = area(&mut s, 300.0, 200.0, "Add one mana.", json!({}));
+    s.execute("text.insertInline", &json!({"id": id.0, "at": 0, "symbol": "Tap"})).unwrap();
+    let top = lay(&text(&s, id));
+    s.execute("text.areaOptions", &json!({"verticalAlign": "center"})).unwrap();
+    let l = lay(&text(&s, id));
+    let d = l.lines[0].baseline - top.lines[0].baseline;
+    assert!(d > 50.0, "{d}");
+    assert!((l.inlines[0].bounds.y0 - top.inlines[0].bounds.y0 - d).abs() < 1e-6, "{:?} vs {:?}", l.inlines[0].bounds, top.inlines[0].bounds);
+    // The cached bounds (hit testing, selection) include the moved art.
+    let cached = text(&s, id).cached_bounds.unwrap();
+    assert!(cached.contains(l.inlines[0].bounds.center()), "{cached:?}");
+}
+
+#[test]
+fn every_feature_saves_and_reopens() {
+    let mut s = session();
+    circle_symbol(&mut s, "Tap", 10.0);
+    let id = area(
+        &mut s,
+        220.0,
+        70.0,
+        &format!(": Add one mana of any color. {STORY}\n{STORY}"),
+        json!({"verticalAlign": "center", "fit": "shrinkText", "fitMinPercent": 30}),
+    );
+    s.execute("text.insertInline", &json!({"id": id.0, "at": 0, "symbol": "Tap", "scale": 0.8, "shift": 0.5})).unwrap();
+    let flavor = text(&s, id).plain_text().find('\n').unwrap() + 1;
+    s.execute("text.setFormat", &json!({"ids": [id.0], "spaceBefore": 8, "composer": "singleLine", "start": flavor, "end": flavor})).unwrap();
+    s.execute("text.setStyle", &json!({"id": id.0, "justify": "justifyAll", "start": flavor, "end": flavor})).unwrap();
+    s.execute("text.setStyle", &json!({"id": id.0, "tracking": 20})).unwrap();
+    let t = text(&s, id);
+    let l = lay(&t);
+    assert!(!l.overflow && l.fit_scale < 1.0, "{}", l.fit_scale);
+    assert_eq!(l.inlines.len(), 1);
+    let doc = s.doc().unwrap().doc.clone();
+    let back = vectorcraft_format::load(&vectorcraft_format::save(&doc, false)).unwrap();
+    let NodeKind::Text(t2) = &back.node(id).unwrap().kind else { panic!("not text") };
+    let mut t2 = (**t2).clone();
+    // Resolved art bounds and layout caches aren't saved: resolve them as opening does.
+    back.resolve_text_inline(&mut t2);
+    assert_eq!(t2.runs, t.runs);
+    assert_eq!(t2.paragraph_styles(), t.paragraph_styles());
+    assert_eq!(t2.area, t.area);
+    let l2 = lay(&t2);
+    assert_eq!((l2.fit_scale, l2.lines.len()), (l.fit_scale, l.lines.len()));
+    assert_eq!(l2.inlines.iter().map(|i| i.bounds).collect::<Vec<_>>(), l.inlines.iter().map(|i| i.bounds).collect::<Vec<_>>());
+}

crates/mcp/src/prompts.rs

@@ -295,11 +295,15 @@ with the {effect} effect.
 Method:
 1. open_file the image: it becomes a document of its own pixel size.
 2. imageTrace.make with the preset name, adjusting `params` — mode blackAndWhite, grayscale or
-   color, then threshold, colors, paths, corners, noise, method abutting or overlapping,
+   color (palette limited, fullTone for photos, automatic, or documentLibrary to trace with
+   the document's swatches or a swatch `library`), then threshold, colors (colorDetail for
+   fullTone and automatic), paths, corners, noise, method abutting or overlapping,
    ignoreWhite, snapCurvesToLines; for line art, strokes: true (with strokeWidth, the widest
-   line in pixels) traces lines as stroked centre lines instead of filled outlines. Run imageTrace.presets to see every preset with its numbers.
+   line in pixels) traces lines as stroked centre lines instead of filled outlines. Run
+   imageTrace.presets to see every preset with its numbers.
    Lower paths and higher corners give the clean, logo-like result; high fidelity needs paths
-   near 90.
+   near 90. imageTrace.setView {view: \"outlinesWithSourceImage\"} draws the traced outlines
+   over the image on screen to compare them (screenshots show it; exports keep the result).
 3. apply_effect {effect} on the traced shapes. Call apply_effect with no `effect` for the
    catalogue and each effect's parameters.
 4. set_paint over the traced shapes to give the artwork its own colours.

crates/render/src/lib.rs

@@ -21,7 +21,7 @@ pub mod proof;
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, StrokeAlign, StrokeLayer, TextObject};
+use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, StrokeAlign, StrokeLayer, TextObject, TraceView};
 use vectorcraft_geom::{Affine, BezPath, FillRule, Rect, Shape};
 use vello_cpu::kurbo;
 use vello_cpu::peniko::{self, BlendMode, Compose, Mix};
@@ -100,6 +100,12 @@ pub struct RenderOptions {
     /// Screen view: placed documents draw from cached bitmaps made in the background (see
     /// [`placed_document`]); off, they draw exactly, read when needed.
     pub progressive_placed: bool,
+    /// Screen view: Image Trace objects draw as their View asks (outlines, the source image…);
+    /// off, they draw their tracing result, as exports and printing do.
+    pub trace_views: bool,
+    /// Images are sampled smoothly when scaled or rotated; off, each pixel takes its nearest image
+    /// pixel (Pixel Preview with File Handling › Display Bitmaps as Anti-aliased Images off).
+    pub smooth_images: bool,
 }
 
 /// How edges are rasterized (raster export option).
@@ -165,6 +171,8 @@ impl Default for RenderOptions {
             highlight_substitutions: false,
             anti_alias: AntiAlias::Art,
             progressive_placed: false,
+            trace_views: false,
+            smooth_images: true,
         }
     }
 }
@@ -646,8 +654,10 @@ impl Renderer {
         let b = match &a.kind {
             NodeKind::Layer { children, clip: false, .. } | NodeKind::Group { children, clip: false } if !fx::has_object_fx(a) => {
                 let mut acc: Option<Rect> = None;
+                // An Image Trace object's hidden source image shows in some of its views.
+                let source = a.trace.is_some().then(|| children.first()).flatten();
                 for c in children {
-                    if c.visible {
+                    if c.visible || source.is_some_and(|s| Arc::ptr_eq(s, c)) {
                         acc = vectorcraft_geom::union_opt(acc, self.bounds_of(c));
                     }
                 }
@@ -883,6 +893,9 @@ impl Renderer {
     /// What `n` draws inside its transparency group (`knockout`: its children knock each other out).
     fn draw_content(&mut self, ctx: &mut RenderContext, f: &Frame, n: &Node, knockout: bool) {
         match &n.kind {
+            NodeKind::Group { children, clip: false } if f.opts.trace_views && !f.opts.outline && n.trace_view() != TraceView::Result => {
+                self.draw_trace_view(ctx, f, children, n.trace_view(), knockout)
+            }
             NodeKind::Layer { children, clip: false, .. } | NodeKind::Group { children, clip: false } => {
                 self.draw_children(ctx, f, children, knockout)
             }
@@ -955,6 +968,25 @@ impl Renderer {
         }
     }
 
+    /// An Image Trace object's `children` (the hidden source image, then the traced shapes) as
+    /// `view` shows them on screen.
+    fn draw_trace_view(&mut self, ctx: &mut RenderContext, f: &Frame, children: &[Arc<Node>], view: TraceView, knockout: bool) {
+        let Some((source, shapes)) = children.split_first() else { return };
+        if view.shows_source() && matches!(source.kind, NodeKind::Image(_)) {
+            self.draw_node(ctx, f, source, true);
+        }
+        if view.shows_result() {
+            self.draw_children(ctx, f, shapes, knockout);
+        }
+        if view.shows_outlines() {
+            let opts = RenderOptions { outline: true, ..f.opts.clone() };
+            let frame = Frame { opts: &opts, ..*f };
+            for c in shapes {
+                self.draw_node(ctx, &frame, c, false);
+            }
+        }
+    }
+
     /// The children of a group: as the elements of a knockout group when `knockout`.
     fn draw_children(&mut self, ctx: &mut RenderContext, f: &Frame, children: &[Arc<Node>], knockout: bool) {
         if knockout {
@@ -1391,7 +1423,9 @@ impl Renderer {
             let pm = if outline { pm } else { self.ink_image(&cache_key, &pm, f.ink, f.doc.images.get(&im.key)) };
             let sx = im.width as f64 / pm.width().max(1) as f64;
             let sy = im.height as f64 / pm.height().max(1) as f64;
-            ctx.set_paint(vello_cpu::Image { image: vello_cpu::ImageSource::Pixmap(pm), sampler: peniko::ImageSampler::default() });
+            let quality = if f.opts.smooth_images { peniko::ImageQuality::Medium } else { peniko::ImageQuality::Low };
+            let sampler = peniko::ImageSampler { quality, ..Default::default() };
+            ctx.set_paint(vello_cpu::Image { image: vello_cpu::ImageSource::Pixmap(pm), sampler });
             match area {
                 Some((bp, rule)) => {
                     ctx.set_transform(f.view);

crates/render/src/tests.rs

@@ -362,3 +362,26 @@ fn invalid_dash_pattern_strokes_solid() {
         assert_eq!(img.pixels, solid.pixels, "dash {pattern:?}");
     }
 }
+
+/// An image drawn larger than its pixels samples smoothly, or with `smooth_images` off each screen
+/// pixel takes its nearest image pixel (Pixel Preview with File Handling › Display Bitmaps as
+/// Anti-aliased Images off, #394).
+#[test]
+fn images_take_their_nearest_pixel_without_smoothing() {
+    use vectorcraft_doc::{ImageBlob, ImageObject, NodeKind};
+    let img = image::RgbaImage::from_fn(2, 1, |x, _| image::Rgba(if x == 0 { [0, 0, 0, 255] } else { [255, 255, 255, 255] }));
+    let mut png = vec![];
+    img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
+    let mut d = Document::new(40.0, 20.0);
+    d.images.insert("bw".into(), ImageBlob::new("image/png", png));
+    let id = d.alloc_id();
+    let im = ImageObject { key: "bw".into(), width: 2, height: 1, xf: Affine::scale(20.0), link: None, placement: Default::default() };
+    d.insert(Some(d.layers[0].id), 0, Node::new(id, NodeKind::Image(im))).unwrap();
+    // How many pixels across the image are neither black nor white.
+    let greys = |smooth_images| {
+        let r = Renderer::new().render(&d, 40, 20, Affine::IDENTITY, &RenderOptions { smooth_images, ..Default::default() });
+        (0..40).filter(|x| (16..240).contains(&r.pixel(*x, 10)[0])).count()
+    };
+    assert!(greys(true) >= 4, "smooth: a ramp from black to white");
+    assert_eq!(greys(false), 0, "nearest: black, then white");
+}

crates/text/src/layout.rs

@@ -206,14 +206,17 @@ fn shrink_to_fit(db: &FontDb, t: &TextObject, opts: &LayoutOptions, min: f64) ->
     Some(best.unwrap_or_else(|| at(lo)))
 }
 
-/// `t` with every run's size, explicit leading and baseline shift scaled by `f` (auto leading
-/// follows the size; paragraph spacing stays).
+/// `t` with every run's size, explicit leading and baseline shift scaled by `f`, inline art's own
+/// shift included (auto leading and the art's size follow the size; paragraph spacing stays).
 fn scaled(t: &TextObject, f: f64) -> TextObject {
     let mut s = t.clone();
     for r in &mut s.runs {
         r.style.size *= f;
         r.style.leading = r.style.leading.map(|l| l * f);
         r.style.baseline_shift *= f;
+        if let Some(a) = &mut r.inline {
+            a.baseline_shift *= f;
+        }
     }
     s
 }
@@ -595,6 +598,15 @@ fn align_vertically(cx: &mut Ctx<'_>, paras: &[Range<usize>], t: &TextObject, re
                 g.origin.y += d;
             }
         }
+        // Inline art moves with its glyph's line.
+        for i in &mut cx.out.inlines {
+            let d = cx.out.glyphs.get(i.glyph).and_then(|g| offs.get(g.line)).copied().unwrap_or(0.0);
+            if d != 0.0 {
+                let m = Affine::translate((0.0, d));
+                i.xf = m * i.xf;
+                i.bounds = m.transform_rect_bbox(i.bounds);
+            }
+        }
         return;
     }
     let laid_out = |out: &TextLayout| out.lines.last().map_or(0, |l| l.end);
@@ -624,12 +636,17 @@ fn align_vertically(cx: &mut Ctx<'_>, paras: &[Range<usize>], t: &TextObject, re
             return;
         }
         let before = laid_out(&cx.out);
-        let prev = (std::mem::take(&mut cx.out.glyphs), std::mem::take(&mut cx.out.lines), std::mem::replace(&mut cx.out.overflow, false));
+        let prev = (
+            std::mem::take(&mut cx.out.glyphs),
+            std::mem::take(&mut cx.out.lines),
+            std::mem::take(&mut cx.out.inlines),
+            std::mem::replace(&mut cx.out.overflow, false),
+        );
         flow(cx, paras, t, Some(regions));
         if laid_out(&cx.out) < before {
             // Text no longer fits (lines got narrower, or flow around a wrap object): undo the
             // pass and try a smaller step.
-            (cx.out.glyphs, cx.out.lines, cx.out.overflow) = prev;
+            (cx.out.glyphs, cx.out.lines, cx.out.inlines, cx.out.overflow) = prev;
             for (r, (shift, gap)) in regions.iter_mut().zip(saved) {
                 r.shift = shift;
                 r.gap = gap;

crates/text/src/lib.rs

@@ -502,6 +502,8 @@ mod tests;
 #[cfg(test)]
 mod tests_bidi;
 #[cfg(test)]
+mod tests_combos;
+#[cfg(test)]
 mod tests_embed;
 #[cfg(test)]
 mod tests_fit;

crates/text/src/tests_combos.rs

@@ -0,0 +1,574 @@
+//! The text engine's newer features combined, two at a time and all together: ligatures under
+//! tracking, the paragraph composer, area type vertical alignment, Shrink Text to Fit,
+//! per-paragraph attributes and inline graphics. Each feature has its own tests; these check that
+//! one doesn't undo or skip another (as vertical alignment once left inline art behind).
+
+use super::*;
+use kurbo::Shape;
+use vectorcraft_doc::{AreaFit, CharStyle, Composer, InlineArt, Justify, TextKind, TextRun, VerticalAlign};
+use vectorcraft_geom::PathData;
+
+const COPY: &str = "Typography is the craft of arranging type to make written language legible, readable and appealing when displayed. \
+The arrangement of type involves selecting typefaces, point sizes, line lengths, line spacing and letter spacing.";
+
+/// Words full of `fi` (Source Serif 4 ligates it).
+const FI: &str = "fine fish finish first in fifty fields of fireflies, a fitting finale for the final fiddler";
+
+/// Two lines that single-line and every-line composers break differently (see
+/// `every_line_composer_balances_ragged_lines`).
+const RAG: &str = "Destroy all creatures with toughness X or less.";
+
+fn db() -> &'static FontDb {
+    FontDb::global()
+}
+
+fn sans(size: f64) -> CharStyle {
+    CharStyle { size, ..CharStyle::default() }
+}
+
+fn serif(size: f64, tracking: f64) -> CharStyle {
+    CharStyle { font_family: "Source Serif 4".into(), size, tracking, ..CharStyle::default() }
+}
+
+fn run(text: &str, style: CharStyle) -> TextRun {
+    TextRun::new(text, style)
+}
+
+/// A square symbol, `scale` × the run's size tall, raised `shift` points.
+fn art(scale: f64, shift: f64) -> InlineArt {
+    InlineArt { scale, baseline_shift: shift, bounds: Some(Rect::new(-5.0, -5.0, 5.0, 5.0)), ..InlineArt::new("sym") }
+}
+
+fn sym(scale: f64, shift: f64, style: CharStyle) -> TextRun {
+    TextRun::inline(art(scale, shift), style)
+}
+
+/// Area type in `frame` holding `runs`.
+fn area(runs: Vec<TextRun>, frame: Rect) -> TextObject {
+    let mut t = TextObject::point(Point::ZERO, "", sans(12.0));
+    t.runs = runs;
+    t.kind = TextKind::Area { frame: PathData::from_bezpath(&frame.to_path(0.1)) };
+    t.xf = Affine::IDENTITY;
+    t
+}
+
+/// `t` as Shrink Text to Fit lays it out at factor `f`, without fitting: sizes, explicit leading
+/// and baseline shifts scaled (inline art's own shift too), paragraph spacing kept.
+fn scaled_by(t: &TextObject, f: f64) -> TextObject {
+    let mut s = t.clone();
+    s.area.fit = AreaFit::None;
+    for r in &mut s.runs {
+        r.style.size *= f;
+        r.style.leading = r.style.leading.map(|l| l * f);
+        r.style.baseline_shift *= f;
+        if let Some(a) = &mut r.inline {
+            a.baseline_shift *= f;
+        }
+    }
+    s
+}
+
+fn line_texts(t: &TextObject, l: &TextLayout) -> Vec<String> {
+    let text = t.plain_text();
+    l.lines.iter().map(|li| text[li.start..li.end].trim_end().to_string()).collect()
+}
+
+/// Ligature clusters: glyphs standing for more than one character.
+fn ligatures(l: &TextLayout) -> usize {
+    l.glyphs.iter().filter(|g| g.len > 1 && !g.outline.elements().is_empty()).count()
+}
+
+/// Every inline graphic drawn once, where its glyph is: left edge on the glyph's origin, the
+/// scaled height, centred half the (scaled) cap height above the glyph's baseline plus its own
+/// (scaled) shift.
+fn assert_inlines_on_their_glyphs(t: &TextObject, l: &TextLayout, what: &str) {
+    let want = t.runs.iter().filter(|r| r.inline.is_some()).count();
+    assert_eq!(l.inlines.len(), want, "{what}: one placement per inline run");
+    let mut glyphs: Vec<usize> = l.inlines.iter().map(|i| i.glyph).collect();
+    glyphs.dedup();
+    assert_eq!(glyphs.len(), want, "{what}: no inline drawn twice");
+    for i in &l.inlines {
+        let g = &l.glyphs[i.glyph];
+        assert_eq!(g.run, i.run, "{what}");
+        let r = &t.runs[i.run];
+        let a = r.inline.as_ref().unwrap();
+        let size = r.style.size * l.fit_scale;
+        let face = db().face(&r.style.font_family, &r.style.font_style).unwrap();
+        let cap = face.cap_height * size / face.upem;
+        let b = i.bounds;
+        assert!((b.height() - a.scale * size).abs() < 1e-6, "{what}: height {} vs {}", b.height(), a.scale * size);
+        assert!((b.x0 - g.origin.x).abs() < 1e-6, "{what}: {b:?} vs origin {:?}", g.origin);
+        let centre = g.origin.y - cap * 0.5 - a.baseline_shift * l.fit_scale;
+        assert!((b.center().y - centre).abs() < 1e-6, "{what}: centre {} vs {centre} (line {})", b.center().y, g.line);
+        assert!(l.lines[g.line].glyph_start <= i.glyph && i.glyph < l.lines[g.line].glyph_end, "{what}");
+        assert!(l.bounds.contains(b.center()), "{what}: layout bounds {:?} miss {b:?}", l.bounds);
+    }
+}
+
+/// Space left below the last line of a one-cell frame.
+fn slack(l: &TextLayout, frame: Rect) -> f64 {
+    let last = l.lines.last().unwrap();
+    frame.y1 - (last.baseline + last.descent)
+}
+
+fn baselines(l: &TextLayout) -> Vec<f64> {
+    l.lines.iter().map(|li| li.baseline).collect()
+}
+
+// ---------- ligatures under tracking × … ----------
+
+#[test]
+fn ligatures_x_composer() {
+    // Justified (where every-line spreads word space) and ragged, with tracking inside the limits
+    // (kept) and letterspaced (dropped), whichever composer breaks the lines.
+    for justify in [Justify::Left, Justify::JustifyLeft] {
+        for (tracking, kept) in [(0.0, true), (20.0, true), (100.0, false)] {
+            let mut counts = vec![];
+            for composer in [Composer::SingleLine, Composer::EveryLine] {
+                let mut t = area(vec![run(&FI.repeat(3), serif(12.0, tracking))], Rect::new(0.0, 0.0, 170.0, 1000.0));
+                t.para.justify = justify;
+                t.para.composer = composer;
+                let l = layout(db(), &t);
+                assert!(l.lines.len() > 3, "several lines to compose");
+                counts.push(ligatures(&l));
+            }
+            assert_eq!(counts[0], counts[1], "{justify:?} {tracking}: composers shape alike");
+            assert_eq!(counts[0] > 0, kept, "{justify:?} {tracking}: {counts:?}");
+        }
+    }
+}
+
+#[test]
+fn ligatures_x_vertical_align() {
+    let frame = Rect::new(0.0, 0.0, 200.0, 400.0);
+    for tracking in [20.0, 100.0] {
+        let mut t = area(vec![run(FI, serif(12.0, tracking))], frame);
+        let top = layout(db(), &t);
+        for a in [VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify] {
+            t.area.vertical_align = a;
+            let l = layout(db(), &t);
+            let gids = |l: &TextLayout| l.glyphs.iter().map(|g| (g.gid, g.byte)).collect::<Vec<_>>();
+            assert_eq!(gids(&l), gids(&top), "{tracking} {a:?}: moving lines doesn't reshape them");
+            assert!(l.lines[0].baseline > top.lines[0].baseline + 1.0 || a == VerticalAlign::Justify, "{a:?}");
+        }
+    }
+}
+
+#[test]
+fn ligatures_x_shrink_text() {
+    // Tracking is in 1/1000 em, so scaling the size doesn't move it across the limits.
+    let frame = Rect::new(0.0, 0.0, 150.0, 60.0);
+    for (tracking, features, kept) in [(40.0, vec![], true), (100.0, vec![], false), (100.0, vec!["liga".to_string()], true)] {
+        let st = CharStyle { features, ..serif(14.0, tracking) };
+        let mut t = area(vec![run(&FI.repeat(2), st)], frame);
+        t.area.fit = AreaFit::ShrinkText { min_percent: 10.0 };
+        let l = layout(db(), &t);
+        assert!(!l.overflow && l.fit_scale < 1.0, "{tracking}: {}", l.fit_scale);
+        assert_eq!(ligatures(&l) > 0, kept, "{tracking}");
+        assert_eq!(ligatures(&l), ligatures(&layout(db(), &scaled_by(&t, l.fit_scale))), "{tracking}");
+    }
+}
+
+#[test]
+fn ligatures_x_paragraph_attrs() {
+    // Paragraph attributes don't touch shaping: a centred, indented, every-line paragraph keeps
+    // its ligatures and a letterspaced run in the next paragraph loses them.
+    let mut t = area(vec![run(&format!("{FI}\n"), serif(12.0, 10.0)), run(FI, serif(12.0, 120.0))], Rect::new(0.0, 0.0, 240.0, 600.0));
+    let mut second = t.para.clone();
+    second.justify = Justify::Center;
+    second.left_indent = 20.0;
+    second.space_before = 12.0;
+    t.set_paragraph_styles(vec![t.para.clone(), second]);
+    let l = layout(db(), &t);
+    let split = FI.len() + 1;
+    let ligs = |first: bool| l.glyphs.iter().filter(|g| g.len > 1 && (g.byte < split) == first).count();
+    assert!(ligs(true) > 0, "tracking 10 keeps them");
+    assert_eq!(ligs(false), 0, "tracking 120 drops them");
+}
+
+#[test]
+fn ligatures_x_inline_graphics() {
+    // An inline graphic between ligated words neither breaks their ligatures nor takes them: its
+    // own letterspaced run tracks the art without touching its neighbours.
+    let st = serif(14.0, 0.0);
+    let runs = vec![run("fine fish ", st.clone()), sym(1.0, 0.0, serif(14.0, 200.0)), run(" first fifty", st.clone())];
+    let t = area(runs, Rect::new(0.0, 0.0, 400.0, 100.0));
+    let l = layout(db(), &t);
+    let without = area(vec![run("fine fish ", st.clone()), run(" first fifty", st.clone())], Rect::new(0.0, 0.0, 400.0, 100.0));
+    assert_eq!(ligatures(&l), ligatures(&layout(db(), &without)), "the same ligatures as without the art");
+    assert!(ligatures(&l) >= 4, "fi in fine, fish, first and fifty");
+    assert_inlines_on_their_glyphs(&t, &l, "between ligatures");
+    let g = &l.glyphs[l.inlines[0].glyph];
+    assert!((g.advance - (14.0 + 200.0 / 1000.0 * 14.0)).abs() < 1e-6, "art width plus its tracking: {}", g.advance);
+}
+
+// ---------- composer × … ----------
+
+#[test]
+fn composer_x_vertical_align() {
+    let w = natural_width(RAG, 12.0) * 0.9;
+    let frame = Rect::new(0.0, 0.0, w, 200.0);
+    for composer in [Composer::SingleLine, Composer::EveryLine] {
+        let mut t = area(vec![run(RAG, sans(12.0))], frame);
+        t.para.composer = composer;
+        let top = layout(db(), &t);
+        for a in [VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify] {
+            t.area.vertical_align = a;
+            let l = layout(db(), &t);
+            assert_eq!(line_texts(&t, &l), line_texts(&t, &top), "{composer:?} {a:?}: the same breaks");
+            let want = match a {
+                VerticalAlign::Center => slack(&top, frame) * 0.5,
+                _ => slack(&top, frame),
+            };
+            let moved = l.lines.last().unwrap().baseline - top.lines.last().unwrap().baseline;
+            assert!((moved - want).abs() < 1e-6, "{composer:?} {a:?}: last line moved {moved}, want {want}");
+        }
+    }
+    // And the two composers still differ there.
+    let breaks = |c: Composer| {
+        let mut t = area(vec![run(RAG, sans(12.0))], frame);
+        t.para.composer = c;
+        t.area.vertical_align = VerticalAlign::Center;
+        line_texts(&t, &layout(db(), &t))
+    };
+    assert_ne!(breaks(Composer::SingleLine), breaks(Composer::EveryLine));
+}
+
+#[test]
+fn composer_x_shrink_text() {
+    // Each composer shrinks to the largest size at which its own breaks fit.
+    for justify in [Justify::Left, Justify::JustifyLeft] {
+        for composer in [Composer::SingleLine, Composer::EveryLine] {
+            let mut t = area(vec![run(COPY, sans(14.0))], Rect::new(0.0, 0.0, 180.0, 90.0));
+            t.para.composer = composer;
+            t.para.justify = justify;
+            t.area.fit = AreaFit::ShrinkText { min_percent: 20.0 };
+            let l = layout(db(), &t);
+            assert!(!l.overflow && l.fit_scale < 1.0, "{justify:?} {composer:?}");
+            let size = 14.0 * l.fit_scale;
+            assert!(layout(db(), &scaled_by(&t, (size + 0.1) / 14.0)).overflow, "{justify:?} {composer:?}: maximal at {size}");
+            let same = layout(db(), &scaled_by(&t, l.fit_scale));
+            assert_eq!(line_texts(&t, &same), line_texts(&t, &l), "{justify:?} {composer:?}");
+        }
+    }
+}
+
+#[test]
+fn composer_x_paragraph_attrs() {
+    // Each paragraph breaks with its own composer.
+    let w = natural_width("Destroy all creatures with toughness X or", 12.0) + 2.0;
+    let mut t = area(vec![run(&format!("{RAG}\n{RAG}\n{RAG}"), sans(12.0))], Rect::new(0.0, 0.0, w, 400.0));
+    let p = |c: Composer| vectorcraft_doc::ParaStyle { composer: c, ..t.para.clone() };
+    t.set_paragraph_styles(vec![p(Composer::SingleLine), p(Composer::EveryLine), p(Composer::SingleLine)]);
+    let l = layout(db(), &t);
+    let greedy = ["Destroy all creatures with toughness X or", "less."];
+    let every = ["Destroy all creatures with toughness X", "or less."];
+    let want: Vec<&str> = [greedy, every, greedy].concat();
+    assert_eq!(line_texts(&t, &l), want);
+    // The object-wide override still wins over every paragraph.
+    let forced = layout_with(db(), &t, &LayoutOptions { composer: Some(Composer::SingleLine), ..Default::default() });
+    assert_eq!(line_texts(&t, &forced), [greedy, greedy, greedy].concat());
+}
+
+#[test]
+fn composer_x_inline_graphics() {
+    // An inline graphic is a word's worth of box to the composers: each one breaks around it as
+    // around the letter it replaces, and the art follows its glyph to whichever line it lands on.
+    let st = sans(12.0);
+    let runs = |x: TextRun| vec![run("Destroy all creatures with toughness ", st.clone()), x, run(" or less.", st.clone())];
+    let with_art = runs(sym(0.7, 0.0, st.clone()));
+    let mut probe = area(with_art.clone(), Rect::new(0.0, 0.0, 10_000.0, 100.0));
+    probe.runs.truncate(2);
+    probe.runs.push(run(" or", st.clone()));
+    let w = layout(db(), &probe).lines[0].x1 + 2.0;
+    let sym_text = INLINE.to_string();
+    for (composer, first, second) in [
+        (Composer::SingleLine, format!("Destroy all creatures with toughness {sym_text} or"), "less."),
+        (Composer::EveryLine, format!("Destroy all creatures with toughness {sym_text}"), "or less."),
+    ] {
+        let mut t = area(with_art.clone(), Rect::new(0.0, 0.0, w, 200.0));
+        t.para.composer = composer;
+        let l = layout(db(), &t);
+        assert_eq!(line_texts(&t, &l), [first.as_str(), second], "{composer:?}");
+        assert_inlines_on_their_glyphs(&t, &l, &format!("{composer:?}"));
+    }
+}
+
+const INLINE: char = vectorcraft_doc::text::INLINE_CHAR;
+
+// ---------- vertical alignment × … ----------
+
+#[test]
+fn vertical_align_x_shrink_text() {
+    let frame = Rect::new(0.0, 0.0, 200.0, 100.0);
+    let mut t = area(vec![run(&COPY.repeat(2), sans(14.0))], frame);
+    t.area.fit = AreaFit::ShrinkText { min_percent: 10.0 };
+    let top = layout(db(), &t);
+    assert!(!top.overflow && top.fit_scale < 1.0);
+    for a in [VerticalAlign::Center, VerticalAlign::Bottom] {
+        t.area.vertical_align = a;
+        let l = layout(db(), &t);
+        assert_eq!(l.fit_scale, top.fit_scale, "{a:?}: aligning doesn't change the fit");
+        assert_eq!(line_texts(&t, &l), line_texts(&t, &top), "{a:?}");
+        let want = if a == VerticalAlign::Center { slack(&top, frame) * 0.5 } else { slack(&top, frame) };
+        for (b, b0) in baselines(&l).iter().zip(baselines(&top)) {
+            assert!((b - b0 - want).abs() < 1e-6, "{a:?}: {b} vs {b0} + {want}");
+        }
+        if a == VerticalAlign::Bottom {
+            assert!(slack(&l, frame).abs() < 1e-6, "the shrunk block sits on the bottom");
+        }
+    }
+    // Still overflowing at the minimum: aligned like any full frame (the same lines, moved by
+    // less than a line, inside the frame), at the same scale.
+    let frame = Rect::new(0.0, 0.0, 120.0, 40.0);
+    let mut t = area(vec![run(&COPY.repeat(4), sans(14.0))], frame);
+    t.area.fit = AreaFit::ShrinkText { min_percent: 90.0 };
+    let top = layout(db(), &t);
+    assert!(top.overflow && (top.fit_scale - 0.9).abs() < 1e-9);
+    for a in [VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify] {
+        t.area.vertical_align = a;
+        let l = layout(db(), &t);
+        assert!(l.overflow && l.fit_scale == top.fit_scale, "{a:?}");
+        assert_eq!(line_texts(&t, &l), line_texts(&t, &top), "{a:?}");
+        let first = &top.lines[0];
+        assert!(l.lines[0].baseline - first.baseline < first.ascent + first.descent, "{a:?}");
+        assert!(slack(&l, frame) >= -1e-6, "{a:?}");
+    }
+}
+
+#[test]
+fn vertical_align_x_paragraph_attrs() {
+    // Per-paragraph spacing and alignment survive the move: lines keep their x and their
+    // paragraph gaps, and the block lands where the alignment puts it.
+    let frame = Rect::new(0.0, 0.0, 260.0, 500.0);
+    let mut t = area(vec![run(&format!("{COPY}\n{COPY}\n{COPY}"), sans(11.0))], frame);
+    let mut mid = t.para.clone();
+    mid.justify = Justify::Center;
+    mid.space_before = 18.0;
+    mid.left_indent = 24.0;
+    let mut last = t.para.clone();
+    last.justify = Justify::Right;
+    last.space_before = 6.0;
+    t.set_paragraph_styles(vec![t.para.clone(), mid, last]);
+    let top = layout(db(), &t);
+    for a in [VerticalAlign::Center, VerticalAlign::Bottom] {
+        t.area.vertical_align = a;
+        let l = layout(db(), &t);
+        assert_eq!(line_texts(&t, &l), line_texts(&t, &top));
+        let d = l.lines[0].baseline - top.lines[0].baseline;
+        assert!(d > 1.0, "{a:?}");
+        for (li, l0) in l.lines.iter().zip(&top.lines) {
+            assert!((li.baseline - l0.baseline - d).abs() < 1e-6, "{a:?}: every line moves alike");
+            assert!((li.x0 - l0.x0).abs() < 1e-6 && (li.x1 - l0.x1).abs() < 1e-6, "{a:?}: x stays");
+        }
+        for (g, g0) in l.glyphs.iter().zip(&top.glyphs) {
+            assert!((g.origin.x - g0.origin.x).abs() < 1e-6 && (g.origin.y - g0.origin.y - d).abs() < 1e-6);
+        }
+    }
+    // Justify: spacing is shared out on top of each paragraph's own space before, never less.
+    t.area.vertical_align = VerticalAlign::Justify;
+    let l = layout(db(), &t);
+    assert!(slack(&l, frame).abs() < 1e-6, "justified to the bottom");
+    for (pair, pair0) in l.lines.windows(2).zip(top.lines.windows(2)) {
+        assert!(pair[1].baseline - pair[0].baseline >= pair0[1].baseline - pair0[0].baseline - 1e-6);
+    }
+}
+
+#[test]
+fn vertical_align_x_inline_graphics() {
+    // Inline art moves with its line however the lines are aligned, in one cell or several, in a
+    // rectangle or a frame the text flows into again.
+    let st = sans(12.0);
+    let mut runs = vec![];
+    for i in 0..6 {
+        runs.push(run(&format!("{} ", &COPY[i * 20..i * 20 + 20]), st.clone()));
+        runs.push(sym(1.0 + i as f64 * 0.1, i as f64 - 2.0, st.clone()));
+        if i == 2 {
+            runs.push(run("\n", st.clone()));
+        }
+    }
+    let mut tri = BezPath::new();
+    tri.move_to((0.0, 0.0));
+    tri.line_to((600.0, 0.0));
+    tri.line_to((300.0, 400.0));
+    tri.close_path();
+    for (name, frame, columns) in [
+        ("rect", Rect::new(0.0, 0.0, 160.0, 400.0).to_path(0.1), 1),
+        ("columns", Rect::new(0.0, 0.0, 400.0, 300.0).to_path(0.1), 2),
+        ("triangle", tri, 1),
+    ] {
+        for a in VerticalAlign::ALL {
+            let mut t = area(runs.clone(), Rect::ZERO);
+            t.kind = TextKind::Area { frame: PathData::from_bezpath(&frame) };
+            t.area.columns = columns;
+            t.area.vertical_align = a;
+            let l = layout(db(), &t);
+            assert!(!l.overflow, "{name} {a:?}");
+            assert_inlines_on_their_glyphs(&t, &l, &format!("{name} {a:?}"));
+        }
+    }
+}
+
+// ---------- Shrink Text to Fit × … ----------
+
+#[test]
+fn shrink_text_x_paragraph_attrs() {
+    // Shrinking scales the type, not each paragraph's spacing and indents: the fitted layout is
+    // the unfitted one at the scaled size.
+    let mut t = area(vec![run(&format!("{COPY}\n{COPY}"), sans(13.0))], Rect::new(0.0, 0.0, 220.0, 160.0));
+    let mut second = t.para.clone();
+    second.space_before = 14.0;
+    second.left_indent = 30.0;
+    second.first_line_indent = 12.0;
+    second.justify = Justify::JustifyLeft;
+    second.composer = Composer::SingleLine;
+    t.set_paragraph_styles(vec![t.para.clone(), second]);
+    t.area.fit = AreaFit::ShrinkText { min_percent: 10.0 };
+    let l = layout(db(), &t);
+    assert!(!l.overflow && l.fit_scale < 1.0);
+    let same = layout(db(), &scaled_by(&t, l.fit_scale));
+    assert_eq!(baselines(&l), baselines(&same));
+    assert_eq!(line_texts(&t, &l), line_texts(&t, &same));
+    // The second paragraph's indents are unscaled points.
+    let split = COPY.len() + 1;
+    let first_of_second = l.lines.iter().find(|li| li.start == split).unwrap();
+    assert!((first_of_second.x0 - 42.0).abs() < 1e-6, "{}", first_of_second.x0);
+    assert!(l.lines.iter().filter(|li| li.start > split).all(|li| (li.x0 - 30.0).abs() < 1e-6));
+    // A paragraph's space before alone can make the text overflow; shrinking still finds a fit.
+    let mut tall = t.clone();
+    tall.edit_paras(Some(1..2), |p| p.space_before = 100.0);
+    let l = layout(db(), &tall);
+    assert!(!l.overflow && l.fit_scale < layout(db(), &t).fit_scale);
+}
+
+#[test]
+fn shrink_text_x_inline_graphics() {
+    // Inline art shrinks with the type, its shift included, and stays centred on the cap height.
+    let st = sans(14.0);
+    let mut runs = vec![];
+    for i in 0..8 {
+        runs.push(run(&COPY[i * 25..i * 25 + 25], st.clone()));
+        runs.push(sym(1.2, 1.5, st.clone()));
+    }
+    let mut t = area(runs, Rect::new(0.0, 0.0, 200.0, 80.0));
+    t.area.fit = AreaFit::ShrinkText { min_percent: 10.0 };
+    let l = layout(db(), &t);
+    assert!(!l.overflow && l.fit_scale < 1.0, "{}", l.fit_scale);
+    assert_inlines_on_their_glyphs(&t, &l, "shrunk");
+    let same = layout(db(), &scaled_by(&t, l.fit_scale));
+    for (i, i0) in l.inlines.iter().zip(&same.inlines) {
+        assert!((i.bounds.y0 - i0.bounds.y0).abs() < 1e-6 && (i.bounds.x0 - i0.bounds.x0).abs() < 1e-6, "{:?} vs {:?}", i.bounds, i0.bounds);
+    }
+    // Large art makes lines taller; shrinking still fits it.
+    for r in &mut t.runs {
+        if let Some(a) = &mut r.inline {
+            a.scale = 3.0;
+        }
+    }
+    let big = layout(db(), &t);
+    assert!(!big.overflow && big.fit_scale < l.fit_scale);
+    assert_inlines_on_their_glyphs(&t, &big, "shrunk, big art");
+}
+
+// ---------- paragraph attributes × inline graphics ----------
+
+#[test]
+fn paragraph_attrs_x_inline_graphics() {
+    // Inline art in paragraphs of each alignment and indent sits on its glyph, and an inline
+    // graphic opening a paragraph takes that paragraph's first-line indent.
+    let st = sans(12.0);
+    let runs = vec![
+        run("Left aligned ", st.clone()),
+        sym(1.0, 0.0, st.clone()),
+        run(" text.\n", st.clone()),
+        sym(1.0, 0.0, st.clone()),
+        run(" centred with art first\nright ", st.clone()),
+        sym(1.5, -1.0, st.clone()),
+        run(" aligned\nfull justified text with ", st.clone()),
+        sym(1.0, 0.0, st.clone()),
+        run(" in the middle of a long line that wraps", st.clone()),
+    ];
+    let mut t = area(runs, Rect::new(0.0, 0.0, 200.0, 400.0));
+    let base = t.para.clone();
+    let with = |j: Justify, first: f64| vectorcraft_doc::ParaStyle { justify: j, first_line_indent: first, left_indent: 6.0, ..base.clone() };
+    t.set_paragraph_styles(vec![base.clone(), with(Justify::Center, 0.0), with(Justify::Right, 0.0), with(Justify::JustifyLeft, 18.0)]);
+    let l = layout(db(), &t);
+    assert_inlines_on_their_glyphs(&t, &l, "paragraphs");
+    let opening = &l.glyphs[l.inlines[1].glyph];
+    let line = &l.lines[opening.line];
+    assert!((opening.origin.x - line.x0).abs() < 1e-6, "the art opens its line");
+    assert!(((line.x0 + line.x1) * 0.5 - (6.0 + 200.0) * 0.5).abs() < 1e-6, "the centred paragraph: {line:?}");
+    let right = &l.lines[l.glyphs[l.inlines[2].glyph].line];
+    assert!((right.x1 - 200.0).abs() < 1e-6, "{right:?}");
+    let full = l.lines.iter().find(|li| li.start == t.plain_text().find("full").unwrap()).unwrap();
+    assert!((full.x0 - 24.0).abs() < 1e-6, "left indent + first-line indent: {full:?}");
+}
+
+// ---------- all of them ----------
+
+/// One area type object with everything on: two paragraphs with their own attributes (the first
+/// ragged every-line with inline symbols and lightly tracked ligatures, the second single-line,
+/// justified and spaced away), centred vertically, shrunk to fit.
+#[test]
+fn every_feature_at_once() {
+    let rules = serif(14.0, 15.0);
+    let flavor = CharStyle { font_style: "Italic".into(), ..serif(14.0, 0.0) };
+    let mut runs = vec![];
+    for (i, words) in
+        ["Sacrifice a fine fish", "First strike. When this finishes fighting, draw a card", "Fifty fireflies fill the field"].iter().enumerate()
+    {
+        runs.push(sym(0.8, 0.0, rules.clone()));
+        runs.push(run(&format!(": {words}. "), rules.clone()));
+        if i == 1 {
+            runs.push(sym(0.8, 0.5, rules.clone()));
+            runs.push(run(" Then fight again.", rules.clone()));
+        }
+    }
+    runs.push(run("\nThe finest fishers find their fortune in the fjords, if they first fix their nets.", flavor));
+    let frame = Rect::new(0.0, 0.0, 240.0, 110.0);
+    let mut t = area(runs, frame);
+    let mut flav = t.para.clone();
+    flav.space_before = 10.0;
+    flav.justify = Justify::JustifyLeft;
+    flav.composer = Composer::SingleLine;
+    t.para.composer = Composer::EveryLine;
+    t.set_paragraph_styles(vec![t.para.clone(), flav]);
+    t.area.fit = AreaFit::ShrinkText { min_percent: 30.0 };
+
+    let top = layout(db(), &t);
+    t.area.vertical_align = VerticalAlign::Center;
+    let l = layout(db(), &t);
+    assert!(!l.overflow && l.fit_scale < 1.0, "{}", l.fit_scale);
+    assert_eq!(l.fit_scale, top.fit_scale);
+    // Shrunk: the same as laying out the scaled text, then centring it.
+    let mut unfit = scaled_by(&t, l.fit_scale);
+    unfit.area.vertical_align = VerticalAlign::Top;
+    let plain = layout(db(), &unfit);
+    assert_eq!(line_texts(&t, &l), line_texts(&t, &plain));
+    let d = slack(&plain, frame) * 0.5;
+    assert!(d > 0.0);
+    for (b, b0) in baselines(&l).iter().zip(baselines(&plain)) {
+        assert!((b - b0 - d).abs() < 1e-6, "centred: {b} vs {b0} + {d}");
+    }
+    // Every symbol on its glyph; ligatures kept at tracking 15.
+    assert_inlines_on_their_glyphs(&t, &l, "everything");
+    assert_eq!(l.inlines.len(), 4);
+    assert!(ligatures(&l) >= 6, "{}", ligatures(&l));
+    // The flavor paragraph: justified (all but its last line fill the measure) and spaced away.
+    let split = t.plain_text().find('\n').unwrap() + 1;
+    let flavor_lines: Vec<&LineInfo> = l.lines.iter().filter(|li| li.start >= split).collect();
+    assert!(flavor_lines.len() >= 2);
+    for li in &flavor_lines[..flavor_lines.len() - 1] {
+        assert!((li.x1 - li.x0 - 240.0).abs() < 0.5, "justified: {li:?}");
+    }
+    // Deterministic.
+    let again = layout(db(), &t);
+    assert_eq!(baselines(&again), baselines(&l));
+    assert_eq!(again.inlines.iter().map(|i| i.bounds).collect::<Vec<_>>(), l.inlines.iter().map(|i| i.bounds).collect::<Vec<_>>());
+}
+
+/// The natural width of `s` set in one line at `size`.
+fn natural_width(s: &str, size: f64) -> f64 {
+    let l = layout(db(), &TextObject::point(Point::ZERO, s, sans(size)));
+    l.lines[0].x1 - l.lines[0].x0
+}

crates/text/src/tests_inline.rs

@@ -296,3 +296,33 @@ fn top_to_top_leading_spaces_inline_art_by_its_run() {
     let (tall0, tall1) = lines(3.0);
     assert!((small0 - tall0).abs() < 1e-6 && (small1 - tall1).abs() < 1e-6, "{small0} {small1} / {tall0} {tall1}");
 }
+
+#[test]
+fn inline_art_moves_with_vertically_aligned_lines() {
+    use vectorcraft_doc::text::{AreaOptions, VerticalAlign};
+    // A rectangle (lines shift) and a triangle (text flows again lower down).
+    let rect = Rect::new(0.0, 0.0, 400.0, 400.0).to_path(0.1);
+    let mut tri = kurbo::BezPath::new();
+    tri.move_to((0.0, 0.0));
+    tri.line_to((800.0, 0.0));
+    tri.line_to((400.0, 400.0));
+    tri.close_path();
+    for frame in [rect, tri] {
+        for align in [VerticalAlign::Center, VerticalAlign::Bottom] {
+            let mut t = text("A", art(1.0), "B", 20.0);
+            t.kind = TextKind::Area { frame: PathData::from_bezpath(&frame) };
+            t.area = AreaOptions { vertical_align: align, ..AreaOptions::default() };
+            let l = layout(db(), &t);
+            assert_eq!(l.inlines.len(), 1, "{align:?}");
+            let g = inline_glyph(&l);
+            let line = &l.lines[g.line];
+            assert!(line.baseline > 100.0, "{align:?}: not aligned, baseline {}", line.baseline);
+            // Still centred on the cap height above its (moved) baseline.
+            let face = db().face("Source Sans 3", "Regular").unwrap();
+            let cap = face.cap_height * 20.0 / face.upem;
+            let b = l.inlines[0].bounds;
+            assert!((b.center().y - (line.baseline - cap * 0.5)).abs() < 1e-6, "{align:?}: {b:?} baseline {}", line.baseline);
+            assert!((b.x0 - g.origin.x).abs() < 1e-6, "{align:?}: {b:?}");
+        }
+    }
+}

crates/trace/src/lib.rs

@@ -4,8 +4,11 @@
 //! and classic colour quantisation), not from any existing implementation:
 //!
 //! 1. **Quantise** the image into a small palette: a luminance threshold (Black and White), 1-D
-//!    k-means over the luminance histogram (Grayscale), or median cut followed by weighted
-//!    k-means over a 15-bit colour histogram (Color). Transparent pixels are left out.
+//!    k-means over the luminance histogram (Grayscale), or, in Color, over a 15-bit colour
+//!    histogram as the [`Palette`] asks: median cut to a colour count followed by weighted k-means
+//!    (Limited), median cut until every colour box is tight (Full Tone), one of those two by
+//!    whether the image is flat art (Automatic), or the most used colours of a swatch library
+//!    (Document Library). Transparent pixels are left out.
 //! 2. **Remove noise**: 4-connected same-colour components smaller than `noise` pixels are merged
 //!    into their most common neighbouring colour.
 //! 3. **Follow boundaries**: for each colour layer, the pixel-crack edges between inside and
@@ -39,7 +42,7 @@ use vectorcraft_geom::PathData;
 
 pub use contour::{Component, Loop, trace_mask};
 pub use mosaic::mosaic;
-pub use quantize::{Quantized, TRANSPARENT, denoise, quantize};
+pub use quantize::{FULL_TONE_MAX, Quantized, TRANSPARENT, denoise, quantize};
 
 /// Errors decoding a raster.
 #[derive(Debug, thiserror::Error)]
@@ -137,6 +140,28 @@ pub enum Method {
     Overlapping,
 }
 
+/// Where Color mode's colours come from (the Palette popup).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Palette {
+    /// The `colors` colours that best represent the image.
+    #[default]
+    #[serde(alias = "Limited")]
+    Limited,
+    /// As many colours as the image's tones need, up to [`FULL_TONE_MAX`] (photos, gradients):
+    /// `color_detail` sets how close two colours may be and stay apart.
+    #[serde(alias = "Full Tone")]
+    FullTone,
+    /// Flat art (a few colours cover nearly all of it) traces with exactly those colours, anything
+    /// else as Full Tone.
+    #[serde(alias = "Automatic")]
+    Automatic,
+    /// The most used colours of a swatch library ([`TraceParams::swatches`]), at most `colors` of
+    /// them, exactly as they are.
+    #[serde(alias = "library", alias = "Document Library")]
+    DocumentLibrary,
+}
+
 /// Image Trace parameters (the Image Trace panel).
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(default, rename_all = "camelCase")]
@@ -144,8 +169,20 @@ pub struct TraceParams {
     pub mode: Mode,
     /// Black and White: pixels darker than this (luminance 0–255) are black.
     pub threshold: u8,
-    /// Palette size for Color, number of grays for Grayscale (2–256).
+    /// Color: where the colours come from.
+    pub palette: Palette,
+    /// Palette size for Color (Limited; at most this many for Document Library), number of grays
+    /// for Grayscale (2–256).
     pub colors: u32,
+    /// Full Tone and Automatic: how many colours, 0 (few) – 100 (many).
+    pub color_detail: f64,
+    /// Document Library: the swatch library, `"document"` (the document's swatches) or a library id
+    /// or name. The caller looks its colours up into `swatches`.
+    pub library: String,
+    /// Document Library: the library's colours (sRGB). Not saved: they are looked up from
+    /// `library` at every trace.
+    #[serde(skip)]
+    pub swatches: Vec<[u8; 3]>,
     /// Paths (fidelity) 0–100: higher follows the pixels more tightly.
     pub paths: f64,
     /// Corners 0–100: higher keeps more corners.
@@ -171,7 +208,11 @@ impl Default for TraceParams {
         Self {
             mode: Mode::BlackAndWhite,
             threshold: 128,
+            palette: Palette::Limited,
             colors: 6,
+            color_detail: 50.0,
+            library: "document".into(),
+            swatches: vec![],
             paths: 50.0,
             corners: 75.0,
             noise: 25,

crates/trace/src/quantize.rs

@@ -1,6 +1,6 @@
 //! Colour reduction and noise removal.
 
-use crate::{Mode, Raster, TraceParams};
+use crate::{Mode, Palette, Raster, TraceParams};
 
 /// Label of a transparent (untraced) pixel.
 pub const TRANSPARENT: u16 = u16::MAX;
@@ -67,10 +67,8 @@ pub fn quantize(img: &Raster, params: &TraceParams) -> Quantized {
                     b.sum[2] += p[2] as u64;
                 }
             }
-            let used: Vec<(usize, [f64; 3], f64)> =
-                bins.iter().enumerate().filter(|(_, b)| b.n > 0).map(|(i, b)| (i, b.mean(), b.n as f64)).collect();
-            let k = params.colors.clamp(2, 256) as usize;
-            let centers = kmeans_rgb(&used, k);
+            let used: Vec<Used> = bins.iter().enumerate().filter(|(_, b)| b.n > 0).map(|(i, b)| (i, b.mean(), b.n as f64)).collect();
+            let centers = color_palette(&used, params);
             let mut lut = vec![0u16; 1 << 15];
             for (i, c, _) in &used {
                 lut[*i] = nearest_rgb(&centers, *c) as u16;
@@ -187,12 +185,108 @@ fn nearest_rgb(centers: &[[f64; 3]], c: [f64; 3]) -> usize {
     best.1
 }
 
-/// Median cut for the initial palette, then weighted k-means refinement over histogram bins.
-fn kmeans_rgb(used: &[(usize, [f64; 3], f64)], k: usize) -> Vec<[f64; 3]> {
+/// The most colours Full Tone (and Automatic on continuous-tone images) makes.
+pub const FULL_TONE_MAX: usize = 256;
+
+/// A histogram bin in use: its index, mean colour and pixel count.
+type Used = (usize, [f64; 3], f64);
+
+/// Color mode's palette for the histogram bins `used`, as `params.palette` asks.
+fn color_palette(used: &[Used], params: &TraceParams) -> Vec<[f64; 3]> {
+    let k = params.colors.clamp(2, 256) as usize;
+    let detail = (params.color_detail / 100.0).clamp(0.0, 1.0);
+    // Full Tone: split until no colour box is wider than 96 (few colours) … 8 (many) levels per
+    // channel, which is one histogram bin.
+    let full_tone = || refine(used, centers(&median_cut(used, FULL_TONE_MAX, 96.0 - 88.0 * detail)));
+    match params.palette {
+        Palette::Limited => kmeans_rgb(used, k),
+        Palette::FullTone => full_tone(),
+        Palette::Automatic => match flat_colors(used, detail) {
+            Some(n) => kmeans_rgb(used, n),
+            None => full_tone(),
+        },
+        Palette::DocumentLibrary if !params.swatches.is_empty() => library_colors(used, &params.swatches, k),
+        // No library colours to use: as Limited.
+        Palette::DocumentLibrary => kmeans_rgb(used, k),
+    }
+}
+
+/// Automatic: how many colours flat art is made of, or `None` for continuous tone (photos,
+/// gradients). Flat art has most of its pixels in a few tight colours (anti-aliased edges and
+/// noise aside): the bins holding 90% of the pixels are few, and each colour's pixels sit mostly
+/// in one bin. `detail` (0–1) lets smaller colour areas count as colours of their own.
+fn flat_colors(used: &[Used], detail: f64) -> Option<usize> {
+    let total: f64 = used.iter().map(|u| u.2).sum();
+    if total <= 0.0 {
+        return Some(2);
+    }
+    let mut by_count: Vec<&Used> = used.iter().collect();
+    by_count.sort_by(|a, b| b.2.total_cmp(&a.2));
+    let mut covered = 0.0;
+    let main = by_count
+        .iter()
+        .take_while(|u| {
+            let before = covered;
+            covered += u.2;
+            before < 0.9 * total
+        })
+        .count();
+    if main > FLAT_BINS {
+        return None;
+    }
+    let boxes = median_cut(used, 64, 24.0);
+    let min_share = (0.04 - 0.035 * detail) * total;
+    let colours: Vec<&ColorBox> = boxes.iter().filter(|b| b.weight >= min_share).collect();
+    let weight: f64 = colours.iter().map(|b| b.weight).sum();
+    let peaks: f64 = colours.iter().map(|b| b.peak).sum();
+    (weight >= 0.9 * total && peaks >= 0.5 * weight && colours.len() <= 32).then_some(colours.len().max(2))
+}
+
+/// The most histogram bins flat art's main colours spread over (a few bins per colour).
+const FLAT_BINS: usize = 96;
+
+/// Document Library: the `k` swatches (at most) that the most pixels are nearest to.
+fn library_colors(used: &[Used], swatches: &[[u8; 3]], k: usize) -> Vec<[f64; 3]> {
+    let mut all: Vec<[f64; 3]> = vec![];
+    for s in swatches {
+        let c = s.map(f64::from);
+        if !all.contains(&c) {
+            all.push(c);
+        }
+    }
+    let mut weight = vec![0.0; all.len()];
+    for (_, c, n) in used {
+        if let Some(w) = weight.get_mut(nearest_rgb(&all, *c)) {
+            *w += n;
+        }
+    }
+    let mut order: Vec<usize> = (0..all.len()).collect();
+    order.sort_by(|a, b| weight[*b].total_cmp(&weight[*a]).then(a.cmp(b)));
+    order.into_iter().take(k.max(1)).filter_map(|i| all.get(i).copied()).collect()
+}
+
+/// A median-cut box: its weighted mean colour, pixel count and the pixel count of its heaviest bin.
+struct ColorBox {
+    mean: [f64; 3],
+    weight: f64,
+    peak: f64,
+}
+
+fn centers(boxes: &[ColorBox]) -> Vec<[f64; 3]> {
+    boxes.iter().map(|b| b.mean).collect()
+}
+
+/// Median cut to `k` colours, then weighted k-means refinement over histogram bins.
+fn kmeans_rgb(used: &[Used], k: usize) -> Vec<[f64; 3]> {
+    refine(used, centers(&median_cut(used, k, 0.0)))
+}
+
+/// Median cut: repeatedly split the box with the largest weighted extent, while there are fewer
+/// than `k` boxes and some box spans more than `spread` levels of a channel.
+fn median_cut(used: &[Used], k: usize, spread: f64) -> Vec<ColorBox> {
     if used.is_empty() {
-        return vec![[255.0; 3]];
+        return vec![ColorBox { mean: [255.0; 3], weight: 0.0, peak: 0.0 }];
     }
-    // Median cut: repeatedly split the box with the largest weighted extent.
     let mut boxes: Vec<Vec<usize>> = vec![(0..used.len()).collect()];
     while boxes.len() < k {
         let mut best: Option<(f64, usize, usize)> = None;
@@ -210,7 +304,7 @@ fn kmeans_rgb(used: &[(usize, [f64; 3], f64)], k: usize) -> Vec<[f64; 3]> {
                 wsum += used[i].2;
             }
             let (ch, range) = (0..3).map(|c| (c, hi[c] - lo[c])).fold((0, -1.0), |a, b| if b.1 > a.1 { b } else { a });
-            if range <= 0.0 {
+            if range <= spread.max(0.0) {
                 continue;
             }
             let score = range * wsum.sqrt();
@@ -235,21 +329,25 @@ fn kmeans_rgb(used: &[(usize, [f64; 3], f64)], k: usize) -> Vec<[f64; 3]> {
         boxes.push(b);
         boxes.push(tail);
     }
-    let mut centers: Vec<[f64; 3]> = boxes
+    boxes
         .iter()
         .map(|b| {
             let mut s = [0.0; 3];
-            let mut w = 0.0;
+            let (mut w, mut peak) = (0.0, 0.0f64);
             for &i in b {
                 for (acc, v) in s.iter_mut().zip(used[i].1) {
                     *acc += v * used[i].2;
                 }
                 w += used[i].2;
+                peak = peak.max(used[i].2);
             }
-            [s[0] / w, s[1] / w, s[2] / w]
+            ColorBox { mean: [s[0] / w, s[1] / w, s[2] / w], weight: w, peak }
         })
-        .collect();
-    // Lloyd refinement.
+        .collect()
+}
+
+/// Lloyd refinement of `centers` over the bins `used`.
+fn refine(used: &[Used], mut centers: Vec<[f64; 3]>) -> Vec<[f64; 3]> {
     for _ in 0..12 {
         let mut sum = vec![[0.0; 3]; centers.len()];
         let mut cnt = vec![0.0; centers.len()];

crates/trace/src/tests.rs

@@ -350,6 +350,96 @@ fn an_image_too_large_to_trace_is_refused_before_decoding() {
     assert!(matches!(Raster::decode(&png_header(64, 64)), Err(TraceError::Decode(_))), "a small header goes on to decoding");
 }
 
+/// Four flat colours with anti-aliased (blended) edges between the quadrants.
+fn flat_quads() -> Raster {
+    const C: [[u8; 3]; 4] = [[220, 30, 30], [30, 200, 40], [30, 40, 210], [240, 220, 20]];
+    Raster::from_fn(100, 100, |x, y| {
+        let at = |x: u32, y: u32| C[usize::from(x >= 50) + 2 * usize::from(y >= 50)];
+        let (a, b) = (at(x, y), at(x.saturating_sub(1), y.saturating_sub(1)));
+        // Blend the pixels along the quadrant edges, as an anti-aliased picture has them.
+        let c: Vec<u8> = a.iter().zip(b).map(|(p, q)| ((u16::from(*p) + u16::from(q)) / 2) as u8).collect();
+        [c[0], c[1], c[2], 255]
+    })
+}
+
+/// A smooth two-dimensional colour gradient (continuous tone).
+fn gradient() -> Raster {
+    Raster::from_fn(128, 128, |x, y| [(x * 2) as u8, (y * 2) as u8, (255 - x - y / 2) as u8, 255])
+}
+
+fn palette(img: &Raster, palette: Palette, colors: u32, color_detail: f64) -> Vec<[u8; 3]> {
+    let p = TraceParams { mode: Mode::Color, palette, colors, color_detail, noise: 4, ..TraceParams::default() };
+    trace(img, &p).palette
+}
+
+#[test]
+fn palettes_parse_from_their_ids_and_names() {
+    for (id, want) in [
+        ("limited", Palette::Limited),
+        ("fullTone", Palette::FullTone),
+        ("Automatic", Palette::Automatic),
+        ("documentLibrary", Palette::DocumentLibrary),
+        ("library", Palette::DocumentLibrary),
+    ] {
+        let p: TraceParams = serde_json::from_value(serde_json::json!({ "palette": id })).unwrap();
+        assert_eq!(p.palette, want, "{id}");
+    }
+    assert_eq!(TraceParams::default().palette, Palette::Limited);
+    // The library's colours are looked up at every trace, not saved with the settings.
+    let v = serde_json::to_value(TraceParams { swatches: vec![[1, 2, 3]], ..TraceParams::default() }).unwrap();
+    assert!(v.get("swatches").is_none() && v["library"] == "document" && v["colorDetail"] == 50.0, "{v}");
+}
+
+#[test]
+fn full_tone_follows_the_tones_the_image_has() {
+    // Flat art keeps its few colours (and the tones of its blended edges); a gradient gets many,
+    // more with more detail.
+    let flat = palette(&flat_quads(), Palette::FullTone, 6, 50.0);
+    assert!((4..=10).contains(&flat.len()), "flat art: {flat:?}");
+    let few = palette(&gradient(), Palette::FullTone, 6, 10.0).len();
+    let many = palette(&gradient(), Palette::FullTone, 6, 90.0).len();
+    assert!(few > 6 && many > few && many <= FULL_TONE_MAX, "{few} then {many} colours");
+}
+
+#[test]
+fn automatic_traces_flat_art_with_its_colours_and_photos_in_full_tone() {
+    let flat = palette(&flat_quads(), Palette::Automatic, 2, 50.0);
+    assert_eq!(flat.len(), 4, "the four flat colours, whatever `colors` says: {flat:?}");
+    assert!(flat.iter().any(|c| c[0] > 200 && c[1] < 60 && c[2] < 60), "red is one of them: {flat:?}");
+    let tone = palette(&gradient(), Palette::Automatic, 2, 50.0);
+    assert_eq!(tone.len(), palette(&gradient(), Palette::FullTone, 2, 50.0).len(), "continuous tone: as Full Tone");
+}
+
+#[test]
+fn document_library_uses_the_most_used_swatches_exactly() {
+    let swatches = vec![[255, 0, 0], [0, 255, 0], [0, 0, 255], [255, 255, 0], [0, 0, 0], [255, 255, 255]];
+    let p = |colors| TraceParams {
+        mode: Mode::Color,
+        palette: Palette::DocumentLibrary,
+        colors,
+        swatches: swatches.clone(),
+        noise: 4,
+        ..TraceParams::default()
+    };
+    let hard = Raster::from_fn(100, 100, |x, y| match (x < 50, y < 50) {
+        (true, true) => [220, 30, 30, 255],
+        (false, true) => [30, 200, 40, 255],
+        (true, false) => [30, 40, 210, 255],
+        (false, false) => [240, 220, 20, 255],
+    });
+    let res = trace(&hard, &p(6));
+    let mut got = res.palette.clone();
+    got.sort_unstable();
+    assert_eq!(got, [[0, 0, 255], [0, 255, 0], [255, 0, 0], [255, 255, 0]], "the nearest swatch of each colour, as it is");
+    assert!(res.paths.iter().all(|t| swatches.contains(&t.color)));
+    // At most `colors` of them: the ones the most pixels are nearest to.
+    let two = trace(&hard, &p(2)).palette;
+    assert!(two.len() <= 2 && two.iter().all(|c| swatches.contains(c)), "{two:?}");
+    // Without library colours, it traces as Limited.
+    let none = TraceParams { swatches: vec![], ..p(4) };
+    assert_eq!(trace(&hard, &none).palette.len(), 4);
+}
+
 fn strokes(fills: bool) -> TraceParams {
     TraceParams { strokes: true, fills, stroke_width: 6.0, noise: 4, ..bw() }
 }

crates/ui-egui/src/canvas.rs

@@ -69,9 +69,17 @@ enum Drag {
         center: Point,
         middle: bool,
     },
+    /// A Zoom tool drag without Animated Zoom: the area to zoom to.
     ZoomBox {
         start: Pos2,
     },
+    /// A Zoom tool press with Animated Zoom ([`animated_zoom`]): dragged sideways it zooms about
+    /// `start`, held still (for `held` seconds so far) it zooms on, else it's a click.
+    ZoomScrub {
+        start: Pos2,
+        held: f32,
+        moved: bool,
+    },
     RotateView {
         start_angle: f64,
         start_rot: f64,
@@ -221,6 +229,9 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     // View › Pixel Preview: the art as it rasterizes, one pixel per point, while a document pixel
     // is bigger than a screen pixel (below that the screen render already shows it).
     let pixel = (app.ui.view.pixel_preview && v.zoom * ppp as f64 > 1.0).then(|| pixel_region(&xf)).flatten();
+    // File Handling › Display Bitmaps as Anti-aliased Images in Pixel Preview: off, images show
+    // their pixels as they rasterize, hard-edged.
+    let smooth_images = pixel.is_none() || app.session.prefs.anti_aliased_bitmaps;
     let key = CacheKey {
         doc: st.uid as usize,
         revision: st.revision,
@@ -237,6 +248,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
         anti_alias: app.session.prefs.anti_aliased_artwork,
         placed: vectorcraft_render::placed_document::generation(),
         pixel,
+        smooth_images,
     };
     // Placed documents' bitmaps are being made: draw again when they are ready.
     if vectorcraft_render::placed_document::busy() {
@@ -284,6 +296,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
             // pattern tiles stay smooth), as in Illustrator.
             anti_alias: if app.session.prefs.anti_aliased_artwork { vectorcraft_render::AntiAlias::Art } else { vectorcraft_render::AntiAlias::None },
             progressive_placed: true,
+            trace_views: true,
+            smooth_images,
             ..opts
         };
         // Light documents render synchronously (no lag vs overlays); heavy ones go to the worker.
@@ -437,15 +451,18 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
             }
             // Caps Lock gives precise (crosshair) cursors, like Illustrator; env opt-out for system cursors.
             let custom = std::env::var_os("VECTORCRAFT_SYSTEM_CURSORS").is_none();
+            // User Interface › Scale Cursor Proportional to UI: the glyphs grow with UI Scaling;
+            // off, they keep their size.
+            let ui_scale = if app.session.prefs.scale_cursor_with_ui { 1.0 } else { ui.ctx().zoom_factor() };
             match ui.input(|i| i.pointer.hover_pos()) {
                 // An OS cursor: the system moves it at once, where a painted one trails the pointer
                 // (#444). The system cursor stands in for cursors without a glyph.
                 Some(_) if custom && crate::cursors::OS_CURSORS => {
-                    let ppp = ui.ctx().native_pixels_per_point().unwrap_or_else(|| ui.ctx().pixels_per_point());
+                    let ppp = ui.ctx().pixels_per_point() / ui_scale;
                     ui.ctx().set_cursor_image(app.canvas.cursors.get(c, ppp));
                     cursor_icon(c)
                 }
-                Some(hp) if custom && crate::cursors::paint(&painter, c, hp) => egui::CursorIcon::None,
+                Some(hp) if custom && crate::cursors::paint(&painter, c, hp, 1.0 / ui_scale) => egui::CursorIcon::None,
                 _ => cursor_icon(c),
             }
         } else {
@@ -515,17 +532,15 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
         prev.is_some_and(|prev| prev != m)
     });
 
-    // Zoom around the pointer, or scroll ([`wheel`]).
+    // Zoom around the pointer, and scroll ([`wheel`]): fingers pinching on a touch screen may also
+    // slide.
     if resp.hovered() {
-        if (factor - 1.0).abs() > 1e-6 {
-            if let (Some(p), Some(vm)) = (hover, app.view_mut()) {
-                let before = xf.to_doc(p);
-                vm.zoom = (vm.zoom * factor).clamp(0.0313, 640.0);
-                let nx = Xf { rect, zoom: vm.zoom, center: vm.center, rot: vm.rotation.to_radians() };
-                let after = nx.to_doc(p);
-                vm.center += before - after;
-            }
-        } else if scroll != egui::Vec2::ZERO
+        if (factor - 1.0).abs() > 1e-6
+            && let (Some(p), Some(vm)) = (hover, app.view_mut())
+        {
+            zoom_about(vm, rect, p, vm.zoom * factor);
+        }
+        if scroll != egui::Vec2::ZERO
             && let Some(vm) = app.view_mut()
         {
             let d = Xf { rect, zoom: vm.zoom, center: vm.center, rot: vm.rotation.to_radians() }.delta_to_doc(scroll);
@@ -549,7 +564,7 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
         ui.ctx().memory_mut(|mem| mem.stop_text_input());
         app.ui.flyout = None;
         let d = if zoom_mode {
-            Drag::ZoomBox { start: p }
+            if animated_zoom(&app.session.prefs) { Drag::ZoomScrub { start: p, held: 0.0, moved: false } } else { Drag::ZoomBox { start: p } }
         } else if pan_mode {
             Drag::Pan { start: p, center: v.center, middle: false }
         } else if tool == "rotateView" {
@@ -596,7 +611,26 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
                         vm.rotation = vectorcraft_geom::normalize_deg(deg);
                     }
                 }
-                Drag::ZoomBox { .. } | Drag::Art | Drag::Gesture => {}
+                Drag::ZoomBox { start } => marquee(ui.painter(), egui::Rect::from_two_pos(start, p)),
+                Drag::ZoomScrub { start, held, moved } => {
+                    let dt = ui.input(|i| i.unstable_dt).min(0.25);
+                    let (held, moved) = (held + dt, moved || (p - start).length() > SCRUB_SLOP);
+                    // Dragged sideways it zooms with the pointer, held still it zooms on (Alt: out).
+                    let exponent = if moved {
+                        f64::from(pointer.delta().x) * SCRUB_ZOOM
+                    } else if held > HOLD_DELAY {
+                        f64::from(dt) * HOLD_ZOOM * if m.alt { -1.0 } else { 1.0 }
+                    } else {
+                        0.0
+                    };
+                    if exponent != 0.0
+                        && let Some(vm) = app.view_mut()
+                    {
+                        zoom_about(vm, rect, start, vm.zoom * exponent.exp());
+                    }
+                    ui.data_mut(|dd| dd.insert_temp(drag_id(), Drag::ZoomScrub { start, held, moved }));
+                }
+                Drag::Art | Drag::Gesture => {}
                 Drag::Tool if drag_art_out(app, ui, resp, p, view) => {
                     ui.data_mut(|dd| dd.insert_temp(drag_id(), Drag::Art));
                 }
@@ -629,13 +663,17 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
                             vm.center = Point::new((a.x + b.x) / 2.0, (a.y + b.y) / 2.0);
                             vm.zoom = (rect.width() as f64 / (b.x - a.x)).min(rect.height() as f64 / (b.y - a.y)).clamp(0.0313, 640.0);
                         } else {
-                            let before = xf.to_doc(p);
-                            vm.zoom = crate::state::next_zoom(vm.zoom, !m.alt);
-                            let nx = Xf { rect, zoom: vm.zoom, center: vm.center, rot: vm.rotation.to_radians() };
-                            vm.center += before - nx.to_doc(p);
+                            zoom_about(vm, rect, p, crate::state::next_zoom(vm.zoom, !m.alt));
                         }
                     }
                 }
+                // A click (not held, not dragged) steps the zoom as with the marquee.
+                Drag::ZoomScrub { held, moved: false, .. } if held <= HOLD_DELAY => {
+                    if let Some(vm) = app.view_mut() {
+                        zoom_about(vm, rect, p, crate::state::next_zoom(vm.zoom, !m.alt));
+                    }
+                }
+                Drag::ZoomScrub { .. } => {}
                 Drag::Tool => {
                     let ev = PointerEvent { kind: PointerKind::Up, pos: xf.to_doc(p), mods: mods(m, space), pressure: pen_pressure(ui, false) };
                     dispatch(app, &ev, view);
@@ -671,14 +709,46 @@ fn handle_input(app: &mut VectorcraftApp, ui: &Ui, resp: &egui::Response, rect:
 
 /// How much one point of wheel motion zooms (as `exp(points × WHEEL_ZOOM)`).
 const WHEEL_ZOOM: f64 = 0.01;
+/// Animated Zoom: how much one point of sideways drag zooms (100 points to the right double it).
+const SCRUB_ZOOM: f64 = std::f64::consts::LN_2 / 100.0;
+/// Animated Zoom: how far the pointer moves before a press is a drag, in points.
+const SCRUB_SLOP: f32 = 3.0;
+/// Animated Zoom: how long a press is held still before it zooms on, in seconds…
+const HOLD_DELAY: f32 = 0.3;
+/// …and how fast it zooms then (as `exp(seconds × HOLD_ZOOM)`: twice as close each second).
+const HOLD_ZOOM: f64 = std::f64::consts::LN_2;
 
-/// What the wheel and a pinch did over the canvas this frame: a zoom factor (about the pointer)
-/// and a scroll (screen points the content moves). The wheel scrolls, Cmd- and Alt-wheel (Option
+/// Performance › Animated Zoom, which needs GPU Performance as in Illustrator: the Zoom tool zooms
+/// as it is dragged sideways or held, instead of zooming to the area dragged across.
+pub(crate) fn animated_zoom(p: &vectorcraft_engine::Prefs) -> bool {
+    p.animated_zoom && p.gpu_performance
+}
+
+/// Zoom view `vm` of the canvas `rect` to `zoom` (clamped to the zoom range), keeping the document
+/// point under screen point `p` where it is.
+fn zoom_about(vm: &mut View, rect: egui::Rect, p: Pos2, zoom: f64) {
+    let before = Xf::new(rect, vm).to_doc(p);
+    vm.zoom = zoom.clamp(0.0313, 640.0);
+    vm.center += before - Xf::new(rect, vm).to_doc(p);
+}
+
+/// A dashed marquee around screen rectangle `r`.
+fn marquee(p: &egui::Painter, r: egui::Rect) {
+    let pts = [r.left_top(), r.right_top(), r.right_bottom(), r.left_bottom(), r.left_top()];
+    for w in pts.windows(2) {
+        p.extend(Shape::dashed_line(&[w[0], w[1]], Stroke::new(1.0, Color32::from_gray(90)), 3.0, 3.0));
+    }
+}
+
+/// What the wheel, a pinch and a two-finger drag on a touch screen did over the canvas this frame:
+/// a zoom factor (about the pointer) and a scroll (screen points the content moves). The wheel scrolls, Cmd- and Alt-wheel (Option
 /// on the Mac) zoom. With General › Zoom with Mouse Wheel (`wheel_zooms`) the wheel and Alt-wheel
 /// zoom, Shift-wheel scrolls up and down and Cmd/Ctrl-wheel sideways. `line` and `page`: points
 /// per wheel line and page. `alt_turn`: the last wheel turn was an Alt-wheel one (kept by the
 /// caller across frames).
 fn wheel(i: &egui::InputState, wheel_zooms: bool, line: f32, page: f32, alt_turn: &mut bool) -> (f64, egui::Vec2) {
+    // Fingers on a touch screen pan the content with them (a trackpad sends scrolls instead).
+    let pan = i.multi_touch().map_or(egui::Vec2::ZERO, |t| t.translation_delta);
     if !wheel_zooms {
         // egui makes Cmd-wheel (and a pinch) its zoom and the rest a scroll it spreads over a few
         // frames: the rest of an Alt-wheel turn zooms too, however soon Alt is let go.
@@ -687,14 +757,14 @@ fn wheel(i: &egui::InputState, wheel_zooms: bool, line: f32, page: f32, alt_turn
         }
         let (zoom, scroll) = (f64::from(i.zoom_delta()), i.smooth_scroll_delta);
         return if *alt_turn && scroll != egui::Vec2::ZERO {
-            (zoom * (f64::from(scroll.x + scroll.y) * WHEEL_ZOOM).exp(), egui::Vec2::ZERO)
+            (zoom * (f64::from(scroll.x + scroll.y) * WHEEL_ZOOM).exp(), pan)
         } else {
-            (zoom, scroll)
+            (zoom, scroll + pan)
         };
     }
     // The wheel events themselves: egui's own handling turns Cmd-wheel into a zoom.
     let mut zoom = i.multi_touch().map_or(1.0, |t| f64::from(t.zoom_delta));
-    let mut scroll = egui::Vec2::ZERO;
+    let mut scroll = pan;
     for e in &i.events {
         match e {
             egui::Event::MouseWheel { unit, delta, modifiers, .. } => {
@@ -1630,13 +1700,7 @@ fn names_an_artboard(text: &str) -> bool {
 fn draw_overlays(p: &egui::Painter, xf: &Xf, overlays: &[Overlay], t: &Tokens, look: HandleLook) {
     for o in overlays {
         match o {
-            Overlay::Marquee(r) => {
-                let sr = xf.rect_to_screen(*r);
-                let pts = [sr.left_top(), sr.right_top(), sr.right_bottom(), sr.left_bottom(), sr.left_top()];
-                for w in pts.windows(2) {
-                    p.extend(Shape::dashed_line(&[w[0], w[1]], Stroke::new(1.0, Color32::from_gray(90)), 3.0, 3.0));
-                }
-            }
+            Overlay::Marquee(r) => marquee(p, xf.rect_to_screen(*r)),
             Overlay::Path { path, color, width, dashed } => {
                 let s = Stroke::new(*width, c32(*color));
                 if *dashed {
@@ -1718,6 +1782,7 @@ fn home(app: &mut VectorcraftApp, ui: &mut Ui, rect: egui::Rect) {
             app.run("file.open", json!({})).ok();
         }
     });
+    recent(app, ui);
     ui.add_space(28.0);
     ui.label(egui::RichText::new(tl!("Quickly start a new file")).font(theme::semibold(14.0)).color(t.text));
     ui.add_space(10.0);
@@ -1738,6 +1803,35 @@ fn home(app: &mut VectorcraftApp, ui: &mut Ui, rect: egui::Rect) {
     crate::community::links(app, ui);
 }
 
+/// The Home screen's Recent Files (#663): the first of File › Open Recent Files, each its name and
+/// folder; a click opens it. Nothing when there are none.
+fn recent(app: &mut VectorcraftApp, ui: &mut Ui) {
+    const SHOWN: usize = 6;
+    let files: Vec<String> = crate::io::recent_files(app).iter().take(SHOWN).cloned().collect();
+    if files.is_empty() {
+        return;
+    }
+    let t = Tokens::get(ui.ctx());
+    ui.add_space(28.0);
+    ui.label(egui::RichText::new(tl!("Recent Files")).font(theme::semibold(14.0)).color(t.text));
+    ui.add_space(8.0);
+    for path in files {
+        let p = std::path::Path::new(&path);
+        let name = p.file_name().map_or_else(|| path.clone(), |n| n.to_string_lossy().into_owned());
+        let folder = p.parent().map(|f| f.to_string_lossy().into_owned()).unwrap_or_default();
+        ui.horizontal(|ui| {
+            crate::icons::icon(ui, "history", 16.0, t.icon);
+            let r = ui.add(egui::Button::new(egui::RichText::new(&name).color(t.accent).size(13.0)).frame(false)).on_hover_text(&path);
+            ui.add(egui::Label::new(egui::RichText::new(&folder).size(12.0).color(t.text_dim)).truncate());
+            if r.clicked()
+                && let Err(e) = crate::io::open_path(app, &path)
+            {
+                app.status(e);
+            }
+        });
+    }
+}
+
 fn kurbo_flatten(p: &BezPath, tol: f64, f: &mut impl FnMut(PathEl)) {
     vectorcraft_geom::kurbo::flatten(p.elements().iter().copied(), tol, f);
 }
@@ -2375,6 +2469,28 @@ mod tests {
         assert!(partial(&alphas(&mut app).expect("re-rendered")) > 50, "smooth again");
     }
 
+    /// File Handling › Display Bitmaps as Anti-aliased Images in Pixel Preview (#394): off, Pixel
+    /// Preview draws images with each pixel taking its nearest image pixel; on, smoothly, as the
+    /// canvas always does out of Pixel Preview.
+    #[test]
+    fn pixel_preview_smooths_bitmaps_only_when_asked() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        app.canvas.worker_started = true; // render on this thread
+        let ctx = egui::Context::default();
+        let smooth = |app: &mut VectorcraftApp| {
+            let (_, mut delta) = frame_output(app, &ctx);
+            delta.clear();
+            app.canvas.key.as_ref().map(|k| k.smooth_images).unwrap()
+        };
+        assert!(smooth(&mut app), "out of Pixel Preview");
+        app.ui.view.pixel_preview = true;
+        app.view_mut().unwrap().zoom = 8.0;
+        assert!(!smooth(&mut app), "Pixel Preview, off by default");
+        app.run("prefs.set", json!({"key": "antiAliasedBitmaps", "value": true})).unwrap();
+        assert!(smooth(&mut app), "Pixel Preview, on");
+    }
+
     /// Guides & Grid › Show Pixel Grid (Above 600% Zoom) (#394): in Pixel Preview at 600% zoom and
     /// above, a line at every document pixel over the art; none below 600%, out of Pixel Preview,
     /// or with the option off.
@@ -2657,6 +2773,107 @@ mod tests {
         assert!((zoom - 1.0).abs() < 1e-9 && scroll.x < -1.0 && scroll.y == 0.0, "on: Cmd-wheel scrolls sideways ({zoom}, {scroll:?})");
     }
 
+    /// Two fingers dragged together on a touch screen pan the canvas with them, under either
+    /// Zoom with Mouse Wheel setting, and draw nothing (#449).
+    #[test]
+    fn two_fingers_dragged_together_pan_the_canvas() {
+        for wheel_zooms in [false, true] {
+            let mut app = VectorcraftApp::new(Session::new(), Default::default());
+            app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+            app.session.execute("prefs.set", &json!({"key": "zoomWithMouseWheel", "value": wheel_zooms})).unwrap();
+            app.select_tool("rectangle");
+            let ctx = egui::Context::default();
+            frame(&mut app, &ctx, vec![]);
+            let c = app.canvas_rect.unwrap().center();
+            let touch = |n: u64, phase, pos| egui::Event::Touch { device_id: egui::TouchDeviceId(1), id: egui::TouchId(n), phase, pos, force: None };
+            let fingers = |phase, d: egui::Vec2| vec![touch(1, phase, c - vec2(40.0, 0.0) + d), touch(2, phase, c + vec2(40.0, 0.0) + d)];
+            let before = *app.view().unwrap();
+            // egui-winit moves the pointer with the first finger, as here.
+            frame(&mut app, &ctx, vec![egui::Event::PointerMoved(c - vec2(40.0, 0.0))]);
+            frame(&mut app, &ctx, fingers(egui::TouchPhase::Start, Vec2::ZERO));
+            for k in 1..=3 {
+                frame(&mut app, &ctx, fingers(egui::TouchPhase::Move, vec2(10.0, 8.0) * k as f32));
+            }
+            frame(&mut app, &ctx, fingers(egui::TouchPhase::End, vec2(30.0, 24.0)));
+            let after = *app.view().unwrap();
+            let moved = (after.center - before.center) * after.zoom;
+            assert!((after.zoom / before.zoom - 1.0).abs() < 1e-9, "no zoom: {wheel_zooms}");
+            assert!((moved.x + 30.0).abs() < 0.5 && (moved.y + 24.0).abs() < 0.5, "the content follows the fingers ({wheel_zooms}): {moved:?}");
+            assert_eq!(app.session.active().unwrap().doc.layers[0].children().unwrap().len(), 0, "nothing drawn");
+        }
+    }
+
+    /// Performance › Animated Zoom (#394): the Zoom tool dragged sideways zooms about where it was
+    /// pressed (right in, left out), held still it zooms on, and a click still steps. Off, or with
+    /// GPU Performance off, a drag zooms to the area dragged across.
+    #[test]
+    fn animated_zoom_scrubs_and_holds_else_the_zoom_tool_zooms_to_an_area() {
+        use egui::Event;
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        app.select_tool("zoom");
+        let ctx = egui::Context::default();
+        frame(&mut app, &ctx, vec![]);
+        let rect = app.canvas_rect.unwrap();
+        let at = rect.center() - vec2(100.0, 50.0);
+        let button = |pos, pressed| Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        // Press at `at`, move by `by` and hold for `frames` frames (a 60th of a second each), let go.
+        let press = |app: &mut VectorcraftApp, by: egui::Vec2, frames: usize| {
+            frame(app, &ctx, vec![Event::PointerMoved(at)]);
+            frame(app, &ctx, vec![button(at, true)]);
+            frame(app, &ctx, vec![Event::PointerMoved(at + by)]);
+            for _ in 0..frames {
+                frame(app, &ctx, vec![]);
+            }
+            frame(app, &ctx, vec![button(at + by, false)]);
+        };
+        let doc_at = |app: &VectorcraftApp, p: Pos2| Xf::new(rect, app.view().unwrap()).to_doc(p);
+        let pinned = doc_at(&app, at);
+        let z0 = app.view().unwrap().zoom;
+        press(&mut app, vec2(100.0, 0.0), 0);
+        let z1 = app.view().unwrap().zoom;
+        assert!((z1 / z0 - 2.0).abs() < 1e-6, "100 points right doubles the zoom: {z0} → {z1}");
+        assert!(doc_at(&app, at).distance(pinned) < 1e-6, "about the press");
+        press(&mut app, vec2(-100.0, 0.0), 0);
+        assert!((app.view().unwrap().zoom - z0).abs() < 1e-6, "and back to the left");
+        press(&mut app, vec2(0.0, 0.0), 0);
+        assert_eq!(app.view().unwrap().zoom, crate::state::next_zoom(z0, true), "a click steps");
+        let z2 = app.view().unwrap().zoom;
+        press(&mut app, vec2(0.0, 0.0), 40);
+        assert!(app.view().unwrap().zoom > z2 * 1.2, "held, it zooms on");
+        assert!(doc_at(&app, at).distance(pinned) < 1e-6, "about the press");
+        // Off (or without GPU Performance): the area dragged across fills the view.
+        for key in ["animatedZoom", "gpuPerformance"] {
+            app.run("prefs.reset", json!({})).unwrap();
+            app.run("prefs.set", json!({"key": key, "value": false})).unwrap();
+            app.view_mut().unwrap().zoom = z0;
+            press(&mut app, vec2(100.0, 50.0), 0);
+            let z = app.view().unwrap().zoom;
+            assert!((z - z0 * (rect.width() / 100.0).min(rect.height() / 50.0) as f64).abs() < 1e-6, "{key} off: {z0} → {z}");
+        }
+    }
+
+    /// User Interface › Large Tabs (#394): the document tabs are taller, so the canvas starts lower.
+    #[test]
+    fn large_tabs_make_the_document_tabs_taller() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let canvas_top = |app: &mut VectorcraftApp| {
+            let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), ..Default::default() };
+            let mut out = ctx.run_ui(raw, |ui| {
+                crate::chrome::doc_tabs(app, ui);
+                show(app, ui);
+            });
+            out.textures_delta.clear();
+            app.canvas_rect.unwrap().top()
+        };
+        let small = canvas_top(&mut app);
+        app.run("prefs.set", json!({"key": "largeTabs", "value": true})).unwrap();
+        assert_eq!(canvas_top(&mut app) - small, 9.0, "44 points instead of 35");
+    }
+
     #[test]
     fn cmd_space_zooms_and_space_pans_whatever_the_tool() {
         use egui::{Event, Modifiers};

crates/ui-egui/src/chrome.rs

@@ -319,10 +319,12 @@ fn tab_title(d: &vectorcraft_engine::DocState, zoom: f64, outline: bool) -> Stri
     format!("{}{} @ {} ({mode})", d.title(), if d.is_dirty() { "*" } else { "" }, zoom_label(zoom).replace('%', " %"))
 }
 
-/// Document tab strip: "Name* @ 66.67% (RGB/Preview)".
+/// Document tab strip: "Name* @ 66.67% (RGB/Preview)". User Interface › Large Tabs makes the tabs
+/// taller, with larger titles.
 pub fn doc_tabs(app: &mut VectorcraftApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
-    let (strip, _) = ui.allocate_exact_size(vec2(ui.available_width(), 35.0), Sense::hover());
+    let (height, title_size) = if app.session.prefs.large_tabs { (44.0, 14.0) } else { (35.0, 12.5) };
+    let (strip, _) = ui.allocate_exact_size(vec2(ui.available_width(), height), Sense::hover());
     ui.painter().rect_filled(strip, 0.0, t.tab_strip);
     ui.painter().line_segment([strip.left_bottom(), strip.right_bottom()], Stroke::new(1.0, t.border));
     let mut x = strip.left();
@@ -334,7 +336,7 @@ pub fn doc_tabs(app: &mut VectorcraftApp, ui: &mut Ui) {
         let title = tab_title(d, zoom, app.ui.view.outline);
         // On the Home screen no tab is the current one.
         let is_active = Some(i) == active && app.ui.home.is_none();
-        let galley = ui.painter().layout_no_wrap(title, theme::semibold(12.5), if is_active { t.text_strong } else { t.text_dim });
+        let galley = ui.painter().layout_no_wrap(title, theme::semibold(title_size), if is_active { t.text_strong } else { t.text_dim });
         let w = galley.size().x + 50.0;
         let r = egui::Rect::from_min_size(egui::pos2(x, strip.top()), vec2(w, strip.height() - 1.0));
         let resp = ui.interact(r, ui.id().with(("tab", i)), Sense::click());
@@ -517,6 +519,9 @@ pub fn status_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
 
 /// Contextual hint for the active tool: segments of (text, bold). Keys in bold segments are
 /// written as shortcuts are ("Alt+Click"); [`hint_segments`] names them for the platform.
+/// The hint of the Zoom tool with Performance › Animated Zoom on.
+const ANIMATED_ZOOM_HINT: &str = "zoom.animated";
+
 fn hint_for(tool: &str) -> Option<&'static [(&'static str, bool)]> {
     Some(match tool {
         "selection" => &[
@@ -588,6 +593,16 @@ fn hint_for(tool: &str) -> Option<&'static [(&'static str, bool)]> {
             ("Drag", true),
             (" to zoom into an area", false),
         ],
+        ANIMATED_ZOOM_HINT => &[
+            ("Click", true),
+            (" to zoom in  |  ", false),
+            ("Alt+Click", true),
+            (" to zoom out  |  ", false),
+            ("Drag", true),
+            (" right or left to zoom in or out  |  ", false),
+            ("Hold", true),
+            (" to keep zooming", false),
+        ],
         "eyedropper" => &[
             ("Click", true),
             (" an object to copy its attributes  |  ", false),
@@ -674,8 +689,8 @@ fn hint_for(tool: &str) -> Option<&'static [(&'static str, bool)]> {
 /// can insist a complete language covers them.
 pub fn hint_strings() -> Vec<&'static str> {
     let mut v = Vec::new();
-    for tool in vectorcraft_tools::catalog::all_tools() {
-        for &(text, bold) in hint_for(tool.id).unwrap_or(&[]) {
+    for tool in vectorcraft_tools::catalog::all_tools().map(|t| t.id).chain([ANIMATED_ZOOM_HINT]) {
+        for &(text, bold) in hint_for(tool).unwrap_or(&[]) {
             let text = if bold { text.rsplit_once('+').map_or(text, |(_, k)| k) } else { text };
             if !text.is_empty() && !text.chars().all(|c| c.is_ascii_digit()) && !v.contains(&text) {
                 v.push(text);
@@ -729,7 +744,10 @@ pub fn hint_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
                 ui.painter().text(r.center(), egui::Align2::CENTER_CENTER, "?", theme::semibold(11.0), t.text);
                 ui.add_space(6.0);
                 let mut job = egui::text::LayoutJob::default();
-                for (txt, bold) in hint_segments(app.session.tool_id()) {
+                let tool = app.session.tool_id();
+                // The Zoom tool's drag zooms to an area, or with Animated Zoom zooms as it goes.
+                let hint = if tool == "zoom" && crate::canvas::animated_zoom(&app.session.prefs) { ANIMATED_ZOOM_HINT } else { tool };
+                for (txt, bold) in hint_segments(hint) {
                     let font = if bold { theme::semibold(12.5) } else { egui::FontId::proportional(12.5) };
                     job.append(&txt, 0.0, egui::TextFormat { font_id: font, color: if bold { t.text_strong } else { t.text }, ..Default::default() });
                 }
@@ -832,4 +850,33 @@ mod tests {
         s.execute("transparency.stopEditingOpacityMask", &json!({})).unwrap();
         assert!(title(&s).ends_with("(RGB/Preview)"));
     }
+
+    /// The Zoom tool's hint follows Performance › Animated Zoom (#394): a drag zooms as it goes,
+    /// or (off) zooms into the area dragged across.
+    #[test]
+    fn the_zoom_hint_follows_animated_zoom() {
+        fn texts(s: &egui::Shape, out: &mut String) {
+            match s {
+                egui::Shape::Text(t) => out.push_str(t.galley.text()),
+                egui::Shape::Vec(v) => v.iter().for_each(|s| texts(s, out)),
+                _ => {}
+            }
+        }
+        let mut app = crate::VectorcraftApp::new(Session::new(), Default::default());
+        app.select_tool("zoom");
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let hint = |app: &mut crate::VectorcraftApp| {
+            let mut out = ctx.run_ui(egui::RawInput::default(), |ui| super::hint_bar(app, ui));
+            out.textures_delta.clear();
+            let mut shown = String::new();
+            out.shapes.iter().for_each(|c| texts(&c.shape, &mut shown));
+            shown
+        };
+        let on = hint(&mut app);
+        assert!(on.contains(" right or left to zoom in or out") && on.contains("Hold"), "{on}");
+        app.run("prefs.set", json!({"key": "animatedZoom", "value": false})).unwrap();
+        let off = hint(&mut app);
+        assert!(off.contains(" to zoom into an area") && !off.contains("Hold"), "{off}");
+    }
 }

crates/ui-egui/src/cursors.rs

@@ -288,10 +288,19 @@ fn glyph(c: Cursor, p: Pos2) -> Option<Vec<Shape>> {
     Some(std::mem::take(&mut ink.0))
 }
 
-/// Paint cursor `c` at `p` on the given (foreground) painter, where the window can't show it as an
-/// OS cursor ([`OS_CURSORS`]). Returns false for cursors that stay system cursors.
-pub fn paint(painter: &Painter, c: Cursor, p: Pos2) -> bool {
-    glyph(c, p).map(|shapes| painter.extend(shapes)).is_some()
+/// Paint cursor `c` at `p`, `scale` times its size, on the given (foreground) painter, where the
+/// window can't show it as an OS cursor ([`OS_CURSORS`]). Returns false for cursors that stay
+/// system cursors.
+pub fn paint(painter: &Painter, c: Cursor, p: Pos2, scale: f32) -> bool {
+    let place = egui::emath::TSTransform::new(p.to_vec2(), scale);
+    glyph(c, Pos2::ZERO)
+        .map(|shapes| {
+            painter.extend(shapes.into_iter().map(|mut s| {
+                s.transform(place);
+                s
+            }))
+        })
+        .is_some()
 }
 
 /// Does the window show the glyphs as OS cursors ([`Images`])? Not on macOS, which sizes a cursor
@@ -555,6 +564,43 @@ mod tests {
         assert!(off.platform_output.cursor_image.is_none());
     }
 
+    /// User Interface › Scale Cursor Proportional to UI (#394): off, the tool cursors keep their
+    /// size whatever the UI Scaling; on, they grow with it.
+    #[test]
+    fn tool_cursors_scale_with_the_ui_only_when_asked() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width": 400, "height": 300})).unwrap();
+        app.run("prefs.set", json!({"key": "uiScaling", "value": 2.0})).unwrap();
+        let ctx = egui::Context::default();
+        for _ in 0..3 {
+            frame(&mut app, &ctx, vec![]);
+        }
+        assert_eq!(ctx.zoom_factor(), 2.0);
+        let over = app.canvas_rect.unwrap().center();
+        let shown =
+            |app: &mut VectorcraftApp, d: f32| frame(app, &ctx, vec![egui::Event::PointerMoved(over + vec2(d, 0.0))]).platform_output.cursor_image;
+        if OS_CURSORS {
+            assert_eq!(shown(&mut app, 0.0).unwrap(), app.canvas.cursors.get(Cursor::Arrow, 1.0).unwrap(), "off: its own size");
+            app.run("prefs.set", json!({"key": "scaleCursorWithUi", "value": true})).unwrap();
+            assert_eq!(shown(&mut app, 4.0).unwrap(), app.canvas.cursors.get(Cursor::Arrow, 2.0).unwrap(), "on: twice as big");
+        }
+        // Painted into the window (macOS, the web), the glyph is drawn at the scale asked for, its
+        // hotspot where the pointer is.
+        let painted = |scale: f32| {
+            let ctx = egui::Context::default();
+            let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+                let layer = egui::LayerId::new(egui::Order::Tooltip, egui::Id::new("probe"));
+                assert!(paint(&ui.ctx().layer_painter(layer), Cursor::Arrow, pos2(100.0, 100.0), scale));
+            });
+            out.textures_delta.clear();
+            out.textures_delta.clear();
+            out.shapes.iter().fold(egui::Rect::NOTHING, |r, c| r.union(c.shape.visual_bounding_rect()))
+        };
+        let (full, half) = (painted(1.0), painted(0.5));
+        assert!((half.height() * 2.0 - full.height()).abs() < 1.5 && full.height() > 15.0, "{full:?} {half:?}");
+        assert!(full.contains(pos2(100.0, 100.0)) && half.contains(pos2(100.0, 100.0)), "{full:?} {half:?}");
+    }
+
     #[test]
     fn arrow_hotspot_is_tip() {
         let pts = arrow_points(pos2(10.0, 20.0));

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

@@ -190,7 +190,7 @@ fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
                 ui.vertical(|ui| {
                     ui.set_width(640.0);
                     ui.set_min_height(HEIGHT - 32.0);
-                    presets(app, ui, &mut d);
+                    b.create |= presets(app, ui, &mut d);
                 });
             });
             egui::Frame::NONE.fill(t.panel_darker).inner_margin(egui::Margin::same(18)).show(ui, |ui| {
@@ -205,8 +205,9 @@ fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
     b.finish(app, ctx, d);
 }
 
-/// The category tabs and the chosen category's preset cards.
-fn presets(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) {
+/// The category tabs and the chosen category's preset cards: a click chooses one, a double-click
+/// also creates it (true then).
+fn presets(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
     let t = Tokens::get(ui.ctx());
     let names: Vec<&str> = newdoc::category_names().collect();
     let cat = names.iter().position(|n| n.eq_ignore_ascii_case(&d.str("category"))).unwrap_or(0);
@@ -227,20 +228,24 @@ fn presets(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) {
     if list.is_empty() {
         let hint = if cat == 1 { tl!("Presets you save with the Save Preset button appear here.") } else { tl!("Documents you create appear here.") };
         ui.label(egui::RichText::new(hint).color(t.text_dim));
-        return;
+        return false;
     }
+    let mut create = false;
     egui::ScrollArea::vertical().id_salt(("newdoc-presets", cat)).max_height(HEIGHT - 110.0).auto_shrink([false, false]).show(ui, |ui| {
         ui.horizontal_wrapped(|ui| {
             ui.spacing_mut().item_spacing = egui::vec2(12.0, 12.0);
             let (w, h, preset) = (d.f64("width", 0.0), d.f64("height", 0.0), d.str("preset"));
             for s in &list {
                 let selected = d.fields.contains_key(APPLIED) && s.name == preset && s.width == w && s.height == h;
-                if preset_card(ui, s, selected).clicked() {
+                let card = preset_card(ui, s, selected);
+                if card.clicked() || card.double_clicked() {
                     apply(d, s);
                 }
+                create |= card.double_clicked();
             }
         });
     });
+    create
 }
 
 /// Is `name` a built-in preset's? Those are ours (translated); Recent and Saved hold the names of
@@ -345,7 +350,7 @@ fn details(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, b: &mut
     // Close and Create at the bottom right.
     ui.add_space((HEIGHT - (ui.cursor().top() - top) - 28.0).max(12.0));
     ui.allocate_ui_with_layout(egui::vec2(ui.available_width(), 28.0), egui::Layout::right_to_left(egui::Align::Center), |ui| {
-        b.create = widgets::primary_button(ui, tl!("Create")).clicked();
+        b.create |= widgets::primary_button(ui, tl!("Create")).clicked();
         ui.add_space(8.0);
         b.close = widgets::secondary_button(ui, tl!("Close")).clicked();
     });
@@ -441,17 +446,8 @@ fn choice(ui: &mut egui::Ui, d: &mut Dialog, key: &str, options: &[(Value, Strin
 
 /// The collapsible Advanced Options: Color Mode, Raster Effects and Preview Mode.
 fn advanced(ui: &mut egui::Ui, d: &mut Dialog, label: f32, field: f32) {
-    let t = Tokens::get(ui.ctx());
     let open = d.bool("advanced");
-    let resp = ui
-        .horizontal(|ui| {
-            let (r, _) = ui.allocate_exact_size(egui::vec2(14.0, 18.0), egui::Sense::hover());
-            crate::icons::paint(ui, if open { "chevron-down" } else { "chevron-right" }, r, t.icon);
-            ui.label(egui::RichText::new(tl!("Advanced Options")).color(t.text));
-        })
-        .response
-        .interact(egui::Sense::click());
-    if resp.clicked() {
+    if widgets::section_toggle(ui, tl!("Advanced Options"), open) {
         d.fields.insert("advanced".into(), json!(!open));
     }
     if !open {
@@ -567,7 +563,7 @@ fn show_more(app: &mut VectorcraftApp, ctx: &egui::Context) {
         ui.horizontal(|ui| {
             templates = widgets::secondary_button(ui, tl!("Templates…")).on_hover_text(tl!("New from Template")).clicked();
             ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
-                b.create = widgets::primary_button(ui, tl!("Create Document")).clicked();
+                b.create |= widgets::primary_button(ui, tl!("Create Document")).clicked();
                 ui.add_space(8.0);
                 // Cancel goes back to New Document.
                 if widgets::secondary_button(ui, tl!("Cancel")).clicked() {
@@ -619,6 +615,51 @@ mod tests {
         app.ui.dialog.as_ref().unwrap().fields.get(k).cloned().unwrap_or_default()
     }
 
+    /// A double-click on a preset card creates the document from it (#663); a click only chooses it.
+    #[test]
+    fn a_double_clicked_preset_creates_the_document() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.newDialog", json!({})).unwrap();
+        set(&mut app, "category", json!("Mobile"));
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        // Frames 50 ms apart, so two clicks a frame apart make a double-click.
+        let mut time = 0.0;
+        let mut run = |app: &mut VectorcraftApp, events| {
+            time += 0.05;
+            let screen_rect = Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1400.0, 1000.0)));
+            let raw = egui::RawInput { screen_rect, events, time: Some(time), ..Default::default() };
+            let mut out = ctx.run_ui(raw, |ui| crate::dialogs::show(app, ui.ctx()));
+            out.textures_delta.clear();
+            out
+        };
+        run(&mut app, vec![]);
+        // The first card of the category, found by its size line.
+        let card = |app: &mut VectorcraftApp, run: &mut dyn FnMut(&mut VectorcraftApp, Vec<egui::Event>) -> egui::FullOutput| {
+            let out = run(app, vec![]);
+            let mut texts = vec![];
+            fn walk(s: &egui::Shape, out: &mut Vec<(String, egui::Rect)>) {
+                match s {
+                    egui::Shape::Text(t) => out.push((t.galley.text().to_string(), t.visual_bounding_rect())),
+                    egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+                    _ => {}
+                }
+            }
+            out.shapes.iter().for_each(|c| walk(&c.shape, &mut texts));
+            texts.into_iter().find(|(t, _)| t.starts_with("Phone 393")).map(|(_, r)| r.center()).unwrap()
+        };
+        let at = card(&mut app, &mut run);
+        let press = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        run(&mut app, vec![egui::Event::PointerMoved(at), press(true)]);
+        run(&mut app, vec![press(false)]);
+        assert!(app.ui.dialog.is_some() && app.session.documents().is_empty(), "a click only chooses it");
+        assert!(field(&app, "preset").as_str().is_some_and(|p| p == "Phone 393×852"), "{:?}", field(&app, "preset"));
+        run(&mut app, vec![press(true)]);
+        run(&mut app, vec![press(false)]);
+        assert!(app.ui.dialog.is_none(), "the double-click created it: {:?}", app.ui.status);
+        assert_eq!(app.session.documents().len(), 1);
+    }
+
     #[test]
     fn a_preset_fills_the_details_and_create_makes_the_document() {
         let mut app = VectorcraftApp::new(Session::new(), Default::default());

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

@@ -1152,6 +1152,11 @@
 	Ignore	Ignorar
 	Ignore Artboards (all the art as one page)	Ignorar mesas de trabajo (toda la ilustración como una página)
 	Ignore White	Ignorar blanco
+	Palette:	Paleta:
+	Limited	Limitada
+	Full Tone	Tono completo
+	Document Library	Biblioteca del documento
+	Library:	Biblioteca:
 	Image	Imagen
 	Image Info	Información de imagen
 	Image Map:	Mapa de imagen:
@@ -2490,6 +2495,13 @@
 	Smooth Color	Color suavizado
 	Smooth Tool	Herramienta Suavizar
 	Snap Curves To Lines	Ajustar curvas a líneas
+	View:	Vista:
+	Tracing Result	Resultado de calco
+	Tracing Result with Outlines	Resultado de calco con contornos
+	Outlines	Contornos
+	Outlines with Source Image	Contornos con imagen de origen
+	Source Image	Imagen de origen
+	Image Trace View	Vista del calco de imagen
 	Snap Options	Opciones de ajuste
 	Snap to Glyph	Ajustar a glifo
 	Snap to Grid	Ajustar a cuadrícula
@@ -2975,6 +2987,9 @@
 	 to zoom in  |  	 para acercar  |  
 	 to zoom out  |  	 para alejar  |  
 	 to zoom into an area	 para acercar un área
+	Hold	Mantener pulsado
+	 right or left to zoom in or out  |  	 a la derecha o a la izquierda para acercar o alejar  |  
+	 to keep zooming	 para seguir haciendo zoom
 	 an object to copy its attributes  |  	 en un objeto para copiar sus atributos  |  
 	 to apply the selection's to it  |  	 para aplicarle los de la selección  |  
 	 to sample a color	 para muestrear un color

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

@@ -1151,6 +1151,11 @@
 	Ignore	Ignorer
 	Ignore Artboards (all the art as one page)	Ignorer les plans de travail (toute l’illustration sur une page)
 	Ignore White	Ignorer le blanc
+	Palette:	Palette :
+	Limited	Limitée
+	Full Tone	Tons continus
+	Document Library	Bibliothèque du document
+	Library:	Bibliothèque :
 	Image	Image
 	Image Info	Informations sur l’image
 	Image Map:	Image cliquable :
@@ -2487,6 +2492,13 @@
 	Smooth Color	Couleur lissée
 	Smooth Tool	Outil Arrondi
 	Snap Curves To Lines	Aimanter les courbes aux lignes
+	View:	Affichage :
+	Tracing Result	Résultat de la vectorisation
+	Tracing Result with Outlines	Résultat de la vectorisation avec contours
+	Outlines	Contours
+	Outlines with Source Image	Contours avec l’image source
+	Source Image	Image source
+	Image Trace View	Affichage de la vectorisation de l’image
 	Snap Options	Options de magnétisme
 	Snap to Glyph	Aimanter au glyphe
 	Snap to Grid	Aimanter à la grille
@@ -2972,6 +2984,9 @@
 	 to zoom in  |  	 pour effectuer un zoom avant  |  
 	 to zoom out  |  	 pour effectuer un zoom arrière  |  
 	 to zoom into an area	 pour zoomer sur une zone
+	Hold	Maintenir
+	 right or left to zoom in or out  |  	 vers la droite ou la gauche pour effectuer un zoom avant ou arrière  |  
+	 to keep zooming	 pour continuer le zoom
 	 an object to copy its attributes  |  	 sur un objet pour copier ses attributs  |  
 	 to apply the selection's to it  |  	 pour lui appliquer ceux de la sélection  |  
 	 to sample a color	 pour prélever une couleur

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

@@ -1151,6 +1151,11 @@
 	Ignore	Ignora
 	Ignore Artboards (all the art as one page)	Ignora tavole da disegno (tutta la grafica come una sola pagina)
 	Ignore White	Ignora bianco
+	Palette:	Palette:
+	Limited	Limitata
+	Full Tone	Tono continuo
+	Document Library	Libreria del documento
+	Library:	Libreria:
 	Image	Immagine
 	Image Info	Informazioni immagine
 	Image Map:	Mappa immagine:
@@ -2490,6 +2495,13 @@
 	Smooth Color	Colore graduale
 	Smooth Tool	Strumento Smussa
 	Snap Curves To Lines	Aggancia curve a linee
+	View:	Vista:
+	Tracing Result	Risultato ricalco
+	Tracing Result with Outlines	Risultato ricalco con contorni
+	Outlines	Contorni
+	Outlines with Source Image	Contorni con immagine di origine
+	Source Image	Immagine di origine
+	Image Trace View	Vista del ricalco immagine
 	Snap Options	Opzioni di aggancio
 	Snap to Glyph	Aggancia a glifo
 	Snap to Grid	Aggancia alla griglia
@@ -2975,6 +2987,9 @@
 	 to zoom in  |  	 per ingrandire  |  
 	 to zoom out  |  	 per ridurre  |  
 	 to zoom into an area	 per ingrandire un'area
+	Hold	Tieni premuto
+	 right or left to zoom in or out  |  	 a destra o a sinistra per ingrandire o ridurre  |  
+	 to keep zooming	 per continuare lo zoom
 	 an object to copy its attributes  |  	 su un oggetto per copiarne gli attributi  |  
 	 to apply the selection's to it  |  	 per applicargli quelli della selezione  |  
 	 to sample a color	 per campionare un colore

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

@@ -675,6 +675,9 @@
 	 to transform  |  	：変形  |  
 	 to zoom in  |  	：拡大  |  
 	 to zoom into an area	：範囲を拡大
+	Hold	長押し
+	 right or left to zoom in or out  |  	：右で拡大、左で縮小  |  
+	 to keep zooming	：拡大または縮小し続ける
 	 to zoom out  |  	：縮小  |  
 	 while dragging to move perpendicular to the plane  |  	：ドラッグ中に面と垂直に移動  |  
 	(closest)	(最も近い)
@@ -1410,6 +1413,11 @@
 	Ignore	無視
 	Ignore Artboards (all the art as one page)	アートボードを無視 (すべてのアートを 1 ページとして扱う)
 	Ignore White	白を無視
+	Palette:	パレット:
+	Limited	限定
+	Full Tone	フルトーン
+	Document Library	ドキュメントライブラリ
+	Library:	ライブラリ:
 	Image Info	画像情報
 	Image Map:	イメージマップ:
 	Image Size	イメージサイズ
@@ -2317,6 +2325,13 @@
 	Smooth	スムーズ
 	Smooth Tool	スムーズツール
 	Snap Curves To Lines	曲線を直線にスナップ
+	View:	表示:
+	Tracing Result	トレース結果
+	Tracing Result with Outlines	トレース結果（アウトライン付き）
+	Outlines	アウトライン
+	Outlines with Source Image	アウトライン（元画像付き）
+	Source Image	元画像
+	Image Trace View	画像トレースの表示
 	Snap Options	スナップオプション
 	Snapping Tolerance	スナップ許容値
 	Soft Light	ソフトライト

crates/ui-egui/src/i18n/pt-br.tsv

@@ -78,6 +78,9 @@
 	 to transform  |  	 para transformar  |  
 	 to zoom in  |  	 para ampliar  |  
 	 to zoom into an area	 para ampliar uma área
+	Hold	Manter pressionado
+	 right or left to zoom in or out  |  	 para a direita ou a esquerda para ampliar ou reduzir  |  
+	 to keep zooming	 para continuar o zoom
 	 to zoom out  |  	 para reduzir  |  
 	 while dragging to move perpendicular to the plane  |  	 ao arrastar para mover perpendicularmente ao plano  |  
 	(closest)	(mais próximo)

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

@@ -1149,6 +1149,11 @@
 	Ignore	Игнорировать
 	Ignore Artboards (all the art as one page)	Игнорировать монтажные области (весь рисунок как одна страница)
 	Ignore White	Игнорировать белый
+	Palette:	Палитра:
+	Limited	Ограниченная
+	Full Tone	Полутоновая
+	Document Library	Библиотека документа
+	Library:	Библиотека:
 	Image	Изображение
 	Image Info	Сведения об изображении
 	Image Map:	Карта изображения:
@@ -2486,6 +2491,13 @@
 	Smooth Color	Сглаженный цвет
 	Smooth Tool	Инструмент «Сглаживание»
 	Snap Curves To Lines	Привязывать кривые к линиям
+	View:	Просмотр:
+	Tracing Result	Результат трассировки
+	Tracing Result with Outlines	Результат трассировки с контурами
+	Outlines	Контуры
+	Outlines with Source Image	Контуры с исходным изображением
+	Source Image	Исходное изображение
+	Image Trace View	Просмотр трассировки изображения
 	Snap Options	Параметры привязки
 	Snap to Glyph	Привязать к глифу
 	Snap to Grid	Привязать к сетке
@@ -2971,6 +2983,9 @@
 	 to zoom in  |  	 для увеличения  |  
 	 to zoom out  |  	 для уменьшения  |  
 	 to zoom into an area	 для увеличения области
+	Hold	Удерживать
+	 right or left to zoom in or out  |  	 вправо или влево для увеличения или уменьшения  |  
+	 to keep zooming	 для непрерывного масштабирования
 	 an object to copy its attributes  |  	 в объект для копирования его атрибутов  |  
 	 to apply the selection's to it  |  	 для применения атрибутов выделения к нему  |  
 	 to sample a color	 для взятия образца цвета

crates/ui-egui/src/i18n/zh-hans.tsv

@@ -1140,6 +1140,11 @@
 	Ignore	忽略
 	Ignore Artboards (all the art as one page)	忽略画板 (所有图稿作为一页)
 	Ignore White	忽略白色
+	Palette:	调板：
+	Limited	有限
+	Full Tone	全色调
+	Document Library	文档库
+	Library:	库：
 	Image	图像
 	Image Info	图像信息
 	Image Map:	图像映射：
@@ -2427,6 +2432,13 @@
 	Smooth Color	平滑颜色
 	Smooth Tool	平滑工具
 	Snap Curves To Lines	将曲线对齐到直线
+	View:	视图：
+	Tracing Result	描摹结果
+	Tracing Result with Outlines	描摹结果（带轮廓）
+	Outlines	轮廓
+	Outlines with Source Image	轮廓（带源图像）
+	Source Image	源图像
+	Image Trace View	图像描摹视图
 	Snap Options	对齐选项
 	Snap to Glyph	靠齐字符
 	Snap to Grid	对齐网格
@@ -2915,6 +2927,9 @@
 	 to zoom in  |  	以放大  |  
 	 to zoom out  |  	以缩小  |  
 	 to zoom into an area	以放大指定区域
+	Hold	按住
+	 right or left to zoom in or out  |  	向右以放大、向左以缩小  |  
+	 to keep zooming	以持续缩放
 	 an object to copy its attributes  |  	选择对象以复制其属性  |  
 	 to apply the selection's to it  |  	以将所选对象属性应用到它  |  
 	 to sample a color	以取样颜色

crates/ui-egui/src/i18n/zh-hant.tsv

@@ -1169,6 +1169,11 @@
 	Ignore	略過
 	Ignore Artboards (all the art as one page)	忽略工作區域 (所有圖稿視為單一頁面)
 	Ignore White	忽略白色
+	Palette:	調色盤：
+	Limited	有限
+	Full Tone	全色調
+	Document Library	文件資料庫
+	Library:	資料庫：
 	Image	影像
 	Image Info	影像資訊
 	Image Map:	影像地圖：
@@ -2510,6 +2515,13 @@
 	Smooth Color	平滑顏色
 	Smooth Tool	平滑工具
 	Snap Curves To Lines	將曲線靠齊線條
+	View:	檢視：
+	Tracing Result	描圖結果
+	Tracing Result with Outlines	描圖結果（含外框）
+	Outlines	外框
+	Outlines with Source Image	外框（含來源影像）
+	Source Image	來源影像
+	Image Trace View	影像描圖檢視
 	Snap Options	靠齊選項
 	Snap to Glyph	靠齊字符
 	Snap to Grid	靠齊格點
@@ -3000,6 +3012,9 @@
 	 to zoom in  |  	可放大  |  
 	 to zoom out  |  	可縮小  |  
 	 to zoom into an area	可放大至指定區域
+	Hold	按住
+	 right or left to zoom in or out  |  	向右可放大、向左可縮小  |  
+	 to keep zooming	可持續縮放
 	 an object to copy its attributes  |  	物件可複製其屬性  |  
 	 to apply the selection's to it  |  	可將選取範圍的屬性套用至該物件  |  
 	 to sample a color	可取樣顏色

crates/ui-egui/src/lib.rs

@@ -291,6 +291,8 @@ pub struct CacheKey {
     /// View › Pixel Preview: the document pixels rendered (x0, y0, x1, y1), one per point, shown
     /// with hard edges. None: the art is rendered for the screen.
     pub pixel: Option<[i64; 4]>,
+    /// Images sampled smoothly ([`vectorcraft_render::RenderOptions::smooth_images`]).
+    pub smooth_images: bool,
 }
 
 #[derive(Clone, Copy, Debug, Default)]

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

@@ -1,23 +1,57 @@
-//! Image Trace panel: preset, mode, threshold or colour count, and the advanced options (fidelity,
-//! method, Create: Fills / Strokes with the widest line stroked).
-//! With an Image Trace object selected, changing a setting re-traces it (one undo step per change;
-//! sliders apply when released). With an image selected, Trace makes a new Image Trace object.
+//! Image Trace panel: preset, view, mode, palette (Color), threshold or colour count, and the
+//! Advanced section (open or closed as it was last left): fidelity, method, and Create: Fills /
+//! Strokes with the widest line stroked. With an Image Trace object selected, changing a setting
+//! re-traces it (one undo step per change; sliders apply when released) and changing the view
+//! redraws it without tracing again. With an image selected, Trace makes a new Image Trace object.
 
 use egui::Ui;
 use serde_json::{Value, json};
-use vectorcraft_doc::{Node, NodeKind};
+use vectorcraft_doc::{Node, NodeKind, TraceView};
+use vectorcraft_engine::cmd::swatchlib::DOCUMENT_SWATCHES;
 
-use super::{first_selected, pstate, set_pstate};
+use super::{first_selected, library_panel, pstate, set_pstate, swatches};
 use crate::VectorcraftApp;
 use crate::widgets::{self, menu_item};
 
 const MODES: [(&str, &str); 3] = [("blackAndWhite", "Black and White"), ("grayscale", "Grayscale"), ("color", "Color")];
 
-/// Panel state: the preset name, the current parameters and the last result's counts.
+/// Color mode's palettes (`palette` param ids), in panel order.
+const PALETTES: [&str; 4] = ["limited", "fullTone", "automatic", "documentLibrary"];
+
+/// Palette `id`, in the UI language.
+fn palette_label(id: &str) -> &'static str {
+    match id {
+        "fullTone" => tl!("Full Tone"),
+        "automatic" => tl!("Automatic"),
+        "documentLibrary" => tl!("Document Library"),
+        _ => tl!("Limited"),
+    }
+}
+
+/// The name of Document Library's library `key` (the document's swatches or a swatch library); a
+/// library that is gone shows its key.
+fn library_label(app: &VectorcraftApp, key: &str) -> String {
+    match swatches::limit_name(app, key) {
+        Some(_) if key == DOCUMENT_SWATCHES => tl!(swatches::DOCUMENT_SWATCHES).to_string(),
+        Some(name) => library_panel::library_name(key, &name).to_string(),
+        None => key.to_string(),
+    }
+}
+
+/// Document Library's choices: the document's swatches, then the colour libraries (`current`
+/// checked) → the key chosen.
+fn library_list(app: &VectorcraftApp, ui: &mut Ui, current: &str) -> Option<String> {
+    let document = menu_item(ui, swatches::DOCUMENT_SWATCHES, true, current == DOCUMENT_SWATCHES).then(|| DOCUMENT_SWATCHES.to_string());
+    ui.separator();
+    library_panel::library_items(ui, &swatches::colour_libraries(app), Some(current)).or(document)
+}
+
+/// Panel state: the preset name, the current parameters, the view and the last result's counts.
 #[derive(Clone, Default)]
 struct TraceUi {
     preset: String,
     params: Value,
+    view: TraceView,
     info: Option<(u64, u64, u64)>,
     /// The selected Image Trace object's stored settings last adopted (so edits in progress
     /// aren't overwritten until the object changes).
@@ -45,12 +79,44 @@ fn target(app: &VectorcraftApp) -> (bool, bool, Option<Value>) {
     (is_trace(&n), matches!(n.kind, NodeKind::Image(_)), n.trace.map(|t| *t))
 }
 
-/// The preset of the one selected Image Trace object ("Custom" once its settings were changed).
-pub(crate) fn selected_preset(app: &VectorcraftApp) -> Option<String> {
+/// The one selected Image Trace object's preset ("Custom" once its settings were changed) and view.
+pub(crate) fn selected_trace(app: &VectorcraftApp) -> Option<(String, TraceView)> {
     let st = app.session.active()?;
     let [id] = st.selection.objects[..] else { return None };
     let n = st.doc.node(id).filter(|n| is_trace(n))?;
-    Some(n.trace.as_ref().and_then(|t| t["preset"].as_str()).unwrap_or("Custom").to_string())
+    Some((n.trace.as_ref().and_then(|t| t["preset"].as_str()).unwrap_or("Custom").to_string(), n.trace_view()))
+}
+
+/// Image Trace › View, in the UI language.
+fn view_label(v: TraceView) -> &'static str {
+    match v {
+        TraceView::Result => tl!("Tracing Result"),
+        TraceView::ResultWithOutlines => tl!("Tracing Result with Outlines"),
+        TraceView::Outlines => tl!("Outlines"),
+        TraceView::OutlinesWithSource => tl!("Outlines with Source Image"),
+        TraceView::Source => tl!("Source Image"),
+    }
+}
+
+/// The View dropdown showing `current` → the view chosen.
+fn view_dropdown(ui: &mut Ui, current: TraceView, width: f32) -> Option<TraceView> {
+    let labels = TraceView::ALL.map(view_label);
+    widgets::dropdown_names(ui, "trace-view", view_label(current), &labels, width).and_then(|i| TraceView::ALL.get(i).copied())
+}
+
+/// Show the selected Image Trace objects with `view` (no new trace).
+fn set_view(app: &mut VectorcraftApp, view: TraceView) {
+    if let Err(e) = app.run("imageTrace.setView", json!({ "view": view.id() })) {
+        app.ui.status = e;
+    }
+}
+
+/// The selected Image Trace object's View row (Control bar, Properties).
+pub(crate) fn view_row(app: &mut VectorcraftApp, ui: &mut Ui, current: TraceView, width: f32) {
+    widgets::dim_label(ui, tl!("View:"));
+    if let Some(v) = view_dropdown(ui, current, width) {
+        set_view(app, v);
+    }
 }
 
 /// Trace the selected image, or trace the selected Image Trace object again, with built-in `preset`.
@@ -95,12 +161,13 @@ pub(crate) fn preset_dropdown(app: &mut VectorcraftApp, ui: &mut Ui, current: &s
     }
 }
 
-/// The Control bar for one selected Image Trace object: its preset, the Image Trace panel and
-/// Expand. Whether it is one.
+/// The Control bar for one selected Image Trace object: its preset, view, the Image Trace panel
+/// and Expand. Whether it is one.
 pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) -> bool {
-    let Some(preset) = selected_preset(app) else { return false };
+    let Some((preset, view)) = selected_trace(app) else { return false };
     widgets::dim_label(ui, tl!("Preset:"));
     preset_dropdown(app, ui, &preset, 150.0);
+    view_row(app, ui, view, 190.0);
     if widgets::icon_button(ui, "image", tl!("Image Trace"), false, 24.0).clicked() {
         app.ui.open_panel = Some("imageTrace".into());
     }
@@ -113,7 +180,7 @@ pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) -> bool {
 
 fn trace(app: &mut VectorcraftApp, st: &mut TraceUi) {
     let preset = if st.preset == "Custom" { "Default" } else { st.preset.as_str() };
-    match app.run("imageTrace.make", json!({ "preset": preset, "params": st.params })) {
+    match app.run("imageTrace.make", json!({ "preset": preset, "params": st.params, "view": st.view.id() })) {
         Ok(r) => st.info = Some((r["paths"].as_u64().unwrap_or(0), r["anchors"].as_u64().unwrap_or(0), r["colors"].as_u64().unwrap_or(0))),
         Err(e) => app.ui.status = e,
     }
@@ -144,6 +211,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     if let Some(t) = stored.filter(|t| *t != st.synced) {
         st.preset = t["preset"].as_str().unwrap_or("Custom").to_string();
         st.params = t["params"].clone();
+        st.view = TraceView::of(&t);
         st.synced = t;
     }
     let mut retrace = false;
@@ -157,6 +225,15 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
             retrace = true;
         }
     });
+    ui.horizontal(|ui| {
+        widgets::dim_label(ui, tl!("View:"));
+        if let Some(v) = view_dropdown(ui, st.view, 170.0) {
+            st.view = v;
+            if is_trace {
+                set_view(app, v);
+            }
+        }
+    });
     ui.horizontal(|ui| {
         widgets::dim_label(ui, tl!("Mode:"));
         let mode = st.params["mode"].as_str().unwrap_or("blackAndWhite").to_string();
@@ -168,23 +245,49 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
             retrace = true;
         }
     });
-    let bw = st.params["mode"].as_str() == Some("blackAndWhite");
-    let (key, label, range) = if bw {
-        ("threshold", tl!("Threshold"), 0.0..=255.0)
-    } else {
-        ("colors", if st.params["mode"] == "grayscale" { tl!("Grays") } else { tl!("Colors") }, 2.0..=256.0)
+    let mode = st.params["mode"].as_str().unwrap_or("blackAndWhite").to_string();
+    let palette = st.params["palette"].as_str().unwrap_or("limited").to_string();
+    if mode == "color" {
+        ui.horizontal(|ui| {
+            widgets::dim_label(ui, tl!("Palette:"));
+            let labels = PALETTES.map(palette_label);
+            if let Some(p) = widgets::dropdown_names(ui, "it-palette", palette_label(&palette), &labels, 170.0).and_then(|i| PALETTES.get(i)) {
+                st.params["palette"] = json!(p);
+                st.preset = "Custom".into();
+                retrace = true;
+            }
+        });
+        if palette == "documentLibrary" {
+            ui.horizontal(|ui| {
+                widgets::dim_label(ui, tl!("Library:"));
+                let key = st.params["library"].as_str().unwrap_or(DOCUMENT_SWATCHES).to_string();
+                if let Some(k) = widgets::combo(ui, "it-library", &library_label(app, &key), 170.0, false, |ui| library_list(app, ui, &key)) {
+                    st.params["library"] = json!(k);
+                    st.preset = "Custom".into();
+                    retrace = true;
+                }
+            });
+        }
+    }
+    // Full Tone and Automatic: how many colours (Less … More); else a count or the threshold.
+    let (key, label, range, suffix) = match mode.as_str() {
+        "blackAndWhite" => ("threshold", tl!("Threshold"), 0.0..=255.0, ""),
+        "grayscale" => ("colors", tl!("Grays"), 2.0..=256.0, ""),
+        _ if matches!(palette.as_str(), "fullTone" | "automatic") => ("colorDetail", tl!("Colors"), 0.0..=100.0, "%"),
+        _ => ("colors", tl!("Colors"), 2.0..=256.0, ""),
     };
     let mut v = st.params[key].as_f64().unwrap_or(0.0);
-    let (changed, release) = slider(ui, label, &mut v, range, "");
+    let (changed, release) = slider(ui, label, &mut v, range, suffix);
     if changed {
-        st.params[key] = json!(v.round() as u64);
+        st.params[key] = if key == "colorDetail" { json!(v.round()) } else { json!(v.round() as u64) };
         st.preset = "Custom".into();
     }
     retrace |= release;
 
-    let open: bool = !pstate::<bool>(ui.ctx(), "it-advanced-closed");
-    if ui.add(egui::Button::new(format!("{} {}", if open { "▾" } else { "▸" }, tl!("Advanced"))).frame(false)).clicked() {
-        set_pstate(ui.ctx(), "it-advanced-closed", open);
+    ui.add_space(4.0);
+    let open = app.ui.image_trace_advanced;
+    if widgets::section_toggle(ui, tl!("Advanced"), open) {
+        app.ui.image_trace_advanced = !open;
     }
     if open {
         for (key, label, range, suffix) in
@@ -311,6 +414,68 @@ mod tests {
         app
     }
 
+    #[test]
+    fn advanced_is_a_section_that_stays_as_it_was_left() {
+        let mut app = traced_app();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let has = |texts: &[(String, Rect)], s: &str| texts.iter().any(|(t, _)| t == s);
+        let texts = frame(&mut app, &ctx, vec![]);
+        assert!(app.ui.image_trace_advanced && has(&texts, "Advanced") && has(&texts, "Corners"), "open at first: {texts:?}");
+        click(&mut app, &ctx, "Advanced");
+        assert!(!app.ui.image_trace_advanced, "the header closes it");
+        assert!(!has(&frame(&mut app, &ctx, vec![]), "Corners"));
+        // Remembered with the UI preferences, across launches.
+        let saved: crate::state::UiState = serde_json::from_value(serde_json::to_value(&app.ui).unwrap()).unwrap();
+        assert!(!saved.image_trace_advanced);
+        let old: crate::state::UiState = serde_json::from_value(json!({})).unwrap();
+        assert!(old.image_trace_advanced, "open for preferences saved before the section existed");
+        click(&mut app, &ctx, "Advanced");
+        assert!(app.ui.image_trace_advanced && has(&frame(&mut app, &ctx, vec![]), "Corners"));
+    }
+
+    #[test]
+    fn the_view_dropdown_shows_and_sets_the_objects_view() {
+        let mut app = traced_app();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let texts = frame(&mut app, &ctx, vec![]);
+        assert!(texts.iter().any(|(t, _)| t == "View:") && texts.iter().any(|(t, _)| t == "Tracing Result"), "{texts:?}");
+        let steps = app.session.active().unwrap().history.undo.len();
+        click(&mut app, &ctx, "Tracing Result");
+        click(&mut app, &ctx, "Source Image");
+        assert_eq!(selected_trace(&app).map(|t| t.1), Some(TraceView::Source));
+        assert_eq!(app.session.active().unwrap().history.undo.len(), steps + 1, "one undo step, no new trace");
+        // Another object's view is shown when it is selected.
+        app.run("imageTrace.setView", json!({"view": "outlines"})).unwrap();
+        assert!(frame(&mut app, &ctx, vec![]).iter().any(|(t, _)| t == "Outlines"));
+    }
+
+    #[test]
+    fn the_palette_shows_in_color_mode_and_traces_again() {
+        let mut app = traced_app();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let has = |texts: &[(String, Rect)], s: &str| texts.iter().any(|(t, _)| t == s);
+        let palette = |app: &VectorcraftApp| target(app).2.map(|t| t["params"]["palette"].clone());
+        assert!(!has(&frame(&mut app, &ctx, vec![]), "Palette:"), "Black and White has no palette");
+        app.run("imageTrace.make", json!({"preset": "6 Colors"})).unwrap();
+        let texts = frame(&mut app, &ctx, vec![]);
+        assert!(has(&texts, "Palette:") && has(&texts, "Limited") && !has(&texts, "Library:"), "{texts:?}");
+        // Document Library traces again with the document's swatches, and names them.
+        click(&mut app, &ctx, "Limited");
+        click(&mut app, &ctx, "Document Library");
+        assert_eq!(palette(&app), Some(json!("documentLibrary")));
+        let texts = frame(&mut app, &ctx, vec![]);
+        assert!(has(&texts, "Library:") && has(&texts, "Document Swatches"), "{texts:?}");
+        // Full Tone's Colors is how many, Less (0%) … More (100%).
+        click(&mut app, &ctx, "Document Library");
+        click(&mut app, &ctx, "Full Tone");
+        assert_eq!(palette(&app), Some(json!("fullTone")));
+        let texts = frame(&mut app, &ctx, vec![]);
+        assert!(has(&texts, "50") && !has(&texts, "Library:"), "{texts:?}");
+    }
+
     #[test]
     fn create_strokes_traces_again_and_keeps_one_kind_on() {
         let mut app = traced_app();

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

@@ -44,8 +44,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
         image_section(app, ui);
         divider(ui);
     }
-    if let Some(preset) = crate::panels::image_trace::selected_preset(app) {
-        trace_section(app, ui, &preset);
+    if let Some((preset, view)) = crate::panels::image_trace::selected_trace(app) {
+        trace_section(app, ui, &preset, view);
         divider(ui);
     }
     if matches!(first.as_ref().map(|n| &n.kind), Some(NodeKind::Text(_))) {
@@ -162,13 +162,14 @@ fn image_section(app: &mut VectorcraftApp, ui: &mut Ui) {
 }
 
 /// The one selected Image Trace object: its preset (choosing another traces it again with that
-/// one), Expand and Release.
-fn trace_section(app: &mut VectorcraftApp, ui: &mut Ui, preset: &str) {
+/// one), view, Expand and Release.
+fn trace_section(app: &mut VectorcraftApp, ui: &mut Ui, preset: &str, view: vectorcraft_doc::TraceView) {
     section_header(ui, tl!("Image Trace"));
     ui.horizontal(|ui| {
         dim_label(ui, tl!("Preset:"));
         crate::panels::image_trace::preset_dropdown(app, ui, preset, ui.available_width());
     });
+    ui.horizontal(|ui| crate::panels::image_trace::view_row(app, ui, view, ui.available_width()));
     let w = (ui.available_width() - 6.0) / 2.0;
     ui.horizontal(|ui| {
         for (label, id) in [(tl!("Expand"), "imageTrace.expand"), (tl!("Release"), "imageTrace.release")] {

crates/ui-egui/src/prefs_dialog.rs

@@ -244,6 +244,10 @@ fn category_fields(ui: &mut egui::Ui, d: &mut Dialog, cat: &str) {
             PrefKind::Bool if sp.key == "numbersWithoutUnitsArePoints" => {
                 ui.add_enabled_ui(picas_in_use(d), |ui| bool_row(ui, d, sp.key, sp.label));
             }
+            // Performance › Animated Zoom needs GPU Performance: dimmed while it is off.
+            PrefKind::Bool if sp.key == "animatedZoom" => {
+                ui.add_enabled_ui(d.bool("gpuPerformance"), |ui| bool_row(ui, d, sp.key, sp.label));
+            }
             PrefKind::Bool => bool_row(ui, d, sp.key, sp.label),
             PrefKind::Num { min, max, unit } => {
                 labeled(ui, sp.label, |ui| {

crates/ui-egui/src/state.rs

@@ -365,6 +365,9 @@ pub struct UiState {
     /// Layers panel › Panel Options… (row size, thumbnails, Show Layers Only).
     #[serde(default)]
     pub layers_panel: crate::panels::layers::PanelOptions,
+    /// The Image Trace panel's Advanced section is open (as it was last left).
+    #[serde(default = "yes")]
+    pub image_trace_advanced: bool,
     /// The desktop window's size, position and maximized state, saved when the app quits and
     /// restored at the next launch (the desktop host reads and writes it; none on the web).
     #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -518,6 +521,7 @@ impl Default for UiState {
             dxf_import: Value::Null,
             home: None,
             layers_panel: Default::default(),
+            image_trace_advanced: true,
             window: None,
         }
     }

crates/ui-egui/src/tests_home.rs

@@ -90,3 +90,46 @@ fn cmd_n_opens_the_new_document_dialog() {
     assert_eq!(app.ui.dialog.as_ref().map(|d| d.kind.as_str()), Some("newDocument"));
     assert_eq!(app.session.documents().len(), 1, "no document is made until the dialog's OK");
 }
+
+/// One Home screen frame (no document open) with `events`: the texts drawn and where.
+fn home_texts(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<egui::Event>) -> Vec<(String, egui::Rect)> {
+    fn walk(s: &egui::Shape, out: &mut Vec<(String, egui::Rect)>) {
+        match s {
+            egui::Shape::Text(t) => out.push((t.galley.text().to_string(), t.visual_bounding_rect())),
+            egui::Shape::Vec(v) => v.iter().for_each(|s| walk(s, out)),
+            _ => {}
+        }
+    }
+    let raw =
+        egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1000.0, 900.0))), events, ..Default::default() };
+    let mut out = ctx.run_ui(raw, |ui| canvas::show(app, ui));
+    out.textures_delta.clear();
+    let mut texts = vec![];
+    out.shapes.iter().for_each(|c| walk(&c.shape, &mut texts));
+    texts
+}
+
+/// The Home screen lists the first recent files (#663), each by name and folder; a click opens it,
+/// and one that can't be opened says so. With none, there is no Recent Files section.
+#[test]
+fn home_lists_recent_files_and_a_click_opens_one() {
+    let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), crate::Services::default());
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx);
+    let has = |texts: &[(String, egui::Rect)], s: &str| texts.iter().any(|(t, _)| t == s);
+    assert!(!has(&home_texts(&mut app, &ctx, vec![]), "Recent Files"), "none: no section");
+    let dir = std::env::temp_dir().join("vectorcraft-home-recent");
+    let missing = dir.join("Gone.svg").to_string_lossy().into_owned();
+    app.ui.recent_files = (0..9).map(|i| dir.join(format!("Drawing {i}.svg")).to_string_lossy().into_owned()).collect();
+    app.ui.recent_files.insert(0, missing);
+    let texts = home_texts(&mut app, &ctx, vec![]);
+    assert!(has(&texts, "Recent Files") && has(&texts, "Gone.svg") && has(&texts, "Drawing 4.svg"), "{texts:?}");
+    assert!(!has(&texts, "Drawing 5.svg"), "the first six only");
+    assert!(has(&texts, &dir.to_string_lossy()), "with its folder");
+    let at = texts.iter().find(|(t, _)| t == "Gone.svg").map(|(_, r)| r.center()).unwrap();
+    let press = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+    home_texts(&mut app, &ctx, vec![egui::Event::PointerMoved(at), press(true)]);
+    home_texts(&mut app, &ctx, vec![press(false)]);
+    assert!(app.session.documents().is_empty());
+    assert!(!app.ui.status.is_empty(), "a file that can't be opened says so");
+}

crates/ui-egui/src/tests_place.rs

@@ -308,7 +308,8 @@ fn click_label(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) {
 
 #[test]
 fn the_control_bar_and_properties_trace_a_selected_image() {
-    use crate::panels::image_trace::{TRACE_BUTTON_W, selected_preset};
+    use crate::panels::image_trace::{TRACE_BUTTON_W, selected_trace};
+    let selected_preset = |app: &VectorcraftApp| selected_trace(app).map(|t| t.0);
     use crate::tests_removeanchors::{at, click_control, control_frame, has, properties_frame};
     let mut app = app();
     let data = vectorcraft_format::base64_encode(&png(30, 30, 72.0));
@@ -332,19 +333,27 @@ fn the_control_bar_and_properties_trace_a_selected_image() {
     app.run("edit.undo", json!({})).unwrap();
     click_label(&mut app, &ctx, "Image Trace");
     assert_eq!(selected_preset(&app).as_deref(), Some("Default"));
-    // An Image Trace object: its preset (another traces it again), the panel and Expand.
+    // An Image Trace object: its preset (another traces it again), view, the panel and Expand.
     let bar = control_frame(&mut app, &ctx, vec![]);
-    for s in ["Image Tracing", "Preset:", "Default", "Expand"] {
+    for s in ["Image Tracing", "Preset:", "Default", "View:", "Tracing Result", "Expand"] {
         assert!(has(&bar, s), "{s}");
     }
-    assert!(has(&properties_frame(&mut app, 260.0), "Release"));
+    let props = properties_frame(&mut app, 260.0);
+    assert!(has(&props, "Release") && has(&props, "View:"));
+    // Another view redraws it without tracing again.
+    let traced = app.session.active().unwrap().selection.objects.clone();
+    click_control(&mut app, &ctx, at(&bar, "Tracing Result"));
+    click_label(&mut app, &ctx, "Outlines with Source Image");
+    assert_eq!(selected_trace(&app).map(|t| t.1), Some(vectorcraft_doc::TraceView::OutlinesWithSource));
+    assert_eq!(app.session.active().unwrap().selection.objects, traced, "the same object");
+    let bar = control_frame(&mut app, &ctx, vec![]);
     click_control(&mut app, &ctx, at(&bar, "Default"));
     click_label(&mut app, &ctx, "3 Colors");
     assert_eq!(selected_preset(&app).as_deref(), Some("3 Colors"));
     click_label(&mut app, &ctx, "Expand");
     let st = app.session.active().unwrap();
     let g = st.doc.node(st.selection.objects[0]).unwrap();
-    assert!(selected_preset(&app).is_none() && g.children().unwrap().iter().all(|c| !matches!(c.kind, NodeKind::Image(_))), "expanded");
+    assert!(selected_trace(&app).is_none() && g.children().unwrap().iter().all(|c| !matches!(c.kind, NodeKind::Image(_))), "expanded");
 }
 
 #[test]

crates/ui-egui/src/tests_slices.rs

@@ -78,7 +78,7 @@ fn slice_tool_cursors_are_drawn_in_code() {
     let ctx = egui::Context::default();
     let mut out = ctx.run_ui(Default::default(), |ui| {
         for c in [vectorcraft_tools::Cursor::Slice, vectorcraft_tools::Cursor::SliceSelect] {
-            assert!(crate::cursors::paint(ui.painter(), c, egui::pos2(50.0, 50.0)), "{c:?}");
+            assert!(crate::cursors::paint(ui.painter(), c, egui::pos2(50.0, 50.0), 1.0), "{c:?}");
         }
     });
     out.textures_delta.clear();

crates/ui-egui/src/tests_widthtool.rs

@@ -12,7 +12,7 @@ fn the_width_tool_has_its_own_cursors() {
     let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
         let painter = ui.painter().clone();
         for c in [Cursor::Width, Cursor::WidthAdd, Cursor::WidthPoint] {
-            assert!(crate::cursors::paint(&painter, c, egui::pos2(50.0, 50.0)), "{c:?} is drawn");
+            assert!(crate::cursors::paint(&painter, c, egui::pos2(50.0, 50.0), 1.0), "{c:?} is drawn");
         }
     });
     out.textures_delta.clear();

crates/ui-egui/src/widgets.rs

@@ -121,6 +121,21 @@ pub fn section_header(ui: &mut Ui, text: &str) {
     ui.add_space(2.0);
 }
 
+/// A collapsible section's header across the panel: a chevron (down while `open`) and `text`;
+/// a click anywhere on it toggles the section. Whether it was clicked.
+pub fn section_toggle(ui: &mut Ui, text: &str, open: bool) -> bool {
+    let t = Tokens::get(ui.ctx());
+    let (rect, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 24.0), Sense::click());
+    if resp.hovered() {
+        ui.painter().rect_filled(rect, 3.0, t.hover);
+    }
+    let chevron = Rect::from_center_size(pos2(rect.left() + 8.0, rect.center().y), vec2(12.0, 12.0));
+    icons::paint(ui, if open { "chevron-down" } else { "chevron-right" }, chevron, if resp.hovered() { t.text_strong } else { t.icon });
+    ui.painter().text(pos2(rect.left() + 18.0, rect.center().y), egui::Align2::LEFT_CENTER, tl!(text), theme::semibold(12.5), t.text);
+    resp.widget_info(|| egui::WidgetInfo::selected(egui::WidgetType::CollapsingHeader, true, open, tl!(text)));
+    resp.on_hover_cursor(egui::CursorIcon::PointingHand).clicked()
+}
+
 /// Full-width 1 px divider with vertical margins.
 pub fn divider(ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());

docs/development.md

@@ -43,11 +43,12 @@ The canvas is rasterized on the CPU (`vectorcraft-render`, vello_cpu); the GPU (
   - **Automatic on Windows and macOS** is power saving: the system shows frames from any GPU, and presenting frames rendered on a discrete GPU through the integrated one made the window flicker on some hybrid laptops (#306).
   - **Automatic on Linux and the BSDs** keeps the system's order: Mesa's Vulkan device-select layer puts the GPU the desktop runs on first (the integrated one on hybrid laptops; `DRI_PRIME` and `MESA_VK_DEVICE_SELECT` steer it). A Wayland compositor may not accept frames from another GPU: on a desktop whose compositor ran on an NVIDIA GPU, rendering on the Ryzen's integrated GPU made KWin end the window's connection ("importing the supplied dmabufs failed") and 0.5.0 crashed at startup (#502).
   - 0.5.0 saved `powerSaving`, its default, for everyone; it reads as `automatic`.
-- **If the window fails on its adapter while starting up** (an error from wgpu, or a panic inside wgpu or egui-wgpu during the first frames), the app starts again without that adapter and tries the next one, telling which in the status bar; the run that failed keeps its log as `vectorcraft.1.log`. On Unix the new app replaces the process (an AppImage stays mounted); on Windows it starts beside it. The adapters left out travel in `VECTORCRAFT_GPU_SKIP` (`backend:vendor:device`, such as `Vulkan:1002:164e`), one more on each restart, so the restarts end. When no adapter is left, the app logs why and exits with an error instead of panicking.
+- **If the window fails on its adapter while starting up** (an error from wgpu, or a panic inside wgpu or egui-wgpu during the first frames), the app starts again without that adapter and tries the next one, telling which in the status bar; the run that failed keeps its log as `vectorcraft.1.log`. On Unix the new app replaces the process (an AppImage stays mounted); on Windows it starts beside it. Adapters are told apart by backend and PCI ids, or by name where the backend reports no ids (Metal lists every GPU of a dual-GPU Mac as `0000:0000`, #651). The adapters left out travel in `VECTORCRAFT_GPU_SKIP` (`backend:vendor:device`, such as `Vulkan:1002:164e`), one more on each restart, so the restarts end. When no adapter is left, the app logs why and exits with an error instead of panicking.
 - **Environment variables** for when the choice still goes wrong, all read at startup and stronger than the preference:
   - `WGPU_POWER_PREF`: `low`, `high` or `none` (the system's order).
   - `WGPU_ADAPTER_NAME`: part of an adapter's name, any case (`WGPU_ADAPTER_NAME=nvidia`, `=radv`, `=intel`); the names are in the log.
   - `WGPU_BACKEND`: the backends to use, such as `vulkan`, `dx12`, `metal` or `gl`.
+  - `WGPU_VALIDATION_INDIRECT_CALL=1`: turns wgpu's check of indirect draw arguments back on. VectorCraft draws nothing indirectly and turns it off, since the compute shader it needs fails to compile on some drivers (#651).
   - On Linux with Mesa, `MESA_VK_DEVICE_SELECT=10de:2f04!` (vendor:device as `vulkaninfo --summary` or `lspci -nn` show it) leaves only that GPU to Vulkan, and `DRI_PRIME=1` picks the other GPU.
 - Help › About and the control channel's `ui.inspect` (`graphicsAdapter`) show the adapter in use, and the app logs it at startup.