Merge main into fix/opacity-mask-art-inside-symbols-pattern-tiles

crates/doc/src/tests/units.rs

@@ -79,6 +79,21 @@ fn odd_text_reads_as_nothing_without_panicking() {
     }
 }
 
+/// Text from a command or a file can be any length: a sum of thousands of terms reads as nothing
+/// instead of exhausting the stack. Up to 128 `+ - * /` signs read; 129 read as nothing.
+#[test]
+fn a_very_long_expression_reads_as_nothing() {
+    let sum = |terms: usize| format!("1{}", "+1".repeat(terms - 1));
+    assert_eq!(Unit::Points.parse(&sum(129)), Some(129.0));
+    assert_eq!(Unit::Points.parse(&format!("10{} mm", "*1".repeat(128))), Some(Unit::Millimeters.to_pt(10.0)));
+    // Long text with no signs still reads.
+    assert_eq!(Unit::Points.parse(&format!("{}5", " ".repeat(2_000))), Some(5.0));
+    for text in [sum(200_000), format!("1{}", "*1".repeat(200_000)), sum(130), format!("10{} mm", "*1".repeat(129))] {
+        assert_eq!(Unit::Points.parse(&text), None, "{} bytes", text.len());
+        assert_eq!(crate::parse_number(&text), None, "{} bytes", text.len());
+    }
+}
+
 proptest! {
     /// Field text made of digits, operators, `%`, spaces and unit letters reads as a finite value
     /// or as nothing and does not panic.

crates/doc/src/units.rs

@@ -156,7 +156,12 @@ impl Unit {
     /// before it (`3cm*50%` is 1.5 cm, `3cm/50%` is 6 cm). After `+` or `-`, it adds or takes away
     /// that share of everything before it (`50pt+25%` is 62.5 pt, `100pt+20pt-50%` is 60 pt). A
     /// percentage on its own (`50%`) reads as nothing.
+    ///
+    /// Text with more than 128 `+ - * /` signs reads as nothing.
     pub fn parse(self, s: &str) -> Option<f64> {
+        if s.chars().filter(|c| matches!(c, '+' | '-' | '*' | '/')).count() > MAX_MEASURE_OPERATORS {
+            return None;
+        }
         parse_measure(s, self).filter(|v| v.is_finite())
     }
     /// The value naming this unit in the Units preferences (`points`, `millimeters`,
@@ -207,6 +212,9 @@ impl Unit {
     }
 }
 
+/// The most `+ - * /` signs [`Unit::parse`] reads in one text.
+const MAX_MEASURE_OPERATORS: usize = 128;
+
 fn parse_measure(s: &str, default: Unit) -> Option<f64> {
     let s = s.trim();
     // Simple arithmetic on the right (Illustrator fields accept "10+5", "100/2", "3in*2").

crates/effects/src/catalog.rs

@@ -417,7 +417,7 @@ pub fn effect_catalog() -> Vec<EffectInfo> {
             "artistic.roughPastels",
             "Rough Pastels…",
             ARTISTIC,
-            "{strokeLength: 0..40 (6; longer pastel strokes), strokeDetail: 1..20 (10; bristle texture along the strokes), texture: \"brick\"|\"burlap\"|\"canvas\"|\"sandstone\" (\"canvas\"), scaling: % 50..200 (100), relief: 0..50 (4), lightDirection: \"bottom\"|\"bottomLeft\"|\"left\"|\"topLeft\"|\"top\"|\"topRight\"|\"right\"|\"bottomRight\" (\"top\"), invert: bool (false)} repaints the object in soft diagonal pastel strokes over a textured surface, keeping its coverage. Slider ranges follow the documented controls; numeric defaults are chosen for VectorCraft and are not verified against proprietary defaults.",
+            "{strokeLength: 0..40 (6; longer pastel strokes), strokeDetail: 1..20 (10; bristle texture along the strokes), texture: \"brick\"|\"burlap\"|\"canvas\"|\"sandstone\"|\"loaded\" (\"canvas\"; \"loaded\" draws the image in textureImage and draws Canvas when there is none; the others are surfaces made in code), textureImage?: {path} | {name?, dataBase64} | string (Load Texture…: an image file that File › Place reads, within the renderer's pixel allowance, stored as its gray levels in a grayscale PNG in base64; a file sets texture to \"loaded\" unless texture is given, and the stored string, as effect.list gives it, is kept as it is), scaling: % 50..200 (100), relief: 0..50 (4), lightDirection: \"bottom\"|\"bottomLeft\"|\"left\"|\"topLeft\"|\"top\"|\"topRight\"|\"right\"|\"bottomRight\" (\"top\"), invert: bool (false)} repaints the object in soft diagonal pastel strokes over a textured surface, keeping its coverage. A loaded texture lies one image pixel per point at 100 %, centered on the object's center and repeated; each pixel's luma is the surface's height, from 0 for black to 1 pt for white, and a transparent pixel counts as middle gray. Slider ranges follow the documented controls; numeric defaults are chosen for VectorCraft and are not verified against proprietary defaults.",
             json!({
                 "strokeLength": 6.0,
                 "strokeDetail": 10.0,

crates/effects/src/pixel.rs

@@ -155,8 +155,9 @@ pub enum PixelFx {
     /// `texture_coverage` (0..40) says.
     Underpainting { brush_size: f64, texture_coverage: f64, texture: Texture, scaling: f64, relief: f64, light: Light, invert: bool },
     /// Artistic › Rough Pastels: diagonal pastel strokes `length` (0..40) long, bristle detail
-    /// (1..20), then a [`Texture`] surface scaled by `scaling` (0.5..2), in relief as strong as
-    /// `relief` (0..50) and lit from `light`; `invert` turns the surface's heights over.
+    /// (1..20), then a [`Texture`] surface (a loaded one included) scaled by `scaling` (0.5..2), in
+    /// relief as strong as `relief` (0..50) and lit from `light`; `invert` turns the surface's
+    /// heights over.
     RoughPastels { length: f64, detail: f64, texture: Texture, scaling: f64, relief: f64, light: Light, invert: bool },
     /// Blur › Radial Blur around its Blur Center, `center` (0..1 across and down the object's
     /// bounds; (0.5, 0.5) the object's centre): along arcs (spin, an arc of `amount`°) or along
@@ -385,7 +386,7 @@ pub(crate) fn parse(id: &str, p: &Value) -> Option<PixelFx> {
         "artistic.roughPastels" => PixelFx::RoughPastels {
             length: num(p, "strokeLength", 6.0).clamp(0.0, 40.0),
             detail: num(p, "strokeDetail", 10.0).clamp(1.0, 20.0),
-            texture: Texture::parse(text(p, "texture", "canvas")),
+            texture: Texture::parse_with(text(p, "texture", "canvas"), p.get(TEXTURE_IMAGE).and_then(Value::as_str)),
             scaling: num(p, "scaling", 100.0).clamp(50.0, 200.0) / 100.0,
             relief: num(p, "relief", 4.0).clamp(0.0, 50.0),
             light: Light::parse(text(p, "lightDirection", "top")),

crates/effects/src/pixel/tests.rs

@@ -1547,6 +1547,42 @@ fn texturizer_draws_a_loaded_texture_as_relief() {
     assert_eq!(fx("texture.texturizer", json!({"texture": "LOADED", "textureImage": "not a texture"})), fx("texture.texturizer", json!({})));
 }
 
+/// Rough Pastels draws a loaded texture as its surface, and Scaling, Relief, Light Direction and
+/// Invert act on it as on the built-in ones.
+#[test]
+fn rough_pastels_draws_a_loaded_texture_as_its_surface() {
+    let w = 64;
+    let mid = grey(150);
+    let rings = stored(12, 10, |x, y| {
+        let v = ((x as f64 - 5.5).hypot(y as f64 - 4.5) * 0.9).sin().abs();
+        let g = (v * 255.0).round() as u8;
+        [g, g, g, 255]
+    });
+    let run = |mut p: serde_json::Value| {
+        p["strokeLength"] = json!(0);
+        let mut d = flat(w, mid);
+        fx("artistic.roughPastels", p).apply(&mut d, w, w, &space(w, w));
+        d
+    };
+    let relief = run(json!({"texture": "loaded", "textureImage": rings, "relief": 20}));
+    assert_ne!(relief, flat(w, mid));
+    for (_, builtin) in TEXTURES {
+        assert_ne!(relief, run(json!({"texture": builtin, "relief": 20})), "{builtin}");
+    }
+    for (key, value) in [("invert", json!(true)), ("scaling", json!(200)), ("lightDirection", json!("bottomRight")), ("relief", json!(5))] {
+        let mut p = json!({"texture": "loaded", "textureImage": rings, "relief": 20});
+        p[key] = value;
+        assert_ne!(run(p), relief, "{key}");
+    }
+    assert_eq!(run(json!({"texture": "loaded", "textureImage": rings, "relief": 0})), flat(w, mid));
+    let parsed = fx("artistic.roughPastels", json!({"texture": "Loaded", "textureImage": rings}));
+    assert!(matches!(parsed, PixelFx::RoughPastels { texture: Texture::Loaded(_), .. }), "{parsed:?}");
+    // Without a stored texture, or with one that isn't, Loaded draws Canvas.
+    for p in [json!({"texture": "loaded"}), json!({"texture": "loaded", "textureImage": "not a texture"})] {
+        assert_eq!(fx("artistic.roughPastels", p), fx("artistic.roughPastels", json!({})));
+    }
+}
+
 /// The Texture filters' patterns lie in document space around the object's centre: the same at
 /// twice the resolution, and moving with the object.
 #[test]

crates/effects/src/svg_filter/defaults.rs

@@ -128,6 +128,7 @@ mod tests {
             to_doc: Affine::scale(1.0),
             px: 1.0,
             center: Point::new(wd / 2.0, wd / 2.0),
+            size: vectorcraft_geom::Vec2::new(wd, wd),
             channels: Channels::Rgb,
             line: 1.0,
             extent: 0.5 * wd.hypot(wd),

crates/engine/src/cmd/addons/pathtools/tests.rs

@@ -531,8 +531,13 @@ fn an_anchor_edit_makes_it_a_plain_path_and_transforms_keep_it_editable() {
     s.execute("addon.pathtools.shape.set", &json!({"id": id.0, "count": 6})).unwrap();
     assert_eq!((path(&s, id).anchor_count(), steps(&s)), (12, n + 1));
     assert!((shape_of(&s, id).unwrap().rotation + 30.0).abs() < 1e-6, "the turn stays");
-    // Stretched across its own axes (it is turned): skewed, so no longer.
+    // Stretched along its turned bounding box: still the shape, wider along its own axis.
     s.execute("object.scale", &json!({"sx": 150, "sy": 100, "origin": [220, 140]})).unwrap();
+    let r = shape_of(&s, id).unwrap();
+    assert!((r.width - 300.0).abs() < 1e-6 && (r.height - 200.0).abs() < 1e-6 && (r.rotation + 30.0).abs() < 1e-6, "{r:?}");
+    s.execute("edit.undo", &json!({})).unwrap();
+    // Stretched across the page's axes (it is turned): skewed, so no longer.
+    s.execute("object.scale", &json!({"sx": 150, "sy": 100, "origin": [220, 140], "basis": "page"})).unwrap();
     assert_eq!(shape_of(&s, id), None);
     s.execute("edit.undo", &json!({})).unwrap();
     assert!(shape_of(&s, id).is_some(), "undo brings it back");

crates/engine/src/cmd/buildcmds.rs

@@ -14,7 +14,7 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use serde_json::{Value, json};
-use vectorcraft_color::{Color, Paint};
+use vectorcraft_color::{BlendMode, Color, Paint};
 use vectorcraft_doc::appearance::{AppearanceItem, FillLayer, LineCap, LineJoin, StrokeLayer};
 use vectorcraft_doc::{Appearance, Document, GapOptions, GapSize, LiveShape, Node, NodeId, NodeKind, Selection, TraceView};
 use vectorcraft_geom::{FillRule, PathData, Point, Rect, SubPath};
@@ -72,7 +72,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Make",
             ["Object", "Live Paint"],
             Some("Cmd+Alt+X"),
-            "{ids?|id?} build a Live Paint group from the selected paths (paths, compound paths and groups of them; type, images and other objects are refused, nothing changes); each covered face starts with its front-most covering source's fill; with a Live Paint group among them, add the others to it as livePaint.merge does; a Live Paint group alone has nothing to add, so it is selected and nothing changes (no undo step) → {id, faces, edges}",
+            "{ids?|id?} build a Live Paint group from the selected paths (paths, compound paths and groups of them; type, images and other objects are refused, nothing changes); each covered face starts with the fill rows that draw (shown, with paint and an opacity above 0) of its front-most covering source that has one and an opacity above 0, and each edge with the stroke rows that draw (also a weight above 0) of its source, in order with their settings and with that source's opacity and blending mode (on a path cut into several edges, dashes go on along the path with the lengths set, without the fit of dashes aligned to corners and path ends, arrowheads stay at its own ends, and a width profile or brush stays only on an edge that runs the whole path); a face or edge given no such row has one unpainted row; with a Live Paint group among them, add the others to it as livePaint.merge does; a Live Paint group alone has nothing to add, so it is selected and nothing changes (no undo step) → {id, faces, edges}",
             has_selection_or_ids,
             lp_make
         ),
@@ -414,22 +414,274 @@ fn source_nodes(n: &Node) -> Vec<Arc<Node>> {
     if is_live_paint(n) { b::sources(n).and_then(|g| g.children().cloned()).unwrap_or_default() } else { vec![Arc::new(n.clone())] }
 }
 
+/// Does appearance row `i` draw: it is shown, has paint and an opacity above 0, and a stroke also
+/// has a weight above 0?
+fn row_draws(i: &AppearanceItem) -> bool {
+    match i {
+        AppearanceItem::Fill(f) => f.visible && !f.paint.is_none() && f.opacity > 0.0,
+        AppearanceItem::Stroke(s) => s.visible && !s.paint.is_none() && s.opacity > 0.0 && s.width > 0.0,
+    }
+}
+
+/// What a source path gives the faces and edges made from it.
+struct SourceStyle {
+    /// The fill rows that draw, in paint order (none when the path's opacity is 0).
+    fills: Vec<AppearanceItem>,
+    /// The stroke rows that draw, in paint order (none when the path's opacity is 0).
+    strokes: Vec<AppearanceItem>,
+    /// The top stroke's weight, for an edge given no stroke that draws.
+    width: f64,
+    opacity: f32,
+    blend: BlendMode,
+}
+
+impl SourceStyle {
+    /// The style of source path `n`: its rows keep their order and settings, gradients fitted to
+    /// its bounds keep that fit, and the strokes' pen pressure, tilt, bearing and rotation stay
+    /// with the path.
+    fn of(n: &Node) -> Self {
+        let mut a = (*n.appearance).clone().without_pressure();
+        if a.has_unplaced_gradient()
+            && let Some(bounds) = n.geometric_bounds()
+        {
+            a.pin_gradients(bounds);
+        }
+        let width = a.stroke().map_or(1.0, |s| s.width);
+        let (mut fills, mut strokes) = (vec![], vec![]);
+        if n.opacity > 0.0 {
+            for i in a.items.into_iter().filter(row_draws) {
+                if i.is_fill() { fills.push(i) } else { strokes.push(i) }
+            }
+        }
+        Self { fills, strokes, width, opacity: n.opacity, blend: n.blend }
+    }
+
+    /// Give part `n` the rows `rows` of this source with its opacity and blending mode; with no
+    /// rows, `n` keeps the unpainted row it has.
+    fn paint(&self, n: &mut Node, rows: &[AppearanceItem]) {
+        if rows.is_empty() {
+            return;
+        }
+        n.appearance = Appearance { items: rows.to_vec(), ..Default::default() }.into();
+        n.opacity = self.opacity;
+        n.blend = self.blend;
+    }
+}
+
+/// How far, in points, a place on an edge may be from its source path and still be on it.
+const ON_SOURCE: f64 = 0.05;
+
+/// Does stroke row `i` have settings that depend on where along its path a piece of it lies or
+/// which way it runs: dashes, arrowheads, a width profile, a brush, or a gradient along or across
+/// the stroke?
+fn depends_on_place(i: &AppearanceItem) -> bool {
+    matches!(i, AppearanceItem::Stroke(s) if s.dash.is_some() || s.start_arrow.is_some() || s.end_arrow.is_some() || s.profile.is_some() || s.brush.is_some() || s.gradient_mode != vectorcraft_doc::StrokeGradientMode::Within)
+}
+
+/// One subpath's segments with the length along it where each starts, then its whole length, and
+/// a grid of square cells listing the segments whose bounds, grown by [`ON_SOURCE`], reach into
+/// each cell, so finding the segments near a point does not look at every segment.
+struct Track {
+    segs: Vec<kurbo::PathSeg>,
+    at: Vec<f64>,
+    closed: bool,
+    cell: f64,
+    grid: HashMap<(i64, i64), Vec<usize>>,
+    /// Segments that reach into more than [`Track::MAX_CELLS`] cells, or that come after the grid
+    /// holds [`Track::CELLS_PER_SEGMENT`] entries per segment, looked at for every point.
+    wide: Vec<usize>,
+}
+
+impl Track {
+    const ACCURACY: f64 = 1e-4;
+    const MAX_CELLS: i64 = 4096;
+    const CELLS_PER_SEGMENT: usize = 16;
+
+    fn new(sp: &SubPath) -> Self {
+        use kurbo::{ParamCurveArclen, Shape as _};
+        let mut bp = kurbo::BezPath::new();
+        sp.to_bezpath_into(&mut bp);
+        let segs: Vec<kurbo::PathSeg> = bp.segments().collect();
+        let mut at = Vec::with_capacity(segs.len() + 1);
+        let mut len = 0.0;
+        for s in &segs {
+            at.push(len);
+            len += s.arclen(Self::ACCURACY);
+        }
+        at.push(len);
+        let boxes: Vec<kurbo::Rect> = segs.iter().map(|s| s.bounding_box().inflate(ON_SOURCE, ON_SOURCE)).collect();
+        // Cells about as wide as an average segment's bounds.
+        let mean = boxes.iter().map(|b| b.width().max(b.height())).sum::<f64>() / boxes.len().max(1) as f64;
+        let cell = if mean.is_finite() { mean.max(4.0 * ON_SOURCE) } else { 4.0 * ON_SOURCE };
+        let mut grid: HashMap<(i64, i64), Vec<usize>> = HashMap::new();
+        let mut wide = vec![];
+        // The grid holds at most this many entries in all.
+        let mut budget = boxes.len().saturating_mul(Self::CELLS_PER_SEGMENT);
+        for (k, b) in boxes.iter().enumerate() {
+            let (x0, y0) = Self::cell_of(Point::new(b.x0, b.y0), cell);
+            let (x1, y1) = Self::cell_of(Point::new(b.x1, b.y1), cell);
+            let cells = x1.saturating_sub(x0).saturating_add(1).saturating_mul(y1.saturating_sub(y0).saturating_add(1));
+            let Some(cells) = usize::try_from(cells).ok().filter(|&c| cells <= Self::MAX_CELLS && c <= budget) else {
+                wide.push(k);
+                continue;
+            };
+            budget -= cells;
+            for x in x0..=x1 {
+                for y in y0..=y1 {
+                    grid.entry((x, y)).or_default().push(k);
+                }
+            }
+        }
+        Self { segs, at, closed: sp.closed, cell, grid, wide }
+    }
+
+    fn cell_of(p: Point, cell: f64) -> (i64, i64) {
+        ((p.x / cell).floor() as i64, (p.y / cell).floor() as i64)
+    }
+
+    fn len(&self) -> f64 {
+        self.at.last().copied().unwrap_or(0.0)
+    }
+
+    /// The lengths along the subpath to each of its segments' places nearest `p` that are within
+    /// [`ON_SOURCE`] of it (more than one where the subpath passes `p` again).
+    fn places(&self, p: Point) -> Vec<f64> {
+        use kurbo::{ParamCurve, ParamCurveArclen, ParamCurveNearest};
+        let near = self.grid.get(&Self::cell_of(p, self.cell)).map(Vec::as_slice).unwrap_or_default();
+        let mut out = vec![];
+        for &k in near.iter().chain(&self.wide) {
+            let Some(s) = self.segs.get(k) else { continue };
+            let n = s.nearest(p, 1e-9);
+            if n.distance_sq <= ON_SOURCE * ON_SOURCE {
+                out.push(self.at.get(k).copied().unwrap_or(0.0) + s.subsegment(0.0..n.t).arclen(Self::ACCURACY));
+            }
+        }
+        out
+    }
+
+    /// The signed length from `a` to `b` along the subpath (the shorter way round a closed one).
+    fn step(&self, a: f64, b: f64) -> f64 {
+        let (d, len) = (b - a, self.len());
+        if self.closed && len > 0.0 { d - len * (d / len).round() } else { d }
+    }
+
+    /// Of `places`, the one nearest along the subpath to `target`.
+    fn nearest(&self, places: &[f64], target: f64) -> Option<f64> {
+        places.iter().copied().min_by(|x, y| self.step(*x, target).abs().total_cmp(&self.step(*y, target).abs()))
+    }
+}
+
+/// Where edge `edge` runs along its source path, whose subpaths' tracks are `tracks`: the length
+/// along the source subpath to the edge's start, whether the edge starts at that subpath's start and
+/// ends at its end (an open subpath), and whether it runs the whole subpath. The middle of the
+/// edge's first segment places it, and its ends are taken where they lie that far along the source,
+/// so a path that passes a point twice is told apart. An edge that runs against the direction of its
+/// source is reversed first, and a closed edge as long as its closed source is started at the anchor
+/// where its source starts (one with no anchor there, or a shorter loop cut from a source that
+/// crosses itself, does not count as running the whole subpath). `None` when the edge is
+/// not a single piece found on the source.
+fn edge_run(tracks: &[Track], edge: &mut PathData) -> Option<(f64, bool, bool, bool)> {
+    use kurbo::{ParamCurve, ParamCurveArclen};
+    let [sp] = edge.subpaths.as_slice() else { return None };
+    if sp.segment_count() == 0 {
+        return None;
+    }
+    let (a, z) = (sp.anchors.first()?.p, if sp.closed { sp.anchors.first()?.p } else { sp.anchors.last()?.p });
+    let first = sp.segment(0);
+    let mid = first.eval(0.5);
+    let half = first.subsegment(0.0..0.5).arclen(Track::ACCURACY);
+    let length = sp.anchor_arc_positions().last().copied().unwrap_or(0.0);
+    let edge_closed = sp.closed;
+    // (how far off the fit is, track, start, end, runs forward) for the subpath that fits best.
+    let mut found: Option<(f64, &Track, f64, f64, bool)> = None;
+    for track in tracks {
+        // The start lies half the first segment before its middle along the source, or after it
+        // when the edge runs the other way: take the place and way that fit best.
+        let starts_at = track.places(a);
+        let mut best: Option<(f64, f64, bool)> = None;
+        for pm in track.places(mid) {
+            for forward in [true, false] {
+                let Some(pa) = track.nearest(&starts_at, if forward { pm - half } else { pm + half }) else { continue };
+                let miss = (if forward { track.step(pa, pm) } else { track.step(pm, pa) } - half).abs();
+                if best.is_none_or(|(m, _, _)| miss < m) {
+                    best = Some((miss, pa, forward));
+                }
+            }
+        }
+        let Some((miss, pa, forward)) = best else { continue };
+        let target = if forward { pa + length } else { pa - length };
+        let Some(pz) = track.nearest(&track.places(z), target) else { continue };
+        let miss = miss + track.step(pz, target).abs();
+        if found.is_none_or(|(m, ..)| miss < m) {
+            found = Some((miss, track, pa, pz, forward));
+        }
+    }
+    let (_, track, pa, pz, forward) = found?;
+    let (from, to) = if forward { (pa, pz) } else { (pz, pa) };
+    if !forward {
+        edge.reverse();
+    }
+    let open = !track.closed;
+    let starts = open && from <= ON_SOURCE;
+    let ends = open && to >= track.len() - ON_SOURCE;
+    if open {
+        return Some((from, starts, ends, starts && ends));
+    }
+    // A closed edge runs the whole closed subpath, from the anchor the planar map starts it at.
+    // Start it at the anchor where the source starts, so settings that follow the path begin there.
+    let start = track.segs.first().map(|s| s.start())?;
+    let moved = edge_closed
+        && (length - track.len()).abs() <= ON_SOURCE.max(track.len() * 1e-4)
+        && edge.subpaths.first_mut().is_some_and(|sp| match sp.anchors.iter().position(|a| a.p.distance(start) <= ON_SOURCE) {
+            Some(k) => {
+                sp.anchors.rotate_left(k);
+                true
+            }
+            None => false,
+        });
+    Some((if moved { 0.0 } else { from }, false, false, moved))
+}
+
+/// Fit stroke row `row` of a source path to an edge cut from it, which runs as [`edge_run`] says
+/// (`None`: not known): its dashes go on from where the edge starts along the source, with the
+/// lengths set and without the fit of dashes aligned to corners and path ends, its arrowheads stay only at the source's own ends, and its width profile and brush, which spread
+/// over the whole path, stay only on an edge that runs the whole path.
+fn fit_to_edge(row: &mut AppearanceItem, run: Option<(f64, bool, bool, bool)>) {
+    let AppearanceItem::Stroke(s) = row else { return };
+    let (from, starts, ends, whole) = run.unwrap_or((0.0, false, false, false));
+    if !whole {
+        if let Some(d) = &mut s.dash
+            && run.is_some()
+        {
+            d.offset += from;
+            d.align_corners = false;
+        }
+        s.profile = None;
+        s.brush = None;
+    }
+    if !starts {
+        s.start_arrow = None;
+    }
+    if !ends {
+        s.end_arrow = None;
+    }
+}
+
 /// The planar map's inputs from `sources` (paths and compound paths, back → front), with the
-/// fill, stroke and stroke width of each.
-fn source_shapes(sources: &[Arc<Node>]) -> (Vec<po::Shape>, Vec<(Paint, Paint, f64)>) {
+/// style of each.
+fn source_shapes(sources: &[Arc<Node>]) -> (Vec<po::Shape>, Vec<SourceStyle>) {
     let mut lv = vec![];
     for n in sources {
         b::leaf_shapes(n, &mut lv);
     }
     let mut shapes = vec![];
-    let mut styles: Vec<(Paint, Paint, f64)> = vec![];
+    let mut styles: Vec<SourceStyle> = vec![];
     for l in lv {
         if let Some((path, rule)) = b::node_outline(l)
             && !path.is_empty()
         {
             shapes.push(po::Shape::new(path, rule, styles.len() as u64));
-            let a = &l.appearance;
-            styles.push((a.fill_paint(), a.stroke_paint(), a.stroke().map(|s| s.width).unwrap_or(1.0)));
+            styles.push(SourceStyle::of(l));
         }
     }
     (shapes, styles)
@@ -462,17 +714,35 @@ fn build_children(d: &mut Document, sources: Vec<Arc<Node>>, max_gap: Option<f64
     let nfaces = regs.len();
     for r in regs {
         let id = d.alloc_id();
-        let fill = r.top().and_then(|t| styles.get(t)).map_or(Paint::None, |s| s.0.clone());
-        let mut n = Node::path(id, r.path, fill_only(fill));
+        let mut n = Node::path(id, r.path, fill_only(Paint::None));
         n.name = Some(FACE_NAME.into());
+        // The front-most covering source with a fill that draws gives the face its fill rows.
+        if let Some(s) = r.sources.iter().rev().filter_map(|&t| styles.get(t)).find(|s| !s.fills.is_empty()) {
+            s.paint(&mut n, &s.fills);
+        }
         children.push(Arc::new(n));
     }
     let nedges = edges.len();
+    // The tracks of the sources whose edges need them, measured once each.
+    let mut tracks: HashMap<usize, Vec<Track>> = HashMap::new();
     for e in edges {
-        let Some((_, stroke, w)) = styles.get(e.key as usize) else { continue };
+        let key = e.key as usize;
+        let Some(s) = styles.get(key) else { continue };
+        let mut path = e.path;
+        let mut rows = s.strokes.clone();
+        if rows.iter().any(depends_on_place) {
+            let source = tracks
+                .entry(key)
+                .or_insert_with(|| shapes.get(key).map(|src| src.path.subpaths.iter().map(Track::new).collect()).unwrap_or_default());
+            let run = edge_run(source, &mut path);
+            for r in &mut rows {
+                fit_to_edge(r, run);
+            }
+        }
         let id = d.alloc_id();
-        let mut n = Node::path(id, e.path, stroke_only(stroke.clone(), *w));
+        let mut n = Node::path(id, path, stroke_only(Paint::None, s.width));
         n.name = Some(EDGE_NAME.into());
+        s.paint(&mut n, &rows);
         children.push(Arc::new(n));
     }
     Ok((children, nfaces, nedges))
@@ -481,8 +751,9 @@ fn build_children(d: &mut Document, sources: Vec<Arc<Node>>, max_gap: Option<f64
 /// Give the faces and edges of `g`, a Live Paint group made again from the sources of `old`, the
 /// look of `old`'s face or edge where they lie: each face takes everything but the outline (its
 /// appearance, none included, its transparency and the rest) of the old face its inside point is
-/// in, and each edge that of the old edge its middle lies on. Faces and edges where `old` had none
-/// keep the paint of their sources.
+/// in, and each edge that of the old edge its middle lies on, with the old edge's stroke rows fitted
+/// to the part of it the new edge runs, as [`fit_to_edge`] fits a source's rows. Faces and edges
+/// where `old` had none keep the paint of their sources.
 fn repaint_from(g: &mut Node, old: &Node) {
     /// How far an edge's middle may be from the old edge it lies on.
     const ON_EDGE: f64 = 1e-3;
@@ -505,7 +776,30 @@ fn repaint_from(g: &mut Node, old: &Node) {
             n.id = c.id;
             n.kind = c.kind.clone();
             n.bbox_angle = c.bbox_angle;
+            // An edge cut from the old one takes the old edge's dashes, arrowheads, width profile
+            // and brush as they fall on its part of the old edge.
+            if c.name.as_deref() == Some(EDGE_NAME)
+                && let Some(old_path) = was.path_data()
+            {
+                fit_to_old_edge(&mut n, old_path);
+            }
             *c = Arc::new(n);
         }
     }
 }
+
+/// Fit the stroke rows of edge `n`, which it took from an old edge whose outline is `old`, to the
+/// part of the old edge that `n` runs, as [`fit_to_edge`] fits a source's rows to an edge cut from
+/// it; `n` is reversed when it runs against the old edge.
+fn fit_to_old_edge(n: &mut Node, old: &PathData) {
+    if !n.appearance.items.iter().any(depends_on_place) {
+        return;
+    }
+    let tracks: Vec<Track> = old.subpaths.iter().map(Track::new).collect();
+    let run = n.path_data_mut().and_then(|path| edge_run(&tracks, path));
+    let mut a = (*n.appearance).clone();
+    for r in &mut a.items {
+        fit_to_edge(r, run);
+    }
+    n.appearance = a.into();
+}

crates/engine/src/cmd/buildcmds/live_paint.rs

@@ -1,8 +1,8 @@
 use super::{
     Appearance, AppearanceItem, Arc, Beside, Document, EDGE_NAME, EngineError, FACE_NAME, GapOptions, GapSize, LIVE_PAINT_NAME, Node, NodeId,
-    PathData, Point, Rect, Result, SOURCES_NAME, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite, ids_json,
-    is_live_paint, json, number_or, object_param, paint_from, po, point_param, repaint_from, replace_roots, root_ids, source_nodes, source_shapes,
-    switch_or,
+    PathData, Point, Rect, Result, SOURCES_NAME, Selection, Session, SubPath, Value, b, bad, build_children, edge_near, face_at, finite,
+    fit_to_old_edge, ids_json, is_live_paint, json, number_or, object_param, paint_from, po, point_param, repaint_from, replace_roots, root_ids,
+    source_nodes, source_shapes, switch_or,
 };
 
 /// `options` as stored on a Live Paint group: none for the defaults.
@@ -85,6 +85,9 @@ pub(super) fn lp_make(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({ "id": id.0, "faces": faces, "edges": edges }))
 }
 
+/// How far, in points, the middle of an edge Merge makes may be from the old edge it lies on.
+const ON_OLD_EDGE: f64 = 1e-3;
+
 /// What Merge carries from a face or edge to the part it makes again in its place, another path:
 /// the appearance, visibility, opacity and blending mode. Gradients fitted to the old outline keep
 /// that fit, and the strokes' pen pressure, tilt, bearing and rotation stay behind.
@@ -125,18 +128,11 @@ fn merge_live(d: &mut Document, sel: &mut Selection, roots: &[NodeId]) -> Result
         .ok_or_else(|| EngineError::Other("Live Paint Merge: select a Live Paint group and the paths to add".into()))?;
     check_live_paint_takes(d, roots)?;
     let old = d.node(target).cloned().ok_or(EngineError::NoNode(target))?;
-    // Paint to carry over: (point inside face, paint) for faces that draw, and (point on edge,
-    // paint) for every edge.
+    // Paint to carry over: (point inside face, paint) for faces that draw; edges are matched to the
+    // old edges below.
     let keep_faces: Vec<(Point, Carried)> =
         b::faces(&old).iter().filter(|f| draws(f)).filter_map(|f| Some((po::interior_point(f.path_data()?)?, Carried::of(f)))).collect();
-    let keep_edges: Vec<(Point, Carried)> = b::edges(&old)
-        .iter()
-        .filter_map(|e| {
-            let pd = e.path_data()?;
-            let sp = pd.subpaths.first().filter(|sp| sp.segment_count() > 0)?;
-            Some((kurbo::ParamCurve::eval(&sp.segment(0), 0.5), Carried::of(e)))
-        })
-        .collect();
+    let old_parts = old.clone();
     let mut sources = source_nodes(&old);
     for r in roots {
         if *r != target {
@@ -162,12 +158,24 @@ fn merge_live(d: &mut Document, sel: &mut Selection, roots: &[NodeId]) -> Result
             carried.onto(Arc::make_mut(f));
         }
     }
-    for (pt, carried) in keep_edges {
-        if let Some(eid) = edge_near(&g, pt, 0.5).map(|e| e.id)
-            && let Some(ch) = g.children_mut()
-            && let Some(e) = ch.iter_mut().find(|c| c.id == eid)
-        {
-            carried.onto(Arc::make_mut(e));
+    // Each edge whose middle lies on an old edge, every piece of an edge an added path cuts
+    // included, takes the old edge's paint, with its rows fitted to its part of the old edge.
+    if let Some(ch) = g.children_mut() {
+        for c in ch.iter_mut().filter(|c| c.name.as_deref() == Some(EDGE_NAME)) {
+            let Some(mid) = c
+                .path_data()
+                .and_then(|pd| pd.subpaths.first())
+                .filter(|sp| sp.segment_count() > 0)
+                .map(|sp| kurbo::ParamCurve::eval(&sp.segment(0), 0.5))
+            else {
+                continue;
+            };
+            let Some(was) = edge_near(&old_parts, mid, ON_OLD_EDGE) else { continue };
+            let e = Arc::make_mut(c);
+            Carried::of(was).onto(e);
+            if let Some(outline) = was.path_data() {
+                fit_to_old_edge(e, outline);
+            }
         }
     }
     let mut merged = Beside::replacing(d, roots);

crates/engine/src/cmd/effectcmd.rs

@@ -835,11 +835,13 @@ pub(crate) fn set_params(s: &mut Session, p: &Value) -> Result<Value> {
 const GLASS: &str = "distort.glass";
 /// Effect › Texture › Texturizer.
 const TEXTURIZER: &str = "texture.texturizer";
+/// Effect › Artistic › Rough Pastels.
+const ROUGH_PASTELS: &str = "artistic.roughPastels";
 
 /// Does effect `id` have Load Texture: a `textureImage` that `effect.apply` reads from an image
-/// file (Glass, Texturizer)?
+/// file (Glass, Texturizer, Rough Pastels)?
 pub(crate) fn texture_load_effect(id: &str) -> bool {
-    id == GLASS || id == TEXTURIZER
+    id == GLASS || id == TEXTURIZER || id == ROUGH_PASTELS
 }
 
 /// Glass's `textureImage` in `params` as Glass stores it: an image file (`{path}`, or `{name?,

crates/engine/src/cmd/fileio.rs

@@ -39,7 +39,7 @@ pub mod jxlread;
 mod legacy_ai;
 mod load;
 mod mesh3d;
-pub(crate) use load::{MAX_RASTER_ALLOC, size_note};
+pub(crate) use load::{MAX_RASTER_ALLOC, file_clipped, size_note};
 mod heifread;
 mod hpgl;
 mod jp2read;

crates/engine/src/cmd/fileio/load.rs

@@ -1074,16 +1074,32 @@ pub(super) fn raster_doc(name: &str, bytes: &[u8]) -> Result<Document> {
     let layer = d.layers[0].id;
     let id = d.alloc_id();
     let xf = Affine::scale_non_uniform(sx, sy);
-    let mut n = Node::new(
+    let n = Node::new(
         id,
         NodeKind::Image(Box::new(ImageObject { key: key.clone(), width, height, xf, link: None, placement: Default::default(), pixels: None })),
     );
+    let mut n = file_clipped(&mut d, n, psdread::clipping_path(bytes));
     n.name = Some(name.to_string());
     d.images.insert(key, blob);
     d.insert(Some(layer), 0, n).map_err(err)?;
     Ok(d)
 }
 
+/// Image `image` of `d` clipped by `clip`, the clipping path its file names in the image's pixel
+/// space (a PSD or PSB file's, [`psdread::clipping_path`]): a clip group of that path (even-odd,
+/// with no paint) and the image. Without one the image stays as it is.
+pub(crate) fn file_clipped(d: &mut Document, image: Node, clip: Option<vectorcraft_geom::PathData>) -> Node {
+    let (Some(mut path), NodeKind::Image(im)) = (clip, &image.kind) else { return image };
+    path.transform(im.xf);
+    let none = vectorcraft_color::Paint::None;
+    let mut clip = Node::path(d.alloc_id(), path, vectorcraft_doc::Appearance::basic(none.clone(), none, 0.0));
+    if let NodeKind::Path { clipping, rule, .. } = &mut clip.kind {
+        *clipping = true;
+        *rule = vectorcraft_geom::FillRule::EvenOdd;
+    }
+    Node::new(d.alloc_id(), NodeKind::Group { children: vec![std::sync::Arc::new(clip), std::sync::Arc::new(image)], clip: true })
+}
+
 /// Does this import note say that the file has something the document doesn't?
 fn is_loss(note: &str) -> bool {
     note == vectorcraft_pdf::OFF_ARTBOARD_NOTE || vectorcraft_eps::is_loss(note)

crates/engine/src/cmd/fileio/psdread.rs

@@ -2,7 +2,8 @@
 //! File › Place (#918): the merged image, the flattened picture every PSD carries after its layers,
 //! as a linked PSD shows. Written from Adobe's public "Photoshop File Formats Specification"
 //! (<https://www.adobe.com/devnet-apps/photoshop/fileformatashtml/>). File › Open reads the
-//! layers with [`super::psdlayers`], which shares this reader.
+//! layers with [`super::psdlayers`], which shares this reader. The clipping path a document names
+//! ([`clipping_path`]) clips its merged image where it opens or is placed.
 //!
 //! Every mode Photoshop saves a merged image in is read: Bitmap, Grayscale, Duotone (as its
 //! grayscale data), Indexed, RGB, CMYK and Lab, at 1, 8, 16 and 32 bits per channel, stored raw,
@@ -14,6 +15,7 @@
 use std::io::Read;
 
 use vectorcraft_color::cms::{Lab, lab::lab_to_srgb};
+use vectorcraft_geom::{Anchor, AnchorKind, PathData, Point, SubPath};
 
 /// Photoshop's colour modes (the header's numbers), as far as the merged image is concerned.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
@@ -154,30 +156,113 @@ pub(super) fn header<'a>(r: &mut Reader<'a>) -> Result<Header<'a>, String> {
 pub fn resolution(bytes: &[u8]) -> Option<(f64, f64)> {
     let mut r = Reader::new(bytes);
     let h = header(&mut r).ok()?;
-    let mut r = Reader::new(h.resources);
-    while !r.rest().is_empty() {
-        r.take(4).ok()?;
+    let (_, _, data) = resources(h.resources, false).find(|(id, _, _)| *id == 0x03ed)?;
+    let mut d = Reader::new(data);
+    // Fixed 16.16 values, each with its unit (1: per inch, 2: per centimetre) and the unit the
+    // size is shown in.
+    let mut axis = || -> Option<f64> {
+        let v = f64::from(d.u32().ok()?) / 65536.0;
+        let unit = d.u16().ok()?;
+        d.u16().ok()?;
+        Some(if unit == 2 { v * 2.54 } else { v })
+    };
+    Some((axis()?, axis()?))
+}
+
+/// The image resource blocks of `resources`, in file order: each one's id, name (the bytes of its
+/// Pascal string) and data. Stops at the first block that is cut short. With `signed`, only the
+/// blocks whose signature is `8BIM` are given.
+fn resources(resources: &[u8], signed: bool) -> impl Iterator<Item = (u16, &[u8], &[u8])> {
+    let mut r = Reader::new(resources);
+    std::iter::from_fn(move || {
+        if r.rest().is_empty() {
+            return None;
+        }
+        let ours = r.take(4).ok()? == b"8BIM";
         let id = r.u16().ok()?;
         // A Pascal string padded to an even size, length byte included.
-        let name = usize::from(r.u8().ok()?);
-        r.take(name + (name + 1) % 2).ok()?;
+        let len = usize::from(r.u8().ok()?);
+        let name = r.take(len).ok()?;
+        r.take((len + 1) % 2).ok()?;
         let size = usize::try_from(r.u32().ok()?).ok()?;
         let data = r.take(size).ok()?;
         r.take(size % 2).ok()?;
-        if id == 0x03ed {
-            let mut d = Reader::new(data);
-            // Fixed 16.16 values, each with its unit (1: per inch, 2: per centimetre) and the
-            // unit the size is shown in.
-            let mut axis = || -> Option<f64> {
-                let v = f64::from(d.u32().ok()?) / 65536.0;
-                let unit = d.u16().ok()?;
-                d.u16().ok()?;
-                Some(if unit == 2 { v * 2.54 } else { v })
-            };
-            return Some((axis()?, axis()?));
+        Some((ours, id, name, data))
+    })
+    .filter(move |(ours, ..)| *ours || !signed)
+    .map(|(_, id, name, data)| (id, name, data))
+}
+
+/// The resource naming the document's clipping path.
+const CLIPPING_PATH_NAME: u16 = 2999;
+
+/// The saved paths' resource ids.
+const SAVED_PATHS: std::ops::RangeInclusive<u16> = 2000..=2997;
+
+/// The clipping path a PSD or PSB file names, in its pixel space (x across its width, y down
+/// its height): the saved path (resources 2000 to 2997) whose name the clipping path resource
+/// (2999) gives, both `8BIM` resources. `None` when the document names none, names a path it doesn't have, or that path
+/// has no anchors or more records than [`vectorcraft_geom::path::MAX_READ_ANCHORS`]. Saved paths
+/// use the even-odd rule. A path whose initial fill record says the fill starts with all pixels
+/// begins with a subpath around the whole image, so its subpaths cut holes in it.
+pub fn clipping_path(bytes: &[u8]) -> Option<PathData> {
+    let mut r = Reader::new(bytes);
+    let h = header(&mut r).ok()?;
+    let (_, _, named) = resources(h.resources, true).find(|(id, _, _)| *id == CLIPPING_PATH_NAME)?;
+    // A Pascal string, then the flatness and a fill rule, which the specification says is ignored.
+    let len = usize::from(*named.first()?);
+    let name = named.get(1..1 + len)?;
+    let (_, _, data) = resources(h.resources, true).find(|(id, n, _)| SAVED_PATHS.contains(id) && *n == name)?;
+    // A path of more records than a document may hold anchors is left out before it is built.
+    if data.len() / PATH_RECORD > vectorcraft_geom::path::MAX_READ_ANCHORS {
+        return None;
+    }
+    let path = saved_path(data, f64::from(h.width), f64::from(h.height));
+    (!path.is_empty()).then_some(path)
+}
+
+/// One record of a saved path: a selector, then 24 bytes.
+const PATH_RECORD: usize = 26;
+
+/// The saved path of path records `data`, scaled to an image `width` × `height` pixels. Knot
+/// records come after their subpath's length record; one that comes before any, or past the knots
+/// a length record counts, is left out, as is a last record cut short.
+fn saved_path(data: &[u8], width: f64, height: f64) -> PathData {
+    // A path point: a vertical, then a horizontal signed 8.24 fixed-point fraction of the image's
+    // height and width.
+    let fixed = |b: [u8; 4]| f64::from(i32::from_be_bytes(b)) / f64::from(1 << 24);
+    let point = |[v0, v1, v2, v3, h0, h1, h2, h3]: [u8; 8]| Point::new(fixed([h0, h1, h2, h3]) * width, fixed([v0, v1, v2, v3]) * height);
+    let mut subpaths: Vec<SubPath> = vec![];
+    let mut all_pixels = false;
+    // The knots the current subpath still takes.
+    let mut left = 0usize;
+    let (records, _) = data.as_chunks::<PATH_RECORD>();
+    for &[s0, s1, ref body @ ..] in records {
+        let [c0, c1, ..] = *body;
+        let (points, _) = body.as_chunks::<8>();
+        let [a, b, c] = [0, 1, 2].map(|i| points.get(i).copied().map_or(Point::ZERO, point));
+        match u16::from_be_bytes([s0, s1]) {
+            sel @ (0 | 3) => {
+                left = usize::from(u16::from_be_bytes([c0, c1]));
+                // Anchors are added as knots come: a count can claim more than follow.
+                subpaths.push(SubPath::new(vec![], sel == 0));
+            }
+            sel @ (1 | 2 | 4 | 5) if left > 0 => {
+                let Some(sp) = subpaths.last_mut() else { continue };
+                left -= 1;
+                let kind = if matches!(sel, 1 | 4) { AnchorKind::Smooth } else { AnchorKind::Corner };
+                sp.anchors.push(Anchor { h_in: a, p: b, h_out: c, kind });
+            }
+            8 => all_pixels = [c0, c1] == [0, 1],
+            _ => {}
         }
     }
-    None
+    subpaths.retain(|s| !s.anchors.is_empty());
+    if all_pixels && !subpaths.is_empty() {
+        let all = vectorcraft_geom::shapes::rectangle(vectorcraft_geom::Rect::new(0.0, 0.0, width, height));
+        subpaths.splice(0..0, all.subpaths);
+    }
+    PathData::new(subpaths)
 }
 
 /// Does the merged image keep its transparency in the first extra channel? Yes when the layer

crates/engine/src/cmd/fileio/tests_psdread.rs

@@ -1,9 +1,11 @@
 //! Reading Photoshop documents (#918): the merged image of every colour mode, depth and
-//! compression, PSB files, transparency, the resolution, and damaged files refused without a panic.
+//! compression, PSB files, transparency, the resolution, the clipping path, and damaged files
+//! refused without a panic.
 
 use serde_json::{Value, json};
+use vectorcraft_doc::{Document, NodeId, NodeKind};
 
-use super::psdread::{decode, is_psd, resolution};
+use super::psdread::{clipping_path, decode, is_psd, resolution};
 use super::*;
 
 /// A Photoshop document built from its parts: `version` 1 (PSD) or 2 (PSB), the header's fields,
@@ -260,6 +262,199 @@ fn pdd_files_open_and_place() {
     assert!(format_for_name("x.pdd").is_none() && writable_format(None, Some("x.pdd")).is_err(), "an export to .pdd is refused as before");
 }
 
+/// An image resource block: `8BIM`, `id`, `name` as a Pascal string padded to an even size, then
+/// `data` padded to an even size.
+fn resource(id: u16, name: &[u8], data: &[u8]) -> Vec<u8> {
+    let mut r = b"8BIM".to_vec();
+    r.extend(id.to_be_bytes());
+    r.push(name.len() as u8);
+    r.extend(name);
+    if name.len().is_multiple_of(2) {
+        r.push(0);
+    }
+    r.extend((data.len() as u32).to_be_bytes());
+    r.extend(data);
+    if !data.len().is_multiple_of(2) {
+        r.push(0);
+    }
+    r
+}
+
+/// A path point record's 8 bytes: `[x, y]` as fractions of the image's width and height, stored
+/// vertical first as signed 8.24 fixed-point numbers.
+fn point([x, y]: [f64; 2]) -> Vec<u8> {
+    [y, x].iter().flat_map(|v| ((v * f64::from(1 << 24)).round() as i32).to_be_bytes()).collect()
+}
+
+/// A saved path's records: the fill rule record, an initial fill record saying whether the fill
+/// starts with all pixels, then each subpath (closed or not) of corner knots without handles.
+fn saved_path(all_pixels: bool, subpaths: &[(bool, &[[f64; 2]])]) -> Vec<u8> {
+    let record = |selector: u16, body: Vec<u8>| {
+        let mut r = selector.to_be_bytes().to_vec();
+        r.extend(body);
+        r.resize(26, 0);
+        r
+    };
+    let mut d = record(6, vec![]);
+    d.extend(record(8, vec![0, u8::from(all_pixels)]));
+    for (closed, knots) in subpaths {
+        d.extend(record(if *closed { 0 } else { 3 }, (knots.len() as u16).to_be_bytes().to_vec()));
+        for k in *knots {
+            d.extend(record(if *closed { 2 } else { 5 }, [point(*k), point(*k), point(*k)].concat()));
+        }
+    }
+    d
+}
+
+/// The clipping path resource (2999) naming the saved path `name`, with a flatness of 0 and the
+/// fill rule left as it is.
+fn clipping_name(name: &[u8]) -> Vec<u8> {
+    let mut d = vec![name.len() as u8];
+    d.extend(name);
+    d.extend([0; 6]);
+    resource(2999, b"", &d)
+}
+
+/// A 100 × 50 pixel red RGB document with `resources`, flat or with a layer count of 0.
+fn red_psd(resources: &[u8]) -> Vec<u8> {
+    psd(1, 3, (100, 50), 8, 3, &[], resources, &[], &raw(&[&[255; 5000], &[0; 5000], &[0; 5000]]))
+}
+
+/// The triangle saved as "Outline", another path saved as "Other", and the clipping path naming
+/// "Outline".
+fn triangle_resources() -> Vec<u8> {
+    let other = saved_path(false, &[(true, &[[0.0, 0.0], [0.1, 0.0], [0.1, 0.1]])]);
+    let outline = saved_path(false, &[(true, &[[0.5, 0.0], [1.0, 1.0], [0.0, 1.0]])]);
+    [resource(2000, b"Other", &other), resource(2001, b"Outline", &outline), clipping_name(b"Outline")].concat()
+}
+
+/// The clip group a PSD file comes in as: its clipping path's anchors (pt), whether that path
+/// uses the even-odd rule, and the image it clips.
+fn clip_group(d: &Document, id: NodeId) -> (Vec<[f64; 2]>, bool, NodeId) {
+    let Some(NodeKind::Group { children, clip: true }) = d.node(id).map(|n| &n.kind) else { panic!("not a clip group: {:?}", d.node(id)) };
+    let [path, image] = &children[..] else { panic!("{} children", children.len()) };
+    let NodeKind::Path { path: p, rule, clipping: true, .. } = &path.kind else { panic!("not a clipping path") };
+    assert!(matches!(image.kind, NodeKind::Image(_)));
+    let anchors = p.anchors().map(|(_, _, a)| [a.p.x, a.p.y]).collect();
+    (anchors, *rule == vectorcraft_geom::FillRule::EvenOdd, image.id)
+}
+
+#[test]
+fn the_clipping_path_clips_the_merged_image_on_place_and_open() {
+    let f = red_psd(&triangle_resources());
+    let triangle = vec![[50.0, 0.0], [100.0, 50.0], [0.0, 50.0]];
+    let data = vectorcraft_format::base64_encode(&f);
+    // Place: one clip group of the named path, not the other, at 100 % (72 ppi: a pixel a point).
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
+    let r = s.execute("file.place", &json!({"name": "cut.psd", "dataBase64": data, "at": [50, 25]})).unwrap();
+    let id = NodeId(r["ids"][0].as_u64().unwrap());
+    let (anchors, even_odd, image) = clip_group(&s.doc().unwrap().doc, id);
+    assert_eq!((anchors, even_odd), (triangle.clone(), true));
+    assert_eq!(r["image"], image.0, "{r}");
+    assert_eq!((r["width"].as_f64(), r["height"].as_f64()), (Some(100.0), Some(50.0)));
+    // Open with layers off, and a flat file opened with layers on, as its merged image.
+    for params in [json!({"layers": false}), json!({})] {
+        s.execute("document.open", &merge(json!({"name": "cut.psd", "dataBase64": data}), params.clone())).unwrap();
+        let d = &s.doc().unwrap().doc;
+        let top = d.layers[0].children().unwrap();
+        assert_eq!(top.len(), 1, "{params}");
+        assert_eq!(top[0].name.as_deref(), Some("cut.psd"), "{params}");
+        let group = top[0].id;
+        let (anchors, even_odd, _) = clip_group(d, group);
+        assert_eq!((anchors, even_odd), (triangle.clone(), true), "{params}");
+        // The corner outside the triangle draws nothing; its middle draws red.
+        let png = image::load_from_memory(&exported(&mut s, json!({"format": "png"}))).unwrap().to_rgba8();
+        assert_eq!((png.get_pixel(2, 2).0[3], png.get_pixel(50, 40).0), (0, [255, 0, 0, 255]), "{params}");
+        // The clipping path is an ordinary path: releasing the clipping mask leaves the image whole.
+        s.execute("select.set", &json!({"ids": [group.0]})).unwrap();
+        s.execute("object.clippingMask.release", &json!({})).unwrap();
+        let png = image::load_from_memory(&exported(&mut s, json!({"format": "png"}))).unwrap().to_rgba8();
+        assert_eq!(png.get_pixel(2, 2).0, [255, 0, 0, 255], "{params}");
+    }
+}
+
+/// Replace keeps a clipped PSD file's scale, as it keeps an image's.
+#[test]
+fn replacing_a_clipped_psd_keeps_its_scale() {
+    let data = vectorcraft_format::base64_encode(&red_psd(&triangle_resources()));
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
+    s.execute("file.place", &json!({"name": "cut.psd", "dataBase64": data, "at": [200, 200]})).unwrap();
+    s.execute("object.scale", &json!({"sx": 200, "sy": 200})).unwrap();
+    let r = s.execute("file.place", &json!({"name": "cut.psd", "dataBase64": data, "replace": true})).unwrap();
+    assert_eq!((r["width"].as_f64(), r["height"].as_f64()), (Some(200.0), Some(100.0)), "{r}");
+    let (anchors, _, _) = clip_group(&s.doc().unwrap().doc, NodeId(r["ids"][0].as_u64().unwrap()));
+    assert_eq!(anchors, [[200.0, 150.0], [300.0, 250.0], [100.0, 250.0]]);
+    // Other art replacing the clip group takes its centre only, as before.
+    let plain = vectorcraft_format::base64_encode(&red_psd(&[]));
+    let r = s.execute("file.place", &json!({"name": "plain.psd", "dataBase64": plain, "replace": true})).unwrap();
+    assert_eq!((r["width"].as_f64(), r["height"].as_f64()), (Some(100.0), Some(50.0)), "{r}");
+}
+
+#[test]
+fn a_fill_that_starts_with_all_pixels_puts_the_image_around_the_path() {
+    let hole = saved_path(true, &[(true, &[[0.25, 0.25], [0.75, 0.25], [0.75, 0.75], [0.25, 0.75]])]);
+    let f = red_psd(&[resource(2000, b"Hole", &hole), clipping_name(b"Hole")].concat());
+    let path = clipping_path(&f).unwrap();
+    let starts: Vec<_> = path.subpaths.iter().map(|s| (s.anchors[0].p.x, s.anchors[0].p.y, s.closed)).collect();
+    assert_eq!(starts, [(0.0, 0.0, true), (25.0, 12.5, true)], "the image's edges, then the hole");
+    let mut s = Session::new();
+    s.execute("document.open", &json!({"name": "hole.psd", "dataBase64": vectorcraft_format::base64_encode(&f), "layers": false})).unwrap();
+    let png = image::load_from_memory(&exported(&mut s, json!({"format": "png"}))).unwrap().to_rgba8();
+    assert_eq!((png.get_pixel(2, 2).0, png.get_pixel(50, 25).0[3]), ([255, 0, 0, 255], 0));
+}
+
+#[test]
+fn files_naming_no_clipping_path_or_a_missing_one_place_a_plain_image() {
+    let other = saved_path(false, &[(true, &[[0.0, 0.0], [1.0, 0.0], [1.0, 1.0]])]);
+    let empty = saved_path(false, &[]);
+    for (resources, what) in [
+        (resource(2000, b"Other", &other), "saved paths, none named"),
+        ([resource(2000, b"Other", &other), clipping_name(b"Gone")].concat(), "a name no path has"),
+        ([resource(2000, b"Empty", &empty), clipping_name(b"Empty")].concat(), "a path with no knots"),
+        ([resource(3000, b"Other", &other), clipping_name(b"Other")].concat(), "a resource outside the saved paths"),
+        ([resource(2000, b"Other", &other), [&b"MeSa"[..], &clipping_name(b"Other")[4..]].concat()].concat(), "a block not signed 8BIM"),
+        (vec![], "no resources"),
+    ] {
+        let f = red_psd(&resources);
+        assert!(clipping_path(&f).is_none(), "{what}");
+        let mut s = Session::new();
+        s.execute("file.new", &json!({})).unwrap();
+        let r = s.execute("file.place", &json!({"name": "a.psd", "dataBase64": vectorcraft_format::base64_encode(&f)})).unwrap();
+        let id = NodeId(r["ids"][0].as_u64().unwrap());
+        assert!(matches!(s.doc().unwrap().doc.node(id).map(|n| &n.kind), Some(NodeKind::Image(_))), "{what}");
+        assert!(r.get("image").is_none(), "{what}: {r}");
+    }
+}
+
+#[test]
+fn damaged_clipping_paths_are_read_without_a_panic() {
+    let good = red_psd(&triangle_resources());
+    assert!(clipping_path(&good).is_some());
+    // The header, the empty colour mode data, then the resources' length and the resources.
+    let start = 26 + 4;
+    let end = start + 4 + triangle_resources().len();
+    for n in 0..end + 2 {
+        let _ = clipping_path(&good[..n]);
+    }
+    for i in start..end {
+        for v in [0, 1, 0x7f, 0x80, 0xff] {
+            let mut f = good.clone();
+            f[i] = v;
+            let _ = clipping_path(&f);
+        }
+    }
+    // Knots before any length record, and more knots than a length record counts, are left out.
+    let mut extra = saved_path(false, &[(true, &[[0.0, 0.0], [1.0, 0.0], [1.0, 1.0]])]);
+    extra[26 * 2 + 3] = 2;
+    let mut stray = 2u16.to_be_bytes().to_vec();
+    stray.resize(26, 0);
+    extra.splice(26..26, stray);
+    let path = clipping_path(&red_psd(&[resource(2000, b"P", &extra), clipping_name(b"P")].concat())).unwrap();
+    assert_eq!(path.subpaths.iter().map(|s| s.anchors.len()).collect::<Vec<_>>(), [2]);
+}
+
 #[test]
 fn damaged_and_unsupported_files_are_refused_without_a_panic() {
     let good = psd(2, 4, (3, 2), 8, 3, &[], &[], &layer_count(-1, true), &raw(&[&[1; 6], &[2; 6], &[3; 6], &[4; 6]]));

crates/engine/src/cmd/graph/tests.rs

@@ -7372,8 +7372,8 @@ fn graph_commands_refuse_params_of_the_wrong_type() {
 }
 
 /// A `.ai` in PostScript form whose graph's records read whole (version 7 specification, appendix A)
-/// opens as a graph whose data can be edited: Graph Data redraws it on its plot. Saving it as `.ai`
-/// says its data and settings aren't written, in either form.
+/// opens as a graph whose data can be edited: Graph Data redraws it on its plot. Saving it as `.ai`,
+/// in either form, writes its records, and the file opens again with the graph's new data.
 #[test]
 fn a_graph_opened_from_ai_keeps_its_data_for_editing() {
     let graph = "%_Gs\n%_100 200 300 100 Gb\n%_5 0 0 14 0 1 0 0 6 44 Gy\n%_10 2 0 0 90 80 0 Gd\n\
@@ -7430,10 +7430,60 @@ fn a_graph_opened_from_ai_keeps_its_data_for_editing() {
         }
         let r = s.execute("file.saveAs", &p).unwrap();
         let notes = r["warnings"].as_array().cloned().unwrap_or_default();
-        assert!(notes.iter().any(|w| w.as_str().is_some_and(|w| w.starts_with("graphs are written as their art"))), "{name}: {r}");
+        assert!(!notes.iter().any(|w| w.as_str().is_some_and(|w| w.starts_with("graphs are written as their art"))), "{name}: {r}");
+        let mut again = Session::new();
+        again.execute("document.open", &json!({"path": dir.join(name)})).unwrap();
+        let mut graphs = vec![];
+        again.doc().unwrap().doc.walk(|n| graphs.extend(n.extras().graph.as_deref().cloned()));
+        assert_eq!(graphs.len(), 1, "{name}");
+        let g = &graphs[0];
+        assert_eq!(
+            (g.series.as_slice(), g.categories.as_slice(), g.rows.as_slice()),
+            (&after.series[..], &after.categories[..], &after.rows[..]),
+            "{name}"
+        );
+        assert_eq!(g.kind, after.kind, "{name}");
     }
 }
 
+/// A graph the graph tools draw, of each type, saved as `.ai` in either form, opens again as the same
+/// graph exactly when the save gives no warning about graphs; a column graph does.
+#[test]
+fn a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns() {
+    let dir = vectorcraft_testkit::temp_dir("graph-ai-save");
+    let mut live = vec![];
+    for ty in ["column", "stackedColumn", "bar", "stackedBar", "line", "area", "scatter", "pie", "radar"] {
+        let mut s = Session::new();
+        s.execute("file.new", &json!({"width": 800, "height": 800})).unwrap();
+        let csv = ",2024,2025\nQ1,3,2\nQ2,5,4\nQ3,1,6";
+        let id = s.execute("graph.create", &json!({"type": ty, "x": 100, "y": 100, "width": 300, "height": 200, "csv": csv})).unwrap()["id"]
+            .as_u64()
+            .unwrap();
+        let written = spec(&s, NodeId(id));
+        for (name, version) in [("v7.ai", Some("7")), ("pdf.ai", None)] {
+            let path = dir.join(format!("{ty}-{name}"));
+            let mut p = json!({"path": path, "format": "ai"});
+            if let Some(v) = version {
+                p["aiVersion"] = json!(v);
+            }
+            let r = s.execute("file.saveAs", &p).unwrap();
+            let notes = r["warnings"].as_array().cloned().unwrap_or_default();
+            let warned = notes.iter().any(|w| w.as_str().is_some_and(|w| w.starts_with("graphs are written as their art")));
+            let mut again = Session::new();
+            again.execute("document.open", &json!({"path": path})).unwrap();
+            let mut graphs = vec![];
+            again.doc().unwrap().doc.walk(|n| graphs.extend(n.extras().graph.as_deref().cloned()));
+            assert_eq!(graphs.len(), usize::from(!warned), "{ty} {name}: {r}");
+            if let Some(g) = graphs.first() {
+                assert_eq!((g.kind, g.cells()), (written.kind, written.cells()), "{ty} {name}");
+                assert_eq!((g.series.as_slice(), g.categories.as_slice()), (&written.series[..], &written.categories[..]), "{ty} {name}");
+                live.push(format!("{ty} {name}"));
+            }
+        }
+    }
+    assert!(live.contains(&"column v7.ai".to_string()) && live.contains(&"column pdf.ai".to_string()), "{live:?}");
+}
+
 /// A graph opened from a `.ai` keeps the bounds of its art without type, so moving one of its labels on its own
 /// leaves the plot where it is at the first redraw.
 #[test]

crates/engine/src/cmd/object/commands.rs

@@ -43,7 +43,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Scale…",
             ["Object", "Transform"],
             None,
-            "{ids?: [id…] (selected first; default: the selection), sx: %, sy?: %, origin?: [x,y], copy?, strokes?: bool (Scale Strokes & Effects: stroke weights, dashes and effect distances scale; off keeps them, type strokes included), corners?: bool (Scale Corners: live corner radii scale), objects?: bool (Transform Objects, default true; false: the art stays and, with patterns, only its pattern tiles transform), patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles), typeAreas?: bool (area type: the frame is reshaped and the text reflows at its size)} (strokes/corners default to the preferences). With anchors selected with Direct Selection (and no copy), only those anchors and their handles transform, about the centre of their own box.",
+            "{ids?: [id…] (selected first; default: the selection), sx: % (along the bounding box's width), sy?: % (along its height), origin?: [x,y] (a page point), basis?: \"box\"|\"page\" (box, the default: sx and sy follow the bounding box, turned with rotated objects until Reset Bounding Box; page: the page's axes; a saved step without basis, recorded before it, plays along the page's axes), copy?, strokes?: bool (Scale Strokes & Effects: stroke weights, dashes and effect distances scale; off keeps them, type strokes included), corners?: bool (Scale Corners: live corner radii scale), objects?: bool (Transform Objects, default true; false: the art stays and, with patterns, only its pattern tiles transform), patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles), typeAreas?: bool (area type: the frame is reshaped and the text reflows at its size)} (strokes/corners default to the preferences). With anchors selected with Direct Selection (and no copy), only those anchors and their handles transform, about the centre of their own box.",
             has_selection,
             scale
         ),
@@ -52,7 +52,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Reflect…",
             ["Object", "Transform"],
             None,
-            "{ids?: [id…] (selected first; default: the selection), axis: \"vertical\"|\"horizontal\"|deg (the mirror line, counter-clockwise from horizontal; 0: horizontal; omitted: vertical), origin?, copy?, objects?: bool (Transform Objects, default true; false: the art stays and, with patterns, only its pattern tiles transform), patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles), typeAreas?: bool (area type: the frame is reshaped and the text reflows at its size)}. With anchors selected with Direct Selection (and no copy), only those anchors and their handles transform, about the centre of their own box.",
+            "{ids?: [id…] (selected first; default: the selection), axis: \"vertical\"|\"horizontal\"|deg (the mirror line, counter-clockwise from horizontal; 0: horizontal; omitted: vertical; vertical and horizontal are the bounding box's own axes, deg a line on the page), origin?, basis?: \"box\"|\"page\" (for a named axis; box, the default: the bounding box's axes, turned with rotated objects until Reset Bounding Box; page: the page's axes; a saved step without basis, recorded before it, plays along the page's axes), copy?, objects?: bool (Transform Objects, default true; false: the art stays and, with patterns, only its pattern tiles transform), patterns?: bool (Transform Patterns: pattern fills and strokes transform with the art; default: prefs transformPatternTiles), typeAreas?: bool (area type: the frame is reshaped and the text reflows at its size)}. With anchors selected with Direct Selection (and no copy), only those anchors and their handles transform, about the centre of their own box.",
             has_selection,
             reflect
         ),

crates/engine/src/cmd/object/transform.rs

@@ -1,7 +1,7 @@
 use super::align::choice;
 use super::{
-    Affine, Arc, Document, EngineError, LastTransform, Node, NodeId, NodeKind, Point, Result, Scaling, Session, Value, Vec2, bad, bool_or,
-    check_numbers, check_switches, duplicate_in, effects, f64_or, f64_req, ids_param, json, matrix_param, ok, outermost, point_param,
+    Affine, Arc, Document, EngineError, LastTransform, Node, NodeId, NodeKind, OrientedBox, Point, Rect, Result, Scaling, Session, Value, Vec2, bad,
+    bool_or, check_numbers, check_switches, duplicate_in, effects, f64_or, f64_req, ids_param, json, matrix_param, ok, outermost, point_param,
     selected_roots_to_transform,
 };
 
@@ -358,26 +358,52 @@ pub(super) fn scale(s: &mut Session, p: &Value) -> Result<Value> {
     if sx == 0.0 || sy == 0.0 {
         return Err(bad("object.scale", "scale must be non-zero"));
     }
-    apply_transform(s, "Scale", ids, about(o, Affine::scale_non_uniform(sx, sy)), p, true)
+    let frame = basis_frame(s, p, "object.scale", &ids)?;
+    apply_transform(s, "Scale", ids, about(o, frame.conjugate(Affine::scale_non_uniform(sx, sy))), p, true)
+}
+
+/// The frame that `object.scale` and a named `object.reflect` act in, from the `basis` param:
+/// `"box"` (the default) is the bounding box of `ids`, turned with rotated objects until Reset
+/// Bounding Box ([`Document::bbox_angle`]); `"page"` is the page's axes. Anchors selected with
+/// Direct Selection (with no copy and Transform Objects on) transform along the page's axes, as
+/// their own box does. The basis joins the journal entry, so a replay acts in the same frame. A
+/// saved step without `basis` ([`Session::replay`]) was recorded before Scale and Reflect followed
+/// the box, so it acts along the page's axes, as it did when it was recorded.
+fn basis_frame(s: &mut Session, p: &Value, cmd: &str, ids: &[NodeId]) -> Result<OrientedBox> {
+    let basis = choice(p, cmd, "basis", &["box", "page"])?;
+    let page = basis == Some("page") || (basis.is_none() && s.replaying());
+    let st = s.doc()?;
+    let anchors = !bool_or(p, "copy", false)
+        && transforms_objects(p)
+        && effects::preview::anchor_bounds_with(&st.selection, &st.doc, s.bounds_measure()).is_some();
+    let angle = if page || anchors { 0.0 } else { st.doc.bbox_angle(ids) };
+    s.note_journal("basis", json!(if page { "page" } else { "box" }));
+    Ok(OrientedBox { angle, rect: Rect::ZERO })
 }
 
 pub(super) fn reflect(s: &mut Session, p: &Value) -> Result<Value> {
     check_switches(p, &TRANSFORM_SWITCHES, "object.reflect")?;
     let ids = selected_roots_to_transform(s)?;
     let o = origin_of(s, p, &ids)?;
-    let m = match p.get("axis") {
-        Some(Value::String(a)) if a == "horizontal" => Affine::scale_non_uniform(1.0, -1.0),
-        Some(Value::Number(n)) => {
-            let t = -n.as_f64().unwrap_or(90.0).to_radians();
-            Affine::rotate(t) * Affine::scale_non_uniform(1.0, -1.0) * Affine::rotate(-t)
-        }
-        None | Some(Value::Null) => Affine::scale_non_uniform(-1.0, 1.0),
-        Some(Value::String(a)) if a == "vertical" => Affine::scale_non_uniform(-1.0, 1.0),
+    // A named axis is the bounding box's own (see [`basis_frame`]); an angle is a line on the page.
+    let named = match p.get("axis") {
+        Some(Value::String(a)) if a == "horizontal" => Some(Affine::scale_non_uniform(1.0, -1.0)),
+        Some(Value::Number(_)) => None,
+        None | Some(Value::Null) => Some(Affine::scale_non_uniform(-1.0, 1.0)),
+        Some(Value::String(a)) if a == "vertical" => Some(Affine::scale_non_uniform(-1.0, 1.0)),
         Some(v) => {
             let given = v.as_str().map_or_else(|| v.to_string(), str::to_string);
             return Err(bad("object.reflect", format!("axis must be \"vertical\", \"horizontal\" or an angle in degrees, not `{given}`")));
         }
     };
+    let m = match named {
+        Some(m) => basis_frame(s, p, "object.reflect", &ids)?.conjugate(m),
+        None => {
+            choice(p, "object.reflect", "basis", &["box", "page"])?;
+            let t = -p.get("axis").and_then(Value::as_f64).unwrap_or(90.0).to_radians();
+            Affine::rotate(t) * Affine::scale_non_uniform(1.0, -1.0) * Affine::rotate(-t)
+        }
+    };
     apply_transform(s, "Reflect", ids, about(o, m), p, true)
 }
 

crates/engine/src/cmd/params.rs

@@ -424,9 +424,9 @@ fn check_effect_types(id: &str, effect: &str, params: &Value) -> Result<()> {
 /// A value of the type effect `effect` reads for `key`, a parameter its params description names
 /// without a dialog default: the earlier 3D Perspective and light (`perspective`, `lightAzimuth`,
 /// `lightElevation`) and Scribble `variation` are numbers, an Outline Stroke's `width` is a number
-/// and a Gaussian Blur's `linear` is true or false. A Glass or Texturizer `textureImage`, an SVG
-/// filter's `name` and `xml`, a Warp's `version` and the `style` of Crop Marks have checks of their
-/// own; they aren't listed.
+/// and a Gaussian Blur's `linear` is true or false. A Glass, Texturizer or Rough Pastels
+/// `textureImage`, an SVG filter's `name` and `xml`, a Warp's `version` and the `style` of Crop
+/// Marks have checks of their own; they aren't listed.
 pub(crate) fn undefaulted_type(effect: &str, key: &str) -> Option<Value> {
     use vectorcraft_render::effects;
     let number = || Some(Value::from(0.0));

crates/engine/src/cmd/place.rs

@@ -75,7 +75,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Place…",
             ["File"],
             Some("Cmd+Shift+P"),
-            "{path | name | dataBase64 (a file's path, or its name with its bytes), link?: true (a raster image keeps its file's path; a VectorCraft document at path becomes one locked placed document showing artboard `page`, linked to the file and read again when it changes (links.update; saving it in this app updates it at once), drawn as vectors in every output; so does a PDF/.ai page at path, showing its `crop` box, unless password or textAs: \"outlines\" is given; false: an editable copy of its art, as from dataBase64; other files are embedded), text?: {characterSet?: \"unicode\" (UTF-8, or UTF-16 with a byte-order mark, or without one by dataset.import's rule: an even length, at least half of its two-byte units holding a NUL byte, the byte order that reads a line break, valid UTF-16 with no NUL character; other bytes as the platform's 8-bit set) | \"ansi\" (the platform's 8-bit set), platform?: \"windows\" (Windows-1252) | \"mac\" (Mac Roman), removeLineReturns?: false (each block of lines becomes one paragraph; blank lines end paragraphs), removeParagraphReturns?: false (drop blank lines), replaceSpaces?: n (runs of n ≥ 2 spaces become a tab)} (a .txt file, placed as area type filling rect, the replaced object's bounds, or else the artboard less a 36 pt margin), template?: false (onto a new locked template layer below the current layer), replace?: false (swap the one selected object, keeping its stacking place and transform; no at/rect; refused while an object of a symbol instance's art is selected), at?: [x, y] centre (default: the first artboard's centre), rect?: [x, y, width, height] fit inside; aspect kept (wins over at), page?: 1 (PDF/.ai page, or a native document's artboard), crop?: \"crop\" (clipped to that page or artboard, default; an SVG, only when given: framed and clipped by its viewBox, else by its art's bounds) | \"bounding\" (the bounds of the art that shows, with its strokes and effects, as an export measures them: hidden objects and guides left out) | \"art\" | \"trim\" | \"bleed\" | \"media\" (a PDF page's boxes), password? (an encrypted PDF), dxf?: {…the DXF options of document.open} (a .dxf drawing: fit fills the artboard under at, else the first; fitted or uncentred art lands with its drawing's artboard on that artboard, else it is centred on at)} → {ids, name, format, linked, width, height, warnings, image?: the id of the image of a DCS file placed in a clip group, which the Links commands take}. Raster images come in at 100% of their physical size (the file's ppi, else 72); SVG, DXF, HP-GL (.plt, .hpgl, .hgl, .hpg), PDF/.ai, EMF/WMF and PICT (.pct, .pic, .pict; clipped to the picture's frame), EPS (clipped to its bounding box; as document.open reads it), a .ai saved without PDF compatibility (from its editing data, as document.open reads it: the art of the layers that show on artboard `page`, clipped to that artboard unless crop is \"bounding\") and native documents as one group, with the images, symbols, patterns, swatches and brushes they use. A DCS file (an EPS file with one program per printing plate, DCS 1.0 or 2.0) is placed only from its path with link (else an error, as are document.open and links.embed): one linked image of its plates mixed into CMYK, clipped by the clipping path its composite is drawn through, its spot plates added as spot swatches in the process equivalents the file gives (a swatch of the same name is kept, with a warning); print separations and Separations Preview show each plate on its own ink, and plate files of their own are read from its folder. One undo step; selects what it placed (unless on a template layer); never touches the clipboard. A PNG, JPEG, GIF or WebP image whose pixels can't be read (a file cut short) is an error, and nothing is placed",
+            "{path | name | dataBase64 (a file's path, or its name with its bytes), link?: true (a raster image keeps its file's path; a VectorCraft document at path becomes one locked placed document showing artboard `page`, linked to the file and read again when it changes (links.update; saving it in this app updates it at once), drawn as vectors in every output; so does a PDF/.ai page at path, showing its `crop` box, unless password or textAs: \"outlines\" is given; false: an editable copy of its art, as from dataBase64; other files are embedded), text?: {characterSet?: \"unicode\" (UTF-8, or UTF-16 with a byte-order mark, or without one by dataset.import's rule: an even length, at least half of its two-byte units holding a NUL byte, the byte order that reads a line break, valid UTF-16 with no NUL character; other bytes as the platform's 8-bit set) | \"ansi\" (the platform's 8-bit set), platform?: \"windows\" (Windows-1252) | \"mac\" (Mac Roman), removeLineReturns?: false (each block of lines becomes one paragraph; blank lines end paragraphs), removeParagraphReturns?: false (drop blank lines), replaceSpaces?: n (runs of n ≥ 2 spaces become a tab)} (a .txt file, placed as area type filling rect, the replaced object's bounds, or else the artboard less a 36 pt margin), template?: false (onto a new locked template layer below the current layer), replace?: false (swap the one selected object, keeping its stacking place and transform; no at/rect; refused while an object of a symbol instance's art is selected), at?: [x, y] centre (default: the first artboard's centre), rect?: [x, y, width, height] fit inside; aspect kept (wins over at), page?: 1 (PDF/.ai page, or a native document's artboard), crop?: \"crop\" (clipped to that page or artboard, default; an SVG, only when given: framed and clipped by its viewBox, else by its art's bounds) | \"bounding\" (the bounds of the art that shows, with its strokes and effects, as an export measures them: hidden objects and guides left out) | \"art\" | \"trim\" | \"bleed\" | \"media\" (a PDF page's boxes), password? (an encrypted PDF), dxf?: {…the DXF options of document.open} (a .dxf drawing: fit fills the artboard under at, else the first; fitted or uncentred art lands with its drawing's artboard on that artboard, else it is centred on at)} → {ids, name, format, linked, width, height, warnings, image?: the id of the image of a DCS file or PSD/PSB file placed in a clip group, which the Links commands take}. A PSD or PSB file that names a clipping path places in a clip group of that path (even-odd), as does its merged image in document.open. Raster images come in at 100% of their physical size (the file's ppi, else 72); SVG, DXF, HP-GL (.plt, .hpgl, .hgl, .hpg), PDF/.ai, EMF/WMF and PICT (.pct, .pic, .pict; clipped to the picture's frame), EPS (clipped to its bounding box; as document.open reads it), a .ai saved without PDF compatibility (from its editing data, as document.open reads it: the art of the layers that show on artboard `page`, clipped to that artboard unless crop is \"bounding\") and native documents as one group, with the images, symbols, patterns, swatches and brushes they use. A DCS file (an EPS file with one program per printing plate, DCS 1.0 or 2.0) is placed only from its path with link (else an error, as are document.open and links.embed): one linked image of its plates mixed into CMYK, clipped by the clipping path its composite is drawn through, its spot plates added as spot swatches in the process equivalents the file gives (a swatch of the same name is kept, with a warning); print separations and Separations Preview show each plate on its own ink, and plate files of their own are read from its folder. One undo step; selects what it placed (unless on a template layer); never touches the clipboard. A PNG, JPEG, GIF or WebP image whose pixels can't be read (a file cut short) is an error, and nothing is placed",
             has_doc,
             place
         ),
@@ -113,7 +113,9 @@ pub fn specs() -> Vec<CommandSpec> {
 
 /// A file's art at its natural size, before it joins a document.
 enum Art {
-    Image(RasterImage),
+    /// An image, with the clipping path its file names, in its pixel space (a PSD or PSB file's,
+    /// [`fileio::psdread::clipping_path`]).
+    Image(RasterImage, Option<vectorcraft_geom::PathData>),
     /// A text file's, an RTF file's or a Word document's text, placed as area type filling the
     /// natural box.
     Text(text::Story),
@@ -241,7 +243,8 @@ fn load(p: &Value, cmd: &str, board: Option<Rect>, link_pdf: bool) -> Result<Loa
         let natural = Rect::new(0.0, 0.0, img.width as f64 * sx, img.height as f64 * sy);
         let link = src.path.map(|path| super::links::link_info(path, &src.bytes));
         let warnings = fileio::size_note(&img.blob.bytes).into_iter().collect();
-        return Ok(Loaded { name, format, art: Art::Image(img), natural, warnings, link, board: None });
+        let clip = fileio::psdread::clipping_path(&src.bytes);
+        return Ok(Loaded { name, format, art: Art::Image(img, clip), natural, warnings, link, board: None });
     }
     if pdf {
         // Linked: placed like a VectorCraft document, read again with the page's box only. A page
@@ -411,7 +414,7 @@ fn art_of<'a>(nodes: impl Iterator<Item = &'a Arc<Node>>) -> Vec<Node> {
 /// The art as one object of `d` (its resources added), at its natural size and position.
 fn build(d: &mut Document, l: Loaded, link: Option<LinkInfo>) -> Node {
     let mut node = match l.art {
-        Art::Image(img) => {
+        Art::Image(img, clip) => {
             let (sx, sy) = pt_per_px(img.ppi);
             super::links::store_image(d, &img.key, img.blob, link.is_some());
             let im = ImageObject {
@@ -423,7 +426,8 @@ fn build(d: &mut Document, l: Loaded, link: Option<LinkInfo>) -> Node {
                 placement: Default::default(),
                 pixels: None,
             };
-            Node::new(d.alloc_id(), NodeKind::Image(Box::new(im)))
+            let image = Node::new(d.alloc_id(), NodeKind::Image(Box::new(im)));
+            fileio::file_clipped(d, image, clip)
         }
         Art::Dcs(a) => {
             let a = *a;
@@ -485,9 +489,23 @@ fn at_param(p: &Value) -> Result<Option<Point>> {
 
 /// The transform that puts new art with the natural box `natural` where `old` is: an image's scale
 /// and rotation relative to its 100% size (its resolution's) and its centre are kept (with
-/// `image_xf`); other objects keep their centre.
-fn replace_xf(d: &Document, old: &Node, natural: Rect, image_xf: bool) -> Affine {
-    if image_xf && let NodeKind::Image(im) = &old.kind {
+/// `image_xf`), also for an image alone in a clip group when the new art is an image clipped by
+/// its file's clipping path (`clipped`); other objects keep their centre.
+fn replace_xf(d: &Document, old: &Node, natural: Rect, image_xf: bool, clipped: bool) -> Affine {
+    // An image alone in a clip group (as a PSD or PSB file's clipping path places it,
+    // [`fileio::file_clipped`]) is measured as the image when the new art brings its own clip
+    // group; a DCS file's plates are not.
+    let image = match &old.kind {
+        NodeKind::Group { children, clip: true } if clipped => match &children[..] {
+            [path, image] if matches!(path.kind, NodeKind::Path { clipping: true, .. }) => match &image.kind {
+                NodeKind::Image(im) if d.images.get(&im.key).is_none_or(|b| b.separated().is_none()) => image,
+                _ => old,
+            },
+            _ => old,
+        },
+        _ => old,
+    };
+    if image_xf && let NodeKind::Image(im) = &image.kind {
         let (sx, sy) = pt_per_px(d.images.get(&im.key).and_then(|b| fileio::ppi::resolution(&b.bytes)));
         let full = Affine::scale_non_uniform(sx, sy);
         let centre = full * Point::new(im.width as f64 / 2.0, im.height as f64 / 2.0);
@@ -541,7 +559,7 @@ impl PlaceJob {
         let mut loaded = load(&self.params, PLACE, self.target, true)?;
         let linked = loaded.link.is_some() && bool_or(&self.params, "link", true);
         match &mut loaded.art {
-            Art::Image(img) => {
+            Art::Image(img, _) => {
                 let unread = super::links::kept_unread(&img.blob.bytes);
                 img.blob = super::links::readable_and_kept(img.blob.clone(), unread, linked)?;
             }
@@ -657,7 +675,7 @@ fn apply(s: &mut Session, read: PlaceRead) -> Result<Value> {
     }
     let natural = loaded.natural;
     let m = match (old_node, rect) {
-        (Some(o), _) => replace_xf(&st.doc, o, natural, !is_text),
+        (Some(o), _) => replace_xf(&st.doc, o, natural, !is_text, matches!(loaded.art, Art::Image(_, Some(_)))),
         (None, Some(r)) => fit(natural, r),
         // Its artboard's bottom-left corner on the target's.
         (None, None) if let (Some(src), Some(to)) = (loaded.board, target) => Affine::translate((to.x0 - src.x0, to.y1 - src.y1)),
@@ -671,7 +689,7 @@ fn apply(s: &mut Session, read: PlaceRead) -> Result<Value> {
     let link = loaded.link.take().filter(|_| bool_or(p, "link", true));
     let linked = link.is_some();
     let (name, format, mut warnings) = (loaded.name.clone(), loaded.format.id, std::mem::take(&mut loaded.warnings));
-    let dcs_clipped = matches!(&loaded.art, Art::Dcs(a) if a.clip.is_some());
+    let file_clipped = matches!(&loaded.art, Art::Dcs(a) if a.clip.is_some()) || matches!(&loaded.art, Art::Image(_, Some(_)));
     if let Art::Dcs(a) = &loaded.art {
         warnings.extend(dcs::swatch_notes(&st.doc, &a.spots));
     }
@@ -697,8 +715,9 @@ fn apply(s: &mut Session, read: PlaceRead) -> Result<Value> {
         Ok((id, size))
     })?;
     let mut out = json!({ "ids": [id.0], "name": name, "format": format, "linked": linked, "width": size.width(), "height": size.height(), "warnings": warnings });
-    // A DCS file clipped by its clipping path: its image, which the Links commands take.
-    if dcs_clipped {
+    // A DCS, PSD or PSB file clipped by its clipping path: its image, which the Links commands
+    // take.
+    if file_clipped {
         let image = s.doc()?.doc.node(id).and_then(|n| match &n.kind {
             NodeKind::Group { children, clip: true } => children.get(1).filter(|c| matches!(c.kind, NodeKind::Image(_))).map(|c| c.id),
             _ => None,
@@ -810,7 +829,7 @@ fn read_queue(doc: u64, p: Value, queued: Vec<Value>) -> Result<QueueRead> {
         let checked = load(&q, QUEUE, None, false).and_then(|mut l| {
             let linked = l.link.is_some() && bool_or(&q, "link", true);
             match &mut l.art {
-                Art::Image(img) => {
+                Art::Image(img, _) => {
                     let unread = super::links::kept_unread(&img.blob.bytes);
                     let check = if thumbnail.is_some() { super::links::readable_and_kept } else { super::links::readable };
                     img.blob = check(img.blob.clone(), unread, linked)?;
@@ -932,7 +951,7 @@ pub fn read_info(p: &Value) -> Result<Value> {
         "height": natural.height(),
         "warnings": std::mem::take(&mut l.warnings),
     });
-    if let Art::Image(img) = &l.art {
+    if let Art::Image(img, _) = &l.art {
         let (x, y) = img.ppi.unwrap_or((72.0, 72.0));
         out["pixelWidth"] = json!(img.width);
         out["pixelHeight"] = json!(img.height);

crates/engine/src/cmd/plugin.rs

@@ -538,8 +538,8 @@ pub(crate) fn run_command(s: &mut Session, id: &str, p: &Value) -> Result<Value>
 /// live-effect plug-in) with parameters it takes, filled in to their defaults. A record the object
 /// already had stays as it was. An object takes one 3D effect (its fills' and strokes' own
 /// counted), which must fit it, and the `textureImage` of an effect with Load Texture (Glass,
-/// Texturizer) comes as the effect stores it, never as a file to read: a plug-in can't have the
-/// host read one.
+/// Texturizer, Rough Pastels) comes as the effect stores it, never as a file to read: a plug-in
+/// can't have the host read one.
 fn admit_effects(fx: &[Effect], n: &Node) -> std::result::Result<Vec<Effect>, String> {
     admit_effects_for("plugin.run", fx, n)
 }

crates/engine/src/cmd/typecmd.rs

@@ -140,7 +140,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Character",
             [],
             None,
-            "{ids?|id?, font?, style? (font alone: the style is kept when the new family has it, else its closest), size?: pt 0.1..1296 (outside it: an error), leading?: pt|\"auto\", tracking?: 1/1000 em, justify?: \"auto\" (the start of each paragraph's direction)|\"left\"|\"center\"|\"right\"|\"justifyAll\", fill?: colour|\"none\", stroke?: colour|\"none\" (characters without a stroke weight get 1 pt; #rrggbbaa and #rgba are refused in both), keepModel?: bool (fill and stroke, as paint.setFill), strokeWidth?: pt (the character stroke's weight, in document points as stroke.set), features?: [\"dlig\", \"-liga\", \"salt=2\", …] OpenType (swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take the font's alternate number as `tag=N`, N 0–65535: \"salt=2\" draws the second alternate of each glyph that has one, \"salt\" is \"salt=1\", \"-salt\" and \"salt=0\" are off), featureChanges?: [\"tnum\", \"-onum\", \"salt=2\", …] (OpenType features turned on, or with - off, on top of each character's own, a value replacing the feature's last one; its other features are kept), start?: byte, end?: byte} (size/leading are document points after object scaling; with a range: the character attributes style that range and justify the paragraphs it touches; without: all the text; no undo step when no character, paragraph or graph label style changes) → {ids, overflow?: [id…] (area type and type on a path whose text no longer fits; left out when all fits), warning?: text (the font or style set isn't available: its type is drawn in the fallback font or the family's closest style)}",
+            "{ids?|id?, font?, style? (font alone: the style is kept when the new family has it, else its closest), size?: pt 0.1..1296 (outside it: an error), leading?: pt|\"auto\", tracking?: 1/1000 em, justify?: \"auto\" (the start of each paragraph's direction)|\"left\"|\"center\"|\"right\"|\"justifyAll\", fill?: colour|\"none\", stroke?: colour|\"none\" (characters without a stroke weight get 1 pt; #rrggbbaa and #rgba are refused in both), keepModel?: bool (fill and stroke, as paint.setFill), strokeWidth?: pt (the character stroke's weight, in document points as stroke.set), features?: [\"dlig\", \"-liga\", \"salt=2\", …] OpenType (swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take the font's alternate number as `tag=N`, N 0–65535: \"salt=2\" draws the second alternate of each glyph that has one, \"salt\" is \"salt=1\", \"-salt\" and \"salt=0\" are off; \"hkna\" is H or V Style, kana in the font's forms for the writing direction, shaped as `vkna` in vertical type, and \"ital\" is Roman Italics, half-width alphanumerics in the font's italic forms, both on or off only), featureChanges?: [\"tnum\", \"-onum\", \"salt=2\", …] (OpenType features turned on, or with - off, on top of each character's own, a value replacing the feature's last one; its other features are kept), start?: byte, end?: byte} (size/leading are document points after object scaling; with a range: the character attributes style that range and justify the paragraphs it touches; without: all the text; no undo step when no character, paragraph or graph label style changes) → {ids, overflow?: [id…] (area type and type on a path whose text no longer fits; left out when all fits), warning?: text (the font or style set isn't available: its type is drawn in the fallback font or the family's closest style)}",
             has_doc,
             set_style
         ),

crates/engine/src/cmd/typecmd/area_tests.rs

@@ -1589,6 +1589,40 @@ fn proportional_metrics_is_a_character_attribute_saved_only_when_on() {
     assert!(!serde_json::from_value::<vectorcraft_doc::CharStyle>(old).unwrap().proportional_metrics);
 }
 
+/// H or V Style (`hkna`) and Roman Italics (`ital`, OpenType panel menu, East Asian options) are
+/// feature tags of the characters: set on a range and turned off again, kept by a character style
+/// and in a saved document, on or off only (`hkna=2` is refused and changes nothing).
+#[test]
+fn kana_style_and_roman_italics_are_character_features() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
+    let id = s.execute("text.create", &json!({"x": 10, "y": 50, "text": "かなAB"})).unwrap()["id"].as_u64().unwrap();
+    let runs = |s: &Session| match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
+        NodeKind::Text(t) => t.runs.iter().map(|r| (r.text.clone(), r.style.features.clone())).collect::<Vec<_>>(),
+        _ => panic!("text"),
+    };
+    // か and な are 3 bytes each.
+    s.execute("text.setRangeStyle", &json!({"id": id, "start": 0, "end": 6, "features": ["hkna"]})).unwrap();
+    s.execute("text.setRangeStyle", &json!({"id": id, "start": 6, "end": 8, "featureChanges": ["ital"]})).unwrap();
+    assert_eq!(runs(&s), [("かな".to_string(), vec!["hkna".to_string()]), ("AB".to_string(), vec!["ital".to_string()])]);
+    let saved = vectorcraft_format::load(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap();
+    let NodeKind::Text(t) = &saved.node(NodeId(id)).unwrap().kind else { panic!("text") };
+    assert_eq!(t.runs.iter().map(|r| r.style.features.clone()).collect::<Vec<_>>(), [vec!["hkna".to_string()], vec!["ital".to_string()]]);
+    let before = runs(&s);
+    for bad in [json!({"id": id, "features": ["hkna=2"]}), json!({"id": id, "featureChanges": ["ital=1"]})] {
+        let e = s.execute("text.setRangeStyle", &bad).unwrap_err().to_string();
+        assert!(e.contains("unknown OpenType feature"), "{e}");
+    }
+    assert_eq!(runs(&s), before);
+    s.execute("text.setRangeStyle", &json!({"id": id, "featureChanges": ["-hkna", "-ital"]})).unwrap();
+    assert!(runs(&s).iter().all(|(_, f)| f.is_empty()), "{:?}", runs(&s));
+    s.execute("charStyle.new", &json!({"name": "Kana", "attrs": {"features": ["hkna", "ital"]}})).unwrap();
+    s.execute("charStyle.apply", &json!({"name": "Kana", "id": id})).unwrap();
+    assert!(runs(&s).iter().all(|(_, f)| *f == ["hkna", "ital"]), "{:?}", runs(&s));
+    let e = s.execute("charStyle.new", &json!({"name": "Bad", "attrs": {"features": ["ital=2"]}})).unwrap_err().to_string();
+    assert!(e.contains("unknown OpenType feature `ital=2`"), "{e}");
+}
+
 /// Tate-chu-yoko (Character panel menu, East Asian options): a character attribute, saved only
 /// when on. Documents written before it read as off.
 #[test]

crates/engine/src/tests.rs

@@ -1293,7 +1293,12 @@ fn a_transform_that_moves_nothing_records_no_undo_step() {
     for (id, p) in calls {
         assert_eq!(s.execute(id, &p).unwrap(), json!({"ids": [a.0]}), "{id} {p}");
         assert_eq!(history(&s), before, "{id} {p}");
-        assert_eq!(s.journal.last().unwrap(), &(id.to_string(), p));
+        // The journal adds the frame a scale acted in, so a replay acts in the same one.
+        let mut recorded = p;
+        if id == "object.scale" {
+            recorded["basis"] = json!("box");
+        }
+        assert_eq!(s.journal.last().unwrap(), &(id.to_string(), recorded));
     }
     assert_eq!(
         s.doc().unwrap().last_transform,

crates/engine/src/tests/bboxrotate.rs

@@ -666,7 +666,7 @@ fn expanding_a_reflected_symbol_instance_keeps_its_box() {
         for reset in [false, true] {
             let (mut s, inst) = turned_instance(0.0);
             s.execute("object.rotate", &json!({"angle": 150})).unwrap();
-            s.execute("object.reflect", &json!({"axis": "horizontal"})).unwrap();
+            s.execute("object.reflect", &json!({"axis": "horizontal", "basis": "page"})).unwrap();
             assert!(near(angle(&s, inst), -170.0), "{}", angle(&s, inst));
             if reset {
                 s.execute("object.resetBoundingBox", &json!({})).unwrap();
@@ -719,10 +719,164 @@ fn page_flips_keep_an_upright_box_upright() {
     s.execute("object.reflect", &json!({"axis": "horizontal"})).unwrap();
     assert_eq!(angle(&s, a), 0.0);
     s.execute("object.rotate", &json!({"angle": 30})).unwrap();
+    // A named axis is the turned box's own: the box keeps its angle.
     s.execute("object.reflect", &json!({"axis": "vertical"})).unwrap();
+    assert!(near(angle(&s, a), 30.0));
+    s.execute("object.reflect", &json!({"axis": "vertical", "basis": "page"})).unwrap();
     assert!(near(angle(&s, a), -30.0));
 }
 
+fn same_matrix(a: Affine, b: Affine) -> bool {
+    a.as_coeffs().iter().zip(b.as_coeffs()).all(|(x, y)| near(*x, y))
+}
+
+/// After a rotation, Scale and a named Reflect act along the turned bounding box until Reset
+/// Bounding Box; `basis: "page"` keeps the page's axes, and Transform Again repeats the matrix the
+/// transform applied on the page.
+#[test]
+fn scale_and_reflect_follow_the_turned_box() {
+    let mut s = session();
+    let a = turned_rect(&mut s);
+    let page = |s: &Session, ids: &[NodeId]| s.doc().unwrap().doc.bounds_of(ids, false).unwrap();
+    let c = Point::new(200.0, 200.0);
+    let frame = OrientedBox { angle: 45.0, rect: Rect::ZERO };
+    s.execute("object.scale", &json!({"sx": 200, "sy": 100})).unwrap();
+    let b = selection_box(&s);
+    assert!(near(b.angle, 45.0) && near(angle(&s, a), 45.0), "{b:?}");
+    assert!(near(b.rect.width(), 200.0) && near(b.rect.height(), 50.0), "{b:?}");
+    assert!(b.center().distance(c) < 1e-6, "{b:?}");
+    let want = Affine::translate(c.to_vec2()) * frame.conjugate(Affine::scale_non_uniform(2.0, 1.0)) * Affine::translate(-c.to_vec2());
+    let Some(LastTransform::Matrix(m, _)) = s.doc().unwrap().last_transform.clone() else { panic!("no transform to repeat") };
+    assert!(same_matrix(m, want), "{m:?}");
+    // The recorded step names its basis, so a replay acts in the same frame.
+    let steps = s.journal_for_action(0);
+    assert!(steps.iter().any(|(id, p)| id == "object.scale" && p["basis"] == "box"), "{steps:?}");
+
+    // Reflected across the box's vertical axis through its left side: the box keeps its angle and
+    // size, and its centre moves a width to the left along the box.
+    let left = b.reference_point(3);
+    s.execute("object.reflect", &json!({"axis": "vertical", "origin": [left.x, left.y]})).unwrap();
+    let r = selection_box(&s);
+    let moved = c + (frame.to_doc() * Point::new(-200.0, 0.0)).to_vec2();
+    assert!(near(r.angle, 45.0) && near(r.rect.width(), 200.0) && near(r.rect.height(), 50.0), "{r:?}");
+    assert!(r.center().distance(moved) < 1e-6, "{r:?}");
+    // Across its horizontal axis through its centre: the box stays where it is.
+    s.execute("object.reflect", &json!({"axis": "horizontal"})).unwrap();
+    assert!(selection_box(&s).center().distance(moved) < 1e-6 && near(angle(&s, a), 45.0));
+
+    // Unknown bases are errors and change nothing.
+    let n = undo_len(&s);
+    assert!(s.execute("object.scale", &json!({"sx": 50, "basis": "turned"})).is_err());
+    assert!(s.execute("object.reflect", &json!({"axis": "vertical", "basis": 1})).is_err());
+    assert!(s.execute("object.reflect", &json!({"axis": 30, "basis": "turned"})).is_err());
+    assert_eq!(undo_len(&s), n);
+
+    // On the page's axes, the box no longer stands at 45°.
+    s.execute("object.scale", &json!({"sx": 50, "sy": 100, "basis": "page"})).unwrap();
+    assert!(!near(angle(&s, a), 45.0));
+    // Transform Again repeats the page matrix after Reset Bounding Box too.
+    s.execute("object.scale", &json!({"sx": 200, "sy": 100})).unwrap();
+    let Some(LastTransform::Matrix(m, _)) = s.doc().unwrap().last_transform.clone() else { panic!("no transform to repeat") };
+    s.execute("object.resetBoundingBox", &json!({})).unwrap();
+    let before = s.doc().unwrap().doc.node(a).unwrap().clone();
+    s.execute("object.transformAgain", &json!({})).unwrap();
+    let mut want = before;
+    want.transform(m, false);
+    let (got, want) = (page(&s, &[a]), want.geometric_bounds_with(&s.doc().unwrap().doc.symbol_boxes()).unwrap());
+    assert!([got.x0 - want.x0, got.y0 - want.y0, got.x1 - want.x1, got.y1 - want.y1].iter().all(|d| d.abs() < 1e-6), "{got:?} {want:?}");
+}
+
+/// A saved step without `basis` was recorded before Scale and Reflect followed the turned box, so a
+/// replay of it acts along the page's axes, as it did then, and its new journal entry says so. A
+/// step recorded now names its basis and replays along the box. A call without `basis` that is not
+/// a replay acts along the box.
+#[test]
+fn saved_steps_without_a_basis_replay_on_the_page() {
+    // The turned rectangle after `run` runs on it: its page bounds and its box's angle.
+    let after = |run: &dyn Fn(&mut Session)| {
+        let mut s = session();
+        let a = turned_rect(&mut s);
+        run(&mut s);
+        let st = (s.doc().unwrap().doc.bounds_of(&[a], false).unwrap(), angle(&s, a));
+        (st, s.journal.last().unwrap().clone())
+    };
+    let same = |(r, a): (Rect, f64), (q, b): (Rect, f64)| [r.x0 - q.x0, r.y0 - q.y0, r.x1 - q.x1, r.y1 - q.y1, a - b].iter().all(|d| d.abs() < 1e-6);
+    for (id, p) in [("object.scale", json!({"sx": 200, "sy": 100})), ("object.reflect", json!({"axis": "vertical"}))] {
+        let mut on_page = p.clone();
+        on_page["basis"] = json!("page");
+        let (page, _) = after(&|s| {
+            s.execute(id, &on_page).unwrap();
+        });
+        let (old, (_, noted)) = after(&|s| {
+            s.replay(id, &p).unwrap();
+        });
+        assert!(same(old, page), "{id}: {old:?} {page:?}");
+        assert_eq!(noted["basis"], "page", "{id}");
+
+        let (boxed, (recorded_id, recorded)) = after(&|s| {
+            s.execute(id, &p).unwrap();
+        });
+        assert!(!same(boxed, page) && near(boxed.1, 45.0), "{id}: {boxed:?}");
+        assert_eq!(recorded["basis"], "box", "{id}");
+        let (replayed, _) = after(&|s| {
+            s.replay(&recorded_id, &recorded).unwrap();
+        });
+        assert!(same(replayed, boxed), "{id}: {replayed:?} {boxed:?}");
+    }
+}
+
+/// Once Reset Bounding Box squares the box, and for objects standing at different angles, Scale
+/// acts along the page's axes.
+#[test]
+fn scale_follows_the_page_after_a_reset_and_for_mixed_angles() {
+    let mut s = session();
+    let a = turned_rect(&mut s);
+    s.execute("object.resetBoundingBox", &json!({})).unwrap();
+    let page = |s: &Session, ids: &[NodeId]| s.doc().unwrap().doc.bounds_of(ids, false).unwrap();
+    let w = page(&s, &[a]);
+    s.execute("object.scale", &json!({"sx": 200, "sy": 100})).unwrap();
+    let r = page(&s, &[a]);
+    assert!(near(r.width(), 2.0 * w.width()) && near(r.height(), w.height()), "{w:?} {r:?}");
+    assert_eq!(angle(&s, a), 0.0);
+    // A turned rectangle with an upright one: the box is square to the page.
+    let b = turned_rect(&mut s);
+    let u = rect(&mut s, 400.0, 100.0, 50.0, 50.0);
+    sel(&mut s, &[b, u]);
+    let w = page(&s, &[b, u]);
+    s.execute("object.scale", &json!({"sx": 100, "sy": 200})).unwrap();
+    let r = page(&s, &[b, u]);
+    assert!(near(r.width(), w.width()) && near(r.height(), 2.0 * w.height()), "{w:?} {r:?}");
+}
+
+/// With anchors selected, Scale and a named Reflect move the anchors along the page's axes, but
+/// with Transform Objects off they move the whole objects' pattern tiles, along the turned box.
+#[test]
+fn pattern_only_transforms_of_selected_anchors_follow_the_turned_box() {
+    let c = Point::new(200.0, 200.0);
+    let frame = OrientedBox { angle: 45.0, rect: Rect::ZERO };
+    let about = |m: Affine| Affine::translate(c.to_vec2()) * m * Affine::translate(-c.to_vec2());
+    let last = |s: &Session| match s.doc().unwrap().last_transform.clone() {
+        Some(LastTransform::Matrix(m, _)) => m,
+        other => panic!("no matrix to repeat: {other:?}"),
+    };
+    let scale = Affine::scale_non_uniform(2.0, 1.0);
+    let flip = Affine::scale_non_uniform(-1.0, 1.0);
+    for (cmd, p, m) in [("object.scale", json!({"sx": 200, "sy": 100}), scale), ("object.reflect", json!({"axis": "vertical"}), flip)] {
+        for objects in [false, true] {
+            let mut s = session();
+            let a = turned_rect(&mut s);
+            s.execute("select.anchors", &json!({"id": a.0, "anchors": [[0, 0]], "mode": "set"})).unwrap();
+            let mut p = p.clone();
+            p["origin"] = json!([c.x, c.y]);
+            p["objects"] = json!(objects);
+            p["patterns"] = json!(true);
+            s.execute(cmd, &p).unwrap();
+            let want = if objects { about(m) } else { about(frame.conjugate(m)) };
+            assert!(same_matrix(last(&s), want), "{cmd} objects {objects}: {:?}", last(&s));
+        }
+    }
+}
+
 #[test]
 fn groups_type_and_multiple_selections_keep_their_angle() {
     let mut s = session();

crates/engine/src/tests/build.rs

@@ -3,7 +3,8 @@
 use std::sync::Arc;
 
 use serde_json::{Value, json};
-use vectorcraft_color::{Color, Paint};
+use vectorcraft_color::{BlendMode, Color, Paint};
+use vectorcraft_doc::appearance::{Effect, FillLayer, StrokeLayer};
 use vectorcraft_doc::{AppearanceItem, ImageBlob, ImageObject, LineCap, LineJoin, Node, NodeKind};
 use vectorcraft_geom::{Affine, FillRule, PathData, Point, Rect};
 use vectorcraft_testkit::pdf::{PdfPage, pdf};
@@ -2684,6 +2685,401 @@ fn live_paint_make_and_expand_keep_abutting_compound_colors() {
     check_colors(&node(&s, group));
 }
 
+/// Gives `id` the appearance rows `items` (paint order) and returns them.
+fn set_rows(s: &mut Session, id: NodeId, items: Vec<AppearanceItem>) -> Vec<AppearanceItem> {
+    s.edit("t", |d, _| {
+        d.node_mut(id).unwrap().appearance = vectorcraft_doc::Appearance { items: items.clone(), ..Default::default() }.into();
+        Ok(())
+    })
+    .unwrap();
+    items
+}
+
+/// A fill row of `p`, changed by `f`.
+fn fill_row(p: Paint, f: impl FnOnce(&mut FillLayer)) -> AppearanceItem {
+    let mut l = FillLayer::new(p);
+    f(&mut l);
+    AppearanceItem::Fill(l)
+}
+
+/// A stroke row of `p` `width` wide, changed by `f`.
+fn stroke_row(p: Paint, width: f64, f: impl FnOnce(&mut StrokeLayer)) -> AppearanceItem {
+    let mut l = StrokeLayer::new(p, width);
+    f(&mut l);
+    AppearanceItem::Stroke(l)
+}
+
+/// The faces and edges of Live Paint group `g` whose bounds lie within x `x0`..`x1`.
+fn parts_within(s: &Session, g: NodeId, x0: f64, x1: f64) -> (Vec<Node>, Vec<Node>) {
+    let n = node(s, g);
+    let within = |c: &&Arc<Node>| c.geometric_bounds().is_some_and(|b| b.x0 >= x0 - 1e-6 && b.x1 <= x1 + 1e-6);
+    let faces = vectorcraft_tools::builder::faces(&n).into_iter().filter(within).map(|c| (**c).clone()).collect();
+    let edges = vectorcraft_tools::builder::edges(&n).into_iter().filter(within).map(|c| (**c).clone()).collect();
+    (faces, edges)
+}
+
+/// Make gives each edge every stroke row of its source that draws, a lower one under an
+/// unpainted or hidden top row included, with the rows' settings and the source's opacity and
+/// blending mode; rows that draw nothing stay only with the stored source, which Release returns.
+#[test]
+fn live_paint_make_keeps_lower_drawn_stroke_rows() {
+    let mut s = session();
+    let (a, b) = two_at(&mut s, 200.0);
+    let black = Paint::solid(Color::BLACK);
+    let green = Paint::solid(Color::rgb(0.0, 1.0, 0.0));
+    let thick = stroke_row(black.clone(), 3.0, |l| {
+        l.opacity = 0.5;
+        l.blend = BlendMode::Multiply;
+        l.cap = LineCap::Round;
+    });
+    // A: the top stroke has no paint.
+    let a_rows =
+        set_rows(&mut s, a, vec![fill_row(Paint::solid(Color::rgb(1.0, 0.0, 0.0)), |_| {}), thick.clone(), stroke_row(Paint::None, 1.0, |_| {})]);
+    // B: the top stroke is hidden; a zero-weight and a transparent stroke draw nothing either.
+    set_rows(
+        &mut s,
+        b,
+        vec![
+            stroke_row(green.clone(), 2.0, |_| {}),
+            stroke_row(black.clone(), 0.0, |_| {}),
+            stroke_row(black, 2.0, |l| l.opacity = 0.0),
+            stroke_row(Paint::solid(Color::rgb(0.0, 0.0, 1.0)), 5.0, |l| l.visible = false),
+        ],
+    );
+    s.edit("t", |d, _| {
+        let n = d.node_mut(a).unwrap();
+        n.opacity = 0.75;
+        n.blend = BlendMode::Screen;
+        Ok(())
+    })
+    .unwrap();
+    s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let (_, a_edges) = parts_within(&s, g, 0.0, 100.0);
+    let (_, b_edges) = parts_within(&s, g, 200.0, 300.0);
+    assert!(!a_edges.is_empty() && !b_edges.is_empty());
+    for e in &a_edges {
+        assert_eq!(e.appearance.items, vec![thick.clone()], "A's edge takes the stroke that draws");
+        assert_eq!((e.opacity, e.blend), (0.75, BlendMode::Screen));
+    }
+    for e in &b_edges {
+        assert_eq!(e.appearance.items, vec![stroke_row(green.clone(), 2.0, |_| {})], "B's edge takes only its green stroke");
+        assert_eq!((e.opacity, e.blend), (1.0, BlendMode::Normal));
+    }
+    // Release returns the sources with every row they had.
+    let released = ids(&s.execute("livePaint.release", &json!({})).unwrap());
+    assert!(released.contains(&a));
+    assert_eq!(node(&s, a).appearance.items, a_rows);
+}
+
+/// When Make cuts a dashed stroke with arrowheads, a width profile and a brush into edges, each
+/// edge's dashes go on from where it starts along the path, the arrowheads stay at the path's own
+/// ends, and the profile and brush, which spread over the whole path, are left off the pieces.
+#[test]
+fn live_paint_make_fits_dashes_and_arrowheads_to_each_edge() {
+    use vectorcraft_doc::{Arrowhead, Dash};
+    let mut s = session();
+    let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0);
+    let l = line(&mut s, (-20.0, 50.0), (120.0, 50.0));
+    let dash = Dash { pattern: vec![10.0, 5.0], offset: 2.0, align_corners: true };
+    let row = stroke_row(Paint::solid(Color::BLACK), 2.0, |st| {
+        st.dash = Some(dash.clone());
+        st.start_arrow = Some(Arrowhead::Triangle);
+        st.end_arrow = Some(Arrowhead::Circle);
+        st.brush = Some("Charcoal".into());
+    });
+    let rows = set_rows(&mut s, l, vec![row]);
+    s.execute("select.set", &json!({"ids": [a.0, l.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let gn = node(&s, g);
+    let mut pieces: Vec<(f64, f64, vectorcraft_doc::StrokeLayer)> = vectorcraft_tools::builder::edges(&gn)
+        .iter()
+        .filter_map(|e| {
+            let st = e.appearance.stroke().filter(|st| st.dash.is_some())?.clone();
+            let sp = e.path_data()?.subpaths.first()?;
+            Some((sp.anchors.first()?.p.x, sp.anchors.last()?.p.x, st))
+        })
+        .collect();
+    pieces.sort_by(|p, q| p.0.total_cmp(&q.0));
+    let ends: Vec<(f64, f64)> = pieces.iter().map(|p| ((p.0 * 1e3).round() / 1e3, (p.1 * 1e3).round() / 1e3)).collect();
+    assert_eq!(ends, vec![(-20.0, 0.0), (0.0, 100.0), (100.0, 120.0)], "each piece runs the way the line does");
+    let offsets: Vec<f64> = pieces.iter().map(|p| (p.2.dash.as_ref().unwrap().offset * 1e3).round() / 1e3).collect();
+    assert_eq!(offsets, vec![2.0, 22.0, 122.0], "the dashes go on along the line");
+    assert!(pieces.iter().all(|p| !p.2.dash.as_ref().unwrap().align_corners && p.2.brush.is_none()));
+    let arrows: Vec<_> = pieces.iter().map(|p| (p.2.start_arrow.clone(), p.2.end_arrow.clone())).collect();
+    assert_eq!(arrows, vec![(Some(Arrowhead::Triangle), None), (None, None), (None, Some(Arrowhead::Circle))]);
+    // A path that crosses itself: the pieces that start at the crossing take their place on the
+    // path from where they run, not from the first time the path passes that point.
+    let mut s3 = session();
+    let anchors = [(0.0, 0.0), (100.0, 100.0), (100.0, 0.0), (0.0, 100.0)].map(|(x, y)| json!({"x": x, "y": y}));
+    let z = NodeId(s3.execute("path.create", &json!({"anchors": anchors, "closed": false})).unwrap()["id"].as_u64().unwrap());
+    set_rows(&mut s3, z, rows.clone());
+    s3.execute("select.set", &json!({"ids": [z.0]})).unwrap();
+    let g3 = NodeId(s3.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let mut cut: Vec<(f64, Option<Arrowhead>, Option<Arrowhead>)> = vectorcraft_tools::builder::edges(&node(&s3, g3))
+        .iter()
+        .filter_map(|e| {
+            let st = e.appearance.stroke()?;
+            Some(((st.dash.as_ref()?.offset * 1e3).round() / 1e3, st.start_arrow.clone(), st.end_arrow.clone()))
+        })
+        .collect();
+    cut.sort_by(|p, q| p.0.total_cmp(&q.0));
+    let d = 2.0 + 50.0 * 2f64.sqrt();
+    let r = |v: f64| (v * 1e3).round() / 1e3;
+    assert_eq!(
+        cut,
+        vec![(2.0, Some(Arrowhead::Triangle), None), (r(d), None, None), (r(d + 100.0 + 100.0 * 2f64.sqrt()), None, Some(Arrowhead::Circle))]
+    );
+    // An uncut path keeps all of it.
+    let mut s2 = session();
+    let l2 = line(&mut s2, (0.0, 0.0), (50.0, 0.0));
+    set_rows(&mut s2, l2, rows.clone());
+    s2.execute("select.set", &json!({"ids": [l2.0]})).unwrap();
+    let g2 = NodeId(s2.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let edges: Vec<_> = vectorcraft_tools::builder::edges(&node(&s2, g2)).iter().map(|e| e.appearance.items.clone()).collect();
+    assert_eq!(edges, vec![rows]);
+}
+
+/// When Gap Options or Merge cuts an edge in two, each piece keeps the edge's dashes going on from
+/// where it starts along the edge, an arrowhead only at the end of the edge it ends at, and no brush.
+#[test]
+fn live_paint_gap_options_and_merge_fit_an_edge_look_to_each_piece() {
+    use vectorcraft_doc::{Arrowhead, Dash};
+    let mut s = session();
+    let l = line(&mut s, (0.0, 50.0), (100.0, 50.0));
+    let stub = line(&mut s, (50.0, 0.0), (50.0, 48.0));
+    let row = stroke_row(Paint::solid(Color::BLACK), 2.0, |st| {
+        st.dash = Some(Dash { pattern: vec![10.0, 5.0], offset: 2.0, align_corners: false });
+        st.start_arrow = Some(Arrowhead::Triangle);
+        st.end_arrow = Some(Arrowhead::Circle);
+        st.brush = Some("Charcoal".into());
+    });
+    let rows = set_rows(&mut s, l, vec![row]);
+    s.execute("select.set", &json!({"ids": [l.0, stub.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let dashed = |s: &Session, g: NodeId| {
+        let mut out: Vec<(f64, f64, vectorcraft_doc::StrokeLayer)> = vectorcraft_tools::builder::edges(&node(s, g))
+            .iter()
+            .filter_map(|e| {
+                let st = e.appearance.stroke().filter(|st| st.dash.is_some())?.clone();
+                let sp = e.path_data()?.subpaths.first()?;
+                Some(((sp.anchors.first()?.p.x * 1e3).round() / 1e3, (sp.anchors.last()?.p.x * 1e3).round() / 1e3, st))
+            })
+            .collect();
+        out.sort_by(|p, q| p.0.total_cmp(&q.0));
+        out
+    };
+    let before = dashed(&s, g);
+    assert_eq!(before.len(), 1, "nothing cuts the line yet");
+    assert_eq!(vec![AppearanceItem::Stroke(before[0].2.clone())], rows);
+    let r = s.execute("livePaint.gapOptions", &json!({"id": g.0, "closeGaps": true})).unwrap();
+    assert_eq!(r["closed"], json!(1));
+    let pieces = dashed(&s, g);
+    let ends: Vec<(f64, f64)> = pieces.iter().map(|p| (p.0, p.1)).collect();
+    assert_eq!(ends, vec![(0.0, 50.0), (50.0, 100.0)], "the line is cut where the gap closes");
+    let offsets: Vec<f64> = pieces.iter().map(|p| (p.2.dash.as_ref().unwrap().offset * 1e3).round() / 1e3).collect();
+    assert_eq!(offsets, vec![2.0, 52.0], "the dashes go on along the line");
+    let arrows: Vec<_> = pieces.iter().map(|p| (p.2.start_arrow.clone(), p.2.end_arrow.clone())).collect();
+    assert_eq!(arrows, vec![(Some(Arrowhead::Triangle), None), (None, Some(Arrowhead::Circle))]);
+    assert!(pieces.iter().all(|p| p.2.brush.is_none()), "a brush spreads over the whole line");
+    // Merge: the piece of the edge that an added path cuts off, which takes the edge's look, gets
+    // it fitted to where it lies along the edge in the same way.
+    let mut s = session();
+    let l = line(&mut s, (0.0, 50.0), (100.0, 50.0));
+    set_rows(&mut s, l, rows.clone());
+    s.execute("select.set", &json!({"ids": [l.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let cut = line(&mut s, (25.0, 0.0), (25.0, 100.0));
+    s.execute("livePaint.merge", &json!({"ids": [g.0, cut.0]})).unwrap();
+    let pieces = dashed(&s, g);
+    let ends: Vec<(f64, f64)> = pieces.iter().map(|p| (p.0, p.1)).collect();
+    assert_eq!(ends, vec![(0.0, 25.0), (25.0, 100.0)], "the added line cuts the edge");
+    let offsets: Vec<f64> = pieces.iter().map(|p| (p.2.dash.as_ref().unwrap().offset * 1e3).round() / 1e3).collect();
+    assert_eq!(offsets, vec![2.0, 27.0], "the dashes go on along the line");
+    let arrows: Vec<_> = pieces.iter().map(|p| (p.2.start_arrow.clone(), p.2.end_arrow.clone())).collect();
+    assert_eq!(arrows, vec![(Some(Arrowhead::Triangle), None), (None, Some(Arrowhead::Circle))]);
+    assert!(pieces.iter().all(|p| p.2.brush.is_none()), "a brush spreads over the whole line");
+    // A repainted edge that Merge cuts keeps its paint on every piece.
+    let mut s = session();
+    let l = line(&mut s, (0.0, 50.0), (100.0, 50.0));
+    s.execute("select.set", &json!({"ids": [l.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    s.execute("livePaint.strokeEdge", &json!({"group": g.0, "point": [50, 50], "color": "#ff0000", "width": 3})).unwrap();
+    let cut = line(&mut s, (50.0, 0.0), (50.0, 100.0));
+    s.execute("livePaint.merge", &json!({"ids": [g.0, cut.0]})).unwrap();
+    let gn = node(&s, g);
+    let red = Paint::solid(Color::from_hex("#ff0000").unwrap());
+    let mut on_line: Vec<(f64, bool)> = vectorcraft_tools::builder::edges(&gn)
+        .iter()
+        .filter_map(|e| {
+            let sp = e.path_data()?.subpaths.first()?;
+            let (a, z) = (sp.anchors.first()?.p, sp.anchors.last()?.p);
+            ((a.y - 50.0).abs() < 1e-6 && (z.y - 50.0).abs() < 1e-6)
+                .then(|| ((a.x.min(z.x) * 1e3).round() / 1e3, e.appearance.stroke().is_some_and(|st| st.paint == red)))
+        })
+        .collect();
+    on_line.sort_by(|p, q| p.0.total_cmp(&q.0));
+    assert_eq!(on_line, vec![(0.0, true), (50.0, true)], "both pieces keep the edge's paint");
+}
+
+/// The edge Make builds from a closed path that nothing cuts starts at the anchor the path starts
+/// at and runs the way the path does, whichever anchor that is, so its dashes and brush lie where
+/// they do on the path, and it keeps the path's stroke row as it is.
+#[test]
+fn live_paint_make_starts_a_closed_edge_where_its_path_starts() {
+    use vectorcraft_doc::Dash;
+    let corners = [(50.0, 0.0), (100.0, 50.0), (50.0, 100.0), (0.0, 50.0)];
+    for clockwise in [true, false] {
+        for start in 0..4 {
+            let mut s = session();
+            let mut pts: Vec<(f64, f64)> = (0..4).map(|k| corners[(k + start) % 4]).collect();
+            if !clockwise {
+                pts.reverse();
+            }
+            let anchors: Vec<_> = pts.iter().map(|(x, y)| json!({"x": x, "y": y})).collect();
+            let z = NodeId(s.execute("path.create", &json!({"anchors": anchors, "closed": true})).unwrap()["id"].as_u64().unwrap());
+            let row = stroke_row(Paint::solid(Color::BLACK), 2.0, |st| {
+                st.dash = Some(Dash { pattern: vec![10.0, 5.0], offset: 2.0, align_corners: false });
+                st.brush = Some("Charcoal".into());
+            });
+            let rows = set_rows(&mut s, z, vec![row]);
+            s.execute("select.set", &json!({"ids": [z.0]})).unwrap();
+            let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+            let gn = node(&s, g);
+            let edges = vectorcraft_tools::builder::edges(&gn);
+            let [e] = edges.as_slice() else { panic!("one edge, got {}", edges.len()) };
+            let sp = e.path_data().unwrap().subpaths.first().unwrap().clone();
+            let at: Vec<(f64, f64)> = sp.anchors.iter().map(|a| ((a.p.x * 1e3).round() / 1e3, (a.p.y * 1e3).round() / 1e3)).collect();
+            assert!(sp.closed);
+            assert_eq!(at, pts, "clockwise {clockwise}, start {start}");
+            assert_eq!(e.appearance.items, rows, "clockwise {clockwise}, start {start}");
+        }
+    }
+    // A closed path that crosses itself is cut into loops, and the loop that holds the path's
+    // first anchor is still only part of the path: it keeps no brush.
+    let mut s = session();
+    let anchors = [(0.0, 0.0), (100.0, 100.0), (100.0, 0.0), (0.0, 100.0)].map(|(x, y)| json!({"x": x, "y": y}));
+    let z = NodeId(s.execute("path.create", &json!({"anchors": anchors, "closed": true})).unwrap()["id"].as_u64().unwrap());
+    let row = stroke_row(Paint::solid(Color::BLACK), 2.0, |st| {
+        st.dash = Some(Dash { pattern: vec![10.0, 5.0], offset: 2.0, align_corners: false });
+        st.brush = Some("Charcoal".into());
+    });
+    set_rows(&mut s, z, vec![row]);
+    s.execute("select.set", &json!({"ids": [z.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let gn = node(&s, g);
+    let edges = vectorcraft_tools::builder::edges(&gn);
+    assert!(edges.len() > 1, "the crossing cuts the path, got {} edge", edges.len());
+    assert!(edges.iter().all(|e| e.appearance.stroke().is_some_and(|st| st.brush.is_none())), "no loop is the whole path");
+}
+
+/// When Make cuts a stroke whose only setting that depends on direction is a gradient along or
+/// across it, each edge runs the way its source path does, so the gradient keeps its direction.
+#[test]
+fn live_paint_make_keeps_the_direction_of_gradient_strokes() {
+    use vectorcraft_doc::StrokeGradientMode;
+    for mode in [StrokeGradientMode::Along, StrokeGradientMode::Across] {
+        for (x0, x1) in [(-20.0, 120.0), (120.0, -20.0)] {
+            let mut s = session();
+            let a = rect(&mut s, 0.0, 0.0, 100.0, 100.0);
+            let l = line(&mut s, (x0, 50.0), (x1, 50.0));
+            let gradient = Paint::Gradient(Box::new(vectorcraft_color::GradientPaint::new(vectorcraft_color::Gradient::default())));
+            set_rows(&mut s, l, vec![stroke_row(gradient, 2.0, |st| st.gradient_mode = mode)]);
+            s.execute("select.set", &json!({"ids": [a.0, l.0]})).unwrap();
+            let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+            let pieces: Vec<(f64, f64)> = vectorcraft_tools::builder::edges(&node(&s, g))
+                .iter()
+                .filter_map(|e| {
+                    e.appearance.stroke().filter(|st| st.gradient_mode == mode)?;
+                    let sp = e.path_data()?.subpaths.first()?;
+                    Some((sp.anchors.first()?.p.x, sp.anchors.last()?.p.x))
+                })
+                .collect();
+            assert_eq!(pieces.len(), 3, "{mode:?}, from {x0}");
+            assert!(
+                pieces.iter().all(|&(p, q)| (q - p).signum() == (x1 - x0).signum()),
+                "{mode:?}, from {x0}: each piece runs the way the line does: {pieces:?}"
+            );
+        }
+    }
+}
+
+/// Make gives each face every fill row of its source that draws, in order and with their
+/// opacity, blending mode, overprint and effects, and the source's gradients keep their fit on
+/// the source; Expand keeps the rows, and Undo and Redo bring the group back with them.
+#[test]
+fn live_paint_make_keeps_all_drawn_fill_rows_and_attributes() {
+    let mut s = session();
+    let (a, b) = two(&mut s);
+    let lower = fill_row(Paint::solid(Color::rgb(1.0, 0.0, 0.0)), |l| {
+        l.opacity = 0.4;
+        l.blend = BlendMode::Multiply;
+        l.overprint = true;
+        l.effects.push(Effect { id: "distort.roughen".into(), params: Value::Null, visible: true });
+    });
+    // A: two fills that draw, with a hidden one between them and an unpainted one above them.
+    set_rows(
+        &mut s,
+        a,
+        vec![
+            lower.clone(),
+            fill_row(Paint::solid(Color::rgb(0.0, 1.0, 0.0)), |l| l.visible = false),
+            fill_row(Paint::None, |_| {}),
+            stroke_row(Paint::None, 1.0, |_| {}),
+        ],
+    );
+    // The top fill (and the stroke) become a gradient fitted to A's bounds.
+    let (want_fill, _) = paint_with_gradients(&mut s, a);
+    s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
+    let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+    let want = vec![lower, fill_row(want_fill, |_| {})];
+    let rows_within = |s: &Session, x0: f64, x1: f64| parts_within(s, g, x0, x1).0.iter().map(|f| f.appearance.items.clone()).collect::<Vec<_>>();
+    assert_eq!(rows_within(&s, 0.0, 50.0), vec![want.clone()], "A's face takes both fills that draw, the gradient at its fit on A");
+    let blue = vec![fill_row(Paint::solid(Color::rgb(0.0, 0.0, 1.0)), |_| {})];
+    assert_eq!(rows_within(&s, 50.0, 100.0), vec![blue], "B is in front");
+    s.execute("livePaint.expand", &json!({})).unwrap();
+    let expanded = node(&s, g);
+    assert!(!vectorcraft_tools::builder::is_live_paint(&expanded));
+    let kept =
+        expanded.children().unwrap().iter().filter(|c| c.geometric_bounds().is_some_and(|b| b.x1 <= 50.0 + 1e-6)).any(|c| c.appearance.items == want);
+    assert!(kept, "Expand keeps both fills");
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(rows_within(&s, 0.0, 50.0), vec![want.clone()]);
+    s.execute("edit.undo", &json!({})).unwrap();
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(rows_within(&s, 0.0, 50.0), vec![want]);
+}
+
+/// A face takes the fill rows of the front-most covering source whose fill draws: a source in
+/// front whose fill is hidden or transparent, or whose opacity is 0, does not hide the paint of the
+/// source behind it, and a face that no such source covers has no paint.
+#[test]
+fn live_paint_make_uses_frontmost_source_with_drawn_fill() {
+    for front in ["hidden", "clear", "transparent object"] {
+        let mut s = session();
+        let (a, b) = two(&mut s);
+        s.edit("t", |d, _| {
+            let n = d.node_mut(b).unwrap();
+            let mut app = (*n.appearance).clone();
+            match front {
+                "hidden" => app.fill_mut().unwrap().visible = false,
+                "clear" => app.fill_mut().unwrap().opacity = 0.0,
+                _ => n.opacity = 0.0,
+            }
+            n.appearance = app.into();
+            Ok(())
+        })
+        .unwrap();
+        s.execute("select.set", &json!({"ids": [a.0, b.0]})).unwrap();
+        let g = NodeId(s.execute("livePaint.make", &json!({})).unwrap()["id"].as_u64().unwrap());
+        let rows_within = |x0: f64, x1: f64| parts_within(&s, g, x0, x1).0.iter().map(|f| f.appearance.items.clone()).collect::<Vec<_>>();
+        let red = vec![fill_row(Paint::solid(Color::rgb(1.0, 0.0, 0.0)), |_| {})];
+        assert_eq!(rows_within(50.0, 100.0), vec![red], "{front}: the overlap shows A");
+        assert_eq!(rows_within(100.0, 150.0), vec![vec![fill_row(Paint::None, |_| {})]], "{front}: B alone paints nothing");
+        assert_eq!(parts_within(&s, g, 100.0, 150.0).0[0].opacity, 1.0, "{front}");
+    }
+}
+
 #[test]
 fn live_paint_fill_assigns_the_face_under_the_point() {
     let mut s = session();

crates/engine/src/tests/gradient.rs

@@ -219,9 +219,10 @@ fn rotate_reflect_and_scale_carry_unplaced_gradients() {
     s.execute("object.rotate", &json!({"angle": 90})).unwrap();
     let g = fill_geom(&s, id);
     assert!((g.end.x - g.start.x).abs() < 1e-9 && (g.length() - 100.0).abs() < 1e-9, "vertical after a 90° turn: {g:?}");
-    s.execute("object.reflect", &json!({"axis": "horizontal"})).unwrap();
+    s.execute("object.reflect", &json!({"axis": "horizontal", "basis": "page"})).unwrap();
     let r = fill_geom(&s, id);
-    // The vertical vector is centred on the object, so the reflection swaps its ends.
+    // The vertical vector is centred on the object, so the reflection across the page's
+    // horizontal axis swaps its ends.
     assert!(r.start.distance(g.end) < 1e-9 && r.end.distance(g.start) < 1e-9, "{g:?} → {r:?}");
 
     // A circle's radial gradient becomes an ellipse under a non-uniform scale.

crates/engine/src/tests/journal.rs

@@ -406,7 +406,7 @@ fn a_batch_step_records_what_it_took_from_the_preferences() {
     ]);
     s.execute("command.batch", &json!({ "commands": steps })).unwrap();
     let p = &s.journal.last().unwrap().1;
-    assert_eq!(p["commands"][2]["params"], json!({"sx": 300, "strokes": true, "corners": false}));
+    assert_eq!(p["commands"][2]["params"], json!({"sx": 300, "strokes": true, "corners": false, "basis": "box"}));
     // Replayed with other preferences, the scale still scales the stroke.
     let r = replayed(&s);
     assert!(!r.prefs.scale_strokes);

crates/engine/src/tests/plugins.rs

@@ -1700,6 +1700,7 @@ fn filters_set_effects_and_stroke_styles() {
         ("test.engine.badn", json!([{"id": "plugin.test.engine.fx", "params": {"n": "two"}}]), "`n`"),
         ("test.engine.file", json!([{"id": "distort.glass", "params": {"textureImage": {"path": "/etc/hosts"}}}]), "textureImage"),
         ("test.engine.file2", json!([{"id": "texture.texturizer", "params": {"textureImage": {"path": "/etc/hosts"}}}]), "textureImage"),
+        ("test.engine.file3", json!([{"id": "artistic.roughPastels", "params": {"textureImage": {"path": "/etc/hosts"}}}]), "textureImage"),
         ("test.engine.two3d", json!([{"id": "threeD.extrude"}, {"id": "threeD.extrude"}]), "one 3D effect"),
     ] {
         let e = filter(&mut s, name, fx).unwrap_err().to_string();

crates/engine/src/tests/rasterfilters.rs

@@ -323,8 +323,7 @@ fn glass_loads_a_texture_saves_it_and_draws_it() {
     assert_eq!(doc.node(NodeId(g)).unwrap().appearance.effects[0].params, glass_params(&s, g));
     assert_eq!(Renderer::new().render_region(&doc, Rect::new(0.0, 0.0, 200.0, 200.0), 1.0, true).pixels, loaded.pixels);
     // The same file by path, through Effect Options, stores the same texture.
-    let dir = std::env::temp_dir().join(format!("vc-glass-texture-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
+    let dir = vectorcraft_testkit::TempDir::new("glass-texture");
     let path = dir.join("rings.png");
     std::fs::write(&path, &png).unwrap();
     let (mut t, h) = striped();
@@ -334,7 +333,7 @@ fn glass_loads_a_texture_saves_it_and_draws_it() {
     assert_eq!(glass_params(&t, h)["textureImage"], json!(stored));
     assert_eq!(glass_params(&t, h)["texture"], json!("loaded"));
     assert_eq!(render(&t).pixels, loaded.pixels);
-    let _ = std::fs::remove_dir_all(&dir);
+    drop(dir);
     // The stored string is taken as it is (as effect.list gives it, and a graphic style copies it).
     t.execute("effect.apply", &json!({"effect": "distort.glass", "ids": [h], "params": {"textureImage": stored, "texture": "frosted"}})).unwrap();
     let second = t.doc().unwrap().doc.node(NodeId(h)).unwrap().appearance.effects[1].params.clone();
@@ -391,6 +390,53 @@ fn texturizer_loads_a_texture_and_draws_it() {
     assert_eq!(Renderer::new().render_region(&doc, Rect::new(0.0, 0.0, 200.0, 200.0), 1.0, true).pixels, loaded.pixels);
 }
 
+/// Effect › Artistic › Rough Pastels › Load Texture: an image file, given as bytes or by path, is
+/// stored with the effect and picked; it draws as the surface, a save and open keeps it, a file
+/// that isn't an image is refused without a change, and undo takes it away.
+#[test]
+fn rough_pastels_loads_a_texture_saves_it_and_draws_it() {
+    let png = rings_png();
+    let data = vectorcraft_format::base64_encode(&png);
+    let (mut s, g) = striped();
+    let file = json!({"name": "rings.png", "dataBase64": data});
+    s.execute("effect.apply", &json!({"effect": "artistic.roughPastels", "ids": [g], "params": {"relief": 20, "textureImage": file}})).unwrap();
+    let p = glass_params(&s, g);
+    assert_eq!(p["texture"], json!("loaded"), "loading a texture picks it");
+    let stored = p["textureImage"].as_str().unwrap().to_string();
+    assert_eq!(vectorcraft_render::effects::pixel::texture(&stored).unwrap().size(), (12, 10));
+    let loaded = render(&s);
+    for (_, builtin) in vectorcraft_render::effects::pixel::TEXTURES {
+        s.execute("effect.setParams", &json!({"index": 0, "ids": [g], "params": {"texture": builtin}})).unwrap();
+        assert!(mean_diff(&loaded, &render(&s)) > 0.001, "{builtin}");
+    }
+    s.execute("effect.setParams", &json!({"index": 0, "ids": [g], "params": {"texture": "loaded"}})).unwrap();
+    assert_eq!(render(&s).pixels, loaded.pixels, "the texture stayed with the effect");
+    let doc = vectorcraft_format::load(&vectorcraft_format::save(&s.doc().unwrap().doc, false)).unwrap();
+    assert_eq!(doc.node(NodeId(g)).unwrap().appearance.effects[0].params, glass_params(&s, g));
+    assert_eq!(Renderer::new().render_region(&doc, Rect::new(0.0, 0.0, 200.0, 200.0), 1.0, true).pixels, loaded.pixels);
+    // A file that isn't an image changes nothing.
+    let junk = vectorcraft_format::base64_encode(b"not an image");
+    let before = glass_params(&s, g);
+    let e = s.execute("effect.setParams", &json!({"index": 0, "ids": [g], "params": {"textureImage": {"dataBase64": junk}}})).unwrap_err();
+    assert!(e.to_string().contains("textureImage"), "{e}");
+    let e = s.execute("effect.setParams", &json!({"index": 0, "ids": [g], "params": {"textureImage": 5}})).unwrap_err();
+    assert!(e.to_string().contains("textureImage"), "{e}");
+    assert_eq!(glass_params(&s, g), before);
+    // The same file by path, through Effect Options, stores the same texture; undo takes it away.
+    let dir = vectorcraft_testkit::TempDir::new("rough-pastels-texture");
+    let path = dir.join("rings.png");
+    std::fs::write(&path, &png).unwrap();
+    let (mut t, h) = striped();
+    t.execute("effect.apply", &json!({"effect": "artistic.roughPastels", "ids": [h], "params": {"relief": 20}})).unwrap();
+    assert!(glass_params(&t, h).get("textureImage").is_none());
+    t.execute("effect.setParams", &json!({"index": 0, "ids": [h], "params": {"textureImage": {"path": path.to_string_lossy()}}})).unwrap();
+    drop(dir);
+    assert_eq!((&glass_params(&t, h)["textureImage"], &glass_params(&t, h)["texture"]), (&json!(stored), &json!("loaded")));
+    assert_eq!(render(&t).pixels, loaded.pixels);
+    t.execute("edit.undo", &json!({})).unwrap();
+    assert!(glass_params(&t, h).get("textureImage").is_none(), "undone");
+}
+
 #[test]
 fn spin_blur_reaches_past_the_corners() {
     let (mut s, g) = striped();

crates/engine/src/tests/scalestrokes.rs

@@ -216,7 +216,7 @@ fn the_journal_records_the_scale_options_used() {
     run(&mut s, "object.scale", json!({"sx": 150}));
     let (cmd, p) = s.journal.last().unwrap().clone();
     assert_eq!(cmd, "object.scale");
-    assert_eq!(p, json!({"sx": 150, "strokes": false, "corners": true}));
+    assert_eq!(p, json!({"sx": 150, "strokes": false, "corners": true, "basis": "box"}));
     // An explicit value stays; moves don't scale, so they record nothing.
     run(&mut s, "object.scale", json!({"sx": 150, "strokes": true}));
     assert_eq!(s.journal.last().unwrap().1["strokes"], json!(true));

crates/engine/tests/import_fuzz.rs

@@ -1854,6 +1854,80 @@ proptest! {
     }
 }
 
+/// A 4 × 2 pixel RGB PSD file whose clipping path resource (2999) names its saved path "P"
+/// (resource 2000): a closed subpath of a linked and two unlinked knots, an open subpath, and the
+/// initial fill record saying the fill starts with all pixels.
+fn clipped_psd() -> Vec<u8> {
+    let record = |selector: u16, body: &[i32]| {
+        let mut r = selector.to_be_bytes().to_vec();
+        r.extend(body.iter().flat_map(|v| v.to_be_bytes()));
+        r.resize(26, 0);
+        r
+    };
+    let one = 1 << 24;
+    let mut path = record(6, &[]);
+    path.extend(record(8, &[1 << 16]));
+    path.extend(record(0, &[3 << 16]));
+    path.extend(record(1, &[0, 0, 0, one / 2, 0, one]));
+    path.extend(record(2, &[one, one, one, one, one, one]));
+    path.extend(record(2, &[one, 0, one, 0, one, 0]));
+    path.extend(record(3, &[2 << 16]));
+    path.extend(record(5, &[-one, -one, 0, 0, 2 * one, 2 * one]));
+    path.extend(record(4, &[one / 4, one / 4, one / 4, one / 4, one / 4, one / 4]));
+    let mut res = b"8BIM\x07\xd0\x01P".to_vec();
+    res.extend((path.len() as u32).to_be_bytes());
+    res.extend(path);
+    res.extend(b"8BIM\x0b\xb7\0\0");
+    res.extend(8u32.to_be_bytes());
+    res.extend([1, b'P', 0, 0, 0, 0, 0, 0]);
+    let mut f = b"8BPS\0\x01\0\0\0\0\0\0\0\x03\0\0\0\x02\0\0\0\x04\0\x08\0\x03".to_vec();
+    f.extend([0; 4]);
+    f.extend((res.len() as u32).to_be_bytes());
+    f.extend(res);
+    f.extend([0; 4]);
+    f.extend([0, 0]);
+    f.extend((0..24u8).map(|v| v * 10));
+    f
+}
+
+#[test]
+fn the_clipped_psd_sample_places_in_a_clip_group() {
+    let path = vectorcraft_engine::cmd::fileio::psdread::clipping_path(&clipped_psd()).unwrap();
+    assert_eq!(path.subpaths.iter().map(|s| (s.anchors.len(), s.closed)).collect::<Vec<_>>(), [(4, true), (3, true), (2, false)]);
+    let mut s = vectorcraft_engine::Session::new();
+    s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
+    let r = s.execute("file.place", &json!({"name": "c.psd", "dataBase64": vectorcraft_format::base64_encode(&clipped_psd())})).unwrap();
+    assert!(r["image"].is_u64(), "{r}");
+}
+
+proptest! {
+    #![proptest_config(config())]
+
+    /// Mutated copies of a PSD file with a clipping path (its resources: the path records, their
+    /// selectors, counts and points, and the names) never crash reading the path, placing the file
+    /// or opening its merged image.
+    #[test]
+    fn mutated_psd_clipping_paths_never_panic(cut in 0usize..1000, edits in prop::collection::vec((0usize..300, any::<u8>()), 0..12)) {
+        let mut bytes = clipped_psd();
+        let len = bytes.len();
+        for (at, b) in edits {
+            if let Some(x) = bytes.get_mut(at % len) {
+                *x = b;
+            }
+        }
+        bytes.truncate((cut % (len + 1)).max(8));
+        let r = catch_quiet(|| {
+            let _ = vectorcraft_engine::cmd::fileio::psdread::clipping_path(&bytes);
+            let mut s = vectorcraft_engine::Session::new();
+            s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap();
+            let p = json!({"name": "c.psd", "dataBase64": vectorcraft_format::base64_encode(&bytes), "thumbnail": 8});
+            let _ = no_panic(s.execute("file.place", &p));
+            let _ = no_panic(s.execute("document.open", &json!({"name": "c.psd", "dataBase64": vectorcraft_format::base64_encode(&bytes), "layers": false})));
+        });
+        prop_assert!(r.is_ok(), "panicked: {:?}", r.err());
+    }
+}
+
 /// 1-bit TIFFs compressed with CCITT Group 3: modified Huffman (Compression 2) in three strips, T.4
 /// (Compression 3) with two-dimensional rows, fill bits, six EOLs at the end and each byte's lowest
 /// bit first, and T.4 two-dimensional rows in 16 × 16 tiles.

crates/eps/src/ai_editing.rs

@@ -143,6 +143,10 @@
 //!   A path or compound path with a brush the reader reads live is written with an art style whose
 //!   stroke is the brush's filter (`writer::brushes`). A brush is written only when the reader reads
 //!   it back with its settings.
+//! - Graphs, as the reader reads them (`read/graph.rs`): a graph on the layers whose records the
+//!   reader reads back as the same graph ([`crate::ai_graph`]) is written as its group between
+//!   `%_Gs`, its functional records and `%_GS`, each series' group tagged `Go` right after its end;
+//!   any other graph, and a graph with art left out, as its art, with a warning.
 //!
 //! Lines end in CR LF. Strings are written in UTF-8. Art space is ruler space: y up, its origin at
 //! the first artboard's top-left corner. On the canvas ([`CANVAS_SIZE`] points square, y down) the

crates/eps/src/ai_editing/tests.rs

@@ -11196,3 +11196,73 @@ fn a_clipping_path_written_as_its_paint_keeps_one_text_wrap() {
         same_wraps(&wraps(read_back(&doc).layers[0].children().unwrap()), &[(None, 5.0, true)]);
     }
 }
+
+/// A graph whose records read back whole is written with them, each series' group tagged before
+/// its name, and opens again as the same live graph, also from a PDF-compatible file's first page.
+#[test]
+fn graphs_are_written_with_their_records_and_open_live() {
+    use crate::ai_graph::sample;
+    for (what, doc) in sample::kept() {
+        let out = export_ai_editing(&doc, &opts()).unwrap();
+        assert!(!out.warnings.iter().any(|w| w == writer::GRAPHS), "{what}: {:?}", out.warnings);
+        let text = program(&doc);
+        assert_eq!((text.matches("%_Gs\n").count(), text.matches("%_GS\n").count()), (1, 1), "{what}: {text}");
+        assert!(text.contains("U\n%_2 ") && text.contains(" 0 0 Go\n%_/ArtDictionary :\n"), "{what}: the tag comes before the series' name: {text}");
+        let written = sample::graphs(&doc);
+        let graphs = sample::graphs(&read_back(&doc));
+        assert_eq!(graphs.len(), 1, "{what}");
+        assert!(sample::same(&written[0].0, &graphs[0].0), "{what}: {:#?}\n{:#?}", written[0].0, graphs[0].0);
+        assert_eq!(graphs[0].1, written[0].1, "{what}: the members and their series");
+    }
+    let doc = sample::document(sample::spec(vectorcraft_doc::GraphKind::Column));
+    let (p, _) = private_data(&doc, &opts()).unwrap();
+    let pdf =
+        vectorcraft_pdf::export(&doc, &vectorcraft_pdf::PdfOptions { private_data: Some(p), ..vectorcraft_pdf::PdfOptions::uncompressed() }).unwrap();
+    let (read, _) = crate::ai_alone(&vectorcraft_pdf::illustrator_data(&pdf, None).unwrap()).unwrap();
+    let graphs = sample::graphs(&read);
+    assert_eq!(graphs.len(), 1);
+    assert!(sample::same(&sample::graphs(&doc)[0].0, &graphs[0].0));
+}
+
+/// A graph whose records wouldn't read back as it is is written as its art, without records, with
+/// the warning.
+#[test]
+fn graphs_the_records_cant_keep_are_written_as_their_art() {
+    use crate::ai_graph::sample;
+    for (what, doc) in sample::unkept() {
+        let out = export_ai_editing(&doc, &opts()).unwrap();
+        assert!(out.warnings.iter().any(|w| w == writer::GRAPHS), "{what}: {:?}", out.warnings);
+        let text = program(&doc);
+        assert!(!text.contains("%_Gs") && !text.contains(" Go\n") && !text.contains("%_GS"), "{what}: {text}");
+        let read = read_back(&doc);
+        assert!(sample::graphs(&read).is_empty(), "{what}");
+        let paths = |d: &Document| {
+            let mut count = 0;
+            d.walk(|n| count += usize::from(matches!(n.kind, NodeKind::Path { .. })));
+            count
+        };
+        assert_eq!(paths(&read), paths(&doc), "{what}: the graph's art is kept");
+    }
+}
+
+/// A graph with art left out for the object limit is written as the art there is room for, without
+/// records or tags, with the warning; with room for all of it, it is written with its records.
+#[test]
+fn a_graph_with_art_left_out_is_written_without_records() {
+    use crate::ai_graph::sample;
+    let doc = sample::document(sample::spec(vectorcraft_doc::GraphKind::Column));
+    let all = export_ai_editing(&doc, &opts()).unwrap();
+    let read = crate::import::objects_read(&all.program).unwrap();
+    let room = export_within(&doc, &opts(), read).unwrap();
+    assert_eq!(room.program, all.program);
+    for max in [0, 1, read / 2, read - 1] {
+        let out = export_within(&doc, &opts(), max).unwrap();
+        let text = String::from_utf8_lossy(&out.program).replace("\r\n", "\n");
+        assert!(
+            out.warnings.iter().any(|w| w == writer::OBJECT_LIMIT) && out.warnings.iter().any(|w| w == writer::GRAPHS),
+            "{max}: {:?}",
+            out.warnings
+        );
+        assert!(!text.contains("%_Gs") && !text.contains(" Go\n") && !text.contains("%_GS"), "{max}: {text}");
+    }
+}

crates/eps/src/ai_editing/writer.rs

@@ -307,6 +307,13 @@ pub(super) struct Writer<'a> {
     shown: Vec<vectorcraft_geom::BezPath>,
     /// The copy of an image that the last [`Self::image`] wrote as a window, when it did.
     windowed: Option<images::Windowed>,
+    /// Writing a graph's art with its records ([`Self::graph_records`]): a graph inside it is written
+    /// as its art.
+    in_graph: bool,
+    /// The `Go` line the next object, a graph's series group, is followed by.
+    series_tag: Option<String>,
+    /// Where the `Go` lines of the graph being written start in [`Self::body`].
+    graph_tags: Vec<usize>,
 }
 
 impl<'a> Writer<'a> {
@@ -382,6 +389,9 @@ impl<'a> Writer<'a> {
             whole_images: HashMap::new(),
             shown: vec![],
             windowed: None,
+            in_graph: false,
+            series_tag: None,
+            graph_tags: vec![],
         }
     }
 
@@ -662,6 +672,7 @@ impl<'a> Writer<'a> {
 
     /// One object: its state before it, its transparency, and its name and opacity mask after it.
     fn node(&mut self, n: &Node) {
+        let tag = self.series_tag.take();
         if let NodeKind::Layer { .. } = n.kind {
             return self.write_layer(n, &[]);
         }
@@ -672,7 +683,8 @@ impl<'a> Writer<'a> {
         if self.in_symbol {
             self.wrote_fixed |= symbols::redrawn(n);
         }
-        if n.extras().graph.is_some() && !self.in_look {
+        let graph = if n.extras().graph.is_some() && !self.in_look { self.graph_records(n) } else { None };
+        if n.extras().graph.is_some() && !self.in_look && graph.is_none() {
             self.warn(GRAPHS);
         }
         // On the layers or in an opacity mask's art (a symbol's and a pattern tile's included),
@@ -699,14 +711,18 @@ impl<'a> Writer<'a> {
         let start = self.body.len();
         // An image's copy written as the part that its opacity mask, among other regions, shows.
         let mut mask_window = None;
+        let charged = self.charges();
         match &n.kind {
             NodeKind::Layer { .. } => {}
             NodeKind::Group { children, clip: true } => self.clip_group(children, xy),
             NodeKind::Group { children, clip: false } => {
                 if self.open_group("u") {
+                    self.in_graph |= graph.is_some();
                     for c in children {
+                        self.series_tag = graph.as_ref().and_then(|g| g.tags.get(&c.id).cloned());
                         self.node(c);
                     }
+                    self.in_graph &= graph.is_none();
                     self.end_group("U", xy);
                 }
             }
@@ -809,6 +825,11 @@ impl<'a> Writer<'a> {
             // A group's dictionary goes between its end and its state block.
             let block = (self.block_end == self.body.len() && self.block_start >= start).then(|| self.body.split_off(self.block_start));
             self.block_end = usize::MAX;
+            // A graph's series group is tagged right after its end, before its dictionary.
+            if let Some(t) = tag {
+                self.graph_tags.push(self.body.len());
+                self.line(&t);
+            }
             let mask_written = self.dictionary(n);
             if let Some(b) = block {
                 self.body.push_str(&b);
@@ -822,6 +843,41 @@ impl<'a> Writer<'a> {
         if deform {
             self.line(&envelopes::plugin_line());
         }
+        if let Some(g) = graph {
+            self.graph_end(g, start, charged);
+        }
+    }
+
+    /// The records of graph `n` ([`crate::ai_graph::records`]) when it is written as a graph: on the
+    /// layers, outside art cut to a clipping object, symbols' art, live objects' art and another
+    /// graph, and without an art style anywhere in it. `None` when it is written as its art.
+    fn graph_records(&self, n: &Node) -> Option<crate::ai_graph::Records> {
+        fn has_style(n: &Node, styled: &HashMap<NodeId, Arc<Node>>) -> bool {
+            styled.contains_key(&n.id) || n.children().is_some_and(|c| c.iter().any(|c| has_style(c, styled)))
+        }
+        let placed = self.hidden == 0 && self.nest == 0 && self.drawn == 0 && self.clip.is_none() && !self.in_symbol && !self.in_graph;
+        if !placed || has_style(n, &self.styled) {
+            return None;
+        }
+        crate::ai_graph::records(n, self.to_art)
+    }
+
+    /// The graph whose art was written from `start` on, charged from `charged`, ends: its records go
+    /// before the art and `%_GS` after it, or, when art in it was left out ([`Self::take_objects`]),
+    /// its `Go` lines are taken out and it stays its art, with a warning.
+    fn graph_end(&mut self, records: crate::ai_graph::Records, start: usize, charged: Charges) {
+        let tags = std::mem::take(&mut self.graph_tags);
+        if self.body.len() > start && !self.left_out_since(charged) {
+            self.body.insert_str(start, &records.head);
+            self.line(crate::ai_graph::END);
+            return;
+        }
+        for at in tags.into_iter().rev() {
+            if let Some(len) = self.body.get(at..).and_then(|rest| rest.find('\n')) {
+                self.body.replace_range(at..=at + len, "");
+            }
+        }
+        self.warn(GRAPHS);
     }
 
     /// Live object `n`, of transparency `xy`, as a group of its art, with `warning` when it is given.

crates/eps/src/ai_graph.rs

@@ -0,0 +1,661 @@
+//! A live graph's records, which the legacy `.ai` writer ([`crate::legacy_ai`]) and the editing data
+//! writer ([`crate::ai_editing`]) both write around a graph's group (Adobe Illustrator File Format
+//! Specification, version 7.0, §17 and appendix A): `%_Gs`, the functional records on `%_` lines
+//! (`Gb`, `Gy`, `Gd`, three `Ga` … `GA` axes, `Gz`, `Gc` cells and `GC`), the drawn art in one group
+//! with each series' group followed by `%_2 column 0 0 Go`, then `%_GS`.
+//!
+//! A graph is written so only when the `.ai` reader (`import::ai::read::graph`) reads every record
+//! back as the same graph: one of the four graph types it reads (grouped and stacked column, line,
+//! area), the settings it keeps, a table it holds, and drawn art it attaches the graph to (each
+//! series' group a direct member of the graph's, of paths painted with one solid fill and one plain
+//! line, and the plot's left and bottom edges drawn as stroked lines). Any other graph is written as
+//! its art, with a warning.
+
+use std::collections::HashMap;
+use std::fmt::Write;
+
+use kurbo::{PathSeg, Point};
+use vectorcraft_color::{BlendMode, Paint};
+use vectorcraft_doc::{
+    Appearance, AppearanceItem, GraphKind, GraphSpec, LabelStyles, MAX_GRAPH_CATEGORIES, MAX_GRAPH_SERIES, Node, NodeId, NodeKind, PiePosition,
+    PieSort, TickLength, ValueAxisSide,
+};
+use vectorcraft_effects::stroke;
+use vectorcraft_geom::{Affine, Rect};
+
+use crate::ps;
+
+/// Most cells of a graph's table, its label row and column included.
+const MAX_CELLS: usize = 2_600_000;
+
+/// Longest cell string, in bytes (appendix A, `Gc`).
+const MAX_CELL_TEXT: usize = 255;
+
+/// Most characters of the text before or after a value axis' numbers (appendix A, `Ga`, `GA`).
+const MAX_AFFIX: usize = 9;
+
+/// Most tick marks per division the reader keeps.
+const MAX_TICK_MARKS: usize = 20;
+
+/// Most divisions of a value axis with set values the reader keeps.
+const MAX_DIVISIONS: usize = 100;
+
+/// How far an axis line may be from the plot's edge, in points.
+const EDGE: f64 = 0.01;
+
+/// Most values one `Gc` takes.
+const CELLS_PER_RECORD: usize = 15;
+
+/// A graph's records: what goes before its group (`%_Gs` to `%_GC`), and the `Go` line that follows
+/// each series' group, by the group's id. `%_GS` follows the group.
+pub(crate) struct Records {
+    pub(crate) head: String,
+    pub(crate) tags: HashMap<NodeId, String>,
+}
+
+/// The line that ends a graph's records, after its group.
+pub(crate) const END: &str = "%_GS";
+
+/// The records of graph `n` (a group holding [`vectorcraft_doc::NodeExtras::graph`]), its art written
+/// through `to_art`; `None` when the reader would not read them back as the same graph.
+pub(crate) fn records(n: &Node, to_art: Affine) -> Option<Records> {
+    let g = n.extras().graph.as_deref()?;
+    let NodeKind::Group { children, clip: false } = &n.kind else { return None };
+    (n.visible && n.extras().mask.is_none() && all_shown(n)).then_some(())?;
+    let ty = kind_code(g.kind)?;
+    settings_kept(g).then_some(())?;
+    let (left_manual, left_min, left_max, left_step) = axis(g.ticks, g.axis_min, g.axis_max)?;
+    let (right_manual, right_min, right_max, right_step) = axis(g.right_ticks, g.right_axis_min, g.right_axis_max)?;
+    // The table as the graph draws it: `cells` leaves out rows and series past the model's limits.
+    let rows = g.rows.len();
+    let width = g.rows.iter().map(Vec::len).max().unwrap_or(0);
+    ((1..=MAX_GRAPH_CATEGORIES).contains(&rows) && (1..=MAX_GRAPH_SERIES).contains(&width)).then_some(())?;
+    let cells = g.cells();
+    cells.iter().flatten().all(|v| v.is_none_or(f64::is_finite)).then_some(())?;
+    cells.iter().flatten().any(Option::is_some).then_some(())?;
+    let first_row = usize::from(!g.series.is_empty());
+    let first_col = usize::from(!g.categories.is_empty());
+    (g.series.is_empty() || g.series.len() == width).then_some(())?;
+    (g.categories.is_empty() || g.categories.len() == rows).then_some(())?;
+    let (total_rows, total_cols) = (rows + first_row, width + first_col);
+    total_rows.checked_mul(total_cols).filter(|c| *c <= MAX_CELLS)?;
+    g.series.iter().chain(&g.categories).all(|l| l.len() <= MAX_CELL_TEXT && !l.chars().any(char::is_control)).then_some(())?;
+    [&g.prefix, &g.suffix, &g.right_prefix, &g.right_suffix]
+        .iter()
+        .all(|a| a.chars().count() <= MAX_AFFIX && !a.chars().any(char::is_control))
+        .then_some(())?;
+    // The plot, and the art the reader attaches the graph to.
+    let r = g.rect;
+    (r.is_finite() && r.width() > 0.0 && r.height() > 0.0).then_some(())?;
+    let plot = to_art.transform_rect_bbox(r);
+    (plot.is_finite() && plot.width() > 0.0 && plot.height() > 0.0).then_some(())?;
+    let tags = series_groups(children, width, first_col, g.kind == GraphKind::Line)?;
+    draws_axes(n, r).then_some(())?;
+    let placed = n.geometric_bounds()?;
+    (r.x0 >= placed.x0 - EDGE && r.y0 >= placed.y0 - EDGE && r.x1 <= placed.x1 + EDGE && r.y1 <= placed.y1 + EDGE).then_some(())?;
+
+    let mut head = String::from("%_Gs\n");
+    let _ = writeln!(head, "%_{} {} {} {} Gb", real(plot.x0), real(plot.y1), real(plot.x1), real(plot.y0));
+    let flag = |b: bool| u8::from(b);
+    let _ = writeln!(
+        head,
+        "%_{ty} {} {} 14 {} {} 0 {} 6 44 Gy",
+        flag(g.drop_shadow),
+        flag(g.first_row_in_front),
+        flag(g.mark_points),
+        flag(g.connect_points),
+        flag(g.legend_across_top)
+    );
+    let _ =
+        writeln!(head, "%_10 2 {} 0 {} {} {} Gd", flag(g.first_column_in_front), real(g.column_width), real(g.cluster_width), flag(g.edge_to_edge));
+    // Tick marks per division: 0 and 1 both mean one, at the labels, and the reader reads 0 as 1.
+    let (category_marks, left_marks, right_marks) = (g.category_tick_marks.max(1), g.tick_marks.max(1), g.right_tick_marks.max(1));
+    let _ = writeln!(head, "%_1 () Ga\n%_0 {} 0 0 0 {category_marks} {} () GA", tick(g.category_tick_length), flag(g.ticks_between_labels));
+    let _ = writeln!(head, "%_2 {} Ga", ps::bytes(g.prefix.as_bytes()));
+    let _ = writeln!(
+        head,
+        "%_{} {} {} {} {} {} 0 {} GA",
+        flag(left_manual),
+        tick(g.tick_length),
+        real(left_min),
+        real(left_max),
+        real(left_step),
+        left_marks,
+        ps::bytes(g.suffix.as_bytes())
+    );
+    let _ = writeln!(head, "%_4 {} Ga", ps::bytes(g.right_prefix.as_bytes()));
+    let _ = writeln!(
+        head,
+        "%_{} {} {} {} {} {} 0 {} GA",
+        flag(right_manual),
+        tick(g.right_tick_length),
+        real(right_min),
+        real(right_max),
+        real(right_step),
+        right_marks,
+        ps::bytes(g.right_suffix.as_bytes())
+    );
+    let _ = writeln!(head, "%_{total_rows} {total_cols} {first_row} {first_col} Gz");
+    let mut table = Table::new(&mut head);
+    if first_row == 1 {
+        if first_col == 1 {
+            table.text("");
+        }
+        for s in &g.series {
+            table.text(s);
+        }
+    }
+    for (i, row) in cells.iter().enumerate() {
+        if let Some(c) = g.categories.get(i) {
+            table.text(c);
+        }
+        for v in row {
+            match v {
+                Some(v) => table.num(*v),
+                None => table.text(""),
+            }
+        }
+    }
+    table.finish();
+    head.push_str("%_GC\n");
+    Some(Records { head, tags })
+}
+
+/// The `Gc` records of a table, its cells in rows: at most [`CELLS_PER_RECORD`] values each, one
+/// string at most.
+struct Table<'a> {
+    out: &'a mut String,
+    values: usize,
+    string: bool,
+}
+
+impl<'a> Table<'a> {
+    fn new(out: &'a mut String) -> Self {
+        Self { out, values: 0, string: false }
+    }
+
+    fn start(&mut self, string: bool) {
+        if self.values == CELLS_PER_RECORD || (string && self.string) {
+            self.finish();
+        }
+        self.out.push_str(if self.values == 0 { "%_" } else { " " });
+        self.values += 1;
+        self.string |= string;
+    }
+
+    fn text(&mut self, t: &str) {
+        self.start(true);
+        self.out.push_str(&ps::bytes(t.as_bytes()));
+    }
+
+    fn num(&mut self, v: f64) {
+        self.start(false);
+        self.out.push_str(&real(v));
+    }
+
+    fn finish(&mut self) {
+        if self.values > 0 {
+            self.out.push_str(" Gc\n");
+        }
+        (self.values, self.string) = (0, false);
+    }
+}
+
+/// `v` as a PostScript number that reads back as the same value.
+fn real(v: f64) -> String {
+    if v == 0.0 {
+        "0".into()
+    } else if (1e-4..1e15).contains(&v.abs()) {
+        format!("{v}")
+    } else {
+        format!("{v:e}")
+    }
+}
+
+/// `graphType`: 5 grouped column, 6 stacked column, 7 line, 10 area; the reader reads no other type.
+fn kind_code(k: GraphKind) -> Option<u8> {
+    match k {
+        GraphKind::Column => Some(5),
+        GraphKind::StackedColumn => Some(6),
+        GraphKind::Line => Some(7),
+        GraphKind::Area => Some(10),
+        _ => None,
+    }
+}
+
+/// `tickMarkType`: 13 none, 14 short, 15 the length of the plot.
+fn tick(t: TickLength) -> u8 {
+    match t {
+        TickLength::None => 13,
+        TickLength::Short => 14,
+        TickLength::Full => 15,
+    }
+}
+
+/// Whether `g`'s settings are ones the records give and the reader keeps: a legend beside or across
+/// the top, every series of the graph's type, one value axis on the left, lines not filled, no graph
+/// designs, label formatting or pie settings, column and cluster widths of 1% to 1000%, and at most
+/// [`MAX_TICK_MARKS`] tick marks a division.
+fn settings_kept(g: &GraphSpec) -> bool {
+    let percent = |p: f64| (1.0..=1000.0).contains(&p);
+    g.legend
+        && g.series_kinds.iter().all(|k| k.is_none_or(|k| k == g.kind))
+        && g.value_axis == ValueAxisSide::Left
+        && !g.separate_scales
+        && g.right_series.is_empty()
+        && !g.filled_lines
+        && g.series_markers.iter().all(Option::is_none)
+        && g.series_columns.iter().all(Option::is_none)
+        && g.label_styles == LabelStyles::default()
+        && !g.pie_legend_in_wedges
+        && g.pie_position == PiePosition::Even
+        && g.pie_sort == PieSort::None
+        && percent(g.column_width)
+        && percent(g.cluster_width)
+        && [g.tick_marks, g.right_tick_marks, g.category_tick_marks].iter().all(|m| *m <= MAX_TICK_MARKS)
+}
+
+/// A value axis' `useManualValues`, lowest and highest value and `betweenValue`: automatic (no tick
+/// count and no values), or a whole number of divisions (1 to [`MAX_DIVISIONS`]) between a lowest
+/// and a higher highest value, which the reader reads back as the same count.
+fn axis(ticks: usize, min: Option<f64>, max: Option<f64>) -> Option<(bool, f64, f64, f64)> {
+    match (ticks, min, max) {
+        (0, None, None) => Some((false, 0.0, 0.0, 0.0)),
+        (1..=MAX_DIVISIONS, Some(lo), Some(hi)) if lo.is_finite() && hi.is_finite() && hi > lo => {
+            let step = (hi - lo) / ticks as f64;
+            let n = (hi - lo) / step;
+            let exact = step > 0.0 && step.is_finite() && (n - n.round()).abs() <= 1e-6 * n.round().max(1.0) && n.round() == ticks as f64;
+            exact.then_some((true, lo, hi, step))
+        }
+        _ => None,
+    }
+}
+
+/// Whether `n` and everything in it is shown.
+fn all_shown(n: &Node) -> bool {
+    n.visible && n.children().is_none_or(|c| c.iter().all(|c| all_shown(c)))
+}
+
+/// Whether `n` is shown, fully opaque, in Normal mode, not isolated and without an opacity mask or
+/// effects: the reader keeps a series' paint only from groups and paths drawn so.
+fn as_drawn(n: &Node) -> bool {
+    n.visible
+        && n.opacity == 1.0
+        && n.blend == BlendMode::Normal
+        && !n.isolate
+        && n.extras().mask.is_none()
+        && !n.appearance.effects.iter().any(|e| e.visible)
+}
+
+/// The visible fill and line `p` is written with as one path object: a solid fill, and a solid
+/// plain line with its weight, each opaque, in Normal mode and without effects of its own. `None`
+/// when it has other paint, more than one of either, or isn't one path of one subpath.
+#[allow(clippy::type_complexity)]
+fn plain_paint(p: &Node) -> Option<(Option<Paint>, Option<(Paint, f64)>)> {
+    let NodeKind::Path { path, guide: false, clipping: false, .. } = &p.kind else { return None };
+    (path.subpaths.iter().filter(|sp| !sp.anchors.is_empty()).count() == 1).then_some(())?;
+    let (mut fill, mut line) = (None, None);
+    for item in &p.appearance.items {
+        let drawn = match item {
+            AppearanceItem::Fill(f) => f.visible && !f.paint.is_none(),
+            AppearanceItem::Stroke(s) => s.visible && !s.paint.is_none() && s.width > 0.0 && s.width.is_finite(),
+        };
+        if !drawn {
+            // The writers leave out what draws nothing; the reader reads nothing in its place.
+            continue;
+        }
+        let plain =
+            item.opacity() == 1.0 && item.blend() == BlendMode::Normal && item.effects().is_empty() && matches!(item.paint(), Paint::Solid { .. });
+        plain.then_some(())?;
+        match item {
+            AppearanceItem::Fill(f) if fill.is_none() && line.is_none() => fill = Some(f.paint.clone()),
+            AppearanceItem::Stroke(s) if line.is_none() && stroke::is_plain(s) => line = Some((s.paint.clone(), s.width)),
+            _ => return None,
+        }
+    }
+    Some((fill, line))
+}
+
+/// The `Go` line of each series' group among `children`: a group whose series index is one of the
+/// `series` the table has, each once, of paths [`as_drawn`] with one fill and one line alike
+/// ([`plain_paint`]), every path filled unless the graph draws lines (`line`). Its column is the
+/// table's: after the label column when there is one (`first_col`). `None` when a series has no
+/// such group.
+fn series_groups(children: &[std::sync::Arc<Node>], series: usize, first_col: usize, line: bool) -> Option<HashMap<NodeId, String>> {
+    let mut tags = HashMap::new();
+    let mut seen = vec![false; series];
+    for c in children {
+        let Some(s) = c.extras().series_index else { continue };
+        let s = usize::try_from(s).ok().filter(|s| *s < series)?;
+        let slot = seen.get_mut(s)?;
+        (!*slot).then_some(())?;
+        *slot = true;
+        let NodeKind::Group { children: paths, clip: false } = &c.kind else { return None };
+        (as_drawn(c) && *c.appearance == Appearance::default() && !paths.is_empty()).then_some(())?;
+        let mut paints = vec![];
+        for p in paths {
+            as_drawn(p).then_some(())?;
+            paints.push(plain_paint(p)?);
+        }
+        let fill = paints.iter().find_map(|(f, _)| f.clone());
+        paints.iter().all(|(f, _)| f.is_none() || *f == fill).then_some(())?;
+        (line || paints.iter().all(|(f, _)| f.is_some())).then_some(())?;
+        let stroke = paints.first().and_then(|(_, s)| s.clone());
+        paints.iter().all(|(_, s)| *s == stroke).then_some(())?;
+        tags.insert(c.id, format!("%_2 {} 0 0 Go", s + first_col));
+    }
+    seen.iter().all(|s| *s).then_some(tags)
+}
+
+/// Whether `art` draws plot `plot`'s left edge and its bottom edge (the document's y runs down) as
+/// straight lines, each a shown path of one subpath with a plain line ([`plain_paint`]) in a shown
+/// group, as the reader finds the axes.
+fn draws_axes(art: &Node, plot: Rect) -> bool {
+    let near = |a: Point, b: Point| (a - b).hypot() <= EDGE;
+    let on = |s: &PathSeg, a: Point, b: Point| match s {
+        PathSeg::Line(l) => (near(l.p0, a) && near(l.p1, b)) || (near(l.p0, b) && near(l.p1, a)),
+        _ => false,
+    };
+    let (top_left, bottom_left, bottom_right) = (Point::new(plot.x0, plot.y0), Point::new(plot.x0, plot.y1), Point::new(plot.x1, plot.y1));
+    let (mut left, mut bottom) = (false, false);
+    let mut stack = vec![art];
+    while let Some(n) = stack.pop() {
+        if !n.visible || n.opacity <= 0.0 || (left && bottom) {
+            continue;
+        }
+        match &n.kind {
+            NodeKind::Group { children, clip: false } => stack.extend(children.iter().map(|c| &**c)),
+            NodeKind::Path { path, .. } if plain_paint(n).is_some_and(|(_, line)| line.is_some()) => {
+                for s in path.to_bezpath().segments() {
+                    left |= on(&s, top_left, bottom_left);
+                    bottom |= on(&s, bottom_left, bottom_right);
+                }
+            }
+            _ => {}
+        }
+    }
+    left && bottom
+}
+
+/// Graphs built as the graph tools draw them, for the writers' tests.
+#[cfg(test)]
+pub(crate) mod sample {
+    use std::sync::Arc;
+
+    use vectorcraft_color::{Color, Paint};
+    use vectorcraft_doc::{Document, GraphKind, GraphSpec, Node, PieSort, TickLength, ValueAxisSide};
+    use vectorcraft_geom::{PathData, Point, Rect, shapes};
+
+    use super::Appearance;
+
+    /// A graph of kind `kind`: series East and West, categories Q1 to Q3, West blank in Q2, on the
+    /// plot 100 100 300 250.
+    pub(crate) fn spec(kind: GraphKind) -> GraphSpec {
+        let mut g = GraphSpec {
+            kind,
+            rect: Rect::new(100.0, 100.0, 300.0, 250.0),
+            series: vec!["East".into(), "West".into()],
+            categories: vec!["Q1".into(), "Q2".into(), "Q3".into()],
+            ..GraphSpec::default()
+        };
+        g.set_cells(vec![vec![Some(5.0), Some(3.0)], vec![Some(7.0), None], vec![Some(4.0), Some(6.0)]]);
+        g
+    }
+
+    fn path(doc: &mut Document, p: PathData, fill: Paint, stroke: Paint) -> Arc<Node> {
+        Arc::new(Node::path(doc.alloc_id(), p, Appearance::basic(fill, stroke, 1.0)))
+    }
+
+    /// Graph `g` drawn as a group: a group of each series' marks (a line graph's series as an unfilled
+    /// line, the others' as filled columns), its axes on the plot's left and bottom edges, and a
+    /// legend of a swatch for each series; its series groups named after the series.
+    pub(crate) fn graph(doc: &mut Document, g: GraphSpec) -> Node {
+        let r = g.rect;
+        let cells = g.cells();
+        let width = cells.first().map_or(0, Vec::len);
+        let mut members = vec![];
+        let axes = vec![
+            path(doc, shapes::line(Point::new(r.x0, r.y0), Point::new(r.x0, r.y1)), Paint::None, Paint::solid(Color::BLACK)),
+            path(doc, shapes::line(Point::new(r.x0, r.y1), Point::new(r.x1, r.y1)), Paint::None, Paint::solid(Color::BLACK)),
+        ];
+        members.push(Arc::new(Node::group(doc.alloc_id(), axes)));
+        for s in 0..width {
+            let gray = Paint::solid(Color::gray(0.2 + 0.3 * s as f32));
+            let points: Vec<Point> = cells
+                .iter()
+                .enumerate()
+                .filter_map(|(c, row)| {
+                    row.get(s).copied().flatten().map(|v| Point::new(r.x0 + 20.0 + 60.0 * c as f64 + 15.0 * s as f64, r.y1 - v * 10.0))
+                })
+                .collect();
+            let marks: Vec<Arc<Node>> = if g.kind == GraphKind::Line {
+                let mut bp = kurbo::BezPath::new();
+                for (i, p) in points.iter().enumerate() {
+                    if i == 0 { bp.move_to(*p) } else { bp.line_to(*p) }
+                }
+                vec![path(doc, PathData::from_bezpath(&bp), Paint::None, gray)]
+            } else {
+                points.iter().map(|p| path(doc, shapes::rectangle(Rect::new(p.x, p.y, p.x + 10.0, r.y1)), gray.clone(), Paint::None)).collect()
+            };
+            let mut series = Node::group(doc.alloc_id(), marks);
+            series.name = Some(g.series.get(s).cloned().unwrap_or_else(|| format!("Series {}", s + 1)));
+            series.extras_mut().series_index = Some(s as u32);
+            members.push(Arc::new(series));
+        }
+        let swatches: Vec<Arc<Node>> = (0..width)
+            .map(|s| {
+                let y = r.y0 + 12.0 * s as f64;
+                path(
+                    doc,
+                    shapes::rectangle(Rect::new(r.x1 + 10.0, y, r.x1 + 18.0, y + 8.0)),
+                    Paint::solid(Color::gray(0.2 + 0.3 * s as f32)),
+                    Paint::None,
+                )
+            })
+            .collect();
+        members.push(Arc::new(Node::group(doc.alloc_id(), swatches)));
+        let mut n = Node::group(doc.alloc_id(), members);
+        n.extras_mut().graph = Some(Box::new(g));
+        n
+    }
+
+    /// A 400 × 300 document holding `g` drawn by [`graph`] on its layer.
+    pub(crate) fn document(g: GraphSpec) -> Document {
+        let mut doc = Document::new(400.0, 300.0);
+        let layer = doc.layers[0].id;
+        let n = graph(&mut doc, g);
+        doc.insert(Some(layer), usize::MAX, n).unwrap();
+        doc
+    }
+
+    /// Graphs whose records read back whole: each type the records give, every setting they keep
+    /// changed, labels with parentheses, backslashes and non-ASCII characters, a label of 255 bytes,
+    /// and a table without labels.
+    pub(crate) fn kept() -> Vec<(&'static str, Document)> {
+        let mut cases = vec![
+            ("column", document(spec(GraphKind::Column))),
+            ("stacked column", document(spec(GraphKind::StackedColumn))),
+            ("line", document(spec(GraphKind::Line))),
+            ("area", document(spec(GraphKind::Area))),
+        ];
+        let mut g = spec(GraphKind::Column);
+        (g.drop_shadow, g.first_row_in_front, g.first_column_in_front, g.legend_across_top) = (true, true, true, true);
+        (g.mark_points, g.connect_points, g.edge_to_edge) = (false, false, true);
+        (g.column_width, g.cluster_width) = (120.0, 50.0);
+        (g.tick_length, g.tick_marks, g.ticks, g.axis_min, g.axis_max) = (TickLength::Full, 3, 4, Some(0.0), Some(20.0));
+        (g.right_tick_length, g.right_tick_marks, g.right_ticks, g.right_axis_min, g.right_axis_max) = (TickLength::None, 2, 5, Some(1.0), Some(6.0));
+        (g.category_tick_length, g.category_tick_marks, g.ticks_between_labels) = (TickLength::Short, 2, true);
+        (g.prefix, g.suffix, g.right_prefix, g.right_suffix) = ("($".into(), "\\)".into(), "é".into(), " u".into());
+        cases.push(("settings", document(g)));
+        let mut g = spec(GraphKind::Column);
+        g.series = vec!["A (1)".into(), "B\\2".into()];
+        g.categories = vec![String::new(), "naïve".into(), "a".repeat(255)];
+        g.set_cells(vec![vec![Some(1.0 / 3.0), Some(1e-7)], vec![None, Some(2.5)], vec![Some(12.0), None]]);
+        cases.push(("labels", document(g)));
+        let mut g = spec(GraphKind::Column);
+        (g.series, g.categories) = (vec![], vec![]);
+        cases.push(("no labels", document(g)));
+        cases
+    }
+
+    /// Graphs the records can't give as they are, which are written as their art: the five other
+    /// types, settings the reader doesn't keep, a table it can't hold, and art it can't attach the
+    /// graph to.
+    pub(crate) fn unkept() -> Vec<(&'static str, Document)> {
+        let with = |f: &dyn Fn(&mut GraphSpec)| {
+            let mut g = spec(GraphKind::Column);
+            f(&mut g);
+            document(g)
+        };
+        let mut cases: Vec<(&'static str, Document)> = [GraphKind::Bar, GraphKind::StackedBar, GraphKind::Scatter, GraphKind::Pie, GraphKind::Radar]
+            .into_iter()
+            .map(|k| (k.id(), document(spec(k))))
+            .collect();
+        cases.extend([
+            ("no legend", with(&|g| g.legend = false)),
+            ("filled lines", with(&|g| (g.kind, g.filled_lines) = (GraphKind::Line, true))),
+            ("a series of another type", with(&|g| g.series_kinds = vec![None, Some(GraphKind::Line)])),
+            ("a marker design", with(&|g| g.series_markers = vec![Some("Star".into())])),
+            ("a column design", with(&|g| g.series_columns = vec![Some(Default::default())])),
+            ("label formatting", with(&|g| g.label_styles.values = Some(Default::default()))),
+            ("a value axis on both sides", with(&|g| g.value_axis = ValueAxisSide::Both)),
+            ("a series on the right axis", with(&|g| g.right_series = vec![1])),
+            ("pie settings", with(&|g| g.pie_sort = PieSort::All)),
+            ("a manual axis without its values", with(&|g| g.ticks = 4)),
+            ("values without a tick count", with(&|g| (g.axis_min, g.axis_max) = (Some(0.0), Some(10.0)))),
+            ("101 divisions", with(&|g| (g.ticks, g.axis_min, g.axis_max) = (101, Some(0.0), Some(101.0)))),
+            ("too many tick marks", with(&|g| g.tick_marks = 21)),
+            ("a column width past 1000%", with(&|g| g.column_width = 1001.0)),
+            ("a long prefix", with(&|g| g.prefix = "0123456789".into())),
+            ("a line break in a label", with(&|g| g.series[0] = "East\nside".into())),
+            ("a label of 256 bytes", with(&|g| g.categories[0] = "a".repeat(256))),
+            ("a value that isn't finite", with(&|g| g.rows[0][0] = f64::NAN)),
+            ("only blank cells", with(&|g| g.set_cells(vec![vec![None, None]; 3]))),
+            ("fewer labels than series", with(&|g| g.series.truncate(1))),
+        ]);
+        let drawn = |what: &'static str, f: &dyn Fn(&mut Vec<Arc<Node>>)| {
+            let mut doc = Document::new(400.0, 300.0);
+            let mut n = graph(&mut doc, spec(GraphKind::Column));
+            if let Some(c) = n.children_mut() {
+                f(c);
+            }
+            let layer = doc.layers[0].id;
+            doc.insert(Some(layer), usize::MAX, n).unwrap();
+            (what, doc)
+        };
+        cases.extend([
+            drawn("a series without its group", &|c| {
+                c.remove(2);
+            }),
+            drawn("no axes", &|c| {
+                c.remove(0);
+            }),
+            drawn("a hidden legend", &|c| {
+                if let Some(l) = c.last_mut() {
+                    Arc::make_mut(l).visible = false;
+                }
+            }),
+            drawn("a series drawn half opaque", &|c| Arc::make_mut(&mut c[1]).opacity = 0.5),
+            drawn("a series mark with a gradient", &|c| {
+                let g = vectorcraft_color::Gradient::new(
+                    vectorcraft_color::GradientKind::Linear,
+                    vec![vectorcraft_color::GradientStop::new(0.0, Color::BLACK), vectorcraft_color::GradientStop::new(1.0, Color::WHITE)],
+                );
+                let series = Arc::make_mut(&mut c[1]);
+                if let Some(marks) = series.children_mut() {
+                    let mark = Arc::make_mut(&mut marks[0]);
+                    mark.appearance = Appearance::basic(Paint::Gradient(Box::new(vectorcraft_color::GradientPaint::new(g))), Paint::None, 0.0).into();
+                }
+            }),
+        ]);
+        cases
+    }
+
+    /// The graphs in `doc`, each with the series index of its members.
+    pub(crate) fn graphs(doc: &Document) -> Vec<(GraphSpec, Vec<Option<u32>>)> {
+        let mut out = vec![];
+        doc.walk(|n| {
+            if let Some(g) = n.extras().graph.as_deref() {
+                out.push((g.clone(), n.children().map(|c| c.iter().map(|c| c.extras().series_index).collect()).unwrap_or_default()));
+            }
+        });
+        out
+    }
+
+    /// Whether `read` is the graph `written` was: the same data and settings, the plot in the same
+    /// place; its series' paint is the art's and its bounds are the art's as read.
+    pub(crate) fn same(written: &GraphSpec, read: &GraphSpec) -> bool {
+        let near = |a: Rect, b: Rect| (a.x0 - b.x0).abs() + (a.y0 - b.y0).abs() + (a.x1 - b.x1).abs() + (a.y1 - b.y1).abs() < 1e-6;
+        let plain = |g: &GraphSpec| GraphSpec {
+            rect: Rect::ZERO,
+            rows: vec![],
+            blanks: vec![],
+            series_paints: vec![],
+            placed: None,
+            placed_art: None,
+            series_kinds: vec![],
+            ..g.clone()
+        };
+        near(written.rect, read.rect) && written.cells() == read.cells() && plain(written) == plain(read)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// Numbers are written so they read back the same, small and large ones included.
+    #[test]
+    fn numbers_read_back_as_written() {
+        for v in [0.0, 1.0, -2.5, 1.0 / 3.0, 1e-7, 123_456_789_012_345_678.0, f64::MAX, f64::MIN_POSITIVE] {
+            assert_eq!(real(v).parse::<f64>().ok(), Some(v), "{v}");
+        }
+    }
+
+    /// A graph of `categories` rows of `series` values, drawn by [`sample::graph`].
+    fn sized(categories: usize, series: usize) -> Node {
+        let mut g = sample::spec(GraphKind::Column);
+        (g.series, g.categories) = (vec![], vec![]);
+        g.set_cells(vec![vec![Some(1.0); series]; categories]);
+        sample::graph(&mut vectorcraft_doc::Document::new(400.0, 300.0), g)
+    }
+
+    /// The table the reader holds: up to 10,000 categories and 256 series; past them, the graph is
+    /// its art.
+    #[test]
+    fn tables_up_to_the_readers_limits_are_written() {
+        assert!(records(&sized(MAX_GRAPH_CATEGORIES, 1), Affine::IDENTITY).is_some_and(|r| r.head.contains("%_10000 1 0 0 Gz\n")));
+        assert!(records(&sized(MAX_GRAPH_CATEGORIES + 1, 1), Affine::IDENTITY).is_none());
+        assert!(records(&sized(1, MAX_GRAPH_SERIES), Affine::IDENTITY).is_some_and(|r| r.tags.len() == MAX_GRAPH_SERIES));
+        assert!(records(&sized(1, MAX_GRAPH_SERIES + 1), Affine::IDENTITY).is_none());
+    }
+
+    /// Tick-mark counts of 0, which mean one tick mark as 1 does, are written as 1, the count the
+    /// reader reads back.
+    #[test]
+    fn tick_mark_counts_of_0_are_written_as_1() {
+        let mut g = sample::spec(GraphKind::Column);
+        (g.tick_marks, g.right_tick_marks, g.category_tick_marks) = (0, 0, 0);
+        let n = sample::graph(&mut vectorcraft_doc::Document::new(400.0, 300.0), g);
+        let head = records(&n, Affine::IDENTITY).map(|r| r.head).unwrap_or_default();
+        let marks: Vec<&str> = head.lines().filter(|l| l.ends_with(" GA")).map(|l| l.split(' ').nth(5).unwrap_or("")).collect();
+        assert_eq!(marks, ["1", "1", "1"], "{head}");
+    }
+
+    /// A table's cells go fifteen to a record, with one string at most in each.
+    #[test]
+    fn cells_go_fifteen_to_a_record_with_one_string_each() {
+        let mut out = String::new();
+        let mut t = Table::new(&mut out);
+        t.text("a");
+        t.text("b");
+        for v in 0..16 {
+            t.num(f64::from(v));
+        }
+        t.finish();
+        let records: Vec<&str> = out.lines().collect();
+        assert_eq!(records[0], "%_(a) Gc");
+        assert_eq!(records[1], "%_(b) 0 1 2 3 4 5 6 7 8 9 10 11 12 13 Gc");
+        assert_eq!(records[2], "%_14 15 Gc");
+    }
+}

crates/eps/src/import/ai/tests.rs

@@ -10329,11 +10329,14 @@ fn a_brushed_path_with_samples_of_the_pen_keeps_its_drawn_look() {
     assert_eq!(a.len(), 1, "{a:#?}");
     assert!(matches!(a[0].kind, NodeKind::Group { .. }), "the drawn look: {a:#?}");
     assert!(r.warnings.iter().any(|w| w.contains("drawn look")), "{:?}", r.warnings);
-    // The samples belong to the path before them: a path after them is read as it was.
-    let after = format!("{path}{RED}{}f\n", rect_path(0.0, 0.0, 10.0, 10.0));
+    // The samples belong to the path before them: a path after them with the same brush and no
+    // samples of its own comes in brushed.
+    let after = format!("{path}{}", brushed_path());
     let a = art(&read_ok(&format!("{def}{style}{}", layer(&after))).doc);
     assert_eq!(a.len(), 2, "{a:#?}");
-    assert!(matches!(a[1].kind, NodeKind::Path { .. }) && a[1].appearance.fill().is_some(), "{a:#?}");
+    assert!(matches!(a[0].kind, NodeKind::Group { .. }), "the sampled path's drawn look: {a:#?}");
+    assert!(matches!(a[1].kind, NodeKind::Path { .. }), "the path after the samples, brushed: {a:#?}");
+    assert_eq!(a[1].appearance.stroke().and_then(|s| s.brush.as_deref()), Some("Six D"), "{a:#?}");
     // Samples with no object before them in the layer mark nothing: the path after them is read.
     let first = format!("{PEN_SAMPLES}{}", brushed_path());
     let a = art(&read_ok(&format!("{def}{style}{}", layer(&first))).doc);

crates/eps/src/legacy_ai.rs

@@ -43,13 +43,17 @@
 //!   PostScript names in `%%DocumentFonts` and `%%IncludeFont` (§3.1) and re-encoded to
 //!   Windows-1252 (`TE`, then `%AI3_BeginEncoding: _name name`, `TZ`, §3.3), the 8-bit encoding
 //!   strings are in.
+//! - Graphs (§17): a graph whose records VectorCraft's reader reads back as the same graph
+//!   (`crate::ai_graph`) as `%_Gs`, its functional records, its group with each series' group
+//!   followed by `%_2 column 0 0 Go`, and `%_GS`.
 //!
 //! The format has one artboard, no transparency, sublayers, object names, hidden objects (only
 //! layers hide), live effects, symbols or appearances with several fills and strokes. Callers write
 //! one file per artboard and expand appearances first; what is left is written as the format can
 //! hold it, each loss a warning: transparent objects are written opaque, sublayers become groups,
-//! live objects and symbols their art, strokes a plain line can't draw their outlines, pattern
-//! fills their tiles clipped to the shape, freeform gradients their average colour, elliptical
+//! live objects and symbols their art, other graphs their art, strokes a plain line can't draw
+//! their outlines, pattern fills their tiles clipped to the shape, freeform gradients their average
+//! colour, elliptical
 //! radial gradients circular (the gradient matrix is relative to a canvas the specification
 //! doesn't size), transparent image pixels over white. Hidden objects go to a hidden layer of
 //! their own above their layer, are left out or show, as [`HiddenObjects`] says (in a hidden

crates/eps/src/legacy_ai/tests.rs

@@ -2157,3 +2157,64 @@ fn a_stained_instance_is_written_in_its_stained_color() {
     let text = String::from_utf8(write(&doc).bytes).unwrap();
     assert!(text.contains("0 0 1 Xa") && !text.contains("1 0 0 Xa"), "{text}");
 }
+
+/// A graph whose records read back whole is written with them (§17), and opens again as the same
+/// live graph: its table, type and settings, its series' groups tagged in order, without a warning
+/// about graphs.
+#[test]
+fn graphs_are_written_with_their_records_and_open_live() {
+    use crate::ai_graph::sample;
+    for (what, doc) in sample::kept() {
+        let out = write(&doc);
+        assert!(!out.warnings.iter().any(|w| w == GRAPHS), "{what}: {:?}", out.warnings);
+        let text = String::from_utf8(out.bytes.clone()).unwrap();
+        assert_eq!((text.matches("%_Gs\n").count(), text.matches("%_GS\n").count()), (1, 1), "{what}: {text}");
+        let read = crate::import(&out.bytes).unwrap();
+        let written = sample::graphs(&doc);
+        let graphs = sample::graphs(&read.document);
+        assert_eq!(graphs.len(), 1, "{what}: {:?}", read.warnings);
+        assert!(sample::same(&written[0].0, &graphs[0].0), "{what}: {:#?}\n{:#?}", written[0].0, graphs[0].0);
+        assert_eq!(graphs[0].1, written[0].1, "{what}: the members and their series");
+    }
+}
+
+/// A graph inside a group is written with its records too, and opens on its own group.
+#[test]
+fn a_graph_in_a_group_is_written_with_its_records() {
+    use crate::ai_graph::sample;
+    let mut doc = Document::new(400.0, 300.0);
+    let graph = sample::graph(&mut doc, sample::spec(vectorcraft_doc::GraphKind::Column));
+    let frame = shape(&mut doc, shapes::rectangle(Rect::new(10.0, 10.0, 20.0, 20.0)), red(), Paint::None);
+    let outer = Node::group(doc.alloc_id(), vec![Arc::new(frame), Arc::new(graph)]);
+    let l = doc.layers[0].id;
+    doc.insert(Some(l), 0, outer).unwrap();
+    let out = write(&doc);
+    assert!(!out.warnings.iter().any(|w| w == GRAPHS), "{:?}", out.warnings);
+    let read = crate::import(&out.bytes).unwrap();
+    let graphs = sample::graphs(&read.document);
+    assert_eq!(graphs.len(), 1, "{:?}", read.warnings);
+    assert!(sample::same(&sample::graphs(&doc)[0].0, &graphs[0].0));
+    let layer = children(&read.document.layers[0]);
+    assert!(layer[0].extras().graph.is_none() && layer[0].children().is_some_and(|c| c.len() == 2), "{layer:#?}");
+}
+
+/// A graph whose records wouldn't read back as it is is written as its art, without records, with
+/// the warning, and opens as that art.
+#[test]
+fn graphs_the_records_cant_keep_are_written_as_their_art() {
+    use crate::ai_graph::sample;
+    for (what, doc) in sample::unkept() {
+        let out = export_legacy_ai(&doc, &LegacyAiOptions::default()).unwrap();
+        assert!(out.warnings.iter().any(|w| w == GRAPHS), "{what}: {:?}", out.warnings);
+        let text = String::from_utf8_lossy(&out.bytes).into_owned();
+        assert!(!text.contains("%_Gs") && !text.contains(" Go\n") && !text.contains("%_GS"), "{what}: {text}");
+        let read = crate::import(&out.bytes).unwrap();
+        assert!(sample::graphs(&read.document).is_empty(), "{what}");
+        let paths = |d: &Document| {
+            let mut count = 0;
+            d.walk(|n| count += usize::from(matches!(n.kind, NodeKind::Path { .. })));
+            count
+        };
+        assert_eq!(paths(&read.document), paths(&doc), "{what}: the graph's art is kept");
+    }
+}

crates/eps/src/legacy_ai/writer.rs

@@ -52,6 +52,8 @@ pub(super) struct Writer<'a> {
     last_image: Option<(ImageBlob, Option<Arc<image::DynamicImage>>)>,
     /// The images written whole so far, by the address of their data (which each entry keeps).
     whole_images: std::collections::HashMap<usize, Arc<Vec<u8>>>,
+    /// Writing a graph's art with its records: a graph inside it is written as its art.
+    in_graph: bool,
 }
 
 impl<'a> Writer<'a> {
@@ -78,6 +80,7 @@ impl<'a> Writer<'a> {
             clips: vec![],
             last_image: None,
             whole_images: std::collections::HashMap::new(),
+            in_graph: false,
         }
     }
 
@@ -264,7 +267,12 @@ impl<'a> Writer<'a> {
         if n.name.as_deref().is_some_and(|s| !s.is_empty()) && !n.is_layer() {
             self.warn(NAMES);
         }
-        if n.extras().graph.is_some() {
+        // A graph on the layers keeps its data and settings when its records read back whole.
+        let graph = match n.extras().graph.is_some() {
+            true if self.nest == 0 && !self.in_graph => crate::ai_graph::records(n, self.to_art),
+            _ => None,
+        };
+        if n.extras().graph.is_some() && graph.is_none() {
             self.warn(GRAPHS);
         }
         let locked = locked || n.locked;
@@ -273,7 +281,10 @@ impl<'a> Writer<'a> {
                 self.warn(SUBLAYERS);
                 self.group(children, *clip, locked);
             }
-            NodeKind::Group { children, clip } => self.group(children, *clip, locked),
+            NodeKind::Group { children, clip } => match &graph {
+                Some(records) => self.graph(children, locked, records),
+                None => self.group(children, *clip, locked),
+            },
             NodeKind::Path { path, rule, guide, .. } => {
                 self.lock(locked);
                 if *guide {
@@ -352,6 +363,25 @@ impl<'a> Writer<'a> {
         }
     }
 
+    /// A graph's group (`u` … `U`) between its records (§17): `%_Gs` and its functional records
+    /// before it, `%_GS` after it, and each series' group followed by its `Go` tag.
+    fn graph(&mut self, children: &[Arc<Node>], locked: bool, records: &crate::ai_graph::Records) {
+        self.lock(locked);
+        self.body.push_str(&records.head);
+        self.line("u");
+        self.in_graph = true;
+        for c in children {
+            self.node(c, locked);
+            if let Some(tag) = records.tags.get(&c.id) {
+                self.line(tag);
+            }
+        }
+        self.in_graph = false;
+        self.lock(locked);
+        self.line("U");
+        self.line(crate::ai_graph::END);
+    }
+
     /// A clipping group: its first member's outline clips the others (`h W n`). That member's fills
     /// paint behind the art, inside the clip, and its strokes over it, outside.
     fn clip_group(&mut self, children: &[Arc<Node>], locked: bool) {

crates/eps/src/lib.rs

@@ -31,9 +31,11 @@
 //! - `ai_editing`: the editing copy of the art a PDF-compatible `.ai` file carries
 //!   ([`export_ai_editing`], [`ai_private_data`]).
 //! - `ai_ops`: the path and line style operators those two write.
+//! - `ai_graph`: the records of a live graph those two write around its group.
 //! - [`dcs`]: DCS files, an EPS file with one program per printing plate, read for placing.
 
 mod ai_editing;
+mod ai_graph;
 mod ai_ops;
 pub mod dcs;
 mod import;

crates/mcp/src/tools/definitions.rs

@@ -465,7 +465,7 @@ pub fn tool_definitions() -> Vec<Value> {
         tool(
             "transform",
             "Transform",
-            "Move, rotate, scale, reflect or shear the selection (or `ids`); several may be combined and run in that order. Angles in degrees (counter-clockwise), scale in %. `origin` [x,y] defaults to the selection centre; `copy` transforms a copy.",
+            "Move, rotate, scale, reflect or shear the selection (or `ids`); several may be combined and run in that order. Angles in degrees (counter-clockwise), scale in %. Scale and reflect act along the selection's bounding box, turned with rotated objects until Reset Bounding Box. `origin` [x,y] defaults to the selection centre; `copy` transforms a copy.",
             obj(
                 json!({
                     "ids": {"type": "array", "items": {"type": "integer"}},

crates/mcp/src/ui_catalog.rs

@@ -1087,6 +1087,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "",
         "{objects?: [paths|shapes|text|images|effects|groups|linkedFiles|guides], layers?: [locked|hidden]} set the Layers panel's Filter (By Object, By Layer): a row stays when it is of a kind in `objects` and in a state in `layers` (its own lock or eye; an empty list takes every row), or when a row inside it stays; Search All narrows the rows further. A key left out keeps its list. The filter lasts the session and does not change the document, its open rows or the selection → {objects, layers}",
     ),
+    (
+        "ui.panelView",
+        "Set Panel View",
+        "",
+        "{panel: swatches|graphicStyles|symbols, view?} set a panel's view, as the view items of its panel menu do: for swatches smallThumb|mediumThumb (the default)|largeThumb|smallList|largeList, for graphicStyles and symbols thumbnail (the default)|smallList|largeList; without `view`, answer the current one. The view lasts the session and does not change the document; an unknown panel or view is an error and changes nothing → {panel, view}",
+    ),
     (
         "ui.tileEdgeColor",
         "Tile Edge Color…",

crates/text/src/features.rs

@@ -43,7 +43,7 @@ pub struct OtFeatures {
     pub swash: bool,
     /// The features of [`EXTRA_FEATURES`] turned on, one bit each (off by default): stylistic
     /// sets, alternates, titling, proportional and lining figures, superscript, subscript,
-    /// numerators and denominators, `aalt`.
+    /// numerators and denominators, `aalt`, H or V Style (`hkna`) and Roman Italics (`ital`).
     pub extra: u32,
     /// The value of each feature of [`EXTRA_FEATURES`] that is on, as a tag `salt=2` gives it: for
     /// a feature with alternates, which of them the font draws (the HarfBuzz feature value, 1 for
@@ -64,13 +64,20 @@ pub const MAX_STYLE_FEATURES: usize = 256;
 /// Features beyond the named fields, off unless asked for, each bit `i` of [`OtFeatures::extra`]:
 /// stylistic sets `ss01`–`ss20`, stylistic alternates `salt`, titling `titl`, proportional `pnum`
 /// and lining `lnum` figures, superscript `sups`, subscript `subs`, numerators `numr`,
-/// denominators `dnom` and access all alternates `aalt`.
+/// denominators `dnom`, access all alternates `aalt`, and the OpenType panel menu's H or V Style
+/// `hkna` (shaped as `vkna` in vertical type) and Roman Italics `ital`.
 /// <https://learn.microsoft.com/en-us/typography/opentype/spec/features_ae#tag-aalt>
-pub const EXTRA_FEATURES: [&str; 29] = [
+/// <https://learn.microsoft.com/en-us/typography/opentype/spec/features_fj#tag-hkna>
+/// <https://learn.microsoft.com/en-us/typography/opentype/spec/features_fj#tag-ital>
+pub const EXTRA_FEATURES: [&str; 31] = [
     "ss01", "ss02", "ss03", "ss04", "ss05", "ss06", "ss07", "ss08", "ss09", "ss10", "ss11", "ss12", "ss13", "ss14", "ss15", "ss16", "ss17", "ss18",
-    "ss19", "ss20", "salt", "titl", "pnum", "lnum", "sups", "subs", "numr", "dnom", "aalt",
+    "ss19", "ss20", "salt", "titl", "pnum", "lnum", "sups", "subs", "numr", "dnom", "aalt", "hkna", "ital",
 ];
 
+/// The features of [`EXTRA_FEATURES`] that are only on or off: they substitute one form for each
+/// glyph, so they take no alternate's number (`hkna=2` is refused).
+const SWITCH_FEATURES: [&str; 2] = ["hkna", "ital"];
+
 impl Default for OtFeatures {
     fn default() -> Self {
         Self {
@@ -107,10 +114,11 @@ struct ParsedTag<'a> {
     value: u16,
 }
 
-/// Can feature `name` take a value (`salt=2`)? The features of [`EXTRA_FEATURES`] and `swsh` can:
-/// each substitutes glyphs, and the value says which alternate.
+/// Can feature `name` take a value (`salt=2`)? The features of [`EXTRA_FEATURES`] but
+/// [`SWITCH_FEATURES`], and `swsh`, can: each substitutes glyphs, and the value says which
+/// alternate.
 fn takes_value(name: &str) -> bool {
-    name == "swsh" || EXTRA_FEATURES.contains(&name)
+    name == "swsh" || (EXTRA_FEATURES.contains(&name) && !SWITCH_FEATURES.contains(&name))
 }
 
 /// Read a feature tag: `tag`, `+tag`, `-tag` or, for a feature that takes a value, `tag=N` (`N`
@@ -316,6 +324,8 @@ impl OtFeatures {
         }
         for (i, tag) in EXTRA_FEATURES.iter().enumerate() {
             if let (true, Ok(t)) = (s.extra & (1 << i) != 0, <[u8; 4]>::try_from(tag.as_bytes())) {
+                // H or V Style: the kana forms made for the writing direction, `vkna` in vertical type.
+                let t = if self.vertical && &t == b"hkna" { *b"vkna" } else { t };
                 v.push(f(&t, u32::from(s.extra_values.get(i).copied().unwrap_or(0).max(1))));
             }
         }
@@ -434,6 +444,31 @@ mod tests {
         }
     }
 
+    /// H or V Style (`hkna`) and Roman Italics (`ital`) are known, round-trip through the stored
+    /// tags and reach the shaper: `hkna` as itself in horizontal type and as `vkna` in vertical
+    /// type, `ital` in both. Neither takes an alternate's number.
+    #[test]
+    fn kana_style_and_roman_italics_are_kept_and_shaped() {
+        for t in ["hkna", "-hkna", "+ital", "ital"] {
+            assert!(OtFeatures::known_tag(t), "{t}");
+        }
+        for t in ["hkna=2", "ital=0", "vkna"] {
+            assert!(!OtFeatures::known_tag(t), "{t}");
+        }
+        assert_eq!(OtFeatures::from_tags(["ital", "hkna", "smcp"]).to_tags(), ["smcp", "hkna", "ital"]);
+        assert_eq!(OtFeatures::from_tags(["hkna", "ital", "-hkna"]).to_tags(), ["ital"]);
+        let st = CharStyle { features: vec!["hkna".into(), "ital".into()], ..CharStyle::default() };
+        let on = |vertical: bool| -> Vec<String> {
+            OtFeatures { vertical, ..OtFeatures::default() }.resolve(&st).iter().filter(|f| f.value == 1).map(|f| f.tag.to_string()).collect()
+        };
+        assert_eq!(on(false), ["hkna", "ital"]);
+        assert_eq!(on(true), ["vkna", "ital", "vert"]);
+        let plain = |vertical: bool| OtFeatures { vertical, ..OtFeatures::default() }.resolve(&CharStyle::default());
+        for vertical in [false, true] {
+            assert!(!plain(vertical).iter().any(|f| [b"hkna", b"vkna", b"ital"].iter().any(|t| f.tag == Tag::new(t))), "off by default");
+        }
+    }
+
     /// `changes` lists the features a change turns on and off and leaves out the ones it keeps,
     /// and applying them to any set makes the same change.
     #[test]

crates/tools/src/draw2/gesture.rs

@@ -1564,9 +1564,9 @@ impl Tool for GestureTool {
             };
             let mut area = self.area.take().filter(|a| a.fits(key, &self.points)).unwrap_or_else(|| AreaPreview::new(key, self.points[0]));
             area.step(&self.points, pressures);
-            for path in area.paths(&self.points) {
-                o.push(Overlay::Path { path, color, width: 1.0, dashed: false });
-            }
+            let paths = area.paths(&self.points);
+            o.extend(paths.settled.into_iter().map(|path| Overlay::SharedPath { path, color, width: 1.0 }));
+            o.extend(paths.live.into_iter().map(|path| Overlay::Path { path, color, width: 1.0, dashed: false }));
             self.area_pending.set(area.pending(&self.points));
             self.area.set(Some(area));
         } else if let Some(pressures) = self.size_pressures() {

crates/tools/src/draw2/gesture/area.rs

@@ -13,6 +13,7 @@
 //! most [`JOIN_PIECES_PER_CALL`] pieces' worth. The grid holds at most [`LISTINGS`] listings.
 
 use std::collections::{BTreeSet, HashMap};
+use std::sync::Arc;
 
 use vectorcraft_geom::{Affine, BezPath, Line, ParamCurve, PathData, PathEl, PathSeg, Point, SubPath};
 use vectorcraft_pathops as po;
@@ -84,10 +85,22 @@ pub(super) struct AreaWork {
     pub joined: usize,
 }
 
+/// The paths of the outline to show ([`AreaPreview::paths`]).
+pub(super) struct AreaPaths {
+    /// The settled pieces' outlines, joined [`BLOCK_PIECES`] at a time: a block that did not change
+    /// is the same shared path as in the call before.
+    pub settled: Vec<Arc<BezPath>>,
+    /// The growing last piece's outline and the thin line over the points not taken yet, drawn
+    /// over the settled ones.
+    pub live: Vec<BezPath>,
+}
+
 /// The joined outline of up to [`BLOCK_PIECES`] settled pieces.
 #[derive(Default)]
 struct Block {
-    path: BezPath,
+    /// Shared with the paths [`AreaPreview::paths`] returned: a new one only when the block is
+    /// joined again.
+    path: Arc<BezPath>,
     /// A piece in it changed since `path` was joined.
     stale: bool,
 }
@@ -227,8 +240,9 @@ impl AreaPreview {
     /// The paths to show: the settled pieces' outlines, joined [`BLOCK_PIECES`] at a time, the
     /// growing last piece's and a thin line over the points of `pts` not taken yet. The joined
     /// paths with a changed piece are joined again, newest first, at most
-    /// [`JOIN_PIECES_PER_CALL`] pieces a call; the others show the path last joined.
-    pub(super) fn paths(&mut self, pts: &[Point]) -> Vec<BezPath> {
+    /// [`JOIN_PIECES_PER_CALL`] pieces a call; the others show the path last joined, the same
+    /// shared path each call.
+    pub(super) fn paths(&mut self, pts: &[Point]) -> AreaPaths {
         let settled = self.settled_count();
         for b in (0..self.blocks.len()).rev() {
             if self.work.joined >= JOIN_PIECES_PER_CALL {
@@ -243,9 +257,10 @@ impl AreaPreview {
                 joined.extend(p.shown.elements().iter().copied());
             }
             self.work.joined += pieces.len();
-            self.blocks[b] = Block { path: joined, stale: false };
+            self.blocks[b] = Block { path: Arc::new(joined), stale: false };
         }
-        let mut out: Vec<BezPath> = self.blocks.iter().filter(|b| !b.path.elements().is_empty()).map(|b| b.path.clone()).collect();
+        let settled_paths = self.blocks.iter().filter(|b| !b.path.elements().is_empty()).map(|b| Arc::clone(&b.path)).collect();
+        let mut out = vec![];
         if let Some(p) = self.pieces.get(settled).filter(|p| !p.shown.elements().is_empty()) {
             out.push(p.shown.clone());
         }
@@ -261,7 +276,7 @@ impl AreaPreview {
             }
             out.push(guide);
         }
-        out
+        AreaPaths { settled: settled_paths, live: out }
     }
 
     /// How many pieces no longer grow: all of them but a last one with room for more segments.

crates/tools/src/draw2/gesture/tests.rs

@@ -2450,11 +2450,111 @@ fn the_blob_brush_and_the_eraser_outline_a_long_drag_a_bounded_amount_per_frame(
     }
 }
 
+/// The settled paths of the outline of a long Blob Brush or Eraser drag (each the outline of up
+/// to `BLOCK_PIECES` pieces) come back from one call to the next, at any zoom, as the same shared
+/// paths, which the host draws again without copying or flattening them. A step of the drag
+/// replaces only the paths of the pieces near it.
+#[test]
+fn the_settled_outline_of_a_long_drag_is_the_same_shared_path_each_frame() {
+    let (d, _) = doc_with_rect();
+    let s = Selection::default();
+    let p = paint();
+    let cx = ToolContext { precise_cursors: true, ..cx(&d, &s, &p) };
+    let settled = |o: &[Overlay]| -> Vec<std::sync::Arc<BezPath>> {
+        o.iter().filter_map(|o| if let Overlay::SharedPath { path, .. } = o { Some(std::sync::Arc::clone(path)) } else { None }).collect()
+    };
+    let kept = |was: &[std::sync::Arc<BezPath>], now: &[std::sync::Arc<BezPath>]| {
+        now.iter().filter(|n| was.iter().any(|w| std::sync::Arc::ptr_eq(w, n))).count()
+    };
+    for (id, angle, roundness, pressure) in
+        [("blobBrush", 0.0, 100.0, false), ("eraser", -60.0, 30.0, false), ("blobBrush", 0.0, 100.0, true), ("eraser", 45.0, 50.0, true)]
+    {
+        let mut t = GestureTool::new(id);
+        t.set_option("size", &json!(10));
+        t.set_option("angle", &json!(angle));
+        t.set_option("roundness", &json!(roundness));
+        if pressure {
+            t.set_option("sizeMode", &json!("pressure"));
+            t.set_option("sizeVariation", &json!(4));
+        }
+        let n = if pressure { 3000 } else { 6000 };
+        long_area_drag(&mut t, &cx, n, |i| if pressure { 0.3 + 0.6 * ((i % 50) as f32 / 50.0) } else { 1.0 });
+        drain_area(&t, &cx);
+        let first = settled(&t.overlays(&cx));
+        assert!(first.len() > 1, "{id}: {} settled paths", first.len());
+        for zoom in [1.0, 4.0, 1.0] {
+            let again = settled(&t.overlays(&ToolContext { zoom, ..cx }));
+            assert_eq!(again.len(), first.len(), "{id}");
+            assert_eq!(kept(&first, &again), first.len(), "{id}: at zoom {zoom}, every settled path is the one shown before");
+        }
+        // One step more along the drag: with Size set to Pressure each path holds 64 one-segment
+        // pieces, part of one turn of the drag, and the paths far from the step stay the ones shown
+        // before. (Without it a path holds 64 pieces of 32 segments, many turns round the circle.)
+        if !pressure {
+            continue;
+        }
+        let s = n as f64;
+        let r = 150.0 + 100.0 * (s * 0.0071).sin();
+        let (x, y) = (300.0 + r * (s * 0.04).cos(), 300.0 + r * (s * 0.04).sin());
+        t.pointer(&cx, &PointerEvent { pressure: 0.5, ..PointerEvent::new(PointerKind::Drag, x, y) });
+        drain_area(&t, &cx);
+        let after = settled(&t.overlays(&cx));
+        let replaced = after.len() - kept(&first, &after);
+        assert!((1..=8).contains(&replaced), "{id}: {replaced} of {} settled paths replaced", after.len());
+    }
+}
+
+/// The outline a Blob Brush or Eraser drag shows does not change what its release sends: the same
+/// drag sends the same command whether or not its outline was drawn along the way.
+#[test]
+fn drawing_the_outline_of_a_drag_does_not_change_what_its_release_sends() {
+    let (d, _) = doc_with_rect();
+    let s = Selection::default();
+    let p = paint();
+    let cx = ToolContext { precise_cursors: true, ..cx(&d, &s, &p) };
+    for (id, angle, roundness, pressure) in
+        [("blobBrush", 0.0, 100.0, false), ("blobBrush", 30.0, 40.0, true), ("eraser", -60.0, 30.0, false), ("eraser", 45.0, 50.0, true)]
+    {
+        let release = |drawn: bool| {
+            let mut t = GestureTool::new(id);
+            t.set_option("size", &json!(10));
+            t.set_option("angle", &json!(angle));
+            t.set_option("roundness", &json!(roundness));
+            if pressure {
+                t.set_option("sizeMode", &json!("pressure"));
+                t.set_option("sizeVariation", &json!(4));
+            }
+            for i in 0..800 {
+                let s = i as f64;
+                let r = 150.0 + 100.0 * (s * 0.0071).sin();
+                let (x, y) = (300.0 + r * (s * 0.04).cos(), 300.0 + r * (s * 0.04).sin());
+                let kind = if i == 0 { PointerKind::Down } else { PointerKind::Drag };
+                let pressure = if pressure { 0.3 + 0.6 * ((i % 50) as f32 / 50.0) } else { 1.0 };
+                t.pointer(&cx, &PointerEvent { pressure, ..PointerEvent::new(kind, x, y) });
+                if drawn {
+                    t.overlays(&cx);
+                }
+            }
+            if drawn {
+                drain_area(&t, &cx);
+            }
+            t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 300.0, 300.0))
+        };
+        let (drawn, not_drawn) = (release(true), release(false));
+        assert!(matches!(drawn.first(), Some(Action::Exec(..))), "{id}: {drawn:?}");
+        assert_eq!(drawn, not_drawn, "{id}");
+    }
+}
+
 /// Every flattened point of the paths `o` (the outline shown).
 fn shown_points(o: &[Overlay]) -> Vec<(Point, Point)> {
     let mut lines = vec![];
     for o in o {
-        let Overlay::Path { path, .. } = o else { continue };
+        let path = match o {
+            Overlay::Path { path, .. } => path,
+            Overlay::SharedPath { path, .. } => &**path,
+            _ => continue,
+        };
         let mut pen = Point::ZERO;
         let mut start = Point::ZERO;
         vectorcraft_geom::kurbo::flatten(path.elements().iter().copied(), 0.01, |el| match el {
@@ -2541,7 +2641,11 @@ fn a_long_jump_in_a_blob_brush_drag_is_outlined_a_bounded_amount_at_a_time() {
     let o = t.overlays(&cx);
     let b = o
         .iter()
-        .filter_map(|o| if let Overlay::Path { path, .. } = o { Some(vectorcraft_geom::Shape::bounding_box(path)) } else { None })
+        .filter_map(|o| match o {
+            Overlay::Path { path, .. } => Some(vectorcraft_geom::Shape::bounding_box(path)),
+            Overlay::SharedPath { path, .. } => Some(vectorcraft_geom::Shape::bounding_box(&**path)),
+            _ => None,
+        })
         .reduce(|a, b| a.union(b));
     let Some(b) = b else { panic!("{o:?}") };
     assert!((b.x0 + 0.5).abs() < 0.01 && (b.x1 - 20_000.5).abs() < 0.01, "{b:?}");

crates/tools/src/lib.rs

@@ -71,6 +71,10 @@ pub enum Overlay {
     SelectionMarquee { rect: Rect, enclosed: bool, pointer: Point },
     /// A path preview (e.g. pen rubber band) in a colour (RGB).
     Path { path: BezPath, color: [u8; 3], width: f32, dashed: bool },
+    /// A solid path preview that later calls return again, as the same shared `path`, for as long
+    /// as it does not change (the settled outline of a long Blob Brush or Eraser drag). The host
+    /// can keep what it built to draw it while `path` is the same allocation.
+    SharedPath { path: std::sync::Arc<BezPath>, color: [u8; 3], width: f32 },
     /// A line segment (smart guide, handle line).
     Line { a: Point, b: Point, color: [u8; 3], dashed: bool },
     /// An anchor square: filled = selected.

crates/tools/src/xform/transform.rs

@@ -8,10 +8,12 @@
 //! while hovering, so transforms pivot exactly on a corner. A drag starts from the point it grabbed
 //! snapped the same way, and the pointer snaps as a drawn point does (Smart Guides: the other
 //! objects' anchors, centres and edges; or the grid, pixels, Snap to Point), so a corner dragged
-//! onto another object's anchor scales exactly onto it.
+//! onto another object's anchor scales exactly onto it. Scale stretches along the bounding box's
+//! own width and height, turned with rotated objects until Reset Bounding Box; Reflect's default
+//! axis is the box's vertical one, and Shift constrains a drawn axis to 45° steps from the box.
 
 use serde_json::{Value, json};
-use vectorcraft_doc::NodeId;
+use vectorcraft_doc::{NodeId, OrientedBox};
 use vectorcraft_geom::{Affine, Point, Rect, Vec2};
 
 use super::target_overlays;
@@ -68,9 +70,28 @@ struct Drag {
     /// Alt was down at the press: a click opens the dialog, a drag transforms a copy.
     alt: bool,
     bounds: Rect,
+    /// The angle of the selection's bounding box: Scale and Reflect act along its axes
+    /// ([`TransformTool::matrix_in`]).
+    angle: f64,
+    /// Anchors are selected with Direct Selection: they transform alone along the page's axes,
+    /// and a copy or a pattern-only drag transforms the whole objects along the box
+    /// ([`Drag::angle_for`]).
+    anchors: bool,
+    /// The snapped pointer and Shift at the last drag event, to work out the transform again
+    /// when the Alt state at the release changes what it transforms.
+    pointer: Point,
+    shift: bool,
     last: Affine,
 }
 
+impl Drag {
+    /// The angle Scale and Reflect act along, for a drag that copies (`copy`) or not, and that
+    /// transforms only pattern tiles (`patterns_only`, the backquote key) or not.
+    fn angle_for(&self, copy: bool, patterns_only: bool) -> f64 {
+        if self.anchors && !copy && !patterns_only { 0.0 } else { self.angle }
+    }
+}
+
 pub struct TransformTool {
     kind: TransformKind,
     /// Custom reference point and the selection it was set for.
@@ -125,6 +146,16 @@ impl TransformTool {
 
     /// Transform for dragging from `start` to `p` about `o`; returns the matrix and a readout.
     pub fn matrix_for(&self, o: Point, start: Point, p: Point, shift: bool, bounds: Rect) -> (Affine, String) {
+        self.matrix_in(0.0, o, start, p, shift, bounds)
+    }
+
+    /// [`TransformTool::matrix_for`] with the bounding box turned by `angle` (counter-clockwise
+    /// degrees): Scale stretches along the box's own width and height, and Reflect's default axis
+    /// and Shift's 45° steps start from the box's axes. A Reflect axis drawn by the drag is the
+    /// line the pointer draws on the page.
+    pub fn matrix_in(&self, angle: f64, o: Point, start: Point, p: Point, shift: bool, bounds: Rect) -> (Affine, String) {
+        let frame = OrientedBox { angle, rect: Rect::ZERO };
+        let local = |v: Vec2| frame.to_doc().inverse() * v.to_point();
         match self.kind {
             TransformKind::Rotate => {
                 let (a, deg) = rotate_for_drag(o, start, p, shift);
@@ -132,15 +163,17 @@ impl TransformTool {
             }
             TransformKind::Reflect => {
                 let mut v = p - o;
-                if shift {
-                    v = vectorcraft_geom::constrain_angle(v, 45.0);
+                if v.hypot() < 1e-9 {
+                    v = (frame.to_doc() * Point::new(0.0, 1.0)).to_vec2();
+                } else if shift {
+                    v = (frame.to_doc() * vectorcraft_geom::constrain_angle(local(v).to_vec2(), 45.0).to_point()).to_vec2();
                 }
-                let theta = if v.hypot() < 1e-9 { std::f64::consts::FRAC_PI_2 } else { v.y.atan2(v.x) };
+                let theta = v.y.atan2(v.x);
                 (reflect_matrix(o, theta), format!("{:.1}°", vectorcraft_geom::normalize_deg(-theta.to_degrees())))
             }
             TransformKind::Scale => {
-                let d0 = start - o;
-                let d1 = p - o;
+                let d0 = local(start - o).to_vec2();
+                let d1 = local(p - o).to_vec2();
                 let ratio = |a: f64, b: f64| if a.abs() > 1e-6 { b / a } else { 1.0 };
                 let (mut sx, mut sy) = (ratio(d0.x, d1.x), ratio(d0.y, d1.y));
                 if shift {
@@ -151,7 +184,7 @@ impl TransformTool {
                 }
                 let clamp = |s: f64| if s.abs() < 1e-4 { 1e-4f64.copysign(s) } else { s };
                 let (sx, sy) = (clamp(sx), clamp(sy));
-                (about(o, Affine::scale_non_uniform(sx, sy)), format!("W: {:.1}%\nH: {:.1}%", sx * 100.0, sy * 100.0))
+                (about(o, frame.conjugate(Affine::scale_non_uniform(sx, sy))), format!("W: {:.1}%\nH: {:.1}%", sx * 100.0, sy * 100.0))
             }
             TransformKind::Shear => {
                 // The shear axis follows the dominant drag direction. Shift keeps the drag on that
@@ -227,7 +260,21 @@ impl Tool for TransformTool {
                 // Alt: decided on release. A click sets the point and opens the dialog; a drag
                 // transforms a copy about the reference point as it was.
                 let origin = self.reference_point(cx).unwrap_or(bounds.center());
-                self.drag = Some(Drag { start: p, pick, origin, began: false, alt: ev.mods.alt, bounds, last: Affine::IDENTITY });
+                let anchors = vectorcraft_effects::preview::anchor_bounds_with(cx.selection, cx.doc, cx.bounds_measure()).is_some();
+                let angle = selection_box(cx).map_or(0.0, |b| b.angle);
+                self.drag = Some(Drag {
+                    start: p,
+                    pick,
+                    origin,
+                    began: false,
+                    alt: ev.mods.alt,
+                    bounds,
+                    angle,
+                    anchors,
+                    pointer: p,
+                    shift: false,
+                    last: Affine::IDENTITY,
+                });
                 vec![]
             }
             PointerKind::Drag => {
@@ -247,8 +294,8 @@ impl Tool for TransformTool {
                 }
                 let (p, guides) = self.snap.as_ref().map_or((p, vec![]), |s| s.snap(cx, p));
                 self.hover = guides;
-                let (m, text) = self.matrix_for(d.origin, d.pick, p, ev.mods.shift, d.bounds);
-                d.last = m;
+                let (m, text) = self.matrix_in(d.angle_for(ev.mods.alt, ev.backquote), d.origin, d.pick, p, ev.mods.shift, d.bounds);
+                (d.last, d.pointer, d.shift) = (m, p, ev.mods.shift);
                 self.drag = Some(d);
                 self.measure = Some((p, text));
                 out.push(preview(m, ev.mods.alt, ev.backquote));
@@ -257,8 +304,15 @@ impl Tool for TransformTool {
             PointerKind::Up => {
                 let Some(d) = self.end_drag() else { return vec![] };
                 if d.began {
-                    // The Alt state at release decides whether the result is a copy.
-                    vec![preview(d.last, ev.mods.alt, ev.backquote), Action::Commit]
+                    // The Alt and backquote states at release decide whether the result is a copy
+                    // or moves only pattern tiles, and with anchors selected, whether it acts
+                    // along the box or the page.
+                    let m = if d.anchors {
+                        self.matrix_in(d.angle_for(ev.mods.alt, ev.backquote), d.origin, d.pick, d.pointer, d.shift, d.bounds).0
+                    } else {
+                        d.last
+                    };
+                    vec![preview(m, ev.mods.alt, ev.backquote), Action::Commit]
                 } else {
                     // A click sets the reference point; with Alt, it opens the dialog too.
                     self.origin = Some((d.pick, cx.selection.objects.clone()));
@@ -579,6 +633,70 @@ mod tests {
         assert!((m * Point::new(100.0, 120.0)).distance(Point::new(200.0, 120.0)) < 1e-9);
     }
 
+    /// With the selection turned by 30°, a Scale drag stretches along the box's own sides, and
+    /// Reflect's default axis and Shift steps start from the box's axes while a drawn axis stays
+    /// the line drawn on the page.
+    #[test]
+    fn scale_and_reflect_drags_follow_a_turned_bounding_box() {
+        let (mut d, id) = doc_with_rect();
+        let c = Point::new(150.0, 150.0);
+        d.node_mut(id).unwrap().transform(about(c, Affine::rotate(-30f64.to_radians())), false);
+        let mut s = Selection::default();
+        s.add(id);
+        let p = paint();
+        let mut cx = cx(&d, &s, &p);
+        (cx.smart_guides, cx.snap_to_point) = (false, false);
+        let frame = OrientedBox { angle: 30.0, rect: Rect::ZERO };
+        let along = |x: f64, y: f64| c + (frame.to_doc() * Point::new(x, y)).to_vec2();
+        // The right side's middle dragged out to twice its distance: the width doubles along the
+        // box, and the height stays.
+        let mut t = TransformTool::new(TransformKind::Scale);
+        let (from, to) = (along(50.0, 0.0), along(100.0, 0.0));
+        t.pointer(&cx, &ev(PointerKind::Down, from.x, from.y));
+        let a = t.pointer(&cx, &ev(PointerKind::Drag, to.x, to.y));
+        let m = matrix(&a[1]);
+        assert!((m * along(50.0, 50.0)).distance(along(100.0, 50.0)) < 1e-9, "{m:?}");
+        assert!((m * along(0.0, 50.0)).distance(along(0.0, 50.0)) < 1e-9, "{m:?}");
+        assert!(a.iter().any(|x| matches!(x, Action::Preview(..))));
+
+        let t = TransformTool::new(TransformKind::Reflect);
+        // No axis drawn: the box's vertical axis.
+        let (m, _) = t.matrix_in(30.0, c, c, c, false, Rect::ZERO);
+        assert!((m * along(40.0, 10.0)).distance(along(-40.0, 10.0)) < 1e-9, "{m:?}");
+        // Shift: 39° from the box's horizontal axis steps to 45° from it.
+        let (m, text) = t.matrix_in(30.0, c, c, along(10.0, 8.0), true, Rect::ZERO);
+        assert!((m * along(10.0, 0.0)).distance(along(0.0, 10.0)) < 1e-9, "{m:?}");
+        assert_eq!(text, "-15.0°");
+        // A drawn axis is the line on the page.
+        let (m, _) = t.matrix_in(30.0, c, c, c + Vec2::new(0.0, -50.0), false, Rect::ZERO);
+        assert!((m * Point::new(100.0, 120.0)).distance(Point::new(200.0, 120.0)) < 1e-9, "{m:?}");
+
+        // Anchors selected with Direct Selection scale alone along the page's axes; Alt at the
+        // release copies the whole object, which scales along its box.
+        let mut s = s.clone();
+        s.anchors.insert(id, [(0, 0), (0, 1)].into());
+        let mut cx = crate::testutil::cx(&d, &s, &p);
+        (cx.smart_guides, cx.snap_to_point) = (false, false);
+        let page_axes = |m: Affine| m.as_coeffs()[1].abs() < 1e-9 && m.as_coeffs()[2].abs() < 1e-9;
+        let (from, to) = (along(50.0, 0.0), along(100.0, 30.0));
+        for copy in [false, true] {
+            let mut t = TransformTool::new(TransformKind::Scale);
+            t.pointer(&cx, &ev(PointerKind::Down, from.x, from.y));
+            let a = t.pointer(&cx, &ev(PointerKind::Drag, to.x, to.y));
+            assert!(page_axes(matrix(&a[1])), "{a:?}");
+            let up = t.pointer(&cx, &ev(PointerKind::Up, to.x, to.y).with_mods(if copy { alt() } else { Mods::default() }));
+            assert_eq!(page_axes(matrix(&up[0])), !copy, "copy {copy}: {up:?}");
+        }
+        // With the backquote key the drag moves only the whole objects' pattern tiles, which
+        // scale along the box, both while dragging and at the release.
+        let mut t = TransformTool::new(TransformKind::Scale);
+        t.pointer(&cx, &ev(PointerKind::Down, from.x, from.y));
+        let a = t.pointer(&cx, &PointerEvent { backquote: true, ..ev(PointerKind::Drag, to.x, to.y) });
+        assert!(!page_axes(matrix(&a[1])), "{a:?}");
+        let up = t.pointer(&cx, &PointerEvent { backquote: true, ..ev(PointerKind::Up, to.x, to.y) });
+        assert!(!page_axes(matrix(&up[0])), "{up:?}");
+    }
+
     #[test]
     fn shear_horizontal_keeps_origin_row() {
         let t = TransformTool::new(TransformKind::Shear);

crates/ui-egui/src/app.rs

@@ -85,6 +85,7 @@ impl VectorcraftApp {
                 hidden_chars: Default::default(),
                 spelling: Default::default(),
                 selection_marks: Default::default(),
+                shared_paths: Default::default(),
                 selection_box: None,
                 selection_bounds: None,
                 content_bounds: None,

crates/ui-egui/src/caches.rs

@@ -51,6 +51,9 @@ pub struct CanvasCache {
     /// The selected objects' outlines, anchors and handles as drawn in the last frame. A frame that
     /// does not draw them drops them ([`canvas::show`]).
     pub selection_marks: canvas::SelectionMarks,
+    /// The meshes the tools' shared paths (a long Blob Brush or Eraser drag's settled outline) were
+    /// drawn with in the last frame. A frame that does not draw them drops them ([`canvas::show`]).
+    pub shared_paths: canvas::SharedPaths,
     /// [`VectorcraftApp::selection_box`] for (document uid, revision, Use Preview Bounds and
     /// Measure Type by Glyph Bounds).
     pub selection_box: Option<((u64, u64, vectorcraft_effects::preview::Measure), Option<vectorcraft_doc::OrientedBox>)>,

crates/ui-egui/src/canvas.rs

@@ -60,6 +60,7 @@ use input::handle_input;
 use outline::KEY_OUTLINE;
 #[cfg(test)]
 use outline::{OVERLAY_MAX_ANCHORS, c32, node_outline, walk_drawn};
+pub use overlays::SharedPaths;
 #[cfg(test)]
 use overlays::selected_anchor;
 use overlays::{HandleLook, blend_widgets_overlay, draw_inside_overlay, draw_overlays, hover_highlight, ime_geometry, selection_overlay};
@@ -244,6 +245,9 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     let hidden_chars = std::mem::take(&mut app.canvas.hidden_chars);
     // The selection's kept marks. Likewise, a frame that does not draw them drops them.
     let selection_marks = std::mem::take(&mut app.canvas.selection_marks);
+    // The meshes of the tools' shared paths. Likewise, a frame that does not draw the tools'
+    // overlays drops them.
+    let mut shared_paths = std::mem::take(&mut app.canvas.shared_paths);
     // A release ends the Image Trace panel's eye-button hold, also when the panel is no longer
     // drawn, so a later press elsewhere does not show the source image.
     if app.ui.trace_hold_source.is_some() && !ui.input(|i| i.pointer.any_down()) {
@@ -415,7 +419,8 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
         original_path_overlay(app, &painter, &xf);
 
         let overlays = selection_visuals(app, &painter, &xf, (hidden_chars, selection_marks, hover_still), revolve_edit, view_info);
-        draw_overlays(&painter, &xf, &overlays, &t, HandleLook::of(&app.session.prefs));
+        draw_overlays(&painter, &xf, &overlays, &t, HandleLook::of(&app.session.prefs), &mut shared_paths);
+        app.canvas.shared_paths = shared_paths;
         if !revolve_edit {
             shaper_widget_overlay(app, &painter, &xf);
             crate::panels::three_d::paint_graphic_handles(app, &painter, &xf);

crates/ui-egui/src/canvas/overlays.rs

@@ -1,8 +1,14 @@
+use std::collections::HashMap;
+use std::sync::Arc;
+
+use egui::Mesh;
+use egui::epaint::{TessellationOptions, Tessellator};
+
 use super::artboards::names_an_artboard;
 use super::input::marquee_through;
 use super::outline::{KEY_OUTLINE, c32, node_outline, selection_hit_at, stroke_path, to_screen_path, too_many_anchors};
 use super::selection_marks::{MarkOptions, SelectionMarks};
-use super::{Color32, CornerRadius, NodeKind, Overlay, Pos2, Shape, Stroke, StrokeKind, Tokens, VectorcraftApp, Xf, vec2};
+use super::{BezPath, Color32, CornerRadius, NodeKind, Overlay, Pos2, Shape, Stroke, StrokeKind, Tokens, VectorcraftApp, Xf, vec2};
 
 pub(super) fn hover_highlight(app: &VectorcraftApp, p: &egui::Painter, xf: &Xf) {
     let Some(h) = app.hover_doc else { return };
@@ -351,7 +357,75 @@ pub(super) fn ime_geometry(app: &mut VectorcraftApp, ctx: &egui::Context, xf: &X
     app.ime_caret_rect = Some((r, r));
 }
 
-pub(super) fn draw_overlays(p: &egui::Painter, xf: &Xf, overlays: &[Overlay], t: &Tokens, look: HandleLook) {
+/// The meshes the tools' shared paths ([`Overlay::SharedPath`]) were drawn with in the last frame
+/// ([`crate::CanvasCache::shared_paths`]). Each is kept with its path, by the path's allocation, and
+/// with the view, clip and stroke it was built for: a path that comes back unchanged at the same view
+/// is drawn with the same mesh, without flattening or tessellating it again. A frame keeps only the
+/// meshes it draws; a frame that draws no overlays drops them all ([`super::show`]).
+#[derive(Default)]
+pub struct SharedPaths {
+    pub(super) meshes: HashMap<usize, SharedMesh>,
+}
+
+pub(super) struct SharedMesh {
+    /// Held so that the allocation, the key of the map, is not reused while the mesh is kept.
+    path: Arc<BezPath>,
+    key: SharedKey,
+    pub(super) mesh: Arc<Mesh>,
+}
+
+/// What a shared path's mesh depends on besides the path.
+#[derive(Clone, Copy, PartialEq)]
+struct SharedKey {
+    /// The view's mapping onto the screen ([`Xf::affine`]).
+    view: [f64; 6],
+    /// The painter's clip: the lines of the path outside it have no triangles in the mesh.
+    clip: egui::Rect,
+    stroke: Stroke,
+    pixels_per_point: f32,
+    tessellation: TessellationOptions,
+}
+
+impl SharedPaths {
+    /// The mesh that draws `path` with `s` at the view `xf` with the painter `p`: the one kept in
+    /// this frame or in `last` (the last frame's) when it was built for the same, else a new one.
+    /// It is kept for the next frame.
+    fn mesh(&mut self, last: &mut HashMap<usize, SharedMesh>, path: &Arc<BezPath>, xf: &Xf, s: Stroke, p: &egui::Painter) -> Arc<Mesh> {
+        let ctx = p.ctx();
+        let key = SharedKey {
+            view: xf.affine().as_coeffs(),
+            clip: p.clip_rect(),
+            stroke: s,
+            pixels_per_point: ctx.pixels_per_point(),
+            tessellation: ctx.tessellation_options(|o| *o),
+        };
+        let at = Arc::as_ptr(path) as usize;
+        let fits = |m: &SharedMesh| m.key == key && Arc::ptr_eq(&m.path, path);
+        if let Some(kept) = self.meshes.get(&at).filter(|m| fits(m)) {
+            return Arc::clone(&kept.mesh);
+        }
+        let kept = match last.remove(&at).filter(|m| fits(m)) {
+            Some(kept) => kept,
+            None => {
+                let font_image_size = ctx.fonts(|f| f.font_image_size());
+                let mut tessellator = Tessellator::new(key.pixels_per_point, key.tessellation, font_image_size, vec![]);
+                tessellator.set_clip_rect(key.clip);
+                let mut mesh = Mesh::default();
+                for line in to_screen_path(path, xf) {
+                    tessellator.tessellate_shape(Shape::line(line, s), &mut mesh);
+                }
+                SharedMesh { path: Arc::clone(path), key, mesh: Arc::new(mesh) }
+            }
+        };
+        let mesh = Arc::clone(&kept.mesh);
+        self.meshes.insert(at, kept);
+        mesh
+    }
+}
+
+pub(super) fn draw_overlays(p: &egui::Painter, xf: &Xf, overlays: &[Overlay], t: &Tokens, look: HandleLook, shared: &mut SharedPaths) {
+    // The meshes kept from the last frame; those this frame does not draw are dropped.
+    let mut last = std::mem::take(&mut shared.meshes);
     for o in overlays {
         match o {
             // Where the tools select: the document rectangle, turned with the view.
@@ -389,6 +463,12 @@ pub(super) fn draw_overlays(p: &egui::Painter, xf: &Xf, overlays: &[Overlay], t:
                     stroke_path(p, path, xf, s);
                 }
             }
+            Overlay::SharedPath { path, color, width } => {
+                let mesh = shared.mesh(&mut last, path, xf, Stroke::new(*width, c32(*color)), p);
+                if !mesh.is_empty() {
+                    p.add(Shape::mesh(mesh));
+                }
+            }
             Overlay::Line { a, b, color, dashed } => {
                 let s = Stroke::new(1.0, c32(*color));
                 let (a, b) = (xf.to_screen(*a), xf.to_screen(*b));

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

@@ -17,6 +17,7 @@ fn marquee_feedback_explains_the_rule_and_stays_on_canvas() {
                 &[Overlay::SelectionMarquee { rect: Rect::new(20.0, y - 60.0, 300.0, y), enclosed, pointer: Point::new(315.0, y) }],
                 &t,
                 overlays::HandleLook::of(&prefs),
+                &mut overlays::SharedPaths::default(),
             );
         }
     };
@@ -61,6 +62,89 @@ fn marquee_feedback_explains_the_rule_and_stays_on_canvas() {
     }
 }
 
+/// A tool's shared path ([`Overlay::SharedPath`], the settled outline of a long Blob Brush or Eraser
+/// drag) is drawn with the mesh kept from the last frame while the path and the view stay the same,
+/// and that mesh is the one the plain path draws. Another path, even one with the same elements, or
+/// a new view builds a new mesh, and a frame keeps only the meshes it draws.
+#[test]
+fn a_shared_tool_path_is_drawn_with_the_mesh_kept_while_it_and_the_view_stay() {
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx);
+    crate::theme::apply(&ctx, crate::theme::Brightness::MediumDark);
+    let prefs = vectorcraft_engine::Prefs::default();
+    let mut shared = overlays::SharedPaths::default();
+    let frame = |overlays: &[Overlay], zoom: f64, shared: &mut overlays::SharedPaths| {
+        let raw = egui::RawInput { screen_rect: Some(egui::Rect::from_min_size(Pos2::ZERO, vec2(400.0, 300.0))), ..Default::default() };
+        let mut out = ctx.run_ui(raw, |ui| {
+            let t = Tokens::get(ui.ctx());
+            let xf = Xf { rect: ui.max_rect(), zoom, center: Point::new(200.0, 150.0), rot: 0.3 };
+            overlays::draw_overlays(ui.painter(), &xf, overlays, &t, overlays::HandleLook::of(&prefs), shared);
+        });
+        out.textures_delta.clear();
+        out.shapes
+    };
+    let meshes = |shapes: &[egui::epaint::ClippedShape]| -> Vec<std::sync::Arc<egui::Mesh>> {
+        shapes.iter().filter_map(|c| if let Shape::Mesh(m) = &c.shape { Some(std::sync::Arc::clone(m)) } else { None }).collect()
+    };
+    let one = |shapes: Vec<egui::epaint::ClippedShape>| {
+        let found = meshes(&shapes);
+        assert_eq!(found.len(), 1, "one mesh");
+        std::sync::Arc::clone(&found[0])
+    };
+    let mut path = BezPath::new();
+    path.move_to((60.0, 80.0));
+    path.curve_to((120.0, 20.0), (220.0, 260.0), (330.0, 120.0));
+    path.close_path();
+    path.move_to((150.0, 150.0));
+    path.line_to((250.0, 160.0));
+    let a = std::sync::Arc::new(path.clone());
+    let b = std::sync::Arc::new(path.clone());
+    let shared_of = |p: &std::sync::Arc<BezPath>| Overlay::SharedPath { path: std::sync::Arc::clone(p), color: [0x80, 0x80, 0x80], width: 1.0 };
+    let first = one(frame(&[shared_of(&a)], 1.0, &mut shared));
+    assert!(!first.vertices.is_empty());
+    let again = one(frame(&[shared_of(&a)], 1.0, &mut shared));
+    assert!(std::sync::Arc::ptr_eq(&first, &again), "the same path at the same view is drawn with the kept mesh");
+    // The plain path draws the same triangles.
+    let plain = frame(&[Overlay::Path { path: path.clone(), color: [0x80, 0x80, 0x80], width: 1.0, dashed: false }], 1.0, &mut shared);
+    assert!(shared.meshes.is_empty(), "a frame that draws no shared path keeps no mesh");
+    let lines: Vec<_> = plain.into_iter().filter(|c| matches!(c.shape, Shape::Path(_))).collect();
+    assert_eq!(lines.len(), 2, "a line for each subpath");
+    let tessellated = ctx.tessellate(lines, ctx.pixels_per_point());
+    let triangles: Vec<_> = tessellated
+        .into_iter()
+        .filter_map(|c| if let egui::epaint::Primitive::Mesh(m) = c.primitive { Some(m) } else { None })
+        .flat_map(|m| m.vertices)
+        .map(|v| (v.pos, v.color))
+        .collect();
+    assert_eq!(triangles, first.vertices.iter().map(|v| (v.pos, v.color)).collect::<Vec<_>>());
+    // A dropped mesh, another allocation of the same path and a new view each build a new mesh.
+    let rebuilt = one(frame(&[shared_of(&a)], 1.0, &mut shared));
+    assert!(!std::sync::Arc::ptr_eq(&first, &rebuilt) && *first == *rebuilt);
+    let other = one(frame(&[shared_of(&b)], 1.0, &mut shared));
+    assert!(!std::sync::Arc::ptr_eq(&rebuilt, &other) && *rebuilt == *other);
+    let zoomed = one(frame(&[shared_of(&b)], 2.0, &mut shared));
+    assert!(!std::sync::Arc::ptr_eq(&other, &zoomed) && *other != *zoomed);
+    // Two paths in one frame: each keeps its own mesh, and only those two are kept.
+    let both = meshes(&frame(&[shared_of(&a), shared_of(&b)], 2.0, &mut shared));
+    let both_again = meshes(&frame(&[shared_of(&a), shared_of(&b)], 2.0, &mut shared));
+    assert_eq!(both.len(), 2);
+    assert!(both.iter().zip(&both_again).all(|(x, y)| std::sync::Arc::ptr_eq(x, y)));
+    assert!(std::sync::Arc::ptr_eq(&both[1], &zoomed), "b at zoom 2 was kept from its frame");
+    assert_eq!(shared.meshes.len(), 2);
+    // A path off the canvas gets no triangles and draws nothing, and the lines of one partly off
+    // it are left out of its mesh.
+    let mut far = path.clone();
+    far.apply_affine(vectorcraft_geom::Affine::translate((5000.0, 5000.0)));
+    let far = std::sync::Arc::new(far);
+    assert!(meshes(&frame(&[shared_of(&far)], 1.0, &mut shared)).is_empty());
+    assert!(shared.meshes.values().all(|m| m.mesh.is_empty()) && shared.meshes.len() == 1);
+    let mut half = path.clone();
+    half.move_to((5000.0, 5000.0));
+    half.line_to((5100.0, 5000.0));
+    let half = one(frame(&[shared_of(&std::sync::Arc::new(half))], 1.0, &mut shared));
+    assert_eq!(*half, *first, "the subpath off the canvas adds no triangles");
+}
+
 #[test]
 fn subpixel_dock_layout_does_not_change_pointer_document_coordinates() {
     let mut observed = Vec::new();

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

@@ -48,6 +48,8 @@ const OT_SWITCHES: &[(&str, &str)] = &[
     ("ot_titl", "titl"),
     ("ot_ordn", "ordn"),
     ("ot_frac", "frac"),
+    ("ot_hkna", "hkna"),
+    ("ot_ital", "ital"),
 ];
 /// The feature tags the Figure menu sets.
 const FIGURE_TAGS: [&str; 4] = ["tnum", "onum", "pnum", "lnum"];
@@ -56,8 +58,21 @@ const FIGURE_VALUES: [&str; 5] = ["default", "tabularLining", "proportionalLinin
 /// The values of the Position field, in the order of the OpenType panel's Position menu.
 const POSITION_VALUES: [&str; 5] = ["default", "superscript", "subscript", "numerator", "denominator"];
 /// The fields of OpenType Features.
-const OT_FIELDS: &[&str] =
-    &["ot_figure", "ot_position", "ot_liga", "ot_calt", "ot_dlig", "ot_swsh", "ot_salt", "ot_titl", "ot_ordn", "ot_frac", "ot_sets"];
+const OT_FIELDS: &[&str] = &[
+    "ot_figure",
+    "ot_position",
+    "ot_liga",
+    "ot_calt",
+    "ot_dlig",
+    "ot_swsh",
+    "ot_salt",
+    "ot_titl",
+    "ot_ordn",
+    "ot_frac",
+    "ot_hkna",
+    "ot_ital",
+    "ot_sets",
+];
 
 pub(super) const SPEC: DialogSpec = DialogSpec {
     heading: |_| tl!("Character Style Options").into(),
@@ -106,6 +121,8 @@ pub(super) const SPEC: DialogSpec = DialogSpec {
             "ot_titl",
             "ot_ordn",
             "ot_frac",
+            "ot_hkna",
+            "ot_ital",
             "ot_sets",
             "section",
         ]
@@ -926,6 +943,8 @@ pub(crate) fn opentype_body(ui: &mut egui::Ui, d: &mut Dialog) {
             ("ot_titl", tl!("Titling Alternates")),
             ("ot_ordn", tl!("Ordinals")),
             ("ot_frac", tl!("Fractions")),
+            ("ot_hkna", tl!("H or V Style")),
+            ("ot_ital", tl!("Roman Italics")),
         ] {
             switch(ui, d, key, caption, true);
         }
@@ -2042,6 +2061,23 @@ mod tests {
         assert_eq!(edited_attrs(&d).unwrap()["features"], json!(["frac"]));
     }
 
+    /// H or V Style and Roman Italics are on, off or unset switches of OpenType Features: they show
+    /// the style's `hkna` and `ital` tags, a changed switch replaces its tag and keeps the others, an
+    /// unset one removes it, and a style without them keeps none.
+    #[test]
+    fn kana_style_and_roman_italics_are_opentype_switches() {
+        let mut d = dialog_for(json!({"features": ["hkna", "-ital", "dlig"]}));
+        assert_eq!((&d.fields["ot_hkna"], &d.fields["ot_ital"]), (&json!(true), &json!(false)));
+        assert_eq!(edited_attrs(&d).unwrap()["features"], json!(["hkna", "-ital", "dlig"]), "untouched");
+        d.fields.insert("ot_ital".into(), json!(true));
+        d.fields.insert("ot_hkna".into(), Value::Null);
+        assert_eq!(edited_attrs(&d).unwrap()["features"], json!(["dlig", "ital"]));
+        let mut d = dialog_for(json!({}));
+        assert!(d.fields["ot_hkna"].is_null() && d.fields["ot_ital"].is_null());
+        d.fields.insert("ot_hkna".into(), json!(true));
+        assert_eq!(edited_attrs(&d).unwrap()["features"], json!(["hkna"]));
+    }
+
     #[test]
     fn color_and_opentype_sections_show_their_controls() {
         let mut d = dialog_for(json!({}));
@@ -2066,6 +2102,8 @@ mod tests {
             "Titling Alternates",
             "Ordinals",
             "Fractions",
+            "H or V Style",
+            "Roman Italics",
             "Stylistic Sets",
             "ss01",
             "ss20",

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

@@ -23,7 +23,7 @@ pub(super) const SPEC: DialogSpec = DialogSpec {
     confirm,
     preview: true,
     // Load Texture… adds the texture it reads.
-    passes: |d, field| field == vectorcraft_effects::pixel::TEXTURE_IMAGE && matches!(d.str("__effect").as_str(), GLASS | TEXTURIZER),
+    passes: |d, field| field == vectorcraft_effects::pixel::TEXTURE_IMAGE && loads_texture(&d.str("__effect")),
     // OK could only fail the same way: off, beside the reason the dialog shows (#6140).
     ok_enabled: Some(|_, d| !(vectorcraft_effects::is_three_d(&d.str("__effect")) && d.fields.contains_key(form::REFUSED))),
     ..DialogSpec::FORM
@@ -220,6 +220,7 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
         }
         None if id == GLASS => glass_fields(app, ui, d, GLASS),
         None if id == TEXTURIZER => glass_fields(app, ui, d, TEXTURIZER),
+        None if id == ROUGH_PASTELS => glass_fields(app, ui, d, ROUGH_PASTELS),
         None if id == TRANSFORM => transform_fields(ui, d, app.session.general_unit()),
         None if id == SCRIBBLE => scribble_fields(ui, d, app.session.general_unit()),
         None if id == ZIG_ZAG || id == ROUGHEN => size_fields(ui, d, &id, app.session.general_unit()),
@@ -413,16 +414,23 @@ fn blur_center(ui: &mut egui::Ui, d: &mut Dialog) {
 const GLASS: &str = "distort.glass";
 /// The Texturizer effect (Effect › Texture › Texturizer…).
 const TEXTURIZER: &str = "texture.texturizer";
+/// The Rough Pastels effect (Effect › Artistic › Rough Pastels…).
+const ROUGH_PASTELS: &str = "artistic.roughPastels";
 
-/// Glass and Texturizer: parameters, the Texture menu ending with Loaded Texture once a texture is
-/// loaded, and Load Texture… with the loaded texture's size. Returns whether the values differ from
-/// those last previewed.
+/// Does effect `id` have Load Texture… in its dialog (Glass, Texturizer, Rough Pastels)?
+fn loads_texture(id: &str) -> bool {
+    matches!(id, GLASS | TEXTURIZER | ROUGH_PASTELS)
+}
+
+/// Glass, Texturizer and Rough Pastels: parameters, the Texture menu ending with Loaded Texture
+/// once a texture is loaded, and Load Texture… with the loaded texture's size. Returns whether the
+/// values differ from those last previewed.
 fn glass_fields(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, id: &str) -> bool {
     use vectorcraft_effects::pixel::{TEXTURE_IMAGE, texture};
     // The stored texture is shown as its size, not as a text field.
     let stored = d.fields.remove(TEXTURE_IMAGE);
     let size = stored.as_ref().and_then(Value::as_str).and_then(texture).map(|t| t.size());
-    let menu = if id == TEXTURIZER { texturizer_textures(size.is_some()) } else { glass_textures(size.is_some()) };
+    let menu = if id == GLASS { glass_textures(size.is_some()) } else { texturizer_textures(size.is_some()) };
     let doc = vectorcraft_effects::effect_info(id).map(|e| e.params).unwrap_or_default();
     let unit = app.session.general_unit();
     let pick = |k: &str| if k == "texture" { Some(menu) } else { choices(id, k) };
@@ -438,11 +446,18 @@ fn glass_fields(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, id:
             widgets::dim_label(ui, &format!("{w} × {h} px"));
         }
     });
-    if load
-        && let Err(e) = crate::picks::in_dialog(app, d, load_texture)
-        && e != "cancelled"
-    {
-        app.status(e);
+    if load {
+        // The Effect Gallery's Settings draw in a dialog of their own: its answer goes to the gallery.
+        let loaded = if d.fields.contains_key(super::effect_gallery::SETTINGS) {
+            super::effect_gallery::load_texture(app, d)
+        } else {
+            crate::picks::in_dialog(app, d, load_texture)
+        };
+        if let Err(e) = loaded
+            && e != "cancelled"
+        {
+            app.status(e);
+        }
     }
     values_changed(d)
 }
@@ -453,7 +468,8 @@ fn glass_textures(loaded: bool) -> form::Choices {
     if loaded { &GLASS_TEXTURES_LOADED } else { &GLASS_TEXTURES }
 }
 
-/// Texturizer's Texture menu, ending with Loaded Texture once a texture is `loaded`.
+/// Texturizer's and Rough Pastels' Texture menu, ending with Loaded Texture once a texture is
+/// `loaded`.
 fn texturizer_textures(loaded: bool) -> form::Choices {
     use vectorcraft_effects::pixel::{TEXTURES, TEXTURES_LOADED};
     if loaded { &TEXTURES_LOADED } else { &TEXTURES }
@@ -461,7 +477,7 @@ fn texturizer_textures(loaded: bool) -> form::Choices {
 
 /// Glass's Load Texture…: an image file the user picks, read into `textureImage` as Glass stores
 /// it and picked in the Texture menu.
-fn load_texture(app: &mut VectorcraftApp, d: &mut Dialog) -> Result<(), String> {
+pub(super) fn load_texture(app: &mut VectorcraftApp, d: &mut Dialog) -> Result<(), String> {
     use vectorcraft_engine::cmd::fileio;
     let filters = crate::FilePick::filters(fileio::FORMATS.iter().filter(|f| f.read && f.raster).map(|f| (f.label, fileio::read_extensions(f))));
     let path = crate::picks::open(app, &crate::FilePick { filters, ..Default::default() }).ok_or("cancelled")?;
@@ -488,8 +504,10 @@ fn choices(effect: &str, key: &str) -> Option<form::Choices> {
         ("sketch.halftonePattern", "patternType") => Some(&vectorcraft_effects::pixel::HALFTONE_TYPES),
         ("sketch.plaster", "lightDirection") => Some(&vectorcraft_effects::pixel::LIGHT_DIRECTIONS),
         ("texture.grain", "grainType") => Some(&vectorcraft_effects::pixel::GRAIN_TYPES),
-        ("texture.texturizer" | "artistic.underpainting" | "sketch.conteCrayon", "texture") => Some(&vectorcraft_effects::pixel::TEXTURES),
-        ("sketch.basRelief" | "texture.texturizer" | "artistic.underpainting" | "sketch.conteCrayon", "lightDirection") => {
+        ("texture.texturizer" | "artistic.underpainting" | "artistic.roughPastels" | "sketch.conteCrayon", "texture") => {
+            Some(&vectorcraft_effects::pixel::TEXTURES)
+        }
+        ("sketch.basRelief" | "texture.texturizer" | "artistic.underpainting" | "artistic.roughPastels" | "sketch.conteCrayon", "lightDirection") => {
             Some(&vectorcraft_effects::pixel::LIGHT_DIRECTIONS)
         }
         ("video.deinterlace", "eliminate") => Some(&[("Odd Fields", "odd"), ("Even Fields", "even")]),
@@ -547,10 +565,10 @@ pub(super) fn own_choices(effect: &str, key: &str, cmyk: bool) -> Option<Vec<(&'
 
 /// The values that parameter `key` of applied effect `effect` picks from, as its dialog lists
 /// them, as (label, value): our own effects' labels in the UI language, a plug-in's choices as the
-/// plug-in names them. Glass's Texture menu ends with Loaded Texture when the effect's values
-/// `params` hold a loaded texture, and the lists of [`own_choices`] are translated as their
-/// dialogs translate them (`cmyk`: the document is in CMYK). `None` for a parameter that is not one
-/// of these lists.
+/// plug-in names them. The Texture menu of Glass, Texturizer and Rough Pastels ends with Loaded
+/// Texture when the effect's values `params` hold a loaded texture, and the lists of
+/// [`own_choices`] are translated as their dialogs translate them (`cmyk`: the document is in
+/// CMYK). `None` for a parameter that is not one of these lists.
 pub(crate) fn shown_choices(effect: &str, key: &str, params: &Map<String, Value>, cmyk: bool) -> Option<Vec<(String, String)>> {
     if let Some(plugin) = vectorcraft_plugins::effect::installed(effect) {
         return plugin.manifest().param(key).and_then(|p| match &p.spec {
@@ -561,7 +579,7 @@ pub(crate) fn shown_choices(effect: &str, key: &str, params: &Map<String, Value>
     if let Some(own) = own_choices(effect, key, cmyk) {
         return Some(own.into_iter().map(|(label, value)| (tl!(label).to_string(), value.to_string())).collect());
     }
-    let options = if (effect == GLASS || effect == TEXTURIZER) && key == "texture" {
+    let options = if loads_texture(effect) && key == "texture" {
         use vectorcraft_effects::pixel::{TEXTURE_IMAGE, texture};
         let loaded = params.get(TEXTURE_IMAGE).and_then(Value::as_str).and_then(texture).is_some();
         if effect == GLASS { glass_textures(loaded) } else { texturizer_textures(loaded) }
@@ -1185,6 +1203,45 @@ mod tests {
         assert_eq!((&params["texture"], &params["textureImage"]), (&json!("loaded"), &json!(stored)));
         let _ = std::fs::remove_dir_all(&dir);
     }
+
+    /// Rough Pastels' Texture and Light Direction are menus, and Load Texture… matches Glass: pick,
+    /// Loaded Texture in the menu with the texture's size, OK applies, and the Appearance panel's
+    /// Texture menu lists Loaded Texture too.
+    #[test]
+    fn rough_pastels_load_texture_reads_the_picked_image_into_the_effect() {
+        let dir = std::env::temp_dir().join(format!("vectorcraft-rough-pastels-dialog-{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("texture.png");
+        image::RgbaImage::from_fn(6, 4, |x, y| image::Rgba([(x * 40) as u8, (y * 60) as u8, 90, 255])).save(&path).unwrap();
+        let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        let picked = path.to_string_lossy().into_owned();
+        app.services.pick_open = Some(Box::new(move |_: &crate::FilePick| Some(picked.clone())));
+        app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
+        app.run("file.new", json!({"width": 200, "height": 200})).unwrap();
+        let id = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 50, "height": 50})).unwrap()["id"].as_u64().unwrap();
+        app.run("select.all", json!({})).unwrap();
+        app.run("effect.dialog", json!({"effect": ROUGH_PASTELS})).unwrap();
+        let paint = |app: &mut VectorcraftApp| crate::tests_labels::painted_text(app, |app, ui| super::super::show(app, ui.ctx()));
+        let text = paint(&mut app);
+        assert!(text.lines().any(|l| l == "Load Texture…") && text.lines().any(|l| l == "Canvas") && text.lines().any(|l| l == "Top"), "{text}");
+        assert!(!text.contains("Loaded Texture") && !text.contains(" px"), "{text}");
+        let mut d = app.ui.dialog.take().unwrap();
+        load_texture(&mut app, &mut d).unwrap();
+        let stored = d.str(vectorcraft_effects::pixel::TEXTURE_IMAGE);
+        assert_eq!((d.str("texture"), vectorcraft_effects::pixel::texture(&stored).map(|t| t.size())), ("loaded".to_string(), Some((6, 4))));
+        app.ui.dialog = Some(d);
+        let text = paint(&mut app);
+        assert!(text.lines().any(|l| l == "Loaded Texture") && text.lines().any(|l| l == "6 × 4 px"), "{text}");
+        assert!(!text.contains(&stored[..24]), "the stored text isn't shown");
+        super::super::confirm(&mut app).unwrap();
+        let st = app.session.doc().unwrap();
+        let params = &st.doc.node(vectorcraft_doc::NodeId(id)).unwrap().appearance.effects[0].params;
+        assert_eq!((&params["texture"], &params["textureImage"]), (&json!("loaded"), &json!(stored)));
+        let shown = shown_choices(ROUGH_PASTELS, "texture", params.as_object().unwrap(), false).unwrap();
+        assert_eq!(shown.last().map(|(_, v)| v.as_str()), Some(vectorcraft_effects::pixel::LOADED), "{shown:?}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
+
     /// Effect > Stylize > Outer Glow: a swatch beside Color shows the effect's colour, typing a
     /// hex recolours it, and a double-click opens the Color Picker over the dialog; its OK fills
     /// Color, and the effect applies that colour.

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

@@ -52,6 +52,8 @@ pub(super) const SPEC: DialogSpec = DialogSpec {
 
 #[derive(Clone)]
 struct StackEntry {
+    /// The row's own number, kept while the row moves (a file dialog's late answer finds it).
+    id: u64,
     effect: String,
     visible: bool,
     params: Map<String, Value>,
@@ -63,13 +65,20 @@ pub fn open(app: &mut VectorcraftApp, _p: &Value) -> Result<Value, String> {
         return Err(tl!("Select artwork to apply effects").into());
     }
     let selected = effects_in_category(0).first().map(|e| e.id).unwrap_or("");
+    // Each gallery opened has a number of its own, so a file dialog's late answer for one that
+    // closed never reaches the next.
+    static OPENED: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0);
+    let opened = OPENED.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
     app.ui.dialog = Some(Dialog::new(
         KIND,
-        json!({ "category": 0, "selected": selected, "stack": [], "stackSelected": 0, "stackFocus": false, "preview": true }),
+        json!({ "category": 0, "selected": selected, "stack": [], "stackSelected": 0, "stackFocus": false, "preview": true, OPENED_FIELD: opened }),
     ));
     Ok(Value::Null)
 }
 
+/// Field of the gallery holding the number it was opened with.
+const OPENED_FIELD: &str = "opened";
+
 fn effects_in_category(cat: usize) -> Vec<EffectInfo> {
     let path = CATEGORIES.get(cat).map(|(_, p)| *p).unwrap_or(CATEGORIES[0].1);
     let mut out: Vec<EffectInfo> =
@@ -92,31 +101,48 @@ fn merged_params(id: &str, stored: &Map<String, Value>) -> Map<String, Value> {
     }
 }
 
+/// The stack's rows. A row without a number of its own, or with one an earlier row has, gets the
+/// next number after the highest one.
 fn stack_of(d: &Dialog) -> Vec<StackEntry> {
-    d.fields
-        .get("stack")
-        .and_then(Value::as_array)
-        .map(|rows| {
-            rows.iter()
-                .filter_map(|row| {
-                    let effect = row.get("effect").and_then(Value::as_str)?;
-                    let visible = row.get("visible").and_then(Value::as_bool).unwrap_or(true);
-                    let params = row
-                        .get("params")
-                        .and_then(Value::as_object)
-                        .cloned()
-                        .map(|m| merged_params(effect, &m))
-                        .unwrap_or_else(|| default_params(effect));
-                    Some(StackEntry { effect: effect.to_string(), visible, params })
-                })
-                .collect()
+    let rows = d.fields.get("stack").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default();
+    let mut next = rows.iter().filter_map(|row| row.get("id").and_then(Value::as_u64)).max().map_or(0, |m| m.saturating_add(1));
+    next = next.max(d.fields.get(NEXT_ROW).and_then(Value::as_u64).unwrap_or(0));
+    let mut seen = std::collections::HashSet::new();
+    rows.iter()
+        .filter_map(|row| {
+            let effect = row.get("effect").and_then(Value::as_str)?;
+            let visible = row.get("visible").and_then(Value::as_bool).unwrap_or(true);
+            let params =
+                row.get("params").and_then(Value::as_object).cloned().map(|m| merged_params(effect, &m)).unwrap_or_else(|| default_params(effect));
+            let id = match row.get("id").and_then(Value::as_u64) {
+                Some(id) if seen.insert(id) => id,
+                _ => {
+                    let id = next;
+                    next = next.saturating_add(1);
+                    seen.insert(id);
+                    id
+                }
+            };
+            Some(StackEntry { id, effect: effect.to_string(), visible, params })
         })
-        .unwrap_or_default()
+        .collect()
+}
+
+/// Field of the gallery holding the number the next new row takes.
+const NEXT_ROW: &str = "nextRowId";
+
+/// A number for a new row of `stack` in `d`: after the highest one, and never one that a removed
+/// row had.
+fn next_row_id(d: &Dialog, stack: &[StackEntry]) -> u64 {
+    let after = stack.iter().map(|e| e.id).max().map_or(0, |m| m.saturating_add(1));
+    after.max(d.fields.get(NEXT_ROW).and_then(Value::as_u64).unwrap_or(0))
 }
 
 fn write_stack(d: &mut Dialog, stack: &[StackEntry]) {
-    let rows: Vec<Value> = stack.iter().map(|e| json!({ "effect": e.effect, "visible": e.visible, "params": e.params })).collect();
+    let rows: Vec<Value> = stack.iter().map(|e| json!({ "id": e.id, "effect": e.effect, "visible": e.visible, "params": e.params })).collect();
     d.fields.insert("stack".into(), Value::Array(rows));
+    let next = next_row_id(d, stack);
+    d.fields.insert(NEXT_ROW.into(), json!(next));
 }
 
 fn category_ix(d: &Dialog) -> usize {
@@ -177,8 +203,79 @@ fn write_param_target(d: &mut Dialog, stack: &mut [StackEntry], stack_sel: usize
     }
 }
 
-/// Reuse the live effect dialog's fields for `effect_id` and `params`.
-fn effect_param_fields(app: &mut VectorcraftApp, ui: &mut egui::Ui, effect_id: &str, params: &mut Map<String, Value>) {
+/// Field of the effect dialog the gallery's Settings draw in ([`effect_param_fields`]): which
+/// values they edit ([`settings_key`]).
+pub(super) const SETTINGS: &str = "__gallerySettings";
+
+/// Field of the stand-in dialog [`load_texture`] asks the file dialog with.
+const ASKING: &str = "__asking";
+
+/// The stack row the Settings of `d` edit when the stack has the focus, of `rows` rows.
+fn settings_row(d: &Dialog, rows: usize) -> Option<usize> {
+    let row = (d.fields.get("stackSelected").and_then(Value::as_u64).unwrap_or(0) as usize).min(rows.saturating_sub(1));
+    stack_focus(d).then_some(row)
+}
+
+/// Which values the Settings of gallery `d` edit: `{opened, row}`, the gallery's number and the
+/// number of the stack row, or `null` for the row when they edit the filter being browsed.
+fn settings_key(d: &Dialog, stack: &[StackEntry]) -> Value {
+    let row = settings_row(d, stack.len()).and_then(|row| stack.get(row)).map(|e| e.id);
+    json!({ "opened": d.fields.get(OPENED_FIELD), "row": row })
+}
+
+/// Load Texture… in the gallery's Settings (`temp`, for Glass, Texturizer or Rough Pastels): the
+/// image picked goes into `temp` when the file dialog answers at once. When it answers later
+/// (shown off the UI thread) it goes into the values that asked: the stack row of that number
+/// wherever it moved, or the filter being browsed. An answer for a row that was removed, or for a
+/// filter no longer browsed, or for a gallery that closed, is dropped.
+pub(super) fn load_texture(app: &mut VectorcraftApp, temp: &mut Dialog) -> Result<(), String> {
+    use vectorcraft_effects::pixel::TEXTURE_IMAGE;
+    let effect = temp.str("__effect");
+    let key = temp.fields.get(SETTINGS).cloned().unwrap_or(Value::Null);
+    let opened = key.get("opened").cloned().unwrap_or(Value::Null);
+    let row = key.get("row").and_then(Value::as_u64);
+    let mut asking = Dialog::new(KIND, json!({ ASKING: true }));
+    crate::picks::in_dialog(app, &mut asking, move |app, d| {
+        if d.fields.contains_key(ASKING) {
+            return effect::load_texture(app, d);
+        }
+        let mut picked = Dialog::new(KIND, json!({}));
+        effect::load_texture(app, &mut picked)?;
+        if d.fields.get(OPENED_FIELD).unwrap_or(&Value::Null) != &opened {
+            return Ok(());
+        }
+        match row {
+            Some(row) => {
+                let mut stack = stack_of(d);
+                if let Some(e) = stack.iter_mut().find(|e| e.id == row && e.effect == effect) {
+                    e.params.extend(picked.fields);
+                    write_stack(d, &stack);
+                }
+            }
+            None if selected_id(d) == effect => {
+                let mut params = if d.fields.get("browseEffect").and_then(Value::as_str) == Some(effect.as_str()) {
+                    browse_params(d)
+                } else {
+                    default_params(&effect)
+                };
+                params.extend(picked.fields);
+                set_browse_params(d, &effect, params);
+            }
+            None => {}
+        }
+        Ok(())
+    })?;
+    for key in [TEXTURE_IMAGE, "texture"] {
+        if let Some(v) = asking.fields.remove(key) {
+            temp.fields.insert(key.into(), v);
+        }
+    }
+    Ok(())
+}
+
+/// Reuse the live effect dialog's fields for `effect_id` and `params`, the values `key` names
+/// ([`settings_key`]).
+fn effect_param_fields(app: &mut VectorcraftApp, ui: &mut egui::Ui, effect_id: &str, params: &mut Map<String, Value>, key: Value) {
     if effect_id.is_empty() {
         return;
     }
@@ -188,6 +285,7 @@ fn effect_param_fields(app: &mut VectorcraftApp, ui: &mut egui::Ui, effect_id: &
     fields.insert("__effect".into(), json!(effect_id));
     fields.insert("__label".into(), json!(label));
     fields.insert("preview".into(), json!(false));
+    fields.insert(SETTINGS.into(), key);
     let mut temp = Dialog::new("effect", Value::Object(fields));
     (effect::SPEC.body)(app, ui, &mut temp);
     if let Value::Object(m) = form::params(&temp) {
@@ -475,8 +573,9 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool {
     let (param_effect, mut param_values) = param_target(d, &stack, stack_sel, &sel);
     if !param_effect.is_empty() {
         widgets::subheader(ui, tl!("Settings"));
+        let key = settings_key(d, &stack);
         egui::ScrollArea::vertical().max_height(200.0).show(ui, |ui| {
-            effect_param_fields(app, ui, &param_effect, &mut param_values);
+            effect_param_fields(app, ui, &param_effect, &mut param_values, key);
         });
         write_param_target(d, &mut stack, stack_sel, &sel, &param_effect, param_values);
     }
@@ -604,7 +703,7 @@ fn add_selected(d: &mut Dialog, id: &str) {
     let params =
         if !stack_focus(d) && d.fields.get("browseEffect").and_then(Value::as_str) == Some(id) { browse_params(d) } else { default_params(id) };
     let mut stack = stack_of(d);
-    stack.push(StackEntry { effect: id.to_string(), visible: true, params });
+    stack.push(StackEntry { id: next_row_id(d, &stack), effect: id.to_string(), visible: true, params });
     write_stack(d, &stack);
     d.fields.insert("stackSelected".into(), json!(stack.len().saturating_sub(1)));
     set_stack_focus(d, true);
@@ -739,4 +838,88 @@ mod tests {
         );
         assert_ne!(soft, hard, "the preview follows the filter's settings");
     }
+
+    /// Load Texture… in the Settings, with the file dialog shown off the UI thread: the image
+    /// goes into the values whose Settings asked (the filter browsed, or a stack row wherever it
+    /// moved) when the dialog answers, and an answer for a removed row, or for a filter no longer
+    /// browsed, is dropped.
+    #[test]
+    fn settings_load_texture_answers_into_the_gallery() {
+        use vectorcraft_effects::pixel::{TEXTURE_IMAGE, texture};
+        let dir = std::env::temp_dir().join(format!("vectorcraft-gallery-texture-{}", std::process::id()));
+        std::fs::create_dir_all(&dir).unwrap();
+        let path = dir.join("texture.png");
+        image::RgbaImage::from_fn(6, 4, |x, y| image::Rgba([(x * 40) as u8, (y * 60) as u8, 90, 255])).save(&path).unwrap();
+        let picked = path.to_string_lossy().into_owned();
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        let (shown, _) = crate::tests_picks::off_the_ui_thread(&mut app.services);
+        app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
+        app.run("file.new", json!({"width": 200, "height": 200})).unwrap();
+        app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 40, "height": 40})).unwrap();
+        app.run("ui.effectGalleryDialog", json!({})).unwrap();
+        let effect = "artistic.roughPastels";
+        let loaded = |params: &serde_json::Map<String, serde_json::Value>| {
+            params.get(TEXTURE_IMAGE).and_then(serde_json::Value::as_str).and_then(texture).map(|t| t.size()) == Some((6, 4))
+                && params.get("texture") == Some(&json!("loaded"))
+        };
+        // Asks from the Settings of `row` (None: the filter browsed), then `meanwhile` changes the
+        // gallery before the dialog answers.
+        let ask = |app: &mut VectorcraftApp, row: Option<usize>, meanwhile: &dyn Fn(&mut crate::state::Dialog)| {
+            let gallery = app.ui.dialog.as_mut().unwrap();
+            gallery.fields.remove("browseEffect");
+            gallery.fields.remove("browseParams");
+            gallery.fields.insert("selected".into(), json!(effect));
+            gallery.fields.remove(super::NEXT_ROW);
+            gallery.fields.insert("stack".into(), json!([{"effect": effect, "params": {}}, {"effect": effect, "params": {}}]));
+            let rows = super::stack_of(gallery);
+            super::write_stack(gallery, &rows);
+            gallery.fields.insert("stackFocus".into(), json!(row.is_some()));
+            gallery.fields.insert("stackSelected".into(), json!(row.unwrap_or(0)));
+            let key = super::settings_key(gallery, &super::stack_of(gallery));
+            let mut temp = crate::state::Dialog::new("effect", json!({"__effect": effect, super::SETTINGS: key, "texture": "canvas"}));
+            assert_eq!(super::load_texture(app, &mut temp), Err("cancelled".to_string()), "asked, not answered yet");
+            assert!(temp.fields.get(TEXTURE_IMAGE).is_none());
+            meanwhile(app.ui.dialog.as_mut().unwrap());
+            shown.answer(&[picked.as_str()]);
+            crate::picks::poll(app, &egui::Context::default());
+            let d = app.ui.dialog.as_ref().expect("the gallery stays open");
+            (super::browse_params(d), super::stack_of(d).into_iter().map(|e| loaded(&e.params)).collect::<Vec<_>>())
+        };
+        // The filter browsed gets it, and so does the stack row whose Settings asked.
+        let (browsed, rows) = ask(&mut app, None, &|_| {});
+        assert!(loaded(&browsed) && rows == [false, false], "{browsed:?}");
+        let (browsed, rows) = ask(&mut app, Some(1), &|_| {});
+        assert!(!loaded(&browsed) && rows == [false, true], "{rows:?}");
+        // The row that asked gets it after it moved, or after another row was selected.
+        let (_, rows) = ask(&mut app, Some(0), &|d| {
+            let mut stack = super::stack_of(d);
+            stack.swap(0, 1);
+            super::write_stack(d, &stack);
+        });
+        assert_eq!(rows, [false, true], "moved down");
+        let (_, rows) = ask(&mut app, Some(0), &|d| {
+            d.fields.insert("stackSelected".into(), json!(1));
+        });
+        assert_eq!(rows, [true, false], "another row selected");
+        // A row removed (and another of the same effect added in its place), or a filter no
+        // longer browsed: dropped.
+        let (browsed, rows) = ask(&mut app, Some(1), &|d| {
+            let mut stack = super::stack_of(d);
+            stack.pop();
+            super::write_stack(d, &stack);
+            super::add_selected(d, effect);
+        });
+        assert!(!loaded(&browsed) && rows == [false, false], "{rows:?}");
+        let (browsed, rows) = ask(&mut app, None, &|d| {
+            d.fields.insert("selected".into(), json!("artistic.cutout"));
+        });
+        assert!(!loaded(&browsed) && rows == [false, false], "{browsed:?}");
+        // The gallery that asked closed and another one opened.
+        let (browsed, rows) = ask(&mut app, Some(1), &|d| {
+            let next = d.fields.get(super::OPENED_FIELD).and_then(serde_json::Value::as_u64).unwrap() + 1;
+            d.fields.insert(super::OPENED_FIELD.into(), json!(next));
+        });
+        assert!(!loaded(&browsed) && rows == [false, false], "{rows:?}");
+        let _ = std::fs::remove_dir_all(&dir);
+    }
 }

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

@@ -2593,6 +2593,8 @@ font-technology	Variable	Променливи
 	Proof Setup	Настройка на пробен печат
 	Properties	Свойства
 	Proportional Metrics	Пропорционални метрики
+	H or V Style	Хоризонтален или вертикален стил
+	Roman Italics	Римски курсив
 	Insert Aki Left	Вмъкване на аки отляво
 	Insert Aki Right	Вмъкване на аки отдясно
 	Tsume	Цуме

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

@@ -1584,6 +1584,8 @@ lighting	Light	Svjetlo
 	Leading	Prored
 	No Break	Bez preloma
 	Proportional Metrics	Proporcionalna metrika
+	H or V Style	Horizontalni ili vertikalni stil
+	Roman Italics	Latinični kurziv
 	Insert Aki Left	Umetni aki lijevo
 	Insert Aki Right	Umetni aki desno
 	Tsume	Tsume

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

@@ -3362,6 +3362,8 @@ digits	Malayalam	Malaiàlam
 	Proof Setup	Configuració de prova
 	Properties	Propietats
 	Proportional Metrics	Mètriques proporcionals
+	H or V Style	Estil horitzontal o vertical
+	Roman Italics	Cursiva romana
 	Insert Aki Left	Insereix aki a l'esquerra
 	Insert Aki Right	Insereix aki a la dreta
 	Tsume	Tsume

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

@@ -1612,6 +1612,8 @@ lighting	Light	Světlo
 	Leading	Proklad
 	No Break	Nezalamovat
 	Proportional Metrics	Proporcionální metrika
+	H or V Style	Vodorovný nebo svislý styl
+	Roman Italics	Kurzíva latinky
 	Insert Aki Left	Vložit aki vlevo
 	Insert Aki Right	Vložit aki vpravo
 	Tsume	Tsume
@@ -9258,7 +9260,7 @@ breakText	Glyphs	Glyfy
 @msg	unexpected resources	neočekávané prostředky
 @msg	unknown CMYK profile `{name}`	neznámý profil CMYK `{name}`
 @msg	unknown File Info field `{k}`	neznámé pole informací o souboru `{k}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	neznámá funkce OpenType `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; předpona - funkci vypne; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom a aalt přijímají číslo alternativy jako `tag=N` s N od 0 do {_1}, například `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	neznámá funkce OpenType `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; předpona - funkci vypne; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom a aalt přijímají číslo alternativy jako `tag=N` s N od 0 do {_1}, například `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	neznámá funkce OpenType `{t}` ve featureChanges (značky, které přijímá `features`)
 @msg	unknown PDF preset `{name}` (presets: {_1})	neznámé přednastavení PDF `{name}` (přednastavení: {_1})
 @msg	unknown Warp style	neznámý styl deformace

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

@@ -2129,6 +2129,8 @@ lighting	Light	Lys
 	Leading	Linjeafstand
 	No Break	Ingen ombrydning
 	Proportional Metrics	Proportionale metrikker
+	H or V Style	Vandret eller lodret stil
+	Roman Italics	Romersk kursiv
 	Insert Aki Left	Indsæt aki til venstre
 	Insert Aki Right	Indsæt aki til højre
 	Tsume	Tsume

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

@@ -2637,6 +2637,8 @@ mark-style	Japanese	Japanisch
 	Proof Setup	Proof einrichten
 	Properties	Eigenschaften
 	Proportional Metrics	Proportionale Metrik
+	H or V Style	Horizontaler oder vertikaler Stil
+	Roman Italics	Lateinische Kursive
 	Insert Aki Left	Aki links einfügen
 	Insert Aki Right	Aki rechts einfügen
 	Tsume	Tsume
@@ -7478,7 +7480,7 @@ breakText	Glyphs	Glyphen
 @msg	toString is not a function	toString ist keine Funktion
 @msg	too many arguments	zu viele Argumente
 @msg	too many quantifiers	zu viele Quantifizierer
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	unbekannte OpenType-Funktion `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; mit vorangestelltem - ausschalten; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom und aalt nehmen die Nummer einer Alternative als `tag=N` mit N von 0 bis {_1}, etwa `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	unbekannte OpenType-Funktion `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; mit vorangestelltem - ausschalten; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom und aalt nehmen die Nummer einer Alternative als `tag=N` mit N von 0 bis {_1}, etwa `salt=2`)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	unbekanntes Dithering `{d}` (diffusion, pattern, noise oder none)
 @msg	unknown panel `{panel}`	unbekanntes Bedienfeld `{panel}`
 @msg	unknown parameter `{key}`	unbekannter Parameter `{key}`

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

@@ -3434,6 +3434,8 @@ theme	Appearance	Εμφάνιση
 	Profile inclusion:	Συμπερίληψη προφίλ:
 	Projecting Cap	Προεξέχον άκρο
 	Proportional Metrics	Αναλογικές μετρικές
+	H or V Style	Οριζόντιο ή κατακόρυφο στυλ
+	Roman Italics	Λατινικά πλάγια
 	Insert Aki Left	Εισαγωγή aki αριστερά
 	Insert Aki Right	Εισαγωγή aki δεξιά
 	Tsume	Tsume

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

@@ -2671,6 +2671,8 @@ font-technology	Variable	Variables
 	Proof Setup	Ajuste de prueba
 	Properties	Propiedades
 	Proportional Metrics	Métrica proporcional
+	H or V Style	Estilo horizontal o vertical
+	Roman Italics	Cursiva romana
 	Insert Aki Left	Insertar aki a la izquierda
 	Insert Aki Right	Insertar aki a la derecha
 	Tsume	Tsume

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

@@ -1587,6 +1587,8 @@ lighting	Light	Valo
 	Leading	Riviväli
 	No Break	Ei katkoa
 	Proportional Metrics	Suhteelliset metriikat
+	H or V Style	Vaaka- tai pystytyyli
+	Roman Italics	Latinalainen kursiivi
 	Insert Aki Left	Lisää aki vasemmalle
 	Insert Aki Right	Lisää aki oikealle
 	Tsume	Tsume

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

@@ -2663,6 +2663,8 @@ font-technology	Variable	Variables
 	Proof Setup	Format d’épreuve
 	Properties	Propriétés
 	Proportional Metrics	Métrique proportionnelle
+	H or V Style	Style horizontal ou vertical
+	Roman Italics	Italique des caractères romains
 	Insert Aki Left	Insérer un aki à gauche
 	Insert Aki Right	Insérer un aki à droite
 	Tsume	Tsume
@@ -9116,7 +9118,7 @@ breakText	Glyphs	Glyphes
 @msg	unexpected resources	ressources inattendues
 @msg	unknown CMYK profile `{name}`	profil CMJN inconnu `{name}`
 @msg	unknown File Info field `{k}`	champ Informations sur le fichier inconnu `{k}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	fonctionnalité OpenType inconnue `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt ; préfixe - pour désactiver ; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom et aalt acceptent un numéro de variante sous la forme `tag=N` avec N de 0 à {_1}, comme `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	fonctionnalité OpenType inconnue `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital ; préfixe - pour désactiver ; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom et aalt acceptent un numéro de variante sous la forme `tag=N` avec N de 0 à {_1}, comme `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	fonctionnalité OpenType inconnue `{t}` dans featureChanges (les balises qu’accepte `features`)
 @msg	unknown PDF preset `{name}` (presets: {_1})	paramètre prédéfini PDF inconnu `{name}` (paramètres prédéfinis : {_1})
 @msg	unknown Warp style	style de déformation inconnu

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

@@ -2744,6 +2744,8 @@
 	Proof Setup	પ્રૂફ સેટઅપ
 	Properties	ગુણધર્મો
 	Proportional Metrics	પ્રમાણસર મેટ્રિક્સ
+	H or V Style	આડી અથવા ઊભી શૈલી
+	Roman Italics	રોમન ઇટાલિક
 	Pucker	પકર
 	Pucker & Bloat…	પકર અને બ્લોટ…
 	Pucker Tool	પકર ટૂલ

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

@@ -3702,6 +3702,8 @@ antiAlias	Sharp	शार्प
 	Properties	प्रॉपर्टीज़
 	Proportional Lining	आनुपातिक लाइनिंग
 	Proportional Metrics	आनुपातिक मीट्रिक
+	H or V Style	क्षैतिज या ऊर्ध्वाधर शैली
+	Roman Italics	रोमन इटैलिक
 	Insert Aki Left	बाईं ओर आकी जोड़ें
 	Insert Aki Right	दाईं ओर आकी जोड़ें
 	Tsume	त्सुमे

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

@@ -3228,6 +3228,8 @@ mark-style	Japanese	Japán
 	Proof Setup	Színpróba beállítása
 	Properties	Tulajdonságok
 	Proportional Metrics	Arányos metrika
+	H or V Style	Vízszintes vagy függőleges stílus
+	Roman Italics	Latin betűk dőlt változata
 	Insert Aki Left	Aki beszúrása balra
 	Insert Aki Right	Aki beszúrása jobbra
 	Tsume	Tsume
@@ -9128,7 +9130,7 @@ breakText	Glyphs	Glifák
 @msg	unexpected resources	váratlan erőforrások
 @msg	unknown CMYK profile `{name}`	ismeretlen CMYK-profil: `{name}`
 @msg	unknown File Info field `{k}`	ismeretlen fájlinformációs mező: `{k}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	ismeretlen OpenType-funkció: `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; a - előtag kikapcsolja; a swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom és aalt egy alternatíva számát `tag=N` alakban fogadja, ahol N 0 és {_1} között lehet, például `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	ismeretlen OpenType-funkció: `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; a - előtag kikapcsolja; a swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom és aalt egy alternatíva számát `tag=N` alakban fogadja, ahol N 0 és {_1} között lehet, például `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	ismeretlen OpenType-funkció a featureChanges értékben: `{t}` (a `features` által fogadott címkék használhatók)
 @msg	unknown PDF preset `{name}` (presets: {_1})	ismeretlen PDF-előbeállítás: `{name}` (előbeállítások: {_1})
 @msg	unknown Warp style	ismeretlen hajlítási stílus

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

@@ -1520,6 +1520,8 @@ lighting	Light	Cahaya
 	Leading	Leading
 	No Break	Tanpa pemenggalan
 	Proportional Metrics	Metrik proporsional
+	H or V Style	Gaya horizontal atau vertikal
+	Roman Italics	Miring Romawi
 	Insert Aki Left	Sisipkan aki kiri
 	Insert Aki Right	Sisipkan aki kanan
 	Tsume	Tsume

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

@@ -2713,6 +2713,8 @@ mark-style	Japanese	Giapponese
 	Proof Setup	Impostazione prova
 	Properties	Proprietà
 	Proportional Metrics	Metrica proporzionale
+	H or V Style	Stile orizzontale o verticale
+	Roman Italics	Corsivo romano
 	Insert Aki Left	Inserisci aki a sinistra
 	Insert Aki Right	Inserisci aki a destra
 	Tsume	Tsume
@@ -7526,7 +7528,7 @@ breakText	Glyphs	Glifi
 @msg	toString is not a function	toString non è una funzione
 @msg	too many arguments	troppi argomenti
 @msg	too many quantifiers	troppi quantificatori
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	funzione OpenType sconosciuta `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; anteponi - per disattivarla; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom e aalt accettano il numero di un'alternativa come `tag=N` con N da 0 a {_1}, ad esempio `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	funzione OpenType sconosciuta `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; anteponi - per disattivarla; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom e aalt accettano il numero di un'alternativa come `tag=N` con N da 0 a {_1}, ad esempio `salt=2`)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	dithering sconosciuto `{d}` (diffusion, pattern, noise o none)
 @msg	unknown panel `{panel}`	pannello sconosciuto `{panel}`
 @msg	unknown parameter `{key}`	parametro sconosciuto `{key}`

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

@@ -50,6 +50,8 @@ font-technology	Variable	バリアブル
 	x-Height	x ハイト
 	ICF Box	平均字面
 	Proportional Metrics	プロポーショナルメトリクス
+	H or V Style	横組み・縦組み用かな
+	Roman Italics	欧文イタリック
 	Insert Aki Left	前にアキを挿入
 	Insert Aki Right	後ろにアキを挿入
 	Tsume	文字ツメ
@@ -6733,7 +6735,7 @@ axis	Y Axis	Y 軸
 @msg	toString is not a function	toString は関数ではありません
 @msg	too many arguments	引数が多すぎます
 @msg	too many quantifiers	量指定子が多すぎます
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	`{t}` は不明な OpenType 機能です (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt。オフにするには先頭に - を付けます。swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt には、`salt=2` のように `tag=N` の形式で代替字形の番号を指定できます。N は 0 から {_1} まで)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	`{t}` は不明な OpenType 機能です (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital。オフにするには先頭に - を付けます。swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt には、`salt=2` のように `tag=N` の形式で代替字形の番号を指定できます。N は 0 から {_1} まで)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	`{d}` は不明なディザの指定です (diffusion、pattern、noise、none のいずれか)
 @msg	unknown panel `{panel}`	`{panel}` は不明なパネルです
 @msg	unknown parameter `{key}`	`{key}` は不明なパラメーターです

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

@@ -1457,6 +1457,8 @@ lighting	Light	სინათლე
 	Leading	სტრიქონთა დაშორება
 	No Break	გადატანის გარეშე
 	Proportional Metrics	პროპორციული მეტრიკა
+	H or V Style	ჰორიზონტალური ან ვერტიკალური სტილი
+	Roman Italics	ლათინური კურსივი
 	Insert Aki Left	აკის ჩასმა მარცხნივ
 	Insert Aki Right	აკის ჩასმა მარჯვნივ
 	Tsume	ცუმე

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

@@ -44,6 +44,8 @@ font-technology	Variable	가변
 	x-Height	x 높이
 	ICF Box	ICF 박스
 	Proportional Metrics	비례 메트릭
+	H or V Style	가로 또는 세로 스타일
+	Roman Italics	로마자 이탤릭
 	Insert Aki Left	앞 아키 삽입
 	Insert Aki Right	뒤 아키 삽입
 	Tsume	츠메
@@ -8861,7 +8863,7 @@ breakText	Glyphs	글리프
 @msg	unexpected resources	예상하지 못한 리소스
 @msg	unknown CMYK profile `{name}`	알 수 없는 CMYK 프로파일 `{name}`
 @msg	unknown File Info field `{k}`	알 수 없는 파일 정보 필드 `{k}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	알 수 없는 OpenType 기능 `{t}`(liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt. 끄려면 앞에 -를 붙이세요. swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt는 대체 글리프 번호를 `tag=N` 형식으로 받으며 N은 0에서 {_1} 사이입니다. 예: `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	알 수 없는 OpenType 기능 `{t}`(liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital. 끄려면 앞에 -를 붙이세요. swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt는 대체 글리프 번호를 `tag=N` 형식으로 받으며 N은 0에서 {_1} 사이입니다. 예: `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	featureChanges의 알 수 없는 OpenType 기능 `{t}`(`features`가 받는 태그를 사용하세요)
 @msg	unknown PDF preset `{name}` (presets: {_1})	알 수 없는 PDF 프리셋 `{name}`(프리셋: {_1})
 @msg	unknown Warp style	알 수 없는 왜곡 스타일

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

@@ -2038,6 +2038,8 @@ lighting	Light	Licht
 	Leading	Regelafstand
 	No Break	Niet afbreken
 	Proportional Metrics	Proportionele metingen
+	H or V Style	Horizontale of verticale stijl
+	Roman Italics	Romeinse cursief
 	Insert Aki Left	Aki links invoegen
 	Insert Aki Right	Aki rechts invoegen
 	Tsume	Tsume
@@ -7208,7 +7210,7 @@ imageTrace	Outline	Contour
 @msg	unexpected resources	onverwachte resources
 @msg	unknown CMYK profile `{name}`	onbekend CMYK-profiel `{name}`
 @msg	unknown File Info field `{k}`	onbekend veld `{k}` van Bestandsinfo
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	onbekende OpenType-functie `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; zet er - voor om uit te schakelen; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom en aalt accepteren het nummer van een alternatief als `tag=N` met N van 0 tot {_1}, zoals `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	onbekende OpenType-functie `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; zet er - voor om uit te schakelen; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom en aalt accepteren het nummer van een alternatief als `tag=N` met N van 0 tot {_1}, zoals `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	onbekende OpenType-functie `{t}` in featureChanges (de tags die `features` accepteert)
 @msg	unknown PDF preset `{name}` (presets: {_1})	onbekende PDF-voorinstelling `{name}` (voorinstellingen: {_1})
 @msg	unknown Warp style	onbekende warpstijl

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

@@ -1525,6 +1525,8 @@ lighting	Light	Światło
 	Leading	Interlinia
 	No Break	Bez podziału
 	Proportional Metrics	Metryka proporcjonalna
+	H or V Style	Styl poziomy lub pionowy
+	Roman Italics	Kursywa łacińska
 	Insert Aki Left	Wstaw aki z lewej
 	Insert Aki Right	Wstaw aki z prawej
 	Tsume	Tsume
@@ -7767,7 +7769,7 @@ breakText	Glyphs	Glify
 @msg	too many arguments	zbyt wiele argumentów
 @msg	too many quantifiers	zbyt wiele kwantyfikatorów
 @msg	turn on at least one side	włącz co najmniej jedną stronę
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	nieznana funkcja OpenType `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefiks - wyłącza funkcję; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom i aalt przyjmują numer wariantu w postaci `tag=N`, gdzie N to liczba od 0 do {_1}, na przykład `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	nieznana funkcja OpenType `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefiks - wyłącza funkcję; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom i aalt przyjmują numer wariantu w postaci `tag=N`, gdzie N to liczba od 0 do {_1}, na przykład `salt=2`)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	nieznane rozpraszanie `{d}` (diffusion, pattern, noise lub none)
 @msg	unknown panel `{panel}`	nieznany panel `{panel}`
 @msg	unknown parameter `{key}`	nieznany parametr `{key}`

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

@@ -2235,6 +2235,8 @@ antiAlias	Sharp	Nítido
 	Proof Setup	Configuração de Prova
 	Properties	Propriedades
 	Proportional Metrics	Métrica Proporcional
+	H or V Style	Estilo Horizontal ou Vertical
+	Roman Italics	Itálico Romano
 	Insert Aki Left	Inserir Aki à Esquerda
 	Insert Aki Right	Inserir Aki à Direita
 	Tsume	Tsume
@@ -9321,7 +9323,7 @@ swatch	Yellow Green	Verde-amarelado
 @msg	unexpected resources	recursos inesperados
 @msg	unknown CMYK profile `{name}`	perfil CMYK desconhecido `{name}`
 @msg	unknown File Info field `{k}`	campo de Informações do Arquivo desconhecido `{k}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	recurso OpenType desconhecido `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefixe com - para desativar; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom e aalt aceitam o número de uma alternativa como `tag=N` com N de 0 a {_1}, como `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	recurso OpenType desconhecido `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefixe com - para desativar; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom e aalt aceitam o número de uma alternativa como `tag=N` com N de 0 a {_1}, como `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	recurso OpenType desconhecido `{t}` em featureChanges (as tags que `features` aceita)
 @msg	unknown PDF preset `{name}` (presets: {_1})	predefinição de PDF desconhecida `{name}` (predefinições: {_1})
 @msg	unknown Warp style	estilo de Deformação desconhecido

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

@@ -2700,6 +2700,8 @@ mark-style	Japanese	Японский
 	Proof Setup	Настройка цветопробы
 	Properties	Свойства
 	Proportional Metrics	Пропорциональные метрики
+	H or V Style	Горизонтальный или вертикальный стиль
+	Roman Italics	Римский курсив
 	Insert Aki Left	Вставить аки слева
 	Insert Aki Right	Вставить аки справа
 	Tsume	Цумэ

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

@@ -2608,6 +2608,8 @@ font-technology	Variable	Variabla
 	Proof Setup	Provtrycksinställningar
 	Properties	Egenskaper
 	Proportional Metrics	Proportionella mått
+	H or V Style	Vågrät eller lodrät stil
+	Roman Italics	Romersk kursiv
 	Insert Aki Left	Infoga aki till vänster
 	Insert Aki Right	Infoga aki till höger
 	Tsume	Tsume

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

@@ -1914,6 +1914,13 @@ fn uk() -> Lang {
     Lang::from_code("uk").expect("uk registered")
 }
 
+/// The Ukrainian Color Library labels use the word for colors (кольорів), not flowers (квітів).
+#[test]
+fn ukrainian_color_library_labels_name_colors() {
+    assert_eq!(uk().catalog().plain("Color Library"), Some("Бібліотека кольорів"));
+    assert_eq!(uk().catalog().plain("Color Library…"), Some("Бібліотека кольорів…"));
+}
+
 /// Every Ukrainian plural has all three forms; exercise different endings through real lookups.
 #[test]
 fn ukrainian_plurals_have_three_forms() {

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

@@ -2455,6 +2455,8 @@ shape	Open	Açık
 	Proof Setup	Prova Kurulumu
 	Properties	Özellikler
 	Proportional Metrics	Orantılı Metrikler
+	H or V Style	Yatay veya Dikey Stil
+	Roman Italics	Roma İtalik
 	Insert Aki Left	Sola Aki Ekle
 	Insert Aki Right	Sağa Aki Ekle
 	Tsume	Tsume
@@ -7120,7 +7122,7 @@ axis	Y Axis	Y ekseni
 @msg	toString is not a function	toString bir işlev değil
 @msg	too many arguments	çok fazla bağımsız değişken
 @msg	too many quantifiers	çok fazla niceleyici
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	bilinmeyen OpenType özelliği `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; kapatmak için başına - koyun; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom ve aalt bir alternatifin numarasını `tag=N` biçiminde alır, N 0 ile {_1} arasındadır, örneğin `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	bilinmeyen OpenType özelliği `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; kapatmak için başına - koyun; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom ve aalt bir alternatifin numarasını `tag=N` biçiminde alır, N 0 ile {_1} arasındadır, örneğin `salt=2`)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	bilinmeyen renk taklidi `{d}` (diffusion, pattern, noise veya none)
 @msg	unknown panel `{panel}`	bilinmeyen panel `{panel}`
 @msg	unknown parameter `{key}`	bilinmeyen parametre `{key}`

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

@@ -541,8 +541,8 @@ font-technology	Variable	Варіативні
 	Color Guide Options	Параметри колірного гіда
 	Color Guide Options…	Параметри колірного гіда…
 	Color images	Кольорові зображення
-	Color Library	Бібліотека квітів
-	Color Library…	Бібліотека квітів…
+	Color Library	Бібліотека кольорів
+	Color Library…	Бібліотека кольорів…
 	Color Management	Керування кольором
 	Color Mixer (Shift-click the chip)	Змішувач кольорів (Shift+клацання на зразку)
 	Color Mode	Колірний режим
@@ -2705,6 +2705,8 @@ mark-style	Japanese	Японський
 	Proof Setup	Налаштування кольоропроби
 	Properties	Властивості
 	Proportional Metrics	Пропорційні метрики
+	H or V Style	Горизонтальний або вертикальний стиль
+	Roman Italics	Римський курсив
 	Insert Aki Left	Вставити акі ліворуч
 	Insert Aki Right	Вставити акі праворуч
 	Tsume	Цуме
@@ -8850,7 +8852,7 @@ breakText	Glyphs	Гліфи
 @msg	unexpected resources	неочікувані ресурси
 @msg	unknown CMYK profile `{name}`	невідомий профіль CMYK `{name}`
 @msg	unknown File Info field `{k}`	невідоме поле відомостей про файл `{k}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	невідома функція OpenType `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; префікс - вимикає функцію; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom і aalt приймають номер альтернативи у вигляді `tag=N`, де N від 0 до {_1}, наприклад `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	невідома функція OpenType `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; префікс - вимикає функцію; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom і aalt приймають номер альтернативи у вигляді `tag=N`, де N від 0 до {_1}, наприклад `salt=2`)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	невідома функція OpenType `{t}` у featureChanges (допустимі теги, які приймає `features`)
 @msg	unknown PDF preset `{name}` (presets: {_1})	невідомий набір PDF `{name}` (набори: {_1})
 @msg	unknown Warp style	невідомий стиль деформації

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

@@ -3017,6 +3017,8 @@ mark-style	Japanese	Kiểu Nhật
 	Proof Setup	Thiết lập thử nghiệm
 	Properties	Thuộc tính
 	Proportional Metrics	Số liệu theo tỷ lệ
+	H or V Style	Kiểu ngang hoặc dọc
+	Roman Italics	Nghiêng Roman
 	Insert Aki Left	Chèn aki bên trái
 	Insert Aki Right	Chèn aki bên phải
 	Tsume	Tsume

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

@@ -2567,6 +2567,8 @@ font-script	Japanese	汉字
 	Proof Setup	校样设置
 	Properties	属性
 	Proportional Metrics	比例度量
+	H or V Style	横排或直排样式
+	Roman Italics	西文斜体
 	Insert Aki Left	在前方插入空白
 	Insert Aki Right	在后方插入空白
 	Tsume	比例间距
@@ -7748,7 +7750,7 @@ breakText	Glyphs	字形
 @msg	too many arguments	参数过多
 @msg	too many quantifiers	量词过多
 @msg	turn on at least one side	请至少打开一条边
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	未知的 OpenType 特性 `{t}` (liga、calt、dlig、smcp、frac、onum、tnum、ordn、swsh、ss01–ss20、salt、titl、pnum、lnum、sups、subs、numr、dnom、aalt；加前缀 - 表示关闭；swsh、ss01–ss20、salt、titl、pnum、lnum、sups、subs、numr、dnom 和 aalt 可用 `tag=N` 指定替代字形的编号，N 为 0 到 {_1}，例如 `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	未知的 OpenType 特性 `{t}` (liga、calt、dlig、smcp、frac、onum、tnum、ordn、swsh、ss01–ss20、salt、titl、pnum、lnum、sups、subs、numr、dnom、aalt、hkna、ital；加前缀 - 表示关闭；swsh、ss01–ss20、salt、titl、pnum、lnum、sups、subs、numr、dnom 和 aalt 可用 `tag=N` 指定替代字形的编号，N 为 0 到 {_1}，例如 `salt=2`)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	未知的仿色 `{d}` (diffusion、pattern、noise 或 none)
 @msg	unknown panel `{panel}`	未知的面板 `{panel}`
 @msg	unknown parameter `{key}`	未知的参数 `{key}`

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

@@ -3787,6 +3787,8 @@ font-script	Japanese	漢字
 	Proof Setup	校樣設定
 	Properties	內容
 	Proportional Metrics	比例度量
+	H or V Style	橫排或直排樣式
+	Roman Italics	羅馬字斜體
 	Insert Aki Left	在前方插入空白
 	Insert Aki Right	在後方插入空白
 	Tsume	比例間距
@@ -7676,7 +7678,7 @@ breakText	Glyphs	字符
 @msg	too many arguments	引數過多
 @msg	too many quantifiers	量詞過多
 @msg	turn on at least one side	請至少開啟一側
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	未知的 OpenType 功能 `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt；加上前置的 - 可關閉；swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom 和 aalt 可用 `tag=N` 指定替代字的編號，N 為 0 到 {_1}，例如 `salt=2`)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`)	未知的 OpenType 功能 `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital；加上前置的 - 可關閉；swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom 和 aalt 可用 `tag=N` 指定替代字的編號，N 為 0 到 {_1}，例如 `salt=2`)
 @msg	unknown dither `{d}` (diffusion, pattern, noise or none)	未知的仿色 `{d}` (diffusion、pattern、noise 或 none)
 @msg	unknown panel `{panel}`	未知的面板 `{panel}`
 @msg	unknown parameter `{key}`	未知的參數 `{key}`

crates/ui-egui/src/menus/run.rs

@@ -845,6 +845,7 @@ fn run_ui_part8(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<Result<
         "ui.navigatorPanelOptions" => crate::panels::navigator::set_options(app, p),
         "ui.layersExpand" => crate::panels::layers::expand(app, p),
         "ui.layersFilter" => crate::panels::layers::set_filter(app, p),
+        "ui.panelView" => crate::panels::set_view(app, p),
         "ui.flattenTransparencyDialog" => {
             crate::dialogs::flatten::open(app);
             Ok(Value::Null)

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

@@ -1008,6 +1008,57 @@ fn expand_appearance_is_an_object_menu_item_only() {
     assert_eq!(paths, [vec!["Object".to_string()]]);
 }
 
+/// Object › Distribute follows Object › Align and lists the Align panel's Distribute Objects and
+/// Distribute Spacing buttons, each item running the button's command: dimmed with nothing
+/// selected, spacing three objects evenly, and with a key object sending the Distribute Spacing value.
+#[test]
+fn object_distribute_runs_the_distribute_buttons() {
+    let object = menu_tree().into_iter().find(|(t, _)| *t == "Object").map(|(_, items)| items).unwrap_or_default();
+    let subs: Vec<&str> = object.iter().filter_map(|it| if let Item::Sub(l, _) = it { Some(*l) } else { None }).collect();
+    let align = subs.iter().position(|l| *l == "Align").unwrap_or_else(|| panic!("Object › Align: {subs:?}"));
+    assert_eq!(subs.get(align + 1), Some(&"Distribute"), "{subs:?}");
+    let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), crate::Services::default());
+    app.run("file.new", json!({"width": 200, "height": 200})).unwrap();
+    let items = |app: &VectorcraftApp| -> Vec<MenuEntry> { menu_entries(app).into_iter().filter(|e| e.path == ["Object", "Distribute"]).collect() };
+    let listed: Vec<(String, Option<String>)> = items(&app).into_iter().map(|e| (e.label, e.command)).collect();
+    let expected: Vec<(String, Option<String>)> = [
+        ("Horizontal Distribute Left", "align.distributeHorizontalLeft"),
+        ("Horizontal Distribute Center", "align.distributeHorizontalCenter"),
+        ("Horizontal Distribute Right", "align.distributeHorizontalRight"),
+        ("Vertical Distribute Top", "align.distributeVerticalTop"),
+        ("Vertical Distribute Center", "align.distributeVerticalCenter"),
+        ("Vertical Distribute Bottom", "align.distributeVerticalBottom"),
+        ("Horizontal Distribute Space", "align.distributeHorizontalSpace"),
+        ("Vertical Distribute Space", "align.distributeVerticalSpace"),
+    ]
+    .into_iter()
+    .map(|(l, id)| (l.to_string(), Some(id.to_string())))
+    .collect();
+    assert_eq!(listed, expected);
+    assert!(items(&app).iter().all(|e| !e.enabled), "nothing selected");
+    let ids: Vec<Value> = [0, 30, 100]
+        .into_iter()
+        .map(|x| app.run("shape.rectangle", json!({"x": x, "y": 10, "width": 10, "height": 10})).unwrap()["id"].clone())
+        .collect();
+    app.run("select.set", json!({"ids": ids})).unwrap();
+    let lefts = |app: &VectorcraftApp| -> Vec<f64> {
+        let doc = &app.session.active().unwrap().doc;
+        ids.iter().map(|id| doc.node(vectorcraft_doc::NodeId(id.as_u64().unwrap())).unwrap().geometric_bounds().unwrap().x0).collect()
+    };
+    let click = |app: &mut VectorcraftApp, label: &str| {
+        let e = items(app).into_iter().find(|e| e.label == label).unwrap_or_else(|| panic!("{label}"));
+        assert!(e.enabled, "{label}");
+        let (id, p) = click_target(&e.label, e.command.as_deref().unwrap_or_default(), &e.params);
+        invoke(app, &id, p);
+    };
+    click(&mut app, "Horizontal Distribute Left");
+    assert_eq!(lefts(&app), [0.0, 50.0, 100.0], "{}", app.ui.status);
+    app.ui.align_spacing = 5.0;
+    app.run("select.key", json!({"id": ids[0]})).unwrap();
+    click(&mut app, "Horizontal Distribute Space");
+    assert_eq!(lefts(&app), [0.0, 15.0, 30.0], "{}", app.ui.status);
+}
+
 /// Isolation keeps the Lock and Hide actions available for selected members.
 #[test]
 fn lock_and_hide_menus_are_enabled_in_isolation_mode() {

crates/ui-egui/src/menus/tree.rs

@@ -165,6 +165,23 @@ pub fn menu_tree_named(english_names: bool) -> Vec<(&'static str, Vec<Item>)> {
                         cp("Vertical Align Bottom", "object.align", json!({"vertical": "bottom"})),
                     ],
                 ),
+                // The Align panel's Distribute Objects and Distribute Spacing buttons: each item runs
+                // what a click on its button runs (`crate::panels::align::run_button`).
+                sub(
+                    "Distribute",
+                    vec![
+                        c("Horizontal Distribute Left", "align.distributeHorizontalLeft"),
+                        c("Horizontal Distribute Center", "align.distributeHorizontalCenter"),
+                        c("Horizontal Distribute Right", "align.distributeHorizontalRight"),
+                        Sep,
+                        c("Vertical Distribute Top", "align.distributeVerticalTop"),
+                        c("Vertical Distribute Center", "align.distributeVerticalCenter"),
+                        c("Vertical Distribute Bottom", "align.distributeVerticalBottom"),
+                        Sep,
+                        c("Horizontal Distribute Space", "align.distributeHorizontalSpace"),
+                        c("Vertical Distribute Space", "align.distributeVerticalSpace"),
+                    ],
+                ),
                 Sep,
                 c("Group", "object.group"),
                 c("Ungroup", "object.ungroup"),

crates/ui-egui/src/menus/ui_commands.rs

@@ -1088,6 +1088,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "",
         "{objects?: [paths|shapes|text|images|effects|groups|linkedFiles|guides], layers?: [locked|hidden]} set the Layers panel's Filter (By Object, By Layer): a row stays when it is of a kind in `objects` and in a state in `layers` (its own lock or eye; an empty list takes every row), or when a row inside it stays; Search All narrows the rows further. A key left out keeps its list. The filter lasts the session and does not change the document, its open rows or the selection → {objects, layers}",
     ),
+    (
+        "ui.panelView",
+        "Set Panel View",
+        "",
+        "{panel: swatches|graphicStyles|symbols, view?} set a panel's view, as the view items of its panel menu do: for swatches smallThumb|mediumThumb (the default)|largeThumb|smallList|largeList, for graphicStyles and symbols thumbnail (the default)|smallList|largeList; without `view`, answer the current one. The view lasts the session and does not change the document; an unknown panel or view is an error and changes nothing → {panel, view}",
+    ),
     (
         "ui.tileEdgeColor",
         "Tile Edge Color…",

crates/ui-egui/src/panels.rs

@@ -514,6 +514,42 @@ pub(crate) fn set_pstate<T: Clone + Send + Sync + 'static>(ctx: &egui::Context,
     ctx.data_mut(|d| d.insert_temp(egui::Id::unique(("panel-state", key)), v));
 }
 
+/// `ui.panelView {panel, view?}`: set the view of the Swatches, Graphic Styles or Symbols panel
+/// (`panel`: swatches, graphicStyles or symbols), as the view items of its panel menu do; without
+/// `view`, answer the current one. An unknown panel or view is an error, and then nothing changes.
+/// → {panel, view}
+pub(crate) fn set_view(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
+    fn given<T: serde::de::DeserializeOwned>(p: &Value, err: &str) -> Result<Option<T>, String> {
+        match p.get("view") {
+            None | Some(Value::Null) => Ok(None),
+            Some(v) => serde_json::from_value(v.clone()).map(Some).map_err(|_| err.to_string()),
+        }
+    }
+    let ui = &mut app.ui;
+    let (panel, view) = match p.get("panel").and_then(Value::as_str) {
+        Some("swatches") => {
+            if let Some(v) = given(p, "`view` is smallThumb, mediumThumb, largeThumb, smallList or largeList")? {
+                ui.swatches_view = v;
+            }
+            ("swatches", json!(ui.swatches_view))
+        }
+        Some("graphicStyles") => {
+            if let Some(v) = given(p, "`view` is thumbnail, smallList or largeList")? {
+                ui.graphic_styles_view = v;
+            }
+            ("graphicStyles", json!(ui.graphic_styles_view))
+        }
+        Some("symbols") => {
+            if let Some(v) = given(p, "`view` is thumbnail, smallList or largeList")? {
+                ui.symbols_view = v;
+            }
+            ("symbols", json!(ui.symbols_view))
+        }
+        _ => return Err("`panel` is swatches, graphicStyles or symbols".to_string()),
+    };
+    Ok(json!({ "panel": panel, "view": view }))
+}
+
 /// Whether the panel whose state is `key` has the keyboard for its rows (Delete and Backspace
 /// remove its highlighted rows): it took it with a click on a row ([`set_row_keys`]) and kept it in
 /// every frame since, so it lapses when the panel isn't drawn.

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

@@ -312,7 +312,7 @@ pub fn default_sets() -> Vec<ActionSet> {
             Action::new("Center on Artboard", vec![step("object.align", json!({"horizontal": "center", "vertical": "center", "to": "artboard"}))]),
             Action::new("Outline Text", vec![step("type.createOutlines", json!({}))]),
             Action::new("Rotate 90° CW", vec![step("object.rotate", json!({"angle": -90}))]),
-            Action::new("Reflect Horizontal", vec![step("object.reflect", json!({"axis": "vertical"}))]),
+            Action::new("Reflect Horizontal", vec![step("object.reflect", json!({"axis": "vertical", "basis": "box"}))]),
         ],
     )]
 }
@@ -2721,6 +2721,28 @@ mod tests {
         }
     }
 
+    /// The built-in Reflect Horizontal reflects a rotated object across its bounding box's own axis,
+    /// as the Reflect dialog does, so the box keeps its angle; a saved step without a basis, recorded
+    /// before Reflect followed the box, still reflects across the page's axis.
+    #[test]
+    fn the_built_in_reflect_follows_the_turned_box() {
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width": 400, "height": 400})).unwrap();
+        let id = vectorcraft_doc::NodeId(
+            app.run("shape.rectangle", json!({"x": 100, "y": 100, "width": 100, "height": 50})).unwrap()["id"].as_u64().unwrap(),
+        );
+        app.run("select.set", json!({"ids": [id.0]})).unwrap();
+        app.run("object.rotate", json!({"angle": 30})).unwrap();
+        let angle = |app: &VectorcraftApp| app.session.active().unwrap().doc.bbox_angle(&[id]);
+        let reflect = default_sets()[0].actions.iter().position(|a| a.name == "Reflect Horizontal").unwrap();
+        app.ui.action_sets = default_sets();
+        play(&mut app, 0, reflect).unwrap();
+        assert!((angle(&app) - 30.0).abs() < 1e-6, "{}", angle(&app));
+        app.ui.action_sets = vec![ActionSet::new("Old", vec![Action::new("Reflect", vec![("object.reflect".into(), json!({"axis": "vertical"}))])])];
+        play(&mut app, 0, 0).unwrap();
+        assert!((angle(&app) + 30.0).abs() < 1e-6, "{}", angle(&app));
+    }
+
     /// An action recorded with a key its command no longer reads still plays, accelerated and one
     /// step at a time, though the same command run by itself is refused.
     #[test]

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

@@ -30,9 +30,10 @@ use crate::menus::Item;
 use crate::theme::Tokens;
 use crate::widgets::{self, PanelDrag, menu_item};
 
-/// The panel's views.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-enum View {
+/// The panel's views (`ui.panelView {panel: "graphicStyles", view}`).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum View {
     #[default]
     Thumbnail,
     SmallList,
@@ -463,7 +464,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     let looks = look_hashes(ui.ctx(), app);
     let shown = Shown { d: &doc, looks: &looks, preview: pstate(ui.ctx(), "gs-preview") };
     let sel = selected(ui.ctx(), &doc);
-    let view: View = pstate(ui.ctx(), "gs-view");
+    let view = app.ui.graphic_styles_view;
     let mut ev = Events::default();
     // In a sized panel the list fills the space above the footer (#2992), as the Artboards list
     // does; elsewhere it keeps its 220 pt.
@@ -605,10 +606,12 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
         app.run("graphicStyle.sortByName", json!({})).ok();
     }
     ui.separator();
-    let view: View = pstate(ui.ctx(), "gs-view");
+    let view = app.ui.graphic_styles_view;
     for (v, label) in View::ALL {
-        if menu_item(ui, tl!(label), true, view == v) {
-            set_pstate(ui.ctx(), "gs-view", v);
+        if menu_item(ui, tl!(label), true, view == v)
+            && let Err(e) = app.run("ui.panelView", json!({ "panel": "graphicStyles", "view": v }))
+        {
+            app.status(e);
         }
     }
     ui.separator();
@@ -865,7 +868,7 @@ mod tests {
             app.session.execute("graphicStyle.new", &json!({"name": format!("Style {i:02}")})).unwrap();
         }
         let ctx = egui::Context::default();
-        set_pstate(&ctx, "gs-view", View::LargeList);
+        app.ui.graphic_styles_view = View::LargeList;
         // The clip rect of the first style's name: the list's visible area.
         let mut list = |bottom: Option<f32>| {
             let mut clip = None;
@@ -891,7 +894,7 @@ mod tests {
         let mut app = app();
         app.session.execute("graphicStyle.new", &json!({"name": "Mine"})).unwrap();
         let ctx = egui::Context::default();
-        set_pstate(&ctx, "gs-view", View::LargeList);
+        app.ui.graphic_styles_view = View::LargeList;
         let texts = frame(&ctx, |ui| {
             show(&mut app, ui);
             menu(&mut app, ui);
@@ -906,7 +909,7 @@ mod tests {
         let unused: Vec<String> = serde_json::from_value(app.session.execute("graphicStyle.unused", &json!({})).unwrap()["names"].clone()).unwrap();
         assert_eq!(unused.len(), 4);
         set_pstate(&ctx, "gs-sel", unused.clone());
-        set_pstate(&ctx, "gs-view", View::SmallList);
+        app.ui.graphic_styles_view = View::SmallList;
         frame(&ctx, |ui| show(&mut app, ui));
         // Delete asks first; OK deletes, and the panel selection follows.
         delete(&mut app, &unused, false);
@@ -967,7 +970,7 @@ mod tests {
 
         // A style dragged onto the top half of the first row lands first (Small List View: rows
         // of 18 points from the top of the list).
-        set_pstate(&ctx, "gs-view", View::SmallList);
+        app.ui.graphic_styles_view = View::SmallList;
         frame(&ctx, |ui| show(&mut app, ui));
         let release = |at: egui::Pos2| {
             let up = egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed: false, modifiers: Default::default() };
@@ -992,7 +995,7 @@ mod tests {
         let n = names(&app);
         assert_eq!(n.len(), 5);
         let ctx = egui::Context::default();
-        set_pstate(&ctx, "gs-view", View::SmallList);
+        app.ui.graphic_styles_view = View::SmallList;
         frame(&ctx, |ui| show(&mut app, ui));
         // A click on row `i` (Small List View: rows of 18 points, 3 apart) with `modifiers` held,
         // a second after the last one so that two clicks on a row are not a double-click.

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

@@ -1,6 +1,7 @@
 //! OpenType panel: per-character OpenType features (ligatures, alternates, swashes, small caps,
-//! ordinals, fractions, figure style, position) for the selected text (every frame of each
-//! selected threaded story) or the Type tool's selected characters.
+//! ordinals, fractions, figure style, position, and with the East Asian options the menu's H or V
+//! Style and Roman Italics) for the selected text (every frame of each selected threaded story) or
+//! the Type tool's selected characters.
 
 use egui::Ui;
 use serde_json::json;
@@ -117,10 +118,42 @@ fn shown_figure(app: &VectorcraftApp) -> Option<usize> {
     shared(app, |s| figure(&OtFeatures::from_tags(s.features.iter().map(String::as_str))))
 }
 
-/// Whether `flag` is on for every character the panel acts on (`Some(true)`), for none of them
-/// (`Some(false)`), or only for some (`None`).
+/// Whether `flag` is on for every character a toggle changes (`Some(true)`), for none of them
+/// (`Some(false)`), or only for some (`None`). At a Type tool caret, and after Select All in a
+/// threaded story, the command styles all the text ([`run_features`]), so every character of it
+/// counts, as in [`edit`].
 fn shown_flag(app: &VectorcraftApp, flag: Flag) -> Option<bool> {
-    shared(app, |s| flag.get(&OtFeatures::from_tags(s.features.iter().map(String::as_str))))
+    let on = |s: &CharStyle| flag.get(&OtFeatures::from_tags(s.features.iter().map(String::as_str)));
+    if let Some(mut runs) = whole_text_runs(app) {
+        // A run with no text, such as an empty frame's, counts only when no run has text.
+        if runs.iter().any(|r| !r.text.is_empty()) {
+            runs.retain(|r| !r.text.is_empty());
+        }
+        let Some(first) = runs.first() else {
+            return shared(app, on);
+        };
+        let v = on(&first.style);
+        return runs.iter().all(|r| on(&r.style) == v).then_some(v);
+    }
+    shared(app, on)
+}
+
+/// The runs the panel's commands style as a whole while the Type tool edits text: those of every
+/// frame of the story after Select All in threaded text, else at a caret (an empty selection)
+/// those of the text object. `None` for a range in one text object, or with no Type tool editing.
+fn whole_text_runs(app: &VectorcraftApp) -> Option<Vec<&vectorcraft_doc::TextRun>> {
+    let (id, a, b) = text_editing(app)?;
+    let st = app.session.active()?;
+    let ids = match super::character::text_story(app) {
+        Some(story) => story,
+        None if b <= a => vec![id],
+        None => return None,
+    };
+    let runs = ids.into_iter().filter_map(|id| match &st.doc.node(id)?.kind {
+        NodeKind::Text(t) => Some(t.runs.iter()),
+        _ => None,
+    });
+    Some(runs.flatten().collect())
 }
 
 /// The Figure menu's text for entry `shown`: Mixed when the characters differ.
@@ -150,8 +183,9 @@ impl Change {
 }
 
 /// Make `change` to the features of each character the panel acts on, from the character's own
-/// features (`featureChanges`), unless it changes none of them. At a Type tool caret the
-/// command styles all the text, so every character of the text is checked.
+/// features (`featureChanges`), unless it changes none of them. At a Type tool caret, and after
+/// Select All in a threaded story, the command styles all the text, so every character of it is
+/// checked ([`whole_text_runs`]).
 fn edit(app: &mut VectorcraftApp, change: Change) {
     let same = |s: &CharStyle| {
         let before = OtFeatures::from_tags(s.features.iter().map(String::as_str));
@@ -159,12 +193,9 @@ fn edit(app: &mut VectorcraftApp, change: Change) {
         change.apply(&mut after);
         after == before
     };
-    let unchanged = match text_editing(app) {
-        Some((id, a, b)) if b <= a => match app.session.active().and_then(|st| st.doc.node(id)).map(|n| &n.kind) {
-            Some(NodeKind::Text(t)) => Some(t.runs.iter().all(|r| same(&r.style))),
-            _ => None,
-        },
-        _ => shared(app, same),
+    let unchanged = match whole_text_runs(app) {
+        Some(runs) => Some(runs.iter().all(|r| same(&r.style))),
+        None => shared(app, same),
     };
     if unchanged != Some(true) {
         run_features(app, "featureChanges", OtFeatures::changes(|f| change.apply(f)));
@@ -304,10 +335,29 @@ fn rows() -> [Toggle; 9] {
     ]
 }
 
+/// The panel menu's East Asian items, with Show East Asian Options: label and the feature each
+/// turns on and off. H or V Style sets kana in the forms the font draws for the writing direction
+/// (`hkna`, shaped as `vkna` in vertical type), and Roman Italics sets half-width alphanumerics
+/// in the font's italic forms (`ital`).
+fn east_asian_items() -> [Toggle; 2] {
+    [(tl!("H or V Style"), Flag::Extra("hkna")), (tl!("Roman Italics"), Flag::Extra("ital"))]
+}
+
 pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
-    if menu_item(ui, tl!("Reset OpenType Features"), text_style(app).is_some(), false) {
+    let has = text_style(app).is_some();
+    if menu_item(ui, tl!("Reset OpenType Features"), has, false) {
         set(app, OtFeatures::default());
     }
+    if app.session.prefs.show_east_asian_options {
+        ui.separator();
+        // Checked when every character it changes has it; chosen then, it turns it off.
+        for (label, flag) in east_asian_items() {
+            let on = shown_flag(app, flag) == Some(true);
+            if menu_item(ui, label, has, on) {
+                edit(app, Change::Toggle(flag, !on));
+            }
+        }
+    }
 }
 
 #[cfg(test)]
@@ -715,4 +765,127 @@ mod tests {
         edit(&mut app, Change::Position(4));
         assert_eq!(undo_steps(&app), undo + 1);
     }
+
+    /// H or V Style and Roman Italics are in the panel menu with the East Asian options only.
+    #[test]
+    fn kana_style_and_roman_italics_show_with_the_east_asian_options() {
+        let mut app = selected_text();
+        let shown = |app: &mut VectorcraftApp| {
+            let text = crate::tests_labels::painted_text(app, menu);
+            (text.contains("H or V Style"), text.contains("Roman Italics"))
+        };
+        assert_eq!(shown(&mut app), (false, false));
+        app.session.prefs.show_east_asian_options = true;
+        assert_eq!(shown(&mut app), (true, true));
+    }
+
+    /// With the Type tool's characters only partly set, H or V Style and Roman Italics show
+    /// unchecked; chosen, each turns its feature on for every selected character in one undo step,
+    /// each run keeping its other features, and shows checked; chosen again, it turns it off.
+    /// Reset OpenType Features clears both.
+    #[test]
+    fn kana_style_and_roman_italics_turn_on_and_off() {
+        for (label, tag) in [("H or V Style", "hkna"), ("Roman Italics", "ital")] {
+            let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+            app.session.prefs.show_east_asian_options = true;
+            app.session.execute("file.new", &json!({"width": 300, "height": 200})).unwrap();
+            app.session.select_tool("type", Default::default()).unwrap();
+            let id = app.session.execute("text.create", &json!({"x": 10, "y": 40, "text": "かなAB"})).unwrap()["id"].clone();
+            app.session.execute("text.setRangeStyle", &json!({"id": id, "start": 0, "end": 3, "features": [tag, "smcp"]})).unwrap();
+            app.session.apply_actions(vec![vectorcraft_tools::Action::Notify("text.editNew".into())]).unwrap();
+            // "かなAB" is 8 bytes.
+            app.session.set_tool_option("select", &json!({"start": 0, "end": 8}));
+            let ctx = egui::Context::default();
+            let row = |app: &mut VectorcraftApp, label: &str| {
+                let texts = super::super::tests_appearance::frame_events(&ctx, app, vec![], menu);
+                texts.into_iter().find(|(t, _)| t.trim_start_matches(['✓', ' ']) == label).unwrap_or_else(|| panic!("{label} missing"))
+            };
+            let has = |runs: &[(String, Value)], t: &str| runs.iter().all(|(_, f)| f.as_array().is_some_and(|f| f.iter().any(|x| x == t)));
+            let (text, at) = row(&mut app, label);
+            assert!(!text.starts_with('✓'), "{label}: {text:?}");
+            let undo = undo_steps(&app);
+            super::super::tests_appearance::click(&ctx, &mut app, at.center(), menu);
+            assert_eq!(undo_steps(&app), undo + 1, "{label}");
+            let runs = run_features(&mut app, &id, 8);
+            assert!(has(&runs, tag), "{label}: {runs:?}");
+            assert!(has(&runs[..1], "smcp") && runs[0].0 == "か", "{label} keeps the other features: {runs:?}");
+            let (text, at) = row(&mut app, label);
+            assert!(text.starts_with('✓'), "{label}: {text:?}");
+            super::super::tests_appearance::click(&ctx, &mut app, at.center(), menu);
+            assert_eq!(run_features(&mut app, &id, 8), [("か".to_string(), json!(["smcp"])), ("なAB".to_string(), Value::Null)], "{label} off");
+            app.session.execute("text.setRangeStyle", &json!({"id": id, "features": ["hkna", "ital", "dlig"]})).unwrap();
+            let at = row(&mut app, "Reset OpenType Features").1;
+            super::super::tests_appearance::click(&ctx, &mut app, at.center(), menu);
+            assert_eq!(run_features(&mut app, &id, 8), [("かなAB".to_string(), Value::Null)], "{label}: reset");
+        }
+    }
+
+    /// At a Type tool caret after a character that has H or V Style or Roman Italics while the
+    /// rest of the text does not, the item and the checkbox rows read every character the command
+    /// styles at a caret (all of them): the item shows unchecked, a Small Caps row set the same way
+    /// shows a dash, and choosing the item turns its feature on for the whole text.
+    #[test]
+    fn caret_items_read_every_character_they_change() {
+        for (label, tag) in [("H or V Style", "hkna"), ("Roman Italics", "ital")] {
+            let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+            app.session.prefs.show_east_asian_options = true;
+            app.session.execute("file.new", &json!({"width": 300, "height": 200})).unwrap();
+            app.session.select_tool("type", Default::default()).unwrap();
+            let id = app.session.execute("text.create", &json!({"x": 10, "y": 40, "text": "かなAB"})).unwrap()["id"].clone();
+            app.session.execute("text.setRangeStyle", &json!({"id": id, "start": 0, "end": 3, "features": [tag, "smcp"]})).unwrap();
+            app.session.apply_actions(vec![vectorcraft_tools::Action::Notify("text.editNew".into())]).unwrap();
+            // The caret after "か", whose style the next typed character takes.
+            app.session.set_tool_option("select", &json!({"start": 3, "end": 3}));
+            assert_eq!(text_editing(&app).map(|(_, a, b)| (a, b)), Some((3, 3)));
+            assert_eq!(shown_flag(&app, Flag::Field(|f| &mut f.small_caps)), None, "{label}: Small Caps row");
+            let ctx = egui::Context::default();
+            let texts = super::super::tests_appearance::frame_events(&ctx, &mut app, vec![], menu);
+            let Some((text, at)) = texts.into_iter().find(|(t, _)| t.trim_start_matches(['✓', ' ']) == label) else { panic!("{label} missing") };
+            assert!(!text.starts_with('✓'), "{label}: {text:?}");
+            super::super::tests_appearance::click(&ctx, &mut app, at.center(), menu);
+            let runs = run_features(&mut app, &id, 8);
+            assert!(runs.iter().all(|(_, f)| f.as_array().is_some_and(|f| f.iter().any(|x| x == tag))), "{label}: {runs:?}");
+        }
+    }
+
+    /// After Select All in a threaded story whose edited frame is empty, the item reads the text
+    /// of every frame the command styles: with the story's text set with H or V Style or Roman
+    /// Italics it shows checked, and choosing it turns the feature off for that text.
+    #[test]
+    fn select_all_from_an_empty_frame_reads_the_whole_story() {
+        for (label, tag) in [("H or V Style", "hkna"), ("Roman Italics", "ital")] {
+            let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+            app.session.prefs.show_east_asian_options = true;
+            app.run("file.new", json!({"width": 600, "height": 300})).unwrap();
+            let story = "The quick brown fox jumps over the lazy dog and keeps running far beyond the first frame. ".repeat(4);
+            let area = json!({"x": 10, "y": 10, "text": story, "size": 12, "area": {"width": 150, "height": 60}});
+            let a = app.run("text.create", area).unwrap()["id"].as_u64().unwrap();
+            let b = app.run("shape.rectangle", json!({"x": 200, "y": 10, "width": 150, "height": 200})).unwrap()["id"].as_u64().unwrap();
+            app.run("select.set", json!({"ids": [a, b]})).unwrap();
+            app.run("text.thread.create", json!({})).unwrap();
+            app.session.select_tool("type", Default::default()).unwrap();
+            app.session.set_tool_option("textSelection", &json!({"editing": a, "anchor": 0, "caret": 0}));
+            app.run("select.all", json!({})).unwrap();
+            // A frame threaded in before the first takes the whole text, leaving the edited frame empty.
+            let c = app.run("text.thread.add", json!({"from": a, "before": true, "rect": [700, 10, 400, 600]})).unwrap()["id"].as_u64().unwrap();
+            app.run("text.setRangeStyle", json!({"id": c, "features": [tag]})).unwrap();
+            assert_eq!(text_editing(&app).map(|(id, a, b)| (id.0, a, b)), Some((a, 0, 0)), "{label}");
+            assert_eq!(super::super::character::text_story(&app).map(|frames| frames.len()), Some(3), "{label}");
+            // The empty frames' runs, which hold no character, without the feature.
+            for id in [a, b] {
+                let doc = std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc);
+                let Some(NodeKind::Text(t)) = doc.node_mut(NodeId(id)).map(|n| &mut n.kind) else { panic!("no frame {id}") };
+                for r in &mut t.runs {
+                    r.style.features.clear();
+                }
+            }
+            let ctx = egui::Context::default();
+            let texts = super::super::tests_appearance::frame_events(&ctx, &mut app, vec![], menu);
+            let Some((text, at)) = texts.into_iter().find(|(t, _)| t.trim_start_matches(['✓', ' ']) == label) else { panic!("{label} missing") };
+            assert!(text.starts_with('✓'), "{label}: {text:?}");
+            super::super::tests_appearance::click(&ctx, &mut app, at.center(), menu);
+            let runs = run_features(&mut app, &json!(c), story.len());
+            assert!(runs.iter().all(|(_, f)| !f.as_array().is_some_and(|f| f.iter().any(|x| x == tag))), "{label}: {runs:?}");
+        }
+    }
 }

crates/ui-egui/src/panels/swatches/actions.rs

@@ -121,7 +121,7 @@ pub(super) fn new_swatch(app: &mut VectorcraftApp, sel: &[String], m: egui::Modi
 }
 
 pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
-    let view: View = pstate(ui.ctx(), "swatch-view");
+    let view = app.ui.swatches_view;
     let selected = selection(app, ui);
     let del = deletable(&selected);
     let opts = editable(app, &selected);
@@ -174,7 +174,7 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
     ui.separator();
     for (v, label) in View::ALL {
         if menu_item(ui, label, true, v == view) {
-            set_pstate(ui.ctx(), "swatch-view", v);
+            app.run("ui.panelView", json!({ "panel": "swatches", "view": v })).ok();
         }
     }
     ui.separator();

crates/ui-egui/src/panels/swatches/body.rs

@@ -16,17 +16,21 @@ pub(super) fn body(app: &mut VectorcraftApp, ui: &mut Ui, salt: &'static str) {
         crate::panels::empty_state(ui, "swatch-book", tl!("No document"), tl!("Open a document to see its swatches."));
         return;
     }
-    let view: View = pstate(ui.ctx(), "swatch-view");
+    let view = app.ui.swatches_view;
     let kind: Kind = pstate(ui.ctx(), "swatch-kind");
     // Top row: proxy at left, list / grid view toggles at right.
     ui.horizontal(|ui| {
         crate::panels::proxy(app, ui, 34.0);
         ui.add_space(ui.available_width() - 58.0);
+        let mut to = None;
         if widgets::icon_button(ui, "dc-list-view", tl!("Show List View"), view.is_list(), 26.0).clicked() {
-            set_pstate(ui.ctx(), "swatch-view", View::SmallList);
+            to = Some(View::SmallList);
         }
         if widgets::icon_button(ui, "dc-grid-view", tl!("Show Thumbnail View"), !view.is_list(), 26.0).clicked() {
-            set_pstate(ui.ctx(), "swatch-view", View::MediumThumb);
+            to = Some(View::MediumThumb);
+        }
+        if let Some(v) = to {
+            app.run("ui.panelView", json!({ "panel": "swatches", "view": v })).ok();
         }
     });
     ui.add_space(4.0);

crates/ui-egui/src/panels/swatches/tests.rs

@@ -489,7 +489,7 @@ fn find_field_filters_and_shift_extends_over_what_is_shown() {
 fn list_view_rows_take_double_clicks_and_folder_clicks_select_the_group() {
     let mut app = app();
     let ctx = context();
-    set_pstate(&ctx, "swatch-view", View::SmallList);
+    app.ui.swatches_view = View::SmallList;
     double_click_tile(&mut app, &ctx, "Red");
     assert_eq!(app.ui.dialog.as_ref().map(|d| d.kind.as_str()), Some(KIND), "double-click in a list opens Swatch Options");
     let d = &app.session.active().unwrap().doc;
@@ -1013,7 +1013,7 @@ fn the_list_fills_a_tall_panel_above_its_footer() {
         app.run("swatch.new", json!({"name": format!("Tone {i:02}"), "color": format!("#{:02x}3060", i * 4)})).unwrap();
     }
     let ctx = context();
-    set_pstate(&ctx, "swatch-view", View::SmallList);
+    app.ui.swatches_view = View::SmallList;
     // The clip rect of the first swatch row's name: the list's visible area.
     let mut list = |bottom: Option<f32>| {
         let mut clip = None;

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

@@ -286,7 +286,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     let t = Tokens::get(ui.ctx());
     let Some((doc, keys)) = app.session.active().map(|d| (d.doc.clone(), document_symbols(d))) else { return };
     let names: Vec<String> = doc.symbols.iter().map(|s| s.name.clone()).collect();
-    let view: View = pstate(ui.ctx(), VIEW);
+    let view = app.ui.symbols_view;
     let sel = current(app);
     let uid = app.session.active().map(|d| d.uid);
     let marked = marked(ui.ctx(), uid, &names);
@@ -458,10 +458,12 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
         app.status(e);
     }
     ui.separator();
-    let view: View = pstate(ui.ctx(), VIEW);
+    let view = app.ui.symbols_view;
     for (v, label) in View::ALL {
-        if menu_item(ui, tl!(label), true, view == v) {
-            set_pstate(ui.ctx(), VIEW, v);
+        if menu_item(ui, tl!(label), true, view == v)
+            && let Err(e) = app.run("ui.panelView", json!({ "panel": "symbols", "view": v }))
+        {
+            app.status(e);
         }
     }
     ui.separator();
@@ -475,13 +477,11 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) {
 /// The panel state key of the symbols Select All Unused picked.
 const MARKED: &str = "sym-unused";
 
-/// The panel state key of the panel's [`View`].
-const VIEW: &str = "sym-view";
-
 /// The panel's views: Thumbnail View (the default) and the Small and Large List Views, whose rows
-/// show each symbol's thumbnail and name.
-#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
-enum View {
+/// show each symbol's thumbnail and name (`ui.panelView {panel: "symbols", view}`).
+#[derive(Clone, Copy, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub enum View {
     #[default]
     Thumbnail,
     SmallList,
@@ -1170,7 +1170,7 @@ mod tests {
         // Large List View: the row named Dot.
         let ctx = egui::Context::default();
         crate::theme::install_fonts(&ctx);
-        set_pstate(&ctx, VIEW, View::LargeList);
+        app.ui.symbols_view = View::LargeList;
         let raw = egui::RawInput { screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(236.0, 400.0))), ..Default::default() };
         let mut out = ctx.run_ui(raw, |ui| show(&mut app, ui));
         out.textures_delta.clear();
@@ -1238,7 +1238,6 @@ mod tests {
             assert_eq!((editing(&app), current(&mut app)), (None, Some("Cat".into())), "{view}");
             let ctx2 = egui::Context::default();
             crate::theme::install_fonts(&ctx2);
-            set_pstate(&ctx2, VIEW, pstate::<View>(&ctx, VIEW));
             frame(&ctx2, &mut app, vec![]);
             frame(&ctx2, &mut app, double_click(row));
             assert_eq!(editing(&app).as_deref(), Some("Cat"), "{view}");
@@ -1253,6 +1252,49 @@ mod tests {
         assert_eq!(app.session.active().unwrap().history.undo.len(), undo);
     }
 
+    /// `ui.panelView` sets the Symbols, Graphic Styles and Swatches panels' views as the view items
+    /// of their panel menus do, and answers the current view without `view`. An unknown panel or
+    /// view, or a view of another panel, is an error and changes nothing.
+    #[test]
+    fn panel_view_sets_the_view_of_each_panel() {
+        use super::super::{graphic_styles, swatches};
+        let mut app = VectorcraftApp::new(Session::new(), Default::default());
+        app.run("file.new", json!({"width": 300, "height": 100})).unwrap();
+        let ctx = egui::Context::default();
+        crate::theme::install_fonts(&ctx);
+        for (i, name) in ["ant", "bee"].into_iter().enumerate() {
+            app.run("shape.rectangle", json!({"x": 10.0 + 40.0 * i as f64, "y": 10, "width": 30, "height": 20})).unwrap();
+            app.run("symbol.new", json!({"name": name})).unwrap();
+        }
+        let views = |checked: &str| ["Thumbnail View", "Small List View", "Large List View"].map(|v| (v.to_string(), v == checked)).to_vec();
+        assert_eq!(app.run("ui.panelView", json!({"panel": "symbols"})).unwrap(), json!({"panel": "symbols", "view": "thumbnail"}));
+        assert!(panel_labels(&ctx, &mut app, &["ant", "bee"]).is_empty(), "the thumbnails draw no names");
+        let r = app.run("ui.panelView", json!({"panel": "symbols", "view": "largeList"})).unwrap();
+        assert_eq!(r, json!({"panel": "symbols", "view": "largeList"}));
+        assert_eq!(view_items(&ctx, &mut app), views("Large List View"), "the panel menu checks it");
+        let names: Vec<String> = panel_labels(&ctx, &mut app, &["ant", "bee"]).into_iter().map(|(t, _)| t).collect();
+        assert_eq!(names, ["ant", "bee"], "the list names the symbols");
+        click_menu(&ctx, &mut app, "Small List View");
+        assert_eq!(app.run("ui.panelView", json!({"panel": "symbols"})).unwrap()["view"], "smallList", "the menu item sets it too");
+        for bad in [
+            json!({"panel": "symbols", "view": "mediumThumb"}),
+            json!({"panel": "symbols", "view": 3}),
+            json!({"panel": "brushes", "view": "smallList"}),
+            json!({"view": "largeList"}),
+        ] {
+            assert!(app.run("ui.panelView", bad.clone()).is_err(), "{bad}");
+        }
+        assert_eq!(app.ui.symbols_view, View::SmallList, "unchanged");
+        let r = app.run("ui.panelView", json!({"panel": "graphicStyles", "view": "largeList"})).unwrap();
+        assert_eq!(r, json!({"panel": "graphicStyles", "view": "largeList"}));
+        assert_eq!(app.ui.graphic_styles_view, graphic_styles::View::LargeList);
+        assert_eq!(app.run("ui.panelView", json!({"panel": "swatches"})).unwrap()["view"], "mediumThumb");
+        app.run("ui.panelView", json!({"panel": "swatches", "view": "largeThumb"})).unwrap();
+        assert!(app.run("ui.panelView", json!({"panel": "swatches", "view": "thumbnail"})).is_err());
+        assert_eq!(app.ui.swatches_view, swatches::View::LargeThumb, "unchanged by the error");
+        assert_eq!(app.ui.symbols_view, View::SmallList, "each panel keeps its own view");
+    }
+
     /// The panel menu's Edit Symbol edits the selected instance's symbol, and with no instance
     /// selected the symbol current in the panel.
     #[test]
@@ -1724,7 +1766,7 @@ mod tests {
         assert!(!symbols(h.state_mut()).contains(&"B".to_string()));
 
         // Also test list view
-        set_pstate(&h.ctx, VIEW, View::SmallList);
+        h.state_mut().ui.symbols_view = View::SmallList;
         h.run_steps(2);
         let node_a = h.get_by_label("A");
         let pos_a = node_a.rect().center();

crates/ui-egui/src/state.rs

@@ -838,6 +838,14 @@ pub struct UiState {
     /// Search All text does.
     #[serde(skip)]
     pub layers_filter: crate::panels::layers::Filter,
+    /// The Swatches, Graphic Styles and Symbols panels' views, chosen in their panel menus
+    /// (`ui.panelView`). They are not saved and last the session.
+    #[serde(skip)]
+    pub swatches_view: crate::panels::swatches::View,
+    #[serde(skip)]
+    pub graphic_styles_view: crate::panels::graphic_styles::View,
+    #[serde(skip)]
+    pub symbols_view: crate::panels::symbols::View,
     /// The Image Trace panel's Advanced section is open (as it was last left).
     #[serde(default = "yes")]
     pub image_trace_advanced: bool,
@@ -1242,6 +1250,9 @@ impl Default for UiState {
             layers_panel: Default::default(),
             navigator_panel: Default::default(),
             layers_filter: Default::default(),
+            swatches_view: Default::default(),
+            graphic_styles_view: Default::default(),
+            symbols_view: Default::default(),
             image_trace_advanced: true,
             image_trace_preview: true,
             glyphs_preview: 0,

docs/control-protocol.md

@@ -102,7 +102,7 @@ the two can still win that race.
 | `ui.click` / `ui.drag` | `{x, y, button?, count?, shift?, alt?, ctrl?, cmd?}` / `{x, y, toX, toY, steps?, count?, button?, shift?, alt?, ctrl?, cmd?}` | egui pointer input; see synthetic input budgets above |
 | `ui.wheel` | `{x, y, dy?, dx?, unit?: "line"\|"point", shift?, alt?, cmd?}` | a mouse wheel turn over screen point (x, y): `dy` notches up (+) or down, `dx` sideways. Over the canvas the wheel scrolls, Cmd-wheel (Ctrl on Windows and Linux) scrolls sideways and Alt-wheel (Option on the Mac) zooms about the pointer (with the `ctrlWheelScrollsSideways` preference off, Cmd-wheel zooms too); with the `zoomWithMouseWheel` preference the wheel and Alt-wheel zoom about the pointer, Shift-wheel scrolls up and down and Cmd-wheel (Ctrl on Windows and Linux) sideways. Over a focused numeric field (click it first) each notch steps its value as Up/Down do (Shift: ten, Cmd/Ctrl: a tenth) and the panel stays put; over anything else in a panel the wheel scrolls it. Over the canvas, the wheel preferences in `docs/mcp.md` change what these keys do |
 | `ui.set` | `{brightness?, panel?, rulers?, outline?, grid?, smartGuides?, boundingBox?, controlBar?, imageTracePreview?}` | `outline`: View › Outline for the active document only (each document has its own, a document opens in Preview, and `ui.inspect` shows it as `view.outline`; an error without a document). `imageTracePreview`: the Image Trace panel's Preview (`ui.inspect` shows it as `ui.image_trace_preview`) |
-| `ui.dialog.set` / `.confirm` / `.cancel` | `{field, value, action?}` or `{fields: [{field, value}…], action?}` | fill and submit the open dialog. `ui.dialog.set` takes the fields the dialog has (`ui.inspect`) other than its `__` fields, the `__` fields that are controls of the dialog (such as `__section` and `__allArtboards` in Save PDF, `__constrain` in Transform Each and the shape dialogs, and `__search` and `__category` in Preferences; Save PDF's and Print's `__savePresetAs`, the preset name, only while Save Preset… asks for it, since OK then saves a preset), `discard` on a dialog with a discard button, `preview` on one with a live preview, the fields that the dialog reads but adds only when a control changes (such as `searchFolder`, or `copy` in the Transform dialogs), and the fields it passes to the command it runs: every parameter of the `command` dialog's command (`ui.paramDialog`), and the `textureImage` that Load Texture… sets in the Glass and Texturizer effects; any other field is an error that lists the dialog's fields, and the dialog stays as it was. Any other `__` field, held or not, holds what the dialog's OK acts on (such as the `__command` and `__params` of a `confirm` or `command` dialog) or the dialog's own state: setting it is the error "the `<kind>` dialog cannot set protected field `<field>`", and the dialog stays as it was. `fields` sets the list (at most 256 items) in order (a missing `value` is `null`) and checks every item first: when one is refused, the call is an error and no field changes. `action: "confirm"` or `"cancel"` on `ui.dialog.set` then confirms or cancels the same dialog in the same request, as `ui.dialog.confirm` and `ui.dialog.cancel` do, and the reply is `{dialog, result}`: the dialog after the fields were set and the reply to confirm (`null` for cancel); any other `action` is an error and no field changes |
+| `ui.dialog.set` / `.confirm` / `.cancel` | `{field, value, action?}` or `{fields: [{field, value}…], action?}` | fill and submit the open dialog. `ui.dialog.set` takes the fields the dialog has (`ui.inspect`) other than its `__` fields, the `__` fields that are controls of the dialog (such as `__section` and `__allArtboards` in Save PDF, `__constrain` in Transform Each and the shape dialogs, and `__search` and `__category` in Preferences; Save PDF's and Print's `__savePresetAs`, the preset name, only while Save Preset… asks for it, since OK then saves a preset), `discard` on a dialog with a discard button, `preview` on one with a live preview, the fields that the dialog reads but adds only when a control changes (such as `searchFolder`, or `copy` in the Transform dialogs), and the fields it passes to the command it runs: every parameter of the `command` dialog's command (`ui.paramDialog`), and the `textureImage` that Load Texture… sets in the Glass, Texturizer and Rough Pastels effects; any other field is an error that lists the dialog's fields, and the dialog stays as it was. Any other `__` field, held or not, holds what the dialog's OK acts on (such as the `__command` and `__params` of a `confirm` or `command` dialog) or the dialog's own state: setting it is the error "the `<kind>` dialog cannot set protected field `<field>`", and the dialog stays as it was. `fields` sets the list (at most 256 items) in order (a missing `value` is `null`) and checks every item first: when one is refused, the call is an error and no field changes. `action: "confirm"` or `"cancel"` on `ui.dialog.set` then confirms or cancels the same dialog in the same request, as `ui.dialog.confirm` and `ui.dialog.cancel` do, and the reply is `{dialog, result}`: the dialog after the fields were set and the reply to confirm (`null` for cancel); any other `action` is an error and no field changes |
 | `ui.screenshot` | `{path?, data?}` | capture the window (PNG), written to `path`; `data: true` sends it back as `pngBase64` too. The inline PNG is capped at 64 MiB: with a `path` the file is still written and `pngBase64` is omitted when the image is larger, while a path-less `data: true` request fails if either the raw RGBA image or the encoded PNG exceeds the cap. Needs a presented frame: with the screen locked or the window minimized/covered it fails after ~8 s with an explanatory error |
 | `ui.render` | `{path?, scale?, artboard?, data?, traceViews?}` | render an artboard headlessly (PNG with the pixels of `app.export {format: "png", background: "white"}` at the same scale; `artboard`: its 0-based index, default the first; `traceViews: true`: Image Trace objects draw in their View, as on the canvas, instead of their tracing result): written to `path`, else (or with `data: true` as well) sent back as `pngBase64` |
 | `ui.render` | `{path?, scale?, artboard?, data?}` | render an artboard headlessly (PNG with the pixels of `app.export {format: "png", background: "white"}` at the same scale; `artboard`: its 0-based index, default the first): written to `path`, else (or with `data: true` as well) sent back as `pngBase64` |