Fix #598 : the Free Transform widget

While the Free Transform tool (E) is active, a small box at the canvas's top left holds Constrain over the tool's three modes: Free Transform, Perspective Distort and Free Distort. Before, the modes were reachable only by modifier keys or `tool.setOption`. - The buttons set the tool's `constrain` and `mode` options through `tool.setOption`, as agents do. Constrain acts as Shift held and is greyed in the distort modes, where it does nothing. The modifier keys keep working while dragging. - Theme tokens; Constrain shows the link icon, Free Transform the tool's own icon, the distort modes are drawn in code. Tooltips translated (cs, es, it, ja, pt-br, ru, zh-hans, zh-hant). - `ui.inspect` reports where it shows (`freeTransformWidget`). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Merge pull request: land #608 (fix #592 )
2026-10-09 05:31:43 +07:00 · 2026-10-09 05:11:15 +07:00 · 2026-10-09 05:03:38 +07:00 · 2026-10-09 05:03:02 +07:00 · 2026-10-09 05:00:01 +07:00 · 2026-10-09 04:59:05 +07:00
75 changed files with 3343 additions and 290 deletions
@@ -4312,8 +4312,10 @@ dependencies = [
 "rfd",
 "serde_json",
 "vectorcraft-engine",
+ "vectorcraft-text",
 "vectorcraft-ui-egui",
 "webbrowser",
+ "windows",
 "winit",
 "winresource",
 ]
@@ -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

@@ -60,9 +60,10 @@ Ordered by how much each gap blocks someone from switching. Sizes are one-agent
   renderer in its own crate (layering allows it below L6), with output in SVG/PDF as rasters or projected vectors.
   The largest single gap. 50–80 h.
 4. **Advanced type:** CJK composition for vertical type (ruby, mojikumi, proportional vertical metrics, manual
-   tate-chu-yoko), Optical Margin Alignment, the composer/hyphenation options, tab leaders, a
+   tate-chu-yoko), Optical Margin Alignment, the hyphenation and justification options (the Every-line/Single-line
+   composer choice is done), tab leaders, a
   spell-check dictionary (open licence), Touch Type and Snap to Glyph. Vertical point, area and path type have
-   initial support. 35–48 h across type core and advanced.
+   initial support. 34–47 h across type core and advanced.
 5. **Brushes, symbols and libraries:** brush options depth; original brush, symbol and graphic-style libraries
   generated in code (never Adobe's); dynamic symbols; Start Global Edit; brushes driven by pen tilt, bearing and
   barrel rotation (6D art pens, #372), which needs tablet input beyond pressure on every platform. 20–32 h.
@@ -138,7 +139,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 - **Geometry and effects:**
  - Pathfinder (10 exact curve booleans), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart.
  - Live effects with previewing dialogs: Distort & Transform, Path, Convert to Shape, 15 Warp styles, Round Corners, Scribble, Effect → Pathfinder (all 10 operations, live on groups; several loose objects are grouped first, in one undo step), Color Adjustments (Brightness/Contrast, Curves, Levels, Hue/Saturation, Shift to Color, Temperature/Tint, on vectors, live type and embedded images), and raster drop shadow, glows and feather. SVG and PDF export keep live effects (geometry baked; SVG raster effects as filters).
- **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline), threaded text across any closed shapes, Fit Headline. Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`). Point type still scales. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. Variation axis sliders are not done. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. Font Size and Leading are combo boxes in the Character and Properties panels (Font Size in the Control bar too, beside the Character link, font family and style): type, step with ↑/↓ or the spinner, scrub the label, or pick a preset (6–72 pt, shown in the type unit; Leading also Auto), each pick one undo step; Kerning and Tracking list -100…200; a size, leading, kerning or tracking the selected text doesn't share shows blank (#458).
+- **Type:** Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), Area Type Options (rows/columns/inset/first baseline, 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. 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), 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, 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, 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 or the em box top/right, centre or bottom/left (ICF top and bottom not yet); Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines.
 - **Transparency:** opacity masks (clip/invert/disable/link), exported as SVG `<mask>` and PDF soft masks.
 - **Advanced art:** live Blends (steps/distance/smooth colour, editable spine, anchor-targeted Blend tool, faithful interpolation, knockout), Envelope Distort (warp/mesh/top object, Reset, full Envelope Options, mesh handles, Edit Contents; type, images, symbols, gradients, patterns and appearance distorted everywhere), Liquify tools with options and pen pressure, Puppet Warp with rotating pins, Perspective Grid with presets, movable planes and projected type (choosing a perspective tool shows the grid; Hide Grid hides it with the tool still chosen), Gradient Mesh, Shape Builder (stroke-only open paths and lines cut the regions they cross and enclose regions of their own; filled open paths count as closed; erase mode while Alt/Option is held: a minus pointer, red highlights of what will go, a click or drag deletes the regions touched, the pieces of open lines and the edges (outline pieces between the points where paths meet, opening their paths there) it passes over, one undo step, `shapeBuilder.merge {erase}` and `shapeBuilder.regions` edges over MCP), Live Paint (every path an edge, open lines included), Image Trace (12 presets, 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; the View modes are not done), pattern swatches with pattern editing mode, live Repeat (radial/grid/mirror).
@@ -175,7 +176,7 @@ grade by behaviour against `plan/illustrator/`, not by whether a menu item exist
 | M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out, EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, Asset Export, clipboard flavours, File Info. Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, polish | 3–6 |
 | M5 | Performance | 🟡 background render + caches + MT done; `vectorcraft-cli bench` and `vectorcraft-cli perf` (budget suite); file format v2 opens 3× faster (50k paths: 722 → 244 ms); raster effects (glows, shadows, blur, feather) no longer force the whole frame single-threaded (filtered offscreen per effect, verified equal to the single-threaded reference); effect-heavy demos need a clean-machine benchmark; dirty-region rendering, GPU backend spike pending | 15–25 |
 | M6 | Path operations (Pathfinder, Shape Builder, offset…) | ✅ mostly done (Boolean precision on almost-horizontal edges fixed and the property tests made deterministic; Shape Builder gap detection, large-offset bug open) | 3–6 |
-| M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | 🟡 Character/Paragraph Styles, Area Type Options (with Width/Height), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs, OpenType panel, Find Font, installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import, variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel, Hebrew/Arabic bidirectional text and Paragraph Direction done; tab leaders, spell check, vertical type pending | 45–60 |
+| M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | 🟡 Character/Paragraph Styles, Area Type Options (with Width/Height, Auto Size and Shrink Text to Fit; overflow reported to agents and vertical Align), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs, OpenType panel, Find Font, installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import, variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel, Hebrew/Arabic bidirectional text, Paragraph Direction, Every-line/Single-line Composer per object (ragged text too) done; tab leaders, spell check, vertical type pending | 45–60 |
 | M8 | Transform & distort (Puppet Warp, Liquify tools, Envelopes, Blends, Perspective Grid) | ✅ done (M8.1–M8.20 on 2026-10-06, fidelity pass): Liquify Tool Options with one shared brush, pen pressure, hold-to-apply, a safe scope and incremental strokes; tool options that last; Puppet Warp rotation, multi-select, Control bar and a rest-shape session that follows Undo; Width tool on compound paths; Envelope dialogs with preview, Reset with Warp/Mesh, full Envelope Options, type/images/symbols/appearance/gradients/patterns distorted on canvas and in every export, warps that keep their frame, Edit Contents, mesh handles and Control bar; Blend Options, anchor-targeted Blend tool, editable spine, keys picked on the canvas, faithful interpolation and knockout; Perspective Grid with Define Grid, presets, lock/snap/rulers, widgets, the 1–4 plane switch, movable planes, Perspective Selection scale/copy/perpendicular/Transform Again, and type and symbols truly projected with Edit Text. Left: Anti-Alias and Preserve Shape output, warp-envelope point editing, brush interpolation in blends, Free Transform/Scale/Reflect along a rotated box | 2–4 |
 | M9 | Live effects (+ 3D & Materials) | 🟡 2D effects done incl. Effect → Pathfinder and Color Adjustments; SVG Filters, Document Raster Effects Settings, 3D pending | 86–135 |
 | M10 | Brushes, symbols, patterns, Repeat | 🟡 pattern swatches (5 tile types, Pattern Options, editing mode, SVG `<pattern>`/PDF export) and live Repeat (radial/grid/mirror) done; brushes/symbols in progress | 23–37 |
@@ -210,7 +211,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale)
 | Live vector effects | 5 | 85% | Outline Object, Pathfinder Hard/Soft Mix and Trap, SVG Filters | 6–10 |
 | Raster effects (Effect Gallery, Document Raster Effects Settings) | 4 | 20% | ~55 Photoshop-style filters (Artistic, Brush Strokes, Distort, Pixelate, Sketch, Stylize, Texture, Video) and the Effect Gallery; Document Raster Effects Settings and raster effects in PDF are done | 28–42 |
 | 3D and Materials | 4 | 0% | Extrude & Bevel, Revolve, Inflate, Rotate, lighting, materials (software renderer) | 50–80 |
-| Type core | 9 | 79% | Middle Eastern features beyond bidi layout and Paragraph Direction (Character Direction, digit types, kashidas, the Middle Eastern composers, editable bidirectional SVG text, a split caret where directions meet); composer/hyphenation options, Optical Margin Alignment, hidden characters, Transform Again after a type-area resize (it scales the type), partial selection of type-area anchors by marquee | 15–20 |
+| Type 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, 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, Character Alignment on the ICF top and bottom), variable font axis sliders (named instances are styles), tab leaders, spell check (open dictionary), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support | 20–28 |
 | Symbols, blends, envelopes, Repeat, perspective | 5 | 88% | symbol libraries (original), dynamic symbols, envelope Anti-Alias/Preserve Shape output and warp point editing, brush interpolation in blends (M8 fidelity pass done) | 5–8 |
 | Image Trace, graphs, image tools | 3 | 70% | graph Design/Column/Marker, Create Object Mosaic, Crop Image polish (an on-canvas crop box), Image Trace View modes (Outlines, Source Image) (Vector Halftone is done) | 6–10 |
@@ -19,6 +19,7 @@ windows7 = ["eframe/glow"]
 [dependencies]
 vectorcraft-engine = { workspace = true }
 vectorcraft-ui-egui = { workspace = true }
+vectorcraft-text = { workspace = true }
 eframe = { workspace = true, features = ["default_fonts", "wayland", "x11"] }
 egui = { workspace = true }
 serde_json = { workspace = true }
@@ -36,6 +37,11 @@ winit = { version = "0.30", default-features = false }
 [target.'cfg(windows)'.dependencies]
 clipboard-win = { workspace = true }

+# DirectWrite's system font collection (src/system_fonts.rs): fonts that font services such as
+# Adobe Fonts load in place (#579). MIT OR Apache-2.0, already in the build through accesskit.
+[target.'cfg(all(windows, not(target_vendor = "win7")))'.dependencies]
+windows = { version = "0.62", features = ["Win32_Graphics_DirectWrite"] }
+
 [target.'cfg(target_os = "macos")'.dependencies]
 # The macOS menu bar (src/mac_menu.rs): Tauri's menu crate, AppKit menus behind a safe API (no GTK
 # with default features off). Pinned exactly: review the diff before bumping.
@@ -27,11 +27,14 @@ mod mac_menu;
 #[cfg(target_os = "macos")]
 mod open_documents;
 mod printing;
+#[cfg(all(windows, not(target_vendor = "win7")))]
+mod system_fonts;
 mod window;

 use vectorcraft_engine::Session;
 use vectorcraft_engine::cmd::fileio;
 use vectorcraft_ui_egui::graphics::GraphicsLoss;
+use vectorcraft_ui_egui::picks::PickRequest;
 use vectorcraft_ui_egui::{ClipboardProbeFactory, FilePick, Services, VectorcraftApp};

 struct App {
@@ -183,9 +186,22 @@ fn save_prefs(app: &VectorcraftApp) {
    }
 }

-/// A native file dialog showing `pick`'s file types, folder and suggested name.
-fn file_dialog(pick: &FilePick) -> rfd::FileDialog {
-    let d = pick.filters.iter().fold(rfd::FileDialog::new(), |d, (name, exts)| d.add_filter(*name, exts));
+/// The window file dialogs belong to.
+type Parent = Option<std::sync::Arc<winit::window::Window>>;
+
+/// A native file dialog for `request` over `parent` (Windows and Linux, where the portal then
+/// shows it over the window and keeps it in front; macOS shows them as before).
+fn file_dialog(request: &PickRequest, parent: &Parent) -> rfd::FileDialog {
+    let d = match parent {
+        Some(w) if !cfg!(target_os = "macos") => rfd::FileDialog::new().set_parent(&**w),
+        _ => rfd::FileDialog::new(),
+    };
+    let pick = match request {
+        PickRequest::Open(pick) | PickRequest::Save(pick) => pick,
+        PickRequest::OpenMany => return fileio::place_filters().fold(d.set_title("Place"), |d, (name, exts)| d.add_filter(name, exts)),
+        PickRequest::Folder => return d,
+    };
+    let d = pick.filters.iter().fold(d, |d, (name, exts)| d.add_filter(*name, exts));
    let d = match &pick.folder {
        Some(folder) => d.set_directory(folder),
        None => d,
@@ -193,6 +209,28 @@ fn file_dialog(pick: &FilePick) -> rfd::FileDialog {
    if pick.name.is_empty() { d } else { d.set_file_name(&pick.name) }
 }

+/// Show `dialog` for `request` (on the calling thread, until it closes) → the paths picked.
+fn show_dialog(dialog: rfd::FileDialog, request: &PickRequest) -> Vec<String> {
+    let paths = match request {
+        PickRequest::Open(_) => dialog.pick_file().into_iter().collect(),
+        PickRequest::OpenMany => dialog.pick_files().unwrap_or_default(),
+        PickRequest::Save(pick) => {
+            // The Templates folder may not exist yet.
+            if let Some(folder) = &pick.folder {
+                let _ = std::fs::create_dir_all(folder);
+            }
+            dialog.save_file().into_iter().collect()
+        }
+        PickRequest::Folder => dialog.pick_folder().into_iter().collect(),
+    };
+    paths.into_iter().map(|p| p.to_string_lossy().to_string()).collect()
+}
+
+/// Show the dialog for `request` over `parent` now → the paths picked.
+fn pick_now(request: PickRequest, parent: &Parent) -> Vec<String> {
+    show_dialog(file_dialog(&request, parent), &request)
+}
+
 /// File → Show in Folder: select `path` in Finder / Explorer, or open its folder elsewhere.
 fn reveal(path: &str) -> Result<(), String> {
    reveal_command(path).spawn().map(|_| ()).map_err(|e| format!("can't show {path}: {e}"))
@@ -228,25 +266,31 @@ fn write_file(path: &str, bytes: &[u8]) -> Result<(), String> {
    fileio::write_atomic(std::path::Path::new(path), bytes).map_err(|e| e.to_string())
 }

-fn services() -> Services {
+/// Linux: show the dialog for `request` over `parent` on a thread of its own, answering on the
+/// receiver. Shown on the UI thread, nothing would answer the compositor meanwhile, which then
+/// offers to kill the window as not responding (#592).
+fn start_pick(request: PickRequest, parent: &Parent) -> Option<std::sync::mpsc::Receiver<Vec<String>>> {
+    let dialog = file_dialog(&request, parent);
+    let (tx, rx) = std::sync::mpsc::channel();
+    std::thread::Builder::new()
+        .name("file-dialog".into())
+        .spawn(move || {
+            // The app gone meanwhile has no use for the answer.
+            let _ = tx.send(show_dialog(dialog, &request));
+        })
+        .ok()?;
+    Some(rx)
+}
+
+fn services(parent: Parent) -> Services {
+    let (p1, p2, p3, p4, p5) = (parent.clone(), parent.clone(), parent.clone(), parent.clone(), parent);
    Services {
-        pick_open: Some(Box::new(|pick: &FilePick| file_dialog(pick).pick_file().map(|p| p.to_string_lossy().to_string()))),
-        pick_open_multi: Some(Box::new(|| {
-            fileio::place_filters()
-                .fold(rfd::FileDialog::new().set_title("Place"), |d, (name, exts)| d.add_filter(name, exts))
-                .pick_files()
-                .unwrap_or_default()
-                .into_iter()
-                .map(|p| p.to_string_lossy().to_string())
-                .collect()
-        })),
-        pick_save: Some(Box::new(|pick: &FilePick| {
-            // The Templates folder may not exist yet.
-            if let Some(folder) = &pick.folder {
-                let _ = std::fs::create_dir_all(folder);
-            }
-            file_dialog(pick).save_file().map(|p| p.to_string_lossy().to_string())
-        })),
+        pick_open: Some(Box::new(move |pick: &FilePick| pick_now(PickRequest::Open(pick.clone()), &p1).into_iter().next())),
+        pick_open_multi: Some(Box::new(move || pick_now(PickRequest::OpenMany, &p2))),
+        pick_save: Some(Box::new(move |pick: &FilePick| pick_now(PickRequest::Save(pick.clone()), &p3).into_iter().next())),
+        // Windows and macOS dialogs run the window's events while they are open; Linux's don't.
+        start_pick: cfg!(all(unix, not(target_os = "macos")))
+            .then(|| Box::new(move |request: PickRequest| start_pick(request, &p5)) as vectorcraft_ui_egui::picks::StartPick),
        read: Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string()))),
        write: Some(Box::new(write_file)),
        // Background Save and Export write from a worker thread.
@@ -264,7 +308,7 @@ fn services() -> Services {
        reveal: Some(Box::new(reveal)),
        // Links panel: Edit Original; Package: Show Package. Relink to Folder and Package pick folders.
        open_file: Some(Box::new(open_file)),
-        pick_folder: Some(Box::new(|| rfd::FileDialog::new().pick_folder().map(|p| p.to_string_lossy().to_string()))),
+        pick_folder: Some(Box::new(move || pick_now(PickRequest::Folder, &p4).into_iter().next())),
        // File → Print: the system's printers and print queue.
        print: Some(Box::new(printing::SystemPrint)),
        ..Default::default()
@@ -314,6 +358,9 @@ fn main() -> std::process::ExitCode {
    // First, so every start-up warning is recorded (`logging`).
    let logger = logging::install();
    vectorcraft_ui_egui::i18n::detect_system_lang_in_background();
+    // Before the first font scan (the app's start): the fonts font services load (#579).
+    #[cfg(all(windows, not(target_vendor = "win7")))]
+    system_fonts::install();
    let mut control_port: Option<u16> = std::env::var("VECTORCRAFT_CONTROL_PORT").ok().and_then(|p| p.parse().ok());
    let mut files = Vec::new();
    let mut in_window_menus = std::env::var_os("VECTORCRAFT_IN_WINDOW_MENUS").is_some_and(|v| !v.is_empty() && v != "0");
@@ -392,7 +439,7 @@ fn main() -> std::process::ExitCode {
            "VectorCraft",
            options,
            Box::new(move |cc| {
-                let mut app = VectorcraftApp::new(Session::new(), services());
+                let mut app = VectorcraftApp::new(Session::new(), services(cc.winit_window().cloned()));
                load_prefs(&mut app, saved);
                // Fit the window to its monitor, or put it back where it was (still hidden).
                if let Some(w) = cc.winit_window() {
@@ -0,0 +1,91 @@
+//! Windows: the font files in DirectWrite's system font collection, scanned with the font folders
+//! (`vectorcraft_text::set_platform_font_files`).
+//!
+//! Font services such as Adobe Fonts load their fonts with GDI at run time, from files in their
+//! own folders, without installing them: the font folders and the registry don't list them. Since
+//! Windows 10 (version 1607) DirectWrite's system font collection holds them too
+//! (<https://learn.microsoft.com/windows/win32/directwrite/what-s-new-in-directwrite-for-windows-8-consumer-preview>,
+//! "Support for Adobe Typekit and other font-service clients"), so VectorCraft lists them as other
+//! apps do, reading the files in place (#579).
+//!
+//! DirectWrite is COM, which has no safe API, hence the scoped `unsafe_code` allowance.
+#![allow(unsafe_code)]
+
+use std::collections::BTreeSet;
+
+use windows::Win32::Graphics::DirectWrite::{
+    DWRITE_FACTORY_TYPE_SHARED, DWriteCreateFactory, IDWriteFactory3, IDWriteFontSet, IDWriteLocalFontFileLoader,
+};
+use windows::core::Interface;
+
+/// The most fonts read from the collection (a system has a few thousand).
+const MAX_FONTS: u32 = 1 << 16;
+/// The longest file path taken, in UTF-16 units (Windows' own limit).
+const MAX_PATH: u32 = 32_767;
+
+/// Have the font scans read the font files DirectWrite lists.
+pub fn install() {
+    vectorcraft_text::set_platform_font_files(font_files);
+}
+
+/// The local files of the fonts in DirectWrite's system font collection as it is now (fonts
+/// loaded since the last call included). None before Windows 10, or when DirectWrite fails: the
+/// font folders and the registry still list the installed fonts.
+fn font_files() -> Vec<String> {
+    match collection_files() {
+        Ok(files) => files.into_iter().collect(),
+        Err(e) => {
+            log::debug!("DirectWrite's system fonts aren't listed: {e}");
+            Vec::new()
+        }
+    }
+}
+
+fn collection_files() -> windows::core::Result<BTreeSet<String>> {
+    // SAFETY: plain DirectWrite calls on interfaces it returned, each checked for failure; the
+    // collection is asked to check for fonts loaded since the factory last looked.
+    let set = unsafe {
+        let factory: IDWriteFactory3 = DWriteCreateFactory(DWRITE_FACTORY_TYPE_SHARED)?;
+        let mut collection = None;
+        factory.GetSystemFontCollection(false, &mut collection, true)?;
+        let Some(collection) = collection else { return Ok(BTreeSet::new()) };
+        collection.GetFontSet()?
+    };
+    // SAFETY: a count of the set's fonts.
+    let count = unsafe { set.GetFontCount() }.min(MAX_FONTS);
+    // Faces of one file (a collection's, a variable font's instances) name it once.
+    Ok((0..count).filter_map(|i| local_path(&set, i)).collect())
+}
+
+/// The path of the file holding font `i` of `set`, when it is a local file (not a downloadable
+/// font, nor one in memory).
+fn local_path(set: &IDWriteFontSet, i: u32) -> Option<String> {
+    // SAFETY: `i` is below the set's count; the key DirectWrite hands back stays valid while
+    // `file` (which owns it) lives, and is passed back with its own size; the path buffer is
+    // sized from DirectWrite's answer plus the terminating NUL.
+    unsafe {
+        let file = set.GetFontFaceReference(i).ok()?.GetFontFile().ok()?;
+        let loader: IDWriteLocalFontFileLoader = file.GetLoader().ok()?.cast().ok()?;
+        let (mut key, mut size) = (std::ptr::null_mut(), 0u32);
+        file.GetReferenceKey(&mut key, &mut size).ok()?;
+        let len = loader.GetFilePathLengthFromKey(key, size).ok()?;
+        if len == 0 || len > MAX_PATH {
+            return None;
+        }
+        let mut path = vec![0u16; len as usize + 1];
+        loader.GetFilePathFromKey(key, size, &mut path).ok()?;
+        Some(String::from_utf16_lossy(path.get(..len as usize)?))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    /// DirectWrite lists the installed fonts, by their files' full paths.
+    #[test]
+    fn directwrite_lists_the_installed_font_files() {
+        let files = super::font_files();
+        assert!(files.iter().all(|f| std::path::Path::new(f).is_absolute()), "{:?}", files.first());
+        let fonts = std::path::Path::new(&std::env::var("WINDIR").unwrap()).join("Fonts").to_string_lossy().to_lowercase();
+        assert!(files.iter().any(|f| f.to_lowercase().starts_with(&fonts)), "{} files, {:?}", files.len(), files.first());
+    }
+}
@@ -28,3 +28,6 @@ sync_github_name = false

 [people.mo0kid]
 sync_github_name = true
+
+[people.omd0]
+sync_github_name = true
@@ -82,8 +82,9 @@ pub use setup::{Background, DocSetup, ExportText, GridSize, Quotes};
 pub use slices::{CellAlign, CellVAlign, Slice, SliceArea, SliceKind, SliceOptions, SliceSource};
 pub use style_libs::StyleLibrary;
 pub use text::{
-    AreaOptions, Burasagari, CharAlign, CharPosition, CharStyle, FirstBaseline, Justify, LeadingModel, Mojikumi, ParaDirection, ParaStyle, PathAlign,
-    PathEffect, ScriptMetrics, TabAlign, TabStop, TextKind, TextObject, TextRun, TextStyleDef, TextWrap, WrapShape,
+    AreaFit, AreaOptions, Burasagari, CharAlign, CharPosition, CharStyle, Composer, FirstBaseline, Justify, LeadingModel, Mojikumi, ParaDirection,
+    ParaStyle, PathAlign, PathEffect, ScriptMetrics, TabAlign, TabStop, TextKind, TextObject, TextRun, TextStyleDef, TextWrap, VerticalAlign,
+    WrapShape,
 };
 pub use vectorcraft_color as color;
 pub use vectorcraft_geom as geom;
@@ -285,6 +285,24 @@ fn default_align_on() -> char {
 /// Distance between default tab stops when no explicit stop applies (½ inch).
 pub const DEFAULT_TAB_INTERVAL: f64 = 36.0;

+/// Paragraph composer (Paragraph panel menu): how lines are broken.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum Composer {
+    /// Break each line as soon as it is full.
+    SingleLine,
+    /// Total fit over the whole paragraph (Illustrator's default): justified lines get even word
+    /// spacing, ragged lines an even rag.
+    #[default]
+    EveryLine,
+}
+
+impl Composer {
+    fn is_default(&self) -> bool {
+        *self == Self::default()
+    }
+}
+
 /// Paragraph attributes (the Paragraph panel).
 ///
 /// Saved through [`ParaStyleFile`], which keeps files with text openable by builds from before
@@ -299,6 +317,8 @@ pub struct ParaStyle {
    pub space_before: f64,
    pub space_after: f64,
    pub hyphenate: bool,
+    /// Line breaking: Single-line or Every-line Composer.
+    pub composer: Composer,
    /// Tab stops (Tabs panel), sorted by position.
    pub tabs: Vec<TabStop>,
    /// Paragraph style (Paragraph Styles panel) these attributes come from; None = Normal.
@@ -341,6 +361,8 @@ struct ParaStyleFile {
    space_after: f64,
    #[serde(default)]
    hyphenate: bool,
+    #[serde(default, skip_serializing_if = "Composer::is_default")]
+    composer: Composer,
    #[serde(default, skip_serializing_if = "Vec::is_empty")]
    tabs: Vec<TabStop>,
    #[serde(default, skip_serializing_if = "Option::is_none")]
@@ -370,6 +392,7 @@ impl From<ParaStyle> for ParaStyleFile {
            space_before,
            space_after,
            hyphenate,
+            composer,
            tabs,
            style_name,
            mojikumi,
@@ -387,6 +410,7 @@ impl From<ParaStyle> for ParaStyleFile {
            space_before,
            space_after,
            hyphenate,
+            composer,
            tabs,
            style_name,
            mojikumi,
@@ -407,6 +431,7 @@ impl From<ParaStyleFile> for ParaStyle {
            space_before,
            space_after,
            hyphenate,
+            composer,
            tabs,
            style_name,
            mojikumi,
@@ -423,6 +448,7 @@ impl From<ParaStyleFile> for ParaStyle {
            space_before,
            space_after,
            hyphenate,
+            composer,
            tabs,
            style_name,
            mojikumi,
@@ -506,6 +532,34 @@ pub enum FirstBaseline {
    Fixed,
 }

+/// Area Type Options "Align" (vertical): where the lines of each row/column sit in it.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum VerticalAlign {
+    /// Lines start at the top of the cell (the default).
+    #[default]
+    Top,
+    /// The block of lines is centred in the cell.
+    Center,
+    /// The last line's descent touches the cell bottom.
+    Bottom,
+    /// The first line stays at the top, the last one moves to the bottom and the space left over
+    /// is shared equally between the lines (no paragraph spacing limit).
+    Justify,
+}
+
+impl VerticalAlign {
+    pub const ALL: [VerticalAlign; 4] = [VerticalAlign::Top, VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify];
+    pub fn id(self) -> &'static str {
+        match self {
+            VerticalAlign::Top => "top",
+            VerticalAlign::Center => "center",
+            VerticalAlign::Bottom => "bottom",
+            VerticalAlign::Justify => "justify",
+        }
+    }
+}
+
 /// Text Wrap Options of a wrap object (Object → Text Wrap).
 #[derive(Clone, Copy, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(default)]
@@ -608,11 +662,85 @@ pub struct AreaOptions {
    pub first_baseline: FirstBaseline,
    /// Minimum first-baseline offset in points.
    pub first_baseline_min: f64,
+    /// Vertical alignment of the lines in each row/column.
+    pub vertical_align: VerticalAlign,
+    /// How the frame and its text fit each other (Auto Size, Shrink Text to Fit).
+    #[serde(skip_serializing_if = "crate::skip::is_default")]
+    pub fit: AreaFit,
 }

 impl Default for AreaOptions {
    fn default() -> Self {
-        Self { rows: 1, columns: 1, gutter: 18.0, inset: 0.0, first_baseline: FirstBaseline::Ascent, first_baseline_min: 0.0 }
+        Self {
+            rows: 1,
+            columns: 1,
+            gutter: 18.0,
+            inset: 0.0,
+            first_baseline: FirstBaseline::Ascent,
+            first_baseline_min: 0.0,
+            vertical_align: VerticalAlign::Top,
+            fit: AreaFit::None,
+        }
+    }
+}
+
+/// How area type and its frame fit each other. Serialized as `"none"`, `"autoHeight"` or
+/// `{"shrinkText": {"minPercent": 50}}`.
+#[derive(Clone, Copy, Debug, Default, PartialEq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum AreaFit {
+    /// The frame keeps its size; text that doesn't fit overflows.
+    #[default]
+    None,
+    /// The frame's height follows the text (Illustrator's Auto Size): resolved by the engine after
+    /// each edit, for rectangular frames of horizontal type in one row.
+    AutoHeight,
+    /// Text that overflows is scaled down (size, leading and baseline shift; not paragraph
+    /// spacing) by the largest factor down to `min_percent` % that makes it fit, at layout time.
+    ShrinkText {
+        #[serde(rename = "minPercent", default = "AreaFit::default_min_percent")]
+        min_percent: f64,
+    },
+}
+
+impl AreaFit {
+    /// The smallest Shrink Text to Fit percentage allowed.
+    pub const MIN_PERCENT: f64 = 10.0;
+    /// The Shrink Text to Fit percentage new settings start with.
+    pub const DEFAULT_MIN_PERCENT: f64 = 50.0;
+    fn default_min_percent() -> f64 {
+        Self::DEFAULT_MIN_PERCENT
+    }
+    /// Its id: `none`, `autoHeight` or `shrinkText`.
+    pub fn id(self) -> &'static str {
+        match self {
+            AreaFit::None => "none",
+            AreaFit::AutoHeight => "autoHeight",
+            AreaFit::ShrinkText { .. } => "shrinkText",
+        }
+    }
+    /// The fit an id names (case, spaces, dashes and underscores ignored), with `min_percent`
+    /// for Shrink Text (clamped to 10..100; a non-finite value gives the default).
+    pub fn parse(id: &str, min_percent: Option<f64>) -> Option<Self> {
+        match id.to_ascii_lowercase().replace([' ', '-', '_'], "").as_str() {
+            "none" | "off" => Some(AreaFit::None),
+            "autoheight" | "autosize" => Some(AreaFit::AutoHeight),
+            "shrinktext" | "shrinktexttofit" | "shrink" => {
+                Some(AreaFit::ShrinkText { min_percent: Self::clamp_percent(min_percent.unwrap_or(Self::DEFAULT_MIN_PERCENT)) })
+            }
+            _ => None,
+        }
+    }
+    /// A Shrink Text minimum percentage within 10..100 (the default when not finite).
+    pub fn clamp_percent(p: f64) -> f64 {
+        if p.is_finite() { p.clamp(Self::MIN_PERCENT, 100.0) } else { Self::DEFAULT_MIN_PERCENT }
+    }
+    /// Shrink Text's minimum scale factor (0.1..1), if this is Shrink Text.
+    pub fn min_scale(self) -> Option<f64> {
+        match self {
+            AreaFit::ShrinkText { min_percent } => Some(Self::clamp_percent(min_percent) / 100.0),
+            _ => None,
+        }
    }
 }

@@ -50,7 +50,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Create Text",
            [],
            None,
-            "{x, y, text, vertical?: bool = false, size?: pt, font?: family, style?, color?, area?: {width, height}, placeholder?: bool (fill it with placeholder text instead, as the Type tools do with prefs placeholderText), leadingModel?: \"romanBaseline\"|\"emBoxTop\", charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\" (default: emBoxTop and emBoxCenter while the interface is in Japanese, else romanBaseline)} → {id}",
+            "{x, y, text, vertical?: bool = false, size?: pt, font?: family, style?, color?, area?: {width, height, fit?: none|autoHeight|shrinkText, fitMinPercent?}, placeholder?: bool (fill it with placeholder text instead, as the Type tools do with prefs placeholderText), leadingModel?: \"romanBaseline\"|\"emBoxTop\", charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\" (default: emBoxTop and emBoxCenter while the interface is in Japanese, else romanBaseline)} → {id}; new area type gets Auto Size (fit autoHeight) when the autoSizeAreaType preference is on",
            has_doc,
            text_create
        ),
@@ -415,10 +415,12 @@ fn text_create(s: &mut Session, p: &Value) -> Result<Value> {
        let w = f64_or(a, "width", 200.0);
        let h = f64_or(a, "height", 100.0);
        t.kind = vectorcraft_doc::TextKind::Area { frame: shapes::rectangle(Rect::new(0.0, 0.0, w, h)) };
+        t.area.fit = new_area_fit(s, a, "text.create")?;
    }
    if bool_or(p, "placeholder", false) {
        super::typemenu::fill_with_placeholder(&mut t);
    } else {
+        // Lays the text out (and sizes an Auto Size frame).
        super::typecmd::refresh_bounds(&mut t);
    }
    add_node(s, "Type", NodeKind::Text(Box::new(t)), Appearance::default(), None)
@@ -471,6 +473,13 @@ pub(crate) fn new_type_alignment(s: &mut Session, p: &Value, cmd: &str, t: &mut
    Ok(())
 }

+/// The fit new area type gets: `fit`/`fitMinPercent` from `p` (as `text.areaOptions` takes
+/// them), else Auto Size when the "Auto Size New Area Type" preference is on.
+pub(crate) fn new_area_fit(s: &Session, p: &Value, c: &str) -> Result<vectorcraft_doc::AreaFit> {
+    let default = if s.prefs.auto_size_area_type { vectorcraft_doc::AreaFit::AutoHeight } else { vectorcraft_doc::AreaFit::None };
+    Ok(super::typecmd::fit_param(p, default, c)?.unwrap_or(default))
+}
+
 /// The character style new type gets: `size`, `font`, `style` and `color` from `p`, else the
 /// defaults, filled with the current fill unless that is None or white (black then).
 pub(crate) fn new_type_style(s: &Session, p: &Value) -> CharStyle {
@@ -86,7 +86,7 @@ pub(super) const OPTIONS: &[FormatOption] = &[
        name: "createLayers",
        ty: "boolean",
        default: "false",
-        description: "top-level layers as PDF layers (optional content groups with their visibility, print state and lock; PDF 1.5 or later)",
+        description: "layers and sublayers as PDF layers (optional content groups with their visibility, print state and lock, sublayers listed under their layers; PDF 1.5 or later)",
    },
    FormatOption {
        name: "flattenerPreset",
@@ -109,7 +109,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Export PDF",
            [],
            None,
-            "{path?, preset?: \"VectorCraft Default\" (built-in or saved: pdf.preset.list), artboard? | artboards?: [i…] | range?: \"1-3, 5\" (1-based; default all, one page each), standard?: none|pdfA2b|pdfX1a (CMYK, grey and spot colours only: colours and images converted to output.destination or the CMYK output intent, untagged; transparency flattened with flattenerPreset; PDF 1.3)|pdfX3 (colours ICC-tagged; transparency flattened; PDF 1.3)|pdfX4 (transparency and layers kept; colours ICC-tagged; PDF 1.6 at most) (PDF/X: a /GTS_PDFX output intent, by default the CMYK profile in effect, embedded; TrimBox, Trapped, GTS_PDFXVersion, title and dates; fonts embedded or outlined), compatibility?: 1.3 (no transparency: it is flattened with flattenerPreset; images keep no see-through pixels)|1.4|1.5|1.6|1.7 (default)|2.0 (choosing a standard sets its version: 1.7 for pdfA2b, 1.6 for pdfX4, 1.3 for pdfX1a and pdfX3, which write 1.4 as 1.3 too; pdfA2b refuses 1.3), preserveEditing? (on in VectorCraft Default: the native document as an embedded file, which document.open restores; choosing a standard turns it off, a standard refuses it), thumbnails? (each page drawn as a /Thumb image, 106 px on its long side), fastWebView? (a linearised file: the first page shows while the rest downloads; it stays linearised when encrypted), viewAfterSaving? (the app opens the written file), createLayers? (each top-level layer but template layers as a PDF layer, an optional content group: hidden layers off, non-printing ones /PrintState /OFF, locked ones locked; needs 1.5 or later; they reopen as layers; choosing pdfX1a or pdfX3 turns it off; they refuse it), includeNonPrinting? (keep layers whose Print option is off; left out by default unless createLayers), flattenerPreset?: \"\" (High Resolution) | high | medium | low | a saved preset (flattener.presets.list): what PDF 1.3 files flatten transparency with, flattener?: {object.flattenTransparency options over it}, compression?: {color?, gray?: {downsample: none|average|subsample|bicubic, ppi: 300, abovePpi: 450, compression: none|zip|jpeg|jpeg2000|auto, quality: minimum|low|medium|high|maximum}, mono?: {downsample, ppi: 1200, abovePpi: 1800, compression: none|ccittG3|ccittG4|zip|runLength} (black-and-white images), compressText?: true} (images above abovePpi are resampled to ppi; auto keeps JPEGs JPEG, the others lossless; JPEG needs opaque images; none, jpeg2000, CCITT and runLength are written as ZIP with a warning), marks?: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25 (trim marks and targets), offset: 6 (pt from the artboard, at least the bleed)} (printer's marks in [Registration], every plate: trim marks, registration targets mid-side, CMYK/spot/black-tint colour bars on top, page information (title, artboard, date UTC) below), bleed?: {useDocument (the document's bleed, document.setup), top, bottom, left, right} (pt; art in the bleed is kept). Each page: TrimBox = artboard, BleedBox = artboard + bleed, MediaBox = that + the marks' room (art clipped to the BleedBox), output?: {conversion: none (default)|destination (every colour into the destination profile's model, CMYK or RGB, also colours of that model in another profile)|preserveNumbers (only colours of the other model and Lab; those in the destination's model keep their numbers) (grey stays grey; images are converted too, printer's marks are not), destination: profile name (edit.colorSettings lists them; default: the document's profile for its colour mode), profiles: none (device colours)|all|destination|taggedSource (documents assigned a profile: edit.assignProfile) (ICC-based colours: CMYK with the destination or document CMYK profile, RGB as sRGB, grey with the sRGB tone curve; PDF/A always), outputIntent: profile name (embedded as the catalog's /GTS_PDFX output intent; a name that isn't a profile is only named, which pdfX1a and pdfX3 allow only with a registry and pdfX4 refuses; pdfX1a needs a CMYK one), outputCondition, outputConditionId (default: outputIntent), registry, trapped (/Trapped /True; /False when an output intent is written)} (PDF/A files keep their own output intent), advanced?: {fontSubsetPercent: 100 (below 100 is accepted with a warning: fonts are always embedded as subsets), outlineText: true (false: type as real, selectable and searchable text in embedded subset fonts with a ToUnicode map; fonts whose licence forbids embedding, or allows only whole fonts, stay outlines with a warning), overprint: preserve (overprinting fills and strokes set /OP /op true, /OPM 1; white ones knock out with document.setup discardWhiteOverprint)|discard (they knock out)}, security?: {openPassword, permissionsPassword, printing: none|low|high, changes: none|pages|forms|comments|any, copy, screenReader, plaintextMetadata}} → {path, bytes, warnings}; no path → {dataBase64, bytes, warnings}. The options apply over the preset (null keeps its value); options accepted but not applied yet c
Line truncated
+            "{path?, preset?: \"VectorCraft Default\" (built-in or saved: pdf.preset.list), artboard? | artboards?: [i…] | range?: \"1-3, 5\" (1-based; default all, one page each), standard?: none|pdfA2b|pdfX1a (CMYK, grey and spot colours only: colours and images converted to output.destination or the CMYK output intent, untagged; transparency flattened with flattenerPreset; PDF 1.3)|pdfX3 (colours ICC-tagged; transparency flattened; PDF 1.3)|pdfX4 (transparency and layers kept; colours ICC-tagged; PDF 1.6 at most) (PDF/X: a /GTS_PDFX output intent, by default the CMYK profile in effect, embedded; TrimBox, Trapped, GTS_PDFXVersion, title and dates; fonts embedded or outlined), compatibility?: 1.3 (no transparency: it is flattened with flattenerPreset; images keep no see-through pixels)|1.4|1.5|1.6|1.7 (default)|2.0 (choosing a standard sets its version: 1.7 for pdfA2b, 1.6 for pdfX4, 1.3 for pdfX1a and pdfX3, which write 1.4 as 1.3 too; pdfA2b refuses 1.3), preserveEditing? (on in VectorCraft Default: the native document as an embedded file, which document.open restores; choosing a standard turns it off, a standard refuses it), thumbnails? (each page drawn as a /Thumb image, 106 px on its long side), fastWebView? (a linearised file: the first page shows while the rest downloads; it stays linearised when encrypted), viewAfterSaving? (the app opens the written file), createLayers? (each layer and sublayer but template layers as a PDF layer, an optional content group listed under its layer's: hidden layers off, non-printing ones /PrintState /OFF, locked ones locked; needs 1.5 or later; they reopen as layers; choosing pdfX1a or pdfX3 turns it off; they refuse it), includeNonPrinting? (keep layers whose Print option is off; left out by default unless createLayers), flattenerPreset?: \"\" (High Resolution) | high | medium | low | a saved preset (flattener.presets.list): what PDF 1.3 files flatten transparency with, flattener?: {object.flattenTransparency options over it}, compression?: {color?, gray?: {downsample: none|average|subsample|bicubic, ppi: 300, abovePpi: 450, compression: none|zip|jpeg|jpeg2000|auto, quality: minimum|low|medium|high|maximum}, mono?: {downsample, ppi: 1200, abovePpi: 1800, compression: none|ccittG3|ccittG4|zip|runLength} (black-and-white images), compressText?: true} (images above abovePpi are resampled to ppi; auto keeps JPEGs JPEG, the others lossless; JPEG needs opaque images; none, jpeg2000, CCITT and runLength are written as ZIP with a warning), marks?: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25 (trim marks and targets), offset: 6 (pt from the artboard, at least the bleed)} (printer's marks in [Registration], every plate: trim marks, registration targets mid-side, CMYK/spot/black-tint colour bars on top, page information (title, artboard, date UTC) below), bleed?: {useDocument (the document's bleed, document.setup), top, bottom, left, right} (pt; art in the bleed is kept). Each page: TrimBox = artboard, BleedBox = artboard + bleed, MediaBox = that + the marks' room (art clipped to the BleedBox), output?: {conversion: none (default)|destination (every colour into the destination profile's model, CMYK or RGB, also colours of that model in another profile)|preserveNumbers (only colours of the other model and Lab; those in the destination's model keep their numbers) (grey stays grey; images are converted too, printer's marks are not), destination: profile name (edit.colorSettings lists them; default: the document's profile for its colour mode), profiles: none (device colours)|all|destination|taggedSource (documents assigned a profile: edit.assignProfile) (ICC-based colours: CMYK with the destination or document CMYK profile, RGB as sRGB, grey with the sRGB tone curve; PDF/A always), outputIntent: profile name (embedded as the catalog's /GTS_PDFX output intent; a name that isn't a profile is only named, which pdfX1a and pdfX3 allow only with a registry and pdfX4 refuses; pdfX1a needs a CMYK one), outputCondition, outputConditionId (default: outputIntent), registry, trapped (/Trapped /True; /False when an output intent is written)} (PDF/A files keep their own output intent), advanced?: {fontSubsetPercent: 100 (below 100 is accepted with a warning: fonts are always embedded as subsets), outlineText: true (false: type as real, selectable and searchable text in embedded subset fonts with a ToUnicode map; fonts whose licence forbids embedding, or allows only whole fonts, stay outlines with a warning), overprint: preserve (overprinting fills and strokes set /OP /op true, /OPM 1; white ones knock out with document.setup discardWhiteOverprint)|discard (they knock out)}, security?: {openPassword, permissionsPassword, printing: none|low|high, changes: none|pages|forms|comments|any, copy, screenReader, plaintextMetadata}} → {path, bytes, warnings}; no path → {dataBase64, bytes, warnings}. The options apply over the preset (null keeps its value); options ac
Line truncated
            has_doc,
            export_pdf
        ),
@@ -306,11 +306,16 @@ fn blank_pages(doc: &Document) -> Document {
 const NOT_PDF_COMPATIBLE: &str = "saved without PDF content: VectorCraft opens it as before, other apps show empty pages";

 /// The encoder's params for a `.ai` file, from a save's or an export's: a PDF of every artboard
-/// with the PDF options, always carrying the native document; Use Compression compresses the
-/// PDF's content.
+/// with the PDF options, always carrying the native document, its layers and sublayers PDF layers
+/// (hidden ones off) unless asked otherwise; Use Compression compresses the PDF's content.
 pub(super) fn ai_params(params: &mut Value) {
    let Some(o) = params.as_object_mut() else { return };
    o.extend([("preserveEditing".into(), json!(true)), ("range".into(), json!("all"))]);
+    // Apps that read the PDF part (not the native document) then find the layers, the hidden ones
+    // with their art (#372); a PDF standard decides for itself.
+    if o.get("standard").is_none_or(Value::is_null) {
+        o.entry("createLayers").or_insert(json!(true));
+    }
    if let Some(c) = o.get("compress").and_then(Value::as_bool) {
        let compression = o.entry("compression").or_insert_with(|| json!({}));
        if let Some(m) = compression.as_object_mut() {
@@ -59,3 +59,35 @@ fn export_pdf_overprint_is_preserved_or_discarded() {
    assert_eq!(overprints(&mut s, json!({"compression": {"compressText": false}})), 1);
    assert_eq!(overprints(&mut s, json!({"advanced": {"overprint": "discard"}})), 0);
 }
+
+/// A `.ai` file's PDF part, which apps that don't read the native document open, has the layers
+/// and sublayers as PDF layers, the hidden ones with their art (#372).
+#[test]
+fn ai_files_write_their_layers_and_sublayers_as_pdf_layers() {
+    let mut s = session();
+    let layer1 = s.execute("document.inspect", &json!({})).unwrap()["layers"][1]["id"].as_u64().unwrap();
+    let sub = s.execute("layer.newSublayer", &json!({"parent": layer1, "name": "Sketch"})).unwrap()["id"].as_u64().unwrap();
+    s.execute("layer.setCurrent", &json!({"id": sub})).unwrap();
+    s.execute("shape.ellipse", &json!({"x": 10, "y": 40, "width": 20, "height": 20})).unwrap();
+    s.execute("layer.setProps", &json!({"id": sub, "visible": false})).unwrap();
+    // Name, shown and what it holds (sublayers by name), top-level layers in paint order.
+    fn rows(layers: &[std::sync::Arc<vectorcraft_doc::Node>]) -> Vec<(String, bool, Vec<String>)> {
+        layers
+            .iter()
+            .map(|l| {
+                let held =
+                    l.children().into_iter().flatten().map(|c| c.name.clone().filter(|_| c.is_layer()).unwrap_or_else(|| "art".into())).collect();
+                (l.name.clone().unwrap_or_default(), l.visible, held)
+            })
+            .collect()
+    }
+    let v = s.execute("document.export", &json!({"format": "ai"})).unwrap();
+    let back = vectorcraft_pdf::import(&b64(&v)).unwrap();
+    let art = || "art".to_string();
+    assert_eq!(rows(&back.layers), [("Layer 1".to_string(), true, vec![art(), "Sketch".into()]), ("Notes".to_string(), false, vec![art()])]);
+    let sketch = back.layers.first().and_then(|l| l.children()?.last().cloned()).unwrap();
+    assert_eq!(rows(&[sketch]), [("Sketch".to_string(), false, vec![art()])]);
+    // Asked not to, it writes none.
+    let v = s.execute("document.export", &json!({"format": "ai", "createLayers": false})).unwrap();
+    assert_eq!(vectorcraft_pdf::import(&b64(&v)).unwrap().layers.len(), 1);
+}
@@ -2,7 +2,7 @@
 //! Character/Paragraph attributes.

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

 use super::*;
@@ -43,7 +43,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Character / Paragraph",
            [],
            None,
-            "{ids?|id?, kerning?: 1/1000 em|\"auto\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg, underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt, hyphenate?: bool, mojikumi?: \"none\"|\"lineEndHalf\" (Japanese punctuation spacing), direction?: \"auto\"|\"leftToRight\"|\"rightToLeft\" (paragraph direction; auto: from each paragraph's first strong character), leadingModel?: \"romanBaseline\"|\"emBoxTop\" (leading measured baseline to baseline, or em box top to top), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\" (where characters smaller than the largest on their line line up with it), burasagari?: \"none\"|\"standard\"|\"forced\" (Paragraph panel menu › Burasagari None/Regular/Force: an East Asian comma or full stop ending an area type line hangs outside it: when it doesn't fit, or always; new type: \"standard\")}",
+            "{ids?|id?, kerning?: 1/1000 em|\"auto\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg, underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt, hyphenate?: bool, mojikumi?: \"none\"|\"lineEndHalf\" (Japanese punctuation spacing), direction?: \"auto\"|\"leftToRight\"|\"rightToLeft\" (paragraph direction; auto: from each paragraph's first strong character), leadingModel?: \"romanBaseline\"|\"emBoxTop\" (leading measured baseline to baseline, or em box top to top), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\" (where characters smaller than the largest on their line line up with it), burasagari?: \"none\"|\"standard\"|\"forced\" (Paragraph panel menu › Burasagari None/Regular/Force: an East Asian comma or full stop ending an area type line hangs outside it: when it doesn't fit, or always; new type: \"standard\"), composer?: \"singleLine\"|\"everyLine\" (line breaking, Every-line by default)}",
            has_doc,
            set_format
        ),
@@ -219,10 +219,19 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
        "leadingModel",
        "charAlign",
        "burasagari",
+        "composer",
    ];
    if !keys.iter().any(|k| p.get(*k).is_some()) {
        return Err(bad(C, "nothing to change"));
    }
+    let composer = match p.get("composer") {
+        None | Some(Value::Null) => None,
+        Some(v) => Some(match v.as_str() {
+            Some("singleLine") => Composer::SingleLine,
+            Some("everyLine") => Composer::EveryLine,
+            _ => return Err(bad(C, "composer must be \"singleLine\" or \"everyLine\"")),
+        }),
+    };
    let (position, small_caps) = super::docsetup::script_params(p, &s.doc()?.doc.setup, C)?;
    let char_align = super::textedit::char_align_param(p, C)?;
    let mojikumi = match p.get("mojikumi") {
@@ -329,6 +338,9 @@ fn set_format(s: &mut Session, p: &Value) -> Result<Value> {
            if let Some(v) = burasagari {
                para.burasagari = v;
            }
+            if let Some(v) = composer {
+                para.composer = v;
+            }
            super::typecmd::refresh_bounds(t);
        }
        Ok(())
@@ -45,7 +45,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Area / Path Type",
            [],
            None,
-            "{path: id, mode: \"area\"|\"onPath\", text?: \"\", vertical?: bool = false, at?: [x, y] (on-path start: nearest point), size?, font?, placeholder?: bool (placeholder text instead, as text.create), leadingModel?, charAlign? (as text.create)} turn a path into an area-type frame or a type-on-a-path baseline (the path's paint is dropped) → {id}",
+            "{path: id, mode: \"area\"|\"onPath\", text?: \"\", vertical?: bool = false, at?: [x, y] (on-path start: nearest point), size?, font?, fit?: none|autoHeight|shrinkText, fitMinPercent? (area: as text.areaOptions; default autoHeight when the autoSizeAreaType preference is on), placeholder?: bool (placeholder text instead, as text.create), leadingModel?, charAlign? (as text.create)} turn a path into an area-type frame or a type-on-a-path baseline (the path's paint is dropped) → {id}",
            has_doc,
            create_in_path
        ),
@@ -472,6 +472,9 @@ fn create_in_path(s: &mut Session, p: &Value) -> Result<Value> {
        cached_baselines: Vec::new(),
    };
    super::create::new_type_alignment(s, p, C, &mut t)?;
+    if !on_path {
+        t.area.fit = super::create::new_area_fit(s, p, C)?;
+    }
    if bool_or(p, "placeholder", false) {
        super::typemenu::fill_with_placeholder(&mut t);
    } else {
@@ -93,6 +93,16 @@ pub(crate) fn reflow(before: &Document, doc: &mut Document) {
            continue;
        }
        vectorcraft_text::edit::normalize(&mut story);
+        if live.len() >= 2 {
+            // Threaded frames keep their size: Auto Size is off for them (as in Illustrator).
+            for id in &live {
+                if text_of(doc, *id).is_some_and(|t| t.area.fit == vectorcraft_doc::AreaFit::AutoHeight)
+                    && let Some(NodeKind::Text(t)) = doc.node_mut(*id).map(|n| &mut n.kind)
+                {
+                    t.area.fit = vectorcraft_doc::AreaFit::None;
+                }
+            }
+        }
        let frames: Vec<TextObject> = live.iter().filter_map(|id| text_of(doc, *id).cloned()).collect();
        let refs: Vec<&TextObject> = frames.iter().collect();
        let parts = vectorcraft_text::thread::distribute(vectorcraft_text::FontDb::global(), &refs, &story);
@@ -4,7 +4,7 @@
 use std::sync::Arc;

 use serde_json::{Value, json};
-use vectorcraft_doc::{Document, Justify, Node, NodeId, NodeKind, TextObject};
+use vectorcraft_doc::{AreaFit, Document, Justify, Node, NodeId, NodeKind, TextObject};
 use vectorcraft_geom::{Affine, PathData, Vec2};

 use super::edit::selected_roots;
@@ -48,7 +48,7 @@ pub fn specs() -> Vec<CommandSpec> {
            "Area Type Options…",
            ["Type"],
            None,
-            "{ids?, width?: pt, height?: pt, rows?, columns?, gutter?: pt, inset?: pt, firstBaseline?: ascent|capHeight|xHeight|leading|fixed, firstBaselineMin?: pt} set the selected area type's options; width and height size the type area from its top-left corner, along the type's own axes, and the text reflows at its size (none given: query) → the first object's options",
+            "{ids?, width?: pt, height?: pt, rows?, columns?, gutter?: pt, inset?: pt, firstBaseline?: ascent|capHeight|xHeight|leading|fixed, firstBaselineMin?: pt, verticalAlign?: top|center|bottom|justify, fit?: none|autoHeight|shrinkText, fitMinPercent?: 10..100} set the selected area type's options; width and height size the type area from its top-left corner, along the type's own axes, and the text reflows at its size (with fit autoHeight, Auto Size, the frame's height follows the text after every edit and height is ignored; setting the height by hand turns it off); fit shrinkText scales overflowing text down (size, leading, baseline shift) by the largest factor down to fitMinPercent % (default 50) that makes it fit (none given: query) → the first object's options, plus overflow (the text doesn't fit its frame) and fitScale (Shrink Text's factor, 1 unshrunk)",
            has_selection,
            area_options
        ),
@@ -97,13 +97,94 @@ fn orientation(s: &mut Session, p: &Value, vertical: bool) -> Result<Value> {
    Ok(json!({"vertical": vertical, "ids": ids.iter().map(|id| id.0).collect::<Vec<_>>()}))
 }

-/// Recompute the layout caches (bounds and baselines) after a text edit.
+/// Recompute the layout caches (bounds and baselines) after a text edit. Every engine text edit ends here (typing
+/// through `text.editRange` too), inside its `Session::edit`, so this is where Auto Size area type
+/// ([`vectorcraft_doc::AreaFit::AutoHeight`]) fits its frame to the text: part of the same undo
+/// step as the edit.
 pub(crate) fn refresh_bounds(t: &mut TextObject) {
+    auto_height(t);
    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t);
    t.cached_bounds = Some(lay.bounds);
    t.cached_baselines = lay.baselines();
 }

+/// The text-space bounds of area type's frame, when Auto Size can fit it: a rectangle (one
+/// subpath, as large as its bounds) of horizontal type in one row, with some height.
+fn auto_height_frame(t: &TextObject) -> Option<vectorcraft_geom::Rect> {
+    use vectorcraft_geom::Shape;
+    let vectorcraft_doc::TextKind::Area { frame } = &t.kind else { return None };
+    if t.area.fit != vectorcraft_doc::AreaFit::AutoHeight || t.vertical || t.area.rows > 1 || frame.subpaths.len() != 1 {
+        return None;
+    }
+    let b = frame.bounds()?;
+    let area = frame.to_bezpath().area().abs();
+    let finite = [b.x0, b.y0, b.x1, b.y1].iter().all(|v| v.is_finite());
+    (finite && b.height() > 1e-6 && b.width() > 1e-6 && (area - b.area()).abs() <= b.area() * 1e-6).then_some(b)
+}
+
+/// Auto Size: move the bottom of a rectangular area type frame to just below its last line (plus
+/// the inset), so the frame's height follows the text. Text in several columns gets the least
+/// height (to 0.01 pt) at which it fits. True when the frame changed.
+fn auto_height(t: &mut TextObject) -> bool {
+    use vectorcraft_geom::Shape;
+    let Some(b) = auto_height_frame(t) else { return false };
+    let db = vectorcraft_text::FontDb::global();
+    // Lay out in a frame as tall as the canvas allows: everything the width lets through flows.
+    let tall = (crate::MAX_COORD - b.y0).min(1.0e5);
+    if tall <= 1.0 {
+        return false;
+    }
+    let mut probe = t.clone();
+    let with_size = |probe: &mut TextObject, w: f64, h: f64| {
+        if let vectorcraft_doc::TextKind::Area { frame } = &mut probe.kind {
+            *frame = PathData::from_bezpath(&vectorcraft_geom::Rect::new(b.x0, b.y0, b.x0 + w, b.y0 + h).to_path(0.1));
+        }
+    };
+    // Columns: all the text in one column as wide as each of them is surely tall enough.
+    let cols = t.area.columns.max(1);
+    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;
+    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 };
+    // The layout's fit test is `baseline + descent <= bottom + 0.01`: the last line fits exactly.
+    let mut h = (bottom + inset - b.y0).clamp(1.0, tall);
+    if cols > 1 {
+        // The least height (to 0.01 pt) at which the columns hold the text.
+        probe.area.columns = cols;
+        let fits = |probe: &mut TextObject, h: f64| {
+            with_size(probe, b.width(), h);
+            !vectorcraft_text::layout(db, probe).overflow
+        };
+        if !fits(&mut probe, h) {
+            return false;
+        }
+        let (mut lo, mut hi) = (1.0, h);
+        for _ in 0..24 {
+            if hi - lo <= 0.01 {
+                break;
+            }
+            let mid = (lo + hi) * 0.5;
+            if fits(&mut probe, mid) { hi = mid } else { lo = mid }
+        }
+        h = hi;
+    }
+    if (h - b.height()).abs() <= 1e-6 {
+        return false;
+    }
+    // Scale the frame about its top edge, keeping its anchors (and their order) as they are.
+    let a = Affine::translate((0.0, b.y0)) * Affine::scale_non_uniform(1.0, h / b.height()) * Affine::translate((0.0, -b.y0));
+    let vectorcraft_doc::TextKind::Area { frame } = &mut t.kind else { return false };
+    let mut next = frame.clone();
+    next.transform(a);
+    if next.bounds().is_none_or(|nb| ![nb.x0, nb.y0, nb.x1, nb.y1].iter().all(|v| v.is_finite() && v.abs() <= crate::MAX_COORD)) {
+        return false;
+    }
+    *frame = next;
+    true
+}
+
 /// Text objects among `ids` and their descendants.
 fn text_ids(d: &Document, ids: &[NodeId]) -> Vec<NodeId> {
    let mut out = vec![];
@@ -292,10 +373,18 @@ pub(crate) fn reshape_area_with(t: &mut TextObject, f: impl FnOnce(&mut TextObje
        }
        _ => false,
    };
+    let height = |t: &TextObject| auto_height_frame(t).map(|b| b.height());
+    let was = height(t);
    if !(f(t) && within(t)) {
        t.kind = before;
        return false;
    }
+    // Setting the height by hand turns Auto Size off (as in Illustrator); a new width keeps it.
+    if let (Some(a), Some(b)) = (was, height(t))
+        && (a - b).abs() > 1e-6
+    {
+        t.area.fit = vectorcraft_doc::AreaFit::None;
+    }
    refresh_bounds(t);
    true
 }
@@ -334,6 +423,60 @@ fn size_area(t: &mut TextObject, w: Option<f64>, h: Option<f64>) -> bool {
    reshape_area_with(t, |t| t.transform_area(a))
 }

+/// The fit `p` asks for (`fit`: none|autoHeight|shrinkText or `{"shrinkText": {"minPercent"}}`,
+/// `fitMinPercent`), starting from `cur`. None when `p` sets neither (or only `fitMinPercent`
+/// while the fit isn't Shrink Text).
+pub(crate) fn fit_param(p: &Value, cur: AreaFit, c: &str) -> Result<Option<AreaFit>> {
+    let min = p.get("fitMinPercent").and_then(Value::as_f64);
+    let cur_min = match cur {
+        AreaFit::ShrinkText { min_percent } => Some(min_percent),
+        _ => None,
+    };
+    let fit = match p.get("fit") {
+        None | Some(Value::Null) => match (cur, min) {
+            (AreaFit::ShrinkText { .. }, Some(m)) => AreaFit::ShrinkText { min_percent: m },
+            _ => return Ok(None),
+        },
+        Some(Value::String(id)) => {
+            AreaFit::parse(id, min.or(cur_min)).ok_or_else(|| bad(c, format!("fit must be none|autoHeight|shrinkText, got {id}")))?
+        }
+        Some(v) => match serde_json::from_value::<AreaFit>(v.clone()).map_err(|e| bad(c, format!("bad fit: {e}")))? {
+            AreaFit::ShrinkText { min_percent } => AreaFit::ShrinkText { min_percent: min.unwrap_or(min_percent) },
+            f => f,
+        },
+    };
+    Ok(Some(match fit {
+        AreaFit::ShrinkText { min_percent } => AreaFit::ShrinkText { min_percent: AreaFit::clamp_percent(min_percent) },
+        f => f,
+    }))
+}
+
+/// Area type's options as `text.areaOptions` reports them: the Area Type Options with `fit` as
+/// its id and `fitMinPercent` beside it, the frame's `width` and `height`, and whether the text
+/// `overflow`s its frame at `fitScale` (Shrink Text to Fit's factor; 1 unshrunk).
+pub(crate) fn area_options_json(t: &TextObject) -> Result<Value> {
+    let mut v = serde_json::to_value(&t.area).map_err(|e| EngineError::Other(e.to_string()))?;
+    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t);
+    if let Some(o) = v.as_object_mut() {
+        o.insert("fit".into(), json!(t.area.fit.id()));
+        let min = match t.area.fit {
+            AreaFit::ShrinkText { min_percent } => min_percent,
+            _ => AreaFit::DEFAULT_MIN_PERCENT,
+        };
+        o.insert("fitMinPercent".into(), json!(min));
+        if let Some((w, h, _)) = area_size(t) {
+            o.insert("width".into(), json!(w));
+            o.insert("height".into(), json!(h));
+        }
+        o.insert("overflow".into(), json!(lay.overflow));
+        o.insert("fitScale".into(), json!(lay.fit_scale));
+    }
+    Ok(v)
+}
+
+/// The [`vectorcraft_doc::AreaOptions`] keys `text.areaOptions` merges as they are.
+const AREA_KEYS: [&str; 7] = ["rows", "columns", "gutter", "inset", "firstBaseline", "firstBaselineMin", "verticalAlign"];
+
 fn area_options(s: &mut Session, p: &Value) -> Result<Value> {
    const C: &str = "text.areaOptions";
    let ids: Vec<NodeId> = {
@@ -343,34 +486,35 @@ fn area_options(s: &mut Session, p: &Value) -> Result<Value> {
    let first = *ids.first().ok_or_else(|| bad(C, "select area type (text in a frame)"))?;
    let options = |s: &Session| -> Result<Value> {
        let t = area_text(s.doc()?.doc.node(first)).ok_or_else(|| bad(C, "select area type (text in a frame)"))?;
-        let mut v = serde_json::to_value(&t.area).map_err(|e| EngineError::Other(e.to_string()))?;
-        if let (Some(o), Some((w, h, _))) = (v.as_object_mut(), area_size(t)) {
-            o.insert("width".into(), json!(w));
-            o.insert("height".into(), json!(h));
-        }
-        Ok(v)
+        area_options_json(t)
    };
-    let mut v = options(s)?;
-    let size = |k: &str| p.get(k).and_then(Value::as_f64).map(|x| x.clamp(1.0, 100_000.0));
-    let (w, h) = (size("width"), size("height"));
-    let mut changed = w.is_some() || h.is_some();
+    let cur = area_text(s.doc()?.doc.node(first)).map(|t| t.area.clone()).unwrap_or_default();
+    let fit = fit_param(p, cur.fit, C)?;
+    let mut v = serde_json::to_value(&cur).map_err(|e| EngineError::Other(e.to_string()))?;
+    let size = |k: &str| p.get(k).and_then(Value::as_f64).filter(|x| x.is_finite()).map(|x| x.clamp(1.0, 100_000.0));
+    let (w, mut h) = (size("width"), size("height"));
+    let mut changed = w.is_some() || h.is_some() || fit.is_some();
    if let (Some(o), Some(src)) = (v.as_object_mut(), p.as_object()) {
-        for (k, val) in src {
-            if o.contains_key(k) && !matches!(k.as_str(), "ids" | "width" | "height") {
-                o.insert(k.clone(), val.clone());
-                changed = true;
-            }
+        for (k, val) in src.iter().filter(|(k, _)| AREA_KEYS.contains(&k.as_str())) {
+            o.insert(k.clone(), val.clone());
+            changed = true;
        }
    }
    if !changed {
-        return Ok(v);
+        return options(s);
    }
    let mut opts: vectorcraft_doc::AreaOptions = serde_json::from_value(v).map_err(|e| bad(C, e.to_string()))?;
    opts.rows = opts.rows.clamp(1, 100);
    opts.columns = opts.columns.clamp(1, 100);
-    opts.gutter = opts.gutter.clamp(0.0, 10_000.0);
-    opts.inset = opts.inset.clamp(0.0, 10_000.0);
-    opts.first_baseline_min = opts.first_baseline_min.clamp(0.0, 10_000.0);
+    let finite = |x: f64| if x.is_finite() { x } else { 0.0 };
+    opts.gutter = finite(opts.gutter).clamp(0.0, 10_000.0);
+    opts.inset = finite(opts.inset).clamp(0.0, 10_000.0);
+    opts.first_baseline_min = finite(opts.first_baseline_min).clamp(0.0, 10_000.0);
+    opts.fit = fit.unwrap_or(cur.fit);
+    if opts.fit == AreaFit::AutoHeight {
+        // Auto Size sets the height (Illustrator's dialog turns the Height field off).
+        h = None;
+    }
    s.edit("Area Type Options", |d, _| {
        for id in &ids {
            if let Some(NodeKind::Text(t)) = d.node_mut(*id).map(|n| &mut n.kind) {
@@ -80,7 +80,19 @@ pub fn node_summary_opts(n: &Node, opts: SummaryOpts) -> Value {
            v["anchors"] = json!(path.anchor_count());
            v["closed"] = json!(path.is_closed());
        }
-        NodeKind::Text(t) => v["text"] = json!(t.plain_text()),
+        NodeKind::Text(t) => {
+            v["text"] = json!(t.plain_text());
+            // Area type and type on a path: does the text fit (the red overflow "+")? Area type
+            // also reports its fit and Shrink Text's factor (1 unshrunk).
+            if !matches!(t.kind, vectorcraft_doc::TextKind::Point) {
+                let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), t);
+                v["overflow"] = json!(lay.overflow);
+                if matches!(t.kind, vectorcraft_doc::TextKind::Area { .. }) {
+                    v["fit"] = json!(t.area.fit.id());
+                    v["fitScale"] = json!(lay.fit_scale);
+                }
+            }
+        }
        _ => {}
    }
    if let Some(ch) = n.children() {
@@ -1293,6 +1293,8 @@ mod tests_adjust;
 #[cfg(test)]
 mod tests_appearance;
 #[cfg(test)]
+mod tests_areafit;
+#[cfg(test)]
 mod tests_assets;
 #[cfg(test)]
 mod tests_attributes;
@@ -0,0 +1,242 @@
+//! Area type fitting: Auto Size (the frame's height follows the text), Shrink Text to Fit, and
+//! overflow reporting.
+
+use serde_json::{Value, json};
+use vectorcraft_doc::{AreaFit, NodeKind, TextKind, TextObject};
+use vectorcraft_geom::Rect;
+use vectorcraft_tools::{Mods, PointerEvent, PointerKind, ToolKey};
+
+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
+}
+
+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 = s.execute("text.create", &json!({"x": 40, "y": 40, "size": 12, "area": a, "text": text})).unwrap()["id"].as_u64().unwrap();
+    NodeId(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 overflows(s: &Session, id: NodeId) -> bool {
+    vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &text(s, id)).overflow
+}
+
+fn undo_len(s: &Session) -> usize {
+    s.doc().unwrap().history.undo.len()
+}
+
+#[test]
+fn area_options_set_and_report_the_fit() {
+    let mut s = session();
+    let id = area(&mut s, 120.0, 30.0, STORY, json!({}));
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    let q = s.execute("text.areaOptions", &json!({})).unwrap();
+    assert_eq!((q["fit"].as_str(), q["fitMinPercent"].as_f64()), (Some("none"), Some(50.0)));
+    assert_eq!((q["overflow"].as_bool(), q["fitScale"].as_f64()), (Some(true), Some(1.0)));
+    let n = undo_len(&s);
+    let r = s.execute("text.areaOptions", &json!({"fit": "shrinkText", "fitMinPercent": 20})).unwrap();
+    assert_eq!(undo_len(&s), n + 1);
+    assert_eq!((r["fit"].as_str(), r["fitMinPercent"].as_f64()), (Some("shrinkText"), Some(20.0)));
+    assert_eq!(r["overflow"], false, "{r}");
+    let f = r["fitScale"].as_f64().unwrap();
+    assert!((0.2..1.0).contains(&f), "{f}");
+    assert_eq!(text(&s, id).area.fit, AreaFit::ShrinkText { min_percent: 20.0 });
+    assert_eq!(text(&s, id).runs[0].style.size, 12.0, "the stored size stays");
+    // The minimum alone, clamped; the object form; and bad values.
+    s.execute("text.areaOptions", &json!({"fitMinPercent": 3})).unwrap();
+    assert_eq!(text(&s, id).area.fit, AreaFit::ShrinkText { min_percent: 10.0 });
+    s.execute("text.areaOptions", &json!({"fit": {"shrinkText": {"minPercent": 95}}})).unwrap();
+    assert_eq!(text(&s, id).area.fit, AreaFit::ShrinkText { min_percent: 95.0 });
+    assert_eq!(s.execute("text.areaOptions", &json!({})).unwrap()["overflow"], true, "95 % is not enough");
+    assert!(s.execute("text.areaOptions", &json!({"fit": "squash"})).is_err());
+    assert!(s.execute("text.areaOptions", &json!({"fit": 7})).is_err());
+    // The reply's own keys go back in unchanged (the dialog sends everything).
+    let q = s.execute("text.areaOptions", &json!({})).unwrap();
+    let n = undo_len(&s);
+    let again = s.execute("text.areaOptions", &q).unwrap();
+    assert_eq!(again, q);
+    assert_eq!(undo_len(&s), n + 1);
+    // Undo back to no fit.
+    while text(&s, id).area.fit != AreaFit::None {
+        s.execute("edit.undo", &json!({})).unwrap();
+    }
+    assert!(overflows(&s, id));
+}
+
+#[test]
+fn inspect_reports_overflow_and_fit_scale() {
+    let mut s = session();
+    let id = area(&mut s, 120.0, 30.0, STORY, json!({"fit": "shrinkText", "fitMinPercent": 10}));
+    s.execute("text.create", &json!({"x": 10, "y": 500, "text": "point"})).unwrap();
+    let doc = s.execute("document.inspect", &json!({})).unwrap();
+    let kids = doc["layers"][0]["children"].as_array().unwrap();
+    let node = kids.iter().find(|k| k["id"] == id.0).unwrap();
+    assert_eq!(node["overflow"], false);
+    assert_eq!(node["fit"], "shrinkText");
+    assert!(node["fitScale"].as_f64().unwrap() < 1.0);
+    let point = kids.iter().find(|k| k["id"] != id.0).unwrap();
+    assert!(point.get("overflow").is_none() && point.get("fitScale").is_none(), "point type never overflows");
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    s.execute("text.areaOptions", &json!({"fit": "none"})).unwrap();
+    let doc = s.execute("document.inspect", &json!({})).unwrap();
+    let node = doc["layers"][0]["children"].as_array().unwrap().iter().find(|k| k["id"] == id.0).unwrap().clone();
+    assert_eq!((node["overflow"].as_bool(), node["fitScale"].as_f64(), node["fit"].as_str()), (Some(true), Some(1.0), Some("none")));
+}
+
+#[test]
+fn auto_height_follows_edits_in_the_same_undo_step() {
+    let mut s = session();
+    let id = area(&mut s, 200.0, 300.0, "One line", json!({"fit": "autoHeight"}));
+    let one = frame(&s, id);
+    assert!(one.height() < 30.0, "the frame fits one line: {one:?}");
+    assert_eq!((one.x0, one.y0, one.width()), (0.0, 0.0, 200.0), "top and width stay");
+    assert!(!overflows(&s, id));
+    let n = undo_len(&s);
+    s.execute("text.editRange", &json!({"id": id.0, "start": 8, "insert": format!(" {STORY}")})).unwrap();
+    assert_eq!(undo_len(&s), n + 1);
+    let grown = frame(&s, id);
+    assert!(grown.height() > one.height() * 2.0, "{grown:?}");
+    assert!(!overflows(&s, id), "the grown frame holds the text");
+    // Tight: a point less overflows.
+    let mut t = text(&s, id);
+    t.area.fit = AreaFit::None;
+    t.kind = TextKind::Area {
+        frame: vectorcraft_geom::PathData::from_bezpath(&vectorcraft_geom::Shape::to_path(&Rect::new(0.0, 0.0, 200.0, grown.height() - 1.0), 0.1)),
+    };
+    assert!(vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t).overflow);
+    // Character changes resize it too.
+    s.execute("text.setRangeStyle", &json!({"id": id.0, "start": 0, "end": 3, "size": 40})).unwrap();
+    assert!(frame(&s, id).height() > grown.height());
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(frame(&s, id), grown);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(frame(&s, id), one, "one undo restores the text and the frame");
+    assert_eq!(text(&s, id).plain_text(), "One line");
+}
+
+#[test]
+fn auto_height_follows_typing_with_the_type_tool() {
+    let mut s = session();
+    s.prefs.auto_size_area_type = true;
+    // An empty frame (no placeholder text), so its first height is one line.
+    s.prefs.placeholder_text = false;
+    let v = ViewInfo::default();
+    s.select_tool("type", v).unwrap();
+    for (kind, (x, y)) in [(PointerKind::Down, (100.0, 100.0)), (PointerKind::Drag, (300.0, 400.0)), (PointerKind::Up, (300.0, 400.0))] {
+        s.pointer(&PointerEvent::new(kind, x, y), v).unwrap();
+    }
+    let id = s.doc().unwrap().selection.objects[0];
+    assert_eq!(text(&s, id).area.fit, AreaFit::AutoHeight, "the preference gives new area type Auto Size");
+    let empty = frame(&s, id);
+    assert!(empty.height() < 30.0, "{empty:?}");
+    let n = undo_len(&s);
+    for word in STORY.split_inclusive(' ') {
+        s.tool_text(word, v).unwrap();
+    }
+    s.tool_key(ToolKey::Escape, Mods::default(), v).unwrap();
+    assert_eq!(text(&s, id).plain_text(), STORY);
+    assert_eq!(undo_len(&s), n + 1, "one typing step");
+    let typed = frame(&s, id);
+    assert!(typed.height() > empty.height() * 2.0, "{typed:?}");
+    assert!(!overflows(&s, id));
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(frame(&s, id), empty);
+    assert_eq!(text(&s, id).plain_text(), "");
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(frame(&s, id), typed);
+}
+
+#[test]
+fn auto_height_in_columns_and_by_hand() {
+    let mut s = session();
+    let id = area(&mut s, 300.0, 400.0, &STORY.repeat(3), json!({"fit": "autoHeight"}));
+    let one = frame(&s, id).height();
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    // Height is ignored while Auto Size is on.
+    let r = s.execute("text.areaOptions", &json!({"columns": 2, "gutter": 12, "height": 500})).unwrap();
+    let two = r["height"].as_f64().unwrap();
+    assert!(two < 500.0 && two > one * 0.5, "{one} → {two}");
+    assert_eq!(r["overflow"], false);
+    assert_eq!(r["fit"], "autoHeight");
+    // The least height the two columns fit: a point less overflows, and both columns are used.
+    let mut t = text(&s, id);
+    let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t);
+    assert!(lay.glyphs.iter().any(|g| g.origin.x > 160.0), "text flows into the second column");
+    t.area.fit = AreaFit::None;
+    t.kind = TextKind::Area {
+        frame: vectorcraft_geom::PathData::from_bezpath(&vectorcraft_geom::Shape::to_path(&Rect::new(0.0, 0.0, 300.0, two - 1.0), 0.1)),
+    };
+    assert!(vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t).overflow);
+    // Dragging the bottom edge sets the height by hand: Auto Size goes off.
+    let b = frame(&s, id);
+    s.execute("text.reshapeArea", &json!({"id": id.0, "anchors": [[0, 2], [0, 3]], "dx": 0, "dy": 50})).unwrap();
+    assert_eq!(text(&s, id).area.fit, AreaFit::None);
+    assert!((frame(&s, id).height() - (b.height() + 50.0)).abs() < 1e-6);
+    s.execute("edit.undo", &json!({})).unwrap();
+    // A new width keeps it: the height follows the reflow.
+    s.execute("text.reshapeArea", &json!({"id": id.0, "anchors": [[0, 1], [0, 2]], "dx": 100, "dy": 0})).unwrap();
+    assert_eq!(text(&s, id).area.fit, AreaFit::AutoHeight);
+    assert!(frame(&s, id).height() < b.height());
+    // Point type has no frame to size.
+    let p = s.execute("text.create", &json!({"x": 10, "y": 10, "text": "x"})).unwrap()["id"].as_u64().unwrap();
+    s.execute("select.set", &json!({"ids": [p]})).unwrap();
+    assert!(s.execute("text.areaOptions", &json!({"fit": "autoHeight"})).is_err(), "point type has no area options");
+}
+
+#[test]
+fn shrink_text_round_trips_through_the_native_format() {
+    let mut s = session();
+    let id = area(&mut s, 120.0, 30.0, STORY, json!({"fit": "shrinkText", "fitMinPercent": 35}));
+    let doc = s.doc().unwrap().doc.clone();
+    let bytes = vectorcraft_format::save(&doc, false);
+    let back = vectorcraft_format::load(&bytes).unwrap();
+    let NodeKind::Text(t) = &back.node(id).unwrap().kind else { panic!() };
+    assert_eq!(t.area.fit, AreaFit::ShrinkText { min_percent: 35.0 });
+}
+
+#[test]
+fn auto_height_follows_the_leading_model_and_character_alignment() {
+    let mut s = session();
+    let id = area(&mut s, 200.0, 300.0, STORY, json!({"fit": "autoHeight"}));
+    let roman = frame(&s, id);
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    // Top-to-Top leading: the first line moves up to touch the frame, the frame follows.
+    s.execute("text.setFormat", &json!({"leadingModel": "emBoxTop"})).unwrap();
+    let em = frame(&s, id);
+    assert_ne!(em.height(), roman.height());
+    assert!(!overflows(&s, id), "the frame holds the text under emBoxTop");
+    // Mixed sizes aligned on the em box centre still fit exactly.
+    s.execute("text.setRangeStyle", &json!({"id": id.0, "start": 0, "end": 3, "size": 30})).unwrap();
+    s.execute("text.setFormat", &json!({"charAlign": "emBoxCenter"})).unwrap();
+    let mixed = frame(&s, id);
+    assert!(mixed.height() > em.height());
+    assert!(!overflows(&s, id));
+    let mut t = text(&s, id);
+    t.area.fit = AreaFit::None;
+    t.kind = TextKind::Area {
+        frame: vectorcraft_geom::PathData::from_bezpath(&vectorcraft_geom::Shape::to_path(&Rect::new(0.0, 0.0, 200.0, mixed.height() - 1.0), 0.1)),
+    };
+    assert!(vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t).overflow, "tight");
+}
@@ -248,6 +248,16 @@ fn text_set_format() {
    let NodeKind::Text(t) = node(&s, id).kind else { panic!() };
    assert_eq!(t.first_style().kerning, None);
    assert!(s.execute("text.setFormat", &json!({"ids": [id.0]})).is_err());
+    // Paragraph composer: Every-line by default, undoable.
+    assert_eq!(t.para.composer, vectorcraft_doc::Composer::EveryLine);
+    s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "singleLine"})).unwrap();
+    let NodeKind::Text(t) = node(&s, id).kind else { panic!() };
+    assert_eq!(t.para.composer, vectorcraft_doc::Composer::SingleLine);
+    assert!(s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "best"})).is_err());
+    assert!(s.execute("text.setFormat", &json!({"ids": [id.0], "composer": 1})).is_err());
+    s.execute("edit.undo", &json!({})).unwrap();
+    let NodeKind::Text(t) = node(&s, id).kind else { panic!() };
+    assert_eq!(t.para.composer, vectorcraft_doc::Composer::EveryLine);
 }

 #[test]
@@ -339,3 +339,38 @@ fn the_type_widget_converts_point_and_area_type() {
    s.execute("edit.undo", &json!({})).unwrap();
    assert_eq!(text(&s, id), before);
 }
+
+#[test]
+fn area_type_options_align_the_lines_vertically() {
+    use vectorcraft_doc::VerticalAlign;
+    let mut s = session();
+    let id = area(&mut s, 40.0, 40.0, 200.0, 300.0, "Short story");
+    sel(&mut s, &[id]);
+    assert_eq!(s.execute("text.areaOptions", &json!({})).unwrap()["verticalAlign"], "top");
+    let top = layout(&s, id).lines[0].baseline;
+    let before = text(&s, id).cached_bounds;
+    let n = undo_len(&s);
+    let r = s.execute("text.areaOptions", &json!({"verticalAlign": "bottom"})).unwrap();
+    assert_eq!(r["verticalAlign"], "bottom");
+    assert_eq!(text(&s, id).area.vertical_align, VerticalAlign::Bottom);
+    let l = layout(&s, id);
+    let last = l.lines.last().unwrap();
+    assert!((last.baseline + last.descent - 300.0).abs() < 1e-6);
+    assert!(l.lines[0].baseline > top + 200.0);
+    assert_ne!(text(&s, id).cached_bounds, before, "the cached bounds follow the text");
+    assert_eq!((undo_len(&s), last_step(&s).as_str()), (n + 1, "Area Type Options"));
+    s.execute("text.areaOptions", &json!({"verticalAlign": "center"})).unwrap();
+    assert_eq!(text(&s, id).area.vertical_align, VerticalAlign::Center);
+    // Unknown values are refused and change nothing.
+    for bad in [json!({"verticalAlign": "middle"}), json!({"verticalAlign": 3}), json!({"verticalAlign": null})] {
+        assert!(s.execute("text.areaOptions", &bad).is_err(), "{bad}");
+    }
+    assert_eq!(undo_len(&s), n + 2);
+    assert_eq!(text(&s, id).area.vertical_align, VerticalAlign::Center);
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(text(&s, id).area.vertical_align, VerticalAlign::Top);
+    assert_eq!(layout(&s, id).lines[0].baseline, top);
+    assert_eq!(text(&s, id).cached_bounds, before);
+    assert!(cmd::find_command("text.areaOptions").unwrap().params.contains("verticalAlign?: top|center|bottom|justify"));
+}
@@ -311,6 +311,54 @@ fn structured_junk() {
    assert!(failures.is_empty(), "{} failures:\n{}", failures.len(), failures.join("\n"));
 }

+/// Area Type Options with junk fit values, on selected area type (the fixtures have none), with
+/// text that overflows: never a panic, the document stays sound, and editing still works.
+#[test]
+fn area_options_fit_junk() {
+    let cases = [
+        json!({"fit": "shrinkText", "fitMinPercent": 1e308}),
+        json!({"fit": "shrinkText", "fitMinPercent": -1e308}),
+        json!({"fit": "shrinkText", "fitMinPercent": "x"}),
+        json!({"fit": {"shrinkText": {"minPercent": -5}}}),
+        json!({"fit": {"shrinkText": {"minPercent": "a"}}}),
+        json!({"fit": {"shrinkText": null}}),
+        json!({"fit": {"autoHeight": 1}}),
+        json!({"fit": {"bogus": {}}}),
+        json!({"fit": [1, 2]}),
+        json!({"fit": ""}),
+        json!({"fit": "AUTO-HEIGHT", "height": 1e308, "width": -1e308}),
+        json!({"fit": "autoHeight", "columns": u64::MAX, "gutter": 1e308, "inset": 1e308}),
+        json!({"fit": "autoHeight", "rows": 5, "inset": -1}),
+        json!({"fit": "shrinkText", "columns": 100, "gutter": 0, "inset": 10000}),
+        json!({"fitMinPercent": 50}),
+        json!({"fit": "none", "fitMinPercent": 1e-308}),
+    ];
+    let story = "Words that overflow a small frame. ".repeat(40);
+    let mut failures = vec![];
+    for (size, (w, h)) in [(12.0, (120.0, 40.0)), (0.1, (1.0, 1.0)), (1296.0, (100_000.0, 1.0))] {
+        for p in &cases {
+            let mut s = Fixture::Multi.session();
+            let made = s.execute("text.create", &json!({"x": 10, "y": 10, "size": size, "text": story, "area": {"width": w, "height": h}}));
+            let Ok(made) = made else { continue };
+            let id = made["id"].as_u64().unwrap_or(0);
+            let r = catch_quiet(|| s.execute("text.areaOptions", p));
+            match r {
+                Err(m) => failures.push(format!("PANIC text.areaOptions {p} [{size} pt, {w}×{h}]: {m}")),
+                Ok(_) => {
+                    let typed = catch_quiet(|| s.execute("text.editRange", &json!({"id": id, "start": 0, "insert": "More words. "})));
+                    if typed.is_err() {
+                        failures.push(format!("PANIC typing after text.areaOptions {p}"));
+                    }
+                    if let Err(e) = check_session(&s) {
+                        failures.push(format!("text.areaOptions {p} [{size} pt]: {e}"));
+                    }
+                }
+            }
+        }
+    }
+    assert!(failures.is_empty(), "{} failures:\n{}", failures.len(), failures.join("\n"));
+}
+
 /// After a successful fuzzed call, the document still round-trips and exports.
 #[test]
 fn fuzzed_calls_keep_documents_serializable() {
@@ -7,7 +7,7 @@ use std::io::Write as _;
 use std::sync::Arc;

 use serde_json::{Value, json};
-use vectorcraft_doc::{ColorProfiles, Document, ImageBlob, ImageObject, Node, NodeKind, OpacityMask, Symbol};
+use vectorcraft_doc::{ColorProfiles, Composer, Document, ImageBlob, ImageObject, Node, NodeKind, OpacityMask, Symbol};
 use vectorcraft_format::{FormatError, SaveOptions, VERSION, is_compressed, load, preview, save, save_with, sniff};
 use vectorcraft_geom::Affine;
 use vectorcraft_testkit::fixtures;
@@ -43,6 +43,46 @@ fn opts(version: u32, compress: bool) -> SaveOptions {
    SaveOptions { version, compress, ..SaveOptions::default() }
 }

+#[test]
+fn area_type_vertical_alignment_round_trips() {
+    let d = rich_doc();
+    let text = String::from_utf8(save(&d, false)).unwrap();
+    assert!(text.contains("\"verticalAlign\":\"center\""), "the fixture's area type is centred");
+    let back = load(text.as_bytes()).unwrap();
+    assert_eq!(doc_json(&back), doc_json(&d));
+    let area = |d: &Document| {
+        let mut found = None;
+        d.walk(|n| {
+            // The fixture's centred area type, by its text (the fixture has other area type).
+            if let NodeKind::Text(t) = &n.kind
+                && matches!(t.kind, vectorcraft_doc::TextKind::Area { .. })
+                && t.runs.iter().map(|r| r.text.as_str()).collect::<String>() == "Centred area type"
+            {
+                found = Some(t.area.vertical_align);
+            }
+        });
+        found.unwrap()
+    };
+    assert_eq!(area(&back), vectorcraft_doc::VerticalAlign::Center);
+    // Files from before the option open top-aligned.
+    // (Every area type the fixture has writes its options, so the key goes from all of them.)
+    fn strip(v: &mut Value) {
+        match v {
+            Value::Object(m) => {
+                m.remove("verticalAlign");
+                m.values_mut().for_each(strip);
+            }
+            Value::Array(a) => a.iter_mut().for_each(strip),
+            _ => {}
+        }
+    }
+    let mut v = json_of(text.as_bytes());
+    strip(&mut v);
+    let old = serde_json::to_string(&v).unwrap();
+    assert!(!old.contains("verticalAlign"));
+    assert_eq!(area(&load(old.as_bytes()).unwrap()), vectorcraft_doc::VerticalAlign::Top);
+}
+
 #[test]
 fn compressed_files_load() {
    let d = rich_doc();
@@ -111,6 +151,43 @@ fn keys_from_newer_versions_round_trip() {
    check_native_roundtrip(&d).unwrap();
 }

+/// The paragraph composer is saved only when it isn't the default (Every-line) and reads back.
+#[test]
+fn text_composer_round_trips() {
+    let d = rich_doc();
+    let composers = |d: &Document| {
+        let mut v = vec![];
+        d.walk(|n| {
+            if let NodeKind::Text(t) = &n.kind {
+                v.push(t.para.composer);
+            }
+        });
+        v
+    };
+    // The point type set to Single-line comes first; the fixture's other type keeps the default.
+    let single_then_default = |c: &[Composer]| c.len() > 1 && c[0] == Composer::SingleLine && c[1..].iter().all(|c| *c == Composer::EveryLine);
+    assert!(single_then_default(&composers(&d)), "{:?}", composers(&d));
+    let bytes = save(&d, false);
+    assert!(String::from_utf8_lossy(&bytes).contains("\"composer\":\"singleLine\""));
+    assert_eq!(composers(&load(&bytes).unwrap()), composers(&d));
+    // Files without the key (older files, Every-line text) read as Every-line.
+    fn strip(v: &mut Value) {
+        match v {
+            Value::Object(m) => {
+                m.remove("composer");
+                m.values_mut().for_each(strip);
+            }
+            Value::Array(a) => a.iter_mut().for_each(strip),
+            _ => {}
+        }
+    }
+    let mut v = json_of(&bytes);
+    strip(&mut v);
+    let d2 = load(&serde_json::to_vec(&v).unwrap()).unwrap();
+    assert!(composers(&d2).iter().all(|c| *c == Composer::EveryLine), "{:?}", composers(&d2));
+    assert!(!String::from_utf8_lossy(&save(&d2, false)).contains("composer"));
+}
+
 /// A document as the first version wrote it (format name `drawcraft`, anchors as maps).
 const V1_FILE: &str = r#"{"format":"drawcraft","version":1,"generator":"DrawCraft 0.1.0","document":{"version":1,"title":"Old","artboards":[{"id":1,"name":"Artboard 1","rect":{"x0":0.0,"y0":0.0,"x1":100.0,"y1":80.0}}],
 "layers":[{"id":1,"name":"Layer 1","visible":true,"locked":false,"opacity":1.0,"kind":{"type":"layer","children":[
@@ -453,11 +453,13 @@ pub(crate) struct Exporter<'a> {
    /// The fonts real text is written in, by face id, with their units per em; `None` for faces
    /// that can't be embedded.
    fonts: HashMap<u32, Option<(krilla::text::Font, f64)>>,
-    /// Top-level layers are drawn as forms marked for their optional content groups
+    /// Layers and sublayers are drawn as forms marked for their optional content groups
    /// ([`crate::forms`]).
    pub layers: bool,
-    /// A top-level layer's form is being drawn.
-    in_layer: bool,
+    /// Each layer's index in [`crate::forms::pdf_layers`], by address.
+    layer_index: HashMap<usize, usize>,
+    /// The address of the layer whose form is being drawn.
+    in_layer: usize,
    /// Overprinting fills and strokes are drawn as forms marked to overprint.
    pub overprint: bool,
    /// An overprinting fill or stroke was drawn so.
@@ -485,7 +487,8 @@ impl<'a> Exporter<'a> {
            outline_text: set.advanced.outline_text,
            fonts: HashMap::new(),
            layers: false,
-            in_layer: false,
+            layer_index: crate::forms::pdf_layers(doc).iter().enumerate().map(|(i, l)| (address(l.node), i)).collect(),
+            in_layer: 0,
            overprint: false,
            overprinted: false,
        }
@@ -601,6 +604,11 @@ fn constant_mask(s: &mut Surface, page: Rect, alpha: f32) -> krilla::mask::Mask
    krilla::mask::Mask::new(sb.finish(), krilla::mask::MaskType::Alpha)
 }

+/// A node's address, to tell the very node apart from equal ones.
+fn address(n: &Node) -> usize {
+    std::ptr::from_ref(n).addr()
+}
+
 fn rects_overlap(a: Rect, b: Rect) -> bool {
    a.x0 <= b.x1 && b.x0 <= a.x1 && a.y0 <= b.y1 && b.y0 <= a.y1
 }
@@ -885,15 +893,15 @@ impl Exporter<'_> {

    fn node(&mut self, s: &mut Surface, n: &Node, page: Rect, force: bool) {
        if self.layers
-            && !self.in_layer
-            && let NodeKind::Layer { template: false, printable, .. } = n.kind
+            && self.in_layer != address(n)
+            && let NodeKind::Layer { printable, .. } = n.kind
            && (printable || self.non_printing)
-            && let Some(i) = self.doc.layers.iter().position(|l| std::ptr::eq(&**l, n))
+            && let Some(&i) = self.layer_index.get(&address(n))
        {
-            // A PDF layer: hidden layers are written too (their group is off).
-            self.in_layer = true;
+            // A PDF layer: hidden layers and sublayers are written too (their group is off).
+            let enclosing = std::mem::replace(&mut self.in_layer, address(n));
            crate::forms::form(s, Mark::Layer(i), |s| self.node(s, n, page, true));
-            self.in_layer = false;
+            self.in_layer = enclosing;
            return;
        }
        if !force && !n.visible {
@@ -11,7 +11,9 @@ use std::io::Read;
 use krilla::geom::PathBuilder;
 use krilla::graphic::Graphic;
 use krilla::surface::Surface;
-use vectorcraft_doc::{Document, NodeKind};
+use std::sync::Arc;
+
+use vectorcraft_doc::{Document, Node, NodeKind};

 use crate::encrypt::{Lexer, Obj, StreamSpans, Tok, int, stream_spans};
 use crate::output::{deflate, text_string};
@@ -21,12 +23,36 @@ use crate::{PdfError, PdfSettings, Standard};
 /// What a marked form is.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(crate) enum Mark {
-    /// The art of top-level layer `i` (`Document::layers`).
+    /// The art of layer `i` of [`pdf_layers`].
    Layer(usize),
    /// A fill or stroke that overprints.
    Overprint,
 }

+/// A layer written as a PDF layer (an optional content group).
+pub(crate) struct PdfLayer<'a> {
+    pub node: &'a Node,
+    /// Its parent layer's index in [`pdf_layers`] (none for a top-level layer).
+    pub parent: Option<usize>,
+}
+
+/// The layers written as PDF layers: the top-level layers and their sublayers, but template layers
+/// (and what they hold), each before its sublayers, in paint order (bottom first).
+pub(crate) fn pdf_layers(doc: &Document) -> Vec<PdfLayer<'_>> {
+    fn add<'a>(nodes: &'a [Arc<Node>], parent: Option<usize>, out: &mut Vec<PdfLayer<'a>>) {
+        for n in nodes {
+            if let NodeKind::Layer { template: false, children, .. } = &n.kind {
+                let i = out.len();
+                out.push(PdfLayer { node: n, parent });
+                add(children, Some(i), out);
+            }
+        }
+    }
+    let mut out = vec![];
+    add(&doc.layers, None, &mut out);
+    out
+}
+
 /// The x coordinate of a layer mark's first point (its y is the layer index).
 const LAYER_X: i32 = -32000;
 /// The x coordinate of an overprint mark's first point.
@@ -199,7 +225,7 @@ fn mark_layers(content: &[u8], forms: &HashMap<&[u8], usize>) -> Option<(Vec<u8>
 }

 /// Finish the marked forms of `pdf` (as [`crate::export`] writes `doc` with `set`): with
-/// `layers`, each top-level layer (but template layers) becomes an optional content group —
+/// `layers`, each layer and sublayer (but template layers) becomes an optional content group —
 /// named as the layer, off when it is hidden, not printed (`/PrintState /OFF`) when its Print
 /// option is off, locked when it is locked — and the uses of its forms its optional content;
 /// with `overprint`, the overprinting forms get a graphics state that overprints (`/OP`, `/op`,
@@ -228,6 +254,11 @@ pub(crate) fn finish(pdf: Vec<u8>, doc: &Document, set: &PdfSettings, layers: bo
    }
    if layers {
        write_layers(&pdf, &xref, &objects, &marks, &mut patch, doc, set)?;
+        for (n, _) in marks.iter().filter(|(_, m)| matches!(m, Mark::Layer(_))) {
+            if let Some(o) = objects.get(n) {
+                unbox(&pdf, o, &mut patch)?;
+            }
+        }
    }
    let pdf = patch.apply(&pdf, &xref)?;
    // The file still is what its standard says.
@@ -235,8 +266,9 @@ pub(crate) fn finish(pdf: Vec<u8>, doc: &Document, set: &PdfSettings, layers: bo
    Ok(pdf)
 }

-/// The optional content groups of `doc`'s top-level layers, the uses of their forms marked as
-/// their content, and the catalog's `/OCProperties`.
+/// The optional content groups of `doc`'s layers and sublayers ([`pdf_layers`]), the uses of their
+/// forms marked as their content, and the catalog's `/OCProperties`, listing sublayers under their
+/// layers.
 fn write_layers(
    pdf: &[u8],
    xref: &Xref,
@@ -247,11 +279,16 @@ fn write_layers(
    set: &PdfSettings,
 ) -> Result<(), PdfError> {
    // One group per layer, in paint order (bottom first).
+    let layers = pdf_layers(doc);
    let mut groups: HashMap<usize, u32> = HashMap::new();
    let (mut all, mut off, mut locked) = (vec![], vec![], vec![]);
-    for (i, l) in doc.layers.iter().enumerate() {
-        let NodeKind::Layer { template: false, printable, .. } = l.kind else { continue };
-        let name = l.name.clone().unwrap_or_else(|| format!("Layer {}", i + 1));
+    // Each layer's sublayers, and the top-level layers, in paint order.
+    let mut children: HashMap<Option<usize>, Vec<usize>> = HashMap::new();
+    for (i, PdfLayer { node: l, parent }) in layers.iter().enumerate() {
+        let siblings = children.entry(*parent).or_default();
+        siblings.push(i);
+        let name = l.name.clone().unwrap_or_else(|| format!("Layer {}", siblings.len()));
+        let printable = matches!(l.kind, NodeKind::Layer { printable: true, .. });
        let on = |b: bool| if b { "ON" } else { "OFF" };
        let g = patch.add_object(
            format!("<</Type/OCG/Name{}/Usage<</View<</ViewState/{}>>/Print<</PrintState/{}>>>>>>", text_string(&name), on(l.visible), on(printable))
@@ -295,9 +332,7 @@ fn write_layers(
        add_resources(patch, res, "Properties", &entries)?;
    }
    let refs = |v: &[u32]| v.iter().map(|g| format!("{g} 0 R")).collect::<Vec<_>>().join(" ");
-    // Layers panels list the top layer first.
-    let order: Vec<u32> = all.iter().rev().copied().collect();
-    let mut config = format!("/Name(Layers)/Order[{}]", refs(&order));
+    let mut config = format!("/Name(Layers)/Order[{}]", order(&children, &groups, None));
    if !off.is_empty() {
        config.push_str(&format!("/OFF[{}]", refs(&off)));
    }
@@ -313,3 +348,35 @@ fn write_layers(
    patch.replace(start + 2, start + 2, format!("/OCProperties<</OCGs[{}]/D<<{config}>>>>", refs(&all)).into_bytes());
    Ok(())
 }
+
+/// A form's box as large as a page can be: the box of a layer's form is only the bounds of its
+/// art, and a reader that makes a clipping group of a form's box (as importers do) would gather a
+/// layer's art and its sublayers' in one group, which no layer can hold. A box round the whole
+/// page clips nothing.
+const UNBOXED: &[u8] = b"[-32767 -32767 32767 32767]";
+
+/// Give the layer's form `o` the [`UNBOXED`] box.
+fn unbox(pdf: &[u8], o: &Object<'_>, patch: &mut Patch) -> Result<(), PdfError> {
+    let Obj::Dict { start, end, .. } = o.dict else { return Err(bad("a layer's form has no dictionary")) };
+    let dict = pdf.get(start..end).ok_or_else(|| bad("a layer's form can't be read"))?;
+    // The writer writes the box as an array of numbers.
+    let at = dict.windows(5).position(|w| w == b"/BBox").ok_or_else(|| bad("a layer's form has no box"))? + 5;
+    let open = at + dict.get(at..).and_then(|d| d.iter().position(|&c| c == b'[')).ok_or_else(|| bad("a layer's form box isn't an array"))?;
+    let close = open + dict.get(open..).and_then(|d| d.iter().position(|&c| c == b']')).ok_or_else(|| bad("a layer's form box isn't an array"))? + 1;
+    patch.replace(start + open, start + close, UNBOXED.to_vec());
+    Ok(())
+}
+
+/// The `/Order` entries of `parent`'s sublayers (the top-level layers for none), the top one first
+/// as Layers panels list them, each followed by an array of its own sublayers when it has some.
+fn order(children: &HashMap<Option<usize>, Vec<usize>>, groups: &HashMap<usize, u32>, parent: Option<usize>) -> String {
+    let mut out = vec![];
+    for &i in children.get(&parent).into_iter().flatten().rev() {
+        let Some(g) = groups.get(&i) else { continue };
+        out.push(format!("{g} 0 R"));
+        if children.contains_key(&Some(i)) {
+            out.push(format!("[{}]", order(children, groups, Some(i))));
+        }
+    }
+    out.join(" ")
+}
@@ -537,14 +537,23 @@ struct Frame {
    children: Vec<Arc<Node>>,
    /// The first optional content group entered inside (where the frame's art goes).
    group: Option<usize>,
+    /// The group each child was drawn in, where the frame's art goes when the frame dissolves
+    /// into its parent (a layer's form drawing its sublayers' forms).
+    child_groups: Vec<Option<usize>>,
 }

 impl Frame {
    fn new(kind: FrameKind) -> Self {
-        Self { kind, children: vec![], group: None }
+        Self { kind, children: vec![], group: None, child_groups: vec![] }
    }
 }

+/// A dissolving frame's `children`, each with the group it was drawn in (`groups`, else the
+/// frame's `group`).
+fn grouped(children: Vec<Arc<Node>>, groups: Vec<Option<usize>>, group: Option<usize>) -> impl Iterator<Item = (Arc<Node>, Option<usize>)> {
+    children.into_iter().zip(groups.into_iter().map(move |g| g.or(group)).chain(std::iter::repeat(group)))
+}
+
 /// Glyphs drawn consecutively with the same paint, merged into one path.
 struct GlyphRun {
    path: BezPath,
@@ -846,8 +855,11 @@ impl<'p> Builder<'p> {
        // A frame's art goes where its first art was drawn (a clip can end in a later group).
        if root {
            self.root_groups.push(group.or(current));
-        } else if f.group.is_none() {
-            f.group = group.or(current);
+        } else {
+            f.child_groups.push(group.or(current));
+            if f.group.is_none() {
+                f.group = group.or(current);
+            }
        }
    }

@@ -925,7 +937,7 @@ impl<'p> Builder<'p> {
        let node = match f.kind {
            FrameKind::Root => None,
            FrameKind::Skip => {
-                f.children.into_iter().for_each(|c| self.emit(c, group));
+                grouped(f.children, f.child_groups, group).for_each(|(c, g)| self.emit(c, g));
                None
            }
            FrameKind::Clip(clip) => {
@@ -934,7 +946,7 @@ impl<'p> Builder<'p> {
                    None
                } else if noop.is_some_and(|r| bounds(&f.children).is_some_and(|b| contains(r, b))) {
                    // A rectangle around all of its art (a form's box) clips nothing.
-                    f.children.into_iter().for_each(|c| self.emit(c, group));
+                    grouped(f.children, f.child_groups, group).for_each(|(c, g)| self.emit(c, g));
                    None
                } else {
                    let mut ch = vec![Arc::new(*clip)];
@@ -957,7 +969,7 @@ impl<'p> Builder<'p> {
                if children.is_empty() {
                    None
                } else if plain {
-                    children.into_iter().for_each(|c| self.emit(c, group));
+                    grouped(children, f.child_groups, group).for_each(|(c, g)| self.emit(c, g));
                    None
                } else if let [only] = children.as_slice()
                    && !only.is_container()
@@ -10,7 +10,7 @@
 //!   text in embedded subset fonts (Advanced). Colours are converted, tagged with ICC profiles and
 //!   given an output intent as the Output settings say. Hidden objects,
 //!   guides and template layers are skipped, and so are non-printing layers unless asked for.
-//!   Top-level layers can be PDF layers (optional content groups with their visibility, print
+//!   Layers and sublayers can be PDF layers (optional content groups with their visibility, print
 //!   state and lock), and overprinting fills and strokes overprint (Advanced).
 //!   Each page is its artboard (the trim box) grown by the bleed (the bleed box) and by the
 //!   printer's marks around it (the media box), drawn in Registration. [`PdfSettings`] is the Save PDF
@@ -226,7 +226,7 @@ pub struct PdfSettings {
    pub fast_web_view: bool,
    /// The app opens the written file (frontends only; the writer ignores it).
    pub view_after_saving: bool,
-    /// Write top-level layers as PDF layers (optional content).
+    /// Write layers and sublayers as PDF layers (optional content).
    pub create_layers: bool,
    /// Keep the layers whose Print option is off (they are left out otherwise, unless
    /// `create_layers` is on).
@@ -449,7 +449,7 @@ impl PdfSettings {
        within("advanced.fontSubsetPercent", self.advanced.font_subset_percent, 0.0, 100.0, "%")
    }

-    /// Top-level layers are written as PDF layers: asked for, at a version that has them.
+    /// Layers and sublayers are written as PDF layers: asked for, at a version that has them.
    pub fn writes_layers(&self) -> bool {
        self.create_layers && self.compatibility.has_layers()
    }
@@ -131,6 +131,57 @@ fn pdf_layers_import_back_as_layers() {
    }
 }

+/// The rows of `nodes` in paint order, depth first: `depth name visible` for layers, `depth fill`
+/// for art.
+fn tree(nodes: &[std::sync::Arc<Node>], depth: usize, out: &mut Vec<String>) {
+    for n in nodes {
+        match &n.kind {
+            NodeKind::Layer { children, .. } => {
+                out.push(format!("{depth} {} {}", n.name.clone().unwrap_or_default(), n.visible));
+                tree(children, depth + 1, out);
+            }
+            _ => out.push(format!("{depth} {:?}", n.appearance.fill().and_then(|f| f.paint.color()))),
+        }
+    }
+}
+
+/// Sublayers are PDF layers listed under their layer's, hidden ones off with their art, and they
+/// import back as sublayers (#372: other apps read a `.ai` file's PDF part).
+#[test]
+fn sublayers_are_nested_pdf_layers_and_import_back() {
+    let mut d = Document::new(200.0, 100.0);
+    d.layers.clear();
+    let layer = |d: &mut Document, name: &str, visible: bool, children: Vec<Node>| {
+        let mut l = Node::layer(d.alloc_id(), name, LayerColor::Preset(0));
+        l.visible = visible;
+        if let NodeKind::Layer { children: c, .. } = &mut l.kind {
+            c.extend(children.into_iter().map(std::sync::Arc::new));
+        }
+        l
+    };
+    let deep = vec![rect(&mut d, 90.0, GREEN)];
+    let deep = layer(&mut d, "Deep", true, deep);
+    let sub = vec![rect(&mut d, 50.0, BLUE), deep];
+    let sub = layer(&mut d, "Sub", false, sub);
+    let main = vec![rect(&mut d, 10.0, RED), sub];
+    let main = layer(&mut d, "Main", true, main);
+    d.layers.push(main.into());
+    let r = export(&d, json!({"createLayers": true, "compression": {"compressText": false}}));
+    oc_properties(&r.bytes, None, |props, xref| {
+        let props = props.expect("/OCProperties");
+        assert_eq!(names(xref, props.get(b"OCGs")), ["Main", "Sub", "Deep"]);
+        assert_eq!(names(xref, props.get::<Dict<'_>>(b"D").unwrap().get(b"OFF")), ["Sub"]);
+    });
+    let text = String::from_utf8_lossy(&r.bytes);
+    let order = text.split("/Order").nth(1).and_then(|o| o.split("]/").next()).unwrap().to_string();
+    assert_eq!(order.matches('[').count(), 3, "each layer's sublayers in an array after it: {order}");
+    let mut got = vec![];
+    tree(&import(&r.bytes).unwrap().layers, 0, &mut got);
+    // Paint order, as it was.
+    let fill = |depth, c: Color| format!("{depth} {:?}", Some(c));
+    assert_eq!(got, ["0 Main true".to_string(), fill(1, RED), "1 Sub false".into(), fill(2, BLUE), "2 Deep true".into(), fill(3, GREEN)]);
+}
+
 #[test]
 fn identical_layers_stay_apart() {
    let mut d = Document::new(200.0, 100.0);
@@ -68,6 +68,20 @@ fn wrapped_lines_get_one_tspan_each() {
    assert!(!export(&d, &ExportOptions::default()).contains("text-anchor"));
 }

+#[test]
+fn vertically_aligned_area_type_exports_where_it_is_drawn() {
+    let top = area_doc(vec![run("alpha beta", style(12.0))], 200.0, Justify::Left);
+    let mut centred = top.clone();
+    let id = centred.layers[0].children().unwrap()[0].id;
+    if let Some(NodeKind::Text(t)) = centred.node_mut(id).map(|n| &mut n.kind) {
+        t.area.vertical_align = vectorcraft_doc::VerticalAlign::Center;
+    }
+    let y = |d: &Document| attr(tspans(&export(d, &ExportOptions::default()))[0], "y").unwrap();
+    let (yt, yc) = (y(&top), y(&centred));
+    // The 160 pt frame holds one 12 pt line: centring moves it down about (160 - 14.4) / 2.
+    assert!(yc - yt > 60.0 && yc - yt < 80.0, "{yt} → {yc}");
+}
+
 #[test]
 fn rich_text_writes_spacing_shift_and_scale() {
    let shifted = CharStyle { baseline_shift: 4.0, ..style(12.0) };
@@ -112,7 +112,23 @@ pub fn rich_session() -> Session {
    exec(&mut s, "effect.apply", json!({"effect": "distort.roughen", "params": {"size": 3, "detail": 5, "seed": 7}}));
    let l = id_of(&exec(&mut s, "shape.line", json!({"x1": 20, "y1": 300, "x2": 200, "y2": 350})));
    exec(&mut s, "stroke.set", json!({"weight": 3, "endArrow": "Arrow"}));
-    let _ = id_of(&exec(&mut s, "text.create", json!({"x": 250, "y": 300, "text": "VectorCraft", "size": 30})));
+    let tx = id_of(&exec(&mut s, "text.create", json!({"x": 250, "y": 300, "text": "VectorCraft", "size": 30})));
+    // A non-default paragraph composer, so format round trips cover it.
+    exec(&mut s, "text.setFormat", json!({"ids": [tx.0], "composer": "singleLine"}));
+    // Area type with non-default Area Type Options (vertical alignment, inset).
+    let area = id_of(&exec(
+        &mut s,
+        "text.create",
+        json!({"x": 250, "y": 340, "text": "Centred area type", "size": 12, "area": {"width": 120, "height": 50}}),
+    ));
+    select(&mut s, &[area]);
+    exec(&mut s, "text.areaOptions", json!({"verticalAlign": "center", "inset": 2}));
+    let _ = id_of(&exec(
+        &mut s,
+        "text.create",
+        json!({"x": 300, "y": 330, "size": 14, "text": "Area type shrinks its text to fit the frame.",
+               "area": {"width": 150, "height": 40, "fit": "shrinkText", "fitMinPercent": 40}}),
+    ));
    exec(&mut s, "layer.new", json!({"name": "Top"}));
    let d = rect(&mut s, 350.0, 200.0, 80.0, 80.0);
    let e = ellipse(&mut s, 380.0, 230.0, 80.0, 80.0);
@@ -1,9 +1,17 @@
-//! Every-line composer: a Knuth–Plass style total-fit line breaker for justified paragraphs.
+//! Every-line composer: a Knuth–Plass style total-fit line breaker.
 //!
-//! Boxes are the paragraph's glyphs, glue is its spaces (word spacing may stretch to 150% and
-//! shrink to 80%), and penalties are break opportunities after hyphens/dashes/CJK and at
-//! hyphenation points. The breaks minimise the sum of squared (badness + penalty) demerits over
-//! the whole paragraph, so loose lines are traded for evenly spaced ones.
+//! Boxes are the paragraph's glyphs, glue is its spaces, and penalties are break opportunities
+//! after hyphens/dashes/CJK and at hyphenation points. The breaks minimise the sum of squared
+//! (badness + penalty) demerits over the whole paragraph, plus a demerit when neighbouring lines
+//! fall in fitness classes more than one apart (a tight line next to a loose one).
+//!
+//! - **Justified** lines: word spacing may stretch to 150% and shrink to 80%; the badness comes
+//!   from the stretch/shrink ratio, so loose lines are traded for evenly spaced ones.
+//! - **Ragged** lines (left/centre/right aligned): spaces keep their width, so a line never
+//!   shrinks (it must fit). The badness comes from the line's leftover space measured against a
+//!   rag zone of a sixth of the line width, so the rag is even rather than full lines followed by
+//!   a short one, and hyphenating costs less. The last line costs nothing unless it is shorter
+//!   than a third of the width (a word or two left dangling).

 use crate::shape::SGlyph;

@@ -12,6 +20,21 @@ const SHRINK: f64 = 0.2;
 const HYPHEN_PENALTY: f64 = 50.0;
 const DOUBLE_HYPHEN_DEMERITS: f64 = 3000.0;
 const LINE_PENALTY: f64 = 10.0;
+/// Demerits for adjacent lines whose fitness classes differ by more than one.
+const ADJ_DEMERITS_JUSTIFIED: f64 = 10_000.0;
+const ADJ_DEMERITS_RAGGED: f64 = 1_000.0;
+/// Ragged lines only gain from hyphenation by filling the rag, so it costs less than in
+/// justified text (where it also evens the word spacing).
+const HYPHEN_PENALTY_RAGGED: f64 = 25.0;
+/// Ragged text: leftover space is measured in units of this fraction of the line width.
+const RAG_ZONE: f64 = 1.0 / 6.0;
+/// Ragged text: a last line shorter than this fraction of the width is penalised, by how much
+/// shorter it is in units of `SHORT_LAST_ZONE` of the width.
+const SHORT_LAST: f64 = 1.0 / 3.0;
+const SHORT_LAST_ZONE: f64 = 1.0 / 3.0;
+/// Give up (fall back to the single-line composer) beyond this many active breakpoints.
+const MAX_ACTIVE: usize = 4096;
+const EPS: f64 = 1e-6;

 /// A place a line may end: glyph index `end` (exclusive), plus the width of the hyphen that is
 /// added when breaking there (0 = no hyphen).
@@ -21,24 +44,56 @@ pub(crate) struct Breakpoint {
    pub hyphen: f64,
 }

+/// How a paragraph is composed.
+#[derive(Clone, Copy, Debug)]
+pub(crate) struct Params {
+    /// The last line is justified too (Justify All).
+    pub justify_last: bool,
+    /// Left/centre/right aligned text: spaces keep their width and lines are scored by their rag.
+    pub ragged: bool,
+    /// Maximum stretch ratio (justified) or leftover space in rag zones (ragged) of a line.
+    pub tolerance: f64,
+    /// Lines from this index on all have the same width, so their line numbers are interchangeable
+    /// (keeps the number of active breakpoints small).
+    pub uniform_from: usize,
+}
+
 struct Node {
    pos: usize,
+    /// Line number of the next line, clamped to `uniform_from`.
    line: usize,
+    fitness: u8,
    demerits: f64,
    hyphenated: bool,
    prev: Option<usize>,
 }

+/// Fitness class 0 (tight) … 3 (very loose) of a line with adjustment ratio `r`.
+fn fitness(r: f64, ragged: bool) -> u8 {
+    let bounds = if ragged { [0.15, 0.4, 0.75] } else { [-0.5, 0.5, 1.0] };
+    if r < bounds[0] {
+        0
+    } else if r <= bounds[1] {
+        1
+    } else if r <= bounds[2] {
+        2
+    } else {
+        3
+    }
+}
+
 /// Compose the paragraph `g` into lines. `width(k)` is the available width of line `k`;
-/// `cands` are the break opportunities in increasing order (the paragraph end is added).
-/// `justify_last`: the last line is justified too (Justify All). Returns `(end, hyphen)` per line,
-/// or `None` if no set of breaks fits within `tolerance` (maximum stretch ratio).
+/// `start_credit(i)` is the width a wrapped line starting at glyph `i` gives back (Mojikumi sets
+/// an opening bracket there flush with the line's start); `cands` are the break opportunities
+/// in increasing order (the paragraph end is added).
+/// Returns `(end, hyphen)` per line, or `None` if no set of breaks fits within the tolerance
+/// (the caller then falls back to single-line breaking).
 pub(crate) fn compose(
    g: &[SGlyph],
    width: &dyn Fn(usize) -> f64,
+    start_credit: &dyn Fn(usize) -> f64,
    cands: &[Breakpoint],
-    justify_last: bool,
-    tolerance: f64,
+    p: &Params,
 ) -> Option<Vec<(usize, bool)>> {
    let n = g.len();
    if n == 0 {
@@ -51,68 +106,93 @@ pub(crate) fn compose(
        w[i + 1] = w[i] + gl.adv;
        sp[i + 1] = sp[i] + if gl.is_space() { gl.adv } else { 0.0 };
    }
+    if !w[n].is_finite() {
+        return None;
+    }
    // Trailing spaces are dropped at a break.
    let trim = |mut b: usize, a: usize| {
-        while b > a && g[b - 1].is_space() {
+        while b > a && g.get(b - 1).is_some_and(SGlyph::is_space) {
            b -= 1;
        }
        b
    };
    let mut all: Vec<Breakpoint> = cands.iter().copied().filter(|c| c.end > 0 && c.end < n).collect();
    all.push(Breakpoint { end: n, hyphen: 0.0 });
-    let mut nodes = vec![Node { pos: 0, line: 0, demerits: 0.0, hyphenated: false, prev: None }];
+    let (adj_demerits, hyphen_penalty) =
+        if p.ragged { (ADJ_DEMERITS_RAGGED, HYPHEN_PENALTY_RAGGED) } else { (ADJ_DEMERITS_JUSTIFIED, HYPHEN_PENALTY) };
+    let mut nodes = vec![Node { pos: 0, line: 0, fitness: 1, demerits: 0.0, hyphenated: false, prev: None }];
    let mut active: Vec<usize> = vec![0];
    for bp in &all {
        let last = bp.end == n;
-        let mut best: Vec<(usize, f64, usize)> = vec![]; // (line, demerits, from)
+        let mut best: Vec<(usize, u8, f64, usize)> = vec![]; // (line, fitness, demerits, from)
        let mut keep = Vec::with_capacity(active.len());
        for &ai in &active {
-            let a = &nodes[ai];
+            let Some(a) = nodes.get(ai) else { continue };
            let t = trim(bp.end, a.pos);
-            let natural = w[t] - w[a.pos] + bp.hyphen;
-            let spaces = sp[t] - sp[a.pos];
+            let credit = if a.pos > 0 { start_credit(a.pos) } else { 0.0 };
+            let natural = w[t] - w[a.pos] - credit + bp.hyphen;
            let lw = width(a.line);
-            let ratio = if natural < lw {
-                if last && !justify_last {
-                    0.0
-                } else if spaces > 0.0 {
-                    (lw - natural) / (spaces * STRETCH)
+            // Adjustment ratio, badness and whether the line ends the active node's reach.
+            let ratio = if p.ragged {
+                if natural > lw + EPS {
+                    // Ragged lines never shrink; longer lines from this node only get worse.
+                    continue;
+                }
+                if last && !p.justify_last {
+                    ((lw * SHORT_LAST - natural) / (lw * SHORT_LAST_ZONE).max(1.0)).max(0.0)
                } else {
-                    f64::INFINITY
+                    (lw - natural).max(0.0) / (lw * RAG_ZONE).max(1.0)
                }
-            } else if natural > lw {
-                if spaces > 0.0 { (lw - natural) / (spaces * SHRINK) } else { f64::NEG_INFINITY }
            } else {
-                0.0
+                let spaces = sp[t] - sp[a.pos];
+                if natural < lw {
+                    if last && !p.justify_last {
+                        0.0
+                    } else if spaces > 0.0 {
+                        (lw - natural) / (spaces * STRETCH)
+                    } else {
+                        f64::INFINITY
+                    }
+                } else if natural > lw {
+                    if spaces > 0.0 { (lw - natural) / (spaces * SHRINK) } else { f64::NEG_INFINITY }
+                } else {
+                    0.0
+                }
            };
            if ratio < -1.0 {
                // Too long already; longer lines from this node only get worse.
                continue;
            }
            keep.push(ai);
-            if ratio > tolerance && !(last && ratio.is_infinite() && justify_last) {
+            let free_last = last && (p.ragged || !p.justify_last);
+            if ratio > p.tolerance && !(last && (p.ragged || (ratio.is_infinite() && p.justify_last))) {
                continue;
            }
            let badness = if ratio.is_finite() { (100.0 * ratio.abs().powi(3)).min(10_000.0) } else { 10_000.0 };
-            let penalty = if bp.hyphen > 0.0 { HYPHEN_PENALTY } else { 0.0 };
+            let penalty = if bp.hyphen > 0.0 { hyphen_penalty } else { 0.0 };
            let mut d = (LINE_PENALTY + badness).powi(2) + penalty * penalty;
            if bp.hyphen > 0.0 && a.hyphenated {
                d += DOUBLE_HYPHEN_DEMERITS;
            }
+            // A ragged last line's length says nothing about the rag: it keeps its neighbour's class.
+            let fit = if p.ragged && free_last { a.fitness } else { fitness(ratio, p.ragged) };
+            if a.prev.is_some() && fit.abs_diff(a.fitness) > 1 {
+                d += adj_demerits;
+            }
            let total = a.demerits + d;
-            let line = a.line + 1;
-            match best.iter_mut().find(|b| b.0 == line) {
-                Some(b) if b.1 <= total => {}
-                Some(b) => *b = (line, total, ai),
-                None => best.push((line, total, ai)),
+            let line = (a.line + 1).min(p.uniform_from);
+            match best.iter_mut().find(|b| b.0 == line && b.1 == fit) {
+                Some(b) if b.2 <= total => {}
+                Some(b) => *b = (line, fit, total, ai),
+                None => best.push((line, fit, total, ai)),
            }
        }
        active = keep;
-        for (line, demerits, from) in best {
-            nodes.push(Node { pos: bp.end, line, demerits, hyphenated: bp.hyphen > 0.0, prev: Some(from) });
+        for (line, fitness, demerits, from) in best {
+            nodes.push(Node { pos: bp.end, line, fitness, demerits, hyphenated: bp.hyphen > 0.0, prev: Some(from) });
            active.push(nodes.len() - 1);
        }
-        if active.is_empty() {
+        if active.is_empty() || active.len() > MAX_ACTIVE {
            return None;
        }
    }
@@ -120,10 +200,14 @@ pub(crate) fn compose(
    let mut out = vec![];
    let mut cur = Some(end);
    while let Some(i) = cur {
-        if nodes[i].prev.is_some() {
-            out.push((nodes[i].pos, nodes[i].hyphenated));
+        let nd = nodes.get(i)?;
+        if nd.prev.is_some() {
+            out.push((nd.pos, nd.hyphenated));
+        }
+        cur = nd.prev;
+        if out.len() > n {
+            return None;
        }
-        cur = nodes[i].prev;
    }
    out.reverse();
    Some(out)
@@ -782,8 +782,29 @@ pub(crate) fn sfnt_of(tables: &[(&[u8; 4], &[u8])]) -> Option<Vec<u8>> {
    Some(font)
 }

-/// The platform's font folders (the system's and the user's) and, on Windows, the font files
-/// registered with it outside them, scanned by [`FontDb::global`].
+/// Lists the font files the platform's font service knows, for [`set_platform_font_files`].
+pub type PlatformFontFiles = fn() -> Vec<String>;
+
+/// What lists the platform's font files, set by the app ([`set_platform_font_files`]).
+#[cfg(not(target_arch = "wasm32"))]
+static PLATFORM_FONT_FILES: std::sync::OnceLock<PlatformFontFiles> = std::sync::OnceLock::new();
+
+/// Have [`system_font_dirs`] add the font files `list` gives (full paths) outside the font
+/// folders, asked again by each scan and each check for installed fonts
+/// ([`FontDb::installed_fonts_changed`]). The desktop app lists DirectWrite's system font
+/// collection on Windows: fonts a font service such as Adobe Fonts loads in place, from files
+/// outside the font folders and unknown to the registry (#579). Only the first call counts.
+pub fn set_platform_font_files(list: PlatformFontFiles) {
+    #[cfg(not(target_arch = "wasm32"))]
+    // A second call keeps the first lister, as documented.
+    let _ = PLATFORM_FONT_FILES.set(list);
+    #[cfg(target_arch = "wasm32")]
+    let _ = list;
+}
+
+/// The platform's font folders (the system's and the user's) and the font files known to it
+/// outside them (on Windows those registered with it, and those [`set_platform_font_files`]
+/// lists), scanned by [`FontDb::global`].
 pub fn system_font_dirs() -> Vec<PathBuf> {
    let mut dirs: Vec<PathBuf> = Vec::new();
    if cfg!(target_arch = "wasm32") {
@@ -824,6 +845,11 @@ pub fn system_font_dirs() -> Vec<PathBuf> {
        // In a Flatpak sandbox, the host's fonts (system, local and the user's).
        dirs.extend(["/run/host/fonts", "/run/host/local-fonts", "/run/host/user-fonts"].map(Into::into));
    }
+    #[cfg(not(target_arch = "wasm32"))]
+    if let Some(list) = PLATFORM_FONT_FILES.get() {
+        let files = fonts_outside(list(), &dirs);
+        dirs.extend(files);
+    }
    dirs
 }

@@ -848,7 +874,7 @@ fn registered_font_files(font_dirs: &[PathBuf]) -> Vec<PathBuf> {
 /// The full paths among `registered` (font registrations' data) that aren't in `font_dirs`
 /// (ignoring case, as Windows paths do), sorted and deduplicated. File names alone are files in
 /// the Windows font folder, which is scanned anyway. The count is capped.
-#[cfg(any(windows, test))]
+#[cfg(not(target_arch = "wasm32"))]
 pub(crate) fn fonts_outside(registered: impl IntoIterator<Item = String>, font_dirs: &[PathBuf]) -> Vec<PathBuf> {
    const MAX_REGISTERED: usize = 1 << 16;
    let lower = |p: &Path| PathBuf::from(p.to_string_lossy().to_lowercase());
@@ -1154,6 +1180,7 @@ impl FontDb {
        let mut n = 0;
        let paths = self.font_paths.get();
        let mut modified_at = Vec::new();
+        // Each file with whether it was named by itself rather than found in a folder.
        let mut files = Vec::new();
        let mut stack = paths.clone();
        // Each folder once, however links lead back to it.
@@ -1166,7 +1193,7 @@ impl FontDb {
            modified_at.push((d.clone(), modified(&d)));
            // Not a folder: a font file named by itself (or nothing, yet).
            let Ok(rd) = std::fs::read_dir(&d) else {
-                files.push(d);
+                files.push((d, true));
                continue;
            };
            for e in rd.flatten() {
@@ -1174,13 +1201,15 @@ impl FontDb {
                if p.is_dir() {
                    stack.push(p);
                } else {
-                    files.push(p);
+                    files.push((p, false));
                }
            }
        }
-        for p in files {
+        for (p, named) in files {
+            // A file named by itself is a font whatever its name (font services keep fonts in
+            // files without an extension); one of a folder's only with a font's extension.
            let ext = p.extension().and_then(|e| e.to_str()).map(|e| e.to_ascii_lowercase());
-            if !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
+            if !named && !matches!(ext.as_deref(), Some("ttf" | "otf" | "ttc" | "otc")) {
                continue;
            }
            for FaceStyle { family, style, keys, weight, italic, traits, .. } in file_face_names(&p) {
@@ -9,11 +9,11 @@ use vectorcraft_doc::{
 };
 use vectorcraft_geom::{ArcPath, PathData};

-use crate::composer::{Breakpoint, compose};
+use crate::composer::{Breakpoint, Params, compose};
 use crate::fontdb::FontDb;
 use crate::hyphen::hyphen_points;
 use crate::shape::{Punct, SGlyph, Tcy, cap_x_heights, hyphen_glyph, is_cjk, no_line_end, no_line_start, punct, shape_range, style_metrics};
-use crate::{Composer, FirstBaseline, LayoutOptions, LineInfo, OtFeatures, PositionedGlyph, TextLayout};
+use crate::{Composer, FirstBaseline, LayoutOptions, LineInfo, OtFeatures, PositionedGlyph, TextLayout, VerticalAlign};

 const EPS: f64 = 1e-6;

@@ -127,14 +127,89 @@ pub fn layout(db: &FontDb, t: &TextObject) -> TextLayout {
        inset: a.inset,
        first_baseline: a.first_baseline,
        first_baseline_min: a.first_baseline_min,
+        vertical_align: a.vertical_align,
+        fit: a.fit,
        ..LayoutOptions::default()
    };
    layout_with(db, t, &opts)
 }

+/// Most layout passes Shrink Text to Fit runs past the first (bisection plus the final pass).
+const SHRINK_PASSES: usize = 11;
+
 /// Lay out a text object with explicit options (area type rows/columns, inset, first baseline,
-/// composer, OpenType features).
+/// fit, composer, OpenType features).
 pub fn layout_with(db: &FontDb, t: &TextObject, opts: &LayoutOptions) -> TextLayout {
+    let first = layout_once(db, t, opts);
+    match (opts.fit.min_scale(), &t.kind) {
+        (Some(min), TextKind::Area { .. }) if first.overflow => shrink_to_fit(db, t, opts, min).unwrap_or(first),
+        _ => first,
+    }
+}
+
+/// Shrink Text to Fit for text that overflows at full size: the largest scale in `min..1` at which
+/// it fits, searched by bisection over the first run's size in steps of 0.1 pt (so its scaled size
+/// is a whole number of tenths of a point, the same every time). Down at `min` it lays out there,
+/// still overflowing. None (keep the full-size layout) when the text has no usable size.
+fn shrink_to_fit(db: &FontDb, t: &TextObject, opts: &LayoutOptions, min: f64) -> Option<TextLayout> {
+    let size = t.runs.first().map(|r| r.style.size).filter(|s| s.is_finite() && *s >= 0.1)?;
+    if !(min.is_finite() && min < 1.0) {
+        return None;
+    }
+    let tenths = size * 10.0;
+    // Candidate sizes k/10 pt for k in lo..hi: `hi` (full size, rounded down) is known to overflow
+    // unless it is below the full size; `lo` is the smallest allowed.
+    let mut lo = (tenths * min).ceil().max(1.0);
+    let mut hi = tenths.floor();
+    if hi < lo {
+        hi = lo;
+    }
+    let at = |k: f64| -> TextLayout {
+        let f = (k / tenths).clamp(min, 1.0);
+        let mut l = layout_once(db, &scaled(t, f), opts);
+        l.fit_scale = f;
+        l
+    };
+    let mut passes = 0;
+    let mut best: Option<TextLayout> = None;
+    // `hi` itself may fit when the size isn't a whole number of tenths.
+    if hi < tenths && hi > lo {
+        let l = at(hi);
+        passes += 1;
+        if !l.overflow {
+            return Some(l);
+        }
+    }
+    // Invariant: everything at `hi` or above overflows; `lo` fits or is the floor.
+    while hi - lo > 1.0 && passes + 1 < SHRINK_PASSES {
+        let mid = ((lo + hi) * 0.5).floor();
+        let l = at(mid);
+        passes += 1;
+        if l.overflow {
+            hi = mid;
+        } else {
+            lo = mid;
+            best = Some(l);
+        }
+    }
+    // `best` is the layout at `lo` once `lo` has moved; at the floor it still needs laying out.
+    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).
+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;
+    }
+    s
+}
+
+/// One layout pass, without fitting.
+fn layout_once(db: &FontDb, t: &TextObject, opts: &LayoutOptions) -> TextLayout {
    let text = t.plain_text();
    let mut runs = Vec::with_capacity(t.runs.len());
    let mut off = 0;
@@ -183,9 +258,12 @@ pub fn layout_with(db: &FontDb, t: &TextObject, opts: &LayoutOptions) -> TextLay
            } else {
                t.wrap.clone()
            };
-            let regions = Region::cells(&(to_lines * frame.to_bezpath()), opts, &wrap);
+            let mut regions = Region::cells(&(to_lines * frame.to_bezpath()), opts, &wrap);
            cx.out.frames = regions.iter().map(|r| line_xf.transform_rect_bbox(r.cell)).collect();
            flow(&mut cx, &paras, &t.para, Some(&regions));
+            if opts.vertical_align != VerticalAlign::Top {
+                align_vertically(&mut cx, &paras, &t.para, &mut regions);
+            }
        }
        TextKind::OnPath { path, .. } => on_path(&mut cx, &paras, t, path),
    }
@@ -416,6 +494,125 @@ fn finish_bounds(out: &mut TextLayout) {
    out.bounds = b.unwrap_or_default();
 }

+/// Space left in each cell after flowing top-aligned: (space above the first line's ascent, space
+/// below the last line's descent, number of distinct baselines). Cells without lines are `None`.
+fn cell_space(out: &TextLayout, regions: &[Region]) -> Vec<Option<(f64, f64, usize)>> {
+    regions
+        .iter()
+        .enumerate()
+        .map(|(ri, r)| {
+            let mut top = f64::INFINITY;
+            let mut bottom = f64::NEG_INFINITY;
+            let mut baselines: Vec<f64> = vec![];
+            for l in out.lines.iter().filter(|l| l.region == ri) {
+                top = top.min(l.baseline - l.ascent);
+                bottom = bottom.max(l.baseline + l.descent);
+                if !baselines.iter().any(|b| (b - l.baseline).abs() < 1e-6) {
+                    baselines.push(l.baseline);
+                }
+            }
+            if baselines.is_empty() || !top.is_finite() || !bottom.is_finite() {
+                return None;
+            }
+            // Never negative: a full (or overflowing) cell stays where top alignment put it.
+            Some(((top - r.top()).max(0.0), (r.bottom() - bottom).max(0.0), baselines.len()))
+        })
+        .collect()
+}
+
+/// Area Type Options "Align" other than Top: move each cell's lines down. Rectangular cells
+/// without text wrap shift their lines (centre: half the space left below the last line;
+/// bottom: all of it; justify: the first line stays, each further line gets an equal share of it).
+/// Other frames give lines different widths at different heights, so the text flows again with
+/// each cell's lines started lower (or spaced wider) until it settles, at most eight passes; a
+/// pass that would push text out of the frame is undone and retried with half the step.
+fn align_vertically(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: &mut [Region]) {
+    let align = cx.opts.vertical_align;
+    let plain = regions.iter().all(|r| (r.rect || r.polys.is_empty()) && r.wraps.is_empty());
+    if plain {
+        let space = cell_space(&cx.out, regions);
+        // Each distinct baseline's index within its cell, for justify.
+        let mut seen: Vec<Vec<f64>> = vec![vec![]; regions.len()];
+        let offs: Vec<f64> = cx
+            .out
+            .lines
+            .iter()
+            .map(|l| {
+                let Some(Some((_, below, n))) = space.get(l.region).copied() else { return 0.0 };
+                match align {
+                    VerticalAlign::Top => 0.0,
+                    VerticalAlign::Center => below * 0.5,
+                    VerticalAlign::Bottom => below,
+                    VerticalAlign::Justify => {
+                        let Some(s) = seen.get_mut(l.region) else { return 0.0 };
+                        let k = s.iter().position(|b| (b - l.baseline).abs() < 1e-6).unwrap_or_else(|| {
+                            s.push(l.baseline);
+                            s.len() - 1
+                        });
+                        if n > 1 { below * k as f64 / (n - 1) as f64 } else { 0.0 }
+                    }
+                }
+            })
+            .collect();
+        for (l, d) in cx.out.lines.iter_mut().zip(&offs) {
+            l.baseline += d;
+        }
+        for g in &mut cx.out.glyphs {
+            let d = offs.get(g.line).copied().unwrap_or(0.0);
+            if d != 0.0 {
+                let m = Affine::translate((0.0, d));
+                g.outline.apply_affine(m);
+                g.xf = m * g.xf;
+                g.origin.y += d;
+            }
+        }
+        return;
+    }
+    let laid_out = |out: &TextLayout| out.lines.last().map_or(0, |l| l.end);
+    // How much of the measured space a pass takes up: halved after a pass that lost text.
+    let mut step = 1.0;
+    for _ in 0..8 {
+        let space = cell_space(&cx.out, regions);
+        let mut moved = false;
+        let saved: Vec<(f64, f64)> = regions.iter().map(|r| (r.shift, r.gap)).collect();
+        for (r, s) in regions.iter_mut().zip(&space) {
+            let Some((above, below, n)) = *s else { continue };
+            let (shift, gap) = match align {
+                VerticalAlign::Top => (r.shift, r.gap),
+                VerticalAlign::Center => (r.shift + (below - above) * 0.5 * step, r.gap),
+                VerticalAlign::Bottom => (r.shift + below * step, r.gap),
+                VerticalAlign::Justify if n > 1 => (r.shift, r.gap + below * step / (n - 1) as f64),
+                VerticalAlign::Justify => (r.shift, r.gap),
+            };
+            let (shift, gap) = (shift.clamp(0.0, r.cell.height().max(0.0)), gap.clamp(0.0, r.cell.height().max(0.0)));
+            if (shift - r.shift).abs() > 0.25 || (gap - r.gap).abs() > 0.01 {
+                moved = true;
+            }
+            r.shift = shift;
+            r.gap = gap;
+        }
+        if !moved {
+            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));
+        flow(cx, paras, para, 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;
+            for (r, (shift, gap)) in regions.iter_mut().zip(saved) {
+                r.shift = shift;
+                r.gap = gap;
+            }
+            step *= 0.5;
+            if step < 0.1 {
+                return;
+            }
+        }
+    }
+}
+
 /// One cell of a flattened area-type frame (the whole frame, or one row/column of it).
 struct Region {
    /// The cell (frame bounds, or a grid cell of them).
@@ -427,6 +624,10 @@ struct Region {
    rect: bool,
    /// Text Wrap shapes: (polygons, offset, invert).
    wraps: Vec<(Vec<Vec<Point>>, f64, bool)>,
+    /// Vertical alignment: how far below the top-aligned position the first line starts.
+    shift: f64,
+    /// Vertical justification: extra space added between consecutive lines.
+    gap: f64,
 }

 /// Flattened closed polygons of a path.
@@ -529,7 +730,7 @@ impl Region {
                let x0 = bbox.x0 + c as f64 * (cw + gutter);
                let y0 = bbox.y0 + r as f64 * (rh + gutter);
                let cell = if rows * cols == 1 { bbox } else { Rect::new(x0, y0, x0 + cw, y0 + rh) };
-                out.push(Region { cell, inset: opts.inset.max(0.0), polys: polys.clone(), rect, wraps: wraps.clone() });
+                out.push(Region { cell, inset: opts.inset.max(0.0), polys: polys.clone(), rect, wraps: wraps.clone(), shift: 0.0, gap: 0.0 });
            }
        }
        out
@@ -674,9 +875,9 @@ impl Pen<'_> {
        loop {
            let r = regions.get(self.ri)?;
            let mut baseline = match self.prev {
-                None if self.model == LeadingModel::EmBoxTop => r.top() + est.top.max(self.fb_min),
-                None => r.top() + est.first_baseline(self.fb, self.fb_min),
-                Some(b) => self.next_baseline(b, est),
+                None if self.model == LeadingModel::EmBoxTop => r.top() + r.shift + est.top.max(self.fb_min),
+                None => r.top() + r.shift + est.first_baseline(self.fb, self.fb_min),
+                Some(b) => self.next_baseline(b, est) + r.gap,
            };
            loop {
                if baseline + est.desc > r.bottom() + 0.01 {
@@ -761,10 +962,15 @@ fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool, b
    let mut j = i;
    while j < g.len() {
        let gl = &g[j];
-        if j > i && !gl.is_space() && x + gl.adv > width + EPS {
+        let mut cluster_end = j + 1;
+        while g.get(cluster_end).is_some_and(|next| next.byte == gl.byte) {
+            cluster_end += 1;
+        }
+        let cluster_width: f64 = g[j..cluster_end].iter().map(|glyph| glyph.adv).sum();
+        if j > i && !gl.is_space() && x + cluster_width > width + EPS {
            // It ends the line with the spaces after it.
-            if burasagari != Burasagari::None && hangs(gl) && kinsoku_allows(g, j) && g.get(j + 1).is_none_or(|n| n.byte != gl.byte) {
-                let mut end = j + 1;
+            if burasagari != Burasagari::None && hangs(gl) && kinsoku_allows(g, cluster_end - 1) {
+                let mut end = cluster_end;
                while g.get(end).is_some_and(SGlyph::is_space) {
                    end += 1;
                }
@@ -772,17 +978,18 @@ fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool, b
            }
            break;
        }
-        x += gl.adv;
-        if gl.break_after() && kinsoku_allows(g, j) {
-            if gl.is_soft_hyphen() {
-                if x + hyphen_glyph(gl).adv <= width + EPS {
-                    last_break = Some((j + 1, true));
+        x += cluster_width;
+        let last = &g[cluster_end - 1];
+        if last.break_after() && kinsoku_allows(g, cluster_end - 1) {
+            if last.is_soft_hyphen() {
+                if x + hyphen_glyph(last).adv <= width + EPS {
+                    last_break = Some((cluster_end, true));
                }
            } else {
-                last_break = Some((j + 1, false));
+                last_break = Some((cluster_end, false));
            }
        }
-        j += 1;
+        j = cluster_end;
    }
    if j >= g.len() {
        return (g.len(), false);
@@ -805,14 +1012,12 @@ fn break_line(text: &str, g: &[SGlyph], i: usize, width: f64, hyphenate: bool, b
            }
        }
    }
-    // Don't separate a cluster's glyphs.
-    let (mut end, hy) = match last_break {
+    // Break candidates and greedy overflow are cluster boundaries; hyphenation also returns only
+    // cluster starts, so the resulting end always keeps each source cluster together.
+    let (end, hy) = match last_break {
        Some(b) if b.0 > i => b,
        _ => (j, false),
    };
-    while end > i + 1 && end < g.len() && g[end].byte == g[end - 1].byte {
-        end -= 1;
-    }
    (end, hy)
 }

@@ -835,6 +1040,123 @@ fn kinsoku_between(before: char, after: Option<char>) -> bool {
    !no_line_end(before) && after.is_none_or(|c| !no_line_start(c))
 }

+#[cfg(test)]
+mod wrapping_tests {
+    use super::*;
+    use std::sync::Arc;
+
+    fn synthetic_glyphs(specs: &[(usize, usize, f64, char)]) -> Vec<SGlyph> {
+        // The face is only a required SGlyph field here; advances and cluster boundaries below are
+        // entirely synthetic, so the regressions don't depend on a particular font's shaping.
+        static DB: std::sync::OnceLock<FontDb> = std::sync::OnceLock::new();
+        let db = DB.get_or_init(|| FontDb::with_font_dirs(vec![]));
+        let face = db.face("Source Sans 3", "Regular").expect("bundled test face");
+        specs
+            .iter()
+            .map(|&(byte, len, adv, ch)| SGlyph {
+                face: Arc::clone(&face),
+                gid: 0,
+                byte,
+                len,
+                run: 0,
+                adv,
+                dx: 0.0,
+                dy: 0.0,
+                sx: 1.0,
+                sy: 1.0,
+                bshift: 0.0,
+                rotation: 0.0,
+                ascent: 8.0,
+                descent: 2.0,
+                leading: 0.0,
+                cap: 6.0,
+                xh: 4.0,
+                ch,
+                tcy: None,
+                lead: 0.0,
+                level: unicode_bidi::Level::ltr(),
+            })
+            .collect()
+    }
+
+    fn source_range(glyphs: &[SGlyph], start: usize, end: usize) -> Range<usize> {
+        let first = glyphs.get(start).expect("nonempty source range");
+        let last = glyphs.get(end - 1).expect("nonempty source range");
+        first.byte..last.byte + last.len
+    }
+
+    #[test]
+    fn greedy_wrap_keeps_an_oversized_first_cluster_and_its_source_range() {
+        let text = "بَت";
+        let glyphs = synthetic_glyphs(&[(0, 4, 2.0, 'ب'), (0, 4, 2.0, 'ب'), (4, 2, 1.0, 'ت')]);
+
+        let (end, hyphenated) = break_line(text, &glyphs, 0, 3.0, false, Burasagari::None);
+
+        assert!(!hyphenated);
+        assert_eq!(end, 2, "oversized base-plus-mark cluster must stay together");
+        assert_eq!(source_range(&glyphs, 0, end), 0..4);
+        assert_eq!(glyphs.get(end).map(|g| g.byte), Some(4));
+    }
+
+    #[test]
+    fn greedy_wrap_keeps_an_oversized_cluster_after_a_line_start_atomic() {
+        let text = "بَتَث";
+        let glyphs = synthetic_glyphs(&[(0, 4, 1.0, 'ب'), (4, 4, 2.0, 'ت'), (4, 4, 2.0, 'ت'), (8, 2, 1.0, 'ث')]);
+
+        let (first_end, _) = break_line(text, &glyphs, 0, 3.0, false, Burasagari::None);
+        assert_eq!(first_end, 1);
+        assert_eq!(source_range(&glyphs, 0, first_end), 0..4);
+
+        let (second_end, hyphenated) = break_line(text, &glyphs, first_end, 3.0, false, Burasagari::None);
+
+        assert!(!hyphenated);
+        assert_eq!(second_end, 3, "oversized cluster at the next line start must stay together");
+        assert_eq!(source_range(&glyphs, first_end, second_end), 4..8);
+        assert_eq!(glyphs.get(second_end).map(|g| g.byte), Some(8));
+    }
+
+    #[test]
+    fn narrow_arabic_area_wrap_keeps_base_and_mark_together_when_supported() {
+        let db = FontDb::global();
+        let Some(face) = db.face_covering('ب').filter(|face| face.covers('َ')) else {
+            // Arabic integration coverage depends on an installed font; synthetic tests above are
+            // the font-independent regression oracle.
+            return;
+        };
+        let text = "بَت";
+        let style = CharStyle { font_family: face.family.clone(), font_style: face.style.clone(), size: 20.0, ..CharStyle::default() };
+        let bidi = para_bidi(text, None);
+        let levels = bidi.as_ref().map_or(&[][..], |info| &info.levels);
+        let mut shaped = Vec::new();
+        shape_range(db, text, 0..text.len(), &[(0..text.len(), &style)], &OtFeatures::default(), levels, &mut shaped);
+        let Some(first) = shaped.first() else { return };
+        let first_end = shaped.iter().take_while(|g| g.byte == first.byte).count();
+        if first.byte != 0 || first_end < 2 || first_end >= shaped.len() {
+            return;
+        }
+        // Pick a narrow width that fits glyphs before one positive-advance glyph but not that next
+        // glyph. This ensures the old per-glyph loop would have returned inside the first cluster.
+        let mut prefix = shaped.first().map_or(0.0, |g| g.adv);
+        let width = (1..first_end).find_map(|k| {
+            let advance = shaped.get(k)?.adv;
+            if prefix > EPS && advance > EPS {
+                Some(prefix)
+            } else {
+                prefix += advance;
+                None
+            }
+        });
+        let Some(width) = width else { return };
+
+        let mut object = TextObject::point(Point::ZERO, text, style);
+        object.kind = TextKind::Area { frame: PathData::from_bezpath(&Rect::new(0.0, 0.0, width, 100.0).to_path(0.1)) };
+        let result = layout_with(db, &object, &LayoutOptions::default());
+
+        let next_cluster_byte = shaped.get(first_end).map(|g| g.byte);
+        assert_eq!(result.lines.first().map(|line| line.end), next_cluster_byte);
+    }
+}
+
 #[cfg(test)]
 #[test]
 fn japanese_letters_for_the_latin_space_are_kana_kanji_and_marks_not_hangul_or_punctuation() {
@@ -914,14 +1236,18 @@ fn candidates(text: &str, g: &[SGlyph], hyphenate: bool) -> Vec<Breakpoint> {
    v
 }

-/// Every-line composition of paragraph glyphs `sg` if applicable (justified area text with uniform
-/// line metrics); `None` falls back to the greedy single-line composer.
-fn compose_para(cx: &Ctx<'_>, sg: &[SGlyph], para: &ParaStyle, pen: &Pen<'_>) -> Option<Vec<(usize, bool)>> {
-    let justified = !matches!(para.justify, Justify::Auto | Justify::Left | Justify::Center | Justify::Right);
+/// Paragraphs longer than this (glyphs) are always broken line by line.
+const MAX_COMPOSE_GLYPHS: usize = 200_000;
+
+/// Every-line composition of paragraph glyphs `sg` if applicable (area text with uniform line
+/// metrics, justified or ragged); `None` falls back to the greedy single-line composer.
+fn compose_para(cx: &Ctx<'_>, sg: &[SGlyph], para: &ParaStyle, pen: &Pen<'_>, rtl: bool) -> Option<Vec<(usize, bool)>> {
+    let ragged = matches!(para.justify, Justify::Auto | Justify::Left | Justify::Center | Justify::Right);
+    let composer = cx.opts.composer.unwrap_or(para.composer);
    // A paragraph whose commas or full stops may hang is composed line by line (as the Japanese
    // single-line composer does).
    let may_hang = para.burasagari != Burasagari::None && sg.iter().any(hangs);
-    if cx.opts.composer != Composer::EveryLine || !justified || pen.regions.is_none() || sg.len() < 2 || may_hang {
+    if composer != Composer::EveryLine || pen.regions.is_none() || sg.len() < 2 || sg.len() > MAX_COMPOSE_GLYPHS || may_hang {
        return None;
    }
    let m = Metrics::of(&sg[0]);
@@ -948,9 +1274,21 @@ fn compose_para(cx: &Ctx<'_>, sg: &[SGlyph], para: &ParaStyle, pen: &Pen<'_>) ->
    }
    let last = *widths.last()?;
    let width = |k: usize| widths.get(k).copied().unwrap_or(last);
+    // Lines from `uniform_from` on are interchangeable (same width).
+    let uniform_from = widths.iter().rposition(|&w| (w - last).abs() > EPS).map_or(0, |k| k + 1);
    let cands = candidates(cx.text, sg, para.hyphenate);
    let justify_last = para.justify == Justify::JustifyAll;
-    compose(sg, &width, &cands, justify_last, 1.0).or_else(|| compose(sg, &width, &cands, justify_last, 4.0))
+    let params = |tolerance| Params { justify_last, ragged, tolerance, uniform_from };
+    // Ragged: first look for breaks that leave at most one rag zone (a sixth of the width) on
+    // each line, then accept any lines that fit.
+    let (strict, loose) = if ragged { (1.0, f64::INFINITY) } else { (1.0, 4.0) };
+    // The same rule as the line loop below: an opening bracket starting a wrapped line gives up
+    // the space before it.
+    let start_credit = |i: usize| {
+        let flush = !rtl && para.mojikumi == Mojikumi::LineEndHalf;
+        sg.get(i).filter(|g| flush && g.lead <= 0.0).and_then(|g| punct_half(g, Punct::Opening)).unwrap_or(0.0)
+    };
+    compose(sg, &width, &start_credit, &cands, &params(strict)).or_else(|| compose(sg, &width, &start_credit, &cands, &params(loose)))
 }

 fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Option<&[Region]>) {
@@ -985,7 +1323,7 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
            pen.pending += para.space_before;
        }
        let n = sg.len();
-        let composed = compose_para(cx, &sg, para, &pen);
+        let composed = compose_para(cx, &sg, para, &pen, rtl);
        let mut li_para = 0;
        let mut i = 0;
        loop {
@@ -1189,6 +1527,7 @@ fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], para: &ParaStyle, regions: Opt
                glyph_start,
                glyph_end: cx.out.glyphs.len(),
                avail: if regions.is_some() { (ax0, ax1) } else { (start_x, x_end) },
+                region: if regions.is_some() { pen.ri } else { 0 },
            });
            pen.settled(baseline, m);
            // Further spans of this line band share the settled baseline.
@@ -1265,6 +1604,7 @@ fn on_path(cx: &mut Ctx<'_>, paras: &[Range<usize>], t: &TextObject, path: &Path
            glyph_start: 0,
            glyph_end: 0,
            avail: (0.0, 0.0),
+            region: 0,
        });
        return;
    }
@@ -1349,6 +1689,7 @@ fn on_path(cx: &mut Ctx<'_>, paras: &[Range<usize>], t: &TextObject, path: &Path
        glyph_start: 0,
        glyph_end: cx.out.glyphs.len(),
        avail: (0.0, ap.len()),
+        region: 0,
    });
 }

@@ -24,22 +24,17 @@ pub mod thread;

 pub use craft_fonts::{CRAFT_FONTS, CraftFont};
 pub use features::{LIGATURE_TRACKING_LIMITS, OtFeatures, explicit_ligatures, ligatures_suppressed_by};
-pub use fontdb::{FALLBACK_FAMILY, FontClass, FontDb, FontFace, FontMatch, FontTraits, style_weight, system_font_dirs};
+pub use fontdb::{
+    FALLBACK_FAMILY, FontClass, FontDb, FontFace, FontMatch, FontTraits, PlatformFontFiles, set_platform_font_files, style_weight, system_font_dirs,
+};
 use kurbo::{Affine, BezPath, Point, Rect, Vec2};
 pub use layout::{layout, layout_with};
 pub use vectorcraft_doc::TextObject;

-pub use vectorcraft_doc::FirstBaseline;
+pub use vectorcraft_doc::{AreaFit, FirstBaseline, VerticalAlign};

-/// Paragraph composer (Paragraph panel menu).
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-pub enum Composer {
-    /// Break each line as soon as it is full.
-    SingleLine,
-    /// Knuth–Plass total fit over the paragraph (justified area text only).
-    #[default]
-    EveryLine,
-}
+/// Paragraph composer; stored per text object in [`vectorcraft_doc::ParaStyle::composer`].
+pub use vectorcraft_doc::Composer;

 /// Layout parameters that the document model doesn't store per object (Area Type Options,
 /// composer, OpenType features). [`layout`] takes rows/columns/inset/first baseline from the object.
@@ -55,7 +50,13 @@ pub struct LayoutOptions {
    pub first_baseline: FirstBaseline,
    /// Minimum first-baseline offset in points.
    pub first_baseline_min: f64,
-    pub composer: Composer,
+    /// Vertical alignment of the lines in each row/column (Area Type Options "Align").
+    pub vertical_align: VerticalAlign,
+    /// Area type only: Shrink Text to Fit scales overflowing text down at layout time (see
+    /// [`TextLayout::fit_scale`]); the other fits are the engine's business and lay out as `None`.
+    pub fit: AreaFit,
+    /// Overrides the object's paragraph composer (`None` = use `ParaStyle::composer`).
+    pub composer: Option<Composer>,
    pub features: OtFeatures,
 }

@@ -68,7 +69,9 @@ impl Default for LayoutOptions {
            inset: 0.0,
            first_baseline: FirstBaseline::Ascent,
            first_baseline_min: 0.0,
-            composer: Composer::EveryLine,
+            vertical_align: VerticalAlign::Top,
+            fit: AreaFit::None,
+            composer: None,
            features: OtFeatures::default(),
        }
    }
@@ -128,9 +131,11 @@ pub struct LineInfo {
    /// Horizontal span available to the line (frame span minus indents; the content extent for
    /// point type). Used for hit testing across columns.
    pub avail: (f64, f64),
+    /// Area type: index of the frame cell ([`TextLayout::frames`]) the line sits in (0 otherwise).
+    pub region: usize,
 }

-#[derive(Clone, Debug, Default)]
+#[derive(Clone, Debug)]
 pub struct TextLayout {
    /// Lines retain inline/block coordinates; glyph geometry is in physical text space.
    pub vertical: bool,
@@ -148,6 +153,25 @@ pub struct TextLayout {
    pub on_path: bool,
    /// Area type: the frame cells text flowed into (one per row/column).
    pub frames: Vec<Rect>,
+    /// Shrink Text to Fit: the factor the text's sizes, leading and baseline shifts were scaled
+    /// by to fit its frame (1.0 when the text is not shrunk).
+    pub fit_scale: f64,
+}
+
+impl Default for TextLayout {
+    fn default() -> Self {
+        Self {
+            vertical: false,
+            line_xf: Affine::IDENTITY,
+            glyphs: Vec::new(),
+            lines: Vec::new(),
+            bounds: Rect::ZERO,
+            overflow: false,
+            on_path: false,
+            frames: Vec::new(),
+            fit_scale: 1.0,
+        }
+    }
 }

 impl TextLayout {
@@ -449,6 +473,8 @@ mod tests_bidi;
 #[cfg(test)]
 mod tests_embed;
 #[cfg(test)]
+mod tests_fit;
+#[cfg(test)]
 mod tests_scripts;
 #[cfg(test)]
 mod tests_snap;
@@ -196,20 +196,43 @@ pub(crate) fn shape_range(
    levels: &[Level],
    out: &mut Vec<SGlyph>,
 ) {
+    if text.get(range.clone()).is_none() || range.is_empty() {
+        return;
+    }
    let level_at = |i: usize| levels.get(i - range.start).copied().unwrap_or_else(Level::ltr);
    let output_start = out.len();
+
+    // Text runs also carry non-shaping attributes (fill, stroke, etc.). Coalesce adjacent equal
+    // styles so an editor split does not become an accidental OpenType shaping boundary. Keep
+    // original run spans: each emitted cluster is attributed by its source byte below.
+    let mut spans: Vec<(Range<usize>, &CharStyle, Range<usize>)> = Vec::new();
    for (ri, (rr, st)) in runs.iter().enumerate() {
        let a = rr.start.max(range.start);
        let b = rr.end.min(range.end);
-        if a >= b {
+        if a >= b || text.get(a..b).is_none() {
            continue;
        }
+        if let Some((previous, previous_style, source_runs)) = spans.last_mut()
+            && previous.end == a
+            && *previous_style == *st
+        {
+            previous.end = b;
+            source_runs.end = ri + 1;
+            continue;
+        }
+        spans.push((a..b, *st, ri..ri + 1));
+    }
+
+    for (span, st, source_runs) in spans {
+        let a = span.start;
+        let b = span.end;
        let Some(primary) = db.face(&st.font_family, &st.font_style) else { continue };
        let pmap = primary.skrifa().map(|f| f.charmap());
        // Synthesized Small Caps shape lowercase letters separately (as smaller capitals).
        let small_caps = st.small_caps.is_some() && !st.all_caps;
        // Split into segments by font coverage (and case, for Small Caps).
-        let mut seg = Segment { range: a..a, run: ri, st, face: primary.clone(), small: false, level: level_at(a) };
+        let group_output_start = out.len();
+        let mut seg = Segment { range: a..a, run: source_runs.start, st, face: primary.clone(), small: false, level: level_at(a) };
        let mut cache: Vec<(char, Arc<FontFace>)> = Vec::new();
        let mut script = Script::Common;
        for (i, c) in text[a..b].char_indices() {
@@ -233,7 +256,7 @@ pub(crate) fn shape_range(
            if (face.id() != seg.face.id() || small != seg.small || level != seg.level || script_change) && !is_mark(c) {
                if i > seg.range.start {
                    seg.range.end = i;
-                    shape_segment(text, &seg, feats, out);
+                    shape_segment(text, &range, &seg, feats, out);
                }
                seg = Segment { range: i..i, face, small, level, ..seg };
            }
@@ -243,7 +266,10 @@ pub(crate) fn shape_range(
        }
        if b > seg.range.start {
            seg.range.end = b;
-            shape_segment(text, &seg, feats, out);
+            shape_segment(text, &range, &seg, feats, out);
+        }
+        for glyph in &mut out[group_output_start..] {
+            glyph.run = source_run_at(runs, &source_runs, glyph.byte).unwrap_or(source_runs.start);
        }
    }
    // Right-to-left segments come out of the shaper in visual order: back to logical order for
@@ -255,6 +281,15 @@ pub(crate) fn shape_range(
    }
 }

+/// Index in the original run list containing `byte`, limited to one coalesced shaping span.
+/// Source runs are ordered and non-overlapping; partitioning keeps attribution bounded when a
+/// document contains many adjacent style runs.
+fn source_run_at(runs: &[(Range<usize>, &CharStyle)], span: &Range<usize>, byte: usize) -> Option<usize> {
+    let source = runs.get(span.clone())?;
+    let i = source.partition_point(|(range, _)| range.end <= byte);
+    source.get(i).filter(|(range, _)| range.contains(&byte)).map(|_| span.start + i)
+}
+
 /// The script `c` is shaped in: Japanese and Chinese text mixes Han, Hiragana, Katakana and
 /// Bopomofo, shaped together (splitting them would cost a shaper call per change of script).
 fn shaping_script(c: char) -> Script {
@@ -281,7 +316,7 @@ fn is_mark(c: char) -> bool {
        || matches!(c, '\u{200D}' | '\u{FE00}'..='\u{FE0F}')
 }

-fn shape_segment(text: &str, seg: &Segment, feats: &OtFeatures, out: &mut Vec<SGlyph>) {
+fn shape_segment(text: &str, context: &Range<usize>, seg: &Segment, feats: &OtFeatures, out: &mut Vec<SGlyph>) {
    let Segment { range, run, st, face, small, level } = seg;
    let (range, run, small) = (range.clone(), *run, *small);
    let text_seg = &text[range.clone()];
@@ -320,6 +355,15 @@ fn shape_segment(text: &str, seg: &Segment, feats: &OtFeatures, out: &mut Vec<SG
        }
        buf.set_direction(if level.is_rtl() { Direction::RightToLeft } else { Direction::LeftToRight });
        buf.guess_segment_properties();
+        // Harfrust keeps this Unicode context for joining/positional shaping, but does not emit
+        // glyphs for it. This retains context at real style/font segmentation boundaries without
+        // shaping across those boundaries or claiming cross-style ligatures/mark attachment.
+        if let Some(pre) = text.get(context.start..range.start) {
+            buf.set_pre_context(pre);
+        }
+        if let Some(post) = text.get(range.end..context.end) {
+            buf.set_post_context(post);
+        }
        let feats: Vec<Feature> = feats.resolve(st);
        let gb = shaper.shape(buf, ShapeOptions::new().features(&feats));
        for (info, pos) in gb.glyph_infos().iter().zip(gb.glyph_positions()) {
@@ -1,12 +1,42 @@
 //! Direction, source-cluster and editing regressions; no RTL font assets required.
 use super::*;
 use kurbo::{Point, Rect, Shape};
-use vectorcraft_doc::{CharStyle, TextKind};
+use std::sync::Arc;
+use vectorcraft_doc::{CharStyle, TextKind, TextRun};

 fn text_layout(s: &str) -> TextLayout {
    layout(FontDb::global(), &TextObject::point(Point::ZERO, s, CharStyle::default()))
 }

+fn arabic_test_face(test: &str) -> Option<Arc<FontFace>> {
+    let db = FontDb::global();
+    let face = ["Geeza Pro", "Arial", "Noto Sans Arabic"]
+        .into_iter()
+        .filter_map(|name| db.face(name, "Regular"))
+        .find(|face| face.covers('ب') && face.covers('ل') && face.covers('ا'));
+    if let Some(face) = &face {
+        let path = face.path().map_or_else(|| "bundled font".to_string(), |p| p.display().to_string());
+        eprintln!("ASSERTIONS RUN: {test}; Arabic font {} {} ({path})", face.family, face.style);
+    } else {
+        eprintln!("SKIPPED: {test}; no installed candidate font covers Arabic beh, lam, and alef");
+    }
+    face
+}
+
+fn arabic_style(face: &FontFace) -> CharStyle {
+    CharStyle { font_family: face.family.clone(), font_style: face.style.clone(), ..CharStyle::default() }
+}
+
+fn assert_same_shaped_glyphs(left: &TextLayout, right: &TextLayout) {
+    assert_eq!(left.glyphs.len(), right.glyphs.len());
+    for (a, b) in left.glyphs.iter().zip(&right.glyphs) {
+        assert_eq!(
+            (a.gid, a.byte, a.len, a.font_id, a.advance, a.origin, a.xf, a.rtl),
+            (b.gid, b.byte, b.len, b.font_id, b.advance, b.origin, b.xf, b.rtl),
+        );
+    }
+}
+
 #[test]
 fn hebrew_and_arabic_are_visually_rtl_with_exact_source_clusters() {
    for s in ["שלום", "مرحبا"] {
@@ -85,10 +115,14 @@ fn hebrew_marks_stay_with_base_clusters() {
 fn arabic_contextual_forms_and_lam_alef_use_the_shaper() {
    let db = FontDb::global();
    // Installed fonts are optional; no proprietary or test font is copied into the repo.
-    let face =
-        ["Geeza Pro", "Arial", "Noto Sans Arabic"].into_iter().filter_map(|name| db.face(name, "Regular")).find(|f| f.covers('ل') && f.covers('ا'));
-    let Some(face) = face else { return };
-    let st = CharStyle { font_family: face.family.clone(), font_style: face.style.clone(), ..CharStyle::default() };
+    let Some(face) = arabic_test_face("arabic_contextual_forms_and_lam_alef_use_the_shaper") else { return };
+    let st = arabic_style(&face);
+    let pair = "لا";
+    let lam_alef = layout(db, &TextObject::point(Point::ZERO, pair, st.clone()));
+    let ligature = lam_alef.glyphs.iter().find(|g| g.byte == 0 && g.len == pair.len());
+    assert!(ligature.is_some(), "lam-alef must retain one cluster spanning both source letters: {lam_alef:?}");
+    assert_ne!(ligature.unwrap().gid, face.glyph_for('ل'), "lam-alef must use a shaped glyph");
+
    for s in ["سلام", "שלום سلام"] {
        let l = layout(db, &TextObject::point(Point::ZERO, s, st.clone()));
        let arabic: Vec<_> = l.glyphs.iter().filter(|g| s.get(g.byte..).is_some_and(|t| t.starts_with(['س', 'ل', 'ا', 'م']))).collect();
@@ -100,6 +134,70 @@ fn arabic_contextual_forms_and_lam_alef_use_the_shaper() {
    }
 }

+#[test]
+fn identical_style_arabic_run_splits_keep_joining_and_source_attribution() {
+    let db = FontDb::global();
+    let Some(face) = arabic_test_face("identical_style_arabic_run_splits_keep_joining_and_source_attribution") else { return };
+    let style = arabic_style(&face);
+    let text = "بب";
+
+    let mut single = TextObject::point(Point::ZERO, text, style.clone());
+    single.runs = vec![TextRun { text: text.to_string(), style: style.clone() }];
+    let mut split = TextObject::point(Point::ZERO, text, style.clone());
+    split.runs = vec![TextRun { text: "ب".into(), style: style.clone() }, TextRun { text: "ب".into(), style }];
+
+    let single = layout(db, &single);
+    let split = layout(db, &split);
+    assert!(single.glyphs.iter().any(|glyph| glyph.gid != face.glyph_for('ب')), "single run must exercise contextual beh forms");
+    assert_same_shaped_glyphs(&single, &split);
+    assert_eq!(split.glyphs.len(), 2, "beh-beh should remain two source clusters");
+    for glyph in &split.glyphs {
+        let expected_run = usize::from(glyph.byte >= "ب".len());
+        assert_eq!(glyph.run, expected_run, "source byte {} belongs to run {expected_run}", glyph.byte);
+    }
+}
+
+#[test]
+fn different_style_arabic_boundary_receives_joining_context() {
+    let db = FontDb::global();
+    let Some(face) = arabic_test_face("different_style_arabic_boundary_receives_joining_context") else { return };
+    let style = arabic_style(&face);
+    let text = "بب";
+    let joined = layout(db, &TextObject::point(Point::ZERO, text, style.clone()));
+    assert!(joined.glyphs.iter().any(|glyph| glyph.gid != face.glyph_for('ب')), "reference must use contextual beh forms");
+
+    let mut split = TextObject::point(Point::ZERO, text, style.clone());
+    split.runs =
+        vec![TextRun { text: "ب".into(), style: style.clone() }, TextRun { text: "ب".into(), style: CharStyle { size: style.size * 1.5, ..style } }];
+    let split = layout(db, &split);
+    assert_eq!(joined.glyphs.len(), 2);
+    assert_eq!(split.glyphs.len(), 2);
+    for glyph in &joined.glyphs {
+        let actual = split.glyphs.iter().find(|other| other.byte == glyph.byte).expect("same source cluster");
+        assert_eq!(actual.gid, glyph.gid, "joining form changed at style boundary for byte {}", glyph.byte);
+        assert_eq!(actual.len, glyph.len);
+        assert_eq!(actual.run, usize::from(glyph.byte >= "ب".len()));
+    }
+}
+
+#[test]
+fn shape_range_handles_empty_runs_and_selected_utf8_subranges() {
+    let db = FontDb::global();
+    let style = CharStyle::default();
+    let text = "Aب";
+    let runs = [(0..text.len(), &style)];
+    let mut glyphs = Vec::new();
+
+    shape::shape_range(db, text, 0..0, &runs, &OtFeatures::default(), &[], &mut glyphs);
+    shape::shape_range(db, text, 0..text.len(), &[], &OtFeatures::default(), &[], &mut glyphs);
+    shape::shape_range(db, text, 1..2, &runs, &OtFeatures::default(), &[], &mut glyphs);
+    assert!(glyphs.is_empty());
+
+    shape::shape_range(db, text, 1..text.len(), &runs, &OtFeatures::default(), &[], &mut glyphs);
+    assert!(!glyphs.is_empty());
+    assert!(glyphs.iter().all(|g| (1..text.len()).contains(&g.byte)));
+}
+
 #[test]
 fn bidi_isolates_numbers_and_brackets_keep_valid_clusters() {
    for s in ["שלום (123)", "مرحبا (Rust 42)", "English \u{2067}שלום 123\u{2069} end"] {
@@ -0,0 +1,163 @@
+//! Area type fitting: Shrink Text to Fit.
+
+use super::*;
+use kurbo::Shape;
+use vectorcraft_doc::{AreaFit, CharStyle, TextKind};
+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, and adjusting the space \
+between pairs of letters.";
+
+fn db() -> &'static FontDb {
+    FontDb::global()
+}
+
+fn area(text: &str, size: f64, frame: Rect, fit: AreaFit) -> TextObject {
+    let mut t = TextObject::point(Point::ZERO, text, CharStyle { size, ..CharStyle::default() });
+    t.kind = TextKind::Area { frame: PathData::from_bezpath(&frame.to_path(0.1)) };
+    t.xf = Affine::IDENTITY;
+    t.area.fit = fit;
+    t
+}
+
+fn shrink(min_percent: f64) -> AreaFit {
+    AreaFit::ShrinkText { min_percent }
+}
+
+/// `t` laid out without fitting at `size` (every run).
+fn at_size(t: &TextObject, size: f64) -> TextLayout {
+    let mut p = t.clone();
+    p.area.fit = AreaFit::None;
+    for r in &mut p.runs {
+        r.style.size = size;
+    }
+    layout(db(), &p)
+}
+
+#[test]
+fn shrink_text_makes_overflowing_text_fit() {
+    let t = area(COPY, 14.0, Rect::new(0.0, 0.0, 200.0, 90.0), shrink(30.0));
+    assert!(at_size(&t, 14.0).overflow, "the text overflows at full size");
+    let l = layout(db(), &t);
+    assert!(!l.overflow, "shrunk to fit");
+    assert!(l.fit_scale < 1.0 && l.fit_scale >= 0.3, "{}", l.fit_scale);
+    assert!(l.glyphs.len() > 100);
+    // The first run's scaled size is a whole number of tenths of a point.
+    let size = 14.0 * l.fit_scale;
+    assert!((size * 10.0 - (size * 10.0).round()).abs() < 1e-6, "{size}");
+    // Maximal: a tenth of a point larger overflows; and the layout is the one at that size.
+    assert!(at_size(&t, size + 0.1).overflow, "{size} + 0.1 pt still fits");
+    let same = at_size(&t, size);
+    assert_eq!((same.lines.len(), same.glyphs.len(), same.overflow), (l.lines.len(), l.glyphs.len(), false));
+    // Deterministic.
+    assert_eq!(layout(db(), &t).fit_scale, l.fit_scale);
+}
+
+#[test]
+fn shrink_text_respects_its_minimum() {
+    let t = area(COPY, 14.0, Rect::new(0.0, 0.0, 120.0, 40.0), shrink(90.0));
+    let l = layout(db(), &t);
+    assert!(l.overflow, "still overflows at 90 %");
+    assert!((l.fit_scale - 0.9).abs() < 1e-9, "{}", l.fit_scale);
+    // Out-of-range minimums are clamped (10 %).
+    let l = layout(db(), &area(COPY, 14.0, Rect::new(0.0, 0.0, 120.0, 40.0), shrink(0.0)));
+    assert!(l.fit_scale >= 0.1 - 1e-9, "{}", l.fit_scale);
+}
+
+#[test]
+fn shrink_text_is_a_no_op_when_the_text_fits() {
+    let t = area("Short text", 14.0, Rect::new(0.0, 0.0, 200.0, 90.0), shrink(50.0));
+    let l = layout(db(), &t);
+    let plain = at_size(&t, 14.0);
+    assert!(!l.overflow);
+    assert_eq!(l.fit_scale, 1.0);
+    let o = |l: &TextLayout| l.glyphs.iter().map(|g| g.origin).collect::<Vec<_>>();
+    assert_eq!(o(&l), o(&plain));
+}
+
+#[test]
+fn shrink_text_fills_columns() {
+    let mut t = area(COPY, 14.0, Rect::new(0.0, 0.0, 300.0, 70.0), shrink(20.0));
+    t.area.columns = 2;
+    t.area.gutter = 12.0;
+    let l = layout(db(), &t);
+    assert!(!l.overflow);
+    assert!(l.fit_scale < 1.0);
+    assert_eq!(l.frames.len(), 2);
+    let second = l.frames[1];
+    assert!(l.glyphs.iter().any(|g| g.origin.x >= second.x0), "text flows into the second column");
+    let size = 14.0 * l.fit_scale;
+    assert!(at_size(&t, size + 0.1).overflow, "maximal across columns too");
+}
+
+#[test]
+fn shrink_text_scales_leading_and_baseline_shift_not_paragraph_spacing() {
+    let mut t = area(&COPY.repeat(2), 12.0, Rect::new(0.0, 0.0, 200.0, 200.0), shrink(10.0));
+    for r in &mut t.runs {
+        r.style.leading = Some(20.0);
+    }
+    let l = layout(db(), &t);
+    assert!(!l.overflow && l.fit_scale < 1.0);
+    let gap = l.lines[2].baseline - l.lines[1].baseline;
+    assert!((gap - 20.0 * l.fit_scale).abs() < 1e-6, "{gap} vs {}", 20.0 * l.fit_scale);
+}
+
+#[test]
+fn point_type_and_type_on_a_path_ignore_fit() {
+    let mut t = TextObject::point(Point::ZERO, COPY, CharStyle::default());
+    t.area.fit = shrink(10.0);
+    assert_eq!(layout(db(), &t).fit_scale, 1.0);
+    t.kind = TextKind::OnPath { path: PathData::from_bezpath(&kurbo::Line::new((0.0, 0.0), (50.0, 0.0)).to_path(0.1)), start: 0.0, end: None };
+    let l = layout(db(), &t);
+    assert!(l.overflow, "text runs past the path end");
+    assert_eq!(l.fit_scale, 1.0);
+}
+
+#[test]
+fn shrink_text_guards_degenerate_sizes() {
+    for size in [0.0, 0.01, f64::NAN, 1296.0] {
+        let l = layout(db(), &area(COPY, size, Rect::new(0.0, 0.0, 50.0, 20.0), shrink(10.0)));
+        assert!(l.fit_scale.is_finite() && l.fit_scale > 0.0 && l.fit_scale <= 1.0, "{size}: {}", l.fit_scale);
+    }
+    // A zero-height frame.
+    let l = layout(db(), &area(COPY, 12.0, Rect::new(0.0, 0.0, 50.0, 0.0), shrink(10.0)));
+    assert!(l.overflow);
+}
+
+#[test]
+fn shrink_text_follows_top_to_top_leading_and_character_alignment() {
+    use vectorcraft_doc::{CharAlign, LeadingModel, TextRun};
+    // Mixed sizes aligned on the em box centre, leading measured from em box top to top.
+    let mut t = area(COPY, 14.0, Rect::new(0.0, 0.0, 200.0, 90.0), shrink(20.0));
+    t.para.leading_model = LeadingModel::EmBoxTop;
+    let big = CharStyle { size: 28.0, leading: Some(32.0), char_align: CharAlign::EmBoxCenter, ..CharStyle::default() };
+    t.runs.insert(0, TextRun { text: "Big ".into(), style: big });
+    for r in &mut t.runs {
+        r.style.char_align = CharAlign::EmBoxCenter;
+    }
+    let l = layout(db(), &t);
+    assert!(!l.overflow, "shrunk to fit under the top-to-top model");
+    assert!(l.fit_scale < 1.0);
+    // The shrunk layout is the same text laid out at the scaled sizes and leading.
+    let mut manual = t.clone();
+    manual.area.fit = AreaFit::None;
+    for r in &mut manual.runs {
+        r.style.size *= l.fit_scale;
+        r.style.leading = r.style.leading.map(|v| v * l.fit_scale);
+    }
+    let m = layout(db(), &manual);
+    let o = |l: &TextLayout| l.glyphs.iter().map(|g| (g.origin.x, g.origin.y)).collect::<Vec<_>>();
+    assert_eq!(o(&l), o(&m));
+    // First line still touches the frame top (top-to-top: em box top at y = 0, scaled).
+    let first = l.lines.first().map(|li| li.baseline).unwrap_or(0.0);
+    assert!(first > 0.0 && first <= 28.0 * l.fit_scale + 1e-6, "{first}");
+    // Maximal: the next 0.1 pt step of the first run overflows.
+    let step = 0.1 / 28.0;
+    let mut bigger = manual.clone();
+    for (r, orig) in bigger.runs.iter_mut().zip(&t.runs) {
+        r.style.size = orig.style.size * (l.fit_scale + step);
+        r.style.leading = orig.style.leading.map(|v| v * (l.fit_scale + step));
+    }
+    assert!(layout(db(), &bigger).overflow);
+}
@@ -237,3 +237,29 @@ fn the_database_tells_when_fonts_were_installed_or_removed_since_its_scan() {
    assert_eq!(db.load_system_fonts(), 2);
    assert_eq!(db.styles(FAMILY), ["Bold"]);
 }
+
+/// A font a font service loads from a file without an extension, outside the font folders.
+fn service_font() -> PathBuf {
+    std::env::temp_dir().join(format!("vc-sysfonts-{}-service", std::process::id())).join(".29457")
+}
+
+/// The fonts a font service (Adobe Fonts on Windows, through DirectWrite) loads in place are
+/// cataloged: named by the platform's lister, read whatever their file is called (#579).
+#[test]
+fn fonts_the_platform_lists_outside_the_font_folders_are_cataloged() {
+    let file = service_font();
+    std::fs::create_dir_all(file.parent().unwrap()).unwrap();
+    std::fs::write(&file, renamed_to("SourceSans3-Regular.ttf", "Service Sans3")).unwrap();
+    // The lister's files outside the font folders are scanned with them, each once (a collection
+    // lists its file once per face).
+    fn lister() -> Vec<String> {
+        vec![service_font().to_string_lossy().into_owned(); 2]
+    }
+    set_platform_font_files(lister);
+    let dirs = system_font_dirs();
+    assert_eq!(dirs.iter().filter(|d| **d == file).count(), 1, "{dirs:?}");
+    // A file named by itself is read without a font's extension, one in a folder isn't.
+    let db = FontDb::with_font_dirs(vec![file.clone()]);
+    assert_eq!(db.styles("Service Sans3"), ["Regular"]);
+    assert!(!FontDb::with_font_dirs(vec![file.parent().unwrap().to_path_buf()]).has_family("Service Sans3"));
+}
@@ -227,7 +227,7 @@ fn composer_lines_never_exceed_frame() {
    for (hy, composer) in [(false, Composer::EveryLine), (true, Composer::EveryLine), (false, Composer::SingleLine), (true, Composer::SingleLine)] {
        let mut t = area(&COPY.repeat(2), style(12.0), Rect::new(0.0, 0.0, 180.0, 2000.0), Justify::JustifyLeft);
        t.para.hyphenate = hy;
-        let l = layout_with(db(), &t, &LayoutOptions { composer, ..Default::default() });
+        let l = layout_with(db(), &t, &LayoutOptions { composer: Some(composer), ..Default::default() });
        assert!(l.lines.len() > 10);
        for (i, li) in l.lines.iter().enumerate() {
            assert!(li.x1 - li.x0 <= 180.0 + 1e-6, "{composer:?} hy={hy} line {i} too wide: {li:?}");
@@ -246,7 +246,7 @@ fn composer_lines_never_exceed_frame() {
 fn every_line_composer_is_more_even() {
    let t = area(&COPY.repeat(2), style(12.0), Rect::new(0.0, 0.0, 190.0, 2000.0), Justify::JustifyLeft);
    let spread = |c: Composer| {
-        let l = layout_with(db(), &t, &LayoutOptions { composer: c, ..Default::default() });
+        let l = layout_with(db(), &t, &LayoutOptions { composer: Some(c), ..Default::default() });
        // Worst word-space stretch (space glyph advance) over all justified lines.
        let mut worst: f64 = 0.0;
        for li in &l.lines[..l.lines.len() - 1] {
@@ -269,7 +269,7 @@ fn burasagari_keeps_the_every_line_composer_for_latin_text() {
    // A measure where the two composers break the copy differently.
    let mut t = area(&COPY.repeat(2), style(12.0), Rect::new(0.0, 0.0, 300.0, 4000.0), Justify::JustifyLeft);
    let ends = |t: &TextObject, c: Composer| {
-        let l = layout_with(db(), t, &LayoutOptions { composer: c, ..Default::default() });
+        let l = layout_with(db(), t, &LayoutOptions { composer: Some(c), ..Default::default() });
        l.lines.iter().map(|li| li.glyph_end).collect::<Vec<_>>()
    };
    let every_line = ends(&t, Composer::EveryLine);
@@ -278,6 +278,102 @@ fn burasagari_keeps_the_every_line_composer_for_latin_text() {
    assert_eq!(ends(&t, Composer::EveryLine), every_line);
 }

+/// Width of `s` set on one line.
+fn natural_width(s: &str, size: f64) -> f64 {
+    let l = layout(db(), &TextObject::point(Point::ZERO, s, style(size)));
+    l.lines[0].x1 - l.lines[0].x0
+}
+
+/// The text of each line.
+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()
+}
+
+/// Ragged text: Every-line breaks before a word that would fit, to avoid leaving a lone short
+/// word on the last line (single-line keeps filling the first line). Auto alignment is ragged
+/// too, in either paragraph direction: set right to left, the lines break the same and stay
+/// flush right.
+#[test]
+fn every_line_composer_balances_ragged_lines() {
+    use vectorcraft_doc::ParaDirection;
+    const S: &str = "Destroy all creatures with toughness X or less.";
+    let w = natural_width("Destroy all creatures with toughness X or", 12.0) + 2.0;
+    assert!(w < natural_width(S, 12.0), "the sentence needs two lines");
+    let cases = [
+        (Justify::Left, None),
+        (Justify::Center, None),
+        (Justify::Right, None),
+        (Justify::Auto, None),
+        (Justify::Auto, Some(ParaDirection::RightToLeft)),
+        (Justify::Left, Some(ParaDirection::RightToLeft)),
+    ];
+    for (justify, direction) in cases {
+        let mut t = area(S, style(12.0), Rect::new(0.0, 0.0, w, 400.0), justify);
+        t.para.direction = direction;
+        t.para.composer = Composer::SingleLine;
+        let greedy = line_texts(&t, &layout(db(), &t));
+        assert_eq!(greedy, ["Destroy all creatures with toughness X or", "less."], "{justify:?} {direction:?}");
+        t.para.composer = Composer::EveryLine;
+        let every = line_texts(&t, &layout(db(), &t));
+        assert_eq!(every, ["Destroy all creatures with toughness X", "or less."], "{justify:?} {direction:?}");
+        // Burasagari (new type's Standard) leaves Latin text to the every-line composer.
+        t.para.burasagari = vectorcraft_doc::Burasagari::Standard;
+        assert_eq!(line_texts(&t, &layout(db(), &t)), every, "{justify:?} {direction:?} with burasagari");
+        if (justify, direction) == (Justify::Auto, Some(ParaDirection::RightToLeft)) {
+            let l = layout(db(), &t);
+            assert!(l.lines.iter().all(|li| li.rtl && (li.x1 - w).abs() < 1e-6), "right to left Auto is flush right: {:?}", l.lines);
+        }
+        // The options override wins over the object's setting.
+        let forced = layout_with(db(), &t, &LayoutOptions { composer: Some(Composer::SingleLine), ..Default::default() });
+        assert_eq!(line_texts(&t, &forced), greedy);
+    }
+}
+
+/// Every-line evens the rag of a long ragged paragraph: the spread of the line ends is no worse
+/// than greedy breaking, every line fits, and nothing is lost.
+#[test]
+fn every_line_composer_evens_the_rag() {
+    for (width, hy) in [(150.0, false), (190.0, false), (240.0, true), (310.0, false)] {
+        let mut t = area(&COPY.repeat(2), style(12.0), Rect::new(0.0, 0.0, width, 4000.0), Justify::Left);
+        t.para.hyphenate = hy;
+        let rag = |c: Composer| {
+            let mut t = t.clone();
+            t.para.composer = c;
+            let l = layout(db(), &t);
+            assert!(!l.overflow);
+            for li in &l.lines {
+                assert!(li.x1 - li.x0 <= width + 1e-6, "{c:?} {width}: line too wide {li:?}");
+            }
+            let clusters: std::collections::BTreeSet<(usize, usize)> = l.glyphs.iter().filter(|g| g.len > 0).map(|g| (g.byte, g.len)).collect();
+            assert_eq!(clusters.iter().map(|c| c.1).sum::<usize>(), COPY.len() * 2, "every character placed");
+            // Leftover space of all lines but the last: its sum of squares (how ragged) and the
+            // sum of squared differences between neighbours (how jagged).
+            let slack: Vec<f64> = l.lines[..l.lines.len() - 1].iter().map(|li| width - (li.x1 - li.x0)).collect();
+            let jag: f64 = slack.windows(2).map(|p| (p[0] - p[1]).powi(2)).sum();
+            (slack.iter().map(|s| s * s).sum::<f64>(), jag, l.lines.len())
+        };
+        let ((kp, kp_jag, kp_lines), (greedy, greedy_jag, greedy_lines)) = (rag(Composer::EveryLine), rag(Composer::SingleLine));
+        assert!(kp <= greedy + 1e-6, "{width}: every-line rag {kp} vs greedy {greedy}");
+        assert!(kp_jag <= greedy_jag + 1e-6, "{width}: every-line jag {kp_jag} vs greedy {greedy_jag}");
+        assert!(kp_lines <= greedy_lines + 1, "{width}: {kp_lines} lines vs {greedy_lines}");
+    }
+}
+
+/// Single-line breaking is the greedy breaker: each line takes as many words as fit.
+#[test]
+fn single_line_composer_is_greedy() {
+    let width = 190.0;
+    let mut t = area(COPY, style(12.0), Rect::new(0.0, 0.0, width, 2000.0), Justify::Left);
+    t.para.composer = Composer::SingleLine;
+    let l = layout(db(), &t);
+    let lines = line_texts(&t, &l);
+    for pair in lines.windows(2) {
+        let next_word = pair[1].split(' ').next().unwrap();
+        assert!(natural_width(&format!("{} {next_word}", pair[0]), 12.0) > width - 1e-6, "{pair:?}");
+    }
+}
+
 #[test]
 fn hyphenation_rules() {
    assert_eq!(hyphen::hyphenate_word("typography"), "typo-gra-phy");
@@ -361,6 +457,201 @@ fn rows_and_columns_flow_in_order() {
    }
 }

+// ---------- vertical alignment ----------
+
+fn valign(a: VerticalAlign) -> LayoutOptions {
+    LayoutOptions { vertical_align: a, ..Default::default() }
+}
+
+/// (space above the first line's ascent, space below the last line's descent) in `0..h`.
+fn block_space(l: &TextLayout, h: f64) -> (f64, f64) {
+    let (first, last) = (l.lines.first().unwrap(), l.lines.last().unwrap());
+    (first.baseline - first.ascent, h - (last.baseline + last.descent))
+}
+
+#[test]
+fn vertical_align_center_bottom_and_justify_in_a_rectangle() {
+    let t = area("First line\nSecond line\nThird line", style(12.0), Rect::new(0.0, 0.0, 200.0, 300.0), Justify::Left);
+    let top = layout(db(), &t);
+    let (above, below) = block_space(&top, 300.0);
+    assert!(above.abs() < 1e-6 && below > 200.0);
+    let center = layout_with(db(), &t, &valign(VerticalAlign::Center));
+    let (a, b) = block_space(&center, 300.0);
+    assert!((a - b).abs() < 1e-6 && a > 100.0, "{a} {b}");
+    // The model field reaches layout().
+    let mut tc = t.clone();
+    tc.area.vertical_align = VerticalAlign::Center;
+    assert!((layout(db(), &tc).lines[0].baseline - center.lines[0].baseline).abs() < 1e-9);
+    // Lines, glyph origins, outlines and transforms move together.
+    let d = center.lines[0].baseline - top.lines[0].baseline;
+    for (g, h) in center.glyphs.iter().zip(&top.glyphs) {
+        assert!((g.origin.y - h.origin.y - d).abs() < 1e-9);
+        assert!((g.xf.translation().y - h.xf.translation().y - d).abs() < 1e-9);
+        if !h.outline.elements().is_empty() {
+            assert!((g.outline.bounding_box().y0 - h.outline.bounding_box().y0 - d).abs() < 1e-6);
+        }
+    }
+    assert!(center.bounds.y0 > top.bounds.y0 + 100.0);
+    let bottom = layout_with(db(), &t, &valign(VerticalAlign::Bottom));
+    let (a, b) = block_space(&bottom, 300.0);
+    assert!(b.abs() < 1e-6 && a > 200.0);
+    // Justify: the first line stays, the last one reaches the bottom, gaps are equal.
+    let just = layout_with(db(), &t, &valign(VerticalAlign::Justify));
+    let (a, b) = block_space(&just, 300.0);
+    assert!(a.abs() < 1e-6 && b.abs() < 1e-6, "{a} {b}");
+    let gaps: Vec<f64> = just.lines.windows(2).map(|w| w[1].baseline - w[0].baseline).collect();
+    assert!(gaps.len() == 2 && (gaps[0] - gaps[1]).abs() < 1e-6 && gaps[0] > 100.0);
+    // A single line justifies to the top.
+    let one = area("Alone", style(12.0), Rect::new(0.0, 0.0, 200.0, 300.0), Justify::Left);
+    assert_eq!(layout_with(db(), &one, &valign(VerticalAlign::Justify)).lines[0].baseline, layout(db(), &one).lines[0].baseline);
+    // Inset: the space is measured inside it.
+    let inset = layout_with(db(), &t, &LayoutOptions { inset: 10.0, vertical_align: VerticalAlign::Bottom, ..Default::default() });
+    assert!(block_space(&inset, 290.0).1.abs() < 1e-6);
+}
+
+#[test]
+fn vertical_align_leaves_overflowing_text_where_it_is() {
+    let text = COPY.repeat(4);
+    let t = area(&text, style(12.0), Rect::new(0.0, 0.0, 200.0, 100.0), Justify::Left);
+    let top = layout(db(), &t);
+    assert!(top.overflow);
+    for a in [VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify] {
+        let l = layout_with(db(), &t, &valign(a));
+        assert!(l.overflow);
+        assert_eq!(l.lines.len(), top.lines.len());
+        assert_eq!(l.lines.last().unwrap().end, top.lines.last().unwrap().end);
+        // A full cell has less than a line of space left: the lines barely move.
+        assert!(l.lines[0].baseline - top.lines[0].baseline < top.lines[0].ascent + top.lines[0].descent);
+        assert!(block_space(&l, 100.0).1 >= -1e-6);
+    }
+}
+
+#[test]
+fn vertical_align_acts_on_each_column_on_its_own() {
+    // Enough text for column 1 and a few lines of column 2.
+    let t = area(COPY, style(12.0), Rect::new(0.0, 0.0, 420.0, 120.0), Justify::Left);
+    let opts = |a| LayoutOptions { columns: 2, gutter: 20.0, vertical_align: a, ..Default::default() };
+    let top = layout_with(db(), &t, &opts(VerticalAlign::Top));
+    let col = |l: &TextLayout, c: usize| l.lines.iter().filter(|li| li.region == c).cloned().collect::<Vec<_>>();
+    assert!(!top.overflow && !col(&top, 0).is_empty() && !col(&top, 1).is_empty());
+    assert!(col(&top, 1).iter().all(|li| li.x0 >= 220.0 - 1e-6));
+    let bottom = layout_with(db(), &t, &opts(VerticalAlign::Bottom));
+    for c in 0..2 {
+        let last = col(&bottom, c).last().cloned().unwrap();
+        assert!((last.baseline + last.descent - 120.0).abs() < 1e-6, "column {c} ends at the bottom");
+    }
+    let shift = |c: usize| col(&bottom, c)[0].baseline - col(&top, c)[0].baseline;
+    assert!(shift(1) > shift(0) + 20.0, "the short column moves further: {} {}", shift(0), shift(1));
+}
+
+#[test]
+fn vertical_align_in_a_circle_reflows_and_stays_inside() {
+    let circle = Circle::new((150.0, 150.0), 120.0).to_path(0.1);
+    let t = area_path("Centred text in a round frame flows again at its new height.", style(12.0), &circle, Justify::Left);
+    let top = layout(db(), &t);
+    for a in [VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify] {
+        let l = layout_with(db(), &t, &valign(a));
+        assert!(!l.overflow, "{a:?}");
+        assert_eq!(l.lines.last().unwrap().end, top.lines.last().unwrap().end);
+        let moved = if a == VerticalAlign::Justify {
+            l.lines.last().unwrap().baseline - top.lines.last().unwrap().baseline
+        } else {
+            l.lines[0].baseline - top.lines[0].baseline
+        };
+        assert!(moved > 20.0, "{a:?} {moved}");
+        for g in l.glyphs.iter().filter(|g| !g.outline.elements().is_empty()) {
+            let b = g.outline.bounding_box();
+            for p in [Point::new(b.x0, b.y0), Point::new(b.x1, b.y1)] {
+                assert!((p - Point::new(150.0, 150.0)).hypot() <= 121.0, "{a:?} {p:?}");
+            }
+        }
+    }
+    let c = layout_with(db(), &t, &valign(VerticalAlign::Center));
+    let (above, below) = block_space(&c, 270.0);
+    assert!((above - 30.0 - below).abs() < 10.0, "roughly centred: {above} {below}");
+}
+
+#[test]
+fn vertical_align_with_text_wrap_flows_again_around_the_object() {
+    let mut t = area(COPY, style(12.0), Rect::new(0.0, 0.0, 300.0, 400.0), Justify::Left);
+    let obstacle = Rect::new(100.0, 250.0, 200.0, 330.0).to_path(0.1);
+    t.wrap = vec![vectorcraft_doc::WrapShape { path: PathData::from_bezpath(&obstacle), wrap: Default::default() }];
+    let top = layout(db(), &t);
+    let bottom = layout_with(db(), &t, &valign(VerticalAlign::Bottom));
+    assert!(!bottom.overflow);
+    assert_eq!(bottom.lines.last().unwrap().end, top.lines.last().unwrap().end);
+    let last = bottom.lines.last().unwrap();
+    assert!(400.0 - (last.baseline + last.descent) < 15.0, "near the bottom: {}", last.baseline);
+    // Lines beside the object leave room for it (offset 6 pt).
+    for li in bottom.lines.iter().filter(|li| li.baseline + li.descent > 244.0 && li.baseline - li.ascent < 336.0) {
+        assert!(li.x1 <= 94.0 + 1e-6 || li.x0 >= 206.0 - 1e-6, "{li:?}");
+    }
+}
+
+#[test]
+fn vertical_align_on_vertical_type_moves_columns_along_the_block_axis() {
+    // Vertical type: the block axis runs right to left, so "bottom" is the frame's left edge.
+    let mut t = area("Tate\nYoko", style(20.0), Rect::new(0.0, 0.0, 200.0, 100.0), Justify::Left);
+    t.vertical = true;
+    let top = layout(db(), &t);
+    let bottom = layout_with(db(), &t, &valign(VerticalAlign::Bottom));
+    let center = layout_with(db(), &t, &valign(VerticalAlign::Center));
+    assert!(top.bounds.x1 > 190.0 && top.bounds.x0 > 100.0, "{:?}", top.bounds);
+    assert!(bottom.bounds.x0.abs() < 0.5, "{:?}", bottom.bounds);
+    assert!((center.bounds.x0 - (200.0 - center.bounds.x1)).abs() < 0.5, "{:?}", center.bounds);
+    // Glyphs stay inside the frame; lines keep line-space coordinates.
+    for g in &bottom.glyphs {
+        assert!(g.origin.x >= -1e-6 && g.origin.x <= 200.0 + 1e-6);
+    }
+}
+
+/// Top-to-Top leading (em box top to em box top): the first line hangs from the frame's top and a
+/// line's leading is the space below it. Vertical alignment measures the space from the lines that
+/// model placed, keeps their spacing when it shifts them, and justify adds its share on top of it.
+#[test]
+fn vertical_align_with_top_to_top_leading() {
+    use vectorcraft_doc::LeadingModel;
+    let st = |size: f64| CharStyle { size, leading: Some(size * 1.5), ..style(size) };
+    let mut t = area("", st(40.0), Rect::new(0.0, 0.0, 200.0, 300.0), Justify::Left);
+    t.runs = vec![TextRun { text: "大\n".into(), style: st(40.0) }, TextRun { text: "小\n中".into(), style: st(20.0) }];
+    t.para.leading_model = LeadingModel::EmBoxTop;
+    let top = layout(db(), &t);
+    assert_eq!(top.lines.len(), 3);
+    // The em box top sits 0.88 em above the baseline in the craft-fonts CJK faces; a system
+    // fallback (no craft-fonts) has its own metrics, which the relative checks below don't need.
+    if !crate::CRAFT_FONTS.is_empty() {
+        assert!((top.lines[0].baseline - 0.88 * 40.0).abs() < 0.01, "first em box at the top: {}", top.lines[0].baseline);
+    }
+    let gaps = |l: &TextLayout| l.lines.windows(2).map(|w| w[1].baseline - w[0].baseline).collect::<Vec<_>>();
+    let bottom = layout_with(db(), &t, &valign(VerticalAlign::Bottom));
+    assert!(block_space(&bottom, 300.0).1.abs() < 1e-6, "{:?}", block_space(&bottom, 300.0));
+    for (a, b) in gaps(&bottom).iter().zip(gaps(&top)) {
+        assert!((a - b).abs() < 1e-6, "spacing kept: {a} {b}");
+    }
+    let center = layout_with(db(), &t, &valign(VerticalAlign::Center));
+    let d = center.lines[0].baseline - top.lines[0].baseline;
+    assert!((d - block_space(&top, 300.0).1 * 0.5).abs() < 1e-6, "{d}");
+    let just = layout_with(db(), &t, &valign(VerticalAlign::Justify));
+    assert!((just.lines[0].baseline - top.lines[0].baseline).abs() < 1e-9, "the first line stays");
+    assert!(block_space(&just, 300.0).1.abs() < 1e-6);
+    let extra: Vec<f64> = gaps(&just).iter().zip(gaps(&top)).map(|(a, b)| a - b).collect();
+    assert!(extra.len() == 2 && (extra[0] - extra[1]).abs() < 1e-6 && extra[0] > 50.0, "{extra:?}");
+    // A round frame reflows with Top-to-Top leading too, without losing text.
+    let circle = Circle::new((150.0, 150.0), 120.0).to_path(0.1);
+    let mut round = area_path("", st(20.0), &circle, Justify::Left);
+    round.runs = t.runs.clone();
+    round.para.leading_model = LeadingModel::EmBoxTop;
+    let rtop = layout(db(), &round);
+    for a in [VerticalAlign::Center, VerticalAlign::Bottom, VerticalAlign::Justify] {
+        let l = layout_with(db(), &round, &valign(a));
+        assert!(!l.overflow, "{a:?}");
+        assert_eq!(l.lines.last().unwrap().end, rtop.lines.last().unwrap().end);
+        // The 40 pt line starts low in the circle already, so centring moves it a little.
+        let want = if a == VerticalAlign::Center { 1.0 } else { 20.0 };
+        assert!(l.lines.last().unwrap().baseline > rtop.lines.last().unwrap().baseline + want, "{a:?}");
+    }
+}
+
 // ---------- OpenType ----------

 #[test]
@@ -419,17 +710,22 @@ fn uncovered_characters_do_not_break_layout() {
 #[test]
 fn layout_10k_area_text_is_fast() {
    let text: String = COPY.chars().cycle().take(10_000).collect();
-    let mut t = area(&text, style(10.0), Rect::new(0.0, 0.0, 400.0, 20_000.0), Justify::JustifyLeft);
-    t.para.hyphenate = true;
-    let _ = layout(db(), &t);
-    let n = 5;
-    let start = std::time::Instant::now();
-    for _ in 0..n {
-        let l = layout(db(), &t);
-        assert!(!l.overflow);
+    for (justify, composer) in
+        [(Justify::JustifyLeft, Composer::EveryLine), (Justify::Left, Composer::EveryLine), (Justify::Left, Composer::SingleLine)]
+    {
+        let mut t = area(&text, style(10.0), Rect::new(0.0, 0.0, 400.0, 20_000.0), justify);
+        t.para.hyphenate = true;
+        t.para.composer = composer;
+        let _ = layout(db(), &t);
+        let n = 5;
+        let start = std::time::Instant::now();
+        for _ in 0..n {
+            let l = layout(db(), &t);
+            assert!(!l.overflow);
+        }
+        let per = start.elapsed().as_secs_f64() * 1000.0 / n as f64;
+        eprintln!("layout of 10k chars ({justify:?}, {composer:?}, hyphenated): {per:.3} ms");
+        let budget = if cfg!(debug_assertions) { 400.0 } else { 10.0 };
+        assert!(per < budget, "{justify:?} {composer:?}: {per} ms");
    }
-    let per = start.elapsed().as_secs_f64() * 1000.0 / n as f64;
-    eprintln!("layout of 10k chars (justified, hyphenated): {per:.3} ms");
-    let budget = if cfg!(debug_assertions) { 400.0 } else { 10.0 };
-    assert!(per < budget, "{per} ms");
 }
@@ -384,6 +384,9 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
    if app.ui.task_bar && !app.session.tool_busy() && app.ui.screen_mode < 3 {
        task_bar(app, ui, &xf);
    }
+    if app.ui.screen_mode < 3 {
+        crate::free_transform::show(app, ui, xf.rect);
+    }
    // Cursor.
    if resp.hovered() {
        let m = ui.input(|i| i.modifiers);
@@ -84,6 +84,8 @@ pub fn inspect(app: &VectorcraftApp, ctx: &egui::Context) -> Value {
            "pinned": app.ui.task_bar_place.pinned,
            "rect": crate::canvas::task_bar_rect(ctx).map(|r| json!([r.left(), r.top(), r.width(), r.height()])),
        },
+        // The Free Transform tool's widget, where it shows.
+        "freeTransformWidget": crate::free_transform::rect(ctx).map(|r| json!([r.left(), r.top(), r.width(), r.height()])),
        "view": app.view().map(|v| serde_json::to_value(v).unwrap_or_default()),
        "canvasRect": app.canvas_rect.map(|c| json!([c.left(), c.top(), c.width(), c.height()])),
        "window": [r.width(), r.height()],
@@ -38,6 +38,9 @@ fn choices(command: &str, key: &str) -> Option<form::Choices> {
    match (command, key) {
        ("type.pathOptions", "effect") => Some(crate::menus::PATH_EFFECTS),
        ("type.pathOptions", "alignToPath") => Some(PATH_ALIGN),
+        ("text.areaOptions", "fit") => Some(AREA_FIT),
+        ("text.areaOptions", "firstBaseline") => Some(FIRST_BASELINE),
+        ("text.areaOptions", "verticalAlign") => Some(VERTICAL_ALIGN),
        _ => None,
    }
 }
@@ -45,6 +48,16 @@ fn choices(command: &str, key: &str) -> Option<form::Choices> {
 /// Type on a Path Options › Align to Path.
 const PATH_ALIGN: form::Choices = &[("Ascender", "ascender"), ("Descender", "descender"), ("Center", "center"), ("Baseline", "baseline")];

+/// Area Type Options › Fit.
+const AREA_FIT: form::Choices = &[("None", "none"), ("Auto Size", "autoHeight"), ("Shrink Text to Fit", "shrinkText")];
+
+/// Area Type Options › First Baseline.
+const FIRST_BASELINE: form::Choices =
+    &[("Ascent", "ascent"), ("Cap Height", "capHeight"), ("x Height", "xHeight"), ("Leading", "leading"), ("Fixed", "fixed")];
+
+/// Area Type Options › Align (vertical alignment of the lines in each row/column).
+const VERTICAL_ALIGN: form::Choices = &[("Top", "top"), ("Center", "center"), ("Bottom", "bottom"), ("Justify", "justify")];
+
 /// Closes before running, so a dialog the command opens stays open.
 fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
    let cmd = d.str("__command");
@@ -59,3 +72,43 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
    }
    app.run(&cmd, params)
 }
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+    use vectorcraft_doc::{NodeKind, VerticalAlign};
+    use vectorcraft_engine::Session;
+
+    use super::*;
+
+    #[test]
+    fn area_type_options_choices_match_the_params_doc() {
+        let doc = vectorcraft_engine::find_command("text.areaOptions").unwrap().params;
+        for key in ["firstBaseline", "verticalAlign"] {
+            let values: Vec<&str> = choices("text.areaOptions", key).unwrap().iter().map(|(_, v)| *v).collect();
+            assert!(doc.contains(&format!("{key}?: {}", values.join("|"))), "{key}: {values:?}");
+        }
+        assert!(choices("text.areaOptions", "firstBaselineMin").is_none(), "a distance, not a choice");
+        assert!(choices("text.areaOptions", "inset").is_none());
+    }
+
+    #[test]
+    fn area_type_options_dialog_sets_the_vertical_alignment() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width": 400, "height": 400})).unwrap();
+        let id = app.run("text.create", json!({"x": 20, "y": 20, "text": "Hello", "area": {"width": 200, "height": 200}})).unwrap()["id"]
+            .as_u64()
+            .unwrap();
+        app.run("select.set", json!({"ids": [id]})).unwrap();
+        crate::menus::invoke(&mut app, "text.areaOptions", json!({}));
+        assert_eq!(app.ui.dialog.as_ref().unwrap().str("verticalAlign"), "top");
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        let mut out = ctx.run_ui(egui::RawInput::default(), |ui| crate::dialogs::show(&mut app, ui.ctx()));
+        out.textures_delta.clear();
+        app.ui.dialog.as_mut().unwrap().fields.insert("verticalAlign".into(), json!("center"));
+        crate::dialogs::confirm(&mut app).unwrap();
+        let NodeKind::Text(t) = &app.session.doc().unwrap().doc.node(vectorcraft_doc::NodeId(id)).unwrap().kind else { panic!("text") };
+        assert_eq!(t.area.vertical_align, VerticalAlign::Center);
+    }
+}
@@ -424,11 +424,8 @@ fn destination(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) {
        let pick = app.services.pick_folder.is_some();
        ui.horizontal(|ui| {
            form::text(ui, d, "folder", if pick { 300.0 } else { 334.0 });
-            if pick
-                && widgets::icon_button(ui, "folder-open", tl!("Choose a folder"), false, 26.0).clicked()
-                && let Some(f) = app.services.pick_folder.as_mut().and_then(|pick| pick())
-            {
-                d.fields.insert("folder".into(), json!(f));
+            if pick && widgets::icon_button(ui, "folder-open", tl!("Choose a folder"), false, 26.0).clicked() {
+                crate::picks::folder_field(app, d, "folder");
            }
        });
        form::check(ui, d, "openLocation", tl!("Open Location after Export"));
@@ -145,10 +145,17 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
            }
        }
    }
-    if let Some(a) = act
-        && let Err(e) = run(app, d, a, &preset.name)
-    {
-        app.status(e);
+    if let Some(a) = act {
+        let r = if matches!(a, Action::Import) {
+            // Its file dialog, shown off the UI thread, imports into the dialog as it is then.
+            let current = preset.name.clone();
+            crate::picks::in_dialog(app, d, move |app, d| run(app, d, Action::Import, &current))
+        } else {
+            run(app, d, a, &preset.name)
+        };
+        if let Err(e) = r {
+            app.status(e);
+        }
    }
    false
 }
@@ -181,7 +188,7 @@ fn run(app: &mut VectorcraftApp, d: &mut Dialog, act: Action, current: &str) ->
                return Ok(());
            }
            let pick = crate::FilePick { filters: vec![("Flattener presets", PRESET_EXTS)], ..Default::default() };
-            let path = app.services.pick_open.as_mut().and_then(|f| f(&pick)).ok_or("cancelled")?;
+            let path = crate::picks::open(app, &pick).ok_or("cancelled")?;
            let r = app.run("flattener.presets.import", json!({ "path": path }))?;
            if let Some(first) = r["imported"].get(0).and_then(Value::as_str) {
                select(d, first);
@@ -122,7 +122,7 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
            p if !p.is_empty() => p,
            _ => {
                let pick = crate::FilePick { filters: vectorcraft_engine::cmd::fileio::place_filters().collect(), ..Default::default() };
-                app.services.pick_open.as_mut().and_then(|f| f(&pick)).ok_or("cancelled")?
+                crate::picks::open(app, &pick).ok_or("cancelled")?
            }
        };
        out = app.run("links.relink", json!({ "ids": current["ids"], "path": path }))?;
@@ -315,7 +315,8 @@ pub fn cancel(app: &mut VectorcraftApp) {
 /// Apply the open dialog (OK).
 pub fn confirm(app: &mut VectorcraftApp) -> DialogResult {
    let Some(d) = app.ui.dialog.clone() else { return Err("no dialog open".into()) };
-    (spec(&d.kind).confirm)(app, &d)
+    // A file dialog it shows off the UI thread confirms the dialog as it is again.
+    crate::picks::as_entry(app, || crate::picks::Entry::Confirm(Box::new(d.clone())), |app| (spec(&d.kind).confirm)(app, &d))
 }

 pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) {
@@ -70,11 +70,8 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
    if !downloads(app) {
        widgets::label_row(ui, tl!("Location:"), LABEL, |ui| {
            form::text(ui, d, "folder", 230.0);
-            if let Some(pick) = app.services.pick_folder.as_mut()
-                && ui.button(tl!("Choose…")).clicked()
-                && let Some(f) = pick()
-            {
-                d.fields.insert("folder".into(), json!(f));
+            if app.services.pick_folder.is_some() && ui.button(tl!("Choose…")).clicked() {
+                crate::picks::folder_field(app, d, "folder");
            }
        });
        ui.add_space(4.0);
@@ -102,10 +102,17 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
            details(ui, &t, preset, builtin);
        });
    });
-    if let Some(a) = act
-        && let Err(e) = run(app, d, a, &preset.name)
-    {
-        app.status(e);
+    if let Some(a) = act {
+        let r = if matches!(a, Action::Import) {
+            // Its file dialog, shown off the UI thread, imports into the dialog as it is then.
+            let current = preset.name.clone();
+            crate::picks::in_dialog(app, d, move |app, d| run(app, d, Action::Import, &current))
+        } else {
+            run(app, d, a, &preset.name)
+        };
+        if let Err(e) = r {
+            app.status(e);
+        }
    }
    false
 }
@@ -169,7 +176,7 @@ fn run(app: &mut VectorcraftApp, d: &mut Dialog, act: Action, current: &str) ->
                return Ok(());
            }
            let pick = crate::FilePick { filters: vec![("PDF presets", vectorcraft_engine::cmd::pdfcmds::PRESET_EXTS)], ..Default::default() };
-            let path = app.services.pick_open.as_mut().and_then(|f| f(&pick)).ok_or("cancelled")?;
+            let path = crate::picks::open(app, &pick).ok_or("cancelled")?;
            let r = app.run("pdf.preset.import", json!({ "path": path }))?;
            if let Some(first) = r["imported"].get(0).and_then(Value::as_str) {
                select(d, first);
@@ -150,10 +150,17 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
        });
    });
    let name = preset.name.clone();
-    if let Some(a) = act
-        && let Err(e) = run(app, d, a, &name)
-    {
-        app.status(e);
+    if let Some(a) = act {
+        let r = if matches!(a, Action::Import) {
+            // Its file dialog, shown off the UI thread, imports into the dialog as it is then.
+            let current = name.clone();
+            crate::picks::in_dialog(app, d, move |app, d| run(app, d, Action::Import, &current))
+        } else {
+            run(app, d, a, &name)
+        };
+        if let Err(e) = r {
+            app.status(e);
+        }
    }
    false
 }
@@ -187,7 +194,7 @@ pub(super) fn run(app: &mut VectorcraftApp, d: &mut Dialog, act: Action, current
                return Ok(());
            }
            let pick = crate::FilePick { filters: vec![("Perspective grid presets", PRESET_EXTS)], ..Default::default() };
-            let path = app.services.pick_open.as_mut().and_then(|f| f(&pick)).ok_or("cancelled")?;
+            let path = crate::picks::open(app, &pick).ok_or("cancelled")?;
            let r = app.run("perspective.presets.import", json!({ "path": path }))?;
            if let Some(first) = r["imported"].get(0).and_then(Value::as_str) {
                select(d, first);
@@ -111,10 +111,17 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
            }
        });
    });
-    if let Some(a) = act
-        && let Err(e) = run(app, d, a, &name)
-    {
-        app.status(e);
+    if let Some(a) = act {
+        let r = if matches!(a, Action::Import) {
+            // Its file dialog, shown off the UI thread, imports into the dialog as it is then.
+            let current = name.clone();
+            crate::picks::in_dialog(app, d, move |app, d| run(app, d, Action::Import, &current))
+        } else {
+            run(app, d, a, &name)
+        };
+        if let Err(e) = r {
+            app.status(e);
+        }
    }
    false
 }
@@ -149,7 +156,7 @@ pub(super) fn run(app: &mut VectorcraftApp, d: &mut Dialog, act: Action, current
                return Ok(());
            }
            let pick = crate::FilePick { filters: vec![("Print presets", PRESET_EXTS)], ..Default::default() };
-            let path = app.services.pick_open.as_mut().and_then(|f| f(&pick)).ok_or("cancelled")?;
+            let path = crate::picks::open(app, &pick).ok_or("cancelled")?;
            let r = app.run("print.presets.import", json!({ "path": path }))?;
            if let Some(first) = r["imported"].get(0).and_then(Value::as_str) {
                select(d, first);
@@ -455,7 +455,7 @@ fn general(ui: &mut egui::Ui, d: &mut Dialog, editor: bool) {
    flag(ui, d, "viewAfterSaving", tl!("View PDF after saving"), true);
    // PDF layers need PDF 1.5, and PDF/X-1a and PDF/X-3 have none.
    let layers = standard.allows_layers() && choice::<Compatibility>(d, "compatibility").unwrap_or_default().has_layers();
-    flag(ui, d, "createLayers", tl!("Create PDF layers from top-level layers"), layers);
+    flag(ui, d, "createLayers", tl!("Create PDF layers from layers and sublayers"), layers);
    flag(ui, d, "includeNonPrinting", tl!("Include non-printing layers"), true);
    if editor {
        heading(ui, tl!("Description"));
@@ -0,0 +1,202 @@
+//! The Free Transform widget (#598): while the Free Transform tool is active, a small floating box
+//! at the canvas's top left with Constrain (as holding Shift: proportional scaling, moves and
+//! rotations by 45°) over the tool's three modes, Free Transform, Perspective Distort and Free
+//! Distort. It sets the tool's options through `tool.setOption` (`constrain`, `mode`), as agents
+//! do; the modifier keys keep working while dragging.
+
+use egui::{Color32, CornerRadius, Pos2, Rect, Sense, Stroke, StrokeKind, Ui, pos2, vec2};
+use serde_json::{Value, json};
+
+use crate::VectorcraftApp;
+use crate::theme::Tokens;
+
+/// The tool the widget belongs to.
+const TOOL: &str = "freeTransform";
+/// A button's side.
+const BUTTON: f32 = 28.0;
+
+/// What a button shows.
+#[derive(Clone, Copy)]
+enum Glyph {
+    /// An icon of the set.
+    Icon(&'static str),
+    /// A box narrower at the top than at the bottom, its corners marked.
+    Perspective,
+    /// A box with corners pulled every which way, its corners marked.
+    Distort,
+}
+
+/// The tool's modes as its `mode` option names them, with their buttons.
+fn modes() -> [(&'static str, Glyph, &'static str); 3] {
+    [
+        ("free", Glyph::Icon("dc-free-transform"), tl!("Free Transform")),
+        ("perspective", Glyph::Perspective, tl!("Perspective Distort")),
+        ("distort", Glyph::Distort, tl!("Free Distort")),
+    ]
+}
+
+/// Where the widget was last drawn (none while it isn't shown).
+pub(crate) fn rect(ctx: &egui::Context) -> Option<Rect> {
+    let id = egui::Id::new(TOOL);
+    ctx.memory(|m| m.areas().is_visible(&egui::LayerId::new(egui::Order::Middle, id)).then(|| m.area_rect(id)).flatten())
+}
+
+/// Show the widget in `canvas` (the canvas's area inside the rulers) while the Free Transform
+/// tool is active.
+pub(crate) fn show(app: &mut VectorcraftApp, ui: &Ui, canvas: Rect) {
+    if app.session.tool_id() != TOOL {
+        return;
+    }
+    let t = Tokens::get(ui.ctx());
+    let opts = app.session.tool_options();
+    let mode = opts["mode"].as_str().unwrap_or("free").to_string();
+    let constrain = opts["constrain"].as_bool().unwrap_or(false);
+    let mut set: Option<(&str, Value)> = None;
+    egui::Area::new(egui::Id::new(TOOL)).order(egui::Order::Middle).fixed_pos(canvas.min + vec2(10.0, 10.0)).show(ui.ctx(), |ui| {
+        egui::Frame::NONE
+            .fill(t.panel)
+            .stroke(Stroke::new(1.0, t.button_border))
+            .corner_radius(CornerRadius::same(4))
+            .inner_margin(egui::Margin::same(3))
+            .shadow(egui::epaint::Shadow { offset: [0, 2], blur: 8, spread: 0, color: Color32::from_black_alpha(60) })
+            .show(ui, |ui| {
+                ui.spacing_mut().item_spacing.y = 2.0;
+                // Constrain shapes only what the Free Transform mode does.
+                if button(ui, Glyph::Icon("link"), tl!("Constrain"), constrain, mode == "free") {
+                    set = Some(("constrain", json!(!constrain)));
+                }
+                let (line, _) = ui.allocate_exact_size(vec2(BUTTON, 3.0), Sense::hover());
+                ui.painter().hline(line.x_range().shrink(4.0), line.center().y, Stroke::new(1.0, t.button_border));
+                for (name, glyph, tip) in modes() {
+                    if button(ui, glyph, tip, mode == name, true) && mode != name {
+                        set = Some(("mode", json!(name)));
+                    }
+                }
+            });
+    });
+    if let Some((key, value)) = set
+        && let Err(e) = app.run("tool.setOption", json!({ "key": key, "value": value }))
+    {
+        app.status(e);
+    }
+}
+
+/// A square button showing `glyph`, highlighted when `on`, greyed and inert unless `enabled`.
+/// Returns whether it was clicked.
+fn button(ui: &mut Ui, glyph: Glyph, tip: &str, on: bool, enabled: bool) -> bool {
+    let t = Tokens::get(ui.ctx());
+    let (rect, resp) = ui.allocate_exact_size(vec2(BUTTON, BUTTON), if enabled { Sense::click() } else { Sense::hover() });
+    let bg = if on && enabled {
+        t.tool_active
+    } else if enabled && resp.hovered() {
+        t.hover
+    } else {
+        Color32::TRANSPARENT
+    };
+    ui.painter().rect_filled(rect, CornerRadius::same(3), bg);
+    let color = match (enabled, on) {
+        (false, _) => t.text_dim,
+        (true, true) => t.text,
+        (true, false) => t.icon,
+    };
+    paint(ui, glyph, rect.shrink(6.0), color);
+    resp.on_hover_text(tip).clicked() && enabled
+}
+
+/// Draw `glyph` in `r`.
+fn paint(ui: &Ui, glyph: Glyph, r: Rect, color: Color32) {
+    let at = |x: f32, y: f32| pos2(r.left() + x * r.width(), r.top() + y * r.height());
+    let quad: [Pos2; 4] = match glyph {
+        Glyph::Icon(name) => return crate::icons::paint(ui, name, r, color),
+        Glyph::Perspective => [at(0.3, 0.12), at(0.7, 0.12), at(0.95, 0.88), at(0.05, 0.88)],
+        Glyph::Distort => [at(0.08, 0.2), at(0.78, 0.06), at(0.94, 0.9), at(0.2, 0.76)],
+    };
+    let (p, fill) = (ui.painter(), Tokens::get(ui.ctx()).panel);
+    p.add(egui::Shape::closed_line(quad.to_vec(), Stroke::new(1.3, color)));
+    for c in quad {
+        let mark = Rect::from_center_size(c, vec2(3.5, 3.5));
+        p.rect_filled(mark, 0.0, fill);
+        p.rect_stroke(mark, 0.0, Stroke::new(1.0, color), StrokeKind::Middle);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+    use vectorcraft_engine::Session;
+    use vectorcraft_geom::Point;
+
+    use super::*;
+    use crate::canvas::Xf;
+
+    fn frame(app: &mut VectorcraftApp, ctx: &egui::Context, events: Vec<egui::Event>) {
+        let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(800.0, 600.0))), events, ..Default::default() };
+        ctx.run_ui(raw, |ui| crate::canvas::show(app, ui)).textures_delta.clear();
+    }
+
+    /// A press and release at `at`, then a frame to settle.
+    fn click(app: &mut VectorcraftApp, ctx: &egui::Context, at: Pos2) {
+        let button = |pressed| egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        frame(app, ctx, vec![egui::Event::PointerMoved(at), button(true)]);
+        frame(app, ctx, vec![button(false)]);
+        frame(app, ctx, vec![]);
+    }
+
+    fn options(app: &VectorcraftApp) -> (String, bool) {
+        let o = app.session.tool_options();
+        (o["mode"].as_str().unwrap_or_default().to_string(), o["constrain"].as_bool().unwrap_or_default())
+    }
+
+    /// The widget shows with the Free Transform tool only; its buttons set the mode and Constrain
+    /// (inert in the distort modes); a corner dragged in Free Distort moves that corner alone.
+    #[test]
+    fn the_widget_sets_the_mode_and_a_corner_drag_then_distorts() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.session.execute("file.new", &json!({"width": 400, "height": 300})).unwrap();
+        let id = app.session.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 100, "height": 60})).unwrap()["id"].clone();
+        app.session.execute("select.set", &json!({"ids": [id]})).unwrap();
+        let ctx = egui::Context::default();
+        app.select_tool("selection");
+        frame(&mut app, &ctx, vec![]);
+        assert!(rect(&ctx).is_none(), "not with the Selection tool");
+        app.select_tool(TOOL);
+        frame(&mut app, &ctx, vec![]);
+        frame(&mut app, &ctx, vec![]);
+        let w = rect(&ctx).expect("the widget shows");
+        let canvas = app.canvas_rect.unwrap();
+        assert!(canvas.contains(w.min) && w.left() - canvas.left() < 20.0 && w.top() - canvas.top() < 20.0, "{w:?} in {canvas:?}");
+        // Constrain, a rule, then Free Transform, Perspective Distort and Free Distort.
+        let at = |i: usize| {
+            let rule = if i > 0 { 3.0 + 2.0 } else { 0.0 };
+            pos2(w.center().x, w.top() + 4.0 + BUTTON / 2.0 + i as f32 * (BUTTON + 2.0) + rule)
+        };
+        assert_eq!(options(&app), ("free".into(), false));
+        click(&mut app, &ctx, at(0));
+        assert_eq!(options(&app), ("free".into(), true), "Constrain on");
+        click(&mut app, &ctx, at(3));
+        assert_eq!(options(&app), ("distort".into(), true));
+        click(&mut app, &ctx, at(0));
+        assert_eq!(options(&app), ("distort".into(), true), "Constrain is inert in Free Distort");
+        click(&mut app, &ctx, at(2));
+        assert_eq!(options(&app).0, "perspective");
+        click(&mut app, &ctx, at(3));
+        // Free Distort: the top-left corner dragged alone.
+        let xf = Xf::new(canvas, app.view().unwrap());
+        let (from, to) = (xf.to_screen(Point::new(100.0, 100.0)), xf.to_screen(Point::new(80.0, 90.0)));
+        let button = |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() };
+        frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from), button(from, true)]);
+        frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from + (to - from) / 2.0)]);
+        frame(&mut app, &ctx, vec![egui::Event::PointerMoved(to)]);
+        frame(&mut app, &ctx, vec![button(to, false)]);
+        frame(&mut app, &ctx, vec![]);
+        let st = app.session.active().unwrap();
+        let node = st.doc.node(vectorcraft_doc::NodeId(id.as_u64().unwrap())).unwrap();
+        let pts: Vec<Point> = node.path_data().unwrap().anchors().map(|(.., a)| a.p).collect();
+        let near = |q: Point| pts.iter().any(|p| p.distance(q) < 0.5);
+        assert!(
+            near(Point::new(80.0, 90.0)) && near(Point::new(200.0, 100.0)) && near(Point::new(200.0, 160.0)) && near(Point::new(100.0, 160.0)),
+            "{pts:?}"
+        );
+        assert_eq!(app.session.tool_id(), TOOL);
+    }
+}
@@ -634,3 +634,7 @@
 	Clipboard Handling	Práce se schránkou
 	Appearance of Black	Vzhled černé
 	Devices	Zařízení
+	A file dialog is open: choose there first	Je otevřené dialogové okno souboru: nejprve vyberte v něm
+	Constrain	Omezit
+	Free Transform	Volná transformace
+	Perspective Distort	Perspektivní deformace
@@ -508,7 +508,7 @@
 	Create Object Mosaic…	Crear mosaico de objetos…
 	Create Outlines	Crear contornos
 	Create Path	Crear trazado
-	Create PDF layers from top-level layers	Crear capas PDF a partir de las capas de nivel superior
+	Create PDF layers from layers and sublayers	Crear capas PDF a partir de las capas y subcapas
 	Create PDF-Compatible File	Crear archivo compatible con PDF
 	Create Report	Crear informe
 	Create Slice	Crear sector
@@ -3598,3 +3598,7 @@ axis	Both	Ambos
 	Off: an editable copy of its art, embedded in this document.	Desactivado: una copia editable de su ilustración, incrustada en este documento.
 	Images: link to the file instead of only embedding it.	Imágenes: vincular al archivo en lugar de solo incrustarlo.
 	VectorCraft documents: one locked object, updated when the file changes.	Documentos de VectorCraft: un objeto bloqueado que se actualiza cuando cambia el archivo.
+	A file dialog is open: choose there first	Hay un cuadro de diálogo de archivos abierto: elija primero en él
+	Constrain	Restringir
+	Free Transform	Transformación libre
+	Perspective Distort	Distorsión de perspectiva
@@ -508,7 +508,7 @@
 	Create Object Mosaic…	Crea mosaico di oggetti…
 	Create Outlines	Crea contorni
 	Create Path	Crea tracciato
-	Create PDF layers from top-level layers	Crea livelli PDF dai livelli principali
+	Create PDF layers from layers and sublayers	Crea livelli PDF dai livelli e sottolivelli
 	Create PDF-Compatible File	Crea file compatibile PDF
 	Create Report	Crea rapporto
 	Create Slice	Crea sezione
@@ -3598,3 +3598,7 @@ axis	Both	Entrambi
 	Off: an editable copy of its art, embedded in this document.	Disattivato: una copia modificabile della sua grafica, incorporata in questo documento.
 	Images: link to the file instead of only embedding it.	Immagini: collega il file invece di incorporarlo soltanto.
 	VectorCraft documents: one locked object, updated when the file changes.	Documenti VectorCraft: un unico oggetto bloccato, aggiornato quando il file cambia.
+	A file dialog is open: choose there first	È aperta una finestra di dialogo dei file: scegli prima lì
+	Constrain	Vincola
+	Free Transform	Trasformazione libera
+	Perspective Distort	Distorsione prospettica
@@ -983,7 +983,7 @@
 	Create New Sublayer	新規サブレイヤーを作成
 	Create New Swatch…	新規スウォッチを作成…
 	Create New {kind} Style	新しい{kind}スタイルを作成
-	Create PDF layers from top-level layers	最上位レイヤーから PDF レイヤーを作成
+	Create PDF layers from layers and sublayers	レイヤーとサブレイヤーから PDF レイヤーを作成
 	Create PDF-Compatible File	PDF 互換ファイルを作成
 	Create Path	パスを作成
 	Create Slice	スライスを作成
@@ -3060,3 +3060,7 @@ theme	Appearance	外観
 	Off: an editable copy of its art, embedded in this document.	オフ：アートの編集可能なコピーをこのドキュメントに埋め込みます。
 	Images: link to the file instead of only embedding it.	画像：埋め込むだけでなく、ファイルにリンクします。
 	VectorCraft documents: one locked object, updated when the file changes.	VectorCraft ドキュメント：ロックされた 1 つのオブジェクト。ファイルの変更時に更新されます。
+	A file dialog is open: choose there first	ファイルダイアログが開いています。先にそちらで選択してください
+	Constrain	制限
+	Free Transform	自由変形
+	Perspective Distort	遠近変形
@@ -497,7 +497,7 @@
 	Create New {kind} Style	Criar Novo Estilo de {kind}
 	Create Object Mosaic…	Criar Mosaico de Objetos…
 	Create Outlines	Criar Contornos
-	Create PDF layers from top-level layers	Criar camadas de PDF a partir das camadas de nível superior
+	Create PDF layers from layers and sublayers	Criar camadas de PDF a partir das camadas e subcamadas
 	Create PDF-Compatible File	Criar Arquivo Compatível com PDF
 	Create Path	Criar Caminho
 	Create Slice	Criar Fatia
@@ -2648,3 +2648,7 @@
 	Off: an editable copy of its art, embedded in this document.	Desativado: uma cópia editável da arte, incorporada neste documento.
 	Images: link to the file instead of only embedding it.	Imagens: vincular ao arquivo em vez de apenas incorporá-lo.
 	VectorCraft documents: one locked object, updated when the file changes.	Documentos do VectorCraft: um objeto bloqueado, atualizado quando o arquivo muda.
+	A file dialog is open: choose there first	Há uma caixa de diálogo de arquivos aberta: escolha nela primeiro
+	Constrain	Restringir
+	Free Transform	Transformação Livre
+	Perspective Distort	Distorção de Perspectiva
@@ -506,7 +506,7 @@
 	Create Object Mosaic…	Создать мозаику объектов…
 	Create Outlines	Создать контуры
 	Create Path	Создать контур
-	Create PDF layers from top-level layers	Создавать слои PDF из слоёв верхнего уровня
+	Create PDF layers from layers and sublayers	Создавать слои PDF из слоёв и подслоёв
 	Create PDF-Compatible File	Создать файл, совместимый с PDF
 	Create Report	Создать отчёт
 	Create Slice	Создать фрагмент
@@ -3596,3 +3596,7 @@ axis	Both	Оба
 	Off: an editable copy of its art, embedded in this document.	Выкл.: редактируемая копия его рисунка, внедрённая в этот документ.
 	Images: link to the file instead of only embedding it.	Изображения: связывать с файлом вместо простого внедрения.
 	VectorCraft documents: one locked object, updated when the file changes.	Документы VectorCraft: один заблокированный объект, обновляемый при изменении файла.
+	A file dialog is open: choose there first	Открыто окно выбора файла: сначала сделайте выбор в нём
+	Constrain	Ограничить
+	Free Transform	Свободное трансформирование
+	Perspective Distort	Искажение перспективы
@@ -508,7 +508,7 @@
 	Create Object Mosaic…	创建对象马赛克…
 	Create Outlines	创建轮廓
 	Create Path	创建路径
-	Create PDF layers from top-level layers	从顶层图层创建 PDF 图层
+	Create PDF layers from layers and sublayers	从图层和子图层创建 PDF 图层
 	Create PDF-Compatible File	创建与 PDF 兼容的文件
 	Create Report	创建报告
 	Create Slice	创建切片
@@ -3315,3 +3315,6 @@ axis	Both	两者
 	Off: an editable copy of its art, embedded in this document.	关闭：将其图稿的可编辑副本嵌入此文档。
 	Images: link to the file instead of only embedding it.	图像：链接到文件，而不只是嵌入。
 	VectorCraft documents: one locked object, updated when the file changes.	VectorCraft 文档：一个锁定对象，文件更改时随之更新。
+	A file dialog is open: choose there first	文件对话框已打开：请先在其中选择
+	Constrain	约束
+	Perspective Distort	透视扭曲
@@ -523,7 +523,7 @@
 	Create Object Mosaic…	建立物件馬賽克…
 	Create Outlines	建立外框
 	Create Path	建立路徑
-	Create PDF layers from top-level layers	從最上層圖層建立 PDF 圖層
+	Create PDF layers from layers and sublayers	從圖層和子圖層建立 PDF 圖層
 	Create PDF-Compatible File	建立與 PDF 相容的檔案
 	Create Report	建立報告
 	Create Slice	建立切片
@@ -3090,3 +3090,7 @@ axis	Both	兩者
 	Off: an editable copy of its art, embedded in this document.	關閉：將其圖稿的可編輯副本內嵌在此文件中。
 	Images: link to the file instead of only embedding it.	影像：連結至檔案，而不只是嵌入。
 	VectorCraft documents: one locked object, updated when the file changes.	VectorCraft 文件：單一鎖定物件，檔案變更時隨之更新。
+	A file dialog is open: choose there first	檔案對話方塊已開啟：請先在其中選擇
+	Constrain	強制
+	Free Transform	任意變形
+	Perspective Distort	透視扭曲
@@ -72,7 +72,7 @@ pub fn open_document(app: &mut VectorcraftApp, name: &str, bytes: &[u8], path: O

 /// A path from the open dialog, or "cancelled".
 fn pick_open(app: &mut VectorcraftApp, pick: &FilePick) -> Result<String, String> {
-    app.services.pick_open.as_mut().and_then(|f| f(pick)).ok_or_else(|| "cancelled".into())
+    crate::picks::open(app, pick).ok_or_else(|| "cancelled".into())
 }

 /// Object › Plug-ins › Install Plug-in…: installs the `.wasm` at `path`, else a picked one (the
@@ -164,7 +164,7 @@ fn pick_path(app: &mut VectorcraftApp, pick: &FilePick) -> Result<String, String
    if is_web(app) {
        return Ok(pick.name.clone());
    }
-    let picked = app.services.pick_save.as_mut().and_then(|f| f(pick)).ok_or("cancelled")?;
+    let picked = crate::picks::save(app, pick).ok_or("cancelled")?;
    Ok(with_extension(&picked, &fileio::extension(&pick.name), |_| true))
 }

@@ -27,6 +27,7 @@ pub mod dock;
 pub mod find_font;
 pub mod floating;
 pub mod font_menu;
+mod free_transform;
 pub mod graphics;
 pub mod i18n;
 pub mod icon_data;
@@ -36,6 +37,7 @@ pub mod menus;
 pub mod native_menu;
 pub mod palette;
 pub mod panels;
+pub mod picks;
 pub mod place;
 pub mod prefs_dialog;
 pub mod print;
@@ -95,6 +97,8 @@ mod tests_pathtype;
 #[cfg(test)]
 mod tests_pdfoutput;
 #[cfg(test)]
+mod tests_picks;
+#[cfg(test)]
 mod tests_place;
 #[cfg(test)]
 mod tests_plugins;
@@ -233,6 +237,10 @@ pub struct Services {
    pub print: Option<Box<dyn print::PrintService>>,
    /// The macOS menu bar, when the desktop app installed one: the in-window menus are hidden then.
    pub native_menu: Option<native_menu::NativeMenu>,
+    /// Show file dialogs off the UI thread (desktop Linux, where a dialog in line holds the window
+    /// and the compositor finds it not answering): what asked runs again with the answer
+    /// ([`picks`]). Without it they are shown in line.
+    pub start_pick: Option<picks::StartPick>,
 }

 /// Cached canvas raster.
@@ -347,6 +355,11 @@ pub struct VectorcraftApp {
    /// The thread that checks the system clipboard for `system_paste` instead
    /// ([`Services::clipboard_probe`]).
    clipboard_probe: Option<clipboard_probe::Probe>,
+    /// File dialogs shown off the UI thread and what runs again with their answers.
+    pub(crate) picks: picks::Picks,
+    /// The look for fonts installed or removed while the app was in the background, running
+    /// ([`Self::refresh_installed_fonts`]): whether they were.
+    font_check: Option<std::sync::mpsc::Receiver<bool>>,
    /// Keyboard pastes of something other than text (see [`shortcuts::PasteChord`]).
    pub(crate) paste_chord: shortcuts::PasteChord,
    /// Saves and exports running in the background (Preferences → File Handling).
@@ -423,6 +436,8 @@ impl VectorcraftApp {
            system_paste: false,
            system_paste_at: f64::NEG_INFINITY,
            clipboard_probe: None,
+            picks: picks::Picks::default(),
+            font_check: None,
            paste_chord: Default::default(),
            background: Default::default(),
            recovery: Default::default(),
@@ -485,6 +500,16 @@ impl VectorcraftApp {

    /// Run a UI or engine command by id. The single entry point for every frontend path.
    pub fn run(&mut self, id: &str, params: Value) -> Result<Value, String> {
+        // A file dialog it shows off the UI thread runs it again with the path picked.
+        if self.picks.is_entry_free() {
+            let entry = picks::Entry::Command(id.to_string(), params.clone());
+            return picks::as_entry(self, move || entry, |app| app.run_now(id, params));
+        }
+        self.run_now(id, params)
+    }
+
+    /// [`Self::run`] it, inside what asks for file dialogs.
+    fn run_now(&mut self, id: &str, params: Value) -> Result<Value, String> {
        self.run_count = self.run_count.wrapping_add(1);
        if let Some(r) = menus::run_ui_command(self, id, &params) {
            return r;
@@ -785,6 +810,8 @@ impl VectorcraftApp {
            self.system_paste_at = now;
            self.system_paste = wanted && self.system_clipboard_pasteable();
        }
+        self.poll_font_check(ctx);
+        picks::poll(self, ctx);
        background::poll(self);
        if !self.background.jobs.is_empty() {
            // Keep the status bar's progress moving and pick the result up when it arrives.
@@ -858,10 +885,38 @@ impl VectorcraftApp {

    /// Fonts installed or removed while the app was in the background are listed when it comes
    /// back (Refresh Font List by itself): a look at the font folders, a scan only when they changed.
+    /// The look runs on another thread (asking DirectWrite for the fonts font services loaded
+    /// meanwhile takes tens of milliseconds on Windows, #579), [`Self::poll_font_check`] scans.
    fn refresh_installed_fonts(&mut self) {
-        if vectorcraft_text::FontDb::global().installed_fonts_changed() {
-            // A failure shows in the status bar, as the menu item's does.
-            let _ = self.run("text.rescanFonts", json!({}));
+        if self.font_check.is_some() {
+            return;
+        }
+        let (tx, rx) = std::sync::mpsc::channel();
+        let look = move || {
+            // The UI gone meanwhile has nothing to refresh.
+            let _ = tx.send(vectorcraft_text::FontDb::global().installed_fonts_changed());
+        };
+        let spawned =
+            if cfg!(target_arch = "wasm32") { None } else { std::thread::Builder::new().name("font-check".into()).spawn(look.clone()).ok() };
+        if spawned.is_none() {
+            look();
+        }
+        self.font_check = Some(rx);
+    }
+
+    /// Rescan the fonts once [`Self::refresh_installed_fonts`]'s look says they changed.
+    fn poll_font_check(&mut self, ctx: &egui::Context) {
+        let Some(check) = &self.font_check else { return };
+        match check.try_recv() {
+            Ok(changed) => {
+                self.font_check = None;
+                if changed {
+                    // A failure shows in the status bar, as the menu item's does.
+                    let _ = self.run("text.rescanFonts", json!({}));
+                }
+            }
+            Err(std::sync::mpsc::TryRecvError::Empty) => ctx.request_repaint_after(std::time::Duration::from_millis(50)),
+            Err(std::sync::mpsc::TryRecvError::Disconnected) => self.font_check = None,
        }
    }

@@ -2848,7 +2848,8 @@ pub fn click_target(label: &str, id: &str, p: &Value) -> (String, Value) {
 /// are.
 fn queried_dialog(id: &str) -> Option<(&'static str, &'static [&'static str])> {
    Some(match id {
-        "text.areaOptions" => ("Area Type Options", &[]),
+        // Whether the text overflows, and Shrink Text's factor, are read-only facts.
+        "text.areaOptions" => ("Area Type Options", &["overflow", "fitScale"]),
        "type.pathOptions" => ("Type on a Path Options", &["start", "end"]),
        _ => return None,
    })
@@ -185,17 +185,23 @@ fn collect(app: &mut VectorcraftApp, ctx: &egui::Context, ids: Option<Vec<NodeId
 /// folder picker: the last folder Export for Screens used, else the Desktop); the web downloads
 /// them, several as one zip.
 fn export(app: &mut VectorcraftApp, ids: Vec<u64>, files_each: usize) {
+    // The folder picked off the UI thread exports them then.
+    crate::picks::button(app, move |app| export_now(app, ids.clone(), files_each));
+}
+
+fn export_now(app: &mut VectorcraftApp, ids: Vec<u64>, files_each: usize) {
    let mut p = json!({ "assets": ids });
    if io::is_web(app) {
        p["zip"] = json!(ids.len() * files_each > 1);
    } else {
        let saved = app.session.active().map(|st| st.doc.export_settings.clone()).unwrap_or_default();
-        let folder = match app.services.pick_folder.as_mut() {
-            Some(pick) => match pick() {
+        let folder = if crate::picks::can(app, &crate::picks::PickRequest::Folder) {
+            match crate::picks::folder(app) {
                Some(f) => f,
                None => return,
-            },
-            None => match saved
+            }
+        } else {
+            match saved
                .get("folder")
                .and_then(Value::as_str)
                .filter(|f| !f.is_empty())
@@ -204,7 +210,7 @@ fn export(app: &mut VectorcraftApp, ids: Vec<u64>, files_each: usize) {
            {
                Some(f) => f,
                None => return app.status("choose a folder to export to".to_string()),
-            },
+            }
        };
        p["folder"] = json!(folder);
        p["openLocation"] = json!(saved.get("openLocation").and_then(Value::as_bool).unwrap_or(true));
@@ -503,21 +503,33 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
    let mut new: Option<(Color, Live, Vec<f32>)> = None;
    let mut behind: Option<(Color, Live)> = None;
    let mut tinted: Option<(f32, Live)> = None;
-    let gamut = color.filter(|_| matches!(mode, Mode::Rgb | Mode::Hsb)).and_then(|c| gamut_fix(app, ui.ctx(), "color-gamut", &c));
+    // The warnings the mode shows: out of gamut in RGB and HSB, out of web colours but in Web Safe
+    // RGB and Grayscale.
+    let (shows_gamut, shows_web) = (matches!(mode, Mode::Rgb | Mode::Hsb), !matches!(mode, Mode::WebSafe | Mode::Grayscale));
+    let gamut = color.filter(|_| shows_gamut).and_then(|c| gamut_fix(app, ui.ctx(), "color-gamut", &c));
    ui.horizontal(|ui| {
        // Left column: proxy, out-of-gamut and out-of-web warnings.
        ui.vertical(|ui| {
            ui.set_width(44.0);
            super::proxy(app, ui, 40.0);
-            let web = color.filter(|c| !matches!(mode, Mode::WebSafe | Mode::Grayscale) && !is_web_safe(c)).map(|c| web_safe(&c));
-            for (warning, fix) in [(GAMUT_WARNING, gamut), (WEB_WARNING, web)] {
-                if let Some(fix) = fix {
-                    ui.add_space(6.0);
-                    if warning_chip(ui, warning, &fix) {
-                        new = Some((fix, Live::Released, components(mode, &fix)));
-                    }
+            let web = color.filter(|c| shows_web && !is_web_safe(c)).map(|c| web_safe(&c));
+            let warnings: Vec<_> = [(GAMUT_WARNING, gamut), (WEB_WARNING, web)].into_iter().filter_map(|(w, fix)| Some((w, fix?))).collect();
+            for (warning, fix) in &warnings {
+                ui.add_space(6.0);
+                if warning_chip(ui, *warning, fix) {
+                    new = Some((*fix, Live::Released, components(mode, fix)));
                }
            }
+            // Room for the mode's other warnings: the panel keeps its height as the colour changes,
+            // else the spectrum below moves under a dragging pointer and the colour flips every
+            // frame, e.g. between a pale colour out of gamut and white above the spectrum (#578).
+            for _ in warnings.len()..usize::from(shows_gamut) + usize::from(shows_web) {
+                ui.add_space(6.0);
+                ui.scope(|ui| {
+                    ui.set_invisible();
+                    warning_chip(ui, WEB_WARNING, &Color::WHITE)
+                });
+            }
        });
        // Sliders (Shift-drag moves them in tandem).
        ui.vertical(|ui| {
@@ -705,6 +717,40 @@ mod tests {
        (f.color().map(|c| c.to_hex()).unwrap_or_default(), s.color().map(|c| c.to_hex()).unwrap_or_default())
    }

+    #[test]
+    fn a_drag_on_the_spectrum_holds_still_near_white() {
+        let mut app = app();
+        let ctx = egui::Context::default();
+        let none = egui::Modifiers::NONE;
+        // White needs no warning, #fefefe the web one, a pale violet both: one panel height.
+        let heights: Vec<f32> = ["#ffffff", "#fefefe", "#ded3ff"]
+            .iter()
+            .map(|c| {
+                app.run("paint.setFill", json!({"color": c})).unwrap();
+                frame(&mut app, &ctx, vec![], none);
+                frame(&mut app, &ctx, vec![], none).1
+            })
+            .collect();
+        assert!(heights.windows(2).all(|w| w[0] == w[1]), "{heights:?}");
+        // Drag along the spectrum's top edge (pale colours, some out of gamut), stopping at each
+        // point: the colour holds while the pointer does.
+        let r = frame(&mut app, &ctx, vec![], none).0.expect("the spectrum is drawn");
+        let at = |x: f32| egui::pos2(r.left() + x * r.width(), r.top() + 2.0);
+        let button = |pressed| egui::Event::PointerButton { pos: at(0.02), button: egui::PointerButton::Primary, pressed, modifiers: none };
+        frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at(0.02)), button(true)], none);
+        for i in 1..20 {
+            frame(&mut app, &ctx, vec![egui::Event::PointerMoved(at(i as f32 * 0.05))], none);
+            let fills: Vec<String> = (0..3)
+                .map(|_| {
+                    frame(&mut app, &ctx, vec![], none);
+                    paints_hex(&app).0
+                })
+                .collect();
+            assert!(fills.windows(2).all(|w| w[0] == w[1]), "at {}: {fills:?}", i as f32 * 0.05);
+        }
+        frame(&mut app, &ctx, vec![button(false)], none);
+    }
+
    #[test]
    fn tandem_keeps_ratios() {
        let t = tandem(Mode::Rgb, &[100.0, 50.0, 25.0], 0, 200.0);
@@ -154,7 +154,7 @@ pub(crate) fn pick_library_file(app: &mut VectorcraftApp, path: Option<String>)
    }
    path.or_else(|| {
        let pick = crate::FilePick { filters: vectorcraft_engine::cmd::fileio::open_filters().collect(), ..Default::default() };
-        app.services.pick_open.as_mut().and_then(|f| f(&pick))
+        crate::picks::open(app, &pick)
    })
    .map(Some)
    .ok_or_else(|| "cancelled".into())
@@ -116,15 +116,23 @@ fn report(app: &mut VectorcraftApp, r: Result<Value, String>, done: impl FnOnce(

 /// Relink images `ids` to a picked file.
 pub(crate) fn relink(app: &mut VectorcraftApp, ids: Vec<u64>) {
+    crate::picks::button(app, move |app| relink_picked(app, ids.clone()));
+}
+
+fn relink_picked(app: &mut VectorcraftApp, ids: Vec<u64>) {
    let pick = crate::FilePick { filters: vectorcraft_engine::cmd::fileio::place_filters().collect(), ..Default::default() };
-    let Some(path) = app.services.pick_open.as_mut().and_then(|f| f(&pick)) else { return };
+    let Some(path) = crate::picks::open(app, &pick) else { return };
    let r = app.run("links.relink", json!({ "ids": ids, "path": path }));
    report(app, r, |v| format!("Relinked {} image(s)", v["relinked"].as_array().map_or(0, Vec::len)));
 }

 /// Relink images `ids` (none: every missing one) to the files of their names in a picked folder.
 fn relink_to_folder(app: &mut VectorcraftApp, ids: Vec<u64>) {
-    let Some(folder) = app.services.pick_folder.as_mut().and_then(|f| f()) else { return };
+    crate::picks::button(app, move |app| relink_to_picked_folder(app, ids.clone()));
+}
+
+fn relink_to_picked_folder(app: &mut VectorcraftApp, ids: Vec<u64>) {
+    let Some(folder) = crate::picks::folder(app) else { return };
    let ids = Some(ids).filter(|i| !i.is_empty());
    let r = app.run("links.relink", json!({ "ids": ids, "folder": folder }));
    report(app, r, |v| {
@@ -154,9 +162,12 @@ pub(crate) fn unembed(app: &mut VectorcraftApp, id: u64, name: &str) {
        }
        return;
    }
-    let Some(path) = app.services.pick_save.as_mut().and_then(|f| f(&crate::FilePick::named(name))) else { return };
-    let r = app.run("links.unembed", json!({ "id": id, "path": path }));
-    report(app, r, |v| format!("Unembedded to {}", v["path"].as_str().unwrap_or_default()));
+    let name = name.to_string();
+    crate::picks::button(app, move |app| {
+        let Some(path) = crate::picks::save(app, &crate::FilePick::named(&name)) else { return };
+        let r = app.run("links.unembed", json!({ "id": id, "path": path }));
+        report(app, r, |v| format!("Unembedded to {}", v["path"].as_str().unwrap_or_default()));
+    });
 }

 /// The UI commands `links.editOriginal` (open the linked file in its app) and `links.reveal`
@@ -1,9 +1,10 @@
 //! Paragraph panel: seven alignment buttons, Paragraph Direction (with the Indic options), indents,
-//! space before/after, Hyphenate and Mojikumi Set (with the East Asian options).
+//! space before/after, Hyphenate and Mojikumi Set (with the East Asian options); the panel menu
+//! picks the Single-line or Every-line Composer.

 use egui::{Ui, vec2};
 use serde_json::{Value, json};
-use vectorcraft_doc::{Justify, NodeKind, ParaDirection, ParaStyle};
+use vectorcraft_doc::{Composer, Justify, NodeKind, ParaDirection, ParaStyle};

 use super::character::text_style;
 use super::{pstate, set_pstate};
@@ -181,14 +182,20 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
        });
    }
    ui.separator();
-    menu_item(ui, tl!("Single-line Composer"), false, false);
-    menu_item(ui, tl!("Every-line Composer"), false, true);
+    let composer = style.as_ref().map(|(_, p)| p.composer);
+    for (c, label, id) in
+        [(Composer::SingleLine, tl!("Single-line Composer"), "singleLine"), (Composer::EveryLine, tl!("Every-line Composer"), "everyLine")]
+    {
+        if menu_item(ui, label, has, composer == Some(c)) {
+            format(app, json!({ "composer": id }));
+        }
+    }
    ui.separator();
    if menu_item(ui, tl!("Reset Panel"), has, false) {
        para_cmd(app, "text.setStyle", json!({"justify": "auto"}));
        format(
            app,
-            json!({"leftIndent": 0, "rightIndent": 0, "firstLineIndent": 0, "spaceBefore": 0, "spaceAfter": 0, "hyphenate": false, "direction": "auto", "leadingModel": "romanBaseline", "burasagari": "standard"}),
+            json!({"leftIndent": 0, "rightIndent": 0, "firstLineIndent": 0, "spaceBefore": 0, "spaceAfter": 0, "hyphenate": false, "direction": "auto", "leadingModel": "romanBaseline", "burasagari": "standard", "composer": "everyLine"}),
        );
    }
 }
@@ -0,0 +1,237 @@
+//! File dialogs that leave the window running (#592).
+//!
+//! The app asks for a path where it needs one (Open, Save As, Export, Place, Relink, presets…)
+//! and goes on with it at once, so a dialog shown on the UI thread holds the window until it
+//! closes. On Windows and macOS the dialog runs the window's events meanwhile; on Linux nothing
+//! does, so a Wayland compositor finds the window not answering and offers to kill it. There the
+//! host shows dialogs on another thread ([`Services::start_pick`]): asking returns no path for now,
+//! and when the dialog answers, what asked (the command, the dialog's OK, a panel's button: the
+//! *entry*) runs again and gets the picked path at once.
+
+use std::rc::Rc;
+use std::sync::mpsc::{Receiver, TryRecvError};
+
+use serde_json::Value;
+
+use crate::state::Dialog;
+use crate::{FilePick, VectorcraftApp};
+
+/// A file dialog to show.
+#[derive(Clone, Debug, PartialEq)]
+pub enum PickRequest {
+    /// An open dialog for one file.
+    Open(FilePick),
+    /// An open dialog for files to place.
+    OpenMany,
+    /// A save dialog.
+    Save(FilePick),
+    /// A folder picker.
+    Folder,
+}
+
+/// The paths a dialog shown off the UI thread picked (none: cancelled).
+pub type PickAnswer = Vec<String>;
+
+/// Shows a dialog off the UI thread; its answer arrives on the receiver. `None` when it can't, and
+/// the dialog is then shown in line.
+pub type StartPick = Box<dyn FnMut(PickRequest) -> Option<Receiver<PickAnswer>>>;
+
+/// What runs again with the picked path.
+#[derive(Clone)]
+pub(crate) enum Entry {
+    /// A command (`app.run`).
+    Command(String, Value),
+    /// A dialog's OK (`dialogs::confirm`), on the dialog as it was.
+    Confirm(Box<Dialog>),
+    /// A panel's or a dialog's button.
+    Call(Rc<dyn Fn(&mut VectorcraftApp)>),
+}
+
+/// A dialog shown off the UI thread, waiting for its answer.
+struct Waiting {
+    request: PickRequest,
+    answer: Receiver<PickAnswer>,
+    entry: Entry,
+}
+
+/// The app's file dialogs ([`VectorcraftApp`]'s `picks`).
+#[derive(Default)]
+pub(crate) struct Picks {
+    /// What is running now and asks for a path, the outermost one.
+    entry: Option<Entry>,
+    waiting: Option<Waiting>,
+    /// A picked answer for the entry running again: the dialog it asks for gets it.
+    answer: Option<(PickRequest, PickAnswer)>,
+}
+
+impl Picks {
+    /// Nothing asking for file dialogs is running.
+    pub(crate) fn is_entry_free(&self) -> bool {
+        self.entry.is_none()
+    }
+}
+
+/// Run `f` as `entry`: a dialog it asks for off the UI thread runs `entry` again when it
+/// answers. Inside another entry, that one runs again instead.
+pub(crate) fn as_entry<R>(app: &mut VectorcraftApp, entry: impl FnOnce() -> Entry, f: impl FnOnce(&mut VectorcraftApp) -> R) -> R {
+    if app.picks.entry.is_some() {
+        return f(app);
+    }
+    app.picks.entry = Some(entry());
+    let r = f(app);
+    app.picks.entry = None;
+    r
+}
+
+/// [`as_entry`] for a panel's or a dialog's button that `f` handles.
+pub(crate) fn button(app: &mut VectorcraftApp, f: impl Fn(&mut VectorcraftApp) + 'static) {
+    let f = Rc::new(f);
+    let again = f.clone();
+    as_entry(app, move || Entry::Call(again), |app| f(app));
+}
+
+/// A dialog body's action `f` on `d` (the open dialog's copy) that asks for a file dialog: shown
+/// off the UI thread, its answer runs `f` again on the open dialog, when it is still of that kind.
+pub(crate) fn in_dialog(
+    app: &mut VectorcraftApp,
+    d: &mut Dialog,
+    f: impl Fn(&mut VectorcraftApp, &mut Dialog) -> Result<(), String> + 'static,
+) -> Result<(), String> {
+    let f = Rc::new(f);
+    let (again, kind) = (f.clone(), d.kind.clone());
+    let entry = move || {
+        Entry::Call(Rc::new(move |app: &mut VectorcraftApp| {
+            let Some(mut d) = app.ui.dialog.take() else { return };
+            let r = if d.kind == kind { again(app, &mut d) } else { Ok(()) };
+            app.ui.dialog = Some(d);
+            if let Err(e) = r {
+                app.status(e);
+            }
+        }))
+    };
+    as_entry(app, entry, |app| f(app, d))
+}
+
+/// A dialog body's folder button: the folder picked into field `key` of `d` ([`in_dialog`]).
+pub(crate) fn folder_field(app: &mut VectorcraftApp, d: &mut Dialog, key: &'static str) {
+    let r = in_dialog(app, d, move |app, d| {
+        if let Some(f) = folder(app) {
+            d.fields.insert(key.into(), serde_json::json!(f));
+        }
+        Ok(())
+    });
+    // Picking a folder doesn't fail.
+    let _ = r;
+}
+
+/// A path from an open dialog for `pick` (none: cancelled, or shown off the UI thread for now).
+pub(crate) fn open(app: &mut VectorcraftApp, pick: &FilePick) -> Option<String> {
+    ask(app, PickRequest::Open(pick.clone()))?.into_iter().next()
+}
+
+/// A path from a save dialog for `pick`.
+pub(crate) fn save(app: &mut VectorcraftApp, pick: &FilePick) -> Option<String> {
+    ask(app, PickRequest::Save(pick.clone()))?.into_iter().next()
+}
+
+/// A folder from the folder picker.
+pub(crate) fn folder(app: &mut VectorcraftApp) -> Option<String> {
+    ask(app, PickRequest::Folder)?.into_iter().next()
+}
+
+/// Paths from the open dialog for files to place (none: cancelled).
+pub(crate) fn open_many(app: &mut VectorcraftApp) -> Vec<String> {
+    ask(app, PickRequest::OpenMany).unwrap_or_default()
+}
+
+/// Whether the host shows `request`'s kind of dialog at all.
+pub(crate) fn can(app: &VectorcraftApp, request: &PickRequest) -> bool {
+    let s = &app.services;
+    match request {
+        PickRequest::Open(_) => s.pick_open.is_some(),
+        PickRequest::OpenMany => s.pick_open_multi.is_some() || s.pick_open.is_some(),
+        PickRequest::Save(_) => s.pick_save.is_some(),
+        PickRequest::Folder => s.pick_folder.is_some(),
+    }
+}
+
+/// The paths `request`'s dialog picked: the answer kept for it, else shown off the UI thread (no
+/// paths for now), else shown in line.
+fn ask(app: &mut VectorcraftApp, request: PickRequest) -> Option<PickAnswer> {
+    // One for another dialog is dropped: the entry took another way this time.
+    if let Some((asked, answer)) = app.picks.answer.take()
+        && asked == request
+    {
+        return Some(answer);
+    }
+    if !can(app, &request) {
+        return None;
+    }
+    if let (Some(entry), Some(start)) = (app.picks.entry.clone(), app.services.start_pick.as_mut()) {
+        if app.picks.waiting.is_some() {
+            app.status(tl!("A file dialog is open: choose there first"));
+            return None;
+        }
+        if let Some(answer) = start(request.clone()) {
+            app.picks.waiting = Some(Waiting { request, answer, entry });
+            return None;
+        }
+    }
+    let s = &mut app.services;
+    let one = |p: Option<String>| Some(p.into_iter().collect());
+    match &request {
+        PickRequest::Open(pick) => one(s.pick_open.as_mut().and_then(|f| f(pick))),
+        PickRequest::Save(pick) => one(s.pick_save.as_mut().and_then(|f| f(pick))),
+        PickRequest::Folder => one(s.pick_folder.as_mut().and_then(|f| f())),
+        PickRequest::OpenMany => match (s.pick_open_multi.as_mut(), s.pick_open.as_mut()) {
+            (Some(many), _) => Some(many()),
+            (None, Some(f)) => one(f(&FilePick::default())),
+            (None, None) => None,
+        },
+    }
+}
+
+/// Each frame: when the dialog shown off the UI thread answers with paths, run its entry again
+/// with them. While it is open, look again shortly.
+pub(crate) fn poll(app: &mut VectorcraftApp, ctx: &egui::Context) {
+    let Some(w) = &app.picks.waiting else { return };
+    let answer = match w.answer.try_recv() {
+        Ok(answer) => answer,
+        Err(TryRecvError::Empty) => {
+            // What asked gave up for now: no "cancelled" while the dialog is open.
+            if app.ui.status == "cancelled" {
+                app.ui.status.clear();
+            }
+            ctx.request_repaint_after(std::time::Duration::from_millis(100));
+            return;
+        }
+        // The dialog's thread is gone: as cancelled.
+        Err(TryRecvError::Disconnected) => vec![],
+    };
+    let Some(Waiting { request, entry, .. }) = app.picks.waiting.take() else { return };
+    if answer.is_empty() {
+        return;
+    }
+    app.picks.answer = Some((request, answer));
+    rerun(app, entry);
+    // An entry that took another way this time leaves the answer unused.
+    app.picks.answer = None;
+}
+
+/// Run `entry` again.
+fn rerun(app: &mut VectorcraftApp, entry: Entry) {
+    let r = match entry {
+        Entry::Command(id, params) => app.run(&id, params).map(|_| ()),
+        Entry::Confirm(d) => {
+            app.ui.dialog = Some(*d);
+            crate::dialogs::confirm(app).map(|_| ())
+        }
+        Entry::Call(f) => {
+            f(app);
+            Ok(())
+        }
+    };
+    if let Err(e) = r {
+        app.status(e);
+    }
+}
@@ -135,10 +135,10 @@ fn pick(app: &mut VectorcraftApp) -> Result<(), String> {
        f();
        return Ok(());
    }
-    let paths = match (app.services.pick_open_multi.as_mut(), app.services.pick_open.as_mut()) {
-        (Some(f), _) => f(),
-        (None, Some(f)) => f(&crate::FilePick { filters: fileio::place_filters().collect(), ..Default::default() }).into_iter().collect(),
-        (None, None) => vec![],
+    let paths = if app.services.pick_open_multi.is_some() {
+        crate::picks::open_many(app)
+    } else {
+        crate::picks::open(app, &crate::FilePick { filters: fileio::place_filters().collect(), ..Default::default() }).into_iter().collect()
    };
    if paths.is_empty() {
        return Err("cancelled".into());
@@ -458,7 +458,7 @@ pub fn run_command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<Resu
        "shortcuts.export" => {
            let v = export_json(&app.ui.shortcut_set, &app.ui.shortcut_overrides);
            let bytes = serde_json::to_vec_pretty(&v).unwrap_or_default();
-            let path = s("path").or_else(|| app.services.pick_save.as_mut().and_then(|f| f(&crate::FilePick::named("VectorCraft Shortcuts.json"))));
+            let path = s("path").or_else(|| crate::picks::save(app, &crate::FilePick::named("VectorCraft Shortcuts.json")));
            match path {
                Some(path) => match app.services.write.as_mut() {
                    Some(w) => w(&path, &bytes).map(|_| json!({"path": path})),
@@ -477,7 +477,7 @@ pub fn run_command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<Resu
            let data = if let Some(v) = p.get("data") {
                Ok(v.clone())
            } else {
-                let path = s("path").or_else(|| app.services.pick_open.as_mut().and_then(|f| f(&crate::FilePick::default())));
+                let path = s("path").or_else(|| crate::picks::open(app, &crate::FilePick::default()));
                match (path, app.services.read.as_ref()) {
                    (Some(path), Some(r)) => r(&path).and_then(|b| serde_json::from_slice(&b).map_err(|e| e.to_string())),
                    (None, _) => Err("cancelled".into()),
@@ -0,0 +1,113 @@
+//! File dialogs shown off the UI thread (Linux, #592): what asked runs again with the answer.
+
+use std::cell::RefCell;
+use std::rc::Rc;
+use std::sync::mpsc::{Sender, channel};
+
+use serde_json::json;
+use vectorcraft_engine::Session;
+
+use crate::picks::{self, PickRequest};
+use crate::state::Dialog;
+use crate::{FilePick, Services, VectorcraftApp};
+
+const SVG: &[u8] = br#"<svg xmlns="http://www.w3.org/2000/svg" width="40" height="30"><rect width="10" height="10"/></svg>"#;
+
+/// A dialog asked for, and where its answer goes.
+type Asked = (PickRequest, Sender<Vec<String>>);
+
+/// The dialogs showing.
+#[derive(Clone, Default)]
+struct Shown(Rc<RefCell<Vec<Asked>>>);
+
+impl Shown {
+    fn requests(&self) -> Vec<PickRequest> {
+        self.0.borrow().iter().map(|(r, _)| r.clone()).collect()
+    }
+    /// The last dialog shown answers `paths`.
+    fn answer(&self, paths: &[&str]) {
+        let (_, tx) = self.0.borrow_mut().pop().expect("a dialog is showing");
+        tx.send(paths.iter().map(|p| p.to_string()).collect()).unwrap();
+    }
+}
+
+/// A desktop app whose dialogs show off the UI thread (none in line), reading [`SVG`] from any path
+/// and writing files to `written`.
+fn app() -> (VectorcraftApp, Shown, Rc<RefCell<Vec<String>>>) {
+    let (shown, written) = (Shown::default(), Rc::new(RefCell::new(vec![])));
+    let (s, w) = (shown.clone(), written.clone());
+    let in_line = |_: &FilePick| -> Option<String> { panic!("no dialog on the UI thread") };
+    let services = Services {
+        pick_open: Some(Box::new(in_line)),
+        pick_save: Some(Box::new(in_line)),
+        pick_folder: Some(Box::new(|| panic!("no dialog on the UI thread"))),
+        read: Some(Box::new(|_: &str| Ok(SVG.to_vec()))),
+        write: Some(Box::new(move |path: &str, _: &[u8]| {
+            w.borrow_mut().push(path.to_string());
+            Ok(())
+        })),
+        start_pick: Some(Box::new(move |request: PickRequest| {
+            let (tx, rx) = channel();
+            s.0.borrow_mut().push((request, tx));
+            Some(rx)
+        })),
+        ..Default::default()
+    };
+    (VectorcraftApp::new(Session::new(), services), shown, written)
+}
+
+fn poll(app: &mut VectorcraftApp) {
+    picks::poll(app, &egui::Context::default());
+}
+
+#[test]
+fn file_open_opens_what_its_dialog_picks_when_it_answers() {
+    let (mut app, shown, _) = app();
+    // The dialog shows; File › Open gives up for now, without a "cancelled".
+    assert!(app.run("file.open", json!({})).is_err());
+    assert!(matches!(shown.requests().as_slice(), [PickRequest::Open(_)]));
+    poll(&mut app);
+    assert!(app.session.documents().is_empty() && app.ui.status.is_empty(), "{}", app.ui.status);
+    // Another dialog waits for this one.
+    assert!(app.run("file.open", json!({})).is_err());
+    assert_eq!(shown.requests().len(), 1);
+    assert!(app.ui.status.contains("file dialog is open"), "{}", app.ui.status);
+    shown.answer(&["/art/a.svg"]);
+    poll(&mut app);
+    assert_eq!(app.session.documents().len(), 1);
+    assert_eq!(app.session.active().and_then(|d| d.path.clone()).as_deref(), Some("/art/a.svg"));
+    // Cancelled: nothing happens, and dialogs show again.
+    assert!(app.run("file.open", json!({})).is_err());
+    shown.answer(&[]);
+    poll(&mut app);
+    assert_eq!(app.session.documents().len(), 1);
+    assert!(app.run("file.open", json!({})).is_err());
+    assert_eq!(shown.requests().len(), 1);
+}
+
+#[test]
+fn save_as_goes_on_with_the_path_picked() {
+    let (mut app, shown, written) = app();
+    app.run("file.new", json!({"width": 100, "height": 80})).unwrap();
+    app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 20})).unwrap();
+    assert!(app.run("file.saveAs", json!({})).is_err());
+    assert!(matches!(shown.requests().as_slice(), [PickRequest::Save(_)]));
+    shown.answer(&["/art/poster.svg"]);
+    poll(&mut app);
+    // SVG Options asks next, and its OK writes the file there.
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.kind.as_str()), Some("svgOptions"));
+    crate::dialogs::confirm(&mut app).unwrap();
+    assert_eq!(*written.borrow(), ["/art/poster.svg"]);
+}
+
+#[test]
+fn a_dialogs_folder_button_fills_its_field_when_the_picker_answers() {
+    let (mut app, shown, _) = app();
+    let mut d = Dialog::new("exportForScreens", json!({"folder": ""}));
+    app.ui.dialog = Some(d.clone());
+    picks::folder_field(&mut app, &mut d, "folder");
+    assert_eq!(shown.requests(), [PickRequest::Folder]);
+    shown.answer(&["/out"]);
+    poll(&mut app);
+    assert_eq!(app.ui.dialog.as_ref().map(|d| d.str("folder")).as_deref(), Some("/out"));
+}
@@ -18,7 +18,7 @@ so only enable it while you use it. Transport: `apps/vectorcraft/src/control_ser
 | `engine.execute` | `{command, params}` | run any engine or UI command (see `engine.commands`) |
 | `engine.commands` | | every command with label, shortcut, params doc, enablement |
 | `document.inspect` | `{depth?, childLimit?}` | layer tree, selection, history, paint defaults; the options slice the layer tree as `document.node {summary: true}` does |
-| `ui.inspect` | | tool, UI state, `screenMode` (0 normal, 1 full screen with menu bar, 2 full screen, 3 Presentation Mode), `taskBar` (`pinned`, and `rect` `[x, y, w, h]` while the Contextual Task Bar shows), view, canvas rect, window size, perf, background saves and exports still running, `nativeMenuBar` (true when the menus are in the macOS menu bar rather than the window; `ui.menu.list` lists the in-window menus either way) |
+| `ui.inspect` | | tool, UI state, `screenMode` (0 normal, 1 full screen with menu bar, 2 full screen, 3 Presentation Mode), `taskBar` (`pinned`, and `rect` `[x, y, w, h]` while the Contextual Task Bar shows), `freeTransformWidget` (`[x, y, w, h]` while the Free Transform widget shows), view, canvas rect, window size, perf, background saves and exports still running, `nativeMenuBar` (true when the menus are in the macOS menu bar rather than the window; `ui.menu.list` lists the in-window menus either way) |
 | `ui.menu.list` / `ui.menu.invoke` | `{command, params}` | the full menu tree / invoke an item |
 | `ui.contextMenu.list` | | the canvas context menu for the current selection, flattened like `ui.menu.list` (`path` holds its submenus). `ui.click {x, y, button: "right"}` on the canvas opens it, after selecting the object there unless it is already selected |
 | `ui.tool.select` / `ui.tool.list` | `{tool}` | |
@@ -214,6 +214,13 @@ Bar Position (`window.taskBar.reset`), which unpins it and puts it back under th
 Panel. As in Illustrator, neither the position nor the pin is saved: each launch starts with the bar under the
 selection.

+The Free Transform widget: while the Free Transform tool (E) is active, a small box at the canvas's top left holds
+Constrain over the tool's three modes, Free Transform, Perspective Distort and Free Distort. The buttons set the tool's
+options, as `tool.setOption {key: "mode", value: "free"|"perspective"|"distort"}` and `{key: "constrain", value}` do:
+Constrain acts as Shift held (proportional scaling, moves and rotations by 45°) and does nothing in the distort modes,
+where it is greyed. The modifier keys still work while dragging (Cmd on a corner distorts it freely, Cmd+Alt+Shift in
+perspective, Cmd on a side shears).
+
 Floating panels: dragging a dock tab, a panel icon or a popped-out panel's title out of the dock floats that panel
 inside the window, and the strip right of the dock's tabs floats the whole Properties | Layers | Libraries group. A
 floating group moves by its title bar (or the strip right of its tabs); a tab dragged out of it floats on its own;
@@ -355,9 +355,11 @@ A `security` password encrypts the file (RC4 40-bit at PDF 1.3, RC4 128-bit at 1
 Pattern fills and strokes are written as their tiles clipped to the area they paint (a stroke's outline, with its
 dashes, caps, profile, arrowheads and alignment), and freeform gradients as an image of their colour field at the
 document's raster effects resolution, clipped the same way.
-`createLayers` writes each top-level layer (template layers are left out) as a PDF layer, an optional content group
-named as the layer: hidden layers are off, non-printing ones have `/PrintState /OFF` and locked ones are locked. It needs
-PDF 1.5 or later (at 1.4 it warns), and the file reopens with those layers.
+`createLayers` writes each layer and sublayer (template layers are left out) as a PDF layer, an optional content group
+named as the layer and listed under its parent layer's: hidden layers are off (their art is written, for the reader to
+show), non-printing ones have `/PrintState /OFF` and locked ones are locked. It needs PDF 1.5 or later (at 1.4 it
+warns), and the file reopens with those layers and sublayers. A `.ai` file writes them unless `createLayers` is false,
+so apps that read its PDF part find the layers, hidden ones included; hidden objects aren't in the PDF part.
 Images follow the `compression` settings of their kind (`color`, `gray`, or `mono` for black-and-white images): above
 `abovePpi` as placed they are resampled (`downsample`: `average`, `subsample` or `bicubic`) to `ppi`, and compressed
 with `zip`, `jpeg` (at `quality`; images with transparency stay lossless) or `auto` (JPEGs stay JPEG, the others
@@ -2201,6 +2203,50 @@ undo step. Object › Transform › Scale, the Scale tool and the Transform pane
 {"name":"run_command","arguments":{"command":"text.reshapeArea","params":{"id":42,"anchors":[[0,2]],"dx":40,"dy":60}}}
 ```

+### Vertical alignment
+
+`text.areaOptions {verticalAlign: top|center|bottom|justify}` (Area Type Options › Align) places the lines of each
+row/column cell on its own: `center` centres the block of lines in the cell, `bottom` puts the last line's descent on
+the cell's bottom (inside the inset), `justify` keeps the first line at the top, moves the last one to the bottom and
+shares the space left over equally between the lines (there is no paragraph spacing limit: every line gap grows by
+the same amount). A cell with a single line justifies to the top, and a full or overflowing cell only moves by the
+less-than-a-line of space it has left. In rectangular frames without text wrap the lines just move; in other
+frames (and around wrap objects) the text flows again starting lower until it settles, never losing text that fit
+top-aligned. Vertical type aligns along its block axis (`bottom` is the frame's left edge). Exports lay type out
+again, so SVG, PDF and EPS show the aligned text.
+
+```json
+{"name":"run_command","arguments":{"command":"text.areaOptions","params":{"verticalAlign":"center"}}}
+```
+
+## Fitting area type: Auto Size, Shrink Text to Fit, overflow
+
+`text.areaOptions` (and `text.create`'s `area`, `text.createInPath` in area mode) take a `fit`:
+
+- `none` (default): the frame keeps its size; text that doesn't fit overflows (the red "+").
+- `autoHeight`: Auto Size. After every edit (typing, `text.editRange`, character and paragraph changes, a new
+  width) the frame's bottom moves to just below the last line plus the inset, in the same undo step as the edit.
+  In several columns the frame gets the least height (to 0.01 pt) at which the columns hold the text. It applies
+  to rectangular frames of horizontal type in one row; `height` is ignored while it is on, and setting the height
+  by hand (a handle drag, `text.reshapeArea` moving the bottom) turns it off, as does threading the frame. The
+  `autoSizeAreaType` preference ("Auto Size New Area Type") gives new area type `autoHeight`.
+- `shrinkText` (beyond the reference app), with `fitMinPercent` (10–100, default 50): when the text overflows,
+  every run's size, leading (explicit leading; auto leading follows the size) and baseline shift are scaled by the
+  largest factor down to `fitMinPercent` % that makes it fit. Paragraph spacing and indents stay. The stored
+  sizes don't change: the scaling happens at layout time, so rendering and every export see it. The factor is
+  found by bisection over the first run's size in steps of 0.1 pt (its scaled size is a whole number of tenths of
+  a point, so the result is deterministic); at `fitMinPercent` the text may still overflow.
+
+The file stores `"fit": "autoHeight"` or `"fit": {"shrinkText": {"minPercent": 40}}` in the object's `area`; the
+command also accepts that object form. The query (and every reply) of `text.areaOptions` reports `fit` as its id,
+`fitMinPercent`, `overflow` (the text doesn't fit its frame) and `fitScale` (Shrink Text's factor, 1 unshrunk).
+`document.inspect` (and `document.node {summary: true}`) reports `overflow` for area type and type on a path (text past
+the end of the path), and `fit` and `fitScale` for area type.
+
+```json
+{"name":"run_command","arguments":{"command":"text.areaOptions","params":{"fit":"shrinkText","fitMinPercent":60}}}
+```
+
 ## Converting between point type and area type

 With the Selection tool, a single selected point or area type object shows the type widget: a small circle beside
@@ -2310,7 +2356,8 @@ tone (mono, or CMYK screens multiplied over each other), clipped to the art's ou

 Type can use the bundled fonts, fonts added to the session and the fonts installed on the system (none on the web):
 the system's and the user's font folders (Windows: `Fonts` and `%LOCALAPPDATA%\Microsoft\Windows\Fonts`, plus fonts
-registered outside them, such as fonts installed as shortcuts; macOS: `/System/Library/Fonts`, `/Library/Fonts`,
+registered outside them, such as fonts installed as shortcuts, and in the desktop app the fonts in DirectWrite's system
+font collection, such as those Adobe Fonts activates while Creative Cloud runs; macOS: `/System/Library/Fonts`, `/Library/Fonts`,
 `/Network/Library/Fonts`, `~/Library/Fonts` and downloaded system fonts; Linux and BSD: `/usr/share/fonts`,
 `/usr/local/share/fonts`, `~/.fonts` and the XDG data folders' `fonts`, `~/.local/share/fonts` among them, and in a
 Flatpak sandbox the host's fonts). The installed fonts are cataloged once per session (in the background when the app starts, else on the first lookup
@@ -2549,6 +2596,20 @@ canvas as they export. `object.blend.expand` and `object.blend.release` keep the
 opacity mask and appearance (Release on a group around the keys and spine when the blend has any), and
 `object.expand` with `object: true` expands the blends in the selection.

+## Paragraph composer
+
+`text.setFormat {ids?, composer: "singleLine"|"everyLine"}` sets how a text object's lines are broken (the Paragraph
+panel menu's Single-line and Every-line Composer; stored in the paragraph attributes as `para.composer`, saved only
+when it is Single-line). Every-line, the default, picks the breaks of the whole paragraph together in area type:
+justified text gets even word spacing, ragged text (left, centre or right aligned) an even rag, so it may move a word
+that fits to the next line to avoid a lone short word on the last line or a full line next to a short one.
+Single-line fills each line as far as it goes. Point type and type on a path have no line width, so both composers
+give the same result there; paragraphs that mix type sizes fall back to Single-line.
+
+```json
+{"name":"run_command","arguments":{"command":"text.setFormat","params":{"ids":[7],"composer":"singleLine"}}}
+```
+
 ## Editing envelopes

 `object.envelope.editContents {editing}` switches between editing the envelope and its contents (the menu item reads
Author	SHA1	Message	Date
bflatasticandClaude Opus 5.5	2497713779	Fix #598 : the Free Transform widget While the Free Transform tool (E) is active, a small box at the canvas's top left holds Constrain over the tool's three modes: Free Transform, Perspective Distort and Free Distort. Before, the modes were reachable only by modifier keys or `tool.setOption`. - The buttons set the tool's `constrain` and `mode` options through `tool.setOption`, as agents do. Constrain acts as Shift held and is greyed in the distort modes, where it does nothing. The modifier keys keep working while dragging. - Theme tokens; Constrain shows the link icon, Free Transform the tool's own icon, the distort modes are drawn in code. Tooltips translated (cs, es, it, ja, pt-br, ru, zh-hans, zh-hant). - `ui.inspect` reports where it shows (`freeTransformWidget`). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 05:31:43 +07:00
BFlat	79a67e2642	Merge pull request: land #608 (fix #592 ) Land #608 (fix #592: Linux file dialogs no longer stop the window answering)	2026-10-09 05:11:15 +07:00
bflatastic	d9a2cfe7f9	Merge #608 : Fix #592 : file dialogs on Linux no longer stop the window answering # Conflicts: # ROADMAP.md	2026-10-09 05:03:38 +07:00
BFlat	6def232852	Merge pull request: land #606 (area type fit) Land #606: area type Auto Size and Shrink Text to Fit	2026-10-09 05:03:02 +07:00
bflatasticandClaude Opus 5.5	0df8231334	Tests: format round trips find their objects by content, not by count #606 adds a second area type (Shrink Text to Fit) to the rich fixture: the vertical-alignment test now picks the centred area type by its text and strips verticalAlign from every area for its old-file case, and the composer test checks the Single-line text and the rest at the default. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 05:00:01 +07:00
bflatasticandClaude Opus 5.5	37d4477362	Fix #592 : file dialogs on Linux no longer stop the window answering VectorCraft asks for a path where it needs one and goes on with it at once, so its file dialogs ran on the UI thread. Windows and macOS dialogs run the window's events meanwhile; on Linux nothing answered the Wayland compositor's pings while a dialog was open, and Hyprland offered to kill the window as not responding. - ui-egui `picks`: every file dialog (open, save, folder, place) goes through one place. With the host's `start_pick` (desktop Linux) the dialog shows on a thread of its own; what asked (the command, the dialog's OK, a panel's or dialog's button) gives up for now and runs again with the picked path when the dialog answers. Another dialog waits for the open one. - The desktop app passes its window as the dialogs' parent on Linux (the portal can then associate its window, "Unhandled parent window type" before) and Windows; macOS shows them as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 04:59:05 +07:00
bflatastic	611deeda46	Merge #606 : M7: area type auto size and shrink text to fit	2026-10-09 04:52:14 +07:00
BFlat	c3b73f0146	Merge pull request: land #603 (part of #372 ) Land #603 (part of #372: .ai layers and sublayers as PDF layers, hidden ones kept)	2026-10-09 04:51:50 +07:00
haven	674aef95b0	M7: area type auto size and shrink text to fit Area Type Options gain a fit: none, autoHeight (Illustrator's Auto Size: the frame's height follows the text after every edit, resolved in refresh_bounds inside the edit so it shares the edit's undo step) and shrinkText {minPercent} (beyond Illustrator: overflowing text scales its sizes, leading and baseline shifts down at layout time by the largest factor, in 0.1 pt steps of the first run, that fits). The Auto Size New Area Type preference now applies. text.areaOptions and document.inspect report overflow and the shrink factor; the Area Type Options dialog offers fit and first baseline as dropdowns.	2026-10-08 14:48:25 -07:00
bflatastic	ef99ab8d1c	Merge #603 : Part of #372 : .ai files write layers and sublayers as PDF layers, hidden ones kept # Conflicts: # ROADMAP.md	2026-10-09 04:46:09 +07:00
BFlat	a89f914119	Merge pull request: land #600 , #601 Land #600 (area type vertical alignment) and #601 (RTL shaping across runs)	2026-10-09 04:45:23 +07:00
bflatasticandClaude Opus 5.5	50bb36ebc2	Part of #372 : .ai files write layers and sublayers as PDF layers, hidden ones kept A `.ai` file's PDF part is what apps that don't read VectorCraft's native document open. It had no PDF layers: hidden layers and sublayers were left out of it and everything else was flat page content. - `.ai` files (Save As, exports, the CLI) write PDF layers unless `createLayers` is false (a PDF standard still decides for itself). - createLayers writes sublayers too, as optional content groups listed under their layer's in `/Order`, hidden ones off with their art. - A layer's form gets a box round the whole page instead of its art's bounds, which readers made a clipping group of, gathering a layer's art and its sublayers' in one group. - PDF import: art inside a group, clip or form that dissolves into its parent keeps the layer it was drawn in, so sublayers nested in their layer's content import as sublayers. - Save PDF: "Create PDF layers from layers and sublayers" (ja, es, it, pt-br, ru, zh-hans, zh-hant). Hidden objects (not layers) still aren't in the PDF part. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 04:40:30 +07:00
bflatastic	4e774b8b61	Merge #601 : Fix RTL shaping across text runs	2026-10-09 04:39:56 +07:00
bflatasticandClaude Opus 5.5	017c846889	Tests: the top-to-top em box check needs the craft-fonts CJK faces Without craft-fonts the CJK text falls back to a system font with its own em box (Windows: 34.0 instead of 35.2 at 40 pt); the relative alignment checks hold either way. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 04:39:56 +07:00
bflatasticandClaude Opus 5.5	e12ed1608e	Tests: the composer round trip counts #600 's area type in the rich fixture #587 and #600 landed together: the fixture's new area type (Every-line, the default) is a second text object the composer test now sees. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 04:36:06 +07:00
Emad Fussi	9e6c115481	Fix RTL shaping across text runs	2026-10-09 00:34:00 +03:00
bflatastic	c7b2bba90e	Merge #600 : M7: area type vertical alignment	2026-10-09 04:31:10 +07:00
haven	d2bb95daab	M7: area type vertical alignment Area Type Options > Align: Top / Center / Bottom / Justify (AreaOptions.verticalAlign, LayoutOptions.vertical_align). Each row/column cell is aligned on its own; rectangular cells shift their lines, other frames and text wrap reflow until settled without losing text. Justify shares the leftover space equally between line gaps. Area Type Options shows Align and First Baseline as dropdowns (the parameter dialog's choices table).	2026-10-08 14:28:02 -07:00
BFlat	8d0cede84a	Merge pull request: land #594 (fix #579 ) Land #594 (fix #579: fonts from font services such as Adobe Fonts on Windows)	2026-10-09 04:26:21 +07:00
bflatastic	030d407f61	Merge #594 : Fix #579 : fonts activated by font services such as Adobe Fonts are listed on Windows # Conflicts: # ROADMAP.md	2026-10-09 04:18:54 +07:00
BFlat	465ec07445	Merge pull request: land #591 (fix #578 ) Land #591 (fix #578: no flicker dragging the Color spectrum near white)	2026-10-09 04:17:20 +07:00
bflatasticandClaude Opus 5.5	5854346053	Fix #579 : fonts activated by font services such as Adobe Fonts are listed on Windows Font services load their fonts with GDI at run time, from files in their own folders, without installing them: neither the font folders nor the registry list them, so the font scan never saw them. DirectWrite's system font collection holds them since Windows 10 1607. - vectorcraft-text: `set_platform_font_files` lets the app name font files the platform knows; each scan and each check for installed fonts asks again and reads those outside the font folders. A file named by itself is read whatever its extension (font services keep fonts in files without one). - The desktop app lists the local files of DirectWrite's system font collection on Windows (`system_fonts.rs`, through the windows crate already in the build), read in place. - The check for fonts installed while the app was in the background runs on a thread: DirectWrite's check for updates takes about 50 ms. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 04:16:14 +07:00
bflatastic	f4b4312cc9	Merge #591 : Fix #578 : a drag on the Color panel's spectrum no longer flickers near white # Conflicts: # ROADMAP.md	2026-10-09 04:13:07 +07:00
BFlat	0869f51360	Merge pull request #587 from Haven-King/feat/text-engine/text-composer-ragged M7: Every-line Composer for ragged text	2026-10-09 04:12:08 +07:00
haven	d2aad22dac	M7: Every-line Composer for ragged text Illustrator's Every-line Composer balances the breaks of the whole paragraph for left/centre/right aligned text too, not only justified text. VectorCraft only composed justified area text; ragged text was always broken greedily. - Model: ParaStyle.composer (vectorcraft_doc::Composer, re-exported by vectorcraft-text), Every-line by default like Illustrator, saved only when Single-line. layout() reads it from the object; LayoutOptions.composer is now an Option override for tests. - Composer: the justified gate is gone. Ragged lines never shrink (a line that doesn't fit ends the node), badness is 100*r^3 with r = the line's leftover space over a rag zone of 1/6 of the width (finite for lines without spaces); the last line is free unless shorter than 1/3 of the width (measured in zones of 1/3), so a lone short word on the last line pulls a word down. Hyphens cost 25 in ragged text (50 in justified). Knuth-Plass fitness classes with adjacency demerits (justified 10000, ragged 1000). Lines past the last width change share one node key, active nodes are capped (4096) and paragraphs over 200k glyphs break single-line, so work stays bounded; ragged tries a tolerance of one rag zone, then any fitting breaks, then falls back to greedy. - text.setFormat {composer: "singleLine"\|"everyLine"}; the Paragraph panel menu's composer items work with a check mark (Reset Panel goes back to Every-line). - Tests: ragged Every-line moves "or" down in "Destroy all creatures with toughness X or less." where greedy leaves "less." alone; the rag of long paragraphs is no worse than greedy (sum of squared leftover and of neighbour differences); Single-line is greedy; the 10k-char layout budget covers ragged text; command test with undo; native format round trip (rich_session's text is now Single-line). No existing test needed changing: the justified tests and hyphenated_layout_adds_hyphens (ragged, now Every-line) still pass. Auto alignment (start of the paragraph direction) is ragged; a wrapped line's Mojikumi flush opening bracket gives its half em back to the composer, as in the line loop; tests cover Auto in both directions. Layout of 10k chars, release: justified Every-line 5.6 ms, ragged Every-line 5.8 ms, ragged Single-line 4.8 ms.	2026-10-08 14:03:33 -07:00
bflatasticandClaude Opus 5.5	2e64786e8c	Fix #578 : a drag on the Color panel's spectrum no longer flickers near white The Color panel shows the out-of-gamut and out-of-web warnings under its proxy only when the colour needs them, so the panel grew and shrank with the colour. Dragging on the spectrum's pale top edge, a colour out of gamut added a warning, the spectrum moved down under the pointer, the pointer then picked white (above the spectrum), the warning went away, the spectrum moved back up: the colour flipped every frame. The panel now keeps room for the warnings its mode can show, so its height no longer depends on the colour. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>	2026-10-09 04:02:44 +07:00
BFlat	367117ba26	Merge pull request: land #583 , #584 (fix #577 ) Land #583, #584 (fix #577) with a ligature-threshold follow-up	2026-10-09 04:02:24 +07:00