From fafd06c9594d1592edf4a6f1e537190e180cf9cb Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Thu, 12 Nov 2026 22:48:57 -0800
Subject: [PATCH 01/48] Recolor Artwork: the Prominent Colors bar weighs the
 art's colors

With art selected, the Edit tab shows a Prominent Colors bar under the
wheel: a part for each row in its new color, as wide as the row's share
of the art, the largest first. Dragging the edge between two parts moves
width from one to the other; when the drag ends, the rows' current
colors move toward the new widths and the art previews the result. OK
keeps the recolor as one undo step.

- recolor.weigh {map, weights?, ids?} returns each row's share of the
  uses of the art's colors and, with weights, the rows with their
  current colors moved: one color at a time between rows that have a
  new color, while a move brings the shares nearer the weights, the
  color nearest in Lab to the row it goes to first. A row keeps its
  first color, the tints of one global swatch move together, colors
  that stay keep their order, and the command changes nothing. A use
  counts for the row recolor.apply recolors it with, and the work is
  bounded at 50,000,000 color-by-row comparisons.
- The New Color Group menu beside the link button has Save All Colors
  (the new colors in row order) and Save Prominent Colors (the bar's
  colors in its order); each saves a color group as its own undo step.
- The dialog's weights field drives the bar from ui.dialog.set. A new
  Colors count drops it.
---
 crates/color/src/recolor.rs                   | 157 ++++++++
 crates/engine/src/cmd/plugin_call/reviewed.rs |   1 +
 crates/engine/src/cmd/recolor.rs              | 154 +++++++-
 crates/engine/src/tests/recolor.rs            | 121 ++++++
 crates/ui-egui/src/dialogs/recolor.rs         | 357 ++++++++++++++++--
 crates/ui-egui/src/i18n/bg.tsv                |   3 +
 crates/ui-egui/src/i18n/bs.tsv                |   3 +
 crates/ui-egui/src/i18n/ca.tsv                |   3 +
 crates/ui-egui/src/i18n/cs.tsv                |   3 +
 crates/ui-egui/src/i18n/da.tsv                |   3 +
 crates/ui-egui/src/i18n/de.tsv                |   3 +
 crates/ui-egui/src/i18n/el.tsv                |   3 +
 crates/ui-egui/src/i18n/es.tsv                |   3 +
 crates/ui-egui/src/i18n/fi.tsv                |   3 +
 crates/ui-egui/src/i18n/fr.tsv                |   3 +
 crates/ui-egui/src/i18n/hi.tsv                |   3 +
 crates/ui-egui/src/i18n/hu.tsv                |   3 +
 crates/ui-egui/src/i18n/id.tsv                |   3 +
 crates/ui-egui/src/i18n/it.tsv                |   3 +
 crates/ui-egui/src/i18n/ja.tsv                |   3 +
 crates/ui-egui/src/i18n/ka.tsv                |   3 +
 crates/ui-egui/src/i18n/ko.tsv                |   3 +
 crates/ui-egui/src/i18n/nl.tsv                |   3 +
 crates/ui-egui/src/i18n/pl.tsv                |   3 +
 crates/ui-egui/src/i18n/pt-br.tsv             |   3 +
 crates/ui-egui/src/i18n/ru.tsv                |   3 +
 crates/ui-egui/src/i18n/sv.tsv                |   3 +
 crates/ui-egui/src/i18n/tr.tsv                |   3 +
 crates/ui-egui/src/i18n/uk.tsv                |   3 +
 crates/ui-egui/src/i18n/vi.tsv                |   3 +
 crates/ui-egui/src/i18n/zh-hans.tsv           |   3 +
 crates/ui-egui/src/i18n/zh-hant.tsv           |   3 +
 docs/mcp.md                                   |  24 ++
 docs/ui-parity.md                             |   2 +
 34 files changed, 874 insertions(+), 23 deletions(-)

diff --git a/crates/color/src/recolor.rs b/crates/color/src/recolor.rs
index 93c0ad0f37..05c386e405 100644
--- a/crates/color/src/recolor.rs
+++ b/crates/color/src/recolor.rs
@@ -567,6 +567,112 @@ pub fn theme_palette(samples: &[(Color, f32)], n: usize) -> Vec<Color> {
     groups.into_iter().map(|g| g.2).collect()
 }
 
+/// Colors that [`weigh`] moves from one row to another as one: a color they are shown by, how
+/// often the art uses them and the row they are in. A fixed unit (such as the color a row is
+/// shown by) stays in its row.
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct WeighUnit {
+    pub color: Color,
+    pub uses: f64,
+    pub row: usize,
+    pub fixed: bool,
+}
+
+/// The unit-by-row comparisons one [`weigh`] makes, at most.
+const WEIGH_WORK: usize = 50_000_000;
+
+/// The uses of `u` that count: a positive finite number, else 0.
+fn unit_uses(u: &WeighUnit) -> f64 {
+    if u.uses.is_finite() && u.uses > 0.0 { u.uses } else { 0.0 }
+}
+
+/// Each row's share of the uses of `units`, in percent (0 for every row when nothing is used).
+/// Units whose row is past `rows`, or whose uses are not a positive finite number, count nothing.
+pub fn row_shares(units: &[WeighUnit], rows: usize) -> Vec<f64> {
+    let mut sums = vec![0.0; rows];
+    for u in units {
+        if let Some(s) = sums.get_mut(u.row) {
+            *s += unit_uses(u);
+        }
+    }
+    let total: f64 = sums.iter().sum();
+    if total <= 0.0 {
+        return vec![0.0; rows];
+    }
+    sums.iter().map(|s| s / total * 100.0).collect()
+}
+
+/// For Recolor Artwork's Prominent Colors (our own rule): the row each of `units` goes to so that
+/// each row's share of the uses comes as near its share of `weights` as whole units allow. One
+/// unit moves at a time, while a move brings the rows' shares nearer their weights (the sum of
+/// every row's distance from its weight falls); of those moves, the one taken is the unit nearest
+/// in Lab (CIEDE2000) to the color of the row it goes to (`anchors`), compared with the row it
+/// leaves; on a tie, the move that brings the shares nearest. Fixed units, units in a row past
+/// `anchors` and units used no times stay where they are. Weights that are negative or not finite
+/// count as 0; when no weight is positive, every unit stays. The moves stop after
+/// [`WEIGH_WORK`] comparisons of a unit with a row, and when the movable units times the rows pass
+/// it, every unit stays.
+pub fn weigh(units: &[WeighUnit], anchors: &[Color], weights: &[f64]) -> Vec<usize> {
+    let mut row: Vec<usize> = units.iter().map(|u| u.row).collect();
+    let n = anchors.len();
+    let given = |r: usize| weights.get(r).copied().filter(|x| x.is_finite() && *x > 0.0).unwrap_or(0.0);
+    // Scaled by the largest weight first, so the sum stays finite.
+    let top = (0..n).map(given).fold(0.0, f64::max);
+    let w = |r: usize| if top > 0.0 { given(r) / top } else { 0.0 };
+    let sum_w: f64 = (0..n).map(w).sum();
+    let movable: Vec<usize> = (0..units.len()).filter(|&i| !units[i].fixed && units[i].row < n && unit_uses(&units[i]) > 0.0).collect();
+    let per_pass = movable.len().saturating_mul(n);
+    if sum_w <= 0.0 || n < 2 || movable.is_empty() || per_pass > WEIGH_WORK {
+        return row;
+    }
+    let mut sums = vec![0.0; n];
+    for u in units.iter().filter(|u| u.row < n) {
+        sums[u.row] += unit_uses(u);
+    }
+    let total: f64 = sums.iter().sum();
+    let target: Vec<f64> = (0..n).map(|r| w(r) / sum_w * total).collect();
+    let anchor_labs: Vec<Lab> = anchors.iter().map(|c| c.to_lab()).collect();
+    // Each movable unit's distance to each row's color.
+    let dist: Vec<Vec<f32>> = movable
+        .iter()
+        .map(|&i| {
+            let l = units[i].color.to_lab();
+            anchor_labs.iter().map(|a| delta_e2000(*a, l)).collect()
+        })
+        .collect();
+    // A move must bring the shares nearer by more than rounding.
+    let eps = total * 1e-9;
+    for _ in 0..WEIGH_WORK / per_pass {
+        let mut best: Option<(f32, f64, usize, usize)> = None;
+        for (m, &i) in movable.iter().enumerate() {
+            let (a, x) = (row[i], unit_uses(&units[i]));
+            let before_a = (sums[a] - target[a]).abs();
+            let after_a = (sums[a] - x - target[a]).abs();
+            for b in (0..n).filter(|&b| b != a) {
+                let gain = before_a + (sums[b] - target[b]).abs() - after_a - (sums[b] + x - target[b]).abs();
+                if gain <= eps {
+                    continue;
+                }
+                let cost = dist[m][b] - dist[m][a];
+                let better = match best {
+                    None => true,
+                    Some((c, g, ..)) => cost < c || (cost == c && gain > g),
+                };
+                if better {
+                    best = Some((cost, gain, m, b));
+                }
+            }
+        }
+        let Some((_, _, m, b)) = best else { break };
+        let i = movable[m];
+        let x = unit_uses(&units[i]);
+        sums[row[i]] -= x;
+        sums[b] += x;
+        row[i] = b;
+    }
+    row
+}
+
 /// A set of colours to snap to (Limit to Library), with their Lab values cached.
 #[derive(Clone, Debug, Default)]
 pub struct Palette(Vec<(Color, Lab)>);
@@ -911,4 +1017,55 @@ mod tests {
         assert!(matches!(Rng::new(3).saturation_brightness(Color::lab(50.0, 40.0, 20.0)), Color::Lab { .. }));
         assert_eq!(Rng::new(3).saturation_brightness(Color::gray(0.4)).to_hsb()[1], 0.0, "greys stay grey");
     }
+
+    fn unit(color: Color, uses: f64, row: usize, fixed: bool) -> WeighUnit {
+        WeighUnit { color, uses, row, fixed }
+    }
+
+    #[test]
+    fn row_shares_are_percent_of_the_uses() {
+        let units = [unit(Color::rgb(1.0, 0.0, 0.0), 3.0, 0, true), unit(Color::rgb(0.0, 0.0, 1.0), 1.0, 1, true), unit(Color::WHITE, 5.0, 4, false)];
+        assert_eq!(row_shares(&units, 2), vec![75.0, 25.0]);
+        assert_eq!(row_shares(&[], 2), vec![0.0, 0.0]);
+        assert_eq!(row_shares(&[unit(Color::WHITE, f64::NAN, 0, false)], 1), vec![0.0]);
+    }
+
+    #[test]
+    fn weigh_moves_the_nearest_colors_toward_the_weights() {
+        let (red, blue) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0));
+        let units = [
+            unit(red, 1.0, 0, true),
+            unit(Color::rgb(0.9, 0.1, 0.3), 1.0, 0, false),
+            unit(Color::rgb(0.5, 0.0, 0.8), 1.0, 0, false),
+            unit(blue, 1.0, 1, true),
+        ];
+        // Equal weights: the reddish purple, nearer blue than the red-pink is, moves.
+        assert_eq!(weigh(&units, &[red, blue], &[1.0, 1.0]), vec![0, 0, 1, 1]);
+        // Most of the weight on blue: both movable colors go, the row's own color stays.
+        assert_eq!(weigh(&units, &[red, blue], &[0.0, 1.0]), vec![0, 1, 1, 1]);
+        // Weights already met, or none positive: nothing moves.
+        assert_eq!(weigh(&units, &[red, blue], &[3.0, 1.0]), vec![0, 0, 0, 1]);
+        assert_eq!(weigh(&units, &[red, blue], &[0.0, f64::NAN]), vec![0, 0, 0, 1]);
+        assert_eq!(weigh(&units, &[red, blue], &[1e308, 1e308]), vec![0, 0, 1, 1], "huge weights act as equal ones");
+        assert_eq!(weigh(&units, &[red], &[1.0]), vec![0, 0, 0, 1], "a row past the anchors keeps its units");
+    }
+
+    #[test]
+    fn weigh_takes_whole_units_and_stops_when_no_move_helps() {
+        let (red, blue) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0));
+        // A heavy unit: moving it would overshoot by more than staying misses.
+        let units = [unit(red, 1.0, 0, true), unit(Color::rgb(0.8, 0.0, 0.2), 10.0, 0, false), unit(blue, 10.0, 1, true)];
+        assert_eq!(weigh(&units, &[red, blue], &[1.0, 1.4]), vec![0, 0, 1]);
+        assert_eq!(weigh(&units, &[red, blue], &[1.0, 20.0]), vec![0, 1, 1]);
+        // Many units: the result still follows the weights.
+        let many: Vec<WeighUnit> = (0..400).map(|i| unit(Color::rgb(i as f32 / 400.0, 0.2, 1.0 - i as f32 / 400.0), 1.0, 0, i == 0)).collect();
+        let rows = weigh(&many, &[Color::rgb(0.0, 0.2, 1.0), Color::rgb(1.0, 0.2, 0.0)], &[1.0, 3.0]);
+        assert_eq!(rows.iter().filter(|r| **r == 1).count(), 300);
+        assert!(rows[399] == 1 && rows[1] == 0, "the reddest colors go to the red row");
+        // Past the work limit (8,000 units by 7,000 rows) nothing moves.
+        let units: Vec<WeighUnit> = (0..8_000).map(|i| unit(Color::WHITE, 1.0, 0, i == 0)).collect();
+        let anchors = vec![Color::BLACK; 7_000];
+        let weights = vec![1.0; 7_000];
+        assert!(weigh(&units, &anchors, &weights).iter().all(|r| *r == 0));
+    }
 }
diff --git a/crates/engine/src/cmd/plugin_call/reviewed.rs b/crates/engine/src/cmd/plugin_call/reviewed.rs
index c4b21b1cb4..bf46bcee94 100644
--- a/crates/engine/src/cmd/plugin_call/reviewed.rs
+++ b/crates/engine/src/cmd/plugin_call/reviewed.rs
@@ -478,6 +478,7 @@ pub(super) const ALLOWED: &[&str] = &[
     "recolor.pickTheme",
     "recolor.randomize",
     "recolor.reduce",
+    "recolor.weigh",
     "select.add",
     "select.all",
     "select.allOnArtboard",
diff --git a/crates/engine/src/cmd/recolor.rs b/crates/engine/src/cmd/recolor.rs
index 931bcce681..f36486064c 100644
--- a/crates/engine/src/cmd/recolor.rs
+++ b/crates/engine/src/cmd/recolor.rs
@@ -7,7 +7,9 @@
 use std::collections::{BTreeSet, HashMap};
 
 use serde_json::{Value, json};
-use vectorcraft_color::recolor::{ColorKey, GlobalAdjust, Method, Preserve, Rng, RowMap, cluster, same_ink};
+use vectorcraft_color::recolor::{
+    ColorKey, GlobalAdjust, Method, Preserve, Rng, RowMap, WeighUnit, cluster, row_shares, same_ink, weigh as weigh_rows,
+};
 use vectorcraft_color::{Color, Paint, Swatch};
 use vectorcraft_doc::swatches::{node_colors, node_paints, override_paints};
 use vectorcraft_doc::{Document, Node, NodeId, NodeKind};
@@ -63,6 +65,15 @@ pub fn specs() -> Vec<CommandSpec> {
             has_doc,
             pick_theme
         ),
+        cmd!(
+            query "recolor.weigh",
+            "Prominent Colors",
+            [],
+            None,
+            "{map: rows [{from, to, …}] or {current: new} as recolor.apply, weights?: [numbers ≥ 0, one per row; an excluded row's is ignored, and at least one other must be above 0], ids?: as recolor.colors} → {map: the rows as given, each with its current colours (from) moved as below, shares: [one per row: its percent of the uses (recolor.colors' count) of the current colours of the rows that aren't excluded; 0 for an excluded row]} for Recolor Artwork's Prominent Colors (VectorCraft's own rule): without weights the rows stay as they are. With weights, current colours move one at a time between the rows that aren't excluded and have a new colour (to), while a move brings each row's share of the uses nearer its share of the weights, first the colour nearest in Lab to the first colour of the row it goes to compared with the row it leaves; a row's first colour stays in it, the tints of one global swatch in a row move together, and a use counts for the row recolor.apply recolors it with (rows with a new colour first, an exact colour before a hex one, the first row that lists it), else for the first other row that lists it. The colours that can move are compared with the rows at most 50,000,000 times in all, and when they times the rows that aren't excluded pass that, none move. Changes nothing",
+            has_doc,
+            weigh
+        ),
     ]
 }
 
@@ -1062,6 +1073,147 @@ fn colors(s: &mut Session, p: &Value) -> Result<Value> {
     Ok(json!({ "colors": v }))
 }
 
+/// `recolor.weigh`'s rows as given, each with `from` as a list (a `{current: new}` map gives a
+/// row per entry). The rows have already been read by [`parse_rows`].
+fn given_rows(p: &Value) -> Vec<Value> {
+    match p.get("map") {
+        Some(Value::Array(rows)) => rows
+            .iter()
+            .map(|r| {
+                let mut r = r.clone();
+                if let Some(f) = r.get("from").filter(|f| !f.is_array()).cloned() {
+                    r["from"] = json!([f]);
+                }
+                r
+            })
+            .collect(),
+        Some(Value::Object(m)) => m.iter().map(|(k, v)| json!({"from": [k], "to": v})).collect(),
+        _ => vec![],
+    }
+}
+
+fn weigh(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "recolor.weigh";
+    let rows = parse_rows(p, C)?;
+    let weights = match p.get("weights") {
+        None | Some(Value::Null) => None,
+        Some(Value::Array(a)) if a.len() == rows.len() => Some(
+            a.iter()
+                .map(|v| {
+                    v.as_f64()
+                        .filter(|x| x.is_finite() && *x >= 0.0)
+                        .ok_or_else(|| bad(C, format!("each weight must be a number of 0 or more (got {v})")))
+                })
+                .collect::<Result<Vec<f64>>>()?,
+        ),
+        Some(v) => return Err(bad(C, format!("`weights` must be a list of {} numbers, one per row (got {v})", rows.len()))),
+    };
+    let active: Vec<usize> = (0..rows.len()).filter(|&i| !rows[i].exclude).collect();
+    if let Some(w) = &weights
+        && !active.is_empty()
+        && !active.iter().any(|&i| w[i] > 0.0)
+    {
+        return Err(bad(C, "at least one row that isn't excluded needs a weight above 0"));
+    }
+    let (ids, only) = scope_ids(s, p, C)?;
+    let st = s.doc()?;
+    let mut used: Vec<Option<Used>> = used_colors(&st.doc, &ids, only.as_ref()).into_iter().map(Some).collect();
+    let mut by_key: HashMap<ColorKey, usize> = HashMap::new();
+    let mut by_hex: HashMap<String, Vec<usize>> = HashMap::new();
+    for (i, u) in used.iter().enumerate().filter_map(|(i, u)| Some((i, u.as_ref()?))) {
+        by_key.insert(ColorKey::of(&u.color), i);
+        by_hex.entry(u.color.to_hex()).or_default().push(i);
+    }
+    // Each current colour's uses and global swatch. A use counts where recolor.apply recolors it:
+    // rows with a new colour first, exact colours before hex colours, the first row that lists it;
+    // then the other rows, in the same way.
+    let mut take = |m: &Match| -> (usize, Option<String>) {
+        let hits: Vec<usize> = match m {
+            Match::Key(k) => by_key.get(k).copied().into_iter().collect(),
+            Match::Hex(h) => by_hex.get(h).cloned().unwrap_or_default(),
+        };
+        let (mut uses, mut link) = (0, None);
+        for u in hits.into_iter().filter_map(|i| used[i].take()) {
+            uses += u.count;
+            link = link.or(u.swatch);
+        }
+        (uses, link)
+    };
+    let mut found: Vec<Vec<(usize, Option<String>)>> = rows.iter().map(|r| vec![(0, None); r.from.len()]).collect();
+    for recolors in [true, false] {
+        for hex in [false, true] {
+            for (r, row) in rows.iter().enumerate().filter(|(_, r)| r.new_color().is_some() == recolors) {
+                for (e, m) in row.from.iter().enumerate().filter(|(_, m)| matches!(m, Match::Hex(_)) == hex) {
+                    found[r][e] = take(m);
+                }
+            }
+        }
+    }
+    // The units that move: in each row that isn't excluded, the colours linked to one global
+    // swatch go together, each other colour on its own, and the unit of the first colour stays.
+    let (mut units, mut members): (Vec<WeighUnit>, Vec<(usize, Vec<usize>)>) = (vec![], vec![]);
+    for (n, &r) in active.iter().enumerate() {
+        let mut groups: Vec<(Option<&String>, Vec<usize>, usize)> = vec![];
+        for (e, (uses, link)) in found[r].iter().enumerate() {
+            match groups.iter_mut().find(|g| link.is_some() && g.0 == link.as_ref()) {
+                Some(g) => {
+                    g.1.push(e);
+                    g.2 += uses;
+                }
+                None => groups.push((link.as_ref(), vec![e], *uses)),
+            }
+        }
+        for (k, (_, entries, uses)) in groups.into_iter().enumerate() {
+            units.push(WeighUnit { color: rows[r].from[entries[0]].color(), uses: uses as f64, row: n, fixed: k == 0 });
+            members.push((r, entries));
+        }
+    }
+    if let Some(w) = &weights {
+        // Only rows with a new colour recolor what they hold, so only they give and take colours.
+        let movers: Vec<usize> = (0..active.len()).filter(|&n| rows[active[n]].new_color().is_some()).collect();
+        let anchors: Vec<Color> =
+            movers.iter().map(|&n| rows[active[n]].from.first().map(Match::color).or(rows[active[n]].to).unwrap_or_default()).collect();
+        let mut mover_of = vec![None; active.len()];
+        for (m, &n) in movers.iter().enumerate() {
+            mover_of[n] = Some(m);
+        }
+        let at: Vec<Option<usize>> = units.iter().map(|u| mover_of[u.row]).collect();
+        let sub: Vec<WeighUnit> = units.iter().zip(&at).filter_map(|(u, m)| Some(WeighUnit { row: (*m)?, ..*u })).collect();
+        let to = weigh_rows(&sub, &anchors, &movers.iter().map(|&n| w[active[n]]).collect::<Vec<_>>());
+        for ((u, _), m) in units.iter_mut().zip(&at).filter(|(_, m)| m.is_some()).zip(to) {
+            u.row = movers[m];
+        }
+    }
+    let mut out = given_rows(p);
+    if weights.is_some() {
+        // Each row's colours: those that stayed, in their order, then those that came to it.
+        let old: Vec<Vec<Value>> = out.iter().map(|r| r["from"].as_array().cloned().unwrap_or_default()).collect();
+        let mut stayed: Vec<Vec<usize>> = active.iter().map(|_| vec![]).collect();
+        let mut came: Vec<Vec<Value>> = active.iter().map(|_| vec![]).collect();
+        for (u, (r, entries)) in units.iter().zip(&members) {
+            if active[u.row] == *r {
+                stayed[u.row].extend(entries);
+            } else {
+                came[u.row].extend(entries.iter().filter_map(|&e| old[*r].get(e).cloned()));
+            }
+        }
+        for (n, &r) in active.iter().enumerate() {
+            stayed[n].sort_unstable();
+            let mut from: Vec<Value> = stayed[n].iter().filter_map(|&e| old[r].get(e).cloned()).collect();
+            from.append(&mut came[n]);
+            if let Some(row) = out.get_mut(r) {
+                row["from"] = Value::Array(from);
+            }
+        }
+    }
+    let shares = row_shares(&units, active.len());
+    let mut all = vec![0.0; rows.len()];
+    for (n, &r) in active.iter().enumerate() {
+        all[r] = shares[n];
+    }
+    Ok(json!({"map": out, "shares": all}))
+}
+
 /// The `method` parameter (`default` without one, or for null). A `method` that is not a string,
 /// such as `5`, names no method.
 fn method_param(p: &Value, cmd: &str, default: Method) -> Result<Method> {
diff --git a/crates/engine/src/tests/recolor.rs b/crates/engine/src/tests/recolor.rs
index 4707ae98fd..a065d09c42 100644
--- a/crates/engine/src/tests/recolor.rs
+++ b/crates/engine/src/tests/recolor.rs
@@ -1348,3 +1348,124 @@ fn theme_picker_refuses_bad_params() {
         assert!(e.contains(msg), "{p}: {e}");
     }
 }
+
+const RED: &str = "rgb 255 0 0";
+const PURPLE: &str = "rgb 128 0 204";
+const BLUE: &str = "rgb 0 0 255";
+
+/// Two red rectangles, a purple one and a blue one, selected.
+fn prominent_art(s: &mut Session) -> [NodeId; 4] {
+    let ids = [rect(s, json!("#ff0000")), rect(s, json!("#ff0000")), rect(s, json!("#8000cc")), rect(s, json!("#0000ff"))];
+    select_all(s);
+    ids
+}
+
+#[test]
+fn weigh_gives_each_rows_share_of_the_uses() {
+    let mut s = session();
+    prominent_art(&mut s);
+    let map = json!([{"from": [RED, PURPLE], "to": "#00ff00"}, {"from": BLUE, "to": null, "tint": 50}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": map}));
+    assert_eq!(r["shares"], json!([75.0, 25.0]));
+    assert_eq!(
+        r["map"],
+        json!([{"from": [RED, PURPLE], "to": "#00ff00"}, {"from": [BLUE], "to": null, "tint": 50}]),
+        "rows as given, from as a list"
+    );
+    // An excluded row has no share, and the others share the uses.
+    let excl = json!([{"from": [RED, PURPLE], "to": null}, {"from": [BLUE], "to": null, "exclude": true}]);
+    assert_eq!(run(&mut s, "recolor.weigh", json!({"map": excl}))["shares"], json!([100.0, 0.0]));
+    // A current colour that no art uses counts nothing, and a use counts for the first row only.
+    let twice = json!({"map": [{"from": [RED, "#123456"]}, {"from": [RED, PURPLE, BLUE]}]});
+    assert_eq!(run(&mut s, "recolor.weigh", twice)["shares"], json!([50.0, 50.0]));
+    // As recolor.apply matches them: an exact colour before a hex one, a row with a new colour first.
+    let exact = json!({"map": [{"from": ["#ff0000", PURPLE], "to": "#00ff00"}, {"from": [RED, BLUE], "to": "#ffff00"}]});
+    assert_eq!(run(&mut s, "recolor.weigh", exact)["shares"], json!([25.0, 75.0]));
+    let recolored = json!({"map": [{"from": [RED, PURPLE]}, {"from": [RED, BLUE], "to": "#ffff00"}]});
+    assert_eq!(run(&mut s, "recolor.weigh", recolored)["shares"], json!([25.0, 75.0]));
+}
+
+#[test]
+fn weigh_moves_colors_to_the_rows_weights_and_changes_nothing() {
+    let mut s = session();
+    let [_, _, purple, blue] = prominent_art(&mut s);
+    let map = json!([{"from": [RED, PURPLE], "to": "#00ff00"}, {"from": [BLUE], "to": "#ffff00"}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": map, "weights": [1, 1]}));
+    assert_eq!(r["map"], json!([{"from": [RED], "to": "#00ff00"}, {"from": [BLUE, PURPLE], "to": "#ffff00"}]));
+    assert_eq!(r["shares"], json!([50.0, 50.0]));
+    assert_eq!(fill(&s, purple).to_hex(), "#8000cc", "a query leaves the art alone");
+    // Recoloring with the weighed rows gives the moved colour its new row's colour.
+    select_all(&mut s);
+    run(&mut s, "recolor.apply", json!({"map": r["map"]}));
+    assert_eq!(fill(&s, purple).to_hex(), "#ffff00");
+    assert_eq!(fill(&s, blue).to_hex(), "#ffff00");
+    // A row's first colour stays, however small its weight.
+    let mut s = session();
+    prominent_art(&mut s);
+    let r = run(&mut s, "recolor.weigh", json!({"map": map, "weights": [0, 1]}));
+    assert_eq!(r["map"][0]["from"], json!([RED]));
+    assert_eq!(r["shares"], json!([50.0, 50.0]));
+    // Excluded rows keep their colours and take none; their weights are ignored.
+    let three =
+        json!([{"from": [RED, PURPLE], "to": "#000000"}, {"from": [BLUE], "to": "#000000", "exclude": true}, {"from": ["#00ff00"], "to": "#000000"}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": three, "weights": [1, 50, 1]}));
+    assert_eq!(r["map"][1]["from"], json!([BLUE]));
+    assert_eq!(r["map"][2]["from"], json!(["#00ff00", PURPLE]));
+    // A row without a new colour recolors nothing, so it neither gives nor takes colours.
+    let keep = json!([{"from": [RED, PURPLE], "to": "#000000"}, {"from": [BLUE]}, {"from": ["#00ff00"], "to": "#000000"}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": keep, "weights": [0, 1, 1]}));
+    assert_eq!(r["map"][1]["from"], json!([BLUE]));
+    assert_eq!(r["map"][2]["from"], json!(["#00ff00", PURPLE]));
+}
+
+#[test]
+fn weigh_moves_the_tints_of_a_global_swatch_together() {
+    let mut s = session();
+    run(&mut s, "swatch.new", json!({"name": "Brand", "color": {"c": 0, "m": 80, "y": 90, "k": 0}, "global": true}));
+    rect(&mut s, json!("#ff0000"));
+    let full = rect(&mut s, json!("#00ff00"));
+    let tint = rect(&mut s, json!("#00ff00"));
+    rect(&mut s, json!("#0000ff"));
+    run(&mut s, "paint.setFill", json!({"ids": [full.0], "swatch": "Brand"}));
+    run(&mut s, "paint.setFill", json!({"ids": [tint.0], "swatch": "Brand", "tint": 50}));
+    select_all(&mut s);
+    let brand: Vec<Value> = run(&mut s, "recolor.colors", json!({}))["colors"]
+        .as_array()
+        .unwrap()
+        .iter()
+        .filter(|c| c["swatch"] == "Brand")
+        .map(|c| c["key"].clone())
+        .collect();
+    assert_eq!(brand.len(), 2);
+    let map = json!([{"from": [RED, brand[0], brand[1]], "to": "#000000"}, {"from": [BLUE], "to": "#ffffff"}]);
+    // Even weights would take one tint alone, which would split the swatch: nothing moves.
+    let r = run(&mut s, "recolor.weigh", json!({"map": map, "weights": [1, 1]}));
+    assert_eq!(r["map"][1]["from"], json!([BLUE]));
+    // The swatch's two colours move to the blue row as one.
+    let r = run(&mut s, "recolor.weigh", json!({"map": map, "weights": [1, 3]}));
+    assert_eq!(r["map"][1]["from"], json!([BLUE, brand[0], brand[1]]));
+    assert_eq!(r["shares"], json!([25.0, 75.0]));
+    // Colours that stay keep their order, a swatch's colours with another between them included.
+    let split = json!([{"from": [brand[0], RED, brand[1]], "to": "#000000"}, {"from": [BLUE], "to": "#ffffff"}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": split, "weights": [3, 1]}));
+    assert_eq!(r["map"][0]["from"], json!([brand[0], RED, brand[1]]));
+}
+
+#[test]
+fn weigh_refuses_bad_weights() {
+    let mut s = session();
+    prominent_art(&mut s);
+    let map = json!([{"from": [RED]}, {"from": [BLUE], "exclude": true}]);
+    for (p, msg) in [
+        (json!({"map": map, "weights": [1]}), "`weights` must be a list of 2 numbers, one per row"),
+        (json!({"map": map, "weights": "1, 1"}), "`weights` must be a list of 2 numbers"),
+        (json!({"map": map, "weights": [1, -1]}), "each weight must be a number of 0 or more (got -1)"),
+        (json!({"map": map, "weights": [1, "2"]}), "each weight must be a number of 0 or more"),
+        (json!({"map": map, "weights": [0, 5]}), "at least one row that isn't excluded needs a weight above 0"),
+        (json!({"weights": [1, 1]}), "missing `map`"),
+        (json!({"map": [{"to": "#ff0000"}]}), "each row needs `from`"),
+    ] {
+        let e = s.execute("recolor.weigh", &p).unwrap_err().to_string();
+        assert!(e.contains(msg), "{p}: {e}");
+    }
+}
diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs
index 8c68237b0c..495c38f8d9 100644
--- a/crates/ui-egui/src/dialogs/recolor.rs
+++ b/crates/ui-egui/src/dialogs/recolor.rs
@@ -19,7 +19,13 @@
 //! show the new colors on the smooth wheel, on a segmented wheel (solid patches of 24 hues by 5
 //! saturations; its markers move as freely) or as color bars (one per new color, in row order: click
 //! one to select it for the sliders, drag one to move its row, which changes no color); the dialog
-//! opens on the smooth wheel. The preset menu sets up a 1, 2 or 3
+//! opens on the smooth wheel. With art, the Prominent Colors bar under the wheel shows the new
+//! colors, each part as wide as its row's share of the art's uses, the largest first; dragging the
+//! edge between two parts moves width between them, and when the drag ends the rows' current
+//! colors move toward those widths (`recolor.weigh`), and the art previews them. The New Color
+//! Group menu beside the link button saves the new colors (Save All Colors, in row order) or the
+//! bar's colors (Save Prominent Colors, in its order) as a color group right away, a step of its
+//! own. The preset menu sets up a 1, 2 or 3
 //! colour job or a library. Opened on a colour group (Edit or Apply Color Group), OK also rewrites
 //! the group with the new colours (renamed by `groupName`); without art only the group changes.
 //! Opened on colours alone (the Color Guide's Edit or Apply Colors without art), OK saves the new
@@ -41,8 +47,9 @@
 //! (`{saturation, brightness, temperature, luminosity}` in percent, sent as `recolor.apply`'s
 //! `globalAdjust` in every slider mode), `display` (the Edit tab's `smooth`, `segmented` or `bars`;
 //! unset: `smooth`), `themePicker` (the Color Theme Picker is on), `themePicks` (its picks, as
-//! `recolor.pickTheme`'s `picks`; a new list recolors the rows). Changing `colors`, a preserve
-//! flag or `limitTo` reduces the rows again.
+//! `recolor.pickTheme`'s `picks`; a new list recolors the rows), `weights` (one per row, as
+//! `recolor.weigh`'s; a new list moves the rows' current colors toward them). Changing `colors`, a
+//! preserve flag or `limitTo` reduces the rows again (and drops `weights`).
 
 use egui::{Rect, Sense, Ui, pos2, vec2};
 use serde_json::{Value, json};
@@ -151,7 +158,7 @@ pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
         "preserveWhite": kept("preserveWhite", true), "preserveBlack": kept("preserveBlack", true),
         "preserveGrays": kept("preserveGrays", false), "limitTo": limit,
         "group": group, "groupName": if new_group { Some(NEW_GROUP) } else { group }, "tab": "assign", "rule": Harmony::Complementary.id(), "linked": true,
-        "preview": true, THEME_PICKER: false, THEME_PICKS: [], "__art": art, "__assign": assign, "__newGroup": new_group,
+        "preview": true, THEME_PICKER: false, THEME_PICKS: [], WEIGHTS: null, "__art": art, "__assign": assign, "__newGroup": new_group,
     });
     let mut d = Dialog::new(KIND, fields);
     // Without art the rows are there from the start: limit them now (art's rows snap as they reduce).
@@ -214,6 +221,182 @@ fn sync(app: &mut VectorcraftApp, d: &mut Dialog) {
     d.fields.insert(DONE.into(), sig);
     // New rows take the colors picked with the Color Theme Picker again.
     d.fields.remove(THEME_DONE);
+    // Weights given for the old rows don't apply to the new ones.
+    d.fields.remove(WEIGHTS);
+    d.fields.remove(WEIGHED);
+}
+
+/// The fields of Prominent Colors: the weights the rows are to take (`recolor.weigh`'s `weights`,
+/// one per row; a new list moves the rows' current colors), the weights they last took, each row's
+/// share of the art's uses (`recolor.weigh`'s `shares`) and the rows' current colors those were
+/// read for; a drag of a part's edge (each part's share of the bar while it lasts); and a request
+/// from the New Color Group menu (`all` or `prominent`).
+const WEIGHTS: &str = "weights";
+const WEIGHED: &str = "__weighed";
+const SHARES: &str = "__shares";
+const SHARES_OF: &str = "__sharesOf";
+const BAR_DRAG: &str = "__barDrag";
+const SAVE_GROUP: &str = "__saveGroup";
+/// Height of the Prominent Colors bar, and the smallest share of it a drag leaves a part.
+const PROMINENT_H: f32 = 18.0;
+const MIN_PART: f64 = 0.01;
+/// The ids of the bar's part `n` and of the edge after part `k`, with `n` or `k`.
+const PROMINENT_PART: &str = "recolor-prominent-part";
+const PROMINENT_EDGE: &str = "recolor-prominent-edge";
+
+/// Cancel the preview, so commands read the art's own colors; it runs again afterwards.
+fn cancel_preview(app: &mut VectorcraftApp, d: &mut Dialog) {
+    if d.fields.remove(super::form::PREVIEWED).is_some() {
+        let _ = app.session.cancel_interaction();
+    }
+}
+
+/// With art: when `weights` changed, move the rows' current colors toward them
+/// (`recolor.weigh`); when the rows' current colors changed, read each row's share of the art's
+/// uses again.
+fn sync_weights(app: &mut VectorcraftApp, d: &mut Dialog) {
+    if !d.bool("__art") {
+        return;
+    }
+    if let Some(w) = d.fields.get(WEIGHTS).filter(|w| !w.is_null()).cloned()
+        && d.fields.get(WEIGHED) != Some(&w)
+    {
+        d.fields.insert(WEIGHED.into(), w.clone());
+        cancel_preview(app, d);
+        match app.session.execute("recolor.weigh", &json!({"map": rows(d), "weights": w})) {
+            Ok(r) => {
+                if let Some(m) = r["map"].as_array() {
+                    d.fields.insert("rows".into(), Value::Array(m.clone()));
+                }
+            }
+            Err(e) => app.status(e.to_string()),
+        }
+    }
+    let rs = rows(d);
+    let of = Value::Array(rs.iter().map(|r| json!([r["from"], excluded(r)])).collect());
+    if d.fields.get(SHARES_OF) == Some(&of) {
+        return;
+    }
+    cancel_preview(app, d);
+    let shares = match app.session.execute("recolor.weigh", &json!({"map": rs})) {
+        Ok(r) => r["shares"].clone(),
+        Err(e) => {
+            app.status(e.to_string());
+            json!([])
+        }
+    };
+    d.fields.insert(SHARES.into(), shares);
+    d.fields.insert(SHARES_OF.into(), of);
+}
+
+/// The parts of the Prominent Colors bar: each row that isn't excluded and has a share of the
+/// art's uses, with that share in percent, the largest share first (on a tie, the first row).
+fn prominent_parts(d: &Dialog, rows: &[Value]) -> Vec<(usize, f64)> {
+    let shares = d.fields.get(SHARES).and_then(Value::as_array).cloned().unwrap_or_default();
+    let mut parts: Vec<(usize, f64)> = shares
+        .iter()
+        .enumerate()
+        .filter_map(|(i, s)| Some((i, s.as_f64().filter(|s| *s > 0.0)?)))
+        .filter(|(i, _)| rows.get(*i).is_some_and(|r| !excluded(r)))
+        .collect();
+    parts.sort_by(|a, b| b.1.total_cmp(&a.1).then(a.0.cmp(&b.0)));
+    parts
+}
+
+/// The Prominent Colors bar: a part per row of [`prominent_parts`] with the row's new color, as wide
+/// as its share of the art's uses. A drag of the edge between two parts moves width from one to
+/// the other (each keeps at least [`MIN_PART`] of the bar); when it ends, the parts' widths become
+/// the rows' `weights`.
+fn prominent_bar(ui: &mut Ui, d: &mut Dialog, rows: &[Value]) {
+    let t = Tokens::get(ui.ctx());
+    let parts = prominent_parts(d, rows);
+    let (bar, resp) = ui.allocate_exact_size(vec2(ui.available_width(), PROMINENT_H), Sense::hover());
+    resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Image, ui.is_enabled(), tl!("Prominent Colors")));
+    if parts.is_empty() {
+        ui.painter().rect_stroke(bar, 1.0, egui::Stroke::new(1.0, t.border), egui::StrokeKind::Inside);
+        return;
+    }
+    let total: f64 = parts.iter().map(|p| p.1).sum();
+    let mut widths: Vec<f64> = match d.fields.get(BAR_DRAG).and_then(Value::as_array) {
+        Some(w) if w.len() == parts.len() => w.iter().map(|x| x.as_f64().unwrap_or(0.0)).collect(),
+        _ => parts.iter().map(|p| p.1 / total).collect(),
+    };
+    let w = f64::from(bar.width());
+    let edge = |k: usize, widths: &[f64]| bar.left() + (widths[..=k].iter().sum::<f64>() * w) as f32;
+    let mut left = bar.left();
+    for (n, (i, _)) in parts.iter().enumerate() {
+        let right = if n + 1 == parts.len() { bar.right() } else { edge(n, &widths) };
+        let r = Rect::from_min_max(pos2(left, bar.top()), pos2(right, bar.bottom()));
+        let c = to_color(&rows[*i]).or_else(|| from_colors(&rows[*i]).first().copied()).unwrap_or_default();
+        chip(ui, r, c, false);
+        let share = (widths[n] * 100.0).round();
+        ui.interact(r, egui::Id::unique((PROMINENT_PART, n)), Sense::hover()).on_hover_text(format!("{} {}: {share}%", tl!("Color"), i + 1));
+        left = right;
+    }
+    let mut ended = false;
+    for k in 0..parts.len() - 1 {
+        let x = edge(k, &widths);
+        let handle = Rect::from_center_size(pos2(x, bar.center().y), vec2(8.0, PROMINENT_H));
+        let h = ui.interact(handle, egui::Id::unique((PROMINENT_EDGE, k)), Sense::drag()).on_hover_cursor(egui::CursorIcon::ResizeHorizontal);
+        if h.dragged() && w > 0.0 {
+            // Each part keeps MIN_PART, or half of the two parts' width when they are narrower.
+            let pair = widths[k] + widths[k + 1];
+            let least = MIN_PART.min(pair / 2.0);
+            let moved = (widths[k] + f64::from(h.drag_delta().x) / w).clamp(least, pair - least);
+            widths[k] = moved;
+            widths[k + 1] = pair - moved;
+            d.fields.insert(BAR_DRAG.into(), json!(widths));
+        }
+        if h.hovered() || h.dragged() {
+            ui.painter().vline(x, bar.y_range(), egui::Stroke::new(2.0, t.accent));
+        }
+        ended |= h.drag_stopped();
+    }
+    if ended && d.fields.remove(BAR_DRAG).is_some() {
+        let mut weights = vec![0.0; rows.len()];
+        for ((i, _), x) in parts.iter().zip(&widths) {
+            weights[*i] = (x * 10_000.0).round() / 100.0;
+        }
+        d.fields.insert(WEIGHTS.into(), json!(weights));
+    }
+}
+
+/// The colors a new color group takes from rows `rs`: each row's new color with the Global Adjust,
+/// snapped to Limit to Library, as `recolor.apply` gives them to a group; a row without a new color
+/// gives its first current color, which the art keeps.
+fn group_colors<'a>(app: &VectorcraftApp, d: &Dialog, rs: impl Iterator<Item = &'a Value>) -> Vec<Value> {
+    let adjust = global_adjust(adjust_values(d));
+    let limit = d.str("limitTo");
+    let palette = Some(limit).filter(|l| !l.is_empty()).and_then(|l| swatchlib::limit_palette(&app.session, &l));
+    rs.filter_map(|r| match to_color(r) {
+        None => from_colors(r).first().map(key),
+        Some(_) if adjust.is_identity() => Some(r["to"].clone()),
+        Some(c) => {
+            let c = adjust.apply(c);
+            Some(key(&palette.as_ref().map_or(c, |p| p.nearest(c))))
+        }
+    })
+    .collect()
+}
+
+/// The New Color Group menu's request: save the new colors of the rows that aren't excluded (Save
+/// All Colors, in row order; a row without one gives its first current color) or of the Prominent Colors bar (Save Prominent Colors, in its order)
+/// as a new color group, a step of its own (`swatch.newGroup`).
+fn save_group(app: &mut VectorcraftApp, d: &mut Dialog, which: &str) {
+    let rs = rows(d);
+    let order: Vec<usize> = match which {
+        "prominent" => prominent_parts(d, &rs).into_iter().map(|p| p.0).collect(),
+        _ => (0..rs.len()).filter(|&i| !excluded(&rs[i])).collect(),
+    };
+    let colors = group_colors(app, d, order.iter().filter_map(|&i| rs.get(i)));
+    if colors.is_empty() {
+        return;
+    }
+    // The group is added to the document itself, not to the preview, which runs again afterwards.
+    cancel_preview(app, d);
+    if let Err(e) = app.run("swatch.newGroup", json!({"colors": colors, "keepModel": true})) {
+        app.status(e);
+    }
 }
 
 /// The fields of the Color Theme Picker: whether a click or drag on the canvas picks colors, and
@@ -401,6 +584,7 @@ fn apply_params(d: &Dialog) -> Value {
 fn body(app: &mut VectorcraftApp, ui: &mut Ui, d: &mut Dialog) -> bool {
     sync(app, d);
     sync_theme(app, d);
+    sync_weights(app, d);
     let t = Tokens::get(ui.ctx());
     let picking = d.bool(THEME_PICKER);
     ui.horizontal(|ui| {
@@ -444,6 +628,10 @@ fn body(app: &mut VectorcraftApp, ui: &mut Ui, d: &mut Dialog) -> bool {
         }
         d.fields.insert("rows".into(), Value::Array(rs));
     }
+    sync_weights(app, d);
+    if let Some(which) = d.fields.remove(SAVE_GROUP) {
+        save_group(app, d, which.as_str().unwrap_or_default());
+    }
     if d.fields.get("group").is_some_and(Value::is_string) || d.bool("__newGroup") {
         ui.add_space(6.0);
         ui.horizontal(|ui| {
@@ -479,25 +667,9 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
     let mut d = d.clone();
     sync(app, &mut d);
     sync_theme(app, &mut d);
+    sync_weights(app, &mut d);
     if d.bool("__newGroup") {
-        // The new colors with the Global Adjust, snapped to Limit to Library, as `recolor.apply`
-        // gives them to a group.
-        let adjust = global_adjust(adjust_values(&d));
-        let limit = d.str("limitTo");
-        let palette = Some(limit).filter(|l| !l.is_empty()).and_then(|l| swatchlib::limit_palette(&app.session, &l));
-        let colors: Vec<Value> = rows(&d)
-            .into_iter()
-            .filter(|r| !excluded(r))
-            .map(|r| {
-                to_color(&r).filter(|_| !adjust.is_identity()).map_or_else(
-                    || r["to"].clone(),
-                    |c| {
-                        let c = adjust.apply(c);
-                        key(&palette.as_ref().map_or(c, |p| p.nearest(c)))
-                    },
-                )
-            })
-            .collect();
+        let colors = group_colors(app, &d, rows(&d).iter().filter(|r| !excluded(r)));
         return form::commit_preview(app, "swatch.newGroup", json!({"name": d.str("groupName"), "colors": colors, "keepModel": true}));
     }
     let r = form::commit_preview(app, CMD, apply_params(&d))?;
@@ -1091,6 +1263,18 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut [Value
             if widgets::icon_button(ui, if linked { "link" } else { "link-2-off" }, tip, linked, 24.0).clicked() {
                 d.fields.insert("linked".into(), json!(!linked));
             }
+            // New Color Group: save the wheel's colors or the Prominent Colors as a color group.
+            let button = widgets::icon_button(ui, "dc-folder", tl!("New Color Group"), false, 24.0);
+            let prominent = d.bool("__art") && !prominent_parts(d, rows).is_empty();
+            let saved = egui::Popup::menu(&button).show(|ui| {
+                if widgets::menu_item_name(ui, tl!("Save All Colors"), rows.iter().any(|r| !excluded(r)), false) {
+                    return Some("all");
+                }
+                widgets::menu_item_name(ui, tl!("Save Prominent Colors"), prominent, false).then_some("prominent")
+            });
+            if let Some(which) = saved.and_then(|r| r.inner) {
+                d.fields.insert(SAVE_GROUP.into(), json!(which));
+            }
             ui.add_space(8.0);
             // The mode of the color sliders under the wheel: the selected new color in a color
             // mode, or Global Adjust for all of them.
@@ -1122,6 +1306,11 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut [Value
             _ => w = widgets::harmony_wheel(ui, "recolor-wheel", WHEEL, &colors, marked),
         });
     });
+    // Prominent Colors: the art's new colors, each as wide as its share of the art.
+    if d.bool("__art") {
+        ui.add_space(6.0);
+        prominent_bar(ui, d, rows);
+    }
     if let Some(k) = w.pressed {
         d.fields.insert("__sel".into(), json!([active[k]]));
     }
@@ -1625,6 +1814,130 @@ mod tests {
         assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
     }
 
+    const RED: &str = "rgb 255 0 0";
+    const PURPLE: &str = "rgb 128 0 204";
+    const BLUE: &str = "rgb 0 0 255";
+
+    /// Two red squares, a purple one and a blue one, selected; Recolor Artwork open on them on the
+    /// Edit tab with the Exact method and the rows set: the blue to yellow, then the red and purple
+    /// to green (the purple's square id last). One frame drawn.
+    fn prominent_setup(app: &mut VectorcraftApp, ctx: &egui::Context) -> u64 {
+        app.run("file.new", json!({"width": 300, "height": 100})).unwrap();
+        let ids = [square(app, 10.0, "#ff0000"), square(app, 40.0, "#ff0000"), square(app, 70.0, "#8000cc"), square(app, 100.0, "#0000ff")];
+        app.run("select.set", json!({"ids": ids})).unwrap();
+        app.run("ui.recolorDialog", json!({})).unwrap();
+        let d = app.ui.dialog.as_mut().unwrap();
+        d.fields.insert("method".into(), json!(Method::Exact.id()));
+        d.fields.insert("tab".into(), json!("edit"));
+        crate::theme::install_fonts(ctx);
+        frame(app, ctx, 0.0, vec![], 0);
+        let rows = json!([{"from": [BLUE], "to": "rgb 255 255 0"}, {"from": [RED, PURPLE], "to": "rgb 0 255 0"}]);
+        app.ui.dialog.as_mut().unwrap().fields.insert("rows".into(), rows);
+        frame(app, ctx, 0.01, vec![], 0);
+        ids[2]
+    }
+
+    fn froms(app: &VectorcraftApp) -> Vec<Value> {
+        super::rows(app.ui.dialog.as_ref().unwrap()).iter().map(|r| r["from"].clone()).collect()
+    }
+
+    /// The Prominent Colors bar holds each row's share of the art's uses, the largest first; new
+    /// `weights` move the rows' current colors toward them, the art previews the result, and only
+    /// OK commits it, as one undo step.
+    #[test]
+    fn weights_move_the_rows_colors_and_the_art_previews_them() {
+        let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        let ctx = egui::Context::default();
+        let purple = prominent_setup(&mut app, &ctx);
+        let d = app.ui.dialog.as_ref().unwrap();
+        assert_eq!(d.fields[SHARES], json!([25.0, 75.0]));
+        assert_eq!(prominent_parts(d, &super::rows(d)), [(1, 75.0), (0, 25.0)], "the largest share first");
+        assert_eq!(fill_hex(&app, purple), "#00ff00", "the art previews the rows");
+        let undo = app.session.doc().unwrap().history.undo.len();
+        app.ui.dialog.as_mut().unwrap().fields.insert(WEIGHTS.into(), json!([50, 50]));
+        frame(&mut app, &ctx, 0.1, vec![], 0);
+        assert_eq!(froms(&app), [json!([BLUE, PURPLE]), json!([RED])]);
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields[SHARES], json!([50.0, 50.0]));
+        assert_eq!(fill_hex(&app, purple), "#ffff00", "the moved color previews its new row's color");
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo, "nothing is committed before OK");
+        // A new count of Colors reduces the rows again and drops the weights.
+        app.ui.dialog.as_mut().unwrap().fields.insert("colors".into(), json!(2));
+        frame(&mut app, &ctx, 0.2, vec![], 0);
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields.get(WEIGHTS), None);
+        app.ui
+            .dialog
+            .as_mut()
+            .unwrap()
+            .fields
+            .insert("rows".into(), json!([{"from": [BLUE, PURPLE], "to": "rgb 255 255 0"}, {"from": [RED], "to": "rgb 0 255 0"}]));
+        crate::dialogs::confirm(&mut app).unwrap();
+        assert_eq!(fill_hex(&app, purple), "#ffff00");
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
+    }
+
+    /// Dragging the edge between two parts of the bar to the left gives the right-hand part more
+    /// weight; when the drag ends, the rows' current colors move.
+    #[test]
+    fn dragging_a_prominent_edge_moves_colors_between_rows() {
+        let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        let ctx = egui::Context::default();
+        let purple = prominent_setup(&mut app, &ctx);
+        let edge = |ctx: &egui::Context| ctx.read_response(egui::Id::unique((PROMINENT_EDGE, 0usize))).map(|r| r.rect);
+        let mut last = None;
+        for n in 0..10 {
+            frame(&mut app, &ctx, 0.02 + f64::from(n) * 0.001, vec![], 0);
+            let r = edge(&ctx);
+            if r.is_some() && r == last {
+                break;
+            }
+            last = r;
+        }
+        let at = edge(&ctx).expect("the edge between the two parts").center();
+        let bar = ctx.read_response(egui::Id::unique((PROMINENT_PART, 0usize))).unwrap().rect;
+        // From 75% to 50%: a quarter of the bar to the left.
+        let to = at - vec2((bar.width() / 0.75) * 0.25, 0.0);
+        let button =
+            |pos, pressed| egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE };
+        frame(&mut app, &ctx, 0.1, vec![egui::Event::PointerMoved(at), button(at, true)], 0);
+        for k in 1..=5 {
+            frame(&mut app, &ctx, 0.1 + f64::from(k) * 0.02, vec![egui::Event::PointerMoved(at + (to - at) * (k as f32 / 5.0))], 0);
+        }
+        assert!(app.ui.dialog.as_ref().unwrap().fields.contains_key(BAR_DRAG), "the drag is under way");
+        assert_eq!(froms(&app)[0], json!([BLUE]), "the rows wait for the drag to end");
+        frame(&mut app, &ctx, 0.3, vec![button(to, false)], 0);
+        frame(&mut app, &ctx, 0.32, vec![], 0);
+        let d = app.ui.dialog.as_ref().unwrap();
+        let w = d.fields[WEIGHTS].as_array().unwrap().iter().map(|x| x.as_f64().unwrap()).collect::<Vec<_>>();
+        assert!((w[0] - 50.0).abs() < 2.0 && (w[1] - 50.0).abs() < 2.0, "{w:?}");
+        assert_eq!(froms(&app), [json!([BLUE, PURPLE]), json!([RED])]);
+        assert_eq!(fill_hex(&app, purple), "#ffff00");
+    }
+
+    /// The New Color Group menu's Save All Colors saves the new colors in row order and Save
+    /// Prominent Colors the bar's colors, the largest share first, each as its own step; the
+    /// preview of the recolor runs on.
+    #[test]
+    fn save_all_and_prominent_colors_make_color_groups() {
+        let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        let ctx = egui::Context::default();
+        let purple = prominent_setup(&mut app, &ctx);
+        let groups = |app: &VectorcraftApp| app.session.doc().unwrap().doc.swatch_groups.len();
+        let last = |app: &VectorcraftApp| -> Vec<String> {
+            let doc = &app.session.doc().unwrap().doc;
+            doc.swatch_groups.last().unwrap().swatches.iter().map(|w| w.paint.color().unwrap().to_hex()).collect()
+        };
+        let (n, undo) = (groups(&app), app.session.doc().unwrap().history.undo.len());
+        for (which, colors, t) in [("all", ["#ffff00", "#00ff00"], 0.1), ("prominent", ["#00ff00", "#ffff00"], 0.2)] {
+            app.ui.dialog.as_mut().unwrap().fields.insert(SAVE_GROUP.into(), json!(which));
+            frame(&mut app, &ctx, t, vec![], 0);
+            frame(&mut app, &ctx, t + 0.01, vec![], 0);
+            assert_eq!(last(&app), colors, "{which}");
+            assert_eq!(fill_hex(&app, purple), "#00ff00", "{which}: the art still previews the rows");
+        }
+        assert_eq!(groups(&app), n + 2);
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 2, "a step for each group");
+    }
+
     /// One frame with `modifiers` held.
     fn frame_with(app: &mut VectorcraftApp, ctx: &egui::Context, time: f64, events: Vec<egui::Event>, modifiers: egui::Modifiers) {
         let events = std::iter::once(egui::Event::ModifiersChanged(modifiers)).chain(events).collect();
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 8edde76eb3..d3f8fe92e6 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -2825,6 +2825,9 @@ digits	Malayalam	Малаялам
 	Reset the rows to the artwork's colors	Нулиране на редовете към цветовете на илюстрацията
 	Color Theme Picker	Избор на цветова тема
 	Click or drag across the art to pick its colors; Shift adds more	Щракнете или плъзнете през илюстрацията, за да вземете цветовете ѝ; Shift добавя още
+	Prominent Colors	Преобладаващи цветове
+	Save All Colors	Запази всички цветове
+	Save Prominent Colors	Запази преобладаващите цветове
 	Reset to Default	Връщане към стандартните
 	Reset to White, Black	Нулиране към бяло, черно
 	Reset with Mesh	Нулиране с мрежа
diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv
index c9c207eaa2..bf1a65904c 100644
--- a/crates/ui-egui/src/i18n/bs.tsv
+++ b/crates/ui-egui/src/i18n/bs.tsv
@@ -2849,6 +2849,9 @@ digits	Malayalam	Malajalam
 	Reset the rows to the artwork's colors	Vrati redove na boje crteža
 	Color Theme Picker	Birač teme boja
 	Click or drag across the art to pick its colors; Shift adds more	Kliknite ili prevucite preko crteža da uzmete njegove boje; Shift dodaje još
+	Prominent Colors	Istaknute boje
+	Save All Colors	Sačuvaj sve boje
+	Save Prominent Colors	Sačuvaj istaknute boje
 	Separate colors into rows	Razdvoji boje u redove
 	Unlink harmony colors	Prekini vezu boja harmonije
 	1 Color Job	Posao s 1 bojom
diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv
index 0399e6c04a..3e590eadb1 100644
--- a/crates/ui-egui/src/i18n/ca.tsv
+++ b/crates/ui-egui/src/i18n/ca.tsv
@@ -3607,6 +3607,9 @@ digits	Malayalam	Malaiàlam
 	Reset the rows to the artwork's colors	Restableix les files als colors de l’obra
 	Color Theme Picker	Selector de tema de colors
 	Click or drag across the art to pick its colors; Shift adds more	Feu clic o arrossegueu sobre l’obra per agafar-ne els colors; Maj n’afegeix més
+	Prominent Colors	Colors predominants
+	Save All Colors	Desa tots els colors
+	Save Prominent Colors	Desa els colors predominants
 	Reset to Default	Restableix el valor predeterminat
 	Reset to default	Restableix el valor predeterminat
 	Reset to Defaults	Restableix els valors predeterminats
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index e62070329c..751d06c66a 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -2885,6 +2885,9 @@ digits	Malayalam	Malajálamské
 	Reset the rows to the artwork's colors	Obnovit řádky na barvy kresby
 	Color Theme Picker	Výběr barevného motivu
 	Click or drag across the art to pick its colors; Shift adds more	Klepnutím nebo tažením přes kresbu převezmete její barvy; Shift přidá další
+	Prominent Colors	Převládající barvy
+	Save All Colors	Uložit všechny barvy
+	Save Prominent Colors	Uložit převládající barvy
 	Separate colors into rows	Rozdělit barvy do řádků
 	Unlink harmony colors	Zrušit propojení barev harmonie
 	1 Color Job	Zakázka s 1 barvou
diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv
index 47a78ef612..df2fbc011f 100644
--- a/crates/ui-egui/src/i18n/da.tsv
+++ b/crates/ui-egui/src/i18n/da.tsv
@@ -2669,6 +2669,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Nulstil rækkerne til grafikkens farver
 	Color Theme Picker	Farvetemavælger
 	Click or drag across the art to pick its colors; Shift adds more	Klik eller træk hen over grafikken for at hente dens farver; Skift tilføjer flere
+	Prominent Colors	Fremtrædende farver
+	Save All Colors	Gem alle farver
+	Save Prominent Colors	Gem fremtrædende farver
 	Separate colors into rows	Opdel farver i rækker
 	Unlink harmony colors	Fjern sammenkædning af harmonifarver
 	1 Color Job	1-farvejob
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index af4489a637..ed11eca5cf 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -2871,6 +2871,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Zeilen auf die Farben der Grafik zurücksetzen
 	Color Theme Picker	Farbthema-Auswahl
 	Click or drag across the art to pick its colors; Shift adds more	Klicken oder ziehen Sie über die Grafik, um ihre Farben aufzunehmen; Umschalt fügt weitere hinzu
+	Prominent Colors	Hervorstechende Farben
+	Save All Colors	Alle Farben speichern
+	Save Prominent Colors	Hervorstechende Farben speichern
 	Reset to Default	Auf Standard zurücksetzen
 	Reset to White, Black	Auf Weiß, Schwarz zurücksetzen
 	Reset with Mesh	Mit Gitter zurücksetzen
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index 6ad6ff11c0..398d51f9db 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -3589,6 +3589,9 @@ digits	Malayalam	Μαλαγιάλαμ
 	Reset the rows to the artwork's colors	Επαναφορά γραμμών στα χρώματα του σχεδίου
 	Color Theme Picker	Επιλογέας χρωματικού θέματος
 	Click or drag across the art to pick its colors; Shift adds more	Κάντε κλικ ή σύρετε πάνω στο σχέδιο για να πάρετε τα χρώματά του· το Shift προσθέτει κι άλλα
+	Prominent Colors	Κυρίαρχα χρώματα
+	Save All Colors	Αποθήκευση όλων των χρωμάτων
+	Save Prominent Colors	Αποθήκευση κυρίαρχων χρωμάτων
 	Reset to White, Black	Επαναφορά σε λευκό και μαύρο
 	Reset with Mesh	Επαναφορά με πλέγμα
 	Reset with Mesh…	Επαναφορά με πλέγμα…
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index 41f92e14f7..380124c709 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -2904,6 +2904,9 @@ digits	Malayalam	Malayálam
 	Reset the rows to the artwork's colors	Restablecer las filas a los colores de la ilustración
 	Color Theme Picker	Selector de tema de color
 	Click or drag across the art to pick its colors; Shift adds more	Haga clic o arrastre sobre la ilustración para tomar sus colores; Mayús añade más
+	Prominent Colors	Colores destacados
+	Save All Colors	Guardar todos los colores
+	Save Prominent Colors	Guardar colores destacados
 	Reset to Default	Restablecer valores predeterminados
 	Reset to White, Black	Restablecer a blanco, negro
 	Reset with Mesh	Restablecer con malla
diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv
index fd38382f63..8211efc0cd 100644
--- a/crates/ui-egui/src/i18n/fi.tsv
+++ b/crates/ui-egui/src/i18n/fi.tsv
@@ -2829,6 +2829,9 @@ digits	Malayalam	Malajalam
 	Reset the rows to the artwork's colors	Palauta rivit kuvituksen väreihin
 	Color Theme Picker	Väriteeman valitsin
 	Click or drag across the art to pick its colors; Shift adds more	Napsauta tai vedä kuvituksen yli poimiaksesi sen värit; Vaihto lisää useampia
+	Prominent Colors	Hallitsevat värit
+	Save All Colors	Tallenna kaikki värit
+	Save Prominent Colors	Tallenna hallitsevat värit
 	Separate colors into rows	Erottele värit riveille
 	Unlink harmony colors	Poista harmoniavärien linkitys
 	1 Color Job	1 värin työ
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index dcbe436fc3..dc7be09b13 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -2896,6 +2896,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Réinitialiser les lignes avec les couleurs de l’illustration
 	Color Theme Picker	Sélecteur de thème de couleurs
 	Click or drag across the art to pick its colors; Shift adds more	Cliquez ou faites glisser sur l’illustration pour prélever ses couleurs ; Maj en ajoute d’autres
+	Prominent Colors	Couleurs dominantes
+	Save All Colors	Enregistrer toutes les couleurs
+	Save Prominent Colors	Enregistrer les couleurs dominantes
 	Reset to Default	Rétablir les valeurs par défaut
 	Reset to White, Black	Réinitialiser à blanc, noir
 	Reset with Mesh	Réinitialiser avec un filet
diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv
index 9b7a15bbad..dd0d8137e7 100644
--- a/crates/ui-egui/src/i18n/hi.tsv
+++ b/crates/ui-egui/src/i18n/hi.tsv
@@ -3948,6 +3948,9 @@ antiAlias	Sharp	शार्प
 	Reset the rows to the artwork's colors	आर्टवर्क के रंग के लिए पंक्तियों को रीसेट करें
 	Color Theme Picker	रंग थीम पिकर
 	Click or drag across the art to pick its colors; Shift adds more	आर्टवर्क के रंग लेने के लिए उस पर क्लिक करें या खींचें; Shift और जोड़ता है
+	Prominent Colors	प्रमुख रंग
+	Save All Colors	सभी रंग सेव करें
+	Save Prominent Colors	प्रमुख रंग सेव करें
 	Reset to default	डिफ़ॉल्ट पर रीसेट करें
 	Reset to Default	डिफ़ॉल्ट पर रीसेट करें
 	Reset to Defaults	डिफ़ॉल्ट पर रीसेट करें
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index 6832a86707..7c1c82e97e 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -3454,6 +3454,9 @@ mark-style	Japanese	Japán
 	Reset the rows to the artwork's colors	Sorok visszaállítása a grafika színeire
 	Color Theme Picker	Színtéma-választó
 	Click or drag across the art to pick its colors; Shift adds more	Kattintson vagy húzzon a grafikán a színei felvételéhez; a Shift továbbiakat ad hozzá
+	Prominent Colors	Domináns színek
+	Save All Colors	Összes szín mentése
+	Save Prominent Colors	Domináns színek mentése
 	Reset to default	Alapérték visszaállítása
 	Reset to Default	Alapérték visszaállítása
 	Reset to Defaults	Alapértékek visszaállítása
diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv
index 45e05b9622..758903eb08 100644
--- a/crates/ui-egui/src/i18n/id.tsv
+++ b/crates/ui-egui/src/i18n/id.tsv
@@ -2669,6 +2669,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Setel ulang baris ke warna karya seni
 	Color Theme Picker	Pemilih tema warna
 	Click or drag across the art to pick its colors; Shift adds more	Klik atau seret melintasi karya seni untuk mengambil warnanya; Shift menambahkan lagi
+	Prominent Colors	Warna menonjol
+	Save All Colors	Simpan semua warna
+	Save Prominent Colors	Simpan warna menonjol
 	Separate colors into rows	Pisahkan warna ke dalam baris
 	Unlink harmony colors	Lepaskan tautan warna harmoni
 	1 Color Job	Pekerjaan 1 warna
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index 57f141f880..579098b1de 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -2947,6 +2947,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Reimposta le righe sui colori della grafica
 	Color Theme Picker	Selettore tema colore
 	Click or drag across the art to pick its colors; Shift adds more	Fai clic o trascina sulla grafica per prelevarne i colori; Maiusc ne aggiunge altri
+	Prominent Colors	Colori prominenti
+	Save All Colors	Salva tutti i colori
+	Save Prominent Colors	Salva colori prominenti
 	Reset to Default	Reimposta valori predefiniti
 	Reset to White, Black	Reimposta su bianco, nero
 	Reset with Mesh	Reimposta con trama
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index 69b55c9121..6abc349cb3 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -2952,6 +2952,9 @@ mark-style	Japanese	日本式
 	Reset the rows to the artwork's colors	行をアートワークのカラーにリセット
 	Color Theme Picker	カラーテーマピッカー
 	Click or drag across the art to pick its colors; Shift adds more	アートワークをクリックまたはドラッグしてカラーを取得します。Shift キーで追加します
+	Prominent Colors	主要カラー
+	Save All Colors	すべてのカラーを保存
+	Save Prominent Colors	主要カラーを保存
 	Reset to Default	初期設定に戻す
 	Reset to White, Black	白、黒にリセット
 	Reset {name}	{name}をリセット
diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv
index 1cbb2d1bf1..8a1605eb96 100644
--- a/crates/ui-egui/src/i18n/ka.tsv
+++ b/crates/ui-egui/src/i18n/ka.tsv
@@ -2585,6 +2585,9 @@ digits	Malayalam	მალაიალამური
 	Reset the rows to the artwork's colors	სტრიქონებისთვის ნახატის ფერების დაბრუნება
 	Color Theme Picker	ფერთა თემის ამრჩევი
 	Click or drag across the art to pick its colors; Shift adds more	დააწკაპუნეთ ან გადაატარეთ ნახატზე მისი ფერების ასაღებად; Shift ამატებს კიდევ
+	Prominent Colors	გამოკვეთილი ფერები
+	Save All Colors	ყველა ფერის შენახვა
+	Save Prominent Colors	გამოკვეთილი ფერების შენახვა
 	Separate colors into rows	ფერების სტრიქონებად დაყოფა
 	Unlink harmony colors	ჰარმონიის ფერების კავშირის გაწყვეტა
 	1 Color Job	1-ფერიანი ბეჭდვა
diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv
index 6135f8d5ec..b1359dba7a 100644
--- a/crates/ui-egui/src/i18n/ko.tsv
+++ b/crates/ui-egui/src/i18n/ko.tsv
@@ -2941,6 +2941,9 @@ mark-style	Japanese	일본식
 	Reset the rows to the artwork's colors	행을 아트웍 색상으로 재설정
 	Color Theme Picker	색상 테마 피커
 	Click or drag across the art to pick its colors; Shift adds more	아트웍을 클릭하거나 드래그하여 색상을 가져옵니다. Shift 키로 더 추가합니다
+	Prominent Colors	주요 색상
+	Save All Colors	모든 색상 저장
+	Save Prominent Colors	주요 색상 저장
 	Reset to Default	기본값으로 재설정
 	Reset to White, Black	흰색, 검정으로 재설정
 	Reset {name}	{name} 재설정
diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv
index 327aee902c..b4fe48049b 100644
--- a/crates/ui-egui/src/i18n/nl.tsv
+++ b/crates/ui-egui/src/i18n/nl.tsv
@@ -2683,6 +2683,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	De rijen herstellen naar de kleuren van de artwork
 	Color Theme Picker	Kleurthemakiezer
 	Click or drag across the art to pick its colors; Shift adds more	Klik of sleep over het artwork om de kleuren ervan op te nemen; Shift voegt er meer toe
+	Prominent Colors	Prominente kleuren
+	Save All Colors	Alle kleuren opslaan
+	Save Prominent Colors	Prominente kleuren opslaan
 	Separate colors into rows	Kleuren over rijen verdelen
 	Unlink harmony colors	Harmoniekleuren ontkoppelen
 	1 Color Job	Opdracht in 1 kleur
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index f277d51d65..cd618b1912 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -2794,6 +2794,9 @@ digits	Malayalam	Malajalam
 	Reset the rows to the artwork's colors	Przywróć w wierszach kolory kompozycji
 	Color Theme Picker	Próbnik motywu kolorów
 	Click or drag across the art to pick its colors; Shift adds more	Kliknij lub przeciągnij po kompozycji, aby pobrać jej kolory; Shift dodaje kolejne
+	Prominent Colors	Dominujące kolory
+	Save All Colors	Zapisz wszystkie kolory
+	Save Prominent Colors	Zapisz dominujące kolory
 	Separate colors into rows	Rozdziel kolory na wiersze
 	Unlink harmony colors	Odłącz kolory harmonii
 	1 Color Job	Praca 1-kolorowa
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index afd10a5fbc..38eb7122f3 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -2442,6 +2442,9 @@ digits	Malayalam	Malaiala
 	Reset the rows to the artwork's colors	Redefinir as linhas para as cores da arte
 	Color Theme Picker	Seletor de Tema de Cores
 	Click or drag across the art to pick its colors; Shift adds more	Clique ou arraste sobre a arte para pegar suas cores; Shift adiciona mais
+	Prominent Colors	Cores Proeminentes
+	Save All Colors	Salvar Todas as Cores
+	Save Prominent Colors	Salvar Cores Proeminentes
 	Reset to Default	Redefinir para o Padrão
 	Reset to White, Black	Redefinir para Branco, Preto
 	Reset with Mesh…	Redefinir com Malha…
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index 2dca232079..4d069732ef 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -2934,6 +2934,9 @@ digits	Malayalam	Малаялам
 	Reset the rows to the artwork's colors	Сбросить строки к цветам рисунка
 	Color Theme Picker	Выбор цветовой темы
 	Click or drag across the art to pick its colors; Shift adds more	Щёлкните или проведите по рисунку, чтобы взять его цвета; Shift добавляет ещё
+	Prominent Colors	Преобладающие цвета
+	Save All Colors	Сохранить все цвета
+	Save Prominent Colors	Сохранить преобладающие цвета
 	Reset to Default	Сбросить к значениям по умолчанию
 	Reset to White, Black	Сбросить к белому, чёрному
 	Reset with Mesh	Сбросить с сеткой
diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv
index e47c4e8662..6311bca512 100644
--- a/crates/ui-egui/src/i18n/sv.tsv
+++ b/crates/ui-egui/src/i18n/sv.tsv
@@ -2840,6 +2840,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Återställ raderna till teckningens färger
 	Color Theme Picker	Färgtemaväljare
 	Click or drag across the art to pick its colors; Shift adds more	Klicka eller dra över teckningen för att hämta dess färger; Skift lägger till fler
+	Prominent Colors	Framträdande färger
+	Save All Colors	Spara alla färger
+	Save Prominent Colors	Spara framträdande färger
 	Reset to Default	Återställ till standard
 	Reset to White, Black	Återställ till vitt, svart
 	Reset with Mesh	Återställ med nät
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index 5983ec4bfe..310f7e8dae 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -2708,6 +2708,9 @@ digits	Malayalam	Malayalam
 	Reset the rows to the artwork's colors	Satırları resmin renklerine göre sıfırlayın
 	Color Theme Picker	Renk Teması Seçici
 	Click or drag across the art to pick its colors; Shift adds more	Renklerini almak için resme tıklayın veya üzerinde sürükleyin; Shift daha fazlasını ekler
+	Prominent Colors	Belirgin Renkler
+	Save All Colors	Tüm Renkleri Kaydet
+	Save Prominent Colors	Belirgin Renkleri Kaydet
 	Reset to Default	Varsayılana Sıfırla
 	Reset to White, Black	Beyaz, Siyah'a Sıfırla
 	Reset with Mesh	Mesh ile Sıfırla
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index 4c9326af72..6590c4bf76 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -2939,6 +2939,9 @@ digits	Malayalam	Малаялам
 	Reset the rows to the artwork's colors	Скинути рядки до кольорів малюнка
 	Color Theme Picker	Вибір колірної теми
 	Click or drag across the art to pick its colors; Shift adds more	Клацніть або проведіть по малюнку, щоб узяти його кольори; Shift додає ще
+	Prominent Colors	Переважні кольори
+	Save All Colors	Зберегти всі кольори
+	Save Prominent Colors	Зберегти переважні кольори
 	Reset to Default	Скинути до значень за замовчуванням
 	Reset to White, Black	Скинути до білого, чорного
 	Reset with Mesh	Скинути із сіткою
diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv
index fef0b8ff90..f485a03f51 100644
--- a/crates/ui-egui/src/i18n/vi.tsv
+++ b/crates/ui-egui/src/i18n/vi.tsv
@@ -3227,6 +3227,9 @@ mark-style	Japanese	Kiểu Nhật
 	Reset the rows to the artwork's colors	Đặt lại các hàng về màu của tác phẩm
 	Color Theme Picker	Bộ chọn bộ màu
 	Click or drag across the art to pick its colors; Shift adds more	Nhấp hoặc kéo qua tác phẩm để lấy màu của nó; Shift để thêm
+	Prominent Colors	Màu nổi bật
+	Save All Colors	Lưu tất cả màu
+	Save Prominent Colors	Lưu màu nổi bật
 	Reset to Default	Đặt lại về mặc định
 	Reset to default	Đặt lại về mặc định
 	Reset to White, Black	Đặt lại về Trắng, Đen
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index a0d941ada8..45e1c6d6fd 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -2804,6 +2804,9 @@ digits	Malayalam	马拉雅拉姆数字
 	Reset the rows to the artwork's colors	将各行重置为图稿的颜色
 	Color Theme Picker	色彩主题拾取器
 	Click or drag across the art to pick its colors; Shift adds more	单击或拖过图稿以拾取其颜色；按住 Shift 可添加更多
+	Prominent Colors	主要颜色
+	Save All Colors	存储所有颜色
+	Save Prominent Colors	存储主要颜色
 	Reset to Default	恢复默认
 	Reset to White, Black	重置为白、黑
 	Reset with Mesh	以网格重置
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index b724e57351..c6b1b68402 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -3999,6 +3999,9 @@ digits	Malayalam	馬來亞拉姆數字
 	Reset the rows to the artwork's colors	將各列重設為圖稿的顏色
 	Color Theme Picker	色彩主題選取器
 	Click or drag across the art to pick its colors; Shift adds more	按一下或拖過圖稿以選取其顏色；按住 Shift 可加入更多
+	Prominent Colors	主要顏色
+	Save All Colors	儲存所有顏色
+	Save Prominent Colors	儲存主要顏色
 	Reset to Default	重設為預設值
 	Reset to White, Black	重設為白色、黑色
 	Reset with Mesh	以網格重設
diff --git a/docs/mcp.md b/docs/mcp.md
index 20e37222c6..1f370735c6 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -3719,6 +3719,30 @@ excluded take the palette as their new colors in row order, the colors repeating
 {"name":"run_command","arguments":{"command":"recolor.pickTheme","params":{"picks":[{"at":[120,80]},{"rect":[200,40,320,140]}],"colors":4}}}
 ```
 
+`recolor.weigh {map, weights?, ids?}` is the dialog's Prominent Colors bar. It takes rows as `recolor.apply` does and
+returns them as `map`, each with `from` as a list, and `shares`: for each row, its percent of the uses (the `count` of
+`recolor.colors`) of the current colors of the rows that are not excluded, and 0 for an excluded row. A use counts for
+the row that `recolor.apply` recolors it with (rows with a new color first, an exact color before a hex color, then
+the first row that lists it), and otherwise for the first other row that lists it. A current color that no art uses
+counts nothing. Without `weights` the
+rows come back unchanged. `weights` holds one number of 0 or more per row; an excluded row's weight is ignored, and
+at least one other row needs a weight above 0. As VectorCraft's own rule, current colors then move one at a time
+between the rows that are not excluded and have a new color (`to`), as long as a move brings each row's share of the uses nearer its share of the
+weights. Of those moves, it takes first the color nearest in Lab to the first color of the row it goes to, compared
+with the row it leaves. A row keeps its first color, and the tints of one global swatch in a row move together. The
+colors that can move are compared with the rows at most 50,000,000 times in all; when those colors times the rows
+that are not excluded pass that, no color moves. Colors that stay in a row keep their order, and the colors that come
+to it follow them. The command changes nothing; `recolor.apply` with the returned `map` recolors the art. In the Recolor Artwork dialog the
+bar sits under the Edit tab's wheel: each row with a share is a part as wide as that share, in the row's new color,
+the largest first. Dragging the edge between two parts moves width between them, and when the drag ends the widths
+become the `weights` field, which moves the rows' current colors and previews the result. The New Color Group menu
+beside the link button runs `swatch.newGroup` right away, as its own undo step: Save All Colors saves the new colors
+of the rows that are not excluded, in row order, and Save Prominent Colors saves the bar's colors in the bar's order.
+
+```json
+{"name":"run_command","arguments":{"command":"recolor.weigh","params":{"map":[{"from":["rgb 255 0 0","rgb 128 0 204"],"to":"#00ff00"},{"from":["rgb 0 0 255"],"to":"#ffff00"}],"weights":[1,1]}}}
+```
+
 The `recolor.*` commands refuse parameters of the wrong form. A `limitTo` or `method` that is not a string gets the
 error for an unknown library or method. Other wrong-form parameters get an error that names them.
 `includeImages`, `includePatterns`, a row's `exclude`, `order`, `saturationBrightness` and the `white`, `black` and
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 5f10ea4841..8485de41ac 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -486,6 +486,8 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po
 
 - [x] Recolor Artwork › Color Theme Picker: with the button beside the tabs on, a click on the canvas takes the color palette of an object or image, a drag takes the palette of the art inside its marquee, and Shift adds more picks; the rows that aren't excluded take the palette as their new colors and the art previews them ([Recolor artwork](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/recolor-artwork.html)). The number and order of the picked colors are VectorCraft's own rule (`recolor.pickTheme`). Tests: `theme_picks_give_the_rows_the_palette_of_the_art_picked` and `the_theme_picker_takes_clicks_and_shift_drags_on_the_canvas` in `crates/ui-egui/src/dialogs/recolor.rs`, `theme_picker_*` in `crates/engine/src/tests/recolor.rs`.
 
+- [x] Recolor Artwork › Prominent Colors: with art, a bar under the Edit tab's wheel shows the new colors, each as wide as its share of the art; dragging the edge between two parts raises one color's weight and lowers the other's, and the art previews the result; the New Color Group menu has Save All Colors and Save Prominent Colors ([Recolor options overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/modify-colors/recolor-options-overview.html)). How a share is measured and how a weight moves colors between rows are VectorCraft's own rules (`recolor.weigh`). Tests: `weights_move_the_rows_colors_and_the_art_previews_them`, `dragging_a_prominent_edge_moves_colors_between_rows` and `save_all_and_prominent_colors_make_color_groups` in `crates/ui-egui/src/dialogs/recolor.rs`, `weigh_*` in `crates/engine/src/tests/recolor.rs`.
+
 - [x] Recolor Artwork Edit color chips scroll within the screen, preserving the wheel and actions (#3416); 5, 20, 200 and 400 colors, resizing and UI scaling, final-chip editing and preview/history covered by egui_kittest.
 
 - [x] Status messages and bounded readouts remain stable as values, canvas hover and background jobs change; ordinary values fit all registered languages and units, and optional groups yield in narrow windows (regressions; contributor rebuilt and confirmed the original-file status-bar scenario on 2026-10-19). Sample widths are cached per UI and refreshed only when language, document units or pixels per point changes.

From 3792561e1a0c01234857ad3bad22ceaaf6c779cb Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 00:51:37 -0800
Subject: [PATCH 02/48] Learn: View more opens a tutorial's practice sample,
 and Next Up shows the next tutorial

Under a tutorial's steps, View more opens the tutorial's practice sample
as a new untitled document, which becomes the active one; open documents
stay as they are, and Save asks where to save the copy. Each of the 12
tutorials has its own small SVG drawing in panels/learn/samples.rs, read
only when View more is pressed.

Once the sample is open, Finish tutorial marks the tutorial finished.
A finished tutorial shows Next Up with the next tutorial's title in the
same skill, and Next Up shows that tutorial without opening its sample.
After a skill's last tutorial the panel says so and shows Back to
skills; Next Up never moves to another skill. Finished tutorials are
kept while the app runs; the skill rings and counts do not show them
yet. The help page's short video is not part of this change.

- learn.openSample, learn.finish and learn.next run the three controls
  and are listed in the UI command catalogs; a missing, non-string or
  unknown tutorial id, or a step out of order, is an error and changes
  nothing.
- New labels and messages have rows in every catalog.
- Docs: docs/mcp.md, docs/target-app-parity.md, docs/ui-parity.md and
  the ASSETS.md line for art generated in code.
---
 ASSETS.md                                  |   2 +-
 crates/mcp/src/ui_catalog.rs               |  18 ++
 crates/ui-egui/src/i18n/bg.tsv             |  12 ++
 crates/ui-egui/src/i18n/bs.tsv             |  12 ++
 crates/ui-egui/src/i18n/ca.tsv             |  12 ++
 crates/ui-egui/src/i18n/cs.tsv             |  12 ++
 crates/ui-egui/src/i18n/da.tsv             |  12 ++
 crates/ui-egui/src/i18n/de.tsv             |  12 ++
 crates/ui-egui/src/i18n/el.tsv             |  12 ++
 crates/ui-egui/src/i18n/es.tsv             |  12 ++
 crates/ui-egui/src/i18n/fi.tsv             |  12 ++
 crates/ui-egui/src/i18n/fr.tsv             |  12 ++
 crates/ui-egui/src/i18n/hi.tsv             |  12 ++
 crates/ui-egui/src/i18n/hu.tsv             |  12 ++
 crates/ui-egui/src/i18n/id.tsv             |  12 ++
 crates/ui-egui/src/i18n/it.tsv             |  12 ++
 crates/ui-egui/src/i18n/ja.tsv             |  12 ++
 crates/ui-egui/src/i18n/ka.tsv             |  12 ++
 crates/ui-egui/src/i18n/ko.tsv             |  12 ++
 crates/ui-egui/src/i18n/nl.tsv             |  12 ++
 crates/ui-egui/src/i18n/pl.tsv             |  12 ++
 crates/ui-egui/src/i18n/pt-br.tsv          |  12 ++
 crates/ui-egui/src/i18n/ru.tsv             |  12 ++
 crates/ui-egui/src/i18n/sv.tsv             |  12 ++
 crates/ui-egui/src/i18n/tr.tsv             |  12 ++
 crates/ui-egui/src/i18n/uk.tsv             |  12 ++
 crates/ui-egui/src/i18n/vi.tsv             |  12 ++
 crates/ui-egui/src/i18n/zh-hans.tsv        |  12 ++
 crates/ui-egui/src/i18n/zh-hant.tsv        |  12 ++
 crates/ui-egui/src/menus/ui_commands.rs    |  18 ++
 crates/ui-egui/src/panels/learn.rs         | 135 ++++++++++++-
 crates/ui-egui/src/panels/learn/catalog.rs |   7 +
 crates/ui-egui/src/panels/learn/samples.rs | 103 ++++++++++
 crates/ui-egui/src/panels/learn/tests.rs   | 216 ++++++++++++++++++++-
 crates/ui-egui/src/state.rs                |   5 +
 docs/mcp.md                                |  20 +-
 docs/target-app-parity.md                  |   1 +
 docs/ui-parity.md                          |   2 +-
 38 files changed, 837 insertions(+), 14 deletions(-)
 create mode 100644 crates/ui-egui/src/panels/learn/samples.rs

diff --git a/ASSETS.md b/ASSETS.md
index 5658882d48..dbdd8b84d8 100644
--- a/ASSETS.md
+++ b/ASSETS.md
@@ -20,7 +20,7 @@ Every non-code asset in this repository (icons, images, fonts, example art, colo
 
 **Policy (mandatory):** VectorCraft contains **no Adobe iconography, images, artwork, presets, swatch/brush/symbol/pattern libraries or ICC profiles**. Every asset is either original work by VectorCraft contributors, or third-party material under an open licence (OSI open source, public domain / CC0, or Creative Commons that allows redistribution), and it is attributed below. Screenshots of Adobe software are never committed. The one exception is the ArtCraft name, wordmark and logos in `docs/brand/`: ArtCraft trademarks, not open source, usable only under [`docs/brand/LICENSE-brand.txt`](docs/brand/LICENSE-brand.txt).
 
-Generated-in-code art is original and has no file to list. This covers the default swatches, brushes, symbols, patterns, graphic styles, image-trace presets and the vector tool cursors (`crates/ui-egui/src/cursors.rs`).
+Generated-in-code art is original and has no file to list. This covers the default swatches, brushes, symbols, patterns, graphic styles, image-trace presets, the vector tool cursors (`crates/ui-egui/src/cursors.rs`) and the Learn panel's practice samples (`crates/ui-egui/src/panels/learn/samples.rs`).
 
 **Font files are never committed here.** Fonts shared by the Crafting Apps live in [storytold/craft-fonts](https://github.com/storytold/craft-fonts). The small Latin UI/document fonts below predate that rule and stay.
 
diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs
index 342feb568c..bffe47bfa7 100644
--- a/crates/mcp/src/ui_catalog.rs
+++ b/crates/mcp/src/ui_catalog.rs
@@ -658,6 +658,24 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "",
         "{tool: a tool id, as tool.select takes} mark where that tool is for 3 seconds without choosing it, as the link on a tool's name in a Learn tutorial step does: its toolbar button, a row of its collapsed group's flyout (which opens), its group's torn-off strip (which comes to the front), or, when no shown toolbar holds it, its row in the All Tools drawer (which opens); a Tools panel hidden with Window › Tools shows again; Escape or the next locate removes the mark; a missing, non-string or unknown id is an error and changes nothing; returns {tool, location: toolbar|flyout|strip|allTools|unavailable, toolbar: the name of the toolbar made with New Toolbar that holds it, or null}, with reason when Presentation Mode or Tab hides the toolbars",
     ),
+    (
+        "learn.openSample",
+        "Open Tutorial Sample",
+        "",
+        "{tutorial: id (see learn.list)} open that tutorial's practice sample as a new untitled document, which becomes the active one, and move the Learn view to the tutorial, as its View more button does; each call opens another copy and open documents stay as they are; a missing, non-string or unknown id is an error and changes nothing; returns {tutorial, index, title} of the new document",
+    ),
+    (
+        "learn.finish",
+        "Finish Tutorial",
+        "",
+        "{tutorial: id (see learn.list)} mark a tutorial whose sample learn.openSample opened as finished, as its Finish tutorial button does; finishing it again keeps one entry; a missing, non-string or unknown id, or a tutorial whose sample was not opened, is an error and changes nothing; returns {tutorial, finished: true, next: id of the next tutorial in its skill, or null after the skill's last one}",
+    ),
+    (
+        "learn.next",
+        "Next Tutorial",
+        "",
+        "{tutorial: id (see learn.list)} show the Learn panel on the tutorial after a finished one in the same skill, as its Next Up button does, without opening a sample; a missing, non-string or unknown id, a tutorial not finished, or a skill's last tutorial is an error and changes nothing; returns {skill, tutorial, title} of the next tutorial",
+    ),
     ("window.brightness", "UI Brightness", "", "{brightness: dark|mediumDark|mediumLight|light}"),
     (
         "window.workspace",
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 3828d9ba2d..0cc6e106ce 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -6744,6 +6744,18 @@ breakText	Glyphs	Глифи
 	Show where this tool is	Показване къде е този инструмент
 @msg	missing `tutorial` (see learn.list)	липсва `tutorial` (вижте learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	непознат урок `{id}` (вижте learn.list)
+	View more	Вижте повече
+	Finish tutorial	Завършване на урока
+	Next Up	Следващ
+	You finished the last tutorial in this skill.	Завършихте последния урок в това умение.
+	Back to skills	Обратно към уменията
+	Open Tutorial Sample	Отваряне на примерния файл на урока
+	Finish Tutorial	Завършване на урок
+	Next Tutorial	Следващ урок
+@msg	tutorial `{id}` has no practice sample	урокът `{id}` няма примерен файл за упражнение
+@msg	open the practice sample of `{id}` first (see learn.openSample)	първо отворете примерния файл за упражнение на `{id}` (вижте learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	първо завършете `{id}` (вижте learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` е последният урок в своето умение
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Обновяване на отложените ефекти
diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv
index 81fee3a079..2df8131afe 100644
--- a/crates/ui-egui/src/i18n/bs.tsv
+++ b/crates/ui-egui/src/i18n/bs.tsv
@@ -6798,6 +6798,18 @@ shape	Open	Otvoren
 	Show where this tool is	Prikaži gdje je ovaj alat
 @msg	missing `tutorial` (see learn.list)	nedostaje `tutorial` (vidi learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	nepoznat tutorijal `{id}` (vidi learn.list)
+	View more	Prikaži više
+	Finish tutorial	Završi tutorijal
+	Next Up	Sljedeće
+	You finished the last tutorial in this skill.	Završili ste posljednji tutorijal u ovoj vještini.
+	Back to skills	Nazad na vještine
+	Open Tutorial Sample	Otvori uzorak tutorijala
+	Finish Tutorial	Završi tutorijal
+	Next Tutorial	Sljedeći tutorijal
+@msg	tutorial `{id}` has no practice sample	tutorijal `{id}` nema uzorak za vježbu
+@msg	open the practice sample of `{id}` first (see learn.openSample)	prvo otvorite uzorak za vježbu tutorijala `{id}` (vidi learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	prvo završite `{id}` (vidi learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` je posljednji tutorijal u svojoj vještini
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Osvježi odgođene efekte
diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv
index 02ae0f4a09..71959a3767 100644
--- a/crates/ui-egui/src/i18n/ca.tsv
+++ b/crates/ui-egui/src/i18n/ca.tsv
@@ -7321,6 +7321,18 @@ breakText	Glyphs	Glifs
 	Show where this tool is	Mostra on és aquesta eina
 @msg	missing `tutorial` (see learn.list)	falta `tutorial` (vegeu learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tutorial desconegut `{id}` (vegeu learn.list)
+	View more	Mostra’n més
+	Finish tutorial	Acaba el tutorial
+	Next Up	A continuació
+	You finished the last tutorial in this skill.	Heu acabat l’últim tutorial d’aquesta habilitat.
+	Back to skills	Torna a les habilitats
+	Open Tutorial Sample	Obre la mostra del tutorial
+	Finish Tutorial	Acaba el tutorial
+	Next Tutorial	Tutorial següent
+@msg	tutorial `{id}` has no practice sample	el tutorial `{id}` no té cap mostra de pràctica
+@msg	open the practice sample of `{id}` first (see learn.openSample)	obriu primer la mostra de pràctica de `{id}` (vegeu learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	acabeu primer `{id}` (vegeu learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` és l’últim tutorial de la seva habilitat
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Actualitza els efectes ajornats
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index 7e3794e8a1..ca6c1cb875 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -7340,6 +7340,18 @@ breakText	Glyphs	Glyfy
 	Show where this tool is	Zobrazit, kde je tento nástroj
 @msg	missing `tutorial` (see learn.list)	chybí `tutorial` (viz learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	neznámý výukový kurz `{id}` (viz learn.list)
+	View more	Zobrazit více
+	Finish tutorial	Dokončit výukový kurz
+	Next Up	Další
+	You finished the last tutorial in this skill.	Dokončili jste poslední výukový kurz této dovednosti.
+	Back to skills	Zpět na dovednosti
+	Open Tutorial Sample	Otevřít ukázku výukového kurzu
+	Finish Tutorial	Dokončit výukový kurz
+	Next Tutorial	Další výukový kurz
+@msg	tutorial `{id}` has no practice sample	výukový kurz `{id}` nemá cvičnou ukázku
+@msg	open the practice sample of `{id}` first (see learn.openSample)	nejprve otevřete cvičnou ukázku kurzu `{id}` (viz learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	nejprve dokončete `{id}` (viz learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` je poslední výukový kurz své dovednosti
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Obnovit odložené efekty
diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv
index f7011e23bf..70411cbd00 100644
--- a/crates/ui-egui/src/i18n/da.tsv
+++ b/crates/ui-egui/src/i18n/da.tsv
@@ -6760,6 +6760,18 @@ breakText	Glyphs	Glyffer
 	Show where this tool is	Vis, hvor dette værktøj er
 @msg	missing `tutorial` (see learn.list)	`tutorial` mangler (se learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	ukendt vejledning `{id}` (se learn.list)
+	View more	Vis mere
+	Finish tutorial	Afslut vejledning
+	Next Up	Næste
+	You finished the last tutorial in this skill.	Du har afsluttet den sidste vejledning i denne færdighed.
+	Back to skills	Tilbage til færdigheder
+	Open Tutorial Sample	Åbn eksempel til vejledning
+	Finish Tutorial	Afslut vejledning
+	Next Tutorial	Næste vejledning
+@msg	tutorial `{id}` has no practice sample	vejledningen `{id}` har intet øvelseseksempel
+@msg	open the practice sample of `{id}` first (see learn.openSample)	åbn først øvelseseksemplet til `{id}` (se learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	afslut først `{id}` (se learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` er den sidste vejledning i sin færdighed
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Opdatér udskudte effekter
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index 4174537f87..eceefc5fb0 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -6935,6 +6935,18 @@ breakText	Glyphs	Glyphen
 	Show where this tool is	Zeigen, wo sich dieses Werkzeug befindet
 @msg	missing `tutorial` (see learn.list)	`tutorial` fehlt (siehe learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	unbekanntes Lernprogramm `{id}` (siehe learn.list)
+	View more	Mehr anzeigen
+	Finish tutorial	Lernprogramm abschließen
+	Next Up	Als Nächstes
+	You finished the last tutorial in this skill.	Sie haben das letzte Lernprogramm dieser Fertigkeit abgeschlossen.
+	Back to skills	Zurück zu den Fertigkeiten
+	Open Tutorial Sample	Übungsdatei des Lernprogramms öffnen
+	Finish Tutorial	Lernprogramm abschließen
+	Next Tutorial	Nächstes Lernprogramm
+@msg	tutorial `{id}` has no practice sample	das Lernprogramm `{id}` hat keine Übungsdatei
+@msg	open the practice sample of `{id}` first (see learn.openSample)	öffnen Sie zuerst die Übungsdatei von `{id}` (siehe learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	schließen Sie zuerst `{id}` ab (siehe learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` ist das letzte Lernprogramm seiner Fertigkeit
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Zurückgestellte Effekte aktualisieren
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index bde2fbee78..79e834ebee 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -7292,6 +7292,18 @@ breakText	Glyphs	Γλύφοι
 	Show where this tool is	Εμφάνιση της θέσης αυτού του εργαλείου
 @msg	missing `tutorial` (see learn.list)	λείπει το `tutorial` (δείτε learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	άγνωστος οδηγός εκμάθησης `{id}` (δείτε learn.list)
+	View more	Προβολή περισσότερων
+	Finish tutorial	Ολοκλήρωση οδηγού
+	Next Up	Επόμενο
+	You finished the last tutorial in this skill.	Ολοκληρώσατε τον τελευταίο οδηγό εκμάθησης αυτής της δεξιότητας.
+	Back to skills	Πίσω στις δεξιότητες
+	Open Tutorial Sample	Άνοιγμα δείγματος οδηγού εκμάθησης
+	Finish Tutorial	Ολοκλήρωση οδηγού εκμάθησης
+	Next Tutorial	Επόμενος οδηγός εκμάθησης
+@msg	tutorial `{id}` has no practice sample	ο οδηγός εκμάθησης `{id}` δεν έχει δείγμα εξάσκησης
+@msg	open the practice sample of `{id}` first (see learn.openSample)	ανοίξτε πρώτα το δείγμα εξάσκησης του `{id}` (δείτε learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	ολοκληρώστε πρώτα το `{id}` (δείτε learn.finish)
+@msg	`{id}` is the last tutorial in its skill	το `{id}` είναι ο τελευταίος οδηγός εκμάθησης της δεξιότητάς του
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Ανανέωση εφέ σε αναμονή
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index ff28d9dfc5..905221dc68 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -7283,6 +7283,18 @@ breakText	Glyphs	Glifos
 	Show where this tool is	Mostrar dónde está esta herramienta
 @msg	missing `tutorial` (see learn.list)	falta `tutorial` (consulta learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tutorial desconocido `{id}` (consulta learn.list)
+	View more	Ver más
+	Finish tutorial	Terminar tutorial
+	Next Up	A continuación
+	You finished the last tutorial in this skill.	Has terminado el último tutorial de esta habilidad.
+	Back to skills	Volver a las habilidades
+	Open Tutorial Sample	Abrir muestra del tutorial
+	Finish Tutorial	Terminar tutorial
+	Next Tutorial	Tutorial siguiente
+@msg	tutorial `{id}` has no practice sample	el tutorial `{id}` no tiene muestra de práctica
+@msg	open the practice sample of `{id}` first (see learn.openSample)	abre primero la muestra de práctica de `{id}` (consulta learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	termina primero `{id}` (consulta learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` es el último tutorial de su habilidad
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Actualizar efectos aplazados
diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv
index bb74188ed8..2227a31c33 100644
--- a/crates/ui-egui/src/i18n/fi.tsv
+++ b/crates/ui-egui/src/i18n/fi.tsv
@@ -7375,6 +7375,18 @@ breakText	Glyphs	Merkit
 	Show where this tool is	Näytä, missä tämä työkalu on
 @msg	missing `tutorial` (see learn.list)	`tutorial` puuttuu (ks. learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tuntematon opetusohjelma `{id}` (ks. learn.list)
+	View more	Näytä lisää
+	Finish tutorial	Viimeistele opetusohjelma
+	Next Up	Seuraavaksi
+	You finished the last tutorial in this skill.	Viimeistelit tämän taidon viimeisen opetusohjelman.
+	Back to skills	Takaisin taitoihin
+	Open Tutorial Sample	Avaa opetusohjelman harjoitustiedosto
+	Finish Tutorial	Viimeistele opetusohjelma
+	Next Tutorial	Seuraava opetusohjelma
+@msg	tutorial `{id}` has no practice sample	opetusohjelmalla `{id}` ei ole harjoitustiedostoa
+@msg	open the practice sample of `{id}` first (see learn.openSample)	avaa ensin opetusohjelman `{id}` harjoitustiedosto (ks. learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	viimeistele ensin `{id}` (ks. learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` on taitonsa viimeinen opetusohjelma
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Päivitä lykätyt tehosteet
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index 09c9c35b0d..22d5e3d376 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -7335,6 +7335,18 @@ breakText	Glyphs	Glyphes
 	Show where this tool is	Afficher l'emplacement de cet outil
 @msg	missing `tutorial` (see learn.list)	`tutorial` manquant (voir learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tutoriel inconnu `{id}` (voir learn.list)
+	View more	Voir plus
+	Finish tutorial	Terminer le tutoriel
+	Next Up	À suivre
+	You finished the last tutorial in this skill.	Vous avez terminé le dernier tutoriel de cette compétence.
+	Back to skills	Retour aux compétences
+	Open Tutorial Sample	Ouvrir le fichier d’exercice du tutoriel
+	Finish Tutorial	Terminer le tutoriel
+	Next Tutorial	Tutoriel suivant
+@msg	tutorial `{id}` has no practice sample	le tutoriel `{id}` n’a pas de fichier d’exercice
+@msg	open the practice sample of `{id}` first (see learn.openSample)	ouvrez d’abord le fichier d’exercice de `{id}` (voir learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	terminez d’abord `{id}` (voir learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` est le dernier tutoriel de sa compétence
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Actualiser les effets différés
diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv
index 9aa4bd7b99..996e534ef0 100644
--- a/crates/ui-egui/src/i18n/hi.tsv
+++ b/crates/ui-egui/src/i18n/hi.tsv
@@ -8733,6 +8733,18 @@ theme	Appearance	अपीयरेंस
 	Show where this tool is	दिखाएँ कि यह टूल कहाँ है
 @msg	missing `tutorial` (see learn.list)	लापता `tutorial` (learn.list देखें)
 @msg	unknown tutorial `{id}` (see learn.list)	अज्ञात ट्यूटोरियल `{id}` (learn.list देखें)
+	View more	और देखें
+	Finish tutorial	ट्यूटोरियल पूरा करें
+	Next Up	आगे
+	You finished the last tutorial in this skill.	आपने इस कौशल का अंतिम ट्यूटोरियल पूरा कर लिया है।
+	Back to skills	कौशल पर वापस जाएँ
+	Open Tutorial Sample	ट्यूटोरियल का नमूना खोलें
+	Finish Tutorial	ट्यूटोरियल पूरा करें
+	Next Tutorial	अगला ट्यूटोरियल
+@msg	tutorial `{id}` has no practice sample	ट्यूटोरियल `{id}` का कोई अभ्यास नमूना नहीं है
+@msg	open the practice sample of `{id}` first (see learn.openSample)	पहले `{id}` का अभ्यास नमूना खोलें (learn.openSample देखें)
+@msg	finish `{id}` first (see learn.finish)	पहले `{id}` पूरा करें (learn.finish देखें)
+@msg	`{id}` is the last tutorial in its skill	`{id}` अपने कौशल का अंतिम ट्यूटोरियल है
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	स्थगित इफ़ेक्ट्स रिफ्रेश करें
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index af6f586880..5c38da2fb4 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -7324,6 +7324,18 @@ breakText	Glyphs	Glifák
 	Show where this tool is	Megmutatja, hol van ez az eszköz
 @msg	missing `tutorial` (see learn.list)	hiányzik: `tutorial` (lásd: learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	ismeretlen oktatóanyag: `{id}` (lásd: learn.list)
+	View more	Továbbiak
+	Finish tutorial	Oktatóanyag befejezése
+	Next Up	Következő
+	You finished the last tutorial in this skill.	Befejezte a készség utolsó oktatóanyagát.
+	Back to skills	Vissza a készségekhez
+	Open Tutorial Sample	Oktatóanyag mintafájljának megnyitása
+	Finish Tutorial	Oktatóanyag befejezése
+	Next Tutorial	Következő oktatóanyag
+@msg	tutorial `{id}` has no practice sample	nincs gyakorló mintafájl ehhez az oktatóanyaghoz: `{id}`
+@msg	open the practice sample of `{id}` first (see learn.openSample)	előbb nyissa meg a gyakorló mintafájlt ehhez: `{id}` (lásd: learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	előbb fejezze be ezt: `{id}` (lásd: learn.finish)
+@msg	`{id}` is the last tutorial in its skill	a készsége utolsó oktatóanyaga: `{id}`
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Elhalasztott effektusok frissítése
diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv
index e0ba31ecd5..75b03775f3 100644
--- a/crates/ui-egui/src/i18n/id.tsv
+++ b/crates/ui-egui/src/i18n/id.tsv
@@ -6760,6 +6760,18 @@ breakText	Glyphs	Glif
 	Show where this tool is	Tampilkan letak alat ini
 @msg	missing `tutorial` (see learn.list)	`tutorial` tidak ada (lihat learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tutorial `{id}` tidak dikenal (lihat learn.list)
+	View more	Lihat selengkapnya
+	Finish tutorial	Selesaikan tutorial
+	Next Up	Berikutnya
+	You finished the last tutorial in this skill.	Anda telah menyelesaikan tutorial terakhir dalam keterampilan ini.
+	Back to skills	Kembali ke keterampilan
+	Open Tutorial Sample	Buka contoh tutorial
+	Finish Tutorial	Selesaikan tutorial
+	Next Tutorial	Tutorial berikutnya
+@msg	tutorial `{id}` has no practice sample	tutorial `{id}` tidak memiliki contoh latihan
+@msg	open the practice sample of `{id}` first (see learn.openSample)	buka contoh latihan `{id}` terlebih dahulu (lihat learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	selesaikan `{id}` terlebih dahulu (lihat learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` adalah tutorial terakhir dalam keterampilannya
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Segarkan efek yang ditunda
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index ce0bc58ce5..1304d8cf61 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -6969,6 +6969,18 @@ breakText	Glyphs	Glifi
 	Show where this tool is	Mostra dove si trova questo strumento
 @msg	missing `tutorial` (see learn.list)	manca `tutorial` (vedi learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tutorial sconosciuto `{id}` (vedi learn.list)
+	View more	Mostra altro
+	Finish tutorial	Termina il tutorial
+	Next Up	Prossimo
+	You finished the last tutorial in this skill.	Hai terminato l’ultimo tutorial di questa competenza.
+	Back to skills	Torna alle competenze
+	Open Tutorial Sample	Apri l’esempio del tutorial
+	Finish Tutorial	Termina il tutorial
+	Next Tutorial	Tutorial successivo
+@msg	tutorial `{id}` has no practice sample	il tutorial `{id}` non ha un esempio di esercitazione
+@msg	open the practice sample of `{id}` first (see learn.openSample)	apri prima l’esempio di esercitazione di `{id}` (vedi learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	termina prima `{id}` (vedi learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` è l’ultimo tutorial della sua competenza
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Aggiorna effetti rimandati
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index 1ecce4618a..1d5d882a82 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -7034,6 +7034,18 @@ breakText	Glyphs	字形
 	Show where this tool is	このツールの場所を表示
 @msg	missing `tutorial` (see learn.list)	`tutorial` が指定されていません (learn.list を参照)
 @msg	unknown tutorial `{id}` (see learn.list)	`{id}` は不明なチュートリアルです (learn.list を参照)
+	View more	詳細を見る
+	Finish tutorial	チュートリアルを完了
+	Next Up	次へ
+	You finished the last tutorial in this skill.	このスキルの最後のチュートリアルを完了しました。
+	Back to skills	スキルに戻る
+	Open Tutorial Sample	チュートリアルのサンプルを開く
+	Finish Tutorial	チュートリアルを完了
+	Next Tutorial	次のチュートリアル
+@msg	tutorial `{id}` has no practice sample	チュートリアル `{id}` には練習用サンプルがありません
+@msg	open the practice sample of `{id}` first (see learn.openSample)	先に `{id}` の練習用サンプルを開いてください (learn.openSample を参照)
+@msg	finish `{id}` first (see learn.finish)	先に `{id}` を完了してください (learn.finish を参照)
+@msg	`{id}` is the last tutorial in its skill	`{id}` はこのスキルの最後のチュートリアルです
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	保留中の効果を更新
diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv
index 3d6425c373..8e4de4c62d 100644
--- a/crates/ui-egui/src/i18n/ka.tsv
+++ b/crates/ui-egui/src/i18n/ka.tsv
@@ -7454,6 +7454,18 @@ font-script	Japanese	იაპონური
 	Show where this tool is	ამ ხელსაწყოს მდებარეობის ჩვენება
 @msg	missing `tutorial` (see learn.list)	აკლია `tutorial` (იხ. learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	უცნობი გაკვეთილი `{id}` (იხ. learn.list)
+	View more	მეტის ნახვა
+	Finish tutorial	გაკვეთილის დასრულება
+	Next Up	შემდეგი
+	You finished the last tutorial in this skill.	თქვენ დაასრულეთ ამ უნარის ბოლო გაკვეთილი.
+	Back to skills	უნარებზე დაბრუნება
+	Open Tutorial Sample	გაკვეთილის ნიმუშის გახსნა
+	Finish Tutorial	გაკვეთილის დასრულება
+	Next Tutorial	შემდეგი გაკვეთილი
+@msg	tutorial `{id}` has no practice sample	გაკვეთილს `{id}` არ აქვს სავარჯიშო ნიმუში
+@msg	open the practice sample of `{id}` first (see learn.openSample)	ჯერ გახსენით `{id}` გაკვეთილის სავარჯიშო ნიმუში (იხ. learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	ჯერ დაასრულეთ `{id}` (იხ. learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` თავისი უნარის ბოლო გაკვეთილია
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	გადადებული ეფექტების განახლება
diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv
index fb87488d64..7d8f77477b 100644
--- a/crates/ui-egui/src/i18n/ko.tsv
+++ b/crates/ui-egui/src/i18n/ko.tsv
@@ -6930,6 +6930,18 @@ breakText	Glyphs	글리프
 	Show where this tool is	이 도구의 위치 표시
 @msg	missing `tutorial` (see learn.list)	`tutorial`이 없습니다(learn.list 참조)
 @msg	unknown tutorial `{id}` (see learn.list)	알 수 없는 튜토리얼 `{id}`(learn.list 참조)
+	View more	자세히 보기
+	Finish tutorial	튜토리얼 완료
+	Next Up	다음
+	You finished the last tutorial in this skill.	이 기술의 마지막 튜토리얼을 완료했습니다.
+	Back to skills	기술로 돌아가기
+	Open Tutorial Sample	튜토리얼 샘플 열기
+	Finish Tutorial	튜토리얼 완료
+	Next Tutorial	다음 튜토리얼
+@msg	tutorial `{id}` has no practice sample	튜토리얼 `{id}`에 연습용 샘플이 없습니다
+@msg	open the practice sample of `{id}` first (see learn.openSample)	먼저 `{id}`의 연습용 샘플을 여세요(learn.openSample 참조)
+@msg	finish `{id}` first (see learn.finish)	먼저 `{id}`을(를) 완료하세요(learn.finish 참조)
+@msg	`{id}` is the last tutorial in its skill	`{id}`은(는) 해당 기술의 마지막 튜토리얼입니다
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	보류된 효과 새로 고침
diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv
index b3388fa82a..db793697a6 100644
--- a/crates/ui-egui/src/i18n/nl.tsv
+++ b/crates/ui-egui/src/i18n/nl.tsv
@@ -6811,6 +6811,18 @@ breakText	Glyphs	Glyphs
 	Show where this tool is	Tonen waar dit gereedschap zich bevindt
 @msg	missing `tutorial` (see learn.list)	`tutorial` ontbreekt (zie learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	onbekende tutorial `{id}` (zie learn.list)
+	View more	Meer weergeven
+	Finish tutorial	Tutorial voltooien
+	Next Up	Hierna
+	You finished the last tutorial in this skill.	Je hebt de laatste tutorial van deze vaardigheid voltooid.
+	Back to skills	Terug naar vaardigheden
+	Open Tutorial Sample	Oefenbestand van tutorial openen
+	Finish Tutorial	Tutorial voltooien
+	Next Tutorial	Volgende tutorial
+@msg	tutorial `{id}` has no practice sample	tutorial `{id}` heeft geen oefenbestand
+@msg	open the practice sample of `{id}` first (see learn.openSample)	open eerst het oefenbestand van `{id}` (zie learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	voltooi eerst `{id}` (zie learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` is de laatste tutorial van zijn vaardigheid
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Uitgestelde effecten vernieuwen
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index 0729e35c79..372697fdef 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -7196,6 +7196,18 @@ breakText	Glyphs	Glify
 	Show where this tool is	Pokaż, gdzie jest to narzędzie
 @msg	missing `tutorial` (see learn.list)	brak `tutorial` (patrz learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	nieznany samouczek `{id}` (patrz learn.list)
+	View more	Pokaż więcej
+	Finish tutorial	Zakończ samouczek
+	Next Up	Następny
+	You finished the last tutorial in this skill.	Ukończono ostatni samouczek tej umiejętności.
+	Back to skills	Powrót do umiejętności
+	Open Tutorial Sample	Otwórz przykład samouczka
+	Finish Tutorial	Zakończ samouczek
+	Next Tutorial	Następny samouczek
+@msg	tutorial `{id}` has no practice sample	samouczek `{id}` nie ma przykładu do ćwiczeń
+@msg	open the practice sample of `{id}` first (see learn.openSample)	najpierw otwórz przykład do ćwiczeń samouczka `{id}` (patrz learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	najpierw zakończ `{id}` (patrz learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` to ostatni samouczek swojej umiejętności
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Odśwież odroczone efekty
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index 36f778dbd5..728f11dafa 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -7413,6 +7413,18 @@ swatch	Yellow Green	Verde-amarelado
 	Show where this tool is	Mostrar onde está esta ferramenta
 @msg	missing `tutorial` (see learn.list)	falta `tutorial` (veja learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	tutorial desconhecido `{id}` (veja learn.list)
+	View more	Ver mais
+	Finish tutorial	Concluir tutorial
+	Next Up	A seguir
+	You finished the last tutorial in this skill.	Você concluiu o último tutorial desta habilidade.
+	Back to skills	Voltar às habilidades
+	Open Tutorial Sample	Abrir Amostra do Tutorial
+	Finish Tutorial	Concluir Tutorial
+	Next Tutorial	Próximo Tutorial
+@msg	tutorial `{id}` has no practice sample	o tutorial `{id}` não tem amostra de prática
+@msg	open the practice sample of `{id}` first (see learn.openSample)	abra primeiro a amostra de prática de `{id}` (veja learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	conclua primeiro `{id}` (veja learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` é o último tutorial da sua habilidade
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Atualizar Efeitos Adiados
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index 442a9612d4..2f5708c436 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -7429,6 +7429,18 @@ shape	Open	Открытый
 	Show where this tool is	Показать, где находится этот инструмент
 @msg	missing `tutorial` (see learn.list)	отсутствует `tutorial` (см. learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	неизвестный урок `{id}` (см. learn.list)
+	View more	Подробнее
+	Finish tutorial	Завершить урок
+	Next Up	Далее
+	You finished the last tutorial in this skill.	Вы завершили последний урок этого навыка.
+	Back to skills	Назад к навыкам
+	Open Tutorial Sample	Открыть пример урока
+	Finish Tutorial	Завершить урок
+	Next Tutorial	Следующий урок
+@msg	tutorial `{id}` has no practice sample	у урока `{id}` нет учебного примера
+@msg	open the practice sample of `{id}` first (see learn.openSample)	сначала откройте учебный пример урока `{id}` (см. learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	сначала завершите `{id}` (см. learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` является последним уроком своего навыка
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Обновить отложенные эффекты
diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv
index cc871ad8a3..a05aa652d6 100644
--- a/crates/ui-egui/src/i18n/sv.tsv
+++ b/crates/ui-egui/src/i18n/sv.tsv
@@ -8779,6 +8779,18 @@ digits	Hindi	Hindi
 	Show where this tool is	Visa var det här verktyget finns
 @msg	missing `tutorial` (see learn.list)	`tutorial` saknas (se learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	okänd självstudie `{id}` (se learn.list)
+	View more	Visa mer
+	Finish tutorial	Slutför självstudien
+	Next Up	Nästa
+	You finished the last tutorial in this skill.	Du har slutfört den sista självstudien i den här färdigheten.
+	Back to skills	Tillbaka till färdigheter
+	Open Tutorial Sample	Öppna övningsexempel för självstudie
+	Finish Tutorial	Slutför självstudie
+	Next Tutorial	Nästa självstudie
+@msg	tutorial `{id}` has no practice sample	självstudien `{id}` har inget övningsexempel
+@msg	open the practice sample of `{id}` first (see learn.openSample)	öppna först övningsexemplet för `{id}` (se learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	slutför först `{id}` (se learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` är den sista självstudien i sin färdighet
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Uppdatera uppskjutna effekter
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index ef8773c31b..1c310c7f6e 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -7296,6 +7296,18 @@ breakText	Glyphs	Glifler
 	Show where this tool is	Bu aracın nerede olduğunu göster
 @msg	missing `tutorial` (see learn.list)	`tutorial` eksik (bkz. learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	bilinmeyen öğretici `{id}` (bkz. learn.list)
+	View more	Daha fazlasını gör
+	Finish tutorial	Öğreticiyi bitir
+	Next Up	Sıradaki
+	You finished the last tutorial in this skill.	Bu becerinin son öğreticisini bitirdiniz.
+	Back to skills	Becerilere dön
+	Open Tutorial Sample	Öğretici Örneğini Aç
+	Finish Tutorial	Öğreticiyi Bitir
+	Next Tutorial	Sonraki Öğretici
+@msg	tutorial `{id}` has no practice sample	`{id}` öğreticisinin alıştırma örneği yok
+@msg	open the practice sample of `{id}` first (see learn.openSample)	önce `{id}` öğreticisinin alıştırma örneğini açın (bkz. learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	önce `{id}` öğreticisini bitirin (bkz. learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}`, becerisinin son öğreticisidir
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Ertelenen Efektleri Yenile
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index 0bccbd8cb6..5f7de5c52f 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -6949,6 +6949,18 @@ breakText	Glyphs	Гліфи
 	Show where this tool is	Показати, де розташований цей інструмент
 @msg	missing `tutorial` (see learn.list)	відсутній `tutorial` (див. learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	невідомий урок `{id}` (див. learn.list)
+	View more	Докладніше
+	Finish tutorial	Завершити урок
+	Next Up	Далі
+	You finished the last tutorial in this skill.	Ви завершили останній урок цієї навички.
+	Back to skills	Назад до навичок
+	Open Tutorial Sample	Відкрити приклад уроку
+	Finish Tutorial	Завершити урок
+	Next Tutorial	Наступний урок
+@msg	tutorial `{id}` has no practice sample	урок `{id}` не має навчального прикладу
+@msg	open the practice sample of `{id}` first (see learn.openSample)	спочатку відкрийте навчальний приклад уроку `{id}` (див. learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	спочатку завершіть `{id}` (див. learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` є останнім уроком своєї навички
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Оновити відкладені ефекти
diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv
index 4f084029db..5fad3e2493 100644
--- a/crates/ui-egui/src/i18n/vi.tsv
+++ b/crates/ui-egui/src/i18n/vi.tsv
@@ -6950,6 +6950,18 @@ breakText	Glyphs	Glyph
 	Show where this tool is	Hiện vị trí của công cụ này
 @msg	missing `tutorial` (see learn.list)	thiếu `tutorial` (xem learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	hướng dẫn không xác định `{id}` (xem learn.list)
+	View more	Xem thêm
+	Finish tutorial	Hoàn tất hướng dẫn
+	Next Up	Tiếp theo
+	You finished the last tutorial in this skill.	Bạn đã hoàn tất hướng dẫn cuối cùng của kỹ năng này.
+	Back to skills	Quay lại kỹ năng
+	Open Tutorial Sample	Mở tệp mẫu của hướng dẫn
+	Finish Tutorial	Hoàn tất hướng dẫn
+	Next Tutorial	Hướng dẫn tiếp theo
+@msg	tutorial `{id}` has no practice sample	hướng dẫn `{id}` không có tệp mẫu thực hành
+@msg	open the practice sample of `{id}` first (see learn.openSample)	hãy mở tệp mẫu thực hành của `{id}` trước (xem learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	hãy hoàn tất `{id}` trước (xem learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` là hướng dẫn cuối cùng trong kỹ năng của nó
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	Làm mới hiệu ứng bị hoãn
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index b04e65a65b..f6e69e53c5 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -7178,6 +7178,18 @@ breakText	Glyphs	字形
 	Show where this tool is	显示此工具的位置
 @msg	missing `tutorial` (see learn.list)	缺少 `tutorial` (请参阅 learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	未知教程 `{id}` (请参阅 learn.list)
+	View more	查看更多
+	Finish tutorial	完成教程
+	Next Up	下一个
+	You finished the last tutorial in this skill.	你已完成此技能的最后一个教程。
+	Back to skills	返回技能
+	Open Tutorial Sample	打开教程示例
+	Finish Tutorial	完成教程
+	Next Tutorial	下一个教程
+@msg	tutorial `{id}` has no practice sample	教程 `{id}` 没有练习示例
+@msg	open the practice sample of `{id}` first (see learn.openSample)	请先打开 `{id}` 的练习示例 (请参阅 learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	请先完成 `{id}` (请参阅 learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` 是其技能的最后一个教程
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	刷新延迟的效果
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index be62fde8a7..c9d6631fb3 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -6984,6 +6984,18 @@ breakText	Glyphs	字符
 	Show where this tool is	顯示此工具的位置
 @msg	missing `tutorial` (see learn.list)	未提供 `tutorial` (請參閱 learn.list)
 @msg	unknown tutorial `{id}` (see learn.list)	未知的教學課程 `{id}` (請參閱 learn.list)
+	View more	檢視更多
+	Finish tutorial	完成教學課程
+	Next Up	接下來
+	You finished the last tutorial in this skill.	你已完成此技能的最後一個教學課程。
+	Back to skills	返回技能
+	Open Tutorial Sample	開啟教學課程範例
+	Finish Tutorial	完成教學課程
+	Next Tutorial	下一個教學課程
+@msg	tutorial `{id}` has no practice sample	教學課程 `{id}` 沒有練習範例
+@msg	open the practice sample of `{id}` first (see learn.openSample)	請先開啟 `{id}` 的練習範例 (請參閱 learn.openSample)
+@msg	finish `{id}` first (see learn.finish)	請先完成 `{id}` (請參閱 learn.finish)
+@msg	`{id}` is the last tutorial in its skill	`{id}` 是其技能的最後一個教學課程
 
 # Deferred plug-in effects
 	Refresh Deferred Effects	重新整理延後的效果
diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs
index 20a2c58314..8e4aaab55e 100644
--- a/crates/ui-egui/src/menus/ui_commands.rs
+++ b/crates/ui-egui/src/menus/ui_commands.rs
@@ -659,6 +659,24 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "",
         "{tool: a tool id, as tool.select takes} mark where that tool is for 3 seconds without choosing it, as the link on a tool's name in a Learn tutorial step does: its toolbar button, a row of its collapsed group's flyout (which opens), its group's torn-off strip (which comes to the front), or, when no shown toolbar holds it, its row in the All Tools drawer (which opens); a Tools panel hidden with Window › Tools shows again; Escape or the next locate removes the mark; a missing, non-string or unknown id is an error and changes nothing; returns {tool, location: toolbar|flyout|strip|allTools|unavailable, toolbar: the name of the toolbar made with New Toolbar that holds it, or null}, with reason when Presentation Mode or Tab hides the toolbars",
     ),
+    (
+        "learn.openSample",
+        "Open Tutorial Sample",
+        "",
+        "{tutorial: id (see learn.list)} open that tutorial's practice sample as a new untitled document, which becomes the active one, and move the Learn view to the tutorial, as its View more button does; each call opens another copy and open documents stay as they are; a missing, non-string or unknown id is an error and changes nothing; returns {tutorial, index, title} of the new document",
+    ),
+    (
+        "learn.finish",
+        "Finish Tutorial",
+        "",
+        "{tutorial: id (see learn.list)} mark a tutorial whose sample learn.openSample opened as finished, as its Finish tutorial button does; finishing it again keeps one entry; a missing, non-string or unknown id, or a tutorial whose sample was not opened, is an error and changes nothing; returns {tutorial, finished: true, next: id of the next tutorial in its skill, or null after the skill's last one}",
+    ),
+    (
+        "learn.next",
+        "Next Tutorial",
+        "",
+        "{tutorial: id (see learn.list)} show the Learn panel on the tutorial after a finished one in the same skill, as its Next Up button does, without opening a sample; a missing, non-string or unknown id, a tutorial not finished, or a skill's last tutorial is an error and changes nothing; returns {skill, tutorial, title} of the next tutorial",
+    ),
     ("window.brightness", "UI Brightness", "", "{brightness: dark|mediumDark|mediumLight|light}"),
     (
         "window.workspace",
diff --git a/crates/ui-egui/src/panels/learn.rs b/crates/ui-egui/src/panels/learn.rs
index cce131c7a3..8941626a2d 100644
--- a/crates/ui-egui/src/panels/learn.rs
+++ b/crates/ui-egui/src/panels/learn.rs
@@ -3,11 +3,15 @@
 //! section with the Quick skill guide card, which opens the Skills tab. The Skills tab lists each
 //! skill with an empty progress ring and its count of tutorials; a skill lists its tutorials, and a
 //! tutorial previews its numbered steps. A tool's name in a step is a link that shows where the tool
-//! is ([`locate`]). Back goes up one level. `learn.list` lists the tutorials, `learn.show` opens one,
-//! `learn.locateTool` shows where a tool is and `window.learn` shows or hides the panel.
+//! is ([`locate`]). Back goes up one level. Under the steps, View more opens the tutorial's practice
+//! sample as a new untitled document; Finish tutorial then marks it finished, and Next Up shows the
+//! next tutorial in the same skill. `learn.list` lists the tutorials, `learn.show` opens one,
+//! `learn.locateTool` shows where a tool is, `learn.openSample`, `learn.finish` and `learn.next` run
+//! the three practice controls, and `window.learn` shows or hides the panel.
 
 pub mod catalog;
 pub mod locate;
+pub mod samples;
 
 use egui::{Sense, Stroke, Ui, vec2};
 use serde_json::{Value, json};
@@ -35,6 +39,14 @@ pub struct View {
     pub tutorial: Option<&'static str>,
 }
 
+/// The tutorials whose samples View more opened, and the tutorials finished, in the order they
+/// were finished. Each id is listed once.
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Practice {
+    pub opened: Vec<&'static str>,
+    pub finished: Vec<&'static str>,
+}
+
 pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     ui.horizontal(|ui| {
         for (tab, label) in [(Tab::ForYou, tl!("For you")), (Tab::Skills, tl!("Skills"))] {
@@ -89,6 +101,7 @@ fn skills(app: &mut VectorcraftApp, ui: &mut Ui) {
             app.ui.learn.tutorial = None;
         }
         steps(app, ui, tutorial);
+        practice(app, ui, tutorial);
         return;
     }
     if let Some(skill) = app.ui.learn.skill.and_then(catalog::skill) {
@@ -163,6 +176,49 @@ fn tool_link(ui: &mut Ui, t: &Tokens, name: &str) -> egui::Response {
     resp.on_hover_cursor(egui::CursorIcon::PointingHand).on_hover_text(tl!("Show where this tool is"))
 }
 
+/// The controls under a tutorial's steps: View more; Finish tutorial once its sample is open; and
+/// once it is finished, Next Up with the next tutorial's title, or for the skill's last tutorial a
+/// line saying so and Back to skills.
+fn practice(app: &mut VectorcraftApp, ui: &mut Ui, tutorial: &'static catalog::Tutorial) {
+    let t = Tokens::get(ui.ctx());
+    let id = tutorial.id;
+    let mut run = None;
+    ui.add_space(6.0);
+    ui.horizontal_wrapped(|ui| {
+        if ui.button(tl!("View more")).clicked() {
+            run = Some("learn.openSample");
+        }
+        let done = &app.ui.learn_practice;
+        if done.opened.contains(&id) && !done.finished.contains(&id) && ui.button(tl!("Finish tutorial")).clicked() {
+            run = Some("learn.finish");
+        }
+    });
+    if app.ui.learn_practice.finished.contains(&id) {
+        ui.add_space(6.0);
+        match catalog::next(id) {
+            Some(next) => {
+                ui.horizontal_wrapped(|ui| {
+                    if ui.button(tl!("Next Up")).clicked() {
+                        run = Some("learn.next");
+                    }
+                    ui.add(egui::Label::new(egui::RichText::new(next.title).color(t.text)).wrap());
+                });
+            }
+            None => {
+                ui.add(egui::Label::new(egui::RichText::new(tl!("You finished the last tutorial in this skill.")).color(t.text_dim)).wrap());
+                if ui.button(tl!("Back to skills")).clicked() {
+                    app.ui.learn = View { tab: Tab::Skills, skill: None, tutorial: None };
+                }
+            }
+        }
+    }
+    if let Some(cmd) = run
+        && let Err(e) = app.run(cmd, json!({ "tutorial": id }))
+    {
+        app.status(e);
+    }
+}
+
 /// A clickable row: `title`, and for a skill (`tutorials`) a progress ring before it and the
 /// count of tutorials done of all after it. No progress is kept yet, so the ring is empty.
 fn row(ui: &mut Ui, title: &str, tutorials: Option<usize>) -> egui::Response {
@@ -191,13 +247,17 @@ fn row(ui: &mut Ui, title: &str, tutorials: Option<usize>) -> egui::Response {
     resp.on_hover_cursor(egui::CursorIcon::PointingHand)
 }
 
-/// The Learn panel's UI commands: `window.learn`, `learn.list`, `learn.show` and `learn.locateTool`.
+/// The Learn panel's UI commands: `window.learn`, `learn.list`, `learn.show`, `learn.locateTool`,
+/// `learn.openSample`, `learn.finish` and `learn.next`.
 pub(crate) fn command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
     Some(match id {
         "window.learn" => toggle(app, p),
         "learn.list" => Ok(list()),
         "learn.show" => open(app, p),
         "learn.locateTool" => locate::locate_tool(app, p),
+        "learn.openSample" => open_sample(app, p),
+        "learn.finish" => finish(app, p),
+        "learn.next" => next(app, p),
         _ => return None,
     })
 }
@@ -234,18 +294,73 @@ fn list() -> Value {
 /// `learn.show {tutorial}`: show the panel on the Skills tab with that tutorial's steps → the
 /// tutorial. A missing or unknown id is an error and changes nothing.
 fn open(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
-    let key = "tutorial";
-    let id = match p.get(key) {
-        None | Some(Value::Null) => return Err("missing `tutorial` (see learn.list)".into()),
-        Some(Value::String(id)) => id.as_str(),
-        Some(_) => return Err(format!("`{key}` must be a string")),
-    };
-    let (skill, tutorial) = catalog::tutorial(id).ok_or_else(|| format!("unknown tutorial `{id}` (see learn.list)"))?;
+    let (skill, tutorial) = tutorial_param(p)?;
     crate::panel_docking::reveal_panel(app, ID)?;
     app.ui.learn = View { tab: Tab::Skills, skill: Some(skill.id), tutorial: Some(tutorial.id) };
     let steps: Vec<String> = tutorial.steps.iter().map(catalog::Step::plain).collect();
     Ok(json!({"skill": skill.id, "tutorial": tutorial.id, "title": tutorial.title, "steps": steps}))
 }
 
+/// The tutorial `p`'s `tutorial` names, with its skill. A missing, non-string or unknown id is an
+/// error.
+fn tutorial_param(p: &Value) -> Result<(&'static catalog::Skill, &'static catalog::Tutorial), String> {
+    let key = "tutorial";
+    let id = match p.get(key) {
+        None | Some(Value::Null) => return Err("missing `tutorial` (see learn.list)".into()),
+        Some(Value::String(id)) => id.as_str(),
+        Some(_) => return Err(format!("`{key}` must be a string")),
+    };
+    catalog::tutorial(id).ok_or_else(|| format!("unknown tutorial `{id}` (see learn.list)"))
+}
+
+/// `learn.openSample {tutorial}`: View more. Open that tutorial's practice sample as a new untitled
+/// document, which becomes the active one, and move the Learn view to the tutorial → `{tutorial,
+/// index, title}` of the new document. Each call opens another copy; open documents stay as they
+/// are. An id that is not valid, or a sample that does not read, is an error and changes nothing.
+fn open_sample(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
+    let (skill, tutorial) = tutorial_param(p)?;
+    let id = tutorial.id;
+    let svg = samples::sample(id).ok_or_else(|| format!("tutorial `{id}` has no practice sample"))?;
+    let name = format!("{id}.svg");
+    let opened = vectorcraft_engine::cmd::fileio::open_template(&mut app.session, &name, svg.as_bytes(), None).map_err(|e| e.to_string())?;
+    app.sync_views();
+    if !app.ui.learn_practice.opened.contains(&id) {
+        app.ui.learn_practice.opened.push(id);
+    }
+    app.ui.learn = View { tab: Tab::Skills, skill: Some(skill.id), tutorial: Some(id) };
+    Ok(json!({"tutorial": id, "index": opened["index"], "title": opened["title"]}))
+}
+
+/// `learn.finish {tutorial}`: Finish tutorial. Mark a tutorial whose sample was opened finished →
+/// `{tutorial, finished: true, next}`, where `next` is the id of the next tutorial in its skill, or
+/// null after the skill's last one. Finishing it again keeps one entry. The Learn view stays as it is.
+fn finish(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
+    let (_, tutorial) = tutorial_param(p)?;
+    let id = tutorial.id;
+    let practice = &mut app.ui.learn_practice;
+    if !practice.opened.contains(&id) {
+        return Err(format!("open the practice sample of `{id}` first (see learn.openSample)"));
+    }
+    if !practice.finished.contains(&id) {
+        practice.finished.push(id);
+    }
+    Ok(json!({"tutorial": id, "finished": true, "next": catalog::next(id).map(|t| t.id)}))
+}
+
+/// `learn.next {tutorial}`: Next Up. Show the panel on the tutorial after a finished one in the
+/// same skill → `{skill, tutorial, title}` of that tutorial. It opens no sample. An unfinished
+/// tutorial, or a skill's last tutorial, is an error and changes nothing.
+fn next(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
+    let (skill, tutorial) = tutorial_param(p)?;
+    let id = tutorial.id;
+    if !app.ui.learn_practice.finished.contains(&id) {
+        return Err(format!("finish `{id}` first (see learn.finish)"));
+    }
+    let after = catalog::next(id).ok_or_else(|| format!("`{id}` is the last tutorial in its skill"))?;
+    crate::panel_docking::reveal_panel(app, ID)?;
+    app.ui.learn = View { tab: Tab::Skills, skill: Some(skill.id), tutorial: Some(after.id) };
+    Ok(json!({"skill": skill.id, "tutorial": after.id, "title": after.title}))
+}
+
 #[cfg(test)]
 mod tests;
diff --git a/crates/ui-egui/src/panels/learn/catalog.rs b/crates/ui-egui/src/panels/learn/catalog.rs
index 98f0d6f355..57a8f30e31 100644
--- a/crates/ui-egui/src/panels/learn/catalog.rs
+++ b/crates/ui-egui/src/panels/learn/catalog.rs
@@ -201,3 +201,10 @@ pub fn skill(id: &str) -> Option<&'static Skill> {
 pub fn tutorial(id: &str) -> Option<(&'static Skill, &'static Tutorial)> {
     SKILLS.iter().find_map(|s| s.tutorials.iter().find(|t| t.id == id).map(|t| (s, t)))
 }
+
+/// The tutorial after the one whose id is `id` in the same skill; none for a skill's last tutorial.
+pub fn next(id: &str) -> Option<&'static Tutorial> {
+    let (skill, _) = tutorial(id)?;
+    let at = skill.tutorials.iter().position(|t| t.id == id)?;
+    skill.tutorials.get(at + 1)
+}
diff --git a/crates/ui-egui/src/panels/learn/samples.rs b/crates/ui-egui/src/panels/learn/samples.rs
new file mode 100644
index 0000000000..d5e2758f59
--- /dev/null
+++ b/crates/ui-egui/src/panels/learn/samples.rs
@@ -0,0 +1,103 @@
+//! The practice samples that a tutorial's View more opens: one small original SVG drawing for each
+//! tutorial, with only the art its steps work on. Each one opens as a new untitled document.
+
+/// The largest sample, in bytes: the catalog test keeps every sample under it.
+pub const MAX_SAMPLE_BYTES: usize = 16 * 1024;
+
+/// Every tutorial's sample, by tutorial id, in the catalog's order.
+pub const SAMPLES: &[(&str, &str)] = &[
+    (
+        "draw-and-color",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <rect x="100" y="75" width="200" height="150" fill="none" stroke="#9aa0a6" stroke-width="2" stroke-dasharray="8 6"/>
+</svg>
+"##,
+    ),
+    (
+        "combine-shapes",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <circle cx="160" cy="150" r="80" fill="#4c8bf5"/>
+  <circle cx="250" cy="150" r="80" fill="#f4b400"/>
+</svg>
+"##,
+    ),
+    (
+        "add-headline",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <rect x="40" y="90" width="320" height="120" rx="12" fill="#e8f0fe"/>
+</svg>
+"##,
+    ),
+    (
+        "pen-paths",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <path d="M 200 60 L 320 240 L 80 240 Z" fill="none" stroke="#9aa0a6" stroke-width="2" stroke-dasharray="8 6"/>
+  <circle cx="200" cy="60" r="5" fill="#1a73e8"/>
+  <circle cx="320" cy="240" r="5" fill="#1a73e8"/>
+  <circle cx="80" cy="240" r="5" fill="#1a73e8"/>
+</svg>
+"##,
+    ),
+    (
+        "smooth-curves",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <path d="M 40 150 C 100 50 160 50 200 150 C 240 250 300 250 360 150" fill="none" stroke="#9aa0a6" stroke-width="2" stroke-dasharray="8 6"/>
+</svg>
+"##,
+    ),
+    (
+        "pencil-sketch",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <path d="M 60 200 C 100 80 180 80 200 150 C 220 220 300 220 340 100" fill="none" stroke="#9aa0a6" stroke-width="2" stroke-dasharray="8 6"/>
+</svg>
+"##,
+    ),
+    (
+        "fill-and-stroke",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <rect x="110" y="80" width="180" height="140" rx="16" fill="#f4b400" stroke="#1a73e8" stroke-width="6"/>
+</svg>
+"##,
+    ),
+    (
+        "gradient",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <circle cx="200" cy="150" r="100" fill="#34a853"/>
+</svg>
+"##,
+    ),
+    (
+        "copy-colors",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <rect x="50" y="90" width="120" height="120" fill="#db4437" stroke="#202124" stroke-width="4"/>
+  <circle cx="290" cy="150" r="60" fill="#dadce0"/>
+</svg>
+"##,
+    ),
+    (
+        "area-type",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <rect x="80" y="60" width="240" height="180" fill="none" stroke="#1a73e8" stroke-width="2"/>
+</svg>
+"##,
+    ),
+    (
+        "type-on-path",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <path d="M 50 200 C 120 80 280 80 350 200" fill="none" stroke="#1a73e8" stroke-width="2"/>
+</svg>
+"##,
+    ),
+    (
+        "outline-type",
+        r##"<svg xmlns="http://www.w3.org/2000/svg" width="400" height="300" viewBox="0 0 400 300">
+  <text x="60" y="170" font-size="64" fill="#202124">Outline</text>
+</svg>
+"##,
+    ),
+];
+
+/// The sample of the tutorial whose id is `id`.
+pub fn sample(id: &str) -> Option<&'static str> {
+    SAMPLES.iter().find(|(tutorial, _)| *tutorial == id).map(|(_, svg)| *svg)
+}
diff --git a/crates/ui-egui/src/panels/learn/tests.rs b/crates/ui-egui/src/panels/learn/tests.rs
index 7014785eda..f302d8f436 100644
--- a/crates/ui-egui/src/panels/learn/tests.rs
+++ b/crates/ui-egui/src/panels/learn/tests.rs
@@ -4,7 +4,7 @@ use egui::accesskit::Node;
 use serde_json::json;
 use vectorcraft_engine::Session;
 
-use super::{ID, Tab, View, catalog, show};
+use super::{ID, Practice, Tab, View, catalog, samples, show};
 use crate::VectorcraftApp;
 use crate::tests_labels::painted_text;
 
@@ -228,6 +228,220 @@ fn learn_show_opens_a_tutorial_and_learn_list_lists_them() {
     assert_eq!(skills[2]["tutorials"][1], json!({"id": "gradient", "title": "Add a gradient", "steps": 3}));
 }
 
+/// Every tutorial has one sample of its own, in the catalog's order, each one small and read
+/// without warnings into art of its own.
+#[test]
+fn every_tutorial_has_its_own_readable_sample() {
+    let ids: Vec<&str> = catalog::SKILLS.iter().flat_map(|s| s.tutorials.iter().map(|t| t.id)).collect();
+    let sampled: Vec<&str> = samples::SAMPLES.iter().map(|(id, _)| *id).collect();
+    assert_eq!(sampled, ids, "one sample for each tutorial, in the catalog's order");
+    let mut texts = HashSet::new();
+    for (id, svg) in samples::SAMPLES {
+        assert!(svg.len() <= samples::MAX_SAMPLE_BYTES, "{id}: {} bytes", svg.len());
+        assert!(texts.insert(*svg), "{id} reuses another tutorial's sample");
+        let loaded = vectorcraft_engine::cmd::fileio::load(&format!("{id}.svg"), svg.as_bytes()).unwrap_or_else(|e| panic!("{id}: {e}"));
+        assert!(loaded.warnings.is_empty(), "{id}: {:?}", loaded.warnings);
+        let mut art = 0;
+        loaded.doc.walk(|n| art += usize::from(!n.is_layer()));
+        assert!(art > 0, "{id} has no art");
+    }
+}
+
+/// Next Up stays in the tutorial's skill: a skill's last tutorial, the catalog's last one
+/// included, has no next tutorial.
+#[test]
+fn the_next_tutorial_is_the_next_one_in_the_same_skill() {
+    for skill in catalog::SKILLS {
+        for pair in skill.tutorials.windows(2) {
+            assert_eq!(catalog::next(pair[0].id).map(|t| t.id), Some(pair[1].id));
+        }
+        let last = skill.tutorials.last().unwrap();
+        assert!(catalog::next(last.id).is_none(), "{} is the last of {}", last.id, skill.id);
+    }
+    assert!(catalog::next("nope").is_none());
+}
+
+/// View more opens the tutorial's sample as a new untitled document beside a modified one, which
+/// stays as it was; another tutorial opens another sample, and View more again opens another copy.
+#[test]
+fn view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document() {
+    let mut app = app();
+    let ctx = context();
+    app.run("file.new", json!({"width": 400, "height": 300})).unwrap();
+    app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 20})).unwrap();
+    let work = app.session.documents()[0].doc.node_count();
+    let (skill, tutorial) = catalog::tutorial("pen-paths").unwrap();
+    app.ui.learn = View { tab: Tab::Skills, skill: Some(skill.id), tutorial: Some(tutorial.id) };
+    click(&mut app, &ctx, "View more", show);
+    let docs = app.session.documents();
+    assert_eq!(docs.len(), 2, "{}", app.ui.status);
+    assert_eq!(app.session.active_index(), Some(1));
+    assert_eq!(docs[0].doc.node_count(), work, "the open document stays as it was");
+    assert!(docs[1].path.is_none() && docs[1].title().starts_with("Untitled-"), "{}", docs[1].title());
+    let pen = docs[1].doc.node_count();
+    assert_eq!(app.ui.learn_practice, Practice { opened: vec!["pen-paths"], finished: vec![] });
+
+    let r = app.run("learn.openSample", json!({"tutorial": "gradient"})).unwrap();
+    assert_eq!(r["tutorial"], "gradient");
+    assert_eq!(r["index"], 2);
+    assert_eq!(r["title"], json!(app.session.documents()[2].title()));
+    assert_ne!(app.session.documents()[2].doc.node_count(), pen, "another tutorial, another sample");
+    assert_eq!(app.ui.learn, View { tab: Tab::Skills, skill: Some("color"), tutorial: Some("gradient") });
+    app.run("learn.openSample", json!({"tutorial": "gradient"})).unwrap();
+    assert_eq!(app.session.documents().len(), 4, "View more again opens another copy");
+    assert_eq!(app.ui.learn_practice.opened, ["pen-paths", "gradient"]);
+}
+
+/// Finish tutorial shows once the sample is open; finishing shows Next Up with the next
+/// tutorial's title, and Next Up shows that tutorial without opening its sample.
+#[test]
+fn finishing_a_tutorial_offers_next_up_in_its_skill() {
+    let mut app = app();
+    let ctx = context();
+    let (skill, tutorial) = catalog::tutorial("pen-paths").unwrap();
+    app.ui.learn = View { tab: Tab::Skills, skill: Some(skill.id), tutorial: Some(tutorial.id) };
+    let text = painted_text(&mut app, show);
+    assert!(text.contains("View more") && !text.contains("Finish tutorial") && !text.contains("Next Up"), "{text}");
+    click(&mut app, &ctx, "View more", show);
+    let text = painted_text(&mut app, show);
+    assert!(text.contains("Finish tutorial") && !text.contains("Next Up"), "{text}");
+    click(&mut app, &ctx, "Finish tutorial", show);
+    assert_eq!(app.ui.learn_practice.finished, ["pen-paths"]);
+    let text = painted_text(&mut app, show);
+    assert!(text.contains("Next Up") && text.contains("Draw smooth curves") && !text.contains("Finish tutorial"), "{text}");
+    let docs = app.session.documents().len();
+    click(&mut app, &ctx, "Next Up", show);
+    assert_eq!(app.ui.learn, View { tab: Tab::Skills, skill: Some("draw"), tutorial: Some("smooth-curves") });
+    assert_eq!(app.session.documents().len(), docs, "Next Up opens no sample");
+    let text = painted_text(&mut app, show);
+    assert!(text.contains("View more") && !text.contains("Finish tutorial") && !text.contains("Next Up"), "{text}");
+}
+
+/// One press and release of `key` in what `draw` draws.
+fn key(app: &mut VectorcraftApp, ctx: &egui::Context, key: egui::Key, draw: fn(&mut VectorcraftApp, &mut egui::Ui)) {
+    let event = |pressed| egui::Event::Key { key, physical_key: None, pressed, repeat: false, modifiers: Default::default() };
+    frame(app, ctx, vec![event(true)], draw);
+    frame(app, ctx, vec![event(false)], draw);
+}
+
+/// Press Tab until the control labeled `name` has the keyboard focus.
+fn tab_to(app: &mut VectorcraftApp, ctx: &egui::Context, name: &str, draw: fn(&mut VectorcraftApp, &mut egui::Ui)) {
+    for _ in 0..32 {
+        key(app, ctx, egui::Key::Tab, draw);
+        let at = center(&frame(app, ctx, vec![], draw), name).unwrap_or_else(|| panic!("{name} is drawn"));
+        if ctx.memory(|m| m.focused()).and_then(|id| ctx.read_response(id)).is_some_and(|r| r.rect.contains(at)) {
+            return;
+        }
+    }
+    panic!("Tab did not reach {name}");
+}
+
+/// View more, Finish tutorial and Next Up are reached with Tab and pressed with Enter.
+#[test]
+fn the_practice_controls_work_from_the_keyboard() {
+    let mut app = app();
+    let ctx = context();
+    let (skill, tutorial) = catalog::tutorial("pen-paths").unwrap();
+    app.ui.learn = View { tab: Tab::Skills, skill: Some(skill.id), tutorial: Some(tutorial.id) };
+    frame(&mut app, &ctx, vec![], show);
+    tab_to(&mut app, &ctx, "View more", show);
+    key(&mut app, &ctx, egui::Key::Enter, show);
+    assert_eq!(app.session.documents().len(), 1, "{}", app.ui.status);
+    assert_eq!(app.ui.learn_practice.opened, ["pen-paths"]);
+    tab_to(&mut app, &ctx, "Finish tutorial", show);
+    key(&mut app, &ctx, egui::Key::Enter, show);
+    assert_eq!(app.ui.learn_practice.finished, ["pen-paths"]);
+    tab_to(&mut app, &ctx, "Next Up", show);
+    key(&mut app, &ctx, egui::Key::Enter, show);
+    assert_eq!(app.ui.learn, View { tab: Tab::Skills, skill: Some("draw"), tutorial: Some("smooth-curves") });
+    assert_eq!(app.session.documents().len(), 1, "Next Up opens no sample");
+}
+
+/// The panel 150 points wide.
+fn narrow(app: &mut VectorcraftApp, ui: &mut egui::Ui) {
+    ui.allocate_ui(egui::vec2(150.0, 800.0), |ui| {
+        ui.set_max_width(150.0);
+        show(app, ui);
+    });
+}
+
+/// In a narrow panel the practice controls wrap inside it.
+#[test]
+fn the_practice_controls_fit_a_narrow_panel() {
+    let mut app = app();
+    let ctx = context();
+    app.run("learn.openSample", json!({"tutorial": "pen-paths"})).unwrap();
+    frame(&mut app, &ctx, vec![], narrow);
+    let nodes = frame(&mut app, &ctx, vec![], narrow);
+    for name in ["View more", "Finish tutorial"] {
+        let node = nodes.iter().find(|n| n.label() == Some(name)).unwrap_or_else(|| panic!("{name} is drawn"));
+        let b = node.bounds().unwrap();
+        assert!(b.x1 <= 151.0, "{name} ends at {}", b.x1);
+    }
+}
+
+/// A skill's last tutorial, finished, says so and offers Back to skills instead of Next Up, even
+/// when another skill follows; `learn.next` there is an error.
+#[test]
+fn the_last_tutorial_of_a_skill_offers_back_to_skills() {
+    let mut app = app();
+    let ctx = context();
+    for id in ["add-headline", "outline-type"] {
+        app.run("learn.openSample", json!({"tutorial": id})).unwrap();
+        assert_eq!(app.run("learn.finish", json!({"tutorial": id})).unwrap(), json!({"tutorial": id, "finished": true, "next": null}));
+        let text = painted_text(&mut app, show);
+        assert!(text.contains("You finished the last tutorial in this skill.") && !text.contains("Next Up"), "{text}");
+        let before = app.ui.learn.clone();
+        assert_eq!(app.run("learn.next", json!({"tutorial": id})).unwrap_err(), format!("`{id}` is the last tutorial in its skill"));
+        assert_eq!(app.ui.learn, before);
+        click(&mut app, &ctx, "Back to skills", show);
+        assert_eq!(app.ui.learn, View { tab: Tab::Skills, skill: None, tutorial: None });
+    }
+}
+
+/// `learn.finish` needs the sample opened, and finishing again keeps one entry; `learn.next` needs
+/// the tutorial finished and answers the next tutorial.
+#[test]
+fn learn_finish_and_learn_next_follow_the_practice() {
+    let mut app = app();
+    let open = "open the practice sample of `gradient` first (see learn.openSample)";
+    assert_eq!(app.run("learn.finish", json!({"tutorial": "gradient"})).unwrap_err(), open);
+    assert_eq!(app.run("learn.next", json!({"tutorial": "gradient"})).unwrap_err(), "finish `gradient` first (see learn.finish)");
+    assert_eq!(app.ui.learn_practice, Practice::default());
+    app.run("learn.openSample", json!({"tutorial": "gradient"})).unwrap();
+    assert_eq!(app.run("learn.next", json!({"tutorial": "gradient"})).unwrap_err(), "finish `gradient` first (see learn.finish)");
+    for _ in 0..2 {
+        let r = app.run("learn.finish", json!({"tutorial": "gradient"})).unwrap();
+        assert_eq!(r, json!({"tutorial": "gradient", "finished": true, "next": "copy-colors"}));
+    }
+    assert_eq!(app.ui.learn_practice.finished, ["gradient"], "finishing again keeps one entry");
+    let r = app.run("learn.next", json!({"tutorial": "gradient"})).unwrap();
+    assert_eq!(r, json!({"skill": "color", "tutorial": "copy-colors", "title": "Copy colors from other art"}));
+    assert!(shown(&app));
+    assert_eq!(app.ui.learn, View { tab: Tab::Skills, skill: Some("color"), tutorial: Some("copy-colors") });
+}
+
+/// The practice commands reject a missing, mistyped or unknown tutorial id and change nothing.
+#[test]
+fn the_practice_commands_reject_a_missing_or_unknown_tutorial() {
+    let mut app = app();
+    app.run("file.new", json!({"width": 400, "height": 300})).unwrap();
+    for cmd in ["learn.openSample", "learn.finish", "learn.next"] {
+        for (params, error) in [
+            (json!({}), "missing `tutorial` (see learn.list)"),
+            (json!({"tutorial": null}), "missing `tutorial` (see learn.list)"),
+            (json!({"tutorial": 3}), "`tutorial` must be a string"),
+            (json!({"tutorial": "nope"}), "unknown tutorial `nope` (see learn.list)"),
+        ] {
+            assert_eq!(app.run(cmd, params).unwrap_err(), error, "{cmd}");
+            assert_eq!(app.ui.learn, View::default());
+            assert_eq!(app.ui.learn_practice, Practice::default());
+            assert_eq!(app.session.documents().len(), 1);
+            assert!(!shown(&app));
+        }
+    }
+}
+
 /// A missing, mistyped or unknown tutorial id is an error and leaves the panel as it was.
 #[test]
 fn learn_show_rejects_a_missing_or_unknown_tutorial() {
diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs
index f84b8f53b0..e7951f6d4f 100644
--- a/crates/ui-egui/src/state.rs
+++ b/crates/ui-egui/src/state.rs
@@ -424,6 +424,10 @@ pub struct UiState {
     /// is on screen. Not saved.
     #[serde(skip)]
     pub learn_locate: Option<crate::panels::learn::locate::Locate>,
+    /// The tutorials whose practice samples were opened and the tutorials finished, kept while the
+    /// app runs.
+    #[serde(skip)]
+    pub learn_practice: crate::panels::learn::Practice,
     pub control_bar: bool,
     /// The Control bar is docked to the bottom of the window instead of the top
     /// (`window.control.dock`).
@@ -1089,6 +1093,7 @@ impl Default for UiState {
             find_font_in: String::new(),
             learn: Default::default(),
             learn_locate: None,
+            learn_practice: Default::default(),
             control_bar: false,
             control_bar_bottom: false,
             control_bar_floating: false,
diff --git a/docs/mcp.md b/docs/mcp.md
index 1232ffb131..8e158a81a9 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -2685,11 +2685,29 @@ dock; in a full screen mode it makes Learn the front panel, which shows when the
 other value of `show` is an error and changes nothing. `learn.list {}` → `{skills: [{id, title, tutorials: [{id, title, steps}]}]}`, in the order the Skills tab
 lists them, where `steps` is the number of steps. `learn.show {tutorial}` shows the panel on its Skills tab with that
 tutorial's steps → `{skill, tutorial, title, steps: [text]}`. A missing, non-string or unknown `tutorial` is an error
-and changes nothing. Behavior reference:
+and changes nothing.
+
+Under a tutorial's steps, View more opens the tutorial's practice sample, a small drawing of VectorCraft's own with the
+art its steps work on, as a new untitled document that becomes the active one; Save asks where to save it. Once the
+sample is open, Finish tutorial marks the tutorial finished. A finished tutorial shows Next Up with the title of the
+next tutorial in the same skill, which Next Up shows without opening its sample. A skill's last tutorial, finished,
+says so and shows Back to skills instead; Next Up never moves to another skill. Which tutorials are finished is kept
+while the app runs, and the skill rings and counts do not show it yet. These are VectorCraft's own rules; the help
+page also plays a short video, which VectorCraft does not have. `learn.openSample {tutorial}` runs View more →
+`{tutorial, index, title}` of the new document, and moves the Learn view to that tutorial; each call opens another
+copy and leaves the open documents as they are. `learn.finish {tutorial}` runs Finish tutorial →
+`{tutorial, finished: true, next}`, where `next` is the next tutorial's id in the skill, or null after the skill's
+last one; the tutorial's sample must have been opened, and finishing it again keeps one entry. `learn.next {tutorial}`
+runs Next Up on a finished tutorial and shows the panel on the next one → `{skill, tutorial, title}`; on a tutorial
+not finished, or a skill's last tutorial, it is an error. For all three, a missing, non-string or unknown `tutorial`
+is an error, and an error changes nothing. Behavior reference:
 [Quick skill guide](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html).
 
 ```json
 {"name":"invoke_menu","arguments":{"command":"learn.show","params":{"tutorial":"pen-paths"}}}
+{"name":"invoke_menu","arguments":{"command":"learn.openSample","params":{"tutorial":"pen-paths"}}}
+{"name":"invoke_menu","arguments":{"command":"learn.finish","params":{"tutorial":"pen-paths"}}}
+{"name":"invoke_menu","arguments":{"command":"learn.next","params":{"tutorial":"pen-paths"}}}
 ```
 
 A step that names a tool shows the tool's name as a blue link. A click on it, or Enter or Space while it has the
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..4ac027eb78 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -864,6 +864,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Native macOS menu bar, vector tool cursors, a ⌘K command palette, middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8).
   - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their tutorial counts and empty progress rings; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list` and `learn.show {tutorial}` script it ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`).
   - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`).
+  - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish` and `learn.next` script them. Not done: the help page's short video, and progress kept between sessions and shown in the skill rings. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`.
   - The errors of the blend spine commands (Move Spine Point, Reshape Spine Segment, Add Spine Point and Delete Spine Point) show in the status bar in the interface language: each has a row in every catalog that translates all status and error messages and in Bulgarian (`blend_spine_param_errors_are_translated`).
   - The errors of the 3D effects (Extrude & Bevel, Revolve, Inflate, Rotate and their Classic forms) show in the status bar in the interface language: the art a 3D effect cannot build a solid from, invalid light, graphics and surface settings, and the notes for an object that draws no 3D faces or more wireframe edges than the limit. Each has a row in every catalog that translates all status and error messages, and the effect's name and the values in the message are translated or kept as written (`three_d_refusals_are_translated_in_every_complete_catalog`, `three_d_refusals_translate_with_their_values`).
   - The errors of the parameter checks that many commands share show in the status bar in the interface language: a value that is not a number where a number goes (`object.move` with `"dx": "60 mm"`, and `object.rotate`, `object.setBounds` and the other commands that call `check_numbers`), a missing number or index, `ids` that are not a list of object ids, an object id that is not a non-negative integer or names no object, and a date that is not Unix seconds. Each has a row in every catalog that translates all status and error messages, and in Bulgarian, Danish, Indonesian and Dutch (`shared_param_check_errors_are_translated`).
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index b2dd7d23a1..86f05d0ad8 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -380,7 +380,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po
 |---|---|---|
 | Effect > Warp Options: style previews, orientation choices and percent controls | done | #1760; focused input, mixed-style and history checks passed; original captures reviewed. No geometry or optional Properties changes. |
 | Command search: Up and Down move through the results, Enter runs the highlighted one | done | #1798 (#1757) |
-| Learn panel: Window › Learn and Explore tutorials on the app bar open it; For you holds a Quick skill guide card, Skills lists VectorCraft's own skills with tutorial counts and empty progress rings, a tutorial shows its numbered steps, Back goes up a level; a tool's name in a step is a link that marks the tool where the toolbars show it (its button, its group's flyout, a torn-off strip, a toolbar made with New Toolbar or the All Tools drawer) without choosing it | done | [the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `learn.list`, `learn.show`, `learn.locateTool`; the mark's look and 3-second lifetime are VectorCraft's own rules; `panels::learn::tests`, `toolbar::tests` |
+| Learn panel: Window › Learn and Explore tutorials on the app bar open it; For you holds a Quick skill guide card, Skills lists VectorCraft's own skills with tutorial counts and empty progress rings, a tutorial shows its numbered steps, Back goes up a level; a tool's name in a step is a link that marks the tool where the toolbars show it (its button, its group's flyout, a torn-off strip, a toolbar made with New Toolbar or the All Tools drawer) without choosing it; View more opens the tutorial's practice sample as a new untitled document, Finish tutorial then marks it finished, and Next Up shows the next tutorial in the same skill (no video) | done | [the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `learn.list`, `learn.show`, `learn.locateTool`, `learn.openSample`, `learn.finish`, `learn.next`; the mark's look and 3-second lifetime are VectorCraft's own rules; `panels::learn::tests`, `toolbar::tests` |
 | Pathfinder panel: a group selected alone counts its nested shapes, so an expanded stroked object keeps the Shape Modes enabled | done | #1642 (#1635) |
 | Selected Grid Repeat shows row, column and corner handles and spacing sliders; bounding-box handles take priority where they meet | done | #2691, `tools/src/repeat_grid.rs`; [public behavior reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-grid-repeat-options.html); drags preview and commit `object.repeat.options` as one undo step, Escape cancels; Radial Repeat has no handles yet |
 | Grid Repeat Options (Object › Repeat › Options…) has a Preview checkbox: the repeat on the canvas follows the fields while the dialog is open, Cancel puts the original back without a history step, OK keeps the previewed values as one undo step | done | #2651; [public behavior reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-grid-repeat-options.html) lists the Preview option for the grid options only, so Radial and Mirror Repeat Options have none; `dialogs/command.rs` tests |

From 6e2fe9fddf714b71f276a65f10db2445e6e65c35 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:06:53 -0800
Subject: [PATCH 03/48] SVG: right-to-left text with text-anchor start or end
 opens at its directional edge

SVG 2 defines text-anchor start for right-to-left text as placing the
right side of the text at its position, and end as placing the left
side there (https://www.w3.org/TR/SVG2/text.html#TextAnchoringProperties).
Import placed start at the left edge and end at the right edge whatever
the direction.

- Point type and type on a path swap start and end when the effective
  direction is rtl. On a path, right-to-left text anchored by start now
  ends at startOffset and text anchored by end begins there. Vertical
  type keeps its anchoring.
- Each line and each absolutely placed chunk is anchored by the
  text-anchor and direction of the element holding its first
  character, a tspan's own included. A later chunk no longer takes the
  first chunk's anchor.
- Each line of point type starts at its own x, also when it has the
  same anchor as the line before it or another line holds absolutely
  placed characters. Such lines were drawn at the first line's x.
- A test covers letter-spaced right-to-left lines: the layout keeps the
  tracking of every letter in such a line, so the whole advance sits
  on its anchor.
---
 crates/svg/src/import/text.rs      |  78 +++++++++------
 crates/svg/tests/it/import_text.rs | 152 +++++++++++++++++++++++++++++
 docs/target-app-parity.md          |   1 +
 3 files changed, 200 insertions(+), 31 deletions(-)

diff --git a/crates/svg/src/import/text.rs b/crates/svg/src/import/text.rs
index 51bcffa41e..f0d50a747d 100644
--- a/crates/svg/src/import/text.rs
+++ b/crates/svg/src/import/text.rs
@@ -1236,12 +1236,6 @@ impl Ctx {
             .collect();
         let under = stroke_under(&mut cells, label, warnings);
 
-        let anchor_of = |i: usize| match cs.chars.get(i).and_then(|c| self.prop(c.1, "text-anchor")).as_deref() {
-            Some("middle") => 0.5,
-            Some("end") => 1.0,
-            _ => 0.0,
-        };
-        let anchor = anchor_of(0);
         let path = cs.path.and_then(|tp| match self.text_path(xml, tp) {
             Some(p) => Some((tp, p)),
             None => {
@@ -1250,6 +1244,22 @@ impl Ctx {
             }
         });
         let vertical = self.prop(t, "writing-mode").is_some_and(|m| m.starts_with("tb") || m.starts_with("vertical"));
+        // Where the chunk starting at character `i` sits on its anchor: 0 its left (or top) edge,
+        // 0.5 its middle, 1 its right (or bottom) edge; on a path, its edge toward the path's
+        // start, its middle or its edge toward the path's end. In horizontal type `start` and
+        // `end` follow the `direction` of the element holding that character: right-to-left text
+        // starts at its right edge, and on a path at the edge toward the path's end (type on a
+        // path lays its glyphs out in visual order from its start).
+        let anchor_of = |i: usize| {
+            let Some(&(_, el)) = cs.chars.get(i) else { return 0.0 };
+            let a = match self.prop(el, "text-anchor").as_deref() {
+                Some("middle") => 0.5,
+                Some("end") => 1.0,
+                _ => 0.0,
+            };
+            if !vertical && self.prop(el, "direction").is_some_and(|d| d.trim() == "rtl") { 1.0 - a } else { a }
+        };
+        let anchor = anchor_of(0);
         self.fit_lengths(&cs.spans, &mut cells, vertical, label, warnings);
         let mut obj = TextObject::point(Point::ZERO, "", CharStyle::default());
         let mut breaks: Vec<Break> = vec![];
@@ -1268,6 +1278,8 @@ impl Ctx {
             let em = self.font_size(tp);
             let offset = tp.attribute("startOffset").and_then(|v| self.length(v, em, len)).unwrap_or(0.0) + dx[0];
             let width = if anchor > 0.0 { advance(&point_text(&cells)) } else { 0.0 };
+            // Text that would start before the path's beginning starts at it, with all its glyphs
+            // on the path (SVG does not draw the glyphs that fall off it).
             let start = Some((offset - anchor * width) / len).filter(|s| s.is_finite()).map_or(0.0, |s| s.clamp(0.0, 1.0));
             obj.kind = TextKind::OnPath { path: PathData::from_bezpath(&bp), start, end: None };
             obj.xf = Affine::IDENTITY;
@@ -1293,14 +1305,14 @@ impl Ctx {
             obj.xf = Affine::IDENTITY;
         } else {
             let origin = Point::new(x[0].unwrap_or(0.0) + dx[0], y[0].unwrap_or(0.0) + dy[0]);
-            let (justify, left, starts) = lines(&mut cells, &x, &y, &dx, &dy, anchor, origin.x, &mut breaks);
+            let (justify, left, starts) = lines(&mut cells, &x, &y, &dx, &dy, &anchor_of, origin.x, &mut breaks);
             obj.para.justify = justify;
             obj.xf = Affine::translate((finite(left), finite(origin.y)));
-            // Lines anchored differently (paragraphs aligned differently): each line's paragraph
-            // takes its alignment, and indents that put it where it was.
-            if let Some(starts) = starts.filter(|st| st.iter().any(|(i, _)| anchor_of(*i) != anchor)) {
-                for (k, &(i, ax)) in starts.iter().enumerate() {
-                    let a = anchor_of(i);
+            // Lines anchored differently or at different x (paragraphs aligned or indented
+            // differently): each line's paragraph takes its alignment, and indents that put it
+            // where it was.
+            if starts.iter().any(|&(_, a, ax)| a != starts[0].1 || ax != starts[0].2) {
+                for (k, &(_, a, ax)) in starts.iter().enumerate() {
                     let d = finite(ax - left);
                     let mut pa = ParaStyle { justify: justify_of(a), ..ParaStyle::default() };
                     match pa.justify {
@@ -1412,7 +1424,7 @@ fn finite(v: f64) -> f64 {
     if v.is_finite() { v } else { 0.0 }
 }
 
-/// The alignment of an SVG text chunk anchored at `anchor` (0 start, 0.5 middle, 1 end).
+/// The alignment of an SVG text chunk anchored at `anchor` (0 left edge, 0.5 middle, 1 right edge).
 fn justify_of(anchor: f64) -> Justify {
     match anchor {
         a if a >= 1.0 => Justify::Right,
@@ -1428,8 +1440,10 @@ fn leading_tolerance(spacing: f64) -> f64 {
 }
 
 /// Point type: line breaks, baseline shifts and kerning from the positioning lists. Returns the
-/// justification, the x of the first line's left (or anchor) edge and, when no character is
-/// placed on its own, each line's first character and anchor x.
+/// justification, the x of the first line's left (or anchor) edge and each line's first
+/// character, alignment (as for [`justify_of`]) and anchor x. `anchor_of` gives where the chunk
+/// starting at a character sits on its anchor. When characters are placed on their own, every
+/// line is left-aligned and its anchor x is its left edge.
 #[allow(clippy::too_many_arguments)]
 fn lines(
     cells: &mut [Cell],
@@ -1437,10 +1451,10 @@ fn lines(
     y: &[Option<f64>],
     dx: &[f64],
     dy: &[f64],
-    anchor: f64,
+    anchor_of: &dyn Fn(usize) -> f64,
     x0: f64,
     breaks: &mut Vec<Break>,
-) -> (Justify, f64, Option<Vec<(usize, f64)>>) {
+) -> (Justify, f64, Vec<(usize, f64, f64)>) {
     let n = cells.len();
     let y0 = y[0].unwrap_or(0.0) + dy[0];
     let (mut base, mut cur) = (y0, y0);
@@ -1482,15 +1496,16 @@ fn lines(
         }
     }
     if targets.is_empty() {
-        return (justify_of(anchor), x0, Some(lines));
+        let starts = lines.iter().map(|&(s, lx)| (s, anchor_of(s), lx)).collect();
+        return (justify_of(anchor_of(0)), x0, starts);
     }
     // Absolutely placed characters: lay the text out left-aligned and kern each one onto its x.
-    // SVG anchors every absolutely placed chunk on its own, so with a middle/end anchor each
-    // chunk's target moves back by its share of the chunk's width.
+    // SVG anchors every absolutely placed chunk on its own, so a chunk not anchored at its left
+    // edge moves back by its share of its own width.
     let line_of = |i: usize| lines.partition_point(|(s, _)| *s <= i) - 1;
-    let mut left = x0;
+    let mut line_left: Vec<f64> = lines.iter().map(|l| l.1).collect();
     let mut wants: Vec<(usize, f64)> = targets.clone();
-    if anchor > 0.0 {
+    if lines.iter().chain(&targets).any(|c| anchor_of(c.0) > 0.0) {
         let (runs, bytes) = assemble(cells, breaks);
         let lay = measure(&with_runs(runs.0));
         let (pens, ends) = pens(&lay, &bytes);
@@ -1506,16 +1521,14 @@ fn lines(
                 _ => 0.0,
             }
         };
-        let line_left: Vec<f64> = lines.iter().map(|&(s, lx)| lx - anchor * width(s)).collect();
-        left = line_left[0];
+        line_left = lines.iter().map(|&(s, lx)| lx - anchor_of(s) * width(s)).collect();
         for w in &mut wants {
-            w.1 -= anchor * width(w.0) + line_left[line_of(w.0)];
-        }
-    } else {
-        for w in &mut wants {
-            w.1 -= lines[line_of(w.0)].1;
+            w.1 -= anchor_of(w.0) * width(w.0);
         }
     }
+    for w in &mut wants {
+        w.1 -= line_left[line_of(w.0)];
+    }
     // Kerning changes shaping (pair kerning is off for manually kerned characters): repeat until
     // every character sits on its x.
     for _ in 0..4 {
@@ -1538,7 +1551,8 @@ fn lines(
             break;
         }
     }
-    (Justify::Left, left, None)
+    let starts = lines.iter().zip(&line_left).map(|(&(s, _), &lx)| (s, 0.0, lx)).collect();
+    (Justify::Left, line_left[0], starts)
 }
 
 /// Centred and right-aligned lines of point type `obj` where a reader draws them. `text-anchor`
@@ -1546,7 +1560,9 @@ fn lines(
 /// export anchors lines so); VectorCraft aligns a line without that tracking
 /// ([`vectorcraft_text::LineInfo::trailing`]). Each such line moves back by its share of it: the
 /// type moves when every line moves alike, otherwise each paragraph's right indent takes the
-/// tracking (a line of imported point type is a paragraph). Browsers add that letter spacing
+/// tracking (a line of imported point type is a paragraph). A right-to-left paragraph's lines
+/// keep all their tracking in the layout (`trailing` is 0), so they stay where they are and their
+/// whole advance sits on the anchor. Browsers add that letter spacing
 /// today; CSS WG issue 1518 and Firefox bugs 1907305 and 1913554 may drop it at a line's end.
 fn keep_reader_anchors(obj: &mut TextObject) {
     let share = |j: Justify| match j {
diff --git a/crates/svg/tests/it/import_text.rs b/crates/svg/tests/it/import_text.rs
index b25dc23678..01f541d8d6 100644
--- a/crates/svg/tests/it/import_text.rs
+++ b/crates/svg/tests/it/import_text.rs
@@ -360,6 +360,158 @@ fn anchored_letter_spaced_lines_stay_where_a_reader_draws_them() {
     assert!(close(s[0], 200.0 - a[0] / 2.0, 1e-6) && close(s[1], 200.0 - a[1], 1e-6), "{s:?} {a:?}");
 }
 
+/// Document-space left and right edges of the advance of each laid-out line.
+fn line_edges(t: &TextObject) -> Vec<(f64, f64)> {
+    let lay = layout(FontDb::global(), t);
+    lay.lines
+        .iter()
+        .map(|l| {
+            let g = &lay.glyphs[l.glyph_start..l.glyph_end];
+            let left = g.iter().map(|g| (t.xf * g.origin).x).fold(f64::INFINITY, f64::min);
+            let right = g.iter().map(|g| (t.xf * g.origin).x + g.advance).fold(f64::NEG_INFINITY, f64::max);
+            (left, right)
+        })
+        .collect()
+}
+
+/// SVG 2 §11.10.1.1 (https://www.w3.org/TR/SVG2/text.html#TextAnchoringProperties): with
+/// `direction: rtl`, `start` puts the right side of the text at its position and `end` puts the
+/// left side there; `middle` centers it either way. The direction is the effective one of the element that
+/// holds the chunk's first character.
+#[test]
+fn rtl_point_text_start_and_end_use_directional_edges() {
+    // (markup, share of the advance left of x = 200)
+    for (body, share) in [
+        (r#"<text x="200" y="60" direction="rtl" font-size="20">Wave</text>"#, 1.0),
+        (r#"<text x="200" y="60" direction="rtl" text-anchor="start" font-size="20">Wave</text>"#, 1.0),
+        (r#"<text x="200" y="60" direction="rtl" text-anchor="middle" font-size="20">Wave</text>"#, 0.5),
+        (r#"<text x="200" y="60" direction="rtl" text-anchor="end" font-size="20">Wave</text>"#, 0.0),
+        (r#"<g direction="rtl"><text x="200" y="60" font-size="20">Wave</text></g>"#, 1.0),
+        (r#"<g direction="rtl" text-anchor="end"><text x="200" y="60" font-size="20">Wave</text></g>"#, 0.0),
+        (r#"<text x="200" y="60" direction="rtl" font-size="20"><tspan direction="ltr">Wave</tspan></text>"#, 0.0),
+        (r#"<text x="200" y="60" text-anchor="start" font-size="20">Wave</text>"#, 0.0),
+        (r#"<text x="200" y="60" direction="ltr" text-anchor="end" font-size="20">Wave</text>"#, 1.0),
+    ] {
+        let d = open(body);
+        let (left, right) = line_edges(only_text(&d))[0];
+        let want = 200.0 - share * (right - left);
+        assert!(close(left, want, 1e-6), "{body}: the advance spans {left}..{right}, so it does not start at {want}");
+    }
+}
+
+/// On a path, right-to-left text anchored by `start` ends at `startOffset` and one anchored by
+/// `end` begins there (its glyphs run from the path's start in visual order); `middle` centers it.
+#[test]
+fn rtl_type_on_a_path_starts_at_its_directional_edge() {
+    // (anchor, direction, share of the advance before the offset)
+    for (anchor, direction, share) in [("start", "rtl", 1.0), ("middle", "rtl", 0.5), ("end", "rtl", 0.0), ("start", "ltr", 0.0), ("end", "ltr", 1.0)]
+    {
+        let d = open(&format!(
+            r##"<path id="p" d="M0 100 L400 100" fill="none"/>
+            <text font-size="20" text-anchor="{anchor}" direction="{direction}"><textPath href="#p" startOffset="200">Wave</textPath></text>"##
+        ));
+        let t = only_text(&d);
+        assert!(matches!(t.kind, TextKind::OnPath { .. }), "{:?}", t.kind);
+        let lay = layout(FontDb::global(), t);
+        let left = lay.glyphs.iter().map(|g| (t.xf * g.origin).x).fold(f64::INFINITY, f64::min);
+        let width: f64 = lay.glyphs.iter().map(|g| g.advance).sum();
+        let want = 200.0 - share * width;
+        assert!(close(left, want, 0.05), "{anchor} {direction}: the text starts at {left}, not {want}");
+    }
+}
+
+/// Letter-spaced right-to-left lines: a line keeps the tracking after each of its characters, and
+/// its whole advance sits on its anchor as `start`, `middle` and `end` place it.
+#[test]
+fn rtl_letter_spaced_lines_stay_on_their_anchor() {
+    for (anchor, share) in [("start", 1.0), ("middle", 0.5), ("end", 0.0)] {
+        let d = open(&format!(r#"<text x="200" y="100" direction="rtl" text-anchor="{anchor}" letter-spacing="8" font-size="40">WAVE</text>"#));
+        let t = only_text(&d);
+        let (left, right) = line_edges(t)[0];
+        let want = 200.0 - share * (right - left);
+        assert!(close(left, want, 1e-6), "{anchor}: the advance spans {left}..{right}, so it does not start at {want}");
+        let natural = {
+            let d = open(&format!(r#"<text x="200" y="100" direction="rtl" text-anchor="{anchor}" font-size="40">WAVE</text>"#));
+            let (l, r) = line_edges(only_text(&d))[0];
+            r - l
+        };
+        assert!(close(right - left, natural + 4.0 * 8.0, 1e-6), "{anchor}: the advance {} holds the tracking of all 4 letters", right - left);
+    }
+    // A right-to-left line anchored by `start` beside a left-to-right `middle` line: each keeps its own anchor.
+    let d = open(
+        r#"<text y="100" font-size="20" letter-spacing="4"><tspan x="200" direction="rtl">Wave</tspan><tspan x="200" dy="30" text-anchor="middle">Line</tspan></text>"#,
+    );
+    let t = only_text(&d);
+    let e = line_edges(t);
+    assert_eq!(e.len(), 2, "{e:?}");
+    assert!(close(e[0].1, 200.0, 1e-6), "the right-to-left line ends at 200: {e:?}");
+    let lay = layout(FontDb::global(), t);
+    let a: f64 = lay.glyphs[lay.lines[1].glyph_start..lay.lines[1].glyph_end].iter().map(|g| g.advance).sum();
+    assert!(close(e[1].0, 200.0 - a / 2.0, 1e-6), "the middle line is centered on 200 with its tracking: {e:?}");
+}
+
+/// Each line is a chunk anchored by the `text-anchor` and `direction` of its first character.
+#[test]
+fn rtl_lines_use_each_chunk_first_character_direction_and_anchor() {
+    let d = open(
+        r#"<text y="60" font-size="20"><tspan x="200" direction="rtl">Wave</tspan><tspan x="200" dy="30">Line</tspan><tspan x="200" dy="30" direction="rtl" text-anchor="end">Last</tspan><tspan x="200" dy="30" direction="rtl" text-anchor="middle">Mid</tspan></text>"#,
+    );
+    let e = line_edges(only_text(&d));
+    assert_eq!(e.len(), 4, "{e:?}");
+    assert!(close(e[0].1, 200.0, 1e-6), "a right-to-left start line ends at 200: {e:?}");
+    assert!(close(e[1].0, 200.0, 1e-6), "a left-to-right start line starts at 200: {e:?}");
+    assert!(close(e[2].0, 200.0, 1e-6), "a right-to-left end line starts at 200: {e:?}");
+    assert!(close((e[3].0 + e[3].1) / 2.0, 200.0, 1e-6), "a middle line is centered on 200: {e:?}");
+}
+
+/// A line starts at its own x, also when it is anchored as the line before it is and when another
+/// line holds absolutely placed characters.
+#[test]
+fn each_line_starts_at_its_own_x() {
+    let d = open(r#"<text y="40" font-size="20"><tspan x="50">Wave</tspan><tspan x="120" dy="30">Line</tspan></text>"#);
+    let e = line_edges(only_text(&d));
+    assert!(close(e[0].0, 50.0, 1e-6) && close(e[1].0, 120.0, 1e-6), "{e:?}");
+    let d = open(r#"<text y="40" font-size="20" text-anchor="end"><tspan x="150">Wave</tspan><tspan x="100" dy="30">Line</tspan></text>"#);
+    let e = line_edges(only_text(&d));
+    assert!(close(e[0].1, 150.0, 1e-6) && close(e[1].1, 100.0, 1e-6), "{e:?}");
+    let d = open(r#"<text y="40" font-size="20"><tspan x="50 100">ab</tspan><tspan x="200" dy="30" direction="rtl">Line</tspan></text>"#);
+    let t = only_text(&d);
+    let e = line_edges(t);
+    assert_eq!(e.len(), 2, "{e:?}");
+    assert!(close(e[0].0, 50.0, 0.05) && close(e[1].1, 200.0, 0.05), "{e:?}");
+    let b = (t.xf * layout(FontDb::global(), t).glyphs[1].origin).x;
+    assert!(close(b, 100.0, 0.05), "b starts at {b}");
+}
+
+/// Absolutely placed chunks are anchored on their own, each by the `text-anchor` and `direction`
+/// of its first character, whatever the first chunk's anchor.
+#[test]
+fn absolutely_placed_chunks_use_their_own_rtl_anchor() {
+    // (markup, share of each chunk's advance left of its x)
+    for (body, shares) in [
+        (r#"<text x="80 200" y="40" font-size="20">a<tspan direction="rtl">b</tspan></text>"#, [0.0, 1.0]),
+        (r#"<text x="80 200" y="40" font-size="20">a<tspan direction="rtl" text-anchor="end">b</tspan></text>"#, [0.0, 0.0]),
+        (r#"<text y="40" font-size="20"><tspan x="80">a</tspan><tspan x="200" direction="rtl">b</tspan></text>"#, [0.0, 1.0]),
+        (r#"<text x="80 200" y="40" text-anchor="middle" font-size="20">a<tspan direction="rtl" text-anchor="end">b</tspan></text>"#, [0.5, 0.0]),
+        (r#"<text x="80 200" y="40" text-anchor="middle" font-size="20">a<tspan direction="rtl" text-anchor="start">b</tspan></text>"#, [0.5, 1.0]),
+        (r#"<text x="80 200" y="40" text-anchor="middle" font-size="20">a<tspan direction="rtl">b</tspan></text>"#, [0.5, 0.5]),
+        (r#"<text x="80 200" y="40" direction="rtl" font-size="20">ab</text>"#, [1.0, 1.0]),
+    ] {
+        let d = open(body);
+        let t = only_text(&d);
+        let lay = layout(FontDb::global(), t);
+        assert_eq!(lay.glyphs.len(), 2, "{body}");
+        // Natural advance: the kerning that moves `b` onto its x is added after `a`.
+        let style = |i: usize| t.runs.iter().flat_map(|r| r.text.chars().map(move |_| &r.style)).nth(i).unwrap();
+        let natural = |i: usize| lay.glyphs[i].advance - style(i).kerning.unwrap_or(0.0) / 1000.0 * style(i).size;
+        for (i, (x, share)) in [80.0, 200.0].into_iter().zip(shares).enumerate() {
+            let left = (t.xf * lay.glyphs[i].origin).x;
+            let want = x - share * natural(i);
+            assert!(close(left, want, 0.05), "{body}: chunk {i} starts at {left}, not {want}");
+        }
+    }
+}
+
 #[test]
 fn a_small_line_gap_in_tiny_type_keeps_its_leading() {
     // 0.0085 against an auto leading of 0.006 differs by less than 0.01 but is not a whole multiple of it.
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..a202baa403 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1526,6 +1526,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
     A function-based PDF shading (type 1) whose colour changes along one axis only, as a browser writes a repeating linear gradient, comes in as a linear gradient over its domain, each hard colour change two stops at one offset; one whose colour changes in two directions comes in as its average colour, with a warning. Either paints only over the shading's domain. Both came in as a flat grey that wasn't in the file (#3621). Each such shading is read once per import, and all of them within one budget of 200,000 function evaluations, so a file filling thousands of paths with long functions still opens in about a second (it took minutes); past the budget they come in as their average colour, then grey, with a warning.
     A gap between glyphs of two sizes is measured against the smaller one, so a word set beside a much larger one with no space glyph between them (a browser's margin between two sizes, as in `≤ 4` and a small `hours`) keeps its word space (#3623).
     SVG import's style cascade, used for hidden objects, non-scaling strokes and type, tests each element only against the `<style>` rules for its id, its classes and its element name, and the rules whose selector ends in none of these (`*`, `[x]`).
+    SVG import places right-to-left point type and type on a path as [SVG 2's `text-anchor`](https://www.w3.org/TR/SVG2/text.html#TextAnchoringProperties) says: with `direction: rtl`, `start` puts the right edge of the text at its position (on a path, the text ends at `startOffset`) and `end` puts the left edge there. Each line and each absolutely placed chunk is anchored by the `text-anchor` and `direction` of the element holding its first character, a `<tspan>`'s own included, and each line starts at its own `x`. A letter-spaced right-to-left line keeps the tracking of all its letters inside the advance it anchors (`rtl_point_text_start_and_end_use_directional_edges`, `rtl_type_on_a_path_starts_at_its_directional_edge`, `rtl_letter_spaced_lines_stay_on_their_anchor`, `rtl_lines_use_each_chunk_first_character_direction_and_anchor`, `each_line_starts_at_its_own_x` and `absolutely_placed_chunks_use_their_own_rtl_anchor` in `crates/svg/tests/it/import_text.rs`).
     A `.svgz` file copied in a file manager pastes as its art, as a copied `.svg` file does.
     SVG export (Save As, Export As, Export for Screens, Asset Export and the clipboard share the writer) writes simple shapes as SVG basic shapes, as the reference app does (an ellipse is an `ellipse` tag until an anchor is added, [forum](https://community.adobe.com/t5/illustrator-discussions/trouble-exporting-shape-with-points-to-svg/td-p/10720325); rectangles come out as `<rect>` and `<polygon>`, [forum](https://community.adobe.com/t5/illustrator-discussions/force-svg-export-using-all-lt-rect-gt/td-p/11282378)): an axis-aligned rectangle as `<rect>`, a circle or ellipse drawn with four standard arcs as `<circle>`/`<ellipse>`, a straight line as `<line>`, and other straight-segment paths as `<polygon>`/`<polyline>`, at the written precision (#4652). A rectangle or ellipse with a dashed stroke, whose dashes would start elsewhere, a turned ellipse, curves and compound paths stay `<path>`. `crates/svg/tests/it/basic_shapes.rs` checks each element, that the picture renders as the canvas does and that the geometry reimports.
     At a precision of 9 decimals or fewer, SVG export writes each number from an integer when the integer rounds it as the decimal formatter does; the formatter still writes values halfway between two written numbers and values too large for the integer. Exporting one path of 200,000 anchors takes a median of 43.4 ms instead of 167.0 ms on Windows 11, and 20,000 rectangles 81.4 ms instead of 141.4 ms, with the same SVG (`crates/svg/src/lib.rs`).

From bc92def89eb03ce9dab00fe74d63a530dac1ff5b Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:12:38 -0800
Subject: [PATCH 04/48] Smooth tool: smoothing a path deselects its
 direct-selected anchors

path.smoothRegion replaced the anchors of each path it smoothed but left
the selection alone, so anchor and segment refs selected with Direct
Selection still named the old indices: after a smooth that removed
anchors, a ref could point past the end of the path or at another
anchor. The edit now drops those refs for each path it changes, so the
path stays selected whole. Selected paths the drag does not change keep
their anchors, and undo restores the earlier selection.
---
 crates/engine/src/cmd/draw2/smooth.rs |  6 +++++-
 crates/engine/src/tests/draw2.rs      | 22 ++++++++++++++++++++++
 docs/target-app-parity.md             |  2 +-
 3 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/crates/engine/src/cmd/draw2/smooth.rs b/crates/engine/src/cmd/draw2/smooth.rs
index d63bdaea77..df383c838b 100644
--- a/crates/engine/src/cmd/draw2/smooth.rs
+++ b/crates/engine/src/cmd/draw2/smooth.rs
@@ -167,9 +167,13 @@ pub(super) fn smooth_region(s: &mut Session, p: &Value) -> Result<Value> {
         return Ok(json!({ "ids": [], "before": 0, "after": 0 }));
     }
     let ids: Vec<NodeId> = plan.iter().map(|(id, _)| *id).collect();
-    s.edit("Smooth", |d, _| {
+    s.edit("Smooth", |d, sel| {
         for (id, np) in plan {
             *path_mut(d, id)? = np;
+            // The smoothed path has new anchors, so the old anchor and segment indices are
+            // dropped and the path stays selected whole.
+            sel.anchors.remove(&id);
+            sel.segments.remove(&id);
         }
         Ok(())
     })?;
diff --git a/crates/engine/src/tests/draw2.rs b/crates/engine/src/tests/draw2.rs
index 5986b618fd..fbf1b22d4a 100644
--- a/crates/engine/src/tests/draw2.rs
+++ b/crates/engine/src/tests/draw2.rs
@@ -1367,6 +1367,28 @@ fn smooth_tool_reduces_jagged_path() {
     assert_eq!(p.subpaths[0].anchors[0].p, Point::new(100.0, 200.0));
 }
 
+/// Smoothing a path with direct-selected anchors leaves the path selected whole: the selection no
+/// longer names anchors by indices into the anchors the smooth replaced. A selected path the drag
+/// does not reach keeps its anchors selected, and undo brings the old selection back.
+#[test]
+fn smoothing_a_path_drops_its_direct_selected_anchors() {
+    let mut s = session();
+    let anchors: Vec<_> = (0..=40).map(|i| json!({"x": 100.0 + i as f64 * 5.0, "y": 200.0 + if i % 2 == 0 { 0.0 } else { 1.5 }})).collect();
+    let r = s.execute("path.create", &json!({"anchors": anchors})).unwrap();
+    let id = NodeId(r["id"].as_u64().unwrap());
+    let other = line(&mut s, 100.0, 500.0, 300.0, 500.0);
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 38]], "mode": "set"})).unwrap();
+    s.execute("select.anchors", &json!({"id": other.0, "anchors": [[0, 1]], "mode": "add"})).unwrap();
+    drag(&mut s, "smooth", &[(90.0, 200.0), (200.0, 200.0), (310.0, 200.0)], Mods::default());
+    assert!(path(&s, id).anchor_count() < 20, "the path is smoothed");
+    let sel = s.doc().unwrap().selection.clone();
+    assert!(sel.contains(id) && sel.contains(other), "{sel:?}");
+    assert!(!sel.anchors.contains_key(&id) && !sel.segments.contains_key(&id), "{sel:?}");
+    assert_eq!(sel.anchors.get(&other), Some(&[(0, 1)].into()), "the path out of reach keeps its anchor");
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(s.doc().unwrap().selection.anchors.get(&id), Some(&[(0, 38)].into()));
+}
+
 /// #1512: a short drag over a small bump smooths the stretch of path under it. The long straight
 /// sides next to the bump stay straight lines from their far ends, which keep their place.
 #[test]
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..40fa89202c 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1012,7 +1012,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
     Blob Brush and Eraser Tool Options' Size is Fixed or Pressure with a Variation (#4590, #3961): with Pressure a pen stroke is Size − Variation wide where it presses lightest and Size + Variation where it presses hardest, and a mouse stroke keeps the Size.
     With the Blob Brush, Shift held during a drag keeps the stroke on the horizontal or vertical line through the press point, whichever is nearer to the pointer (90° steps from the Constrain Angle preference), and the points dragged since Shift went down move to the other line when the pointer crosses to it; the points dragged while Shift is up follow the pointer.
     With the Blob Brush, Alt held before the press, or pressed before the drag has moved, switches to the Smooth tool, as the reference app's [Default keyboard shortcuts](https://web.archive.org/web/20260726060015/https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html) page lists: the cursor shows the Smooth tool, the drag shows a thin line without the length label, Shift does not constrain it, and the release smooths the selected paths under the drag (`path.smoothRegion`) instead of painting; with nothing selected the release changes no path. A stroke that has moved keeps painting when Alt goes down.
-    Curvature point markers are circular, with no direction handles. While drawing, its own point feedback replaces generic selection markers; existing paths use the selection overlay, including partial selections and Hide Edges. Anchor Size applies, and Direct Selection and Pen retain their handles. The real egui-frame regressions in `crates/ui-egui/src/canvas.rs` verify marker positions, counts and unchanged documents (#1236, in part); the existing-path interpolation request remains open. The curve through the points (`curvature_spline` in `crates/tools/src/draw2.rs`) makes each stretch of three points follow the circle through them: a smooth point's handles lie along that circle's tangent, each `chord / (3 cos²(α/2))` long (α between handle and chord, capped at 90°), and the ends of an open path mirror their neighbour's tangent in their chord, so a J or a U curves evenly, a turn tighter than 30° comes to a point, and uneven spacing doesn't loop; the rubber band, a dragged or inserted point and `path.convertAnchor` to smooth use the same rule, while the Pencil's fitting keeps its own; `tests/draw2.rs` checks that the rubber band is the path the click makes (#1236, in part). The Smooth tool smooths only the stretch of path under the drag (#1547, fixes #1512).
+    Curvature point markers are circular, with no direction handles. While drawing, its own point feedback replaces generic selection markers; existing paths use the selection overlay, including partial selections and Hide Edges. Anchor Size applies, and Direct Selection and Pen retain their handles. The real egui-frame regressions in `crates/ui-egui/src/canvas.rs` verify marker positions, counts and unchanged documents (#1236, in part); the existing-path interpolation request remains open. The curve through the points (`curvature_spline` in `crates/tools/src/draw2.rs`) makes each stretch of three points follow the circle through them: a smooth point's handles lie along that circle's tangent, each `chord / (3 cos²(α/2))` long (α between handle and chord, capped at 90°), and the ends of an open path mirror their neighbour's tangent in their chord, so a J or a U curves evenly, a turn tighter than 30° comes to a point, and uneven spacing doesn't loop; the rubber band, a dragged or inserted point and `path.convertAnchor` to smooth use the same rule, while the Pencil's fitting keeps its own; `tests/draw2.rs` checks that the rubber band is the path the click makes (#1236, in part). The Smooth tool smooths only the stretch of path under the drag (#1547, fixes #1512). A path the Smooth tool changes stays selected whole, and the anchor points and segments selected on it with Direct Selection are deselected. Selected paths the drag does not change keep their selected anchors, and undo restores the earlier selection (`tests/draw2.rs`, `smoothing_a_path_drops_its_direct_selected_anchors`).
     While Alt is held during a Paintbrush stroke or before a press with no path selected that the Smooth tool can act on, the Paintbrush shows a closing cursor (a crosshair with a ring), and so does the Pencil with Alt key toggles to Smooth Tool off when Alt is pressed after the drag starts; releasing the mouse button with Alt still held closes the path. Before a Paintbrush press with such a path selected, Alt shows the Smooth cursor, and holding Alt at the press smooths that path with the Smooth tool's radius and Smooth Tool Options' Fidelity. A Pencil drag started with Shift or Alt held draws a straight line instead, which stays open.
     With Shift held at the press, the Pencil draws a straight line from the press point to the pointer at 45° steps from the Constrain Angle, as [Draw straight lines with the Pencil tool](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/draw-straight-lines-with-the-pencil-tool.html) describes; pressed on an end of a selected open path, the line continues the path from that end (part of #3799). With Option/Alt held at the press and Alt key toggles to Smooth Tool off, the Pencil draws a straight line at any angle, whose ends snap to Smart Guides, and it stays open when Alt is still held at the release; Shift and Alt together keep the 45° steps (#3799). While Shift or Alt is held before the press, the Pencil shows a straight-line cursor (a crosshair with a short line), and over an end of a selected open path, where the line continues the path, a path-continuation cursor (the same line leaving a small square), as the page describes.
   - **Shapes:** all shape tools (including Flare) and the line, arc, spiral and grid tools. Space held while dragging out a shape, line, arc, spiral or grid moves it at its current size. While a grid is dragged out, Up/Down change its rows (concentric dividers) and Left/Right its columns (radial dividers). A click with a grid tool asks for the size, the divider counts and the grid options (#1377, in part): a skew for each set of dividers, Use Outside Rectangle As Frame or Create Compound Path From Ellipses, and Fill Grid; they are parameters of `shape.rectangularGrid` and `shape.polarGrid`, stay as the tool's options and apply to drags too. A shape just drawn stays adjustable with its tool: its Live Shape widgets drag, a press on its centre point (Show Center) moves the selection with the Selection tool's move arrow, snapping and Alt copy, and a press in the rotate zone just outside a bounding-box corner turns it about the centre with the Selection tool's rotate cursor (#5477; tests `a_shape_tool_moves_the_selection_by_its_centre_point_and_turns_it_from_a_corner` and, through the engine, `shapetools.rs`). A drag on one of its eight bounding-box handles scales it as the Selection tool's handles do, with their cursors and snapping, instead of drawing a new shape from the handle. A shape tool takes a press as a handle's only on the drawn handle square (VectorCraft's own rule: 3 screen points from its centre along each axis at the default Anchor Size, a half point more or less per step; the Selection tool takes 5), so a press just beside a handle still draws (tests `a_shape_tool_scales_the_selection_by_its_bounding_box_handles`, `a_shape_tool_draws_from_a_press_just_beside_a_handle` and `a_shape_tool_scales_the_shape_just_drawn_by_its_bounding_box_handle`). The curve a skew percentage follows and the direction of the radial skew are our own (the public documentation gives neither), and the dialogs have no reference point locator. An ellipse's Pie Start and End Angle and Invert Pie (Transform and Properties panels' Ellipse Properties, `object.setLiveShape {pieStart, pieEnd, invertPie}`) cut it as a pie (#812). With the bounding box showing, the Selection tool shows a selected ellipse's two pie widgets just outside it; dragging one sets its angle in one undo step and double-clicking one makes the ellipse whole again. A live polygon's Polygon Properties there: side count, angle, corner type and radius, radius, side length and Make Sides Equal once an uneven scale has made its sides differ (`object.setLiveShape {sides, polygonAngle, polygonRadius, sideLength, makeSidesEqual}`, part of #812); a star is a plain path, as in Illustrator. The Flare Tool Options last as the tool's options: the next flare dragged out uses them, a click's dialog shows them and double-clicking the tool opens them (part of #812).

From 7805479dadd9779ba9ecee347dc053b219ef49a3 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:22:29 -0800
Subject: [PATCH 05/48] Libraries: a character style's menu offers Apply, Add
 to Character Styles, Rename and Delete
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A right-click on a character style in the Libraries panel now opens Apply
Character Style, Add to Character Styles, Move to Group, Rename… and
Delete. Apply is enabled only with type selected. Opening the menu applies
nothing, and the paragraph style menu is unchanged.

- library.addToCharacterStyles adds the style to the document's character
  styles without applying it, so no type needs to be selected. A document
  style with the same name and attributes is reused with no undo step, and
  a name taken by other attributes gets a number.
- library.renameItem renames a library item in place and keeps its group.
  The name is trimmed and has 1 to 256 characters. Another item of the same
  kind with that name is an error, the item's own name writes nothing, and
  a rename is not a document undo step.
- library.use and library.addToCharacterStyles compare a library style
  with the document's in the form the document stores it in. A whole
  number size from a library file no longer adds a numbered copy.
- A character style color linked to a swatch that is not a global or spot
  swatch of the document keeps the color it shows without the link.
  Before, adding or applying such a style failed with "no swatch".

Help page: https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/add-and-use-text-and-character-styles-in-libraries.html
---
 crates/engine/src/cmd/library.rs             | 160 ++++++++++++++-
 crates/engine/src/cmd/textstyles.rs          |   7 +
 crates/engine/src/tests/library.rs           | 204 +++++++++++++++++++
 crates/ui-egui/src/i18n/bg.tsv               |   3 +
 crates/ui-egui/src/i18n/bs.tsv               |   3 +
 crates/ui-egui/src/i18n/ca.tsv               |   3 +
 crates/ui-egui/src/i18n/cs.tsv               |   3 +
 crates/ui-egui/src/i18n/da.tsv               |   3 +
 crates/ui-egui/src/i18n/de.tsv               |   3 +
 crates/ui-egui/src/i18n/el.tsv               |   3 +
 crates/ui-egui/src/i18n/es.tsv               |   3 +
 crates/ui-egui/src/i18n/fi.tsv               |   3 +
 crates/ui-egui/src/i18n/fr.tsv               |   3 +
 crates/ui-egui/src/i18n/hi.tsv               |   3 +
 crates/ui-egui/src/i18n/hu.tsv               |   3 +
 crates/ui-egui/src/i18n/id.tsv               |   3 +
 crates/ui-egui/src/i18n/it.tsv               |   3 +
 crates/ui-egui/src/i18n/ja.tsv               |   3 +
 crates/ui-egui/src/i18n/ka.tsv               |   3 +
 crates/ui-egui/src/i18n/ko.tsv               |   3 +
 crates/ui-egui/src/i18n/nl.tsv               |   3 +
 crates/ui-egui/src/i18n/pl.tsv               |   3 +
 crates/ui-egui/src/i18n/pt-br.tsv            |   3 +
 crates/ui-egui/src/i18n/ru.tsv               |   3 +
 crates/ui-egui/src/i18n/sv.tsv               |   3 +
 crates/ui-egui/src/i18n/tr.tsv               |   3 +
 crates/ui-egui/src/i18n/uk.tsv               |   3 +
 crates/ui-egui/src/i18n/vi.tsv               |   3 +
 crates/ui-egui/src/i18n/zh-hans.tsv          |   3 +
 crates/ui-egui/src/i18n/zh-hant.tsv          |   3 +
 crates/ui-egui/src/panels/libraries.rs       |  71 ++++++-
 crates/ui-egui/src/panels/libraries/tests.rs |  83 ++++++++
 docs/mcp.md                                  |  10 +-
 docs/target-app-parity.md                    |   1 +
 34 files changed, 606 insertions(+), 11 deletions(-)

diff --git a/crates/engine/src/cmd/library.rs b/crates/engine/src/cmd/library.rs
index a6d2cbf518..ae8a7ef6b2 100644
--- a/crates/engine/src/cmd/library.rs
+++ b/crates/engine/src/cmd/library.rs
@@ -346,6 +346,36 @@ impl Library {
         }
     }
 
+    /// Name item `r` `name`, in its place in its kind's list; an item keyed by its name keeps its
+    /// group under the new name (a graphic is keyed by its id, which stays).
+    fn rename_item(&mut self, r: &ItemRef, name: &str) {
+        fn set<'a>(mut names: impl Iterator<Item = &'a mut String>, from: &str, to: &str) {
+            if let Some(n) = names.find(|n| n.as_str() == from) {
+                *n = to.to_string();
+            }
+        }
+        let from = r.item.as_str();
+        match r.kind {
+            ItemKind::Color => set(self.colors.iter_mut().map(|c| &mut c.name), from, name),
+            ItemKind::Gradient => set(self.gradients.iter_mut().map(|g| &mut g.name), from, name),
+            ItemKind::Pattern => set(self.patterns.iter_mut().map(|p| &mut p.name), from, name),
+            ItemKind::CharStyle => set(self.char_styles.iter_mut().map(|t| &mut t.name), from, name),
+            ItemKind::ParaStyle => set(self.para_styles.iter_mut().map(|t| &mut t.name), from, name),
+            ItemKind::Graphic => {
+                if let Some(g) = self.graphics.iter_mut().find(|g| g.id == from) {
+                    g.name = name.to_string();
+                }
+                return;
+            }
+            ItemKind::Unknown => return,
+        }
+        for x in self.groups.iter_mut().flat_map(|g| g.items.iter_mut()) {
+            if x == r {
+                x.item = name.to_string();
+            }
+        }
+    }
+
     /// Move item `r` next to `to`, an item of its kind: just before it, or just after it when
     /// `after`, in their kind's list (the order the panel shows them in).
     fn place_next_to(&mut self, r: &ItemRef, to: &ItemRef, after: bool) {
@@ -683,7 +713,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Use Library Item",
             [],
             None,
-            "{library?, kind, item: name (graphic: id or name), center?: [x, y] (graphic; default: the first artboard's centre), to?: fill|stroke (colors, gradients, patterns; default: the kind's), recorded?: the item as it was when used (recorded in the journal so a replay matches)} graphic: place a copy centred on `center`, its resources pasted along, selected, one undo step; colors and gradients: paint the selection (and the defaults) as paint.setFill/paint.setStroke, a gradient fitting each object; a spot color links to the document's spot swatch of its ink's name, added when the document has none of that colour (a name taken by another colour gets a number), one undo step; patterns: add the pattern and its swatch to the document (a name the document gives another pattern gets a number; the same pattern is reused) and paint the selection (and the defaults) with it, one undo step; charStyle/paraStyle: add the style to the document (a name taken by different attributes gets a number) and apply it to the selected text, one undo step → {kind, ids?, style?}",
+            "{library?, kind, item: name (graphic: id or name), center?: [x, y] (graphic; default: the first artboard's centre), to?: fill|stroke (colors, gradients, patterns; default: the kind's), recorded?: the item as it was when used (recorded in the journal so a replay matches)} graphic: place a copy centred on `center`, its resources pasted along, selected, one undo step; colors and gradients: paint the selection (and the defaults) as paint.setFill/paint.setStroke, a gradient fitting each object; a spot color links to the document's spot swatch of its ink's name, added when the document has none of that colour (a name taken by another colour gets a number), one undo step; patterns: add the pattern and its swatch to the document (a name the document gives another pattern gets a number; the same pattern is reused) and paint the selection (and the defaults) with it, one undo step; charStyle/paraStyle: add the style to the document (a name taken by different attributes gets a number; a character style's color linked to a swatch that isn't a global or spot swatch of the document keeps the color it shows, unlinked) and apply it to the selected text, one undo step → {kind, ids?, style?}",
             has_doc,
             use_item
         ),
@@ -696,6 +726,24 @@ pub fn specs() -> Vec<CommandSpec> {
             always,
             remove_item
         ),
+        cmd!(
+            "library.renameItem",
+            "Rename Library Item",
+            [],
+            None,
+            "{library?, kind, item: name (graphic: id or name), name: string (trimmed; 1 to 256 characters)} rename an item; it keeps its place and its group; another item of its kind with that name is an error, and its own name changes nothing; not undoable → {library, kind, item: its key now (graphic: its id), name}",
+            always,
+            rename_item
+        ),
+        cmd!(
+            "library.addToCharacterStyles",
+            "Add to Character Styles",
+            [],
+            None,
+            "{library?, item: a character style's name, recorded?: the style as it was when added (recorded in the journal so a replay matches)} add a library character style to the document's character styles without applying it (no text needs to be selected): a document style of that name with the same attributes is reused, a name taken by different attributes gets a number; a color linked to a swatch that isn't a global or spot swatch of the document keeps the color it shows, unlinked; a new style is one undo step, a reused one none → {style: its name in the document, existing: bool}",
+            has_doc,
+            add_to_char_styles
+        ),
         cmd!(
             "library.createGroup",
             "New Library Group",
@@ -1231,8 +1279,13 @@ fn use_item(s: &mut Session, p: &Value) -> Result<Value> {
         Kind::CharStyle | Kind::ParaStyle => {
             let para = kind == Kind::ParaStyle;
             let name = data.get("name").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty()).unwrap_or("Style").to_string();
-            let attrs = data.get("attrs").and_then(Value::as_object).cloned().unwrap_or_default();
+            let mut attrs = data.get("attrs").and_then(Value::as_object).cloned().unwrap_or_default();
             let doc = &s.doc()?.doc;
+            if !para {
+                unlink_missing_swatches(doc, &mut attrs);
+            }
+            // Compared in the form the document stores them in.
+            let attrs = super::textstyles::stored_style_attrs(doc, para, &attrs).unwrap_or(attrs);
             // The document's style of that name when it is the same; else a new one.
             let same = super::textstyles::style_attrs(doc, para, &name).is_some_and(|a| a == attrs);
             let style = if same { name } else { unique(&name, |n| super::textstyles::style_attrs(doc, para, n).is_some()) };
@@ -1361,6 +1414,109 @@ fn remove_item(s: &mut Session, p: &Value) -> Result<Value> {
     ok()
 }
 
+fn rename_item(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "library.renameItem";
+    let (id, kind, item) = item_param(s, p, C)?;
+    let name = match p.get("name") {
+        None | Some(Value::Null) => return Err(bad(C, "missing `name`")),
+        Some(Value::String(n)) => n.trim().to_string(),
+        Some(_) => return Err(bad(C, "`name` must be a string")),
+    };
+    if name.is_empty() {
+        return Err(bad(C, "missing `name`"));
+    }
+    if name.chars().count() > MAX_NAME {
+        let (label, max) = ("`name`", MAX_NAME);
+        return Err(bad(C, format!("{label} must be at most {max} characters")));
+    }
+    let lib = s.libraries.get(&id).ok_or_else(|| bad(C, format!("no library `{id}`")))?;
+    let r = lib.item_ref(kind.item_kind(), item).ok_or_else(|| bad(C, format!("the library has no item `{item}`")))?;
+    // The item's name now, and whether another item of its kind has the new one.
+    let mut same = false;
+    let mut taken = false;
+    for (_, key, shown) in lib.items().filter(|(k, ..)| *k == r.kind) {
+        if key == r.item {
+            same = shown == name;
+        } else if shown == name {
+            taken = true;
+        }
+    }
+    let key = if r.kind == ItemKind::Graphic { r.item.clone() } else { name.clone() };
+    let out = json!({ "library": id, "kind": str_param(p, "kind"), "item": key, "name": name });
+    if same {
+        return Ok(out);
+    }
+    if taken {
+        return Err(bad(C, format!("the library has another item of that kind named `{name}`")));
+    }
+    s.libraries.change(&id, |lib| {
+        lib.rename_item(&r, &name);
+        Ok(())
+    })?;
+    Ok(out)
+}
+
+fn add_to_char_styles(s: &mut Session, p: &Value) -> Result<Value> {
+    const C: &str = "library.addToCharacterStyles";
+    // A replay (the journal) carries what the style was, so it doesn't depend on the library.
+    let data = match p.get("recorded").cloned() {
+        Some(r) => r,
+        None => {
+            let id = library_id(s, p, C)?;
+            let item = str_param(p, "item").ok_or_else(|| bad(C, "missing `item`"))?;
+            let lib = s.libraries.get(&id).ok_or_else(|| bad(C, format!("no library `{id}`")))?;
+            let t = lib.char_styles.iter().find(|t| t.name == item).ok_or_else(|| bad(C, format!("the library has no item `{item}`")))?;
+            let data = json!({ "name": t.name, "attrs": t.attrs });
+            s.note_journal("recorded", data.clone());
+            data
+        }
+    };
+    let name = data.get("name").and_then(Value::as_str).map(str::trim).filter(|n| !n.is_empty()).unwrap_or("Style").to_string();
+    let mut attrs = data.get("attrs").and_then(Value::as_object).cloned().ok_or_else(|| bad(C, "the library item is damaged"))?;
+    let doc = &s.doc()?.doc;
+    unlink_missing_swatches(doc, &mut attrs);
+    // Compared in the form the document stores them in.
+    let attrs = super::textstyles::stored_style_attrs(doc, false, &attrs).unwrap_or(attrs);
+    // The document's style of that name when it is the same; else a new one, which isn't applied.
+    if super::textstyles::style_attrs(doc, false, &name).is_some_and(|a| a == attrs) {
+        return Ok(json!({ "style": name, "existing": true }));
+    }
+    let style = unique(&name, |n| super::textstyles::style_attrs(doc, false, n).is_some());
+    s.execute("charStyle.new", &json!({ "name": style, "attrs": attrs }))?;
+    Ok(json!({ "style": style, "existing": false }))
+}
+
+/// Unlink a library character style's `fill` and `stroke` colors (solid, and each gradient stop)
+/// from swatches that are not global or spot swatches of `doc`: an unlinked color keeps the color
+/// it shows at full tint, as [`clean_gradient`] keeps a library gradient's stops. A link to a
+/// global or spot swatch `doc` has stays, and takes that swatch's color.
+fn unlink_missing_swatches(doc: &vectorcraft_doc::Document, attrs: &mut Map<String, Value>) {
+    let keep = |name: &str| doc.global_color(name).is_some();
+    for key in ["fill", "stroke"] {
+        let Some(mut paint) = attrs.get(key).and_then(|v| serde_json::from_value::<Paint>(v.clone()).ok()) else { continue };
+        let mut changed = false;
+        let mut unlink = |swatch: &mut Option<String>, tint: &mut f32| {
+            if swatch.as_deref().is_some_and(|n| !keep(n)) {
+                *swatch = None;
+                *tint = 1.0;
+                changed = true;
+            }
+        };
+        match &mut paint {
+            Paint::Solid { swatch, tint, .. } => unlink(swatch, tint),
+            Paint::Gradient(g) => {
+                for st in &mut g.gradient.stops {
+                    unlink(&mut st.swatch, &mut st.tint);
+                }
+            }
+            _ => {}
+        }
+        if changed && let Ok(v) = serde_json::to_value(&paint) {
+            attrs.insert(key.to_string(), v);
+        }
+    }
+}
+
 /// `p`'s `name`, trimmed and clipped, else `default`.
 fn name_param(p: &Value, default: &str) -> String {
     let mut name = str_param(p, "name").map(str::trim).filter(|n| !n.is_empty()).unwrap_or(default).to_string();
diff --git a/crates/engine/src/cmd/textstyles.rs b/crates/engine/src/cmd/textstyles.rs
index 99cfc0a3fc..8134976144 100644
--- a/crates/engine/src/cmd/textstyles.rs
+++ b/crates/engine/src/cmd/textstyles.rs
@@ -506,6 +506,13 @@ pub(crate) fn style_attrs(d: &Document, para: bool, name: &str) -> Option<Map<St
     if para { Kind::Para } else { Kind::Char }.attrs(d, name)
 }
 
+/// `attrs` in the form `charStyle.new` (`para`: `paraStyle.new`) stores them in `d`, or `None`
+/// when they don't pass its checks.
+pub(crate) fn stored_style_attrs(d: &Document, para: bool, attrs: &Map<String, Value>) -> Option<Map<String, Value>> {
+    let kind = if para { Kind::Para } else { Kind::Char };
+    attrs_param(d, &json!({ "attrs": attrs }), kind, "new", None).ok().flatten()
+}
+
 /// The name `charStyle.new` (`para`: `paraStyle.new`) gives a style when it is given none: the
 /// first "Character Style N" ("Paragraph Style N") that no character style (paragraph style) of the
 /// document has.
diff --git a/crates/engine/src/tests/library.rs b/crates/engine/src/tests/library.rs
index 15a8da8104..d7927ec6bf 100644
--- a/crates/engine/src/tests/library.rs
+++ b/crates/engine/src/tests/library.rs
@@ -635,6 +635,210 @@ fn a_library_style_named_with_spaces_comes_in_trimmed() {
     assert_eq!((text.runs[0].style.size, text.runs[0].style.style_name.as_deref()), (31.0, Some("Body")));
 }
 
+/// The size of the first run of text object `id`.
+fn run_size(s: &Session, id: &Value) -> f64 {
+    match &s.doc().unwrap().doc.node(NodeId(id.as_u64().unwrap())).unwrap().kind {
+        vectorcraft_doc::NodeKind::Text(t) => t.runs[0].style.size,
+        _ => 0.0,
+    }
+}
+
+/// Add to Character Styles puts a library character style into the document's character styles
+/// without applying it, with or without type selected, in one undo step; the same style there is
+/// reused without a step, and a name taken by other attributes gets a number. A bad call changes
+/// nothing.
+#[test]
+fn a_library_character_style_is_added_to_the_document_without_applying_it() {
+    let mut s = session();
+    let data = json!({"name": "Kept", "charStyles": [{"name": "Headline", "attrs": {"size": 31.0}}, {"name": "Broken", "attrs": {"size": "big"}}]});
+    let lib = run(&mut s, "library.import", json!({"data": data.to_string()}))["id"].as_str().unwrap().to_string();
+    let styles = |s: &Session| s.doc().unwrap().doc.char_styles.iter().map(|c| c.name.clone()).collect::<Vec<_>>();
+    let undo = |s: &Session| s.doc().unwrap().history.undo.len();
+    // Nothing selected.
+    let before = undo(&s);
+    let r = run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Headline"}));
+    assert_eq!((r["style"].as_str(), r["existing"].as_bool()), (Some("Headline"), Some(false)));
+    assert_eq!(styles(&s), ["Headline"]);
+    assert_eq!(undo(&s), before + 1, "one undo step");
+    let attrs = &s.doc().unwrap().doc.char_styles[0].attrs;
+    assert_eq!(attrs.get("size"), Some(&json!(31.0)));
+    // Selected type keeps its look.
+    let t = run(&mut s, "text.create", json!({"x": 10, "y": 50, "text": "Body", "size": 9}))["id"].clone();
+    run(&mut s, "select.set", json!({"ids": [t]}));
+    let before = undo(&s);
+    let r = run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Headline"}));
+    assert_eq!((r["style"].as_str(), r["existing"].as_bool()), (Some("Headline"), Some(true)));
+    assert_eq!((undo(&s), run_size(&s, &t), styles(&s).len()), (before, 9.0, 1), "reused: no step, the type unchanged");
+    // Another style of that name: numbered, still not applied.
+    run(&mut s, "charStyle.setAttrs", json!({"name": "Headline", "attrs": {"size": 5}}));
+    let r = run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Headline"}));
+    assert_eq!((r["style"].as_str(), r["existing"].as_bool()), (Some("Headline 2"), Some(false)));
+    assert_eq!(run_size(&s, &t), 9.0);
+    let vectorcraft_doc::NodeKind::Text(text) = &s.doc().unwrap().doc.node(NodeId(t.as_u64().unwrap())).unwrap().kind else { panic!("not text") };
+    assert_eq!(text.runs[0].style.style_name, None, "no style applied");
+    // Undo takes the added style back alone.
+    run(&mut s, "edit.undo", json!({}));
+    assert_eq!(styles(&s), ["Headline"]);
+    // Bad calls: nothing changes.
+    let before = (undo(&s), styles(&s));
+    for bad in [
+        json!({"library": lib}),
+        json!({"library": lib, "item": 3}),
+        json!({"library": lib, "item": "Nope"}),
+        json!({"library": "Nope", "item": "Headline"}),
+        json!({"library": lib, "item": "Broken"}),
+        json!({"recorded": {"name": "X", "attrs": "damaged"}}),
+    ] {
+        assert!(s.execute("library.addToCharacterStyles", &bad).is_err(), "{bad}");
+        assert_eq!((undo(&s), styles(&s)), before, "{bad}");
+    }
+    // Without a document it isn't available.
+    run(&mut s, "file.close", json!({}));
+    assert!(s.active().is_none());
+    assert!(s.execute("library.addToCharacterStyles", &json!({"library": lib, "item": "Headline"})).is_err());
+}
+
+/// A library character style whose fill links to a swatch the document lacks is added and applied
+/// with the color it shows, unlinked at full tint; a global swatch of that name in the document
+/// keeps the link and gives its color.
+#[test]
+fn a_library_character_style_linked_to_a_missing_swatch_is_added_unlinked() {
+    let base = vectorcraft_color::Color::rgb(0.2, 0.4, 0.6);
+    let shown = base.tinted(0.5);
+    let linked = vectorcraft_color::Paint::Solid { color: shown, swatch: Some("Brand".into()), tint: 0.5 };
+    let data = json!({"name": "Kept", "charStyles": [{"name": "Accent", "attrs": {"size": 20.0, "fill": linked}}]});
+    let mut s = session();
+    let lib = run(&mut s, "library.import", json!({"data": data.to_string()}))["id"].as_str().unwrap().to_string();
+    let fill = |s: &Session, name: &str| {
+        let st = s.doc().unwrap().doc.char_styles.iter().find(|c| c.name == name).map(|c| c.attrs.clone()).unwrap();
+        serde_json::from_value::<vectorcraft_color::Paint>(st["fill"].clone()).unwrap()
+    };
+    run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Accent"}));
+    assert_eq!(fill(&s, "Accent"), vectorcraft_color::Paint::Solid { color: shown, swatch: None, tint: 1.0 });
+    // Apply as well, on selected type.
+    let t = run(&mut s, "text.create", json!({"x": 10, "y": 50, "text": "Body", "size": 9}))["id"].clone();
+    run(&mut s, "select.set", json!({"ids": [t]}));
+    let r = run(&mut s, "library.use", json!({"library": lib, "kind": "charStyle", "item": "Accent"}));
+    assert_eq!(r["style"], "Accent", "the added style is reused");
+    assert_eq!(run_size(&s, &t), 20.0);
+    // A document with a global swatch of that name keeps the link.
+    run(&mut s, "file.new", json!({"width": 200, "height": 200}));
+    let other = vectorcraft_color::Color::rgb(0.8, 0.1, 0.1);
+    run(&mut s, "swatch.new", json!({"name": "Brand", "color": other, "global": true}));
+    run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Accent"}));
+    let vectorcraft_color::Paint::Solid { swatch, tint, .. } = fill(&s, "Accent") else { panic!("not a solid fill") };
+    assert_eq!((swatch.as_deref(), tint), (Some("Brand"), 0.5));
+    // The style with the document's swatch color is the same style: added again, it is reused.
+    let r = run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Accent"}));
+    assert_eq!((r["style"].as_str(), r["existing"].as_bool()), (Some("Accent"), Some(true)));
+}
+
+/// A library style is compared with the document's in the form the document stores it in, so a
+/// style whose file writes a size as a whole number is reused, by Add to Character Styles and by a
+/// click alike.
+#[test]
+fn a_library_style_is_reused_whatever_form_its_file_writes_it_in() {
+    let data = json!({"name": "Kept", "charStyles": [{"name": "Whole", "attrs": {"size": 31}}], "paraStyles": [{"name": "Para", "attrs": {"left_indent": 4}}]});
+    let mut s = session();
+    let lib = run(&mut s, "library.import", json!({"data": data.to_string()}))["id"].as_str().unwrap().to_string();
+    run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Whole"}));
+    let r = run(&mut s, "library.addToCharacterStyles", json!({"library": lib, "item": "Whole"}));
+    assert_eq!((r["style"].as_str(), r["existing"].as_bool()), (Some("Whole"), Some(true)));
+    let t = run(&mut s, "text.create", json!({"x": 10, "y": 50, "text": "Body", "size": 9}))["id"].clone();
+    run(&mut s, "select.set", json!({"ids": [t]}));
+    for (kind, item) in [("charStyle", "Whole"), ("paraStyle", "Para"), ("paraStyle", "Para")] {
+        assert_eq!(run(&mut s, "library.use", json!({"library": lib, "kind": kind, "item": item}))["style"], item);
+    }
+    let d = &s.doc().unwrap().doc;
+    assert_eq!((d.char_styles.len(), d.para_styles.iter().filter(|p| p.name.starts_with("Para")).count()), (1, 1));
+}
+
+/// Rename gives a library item a new name, trimmed, in its place and its group; a character style
+/// keeps its attributes, a graphic its id. Another item of its kind with that name, an empty or
+/// too long name, a name that isn't text and an unknown item or library are errors that change
+/// nothing; a name with path characters is a name like any other; the item's own name writes
+/// nothing; and the document's history is not touched.
+#[test]
+fn library_items_are_renamed_in_place() {
+    let (mut s, g, c, st) = brand();
+    let t = run(&mut s, "text.create", json!({"x": 10, "y": 120, "text": "Body", "size": 9}))["id"].clone();
+    run(&mut s, "select.set", json!({"ids": [t]}));
+    let other = run(&mut s, "library.add", json!({"kind": "charStyle", "name": "Body"}))["name"].as_str().unwrap().to_string();
+    run(&mut s, "library.createGroup", json!({"name": "Brand", "items": [{"kind": "charStyle", "item": st}, {"kind": "fillColor", "item": c}]}));
+    let undo = s.doc().unwrap().history.undo.len();
+    let attrs = run(&mut s, "library.get", json!({}))["charStyles"][0]["attrs"].clone();
+    let r = run(&mut s, "library.renameItem", json!({"kind": "charStyle", "item": st, "name": "  Title  "}));
+    assert_eq!((r["item"].as_str(), r["name"].as_str()), (Some("Title"), Some("Title")));
+    let got = run(&mut s, "library.get", json!({}));
+    assert_eq!(got["charStyles"][0], json!({"name": "Title", "attrs": attrs}), "first still, the attributes kept");
+    assert_eq!(got["charStyles"][1]["name"], other.as_str());
+    assert_eq!(groups(&mut s), [("Brand".into(), refs(&[("charStyle", "Title"), ("color", &c)]))]);
+    // A colour keeps its group under its new name; a graphic keeps its id.
+    run(&mut s, "library.renameItem", json!({"kind": "strokeColor", "item": c, "name": "Navy"}));
+    assert_eq!(groups(&mut s), [("Brand".into(), refs(&[("charStyle", "Title"), ("color", "Navy")]))]);
+    let r = run(&mut s, "library.renameItem", json!({"kind": "graphic", "item": "Logo", "name": "Mark"}));
+    assert_eq!(r["item"], g.as_str());
+    let graphic = run(&mut s, "library.get", json!({}))["graphics"][0].clone();
+    assert_eq!((graphic["id"].as_str(), graphic["name"].as_str()), (Some(g.as_str()), Some("Mark")));
+    // Path characters are kept.
+    run(&mut s, "library.renameItem", json!({"kind": "charStyle", "item": "Title", "name": "a/b\\c:d"}));
+    assert_eq!(style_order_of(&mut s)[0], "a/b\\c:d");
+    // Errors change nothing.
+    let before = run(&mut s, "library.get", json!({}));
+    let long = "x".repeat(257);
+    for bad in [
+        json!({"kind": "charStyle", "item": "a/b\\c:d", "name": other}),
+        json!({"kind": "charStyle", "item": "a/b\\c:d", "name": "   "}),
+        json!({"kind": "charStyle", "item": "a/b\\c:d", "name": long}),
+        json!({"kind": "charStyle", "item": "a/b\\c:d", "name": 5}),
+        json!({"kind": "charStyle", "item": "a/b\\c:d"}),
+        json!({"kind": "charStyle", "item": "Nope", "name": "X"}),
+        json!({"kind": "paraStyle", "item": "a/b\\c:d", "name": "X"}),
+        json!({"kind": "brush", "item": "a/b\\c:d", "name": "X"}),
+        json!({"library": "Nope", "kind": "charStyle", "item": "a/b\\c:d", "name": "X"}),
+    ] {
+        assert!(s.execute("library.renameItem", &bad).is_err(), "{bad}");
+        assert_eq!(run(&mut s, "library.get", json!({})), before, "{bad}");
+    }
+    // A style of another kind may have the name, and 256 characters are allowed.
+    run(&mut s, "library.renameItem", json!({"kind": "charStyle", "item": "a/b\\c:d", "name": "Navy"}));
+    run(&mut s, "library.renameItem", json!({"kind": "charStyle", "item": "Navy", "name": "y".repeat(256)}));
+    assert_eq!(s.doc().unwrap().history.undo.len(), undo, "no document undo step");
+}
+
+/// The current library's character style names, in order.
+fn style_order_of(s: &mut Session) -> Vec<String> {
+    order(s, "charStyles", "name")
+}
+
+/// A rename is kept in the library's file; renaming an item to its own name writes nothing; and a
+/// rename whose file can't be written is taken back.
+#[cfg(not(target_arch = "wasm32"))]
+#[test]
+fn a_library_item_rename_is_saved_or_taken_back() {
+    let dir = vectorcraft_testkit::temp_dir("library-rename-item");
+    let folder = dir.to_string_lossy().to_string();
+    let mut s = session();
+    s.libraries.set_dir(Some(folder.clone()));
+    let lib = run(&mut s, "library.create", json!({"name": "Kept"}))["id"].as_str().unwrap().to_string();
+    let t = run(&mut s, "text.create", json!({"x": 10, "y": 50, "text": "Body", "size": 12}))["id"].clone();
+    run(&mut s, "select.set", json!({"ids": [t]}));
+    run(&mut s, "library.add", json!({"kind": "charStyle", "name": "Body"}));
+    run(&mut s, "library.renameItem", json!({"kind": "charStyle", "item": "Body", "name": "Text"}));
+    let mut t2 = session();
+    t2.libraries.set_dir(Some(folder.clone()));
+    assert_eq!(style_order_of(&mut t2), ["Text"], "kept in the file");
+    // The file can't be written (a folder stands where it goes): its own name still succeeds, as
+    // it writes nothing; a new name fails and is taken back.
+    let file = dir.join(format!("{lib}.vclibrary"));
+    std::fs::remove_file(&file).unwrap();
+    std::fs::create_dir(&file).unwrap();
+    run(&mut s, "library.renameItem", json!({"kind": "charStyle", "item": "Text", "name": " Text "}));
+    assert!(s.execute("library.renameItem", &json!({"kind": "charStyle", "item": "Text", "name": "Copy"})).is_err());
+    assert_eq!(style_order_of(&mut s), ["Text"], "taken back");
+    let _ = std::fs::remove_dir_all(&dir);
+}
+
 #[cfg(not(target_arch = "wasm32"))]
 #[test]
 fn libraries_are_kept_in_files_across_sessions() {
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 3828d9ba2d..1fb96d9c7d 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -3491,6 +3491,8 @@ digits	Malayalam	Малаялам
 	Rename Library Group	Преименуване на библиотечна група
 	Delete Library Group	Изтриване на библиотечна група
 	Move Library Item to Group	Преместване на библиотечен елемент в група
+	Rename Library Item	Преименуване на елемент от библиотека
+	Add to Character Styles	Добавяне към стилове на знаци
 	Library	Библиотека
 	Rename Library	Преименуване на библиотека
 	Show Library	Показване на библиотека
@@ -4064,6 +4066,7 @@ axis	Both	И двете
 	Drag to the window's left or right edge to dock	Плъзнете до левия или десния ръб на прозореца за закотвяне
 	Float Tool Group	Плаваща група инструменти
 @msg	no library `{id}`	няма библиотека `{id}`
+@msg	the library has another item of that kind named `{name}`	библиотеката вече има друг елемент от този вид с име `{name}`
 @msg	select some type first	първо изберете текст
 @msg	kerning must be a number, "auto", or "optical"	kerning трябва да е число, „auto“ или „optical“
 @msg	{_1} has no {_2} style	{_1} няма стил {_2}
diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv
index 81fee3a079..f04e9535e5 100644
--- a/crates/ui-egui/src/i18n/bs.tsv
+++ b/crates/ui-egui/src/i18n/bs.tsv
@@ -3550,6 +3550,8 @@ theme	Appearance	Izgled
 	Rename Library Group	Preimenuj grupu biblioteke
 	Delete Library Group	Izbriši grupu biblioteke
 	Move Library Item to Group	Premjesti stavku biblioteke u grupu
+	Rename Library Item	Preimenuj stavku biblioteke
+	Add to Character Styles	Dodaj u stilove znakova
 	Rename Library	Preimenuj biblioteku
 	Show Library	Prikaži biblioteku
 	Use Library Item	Koristi stavku biblioteke
@@ -4416,6 +4418,7 @@ imageTrace	Outline	Obris
 @plural	{n} step|{n} steps	{n} korak|{n} koraka|{n} koraka
 @plural	{n} stroke|{n} strokes	{n} potez|{n} poteza|{n} poteza
 @msg	no library `{id}`	nema biblioteke `{id}`
+@msg	the library has another item of that kind named `{name}`	biblioteka već ima drugu stavku te vrste s imenom `{name}`
 @msg	select some type first	prvo odaberite tekst
 @msg	kerning must be a number, "auto", or "optical"	kerning mora biti broj, „auto” ili „optical”
 @msg	the selection has no gradient fill	odabir nema ispunu gradijentom
diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv
index 02ae0f4a09..e6b6f398f2 100644
--- a/crates/ui-egui/src/i18n/ca.tsv
+++ b/crates/ui-egui/src/i18n/ca.tsv
@@ -2634,6 +2634,8 @@ digits	Malayalam	Malaiàlam
 	Move in Perspective	Mou en perspectiva
 	Move Library Group	Mou el grup de la biblioteca
 	Move Library Item to Group	Mou l’element de la biblioteca al grup
+	Rename Library Item	Canvia el nom de l’element de la biblioteca
+	Add to Character Styles	Afegeix als estils de caràcter
 	Move Locked and Hidden Artwork with Artboard	Mou la il·lustració bloquejada i oculta amb el tauler
 	Move Mesh Point	Mou el punt de malla
 	Move Mesh Points	Mou els punts de malla
@@ -5730,6 +5732,7 @@ digits	Malayalam	Malaiàlam
 @msg	no interaction in progress	no hi ha cap interacció en curs
 @msg	no key object	no hi ha objecte clau
 @msg	no library `{id}`	no hi ha la biblioteca `{id}`
+@msg	the library has another item of that kind named `{name}`	la biblioteca ja té un altre element d’aquest tipus anomenat `{name}`
 @msg	no library `{key}` (see {list})	no hi ha la biblioteca `{key}` (vegeu {list})
 @msg	No linked files to look for	No hi ha fitxers enllaçats per buscar
 @msg	no Live Paint edge near that point	no hi ha cap aresta de pintura interactiva a prop d’aquell punt
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index 7e3794e8a1..a44e3b9979 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -3604,6 +3604,8 @@ theme	Appearance	Motiv
 	Rename Library Group	Přejmenovat skupinu knihovny
 	Delete Library Group	Odstranit skupinu knihovny
 	Move Library Item to Group	Přesunout položku knihovny do skupiny
+	Rename Library Item	Přejmenovat položku knihovny
+	Add to Character Styles	Přidat do stylů znaků
 	Rename Library	Přejmenovat knihovnu
 	Show Library	Zobrazit knihovnu
 	Use Library Item	Použít položku knihovny
@@ -4477,6 +4479,7 @@ imageTrace	Outline	Obrys
 
 # Status and error messages
 @msg	no library `{id}`	knihovna `{id}` neexistuje
+@msg	the library has another item of that kind named `{name}`	knihovna už má jinou položku tohoto druhu s názvem `{name}`
 @msg	select some type first	nejprve vyberte text
 @msg	kerning must be a number, "auto", or "optical"	kerning musí být číslo, „auto“ nebo „optical“
 @msg	the selection has no gradient fill	výběr nemá přechodovou výplň
diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv
index f7011e23bf..bce3bd12da 100644
--- a/crates/ui-egui/src/i18n/da.tsv
+++ b/crates/ui-egui/src/i18n/da.tsv
@@ -3337,6 +3337,8 @@ theme	Appearance	Udseende
 	Rename Library Group	Omdøb biblioteksgruppe
 	Delete Library Group	Slet biblioteksgruppe
 	Move Library Item to Group	Flyt bibliotekselement til gruppe
+	Rename Library Item	Omdøb bibliotekselement
+	Add to Character Styles	Føj til tegnstile
 	Rename Library	Omdøb bibliotek
 	Show Library	Vis bibliotek
 	Use Library Item	Brug bibliotekselement
@@ -4183,6 +4185,7 @@ imageTrace	Outline	Kontur
 @plural	{n} step|{n} steps	{n} trin|{n} trin
 @plural	{n} stroke|{n} strokes	{n} kontur|{n} konturer
 @msg	no library `{id}`	intet bibliotek `{id}`
+@msg	the library has another item of that kind named `{name}`	biblioteket har allerede et andet element af den type med navnet `{name}`
 @msg	select some type first	markér først noget tekst
 @msg	kerning must be a number, "auto", or "optical"	kerning skal være et tal, „auto“ eller „optical“
 @msg	{_1} has no {_2} style	{_1} har ingen {_2}-stil
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index 4174537f87..0d995ddc2e 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -4091,6 +4091,7 @@ theme	Appearance	Erscheinungsbild
 # (`untranslated_report` lists any that are missing). Command ids, parameter
 # names and values in backticks or code (`colorModel rgb`, `document.export`) stay as they are.
 @msg	no library `{id}`	keine Bibliothek `{id}`
+@msg	the library has another item of that kind named `{name}`	die Bibliothek hat bereits ein anderes Element dieser Art namens `{name}`
 @msg	select some type first	wählen Sie zuerst Text aus
 @msg	kerning must be a number, "auto", or "optical"	kerning muss eine Zahl, „auto“ oder „optical“ sein
 @msg	the selection has no gradient fill	die Auswahl hat keinen Flächenverlauf
@@ -5124,6 +5125,8 @@ theme	Appearance	Erscheinungsbild
 	Rename Library Group	Bibliotheksgruppe umbenennen
 	Delete Library Group	Bibliotheksgruppe löschen
 	Move Library Item to Group	Bibliothekselement in Gruppe verschieben
+	Rename Library Item	Bibliothekselement umbenennen
+	Add to Character Styles	Zu Zeichenformaten hinzufügen
 	Import Library	Bibliothek importieren
 	Export Library	Bibliothek exportieren
 	New Group	Neue Gruppe
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index bde2fbee78..cb409e9274 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -2266,6 +2266,7 @@ axis	Both	Και τα δύο
 	Document Options	Επιλογές εγγράφου
 	Dock Control Bar	Αγκύρωση γραμμής ελέγχου
 @msg	no library `{id}`	Δεν υπάρχει βιβλιοθήκη με αναγνωριστικό `{id}`
+@msg	the library has another item of that kind named `{name}`	η βιβλιοθήκη έχει ήδη άλλο στοιχείο αυτού του είδους με όνομα `{name}`
 @msg	select some type first	Επιλέξτε πρώτα κάποιο κείμενο
 @msg	kerning must be a number, "auto", or "optical"	το kerning πρέπει να είναι αριθμός, «auto» ή «optical»
 @msg	the selection has no gradient fill	η επιλογή δεν έχει ντεγκραντέ γεμίσματος
@@ -4051,6 +4052,8 @@ digits	Malayalam	Μαλαγιάλαμ
 	Rename Library Group	Μετονομασία ομάδας βιβλιοθήκης
 	Delete Library Group	Διαγραφή ομάδας βιβλιοθήκης
 	Move Library Item to Group	Μετακίνηση στοιχείου βιβλιοθήκης σε ομάδα
+	Rename Library Item	Μετονομασία στοιχείου βιβλιοθήκης
+	Add to Character Styles	Προσθήκη στα στυλ χαρακτήρων
 	Rename Library	Μετονομασία βιβλιοθήκης
 	Show Library	Εμφάνιση βιβλιοθήκης
 	Use Library Item	Χρήση στοιχείου βιβλιοθήκης
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index ff28d9dfc5..de9512cddb 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -3583,6 +3583,8 @@ digits	Malayalam	Malayálam
 	Rename Library Group	Cambiar nombre del grupo de biblioteca
 	Delete Library Group	Eliminar grupo de biblioteca
 	Move Library Item to Group	Mover elemento de la biblioteca al grupo
+	Rename Library Item	Cambiar nombre del elemento de la biblioteca
+	Add to Character Styles	Agregar a estilos de carácter
 	Library	Biblioteca
 	Rename Library	Cambiar nombre de la biblioteca
 	Show Library	Mostrar biblioteca
@@ -4167,6 +4169,7 @@ axis	Both	Ambos
 # (`untranslated_report` lists any that are missing). Command ids, parameter
 # names and values in backticks or code (`colorModel rgb`, `document.export`) stay as they are.
 @msg	no library `{id}`	no hay ninguna biblioteca `{id}`
+@msg	the library has another item of that kind named `{name}`	la biblioteca ya tiene otro elemento de ese tipo llamado `{name}`
 @msg	select some type first	selecciona primero algún texto
 @msg	kerning must be a number, "auto", or "optical"	kerning debe ser un número, «auto» u «optical»
 @msg	the selection has no gradient fill	la selección no tiene un degradado de relleno
diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv
index bb74188ed8..1c3327fb1e 100644
--- a/crates/ui-egui/src/i18n/fi.tsv
+++ b/crates/ui-egui/src/i18n/fi.tsv
@@ -3542,6 +3542,8 @@ theme	Appearance	Ulkoasu
 	Rename Library Group	Nimeä kirjastoryhmä uudelleen
 	Delete Library Group	Poista kirjastoryhmä
 	Move Library Item to Group	Siirrä kirjaston kohde ryhmään
+	Rename Library Item	Nimeä kirjaston kohde uudelleen
+	Add to Character Styles	Lisää merkkityyleihin
 	Rename Library	Nimeä kirjasto uudelleen
 	Show Library	Näytä kirjasto
 	Use Library Item	Käytä kirjaston kohdetta
@@ -4392,6 +4394,7 @@ imageTrace	Outline	Ääriviiva
 @plural	{n} step|{n} steps	{n} vaihe|{n} vaihetta
 @plural	{n} stroke|{n} strokes	{n} viiva|{n} viivaa
 @msg	no library `{id}`	ei kirjastoa `{id}`
+@msg	the library has another item of that kind named `{name}`	kirjastossa on jo toinen samanlainen kohde nimeltä `{name}`
 @msg	select some type first	valitse ensin tekstiä
 @msg	kerning must be a number, "auto", or "optical"	kerning-arvon on oltava luku, ”auto” tai ”optical”
 @msg	the selection has no gradient fill	valinnalla ei ole liukuväritäyttöä
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index 09c9c35b0d..3b45c4d386 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -3575,6 +3575,8 @@ digits	Malayalam	Malayalam
 	Rename Library Group	Renommer le groupe de bibliothèque
 	Delete Library Group	Supprimer le groupe de bibliothèque
 	Move Library Item to Group	Déplacer l’élément de la bibliothèque vers un groupe
+	Rename Library Item	Renommer l’élément de la bibliothèque
+	Add to Character Styles	Ajouter aux styles de caractère
 	Library	Bibliothèque
 	Rename Library	Renommer la bibliothèque
 	Show Library	Afficher la bibliothèque
@@ -4156,6 +4158,7 @@ axis	Both	Les deux
 # (`untranslated_report` lists any that are missing). Command ids, parameter
 # names and values in backticks or code (`colorModel rgb`, `document.export`) stay as they are.
 @msg	no library `{id}`	aucune bibliothèque `{id}`
+@msg	the library has another item of that kind named `{name}`	la bibliothèque a déjà un autre élément de ce type nommé `{name}`
 @msg	select some type first	sélectionnez d’abord du texte
 @msg	kerning must be a number, "auto", or "optical"	kerning doit être un nombre, « auto » ou « optical »
 @msg	the selection has no gradient fill	la sélection n’a pas de dégradé de fond
diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv
index 9aa4bd7b99..0c6089e40a 100644
--- a/crates/ui-egui/src/i18n/hi.tsv
+++ b/crates/ui-egui/src/i18n/hi.tsv
@@ -2873,6 +2873,8 @@ antiAlias	Sharp	शार्प
 	Move in Perspective	पर्सपेक्टिव में मूव करें
 	Move Library Group	लाइब्रेरी ग्रुप मूव करें
 	Move Library Item to Group	लाइब्रेरी आइटम को ग्रुप में मूव करें
+	Rename Library Item	लाइब्रेरी आइटम का नाम बदलें
+	Add to Character Styles	कैरेक्टर स्टाइल्स में जोड़ें
 	Move Locked and Hidden Artwork with Artboard	आर्टबोर्ड के साथ लॉक्ड और छिपा हुआ आर्टवर्क मूव करें
 	Move Mesh Point	मेश पॉइंट मूव करें
 	Move Mesh Points	मेश पॉइंट मूव करें
@@ -7234,6 +7236,7 @@ antiAlias	Sharp	शार्प
 @msg	no layer {id} (see layer.list)	कोई लेयर {id} (layer.list देखें)
 @msg	no layers to export	निर्यात करने के लिए कोई लेयरें नहीं
 @msg	no library `{id}`	नहीं लाइब्रेरी `{id}`
+@msg	the library has another item of that kind named `{name}`	लाइब्रेरी में इस प्रकार का एक और आइटम `{name}` नाम से पहले से है
 @msg	no library `{key}`	नहीं लाइब्रेरी `{key}`
 @msg	no library `{key}` (see {list})	कोई लाइब्रेरी `{key}` ({list} देखें)
 @msg	No line breaks to remove	हटाने के लिए कोई लाइन ब्रेक नहीं
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index af6f586880..06122f94ee 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -2605,6 +2605,8 @@ file-filter	Templates	Sablonok
 	Move Guide to Layer	Segédvonal áthelyezése rétegre
 	Move in Perspective	Áthelyezés perspektívában
 	Move Library Item to Group	Könyvtárelem áthelyezése csoportba
+	Rename Library Item	Könyvtárelem átnevezése
+	Add to Character Styles	Hozzáadás a karakterstílusokhoz
 	Move Locked and Hidden Artwork with Artboard	Zárolt és rejtett grafika mozgatása a rajztáblával
 	Move Mesh Point	Hálópont áthelyezése
 	Move Mesh Points	Hálópontok áthelyezése
@@ -5314,6 +5316,7 @@ imageTrace	Outline	Körvonal
 @msg	no interaction in progress	nincs folyamatban lévő művelet
 @msg	no key object	nincs kulcsobjektum
 @msg	no library `{id}`	nincs ilyen könyvtár: `{id}`
+@msg	the library has another item of that kind named `{name}`	a könyvtárban már van egy másik ilyen fajta elem `{name}` néven
 @msg	no library `{key}` (see {list})	nincs ilyen könyvtár: `{key}` (lásd: {list})
 @msg	no Live Paint edge near that point	annál a pontnál nincs élőfestés-él
 @msg	no Live Paint face at that point	annál a pontnál nincs élőfestés-felület
diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv
index e0ba31ecd5..00d2b09600 100644
--- a/crates/ui-egui/src/i18n/id.tsv
+++ b/crates/ui-egui/src/i18n/id.tsv
@@ -3337,6 +3337,8 @@ theme	Appearance	Tampilan
 	Rename Library Group	Ganti nama grup pustaka
 	Delete Library Group	Hapus grup pustaka
 	Move Library Item to Group	Pindahkan item pustaka ke grup
+	Rename Library Item	Ganti nama item pustaka
+	Add to Character Styles	Tambahkan ke gaya karakter
 	Rename Library	Ganti nama pustaka
 	Show Library	Tampilkan pustaka
 	Use Library Item	Gunakan item pustaka
@@ -4183,6 +4185,7 @@ imageTrace	Outline	Kontur
 @plural	{n} step|{n} steps	{n} langkah
 @plural	{n} stroke|{n} strokes	{n} goresan
 @msg	no library `{id}`	tidak ada pustaka `{id}`
+@msg	the library has another item of that kind named `{name}`	pustaka sudah memiliki item lain dari jenis itu bernama `{name}`
 @msg	select some type first	pilih beberapa teks terlebih dahulu
 @msg	kerning must be a number, "auto", or "optical"	kerning harus berupa angka, “auto”, atau “optical”
 @msg	{_1} has no {_2} style	{_1} tidak memiliki gaya {_2}
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index ce0bc58ce5..869fe2e4a0 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -3628,6 +3628,8 @@ digits	Malayalam	Malayalam
 	Rename Library Group	Rinomina gruppo di libreria
 	Delete Library Group	Elimina gruppo di libreria
 	Move Library Item to Group	Sposta elemento della libreria nel gruppo
+	Rename Library Item	Rinomina elemento della libreria
+	Add to Character Styles	Aggiungi agli stili carattere
 	Library	Libreria
 	Rename Library	Rinomina libreria
 	Show Library	Mostra libreria
@@ -4218,6 +4220,7 @@ axis	Both	Entrambi
 # (`untranslated_report` lists any that are missing). Command ids, parameter
 # names and values in backticks or code (`colorModel rgb`, `document.export`) stay as they are.
 @msg	no library `{id}`	nessuna libreria `{id}`
+@msg	the library has another item of that kind named `{name}`	la libreria ha già un altro elemento di questo tipo chiamato `{name}`
 @msg	select some type first	seleziona prima del testo
 @msg	kerning must be a number, "auto", or "optical"	kerning deve essere un numero, «auto» o «optical»
 @msg	the selection has no gradient fill	la selezione non ha una sfumatura di riempimento
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index 1ecce4618a..a0ce9c93b9 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -3364,6 +3364,8 @@ mark-style	Japanese	日本式
 	Rename Library Group	ライブラリグループ名を変更
 	Delete Library Group	ライブラリグループを削除
 	Move Library Item to Group	ライブラリ項目をグループに移動
+	Rename Library Item	ライブラリ項目名を変更
+	Add to Character Styles	文字スタイルに追加
 	Library	ライブラリ
 	Rename Library	ライブラリ名を変更
 	Show Library	ライブラリを表示
@@ -4491,6 +4493,7 @@ swatch	Bright Violet	ビビッドバイオレット
 @msg	the layer to flatten into is hidden	統合先のレイヤーが非表示になっています
 @msg	there are no objects to release	レイヤーに分配するオブジェクトがありません
 @msg	no library `{id}`	ライブラリ `{id}` が見つかりません
+@msg	the library has another item of that kind named `{name}`	ライブラリには同じ種類の項目 `{name}` がすでにあります
 @msg	{path}: not a file	{path}: ファイルではありません
 @msg	{path}: {e}	{path}: {e}
 @msg	can't write .{ext} images	.{ext} 画像は書き出せません
diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv
index 3d6425c373..b19ed4009a 100644
--- a/crates/ui-egui/src/i18n/ka.tsv
+++ b/crates/ui-egui/src/i18n/ka.tsv
@@ -3183,6 +3183,8 @@ theme	Appearance	იერსახე
 	Rename Library Group	ბიბლიოთეკის ჯგუფის სახელის შეცვლა
 	Delete Library Group	ბიბლიოთეკის ჯგუფის წაშლა
 	Move Library Item to Group	ბიბლიოთეკის ელემენტის ჯგუფში გადატანა
+	Rename Library Item	ბიბლიოთეკის ელემენტის სახელის შეცვლა
+	Add to Character Styles	სიმბოლოს სტილებში დამატება
 	Rename Library	ბიბლიოთეკის სახელის შეცვლა
 	Show Library	ბიბლიოთეკის ჩვენება
 	Use Library Item	ბიბლიოთეკის ელემენტის გამოყენება
@@ -3986,6 +3988,7 @@ font-technology	Variable	ცვლადი
 @plural	{n} step|{n} steps	ნაბიჯი: {n}
 @plural	{n} stroke|{n} strokes	კონტური: {n}
 @msg	no library `{id}`	ბიბლიოთეკა `{id}` არ არსებობს
+@msg	the library has another item of that kind named `{name}`	ბიბლიოთეკას უკვე აქვს ამ ტიპის სხვა ელემენტი სახელით `{name}`
 @msg	select some type first	ჯერ მონიშნეთ ტექსტი
 @msg	kerning must be a number, "auto", or "optical"	kerning უნდა იყოს რიცხვი, „auto“ ან „optical“
 @msg	the selection has no gradient fill	მონიშნულს შევსების გრადიენტი არ აქვს
diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv
index fb87488d64..3f518f00c4 100644
--- a/crates/ui-egui/src/i18n/ko.tsv
+++ b/crates/ui-egui/src/i18n/ko.tsv
@@ -3353,6 +3353,8 @@ mark-style	Japanese	일본식
 	Rename Library Group	라이브러리 그룹 이름 바꾸기
 	Delete Library Group	라이브러리 그룹 삭제
 	Move Library Item to Group	라이브러리 항목을 그룹으로 이동
+	Rename Library Item	라이브러리 항목 이름 바꾸기
+	Add to Character Styles	문자 스타일에 추가
 	Library	라이브러리
 	Rename Library	라이브러리 이름 바꾸기
 	Show Library	라이브러리 표시
@@ -4418,6 +4420,7 @@ theme	Appearance	외관
 @msg	the layer to flatten into is hidden	병합 대상 레이어가 숨겨져 있습니다
 @msg	there are no objects to release	해제할 개체가 없습니다
 @msg	no library `{id}`	`{id}` 라이브러리가 없습니다
+@msg	the library has another item of that kind named `{name}`	라이브러리에 같은 종류의 다른 항목 `{name}`이(가) 이미 있습니다
 @msg	{path}: not a file	{path}: 파일이 아닙니다
 @msg	{path}: {e}	{path}: {e}
 @msg	can't write .{ext} images	.{ext} 이미지는 쓸 수 없습니다
diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv
index b3388fa82a..f4db319711 100644
--- a/crates/ui-egui/src/i18n/nl.tsv
+++ b/crates/ui-egui/src/i18n/nl.tsv
@@ -3351,6 +3351,8 @@ theme	Appearance	Vormgeving
 	Rename Library Group	Bibliotheekgroep hernoemen
 	Delete Library Group	Bibliotheekgroep verwijderen
 	Move Library Item to Group	Bibliotheekitem naar groep verplaatsen
+	Rename Library Item	Bibliotheekitem hernoemen
+	Add to Character Styles	Aan tekenstijlen toevoegen
 	Rename Library	Bibliotheek hernoemen
 	Show Library	Bibliotheek weergeven
 	Use Library Item	Bibliotheekitem gebruiken
@@ -4197,6 +4199,7 @@ imageTrace	Outline	Contour
 @plural	{n} step|{n} steps	{n} stap|{n} stappen
 @plural	{n} stroke|{n} strokes	{n} lijn|{n} lijnen
 @msg	no library `{id}`	geen bibliotheek `{id}`
+@msg	the library has another item of that kind named `{name}`	de bibliotheek heeft al een ander item van die soort met de naam `{name}`
 @msg	select some type first	selecteer eerst wat tekst
 @msg	kerning must be a number, "auto", or "optical"	kerning moet een getal, ‘auto’ of ‘optical’ zijn
 @msg	{_1} has no {_2} style	{_1} heeft geen {_2}stijl
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index 0729e35c79..770622cc1e 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -3483,6 +3483,8 @@ theme	Appearance	Wygląd
 	Rename Library Group	Zmień nazwę grupy biblioteki
 	Delete Library Group	Usuń grupę biblioteki
 	Move Library Item to Group	Przenieś element biblioteki do grupy
+	Rename Library Item	Zmień nazwę elementu biblioteki
+	Add to Character Styles	Dodaj do stylów znakowych
 	Rename Library	Zmień nazwę biblioteki
 	Show Library	Pokaż bibliotekę
 	Use Library Item	Użyj elementu biblioteki
@@ -4300,6 +4302,7 @@ imageTrace	Outline	Kontur
 @plural	{n} step|{n} steps	{n} krok|{n} kroki|{n} kroków
 @plural	{n} stroke|{n} strokes	{n} obrys|{n} obrysy|{n} obrysów
 @msg	no library `{id}`	brak biblioteki `{id}`
+@msg	the library has another item of that kind named `{name}`	biblioteka ma już inny element tego rodzaju o nazwie `{name}`
 @msg	select some type first	najpierw zaznacz tekst
 @msg	kerning must be a number, "auto", or "optical"	kerning musi być liczbą, „auto” lub „optical”
 @msg	the selection has no gradient fill	zaznaczenie nie ma gradientu wypełnienia
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index 36f778dbd5..77fce38c53 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -3705,6 +3705,8 @@ font-technology	Variable	Variáveis
 	Rename Library Group	Renomear grupo de biblioteca
 	Delete Library Group	Excluir grupo de biblioteca
 	Move Library Item to Group	Mover item da biblioteca para o grupo
+	Rename Library Item	Renomear item da biblioteca
+	Add to Character Styles	Adicionar aos Estilos de Caractere
 	Library	Biblioteca
 	Rename Library	Renomear biblioteca
 	Show Library	Mostrar biblioteca
@@ -3742,6 +3744,7 @@ axis	Both	Ambos
 	Drag to float the toolbar	Arraste para flutuar a barra de ferramentas
 	Drag to the window's left or right edge to dock	Arraste até a borda esquerda ou direita da janela para encaixar
 @msg	no library `{id}`	nenhuma biblioteca `{id}`
+@msg	the library has another item of that kind named `{name}`	a biblioteca já tem outro item desse tipo chamado `{name}`
 @msg	select some type first	selecione algum texto primeiro
 @msg	kerning must be a number, "auto", or "optical"	O kerning deve ser um número, “auto” ou “optical”
 @msg	the selection has no gradient fill	a seleção não tem gradiente de preenchimento
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index 442a9612d4..b546e87258 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -3615,6 +3615,8 @@ digits	Malayalam	Малаялам
 	Rename Library Group	Переименовать группу библиотеки
 	Delete Library Group	Удалить группу библиотеки
 	Move Library Item to Group	Переместить элемент библиотеки в группу
+	Rename Library Item	Переименовать элемент библиотеки
+	Add to Character Styles	Добавить в стили символов
 	Library	Библиотека
 	Rename Library	Переименовать библиотеку
 	Show Library	Показать библиотеку
@@ -4204,6 +4206,7 @@ axis	Both	Оба
 # (`untranslated_report` lists any that are missing). Command ids, parameter
 # names and values in backticks or code (`colorModel rgb`, `document.export`) stay as they are.
 @msg	no library `{id}`	нет библиотеки `{id}`
+@msg	the library has another item of that kind named `{name}`	в библиотеке уже есть другой элемент этого вида с именем `{name}`
 @msg	select some type first	сначала выделите текст
 @msg	kerning must be a number, "auto", or "optical"	kerning должен быть числом, «auto» или «optical»
 @msg	the selection has no gradient fill	у выделения нет градиентной заливки
diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv
index 8a8f8453b6..9271ac4bac 100644
--- a/crates/ui-egui/src/i18n/sv.tsv
+++ b/crates/ui-egui/src/i18n/sv.tsv
@@ -3505,6 +3505,8 @@ digits	Malayalam	Malayalam
 	Rename Library Group	Byt namn på biblioteksgrupp
 	Delete Library Group	Radera biblioteksgrupp
 	Move Library Item to Group	Flytta biblioteksobjekt till grupp
+	Rename Library Item	Byt namn på biblioteksobjekt
+	Add to Character Styles	Lägg till i teckenstilar
 	Library	Bibliotek
 	Rename Library	Byt namn på bibliotek
 	Show Library	Visa bibliotek
@@ -4078,6 +4080,7 @@ axis	Both	Båda
 	Drag to the window's left or right edge to dock	Dra till fönstrets vänster- eller högerkant för att docka
 	Float Tool Group	Gör verktygsgruppen flytande
 @msg	no library `{id}`	inget bibliotek `{id}`
+@msg	the library has another item of that kind named `{name}`	biblioteket har redan ett annat objekt av den sorten med namnet `{name}`
 @msg	select some type first	markera någon text först
 @msg	kerning must be a number, "auto", or "optical"	kerning måste vara ett tal, ”auto” eller ”optical”
 @msg	the selection has no gradient fill	markeringen har ingen fyllnadsgradient
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index ef8773c31b..107f30f3ea 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -3394,6 +3394,8 @@ digits	Malayalam	Malayalam
 	Rename Library Group	Kitaplık Grubunu Yeniden Adlandır
 	Delete Library Group	Kütüphane Grubunu Sil
 	Move Library Item to Group	Kitaplık Öğesini Gruba Taşı
+	Rename Library Item	Kitaplık Öğesini Yeniden Adlandır
+	Add to Character Styles	Karakter Stillerine Ekle
 	Library	Kütüphane
 	Rename Library	Kitaplığı Yeniden Adlandır
 	Show Library	Kitaplığı Göster
@@ -3962,6 +3964,7 @@ axis	Both	Her İkisi
 	Drag to the window's left or right edge to dock	Sabitlemek için pencerenin sol veya sağ kenarına sürükleyin
 	Float Tool Group	Araç Grubunu Yüzer Yap
 @msg	no library `{id}`	`{id}` kütüphanesi yok
+@msg	the library has another item of that kind named `{name}`	kitaplıkta zaten bu türden `{name}` adlı başka bir öğe var
 @msg	select some type first	önce bir tür seçin
 @msg	kerning must be a number, "auto", or "optical"	kerning bir sayı, “auto” veya “optical” olmalıdır
 @msg	the selection has no gradient fill	seçimin degrade dolgusu yok
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index 0bccbd8cb6..68aabf0253 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -3621,6 +3621,8 @@ effect	Points	Точки
 	Rename Library Group	Перейменувати групу бібліотеки
 	Delete Library Group	Видалити групу бібліотеки
 	Move Library Item to Group	Перемістити елемент бібліотеки в групу
+	Rename Library Item	Перейменувати елемент бібліотеки
+	Add to Character Styles	Додати до стилів символів
 	Library	Бібліотека
 	Rename Library	Перейменувати бібліотеку
 	Show Library	Показати бібліотеку
@@ -4202,6 +4204,7 @@ axis	Both	Обидві
 	Drag to the window's left or right edge to dock	Перетягніть до лівого або правого краю вікна для прикріплення
 	Float Tool Group	Від’єднати групу інструментів
 @msg	no library `{id}`	немає бібліотеки `{id}`
+@msg	the library has another item of that kind named `{name}`	у бібліотеці вже є інший елемент цього виду з назвою `{name}`
 @msg	select some type first	спочатку виділіть текст
 @msg	kerning must be a number, "auto", or "optical"	kerning має бути числом, «auto» або «optical»
 @msg	the selection has no gradient fill	виділення не має градієнтної заливки
diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv
index 4f084029db..36793e6c56 100644
--- a/crates/ui-egui/src/i18n/vi.tsv
+++ b/crates/ui-egui/src/i18n/vi.tsv
@@ -2424,6 +2424,8 @@ digits	Hindi	Hindi
 	Move Guide to Layer	Di chuyển đường căn vào lớp
 	Move in Perspective	Di chuyển theo phối cảnh
 	Move Library Item to Group	Di chuyển mục thư viện vào nhóm
+	Rename Library Item	Đổi tên mục thư viện
+	Add to Character Styles	Thêm vào các kiểu ký tự
 	Move Locked and Hidden Artwork with Artboard	Di chuyển tác phẩm đã khóa và ẩn cùng bảng vẽ
 	Move Mesh Point	Di chuyển điểm lưới
 	Move Mesh Points	Di chuyển các điểm lưới
@@ -4974,6 +4976,7 @@ theme	Appearance	Giao diện
 @msg	no interaction in progress	không có tương tác nào đang tiến hành
 @msg	no key object	không có đối tượng khóa
 @msg	no library `{id}`	không có thư viện `{id}`
+@msg	the library has another item of that kind named `{name}`	thư viện đã có một mục khác cùng loại tên là `{name}`
 @msg	no library `{key}` (see {list})	không có thư viện `{key}` (xem {list})
 @msg	No linked files to look for	Không có tệp liên kết để tìm kiếm
 @msg	no Live Paint edge near that point	không có cạnh tô trực tiếp gần điểm đó
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index b04e65a65b..27cad80b4a 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -3444,6 +3444,8 @@ digits	Malayalam	马拉雅拉姆数字
 	Rename Library Group	重命名库组
 	Delete Library Group	删除库组
 	Move Library Item to Group	将库项目移到组
+	Rename Library Item	重命名库项目
+	Add to Character Styles	添加到字符样式
 	Library	库
 	Rename Library	重命名库
 	Show Library	显示库
@@ -4195,6 +4197,7 @@ imageTrace	Outline	轮廓
 @msg	the layer to flatten into is hidden	要拼合到的图层已隐藏
 @msg	there are no objects to release	没有可释放的对象
 @msg	no library `{id}`	没有库 `{id}`
+@msg	the library has another item of that kind named `{name}`	库中已有另一个同类项目名为 `{name}`
 @msg	{path}: not a file	{path}：不是文件
 @msg	{path}: {e}	{path}：{e}
 @msg	can't write .{ext} images	无法写入 .{ext} 图像
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index be62fde8a7..ab1fd359cd 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -1959,6 +1959,7 @@ file-filter	Templates	範本
 @msg	the layer to flatten into is hidden	要平面化到的圖層已隱藏
 @msg	there are no objects to release	沒有可釋放的物件
 @msg	no library `{id}`	沒有資料庫 `{id}`
+@msg	the library has another item of that kind named `{name}`	資料庫中已有另一個同類項目名為 `{name}`
 @msg	{path}: not a file	{path}：不是檔案
 @msg	{path}: {e}	{path}：{e}
 @msg	can't write .{ext} images	無法寫入 .{ext} 影像
@@ -4680,6 +4681,8 @@ digits	Malayalam	馬來亞拉姆數字
 	Rename Library Group	重新命名資料庫群組
 	Delete Library Group	刪除資料庫群組
 	Move Library Item to Group	將資料庫項目移至群組
+	Rename Library Item	重新命名資料庫項目
+	Add to Character Styles	新增至字元樣式
 	Library	資料庫
 	Rename Library	重新命名資料庫
 	Show Library	顯示資料庫
diff --git a/crates/ui-egui/src/panels/libraries.rs b/crates/ui-egui/src/panels/libraries.rs
index 78ce76da32..84f72e5bdc 100644
--- a/crates/ui-egui/src/panels/libraries.rs
+++ b/crates/ui-egui/src/panels/libraries.rs
@@ -4,8 +4,10 @@
 //! patterns), are added to it; the + button adds the selection's graphic, fill or stroke color,
 //! pattern or gradient, or text styles. A click on a color, gradient or pattern paints the
 //! selection through the active Fill/Stroke proxy, a style click applies it to the selected type,
-//! and a graphic is dragged onto the canvas (or double-clicked) to place a copy. Libraries are
-//! kept on this machine.
+//! and a graphic is dragged onto the canvas (or double-clicked) to place a copy. A character
+//! style's context menu also applies it, adds it to the document's character styles without
+//! applying it (`library.addToCharacterStyles`) and renames it (`library.renameItem`). Libraries
+//! are kept on this machine.
 //!
 //! The search field filters the items by name; items can be moved into user-named groups, shown as
 //! collapsible sections after the ungrouped items; and the panel menu exports the library to a
@@ -94,12 +96,22 @@ fn ask_group_name(app: &mut VectorcraftApp, library: &str, rename: Option<&str>,
     app.ui.dialog = Some(crate::state::Dialog::new("command", d));
 }
 
+/// The name dialog for renaming item `item` (its key) of `kind` in `library`, filled with its name.
+fn ask_item_name(app: &mut VectorcraftApp, library: &str, kind: ItemKind, item: &str) {
+    let name = app.session.libraries.get(library).and_then(|l| l.items().find(|(k, key, _)| *k == kind && *key == item)).map(|(.., n)| n.to_string());
+    let fixed = json!({ "library": library, "kind": kind_param(kind), "item": item });
+    let d = json!({ "__command": "library.renameItem", "__label": "Rename Library Item", "name": name.unwrap_or_else(|| item.to_string()), "__params": fixed });
+    app.ui.dialog = Some(crate::state::Dialog::new("command", d));
+}
+
 /// What a click in the panel asks for, done once the list is drawn.
 enum Act {
     Run(&'static str, Value),
     /// The New Group dialog; the items (`[{kind, item}]`) go into the new group.
     NewGroup(Value),
     RenameGroup(String),
+    /// The Rename dialog for an item (its kind and key).
+    RenameItem(ItemKind, String),
 }
 
 /// What a drag in the panel holds for the library shown: one of its items, one of its groups (by
@@ -164,6 +176,9 @@ struct Items<'a> {
     grab: Option<Grab>,
     /// Whether the items show in a list (else colours and graphics as icons).
     list: bool,
+    /// Whether a document is open, and whether type is selected there for a style to apply to.
+    has_doc: bool,
+    can_apply: bool,
 }
 
 impl Items<'_> {
@@ -214,7 +229,10 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
     let searching = !query.is_empty();
     let shown = |name: &str| !searching || name.to_lowercase().contains(&query);
     let grab = egui::DragAndDrop::payload::<PanelDrag>(ui.ctx()).and_then(|d| grabbed(&d, &lib_id));
-    let items = Items { library: &lib_id, lib, groups: lib.group_index(), fill_active, grab, list };
+    // Whether a character style's Apply Character Style is enabled (looked up only when the library has one).
+    let can_apply =
+        has_doc && !lib.char_styles.is_empty() && vectorcraft_engine::cmd::textstyles::target_style_attrs(&app.session, &json!({}), false).is_some();
+    let items = Items { library: &lib_id, lib, groups: lib.group_index(), fill_active, grab, list, has_doc, can_apply };
     // The items shown in each section: the ungrouped ones first, then each group's.
     let mut counts = vec![0usize; lib.groups.len() + 1];
     for (kind, key, _) in lib.items().filter(|(_, _, name)| shown(name)) {
@@ -374,6 +392,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) {
         }
         Some(Act::NewGroup(items)) => ask_group_name(app, &lib_id, None, items),
         Some(Act::RenameGroup(g)) => ask_group_name(app, &lib_id, Some(&g), Value::Null),
+        Some(Act::RenameItem(kind, item)) => ask_item_name(app, &lib_id, kind, &item),
         None => {}
     }
 }
@@ -466,7 +485,13 @@ impl Items<'_> {
                 if resp.clicked() {
                     *act = Some(Act::Run("library.use", json!({ "kind": kind_param(kind), "item": st.name })));
                 }
-                resp.context_menu(|ui| self.item_menu(ui, act, kind, &st.name));
+                resp.context_menu(|ui| {
+                    if kind == ItemKind::CharStyle {
+                        self.char_style_menu(ui, act, &st.name);
+                    } else {
+                        self.item_menu(ui, act, kind, &st.name);
+                    }
+                });
             }
             ui.add_space(6.0);
         }
@@ -597,6 +622,40 @@ impl Items<'_> {
     /// An item's context menu entries: Move to Group (No Group, the library's groups, New
     /// Group…) and Delete.
     fn item_menu(&self, ui: &mut Ui, act: &mut Option<Act>, kind: ItemKind, key: &str) {
+        self.group_menu(ui, act, kind, key);
+        if menu_item(ui, "Delete", true, false) {
+            *act = Some(Act::Run("library.removeItem", json!({ "kind": kind_param(kind), "item": key })));
+            ui.close();
+        }
+    }
+
+    /// A character style's context menu: Apply Character Style (with type selected), Add to
+    /// Character Styles (the document's, not applied), Move to Group, Rename… and Delete.
+    fn char_style_menu(&self, ui: &mut Ui, act: &mut Option<Act>, key: &str) {
+        let item = json!({ "kind": "charStyle", "item": key });
+        if menu_item(ui, "Apply Character Style", self.can_apply, false) {
+            *act = Some(Act::Run("library.use", item.clone()));
+            ui.close();
+        }
+        if menu_item(ui, "Add to Character Styles", self.has_doc, false) {
+            *act = Some(Act::Run("library.addToCharacterStyles", json!({ "item": key })));
+            ui.close();
+        }
+        ui.separator();
+        self.group_menu(ui, act, ItemKind::CharStyle, key);
+        if menu_item(ui, "Rename…", true, false) {
+            *act = Some(Act::RenameItem(ItemKind::CharStyle, key.to_string()));
+            ui.close();
+        }
+        if menu_item(ui, "Delete", true, false) {
+            *act = Some(Act::Run("library.removeItem", item));
+            ui.close();
+        }
+    }
+
+    /// The Move to Group submenu of an item's context menu: No Group, the library's groups and
+    /// New Group….
+    fn group_menu(&self, ui: &mut Ui, act: &mut Option<Act>, kind: ItemKind, key: &str) {
         let at = self.group_of(kind, key);
         let item = json!({ "kind": kind_param(kind), "item": key });
         ui.menu_button(format!("   {}", tl!("Move to Group")), |ui| {
@@ -624,10 +683,6 @@ impl Items<'_> {
                 }
             });
         });
-        if menu_item(ui, "Delete", true, false) {
-            *act = Some(Act::Run("library.removeItem", item));
-            ui.close();
-        }
     }
 }
 
diff --git a/crates/ui-egui/src/panels/libraries/tests.rs b/crates/ui-egui/src/panels/libraries/tests.rs
index 5f7f575c8f..931a91a444 100644
--- a/crates/ui-egui/src/panels/libraries/tests.rs
+++ b/crates/ui-egui/src/panels/libraries/tests.rs
@@ -416,6 +416,89 @@ fn group_dialogs_run_with_their_library_and_group() {
     assert_eq!(got["groups"], json!([{"name": "Cold", "items": [{"kind": "color", "item": "Blue"}]}]));
 }
 
+/// A `button` click at `pos`, pressed in one frame and released in the next.
+fn click_at(app: &mut VectorcraftApp, ctx: &egui::Context, pos: egui::Pos2, button: egui::PointerButton) -> Vec<(String, Rect)> {
+    let event = |pressed| egui::Event::PointerButton { pos, button, pressed, modifiers: Default::default() };
+    frame_at(app, ctx, 600.0, vec![egui::Event::PointerMoved(pos), event(true)]);
+    frame_at(app, ctx, 600.0, vec![event(false)]);
+    frame_at(app, ctx, 600.0, vec![]).0
+}
+
+/// The menu entries shown in `texts`, in order from the top: the labels starting with the menu's
+/// indent.
+fn menu_entries(texts: &[(String, Rect)]) -> Vec<String> {
+    let mut entries: Vec<_> = texts.iter().filter(|(t, _)| t.starts_with("   ")).map(|(t, r)| (t.trim().to_string(), r.top())).collect();
+    entries.sort_by(|a, b| a.1.total_cmp(&b.1));
+    entries.into_iter().map(|(t, _)| t).collect()
+}
+
+/// A right-click on a library character style opens its menu without applying it: Apply
+/// Character Style (only with type selected), Add to Character Styles, Move to Group, Rename… and
+/// Delete. Add puts the style in the document's character styles and leaves the selected type as
+/// it was; Rename… opens a dialog with the style's name that renames it on OK and changes nothing
+/// on Cancel. A paragraph style's menu stays Move to Group and Delete.
+#[test]
+fn a_character_style_s_menu_applies_adds_renames_and_deletes() {
+    let mut app = VectorcraftApp::new(Session::new(), Default::default());
+    app.run("file.new", json!({"width": 200, "height": 200})).unwrap();
+    let data = json!({"name": "Type", "charStyles": [{"name": "Headline", "attrs": {"size": 31.0}}], "paraStyles": [{"name": "Body", "attrs": {}}]});
+    let lib = app.run("library.import", json!({"data": data.to_string()})).unwrap()["id"].as_str().unwrap().to_string();
+    let ctx = egui::Context::default();
+    crate::theme::install_fonts(&ctx);
+    let (texts, _) = frame_at(&mut app, &ctx, 600.0, vec![]);
+    // No type selected: Apply is there but does nothing.
+    let menu = click_at(&mut app, &ctx, at(&texts, "Headline").center(), egui::PointerButton::Secondary);
+    assert_eq!(menu_entries(&menu), ["Apply Character Style", "Add to Character Styles", "Move to Group", "Rename…", "Delete"]);
+    click_at(&mut app, &ctx, at(&menu, "   Apply Character Style").center(), egui::PointerButton::Primary);
+    assert!(app.session.active().unwrap().doc.char_styles.is_empty(), "disabled without type");
+    // With type selected: a right-click applies nothing; Add adds the style, unapplied.
+    let t = app.run("text.create", json!({"x": 10, "y": 80, "text": "Type", "size": 9})).unwrap()["id"].as_u64().unwrap();
+    app.run("select.set", json!({"ids": [t]})).unwrap();
+    let style_of = |app: &VectorcraftApp| match &app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(t)).unwrap().kind {
+        vectorcraft_doc::NodeKind::Text(text) => (text.runs[0].style.size, text.runs[0].style.style_name.clone()),
+        _ => panic!("not text"),
+    };
+    let (texts, _) = frame_at(&mut app, &ctx, 600.0, vec![]);
+    let menu = click_at(&mut app, &ctx, at(&texts, "Headline").center(), egui::PointerButton::Secondary);
+    assert_eq!(style_of(&app), (9.0, None), "a right-click applies nothing");
+    let undo = app.session.active().unwrap().history.undo.len();
+    click_at(&mut app, &ctx, at(&menu, "   Add to Character Styles").center(), egui::PointerButton::Primary);
+    let doc = &app.session.active().unwrap().doc;
+    assert_eq!(doc.char_styles.iter().map(|c| c.name.as_str()).collect::<Vec<_>>(), ["Headline"]);
+    assert_eq!(style_of(&app), (9.0, None), "added, not applied");
+    assert_eq!(app.session.active().unwrap().history.undo.len(), undo + 1);
+    // Apply applies it.
+    let (texts, _) = frame_at(&mut app, &ctx, 600.0, vec![]);
+    let menu = click_at(&mut app, &ctx, at(&texts, "Headline").center(), egui::PointerButton::Secondary);
+    click_at(&mut app, &ctx, at(&menu, "   Apply Character Style").center(), egui::PointerButton::Primary);
+    assert_eq!(style_of(&app), (31.0, Some("Headline".into())));
+    // Rename…: Cancel keeps the name, OK renames.
+    for (ok, want) in [(false, "Headline"), (true, "Title")] {
+        let (texts, _) = frame_at(&mut app, &ctx, 600.0, vec![]);
+        let menu = click_at(&mut app, &ctx, at(&texts, "Headline").center(), egui::PointerButton::Secondary);
+        click_at(&mut app, &ctx, at(&menu, "   Rename…").center(), egui::PointerButton::Primary);
+        let d = app.ui.dialog.as_mut().expect("the Rename dialog");
+        assert_eq!((d.str("__command"), d.str("name")), ("library.renameItem".to_string(), "Headline".to_string()));
+        d.fields.insert("name".into(), json!("Title"));
+        if ok {
+            crate::dialogs::confirm(&mut app).unwrap();
+        } else {
+            crate::dialogs::cancel(&mut app);
+        }
+        assert_eq!(style_order(&mut app), [want]);
+    }
+    // The paragraph style's menu.
+    let (texts, _) = frame_at(&mut app, &ctx, 600.0, vec![]);
+    let menu = click_at(&mut app, &ctx, at(&texts, "Body").center(), egui::PointerButton::Secondary);
+    assert_eq!(menu_entries(&menu), ["Move to Group", "Delete"]);
+    // Delete removes the character style from the library only.
+    let (texts, _) = frame_at(&mut app, &ctx, 600.0, vec![]);
+    let menu = click_at(&mut app, &ctx, at(&texts, "Title").center(), egui::PointerButton::Secondary);
+    click_at(&mut app, &ctx, at(&menu, "   Delete").center(), egui::PointerButton::Primary);
+    assert!(app.session.libraries.get(&lib).unwrap().char_styles.is_empty());
+    assert_eq!(app.session.active().unwrap().doc.char_styles.len(), 1, "the document's style stays");
+}
+
 /// Export Library… writes the library's file and Import Library… adds it back as a new library.
 #[cfg(not(target_arch = "wasm32"))]
 #[test]
diff --git a/docs/mcp.md b/docs/mcp.md
index 274db05a34..41e28969f4 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -4051,7 +4051,15 @@ center?, to?}` uses one: a graphic is placed centred on `center` (pasted with it
 gives another colour merges into the document's), a colour paints the selection's fill or stroke, and a style is added
 to the document under its name without the white space around it (numbered when that name is taken by other
 attributes) and applied to the selected text, each as one undo step. `library.removeItem {library?, kind, item}` removes
-one.
+one. `library.addToCharacterStyles {library?, item}` adds a character style to the document's character styles without
+applying it, so no text needs to be selected: a document style of that name with the same attributes is reused
+(`existing: true`, no undo step), and a name taken by other attributes gets a number, as `library.use` names it; a new
+style is one undo step. With either command, a character style's color linked to a swatch that is not a global or spot
+swatch of the document keeps the color it shows without the link. `library.renameItem {library?, kind, item, name}` renames an item in place, its group keeping it
+(a graphic keeps its id); the name is trimmed and has 1 to 256 characters, another item of its kind with that name is
+an error, renaming an item to its own name writes nothing, and a rename is not a document undo step. A right-click on a
+character style in the panel offers Apply Character Style (with type selected), Add to Character Styles, Move to Group,
+Rename… and Delete ([help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/add-and-use-text-and-character-styles-in-libraries.html)).
 
 Gradients and patterns are kinds of their own (the panel's + button lists Fill Gradient, Stroke Gradient, Fill Pattern
 and Stroke Pattern, and a gradient or pattern swatch dragged from the Swatches panel onto the list is added).
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..8dff4868a8 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1468,6 +1468,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - **Neutral wording:** labels, MCP tool text, docs and packaging use neutral names, and `cargo xtask brands` (part of `cargo xtask ci`) fails on vendor names.
 - **Colour, type and file workflows:** Recolor Artwork (dialog with harmonies), Edit Colors, Find & Replace, Change Case, Smart Punctuation, Guides, Lock/Hide Above, Transform Each, Rasterize.
   The Libraries panel holds gradients and patterns: its + button adds the selection's fill or stroke gradient or pattern, a gradient or pattern swatch dragged from the Swatches panel is added, and a click paints the selection through the active Fill/Stroke proxy, a pattern bringing its definition and swatch into the document. A spot colour stays a spot colour: the library keeps its ink name and tint, and using it in any document links the paint to that document's spot swatch of that name, adding it when missing (#5812).
+  A right-click on a character style in the Libraries panel offers Apply Character Style, Add to Character Styles, Move to Group, Rename… and Delete ([help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/add-and-use-text-and-character-styles-in-libraries.html)): Apply works on the selected type, Add puts the style in the document's character styles without applying it (`library.addToCharacterStyles`), Rename… renames the library's style in place (`library.renameItem`) and Delete removes it from the library only. Opening the menu applies nothing. Tests: `tests::library::a_library_character_style_is_added_to_the_document_without_applying_it`, `library_items_are_renamed_in_place`, `panels::libraries::tests::a_character_style_s_menu_applies_adds_renames_and_deletes`.
   Object › Lock › All Artwork Above and Object › Hide › All Artwork Above deselect the selected objects they lock or hide, the key object included.
   Object › Hide › Unselected Artwork (Cmd/Ctrl+Alt+Shift+3, `object.hide.unselected`) hides, in one undo step, every object Select All takes that is not selected and holds no selected object; the members of a group that holds a selected object are hidden one by one, and Object › Show All shows them again. In isolation mode it hides only unselected objects inside the isolated object. Public reference: [Default keyboard shortcuts](https://web.archive.org/web/20260726060015/https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html), "Hide unselected artwork".
   Cmd/Ctrl+Alt+Shift+2 (`object.lock.unselected`) locks unselected artwork in one undo step and has no Object › Lock menu item. It locks unselected members of partly selected groups, clipping groups and compound paths, and unselected guides while Lock Guides is on. In ordinary isolation mode it locks only unselected art inside the isolated object. Object › Unlock All unlocks all locked art in the document, or inside the isolated object in isolation mode. The [public shortcut page](https://web.archive.org/web/20260726060015/https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html) calls the action "Lock all deselected artwork".

From 78ee4d04b6ee53ac77af450017ab14a54ea55243 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:22:29 -0800
Subject: [PATCH 06/48] Panels: item drags start only with the primary button,
 as Layers does

A right or middle drag on a swatch or color group, a brush, a symbol, a
graphic style, a library item or group, a character or paragraph style,
an Appearance row or thumbnail, the Fill and Stroke squares, a Recent
Colors chip or the Gradient panel's thumbnail started the same drag as
the primary button, so it could reorder, copy, delete or apply the item.
These drags now start only with the primary button, as Layers rows
(#7016) and Artboards rows (#7005) do: `widgets::drag_source`, the
Swatches tiles, library panel items, text style rows and Appearance rows
check `drag_started_by(Primary)`, and the Appearance thumbnail shows the
grabbing hand only for a primary drag. Right-click menus and the Graphic
Styles panel's held right-button preview are unchanged.
---
 crates/ui-egui/src/panels/appearance.rs       |  6 +--
 crates/ui-egui/src/panels/library_panel.rs    |  5 +-
 crates/ui-egui/src/panels/swatches/dnd.rs     |  7 +--
 crates/ui-egui/src/panels/swatches/tests.rs   | 44 +++++++++++++++
 crates/ui-egui/src/panels/tests_effectedit.rs | 53 +++++++++++++++++--
 .../src/panels/tests_symbol_libraries.rs      | 31 +++++++++++
 crates/ui-egui/src/panels/text_styles.rs      |  2 +-
 .../ui-egui/src/panels/text_styles/tests.rs   | 38 +++++++++++++
 crates/ui-egui/src/widgets/drag.rs            |  6 +--
 docs/target-app-parity.md                     |  1 +
 10 files changed, 178 insertions(+), 15 deletions(-)

diff --git a/crates/ui-egui/src/panels/appearance.rs b/crates/ui-egui/src/panels/appearance.rs
index 32963ce68b..308b8f3602 100644
--- a/crates/ui-egui/src/panels/appearance.rs
+++ b/crates/ui-egui/src/panels/appearance.rs
@@ -558,7 +558,7 @@ fn delete_key(app: &mut VectorcraftApp, ui: &mut Ui) {
 fn thumbnail_drag(ui: &mut Ui, th: Rect, id: NodeId) {
     let resp = ui.interact(th, ui.scope_id().with("ap-thumb"), Sense::drag()).on_hover_text(tl!("Drag onto art to apply this appearance"));
     widgets::drag_source(ui, &resp, || PanelDrag::Appearance(id));
-    if resp.dragged() {
+    if resp.dragged_by(egui::PointerButton::Primary) {
         ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing);
     }
 }
@@ -704,13 +704,13 @@ fn stack(app: &mut VectorcraftApp, ui: &mut Ui, n: &Node, sel: Sel, object_row:
     let lit = |item: Option<usize>, k: usize| effects.as_ref().is_some_and(|(list, ks)| *list == item && ks.contains(&k));
     let mut rows = vec![(Slot::Object { top: true }, object_row)];
     let mut stopped = false;
-    // Starts or ends a row drag.
+    // Starts (primary button only) or ends a row drag.
     let frozen = only.is_some();
     let mut track = |resp: &egui::Response, what: Dragged| {
         if frozen {
             return;
         }
-        if resp.drag_started() {
+        if resp.drag_started_by(egui::PointerButton::Primary) {
             set_pstate(&ctx, "ap-drag", Some(what));
             // Where the row was grabbed, for its dimmed copy under the pointer.
             // (From where the button went down: the drag starts once the pointer has moved on.)
diff --git a/crates/ui-egui/src/panels/library_panel.rs b/crates/ui-egui/src/panels/library_panel.rs
index 948651ef80..a4d9b4c0d8 100644
--- a/crates/ui-egui/src/panels/library_panel.rs
+++ b/crates/ui-egui/src/panels/library_panel.rs
@@ -690,10 +690,11 @@ fn body<K: LibraryKind>(app: &mut VectorcraftApp, ui: &mut Ui, id: &str) {
     bottom::<K>(app, ui, id);
 }
 
-/// An item of library `id` dragged out of its tile or row `resp` carries what `K` says it does.
+/// An item of library `id` dragged out of its tile or row `resp` with the primary button carries
+/// what `K` says it does.
 fn drag_out<K: LibraryKind>(ui: &Ui, resp: &egui::Response, id: &str, row: &Row<K::Item>) {
     if row.item.is_some()
-        && resp.drag_started()
+        && resp.drag_started_by(egui::PointerButton::Primary)
         && let Some(drag) = K::drag(id, row.name)
     {
         egui::DragAndDrop::set_payload(ui.ctx(), drag);
diff --git a/crates/ui-egui/src/panels/swatches/dnd.rs b/crates/ui-egui/src/panels/swatches/dnd.rs
index d4360b4743..2adff72887 100644
--- a/crates/ui-egui/src/panels/swatches/dnd.rs
+++ b/crates/ui-egui/src/panels/swatches/dnd.rs
@@ -117,14 +117,15 @@ pub(super) struct TileEvents {
 }
 
 /// Clicks, double-clicks, tooltips and drag and drop of the tile or row `resp` of entry `e`
-/// (`items`: the panel's rows, `sel`: its selection, `list`: rows stack downwards). A drag from it
-/// starts a [`PanelDrag`] carrying the rows it moves; see [`tile_drop`] for drags held over it.
+/// (`items`: the panel's rows, `sel`: its selection, `list`: rows stack downwards). A primary-button
+/// drag from it starts a [`PanelDrag`] carrying the rows it moves; see [`tile_drop`] for drags held
+/// over it.
 pub(super) fn tile_input(ui: &Ui, resp: Response, e: &Entry, items: &[Entry], sel: &[String], list: bool, ev: &mut TileEvents) {
     let name = e.name();
     if matches!(e, Entry::Swatch { .. } | Entry::Folder(_)) && resp.double_clicked() {
         ev.edit = Some(e.clone());
     }
-    if resp.drag_started() {
+    if resp.drag_started_by(egui::PointerButton::Primary) {
         let with_sel = sel.iter().any(|s| s == name);
         let names = items
             .iter()
diff --git a/crates/ui-egui/src/panels/swatches/tests.rs b/crates/ui-egui/src/panels/swatches/tests.rs
index 0776b6296b..2de0dd2a3d 100644
--- a/crates/ui-egui/src/panels/swatches/tests.rs
+++ b/crates/ui-egui/src/panels/swatches/tests.rs
@@ -533,6 +533,50 @@ fn dragging_tiles_reorders_and_moves_into_groups_as_one_undo_step_each() {
     assert_eq!((names_of(&app, None), app.session.doc().unwrap().history.undo.len()), (before, undo));
 }
 
+/// Press `pointer` at `from`, drag to `to` and release there, a frame per step from `time`. Returns
+/// whether a drag-and-drop payload was held over `to` before the release.
+fn drag_by(app: &mut VectorcraftApp, ctx: &egui::Context, from: Pos2, to: Pos2, pointer: PointerButton, time: f64) -> bool {
+    let button = |pos, pressed| Event::PointerButton { pos, button: pointer, pressed, modifiers: Modifiers::NONE };
+    frame(app, ctx, vec![Event::PointerMoved(from), button(from, true)], time, show);
+    frame(app, ctx, vec![Event::PointerMoved(from + vec2(6.0, 4.0))], time + 0.1, show);
+    frame(app, ctx, vec![Event::PointerMoved(to)], time + 0.2, show);
+    let held = egui::DragAndDrop::has_any_payload(ctx);
+    frame(app, ctx, vec![Event::PointerMoved(to), button(to, false)], time + 0.3, show);
+    frame(app, ctx, vec![], time + 0.4, show);
+    held
+}
+
+#[test]
+fn only_a_primary_drag_moves_swatches_and_groups() {
+    let mut app = app();
+    let ctx = context();
+    frame(&mut app, &ctx, vec![], 0.0, show);
+    frame(&mut app, &ctx, vec![], 0.5, show);
+    let undo = app.session.doc().unwrap().history.undo.len();
+    let (before, grays) = (names_of(&app, None), names_of(&app, Some("Grays")));
+    let groups = |app: &VectorcraftApp| app.session.active().unwrap().doc.swatch_groups.iter().map(|g| g.name.clone()).collect::<Vec<_>>();
+    let group_order = groups(&app);
+    let mut time = 1.0;
+    for pointer in [PointerButton::Secondary, PointerButton::Middle] {
+        // A swatch onto the left half of Red, and onto a folder.
+        let held = drag_by(&mut app, &ctx, tile_center(&ctx, "Amber"), tile_center(&ctx, "Red") - vec2(4.0, 0.0), pointer, time);
+        assert!(!held, "a {pointer:?} drag carries no swatch");
+        let held = drag_by(&mut app, &ctx, tile_center(&ctx, "Amber"), tile_center(&ctx, "Grays"), pointer, time + 1.0);
+        assert!(!held, "a {pointer:?} drag carries no swatch into a group");
+        // A group onto another group.
+        let held = drag_by(&mut app, &ctx, tile_center(&ctx, "Grays"), tile_center(&ctx, "Brights") - vec2(4.0, 0.0), pointer, time + 2.0);
+        assert!(!held, "a {pointer:?} drag carries no group");
+        assert_eq!((names_of(&app, None), names_of(&app, Some("Grays")), groups(&app)), (before.clone(), grays.clone(), group_order.clone()));
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo, "a {pointer:?} drag records no undo step");
+        time += 3.0;
+    }
+    // The primary button still moves the swatch.
+    assert!(drag_by(&mut app, &ctx, tile_center(&ctx, "Amber"), tile_center(&ctx, "Red") - vec2(4.0, 0.0), PointerButton::Primary, time));
+    let n = names_of(&app, None);
+    assert_eq!(n[n.iter().position(|x| x == "Red").unwrap() - 1], "Amber");
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1);
+}
+
 #[test]
 fn art_dropped_on_the_panel_becomes_a_pattern_swatch() {
     let mut app = app();
diff --git a/crates/ui-egui/src/panels/tests_effectedit.rs b/crates/ui-egui/src/panels/tests_effectedit.rs
index 48dfdfc25f..dc8f6a51ce 100644
--- a/crates/ui-egui/src/panels/tests_effectedit.rs
+++ b/crates/ui-egui/src/panels/tests_effectedit.rs
@@ -8,7 +8,12 @@ use super::tests_appearance::{app_with_rect, click, frame_events, frame_raw, run
 use super::*;
 
 fn pointer(pos: egui::Pos2, pressed: bool, modifiers: egui::Modifiers) -> egui::Event {
-    egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers }
+    pointer_by(pos, pressed, modifiers, egui::PointerButton::Primary)
+}
+
+/// `button` pressed (or released) at `pos` with `modifiers`.
+fn pointer_by(pos: egui::Pos2, pressed: bool, modifiers: egui::Modifiers, button: egui::PointerButton) -> egui::Event {
+    egui::Event::PointerButton { pos, button, pressed, modifiers }
 }
 
 /// One frame of the Appearance panel with `events` and `modifiers` held.
@@ -19,12 +24,17 @@ fn panel_frame(ctx: &egui::Context, app: &mut VectorcraftApp, events: Vec<egui::
 
 /// Drag from `from` to `to` in the Appearance panel, `modifiers` held on release.
 fn drag(ctx: &egui::Context, app: &mut VectorcraftApp, from: egui::Pos2, to: egui::Pos2, modifiers: egui::Modifiers) {
+    drag_by(ctx, app, from, to, modifiers, egui::PointerButton::Primary);
+}
+
+/// [`drag`] with `button`.
+fn drag_by(ctx: &egui::Context, app: &mut VectorcraftApp, from: egui::Pos2, to: egui::Pos2, modifiers: egui::Modifiers, button: egui::PointerButton) {
     let none = egui::Modifiers::NONE;
     panel_frame(ctx, app, vec![egui::Event::PointerMoved(from)], none);
-    panel_frame(ctx, app, vec![pointer(from, true, none)], none);
+    panel_frame(ctx, app, vec![pointer_by(from, true, none, button)], none);
     panel_frame(ctx, app, vec![egui::Event::PointerMoved(from + egui::vec2(0.0, 8.0))], none);
     panel_frame(ctx, app, vec![egui::Event::PointerMoved(to)], modifiers);
-    panel_frame(ctx, app, vec![pointer(to, false, modifiers)], modifiers);
+    panel_frame(ctx, app, vec![pointer_by(to, false, modifiers, button)], modifiers);
     panel_frame(ctx, app, vec![], none);
 }
 
@@ -233,3 +243,40 @@ fn the_thumbnail_drags_the_appearance_and_the_properties_fx_button_opens_the_eff
     let texts = frame_raw(&props, &mut app, Default::default(), properties::show);
     assert!(texts.iter().any(|(t, _)| t == "Distort & Transform"), "{texts:?}");
 }
+
+/// A secondary or middle drag of the thumbnail carries no appearance and shows no grabbing hand,
+/// and one of a fill or stroke row neither moves nor copies it; the primary button still does.
+#[test]
+fn only_a_primary_drag_carries_the_thumbnail_or_a_row() {
+    let mut app = app_with_rect(); // [Fill, Stroke]
+    let ctx = egui::Context::default();
+    let none = egui::Modifiers::NONE;
+    let kinds = |app: &VectorcraftApp| first_selected(app).unwrap().appearance.items.iter().map(|i| i.kind_name()).collect::<Vec<_>>();
+    let undo = app.session.doc().unwrap().history.undo.len();
+    for button in [egui::PointerButton::Secondary, egui::PointerButton::Middle] {
+        let texts = panel_frame(&ctx, &mut app, vec![], none);
+        let label = text_rect(&texts, "Rectangle");
+        let thumb = egui::pos2(label.left() - 28.0, label.center().y);
+        for e in [egui::Event::PointerMoved(thumb), pointer_by(thumb, true, none, button)] {
+            panel_frame(&ctx, &mut app, vec![e], none);
+        }
+        let held = thumb + egui::vec2(30.0, 30.0);
+        let mut out =
+            ctx.run_ui(egui::RawInput { events: vec![egui::Event::PointerMoved(held)], ..Default::default() }, |ui| appearance::show(&mut app, ui));
+        out.textures_delta.clear();
+        assert!(!egui::DragAndDrop::has_any_payload(&ctx), "a {button:?} drag of the thumbnail carries nothing");
+        assert_ne!(out.platform_output.cursor_icon, egui::CursorIcon::Grabbing, "{button:?}");
+        panel_frame(&ctx, &mut app, vec![pointer_by(held, false, none, button)], none);
+        panel_frame(&ctx, &mut app, vec![], none);
+        // The fill dragged onto the stroke row, with and without Alt.
+        for modifiers in [none, egui::Modifiers::ALT] {
+            let texts = panel_frame(&ctx, &mut app, vec![], none);
+            drag_by(&ctx, &mut app, row_of(&texts, "Fill:"), row_of(&texts, "Stroke:") + egui::vec2(0.0, 9.0), modifiers, button);
+            assert_eq!(kinds(&app), ["fill", "stroke"], "a {button:?} drag moves and copies nothing");
+        }
+    }
+    assert_eq!(app.session.doc().unwrap().history.undo.len(), undo, "no undo step");
+    let texts = panel_frame(&ctx, &mut app, vec![], none);
+    drag(&ctx, &mut app, row_of(&texts, "Fill:"), row_of(&texts, "Stroke:"), egui::Modifiers::ALT);
+    assert_eq!(kinds(&app), ["fill", "stroke", "fill"], "a primary Alt-drag copies the fill");
+}
diff --git a/crates/ui-egui/src/panels/tests_symbol_libraries.rs b/crates/ui-egui/src/panels/tests_symbol_libraries.rs
index 1e71583a4b..0d70425e81 100644
--- a/crates/ui-egui/src/panels/tests_symbol_libraries.rs
+++ b/crates/ui-egui/src/panels/tests_symbol_libraries.rs
@@ -106,6 +106,37 @@ fn clicking_a_library_symbol_adds_it_to_the_documents_symbols_in_one_step() {
     assert!(last_open(&app.ui).is_none());
 }
 
+/// A secondary or middle drag out of a library tile carries no symbol and adds nothing; a primary
+/// drag still carries it.
+#[test]
+fn only_a_primary_drag_carries_a_library_symbol_out() {
+    let mut app = app();
+    let ctx = context();
+    app.run("window.symbolLibrary", json!({"library": "Basic Shapes"})).unwrap();
+    let undo = undo_len(&app);
+    let mut time = 0.0;
+    let mut drag = |app: &mut VectorcraftApp, pointer: PointerButton| {
+        let at = tile(app, &ctx, "Burst", time);
+        let button = |pos, pressed| Event::PointerButton { pos, button: pointer, pressed, modifiers: Modifiers::NONE };
+        frame(&ctx, vec![Event::PointerMoved(at), button(at, true)], time + 0.5, |ui| library_panel::show_window(app, ui.ctx()));
+        for (i, d) in [20.0, 60.0].into_iter().enumerate() {
+            frame(&ctx, vec![Event::PointerMoved(at + vec2(d, d))], time + 0.6 + 0.1 * i as f64, |ui| library_panel::show_window(app, ui.ctx()));
+        }
+        let carried = egui::DragAndDrop::payload::<PanelDrag>(&ctx).map(|p| (*p).clone());
+        let end = at + vec2(60.0, 60.0);
+        frame(&ctx, vec![button(end, false)], time + 0.9, |ui| library_panel::show_window(app, ui.ctx()));
+        frame(&ctx, vec![], time + 1.0, |ui| library_panel::show_window(app, ui.ctx()));
+        time += 2.0;
+        carried
+    };
+    for pointer in [PointerButton::Secondary, PointerButton::Middle] {
+        assert_eq!(drag(&mut app, pointer), None, "a {pointer:?} drag carries nothing");
+    }
+    assert_eq!((symbols(&app).len(), undo_len(&app)), (0, undo), "nothing is added");
+    let carried = drag(&mut app, PointerButton::Primary);
+    assert_eq!(carried, Some(PanelDrag::LibrarySymbol { library: "basic-shapes".into(), name: "Burst".into() }));
+}
+
 #[test]
 fn the_window_menu_and_the_symbols_panel_open_symbol_libraries() {
     let mut app = app();
diff --git a/crates/ui-egui/src/panels/text_styles.rs b/crates/ui-egui/src/panels/text_styles.rs
index 961c63074c..880de94c16 100644
--- a/crates/ui-egui/src/panels/text_styles.rs
+++ b/crates/ui-egui/src/panels/text_styles.rs
@@ -273,7 +273,7 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui, kind: Kind) {
             // Overrides: an attribute the style sets that the selection doesn't match.
             let overridden = is_cur && cur.as_ref().is_some_and(|(_, m)| attrs.iter().any(|(k, v)| m.get(k) != Some(v)));
             let (r, resp) = ui.allocate_exact_size(vec2(ui.available_width(), 22.0), Sense::click_and_drag());
-            if resp.drag_started() {
+            if resp.drag_started_by(egui::PointerButton::Primary) {
                 egui::DragAndDrop::set_payload(ui.ctx(), RowDrag { kind, name: name.clone() });
             }
             if scroll_to.as_deref() == Some(name.as_str()) {
diff --git a/crates/ui-egui/src/panels/text_styles/tests.rs b/crates/ui-egui/src/panels/text_styles/tests.rs
index 6bafa25bbe..a83103aec8 100644
--- a/crates/ui-egui/src/panels/text_styles/tests.rs
+++ b/crates/ui-egui/src/panels/text_styles/tests.rs
@@ -184,6 +184,44 @@ fn dragging_a_style_onto_delete_deletes_it() {
     }
 }
 
+/// A secondary or middle drag of a style row onto Create New Style or Delete carries no row and
+/// runs nothing; a primary drag still deletes.
+#[test]
+fn only_a_primary_drag_carries_a_style_row() {
+    for kind in [Kind::Char, Kind::Para] {
+        let (mut app, _) = drag_app();
+        let ctx = egui::Context::default();
+        let before = styles(&mut app, kind);
+        let undo = app.session.doc().unwrap().history.undo.len();
+        let commands = app.run_count;
+        for pointer in [egui::PointerButton::Secondary, egui::PointerButton::Middle] {
+            for from_right in [40.0, 12.0] {
+                let button = std::cell::Cell::new(egui::Pos2::ZERO);
+                let mut draw = |app: &mut VectorcraftApp, ui: &mut egui::Ui| {
+                    ui.set_width(280.0);
+                    let right = ui.max_rect().right();
+                    show(app, ui, kind);
+                    button.set(egui::pos2(right - from_right, ui.min_rect().bottom() - 12.0));
+                };
+                frame_events(&ctx, &mut app, vec![], &mut draw);
+                let row = text_rect(&frame_events(&ctx, &mut app, vec![], &mut draw), "Body").center();
+                let press = |pos, pressed| egui::Event::PointerButton { pos, button: pointer, pressed, modifiers: Default::default() };
+                frame_events(&ctx, &mut app, vec![egui::Event::PointerMoved(row), press(row, true)], &mut draw);
+                frame_events(&ctx, &mut app, vec![egui::Event::PointerMoved(row + vec2(0.0, 12.0))], &mut draw);
+                let to = button.get();
+                frame_events(&ctx, &mut app, vec![egui::Event::PointerMoved(to)], &mut draw);
+                assert!(!egui::DragAndDrop::has_any_payload(&ctx), "{}: a {pointer:?} drag carries no row", kind.what());
+                frame_events(&ctx, &mut app, vec![press(to, false)], &mut draw);
+                frame_events(&ctx, &mut app, vec![], &mut draw);
+            }
+        }
+        assert_eq!((app.run_count, styles(&mut app, kind)), (commands, before.clone()), "{}: nothing runs", kind.what());
+        assert_eq!(app.session.doc().unwrap().history.undo.len(), undo, "no undo step");
+        assert!(drag_row_onto_footer(&ctx, &mut app, kind, "Body", 12.0, false), "{} Styles: Delete is outlined", kind.what());
+        assert_eq!(styles(&mut app, kind).len(), before.len() - 1, "{}: a primary drag deletes Body", kind.what());
+    }
+}
+
 fn capture_app() -> (VectorcraftApp, NodeId, egui::Context) {
     let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
     app.run("file.new", json!({"width": 300, "height": 200})).unwrap();
diff --git a/crates/ui-egui/src/widgets/drag.rs b/crates/ui-egui/src/widgets/drag.rs
index f130795c0f..1a9c280f81 100644
--- a/crates/ui-egui/src/widgets/drag.rs
+++ b/crates/ui-egui/src/widgets/drag.rs
@@ -88,10 +88,10 @@ impl PanelDrag {
     }
 }
 
-/// Make `resp` (which senses drags) a source of the [`PanelDrag`] `drag` builds when a drag starts
-/// on it.
+/// Make `resp` (which senses drags) a source of the [`PanelDrag`] `drag` builds when a drag with the
+/// primary button starts on it. A secondary or middle drag carries nothing.
 pub fn drag_source(ui: &Ui, resp: &Response, drag: impl FnOnce() -> PanelDrag) {
-    if resp.drag_started() {
+    if resp.drag_started_by(egui::PointerButton::Primary) {
         egui::DragAndDrop::set_payload(ui.ctx(), drag());
     }
 }
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..09da30d296 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -831,6 +831,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Screen readers get the value of the color and channel sliders that panels and dialogs draw (the Color panel, the Color Picker, Swatch Options, the Navigator's Zoom, the Character panel's variable font axes, the Perspective Grid and flattener options, and the sliders of the effect, tool option and transform dialogs): the number and text of the field beside each one, such as 128 for G or 50% for an opacity, with the slider's range, which extends to include a number past the slider's end. The harmony wheel's Brightness slider, which has no field, reports its brightness in percent.
   - A layer whose Layer Options › Print is off shows its name italic in the Layers panel, and while its row is dragged, as the reference application shows non-printing layers (#5739); a printing layer stays upright and ticking Print again restores the upright name (`panels::layers` test `a_layer_that_does_not_print_has_its_name_italic`).
   - In the Layers panel only the primary mouse button drags. A drag with the right or middle button on a row, a guide row, the selection square, the eye or lock column or a target circle moves, copies, hides, locks and transfers nothing and records no undo step, and a right-click still opens the row's menu (`panels::layers` test `only_the_primary_button_drags_rows_guides_art_columns_and_appearances`).
+  - The other panels' item drags start only with the primary mouse button too: swatches and color groups, brushes, symbols, graphic styles, library items and groups, character and paragraph styles, Appearance rows and its thumbnail, the Fill and Stroke squares, Recent Colors and the Gradient panel's thumbnail. A right or middle drag on one carries nothing, moves, copies, deletes and applies nothing and records no undo step; right-click menus and the Graphic Styles panel's held right-button preview stay as they were (`panels::swatches` test `only_a_primary_drag_moves_swatches_and_groups`, `panels::text_styles` test `only_a_primary_drag_carries_a_style_row`, `panels::tests_symbol_libraries` test `only_a_primary_drag_carries_a_library_symbol_out`, `panels::tests_effectedit` test `only_a_primary_drag_carries_the_thumbnail_or_a_row`).
   - Panels undock (#495): a dock tab, a panel icon or a popped-out panel's title dragged out of the dock floats that panel (in an OS window of its own on the desktop, #4135), and the strip right of the dock's tabs floats the whole tabbed group. A floating group moves by its title bar, a tab dragged out of it floats on its own, and dropped on another group's title bar or tabs it stacks with that group; dropped on a dock group's tabs, which light up under the pointer, its panels join that group, and on the group's upper or lower half they make a new group above or below it (`window.panel.dock {anchor, zone}`); dropped on the icon column they become icons there, the tabbed group's panels too (`window.panel.dock {icon: true}`); dropped anywhere else on the dock, which lights up, they go back where they live (the tabbed group or the icon column), as its × and the panel menus' Float Panel / Dock Panel do (`window.panel.float`, `window.panel.dock`). The Tools panel floats by its title bar and docks again on the window's left edge. Floating groups stack into sets: dropped on the upper or lower half of another group (a line shows where), a group joins it right above or below it, and the set's groups stack top to bottom, each showing one panel, moving together by the top group's title bar, whose × docks them all; a group dragged by its tab strip leaves the set (`window.panel.float {below, above}`). A double-click on a tab collapses a floating group to its tabs (`collapsed`), and a dock group too, a group below it moving up into the room; a second double-click, or a click on another of its tabs, expands it (`window.panel.collapse`, kept with the preferences and in saved workspaces). Sets dropped on the left edge of the icon column or of another dock column dock as dock columns (a multi-column dock, `window.panel.dock {column}`), whose groups stack, tab and tear out as a floating set's do, and whose top strip floats the column again. Floating panels, their sets and the Tools panel's position are kept with the preferences and in user workspaces, and clamped into a smaller window. Not done: panels in separate OS windows, reordering tabs by dragging, collapsing a set or dock column to icons, dock columns right of the default dock, resizing floating panels and the groups of a set.
   - A floating panel's OS window hides while a tool group's flyout or the All Tools drawer is open in the main window, as it does under a modal dialog or a menu, and shows again when the flyout or the drawer closes (#5813; `a_tool_flyout_hides_the_palette_windows_until_it_closes`).
   - On the desktop a floating panel in an OS window stores the monitor it is on and reopens there at the next launch. When that monitor is no longer connected, the panel opens on the main window's monitor at the same offset (#5582). Outside macOS, a desktop whose monitors have different scale factors keeps opening floating panels on the main window's monitor. Test: `panel_docking::native_tests::a_floating_panel_reopens_on_the_monitor_where_it_was_left`.

From 345cd021dc2cc0701bfdbb39d5ed6ddc9d101463 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:23:19 -0800
Subject: [PATCH 07/48] i18n: Dutch translates status and error messages

Dutch was not in COMPLETE_MESSAGES, so with the interface in Dutch
script errors, plug-in manifest and permission errors, parameter
schema errors, 3D effect refusals, file-reader errors and data-set
messages showed in English.

- nl.tsv gains 557 `@msg` rows and one `@msgplural` row: the messages
  the German catalog translates and Dutch lacked. Most are one block
  with a header comment on their conventions, in the order de.tsv
  holds them; the rest sit next to the related existing rows.
  Backticked names, command ids, double-quoted values and bare true,
  false and null stay as the English writes them.
- nl joins COMPLETE_MESSAGES, so the message tests that iterate the
  list check Dutch too, and the untranslated report lists Dutch's
  missing messages. It lists the same set for Dutch as for German.
- The registry comment, docs/development.md, the Dutch row and
  introduction of docs/localization-parity.md, and the interface
  languages line of docs/target-app-parity.md list Dutch among the
  languages that translate messages.
---
 crates/ui-egui/src/i18n.rs       |   2 +-
 crates/ui-egui/src/i18n/nl.tsv   | 563 +++++++++++++++++++++++++++++++
 crates/ui-egui/src/i18n/tests.rs |   1 +
 docs/development.md              |   2 +-
 docs/localization-parity.md      |   4 +-
 docs/target-app-parity.md        |   2 +-
 6 files changed, 569 insertions(+), 5 deletions(-)

diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs
index 4ec89b8e32..a6bacfc1d7 100644
--- a/crates/ui-egui/src/i18n.rs
+++ b/crates/ui-egui/src/i18n.rs
@@ -296,7 +296,7 @@ pub static LANGUAGES: [LangInfo; 28] = [
         plural: plural_none,
         complete_menus: true,
         catalog: OnceLock::new(),
-    }, // Dutch; every `nl-*` locale (`nl-NL`, `nl-BE`, `nl_NL.UTF-8`…) resolves here.
+    }, // Dutch: the whole interface and the status and error messages; every `nl-*` locale (`nl-NL`, `nl-BE`, `nl_NL.UTF-8`…) resolves here.
     LangInfo {
         code: "nl",
         name: "Nederlands",
diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv
index b3388fa82a..c20b9991fd 100644
--- a/crates/ui-egui/src/i18n/nl.tsv
+++ b/crates/ui-egui/src/i18n/nl.tsv
@@ -25,6 +25,507 @@
 @msg	{key} must be [x, y] with finite coordinates	{key} moet [x, y] met eindige coördinaten zijn
 @msg	ids must contain 1–10000 object ids	ids moet 1–10000 object-id’s bevatten
 
+# Status and error messages: 3D assets, type on a path, scripts and their File and $ objects, presets,
+# PDF page sizes, Objects on Path, plug-ins, file readers and data sets. Names in backticks, command ids,
+# double-quoted values and bare true, false and null stay as the English writes them; names the user
+# gave are quoted „…”, and numbers use a period between thousands (2.048).
+@msg	{what} can't be exported in 3D: {e}	{what} kan niet in 3D worden geëxporteerd: {e}
+@msg	asset {id} isn't a 3D asset	asset {id} is geen 3D-asset
+@msg	asset {id} is a 3D asset: assets.export3D writes it	asset {id} is een 3D-asset: assets.export3D schrijft het weg
+@msg	no 3D assets yet: collect an object with a 3D effect first (assets.add3D)	nog geen 3D-assets: verzamel eerst een object met een 3D-effect (assets.add3D)
+@msg	select an object with a 3D effect (or give its ids)	selecteer een object met een 3D-effect (of geef de id’s ervan)
+@msg	select point type or type on a path	selecteer punttekst of tekst op een pad
+@msg	type on a path in a thread cannot use Dynamic Text: {frames}	tekst op een pad in gekoppelde tekst kan geen dynamische tekst gebruiken: {frames}
+@msg	type on an open or compound path cannot be centered on its top or bottom: {open}	tekst op een open of samengesteld pad kan niet op de boven- of onderkant worden gecentreerd: {open}
+@msg	type on a path with no length or no height cannot be centered: {flat}	tekst op een pad zonder lengte of hoogte kan niet worden gecentreerd: {flat}
+@msg	type on a path in a thread cannot be centered on its top or bottom: {frames}	tekst op een pad in gekoppelde tekst kan niet op de boven- of onderkant worden gecentreerd: {frames}
+@msg	select type on a closed path	selecteer tekst op een gesloten pad
+@msg	`Custom` stands for changed settings: save the preset under another name	`Custom` staat voor gewijzigde instellingen: sla de voorinstelling onder een andere naam op
+@msg	the selection has no gradient fill	de selectie heeft geen verloopvulling
+@msg	the selection has no gradient stroke	de selectie heeft geen verloopcontour
+@msg	the selection has no pattern fill	de selectie heeft geen patroonvulling
+@msg	the selection has no pattern stroke	de selectie heeft geen patrooncontour
+@msg	no gradient swatch `{name}`	geen verloopstaal `{name}`
+@msg	no pattern swatch `{name}`	geen patroonstaal `{name}`
+@msg	the library item is damaged	het bibliotheekitem is beschadigd
+@msg	its zlib compression is damaged	de zlib-compressie ervan is beschadigd
+@msg	its Zstandard compression is damaged	de Zstandard-compressie ervan is beschadigd
+@msg	it decompresses to more than {_1} MB	gedecomprimeerd is het groter dan {_1} MB
+@msg	its editing data is for a different page	zijn bewerkingsgegevens horen bij een andere pagina
+@msg	`fontHeightReference` must be "emBox", "capHeight", "xHeight" or "icfBox"	`fontHeightReference` moet "emBox", "capHeight", "xHeight" of "icfBox" zijn
+@msg	Choose a .js or .jsx script	Kies een .js- of .jsx-script
+@msg	Ran {name}	{name} uitgevoerd
+@msg	The script was stopped and its changes were undone	Het script is gestopt en de wijzigingen ervan zijn ongedaan gemaakt
+@msg	a script is running: stop it or wait for it to finish	er wordt een script uitgevoerd: stop het of wacht tot het klaar is
+@msg	this is a compiled script, which cannot be run; use its source text	dit is een gecompileerd script, dat niet kan worden uitgevoerd; gebruik de brontekst ervan
+@msg	the script is not UTF-8 text	het script is geen UTF-8-tekst
+@msg	the script is too large to run	het script is te groot om uit te voeren
+@msg	a drag or an undo group is open; finish it before running a script	er is nog een sleepbeweging of een groep voor ongedaan maken open; rond die af voordat je een script uitvoert
+@msg	the script left a document that cannot be kept	het script heeft een document achtergelaten dat niet kan worden behouden
+@msg	the script is no longer in the Scripts folder	het script staat niet meer in de map Scripts
+@msg	the script's run is no longer available	de uitvoering van het script is niet meer beschikbaar
+@msg	a failed command changed undo steps that could not be put back, so the script was stopped	een mislukte opdracht heeft stappen voor ongedaan maken gewijzigd die niet konden worden teruggezet, dus is het script gestopt
+@msg	a recovery copy could not be written, so the script was not run	er kon geen herstelkopie worden geschreven, dus is het script niet uitgevoerd
+@msg	Script file access denied	Toegang tot het scriptbestand geweigerd
+@msg	Script file exceeds 8 MiB	Het scriptbestand is groter dan 8 MiB
+@msg	Script file is not open	Het scriptbestand is niet geopend
+@msg	Script file cannot be decoded	Het scriptbestand kan niet worden gedecodeerd
+@msg	Script file is not a regular file	Het scriptbestand is geen gewoon bestand
+@msg	Script file does not exist	Het scriptbestand bestaat niet
+@msg	Script file could not be read	Het scriptbestand kon niet worden gelezen
+@msg	Script folder has more than 2,048 entries	De scriptmap bevat meer dan 2.048 items
+@msg	Script file open mode must be r, w, e or a	De openmodus van een scriptbestand moet r, w, e of a zijn
+@msg	Script file writing is not available	Schrijven naar scriptbestanden is niet beschikbaar
+@msg	Script file dialogs are not available	Dialoogvensters voor scriptbestanden zijn niet beschikbaar
+@msg	Script files cannot be opened in another application	Scriptbestanden kunnen niet in een andere toepassing worden geopend
+@msg	Script file access is unavailable on the web	Toegang tot scriptbestanden is niet beschikbaar op het web
+@msg	Script has 256 files open	Het script heeft 256 bestanden geopend
+@msg	Script file path exceeds 32,767 characters	Het pad van het scriptbestand is langer dan 32.767 tekens
+@msg	Script folder mask takes too many steps to match	Het masker van de scriptmap vraagt te veel stappen om te vergelijken
+@msg	the script opened more file data than one run may open (32 MiB)	het script heeft meer bestandsgegevens geopend dan één uitvoering mag openen (32 MiB)
+@msg	File.seek: takes a position and a mode	File.seek: verwacht een positie en een modus
+@msg	vc.run: give a command id, as a string	vc.run: geef een opdracht-id, als string
+@msg	vc.run: takes a command id and an object of parameters	vc.run: verwacht een opdracht-id en een object met parameters
+@msg	vc.run: the parameters must be an object	vc.run: de parameters moeten een object zijn
+@msg	vc.run: the result{place} is too large for a script	vc.run: het resultaat{place} is te groot voor een script
+@msg	$.evalFile requires a file path	$.evalFile vereist een bestandspad
+@msg	$.evalFile: the timeout must be a finite number of milliseconds, 0 or more	$.evalFile: de time-out moet een eindig aantal milliseconden zijn, 0 of meer
+@msg	$.evalFile: takes a file path and a timeout	$.evalFile: verwacht een bestandspad en een time-out
+@msg	{name}: line {line}, column {column} of {file}: {e} (thrown)	{name}: regel {line}, kolom {column} van {file}: {e} (opgeworpen)
+@msg	{name}: line {line}, column {column}: {e} (thrown)	{name}: regel {line}, kolom {column}: {e} (opgeworpen)
+@msg	{name}: {e} (thrown)	{name}: {e} (opgeworpen)
+@msg	{name}: line {line}, column {column} of {file}: {e} (limit)	{name}: regel {line}, kolom {column} van {file}: {e} (limiet)
+@msg	{name}: line {line}, column {column}: {e} (limit)	{name}: regel {line}, kolom {column}: {e} (limiet)
+@msg	{name}: {e} (limit)	{name}: {e} (limiet)
+@msg	{name}: line {line}, column {column} of {file}: {e} (syntax)	{name}: regel {line}, kolom {column} van {file}: {e} (syntaxisfout)
+@msg	{name}: line {line}, column {column}: {e} (syntax)	{name}: regel {line}, kolom {column}: {e} (syntaxisfout)
+@msg	{name}: {e} (syntax)	{name}: {e} (syntaxisfout)
+@msg	{name}: line {line}, column {column} of {file}: {e} (stopped)	{name}: regel {line}, kolom {column} van {file}: {e} (gestopt)
+@msg	{name}: line {line}, column {column}: {e} (stopped)	{name}: regel {line}, kolom {column}: {e} (gestopt)
+@msg	{name}: {e} (stopped)	{name}: {e} (gestopt)
+@msg	{name}: line {line}, column {column} of {file}: {e} (internal)	{name}: regel {line}, kolom {column} van {file}: {e} (interne fout)
+@msg	{name}: line {line}, column {column}: {e} (internal)	{name}: regel {line}, kolom {column}: {e} (interne fout)
+@msg	{name}: {e} (internal)	{name}: {e} (interne fout)
+@msg	{e} (these files stay written: {paths})	{e} (deze bestanden blijven geschreven: {paths})
+@msg	$.{name}: give a name, as a string	$.{name}: geef een naam, als string
+@msg	$.locale: give a locale such as "en" or "de_DE", or null for the interface's	$.locale: geef een landinstelling zoals "en" of "de_DE", of null voor die van de interface
+@msg	$.localize: give true or false	$.localize: geef true of false
+@msg	$.flags: only 512, which turns localization on, or 0 can be set	$.flags: alleen 512, dat lokalisatie inschakelt, of 0 kan worden ingesteld
+@msg	$.flags: give a number	$.flags: geef een getal
+@msg	$.appEncoding: scripts here read and write UTF-8 only	$.appEncoding: scripts lezen en schrijven hier alleen UTF-8
+@msg	$.appEncoding: give an encoding's name, as a string	$.appEncoding: geef de naam van een codering, als string
+@msg	$.memCache: the memory cache size cannot be set	$.memCache: de grootte van de geheugencache kan niet worden ingesteld
+@msg	$.setenv: give a value, as a string	$.setenv: geef een waarde, als string
+@msg	$.setenv: only {_1} can be set	$.setenv: alleen {_1} kan worden ingesteld
+@msg	$.setenv: a value has at most {MAX_ENV_BYTES} letters, digits and _ . - @	$.setenv: een waarde heeft maximaal {MAX_ENV_BYTES} letters, cijfers en _ . - @
+@msg	$.sleep: give a number of milliseconds from 0 to {MAX_SLEEP_MS}	$.sleep: geef een aantal milliseconden van 0 tot {MAX_SLEEP_MS}
+@msg	$.sleep: give a number of milliseconds	$.sleep: geef een aantal milliseconden
+@msg	$.sleep: a run cannot wait inside a callback of a built-in function, a getter, a conversion or a file $.evalFile runs; call it from the script's own code	$.sleep: een uitvoering kan niet wachten binnen een callback van een ingebouwde functie, een getter, een conversie of een bestand dat $.evalFile uitvoert; roep het aan vanuit de eigen code van het script
+@msg	$.bp: scripts here have no debugger	$.bp: scripts hebben hier geen debugger
+@msg	$.colorPicker: scripts cannot show a dialog yet	$.colorPicker: scripts kunnen nog geen dialoogvenster tonen
+@msg	{name}: give a message	{name}: geef een bericht
+@msg	{name}: give the text the field starts with	{name}: geef de tekst waarmee het veld begint
+@msg	{name}: the message is longer than 16 KiB	{name}: het bericht is langer dan 16 KiB
+@msg	{name}: the title is longer than 256 bytes	{name}: de titel is langer dan 256 bytes
+@msg	{name}: the text the field starts with is longer than 16 KiB	{name}: de tekst waarmee het veld begint is langer dan 16 KiB
+@msg	{name}: a dialog cannot open inside a callback of a built-in function, a getter, a conversion or a file $.evalFile runs; call it from the script's own code	{name}: een dialoogvenster kan niet openen binnen een callback van een ingebouwde functie, een getter, een conversie of een bestand dat $.evalFile uitvoert; roep het aan vanuit de eigen code van het script
+@msg	{name}: the next answer in `answers` is for {_1}, not {name}	{name}: het volgende antwoord in `answers` is voor {_1}, niet voor {name}
+@msg	{name}: `answers` has no answer left for this dialog	{name}: `answers` heeft geen antwoord meer voor dit dialoogvenster
+@msg	vc.document{place} is too large for a script	vc.document{place} is te groot voor een script
+@msg	vc.log: the log of this run is full	vc.log: het logboek van deze uitvoering is vol
+@msg	this function's script run has ended	de scriptuitvoering van deze functie is beëindigd
+@msg	the script made more host calls than one run may make	het script heeft meer hostaanroepen gedaan dan één uitvoering mag doen
+@msg	the script passed more data to and from commands than one run may pass	het script heeft meer gegevens van en naar opdrachten doorgegeven dan één uitvoering mag doorgeven
+@msg	the script added more objects and data to the documents than one run may add	het script heeft meer objecten en gegevens aan de documenten toegevoegd dan één uitvoering mag toevoegen
+@msg	{what}: the object is not a File or a Folder	{what}: het object is geen File of Folder
+@msg	{what}: the count must be a finite number, 0 or more	{what}: het aantal moet een eindig getal zijn, 0 of meer
+@msg	File.seek: the position must be a finite number	File.seek: de positie moet een eindig getal zijn
+@msg	File.seek: the mode must be 0, 1 or 2	File.seek: de modus moet 0, 1 of 2 zijn
+@msg	script file is compiled: {value}	het scriptbestand is gecompileerd: {value}
+@msg	`name` must be the name of a script engine	`name` moet de naam van een scriptengine zijn
+@msg	the main script engine is new for each run and is never kept, so it cannot be dropped	de hoofdscriptengine is bij elke uitvoering nieuw en wordt nooit bewaard, dus kan hij niet worden verwijderd
+@msg	there is no script engine named {name}	er is geen scriptengine met de naam {name}
+@msg	Running a script	Er wordt een script uitgevoerd
+@msg	Data Recovery can't keep copies in {path}: {e}	Gegevensherstel kan geen kopieën bewaren in {path}: {e}
+@msg	Plug-ins can't be loaded from {path}: {e}	Plug-ins kunnen niet worden geladen uit {path}: {e}
+@msg	aiVersion 7 writes legacy .ai files, not .ait templates	aiVersion 7 schrijft verouderde .ai-bestanden, geen .ait-sjablonen
+@msg	`groupColors` must be an array	`groupColors` moet een array zijn
+@msg	`preserve` must be an object	`preserve` moet een object zijn
+@msg	`{key}` must be an array	`{key}` moet een array zijn
+@msg	`{key}` must be a profile name or null	`{key}` moet een profielnaam of null zijn
+@msg	`top` and `below` can't both be true	`top` en `below` kunnen niet allebei true zijn
+@msg	`select` must be true or false	`select` moet true of false zijn
+@msg	`minAnchors` and `maxAnchors` must be whole numbers	`minAnchors` en `maxAnchors` moeten gehele getallen zijn
+@msg	`{key}` must be a number not below 0	`{key}` moet een getal van minstens 0 zijn
+@msg	`{key}` must be [x, y, width, height]: four finite numbers, width and height not negative	`{key}` moet [x, y, width, height] zijn: vier eindige getallen, width en height niet negatief
+@msg	`{min_key}` is greater than `{max_key}`	`{min_key}` is groter dan `{max_key}`
+@msg	give at least one of `name`, `kind`, `text`, `within`, `intersects`, `minWidth`, `maxWidth`, `minHeight`, `maxHeight`, `minThickness`, `maxThickness`, `minArea`, `maxArea`, `minAnchors`, `maxAnchors`	geef minstens een van `name`, `kind`, `text`, `within`, `intersects`, `minWidth`, `maxWidth`, `minHeight`, `maxHeight`, `minThickness`, `maxThickness`, `minArea`, `maxArea`, `minAnchors`, `maxAnchors`
+@msg	a process color can't colorize a grayscale image with transparency: use a spot color, black or white	een proceskleur kan een grijswaardenafbeelding met transparantie niet inkleuren: gebruik een steunkleur, zwart of wit
+@msg	`name` is empty	`name` is leeg
+@msg	`newName` is empty	`newName` is leeg
+@msg	`{name}` is a built-in preset and can't change: save it under another name	`{name}` is een ingebouwde voorinstelling en kan niet worden gewijzigd: sla hem onder een andere naam op
+@msg	`{name}` is a built-in preset and stays	`{name}` is een ingebouwde voorinstelling en blijft bestaan
+@msg	`guideLabel` is null, a layer color's name or #rrggbb	`guideLabel` is null, de naam van een laagkleur of #rrggbb
+@msg	the Simplify slider is not open	de schuifregelaar Vereenvoudigen is niet geopend
+@msg	the Smooth slider is not open	de schuifregelaar Gladmaken is niet geopend
+@msg	the page of artboard {n} is {size}, longer than PDF's page limit of 14,400 pt (200 in): it is written with a UserUnit of {unit}, so apps that ignore UserUnit show it that many times smaller	de pagina van tekengebied {n} is {size}, langer dan de paginalimiet van PDF van 14.400 pt (200 in): hij wordt geschreven met een UserUnit van {unit}, dus apps die UserUnit negeren tonen hem zoveel keer kleiner
+@msg	the page of artboard {n} is {size}, longer than PDF's page limit of 14,400 pt (200 in): {label} pages are written without a UserUnit, in points, and apps that keep to the limit cut the page to 200 in	de pagina van tekengebied {n} is {size}, langer dan de paginalimiet van PDF van 14.400 pt (200 in): {label}-pagina’s worden zonder UserUnit in punten geschreven, en apps die zich aan de limiet houden snijden de pagina af op 200 in
+@msg	PDF 1.5 has no UserUnit, which a page longer than 14,400 pt (200 in) needs to keep its size: the file is written as PDF 1.6	PDF 1.5 heeft geen UserUnit, die een pagina langer dan 14.400 pt (200 in) nodig heeft om zijn formaat te behouden: het bestand wordt geschreven als PDF 1.6
+@msg	PDF 1.4 has no UserUnit, which a page longer than 14,400 pt (200 in) needs to stay within PDF/A-2's page limit of 14,400 units: the file is written as PDF 1.6	PDF 1.4 heeft geen UserUnit, die een pagina langer dan 14.400 pt (200 in) nodig heeft om binnen de paginalimiet van PDF/A-2 van 14.400 eenheden te blijven: het bestand wordt geschreven als PDF 1.6
+@msg	the page of artboard {n} is {size}, too long and narrow for PDF's page sides of 3 to 14,400 units: it is written with a UserUnit of {unit}, which keeps the short side at 3 units or more, and apps that keep to the limit cut the long side to 14,400 units	de pagina van tekengebied {n} is {size}, te lang en te smal voor paginazijden van PDF van 3 tot 14.400 eenheden: hij wordt geschreven met een UserUnit van {unit}, die de korte zijde op minstens 3 eenheden houdt, en apps die zich aan de limiet houden snijden de lange zijde af op 14.400 eenheden
+@msg	{label} files hold real numbers up to {max}, and the page of artboard {n}, {side} pt long, needs larger ones: choose PDF 1.6 or later without a PDF/X standard, or a smaller artboard	{label}-bestanden bevatten reële getallen tot {max}, en de pagina van tekengebied {n}, {side} pt lang, heeft grotere nodig: kies PDF 1.6 of later zonder PDF/X-standaard, of een kleiner tekengebied
+@msg	line {line}: value for `{var}` must be true or false	regel {line}: de waarde voor `{var}` moet true of false zijn
+@msg	line {line}: value for `{var}` is longer than {MAX_GRAPH_CSV} bytes	regel {line}: de waarde voor `{var}` is langer dan {MAX_GRAPH_CSV} bytes
+@msg	a bristle brush name can have at most {max} characters: `{name}` has {count}	de naam van een borstelpenseel mag maximaal {max} tekens hebben: `{name}` heeft er {count}
+@msg	`{file}` isn't a VectorCraft document, a PDF or a PDF-compatible .ai file	`{file}` is geen VectorCraft-document, geen PDF en geen PDF-compatibel .ai-bestand
+@msg	no saved preset named `{name}`	geen opgeslagen voorinstelling met de naam `{name}`
+@msg	no saved preset named `{name}` to rename	geen opgeslagen voorinstelling met de naam `{name}` om te hernoemen
+@msg	`{ID}`: the reference would be larger than {MAX_BYTES} bytes	`{ID}`: de verwijzing zou groter worden dan {MAX_BYTES} bytes
+@msg	the artboard is locked	het tekengebied is vergrendeld
+@msg	node {_1} is on a locked artboard	knooppunt {_1} staat op een vergrendeld tekengebied
+@msg	thumbnail: no page {n} (the file has 1)	miniatuur: geen pagina {n} (het bestand heeft er 1)
+@msg	select an Objects on Path group	selecteer een groep Objecten op pad
+@msg	a path inside a compound path, blend, envelope, repeat or Intertwine group can't take objects	een pad binnen een samengesteld pad, mengsel, omvorming, herhaling of verstrengelingsgroep kan geen objecten opnemen
+@msg	a clipping path can't take objects	een knippad kan geen objecten opnemen
+@msg	objects inside a blend, envelope, repeat or Intertwine group can't be attached to a path	objecten binnen een mengsel, omvorming, herhaling of verstrengelingsgroep kunnen niet aan een pad worden gekoppeld
+@msg	a clipping path can't be attached to a path	een knippad kan niet aan een pad worden gekoppeld
+@msg	`background` must be edges, corners or colors	`background` moet edges, corners of colors zijn
+@msg	`match` must be distance or channels	`match` moet distance of channels zijn
+@msg	`{key}` must be from 0 to 100	`{key}` moet van 0 tot 100 zijn
+@msg	`colors` must list 1 to 16 colors, each hex (#rrggbb or #rgb) or black, white, red, green or blue	`colors` moet 1 tot 16 kleuren bevatten, elk hexadecimaal (#rrggbb of #rgb) of black, white, red, green of blue
+@msg	the linked image shows its preview: embed or relink it first	de gekoppelde afbeelding toont haar voorvertoning: sluit haar eerst in of koppel haar opnieuw
+@msg	a CMYK image has no transparency to set	een CMYK-afbeelding heeft geen transparantie om in te stellen
+@msg	every pixel matches the background: no image would be left	elke pixel komt overeen met de achtergrond: er zou geen afbeelding overblijven
+@msg	an image of {w} × {h} pixels is too large to change	een afbeelding van {w} × {h} pixels is te groot om te wijzigen
+@msg	select an image with a color mask	selecteer een afbeelding met een kleurmasker
+@msg	the color mask's settings are out of range	de instellingen van het kleurmasker vallen buiten het bereik
+@msg	a CMYK image can't take a color mask	een CMYK-afbeelding kan geen kleurmasker krijgen
+@msg	the mask would hide every pixel	het masker zou elke pixel verbergen
+@msg	Recolor completed; {locked} and {hidden} were left unchanged	Herkleuren voltooid; ongewijzigd gelaten: {locked} en {hidden}
+@msg	Recolor completed; {objects} were left unchanged	Herkleuren voltooid; ongewijzigd gelaten: {objects}
+@msg	Recolor completed; {objects} was left unchanged	Herkleuren voltooid; ongewijzigd gelaten: {objects}
+@msg	1 locked object	1 vergrendeld element
+@msg	{n} locked objects	{n} vergrendelde elementen
+@msg	1 hidden object	1 verborgen element
+@msg	{n} hidden objects	{n} verborgen elementen
+@msg	panels can't be shown in Presentation Mode	panelen kunnen niet worden getoond in de presentatiemodus
+@msg	unknown preset `{name}`: not a built-in or saved preset (see imageTrace.presets)	onbekende voorinstelling `{name}`: geen ingebouwde of opgeslagen voorinstelling (zie imageTrace.presets)
+@msg	more than {MAX_CSV_ROWS} data sets: Import Data Sets reads at most {MAX_CSV_ROWS}	meer dan {MAX_CSV_ROWS} gegevenssets: Gegevenssets importeren leest er maximaal {MAX_CSV_ROWS}
+@msg	more than {MAX_CSV_COLS} variables: Import Data Sets reads at most {MAX_CSV_COLS}	meer dan {MAX_CSV_COLS} variabelen: Gegevenssets importeren leest er maximaal {MAX_CSV_COLS}
+@msg	`{key}: {top}` and `options.{key}: {inner}` disagree: give the option once	`{key}: {top}` en `options.{key}: {inner}` spreken elkaar tegen: geef de optie één keer
+@msg	{_1} is an exporter (File › Export › Export As…)	{_1} is een exportplug-in (Bestand › Exporteren › Exporteren als…)
+@msg	`documentData` is {size} bytes (limit {MAX_DOCUMENT_DATA})	`documentData` is {size} bytes (limiet {MAX_DOCUMENT_DATA})
+@msg	a mask that covers several layers comes in as a clipping group in each layer it covers	een masker dat meerdere lagen bedekt, wordt ingelezen als een knipgroep in elke laag die het bedekt
+@msg	a graph's records don't end where they should: its art was read as it is	de records van een grafiek eindigen niet waar ze zouden moeten: de illustratie ervan is gelezen zoals ze is
+@msg	`{w}` takes no operands	`{w}` neemt geen operanden
+@msg	a wraparound group is inside a compound path	een tekstomloopgroep staat binnen een samengesteld pad
+@msg	it ends inside a multi-layer mask	het eindigt binnen een masker over meerdere lagen
+@msg	a multi-layer mask's operators are out of order	de operatoren van een masker over meerdere lagen staan in de verkeerde volgorde
+@msg	a multi-layer mask needs one clipping path	een masker over meerdere lagen heeft één knippad nodig
+@msg	a group crosses a multi-layer mask	een groep doorkruist een masker over meerdere lagen
+@msg	graphs come in as plain art, without their data or settings	grafieken worden ingelezen als gewone illustraties, zonder hun gegevens of instellingen
+@msg	source must be the id of a Shaper Group's original shape	source moet de id van de oorspronkelijke vorm van een Shapergroep zijn
+@msg	group must be the id of a Shaper Group	group moet de id van een Shapergroep zijn
+@msg	the shape is not an editable original shape of that Shaper Group	de vorm is geen bewerkbare oorspronkelijke vorm van die Shapergroep
+@msg	id {value} is a layer, not an object	id {value} is een laag, geen object
+@msg	id {value} is a layer, not an object; move layers with layer.move	id {value} is een laag, geen object; verplaats lagen met layer.move
+@msg	the PCX file is cut short	het PCX-bestand is afgebroken
+@msg	the PCX file's header is damaged	de header van het PCX-bestand is beschadigd
+@msg	PCX files with {bits}-bit pixels in {planes} planes can't be read	PCX-bestanden met {bits}-bits pixels in {planes} vlakken kunnen niet worden gelezen
+@msg	the Pixar file is cut short	het Pixar-bestand is afgebroken
+@msg	the Pixar file's header is damaged	de header van het Pixar-bestand is beschadigd
+@msg	the Pixar file's image data is damaged	de afbeeldingsgegevens van het Pixar-bestand zijn beschadigd
+@msg	the JPEG 2000 file can't be read	het JPEG 2000-bestand kan niet worden gelezen
+@msg	the JPEG 2000 file has an unsupported color space or JPX content	het JPEG 2000-bestand heeft een niet-ondersteunde kleurruimte of JPX-inhoud
+@msg	the HEIC or HEIF file can't be read	het HEIC- of HEIF-bestand kan niet worden gelezen
+@msg	the HEIC or HEIF file holds a kind of image that can't be read	het HEIC- of HEIF-bestand bevat een soort afbeelding die niet kan worden gelezen
+@msg	HEIC and HEIF images can't be opened in this build	HEIC- en HEIF-afbeeldingen kunnen in deze build niet worden geopend
+@msg	the JPEG XL file is cut short	het JPEG XL-bestand is afgebroken
+@msg	the JPEG XL container is too large to read	de JPEG XL-container is te groot om te lezen
+@msg	CMYK JPEG XL images can't be read	CMYK-afbeeldingen in JPEG XL kunnen niet worden gelezen
+@msg	the JPEG XL file can't be read: {e}	het JPEG XL-bestand kan niet worden gelezen: {e}
+@msg	the params must be an object, not {got}	de parameters moeten een object zijn, niet {got}
+@msg	unknown parameter `{path}`; the object takes no keys	onbekende parameter `{path}`; het object accepteert geen sleutels
+@msg	unknown parameter `{path}`; it takes: {keys}	onbekende parameter `{path}`; het accepteert: {keys}
+@msg	missing `{path}`	`{path}` ontbreekt
+@msg	`{path}` must be {expected}, not {got}	`{path}` moet {expected} zijn, niet {got}
+@msg	`{path}` is nested too deeply	`{path}` is te diep genest
+@msg	{path}: not a PNG, JPEG, WebP, TIFF or BMP image	{path}: geen PNG-, JPEG-, WebP-, TIFF- of BMP-afbeelding
+@msg	the image is {iw} × {ih} pixels and the artboard at that width is {rw} × {rh} pixels: their proportions differ	de afbeelding is {iw} × {ih} pixels en het tekengebied is bij die breedte {rw} × {rh} pixels: hun verhoudingen verschillen
+@msg	`threshold` must be a number from 0 to 1	`threshold` moet een getal van 0 tot 1 zijn
+@msg	background {v}: a color such as "#808080"	background {v}: een kleur zoals "#808080"
+@msg	comparing with an image file isn't available in the browser	vergelijken met een afbeeldingsbestand is niet beschikbaar in de browser
+@msg	columns {first} and {column} both name the variable `{name}`	kolommen {first} en {column} noemen allebei de variabele `{name}`
+@msg	nothing in data set {name} was applied: no object is bound to a variable it has a value for	niets uit gegevensset {name} is toegepast: geen enkel object is gekoppeld aan een variabele waarvoor de set een waarde heeft
+@msg	no bound object reports a value (locked objects and embedded images report none)	geen enkel gekoppeld object geeft een waarde (vergrendelde objecten en ingesloten afbeeldingen geven er geen)
+@msg	Edit Original opens image and document files only; “{name}” is not one	Origineel bewerken opent alleen afbeeldings- en documentbestanden; „{name}” is er geen
+@msg	only http, https and mailto URLs open in the browser, not “{url}”	alleen http-, https- en mailto-URL’s worden in de browser geopend, niet „{url}”
+@msg	{id} opens another app: only the person at the keyboard can run it	{id} opent een andere app: alleen de persoon achter het toetsenbord kan dit uitvoeren
+@msg	“{name}” is not a file	„{name}” is geen bestand
+@msg	too many changed shortcuts	te veel gewijzigde sneltoetsen
+@msg	byColor must be true or false	byColor moet true of false zijn
+@msg	byColor can't split Auto Grouping groups: trace without Auto Grouping	byColor kan groepen van Automatisch groeperen niet splitsen: traceer zonder Automatisch groeperen
+@msg	byColor can't regroup a trace with a live Pathfinder effect: expand without byColor	byColor kan een tracering met een live Padvinder-effect niet hergroeperen: vouw uit zonder byColor
+@msg	`colorGroup` needs `library: "document"`	`colorGroup` vereist `library: "document"`
+@msg	`colorGroup` needs `palette: "documentLibrary"`	`colorGroup` vereist `palette: "documentLibrary"`
+@msg	`colorGroup` needs `mode: "color"`	`colorGroup` vereist `mode: "color"`
+@msg	no color group `{name}` in the document (see swatch.list)	geen kleurgroep `{name}` in het document (zie swatch.list)
+@msg	{label} keeps 1 of the document's {n} artboards: the file reopens with one. Turn on Preserve Editing Capabilities to keep them all.	{label} behoudt 1 van de {n} tekengebieden van het document: het bestand wordt met één tekengebied opnieuw geopend. Schakel Bewerkbaarheid behouden in om ze allemaal te behouden.
+@msg	`spread` must be pad, repeat or reflect	`spread` moet pad, repeat of reflect zijn
+@msg	`repeats` must be a whole number from 1 to {MAX_REPEATS}	`repeats` moet een geheel getal van 1 tot {MAX_REPEATS} zijn
+@msg	`spread` applies to linear, radial, conic and diamond gradients	`spread` geldt voor lineaire, radiale, conische en ruitvormige verlopen
+@msg	{_1} finished, but the document or the plug-in changed meanwhile: run it again	{_1} is voltooid, maar het document of de plug-in is intussen gewijzigd: voer het opnieuw uit
+@msg	Running “{name}”…	„{name}” wordt uitgevoerd…
+@msg	a live effect runs while the document is drawn, so it can't be `heavy`	een live-effect wordt uitgevoerd terwijl het document wordt getekend, dus kan het niet `heavy` zijn
+@msg	an exporter always gets an export's budget: leave `budget` out	een exportplug-in krijgt altijd het budget van een export: laat `budget` weg
+@msg	“{_1}” asks for a heavy budget (each run up to {minutes} minutes and {times} times the usual instructions): a person has to approve it in the desktop app, or pass `allowHeavy: true` in a session started with --allow-plugin-grants	„{_1}” vraagt om een groot rekenbudget (elke uitvoering tot {minutes} minuten en {times} keer het gebruikelijke aantal instructies): een persoon moet dit goedkeuren in de desktop-app, of geef `allowHeavy: true` door in een sessie die is gestart met --allow-plugin-grants
+@msg	`name` must be 1-64 printable characters	`name` moet uit 1-64 afdrukbare tekens bestaan
+@msg	`version`, `description` or `author` is too long	`version`, `description` of `author` is te lang
+@msg	`warnings` must be a list of strings	`warnings` moet een lijst met strings zijn
+@msg	`{k}` must be one of {_1}	`{k}` moet een van {_1} zijn
+@msg	`{k}` must be {what}	`{k}` moet {what} zijn
+@msg	an exporter declares 1 to {MAX_EXTENSIONS} `extensions`	een exportplug-in declareert 1 tot {MAX_EXTENSIONS} `extensions`
+@msg	at most {MAX_UNGROUPED} parameters outside groups: give the others a `group`	maximaal {MAX_UNGROUPED} parameters buiten groepen: geef de andere een `group`
+@msg	can't encode the input	de invoer kan niet worden gecodeerd
+@msg	expected {"dataBase64"}	verwacht: {"dataBase64"}
+@msg	expected {"objects"}	verwacht: {"objects"}
+@msg	export `{name}`: {e}	export `{name}`: {e}
+@msg	extension {e} is listed twice	extensie {e} staat twee keer in de lijst
+@msg	extension {e}: use 1-16 lower-case letters and digits, without the dot	extensie {e}: gebruik 1-16 kleine letters en cijfers, zonder de punt
+@msg	invalid id {_1}: use 1-64 characters from A-Z a-z 0-9 . _ -	ongeldige id {_1}: gebruik 1-64 tekens uit A-Z a-z 0-9 . _ -
+@msg	invalid parameter name {k}	ongeldige parameternaam {k}
+@msg	manifest is not UTF-8	het manifest is geen UTF-8
+@msg	manifest is too long (limit {MAX_MANIFEST_BYTES} bytes)	het manifest is te lang (limiet {MAX_MANIFEST_BYTES} bytes)
+@msg	manifest is {_1} bytes (limit {MAX_MANIFEST_BYTES})	het manifest telt {_1} bytes (limiet {MAX_MANIFEST_BYTES})
+@msg	module is {_1} bytes (limit {_2})	de module telt {_1} bytes (limiet {_2})
+@msg	needs approval: it asks for {0}, which the user grants when installing it on its own	goedkeuring nodig: de plug-in vraagt om {0}, wat de gebruiker toestaat wanneer hij die afzonderlijk installeert
+@msg	not JSON: {e}	geen JSON: {e}
+@msg	not a WebAssembly binary (missing \0asm header)	geen WebAssembly-binair bestand (de header \0asm ontbreekt)
+@msg	parameter `{k}`: {what}	parameter `{k}`: {what}
+@msg	parameter `{name}`: {what}	parameter `{name}`: {what}
+@msg	plug-in parameters must be a JSON object	plug-in-parameters moeten een JSON-object zijn
+@msg	the module must export its linear memory as `memory`	de module moet haar lineaire geheugen exporteren als `memory`
+@msg	the objects to change are no longer in the document	de te wijzigen objecten staan niet meer in het document
+@msg	the runtime panicked	de runtime is vastgelopen
+@msg	unexpected host trap	onverwachte trap in de host
+@msg	vc_abi_version returned {v}; this host implements version {ABI_VERSION}	vc_abi_version gaf {v} terug; deze host implementeert versie {ABI_VERSION}
+@msg	vc_alloc returned 0 (out of memory)	vc_alloc gaf 0 terug (onvoldoende geheugen)
+@msg	vc_alloc returned a block outside memory	vc_alloc gaf een blok buiten het geheugen terug
+@msg	vc_run returned error code {packed}	vc_run gaf foutcode {packed} terug
+@msg	{_1} is not a file	{_1} is geen bestand
+@msg	{_1} is {_2} bytes (limit {_3})	{_1} is {_2} bytes (limiet {_3})
+@msg	{_1} objects (limit {MAX_OBJECTS})	{_1} objecten (limiet {MAX_OBJECTS})
+@msg	{at}: {msg}	{at}: {msg}
+@msg	{what} points outside memory	{what} wijst buiten het geheugen
+@msg	`angle` must be a number	`angle` moet een getal zijn
+@msg	`aspect` must be from 0.01 to 100	`aspect` moet van 0,01 tot 100 zijn
+@msg	`cap` must be "butt", "round" or "square"	`cap` moet "butt", "round" of "square" zijn
+@msg	`fillRule` must be "nonzero" or "evenodd"	`fillRule` moet "nonzero" of "evenodd" zijn
+@msg	`helpUrl` must be an https:// address of at most {MAX_HELP_URL} bytes	`helpUrl` moet een https://-adres van maximaal {MAX_HELP_URL} bytes zijn
+@msg	`help` must be 1-{MAX_HELP} printable characters	`help` moet uit 1-{MAX_HELP} afdrukbare tekens bestaan
+@msg	`id` must be an effect id of 1-{MAX_EFFECT_ID} bytes	`id` moet een effect-id van 1-{MAX_EFFECT_ID} bytes zijn
+@msg	`id` must be the id of an input object	`id` moet de id van een invoerobject zijn
+@msg	`join` must be "miter", "round" or "bevel"	`join` moet "miter", "round" of "bevel" zijn
+@msg	`label` and `group` must be 1-{MAX_LABEL} printable characters	`label` en `group` moeten uit 1-{MAX_LABEL} afdrukbare tekens bestaan
+@msg	`maxLength` must be 1-{MAX_TEXT}, and the default no longer	`maxLength` moet 1-{MAX_TEXT} zijn, en de standaardwaarde niet langer
+@msg	`minItems` and `maxItems` must be 0-{MAX_LIST}, `maxItems` at least 1, and the default that many	`minItems` en `maxItems` moeten 0-{MAX_LIST} zijn, `maxItems` minstens 1, en de standaardwaarde zoveel items
+@msg	`name` must be a string	`name` moet een string zijn
+@msg	`opacity` must be a number	`opacity` moet een getal zijn
+@msg	`type` must be "path" or "compound"	`type` moet "path" of "compound" zijn
+@msg	`unit` must be 1-{MAX_UNIT} printable characters	`unit` moet uit 1-{MAX_UNIT} afdrukbare tekens bestaan
+@msg	`visibleWhen` lists 1 to {MAX_CONDITION_VALUES} values for `{other}`	`visibleWhen` noemt 1 tot {MAX_CONDITION_VALUES} waarden voor `{other}`
+@msg	`visibleWhen` names `{other}`, which isn't a parameter declared before this one	`visibleWhen` noemt `{other}`, dat geen parameter is die vóór deze is gedeclareerd
+@msg	`visibleWhen` names at most {MAX_CONDITIONS} parameters	`visibleWhen` noemt maximaal {MAX_CONDITIONS} parameters
+@msg	`visibleWhen` takes `{other}`'s values, of a checkbox or a choice	`visibleWhen` neemt de waarden van `{other}`, een selectievakje of een keuzelijst
+@msg	`visible` must be true or false	`visible` moet true of false zijn
+@msg	`{key}` must be a number from {_1} to {_2}	`{key}` moet een getal van {_1} tot {_2} zijn
+@msg	`{key}` must be an array of at most {MAX_ITEMS} entries	`{key}` moet een array van maximaal {MAX_ITEMS} items zijn
+@msg	a color default must be a color object or a hex string such as "#3a7bd5"	een standaardkleur moet een kleurobject of een hexadecimale string zoals "#3a7bd5" zijn
+@msg	a color object or a hex string such as "#3a7bd5"	een kleurobject of een hexadecimale string zoals "#3a7bd5"
+@msg	a freeform gradient holds at most {MAX_ITEMS} points and lines	een verloop in vrije vorm bevat maximaal {MAX_ITEMS} punten en lijnen
+@msg	a freeform gradient line names a point it doesn't have	een lijn van een verloop in vrije vorm noemt een punt dat het verloop niet heeft
+@msg	a gradient needs 1-{MAX_ITEMS} stops	een verloop heeft 1-{MAX_ITEMS} kleurstops nodig
+@msg	a list of numbers	een lijst met getallen
+@msg	a list of {min_items} to {max_items} numbers	een lijst met {min_items} tot {max_items} getallen
+@msg	a new object needs a `path`	een nieuw object heeft een `path` nodig
+@msg	a number	een getal
+@msg	a painted live effect returns only `objects`	een geschilderd live-effect geeft alleen `objects` terug
+@msg	a painted live effect's piece has only `path`, `fillRule`, `fills` and `strokes`	een stuk van een geschilderd live-effect heeft alleen `path`, `fillRule`, `fills` en `strokes`
+@msg	a read-only object was left out	een alleen-lezen object is weggelaten
+@msg	a read-only object was left out: return it, as {"id"} alone or as it was given	een alleen-lezen object is weggelaten: geef het terug, als alleen {"id"} of zoals het is gegeven
+@msg	a string	een string
+@msg	a stroke has only `paint`, `width`, `join`, `cap` and `miterLimit`	een contour heeft alleen `paint`, `width`, `join`, `cap` en `miterLimit`
+@msg	a stroke must be {"paint", "width"?, "join"?, "cap"?, "miterLimit"?}	een contour moet {"paint", "width"?, "join"?, "cap"?, "miterLimit"?} zijn
+@msg	an effect must be {"id", "params"?, "visible"?}	een effect moet {"id", "params"?, "visible"?} zijn
+@msg	an effect on a fill returns only `fills`	een effect op een vulling geeft alleen `fills` terug
+@msg	an effect on a stroke returns only `strokes`	een effect op een contour geeft alleen `strokes` terug
+@msg	an object must be a JSON object	een object moet een JSON-object zijn
+@msg	bad range	ongeldig bereik
+@msg	choices must be 1-64 non-empty, printable strings	keuzes moeten 1-64 niet-lege, afdrukbare strings zijn
+@msg	coordinate out of range (limit ±{MAX_COORD} pt)	coördinaat buiten bereik (limiet ±{MAX_COORD} pt)
+@msg	default is not one of the options	de standaardwaarde is geen van de opties
+@msg	each piece needs a `path`	elk stuk heeft een `path` nodig
+@msg	is listed twice	staat twee keer in de lijst
+@msg	pattern transform out of range	patroontransformatie buiten bereik
+@msg	read-only field '{field}' changed	alleen-lezen veld '{field}' is gewijzigd
+@msg	stops must be in order of `offset`	kleurstops moeten op volgorde van `offset` staan
+@msg	the document has no pattern {pattern}	het document heeft geen patroon {pattern}
+@msg	the document has no swatch {n}	het document heeft geen staal {n}
+@msg	the output	de uitvoer
+@msg	the path has no anchor points	het pad heeft geen ankerpunten
+@msg	too many anchor points (limit {MAX_ANCHORS})	te veel ankerpunten (limiet {MAX_ANCHORS})
+@msg	true or false	true of false
+@msg	a number >= {_1}	een getal >= {_1}
+@msg	a number > {_1}	een getal > {_1}
+@msg	a number <= {_1}	een getal <= {_1}
+@msg	a number < {_1}	een getal < {_1}
+@msg	a number {_1} to {_2}	een getal van {_1} tot {_2}
+@msg	a number >= {_1} and < {_2}	een getal >= {_1} en < {_2}
+@msg	a number > {_1} and <= {_2}	een getal > {_1} en <= {_2}
+@msg	a number > {_1} and < {_2}	een getal > {_1} en < {_2}
+@msg	a number ({_1})	een getal ({_1})
+@msg	a number >= {_1} ({_2})	een getal >= {_1} ({_2})
+@msg	a number > {_1} ({_2})	een getal > {_1} ({_2})
+@msg	a number <= {_1} ({_2})	een getal <= {_1} ({_2})
+@msg	a number < {_1} ({_2})	een getal < {_1} ({_2})
+@msg	a number {_1} to {_2} ({_3})	een getal van {_1} tot {_2} ({_3})
+@msg	a number >= {_1} and < {_2} ({_3})	een getal >= {_1} en < {_2} ({_3})
+@msg	a number > {_1} and <= {_2} ({_3})	een getal > {_1} en <= {_2} ({_3})
+@msg	a number > {_1} and < {_2} ({_3})	een getal > {_1} en < {_2} ({_3})
+@msg	an integer	een geheel getal
+@msg	an integer >= {_1}	een geheel getal >= {_1}
+@msg	an integer <= {_1}	een geheel getal <= {_1}
+@msg	an integer {_1} to {_2}	een geheel getal van {_1} tot {_2}
+@msg	one of {_1}	een van {_1}
+@msg	an object id (a non-negative integer)	een object-id (een niet-negatief geheel getal)
+@msg	a list of object ids	een lijst met object-id's
+@msg	a color (a string, [r, g, b] or an object)	een kleur (een tekenreeks, [r, g, b] of een object)
+@msg	[x, y] (two numbers)	[x, y] (twee getallen)
+@msg	an object	een object
+@msg	a list	een lijst
+@msg	unknown key `{k}`; the keys here are {_1}	onbekende sleutel `{k}`; de sleutels hier zijn {_1}
+@msg	{_1} is listed twice	{_1} staat twee keer in de lijst
+@msg	{_1} is not the id of an input object	{_1} is niet de id van een invoerobject
+@msg	{_1} is read-only	{_1} is alleen-lezen
+@msg	{what} must be from {lo} to {hi}	{what} moet van {lo} tot {hi} zijn
+@msg	a color component	een kleurcomponent
+@msg	a plate	een drukplaat
+@msg	Automation asked to install this plug-in. To install it, choose Object › Plug-ins › Install Plug-in… yourself.	Automatisering vroeg om deze plug-in te installeren. Kies zelf Object › Plug-ins › Plug-in installeren… om hem te installeren.
+@msg	“{name}” is another module than the plug-in with id {_1} and would get the settings and cache kept for it: install it with `replace: true` once the user agrees	„{name}” is een andere module dan de plug-in met id {_1} en zou de instellingen en cache krijgen die daarvoor worden bewaard: installeer hem met `replace: true` zodra de gebruiker akkoord gaat
+@msg	“{name}” lists `{id}` in `commandAllowlist`, which a plug-in may not call	„{name}” noemt `{id}` in `commandAllowlist`, die een plug-in niet mag aanroepen
+@msg	vc_call `{shown}`: {why}	vc_call `{shown}`: {why}
+@msg	vc_call `{shown}`: the manifest's `commandAllowlist` doesn't list it	vc_call `{shown}`: de `commandAllowlist` van het manifest noemt deze opdracht niet
+@msg	vc_call `{shown}`: the id or the arguments lie outside the module's memory	vc_call `{shown}`: de id of de argumenten liggen buiten het geheugen van de module
+@msg	vc_call `{shown}`: the id or the arguments are not UTF-8	vc_call `{shown}`: de id of de argumenten zijn geen UTF-8
+@msg	vc_call `{shown}`: the arguments are not a JSON object	vc_call `{shown}`: de argumenten zijn geen JSON-object
+@msg	only a filter with the usual budget declares `commandAllowlist`	alleen een filter met het gebruikelijke budget declareert `commandAllowlist`
+@msg	command calls ({MAX_CALLS} calls and {MAX_CALL_BYTES} bytes per run)	opdrachtaanroepen ({MAX_CALLS} aanroepen en {MAX_CALL_BYTES} bytes per uitvoering)
+@msg	command call size (vc_call `{shown}`: {len} bytes, limit {MAX_CALL_DATA})	grootte van een opdrachtaanroep (vc_call `{shown}`: {len} bytes, limiet {MAX_CALL_DATA})
+@msg	at most {MAX_ALLOWED_COMMANDS} commands in `commandAllowlist`	maximaal {MAX_ALLOWED_COMMANDS} opdrachten in `commandAllowlist`
+@msg	a plug-in may not call this command	een plug-in mag deze opdracht niet aanroepen
+@msg	`commandAllowlist` needs the permission `commands`, and `commands` needs a `commandAllowlist`	`commandAllowlist` vereist de machtiging `commands`, en `commands` vereist een `commandAllowlist`
+@msg	`commandAllowlist` names `{shown}`, which is not a command id or is listed twice	`commandAllowlist` noemt `{shown}`, dat geen opdracht-id is of twee keer in de lijst staat
+@msg	permission `{permission}` needs plug-in API level {PROGRESS_API}: give `api` {PROGRESS_API}	machtiging `{permission}` vereist plug-in-API-niveau {PROGRESS_API}: geef `api` {PROGRESS_API}
+@msg	the module imports `env.{name}` with another type than the host's: it is {signature}	de module importeert `env.{name}` met een ander type dan dat van de host: het is {signature}
+@msg	the module imports `env.{name}`, which a plug-in may use only at plug-in API level {PROGRESS_API} (`api` {PROGRESS_API}) and with the permission `{permission}`	de module importeert `env.{name}`, dat een plug-in alleen mag gebruiken op plug-in-API-niveau {PROGRESS_API} (`api` {PROGRESS_API}) en met de machtiging `{permission}`
+@msg	the module imports `{from}.{name}`, which the host doesn't offer: a plug-in may import only the `env.vc_*` functions that docs/plugins.md lists (plug-in API level 2), and no WASI, files or network	de module importeert `{from}.{name}`, dat de host niet aanbiedt: een plug-in mag alleen de `env.vc_*`-functies importeren die docs/plugins.md noemt (plug-in-API-niveau 2), en geen WASI, bestanden of netwerk
+@msg	`api` is {_1}; this host implements plug-in API levels 1 to {API_LEVEL}	`api` is {_1}; deze host implementeert plug-in-API-niveaus 1 tot {API_LEVEL}
+@msg	`paintOutput` may only be true	`paintOutput` mag alleen true zijn
+@msg	`paintOutput` is only for a live effect (`kind` "effect") at `api` 2	`paintOutput` is alleen voor een live-effect (`kind` "effect") bij `api` 2
+@msg	`grant` must be a list of permission names	`grant` moet een lijst met namen van machtigingen zijn
+@msg	`grant` names an unknown permission `{shown}`	`grant` noemt een onbekende machtiging `{shown}`
+@msg	a plug-in of kind `{_1}` needs the permission `{_2}`	een plug-in van het soort `{_1}` heeft de machtiging `{_2}` nodig
+@msg	at most {MAX_PERMISSIONS} `permissions`	maximaal {MAX_PERMISSIONS} `permissions`
+@msg	permission `{shown}` doesn't apply to a plug-in of kind `{_1}`	machtiging `{shown}` geldt niet voor een plug-in van het soort `{_1}`
+@msg	permission `{shown}` is listed twice	machtiging `{shown}` staat twee keer in de lijst
+@msg	only a filter declares `inputs`	alleen een filter declareert `inputs`
+@msg	`inputs` names an unknown object kind `{shown}`: use type, image or symbolInstance	`inputs` noemt een onbekend objectsoort `{shown}`: gebruik type, image of symbolInstance
+@msg	`inputs` lists `{shown}` twice	`inputs` noemt `{shown}` twee keer
+@msg	`inputs` needs `api` 2 or later	`inputs` vereist `api` 2 of hoger
+@msg	`inputs` needs the permission `doc.read`	`inputs` vereist de machtiging `doc.read`
+@msg	memory budget (object {_1} needs {size} bytes of input, {left} left)	geheugenbudget (object {_1} heeft {size} bytes invoer nodig, {left} over)
+@msg	object budget (more than {MAX_OBJECTS} read-only objects)	objectbudget (meer dan {MAX_OBJECTS} alleen-lezen objecten)
+@msg	instruction budget	instructiebudget
+@msg	time budget	tijdbudget
+@msg	memory budget (the selection is too large to hand over)	geheugenbudget (de selectie is te groot om door te geven)
+@msg	output size ({what} is {len} bytes, limit {max})	uitvoergrootte ({what} is {len} bytes, limiet {max})
+@msg	the plug-in's grant can't be removed from the plug-in store	de toekenning van de plug-in kan niet uit de plug-inopslag worden verwijderd
+@msg	permission `{shown}` is reserved for a later plug-in API; this host doesn't grant it	machtiging `{shown}` is gereserveerd voor een latere plug-in-API; deze host kent haar niet toe
+@msg	unknown permission `{shown}`	onbekende machtiging `{shown}`
+@msg	“{name}” asks for the permissions {asked}: a person has to approve them in the desktop app, or pass `grant` in a session started with --allow-plugin-grants	„{name}” vraagt om de machtigingen {asked}: een persoon moet ze goedkeuren in de desktop-app, of geef `grant` door in een sessie die is gestart met --allow-plugin-grants
+@msg	`grant` and `allowHeavy` take effect only in a session started with --allow-plugin-grants: approve the plug-in in the desktop app	`grant` en `allowHeavy` werken alleen in een sessie die is gestart met --allow-plugin-grants: keur de plug-in goed in de desktop-app
+@msg	Only the person at the keyboard can approve installing a plug-in	Alleen de persoon achter het toetsenbord kan het installeren van een plug-in goedkeuren
+@msg	“{name}” wasn't granted `{p}`, which its output needs: nothing was changed	„{name}” heeft `{p}` niet gekregen, wat de uitvoer ervan nodig heeft: er is niets gewijzigd
+@msg	a heavy filter runs in the background, so it can't declare `commands`	een zwaar filter wordt op de achtergrond uitgevoerd, dus kan het geen `commands` declareren
+@msg	at most {MAX_COMMANDS} `commands`	maximaal {MAX_COMMANDS} `commands`
+@msg	command {name} is declared twice	opdracht {name} is twee keer gedeclareerd
+@msg	command {name}: `label` must be 1-64 printable characters	opdracht {name}: `label` moet uit 1-64 afdrukbare tekens bestaan
+@msg	command {name}: use an id of 1-{MAX_COMMAND_ID} characters from a-z 0-9 _ that starts with a letter	opdracht {name}: gebruik een id van 1-{MAX_COMMAND_ID} tekens uit a-z 0-9 _ die met een letter begint
+@msg	command {name}: {e}	opdracht {name}: {e}
+@msg	manifest: {e}	manifest: {e}
+@msg	manifest: {e} at line {line} column {column}	manifest: {e} op regel {line} kolom {column}
+@msg	`commands` must be a list of commands, each with an `id` and a `label`	`commands` moet een lijst met opdrachten zijn, elk met een `id` en een `label`
+@msg	command {name} must be an object with an `id` and a `label`	opdracht {name} moet een objectwaarde met een `id` en een `label` zijn
+@msg	missing field `{key}`	veld `{key}` ontbreekt
+@msg	duplicate field `{key}`	dubbel veld `{key}`
+@msg	only a filter or a live effect declares `commands`	alleen een filter of een live-effect declareert `commands`
+@msg	“{name}” › {label}: {e}	„{name}” › {label}: {e}
+@msg	the module doesn't have the SHA-256 `hash` gives: nothing was installed	de module heeft niet de SHA-256 die `hash` opgeeft: er is niets geïnstalleerd
+@msg	select one object	selecteer één object
+@msg	no similar objects found (rotated or reflected copies are not matched); change the Global Edit Options and try again	geen vergelijkbare objecten gevonden (gedraaide of gespiegelde kopieën worden niet herkend); wijzig de Opties voor globale bewerking en probeer het opnieuw
+@msg	Global Edit is off	Globale bewerking staat uit
+@msg	only an object of the Global Edit other than the one it started from can be left out	alleen een ander object van de globale bewerking dan het object waarmee die begon, kan worden weggelaten
+@msg	`artboards`: all or a range such as 1, 3-5, not {v}	`artboards`: all of een bereik zoals 1, 3-5, niet {v}
+@msg	`{_1}` has no symbols to place	`{_1}` heeft geen symbolen om te plaatsen
+@msg	missing `library` (see symbol.libraries)	`library` ontbreekt (zie symbol.libraries)
+@msg	no symbol `{n}`	geen symbool `{n}`
+@msg	no symbol `{n}` in `{_1}`	geen symbool `{n}` in `{_1}`
+@msg	no symbol library `{key}` (see symbol.libraries)	geen symboolbibliotheek `{key}` (zie symbol.libraries)
+@msg	the document has no symbols to save	het document heeft geen symbolen om op te slaan
+@msg	`{_1}` has no brushes to apply	`{_1}` heeft geen penselen om toe te passen
+@msg	missing `library` (see brush.libraries)	`library` ontbreekt (zie brush.libraries)
+@msg	no brush `{n}`	geen penseel `{n}`
+@msg	no brush `{n}` in `{_1}`	geen penseel `{n}` in `{_1}`
+@msg	no brush library `{key}` (see brush.libraries)	geen penseelbibliotheek `{key}` (zie brush.libraries)
+@msg	the document has no brushes to save	het document heeft geen penselen om op te slaan
+@msg	a {width}×{height} screenshot's byte count overflows	het aantal bytes van een schermafbeelding van {width}×{height} loopt over
+@msg	the window's {what} ({points} points × {scale} DPI) cannot size a screenshot	de {what} van het venster ({points} punten × {scale} DPI) kan geen formaat voor een schermafbeelding geven
+@msg	{label} must be a number	{label} moet een getal zijn
+@msg	{label} must be a number of at least 0.1	{label} moet een getal van minstens 0,1 zijn
+@msg	{label} must be a number from {min} to {max}	{label} moet een getal van {min} tot {max} zijn
+@msg	{label} must be a whole number from {min} to {max}	{label} moet een geheel getal van {min} tot {max} zijn
+@msg	features lists at most {max} tags	features noemt maximaal {max} tags
+@msg	unknown OpenType feature `{t}`	onbekende OpenType-functie `{t}`
+@msg	{label} must be a number above 0 and at most {max}	{label} moet een getal boven 0 en maximaal {max} zijn
+@msg	{label} must be at most {max} characters	{label} mag maximaal {max} tekens lang zijn
+@msg	{label} must be one character	{label} moet één teken zijn
+@msg	at most {max} tab stops	maximaal {max} tabstops
+@msg	unknown align `{other}`	onbekende uitlijning `{other}`
+@msg	no character style `{name}`	geen tekenstijl `{name}`
+@msg	{_1} is an importer (File › Open With)	{_1} is een importplug-in (Bestand › Openen met)
+@msg	missing `importer` (see document.formats)	`importer` ontbreekt (zie document.formats)
+@msg	`importer` must be a plug-in format id (see document.formats)	`importer` moet een indelings-id van een plug-in zijn (zie document.formats)
+@msg	“{shown}” opens {_1} files, not `{_2}`	„{shown}” opent {_1}-bestanden, niet `{_2}`
+@msg	`{_1}` is a plug-in of kind `{_2}`, not an importer	`{_1}` is een plug-in van het soort `{_2}`, geen importplug-in
+@msg	`{_1}` is a plug-in of kind `{_2}`, not an exporter	`{_1}` is een plug-in van het soort `{_2}`, geen exportplug-in
+@msg	`{_1}` is an importer: open a file with document.open {{"importer": "{_2}"}}	`{_1}` is een importplug-in: open een bestand met document.open {{"importer": "{_2}"}}
+@msg	`{_1}` is an exporter: export with document.export {{"format": "{_2}"}}	`{_1}` is een exportplug-in: exporteer met document.export {{"format": "{_2}"}}
+@msg	`{_1}` is a live effect: apply it with effect.apply {{"effect": "{_2}"}}	`{_1}` is een live-effect: pas het toe met effect.apply {{"effect": "{_2}"}}
+@msg	the importer returned no objects	de importplug-in heeft geen objecten teruggegeven
+@msg	an importer returns `objects` and `warnings`, not `{key}`	een importplug-in geeft `objects` en `warnings` terug, niet `{key}`
+@msg	the file is larger than the {MAX_INPUT_BYTES} bytes an importer reads	het bestand is groter dan de {MAX_INPUT_BYTES} bytes die een importplug-in leest
+@msg	an importer declares 1 to {MAX_EXTENSIONS} `extensions`	een importplug-in declareert 1 tot {MAX_EXTENSIONS} `extensions`
+@msg	only an exporter or an importer declares `extensions`	alleen een exportplug-in of een importplug-in declareert `extensions`
+@msg	an importer always gets an import's budget: leave `budget` out	een importplug-in krijgt altijd het budget van een import: laat `budget` weg
+@msg	only paths and compound paths can be aligned to the pixel grid	alleen paden en samengestelde paden kunnen op het pixelraster worden uitgelijnd
+@msg	`first` and `last` must be numbers of lines the console holds, first before last	`first` en `last` moeten nummers zijn van regels die de console bevat, first vóór last
+@msg	no plug-in effect is deferred	er is geen plug-in-effect uitgesteld
+@msg	The selected art has no islands to bridge	De geselecteerde illustratie heeft geen eilanden om te overbruggen
+@msg	No bridge of this width fits across the selected art	Geen brug van deze breedte past over de geselecteerde illustratie
+@msg	Some islands could not be joined to the area around the art	Sommige eilanden konden niet worden verbonden met het gebied rond de illustratie
+@msg	`width` must be from {lo} to {hi} pt	`width` moet van {lo} tot {hi} pt zijn
+@msg	`count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND}	`count` moet een geheel getal van 1 tot {MAX_BRIDGES_PER_ISLAND} zijn
+
 	File	Bestand
 	New…	Nieuw…
 	New Without Dialog	Nieuw zonder dialoogvenster
@@ -4574,6 +5075,7 @@ imageTrace	Outline	Contour
 @msg	not a valid plug-in module: {0}	geen geldige plug-inmodule: {0}
 @msg	not an EMF or WMF file	geen EMF- of WMF-bestand
 @msg	not an HP-GL file	geen HP-GL-bestand
+@msg	not a PICT file	geen PICT-bestand
 @msg	`pens` must be an array of 1 to 255 #rrggbb colors	`pens` moet een array van 1 tot 255 #rrggbb-kleuren zijn
 @msg	not found	niet gevonden
 @msg	not in pattern editing mode	niet in patroonbewerkingsmodus
@@ -4909,6 +5411,7 @@ imageTrace	Outline	Contour
 @msg	choose the font files to add	kies de lettertypebestanden die je wilt toevoegen
 @msg	not a file	geen bestand
 @msg	not a font file	geen lettertypebestand
+@msg	the active document changed while the question was open; nothing was deleted	het actieve document is gewijzigd terwijl de vraag openstond; er is niets verwijderd
 @msg	that document is no longer open	dat document is niet langer geopend
 @msg	larger than 256 MB	groter dan 256 MB
 @msg	the files come to more than 1 GB: add fewer at a time	de bestanden lopen op tot meer dan 1 GB: voeg er minder tegelijk toe
@@ -5330,6 +5833,65 @@ mark-style	Japanese	Japans
 @msg	{label} can't build a solid from an image: trace it first with Object › Image Trace › Make.	{label} kan geen massief object maken van een afbeelding: traceer deze eerst met Object › Afbeelding traceren › Maken.
 @msg	{label} requires a shape with at least two anchors	{label} vereist een vorm met minstens twee ankerpunten
 @msg	The shape is too complex for a 3D effect	De vorm is te complex voor een 3D-effect
+@msg	Extrude & Bevel	Extruderen en afschuinen
+@msg	Revolve	Draaien
+@msg	Inflate	Opblazen
+@msg	Rotate	Roteren
+@msg	Extrude & Bevel (Classic)	Extruderen en afschuinen (klassiek)
+@msg	Revolve (Classic)	Draaien (klassiek)
+@msg	Rotate (Classic)	Roteren (klassiek)
+@msg	This effect	Dit effect
+@msg	clipping paths	knippaden
+@msg	other objects	andere objecten
+@msg	{label} requires a group holding a shape with at least two anchors	{label} vereist een groep met een vorm met minstens twee ankerpunten
+@msg	Revolve requires a group holding a shape with at least two anchors	Draaien vereist een groep met een vorm met minstens twee ankerpunten
+@msg	Revolve requires a shape with at least two anchors	Draaien vereist een vorm met minstens twee ankerpunten
+@msg	{label} on a group needs paths, compound paths, type, groups, clipping groups, blends and symbol instances: release or expand its {what} first.	{label} op een groep vereist paden, samengestelde paden, tekst, groepen, knipgroepen, vermengingen en symboolinstanties: geef eerst het volgende vrij of breid het uit: {what}.
+@msg	{label} on a group takes at most {MAX_MEMBERS} objects	{label} op een groep neemt maximaal {MAX_MEMBERS} objecten op
+@msg	A 3D effect on a group or layer goes on the group itself, not on its fill or stroke	Een 3D-effect op een groep of laag hoort op de groep zelf, niet op de vulling of contour ervan
+@msg	a 3D effect on a group's fill or stroke draws nothing	een 3D-effect op de vulling of contour van een groep tekent niets
+@msg	a 3D effect on a group's fill or stroke draws nothing to export	een 3D-effect op de vulling of contour van een groep tekent niets om te exporteren
+@msg	The 3D object is too complex to export	Het 3D-object is te complex om te exporteren
+@msg	the object has no 3D effect (Extrude & Bevel, Revolve, Inflate or Rotate)	het object heeft geen 3D-effect (Extruderen en afschuinen, Draaien, Opblazen of Roteren)
+@msg	its 3D effect builds no solid	het 3D-effect ervan maakt geen massief object
+@msg	bevel must be none or one of {_1}	bevel moet none of een van {_1} zijn
+@msg	{_1} can't build solids from this art: its symbol instances, blends and clipping groups hold too many objects	{_1} kan van deze illustratie geen massieve objecten maken: de symboolinstanties, vermengingen en knipgroepen ervan bevatten te veel objecten
+@msg	{label} can't build a solid from the instance of symbol "{symbol}": the symbol's art isn't available	{label} kan geen massief object maken van de instantie van symbool "{symbol}": de illustratie van het symbool is niet beschikbaar
+@msg	{_1}: the clipping path is too complex to cut the art with	{_1}: het knippad is te complex om de illustratie mee uit te knippen
+@msg	{_1} takes at most {MAX_MEMBERS} objects	{_1} neemt maximaal {MAX_MEMBERS} objecten op
+@msg	{_1} can't build solids from art nested more than {MAX_DEPTH} levels deep	{_1} kan geen massieve objecten maken van illustraties die meer dan {MAX_DEPTH} niveaus diep genest zijn
+@msg	Revolve paint is too complex for this surface; reduce Segments or simplify the gradient	De verf van Draaien is te complex voor dit oppervlak; verlaag Segmenten of vereenvoudig het verloop
+@msg	Revolve edge must be left or right	Draaien: edge moet left of right zijn
+@msg	Revolve cap must be a boolean	Draaien: cap moet een booleaanse waarde zijn
+@msg	the revolved object has no fill or stroke	het gedraaide object heeft geen vulling of contour
+@msg	lightColor must be an opaque RGB color in #rrggbb form	lightColor moet een dekkende RGB-kleur in de vorm #rrggbb zijn
+@msg	lights must contain one to ten lights	lights moet één tot tien lichten bevatten
+@msg	each light must be an object	elk licht moet een object zijn
+@msg	unknown light setting: use color, intensity, rotation, height, softness or behind	onbekende lichtinstelling: gebruik color, intensity, rotation, height, softness of behind
+@msg	light {key} must be a number from {min} to {max}	licht: {key} moet een getal van {min} tot {max} zijn
+@msg	light color must use opaque #rrggbb	color van een licht moet een dekkend #rrggbb gebruiken
+@msg	light behind must be true or false	behind van een licht moet true of false zijn
+@msg	shadow must be true or false	shadow moet true of false zijn
+@msg	shadowPosition must be behind or below	shadowPosition moet behind of below zijn
+@msg	{key} must be a number from {min} to {max}	{key} moet een getal van {min} tot {max} zijn
+@msg	each of `{GRAPHICS}` must be an object	elk item van `{GRAPHICS}` moet een object zijn
+@msg	`{GRAPHICS}` entries take symbol, face, x, y, scale and rotation, not `{k}`	items van `{GRAPHICS}` nemen symbol, face, x, y, scale en rotation aan, niet `{k}`
+@msg	each of `{GRAPHICS}` needs `symbol`, the name of a symbol	elk item van `{GRAPHICS}` heeft `symbol` nodig, de naam van een symbool
+@msg	`{GRAPHICS}` face must be front or back	face in `{GRAPHICS}` moet front of back zijn
+@msg	`{GRAPHICS}` {key} must be a number from {lo} to {hi}	{key} in `{GRAPHICS}` moet een getal van {lo} tot {hi} zijn
+@msg	`{GRAPHICS}` must be an array	`{GRAPHICS}` moet een array zijn
+@msg	Graphics map onto planar faces: use the Extrude or Plane object type	Illustraties worden op platte vlakken geplaatst: gebruik het objecttype Extruderen of Vlak
+@msg	`{GRAPHICS}` takes at most {MAX_GRAPHICS} graphics	`{GRAPHICS}` neemt maximaal {MAX_GRAPHICS} illustraties op
+@msg	A plane has one face: map its graphics onto the front	Een vlak heeft één zijde: plaats de illustraties ervan op de voorkant
+@msg	The graphics are too complex: simplify the symbols' art	De illustraties zijn te complex: vereenvoudig de illustraties van de symbolen
+@msg	A graphic's art may be nested at most {MAX_LEVELS} levels deep: simplify the symbol's art	De illustratie van een grafisch element mag maximaal {MAX_LEVELS} niveaus diep genest zijn: vereenvoudig de illustratie van het symbool
+@msg	A graphic's art may nest symbols at most {MAX_NESTING} levels deep: simplify the symbol's art	De illustratie van een grafisch element mag symbolen maximaal {MAX_NESTING} niveaus diep nesten: vereenvoudig de illustratie van het symbool
+@msg	A graphic's art holds too many objects: simplify the symbol's art	De illustratie van een grafisch element bevat te veel objecten: vereenvoudig de illustratie van het symbool
+@msg	A graphic draws at most {MAX_PIECES} fills and strokes: simplify the symbol's art	Een grafisch element tekent maximaal {MAX_PIECES} vullingen en contouren: vereenvoudig de illustratie van het symbool
+@msg	`surface` must be one of {_1}	`surface` moet een van {_1} zijn
+@msg	{label} draws the source art for this object instead of its 3D surface	{label} tekent voor dit object de bronillustratie in plaats van het 3D-oppervlak
+@msg	{label} draws no faces for this object	{label} tekent geen vlakken voor dit object
+@msg	the wireframe has more than {MAX_WIRE_EDGES} edges	het draadmodel heeft meer dan {MAX_WIRE_EDGES} randen
 @msg	The 3D surface is too complex; simplify the shape	Het 3D-oppervlak is te complex; vereenvoudig de vorm
 	Transform Objects	Objecten transformeren
 @msg	unknown parameter `{key}`; did you mean `{near}`?	onbekende parameter `{key}`; bedoelde je `{near}`?
@@ -6815,6 +7377,7 @@ breakText	Glyphs	Glyphs
 # Deferred plug-in effects
 	Refresh Deferred Effects	Uitgestelde effecten vernieuwen
 	Deferred Effects	Uitgestelde effecten
+@msgplural	Opened with {n} plug-in effect deferred. Effect › Refresh Deferred Effects runs it.|Opened with {n} plug-in effects deferred. Effect › Refresh Deferred Effects runs them.	Geopend met {n} uitgesteld plug-in-effect. Effect › Uitgestelde effecten vernieuwen voert het uit.|Geopend met {n} uitgestelde plug-in-effecten. Effect › Uitgestelde effecten vernieuwen voert ze uit.
 
 # Cutting Tools add-on (Object › Plug-ins › Cutting Tools).
 	Cutting Tools	Snijgereedschap
diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs
index 66caa1c3a4..605ff0382b 100644
--- a/crates/ui-egui/src/i18n/tests.rs
+++ b/crates/ui-egui/src/i18n/tests.rs
@@ -3617,6 +3617,7 @@ fn translated_messages_keep_the_command_ids_their_english_names() {
 /// the messages each one lacks.
 const COMPLETE_MESSAGES: &[&str] = &[
     "cs", "de", "el", "es", "fr", "hi", "hu", "it", "ja", "ka", "ko", "pl", "pt-br", "ru", "sv", "uk", "vi", "zh-hans", "zh-hant", "fi", "tr", "ca",
+    "nl",
 ];
 
 /// Crates whose error and status messages reach the status bar.
diff --git a/docs/development.md b/docs/development.md
index 37f2b770ac..962f7207f5 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -294,7 +294,7 @@ other `sv-*` locale resolve to it), Georgian (`ka`, complete; `ka-GE` and `ka_GE
   control channel, MCP and tests read them) and are translated only where the status bar draws them
   (`i18n::msg`). `@msg` catalog rows hold a whole message or a template such as
   `Couldn't open {name}: {e}`; `{_1}`, `{_2}` … stand for the format string's `{}`, and the values in the
-  placeholders are translated in turn (the reason after `: {e}` is often a message too). Czech, German, Greek, Spanish, French, Georgian, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Russian, Simplified Chinese, Traditional Chinese, Swedish, Ukrainian, Vietnamese, Finnish, Turkish and Catalan
+  placeholders are translated in turn (the reason after `: {e}` is often a message too). Czech, German, Greek, Spanish, French, Georgian, Hungarian, Italian, Japanese, Korean, Polish, Brazilian Portuguese, Russian, Simplified Chinese, Traditional Chinese, Swedish, Ukrainian, Vietnamese, Finnish, Turkish, Catalan and Dutch
   translate status and error messages (`COMPLETE_MESSAGES` in `i18n::tests`); the untranslated report lists the
   message literals the scan finds that one of them has no row for. The scan reads `Err("…")`, `Other(…)`,
   `#[error(…)]` and `status(…)` messages, messages given to an error enum's variant (`PsError::Limit(…)`, the reason
diff --git a/docs/localization-parity.md b/docs/localization-parity.md
index 25dd92d552..0df4d55d6f 100644
--- a/docs/localization-parity.md
+++ b/docs/localization-parity.md
@@ -15,7 +15,7 @@ translation never fails a test or a build: the interface shows the English text
 `cargo xtask ci` prints the untranslated report (`cargo xtask i18n-report` alone), which lists per language the
 strings missing from each catalog with the `complete_menus` flag and the messages missing from each language in
 the `COMPLETE_MESSAGES` list. Every non-English language marked "full" has the flag, and all of them except
-Bulgarian, Danish, Indonesian and Dutch are in the list. No language has help content: there is no translated (or
+Bulgarian, Danish and Indonesian are in the list. No language has help content: there is no translated (or
 English) in-app help, and the docs are English.
 
 **Native review:** every catalog was written clean-room from the English meaning, most of it by agents
@@ -51,7 +51,7 @@ plus review. Native-speaker review is human work and isn't in the hours.
 |---|---|---|---|
 | Traditional Chinese (Taiwan) | `zh-hant` | 4,892 rows, 790 of them `@msg` (counted 2026-10-21): menus, `tl!` literals and messages complete when counted (80% overall) | partial |
 | Italian | `it` | 4,011 / 4,020 | full |
-| Dutch | `nl` | 5,317 rows, 777 of them `@msg` (counted 2026-10-21): menus and `tl!` literals complete when counted; its messages are partial; one/other plurals | full |
+| Dutch | `nl` | 7,299 rows, 1,609 of them `@msg` and 47 `@msgplural` (counted 2026-11-13 on `main` at `9a1a158a3`): in `COMPLETE_MESSAGES`, and the untranslated report lists the same missing messages for it as for German; one/other plurals | full |
 | Danish | `da` | 5,279 rows, 750 of them `@msg` (counted 2026-10-21): menus and `tl!` literals complete when counted; its messages are partial; one/other plurals | full |
 | Russian | `ru` | 4,009 / 4,020 | full |
 | Ukrainian | `uk` | 4,009 / 4,020 (one/few/many plurals) | full |
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..3f6bff4e09 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1288,7 +1288,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   The Tabs ruler's upper first-line marker and lower left-indent marker show absolute positions and set paragraph indents (`text.setFormat`). Dragging the lower marker keeps the upper position, while Ctrl-dragging it (Command on macOS) moves both; marker drags snap like tab stops, and each release is one undo step. With differing left indents, only the upper marker is shown and its absolute target applies to every touched paragraph.
   When a drag on the Tabs panel's ruler or a value typed in its X field moves a tab stop past another stop, the moved stop stays selected.
   The Tabs panel menu's Clear All Tabs (`text.tabs.clear`), Delete Tab and Repeat Tab (`text.tabs.set`) can be chosen while the panel's ruler shows tab stops. Delete Tab removes the stop selected on the ruler. Repeat Tab replaces the stops after the selected stop with up to 20 copies of it. The copies are spaced by the selected stop's distance from the stop before it, or from the paragraph's left indent (18 pt further in for each list level past the first) when it is the first stop, and no copy is placed at 2,000 pt or beyond. Clear All Tabs removes every stop, so the default stops every ½ inch apply again.
-- **Interface languages, vertical type:** Preferences ▸ User Interface (or VectorCraft ▸ Language on macOS) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese, German (every `de-*` locale), Spanish (neutral international Spanish, for every `es-*` locale), French (every `fr-*` locale), Italian (every `it-*` locale), Russian (every `ru-*` locale) and Ukrainian (every `uk-*` locale), Catalan (every `ca-*` locale) and Polish (every `pl-*` locale; AI-drafted, native review pending) cover the whole interface, Czech every menu label; Czech, German, Greek, Spanish, French, Hungarian, Italian, Japanese, Korean, Vietnamese, Polish, Brazilian Portuguese, Russian, Simplified Chinese, Traditional Chinese, Swedish, Ukrainian and Finnish also translate status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech, German, Spanish, French, Italian, Russian and Ukrainian ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line; on a vertical path, upright glyphs and tate-chu-yoko blocks face the path's start, and letters on their side are a quarter turn clockwise from them (with Skew, 3D Ribbon and Stair Step only on a path that runs to the right), in one column that Align to Path Baseline or Center centers on the path and that the caret and selection span); kinsoku applies to horizontal and vertical Japanese (Paragraph panel › Kinsoku Set, `text.setFormat {kinsoku}`: Hard, the default, keeps closing marks, iteration marks, the prolonged sound mark and small kana off the line start and opening brackets off its end; Soft lets 々, ー and small kana start a line as JLREQ's level 3 rules do; None turns it off), and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a line flush with its start (a paragraph's first line at its first-line indent, JIS X 4051's principle in JLREQ 3.1.5), and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline (new type in a Japanese interface starts top to top, with em box centre character alignment, #432); Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline, the em box top/right, centre or bottom/left, or the ICF (ideographic character face) top/right or bottom/left, from the font's BASE table or, without one, the average ink box of some ideographs and kana; Proportional Metrics (the same menu; `{proportionalMetrics}`) sets full-width glyphs on the font's proportional widths (OpenType `palt`) in horizontal type and upright glyphs on its proportional heights (`vpal`, shaped top to bottom; fonts without vertical metrics keep their cells) in vertical type, and Line-end Punctuation Half Width takes nothing more off the punctuation they re-spaced; Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines. The interface is available in Polish (`pl`): menus, panels, dialogs and messages, with one/few/many plurals; AI-drafted, native review pending (#1498).
+- **Interface languages, vertical type:** Preferences ▸ User Interface (or VectorCraft ▸ Language on macOS) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese, German (every `de-*` locale), Spanish (neutral international Spanish, for every `es-*` locale), French (every `fr-*` locale), Italian (every `it-*` locale), Russian (every `ru-*` locale) and Ukrainian (every `uk-*` locale), Catalan (every `ca-*` locale) and Polish (every `pl-*` locale; AI-drafted, native review pending) cover the whole interface, Czech every menu label; Czech, German, Greek, Spanish, French, Hungarian, Italian, Japanese, Korean, Vietnamese, Polish, Brazilian Portuguese, Russian, Simplified Chinese, Traditional Chinese, Swedish, Ukrainian, Finnish and Dutch also translate status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech, German, Spanish, French, Italian, Russian and Ukrainian ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line; on a vertical path, upright glyphs and tate-chu-yoko blocks face the path's start, and letters on their side are a quarter turn clockwise from them (with Skew, 3D Ribbon and Stair Step only on a path that runs to the right), in one column that Align to Path Baseline or Center centers on the path and that the caret and selection span); kinsoku applies to horizontal and vertical Japanese (Paragraph panel › Kinsoku Set, `text.setFormat {kinsoku}`: Hard, the default, keeps closing marks, iteration marks, the prolonged sound mark and small kana off the line start and opening brackets off its end; Soft lets 々, ー and small kana start a line as JLREQ's level 3 rules do; None turns it off), and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a line flush with its start (a paragraph's first line at its first-line indent, JIS X 4051's principle in JLREQ 3.1.5), and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline (new type in a Japanese interface starts top to top, with em box centre character alignment, #432); Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。，．､｡) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline, the em box top/right, centre or bottom/left, or the ICF (ideographic character face) top/right or bottom/left, from the font's BASE table or, without one, the average ink box of some ideographs and kana; Proportional Metrics (the same menu; `{proportionalMetrics}`) sets full-width glyphs on the font's proportional widths (OpenType `palt`) in horizontal type and upright glyphs on its proportional heights (`vpal`, shaped top to bottom; fonts without vertical metrics keep their cells) in vertical type, and Line-end Punctuation Half Width takes nothing more off the punctuation they re-spaced; Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines. The interface is available in Polish (`pl`): menus, panels, dialogs and messages, with one/few/many plurals; AI-drafted, native review pending (#1498).
   With Line-end Punctuation Half Width, both composers measure a line with its last character set as narrow as Mojikumi sets it ([the help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/use-mojikumi-for-japanese-text-composition.html)): a closing bracket, comma or full stop that fits at half width ends the line, and the character before it no longer goes to the next line with it. A mark that already lost its half to the punctuation after it and a line that ends in a hyphen take nothing more off, and the quarter em between Japanese and Latin text counts only where the line ends there. Kinsoku Shori Type and Burasagari Regular measure lines the same way; right-to-left lines and Mojikumi None break as before. In a frame that is not a rectangle, or with text wrap, a line's first word is measured as it is set (an opening bracket at its start flush, its last character narrowed) when layout looks for a line wide enough for it, and it ends only where the line may break, so kinsoku keeps an opening bracket with the character after it and a No Break run counts whole (`crates/text/src/layout/wrapping_tests.rs`, `crates/text/src/tests/vertical.rs`). Scores and estimates are unchanged.
   The Paragraph panel's Mojikumi Set lists the five predefined sets the help page names (None, YakumonoHankaku, GyomatsuYakumonoHankaku, GyomatsuYakumonoZenkaku and YakumonoZenkaku), then Line-end Punctuation Half Width, and `text.setFormat {mojikumi}` takes each of them. YakumonoHankaku sets every bracket, comma and full stop half width and takes a quarter em off each side of a middle dot; GyomatsuYakumonoHankaku keeps punctuation full width inside a line, sets an opening bracket flush at a line's start and a closing mark half width at its end, and takes the quarter em after a middle dot off at a line's end; GyomatsuYakumonoZenkaku keeps punctuation full width and adds a quarter em between Japanese and Latin text; YakumonoZenkaku sets characters as None does. These widths are VectorCraft's own rules, from the help page's one-line description of each set. Both composers and vertical type measure each line as it is set, the sets save with the document and paragraph styles, and a `.ai` save reports the new sets as left out (`crates/text/src/tests/vertical.rs`, `crates/ui-egui/src/panels/paragraph/tests.rs`). Scores and estimates are unchanged.
   Interface text in characters the interface's fonts lack, drawn in a bundled Japanese, Georgian or Devanagari face or in an installed font that covers them, sits on the baseline of the Latin text beside it, monospace text included (#5816; `crates/ui-egui/src/ui_fonts.rs`, `crates/ui-egui/src/theme.rs`).

From 6c773585fa63f1341ac3368e3929258d580ddada Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:11:38 -0800
Subject: [PATCH 08/48] Type: the Every-line Composer sets mixed sizes in
 shaped and wrapped area type

A paragraph whose characters differ in line metrics (type size, font,
leading, vertical scale, or an inline graphic taller than the text) was
broken with the Single-line Composer in area type of a shape other than
a rectangle, or with text wrap. The every-line composer now composes it
there too.

- The composer takes each line's width from a measure that follows
  where the lines above it went (`composer::Measure`,
  `compose_with`). The fixed widths by line number are one such measure.
- In a frame whose lines are not all as wide, each line the composer
  tries is placed from the pen the lines above it left, at its own
  tallest metrics, as the line loop places it (`layout/shaped.rs`).
  Starts with the same placement are shared, and each start keeps the
  placements it was tried with.
- A line too long for its room does not end the search from its start
  while a glyph after it could make the line taller and set it lower,
  where the frame may be wider.
- The line loop places a composed line in such a frame at the line's
  tallest metrics, so it gets the room the composer measured for it.
- The search for one paragraph stops after 1,000,000 lines tried or
  2,000,000 baseline steps. The searches of all the paragraphs of one
  frame share a budget of 2,000,000 lines and 4,000,000 steps, kept
  apart from the line loop's own steps. A paragraph whose search stops
  is broken line by line. A paragraph the frame has no room for is
  broken line by line too, and overflows as before.

Tests: crates/text/src/tests/combos.rs (a stepped frame, a frame that
widens, text wrap with two spans on a baseline, overflow, a long
paragraph) and crates/text/src/layout/wrapping_tests.rs (the composer
with a measure, and the shared search budget).
---
 crates/text/src/composer.rs              |  89 ++++++--
 crates/text/src/layout.rs                |   1 +
 crates/text/src/layout/breaking.rs       |  24 +-
 crates/text/src/layout/flow.rs           |  48 ++--
 crates/text/src/layout/shaped.rs         | 273 +++++++++++++++++++++++
 crates/text/src/layout/wrapping_tests.rs | 141 ++++++++++++
 crates/text/src/tests/combos.rs          | 174 ++++++++++++++-
 docs/mcp.md                              |   8 +-
 docs/target-app-parity.md                |   2 +-
 9 files changed, 714 insertions(+), 46 deletions(-)
 create mode 100644 crates/text/src/layout/shaped.rs

diff --git a/crates/text/src/composer.rs b/crates/text/src/composer.rs
index bac0edbe92..41b8b7f5c3 100644
--- a/crates/text/src/composer.rs
+++ b/crates/text/src/composer.rs
@@ -61,10 +61,50 @@ pub(crate) struct Params {
     pub hyphen_limit: usize,
 }
 
-struct Node {
+/// The search gave up: it ran past its budget ([`Measure::line`]).
+#[derive(Debug)]
+pub(crate) struct Exhausted;
+
+/// Where each line of a paragraph goes and how wide it is: the measure a line gets may depend on
+/// the lines set above it (their heights move it down a shaped frame, or past a wrap object).
+pub(crate) trait Measure {
+    /// What the measure of the next line depends on; breaks reached with equal states are
+    /// interchangeable from there on.
+    type State: Clone + PartialEq;
+    /// The state of the paragraph's first line.
+    fn first(&mut self) -> Self::State;
+    /// The width of the line of glyphs `pos..end` set from `state`, and the state of the line
+    /// after it; `Ok(None)` when the line can't be set (the frame is full), and [`Exhausted`] when
+    /// the search is to stop.
+    fn line(&mut self, state: &Self::State, pos: usize, end: usize) -> Result<Option<(f64, Self::State)>, Exhausted>;
+    /// Whether a line from `state` longer than `pos..end`, which [`Measure::line`] just measured,
+    /// may get more room than it. While it may, a line from `state` that is too long does not end
+    /// the reach of `state`. Lines from a state are all as wide by default.
+    fn may_widen(&mut self, _state: &Self::State, _pos: usize, _end: usize) -> bool {
+        false
+    }
+}
+
+/// Line widths by line number: `width(k)` for line `k`, lines from `uniform_from` on all as wide.
+struct ByLine<'a> {
+    width: &'a dyn Fn(usize) -> f64,
+    uniform_from: usize,
+}
+
+impl Measure for ByLine<'_> {
+    type State = usize;
+    fn first(&mut self) -> usize {
+        0
+    }
+    fn line(&mut self, &line: &usize, _: usize, _: usize) -> Result<Option<(f64, usize)>, Exhausted> {
+        Ok(Some(((self.width)(line), (line + 1).min(self.uniform_from))))
+    }
+}
+
+struct Node<S> {
     pos: usize,
-    /// Line number of the next line, clamped to `uniform_from`.
-    line: usize,
+    /// The measure of the next line (its line number, clamped to `uniform_from`, for [`compose`]).
+    state: S,
     fitness: u8,
     demerits: f64,
     /// Lines in a row ending with a hyphen up to this break (at most `hyphen_limit`, or 1 with no
@@ -131,6 +171,19 @@ pub(crate) fn compose(
     cands: &[Breakpoint],
     flex: &[Flex],
     p: &Params,
+) -> Option<Vec<(usize, bool)>> {
+    compose_with(g, &mut ByLine { width, uniform_from: p.uniform_from }, start_credit, end_credit, cands, flex, p)
+}
+
+/// [`compose`] with each line's width from `measure`, which follows where the lines above it went.
+pub(crate) fn compose_with<M: Measure>(
+    g: &[SGlyph],
+    measure: &mut M,
+    start_credit: &dyn Fn(usize) -> f64,
+    end_credit: &dyn Fn(usize) -> f64,
+    cands: &[Breakpoint],
+    flex: &[Flex],
+    p: &Params,
 ) -> Option<Vec<(usize, bool)>> {
     let n = g.len();
     if n == 0 {
@@ -165,14 +218,14 @@ pub(crate) fn compose(
     all.push(Breakpoint { end: n, hyphen: 0.0 });
     let (adj_demerits, hyphen_penalty) =
         if p.ragged { (ADJ_DEMERITS_RAGGED, HYPHEN_PENALTY_RAGGED) } else { (ADJ_DEMERITS_JUSTIFIED, HYPHEN_PENALTY) };
-    let mut nodes = vec![Node { pos: 0, line: 0, fitness: 1, demerits: 0.0, hyphens: 0, prev: None }];
+    let mut nodes = vec![Node { pos: 0, state: measure.first(), fitness: 1, demerits: 0.0, hyphens: 0, prev: None }];
     let mut active: Vec<usize> = vec![0];
     for bp in &all {
         let last = bp.end == n;
         let hyphen = bp.hyphen > 0.0;
         // `automatic` is true for a hyphenation point and false for a soft hyphen typed in the text.
         let automatic = hyphen && !bp.end.checked_sub(1).and_then(|k| g.get(k)).is_some_and(SGlyph::is_soft_hyphen);
-        let mut best: Vec<(usize, u8, usize, f64, usize)> = vec![]; // (line, fitness, hyphens, demerits, from)
+        let mut best: Vec<(M::State, u8, usize, f64, usize)> = vec![]; // (state, fitness, hyphens, demerits, from)
         let mut keep = Vec::with_capacity(active.len());
         for &ai in &active {
             let Some(a) = nodes.get(ai) else { continue };
@@ -182,13 +235,18 @@ pub(crate) fn compose(
             // last glyph's advance, so a longer line from the same node is never narrower.
             let end = if hyphen || t <= a.pos { 0.0 } else { line_end_credit(t) };
             let natural = w[t] - w[a.pos] - credit - end + bp.hyphen;
-            let lw = width(a.line);
+            // A line that can't be set (no room left in the frame) ends this node's reach.
+            let Some((lw, next)) = measure.line(&a.state, a.pos, bp.end).ok()? else { continue };
             // Adjustment ratio, badness and whether the line ends the active node's reach.
-            let Some(ratio) = adjustment_ratio(natural, lw, st[t] - st[a.pos], sh[t] - sh[a.pos], last, p) else { continue };
-            if ratio < -1.0 {
-                // Too long already; longer lines from this node only get worse.
+            let ratio = adjustment_ratio(natural, lw, st[t] - st[a.pos], sh[t] - sh[a.pos], last, p);
+            let Some(ratio) = ratio.filter(|&r| r >= -1.0 || r.is_nan()) else {
+                // Too long already; longer lines from this node only get worse, unless they may
+                // get more room (a taller line set lower down a shaped frame).
+                if measure.may_widen(&a.state, a.pos, bp.end) {
+                    keep.push(ai);
+                }
                 continue;
-            }
+            };
             keep.push(ai);
             if automatic && p.hyphen_limit > 0 && a.hyphens >= p.hyphen_limit {
                 continue;
@@ -214,22 +272,21 @@ pub(crate) fn compose(
                 d += adj_demerits;
             }
             let total = a.demerits + d;
-            let line = (a.line + 1).min(p.uniform_from);
             // With a limit, breaks reached with different runs of hyphenated lines stay apart.
             let hyphens = match (hyphen, p.hyphen_limit) {
                 (false, _) => 0,
                 (true, 0) => 1,
                 (true, limit) => (a.hyphens + 1).min(limit),
             };
-            match best.iter_mut().find(|b| b.0 == line && b.1 == fit && b.2 == hyphens) {
+            match best.iter_mut().find(|b| b.0 == next && b.1 == fit && b.2 == hyphens) {
                 Some(b) if b.3 <= total => {}
-                Some(b) => *b = (line, fit, hyphens, total, ai),
-                None => best.push((line, fit, hyphens, total, ai)),
+                Some(b) => *b = (next, fit, hyphens, total, ai),
+                None => best.push((next, fit, hyphens, total, ai)),
             }
         }
         active = keep;
-        for (line, fitness, hyphens, demerits, from) in best {
-            nodes.push(Node { pos: bp.end, line, fitness, demerits, hyphens, prev: Some(from) });
+        for (state, fitness, hyphens, demerits, from) in best {
+            nodes.push(Node { pos: bp.end, state, fitness, demerits, hyphens, prev: Some(from) });
             active.push(nodes.len() - 1);
         }
         if active.is_empty() || active.len() > MAX_ACTIVE {
diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs
index cbe7aaf394..4f3566b97d 100644
--- a/crates/text/src/layout.rs
+++ b/crates/text/src/layout.rs
@@ -31,6 +31,7 @@ mod flow;
 mod on_path;
 mod region;
 mod ruby;
+mod shaped;
 mod vertical;
 
 pub(crate) use bidi::{is_rtl, para_bidi};
diff --git a/crates/text/src/layout/breaking.rs b/crates/text/src/layout/breaking.rs
index 30a498257e..2eef2dd669 100644
--- a/crates/text/src/layout/breaking.rs
+++ b/crates/text/src/layout/breaking.rs
@@ -26,14 +26,18 @@ impl Metrics {
     pub(super) fn max(g: &[SGlyph]) -> Option<Self> {
         let mut it = g.iter();
         let first = Self::of(it.next()?);
-        Some(it.fold(first, |m, g| Self {
-            asc: m.asc.max(g.ascent),
-            desc: m.desc.max(g.descent),
-            lead: m.lead.max(g.leading),
-            cap: m.cap.max(g.cap),
-            xh: m.xh.max(g.xh),
-            top: m.top.max(Self::of(g).top),
-        }))
+        Some(it.fold(first, |m, g| m.union(Self::of(g))))
+    }
+    /// The larger of each of the metrics of `self` and `o`: those of a line holding both.
+    pub(super) fn union(self, o: Self) -> Self {
+        Self {
+            asc: self.asc.max(o.asc),
+            desc: self.desc.max(o.desc),
+            lead: self.lead.max(o.lead),
+            cap: self.cap.max(o.cap),
+            xh: self.xh.max(o.xh),
+            top: self.top.max(o.top),
+        }
     }
     /// Distance from the frame top to the first baseline.
     pub(super) fn first_baseline(&self, fb: FirstBaseline, min: f64) -> f64 {
@@ -67,6 +71,9 @@ pub(super) struct Pen<'r> {
     /// Baseline steps still allowed over all the frame's cells and placements (shared by this pen's
     /// copies): see [`MAX_TOTAL_STEPS`].
     pub(super) steps_left: std::rc::Rc<std::cell::Cell<usize>>,
+    /// What is left of the every-line composer's search over the frame's paragraphs (shared by
+    /// this pen's copies): see [`super::shaped::Budget`].
+    pub(super) search: std::rc::Rc<super::shaped::Budget>,
 }
 
 /// The largest number of steps layout takes to move a line down a frame cell to find room for it:
@@ -841,6 +848,7 @@ fn a_pen_out_of_baseline_steps_finds_no_room() {
         next_top: None,
         no_room_for: f64::INFINITY,
         steps_left: std::rc::Rc::new(std::cell::Cell::new(steps)),
+        search: Default::default(),
     };
     assert!(pen(MAX_TOTAL_STEPS).place(est, 0.0, 0.0, 0.0).is_some());
     assert!(pen(0).place(est, 0.0, 0.0, 0.0).is_none());
diff --git a/crates/text/src/layout/flow.rs b/crates/text/src/layout/flow.rs
index aae91be1ee..13b09811bb 100644
--- a/crates/text/src/layout/flow.rs
+++ b/crates/text/src/layout/flow.rs
@@ -24,9 +24,15 @@ fn pushes_in(para: &ParaStyle) -> bool {
 /// Paragraphs longer than this (glyphs) are always broken line by line.
 const MAX_COMPOSE_GLYPHS: usize = 200_000;
 
+/// Whether every line of area type in `regions` is as wide however tall it is and wherever it is set:
+/// rectangular cells without text wrap.
+fn constant_width(regions: Option<&[Region]>) -> bool {
+    regions.is_some_and(|r| r.iter().all(|r| (r.rect || r.polys.is_empty()) && r.wraps.is_empty()))
+}
+
 /// Every-line composition of paragraph glyphs `sg` if applicable (area text, justified or ragged,
-/// with uniform line metrics or in rectangular cells without text wrap); `None` falls back to the
-/// greedy single-line composer. With `continued`, the paragraph continues from the frame before,
+/// in any frame shape, with or without text wrap); `None` falls back to the greedy single-line
+/// composer. With `continued`, the paragraph continues from the frame before,
 /// and its first composed line is not its first line. `line_end` is how much narrower a line
 /// ending with each glyph is set ([`ParagraphData::line_end`]).
 #[allow(clippy::too_many_arguments)]
@@ -66,14 +72,11 @@ fn compose_para(
     let m = Metrics::of(&sg[0]);
     // Line widths are independent of the breaks when every line has the same metrics, or when
     // a line's width does not depend on how far down the frame it is set: rectangular cells
-    // without text wrap. Then a paragraph whose characters differ in line metrics (type size,
-    // font, leading, vertical scale, an inline graphic taller than the text) is composed too. In
-    // other shapes, or with text wrap, a taller line can move the lines below it to where the
-    // frame is narrower, so such a paragraph is broken line by line.
-    let plain = pen.regions.is_some_and(|r| r.iter().all(|r| (r.rect || r.polys.is_empty()) && r.wraps.is_empty()));
-    if !plain && sg.iter().any(|g| Metrics::of(g) != m) {
-        return None;
-    }
+    // without text wrap. In other shapes, or with text wrap, a paragraph whose characters differ
+    // in line metrics (type size, font, leading, vertical scale, an inline graphic taller than
+    // the text) can have a taller line move the lines below it to where the frame is narrower:
+    // each line the composer tries is then placed after the lines it follows (`shaped::Shaped`).
+    let shaped = !constant_width(pen.regions) && sg.iter().any(|g| Metrics::of(g) != m);
     let total: f64 = sg.iter().map(|g| g.adv).sum();
     // The same rule as the line loop below: an opening bracket starting a wrapped line gives up
     // the space before it.
@@ -86,7 +89,7 @@ fn compose_para(
     let mut acc = 0.0;
     // A line's width and placement depend on the sum of its indents alone, which the mirrored
     // indents of a right-to-left list ([`line_indents`]) keep.
-    while widths.len() < sg.len() {
+    while !shaped && widths.len() < sg.len() {
         let first = widths.is_empty();
         let ind_l = para.laid_out_left_indent() + if first && !continued { para.first_line_indent } else { 0.0 };
         // Only the first line's first word is known here. Later lines are placed as the composed
@@ -103,7 +106,11 @@ fn compose_para(
             break;
         }
     }
-    let last = *widths.last()?;
+    let last = match widths.last() {
+        Some(&last) => last,
+        None if shaped => 0.0,
+        None => return None,
+    };
     let width = |k: usize| widths.get(k).copied().unwrap_or(last);
     // Lines from `uniform_from` on are interchangeable (same width).
     let uniform_from = widths.iter().rposition(|&w| (w - last).abs() > EPS).map_or(0, |k| k + 1);
@@ -119,6 +126,14 @@ fn compose_para(
     let (strict, loose) = (1.0, f64::INFINITY);
     // A line's last character is set narrower, as the line loop sets it.
     let end_credit = |end: usize| end.checked_sub(1).and_then(|k| line_end.get(k)).copied().unwrap_or(0.0);
+    if shaped {
+        // Both passes share the placements tried and one search budget.
+        let mirror = mirrors_indents(para, rtl, cx.vertical);
+        let mut measure = super::shaped::Shaped::new(sg, line_end, para, &start_credit, continued, mirror, pen);
+        let mut pass = |p: &Params| crate::composer::compose_with(sg, &mut measure, &start_credit, &end_credit, &cands, flex, p);
+        let lines = pass(&params(strict));
+        return lines.or_else(|| pass(&params(loose)));
+    }
     let pass = |p: &Params| compose(sg, &width, &start_credit, &end_credit, &cands, flex, p);
     pass(&params(strict)).or_else(|| pass(&params(loose)))
 }
@@ -142,7 +157,7 @@ fn mirrors_indents(para: &ParaStyle, rtl: bool, vertical: bool) -> bool {
 /// the right and the right indent from the left: the bullet of a right-to-left list hangs at the
 /// right, and the lines it wraps to line up with the text after the bullet. A list level past the
 /// first adds to the left indent ([`ParaStyle::laid_out_left_indent`]), mirrored with it.
-fn line_indents(para: &ParaStyle, first: bool, mirror: bool) -> (f64, f64) {
+pub(super) fn line_indents(para: &ParaStyle, first: bool, mirror: bool) -> (f64, f64) {
     let start = para.laid_out_left_indent() + if first { para.first_line_indent } else { 0.0 };
     if mirror { (para.right_indent, start) } else { (start, para.right_indent) }
 }
@@ -162,6 +177,7 @@ pub(super) fn flow(cx: &mut Ctx<'_>, paras: &[Range<usize>], t: &TextObject, reg
         next_top: None,
         no_room_for: f64::INFINITY,
         steps_left: std::rc::Rc::new(std::cell::Cell::new(super::breaking::MAX_TOTAL_STEPS)),
+        search: Default::default(),
     };
     let markers = list_markers(t, paras);
     for (pi, pr) in paras.iter().enumerate() {
@@ -392,6 +408,12 @@ fn place_flow_line(cx: &mut Ctx<'_>, pen: &mut Pen<'_>, context: &mut PlacementC
     }
     // The line's first word, as narrow as the line sets it at both ends.
     let word = word_width(sg, *i, line_end, para.kinsoku);
+    // A composed line in a frame whose lines are not all as wide is placed at its own tallest
+    // metrics, as the composer placed it (`shaped::Shaped`): its room is the room across its height.
+    let est = match composed.as_ref().and_then(|lines| lines.get(*para_line)) {
+        Some(&(end, _)) if end > *i && !constant_width(pen.regions) => sg.get(*i..end).and_then(Metrics::max).unwrap_or(est),
+        _ => est,
+    };
     // Place, break, then settle the baseline on the line's real metrics (moving on to the
     // next row/column if it no longer fits).
     loop {
diff --git a/crates/text/src/layout/shaped.rs b/crates/text/src/layout/shaped.rs
new file mode 100644
index 0000000000..72f6ed8733
--- /dev/null
+++ b/crates/text/src/layout/shaped.rs
@@ -0,0 +1,273 @@
+//! Every-line composition where a line's width depends on the lines above it: area type in a
+//! shape other than a rectangle, or with text wrap, whose characters differ in line metrics (type
+//! size, font, leading, vertical scale, an inline graphic taller than the text). A taller line
+//! moves the lines below it down, to where the frame may be narrower or a wrap object splits the
+//! line. Each line the composer tries is placed from where the lines above it left the pen, at its
+//! own tallest metrics, as the line loop in [`super::flow`] places a composed line: the span it
+//! gets is the room across its whole height.
+
+use std::cell::Cell;
+use std::collections::HashMap;
+use std::rc::Rc;
+
+use super::breaking::{Metrics, Pen, word_width};
+use super::flow::line_indents;
+use super::{ParaStyle, SGlyph};
+use crate::composer::{Exhausted, Measure};
+
+/// The most lines the composer tries to place for one paragraph before it stops and the paragraph
+/// is broken line by line.
+const MAX_PROBES: usize = 1_000_000;
+
+/// The most baseline steps placing those lines takes in all (see [`super::breaking::MAX_TOTAL_STEPS`]).
+const MAX_STEPS: usize = 2_000_000;
+
+/// The most lines the composer tries to place for all the paragraphs of one frame's layout.
+const MAX_LAYOUT_PROBES: usize = 2 * MAX_PROBES;
+
+/// The most baseline steps placing them takes over all the paragraphs of one frame's layout.
+const MAX_LAYOUT_STEPS: usize = 2 * MAX_STEPS;
+
+/// What is left of the composer's search over one frame's layout: the lines it may still try to
+/// place and the baseline steps placing them may still take. Every paragraph's search takes what
+/// it spends from it, and stops when it runs out, or at its own limits of [`MAX_PROBES`] and
+/// [`MAX_STEPS`]. It is separate from the layout's own steps ([`Pen::steps_left`]), which the
+/// search leaves to the line loop.
+pub(super) struct Budget {
+    probes: Cell<usize>,
+    steps: Cell<usize>,
+}
+
+impl Budget {
+    /// A budget of `probes` lines to try and `steps` baseline steps.
+    pub(super) fn new(probes: usize, steps: usize) -> Self {
+        Self { probes: Cell::new(probes), steps: Cell::new(steps) }
+    }
+
+    /// The lines left to try and the baseline steps left.
+    #[cfg(test)]
+    pub(super) fn left(&self) -> (usize, usize) {
+        (self.probes.get(), self.steps.get())
+    }
+}
+
+impl Default for Budget {
+    fn default() -> Self {
+        Self::new(MAX_LAYOUT_PROBES, MAX_LAYOUT_STEPS)
+    }
+}
+
+/// Where a line starts: glyph `pos`, with the pen where the lines above it left it.
+struct Start<'r> {
+    pos: usize,
+    /// The paragraph's first line (it takes the first-line indent).
+    first: bool,
+    pen: Pen<'r>,
+    /// The line placed at each of the metrics it was tried with: its width and the pen after it,
+    /// or `None` when the frame has no room for it.
+    placed: Vec<(Metrics, Option<(f64, Pen<'r>)>)>,
+    /// The metrics of glyphs `pos..to`, measured so far.
+    to: usize,
+    m: Option<Metrics>,
+}
+
+/// What a line's placement depends on: its first glyph, whether it is the paragraph's first line,
+/// and the pen's cell, baselines, pending space, narrowest word without room and further spans.
+type Key = (usize, bool, usize, Option<u64>, Option<u64>, u64, u64, Vec<[u64; 3]>);
+
+fn key(pos: usize, first: bool, pen: &Pen<'_>) -> Key {
+    (
+        pos,
+        first,
+        pen.ri,
+        pen.prev.map(f64::to_bits),
+        pen.next_top.map(f64::to_bits),
+        pen.pending.to_bits(),
+        pen.no_room_for.to_bits(),
+        pen.queued.iter().map(|&(b, x0, x1)| [b.to_bits(), x0.to_bits(), x1.to_bits()]).collect(),
+    )
+}
+
+/// What placing a line reads from the paragraph.
+struct Para<'a> {
+    sg: &'a [SGlyph],
+    /// How much narrower a line ending with each glyph is set (`ParagraphData::line_end`).
+    line_end: &'a [f64],
+    para: &'a ParaStyle,
+    /// The width a line starting with each glyph gives back (Mojikumi's flush opening bracket).
+    start_credit: &'a dyn Fn(usize) -> f64,
+    mirror: bool,
+    /// The baseline steps left to the search.
+    steps: Rc<Cell<usize>>,
+}
+
+/// The measures of a paragraph's lines in a frame where they depend on the lines above.
+pub(super) struct Shaped<'a, 'r> {
+    para: Para<'a>,
+    continued: bool,
+    pen: Pen<'r>,
+    starts: Vec<Start<'r>>,
+    known: HashMap<Key, usize>,
+    /// The lines tried so far, and the most this search may try.
+    probes: usize,
+    max_probes: usize,
+    /// The baseline steps this search started with.
+    max_steps: usize,
+    /// The layout's budget, which takes what the search spent when it ends.
+    budget: Rc<Budget>,
+    /// The tallest metrics of glyphs `k..` for each `k`, `None` past the last glyph.
+    rest: Vec<Option<Metrics>>,
+}
+
+impl<'a, 'r> Shaped<'a, 'r> {
+    /// The measures of the lines of glyphs `sg` of paragraph `para`, set from `pen`. `line_end`
+    /// and `start_credit` are how much narrower a line ending with each glyph is set and how much
+    /// a line starting with it gives back; `continued`: the paragraph's first line is in the
+    /// frame before; `mirror`: its indents are mirrored. The search places its lines with a copy
+    /// of `pen` and takes its baseline steps from the layout's search budget ([`Pen::search`]),
+    /// so the frame's layout keeps its own steps.
+    pub(super) fn new(
+        sg: &'a [SGlyph],
+        line_end: &'a [f64],
+        para: &'a ParaStyle,
+        start_credit: &'a dyn Fn(usize) -> f64,
+        continued: bool,
+        mirror: bool,
+        pen: &Pen<'r>,
+    ) -> Self {
+        let mut pen = pen.clone();
+        let budget = Rc::clone(&pen.search);
+        let max_steps = budget.steps.get().min(pen.steps_left.get()).min(MAX_STEPS);
+        let steps = Rc::new(Cell::new(max_steps));
+        pen.steps_left = Rc::clone(&steps);
+        let mut rest = vec![None; sg.len() + 1];
+        for (k, g) in sg.iter().enumerate().rev() {
+            let m = Metrics::of(g);
+            rest[k] = Some(rest[k + 1].map_or(m, |r: Metrics| r.union(m)));
+        }
+        Self {
+            para: Para { sg, line_end, para, start_credit, mirror, steps },
+            continued,
+            pen,
+            starts: vec![],
+            known: HashMap::new(),
+            probes: 0,
+            max_probes: budget.probes.get().min(MAX_PROBES),
+            max_steps,
+            budget,
+            rest,
+        }
+    }
+
+    /// The start of a line at glyph `pos` with `pen`: an existing one when its placement is the same.
+    fn start(&mut self, pos: usize, first: bool, pen: Pen<'r>) -> usize {
+        let k = key(pos, first, &pen);
+        if let Some(&id) = self.known.get(&k) {
+            return id;
+        }
+        self.starts.push(Start { pos, first, pen, placed: vec![], to: pos, m: None });
+        let id = self.starts.len() - 1;
+        self.known.insert(k, id);
+        id
+    }
+}
+
+impl Measure for Shaped<'_, '_> {
+    type State = usize;
+
+    fn first(&mut self) -> usize {
+        let pen = self.pen.clone();
+        self.start(0, !self.continued, pen)
+    }
+
+    fn line(&mut self, &id: &usize, pos: usize, end: usize) -> Result<Option<(f64, usize)>, Exhausted> {
+        if self.probes >= self.max_probes {
+            return Err(Exhausted);
+        }
+        self.probes += 1;
+        let Some(start) = self.starts.get_mut(id) else { return Ok(None) };
+        let Some((width, pen)) = line(&self.para, start, pos, end)? else { return Ok(None) };
+        Ok(Some((width, self.start(end, false, pen))))
+    }
+
+    /// A longer line is placed as this one is, and gets the same room, unless a glyph after it
+    /// changes the line's tallest metrics.
+    fn may_widen(&mut self, &id: &usize, pos: usize, end: usize) -> bool {
+        let Some(start) = self.starts.get(id) else { return false };
+        let m = if start.pos == pos && start.to == end { start.m } else { self.para.sg.get(pos..end).and_then(Metrics::max) };
+        match (m, self.rest.get(end).copied().flatten()) {
+            (Some(m), Some(rest)) => m.union(rest) != m,
+            _ => false,
+        }
+    }
+}
+
+/// The search's lines tried and baseline steps spent come off the layout's budget, so the
+/// paragraphs of one frame share it.
+impl Drop for Shaped<'_, '_> {
+    fn drop(&mut self) {
+        let spent = self.max_steps.saturating_sub(self.para.steps.get());
+        self.budget.steps.set(self.budget.steps.get().saturating_sub(spent));
+        self.budget.probes.set(self.budget.probes.get().saturating_sub(self.probes));
+    }
+}
+
+/// The width of the line of glyphs `pos..end` from `start`, and the pen after it; `None` when
+/// the frame has no room for it.
+fn line<'r>(p: &Para<'_>, start: &mut Start<'r>, pos: usize, end: usize) -> Result<Option<(f64, Pen<'r>)>, Exhausted> {
+    if start.pos != pos || end <= pos {
+        return Ok(None);
+    }
+    // The line's tallest metrics, measured on from the glyphs already measured.
+    if end < start.to {
+        start.m = p.sg.get(pos..end).and_then(Metrics::max);
+        start.to = end;
+    } else if end > start.to {
+        let more = p.sg.get(start.to..end).and_then(Metrics::max);
+        start.m = match (start.m, more) {
+            (Some(m), Some(more)) => Some(m.union(more)),
+            (m, more) => m.or(more),
+        };
+        start.to = end;
+    }
+    let Some(m) = start.m else { return Ok(None) };
+    if let Some((_, placed)) = start.placed.iter().find(|(at, _)| *at == m) {
+        return Ok(placed.clone());
+    }
+    let placed = place(p, start, m)?;
+    start.placed.push((m, placed.clone()));
+    Ok(placed)
+}
+
+/// The line from `start` placed with metrics `m`: its width and the pen after it, as the line loop
+/// places and settles it; `None` when no frame cell has room for it.
+fn place<'r>(p: &Para<'_>, start: &Start<'r>, m: Metrics) -> Result<Option<(f64, Pen<'r>)>, Exhausted> {
+    let (ind_l, ind_r) = line_indents(p.para, start.first, p.mirror);
+    let word = word_width(p.sg, start.pos, p.line_end, p.para.kinsoku) - (p.start_credit)(start.pos);
+    let mut pen = start.pen.clone();
+    loop {
+        match pen.place(m, ind_l, ind_r, word) {
+            Some((baseline, x0, x1, _)) if baseline.is_finite() && (x1 - x0).is_finite() => {
+                if baseline + m.desc > pen.bottom() + 0.01 {
+                    // A further span of the line above, too low for this line: the next row or column.
+                    pen.ri += 1;
+                    pen.prev = None;
+                    pen.pending = 0.0;
+                    pen.queued.clear();
+                    continue;
+                }
+                pen.pending = 0.0;
+                pen.settled(baseline, m);
+                // Further spans of this line band share the settled baseline.
+                for queued in &mut pen.queued {
+                    queued.0 = baseline;
+                }
+                return Ok(Some((x1 - x0 - ind_l - ind_r, pen)));
+            }
+            Some(_) => return Ok(None),
+            // Out of steps: the frame may still have room further down.
+            None if p.steps.get() == 0 => return Err(Exhausted),
+            None => return Ok(None),
+        }
+    }
+}
diff --git a/crates/text/src/layout/wrapping_tests.rs b/crates/text/src/layout/wrapping_tests.rs
index 110c257c46..9195764211 100644
--- a/crates/text/src/layout/wrapping_tests.rs
+++ b/crates/text/src/layout/wrapping_tests.rs
@@ -533,6 +533,147 @@ fn composition_counts_the_narrower_line_end() {
     assert_eq!(lines(38.0, &half, &[Breakpoint { end: 4, hyphen: 0.0 }]), Some(vec![(4, false), (7, false)]));
 }
 
+/// A line measure for `compose_with`: every line is `width` wide, its state is the glyph it starts
+/// at, and the search stops once `calls` lines were measured.
+struct Measured {
+    width: f64,
+    calls: usize,
+    /// A line from a start past this one finds the frame full.
+    full_after: usize,
+}
+
+impl crate::composer::Measure for Measured {
+    type State = usize;
+    fn first(&mut self) -> usize {
+        0
+    }
+    fn line(&mut self, &start: &usize, _: usize, end: usize) -> Result<Option<(f64, usize)>, crate::composer::Exhausted> {
+        if self.calls == 0 {
+            return Err(crate::composer::Exhausted);
+        }
+        self.calls -= 1;
+        Ok((start <= self.full_after).then_some((self.width, end)))
+    }
+}
+
+/// The every-line composer with a line measure that follows the lines above: it breaks as with
+/// fixed widths when the widths are the same, finds no composition when the frame is full before
+/// the paragraph ends, and gives up when the measure's search stops.
+#[test]
+fn composition_with_a_measure_from_the_lines_above() {
+    let text = "가나다 라마바";
+    let glyphs = korean(text, false);
+    let cands = candidates(text, &glyphs, None, Kinsoku::Hard);
+    let params = Params { justify_last: false, ragged: true, tolerance: f64::INFINITY, uniform_from: 0, hyphen_limit: 0 };
+    let with = |calls: usize, full_after: usize| {
+        let mut measure = Measured { width: 50.0, calls, full_after };
+        crate::composer::compose_with(&glyphs, &mut measure, &|_| 0.0, &|_| 0.0, &cands, &[], &params)
+    };
+    let fixed = compose(&glyphs, &|_| 50.0, &|_| 0.0, &|_| 0.0, &cands, &[], &params);
+    assert_eq!(fixed, Some(vec![(4, false), (7, false)]));
+    assert_eq!(with(usize::MAX, usize::MAX), fixed);
+    assert_eq!(with(usize::MAX, 0), None, "no room for a second line");
+    assert_eq!(with(1, usize::MAX), None, "the search stopped");
+}
+
+/// A line measure for `compose_with` whose lines are `narrow` wide, and `wide` wide when they reach
+/// past glyph `from` (a line made taller there, and set lower in a frame that widens).
+struct Widening {
+    narrow: f64,
+    wide: f64,
+    from: usize,
+}
+
+impl crate::composer::Measure for Widening {
+    type State = usize;
+    fn first(&mut self) -> usize {
+        0
+    }
+    fn line(&mut self, _: &usize, _: usize, end: usize) -> Result<Option<(f64, usize)>, crate::composer::Exhausted> {
+        Ok(Some((if end > self.from { self.wide } else { self.narrow }, end)))
+    }
+    fn may_widen(&mut self, _: &usize, _: usize, end: usize) -> bool {
+        end <= self.from
+    }
+}
+
+/// A line too long for its room does not end the composer's search from its start while a longer
+/// line may get more room: the longer line is tried and set.
+#[test]
+fn composition_tries_a_longer_line_that_gets_more_room() {
+    let text = "가나다 라마바";
+    let glyphs = korean(text, false);
+    let cands = candidates(text, &glyphs, None, Kinsoku::Hard);
+    let params = Params { justify_last: false, ragged: true, tolerance: f64::INFINITY, uniform_from: 0, hyphen_limit: 0 };
+    // "가나다" is 30 wide and does not fit 25; the whole paragraph reaches past glyph 4 and fits 100.
+    let mut measure = Widening { narrow: 25.0, wide: 100.0, from: 4 };
+    let lines = crate::composer::compose_with(&glyphs, &mut measure, &|_| 0.0, &|_| 0.0, &cands, &[], &params);
+    assert_eq!(lines, Some(vec![(7, false)]));
+}
+
+/// The every-line composer's searches for the paragraphs of one frame share one budget: each takes
+/// the lines it tried and the baseline steps it spent from it, the layout's own steps stay as they
+/// were, and once the budget runs out the next paragraph's search stops (it is broken line by line).
+#[test]
+fn shaped_composition_searches_share_the_frame_budget() {
+    use super::shaped::{Budget, Shaped};
+    use std::cell::Cell;
+    use std::rc::Rc;
+    let text = "aa bb cc dd ee ff gg hh ii jj";
+    let mut glyphs = full_width(text);
+    glyphs[3].ascent = 30.0;
+    let cands = candidates(text, &glyphs, None, Kinsoku::Hard);
+    // 60 pt wide down to 40 pt, and 30 pt wide below.
+    let frame = BezPath::from_vec(vec![
+        PathEl::MoveTo((0.0, 0.0).into()),
+        PathEl::LineTo((60.0, 0.0).into()),
+        PathEl::LineTo((60.0, 40.0).into()),
+        PathEl::LineTo((30.0, 40.0).into()),
+        PathEl::LineTo((30.0, 400.0).into()),
+        PathEl::LineTo((0.0, 400.0).into()),
+        PathEl::ClosePath,
+    ]);
+    let regions = region::Region::cells(&frame, &LayoutOptions::default(), &[]);
+    let para = ParaStyle::default();
+    let params = Params { justify_last: false, ragged: true, tolerance: f64::INFINITY, uniform_from: 0, hyphen_limit: 0 };
+    let pen = |search: Rc<Budget>| breaking::Pen {
+        regions: Some(&regions),
+        ri: 0,
+        prev: None,
+        pending: 0.0,
+        fb: FirstBaseline::Ascent,
+        fb_min: 0.0,
+        queued: vec![],
+        model: LeadingModel::default(),
+        next_top: None,
+        no_room_for: f64::INFINITY,
+        steps_left: Rc::new(Cell::new(breaking::MAX_TOTAL_STEPS)),
+        search,
+    };
+    let compose = |pen: &breaking::Pen<'_>| {
+        let mut measure = Shaped::new(&glyphs, &[], &para, &|_| 0.0, false, false, pen);
+        crate::composer::compose_with(&glyphs, &mut measure, &|_| 0.0, &|_| 0.0, &cands, &[], &params)
+    };
+    // One paragraph's search, with room to spare.
+    let one = pen(Rc::new(Budget::default()));
+    let before = one.search.left();
+    let lines = compose(&one);
+    assert!(lines.is_some());
+    let after = one.search.left();
+    let (probes, steps) = (before.0 - after.0, before.1 - after.1);
+    assert!(probes > 0 && steps > 0, "{probes} lines tried, {steps} steps");
+    assert_eq!(one.steps_left.get(), breaking::MAX_TOTAL_STEPS, "the layout's own steps");
+    // A budget of three such searches: three paragraphs are composed, the fourth is not.
+    let three = pen(Rc::new(Budget::new(3 * probes, 3 * steps)));
+    for k in 0..3 {
+        assert_eq!(compose(&three), lines, "paragraph {k}");
+    }
+    assert_eq!(three.search.left(), (0, 0));
+    assert_eq!(compose(&three), None, "the budget ran out");
+    assert_eq!(three.search.left(), (0, 0));
+    assert_eq!(three.steps_left.get(), breaking::MAX_TOTAL_STEPS, "the layout's own steps");
+}
+
 /// The glyphs of `text`, each 10 pt wide, with Korean words kept whole unless `anywhere` (Korean
 /// Line Break Anywhere on).
 fn korean(text: &str, anywhere: bool) -> Vec<SGlyph> {
diff --git a/crates/text/src/tests/combos.rs b/crates/text/src/tests/combos.rs
index 4145c8937f..0146871265 100644
--- a/crates/text/src/tests/combos.rs
+++ b/crates/text/src/tests/combos.rs
@@ -334,14 +334,14 @@ fn composer_x_mixed_sizes() {
     assert_eq!(x.line, 0);
     assert!(l.lines[0].ascent > l.lines[1].ascent + 1.0, "{:?}", l.lines);
     // A rectangle that wraps around an object, and a frame that isn't a rectangle (a corner cut),
-    // both far below the text, break mixed sizes line by line and still break uniform sizes with
-    // the every-line composer.
+    // both far below the text, break mixed sizes and uniform sizes alike with the every-line
+    // composer.
     let below = PathData::from_bezpath(&Rect::new(0.0, 180.0, 20.0, 190.0).to_path(0.1));
-    for (x, want) in [(&wide, every), (&big, greedy)] {
+    for x in [&wide, &big] {
         let mut t = area(runs(x.clone()), Rect::new(0.0, 0.0, w, 200.0));
         t.wrap = vec![vectorcraft_doc::WrapShape { path: below.clone(), wrap: Default::default() }];
         t.para.composer = Composer::EveryLine;
-        assert_eq!(line_texts(&t, &layout(db(), &t)), want, "wrap, {}", x.size);
+        assert_eq!(line_texts(&t, &layout(db(), &t)), every, "wrap, {}", x.size);
     }
     let cut = kurbo::BezPath::from_vec(vec![
         kurbo::PathEl::MoveTo((0.0, 0.0).into()),
@@ -351,14 +351,176 @@ fn composer_x_mixed_sizes() {
         kurbo::PathEl::LineTo((0.0, 200.0).into()),
         kurbo::PathEl::ClosePath,
     ]);
-    for (x, want) in [(&wide, every), (&big, greedy)] {
+    for x in [&wide, &big] {
         let mut t = area(runs(x.clone()), Rect::ZERO);
         t.kind = TextKind::Area { frame: PathData::from_bezpath(&cut) };
         t.para.composer = Composer::EveryLine;
-        assert_eq!(line_texts(&t, &layout(db(), &t)), want, "cut corner, {}", x.size);
+        assert_eq!(line_texts(&t, &layout(db(), &t)), every, "cut corner, {}", x.size);
     }
 }
 
+/// Text with the word `X` set in `x` and the rest in 12 pt.
+fn with_x(x: CharStyle) -> Vec<TextRun> {
+    let st = sans(12.0);
+    vec![
+        run("Destroy all creatures with toughness ", st.clone()),
+        run("X", x),
+        run(" or less. Then draw a card for each creature destroyed this way.", st),
+    ]
+}
+
+/// The width the text of [`with_x`] is set in.
+fn x_width() -> f64 {
+    natural_width("Destroy all creatures with toughness X or", 12.0) + 2.0
+}
+
+#[test]
+fn composer_x_mixed_sizes_in_a_stepped_frame() {
+    // A frame as wide as the first line down to 40 pt and half as wide below. A 36 pt word makes
+    // the line it is on reach below the step, where the frame is narrow: the every-line composer
+    // breaks the paragraph with each line's measure where its height sets it, not as the
+    // single-line composer does, and every line keeps within its room.
+    let w = x_width();
+    let set = |x: CharStyle, composer: Composer| {
+        let mut t = stepped(w, w * 0.5, 40.0, 300.0);
+        t.runs = with_x(x);
+        t.para.composer = composer;
+        let l = layout(db(), &t);
+        assert!(past_their_room(&t, &l).is_empty() && !l.overflow, "{composer:?}: {:?}", l.lines);
+        (line_texts(&t, &l), l)
+    };
+    let (every, l) = set(sans(36.0), Composer::EveryLine);
+    assert_eq!(every, ["Destroy all creatures with toughness", "X or less. Then", "draw a card for each", "creature destroyed", "this way."]);
+    // The 36 pt line reaches below the step and is set at the narrow measure.
+    let tall = &l.lines[1];
+    assert!(tall.ascent > 30.0 && tall.baseline + tall.descent > 40.0 && tall.avail.1 < w * 0.5 + 0.01, "{:?}", l.lines);
+    let (greedy, _) = set(sans(36.0), Composer::SingleLine);
+    assert_ne!(every, greedy);
+    // Uniform sizes keep the breaks they had.
+    let (uniform, _) = set(sans(12.0), Composer::EveryLine);
+    assert_eq!(uniform, ["Destroy all creatures with toughness X or", "less. Then draw a card for each creature", "destroyed this way."]);
+}
+
+#[test]
+fn composer_x_mixed_sizes_around_text_wrap() {
+    // A wrap object across the middle of the frame from 40 pt down splits the lines beside it in
+    // two. The line of the 36 pt word, which starts with a 12 pt word, falls beside it, and the
+    // every-line composer measures each of the two spans across the line's whole height: no
+    // glyph runs into the object.
+    let w = x_width();
+    let object = Rect::new(w * 0.4, 40.0, w * 0.6, 70.0);
+    let set = |composer: Composer| {
+        let mut runs = with_x(sans(36.0));
+        // A no-break space keeps the 36 pt word on the line of the 12 pt word before it.
+        runs[0] = run("Destroy all creatures with toughness\u{a0}", sans(12.0));
+        let mut t = area(runs, Rect::new(0.0, 0.0, w, 300.0));
+        t.wrap = vec![vectorcraft_doc::WrapShape { path: PathData::from_bezpath(&object.to_path(0.1)), wrap: Default::default() }];
+        t.para.composer = composer;
+        let l = layout(db(), &t);
+        (line_texts(&t, &l), l, t)
+    };
+    let (every, l, t) = set(Composer::EveryLine);
+    assert_eq!(
+        every,
+        ["Destroy all creatures with", "toughness\u{a0}X", "or less. Then", "draw a card for", "each creature", "destroyed this", "way."]
+    );
+    assert!(past_their_room(&t, &l).is_empty() && !l.overflow, "{:?}", l.lines);
+    // Two spans share each baseline beside the object.
+    assert_eq!(l.lines[1].baseline, l.lines[2].baseline);
+    assert!(l.lines[1].ascent > 30.0 && l.lines[2].avail.0 > object.x1, "{:?}", l.lines);
+    let text = t.plain_text();
+    let hits = l.glyphs.iter().filter(|g| {
+        let li = &l.lines[g.line];
+        let across = li.baseline - li.ascent < object.y1 && li.baseline + li.descent > object.y0;
+        across && !text[g.byte..].starts_with(char::is_whitespace) && g.origin.x < object.x1 && g.origin.x + g.advance > object.x0
+    });
+    assert_eq!(hits.count(), 0, "{:?}", l.lines);
+    let (greedy, _, _) = set(Composer::SingleLine);
+    assert_ne!(every, greedy);
+}
+
+#[test]
+fn composer_x_mixed_sizes_in_a_frame_that_widens() {
+    // A frame as wide as "Destroy all" down to 20 pt and as wide as the first line of
+    // `composer_x_mixed_sizes_in_a_stepped_frame` below. The second line is too long for the narrow
+    // part until it takes in the 48 pt word, which sets it lower, where the frame is wide: the
+    // every-line composer tries that longer line and sets it there.
+    let w = x_width();
+    let narrow = natural_width("Destroy all", 12.0) + 2.0;
+    let set = |composer: Composer| {
+        let mut t = stepped(narrow, w, 20.0, 300.0);
+        t.runs = with_x(sans(48.0));
+        t.para.composer = composer;
+        let l = layout(db(), &t);
+        assert!(past_their_room(&t, &l).is_empty() && !l.overflow, "{composer:?}: {:?}", l.lines);
+        (line_texts(&t, &l), l)
+    };
+    let (every, l) = set(Composer::EveryLine);
+    assert_eq!(every, ["Destroy all", "creatures with toughness X or less.", "Then draw a card for each creature", "destroyed this way."]);
+    let tall = &l.lines[1];
+    assert!(tall.ascent > 40.0 && tall.baseline - tall.ascent > 20.0 && tall.avail.1 > narrow + 1.0, "{:?}", l.lines);
+    let (greedy, _) = set(Composer::SingleLine);
+    assert_eq!(greedy, ["Destroy all", "creatures", "with toughness X or less. Then draw", "a card for each creature destroyed this", "way."]);
+}
+
+#[test]
+fn composer_x_mixed_sizes_overflow_a_shaped_frame() {
+    // A stepped frame too short for the paragraph: the lines that fit are set, in order, each once
+    // and within its room, and the frame overflows.
+    let w = x_width();
+    let mut t = stepped(w, w * 0.5, 40.0, 75.0);
+    t.runs = with_x(sans(36.0));
+    t.para.composer = Composer::EveryLine;
+    let l = layout(db(), &t);
+    assert!(l.overflow && l.lines.len() >= 2, "{:?}", l.lines);
+    assert_eq!(l.lines[0].start, 0);
+    assert!(l.lines.windows(2).all(|p| p[0].end == p[1].start && p[0].start < p[0].end), "{:?}", l.lines);
+    assert!(past_their_room(&t, &l).is_empty(), "{:?}", l.lines);
+    assert!(l.lines.iter().all(|li| li.baseline + li.descent <= 75.0 + 0.01), "{:?}", l.lines);
+}
+
+#[test]
+fn composer_x_mixed_sizes_long_paragraph_in_a_shaped_frame() {
+    // A long paragraph of mixed sizes in a stepped frame is laid out whole, its lines in order and
+    // each within its room, whether the composer's search finishes or stops at its limits.
+    let w = x_width();
+    let mut t = stepped(w, w * 0.5, 40.0, 100_000.0);
+    t.runs = (0..150).flat_map(|_| with_x(sans(36.0))).collect();
+    t.para.composer = Composer::EveryLine;
+    let l = layout(db(), &t);
+    assert!(!l.overflow, "{} lines", l.lines.len());
+    assert_eq!(l.lines.last().map(|li| li.end), Some(t.plain_text().len()));
+    assert!(l.lines.windows(2).all(|p| p[0].end == p[1].start), "lines out of order");
+    assert!(past_their_room(&t, &l).is_empty());
+}
+
+/// A frame `w` wide down to `y`, and `narrow` wide below it.
+fn stepped(w: f64, narrow: f64, y: f64, bottom: f64) -> TextObject {
+    let frame = kurbo::BezPath::from_vec(vec![
+        kurbo::PathEl::MoveTo((0.0, 0.0).into()),
+        kurbo::PathEl::LineTo((w, 0.0).into()),
+        kurbo::PathEl::LineTo((w, y).into()),
+        kurbo::PathEl::LineTo((narrow, y).into()),
+        kurbo::PathEl::LineTo((narrow, bottom).into()),
+        kurbo::PathEl::LineTo((0.0, bottom).into()),
+        kurbo::PathEl::ClosePath,
+    ]);
+    let mut t = area(vec![], Rect::ZERO);
+    t.kind = TextKind::Area { frame: PathData::from_bezpath(&frame) };
+    t
+}
+
+/// The lines of `l` whose glyphs reach past either end of the room they were set in.
+fn past_their_room(t: &TextObject, l: &TextLayout) -> Vec<usize> {
+    let text = t.plain_text();
+    let past = |i: usize| {
+        let (a, b) = l.lines[i].avail;
+        let mut glyphs = l.glyphs.iter().filter(|g| g.line == i && !text[g.byte..].starts_with(char::is_whitespace));
+        glyphs.any(|g| g.origin.x < a - 0.01 || g.origin.x + g.advance > b + 0.01)
+    };
+    (0..l.lines.len()).filter(|&i| past(i)).collect()
+}
+
 #[test]
 fn composer_x_mixed_line_metrics() {
     // In a rectangle the every-line composer also breaks a paragraph whose characters differ in
diff --git a/docs/mcp.md b/docs/mcp.md
index 274db05a34..921ccdd6b1 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -9905,8 +9905,12 @@ justified text gets even word spacing, ragged text (left, centre or right aligne
 that fits to the next line to avoid a lone short word on the last line or a full line next to a short one.
 Single-line fills each line as far as it goes. Point type and type on a path have no line width, so both composers
 give the same result there. A paragraph whose characters differ in line metrics (type size, font, leading or vertical
-scale, or an inline graphic taller than the text) is composed with Every-line in rectangular area type, rows and
-columns included; in area type of another shape, or with text wrap, it falls back to Single-line.
+scale, or an inline graphic taller than the text) is composed with Every-line in area type of any shape, rows,
+columns and text wrap included. In a frame that is not a rectangle, or with text wrap, each line it tries is measured
+where the lines above it put it, across the line's own height, so a taller line that reaches where the frame is
+narrower, or beside a wrap object, gets the room there. Such a paragraph falls back to Single-line when the frame has
+no room for all of it, or when the search for its breaks passes VectorCraft's own limits (1,000,000 lines tried and
+2,000,000 baseline steps for one paragraph, 2,000,000 lines and 4,000,000 steps for all the paragraphs of a frame).
 The UI command `type.lineComposer` (Cmd+Alt+Shift+C, in remote mode `press_key {key: "C", mods: {cmd: true, alt: true,
 shift: true}}` or `invoke_menu`) sets `singleLine` when every paragraph of the selected type (or every paragraph the
 Type tool's selection touches) uses Every-line, else `everyLine`, and returns the composer it set.
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..c6681b6cba 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1225,7 +1225,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 - **Mouse wheel over the font family field (#5253):** In the Character and Properties panels and the Control bar, turning the mouse wheel over the closed font family field applies the next family to the selected type (the previous one when turned up), keeping the style when the family has it, else its closest. Each notch is one undo step; leaving the field or Escape keeps the family, and Undo takes it back. The steps use the font menu's order at the first turn and keep it until the pointer leaves the field or the text selection changes, so recent-font updates do not reshuffle later turns. That order follows the font filters every font menu shares (one chosen in the Glyphs panel's menu or a dialog's applies too) but ignores its search text, puts recent families first, and stops at the first and last family. A turn with a modifier key is left to the panel and the canvas. Behavior reference: the [Illustrator CS6 reference](https://help.adobe.com/archive/en/illustrator/cs6/illustrator_reference.pdf#page=10) describes editing hovered dropdown controls with the mouse wheel; [Find and apply fonts](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/find-and-apply-fonts.html) names the family field's places. Applying it to the font field, the order, the ends and the undo steps are VectorCraft's own rules. Tests: `crates/ui-egui/src/tests/font_menu.rs`, `crates/ui-egui/src/font_menu/tests.rs`, `crates/ui-egui/tests/font_wheel.rs`.
 - **Type:** Character size, leading, baseline shift and horizontal-scale controls account for object/group transforms (#1034): exact document-point sizes, mixed-value display and keyboard increments, range edits, resettable horizontal stretch, undo/redo and native save/reopen (`tests_typescale`, Character panel tests). Point size is the transformed em-height axis, independent of glyph ink bounds; affine rotation, reflection and shear are retained. Group scaling still scales text; preserving font sizes is a separate enhancement. Behaviour reference: [Transform text](https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/transform-text.html) (public documentation). Text Wrap, Type on a Path effects (Rainbow/Skew/3D Ribbon/Stair Step/Gravity) and Options (Flip, Align to Path, Spacing; OK keeps the type where it is), type on a path's start, centre and end brackets (Selection and Direct Selection drag them to set where the type runs, slide it along its path and, across the path, flip it: #429), Character and Paragraph Styles (override-preserving redefine), paragraph attributes per paragraph (alignment, indents, spacing, hyphenation, hanging punctuation, tab stops, paragraph style, direction, mojikumi and leading model; the Paragraph, Tabs and Paragraph Styles panels act on the paragraphs the Type tool's selection or caret touches, Return continues the paragraph's style, threads and SVG keep them), Area Type Options (rows/columns/inset/first baseline, Text Flow by rows or by columns (#4978), vertical Align Top/Center/Bottom/Justify per row/column, reflowing non-rectangular frames and text wrap), threaded text across any closed shapes, Fit Headline, the Every-line Composer for justified and ragged text (paragraph-wide breaks for an even rag, Single-line per object from the Paragraph panel menu or `text.setFormat {composer}`). Area type resizes like Illustrator's type areas: a bounding-box handle drag (Selection tool) or Area Type Options Width/Height size the frame and the text reflows at its size (threads too); Direct Selection drags a frame corner or edge (`text.reshapeArea`), and an anchor of the path of type on a path outside perspective, the type reflowing along it (`text.reshapePath`, #3980). Point type still scales. Auto Size: the frame height follows the text after every edit, in the same undo step (rectangular frames of horizontal type in one row; columns get the least height that holds them; a height set by hand or threading turns it off), and the "Auto Size New Area Type" preference gives it to new area type. Shrink Text to Fit (beyond Illustrator): overflowing area type scales its sizes, leading and baseline shifts down by the largest factor (in 0.1 pt steps of the first run, down to a minimum percentage) that fits, at layout time so every export sees it. `text.areaOptions` and `document.inspect` report overflow and the shrink factor. The Selection tool shows the type widget beside selected type's bounding box (hollow on point type, filled on area type); double-clicking it converts between them (Type › Convert To Area Type / Convert To Point Type), keeping the text and its styles in place. Variable fonts list every named instance as a style of their family (Figtree Light to Black and their italics, Bahnschrift, Segoe UI Variable), and the instance chosen is shaped, drawn, outlined and measured at its axis settings; PDF and SVG embed it as that instance. The Character panel's Variable Font sliders set each axis (see Fonts). Beyond Illustrator: inline graphics (`text.insertInline`, Type ▸ Insert Inline Symbol) set a document symbol in a run of type as one character that flows, wraps and justifies like a glyph (InDesign-style inline objects, e.g. mana symbols in card rules text): sized to a multiple of the font size, centred on the cap height, opening up tall lines, following Redefine Symbol; a character of its run's size for Character Alignment and Top-to-Top leading, placed by the bidi reordering in right-to-left text (a neutral U+FFFC); drawn on the canvas, kept as live text plus a `<use>` in SVG and as vector art in PDF; Backspace removes it whole. Hebrew and Arabic are laid out right to left with the Unicode bidirectional algorithm (embedded Latin and numbers keep their direction, lines put in visual order after wrapping) in point, area and path type, with caret, selection and arrow keys in visual order; each paragraph's direction comes from its first strong character unless Paragraph Direction sets it (Paragraph panel with Show Indic Options, `text.setFormat {direction}`), and new type aligns to the start of its direction. SVG export outlines right-to-left text. Arabic typefaces: builds made with a craft-fonts checkout that holds its Arabic families (Noto Sans Arabic, the Arabic fallback, plus Cairo, Tajawal, Almarai, IBM Plex Sans Arabic, Noto Kufi Arabic, Amiri, Alexandria, Fustat, Reem Kufi, Aref Ruqaa and Gulzar once craft-fonts adds them, storytold/craft-fonts#11; releases get them when their craft-fonts pin moves) list them in the font menus on desktop; the web build fetches them from beside the wasm (Noto Sans Arabic before start, so Arabic never shows as boxes, the rest in the background). Font Size and Leading are combo boxes in the Character and Properties panels (Font Size in the Control bar too, beside the Character link, font family and style): type, step with ↑/↓ or the spinner, scrub the label, or pick a preset (6–72 pt, shown in the type unit; Leading also Auto), each pick one undo step; Kerning and Tracking list -100…200; a size, leading, kerning or tracking the selected text doesn't share shows blank (#458). Type › Bold and Italic (beyond Illustrator, as page layout apps have them; Cmd+Shift+B / Cmd+Shift+I while the Type tool edits text) switch the selected type to its family's own Bold or Italic face and back, keeping its width (a Narrow face stays Narrow); a family without that face says so (#724). The commands that make or restyle type (and the MCP `add_text` tool) say in their result when area type does not fit its frame, and `add_text` takes Auto Size and Shrink Text to Fit (#1500, fixes #1471). Cmd+Shift+C (Align center) works on Windows and Linux too (#1940). A double-click on area type's bottom middle handle turns on Auto Size (#1940). Print and Print Preview warn about the area type and type on a path that prints without the text that doesn't fit, and give their ids. A tab stop in the Tabs panel drags from where the press landed, a stop just added included (#1487, fixes #1458). Area type in a non-rectangular shape moves a word too wide for the top lines down to the first line that holds it instead of breaking it (#1617, fixes #1615). Stylistic sets (ss01–ss20), stylistic and titling alternates, proportional and lining figures, and superscript and subscript glyphs can be turned on as OpenType features of a character style (`text.setStyle {features}`), and the OpenType panel keeps them (#1611, fixes #1607). Escape while typing ends the edit, keeps the type selected and switches back to the tool that was active before type editing began (kept while clicks move editing to other text), or to the Selection tool when there was none (#1802, #1686, #1656). Select › Same matches type on its characters' fill and stroke (#1746, #1737). `text.create`, `text.createInPath` and the MCP `add_text` tool take `justify`, so point type can be centred on or end at its point (#1752, #1748).
   The Character panel menu's Show Font Height Options shows a Set Font Height Reference dropdown under Font Size (`text.setFormat` or `text.setRangeStyle` `{fontHeightReference}`). With Em Box, the default, the font size is the size of the em square; with Cap Height, x-Height or ICF Box, the characters are set at the em size at which the font's OS/2 cap height, its x height or the height of its ideographic character face equals the font size. With a font that has no such value, or one outside 0.1 to 2 em, the size measures the em box. SVG, PDF and legacy `.ai` export and the CSS Properties rules write the em size the characters are drawn at, and DXF export writes 0.7 times that em size as each TEXT entity's height (group 40, the height of its capitals). Behavior reference: [Vary font height](https://web.archive.org/web/20251118174722/https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/vary-font-height.html).
-  The Every-line Composer composes a paragraph whose characters differ in line metrics (type size, font, leading or vertical scale, or an inline graphic taller than the text) in rectangular area type, rows and columns included. In area type of another shape, or with text wrap, such a paragraph is broken with the Single-line Composer.
+  The Every-line Composer composes a paragraph whose characters differ in line metrics (type size, font, leading or vertical scale, or an inline graphic taller than the text) in area type of any shape, rows, columns and text wrap included. In a frame that is not a rectangle, or with text wrap, each line it tries is measured where the lines above it put it, across the line's own height, so a taller line gets the room of the narrower part of the frame, or of the span beside a wrap object, that it reaches. Such a paragraph is broken with the Single-line Composer when the frame has no room for all of it or when the search passes VectorCraft's own limits. Behavior reference: [the help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/set-hyphenation-and-line-breaks.html).
   The Character panel's Small Caps, Superscript and Subscript buttons and the panel menu's items of the same names turn small caps and the superscript or subscript position on and off for the selected type, or for the text the Type tool has selected (`text.setFormat` or `text.setRangeStyle` `{smallCaps, position}`), in Document Setup's proportions. Turning Superscript on turns Subscript off, and turning Subscript on turns Superscript off. A button or item shows as on when the first selected character (at a caret, the character before it) has its attribute.
   The Character panel's Anti-aliasing Method dropdown, under Character Rotation, sets how the edges of the selected type objects are drawn as pixels (`text.setFormat {antiAlias}`), for the whole object, with each frame of a thread keeping its own method and graph labels keeping it when the graph is drawn again, on the canvas, in raster exports and when the type is rasterized. VectorCraft defines the methods: Sharp, the default, draws edges as before; None paints a pixel only where the type covers at least half of it; Crisp shows a pixel covered by a share c at `2c - 0.5`, and Strong shows it at `2c`, each kept between 0 and 1. SVG, PDF and EPS export are unchanged. Scores and hours unchanged.
   The OpenType panel's Stylistic Alternates and Titling Alternates checkboxes turn `salt` and `titl` on and off for the selected type, and its Figure menu lists Default Figure, Tabular Lining, Proportional Lining, Proportional Oldstyle and Tabular Oldstyle; Proportional Lining sets `pnum` and `lnum` and turns `tnum` and `onum` off, Tabular Lining turns `pnum` off and keeps `lnum`, Proportional Oldstyle turns `lnum` off and keeps `pnum`, and Default Figure and Tabular Oldstyle turn `pnum` and `lnum` off. Behavior reference: [Format text with OpenType features](https://helpx.adobe.com/illustrator/desktop/design-with-text/special-characters-glyphs/format-text-with-opentype-features.html) and [Use swashes, titling alternates, or stylistic alternates](https://helpx.adobe.com/illustrator/desktop/design-with-text/special-characters-glyphs/use-swashes-titling-alternates-or-stylistic-alternates.html) (public documentation). Tests: `panels::opentype::tests`.

From 2129d00868b63dde00ba97b1c49c73d7d91c3e40 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:38:04 -0800
Subject: [PATCH 09/48] Dimension tool: a point on a Smart Guide stays on the
 guide

A Linear pick that the Smart Guides left where the pointer already was,
for example straight below the first point on the vertical construction
guide through it, or exactly in line with an object's center, was taken
as not snapped. The pick then moved to the closest point of a segment
within 8 pixels while the guide still showed it on the guide. The same
happened to a point already on a grid crossing with Snap to Grid on, or
on a whole pixel with Snap to Pixel on.

The pick now keeps the snapped point whenever the snap shows guides or
grid or pixel snapping is on. With Snap to Grid or Snap to Pixel on, a
pick off an anchor is no longer moved from the grid or the whole pixel
onto a segment. A point that no
anchor, guide, grid or pixel snapping places still lands on the closest
point of a segment. An anchor within 8 pixels, a segment within the
Smart Guides snapping tolerance and a nearby guide crossing still take
the point as before.

Docs: docs/dimensions.md, docs/target-app-parity.md.
---
 crates/tools/src/dimension.rs | 52 ++++++++++++++++++++++++++++++++++-
 docs/dimensions.md            |  7 ++++-
 docs/target-app-parity.md     |  1 +
 3 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/crates/tools/src/dimension.rs b/crates/tools/src/dimension.rs
index 7a3d3de765..14f7f85881 100644
--- a/crates/tools/src/dimension.rs
+++ b/crates/tools/src/dimension.rs
@@ -242,6 +242,8 @@ impl DimensionTool {
     /// a link to its path); else where Smart Guides put it (another object's anchor or centre, in
     /// line with one, or for the second point on a construction guide through the first), its
     /// guides showing; else on the closest point of the line under the pointer; else `p` itself.
+    /// A point the guides leave where the pointer is (right on a guide line) stays there, and with
+    /// Snap to Pixel or Snap to Grid on a point stays where they place it.
     fn snap_linear(&mut self, cx: &ToolContext, p: Point) -> (Point, Option<PointRef>) {
         let leave = self.points.last().map(|(first, _)| crate::guides::Leave::segment(cx, *first, false));
         let guided = self.snap.hover(cx, p, &[], leave.as_ref());
@@ -249,7 +251,7 @@ impl DimensionTool {
             self.snap.clear();
             return (point, Some(reference));
         }
-        if guided.distance(p) > 1e-9 {
+        if guided.distance(p) > 1e-9 || !self.snap.guides().is_empty() || cx.snap_to_pixel || cx.snap_to_grid {
             return (guided, None);
         }
         // Not on an anchor or a guide: snap to the closest point of the line (#2432).
@@ -844,6 +846,54 @@ mod tests {
         }
     }
 
+    /// A point that Smart Guides leave where the pointer already is (the pointer right on a
+    /// construction guide or in line with a target) stays on the guide the overlays show. It
+    /// does not move to the nearest point of a segment within the pick's reach. Off the guides,
+    /// a point near a segment still lands on it.
+    #[test]
+    fn a_point_on_a_guide_stays_on_the_guide() {
+        let (d, _) = doc_with_rect();
+        let (s, p) = (Selection::default(), paint());
+        let c = cx(&d, &s, &p);
+        let click = |t: &mut DimensionTool, x: f64, y: f64| {
+            t.pointer(&c, &PointerEvent::new(PointerKind::Move, x, y));
+            t.pointer(&c, &PointerEvent::new(PointerKind::Down, x, y));
+            t.pointer(&c, &PointerEvent::new(PointerKind::Up, x, y));
+        };
+        let mut t = DimensionTool::default();
+        // In line with the rectangle's center, 6 units right of its right edge.
+        assert_eq!(t.snap_linear(&c, Point::new(206.0, 150.0)), (Point::new(206.0, 150.0), None));
+        assert!(!t.snap.guides().is_empty());
+        // Off the guides, beside the edge: the closest point of the edge.
+        let (on_edge, reference) = t.snap_linear(&c, Point::new(206.0, 170.5));
+        assert!(on_edge.distance(Point::new(200.0, 170.5)) < 1e-4 && reference.is_none(), "{on_edge:?}");
+        // The first point, above the rectangle, then straight down along the vertical
+        // construction guide through it, past the right edge.
+        click(&mut t, 206.0, 50.0);
+        assert_eq!(t.points, vec![(Point::new(206.0, 50.0), None)]);
+        for y in [150.0, 170.5, 190.0] {
+            assert_eq!(t.snap_linear(&c, Point::new(206.0, y)), (Point::new(206.0, y), None), "on the construction guide at y = {y}");
+            assert!(!t.snap.guides().is_empty());
+        }
+        click(&mut t, 206.0, 170.5);
+        let dim = t.pending.as_ref().expect("both points were picked");
+        assert_eq!((dim.a, dim.b), (Point::new(206.0, 50.0), Point::new(206.0, 170.5)));
+        // The second point, off the edge, is held against the rectangle's anchors.
+        let Some(DimensionSource::Points { free_b: Some(free), .. }) = &dim.source else { panic!("{:?}", dim.source) };
+        assert!(matches!(free, FreePoint::Anchors { .. }), "{free:?}");
+        // A pointer already on a gridline crossing or on a whole pixel stays there too, and one
+        // off the grid lands on the grid, not on the edge.
+        let grid = ToolContext { snap_to_grid: true, ..cx(&d, &s, &p) };
+        let step = grid.grid_step();
+        let on_grid = Point::new((200.0 / step).ceil() * step, (170.0 / step).round() * step);
+        assert!(on_grid.x > 200.0 + 1e-6 && on_grid.x - 200.0 < 8.0, "{on_grid:?} is off the edge, within the pick's reach");
+        assert_eq!(DimensionTool::default().snap_linear(&grid, on_grid), (on_grid, None));
+        let off_grid = on_grid + Vec2::new(-step * 0.3, 0.2);
+        assert_eq!(DimensionTool::default().snap_linear(&grid, off_grid), (on_grid, None));
+        let pixel = ToolContext { snap_to_pixel: true, ..cx(&d, &s, &p) };
+        assert_eq!(DimensionTool::default().snap_linear(&pixel, Point::new(206.0, 170.0)), (Point::new(206.0, 170.0), None));
+    }
+
     #[test]
     fn placement_press_previews_without_a_prior_move() {
         let (d, _) = doc_with_rect();
diff --git a/docs/dimensions.md b/docs/dimensions.md
index 6f11a29c96..9cba8a66dc 100644
--- a/docs/dimensions.md
+++ b/docs/dimensions.md
@@ -16,7 +16,12 @@ The **Dimension Tool** is in the Modify section of the toolbar. Its strip offers
   before the release; a longer drag drags out the dimension of the segment under the pointer. A
   curved segment is measured from end to end. With Smart Guides on, both points also snap into line with other objects'
   anchors and centres, and the second onto the construction guides through the first; the guides
-  show while hovering, before each click.
+  show while hovering, before each click. VectorCraft's own rules decide where a point lands: an
+  anchor within 8 pixels takes it first; a point on a guide stays on the guide where the pointer
+  is, except that it moves onto a segment within the Smart Guides snapping tolerance, or onto the
+  place where a construction guide crosses another object's alignment line within twice that
+  tolerance; a point that no anchor, guide, grid or pixel snapping places lands on the closest
+  point of a segment within 8 pixels.
   A linear dimension is aligned, horizontal or vertical, as the
   [linear dimensions help](https://helpx.adobe.com/illustrator/desktop/measure-and-align/plot-and-measure/plot-linear-dimensions-of-objects.html)
   describes: after the second click, clicking again places an aligned dimension, and moving the
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..f10ec92b24 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -583,6 +583,7 @@ since 2026-10-01.
 **Drawing tools, Star inner radius held with Ctrl/Cmd:** While a star is dragged out, Ctrl/Cmd keeps the inner radius the star showed when the key went down, also when the key is pressed with the pointer still. `a_star_drag_holds_its_inner_radius_with_ctrl_and_straightens_with_alt` and `a_star_drag_holds_the_inner_radius_it_shows_when_ctrl_goes_down` cover it, with Alt's straight shoulders and a drag canceled with Escape.
 **Drawing tools, Dimension tool horizontal and vertical linear dimensions:** A linear dimension between two clicked points or dragged out from a segment is aligned, horizontal or vertical, chosen by where the pointer moves while it is placed, and a click again by the second point gives aligned; `dimension.create` and `dimension.update` take `orientation`, and the dimension stays linked to the anchors it measures, keeps its orientation when it or the art turns, with a line that lay outside the points kept outside them; an unlinked horizontal or vertical dimension that is reflected has its line on the reflected side. `the_pointer_chooses_aligned_horizontal_or_vertical`, `two_points_measure_horizontally_vertically_or_aligned`, `clicking_again_by_the_second_point_places_an_aligned_dimension`, `a_segment_drag_measures_horizontally_vertically_or_aligned`, `points_on_a_vertical_line_measure_aligned`, `horizontal_and_vertical_dimensions_draw_lines_along_their_axis`, `turned_horizontal_dimensions_stay_horizontal`, `a_linked_horizontal_dimension_keeps_its_gap_from_turned_art`, `a_linked_horizontal_dimension_below_or_between_its_points_follows_turned_art`, `a_reflected_horizontal_dimension_keeps_its_line_on_the_reflected_side`, `a_dimension_without_an_orientation_reads_as_aligned`, `dimension_orientation_is_checked` and `a_turned_dimension_keeps_its_line_on_its_side` cover it.
 **Drawing tools, Dimension tool points that are not anchors follow the art:** A clicked point on a segment stays at its place along the segment, also when the segment curves, and a point off the art is linked to anchors (or, when the anchors lie on one line, anchors and handles) of the path, so both ends of the dimension follow when the art is moved, scaled, turned or reflected, also when the point was placed by a Smart Guide and when the dimension is saved and opened again; a linked linear dimension of reflected art (other than art on one line) has its line on the reflected side; deleting the art, changing its anchor count or whether it is closed, turning an angle's arm into a curve, or making a measured circle or arc no longer circular leaves the dimension where it was, no longer linked, instead of removing it. `a_dimension_to_a_point_on_a_segment_follows_the_art_at_both_ends`, `a_dimension_to_a_point_off_the_art_moves_with_the_art`, `a_dimension_whose_art_changes_its_anchors_stays_where_it_was`, `a_dimension_whose_art_is_opened_stays_where_it_was`, `angle_and_arc_dimensions_whose_art_no_longer_fits_stay_where_they_were`, `a_dimension_that_cannot_be_drawn_again_keeps_its_art`, `a_linked_dimension_of_reflected_art_has_its_line_on_the_reflected_side`, `a_dimension_to_a_point_off_a_line_follows_the_line`, `a_point_off_an_arch_is_reflected_with_the_arch`, `a_point_beside_an_almost_straight_curve_follows_it`, `a_point_off_a_loop_with_its_anchors_in_one_place_follows_it`, `a_point_beside_a_reflected_line_moves_as_a_half_turn_would`, `a_point_on_a_segment_stays_on_it_when_the_segment_curves`, `a_linked_dimension_of_a_reflected_curve_has_its_line_on_the_reflected_side`, `a_dimension_of_art_reflected_across_its_points_changes_sides`, `a_dimension_between_paths_reflected_each_in_its_own_way_keeps_its_offset`, `free_points_survive_a_native_file`, `dimension_free_points_are_checked`, `points_off_anchors_are_held_against_the_path` and `a_point_smart_guides_place_is_held_against_the_path` cover it.
+**Drawing tools, Dimension tool points on a Smart Guide stay on the guide:** By VectorCraft's own rule, a clicked point that lies on a Smart Guide already, such as a point straight below the first one on the vertical construction guide through it, or one in line with an object's center, stays where the pointer is when no anchor is within 8 pixels and no segment is within the Smart Guides snapping tolerance, instead of moving onto a segment farther than that tolerance and within 8 pixels; with Snap to Grid or Snap to Pixel on, a point stays on the grid or the whole pixel those options give. `a_point_on_a_guide_stays_on_the_guide` covers it.
 **Drawing tools, Dimension tool dimensions selected with their art keep their lines and label:** Object › Expand, Object › Expand Appearance and Object › Path › Outline Stroke leave a dimension selected with art it measures, directly or in selected groups without fills, strokes or effects of their own, as it is and change only the other art; when the new art no longer fits its link, the dimension stays where it was, no longer linked, and undo links it again. `expand_leaves_a_dimension_selected_with_its_art_as_it_is`, `expand_appearance_leaves_a_dimension_selected_with_its_art_as_it_is`, `outline_stroke_leaves_a_dimension_selected_with_its_art_as_it_is`, `a_dimension_selected_with_art_that_has_nothing_to_expand_changes_nothing`, `a_group_effect_expanded_reaches_the_dimension_it_holds`, `expand_keeps_a_dimension_in_its_asset_and_its_variable_binding`, `a_dimension_keeps_no_link_to_the_art_expand_replaced`, `a_dimension_outlasts_the_art_outline_stroke_or_expand_appearance_replaced`, `a_dimension_outlasts_the_stroke_expand_outlined` and `expand_appearance_in_safe_mode_leaves_a_dimension_selected_with_its_art` cover it.
 **Live trace result bounds and selection highlights exclude the retained bitmap except in source-image views:** `live_trace_result_bounds_exclude_the_retained_bitmap_at_any_angle` checks every TraceView, geometric and visual bounds and rotated result bounds. `live_trace_selection_highlight_excludes_the_retained_source_rectangle` checks result highlights and the existing ordinary-group policy. Shared editing-child traversal also preserves Shaper handling.
 **Artboard Options shares existing presets and orientation controls and can fit artwork without moving it; artwork fitting includes all drawn document art across artboards and off-board; artwork bounds are cached by active document and revision, and selection uses the shared bounds cache across artboards:** Shared existing preset definitions are reused; no external preset assets are added. Presets preserve each selected artboard's orientation, and orientation choices apply even when the active board already matches. Fit operations draft bounds until OK, affect only the active artboard and leave artwork in place. Regression coverage checks draft/Cancel, selected-set application, active-only fitting and Undo.

From 737d9bc5b8a6ddb78b6af3499c69679debc10fb0 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 02:28:11 -0800
Subject: [PATCH 10/48] PDF/.ai save: envelopes stay editable when the file is
 reopened

A PDF-compatible .ai saved with Include Editing Data for Other Apps now
writes warp, mesh and top-object envelopes as live envelope records in
its editing copy: the grid or contents, Envelope Options, Fidelity,
Edit Contents, a warp's settings and the contents' box, beside the
distorted art, in the form the .ai envelope reader reads. The file
opens with the same live envelopes.

Envelopes the reader would open in another shape or with other
settings are written as their distorted art with a warning: type in
the contents, a turned frame, an old warp map, a mesh laid out another
way round, a top object whose sides do not pair up, a Fidelity that is
not a whole number, bounds margins kept with Distort Appearance off,
envelopes in opacity masks, pattern tiles, clipped art or another
envelope's contents, on a large canvas, and after the first 256.
---
 crates/eps/src/ai_editing/tests.rs            | 446 +++++++++++++++++-
 crates/eps/src/ai_editing/writer.rs           |  62 ++-
 crates/eps/src/ai_editing/writer/envelopes.rs | 395 ++++++++++++++++
 crates/eps/src/import.rs                      |   7 +-
 crates/eps/src/import/ai.rs                   |   2 +-
 crates/eps/src/import/ai/envelope.rs          |   8 +-
 docs/target-app-parity.md                     |   1 +
 7 files changed, 892 insertions(+), 29 deletions(-)
 create mode 100644 crates/eps/src/ai_editing/writer/envelopes.rs

diff --git a/crates/eps/src/ai_editing/tests.rs b/crates/eps/src/ai_editing/tests.rs
index 8c4e95f4e6..b46b962ce4 100644
--- a/crates/eps/src/ai_editing/tests.rs
+++ b/crates/eps/src/ai_editing/tests.rs
@@ -1038,7 +1038,7 @@ fn nested_symbol_instances_stop_at_the_symbol_art_limit() {
 /// The documents [`the_writer_counts_objects_as_the_reader_reads_them`] writes: groups, compound
 /// paths, guides, sublayers, clipping groups and layers, painted clipping paths, opacity masks,
 /// gradients, pattern definitions and tiles, images, type, symbol definitions and instances,
-/// objects with art styles and objects bound to variables.
+/// objects with art styles, objects bound to variables and live envelopes.
 fn counted() -> Vec<(&'static str, Document)> {
     vec![
         ("sample", sample()),
@@ -1053,6 +1053,7 @@ fn counted() -> Vec<(&'static str, Document)> {
         ("painted clips", painted_clips()),
         ("blend", blend_doc()),
         ("brushes", brushes_document()),
+        ("envelopes", envelopes_document()),
     ]
 }
 
@@ -9055,3 +9056,446 @@ fn spread_gradients_past_the_stops_the_reader_reads_stay_gradients() {
     let Some(Paint::Gradient(swatch)) = back.swatch("Bands").map(|s| &s.paint) else { panic!("the swatch is lost") };
     assert!((200..=crate::import::MAX_GRADIENT_STOPS).contains(&swatch.gradient.stops.len()), "{} stops", swatch.gradient.stops.len());
 }
+
+/// An envelope named `Bent` of `kind` around a red rectangle (40, 20)-(100, 80) and a blue one
+/// (100, 20)-(160, 80), with Fidelity `fidelity`, Edit Contents `editing` and `options`.
+fn envelope_node(
+    doc: &mut Document,
+    kind: vectorcraft_doc::live::EnvelopeKind,
+    fidelity: f64,
+    editing: bool,
+    options: vectorcraft_doc::live::EnvelopeOptions,
+) -> Node {
+    let content = vec![
+        Arc::new(square(doc, Rect::new(40.0, 20.0, 100.0, 80.0), Color::rgb(1.0, 0.0, 0.0))),
+        Arc::new(square(doc, Rect::new(100.0, 20.0, 160.0, 80.0), Color::rgb(0.0, 0.0, 1.0))),
+    ];
+    let kind = NodeKind::Envelope { content, kind: Box::new(kind), fidelity, editing, options, frame: Box::default() };
+    named(Node::new(doc.alloc_id(), kind), "Bent")
+}
+
+/// A 200 × 100 document of envelope `kind` ([`envelope_node`]) alone.
+fn envelope_doc(
+    kind: vectorcraft_doc::live::EnvelopeKind,
+    fidelity: f64,
+    editing: bool,
+    options: vectorcraft_doc::live::EnvelopeOptions,
+) -> Document {
+    let mut doc = Document::new(200.0, 100.0);
+    let layer = doc.layers[0].id;
+    let envelope = envelope_node(&mut doc, kind, fidelity, editing, options);
+    doc.insert(Some(layer), usize::MAX, envelope).unwrap();
+    doc
+}
+
+/// A grid of `rows`×`cols` patches over (30, 10)-(170, 90), row by row from the top left, with its
+/// sixth point moved.
+fn envelope_points(rows: u32, cols: u32) -> Vec<kurbo::Point> {
+    let mut points: Vec<kurbo::Point> = (0..=rows)
+        .flat_map(|r| {
+            (0..=cols).map(move |c| kurbo::Point::new(30.0 + 140.0 * f64::from(c) / f64::from(cols), 10.0 + 80.0 * f64::from(r) / f64::from(rows)))
+        })
+        .collect();
+    points[5] += kurbo::Vec2::new(5.0, -8.0);
+    points
+}
+
+/// The envelopes written live: warps (vertical, with distortions, and twisted), meshes (with
+/// handles of their own, one handle uneven, and with the smooth ones), top objects (a curved top
+/// side, and two segments to the top and bottom sides), with Edit Contents off and on.
+fn live_envelope_kinds() -> Vec<(&'static str, vectorcraft_doc::live::EnvelopeKind)> {
+    use vectorcraft_doc::live::{EnvelopeKind, H_RIGHT, WARP_NET, smooth_handles};
+    let warp = |style: &str, bend: f64, h: f64, v: f64, horizontal: bool| EnvelopeKind::Warp {
+        style: style.into(),
+        bend,
+        h,
+        v,
+        horizontal,
+        version: WARP_NET,
+    };
+    let points = envelope_points(2, 3);
+    let mut handles = smooth_handles(2, 3, &points);
+    handles[5][H_RIGHT] += kurbo::Vec2::new(4.0, 6.0);
+    let mut curved = kurbo::BezPath::new();
+    curved.move_to((30.0, 10.0));
+    curved.curve_to((70.0, -5.0), (130.0, -5.0), (170.0, 10.0));
+    curved.line_to((170.0, 90.0));
+    curved.line_to((30.0, 90.0));
+    curved.close_path();
+    let mut six = kurbo::BezPath::new();
+    six.move_to((30.0, 10.0));
+    for p in [(100.0, 0.0), (170.0, 10.0), (170.0, 90.0), (100.0, 95.0), (30.0, 90.0)] {
+        six.line_to(p);
+    }
+    six.close_path();
+    vec![
+        ("arc", warp("arc", 50.0, -20.0, 30.0, false)),
+        ("twist", warp("twist", -35.0, 0.0, 0.0, true)),
+        ("mesh", EnvelopeKind::Mesh { rows: 2, cols: 3, points: points.clone(), handles }),
+        ("smooth mesh", EnvelopeKind::Mesh { rows: 2, cols: 3, points, handles: vec![] }),
+        ("curved top object", EnvelopeKind::TopObject { path: PathData::from_bezpath(&curved), corners: None }),
+        ("six-anchor top object", EnvelopeKind::TopObject { path: PathData::from_bezpath(&six), corners: None }),
+    ]
+}
+
+/// `doc` written and read back from its editing data: the top object on its first layer, the
+/// writer's warnings and the reader's notes.
+fn envelope_back(doc: &Document) -> (Node, Vec<String>, Vec<String>) {
+    let (p, warnings) = private_data(doc, &opts()).unwrap();
+    let (back, notes) = crate::ai_alone(&p.data).unwrap();
+    let a = back.layers[0].children().unwrap();
+    assert_eq!(a.len(), 1, "{a:#?}");
+    ((*a[0]).clone(), warnings, notes)
+}
+
+/// Does reopened envelope kind `got` have the shape of `want`: a warp's style, bend, distortions
+/// and orientation; a mesh's grid and the handles that draw (those inside the grid); the patch a top
+/// object's outline makes?
+fn same_envelope_kind(want: &vectorcraft_doc::live::EnvelopeKind, got: &vectorcraft_doc::live::EnvelopeKind) -> bool {
+    use vectorcraft_doc::live::{Coons, EnvelopeKind, H_DOWN, H_LEFT, H_RIGHT, H_UP, smooth_handles};
+    let near = |a: kurbo::Point, b: kurbo::Point| a.distance(b) < 1e-3;
+    match (want, got) {
+        (
+            EnvelopeKind::Warp { style, bend, h, v, horizontal, version },
+            EnvelopeKind::Warp { style: s, bend: b, h: dh, v: dv, horizontal: hz, version: ver },
+        ) => style == s && horizontal == hz && version == ver && [(bend, b), (h, dh), (v, dv)].iter().all(|(x, y)| (*x - *y).abs() < 1e-9),
+        (EnvelopeKind::Mesh { rows, cols, points, handles }, EnvelopeKind::Mesh { rows: r, cols: c, points: p, handles: hs }) => {
+            let own = if handles.is_empty() { smooth_handles(*rows, *cols, points) } else { handles.clone() };
+            let inside = |i: usize, slot: usize| {
+                let (row, col) = (i / (*cols as usize + 1), i % (*cols as usize + 1));
+                match slot {
+                    s if s == H_LEFT => col > 0,
+                    s if s == H_RIGHT => col < *cols as usize,
+                    s if s == H_UP => row > 0,
+                    s if s == H_DOWN => row < *rows as usize,
+                    _ => false,
+                }
+            };
+            (rows, cols) == (r, c)
+                && points.len() == p.len()
+                && points.iter().zip(p).all(|(a, b)| near(*a, *b))
+                && own.iter().zip(hs).enumerate().all(|(i, (a, b))| (0..4).all(|s| !inside(i, s) || near(a[s].to_point(), b[s].to_point())))
+        }
+        (EnvelopeKind::TopObject { path, corners }, EnvelopeKind::TopObject { path: p, corners: c }) => {
+            let (Some(a), Some(b)) = (Coons::from_top_object(path, *corners), Coons::from_top_object(p, *c)) else { return false };
+            (0..=8).all(|j| {
+                (0..=8).all(|i| a.eval(f64::from(i) / 8.0, f64::from(j) / 8.0).distance(b.eval(f64::from(i) / 8.0, f64::from(j) / 8.0)) < 1e-2)
+            })
+        }
+        _ => false,
+    }
+}
+
+/// A PDF-compatible `.ai`'s editing data keeps a warp, a mesh and a top object envelope live, with
+/// Edit Contents off and on: VectorCraft's reader opens each as the same envelope, its contents,
+/// Fidelity, Edit Contents, Envelope Options and shape as saved, and its name, the drawn art saved
+/// with it drawing as the envelope does.
+#[test]
+fn envelopes_are_read_back_live() {
+    use vectorcraft_doc::live::EnvelopeOptions;
+    for (name, kind) in live_envelope_kinds() {
+        for editing in [false, true] {
+            let doc = envelope_doc(kind.clone(), 50.0, editing, EnvelopeOptions::NEW);
+            let (back, warnings, notes) = envelope_back(&doc);
+            let what = format!("{name}, editing {editing}");
+            assert!(!warnings.iter().any(|w| w == writer::ENVELOPES), "{what}: {warnings:?}");
+            assert!(!notes.iter().any(|w| w == crate::import::ENVELOPE_DRAWN), "{what}: {notes:?}");
+            let NodeKind::Envelope { content, kind: got, fidelity, editing: e, options, frame } = &back.kind else { panic!("{what}: {back:#?}") };
+            assert_eq!((*fidelity, *e, *options, **frame), (50.0, editing, EnvelopeOptions::NEW, Affine::IDENTITY), "{what}");
+            assert!(same_envelope_kind(&kind, got), "{what}: {got:?}");
+            assert_eq!(back.name.as_deref(), Some("Bent"), "{what}");
+            let colors: Vec<Option<Color>> = content.iter().map(|c| c.appearance.fill_paint().color()).collect();
+            assert_eq!(colors, [Some(Color::rgb(1.0, 0.0, 0.0)), Some(Color::rgb(0.0, 0.0, 1.0))], "{what}");
+            // Saved again as it opened (a top object now with the corners the file gives it), it
+            // opens as the same envelope again.
+            let mut again = Document::new(200.0, 100.0);
+            let layer = again.layers[0].id;
+            again.insert(Some(layer), usize::MAX, back.clone()).unwrap();
+            let (twice, warnings, notes) = envelope_back(&again);
+            assert!(!warnings.iter().any(|w| w == writer::ENVELOPES), "{what}, saved again: {warnings:?}");
+            let NodeKind::Envelope { kind: twice, .. } = &twice.kind else { panic!("{what}, saved again: {twice:#?} {notes:?}") };
+            assert!(same_envelope_kind(&kind, twice), "{what}, saved again: {twice:?}");
+        }
+    }
+}
+
+/// An envelope that is a symbol's art is written live in the symbol's definition, and the symbol
+/// opens with it as a live envelope.
+#[test]
+fn an_envelope_in_a_symbol_is_read_back_live() {
+    use vectorcraft_doc::live::EnvelopeOptions;
+    let kinds = live_envelope_kinds();
+    for (name, kind) in kinds {
+        let mut doc = Document::new(200.0, 100.0);
+        let art = envelope_node(&mut doc, kind.clone(), 50.0, false, EnvelopeOptions::NEW);
+        doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) });
+        let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) });
+        let layer = doc.layers[0].id;
+        doc.insert(Some(layer), usize::MAX, instance).unwrap();
+        let (p, warnings) = private_data(&doc, &opts()).unwrap();
+        assert!(!warnings.iter().any(|w| w == writer::ENVELOPES), "{name}: {warnings:?}");
+        let (back, notes) = crate::ai_alone(&p.data).unwrap();
+        let symbol = back.symbols.iter().find(|s| s.name == "Bent").unwrap_or_else(|| panic!("{name}: {:?}", back.symbols));
+        let mut envelopes = vec![];
+        symbol.art.walk(&mut |n| {
+            if let NodeKind::Envelope { kind, .. } = &n.kind {
+                envelopes.push((**kind).clone());
+            }
+        });
+        assert!(matches!(envelopes.as_slice(), [k] if same_envelope_kind(&kind, k)), "{name}: {envelopes:?} {notes:?}");
+    }
+}
+
+/// An envelope with an opacity mask comes back live with its mask, and the plugin's `XP` follows
+/// the envelope's dictionary rather than its mask's art.
+#[test]
+fn an_envelope_with_an_opacity_mask_is_read_back_live() {
+    use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
+    let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] };
+    let mut doc = Document::new(200.0, 100.0);
+    let mut envelope = envelope_node(&mut doc, kind.clone(), 50.0, false, EnvelopeOptions::NEW);
+    let gray = square(&mut doc, Rect::new(40.0, 20.0, 160.0, 80.0), Color::gray(0.5));
+    let art = group(&mut doc, vec![gray], false);
+    envelope.extras_mut().mask = Some(Box::new(OpacityMask::new(art, false)));
+    let layer = doc.layers[0].id;
+    doc.insert(Some(layer), usize::MAX, envelope).unwrap();
+    let text = program(&doc);
+    let (xp, mask) = (text.find(") 1 0 0 XP").unwrap_or(0), text.find("(AI9_Mask)").unwrap_or(usize::MAX));
+    assert!(mask < xp, "{text}");
+    let (back, warnings, notes) = envelope_back(&doc);
+    assert!(!warnings.iter().any(|w| w == writer::ENVELOPES), "{warnings:?}");
+    let NodeKind::Envelope { kind: got, .. } = &back.kind else { panic!("{back:#?} {notes:?}") };
+    assert!(same_envelope_kind(&kind, got), "{got:?}");
+    assert!(back.extras().mask.is_some(), "{back:#?}");
+}
+
+/// As many envelopes are written live as the reader checks in one file, and the ones after them
+/// as their art, with a warning.
+#[test]
+fn envelopes_past_the_readers_checks_are_written_as_their_art() {
+    use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
+    let limit = crate::import::ENVELOPE_CHECKS;
+    let mut doc = Document::new(200.0, 100.0);
+    let layer = doc.layers[0].id;
+    for _ in 0..=limit {
+        let points = [(30.0, 10.0), (170.0, 0.0), (30.0, 90.0), (170.0, 90.0)].map(kurbo::Point::from).to_vec();
+        let kind = EnvelopeKind::Mesh { rows: 1, cols: 1, points, handles: vec![] };
+        let envelope = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW);
+        doc.insert(Some(layer), usize::MAX, envelope).unwrap();
+    }
+    let (p, warnings) = private_data(&doc, &opts()).unwrap();
+    assert!(warnings.iter().any(|w| w == writer::ENVELOPES), "{warnings:?}");
+    let (back, notes) = crate::ai_alone(&p.data).unwrap();
+    let a = back.layers[0].children().unwrap();
+    let live = a.iter().filter(|n| matches!(n.kind, NodeKind::Envelope { .. })).count();
+    assert_eq!((a.len(), live), (limit + 1, limit), "{notes:?}");
+    assert!(!notes.iter().any(|n| n == crate::import::ENVELOPE_DRAWN), "{notes:?}");
+}
+
+/// Every Envelope Options switch and the ends of Fidelity come back as saved.
+#[test]
+fn envelope_options_and_fidelity_are_read_back() {
+    use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions, PreserveShape};
+    let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] };
+    let new = EnvelopeOptions::NEW;
+    let all = [
+        (new, 50.0),
+        (EnvelopeOptions { anti_alias: false, ..new }, 0.0),
+        (EnvelopeOptions { preserve_shape: PreserveShape::Transparency, ..new }, 100.0),
+        (EnvelopeOptions { distort_linear_gradients: true, distort_pattern_fills: true, ..new }, 30.0),
+        (EnvelopeOptions { distort_appearance: false, ..new }, 50.0),
+    ];
+    for (options, fidelity) in all {
+        let (back, _, notes) = envelope_back(&envelope_doc(kind.clone(), fidelity, false, options));
+        let NodeKind::Envelope { options: o, fidelity: f, .. } = &back.kind else { panic!("{options:?}: {back:#?} {notes:?}") };
+        assert_eq!((*o, *f), (options, fidelity));
+    }
+}
+
+/// With Distort Appearance, an envelope whose contents map from their bounds with their strokes
+/// saves that box's size, and opens mapping from the same box.
+#[test]
+fn an_envelope_mapping_from_its_contents_strokes_is_read_back() {
+    use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions, envelope_content_boxes, envelope_stroke_margin};
+    let mut doc = Document::new(200.0, 100.0);
+    let layer = doc.layers[0].id;
+    let mut envelope = envelope_node(
+        &mut doc,
+        EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] },
+        50.0,
+        false,
+        EnvelopeOptions::NEW,
+    );
+    let NodeKind::Envelope { content, options, .. } = &mut envelope.kind else { unreachable_envelope() };
+    for c in content.iter_mut() {
+        let fill = Arc::make_mut(c).appearance.fill_paint();
+        Arc::make_mut(c).appearance = Appearance::basic(fill, solid(Color::BLACK), 8.0).into();
+    }
+    let (stroked, plain) = envelope_content_boxes(content, Affine::IDENTITY).unwrap();
+    options.bounds_margin = envelope_stroke_margin(stroked, plain).unwrap();
+    let margin = options.bounds_margin;
+    assert!(margin.iter().all(|m| *m > 0.0), "{margin:?}");
+    doc.insert(Some(layer), usize::MAX, envelope).unwrap();
+    let (back, warnings, notes) = envelope_back(&doc);
+    assert!(!warnings.iter().any(|w| w == writer::ENVELOPES), "{warnings:?}");
+    let NodeKind::Envelope { options, .. } = &back.kind else { panic!("{back:#?} {notes:?}") };
+    assert!(options.bounds_margin.iter().zip(margin).all(|(a, b)| (a - b).abs() < 1e-4), "{:?} {margin:?}", options.bounds_margin);
+}
+
+/// A test's stand-in for a node that must be an envelope.
+fn unreachable_envelope() -> ! {
+    panic!("not an envelope")
+}
+
+/// The record is written in the order the reader reads it: on `%_` lines the group holding the
+/// grid, its dictionary with the options, the contents' block and the kind, then the distorted art
+/// on plain lines and the plugin's `XP`. While the contents are edited, the group holds them and
+/// the dictionary the grid.
+#[test]
+fn an_envelope_is_written_in_the_order_the_reader_reads_it() {
+    use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
+    let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] };
+    for editing in [false, true] {
+        let text = program(&envelope_doc(kind.clone(), 50.0, editing, EnvelopeOptions::NEW));
+        let at = |s: &str| text.find(s).unwrap_or_else(|| panic!("{s} missing: {text}"));
+        let (group, mesh, dictionary, block, key, style, xp) = (
+            at("%_u\n"),
+            at("%_/Mesh X!"),
+            at("%_131073 /Int (AIDeformOptionsKey) ,\n%_50 /Int (AIDeformFidelityKey) ,\n"),
+            at("%_X=\n"),
+            at("%_ (AIDeformArtKey) ,\n"),
+            at("%_2 /Int (AIDeformStyle) ,\n%_;\n%_\n%_9 () XW\n"),
+            at("(Adobe Deform Plugin) 1 0 0 XP\n"),
+        );
+        assert!(group < dictionary && dictionary < block && block < key && key < style && style < xp, "{text}");
+        assert_eq!(block < mesh, editing, "{text}");
+        assert!(text.contains(&format!("%_{} /Bool (AIDeformEditModeKey) ,\n", u8::from(editing))), "{text}");
+        // The distorted art is one group on plain lines, named as the envelope, right before the `XP`.
+        let drawn = &text[style..xp];
+        assert!(drawn.contains("\nu\n") && drawn.contains("(Bent) ; (AI10_ArtUID) ,"), "{drawn}");
+        // The contents are on `%_` lines only: drawn once on plain lines, as the distorted art.
+        assert_eq!(text.matches("(Adobe Deform Plugin)").count(), 1, "{text}");
+    }
+}
+
+/// Envelopes the reader would open in another shape, or not at all, are written as their distorted
+/// art with a warning, and open as that art: an envelope of type, one in a turned frame, a warp drawn
+/// without its style's net, a mesh the reader would lay out the other way round, a top object
+/// whose sides don't pair up, a Fidelity that isn't a whole number and bounds margins kept with
+/// Distort Appearance off. Other live objects keep their own warning.
+#[test]
+fn envelopes_the_reader_cannot_open_live_are_written_as_their_art() {
+    use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions};
+    let base =
+        || envelope_doc(EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }, 50.0, false, EnvelopeOptions::NEW);
+    let change = |f: &dyn Fn(&mut NodeKind)| {
+        let mut doc = base();
+        let id = doc.layers[0].children().unwrap()[0].id;
+        f(&mut doc.node_mut(id).unwrap().kind);
+        doc
+    };
+    let typed = change(&|k| {
+        if let NodeKind::Envelope { content, .. } = k {
+            let t = vectorcraft_doc::TextObject::point(vectorcraft_geom::Point::new(50.0, 50.0), "Type", vectorcraft_doc::CharStyle::default());
+            content.push(Arc::new(Node::new(vectorcraft_doc::NodeId(9_000), NodeKind::Text(Box::new(t)))));
+        }
+    });
+    let turned = change(&|k| {
+        if let NodeKind::Envelope { frame, .. } = k {
+            **frame = Affine::rotate(0.3);
+        }
+    });
+    let old_warp = change(&|k| {
+        if let NodeKind::Envelope { kind, .. } = k {
+            **kind = EnvelopeKind::Warp { style: "arc".into(), bend: 50.0, h: 0.0, v: 0.0, horizontal: true, version: 0 };
+        }
+    });
+    // Columns down the page and rows across: the reader turns the grid round.
+    let sideways = change(&|k| {
+        if let NodeKind::Envelope { kind, .. } = k {
+            let points =
+                (0..=3).flat_map(|r| (0..=2).map(move |c| kurbo::Point::new(30.0 + 70.0 * f64::from(c), 10.0 + 80.0 * f64::from(r) / 3.0))).collect();
+            **kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: transpose(points, 3, 2), handles: vec![] };
+        }
+    });
+    let mut uneven = kurbo::BezPath::new();
+    uneven.move_to((30.0, 10.0));
+    for p in [(100.0, 0.0), (170.0, 10.0), (170.0, 90.0), (30.0, 90.0)] {
+        uneven.line_to(p);
+    }
+    uneven.close_path();
+    let lopsided = change(&|k| {
+        if let NodeKind::Envelope { kind, .. } = k {
+            **kind = EnvelopeKind::TopObject { path: PathData::from_bezpath(&uneven), corners: None };
+        }
+    });
+    let fractional = change(&|k| {
+        if let NodeKind::Envelope { fidelity, .. } = k {
+            *fidelity = 50.5;
+        }
+    });
+    let margin_kept = change(&|k| {
+        if let NodeKind::Envelope { options, .. } = k {
+            options.distort_appearance = false;
+            options.bounds_margin = [0.5; 4];
+        }
+    });
+    let cases = [
+        ("type", typed),
+        ("turned", turned),
+        ("old warp", old_warp),
+        ("sideways mesh", sideways),
+        ("lopsided top object", lopsided),
+        ("fractional fidelity", fractional),
+        ("margin kept", margin_kept),
+    ];
+    for (what, doc) in cases {
+        let text = program(&doc);
+        assert!(!text.contains("AIDeformOptionsKey"), "{what}: {text}");
+        let (back, warnings, _) = envelope_back(&doc);
+        assert!(warnings.iter().any(|w| w == writer::ENVELOPES), "{what}: {warnings:?}");
+        assert!(!warnings.iter().any(|w| w == writer::LIVE), "{what}: {warnings:?}");
+        assert!(matches!(back.kind, NodeKind::Group { .. }), "{what}: {back:#?}");
+    }
+    let blend = export_ai_editing(&blend_doc(), &opts()).unwrap();
+    assert!(blend.warnings.iter().any(|w| w == writer::LIVE) && !blend.warnings.iter().any(|w| w == writer::ENVELOPES), "{:?}", blend.warnings);
+}
+
+/// `points`, a grid of `rows + 1` rows of `cols + 1` points, as `cols + 1` rows of `rows + 1`.
+fn transpose(points: Vec<kurbo::Point>, rows: usize, cols: usize) -> Vec<kurbo::Point> {
+    (0..=cols).flat_map(|c| (0..=rows).map(move |r| (r, c))).map(|(r, c)| points[r * (cols + 1) + c]).collect()
+}
+
+/// An envelope with its contents in an opacity mask's art is written as its art there, and an
+/// envelope in a group stays live.
+#[test]
+fn envelopes_in_masks_are_written_as_their_art_and_in_groups_stay_live() {
+    let doc = envelopes_document();
+    let (p, warnings) = private_data(&doc, &opts()).unwrap();
+    let (back, notes) = crate::ai_alone(&p.data).unwrap();
+    assert!(warnings.iter().any(|w| w == writer::ENVELOPES), "{warnings:?}");
+    let mut live = 0;
+    back.walk(|n| live += usize::from(matches!(n.kind, NodeKind::Envelope { .. })));
+    assert_eq!(live, 3, "{notes:?}");
+}
+
+/// A warp, a mesh envelope with its contents edited, a top object in a group, and an envelope in an
+/// opacity mask's art.
+fn envelopes_document() -> Document {
+    use vectorcraft_doc::live::EnvelopeOptions;
+    let mut doc = Document::new(200.0, 100.0);
+    let layer = doc.layers[0].id;
+    let kinds = live_envelope_kinds();
+    let kind = |name: &str| kinds.iter().find(|(n, _)| *n == name).map(|(_, k)| k.clone()).unwrap();
+    let warp = envelope_node(&mut doc, kind("arc"), 50.0, false, EnvelopeOptions::NEW);
+    let mesh = envelope_node(&mut doc, kind("mesh"), 50.0, true, EnvelopeOptions::NEW);
+    let top = envelope_node(&mut doc, kind("six-anchor top object"), 50.0, false, EnvelopeOptions::NEW);
+    let top = group(&mut doc, vec![top], false);
+    let mut masked = square(&mut doc, Rect::new(0.0, 0.0, 200.0, 100.0), Color::gray(0.5));
+    let mask_art = envelope_node(&mut doc, kind("twist"), 50.0, false, EnvelopeOptions::NEW);
+    masked.extras_mut().mask = Some(Box::new(OpacityMask::new(mask_art, false)));
+    for n in [warp, mesh, top, masked] {
+        doc.insert(Some(layer), usize::MAX, n).unwrap();
+    }
+    doc
+}
diff --git a/crates/eps/src/ai_editing/writer.rs b/crates/eps/src/ai_editing/writer.rs
index c78c3e6542..cd0455f10f 100644
--- a/crates/eps/src/ai_editing/writer.rs
+++ b/crates/eps/src/ai_editing/writer.rs
@@ -16,6 +16,7 @@ use crate::ai_ops::{self, unit};
 use crate::ps;
 
 mod brushes;
+mod envelopes;
 mod images;
 mod paints;
 mod styles;
@@ -25,6 +26,8 @@ mod variables;
 
 #[cfg(test)]
 pub(super) use brushes::BRUSHES;
+#[cfg(test)]
+pub(super) use envelopes::ENVELOPES;
 pub(super) use styles::{LARGE_CANVAS_STYLES, style_links, styled_objects};
 #[cfg(test)]
 pub(super) use styles::{PANEL_EMPTY, PANEL_STYLES, STYLE_LINKS, same_appearance};
@@ -52,8 +55,7 @@ pub(super) const PATTERN_TILES: &str = "pattern fills with more tiles than a fil
 pub(super) const CLIPPING: &str = "clipping groups and clipping layers whose clipping object isn't a path, and the clipping groups inside them, are written as their art cut to that object in the editing data for other apps";
 pub(super) const CLIP_PAINT: &str = "the fills and strokes of clipping paths that a plain fill and line can't draw are written as paths of their own inside the clipping (fills under the clipped art, strokes over it) in the editing data for other apps";
 pub(super) const CLIP_PAINT_MASKS: &str = "the opacity masks of clipping paths whose fills and strokes are written as paths of their own stay on the clipping path, not on those paths, in the editing data for other apps";
-pub(super) const LIVE: &str =
-    "blends, envelopes, meshes, repeats, placed documents and intertwines are written as their art in the editing data for other apps";
+pub(super) const LIVE: &str = "blends, meshes, repeats, placed documents and intertwines are written as their art in the editing data for other apps";
 pub(super) const STROKES: &str = "strokes a plain line can't draw (inside or outside the path, variable width, dots, dashes fitted to corners, gradients, patterns, arrowheads) are written as filled outlines, and brushed strokes as their brush's art, in the editing data for other apps";
 pub(super) const ITEM_TRANSPARENCY: &str =
     "the opacity and blending modes of single fills and strokes are left out of the editing data for other apps";
@@ -262,6 +264,12 @@ pub(super) struct Writer<'a> {
     brush_set: brushes::Brushes,
     /// Brushes may be written; false on a large canvas, where they are left out.
     pub(super) brushes_live: bool,
+    /// The object just written is an envelope's distorted art, which the plugin's `XP` follows
+    /// ([`Self::envelope`]).
+    deform: bool,
+    /// How many more envelopes may be written live: as many as the reader checks in one file
+    /// ([`crate::import::ENVELOPE_CHECKS`]).
+    envelopes_left: usize,
 }
 
 impl<'a> Writer<'a> {
@@ -319,6 +327,8 @@ impl<'a> Writer<'a> {
             in_look: false,
             brush_set: brushes::Brushes::default(),
             brushes_live: true,
+            deform: false,
+            envelopes_left: crate::import::ENVELOPE_CHECKS,
             objects: 0,
             left_out: 0,
             definition_objects: 0,
@@ -694,29 +704,16 @@ impl<'a> Writer<'a> {
                 }
                 self.end_group("U", xy);
             }
-            NodeKind::Blend { .. }
-            | NodeKind::Envelope { .. }
-            | NodeKind::Mesh(_)
-            | NodeKind::Repeat(_)
-            | NodeKind::PlacedDocument(_)
-            | NodeKind::Intertwine { .. } => {
-                if !self.open_group("u") {
-                    return;
-                }
-                self.warn(LIVE);
-                if self.nest < MAX_NEST {
-                    let g = vectorcraft_effects::expand_live_deep(Some(self.doc), n);
-                    self.nest += 1;
-                    for c in g.children().map(Vec::as_slice).unwrap_or_default() {
-                        self.node(c);
-                    }
-                    self.nest -= 1;
-                }
-                self.end_group("U", xy);
+            NodeKind::Envelope { .. } if self.envelope(n, xy) => {}
+            NodeKind::Envelope { .. } => self.drawn_art(n, xy, Some(envelopes::ENVELOPES)),
+            NodeKind::Blend { .. } | NodeKind::Mesh(_) | NodeKind::Repeat(_) | NodeKind::PlacedDocument(_) | NodeKind::Intertwine { .. } => {
+                self.drawn_art(n, xy, Some(LIVE));
             }
             // Ruler guides are kept in the document's native copy only.
             NodeKind::RulerGuide { .. } => {}
         }
+        // Taken before the dictionary, whose opacity mask art may hold envelopes of its own.
+        let deform = std::mem::take(&mut self.deform);
         if self.body.len() > start {
             // 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));
@@ -726,6 +723,29 @@ impl<'a> Writer<'a> {
                 self.body.push_str(&b);
             }
         }
+        // An envelope's plugin `XP` follows its distorted art, after the art's state block.
+        if deform {
+            self.line(&envelopes::plugin_line());
+        }
+    }
+
+    /// Live object `n`, of transparency `xy`, as a group of its art, with `warning` when it is given.
+    fn drawn_art(&mut self, n: &Node, xy: Xy, warning: Option<&str>) {
+        if !self.open_group("u") {
+            return;
+        }
+        if let Some(w) = warning {
+            self.warn(w);
+        }
+        if self.nest < MAX_NEST {
+            let g = vectorcraft_effects::expand_live_deep(Some(self.doc), n);
+            self.nest += 1;
+            for c in g.children().map(Vec::as_slice).unwrap_or_default() {
+                self.node(c);
+            }
+            self.nest -= 1;
+        }
+        self.end_group("U", xy);
     }
 
     /// `n`'s `/ArtDictionary`, after it, when it has a name (`AI10_ArtUID`, see [`Self::take_id`]),
diff --git a/crates/eps/src/ai_editing/writer/envelopes.rs b/crates/eps/src/ai_editing/writer/envelopes.rs
new file mode 100644
index 0000000000..dcd7274291
--- /dev/null
+++ b/crates/eps/src/ai_editing/writer/envelopes.rs
@@ -0,0 +1,395 @@
+//! Envelopes (see [`crate::ai_editing`] for the form), written in the form VectorCraft's `.ai`
+//! reader opens as live envelopes again: on `%_` lines a group holding the grid that shapes the
+//! envelope (while its contents are edited, the contents), then that group's `/ArtDictionary` with
+//! Envelope Options as a bit word (`AIDeformOptionsKey`), Fidelity (`AIDeformFidelityKey`), Edit
+//! Contents (`AIDeformEditModeKey`), a warp's style, bend, distortions and orientation
+//! (`DeformStyle`, `DeformValue`, `DeformHoriz`, `DeformVert`, `Rotate`), with Distort Appearance
+//! the size of the box the contents map from (`AIDeformArtWidthKey`, `AIDeformArtHeightKey`), the
+//! contents in an `X=` … `X+` block (while they are edited, the grid) as `AIDeformArtKey`, and the
+//! kind (`AIDeformStyle`: 1 a warp, 2 a mesh, 3 a top object); then the distorted art on plain
+//! lines, and the plugin's `XP` after it. A top object's outline is the edge of the grid written
+//! for it, one grid edge to each segment of its sides. An envelope the reader would open in another
+//! shape is written as its distorted art.
+
+use std::fmt::Write;
+use std::sync::Arc;
+
+use kurbo::{Point, Vec2};
+use vectorcraft_doc::live::{
+    Coons, EnvelopeKind, EnvelopeOptions, GradientMesh, H_DOWN, H_LEFT, H_RIGHT, H_UP, MeshPoint, PreserveShape, WARP_NET, envelope_content_boxes,
+    envelope_grid, envelope_stroke_margin, warp_grid,
+};
+use vectorcraft_doc::{Node, NodeKind};
+use vectorcraft_geom::{Affine, PathData};
+
+use super::{MAX_NEST, Writer, Xy, hide};
+use crate::import::{DEFORM_PLUGIN, EnvelopeGridPoint as GridPoint, envelope_outline, envelope_upright, warp_number};
+use crate::ps;
+
+pub(in crate::ai_editing) const ENVELOPES: &str = "envelopes of type, envelopes without contents, envelopes in opacity masks, pattern tiles, art cut to a clipping object or other envelopes' contents, envelopes on the layers of a large canvas or in a turned or mirrored frame, warps drawn without their style's net, meshes and top objects that the data would open in another shape, envelopes with a Fidelity that isn't a whole number, envelopes that map from a box other than their contents' bounds with or without strokes or keep bounds margins with Distort Appearance off, envelopes after the first 256, and envelopes nested more than 8 deep are written as their art in the editing data for other apps";
+
+/// The most rows or columns of an envelope's grid written (Make with Mesh's own limit, and the
+/// reader's).
+const MAX_GRID: usize = 50;
+/// How far, as a share of the diagonal of a top object's patch, the patch on the outline written for
+/// it may lie from its own at any of the places checked.
+const TOP_OBJECT_TOLERANCE: f64 = 1e-6;
+/// How far apart two bounds margins may be and still count as the same.
+const MARGIN_SLACK: f32 = 1e-5;
+
+/// What an envelope's dictionary holds besides its contents: the entries before the contents' block,
+/// each on a line of its own, the kind (`AIDeformStyle`) and the grid that shapes it (`rows`, `cols`
+/// and its points with their handles, row by row from the top left, in the document), when it has
+/// one.
+struct Record {
+    keys: String,
+    style: u8,
+    grid: Option<(usize, usize, Vec<GridPoint>)>,
+}
+
+/// The `XP` that ends an envelope, after its distorted art.
+pub(super) fn plugin_line() -> String {
+    format!("{} 1 0 0 XP", ps::bytes(DEFORM_PLUGIN.as_bytes()))
+}
+
+/// Does `n`, or anything in it, hold type?
+fn holds_type(n: &Node) -> bool {
+    matches!(n.kind, NodeKind::Text(_)) || n.children().is_some_and(|c| c.iter().any(|k| holds_type(k)))
+}
+
+/// The record of envelope `n` (its parts given), or `None` where the reader would open it in
+/// another shape than it has, or not as an envelope.
+fn record(
+    n: &Node,
+    content: &[Arc<Node>],
+    kind: &EnvelopeKind,
+    fidelity: f64,
+    editing: bool,
+    options: &EnvelopeOptions,
+    frame: Affine,
+) -> Option<Record> {
+    // The reader reads Fidelity as a whole number from 0 to 100, and bounds margins only with
+    // Distort Appearance on.
+    let whole = (0.0..=100.0).contains(&fidelity) && fidelity.fract() == 0.0;
+    let margin_kept = !options.distort_appearance && options.bounds_margin != [0.0; 4];
+    if content.is_empty() || frame != Affine::IDENTITY || !whole || margin_kept || content.iter().any(|c| holds_type(c)) {
+        return None;
+    }
+    let mut keys = String::new();
+    let bit = |on: bool, at: u32| i64::from(on) << at;
+    let word = bit(options.distort_appearance, 0)
+        | bit(options.distort_pattern_fills, 1)
+        | bit(options.distort_linear_gradients, 2)
+        | bit(!options.anti_alias, 16)
+        | bit(options.preserve_shape == PreserveShape::ClippingMask, 17);
+    let _ = writeln!(keys, "{word} /Int (AIDeformOptionsKey) ,");
+    let _ = writeln!(keys, "{} /Int (AIDeformFidelityKey) ,", fidelity as i64);
+    let _ = writeln!(keys, "{} /Bool (AIDeformEditModeKey) ,", u8::from(editing));
+    let real = |keys: &mut String, v: f64, key: &str| {
+        ps::push_num_places(keys, v, 9);
+        let _ = writeln!(keys, " /Real ({key}) ,");
+    };
+    let (style, grid) = match kind {
+        EnvelopeKind::Warp { style, bend, h, v, horizontal, version } => {
+            let fraction = |p: f64| (p.is_finite() && (-100.0..=100.0).contains(&p)).then_some(p / 100.0);
+            let (number, bend, h, v) = (warp_number(style)?, fraction(*bend)?, fraction(*h)?, fraction(*v)?);
+            if *version != WARP_NET {
+                return None;
+            }
+            let _ = writeln!(keys, "{number} /Int (DeformStyle) ,");
+            real(&mut keys, h, "DeformHoriz");
+            real(&mut keys, bend, "DeformValue");
+            real(&mut keys, v, "DeformVert");
+            let _ = writeln!(keys, "{} /Bool (Rotate) ,", u8::from(!*horizontal));
+            // The grid of the warp's shape, for apps that read it.
+            (1, warp_grid(n).and_then(|m| as_read(&m)).and_then(|(rows, cols, pts)| sized(rows, cols).map(|(r, c)| (r, c, pts))))
+        }
+        EnvelopeKind::Mesh { rows, cols, points, handles } => {
+            let (r, c) = sized(*rows, *cols)?;
+            let mesh = envelope_grid(*rows, *cols, points, handles)?;
+            let pts = as_read(&mesh)?.2;
+            // The reader lays the grid out with its first row at the top and its first column at the
+            // left: a grid it would lay out another way round would map the contents another way.
+            if !reads_as_written(r, c, &pts) {
+                return None;
+            }
+            (2, Some((r, c, pts)))
+        }
+        EnvelopeKind::TopObject { path, corners } => (3, Some(top_object_grid(path, *corners)?)),
+    };
+    if options.distort_appearance {
+        let (stroked, plain) = envelope_content_boxes(content, Affine::IDENTITY)?;
+        let margin = options.bounds_margin;
+        let same = |m: [f32; 4]| m.iter().zip(margin).all(|(a, b)| (a - b).abs() <= MARGIN_SLACK);
+        // The reader maps from the size written when it matches the contents' bounds with their
+        // strokes, and from their geometric bounds otherwise.
+        let size = if margin == [0.0; 4] {
+            plain
+        } else if stroked != plain && envelope_stroke_margin(stroked, plain).is_some_and(same) {
+            stroked
+        } else {
+            return None;
+        };
+        real(&mut keys, size.height(), "AIDeformArtHeightKey");
+        real(&mut keys, size.width(), "AIDeformArtWidthKey");
+    }
+    Some(Record { keys, style, grid })
+}
+
+/// `rows` and `cols` as sizes, when the reader reads a grid of them.
+fn sized(rows: u32, cols: u32) -> Option<(usize, usize)> {
+    let (r, c) = (usize::try_from(rows).ok()?, usize::try_from(cols).ok()?);
+    ((1..=MAX_GRID).contains(&r) && (1..=MAX_GRID).contains(&c)).then_some((r, c))
+}
+
+/// The points of grid `m` with their handles as the reader reads them back: the handles that point
+/// out of the grid, which nothing draws with, are left at the point. `None` for a grid of points
+/// or handles that aren't finite.
+fn as_read(m: &GradientMesh) -> Option<(u32, u32, Vec<GridPoint>)> {
+    let (rows, cols) = (m.rows as usize, m.cols as usize);
+    let finite = |v: Vec2| v.x.is_finite() && v.y.is_finite();
+    let mut pts = Vec::with_capacity(m.points.len());
+    for (i, q) in m.points.iter().enumerate() {
+        if !finite(q.p.to_vec2()) || !q.handles.iter().all(|h| finite(*h)) {
+            return None;
+        }
+        let (r, c) = (i / (cols + 1), i % (cols + 1));
+        let mut h = q.handles;
+        for (slot, out) in [(H_LEFT, c == 0), (H_RIGHT, c == cols), (H_UP, r == 0), (H_DOWN, r == rows)] {
+            if out && let Some(h) = h.get_mut(slot) {
+                *h = Vec2::ZERO;
+            }
+        }
+        pts.push((q.p, h));
+    }
+    Some((m.rows, m.cols, pts))
+}
+
+/// Does the reader lay out grid `pts` (`rows`×`cols` patches) as it is written?
+fn reads_as_written(rows: usize, cols: usize, pts: &[GridPoint]) -> bool {
+    let points =
+        pts.iter().map(|(p, handles)| MeshPoint { p: *p, color: vectorcraft_color::Color::BLACK, opacity: 1.0, handles: *handles }).collect();
+    let mesh = GradientMesh { rows: rows as u32, cols: cols as u32, points };
+    envelope_upright(&mesh).is_some_and(|(r, c, read)| (r as usize, c as usize) == (rows, cols) && read == pts)
+}
+
+/// The grid a top object with outline `path` and corners `corners` is written with: its edge runs
+/// through the outline's anchors clockwise from the top left corner, one grid edge to a segment, so
+/// the top and bottom sides need as many segments as each other, as do the left and right sides;
+/// the points inside blend the sides. `None` where that grid's edge, read back as the top object's
+/// outline, doesn't give the same patch ([`Coons::from_top_object`]) at every place checked.
+fn top_object_grid(path: &PathData, corners: Option<[u32; 4]>) -> Option<(usize, usize, Vec<GridPoint>)> {
+    let coons = Coons::from_top_object(path, corners)?;
+    // The outline, as the patch takes it: the largest subpath.
+    let mut sp = path.subpaths.iter().filter(|s| s.anchors.len() >= 2).max_by(|a, b| a.area().abs().total_cmp(&b.area().abs()))?.clone();
+    let count = sp.anchors.len();
+    let empty = |i: usize| {
+        let c = sp.segment(i);
+        [c.p1, c.p2, c.p3].iter().all(|p| p.distance(c.p0) <= 1e-9)
+    };
+    if !sp.closed || count < 4 || (0..count).any(empty) {
+        return None;
+    }
+    let fits = |c: &[usize; 4]| {
+        c.iter().all(|i| *i < count) && {
+            let gaps = (0..4).map(|k| (c[(k + 1) % 4] + count - c[k]) % count);
+            gaps.clone().all(|g| g > 0) && gaps.sum::<usize>() == count
+        }
+    };
+    // Stored corners that fit keep the outline as drawn; otherwise it runs clockwise, and the
+    // corners are the anchors the patch's corners lie on.
+    let at = match corners.map(|c| c.map(|i| i as usize)).filter(fits) {
+        Some(c) => c,
+        None => {
+            if sp.signed_area() < 0.0 {
+                sp.reverse();
+            }
+            let find = |q: Point| sp.anchors.iter().position(|a| a.p.distance(q) <= 1e-9);
+            let [tl, tr, br, bl] = coons.corners();
+            let c = [find(tl)?, find(tr)?, find(br)?, find(bl)?];
+            if !fits(&c) {
+                return None;
+            }
+            c
+        }
+    };
+    let gap = |k: usize| (at[(k + 1) % 4] + count - at[k]) % count;
+    let (cols, rows) = (gap(0), gap(1));
+    if gap(2) != cols || gap(3) != rows || cols > MAX_GRID || rows > MAX_GRID {
+        return None;
+    }
+    let width = cols + 1;
+    let mut pts: Vec<GridPoint> = vec![(Point::ZERO, [Vec2::ZERO; 4]); (rows + 1) * width];
+    // Where the `k`th anchor from the top left corner goes, and the slots of the handles of the
+    // segment from it to the next anchor: its own, and the next anchor's back.
+    let place = |k: usize| -> (usize, usize, usize, usize) {
+        if k < cols {
+            (0, k, H_RIGHT, H_LEFT)
+        } else if k < cols + rows {
+            (k - cols, cols, H_DOWN, H_UP)
+        } else if k < 2 * cols + rows {
+            (rows, cols - (k - cols - rows), H_LEFT, H_RIGHT)
+        } else {
+            (rows - (k - 2 * cols - rows), 0, H_UP, H_DOWN)
+        }
+    };
+    for k in 0..count {
+        let i = (at[0] + k) % count;
+        let seg = sp.segment(i);
+        // A straight segment's patch spreads evenly along it, as a cubic's with its handles a third
+        // of the way does.
+        let (p1, p2) = if sp.segment_is_line(i) { (seg.p0.lerp(seg.p3, 1.0 / 3.0), seg.p0.lerp(seg.p3, 2.0 / 3.0)) } else { (seg.p1, seg.p2) };
+        let (r, c, out, into) = place(k);
+        let (nr, nc, _, _) = place((k + 1) % count);
+        if let Some(q) = pts.get_mut(r * width + c) {
+            q.0 = seg.p0;
+            q.1[out] = p1 - seg.p0;
+        }
+        if let Some(q) = pts.get_mut(nr * width + nc) {
+            q.1[into] = p2 - seg.p3;
+        }
+    }
+    // The points inside, blended from the sides.
+    let edge = |r: usize, c: usize| pts.get(r * width + c).map_or(Point::ZERO, |q| q.0).to_vec2();
+    let mut inside = vec![];
+    for r in 1..rows {
+        for c in 1..cols {
+            let (u, v) = (c as f64 / cols as f64, r as f64 / rows as f64);
+            let p = (1.0 - v) * edge(0, c) + v * edge(rows, c) + (1.0 - u) * edge(r, 0) + u * edge(r, cols)
+                - ((1.0 - u) * (1.0 - v) * edge(0, 0) + u * (1.0 - v) * edge(0, cols) + (1.0 - u) * v * edge(rows, 0) + u * v * edge(rows, cols));
+            inside.push((r * width + c, p.to_point()));
+        }
+    }
+    for (i, p) in inside {
+        if let Some(q) = pts.get_mut(i) {
+            q.0 = p;
+        }
+    }
+    if !pts.iter().all(|(p, h)| p.is_finite() && h.iter().all(|h| h.is_finite())) || !reads_as_written(rows, cols, &pts) {
+        return None;
+    }
+    // The top object the reader makes of the grid: its edge, with the corners of the grid.
+    let outline = envelope_outline(rows as u32, cols as u32, &pts)?;
+    let corners = [0, cols, cols + rows, 2 * cols + rows].map(|c| c as u32);
+    let read = Coons::from_top_object(&outline, Some(corners))?;
+    let [tl, tr, br, bl] = coons.corners();
+    let reach = tl.distance(br).max(tr.distance(bl)).max(1.0) * TOP_OBJECT_TOLERANCE;
+    const STEPS: usize = 8;
+    let at = |i: usize| i as f64 / STEPS as f64;
+    let same = (0..=STEPS).all(|j| (0..=STEPS).all(|i| coons.eval(at(i), at(j)).distance(read.eval(at(i), at(j))) <= reach));
+    same.then_some((rows, cols, pts))
+}
+
+impl Writer<'_> {
+    /// Envelope `n`, of transparency `xy`, as a live envelope (see the module's form), outside opacity
+    /// masks' art, pattern tiles, art cut to a clipping object and the layers of a large canvas. False,
+    /// writing nothing, where it is written as its art instead: where the reader would open it in
+    /// another shape, or some of it is left out for the object limit ([`Self::take_objects`]).
+    pub(super) fn envelope(&mut self, n: &Node, xy: Xy) -> bool {
+        let NodeKind::Envelope { content, kind, fidelity, editing, options, frame } = &n.kind else { return false };
+        if self.hidden > 0 || self.clip.is_some() || self.nest >= MAX_NEST || !self.symbols_live || self.envelopes_left == 0 {
+            return false;
+        }
+        let Some(record) = record(n, content, kind, *fidelity, *editing, options, **frame) else { return false };
+        let start = self.body.len();
+        let (state, gs, charges, bound) = (self.state, self.gs, self.charges(), self.bound.len());
+        self.nest += 1;
+        self.hidden += 1;
+        // The group before the dictionary: the grid, or the contents while they are edited.
+        let outer = std::mem::take(&mut self.body);
+        let opened = self.open_group("u");
+        if opened {
+            if *editing {
+                self.contents(content);
+            } else {
+                self.grid(record.grid.as_ref());
+            }
+            self.line("U");
+        }
+        let before = std::mem::replace(&mut self.body, outer);
+        hide(&before, &mut self.body);
+        self.body.push_str("%_/ArtDictionary :\n");
+        hide(&record.keys, &mut self.body);
+        self.body.push_str("%_X=\n");
+        // The dictionary's art starts unlocked, shown and opaque, as an opacity mask's does.
+        let outer = std::mem::take(&mut self.body);
+        let at_block = self.state;
+        (self.state, self.gs) = (Some((false, false)), Some(Xy::OPAQUE));
+        if *editing {
+            self.grid(record.grid.as_ref());
+        } else if self.open_group("u") {
+            self.contents(content);
+            self.end_group("U", Xy::PLAIN);
+        }
+        let block = std::mem::replace(&mut self.body, outer);
+        hide(&block, &mut self.body);
+        (self.state, self.gs, self.block_end) = (at_block, None, usize::MAX);
+        let _ = writeln!(self.body, "%_X+\n%_ (AIDeformArtKey) ,\n%_{} /Int (AIDeformStyle) ,\n%_;\n%_\n%_9 () XW", record.style);
+        self.hidden -= 1;
+        self.nest -= 1;
+        // The distorted art, which takes the envelope's lock, visibility, transparency, name and
+        // opacity mask.
+        self.state(n.locked, !n.visible);
+        self.drawn_art(n, xy, None);
+        if !opened || self.left_out_since(charges) {
+            let lines = self.body.split_off(start);
+            self.give_back(charges, &lines);
+            self.bound.truncate(bound);
+            (self.state, self.gs, self.block_end) = (state, gs, usize::MAX);
+            return false;
+        }
+        self.deform = true;
+        self.envelopes_left -= 1;
+        true
+    }
+
+    /// An envelope's contents.
+    fn contents(&mut self, content: &[Arc<Node>]) {
+        for c in content {
+            self.node(c);
+        }
+    }
+
+    /// An envelope's grid, when it has one, as a gray gradient mesh (`/Mesh X!` … `/End X!`): its
+    /// size (`[cols rows] /Size`), then each patch's place (`[col row] /P`), its four corners
+    /// (`/N`: gray, opacity, the point, the handle towards the next corner and a weight, the handle
+    /// towards the previous one and a weight, in art space), from its top left one down, across and
+    /// up, and `/E`. One object.
+    fn grid(&mut self, grid: Option<&(usize, usize, Vec<GridPoint>)>) {
+        let Some((rows, cols, pts)) = grid else { return };
+        if !self.take_objects(1) {
+            return;
+        }
+        let (rows, cols, width) = (*rows, *cols, cols + 1);
+        let to_art = self.to_art;
+        let s = &mut self.body;
+        let _ = writeln!(s, "/Mesh X!\n2 /Version X#\n/Cartesian /Type X#\n[{cols} {rows}] /Size X#\n/Data X#\n/DeviceGray /CS X#");
+        let num = |s: &mut String, v: f64| {
+            s.push(' ');
+            ps::push_num(s, v);
+        };
+        for c in 0..cols {
+            for r in 0..rows {
+                let _ = writeln!(s, "[{c} {r}] /P X#");
+                // Each corner with the slots of its handles towards the next corner and the previous one.
+                let corners = [((r, c), H_DOWN, H_RIGHT), ((r + 1, c), H_RIGHT, H_UP), ((r + 1, c + 1), H_UP, H_LEFT), ((r, c + 1), H_LEFT, H_DOWN)];
+                for ((pr, pc), next, prev) in corners {
+                    let (p, h) = pts.get(pr * width + pc).copied().unwrap_or((Point::ZERO, [Vec2::ZERO; 4]));
+                    let at = |v: Vec2| to_art * (p + v);
+                    s.push_str("[0 1");
+                    for q in [at(Vec2::ZERO), at(h[next])] {
+                        num(s, q.x);
+                        num(s, q.y);
+                    }
+                    s.push_str(" 1");
+                    let q = at(h[prev]);
+                    num(s, q.x);
+                    num(s, q.y);
+                    s.push_str(" 1] /N X#\n");
+                }
+                s.push_str("/E X#\n");
+            }
+        }
+        s.push_str("/End X!\n");
+    }
+}
diff --git a/crates/eps/src/import.rs b/crates/eps/src/import.rs
index 2cc4bed521..bdb3b9cf50 100644
--- a/crates/eps/src/import.rs
+++ b/crates/eps/src/import.rs
@@ -82,12 +82,15 @@ use graphics::{GState, Out};
 use interp::{Fault, Interp};
 use obj::PsError;
 
+#[cfg(test)]
+pub(crate) use ai::ENVELOPE_DRAWN;
 pub use ai::NameEncoding;
 #[cfg(test)]
 pub(crate) use ai::objects_read;
 pub(crate) use ai::{
-    BRUSH_MANAGER, BrushesRead, MAX_EDITING_OBJECTS, MAX_GRADIENT_STOPS, MAX_LISTED, MAX_LISTED_NAME, MAX_SYMBOLS, brush_plugin_name, brushes_kept,
-    read_art_style, read_brush_object, read_style_list, style_moves_with, symbol_art_member, warp_number,
+    BRUSH_MANAGER, BrushesRead, DEFORM_PLUGIN, EnvelopeGridPoint, MAX_CHECKED as ENVELOPE_CHECKS, MAX_EDITING_OBJECTS, MAX_GRADIENT_STOPS,
+    MAX_LISTED, MAX_LISTED_NAME, MAX_SYMBOLS, brush_plugin_name, brushes_kept, envelope_outline, envelope_upright, read_art_style, read_brush_object,
+    read_style_list, style_moves_with, symbol_art_member, warp_number,
 };
 pub(crate) use ate::{MAX_BYTES as MAX_TEXT_DOCUMENT, MAX_FRAMES, MAX_SEGMENTS, MAX_STORY, MAX_VALUES as MAX_TEXT_VALUES, record_version};
 pub use native::{AiLayers, ai_alone, ai_alone_on_page, ai_alone_with, ai_layers_alone, ai_opened_artboard, is_loss, layered_ai, layered_ai_from};
diff --git a/crates/eps/src/import/ai.rs b/crates/eps/src/import/ai.rs
index 2d6c4a533d..a3de7560e3 100644
--- a/crates/eps/src/import/ai.rs
+++ b/crates/eps/src/import/ai.rs
@@ -36,9 +36,9 @@ use crate::ps;
 
 pub(crate) use brush::{BrushesRead, MANAGER_NAME as BRUSH_MANAGER, brushes_kept, plugin_name as brush_plugin_name, read_brush_object};
 pub(crate) use envelope::DRAWN as ENVELOPE_DRAWN;
-#[cfg(test)]
 pub(crate) use envelope::MAX_CHECKED;
 pub(crate) use envelope::TYPE_DRAWN as ENVELOPE_TYPE_DRAWN;
+pub(crate) use envelope::{GridPoint as EnvelopeGridPoint, PLUGIN as DEFORM_PLUGIN, outline as envelope_outline, upright as envelope_upright};
 pub(crate) use envelope::{WARPED_TYPE_DRAWN, WarpedType};
 pub(crate) use frames::text_frames;
 pub use obj::{NameEncoding, Names};
diff --git a/crates/eps/src/import/ai/envelope.rs b/crates/eps/src/import/ai/envelope.rs
index edb9bba3e3..741ebfabdf 100644
--- a/crates/eps/src/import/ai/envelope.rs
+++ b/crates/eps/src/import/ai/envelope.rs
@@ -41,7 +41,7 @@ use super::obj::Obj;
 use crate::import::native::compare::{MAX_DIFFERENCE, MAX_SOLID_DIFFERENCE, compare_scale, differ, differ_in_colour, differ_on_black};
 
 /// The plugin that writes envelopes.
-pub(super) const PLUGIN: &str = "Adobe Deform Plugin"; // brand-ok: the plugin name the files use
+pub(crate) const PLUGIN: &str = "Adobe Deform Plugin"; // brand-ok: the plugin name the files use
 /// The note for an envelope that keeps its drawn art.
 pub(crate) const DRAWN: &str = "an envelope VectorCraft couldn't read as a live envelope comes in as its drawn art";
 /// The note for an envelope of type, which keeps its drawn art with its type hidden (unless the
@@ -366,12 +366,12 @@ fn only_mesh(n: &Node) -> Option<&GradientMesh> {
 }
 
 /// A grid point and its handles.
-type GridPoint = (Point, [Vec2; 4]);
+pub(crate) type GridPoint = (Point, [Vec2; 4]);
 
 /// The points of mesh `m` as a `rows`×`cols` grid with its first row at the top and its first
 /// column at the left (y down), as an envelope's mesh lays them out; `None` for a grid out of range
 /// or with points that aren't finite.
-fn upright(m: &GradientMesh) -> Option<(u32, u32, Vec<GridPoint>)> {
+pub(crate) fn upright(m: &GradientMesh) -> Option<(u32, u32, Vec<GridPoint>)> {
     let (mut rows, mut cols) = (m.rows, m.cols);
     if rows == 0 || cols == 0 || rows > MAX_GRID || cols > MAX_GRID {
         return None;
@@ -451,7 +451,7 @@ fn upright(m: &GradientMesh) -> Option<(u32, u32, Vec<GridPoint>)> {
 }
 
 /// The outline of an upright grid: its edge, clockwise from the top left corner.
-fn outline(rows: u32, cols: u32, pts: &[GridPoint]) -> Option<PathData> {
+pub(crate) fn outline(rows: u32, cols: u32, pts: &[GridPoint]) -> Option<PathData> {
     let at = |r: u32, c: u32| pts.get((r * (cols + 1) + c) as usize).copied();
     // Each edge: from a point by one of its handles to the next point by one of its handles.
     type Edge = ((u32, u32), usize, (u32, u32), usize);
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..3e0a981b18 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1534,6 +1534,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
     SVG import reads each `<circle>` and `<ellipse>` as the ellipse VectorCraft draws: four smooth anchors on the axes, starting at the right, with handles of the standard length, so an ellipse exported as `<ellipse>` comes back with the anchors it was written from and draws the same (`circles_and_ellipses_import_as_the_ellipse_drawn` in `crates/svg/tests/it/basic_shapes.rs`, `filled_ellipse_on_the_artboard_edge_survives_visually` in `prop_svg.rs`).
     SVG import keeps attributes in other applications' XML namespaces (`plotter:pen="2"`) on the objects and layers they belong to, as it keeps their `data-*` attributes: copies, duplicates and `.vectorcraft` files keep them, and SVG export writes them back with each namespace declared once on the root (the rest of #522; `crates/svg/tests/it/foreign_attributes.rs`, `tests/attributes.rs`).
     A PDF-compatible `.ai` saved with Include Editing Data for Other Apps defines every symbol in its editing copy with its art, registration point and place in the Symbols panel's order, and writes its instances as symbol instances, which VectorCraft's `.ai` reader opens as symbols and instances again (`symbols_and_their_instances_are_read_back` in `crates/eps/src/ai_editing/tests.rs`; [file-format-parity.md](file-format-parity.md) lists the instances written as their art).
+    A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps envelopes made with a warp, a mesh or a top object editable: its editing copy holds each envelope's contents, shape, Fidelity, Envelope Options and Edit Contents state in the form VectorCraft's `.ai` envelope reader reads, beside its distorted art, so the file opens with the same live envelope, Edit Contents still switching between the contents and the envelope ([Edit the contents of envelopes](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/edit-the-contents-of-envelopes.html)). Envelopes of type, envelopes in opacity masks, pattern tiles or another envelope's contents, and envelopes the reader would open with another shape or other settings (a Fidelity that isn't a whole number, bounds margins kept with Distort Appearance off), and envelopes after the first 256 in a file are written as their distorted art, with a warning (`envelopes_are_read_back_live` and `envelopes_the_reader_cannot_open_live_are_written_as_their_art` in `crates/eps/src/ai_editing/tests.rs`).
     A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes eligible paths, compound paths and groups with live effects with an art style when the writer supports their appearance and effects (not a filled path that uses the even-odd rule, and none on a large canvas), which VectorCraft's `.ai` reader opens as the same appearance with its effects live (`objects_with_live_effects_are_read_back` and `every_effect_setting_written_on_an_object_is_read_back` in `crates/eps/src/ai_editing/tests.rs`; [file-format-parity.md](file-format-parity.md) lists the objects written without one and the effects they lose).
     A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes point type, area type and type on a path as type in its editing copy, and objects next to it keep their own transparency (`crates/eps/src/ai_editing/tests.rs`, `cmd::fileio::tests_pdfedit::type_comes_back_from_the_editing_copy`; [file-format-parity.md](file-format-parity.md) lists what is written as outlines).
     A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps the document's variables, data sets and the bindings of objects to variables in its editing copy, in the form the variable library reader above reads, so they come back when the file is opened. Bindings to layers, to type written as outlines, to graphs and to linked images written as other objects, data set values of graphs, and variables, data sets, bindings and values past the writer's limits are left out with a warning (#6024; `crates/eps/src/ai_editing/tests.rs` `variables_data_sets_and_bindings_are_read_back`; `crates/eps/src/ai_editing/writer/variables.rs` lists what is left out).

From 728fd9ef1427feb2bb05f31028d506535f4b7e5f Mon Sep 17 00:00:00 2001
From: jmverges <juanmanuel.vergessolanas@gmail.com>
Date: Fri, 13 Nov 2026 06:02:02 +0000
Subject: [PATCH 11/48] Envelopes: a top object's side that is one split curve
 follows its parameter

A top-object envelope gives each piece of a side a share of the content
in proportion to its control polygon's length. When anchors split a
curve without changing its shape, the pieces' polygons don't divide the
side where the curve's own parameter does, so the envelope bent its
contents differently although its outline was the same: Add Anchor
Points on a top object moved the art, and a top object whose .ai mesh
saves each side's curve split into thirds drew its type up to about
half a point off its drawn art, which follows the whole curve's
parameter.

Coons::from_top_object now checks whether a side's pieces, from corner
to corner, are all pieces of one cubic. The pieces' spans of that
curve's parameter come from the handle lengths either side of each
split, the curve from the outer ends and handles, and every piece must
lie within 0.02 pt of the curve's piece over its span (each control
point). Such a side runs along that curve, by its parameter. Any other
side keeps the polygon shares, including a side only partly made of one
curve and a smooth side drawn in many pieces that isn't one curve as a
whole. Corners found from the outline can still move when anchors are
added, as before. Gradient meshes made from a path are unchanged.

Existing top-object envelopes with such sides redraw.
a_split_curve_moves_the_top_object_share_to_its_new_anchor, which
pinned the earlier behaviour, becomes a_split_curve_keeps_the_top_object_patch.

Tests: a_split_curve_keeps_the_top_object_patch,
a_top_object_joins_a_split_curve_saved_with_rounded_coordinates,
a_top_object_keeps_smoothly_joined_curves_apart,
a_top_object_side_partly_of_one_curve_keeps_the_polygon_shares and
a_top_object_side_of_many_arcs_stays_on_them (vectorcraft-doc),
envelope_top_object_keeps_its_look_when_anchors_are_added
(vectorcraft-engine) and
a_top_object_whose_top_is_one_curve_split_in_thirds_opens_live
(vectorcraft-eps).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 crates/doc/src/live.rs                 | 139 ++++++++++++++++++++++---
 crates/doc/src/live/mesh.rs            |  99 +++++++++++++++---
 crates/engine/src/cmd/live/commands.rs |   2 +-
 crates/engine/src/tests/live.rs        |  26 +++++
 crates/eps/src/import/ai/tests.rs      |  49 +++++++++
 docs/file-format-parity.md             |   3 +-
 docs/mcp.md                            |  10 +-
 docs/target-app-parity.md              |   5 +-
 8 files changed, 298 insertions(+), 35 deletions(-)

diff --git a/crates/doc/src/live.rs b/crates/doc/src/live.rs
index 39fe8cbc43..e667f2972d 100644
--- a/crates/doc/src/live.rs
+++ b/crates/doc/src/live.rs
@@ -568,23 +568,134 @@ mod tests {
         }
     }
 
+    /// The outline of a 200 × 100 box whose top side is `pieces`, end to end from (0, 0) to
+    /// (200, 0), and whose other sides are straight.
+    fn top_of_pieces(pieces: &[CubicBez]) -> PathData {
+        let pt = |p: Point| (p.x, p.y);
+        let mut knots: Vec<Knot> = vec![];
+        for (k, c) in pieces.iter().enumerate() {
+            let h_in = if k == 0 { pt(c.p0) } else { pt(pieces[k - 1].p2) };
+            knots.push((pt(c.p0), h_in, pt(c.p1)));
+        }
+        let last = pieces.last().unwrap();
+        knots.push(((200.0, 0.0), pt(last.p2), (200.0, 0.0)));
+        knots.extend([((200.0, 100.0), (200.0, 100.0), (200.0, 100.0)), ((0.0, 100.0), (0.0, 100.0), (0.0, 100.0))]);
+        outline(&knots)
+    }
+
+    /// A top curve whose parameter runs fast at its start and slow at its end.
+    const UNEVEN_TOP: CubicBez =
+        CubicBez { p0: Point::new(0.0, 0.0), p1: Point::new(120.0, -60.0), p2: Point::new(190.0, -30.0), p3: Point::new(200.0, 0.0) };
+
     #[test]
-    fn a_split_curve_moves_the_top_object_share_to_its_new_anchor() {
-        // Splitting the top curve at t = 0.3 keeps its shape but changes the polygon shares: the
-        // new anchor lands at the first piece's share, not at u = 0.3.
-        let top = CubicBez::new((0.0, 0.0), (40.0, -40.0), (160.0, -40.0), (200.0, 0.0));
-        let (a, b) = (top.subsegment(0.0..0.3), top.subsegment(0.3..1.0));
-        let path = outline(&[
-            ((0.0, 0.0), (0.0, 0.0), a.p1.into()),
-            (a.p3.into(), a.p2.into(), b.p1.into()),
-            ((200.0, 0.0), b.p2.into(), (200.0, 0.0)),
-            ((200.0, 100.0), (200.0, 100.0), (200.0, 100.0)),
-            ((0.0, 100.0), (0.0, 100.0), (0.0, 100.0)),
-        ]);
-        let c = Coons::from_top_object(&path, None).unwrap();
+    fn a_split_curve_keeps_the_top_object_patch() {
+        // Splitting the top curve at t = 0.3, or into thirds, keeps its shape, and the patch stays
+        // the unsplit curve's: the new anchors land at u = 0.3, 1/3 and 2/3 (to within how finely
+        // the side is sampled), where the pieces' control polygons would have put them several
+        // points away.
+        let whole = Coons::from_top_object(&top_of_pieces(&[UNEVEN_TOP]), None).unwrap();
+        for cuts in [vec![0.3], vec![1.0 / 3.0, 2.0 / 3.0]] {
+            let ends: Vec<f64> = std::iter::once(0.0).chain(cuts.iter().copied()).chain([1.0]).collect();
+            let pieces: Vec<CubicBez> = ends.windows(2).map(|w| UNEVEN_TOP.subsegment(w[0]..w[1])).collect();
+            let c = Coons::from_top_object(&top_of_pieces(&pieces), None).unwrap();
+            let total: f64 = pieces.iter().map(|p| polygon(*p)).sum();
+            for (k, t) in cuts.iter().enumerate() {
+                let anchor = pieces[k].p3;
+                assert!(c.eval(*t, 0.0).distance(anchor) < 0.02, "{cuts:?}: u {t} → {:?}, want {anchor:?}", c.eval(*t, 0.0));
+                let share: f64 = pieces[..=k].iter().map(|p| polygon(*p)).sum::<f64>() / total;
+                assert!(c.eval(share, 0.0).distance(anchor) > 2.0, "{cuts:?}: the polygon share {share} lands on the anchor");
+            }
+            for (u, v) in [(0.1, 0.0), (0.3, 0.2), (0.5, 0.5), (0.62, 0.0), (0.9, 0.7), (0.97, 1.0)] {
+                let (p, q) = (c.eval(u, v), whole.eval(u, v));
+                assert!(p.distance(q) < 1e-9, "{cuts:?}: ({u}, {v}) → {p:?}, unsplit {q:?}");
+            }
+        }
+    }
+
+    #[test]
+    fn a_top_object_joins_a_split_curve_saved_with_rounded_coordinates() {
+        // A file saves the pieces of a curve split into thirds, or into tenths, with its
+        // coordinates rounded to 0.001 pt, on an outline 5, 200 or 5,000 pt wide: the side is
+        // still that curve, to within 0.02 pt.
+        let round = |p: Point| Point::new((p.x * 1000.0).round() / 1000.0, (p.y * 1000.0).round() / 1000.0);
+        for cuts in [3u32, 10] {
+            let pieces: Vec<CubicBez> =
+                (0..cuts).map(|k| UNEVEN_TOP.subsegment(f64::from(k) / f64::from(cuts)..f64::from(k + 1) / f64::from(cuts))).collect();
+            for scale in [0.025, 1.0, 25.0] {
+                let mut split = top_of_pieces(&pieces);
+                split.transform(Affine::scale(scale));
+                for a in split.subpaths.iter_mut().flat_map(|sp| sp.anchors.iter_mut()) {
+                    (a.p, a.h_in, a.h_out) = (round(a.p), round(a.h_in), round(a.h_out));
+                }
+                let mut whole = top_of_pieces(&[UNEVEN_TOP]);
+                whole.transform(Affine::scale(scale));
+                let (c, whole) = (Coons::from_top_object(&split, None).unwrap(), Coons::from_top_object(&whole, None).unwrap());
+                for (u, v) in [(1.0 / 6.0, 0.0), (1.0 / 3.0, 0.0), (0.45, 0.0), (0.5, 0.5), (2.0 / 3.0, 0.0), (0.9, 0.3)] {
+                    let (p, q) = (c.eval(u, v), whole.eval(u, v));
+                    assert!(p.distance(q) < 0.02, "{cuts} pieces at {scale}x: ({u}, {v}) → {p:?}, unsplit {q:?}");
+                }
+            }
+        }
+    }
+
+    #[test]
+    fn a_top_object_keeps_smoothly_joined_curves_apart() {
+        // The top side's second piece leaves the split anchor in line with the first piece's
+        // handle, but its far handle is 1 pt off the split curve's: the pieces are two curves, and
+        // each takes the share of its control polygon.
+        let (a, b) = (UNEVEN_TOP.subsegment(0.0..0.3), UNEVEN_TOP.subsegment(0.3..1.0));
+        let b = CubicBez::new(b.p0, b.p1, b.p2 + Vec2::new(0.0, 1.0), b.p3);
+        let c = Coons::from_top_object(&top_of_pieces(&[a, b]), None).unwrap();
         let share = polygon(a) / (polygon(a) + polygon(b));
         assert!(c.eval(share, 0.0).distance(a.p3) < 1e-9, "{:?}", c.eval(share, 0.0));
-        assert!((share - 0.3).abs() > 0.01, "{share}");
+        assert!((share - 0.3).abs() > 0.02, "{share}");
+    }
+
+    #[test]
+    fn a_top_object_side_partly_of_one_curve_keeps_the_polygon_shares() {
+        // The top side is a curve split at t = 0.3, then a straight segment: not all of it is one
+        // curve, so each piece keeps the share of its control polygon.
+        let curve = CubicBez::new((0.0, 0.0), (90.0, -45.0), (142.5, -22.5), (150.0, 0.0));
+        let (a, b) = (curve.subsegment(0.0..0.3), curve.subsegment(0.3..1.0));
+        let line = CubicBez::new((150.0, 0.0), (150.0 + 50.0 / 3.0, 0.0), (200.0 - 50.0 / 3.0, 0.0), (200.0, 0.0));
+        let c = Coons::from_top_object(&top_of_pieces(&[a, b, line]), None).unwrap();
+        let share = polygon(a) / (polygon(a) + polygon(b) + polygon(line));
+        assert!(c.eval(share, 0.0).distance(a.p3) < 1e-9, "{:?}", c.eval(share, 0.0));
+        // Joined into their curve, the two pieces would have put the anchor 0.3 of the way along
+        // their part of the side.
+        let joined = 0.3 * (polygon(a) + polygon(b)) / (polygon(a) + polygon(b) + polygon(line));
+        assert!(c.eval(joined, 0.0).distance(a.p3) > 1.0, "{share} vs {joined}");
+    }
+
+    #[test]
+    fn a_top_object_side_of_many_arcs_stays_on_them() {
+        // A 120° arc of radius 500 drawn as `n` circular arcs, each close to a piece of one cubic
+        // while the whole arc is not one: the side stays on the circle, and the content's middle
+        // stays on the middle anchor, as the arcs' polygon shares put it.
+        let centre = Point::new(300.0, 600.0);
+        for n in [64u32, 128, 256] {
+            let step = 120f64.to_radians() / f64::from(n);
+            let reach = 500.0 * 4.0 / 3.0 * (step / 4.0).tan();
+            let on = |a: f64| centre + Vec2::new(a.cos(), a.sin()) * 500.0;
+            let tangent = |a: f64| Vec2::new(-a.sin(), a.cos()) * reach;
+            let mut anchors: Vec<Anchor> = (0..=n)
+                .map(|i| {
+                    let a = (-150f64).to_radians() + step * f64::from(i);
+                    let p = on(a);
+                    let h_in = if i == 0 { p } else { p - tangent(a) };
+                    let h_out = if i == n { p } else { p + tangent(a) };
+                    Anchor { p, h_in, h_out, ..Anchor::corner(p) }
+                })
+                .collect();
+            let (start, end) = (on((-150f64).to_radians()), on((-30f64).to_radians()));
+            anchors.extend([Anchor::corner(Point::new(end.x, 800.0)), Anchor::corner(Point::new(start.x, 800.0))]);
+            let path = PathData::single(SubPath::new(anchors, true));
+            let c = Coons::from_top_object(&path, Some([0, n, n + 1, n + 2])).unwrap();
+            let off = (0..=4000).map(|k| (c.eval(f64::from(k) / 4000.0, 0.0).distance(centre) - 500.0).abs()).fold(0.0, f64::max);
+            assert!(off < 0.001, "{n} arcs: the side lies {off} pt off the circle");
+            let mid = c.eval(0.5, 0.0);
+            assert!(mid.distance(Point::new(300.0, 100.0)) < 0.001, "{n} arcs: the middle lands at {mid:?}");
+        }
     }
 
     #[test]
diff --git a/crates/doc/src/live/mesh.rs b/crates/doc/src/live/mesh.rs
index d912479464..5e90a56462 100644
--- a/crates/doc/src/live/mesh.rs
+++ b/crates/doc/src/live/mesh.rs
@@ -147,14 +147,18 @@ impl Coons {
     /// The patch of a top object's outline (the largest subpath of `path`), split into four sides
     /// at its corners. Each piece of a side between two anchors or corners takes a share of `u` or
     /// `v` in proportion to the length of its control polygon, spread along the piece by its own
-    /// curve parameter. A segment without handles counts as a cubic with its handles a third of
-    /// the way along, so the content spreads evenly along it. `corners` are the anchors (indices
-    /// into the outline, in its own order) at the top left, top right, bottom right and bottom
-    /// left, as a saved file gives them. They stay on those anchors when they run the way the
-    /// outline does or the opposite way, so a reflected outline keeps them; without them, or when
-    /// they don't fit the outline, each corner is found from the outline ([`top_object_corner`]).
-    /// A straight segment closes an open subpath, and segments of no length are left out. A top
-    /// object's envelope maps onto this patch.
+    /// curve parameter. A side whose pieces, from corner to corner, are all one cubic curve split at
+    /// anchors (each within 0.02 pt of that curve's piece) runs along that curve instead, by its
+    /// parameter: splitting the curve of such a side at more anchors, without changing its shape,
+    /// leaves how the side shares out the content as it was (corners found from the outline can
+    /// still move). A segment without handles counts as a cubic with its handles a third of the way
+    /// along, so the content spreads evenly along it. `corners` are the anchors (indices into the
+    /// outline, in its own order) at the top left, top right, bottom right and bottom left, as a
+    /// saved file gives them. They stay on those anchors when they run the way the outline does or
+    /// the opposite way, so a reflected outline keeps them; without them, or when they don't fit
+    /// the outline, each corner is found from the outline ([`top_object_corner`]). A straight
+    /// segment closes an open subpath, and segments of no length are left out. A top object's
+    /// envelope maps onto this patch.
     pub fn from_top_object(path: &PathData, corners: Option<[u32; 4]>) -> Option<Self> {
         let sp = path.subpaths.iter().filter(|s| s.anchors.len() >= 2).max_by(|a, b| a.area().abs().total_cmp(&b.area().abs()))?;
         let mut sp = sp.clone();
@@ -212,11 +216,12 @@ impl Coons {
             segs.get(i).map_or(Point::ZERO, |(c, _)| c.eval((s - i as f64).clamp(0.0, 1.0)))
         };
         // The side from `a` to `b`: its points, and where along it (0 to 1) each lies. It runs
-        // through pieces of segments, split at `a` and `b`. Each piece takes its share of the side
-        // by the length of its control polygon and holds points at even steps of its parameter
-        // (at least 16, and at least `SIDE` points on the side), its ends included. A side of
-        // many pieces takes fewer points in each, so it holds at most `MAX_SIDE_POINTS` points,
-        // or one for each piece when it has more pieces than that.
+        // through pieces of segments, split at `a` and `b`; when all of them are one curve split
+        // at anchors ([`one_curve`]), it runs along that curve instead. Each piece takes its share
+        // of the side by the length of its control polygon and holds points at even steps of its
+        // parameter (at least 16, and at least `SIDE` points on the side), its ends included. A
+        // side of many pieces takes fewer points in each, so it holds at most `MAX_SIDE_POINTS`
+        // points, or one for each piece when it has more pieces than that.
         let side = |a: f64, b: f64| {
             let span = (b - a).rem_euclid(n);
             if !(span.is_finite() && span > 0.0) {
@@ -232,8 +237,11 @@ impl Coons {
                 }
                 s = next;
             }
-            let polygon = |c: &CubicBez| c.p0.distance(c.p1) + c.p1.distance(c.p2) + c.p2.distance(c.p3);
-            let mut weights: Vec<f64> = pieces.iter().map(polygon).collect();
+            let pieces = match one_curve(&pieces) {
+                Some(one) => vec![one],
+                None => pieces,
+            };
+            let mut weights: Vec<f64> = pieces.iter().map(control_polygon).collect();
             let mut total: f64 = weights.iter().sum();
             if !(total.is_finite() && total > 0.0) {
                 weights.iter_mut().for_each(|w| *w = 1.0);
@@ -336,6 +344,67 @@ impl Coons {
 /// anchors.
 const MAX_SIDE_POINTS: usize = 1 << 16;
 
+/// How far, in points, each control point of each piece of a top object's side may lie from the
+/// matching piece of one cubic curve for the side to run along that curve ([`one_curve`]); the side
+/// then lies within this of the pieces it is drawn with. A curve split into thirds or tenths and
+/// saved with its coordinates rounded to 0.001 pt stays within it, on outlines from 5 to 5,000 pt
+/// wide; coarser rounding, or a piece of a much smaller share of the curve, can take it past this.
+/// A smooth side that isn't one curve, such as an arc of a circle drawn in many pieces, lies
+/// further off as a whole, even where each pair of its pieces would not.
+const ONE_CURVE: f64 = 0.02;
+
+/// The length of `c`'s control polygon.
+fn control_polygon(c: &CubicBez) -> f64 {
+    c.p0.distance(c.p1) + c.p1.distance(c.p2) + c.p2.distance(c.p3)
+}
+
+/// The cubic curve that `pieces`, two or more end to end, are all pieces of, split at the anchors
+/// between them, when each control point of each piece lies within [`ONE_CURVE`] of the matching
+/// piece of that curve; `None` otherwise. Split at parameter `t`, a curve's handles on either side
+/// of the split lie in line, their lengths in proportion to the spans of its parameter the two
+/// pieces take. Those proportions give each piece's span, and the curve follows from the first
+/// piece's start and its handle, and the last piece's end and its handle, scaled up by their spans.
+/// Every piece is then checked against that curve's piece over its span, so error can't build up
+/// from one split to the next (the first piece's start and handle, and the last piece's end and
+/// handle, match by construction).
+fn one_curve(pieces: &[CubicBez]) -> Option<CubicBez> {
+    let (first, last) = (pieces.first()?, pieces.last()?);
+    if pieces.len() < 2 {
+        return None;
+    }
+    let mut spans = Vec::with_capacity(pieces.len());
+    spans.push(1.0);
+    for pair in pieces.windows(2) {
+        let [a, b] = pair else { return None };
+        let (into, out) = (a.p3.distance(a.p2), b.p0.distance(b.p1));
+        let next = spans.last().copied().unwrap_or(1.0) * out / into;
+        if !(into > 0.0 && out > 0.0 && next.is_finite() && next > 0.0) {
+            return None;
+        }
+        spans.push(next);
+    }
+    let total: f64 = spans.iter().sum();
+    let (head, tail) = (spans.first().copied().unwrap_or(1.0) / total, spans.last().copied().unwrap_or(1.0) / total);
+    if !(total.is_finite() && head > 0.0 && tail > 0.0) {
+        return None;
+    }
+    let one = CubicBez::new(first.p0, first.p0 + (first.p1 - first.p0) / head, last.p3 + (last.p2 - last.p3) / tail, last.p3);
+    if ![one.p1, one.p2].iter().all(|p| p.is_finite()) {
+        return None;
+    }
+    let near = |p: Point, q: Point| p.distance(q) <= ONE_CURVE;
+    let mut from = 0.0;
+    for (k, (piece, span)) in pieces.iter().zip(&spans).enumerate() {
+        let to = if k + 1 == pieces.len() { 1.0 } else { (from + span / total).min(1.0) };
+        let part = one.subsegment(from..to);
+        if !(near(part.p0, piece.p0) && near(part.p1, piece.p1) && near(part.p2, piece.p2) && near(part.p3, piece.p3)) {
+            return None;
+        }
+        from = to;
+    }
+    Some(one)
+}
+
 /// How far into the outline's bounding box, as a share of its width and of its height, a corner
 /// of a top object looks for an anchor.
 const CORNER_REACH: f64 = 0.475;
diff --git a/crates/engine/src/cmd/live/commands.rs b/crates/engine/src/cmd/live/commands.rs
index 8a92d759f9..692ce9e563 100644
--- a/crates/engine/src/cmd/live/commands.rs
+++ b/crates/engine/src/cmd/live/commands.rs
@@ -172,7 +172,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Make with Top Object",
             ["Object", "Envelope Distort"],
             Some("Cmd+Alt+C"),
-            "{ids?} the topmost selected path becomes the envelope of the others: its outline splits into four sides at its corners, and each piece of a side takes a share of the content in proportion to its control polygon's length (type maps from its glyph outline bounds) → {id}",
+            "{ids?} the topmost selected path becomes the envelope of the others: its outline splits into four sides at its corners, and each piece of a side takes a share of the content in proportion to its control polygon's length, and a side whose pieces are all one curve split at anchors follows that curve's parameter (type maps from its glyph outline bounds) → {id}",
             has_multi,
             env_make_top
         ),
diff --git a/crates/engine/src/tests/live.rs b/crates/engine/src/tests/live.rs
index 10939d4b2a..c372bcf784 100644
--- a/crates/engine/src/tests/live.rs
+++ b/crates/engine/src/tests/live.rs
@@ -643,6 +643,32 @@ fn envelope_top_object_shares_a_side_by_control_polygon_length() {
     assert!(near(Point::new(500.0, 200.0)) < 0.5, "the middle of the bottom: {pts:?}");
 }
 
+#[test]
+fn envelope_top_object_keeps_its_look_when_anchors_are_added() {
+    // Add Anchor Points splits each segment of the top object in two without changing its shape.
+    // The top curve's parameter runs fast at its start, so its halves have control polygons of
+    // different lengths; the envelope still bends the two rectangles as the unsplit curve does.
+    let made = |add_anchors: bool| {
+        let mut s = session();
+        let left = rect(&mut s, 100.0, 100.0, 100.0, 100.0);
+        let right = rect(&mut s, 200.0, 100.0, 100.0, 100.0);
+        let d = "M400 100 C520 40 590 70 600 100 L600 200 L400 200 Z";
+        let t = id_of(&s.execute("path.create", &json!({ "d": d })).unwrap());
+        if add_anchors {
+            sel(&mut s, &[t]);
+            s.execute("object.path.addAnchorPoints", &json!({})).unwrap();
+            assert_eq!(node(&s, t).path_data().map(|p| p.anchor_count()), Some(8));
+        }
+        sel(&mut s, &[left, right, t]);
+        let e = id_of(&s.execute("object.envelope.makeWithTopObject", &json!({})).unwrap());
+        all_anchors(&live::expand_live(&node(&s, e)))
+    };
+    let (plain, split) = (made(false), made(true));
+    assert_eq!(plain.len(), split.len());
+    let off = plain.iter().zip(&split).map(|(p, q)| p.distance(*q)).fold(0.0, f64::max);
+    assert!(off < 1e-6, "the art moves by up to {off} pt");
+}
+
 #[test]
 fn envelope_release_and_expand() {
     let mut s = session();
diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs
index 3c0ac39a05..9b86f38350 100644
--- a/crates/eps/src/import/ai/tests.rs
+++ b/crates/eps/src/import/ai/tests.rs
@@ -7730,6 +7730,55 @@ fn a_top_object_envelope_opens_live_with_its_outline() {
     assert!(r.warnings.is_empty(), "{:?}", r.warnings);
 }
 
+/// A top object whose saved grid has three patches across, its top edge one curve split into
+/// thirds, maps its contents along that one curve. In this synthetic file the drawn art is drawn by
+/// VectorCraft's own map of the unsplit curve, so the envelope opens live only when the split side
+/// maps the same way, and the contents' first quarter ends a quarter of the way along the curve.
+#[test]
+fn a_top_object_whose_top_is_one_curve_split_in_thirds_opens_live() {
+    use kurbo::{CubicBez, ParamCurve};
+    use vectorcraft_doc::live::EnvelopeKind;
+    // In the document: the top runs from (40, 20) to (160, 20), its parameter fast at the start.
+    let top = CubicBez::new((40.0, 20.0), (112.0, -16.0), (154.0, 2.0), (160.0, 20.0));
+    let thirds = [top.subsegment(0.0..1.0 / 3.0), top.subsegment(1.0 / 3.0..2.0 / 3.0), top.subsegment(2.0 / 3.0..1.0)];
+    // Art space has y up: row 1 is the top. The bottom row and the columns are straight.
+    let up = |p: Point| (p.x, 100.0 - p.y);
+    let at = move |(i, j): (usize, usize)| {
+        if j == 1 { up(if i == 0 { top.p0 } else { thirds[i - 1].p3 }) } else { (40.0 + 40.0 * i as f64, 20.0) }
+    };
+    let handle = move |p: (usize, usize), q: (usize, usize)| match (p, q) {
+        ((i, 1), (k, 1)) if k == i + 1 => up(thirds[i].p1),
+        ((i, 1), (k, 1)) if k + 1 == i => up(thirds[k].p2),
+        _ => {
+            let ((x, y), (u, v)) = (at(p), at(q));
+            (x + (u - x) / 3.0, y + (v - y) / 3.0)
+        }
+    };
+    let shape = mesh_text(3, 1, &at, &handle, None);
+    // The contents: two red bars at the box's left and right ends, drawn by the unsplit curve.
+    let mut bp = kurbo::BezPath::new();
+    bp.move_to(top.p0);
+    bp.curve_to(top.p1, top.p2, top.p3);
+    bp.line_to((160.0, 80.0));
+    bp.line_to((40.0, 80.0));
+    bp.close_path();
+    let one_curve = EnvelopeKind::TopObject { path: vectorcraft_geom::PathData::from_bezpath(&bp), corners: Some([0, 1, 2, 3]) };
+    let src = Rect::new(40.0, 20.0, 160.0, 80.0);
+    let bars = [Rect::new(40.0, 20.0, 70.0, 80.0), Rect::new(130.0, 20.0, 160.0, 80.0)];
+    let content: String = bars.iter().map(|b| format!("{RED}{}f\n", rect_path(b.x0, b.y0, b.x1, b.y1))).collect();
+    let drawn: String = bars.iter().map(|b| drawn_box(&one_curve, src, *b)).collect();
+    let r = read_ok(&layer(&envelope_of(&shape, ENVELOPE_KEYS, &content, 3, &drawn)));
+    assert!(r.warnings.is_empty(), "{:?}", r.warnings);
+    let a = art(&r.doc);
+    assert_eq!(a.len(), 1, "{a:#?}");
+    let (_, kind, ..) = live_envelope(&a[0]);
+    let EnvelopeKind::TopObject { path, .. } = kind else { panic!("{kind:?}") };
+    assert_eq!(path.anchor_count(), 8, "{path:?}");
+    let map = vectorcraft_doc::live::envelope_mapper(kind, src);
+    let (p, want) = (map(Point::new(70.0, 20.0)), top.eval(0.25));
+    assert!((p - want).hypot() < 0.02, "{p:?}, want {want:?}");
+}
+
 /// Envelope Options come from the options word, Fidelity from its own key.
 #[test]
 fn an_envelope_reads_its_options_and_fidelity() {
diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md
index 0ee82f2cbf..f752a8973b 100644
--- a/docs/file-format-parity.md
+++ b/docs/file-format-parity.md
@@ -1,6 +1,6 @@
 # File format parity
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (`.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x)
 >
 > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865).
 
@@ -324,6 +324,7 @@ Stop opacity on translated artboards remains outside this regression coverage.
 | Date | Change | Summary |
 |---|---|---|
 | 2026-11-13 | minor | PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke instead of being left out, adding no text (#6971; `empty_actual_text_keeps_the_glyphs_art` in `crates/pdf/src/tests/actual_text.rs`). Scores and estimates unchanged. |
+| 2026-11-13 | minor | `.ai` and EPS import, and what the canvas, every export and `.ai` save draw: a top-object envelope's mesh can save a side's curve in pieces. In users' files (used locally, never committed), 10 top objects save a grid of three patches across whose top and bottom edges are each one cubic split into thirds, and their drawn art follows the whole curve's parameter. VectorCraft gave each piece the share of its control polygon, so their type came out up to about half a point off the drawn art along the side, and one envelope of type kept its drawn art instead of opening live. A side whose pieces are all one curve split at anchors (each within 0.02 pt of that curve's piece) now follows that curve's parameter (#7097). Synthetic test: `a_top_object_whose_top_is_one_curve_split_in_thirds_opens_live`. Scores unchanged. |
 | 2026-11-12 | minor | `.ai` and EPS import (#6983): type from the text document is set in an installed face of the PostScript name its font record gives, one of exactly that name first. That face's family is no longer swapped for another family spelled alike but for case and punctuation (`FontDb::find_family`, which picked `SAMPLE INK` for `SampleInk`, the PostScript name of `Sample/Ink`); among the faces `FontDb::postscript_faces` lists for the name, the import takes one whose name matches in case and punctuation before one that matches only without them; and when the family and style alone resolve to another installed copy, the type names the face's version. A font record's key 5, the version string (name ID 5), picks that version among the faces of its PostScript name, also when the record spells the name with other punctuation (`Sample-Slab` for faces named `SampleSlab`); each record is resolved once. Type a PostScript program sets and legacy `.ai` type take the face of their font's name the same way. The `.ai` save writes a static font's version (`/5`) when its PostScript name alone would give the reader another installed copy (another version, or the same name in another family), so two such copies are two fonts of the set, and checks that the type comes back in the same family, style and face, taking the record's version as the reader does (up to 256 bytes): such type round-trips without the type attributes note, and so does a version that isn't installed, which draws in the face the font resolves to anyway. In 224 users' files (used locally, never committed; all PDF-compatible, so the PostScript and legacy paths are not exercised), 16 files set some type in another installed face; 12 render differently against their own page, 10 closer (in one from 2.55% to 0.01% of the page differing) and 2 further by 0.03% of the page (an envelope of type that now opens live, and a copy of the same widths in the version the record names); envelopes of type that open live go from 154 to 159, none fewer in any file; no file opens in another way. The notes of how far a file's layers differ from its page shrink in 2 files and appear in 2 where an envelope of type now opens live, so the file is compared with its page. Two installed copies of one PostScript name, family and style that differ in widths, in files whose records keep no version, still take the copy the family and style resolve to: only the page's widths tell them apart. Tests: `tests_native::type_from_the_text_document_takes_the_face_of_its_exact_postscript_name`, `tests_native::type_from_the_text_document_takes_the_version_its_font_record_keeps`, `tests_fontnames::shown_type_takes_the_face_of_its_exact_postscript_name`, `ai::tests::legacy_type_takes_the_face_of_its_exact_postscript_name`, `ai_editing::tests::type_in_a_font_beside_a_family_spelled_alike_keeps_its_font`, `ai_editing::tests::type_in_another_version_of_a_static_font_keeps_it`, `ai_editing::tests::type_in_a_copy_its_postscript_name_alone_doesnt_give_keeps_it`, `ai_editing::tests::a_version_longer_than_the_reader_takes_is_reported`, `vectorcraft-text` `tests::versions::every_face_of_a_postscript_name_is_found`. Scores unchanged. |
 | 2026-11-12 | minor | `.ai` and EPS import: type from the text document keeps its manual kerning (#6899). Key 8 of a story's text holds it as runs of characters (key 1), each with a value (key 0 of key 0, in thousandths of an em) or empty where the automatic kerning applies; a character with a value takes it as its Kerning, the space between it and the next character ([Line and character spacing](https://helpx.adobe.com/illustrator/using/line-character-spacing.html)), of the em as its Horizontal Scale draws it, as tracking. It wasn't read, so type kerned by hand came in spaced by the font alone and drifted from the page from each kerned pair on, and envelopes of such type drew apart from their drawn art and kept it. In users' files, used locally and never committed, 48 stories in 17 of 224 files have it, and the drawn art of envelopes of such type sets each kerned gap wider or narrower by exactly that value (a heading's first pair at -140, the letters of a line at 20 to 220). Measured against each file's own page, 14 of those files draw closer (in 4 the pixels that differ go from 2.7–4.7% to under 0.6%) and 2 a little further, both where an envelope of type now opens live in place of its drawn art; envelopes of type that open live go from 154 to 159 of 203, none fewer in any file, and two notes that the type differs from the page go. A value that can't be read keeps the automatic kerning, a run whose length can't be read ends the runs there, and past 65,536 runs the characters keep the automatic kerning. `.ai` save still leaves kerning out of the editing data, so saving such a file as `.ai` again now gives the note that attributes of type are left out for type with manual kerning. Tests `ate::tests::a_story_keeps_its_manual_kerning`, `tests_native::type_keeps_its_manual_kerning`; scores unchanged |
 | 2026-11-12 | minor | `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, after the ways it was tried before (its glyphs alone and grown by half its strokes' weight, #6535, on its own warp and on its saved grid), before a grid moved onto its drawn art, and only where that box is another: its glyph outlines with their fills and strokes baked as the envelope bakes them (geometry effects on them applied: a stroke a Transform effect moves counts where it is moved to), each piece measured by its visual bounds, which are exact for miter joins (a tip counts where the miter limit keeps it, not the miter allowance at every corner that the bounds with strokes take) and round joins and an upper bound for bevel joins, miters the limit cuts, width profiles and square-capped dashes; a contour of zero length, which paints nothing, doesn't count. Effects on the type object itself are left out, as VectorCraft applies them after the envelope bends the type. The box is measured only when that try comes and the import has a check left for it, and once for an envelope. Groups round type and other objects in the contents are measured as before. In users' files (used locally, never committed) the drawn art of some stroked type in an envelope maps from that box: where the type has sharp corners at its edges (slanted stems, pointed feet) and miter joins, or a stroke moved by a Transform effect (a drop shadow), its glyphs grown by half the weight gave too small a box and the envelope kept its drawn art; and where a glyph holds a contour of zero length at its edge, the glyphs' box counted it. On 224 of our own files: envelopes of type that open live go from 154 in 45 files to 161 in 50, and no file loses one; no file changes whether it opens from its layers or its PDF part; renders at 40 ppi change in 6 files, by at most 0.94% of their pixels, each where an envelope of type now opens live in place of its drawn art (the page's own art): 1 closer to the file's own page and 5 further; the notes change in the same 6 files: the note on type in an envelope goes where none keeps its drawn art, and a file whose envelopes of type all kept their drawn art, which opened without the page comparison, now opens with it and carries its notes (the share of art or type that differs from the page, type the page has without a text object, the PDF part's note on DeviceN colours). A synthetic file of 256 such envelopes of 2,000 characters each opens in the same time as before (13.3 s in a debug build): the box is measured only when its try comes. Tests `ai::envelope::tests::mitred_type_is_also_tried_mapped_from_what_its_stroke_paints_miter_tips_included`, `type_with_a_mitred_character_stroke_is_also_tried_mapped_from_what_it_paints`, `a_stroke_moved_by_a_transform_effect_counts_where_it_paints`, `round_joined_type_is_not_tried_twice_for_the_same_box`, `a_contour_of_zero_length_paints_nothing`, `a_side_within_the_slack_of_the_geometric_box_is_that_side`, `tests_native::a_warp_of_mitred_type_maps_from_what_its_stroke_paints_where_its_drawn_art_does` (#6824, part of #3179) |
diff --git a/docs/mcp.md b/docs/mcp.md
index 274db05a34..bfb0bde319 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -1,6 +1,6 @@
 # VectorCraft MCP server
 
-> **Last updated:** 2026-11-11 · **Change:** Save location-refusal error (#6146); existing response shapes retained.
+> **Last updated:** 2026-11-13 · **Change:** Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter (#7097); existing response shapes retained. Previously: Save location-refusal error (#6146); existing response shapes retained.
 
 `vectorcraft-cli mcp` runs a [Model Context Protocol](https://modelcontextprotocol.io) server on stdio
 (newline-delimited JSON-RPC 2.0; see [Protocol](#protocol) for version negotiation). Agents use it to
@@ -9517,7 +9517,12 @@ outline. On a tie, the anchor met first along the outline in the order it was dr
 Without such an anchor, the corner is the outline's point nearest the box corner, moved onto the anchor at the end of
 its segment when within 0.5% of the segment's parameter. Each piece of a side between anchors and corners takes a
 share of the content's width or height in proportion to the length of its control polygon, spread along the piece by
-its curve parameter, so content spreads evenly along a segment without handles. An envelope opened from an `.ai` file
+its curve parameter, so content spreads evenly along a segment without handles. A side whose pieces, from corner to
+corner, are all one cubic curve split at anchors (each within 0.02 pt of that curve's piece) follows that curve's
+parameter instead, so splitting such a side's curve without changing its shape (Add Anchor Points, or a file that
+saves a curve in pieces) leaves how the side shares out the content as it was. Corners found from the outline can
+still move, since one at the outline's nearest point snaps onto an anchor within 0.5% of its segment's parameter. A
+side only partly made of one curve keeps the polygon shares. An envelope opened from an `.ai` file
 keeps the corners the file saves, and they stay on the same anchors when the envelope is moved, rotated or
 reflected. These are VectorCraft's own rules, and existing top-object envelopes redraw by them.
 A warp bends the content's bounds as one Bézier patch. The style sets the patch's control points from the bend and
@@ -10999,4 +11004,5 @@ the error text. The interactive fallback applies only to ordinary File > Save, n
 
 | Date | Change |
 |---|---|
+| 2026-11-13 | Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter (#7097). |
 | 2026-11-11 | Document READ_ONLY_LOCATION for saves (#6146); no response-shape change. |
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..549584ed7f 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1,6 +1,6 @@
 # Parity with Adobe Illustrator
 
-> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged)
+> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged)
 >
 > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865).
 >
@@ -1750,7 +1750,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 
 - **Envelopes of type map from the glyphs:** an envelope maps point type, area type, type in groups and layers and type used as a clipping path from the bounds of the glyph outlines, underlines and strikethroughs instead of the type's laid-out box (ascent to descent, or the area's frame), with inline graphics counted by their boxes; rotated type and type in perspective map from their outlines as drawn. Make with Mesh, Make with Top Object and Reset with Mesh without Maintain Shape use those bounds. Type that draws nothing keeps its laid-out box, and so does type inside any other object, such as a blend, a repeat or a symbol instance. This is VectorCraft's own rule; envelopes of type made in VectorCraft and in saved files redraw by it. Tests: `crates/engine/src/tests/envelope.rs`, and `tests/envelope_ink.rs` in `vectorcraft-eps`, `vectorcraft-render` and `vectorcraft-effects`. Scores and hours unchanged.
 
-- **Top-object envelopes share each side by control polygon:** each piece of a top object's four sides takes a share of the content's width or height in proportion to the length of its control polygon, spread along the piece by its curve parameter (evenly along a segment without handles), where the sides used to share it out by length. Each corner is the nearest anchor within 47.5% of the bounding box from its box corner that has a handle 0.01 pt long or shorter, or whose tangent unit vectors differ by 0.01 or more in x or y and turn out of the outline, or else the outline's nearest point to that box corner. Envelopes opened from `.ai` files keep the corners the file saves, through moves, rotations and reflections. These are VectorCraft's own rules; existing top-object envelopes redraw by them, and gradient meshes made from a path keep sides measured by length. Tests: `a_top_object_*`, `a_reflected_top_object_keeps_the_corners_a_file_gives`, `a_split_curve_moves_the_top_object_share_to_its_new_anchor`, `a_rounded_rectangle_top_object_stays_close_to_the_identity` and `a_rectangle_top_object_is_the_identity` in `live::tests` (`vectorcraft-doc`), `envelope_top_object_shares_a_side_by_control_polygon_length` in `vectorcraft-engine`, `a_top_object_envelope_opens_live_with_its_outline` in `vectorcraft-eps`. Scores and hours unchanged.
+- **Top-object envelopes share each side by control polygon:** each piece of a top object's four sides takes a share of the content's width or height in proportion to the length of its control polygon, spread along the piece by its curve parameter (evenly along a segment without handles), where the sides used to share it out by length. Each corner is the nearest anchor within 47.5% of the bounding box from its box corner that has a handle 0.01 pt long or shorter, or whose tangent unit vectors differ by 0.01 or more in x or y and turn out of the outline, or else the outline's nearest point to that box corner. Envelopes opened from `.ai` files keep the corners the file saves, through moves, rotations and reflections. A side whose pieces, from corner to corner, are all one cubic curve split at anchors (each within 0.02 pt of that curve's piece) follows that curve's parameter instead, so splitting such a side's curve without changing its shape leaves how the side shares out the content as it was (corners found from the outline can still move, as one at the outline's nearest point snaps onto an anchor within 0.5% of its segment's parameter), and a top object whose `.ai` mesh saves each side's curve in pieces draws its contents along the whole curve's parameter, as the drawn art in users' files (used locally, never committed) does. A side only partly made of one curve keeps the polygon shares. These are VectorCraft's own rules; existing top-object envelopes redraw by them, and gradient meshes made from a path keep sides measured by length. Tests: `a_top_object_*`, `a_reflected_top_object_keeps_the_corners_a_file_gives`, `a_split_curve_keeps_the_top_object_patch`, `a_top_object_side_of_many_arcs_stays_on_them`, `a_rounded_rectangle_top_object_stays_close_to_the_identity` and `a_rectangle_top_object_is_the_identity` in `live::tests` (`vectorcraft-doc`), `envelope_top_object_shares_a_side_by_control_polygon_length` and `envelope_top_object_keeps_its_look_when_anchors_are_added` in `vectorcraft-engine`, `a_top_object_envelope_opens_live_with_its_outline` and `a_top_object_whose_top_is_one_curve_split_in_thirds_opens_live` in `vectorcraft-eps`. Scores and hours unchanged.
 
 - **Texture redraws (#1257):** Craquelure, Mosaic Tiles and Stained Glass compare squared distances when finding their nearest cells; rounding/tie boundaries use the original distance ordering. Brute-force candidate tests and three 1800×1500 viewport comparisons preserve the old pixels. A CMYK rectangle move at 190.07%/DPI 1.5 is reproducible with `cargo test -p vectorcraft-render texture_drag_perf -- --ignored --nocapture`; idle-machine Windows interaction is still unverified.
 
@@ -2170,6 +2170,7 @@ Edit › Copy and Cut put the selected ruler guides on the clipboard, with the s
 
 | Date | Change | Summary |
 |---|---|---|
+| 2026-11-13 | minor | Envelopes: a top object's side whose pieces, from corner to corner, are all one cubic curve split at anchors (each within 0.02 pt of that curve's piece) follows that curve's parameter instead of sharing the content out by the pieces' control polygons, so Add Anchor Points on such a side leaves how it shares out the content as it was, and a top object whose `.ai` mesh saves its sides' curves in pieces draws as the file's drawn art (`a_split_curve_keeps_the_top_object_patch`, `a_top_object_side_of_many_arcs_stays_on_them` and three more in `live::tests`, `envelope_top_object_keeps_its_look_when_anchors_are_added`, `a_top_object_whose_top_is_one_curve_split_in_thirds_opens_live`). Existing top-object envelopes with such sides redraw (#7097). Scores and estimates unchanged. |
 | 2026-11-12 | minor | Object › Rasterize with the Grayscale colour model makes a grayscale image (one gray channel, with alpha over a transparent background), so the Properties panel says Grayscale and a fill color colorizes it; Bitmap makes a 1-bit image (a TIFF), or a black-and-white gray image with alpha over a transparent background, since 1-bit gray with alpha is no format readers take. Both were RGB images of gray pixels (#6969). Scores and estimates unchanged. |
 | 2026-11-12 | minor | `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints (its strokes' miter tips, and strokes a Transform effect moves, included), after its glyphs grown by half its strokes' weight; `.ai` import evidence updated (#6824); scores and estimates unchanged. |
 | 2026-11-12 | minor | Explicit editing-data import keeps a single artboard beyond a capped 14,400 pt PDF page (#6865), with a warning; automatic mode stays unchanged. Scores and estimates unchanged. |

From 2170ddcac4faef958725d8c251a1155470054baf Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:05:56 -0800
Subject: [PATCH 12/48] Eyedropper: a pick that leaves a series mark's row
 without paint replaces the stored transparency

An Eyedropper pick that includes transparency now counts a fill or stroke
row that had paint before the pick and has none after it when it stores
the series' row opacity and blend mode on the graph, as graphic styles
already do. Before, such a pick left the opacity and blend mode another
mark of the series had stored, and the series was drawn with them again
after its data changed. A row that had no paint before the pick still
leaves the stored values as they are.
---
 crates/engine/src/cmd/appearance.rs  |  3 +
 crates/engine/src/cmd/graph/tests.rs | 83 ++++++++++++++++++++++++++++
 docs/target-app-parity.md            |  1 +
 3 files changed, 87 insertions(+)

diff --git a/crates/engine/src/cmd/appearance.rs b/crates/engine/src/cmd/appearance.rs
index fb86fa7852..bdb808fe77 100644
--- a/crates/engine/src/cmd/appearance.rs
+++ b/crates/engine/src/cmd/appearance.rs
@@ -1389,6 +1389,9 @@ fn copy_from(s: &mut Session, p: &Value) -> Result<Value> {
                 .collect()
         };
         let mut opacity_rows = top_opacity_changed(&before, d, &targets);
+        // A written row that had paint before the pick counts too when the pick left it without paint, as in
+        // `capture_series_writes`.
+        opacity_rows.extend(painted_rows(&before, written(opacities)));
         opacity_rows.extend(painted_rows(d, written(opacities)));
         let mut rows = top_paint_changed(&before, d, &targets);
         rows.extend(painted_rows(d, written(paints)));
diff --git a/crates/engine/src/cmd/graph/tests.rs b/crates/engine/src/cmd/graph/tests.rs
index aef1918a6d..f6fb3166e0 100644
--- a/crates/engine/src/cmd/graph/tests.rs
+++ b/crates/engine/src/cmd/graph/tests.rs
@@ -1034,6 +1034,50 @@ fn an_opaque_pick_replaces_the_opacity_the_series_stores() {
     assert_eq!(spec(&s, id).series_paints[0].fill_opacity, None);
 }
 
+/// A column graph whose series 0 stores the 40% Multiply fill set on its first mark, and a mark of series 1 whose top fill
+/// row has no paint and is opaque and Normal: the session, the graph, series 0's marks and that source.
+fn marks_and_unpainted_source() -> (Session, NodeId, Vec<NodeId>, NodeId) {
+    let (mut s, id, _, marks) = column_marks();
+    let source = series(s.doc().unwrap().doc.node(id).unwrap(), 1).children().unwrap()[0].id;
+    s.execute("appearance.setItem", &json!({"ids": [source.0], "index": top_row(&s, source, true), "none": true})).unwrap();
+    let fill = top_row(&s, marks[0], true);
+    s.execute("appearance.setItem", &json!({"ids": [marks[0].0], "index": fill, "opacity": 40, "blend": "multiply"})).unwrap();
+    let kept = spec(&s, id).series_paints[0].clone();
+    assert_eq!((kept.fill_opacity, kept.fill_blend), (Some(0.4), Some(BlendMode::Multiply)));
+    (s, id, marks, source)
+}
+
+/// An Eyedropper pick from a fill row without paint onto a mark whose fill had paint replaces the fill opacity and blend
+/// mode another mark of the series stored: the series is drawn opaque and Normal again.
+#[test]
+fn an_eyedropper_pick_that_unpaints_a_series_fill_clears_its_stored_transparency() {
+    let (mut s, id, marks, source) = marks_and_unpainted_source();
+    let mark = s.doc().unwrap().doc.node(marks[1]).unwrap().appearance.fill().unwrap().clone();
+    assert_eq!((mark.paint.is_none(), mark.opacity, mark.blend), (false, 1.0, BlendMode::Normal), "the target's fill row");
+    s.execute("appearance.copyFrom", &json!({"source": source.0, "ids": [marks[1].0]})).unwrap();
+    let picked = s.doc().unwrap().doc.node(marks[1]).unwrap().appearance.fill().unwrap().clone();
+    assert_eq!((picked.paint.is_none(), picked.opacity, picked.blend), (true, 1.0, BlendMode::Normal));
+    let kept = spec(&s, id).series_paints[0].clone();
+    assert_eq!((kept.fill_opacity, kept.fill_blend), (None, None));
+    s.execute("graph.setData", &json!({"rows": [[1, 2], [3, 4]]})).unwrap();
+    let n = s.doc().unwrap().doc.node(id).unwrap().clone();
+    let fills: Vec<_> = series(&n, 0).children().unwrap().iter().filter_map(|m| m.appearance.fill().map(|f| (f.opacity, f.blend))).collect();
+    assert!(fills.iter().all(|f| *f == (1.0, BlendMode::Normal)), "{fills:?}");
+}
+
+/// An Eyedropper pick from a fill row without paint onto a mark whose fill had no paint before the pick either leaves the
+/// fill opacity and blend mode another mark of the series stored.
+#[test]
+fn an_eyedropper_pick_of_an_already_unpainted_row_leaves_series_transparency() {
+    let (mut s, id, marks, source) = marks_and_unpainted_source();
+    s.execute("appearance.setItem", &json!({"ids": [marks[1].0], "index": top_row(&s, marks[1], true), "none": true})).unwrap();
+    let kept = spec(&s, id).series_paints[0].clone();
+    assert_eq!((kept.fill_opacity, kept.fill_blend), (Some(0.4), Some(BlendMode::Multiply)), "a color set to None writes no opacity");
+    s.execute("appearance.copyFrom", &json!({"source": source.0, "ids": [marks[1].0]})).unwrap();
+    let kept = spec(&s, id).series_paints[0].clone();
+    assert_eq!((kept.fill_opacity, kept.fill_blend), (Some(0.4), Some(BlendMode::Multiply)));
+}
+
 /// An appearance moved between two marks of one series leaves the series with the target's paint, not the source's
 /// empty one, and the series still shows when the graph is drawn again.
 #[test]
@@ -1251,6 +1295,45 @@ fn a_style_that_removes_a_marks_stroke_replaces_the_kept_stroke_opacity() {
     }
 }
 
+/// An Eyedropper pick from a stroke row without paint onto a marker whose stroke had paint replaces the stroke opacity and
+/// blend mode the series' Filled Lines band left, in the pick's undo step: the band's outline is drawn opaque and Normal
+/// again. A pick onto a marker whose stroke had no paint before the pick leaves them as they are.
+#[test]
+fn an_eyedropper_pick_that_unpaints_a_series_stroke_clears_its_stored_transparency() {
+    for stroked in [true, false] {
+        let (mut s, id, band) = band_graph();
+        let parts = series_parts(&s, id, 0);
+        let (marker, source) = (parts[1].id, parts[2].id);
+        let st = parts[2].appearance.stroke().unwrap();
+        assert_eq!((st.paint.is_none(), st.opacity, st.blend), (true, 1.0, BlendMode::Normal), "the source's stroke row");
+        if stroked {
+            let row = top_row(&s, marker, false);
+            s.execute("appearance.setItem", &json!({"ids": [marker.0], "index": row, "color": "#ff0000"})).unwrap();
+        }
+        let row = top_row(&s, band, false);
+        s.execute("appearance.setItem", &json!({"ids": [band.0], "index": row, "opacity": 40, "blend": "multiply"})).unwrap();
+        let was = spec(&s, id).series_paints;
+        assert_eq!((was[0].stroke_opacity, was[0].stroke_blend), (Some(0.4), Some(BlendMode::Multiply)));
+        s.execute("appearance.copyFrom", &json!({"source": source.0, "ids": [marker.0]})).unwrap();
+        let picked = s.doc().unwrap().doc.node(marker).unwrap().appearance.stroke().unwrap().clone();
+        assert_eq!((picked.paint.is_none(), picked.opacity, picked.blend), (true, 1.0, BlendMode::Normal), "stroked {stroked}");
+        let kept = spec(&s, id).series_paints[0].clone();
+        let want = if stroked { (None, None) } else { (Some(0.4), Some(BlendMode::Multiply)) };
+        assert_eq!((kept.stroke_opacity, kept.stroke_blend), want, "stroked {stroked}");
+        if stroked {
+            let after = spec(&s, id).series_paints;
+            s.execute("edit.undo", &json!({})).unwrap();
+            assert_eq!(spec(&s, id).series_paints, was);
+            assert!(!s.doc().unwrap().doc.node(marker).unwrap().appearance.stroke_paint().is_none(), "the undo took back the pick");
+            s.execute("edit.redo", &json!({})).unwrap();
+            assert_eq!(spec(&s, id).series_paints, after);
+        }
+        redrawn_band(&mut s, id);
+        let st = series_parts(&s, id, 0)[0].appearance.stroke().unwrap().clone();
+        assert_eq!((Some(st.opacity).filter(|o| *o < 1.0), Some(st.blend).filter(|b| *b != BlendMode::Normal)), want, "stroked {stroked}");
+    }
+}
+
 /// A Filled Lines band's stroke row removed with the Appearance panel or set to None with `paint.setStroke` leaves the
 /// band its color: an empty stored stroke is not a color for the band.
 #[test]
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..e9a95e71b0 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1058,6 +1058,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - **Blend steps of brushed strokes:** the steps interpolate the pen pressure, tilt, bearing and rotation recorded with the Paintbrush, so a Calligraphic, Scatter or Art brush that varies with the pen changes gradually from one key to the next. A key without a recording counts as half pressure, half tilt and 0°, as brushes read it, and angles turn the shorter way round. When the blend starts a key's path at another anchor (an open path run from its end, a closed one turned to another start), the key's recordings, width profile and arrowheads turn with the path. Different brushes still switch halfway (VectorCraft's own rule; strokes blend their options, as [Blended objects overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/apply-transparency-and-blending/blended-objects-overview.html) describes; `crates/doc/src/blend.rs`, `pen_pressure_tilt_and_angles_interpolate_for_brushes`, `stroke_profiles_turn_with_a_key_path_started_elsewhere`).
   - **Path editing (#494):** the handles shown are the handles that drag: Direct Selection drags those of a path selected as a whole (as the Pen leaves it), the Anchor Point tool and Pen+Alt no longer grab handles that Show handles when multiple anchors are selected hides, a handle shorter than the tolerance leaves its anchor to be picked, and the anchor tools pick within Selection & Anchor Display › Tolerance. A dragged segment keeps a smooth anchor at either end smooth. With Direct Selection, the Pen, the Curvature and the anchor tools, a path selected as a whole shows all its anchors selected, and the Control bar and the Properties panel offer Convert (corner, smooth) for them too; Remove and Cut wait for anchors direct-selected (#504). A handle drag gathers its snap targets once per drag (it took 21 ms per pointer move on a 20,000-path document, now 1 ms; `vectorcraft-cli perf` measures handle and segment drags on a 5,000-anchor path). Join merges the selected anchor points that lie on one another, as after Average, into one anchor (#1582, fixes #1533); Object › Path › Average & Join… (`path.averageJoin`, Cmd+Alt+Shift+J, the "Create corner or smooth join" shortcut of [Default keyboard shortcuts](https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html)) moves two open path ends to their midpoint and joins them there, a corner or smooth point as its dialog's Points choice asks, in one undo step.
   - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type. A series starts in greyscale; Group Selection's fill and stroke, the paint, weight, opacity and blend mode of a mark's top visible fill or stroke row after an Appearance command, the Eyedropper, a graphic style, Default Fill and Stroke or Swap Fill and Stroke, and a mark's object opacity and blend mode, are kept separately on the graph and reapplied when its data, type or size changes, and through save, open and undo. Graph Type's Override Calculated Values (both `axisMin` and `axisMax`) uses exactly that value-axis range, split into the tick count (5 when automatic). Line graphs take Edge-to-Edge Lines (off by default: the points sit at the centres of their categories; graphs saved before the option keep their edge-to-edge lines), and radar graphs follow Mark Data Points and Connect Data Points. Blank cells (an empty CSV cell or `null`) are values left out, not zeros: columns, bars and stacked segments skip them, lines and scatter lines break around them and the value axis ignores them, while area, pie and radar draw them as 0; a number in straight quotes is a label, and the data window writes it back quoted. Graph types combine: Graph Type on series picked with Group Selection (or `series` indexes) draws them as their own type, with column, stacked column, line and area mixing on the vertical value axis and bar and stacked bar on the horizontal one; stacked columns take one slot of the cluster, lines draw in front of columns and areas behind. The value axis goes on the left, the right or both sides (column, stacked column, line, area and scatter graphs; bar graphs keep theirs along the bottom), and Separate Scales gives the series assigned to the right axis a scale of their own with its own tick values. Each value axis takes tick marks of no, short or full (across the plot) length and a count per division, and a prefix and suffix for its numbers; the category axis takes tick marks too (none by default), at or between its labels. Graph designs: Object › Graph › Design lists the designs with a preview of the selected one, and New Design (the selected art), Rename, Delete Design, Paste Design (a copy back to edit) and Select Unused, and Marker draws the data points and legend swatches of line, scatter and radar series with a design, scaled so its backmost object fills the default marker's square. Graph Data transposes rows and columns and switches a scatter graph's x and y, and a `|` in a category or series label starts a new line. Pie graphs take Legends in Wedges, Position (Even, Ratio sized by area, Stacked on one centre) and Sort (None, All, First). Graph Type takes column and cluster widths up to 1000% (overlapping past 100%) with First Row and First Column in Front (First Row orders each series' categories; across series the series order decides, so series stay one group each for Group Selection), draws filled lines, adds drop shadows behind columns, bars, lines and wedges, and puts the legend in rows across the top. Text formatted with the Character, Paragraph or Appearance controls, on the whole graph or on labels picked with Group Selection, is kept per kind of label (value axis numbers, category labels, legend labels) through the graph being drawn again. Object › Graph › Data opens a worksheet: cells picked with a click and edited above the sheet (Tab moves right, Enter down, the arrows between cells), Import Data from a tab-separated text file, Transpose, Switch x/y, Cell Style (decimals shown, column width), Revert and Apply. `graph.setData` returns and takes the data as CSV with each value written exactly, not rounded to two decimals, so applying the returned CSV changes nothing (#1485).
+    An Eyedropper pick that includes transparency and leaves a mark's top fill or stroke row without paint, where that row had paint before, also replaces the opacity and blend mode the graph keeps for that kind of row in the series; a row that had no paint before the pick leaves them as they are.
   - **Graph column designs:** Object › Graph › Column (`graph.column`) draws the columns, bars or stacked segments and the legend swatch of the series picked with Group Selection with a graph design: Vertically Scaled stretches it to each column's length, Uniformly Scaled scales it both ways and centers it, Repeating stacks a copy for each Each Design Represents value and chops or scales the last one (For Fractions), and Sliding keeps the part above the design's guide line in proportion and stretches the part below. The dialog lists the designs with a preview; the choice is saved with the graph and follows the design's rename and delete.
     Type in a column design that holds a `%` followed by two digits shows each column's value in place of the `%` and the digits: the first digit is the least number of places before the decimal point (zeros are added in front; 0 gives as many as the value needs), and the second digit sets the places after it, rounded. Unless it is inside a group that clips or has its own opacity or appearance, or inside a blend, compound shape, envelope, repeat or intertwined objects, the type keeps its size and is drawn once per column in a repeating design. The legend swatch leaves it out.
   - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on; Copy, Cut and Paste take the artboard with its art, Paste right of the last artboard, Paste in Place where it was, into this or another document, #446; Object › Artboards › Rearrange All Artboards lays them out in a grid by row or by column, in one row or one column, left to right or right to left, from the menu, the Artboards panel or Properties' Rearrange All, #681; Scale Artwork with Artboard, in the Control bar and Properties beside Move Artwork with Artboard, resizes the artboard proportionally with the art fully inside it and its guides, strokes and corners per the Scale preferences, #602), Measure, Type, Hand, Zoom, Rotate View.

From 727a26d5a6a877113e19d2ba91716a7bc3035593 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:26:14 -0800
Subject: [PATCH 13/48] Path ops: Offset Path sweeps long, low paths along
 their length

Offset Path now turns the overlap sweep the way Outline Stroke and
Unite do. When the estimate for its fill, the ring stroked around it
and the outline of its open subpaths is under two thirds as large for
the parts turned a quarter turn, the faces are found on the turned
parts, the faces within the offset distance of the path are dropped by
testing their points turned back, and the result is turned back.

On an open path of 10,000 anchors in rows of 1,000, offsetting by 2 pt
takes 1.0 s of processor time instead of 1.8 s in a release build.
The offset of a long, low path has as many subpaths as the offset of
the same path stood on end, and the area where the two differ is no
larger than the refit precision times the outline's length.
---
 crates/pathops/src/offset.rs     | 16 ++++++++++----
 crates/pathops/src/sweep_axis.rs | 38 ++++++++++++++++++++++++++++++++
 docs/target-app-parity.md        |  1 +
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/crates/pathops/src/offset.rs b/crates/pathops/src/offset.rs
index f9579f1bf3..6ada08d3b8 100644
--- a/crates/pathops/src/offset.rs
+++ b/crates/pathops/src/offset.rs
@@ -183,10 +183,18 @@ fn offset_region(
     } else {
         BezPath::new()
     };
-    let arr = Arrangement::new_budgeted(
-        vec![(fill, FillRule::NonZero), (ring, FillRule::NonZero), (open_bp, FillRule::NonZero)],
-        MAX_OFFSET_SEGMENT_PAIRS,
-    )?;
+    let parts = vec![fill, ring, open_bp];
+    match crate::sweep_axis::turned_outlines(&parts) {
+        Some(turned) => offset_faces(turned, delta, |p, r| within(crate::sweep_axis::unturn_point(p), r)).map(crate::sweep_axis::unturn),
+        None => offset_faces(parts, delta, within),
+    }
+}
+
+/// The faces of the offset by `delta` from `parts` (the closed fill, the ring stroked around it and
+/// the stroke of the open subpaths, in that order), less the spurious ones that `within` finds.
+fn offset_faces(parts: Vec<BezPath>, delta: f64, within: impl Fn(kurbo::Point, f64) -> bool) -> Result<PathData, PathOpsError> {
+    let d = delta.abs();
+    let arr = Arrangement::new_budgeted(parts.into_iter().map(|p| (p, FillRule::NonZero)).collect(), MAX_OFFSET_SEGMENT_PAIRS)?;
     let c = if delta >= 0.0 { arr.contours_covering(|c| !c.is_empty()) } else { arr.contours_covering(|c| c.contains(&0) && !c.contains(&1)) };
     // When `d` exceeds a curvature radius the stroker's inner offset inverts and its loops cancel
     // winding, leaving faces uncovered that are really within `d` of the path. Every face of the
diff --git a/crates/pathops/src/sweep_axis.rs b/crates/pathops/src/sweep_axis.rs
index 364325afcd..fb544ad163 100644
--- a/crates/pathops/src/sweep_axis.rs
+++ b/crates/pathops/src/sweep_axis.rs
@@ -149,6 +149,11 @@ pub(crate) fn unturn(mut path: PathData) -> PathData {
     path
 }
 
+/// A point of turned input, turned back.
+pub(crate) fn unturn_point(p: kurbo::Point) -> kurbo::Point {
+    UNTURN * p
+}
+
 #[cfg(test)]
 mod tests {
     use kurbo::{Join, Stroke, StrokeOpts};
@@ -251,6 +256,39 @@ mod tests {
         assert_eq!(turns_during(|| drop(stroke_region(std::slice::from_ref(&short)))), 0);
     }
 
+    #[test]
+    fn offset_path_sweeps_a_long_low_path_turned_with_the_result_of_the_path_on_end() {
+        let mut rng = Rng(17);
+        // Grown past the zigzag's bends, where the stroker leaves loops whose faces are dropped by
+        // the distance test; grown a little; and inset.
+        for (closed, delta) in [(false, 1.5), (true, 0.5), (true, -0.3)] {
+            let what = format!("closed {closed}, offset {delta}");
+            let low = zigzag(3, 300, 0.4, &mut rng, closed);
+            let tall = upright(&low);
+            let offset = |p: &PathData| crate::try_offset_path(p, delta, Join::Round, 4.0).unwrap();
+            let mut turned = PathData::default();
+            assert_eq!(turns_during(|| turned = offset(&low)), 1, "{what}: low");
+            let mut on_end = PathData::default();
+            assert_eq!(turns_during(|| on_end = offset(&tall)), 0, "{what}: tall");
+            assert!(!turned.is_empty(), "{what}: empty");
+            assert_same_region(&turned, &upright(&on_end), &what);
+        }
+        // A long plate with a row of round holes: growing it by 1 closes the narrow holes, which
+        // the distance test drops, and keeps the wide ones.
+        use kurbo::Shape;
+        let mut plate = kurbo::Rect::new(0.0, 0.0, 4000.0, 20.0).to_path(0.1);
+        for i in 0..200u32 {
+            let r = if i % 2 == 0 { 0.8 } else { 4.0 };
+            plate.extend(kurbo::Circle::new((10.0 + 20.0 * f64::from(i), 10.0), r).to_path(0.01).reverse_subpaths());
+        }
+        let plate = PathData::from_bezpath(&plate);
+        let grow = |p: &PathData| crate::try_offset_path(p, 1.0, Join::Round, 4.0).unwrap();
+        let mut grown = PathData::default();
+        assert_eq!(turns_during(|| grown = grow(&plate)), 1, "plate");
+        assert_eq!(grown.subpaths.len(), 1 + 100, "plate");
+        assert_same_region(&grown, &upright(&grow(&upright(&plate))), "plate");
+    }
+
     #[test]
     fn a_repeating_path_is_measured_at_every_position() {
         // Short segments in a row along the bottom, with a long one stacked above the row after
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..365ecc97b6 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1171,6 +1171,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Pathfinder (10 exact curve booleans; single-result shape operations retain source names and SVG IDs, #1293), Offset, Outline Stroke, Simplify, Clean Up, Split Into Grid, Divide Objects Below. With one group selected alone, the Pathfinder panel's buttons work on its members (among other selected objects a group still acts as one shape), and a greyed-out button says what it needs (#1450; behaviour reference: [combine objects using Pathfinder effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/combine-objects-using-pathfinder-effects.html); one plain path selected alone stays disabled, which the documentation doesn't settle). Split Into Grid takes the number, height or width, gutter and total of the rows and of the columns, Add Guides and Preview, and several selected paths become one grid painted as the topmost one (#1462, `object.path.splitIntoGrid`; behaviour reference: [divide or split objects](https://helpx.adobe.com/illustrator/desktop/manage-objects/edit-objects/divide-or-split-objects.html); a typed height or width keeps the gutter and changes the total, our choice). Object › Path › Remove Anchor Points (`path.removeAnchors`) removes the direct-selected anchors without opening their paths (the Delete key still deletes them with their segments): the neighbours keep their handle directions and their facing handles are refitted so one cubic follows the two old segments, and straight sides stay straight. The Delete Anchor Point tool uses the same refit. The Control bar, the contextual task bar, the Properties quick actions and the canvas context menu offer it when anchors are selected. With anchors selected, the Control bar and the Properties panel also convert them to corner or smooth (`path.convertAnchors`), connect end points (Join) and cut the path at them (`path.cutAtAnchors`, also on the task bar and the context menu): a closed path opens there and an open one becomes one path per piece, each cut leaving one of its two coincident anchors selected so a drag pulls the path apart. In the Pathfinder panel a group selected alone counts its nested shapes, so an expanded stroked object keeps the Shape Modes enabled (#1642, #1635).
     Outline Stroke, Expand's Stroke option and Flatten Transparency's Convert All Strokes to Outlines apply the object's visible geometry effects (Offset Path, Zig Zag and the others) to the path, and then apply each stroke's own geometry effects before outlining that stroke, as the canvas draws it. The filled outline of a stroke without a brush keeps the stroke's other effects, such as a drop shadow.
     Outline Stroke and Unite remove the overlaps of a long, low path with the sweep turned along it: when the estimated number of segments the sweep holds at once is under two thirds as large for the path turned a quarter turn (paths of 2,048 segments or more), the overlaps are removed on the turned path and the result is turned back, which moves no point by rounding. The lookups of the input curve that a piece of the result lies on, and of the input anchors that are kept, can search along y instead of x: once lookups with more than 64 candidates along x have counted 16 for each input curve or anchor, a lookup searches along y when it finds fewer candidates there (under a quarter as many for curves), and where that has rarely happened it measures along y in only one lookup of 32. On one open path of 200,000 anchors in rows of 1,000, Outline Stroke takes 17.3 s of processor time instead of 31.3 s and Unite 2.9 s instead of 6.5 s in a release build. A turned result has as many subpaths as the result without the turn, and the area where the two differ is no larger than the refit precision times the outline's length (`crates/pathops/src/sweep_axis.rs` tests).
+    Offset Path turns the sweep the same way: when the estimate for its fill, the ring stroked around the fill and the outline of its open subpaths is under two thirds as large turned a quarter turn, the faces are found on the turned parts, the faces that lie within the offset distance of the path are dropped by testing their points turned back, and the result is turned back. On an open path of 10,000 anchors in rows of 1,000, offsetting by 2 pt takes 1.0 s of processor time instead of 1.8 s in a release build. The offset of a long, low path has as many subpaths as the offset of the same path stood on end, and the area where the two differ is no larger than the refit precision times the outline's length (`offset_path_sweeps_a_long_low_path_turned_with_the_result_of_the_path_on_end`).
   - Divide uses open lines, bent paths and curves as cutting edges (#1307), preserving the frontmost filled face's appearance and holes. Engine tests cover implicit closure of filled open contours and unrelated objects; native automation confirms independent piece movement, one Undo/Redo, canvas/window captures and an exact saved-document read by a separate CLI process. The shared planar map keeps a segment cap (65,536 since #937, was 4,096) and its filled-area fallback; other Pathfinder operations are unchanged.
   - Type that Transform effects only move and copy (no scale, rotation, reflection or Random) exports as type in each place, and PDF export writes every copy as selectable, searchable text, when its characters are in solid colors without underline or strikethrough, the type object has no fills or strokes of its own, no inline graphics and no perspective, its transform does not scale or shear stroked characters, and the copies do not overlap. When the effect is on the type itself, the type can also have transparency, an opacity mask and raster effects. When the effect is on the group or layer holding the type, the type has no transparency or effects of its own and is not in a clipping path, the group or layer has no fill, stroke or Pathfinder effect of its own, and no group between them has a fill, stroke, Pathfinder or geometry effect. Type still exports as outlines when the effect stops its copies early, or when the copies would number more than 10,000 or take more than 20,000,000 bytes of document data, and so does other type under a geometry effect.
   - Extrude & Bevel and Inflate treat strokes as outlined: each visible stroke builds a solid from its outline in its own paint beside the top fill's ([three-d.md](three-d.md#fills-and-strokes)).

From 2bd02ecb2a1580c5148b1c849dd424f944aa5275 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:29:09 -0800
Subject: [PATCH 14/48] Paths: a quadratic segment whose points coincide
 measures zero length instead of NaN

measured_arclen returned kurbo's arc length unchecked. For a quadratic
segment whose three points coincide, kurbo 0.13.1's QuadBez::arclen
multiplies 0 by infinity and returns NaN. measured_arclen now returns 0
when the measurement is not finite, the same value it gives a segment it
does not measure. Finite results are unchanged.
---
 crates/geom/src/path.rs | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/crates/geom/src/path.rs b/crates/geom/src/path.rs
index 59a8f30660..3c1b45a52b 100644
--- a/crates/geom/src/path.rs
+++ b/crates/geom/src/path.rs
@@ -688,7 +688,8 @@ fn box_gap(c: &CubicBez, p: Point) -> Option<f64> {
 const MEASURE_LIMIT: f64 = 1e9;
 
 /// The length of `seg` to `accuracy`; 0 for a segment whose control points are not finite or past
-/// [`MEASURE_LIMIT`].
+/// [`MEASURE_LIMIT`], and 0 when the measurement is not finite (kurbo gives NaN for a quadratic
+/// segment whose three points coincide).
 pub fn measured_arclen(seg: &PathSeg, accuracy: f64) -> f64 {
     let ok = |p: Point| p.x.is_finite() && p.y.is_finite() && p.x.abs() <= MEASURE_LIMIT && p.y.abs() <= MEASURE_LIMIT;
     let fits = match seg {
@@ -696,7 +697,11 @@ pub fn measured_arclen(seg: &PathSeg, accuracy: f64) -> f64 {
         PathSeg::Quad(q) => ok(q.p0) && ok(q.p1) && ok(q.p2),
         PathSeg::Cubic(c) => ok(c.p0) && ok(c.p1) && ok(c.p2) && ok(c.p3),
     };
-    if fits { kurbo::ParamCurveArclen::arclen(seg, accuracy) } else { 0.0 }
+    if !fits {
+        return 0.0;
+    }
+    let len = kurbo::ParamCurveArclen::arclen(seg, accuracy);
+    if len.is_finite() { len } else { 0.0 }
 }
 
 /// The largest x or y, in size, of a segment's control points for which [`segment_bounds`]
@@ -1056,6 +1061,19 @@ mod tests {
         assert!((square().length() - 40.0).abs() < 1e-6);
     }
 
+    /// A quadratic segment whose three points coincide measures 0, not NaN; quadratic segments
+    /// with only two points together, and an ordinary one, keep kurbo's length.
+    #[test]
+    fn measured_arclen_of_a_quad_whose_points_coincide_is_zero() {
+        let quad = |a: (f64, f64), b: (f64, f64), c: (f64, f64)| PathSeg::Quad(kurbo::QuadBez::new(a, b, c));
+        assert_eq!(measured_arclen(&quad((5.0, 5.0), (5.0, 5.0), (5.0, 5.0)), 1e-6), 0.0);
+        assert_eq!(measured_arclen(&quad((0.0, 0.0), (0.0, 0.0), (0.0, 0.0)), 1e-3), 0.0);
+        assert!((measured_arclen(&quad((0.0, 0.0), (0.0, 0.0), (10.0, 0.0)), 1e-6) - 10.0).abs() < 1e-6);
+        assert!((measured_arclen(&quad((0.0, 0.0), (10.0, 0.0), (0.0, 0.0)), 1e-6) - 10.0).abs() < 1e-6);
+        let ordinary = quad((0.0, 0.0), (10.0, 0.0), (10.0, 10.0));
+        assert_eq!(measured_arclen(&ordinary, 1e-6), kurbo::ParamCurveArclen::arclen(&ordinary, 1e-6));
+    }
+
     #[test]
     fn serde_roundtrip() {
         let p = square();

From 88c02aa2939785999cecb5381cb29dda81309d45 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 02:18:29 -0800
Subject: [PATCH 15/48] Effects: culling a painted piece leaves room for its
 own brush art

A live-effect plug-in that paints its pieces draws each piece's brushed
stroke along the piece's path at the piece's stroke width. Culling left
room for brush art from the object's own stroke width around the
pieces, so brush art of a moved or wider piece was cut off at the edge
of the view. Culling now leaves 16 x the piece's stroke width + 8 pt
past each brushed piece, and does so for a symbol instance whose art
holds such a path (measured once per symbol) and for a blend, envelope
or repeat that holds one. Object > Rasterize measures the brush art
drawn along each piece and leaves out the object's own brush art, which
is not drawn.

Groups and layers now leave room for their members' brush art. The
cull bounds of a group or layer united its members' bounds without the
room each brushed member leaves, so the painted bounds of a group, and
the area redrawn when it changes, left out brush art past its members'
strokes. That applied to plain brushed paths as well as painted pieces.
Each member is now measured as the renderer measures it when it draws
the group, in the members of a group with a fill, stroke or adjustment
of its own and in a group with crop marks or Vector Halftone too.
---
 crates/doc/src/symbols.rs               |  15 ++
 crates/render/src/brush_fx.rs           |  17 +-
 crates/render/src/fx.rs                 |   5 +-
 crates/render/src/fx/bounds.rs          | 141 ++++++++++++--
 crates/render/src/tests.rs              |   1 +
 crates/render/src/tests/paintedbrush.rs | 238 ++++++++++++++++++++++++
 docs/target-app-parity.md               |   1 +
 7 files changed, 397 insertions(+), 21 deletions(-)
 create mode 100644 crates/render/src/tests/paintedbrush.rs

diff --git a/crates/doc/src/symbols.rs b/crates/doc/src/symbols.rs
index 2cf260cbec..dde6621993 100644
--- a/crates/doc/src/symbols.rs
+++ b/crates/doc/src/symbols.rs
@@ -87,6 +87,8 @@ pub struct SymbolBoxes<'a> {
     sliced_placed: Cell<u64>,
     /// The most objects of symbol art [`Self::sliced_visual`] places: [`MAX_SYMBOL_NODES`].
     sliced_most: u64,
+    /// The widths [`Self::measured_width`] has measured, by kind and symbol name.
+    widths: RefCell<HashMap<(&'static str, String), Option<f64>>>,
 }
 
 impl Document {
@@ -107,6 +109,7 @@ impl Document {
             sliced: RefCell::default(),
             sliced_placed: Cell::new(0),
             sliced_most: MAX_SYMBOL_NODES,
+            widths: RefCell::default(),
         }
     }
 }
@@ -247,6 +250,18 @@ impl<'a> SymbolBoxes<'a> {
         self.art(name)?.brush
     }
 
+    /// The width `measure` gives for the symbol named `name`, measured once for these boxes for each
+    /// `kind`, which names what `measure` measures. `measure` may call this again for other names.
+    pub fn measured_width(&self, kind: &'static str, name: &str, measure: impl FnOnce() -> Option<f64>) -> Option<f64> {
+        let key = (kind, name.to_string());
+        if let Some(w) = self.widths.borrow().get(&key) {
+            return *w;
+        }
+        let w = measure();
+        self.widths.borrow_mut().insert(key, w);
+        w
+    }
+
     /// How far the visual box of an instance of the symbol named `name` grows in boxes made by
     /// [`Self::with_brush_art`]: `16 × max(w, 1) + 8` for the widest stroke `w` that
     /// [`Self::brush_width`] finds, as far as the renderer grows the cull bounds of a brushed path
diff --git a/crates/render/src/brush_fx.rs b/crates/render/src/brush_fx.rs
index 2b724f2805..b1b46b3327 100644
--- a/crates/render/src/brush_fx.rs
+++ b/crates/render/src/brush_fx.rs
@@ -125,9 +125,15 @@ impl BrushCache {
 }
 
 /// Cull bounds that allow for brush art reaching past the stroke (scatter, wide nibs), symbol
-/// instances measured by their art from `symbols`, with the brushed strokes in that art.
+/// instances measured by their art from `symbols`, with the brushed strokes in that art. A path
+/// whose live-effect plug-ins paint their pieces leaves that room past each piece
+/// ([`crate::fx::painted_cull_bounds`]). A group or layer leaves that room past each of its
+/// members, as the renderer measures a group by its members (`Renderer::bounds_of`).
 pub(crate) fn cull_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> {
-    let b = crate::fx::cull_bounds(symbols, n)?;
+    if let Some(b) = crate::fx::painted_cull_bounds(symbols, n) {
+        return b;
+    }
+    let b = crate::fx::brushed_cull_bounds(symbols, n)?;
     let pad = pad(symbols, n);
     Some(b.inflate(pad, pad))
 }
@@ -145,12 +151,15 @@ pub(crate) fn path_cull_bounds(symbols: &SymbolBoxes, n: &Node, visual: impl FnO
 /// How far brush art can paint past `n`'s brushed strokes, or past the brushed strokes in the art
 /// of symbol instance `n`: `16 × w + 8`, where `w` is the widest stroke (at least 1) of `n` when it
 /// has a visible brushed stroke and of the objects in that art that have one
-/// ([`SymbolBoxes::brush_width`]), and 0 when neither has one.
+/// ([`SymbolBoxes::brush_width`]) or the pieces live-effect plug-ins paint for them
+/// ([`crate::fx::painted_brush_width`]), and 0 when neither has one.
 pub(crate) fn pad(symbols: &SymbolBoxes, n: &Node) -> f64 {
     let own = vectorcraft_brush::has_brush(n)
         .then(|| n.appearance.items.iter().filter_map(|i| if let AppearanceItem::Stroke(s) = i { Some(s.width) } else { None }).fold(1.0, f64::max));
     let art = match &n.kind {
-        NodeKind::SymbolInstance { symbol, .. } => symbols.brush_width(symbol).map(|w| w.max(1.0)),
+        NodeKind::SymbolInstance { symbol, .. } => {
+            symbols.brush_width(symbol).into_iter().chain(crate::fx::painted_brush_width(symbols, symbol)).reduce(f64::max).map(|w| w.max(1.0))
+        }
         _ => None,
     };
     own.into_iter().chain(art).reduce(f64::max).map_or(0.0, |w| 16.0 * w + 8.0)
diff --git a/crates/render/src/fx.rs b/crates/render/src/fx.rs
index a337616329..0dd0beb0eb 100644
--- a/crates/render/src/fx.rs
+++ b/crates/render/src/fx.rs
@@ -70,7 +70,10 @@ mod renderer;
 
 #[cfg(test)]
 pub(crate) use bounds::visual_bounds;
-pub(crate) use bounds::{cull_bounds, drawn_outline, drawn_outlines, painted_reach, path_cull_bounds, three_d_art_bounds, with_own_raster_reach};
+pub(crate) use bounds::{
+    brushed_cull_bounds, cull_bounds, drawn_outline, drawn_outlines, painted_brush_width, painted_cull_bounds, painted_reach, path_cull_bounds,
+    three_d_art_bounds, with_own_raster_reach,
+};
 #[cfg(test)]
 pub(crate) use entries::Drawn;
 pub(crate) use entries::{DocInputs, FxGeom, Inputs, Reads, ShadowEntry};
diff --git a/crates/render/src/fx/bounds.rs b/crates/render/src/fx/bounds.rs
index 6fbd9f37ac..2887180a42 100644
--- a/crates/render/src/fx/bounds.rs
+++ b/crates/render/src/fx/bounds.rs
@@ -99,6 +99,72 @@ fn painted_art(symbols: &SymbolBoxes, n: &Node) -> Option<Node> {
     effects::has_painted_effects(n).then(|| effects::reshape(Some(symbols.document()), n, None)).flatten()
 }
 
+/// Calls `f` on each object in `art`, the art [`painted_art`] makes, that has a visible brushed
+/// stroke, looking into the visible members of its groups. Hidden objects are left out.
+fn each_brushed_piece(art: &Node, f: &mut impl FnMut(&Node)) {
+    if !art.visible {
+        return;
+    }
+    match &art.kind {
+        NodeKind::Group { children, .. } => children.iter().for_each(|c| each_brushed_piece(c, f)),
+        _ if vectorcraft_brush::has_brush(art) => f(art),
+        _ => {}
+    }
+}
+
+/// [`cull_bounds`] of path or compound path `n` whose live-effect plug-ins paint their pieces
+/// ([`painted_art`]), with room for brush art past each piece's brushed strokes
+/// ([`crate::brush_fx::pad`] of that piece, from the piece's own stroke widths) and the reach of
+/// `n`'s raster effects past them. `None` when the renderer measures `n` otherwise: it has no such
+/// pieces, or has Crop Marks, Vector Halftone or a 3D effect.
+pub(crate) fn painted_cull_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Option<Rect>> {
+    if !effects::has_painted_effects(n)
+        || effects::has_crop_marks(n)
+        || effects::addons::halftone::has_halftone(n)
+        || effects::has_revolve(n)
+        || effects::has_solid(n)
+    {
+        return None;
+    }
+    let art = painted_art(symbols, n)?;
+    let mut b = art.visual_bounds_with(symbols);
+    each_brushed_piece(&art, &mut |p| {
+        let pad = crate::brush_fx::pad(symbols, p);
+        b = vectorcraft_geom::union_opt(b, p.visual_bounds_with(symbols).map(|r| r.inflate(pad, pad)));
+    });
+    Some(b.map(|b| with_raster_reach(symbols, n, b)))
+}
+
+/// The widest stroke of the pieces with a visible brushed stroke that live-effect plug-ins paint
+/// ([`painted_art`]) for the paths in the art of the symbol named `symbol`, and in the art of the
+/// symbols the instances in it show, each symbol measured once for `symbols`
+/// ([`SymbolBoxes::measured_width`]). `None` when no such piece has one; symbols whose art has no
+/// visible effect ([`SymbolBoxes::has_effects`]) are not looked at.
+pub(crate) fn painted_brush_width(symbols: &SymbolBoxes, symbol: &str) -> Option<f64> {
+    symbols.measured_width("painted brush", symbol, || {
+        if !symbols.has_effects(symbol) {
+            return None;
+        }
+        let mut width: Option<f64> = None;
+        symbols.measure_art(symbol, |art| {
+            art.walk(&mut |n| {
+                let nested = match &n.kind {
+                    NodeKind::SymbolInstance { symbol, .. } => painted_brush_width(symbols, symbol),
+                    _ => None,
+                };
+                width = width.into_iter().chain(nested).reduce(f64::max);
+                if let Some(pieces) = painted_art(symbols, n) {
+                    each_brushed_piece(&pieces, &mut |p| {
+                        let widths = p.appearance.items.iter().filter_map(|i| if let AppearanceItem::Stroke(s) = i { Some(s.width) } else { None });
+                        width = Some(widths.fold(width.unwrap_or(0.0), f64::max));
+                    });
+                }
+            })
+        });
+        width
+    })
+}
+
 /// Does `item` paint (as [`Renderer::paint_items`] draws it)?
 fn paints(item: &AppearanceItem) -> bool {
     item.visible() && !item.paint().is_none()
@@ -152,8 +218,18 @@ fn spread(symbols: &SymbolBoxes, fx: &[Effect], b: Rect) -> Rect {
 }
 
 /// [`drawn_bounds`] before the raster effects of `n`'s fills and strokes: its art, and the art of
-/// its brushed strokes (a symbol's brushed art as far as [`crate::brush_fx::pad`] reaches).
+/// its brushed strokes (a symbol's brushed art as far as [`crate::brush_fx::pad`] reaches). A path
+/// whose live-effect plug-ins paint their pieces is measured by those pieces, each with the art
+/// its brushed strokes draw along it.
 fn art_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> {
+    if let Some(art) = painted_art(symbols, n) {
+        let mut b = art.visual_bounds_with(symbols);
+        each_brushed_piece(&art, &mut |p| {
+            let brushed = vectorcraft_brush::expand(symbols.document(), p).and_then(|a| a.visual_bounds_with(symbols));
+            b = vectorcraft_geom::union_opt(b, brushed);
+        });
+        return b;
+    }
     let b = shape_bounds(symbols, n);
     let brushed = vectorcraft_brush::has_brush(n)
         .then(|| vectorcraft_brush::expand(symbols.document(), n))
@@ -180,9 +256,6 @@ fn shape_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> {
         }
         NodeKind::Layer { clip: false, .. } | NodeKind::Group { clip: false, .. } => union(n),
         _ if has_fx(n) => {
-            if let Some(art) = painted_art(symbols, n) {
-                return art.visual_bounds_with(symbols);
-            }
             let g = effected_path(symbols.document(), n, &node_bezpath(n)?);
             // The path as the fills and strokes without geometry effects of their own paint it
             // (as every fill and stroke would when none paints).
@@ -396,7 +469,28 @@ fn outset(symbols: &SymbolBoxes, fx: &[Effect], b: Rect) -> f64 {
 /// the subtree (a shadow can reach the view while its object is outside it). Symbol instances are
 /// measured by their art from `symbols`.
 pub(crate) fn cull_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> {
-    cull_bounds_in(symbols, n, true)
+    cull_bounds_in(symbols, n, true, false)
+}
+
+/// [`cull_bounds`] with room for the brush art of the members of the groups and layers in `n`, each
+/// member measured as [`crate::brush_fx::cull_bounds`] measures it. The room for `n`'s own brushed
+/// strokes is left to the caller.
+pub(crate) fn brushed_cull_bounds(symbols: &SymbolBoxes, n: &Node) -> Option<Rect> {
+    cull_bounds_in(symbols, n, true, true)
+}
+
+/// [`cull_bounds_in`] of `c`, a member of a group or layer; with `brush`, grown by the room its
+/// brushed strokes leave for brush art, as [`crate::brush_fx::cull_bounds`] measures it.
+fn member_cull_bounds(symbols: &SymbolBoxes, c: &Node, after_reshape: bool, brush: bool) -> Option<Rect> {
+    if !brush {
+        return cull_bounds_in(symbols, c, after_reshape, false);
+    }
+    if let Some(b) = painted_cull_bounds(symbols, c) {
+        return b;
+    }
+    let b = cull_bounds_in(symbols, c, after_reshape, true)?;
+    let pad = crate::brush_fx::pad(symbols, c);
+    Some(b.inflate(pad, pad))
 }
 
 /// [`cull_bounds`] of path or compound path `n` made from `visual`, its visual bounds as
@@ -420,16 +514,21 @@ pub(crate) fn path_cull_bounds(symbols: &SymbolBoxes, n: &Node, visual: impl FnO
 /// with geometry effects of its own are measured on the art as those effects reshape it
 /// ([`reshaped_art_effects_reach`]). With `after_reshape` false, they are measured on the art
 /// before those effects run ([`art_effects_reach`]), which `symbols` keeps for each symbol and
-/// linear part.
-fn cull_bounds_in(symbols: &SymbolBoxes, n: &Node, after_reshape: bool) -> Option<Rect> {
-    let inner = |c: &Node| cull_bounds_in(symbols, c, after_reshape);
+/// linear part. With `brush` true, the members of a group or layer are measured with the room
+/// their brushed strokes leave for brush art ([`member_cull_bounds`]).
+fn cull_bounds_in(symbols: &SymbolBoxes, n: &Node, after_reshape: bool, brush: bool) -> Option<Rect> {
+    let inner = |c: &Node| cull_bounds_in(symbols, c, after_reshape, false);
+    let member = |c: &Node| member_cull_bounds(symbols, c, after_reshape, brush);
+    // The art that a group's or layer's crop marks or Vector Halftone draw holds its members. The
+    // caller leaves the room for an object's own brushed strokes.
+    let held = |art: &Node| cull_bounds_in(symbols, art, after_reshape, brush && is_container(n));
     match &n.kind {
         // The object and its crop marks.
-        _ if effects::has_crop_marks(n) => effects::crop_marks_art(n).and_then(|art| inner(&art)),
+        _ if effects::has_crop_marks(n) => effects::crop_marks_art(n).and_then(|art| held(&art)),
         // The object Vector Halftone samples, and as far as its dots reach past it.
         _ if effects::addons::halftone::has_halftone(n) => {
             let reach = effects::addons::halftone::reach(n);
-            inner(&effects::addons::halftone::split(n).0).map(|b| b.inflate(reach, reach))
+            held(&effects::addons::halftone::split(n).0).map(|b| b.inflate(reach, reach))
         }
         // A 3D effect's art, as the renderer draws it, and the raster effects' reach: the solid of
         // type or of a group's members reaches past the letters or members the arms below measure.
@@ -445,12 +544,12 @@ fn cull_bounds_in(symbols: &SymbolBoxes, n: &Node, after_reshape: bool) -> Optio
             let b = if art.clips() {
                 art.visual_bounds_with(symbols)
             } else {
-                art.children()?.iter().fold(None, |acc, c| vectorcraft_geom::union_opt(acc, inner(c)))
+                art.children()?.iter().fold(None, |acc, c| vectorcraft_geom::union_opt(acc, member(c)))
             }?;
             Some(with_own_raster_reach(symbols, n, b))
         }
         NodeKind::Layer { children, clip: false, .. } | NodeKind::Group { children, clip: false } => {
-            children.iter().fold(None, |acc, c| vectorcraft_geom::union_opt(acc, inner(c)))
+            children.iter().fold(None, |acc, c| vectorcraft_geom::union_opt(acc, member(c)))
         }
         _ if has_fx(n) => visual_bounds(symbols, n),
         // The reshaped art (a symbol instance's reshaped art is made from its symbol's art; type's
@@ -568,14 +667,24 @@ fn glyphs_box(t: &vectorcraft_doc::TextObject, outset: f64) -> Option<Rect> {
 /// How far the content of live object `n` (a blend, envelope or repeat) can paint past its visual
 /// bounds: for each object in it, how far the effects in a symbol instance's art paint past that
 /// art ([`art_effects_reach`]), how far brush art can paint ([`crate::brush_fx::pad`]) and how far
-/// a path's own effects paint past it ([`path_effects_reach`]), on the farthest side. 0 for any
-/// other kind of object.
+/// a path's own effects paint past it ([`path_effects_reach`]), on the farthest side; for a path
+/// whose live-effect plug-ins paint their pieces, how far its pieces and their brush art reach past
+/// it ([`painted_cull_bounds`]). 0 for any other kind of object.
 fn live_content_reach(symbols: &SymbolBoxes, n: &Node) -> f64 {
     if !vectorcraft_doc::live::is_live(n) {
         return 0.0;
     }
     let mut reach = 0.0f64;
-    n.walk(&mut |c| reach = reach.max(art_effects_reach(symbols, c).max(path_effects_reach(symbols, c)) + crate::brush_fx::pad(symbols, c)));
+    n.walk(&mut |c| {
+        let own = match painted_cull_bounds(symbols, c) {
+            Some(b) => match (b, c.visual_bounds_with(symbols)) {
+                (Some(b), Some(v)) => [v.x0 - b.x0, v.y0 - b.y0, b.x1 - v.x1, b.y1 - v.y1].into_iter().fold(0.0, f64::max),
+                _ => 0.0,
+            },
+            None => art_effects_reach(symbols, c).max(path_effects_reach(symbols, c)) + crate::brush_fx::pad(symbols, c),
+        };
+        reach = reach.max(own);
+    });
     reach
 }
 
@@ -628,7 +737,7 @@ fn reshaped_art_effects_reach(symbols: &SymbolBoxes, n: &Node, r: &Node) -> f64
     if !symbols.has_effects(symbol) {
         return 0.0;
     }
-    let art = r.children().into_iter().flatten().fold(None, |acc, c| vectorcraft_geom::union_opt(acc, cull_bounds_in(symbols, c, false)));
+    let art = r.children().into_iter().flatten().fold(None, |acc, c| vectorcraft_geom::union_opt(acc, cull_bounds_in(symbols, c, false, false)));
     match (art, r.visual_bounds_with(symbols)) {
         (Some(c), Some(v)) => [v.x0 - c.x0, v.y0 - c.y0, c.x1 - v.x1, c.y1 - v.y1].into_iter().fold(0.0, f64::max),
         _ => 0.0,
diff --git a/crates/render/src/tests.rs b/crates/render/src/tests.rs
index 9cf4ac9ca0..bde3278bfc 100644
--- a/crates/render/src/tests.rs
+++ b/crates/render/src/tests.rs
@@ -27,6 +27,7 @@ mod longstroke;
 mod memory;
 mod movedstroke;
 mod objectfx;
+mod paintedbrush;
 mod placed_document;
 mod rasterize;
 mod setup;
diff --git a/crates/render/src/tests/paintedbrush.rs b/crates/render/src/tests/paintedbrush.rs
new file mode 100644
index 0000000000..ad31da5b3b
--- /dev/null
+++ b/crates/render/src/tests/paintedbrush.rs
@@ -0,0 +1,238 @@
+//! A path whose live-effect plug-in paints its pieces draws each piece's brushed stroke along that
+//! piece, at the piece's stroke width. Culling leaves room for that brush art past each piece, in a
+//! symbol instance and a live object too, and Object › Rasterize measures it.
+
+use std::sync::Arc;
+
+use serde_json::json;
+use vectorcraft_color::{Color, Paint};
+use vectorcraft_doc::{Appearance, Document, Effect, Node, NodeKind, Symbol};
+use vectorcraft_geom::{Affine, PathData, Point, SubPath};
+
+use crate::{RenderOptions, Renderer};
+
+const BRUSH: &str = "3 pt. Round";
+
+/// A 20 × 20 square at `x`, 40.
+fn square_at(x: f64) -> PathData {
+    PathData::single(SubPath::polyline(&[Point::new(x, 40.0), Point::new(x + 20.0, 40.0), Point::new(x + 20.0, 60.0), Point::new(x, 60.0)], true))
+}
+
+/// Installs live-effect plug-in `id`, which declares `paintOutput` and returns one piece: the
+/// square at 120, 40 with a black stroke 10 pt wide.
+fn install(id: &str) {
+    use vectorcraft_plugins::wat as tpl;
+    let paint = serde_json::to_value(Paint::solid(Color::BLACK)).unwrap();
+    let output = json!({"objects": [{"path": square_at(120.0), "strokes": [{"paint": paint, "width": 10.0}]}]}).to_string();
+    let manifest = format!(r#"{{"id":"{id}","name":"Test {id}","version":"1","kind":"effect","api":2,"paintOutput":true,"params":{{}}}}"#);
+    let module = wat::parse_str(tpl::returning(&manifest, &output)).unwrap();
+    vectorcraft_plugins::registry::install_bytes(&module).unwrap();
+}
+
+/// A document whose brush `3 pt. Round` paints a round nib 10 pt across for each point of stroke
+/// weight: 100 pt across on a piece's 10 pt stroke, reaching from 70 to 190 across the piece.
+fn document() -> Document {
+    let mut d = Document::new(300.0, 100.0);
+    let mut lib = vectorcraft_brush::library(&d);
+    let Some(vectorcraft_brush::BrushKind::Calligraphic(c)) = lib.iter_mut().find(|b| b.name == BRUSH).map(|b| &mut b.kind) else {
+        panic!("the {BRUSH} brush")
+    };
+    c.size = 10.0;
+    vectorcraft_brush::store(&mut d, &lib);
+    d
+}
+
+/// The square at 0, 40 with a black 1 pt stroke, painted by the brush when `brushed`, with
+/// live-effect plug-in `plugin` as its own effect, or as its stroke's when `on_stroke`.
+fn source(d: &mut Document, plugin: &str, on_stroke: bool, brushed: bool) -> Node {
+    let mut ap = Appearance::basic(Paint::None, Paint::solid(Color::BLACK), 1.0);
+    let effect = Effect { id: format!("plugin.{plugin}"), params: json!({}), visible: true };
+    let stroke = ap.stroke_mut().unwrap();
+    stroke.brush = brushed.then(|| BRUSH.to_string());
+    if on_stroke {
+        stroke.effects = vec![effect];
+    } else {
+        ap.effects = vec![effect];
+    }
+    Node::path(d.alloc_id(), square_at(0.0), ap)
+}
+
+/// `d` with `n` added to its first layer.
+fn with(mut d: Document, n: Node) -> Document {
+    let l = d.layers[0].id;
+    d.insert(Some(l), 0, n).unwrap();
+    d
+}
+
+/// Does a new renderer draw `d` dark at (`x` + 5, 50), in a view of 10 × 20 pt from (`x`, 40)?
+fn dark_at(d: &Document, x: f64) -> bool {
+    let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
+    let img = Renderer::new().render(d, 10, 20, Affine::translate((-x, -40.0)), &opts);
+    let p = img.pixel(5, 10);
+    (p[0] as u32 + p[1] as u32 + p[2] as u32) < 200
+}
+
+/// The brush art of the piece reaches 50 pt past it, to 190; the room left for the source's 1 pt
+/// brushed stroke ends at 169. A view from 175 shows that art whether the plug-in is the path's own
+/// effect or its stroke's, and culling leaves `16 × 10 + 8` pt past the piece's 10 pt stroke. A
+/// renderer that draws the whole document draws it there too.
+#[test]
+fn a_painted_piece_is_culled_by_its_own_brush_art() {
+    for (id, on_stroke) in [("test.render.paintedbrush.object", false), ("test.render.paintedbrush.stroke", true)] {
+        install(id);
+        let mut d = document();
+        let n = source(&mut d, id, on_stroke, true);
+        let d = with(d, n.clone());
+        assert!(dark_at(&d, 175.0), "on the stroke: {on_stroke}; the brush art past the source's room is drawn");
+        let opts = RenderOptions { background: Some([255, 255, 255, 255]), ..Default::default() };
+        let whole = Renderer::new().render(&d, 300, 100, Affine::IDENTITY, &opts).pixel(180, 50);
+        assert!((whole[0] as u32 + whole[1] as u32 + whole[2] as u32) < 200, "on the stroke: {on_stroke}; {whole:?}");
+        let b = crate::brush_fx::cull_bounds(&d.symbol_boxes(), &n).unwrap();
+        assert!(b.x0 <= -52.9 && b.x1 >= 312.9 && b.y0 <= -132.9 && b.y1 >= 232.9, "on the stroke: {on_stroke}; {b:?}");
+        vectorcraft_plugins::registry::remove(id);
+    }
+}
+
+/// Object › Rasterize measures the brush art drawn along the piece, from 70 to 190, and not the
+/// brush art of the source, which is not drawn.
+#[test]
+fn a_painted_piece_s_brush_art_is_in_its_drawn_bounds() {
+    const ID: &str = "test.render.paintedbrush.crop";
+    install(ID);
+    let mut d = document();
+    let n = source(&mut d, ID, false, true);
+    let d = with(d, n.clone());
+    let b = crate::drawn_bounds(&d, &n).unwrap();
+    assert!(b.x0 > 65.0 && b.x0 < 75.0 && b.x1 > 185.0 && b.x1 < 195.0, "{b:?}");
+    vectorcraft_plugins::registry::remove(ID);
+}
+
+/// An instance of a symbol whose art is the path, and a one-by-one grid repeat of it, are drawn
+/// where the piece's brush art reaches.
+#[test]
+fn a_symbol_and_a_repeat_holding_a_painted_path_are_culled_by_its_pieces_brush_art() {
+    const ID: &str = "test.render.paintedbrush.held";
+    install(ID);
+    let mut d = document();
+    let art = source(&mut d, ID, false, true);
+    d.symbols.push(Symbol { dynamic: false, name: "Painted".into(), art: Arc::new(art) });
+    let instance = Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Painted".into(), xf: Affine::IDENTITY });
+    let d = with(d, instance);
+    assert!(dark_at(&d, 175.0), "an instance");
+    let mut d = document();
+    let held = source(&mut d, ID, false, true);
+    let kind = vectorcraft_doc::RepeatKind::Grid {
+        h_spacing: 0.0,
+        v_spacing: 0.0,
+        rows: 1,
+        cols: 1,
+        grid_type: vectorcraft_doc::TileType::Grid,
+        flip_rows: false,
+        flip_cols: false,
+    };
+    let repeat = Node::new(d.alloc_id(), NodeKind::Repeat(vectorcraft_doc::RepeatSpec { kind, source: vec![Arc::new(held)] }));
+    let d = with(d, repeat);
+    assert!(dark_at(&d, 175.0), "a repeat");
+    vectorcraft_plugins::registry::remove(ID);
+}
+
+/// The room an instance leaves for the pieces' brush art is measured once for a symbol's art: the
+/// second instance measured with the same boxes measures no art.
+#[test]
+fn the_pieces_brush_width_is_measured_once_for_a_symbol() {
+    const ID: &str = "test.render.paintedbrush.once";
+    install(ID);
+    let mut d = document();
+    let art = source(&mut d, ID, false, true);
+    d.symbols.push(Symbol { dynamic: false, name: "Painted".into(), art: Arc::new(art) });
+    let instance =
+        |d: &mut Document, x: f64| Node::new(d.alloc_id(), NodeKind::SymbolInstance { symbol: "Painted".into(), xf: Affine::translate((x, 0.0)) });
+    let (a, b) = (instance(&mut d, 0.0), instance(&mut d, 30.0));
+    let symbols = d.symbol_boxes();
+    assert_eq!(crate::brush_fx::pad(&symbols, &a), 168.0, "16 × the piece's 10 pt + 8");
+    let measured = symbols.art_measured();
+    assert_eq!(crate::brush_fx::pad(&symbols, &b), 168.0);
+    assert_eq!(symbols.art_measured(), measured);
+    vectorcraft_plugins::registry::remove(ID);
+}
+
+/// The square at 0, 40 with a black 1 pt stroke painted by the brush, without effects.
+fn brushed_path(d: &mut Document) -> Node {
+    let mut ap = Appearance::basic(Paint::None, Paint::solid(Color::BLACK), 1.0);
+    ap.stroke_mut().unwrap().brush = Some(BRUSH.to_string());
+    Node::path(d.alloc_id(), square_at(0.0), ap)
+}
+
+/// A group leaves the room each member's brushed strokes leave for brush art, as the renderer
+/// measures the group by its members: a plain brushed path (`16 × 1 + 8` pt past its 1 pt stroke),
+/// a painted path (the room past its piece), and the brushed path in a group with an effect of its
+/// own.
+#[test]
+fn a_group_is_culled_by_its_members_brush_art() {
+    const ID: &str = "test.render.paintedbrush.group";
+    install(ID);
+    for painted in [false, true] {
+        let mut d = document();
+        let member = if painted { source(&mut d, ID, false, true) } else { brushed_path(&mut d) };
+        let g = Node::group(d.alloc_id(), vec![Arc::new(member.clone())]);
+        let d = with(d, g);
+        let g = d.layers[0].children().unwrap()[0].clone();
+        let symbols = d.symbol_boxes();
+        let own = crate::brush_fx::cull_bounds(&symbols, &member);
+        assert!(own.is_some_and(|b| b.x0 < -24.0), "painted: {painted}; {own:?}");
+        assert_eq!(crate::brush_fx::cull_bounds(&symbols, &g), own, "painted: {painted}");
+        assert_eq!(crate::painted_bounds(&d, &g), own, "painted: {painted}");
+        assert_eq!(Renderer::new().bounds_of(&symbols, &g), own, "painted: {painted}");
+    }
+    vectorcraft_plugins::registry::remove(ID);
+    // A 4 pt stroke leaves `16 × 4 + 8` pt, past the crop marks. An empty effect id stands for a
+    // stroke of the group's own.
+    for effect in ["adjust.hueSaturation", "cropMarks", ""] {
+        let mut d = document();
+        let mut member = brushed_path(&mut d);
+        member.appearance.stroke_mut().unwrap().width = 4.0;
+        let mut g = Node::group(d.alloc_id(), vec![Arc::new(member.clone())]);
+        if effect.is_empty() {
+            g.appearance = Appearance::basic(Paint::None, Paint::solid(Color::BLACK), 1.0).into();
+        } else {
+            g.appearance.effects = vec![Effect { id: effect.into(), params: json!({}), visible: true }];
+        }
+        let d = with(d, g);
+        let g = d.layers[0].children().unwrap()[0].clone();
+        assert!(crate::fx::has_object_fx(&g), "{effect}: an effect of the group's own");
+        let own = crate::brush_fx::cull_bounds(&d.symbol_boxes(), &member).unwrap();
+        assert!(own.x0 <= -73.9, "{own:?}");
+        let b = crate::painted_bounds(&d, &g);
+        assert!(b.is_some_and(|b| b.union(own) == b), "{effect}: {b:?} holds {own:?}");
+    }
+}
+
+/// A layer leaves the room its members' brushed strokes leave for brush art.
+#[test]
+fn a_layer_is_culled_by_its_members_brush_art() {
+    let mut d = document();
+    let member = brushed_path(&mut d);
+    let d = with(d, member.clone());
+    let layer = d.layers[0].clone();
+    let symbols = d.symbol_boxes();
+    let own = crate::brush_fx::cull_bounds(&symbols, &member);
+    assert!(own.is_some_and(|b| b.x0 <= -24.4 && b.x1 >= 44.4), "{own:?}");
+    assert_eq!(crate::brush_fx::cull_bounds(&symbols, &layer), own);
+    assert_eq!(crate::painted_bounds(&d, &layer), own);
+    assert_eq!(Renderer::new().bounds_of(&symbols, &layer), own);
+}
+
+/// Pieces without a brushed stroke are culled by the pieces alone, as before.
+#[test]
+fn painted_pieces_without_a_brush_take_no_room_for_one() {
+    const ID: &str = "test.render.paintedbrush.plain";
+    install(ID);
+    let mut d = document();
+    let n = source(&mut d, ID, false, false);
+    let d = with(d, n.clone());
+    let symbols = d.symbol_boxes();
+    let b = crate::brush_fx::cull_bounds(&symbols, &n);
+    assert_eq!(b, crate::fx::cull_bounds(&symbols, &n));
+    assert!(b.is_some_and(|b| b.x0 > 100.0 && b.x1 < 150.0), "{b:?}");
+    vectorcraft_plugins::registry::remove(ID);
+}
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..7f23fd25e7 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1818,6 +1818,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 - **A drag ended by a command with Real-time Drawing off:** when Undo, Redo, a filter that calls commands or a plug-in command that calls commands ends a drag whose preview Real-time Drawing off has not applied yet, the preview is applied first and kept as an undo step of its own, as releasing the drag keeps it; a preview that fails cancels the drag. The filter or plug-in command is then given the objects where the drag left them. Regressions: `crates/engine/src/tests/plugins.rs`, `crates/engine/src/tests/prefs.rs`. Scores and hours unchanged.
 - **Plug-in progress, Cancel and log lines (G17):** at plug-in API level 2 a plug-in with the `progress` permission imports `env.vc_progress`, `env.vc_cancelled` and `env.vc_log`. A heavy filter's and an export's progress windows show its progress as a percentage bar, their Cancel reaches it through `vc_cancelled`, a light filter with `progress` and no `commandAllowlist` runs in the background with the same progress window when it runs at once or OK runs it with Preview off, and its log lines go to the app's log with its id, capped per line and per run. Installing checks every import and names the one it refuses. Regressions: `crates/plugins/src/host.rs`, `crates/plugins/tests/abi.rs`, `crates/engine/src/tests/plugins.rs`, `crates/engine/tests/plugin_fuzz.rs`, `crates/ui-egui/src/tests/plugin_runs.rs`. Scores and hours unchanged.
 - **Live-effect plug-ins paint their output (G17, #121):** a live effect whose manifest has `"api": 2` and `"paintOutput": true` returns pieces, each drawn by itself in order with fills and strokes of its own in the filter's paint forms (a piece without them keeps the object's; an empty list paints none; an effect on a fill returns only fills, one on a stroke only strokes). The whole result is checked first: limits, numbers in range with nothing clamped, known keys only, and the swatches and patterns it names in the document; one fault draws that step of the stack unchanged, keeps the effect record and puts the plug-in's name and the field in `plugin.info`'s `lastError`. The pieces are drawn, measured and exported to PDF and SVG from the appearance stack without changing the document, and Expand Appearance writes them as ordinary paths in one undo step. Effects without the key behave as before. Regressions: `crates/plugins/src/painted/tests.rs`, `crates/plugins/src/manifest.rs`, `crates/engine/src/tests/plugins.rs`, `crates/engine/tests/plugin_fuzz.rs`. Scores and hours unchanged.
+- **Painted pieces with brushed strokes are culled and measured by their brush art (G17):** a piece that keeps the object's brushed stroke draws the brush along the piece's own path at the piece's stroke width. Culling leaves VectorCraft's usual room for brush art (16 × the stroke width + 8 pt) past each piece, from the piece's width rather than the object's, and so does culling of a group, layer, symbol instance, blend, envelope or repeat that holds the object. A group or layer also leaves that room for each brushed path among its members, painted or not. Object › Rasterize takes the brush art drawn along each piece and leaves out the object's own brush art, which is not drawn. Pieces without a brush are culled as before. Regressions: `crates/render/src/tests/paintedbrush.rs`. Scores and hours unchanged.
 - **Live-effect plug-ins while a document opens (G17):** the live-effect plug-in runs of a document's first view on screen share a 2,000 ms budget (VectorCraft's own value). A stage left out for time, or one that times out, fails, has no plug-in or meets Safe Mode, draws its input unchanged and is deferred; the status bar says how many, `effect.deferredStatus` lists them with their object, effect and reason, and Effect › Refresh Deferred Effects (`effect.refreshDeferred`) runs them again with a fresh budget. Each document has its own budget, an edit runs the stages it changes, and exports, Expand Appearance and commands run every stage under the 5 s limit of each run. The web build times the budget and each run's limit with the page's `performance.now()`. Regressions: `crates/plugins/src/deferred.rs`, `crates/plugins/src/effect.rs`, `crates/plugins/src/host.rs`, `crates/engine/src/tests/plugins.rs`, `crates/ui-egui/src/canvas/tests.rs`. Scores and hours unchanged.
 - **Refreshing many deferred effects (G17):** Refresh Deferred Effects (`effect.refreshDeferred`) looks up the objects asked for, the stages reached, the objects drawn whole and the inputs that ran in hash sets, so its time no longer grows with the square of the number of deferred stages. The deferred records are indexed by stage and input, so asking whether a stage stays deferred, replacing a stage's records when it runs, and ending a drawing after the first view look at that stage's records only, and the records keep the order they were made in. With 40,000 deferred stages, one refresh in a release build took 38 ms, down from 1,036 ms, and asking about and running each stage once took 16 ms, down from 2,287 ms (wall-clock time on a computer busy with other builds, one run each). Regressions: `crates/plugins/src/deferred.rs`. Scores and hours unchanged.
 - **Refresh Deferred Effects by object (G17):** `effect.refreshDeferred` takes `ids`, or `id` for one, naming objects in the layers or in the art of a symbol, pattern, brush or opacity mask, the objects `effect.deferredStatus` lists; an object without a deferred stage adds nothing to the counts, and an id of no object in the document is an error. Regressions: `crates/engine/src/tests/plugins.rs`. Scores and hours unchanged.

From d956d2165f300bd12eac6516c18f084d5d86d448 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:32:32 -0800
Subject: [PATCH 16/48] SVG: an absolutely placed right-to-left chunk is
 anchored by the edges of its glyphs

A text chunk placed by an absolute x was measured from the pen of its
first character to the farthest glyph end. The first character of a
right-to-left chunk is drawn at its right, so a chunk of several such
characters was measured as that one character: anchored by middle or
end, or starting a line beside absolutely placed characters, it opened
off its position by the width of its other characters.

- A chunk's left and right edges are the smallest glyph start and the
  largest glyph end over all its characters, as SVG 2 anchors a chunk
  (https://www.w3.org/TR/SVG2/text.html#TextLayoutAlgorithm). The first
  character's pen is placed at its own distance from the left edge.
- The layout that measures the chunks has the direction the imported
  text gets: left to right unless the text's direction is rtl. Text
  starting with a digit and holding right-to-left letters was measured
  right to left.
- The chunks are measured in the first of the layouts that kern the
  characters onto their x, so anchored text is laid out once less.
---
 crates/svg/src/import/text.rs      | 95 +++++++++++++++++-------------
 crates/svg/tests/it/import_text.rs | 39 ++++++++++++
 docs/target-app-parity.md          |  2 +-
 3 files changed, 95 insertions(+), 41 deletions(-)

diff --git a/crates/svg/src/import/text.rs b/crates/svg/src/import/text.rs
index f0d50a747d..419e73a385 100644
--- a/crates/svg/src/import/text.rs
+++ b/crates/svg/src/import/text.rs
@@ -1244,6 +1244,7 @@ impl Ctx {
             }
         });
         let vertical = self.prop(t, "writing-mode").is_some_and(|m| m.starts_with("tb") || m.starts_with("vertical"));
+        let rtl = self.prop(t, "direction").is_some_and(|d| d.trim() == "rtl");
         // Where the chunk starting at character `i` sits on its anchor: 0 its left (or top) edge,
         // 0.5 its middle, 1 its right (or bottom) edge; on a path, its edge toward the path's
         // start, its middle or its edge toward the path's end. In horizontal type `start` and
@@ -1305,7 +1306,7 @@ impl Ctx {
             obj.xf = Affine::IDENTITY;
         } else {
             let origin = Point::new(x[0].unwrap_or(0.0) + dx[0], y[0].unwrap_or(0.0) + dy[0]);
-            let (justify, left, starts) = lines(&mut cells, &x, &y, &dx, &dy, &anchor_of, origin.x, &mut breaks);
+            let (justify, left, starts) = lines(&mut cells, &x, &y, &dx, &dy, &anchor_of, rtl, origin.x, &mut breaks);
             obj.para.justify = justify;
             obj.xf = Affine::translate((finite(left), finite(origin.y)));
             // Lines anchored differently or at different x (paragraphs aligned or indented
@@ -1331,13 +1332,7 @@ impl Ctx {
         if !para_styles.is_empty() {
             obj.set_paragraph_styles(para_styles);
         }
-        // SVG text runs left to right unless `direction: rtl` says otherwise, whatever its first
-        // strong character: pinned (on every paragraph) when that would read as right to left.
-        if self.prop(t, "direction").is_some_and(|d| d.trim() == "rtl") {
-            obj.edit_paras(None, |pa| pa.direction = Some(ParaDirection::RightToLeft));
-        } else if obj.plain_text().split('\n').any(|p| vectorcraft_text::paragraph_is_rtl(p, None)) {
-            obj.edit_paras(None, |pa| pa.direction = Some(ParaDirection::LeftToRight));
-        }
+        pin_direction(&mut obj, rtl);
         keep_reader_anchors(&mut obj);
         // The placeholder covers the text (laid out when a paint server needs its bounding box).
         let b = if paints.is_empty() { obj.bounds() } else { Some(obj.xf.transform_rect_bbox(measure(&obj).bounds)) }.unwrap_or_default();
@@ -1442,8 +1437,9 @@ fn leading_tolerance(spacing: f64) -> f64 {
 /// Point type: line breaks, baseline shifts and kerning from the positioning lists. Returns the
 /// justification, the x of the first line's left (or anchor) edge and each line's first
 /// character, alignment (as for [`justify_of`]) and anchor x. `anchor_of` gives where the chunk
-/// starting at a character sits on its anchor. When characters are placed on their own, every
-/// line is left-aligned and its anchor x is its left edge.
+/// starting at a character sits on its anchor, and `rtl` whether the text's `direction` is `rtl`
+/// ([`pin_direction`]). When characters are placed on their own, every line is left-aligned and
+/// its anchor x is its left edge.
 #[allow(clippy::too_many_arguments)]
 fn lines(
     cells: &mut [Cell],
@@ -1452,6 +1448,7 @@ fn lines(
     dx: &[f64],
     dy: &[f64],
     anchor_of: &dyn Fn(usize) -> f64,
+    rtl: bool,
     x0: f64,
     breaks: &mut Vec<Break>,
 ) -> (Justify, f64, Vec<(usize, f64, f64)>) {
@@ -1501,47 +1498,54 @@ fn lines(
     }
     // Absolutely placed characters: lay the text out left-aligned and kern each one onto its x.
     // SVG anchors every absolutely placed chunk on its own, so a chunk not anchored at its left
-    // edge moves back by its share of its own width.
+    // edge moves back by its share of its own width. A chunk's edges are those of its glyphs as
+    // they are drawn: the first character of a right-to-left chunk is at its right.
     let line_of = |i: usize| lines.partition_point(|(s, _)| *s <= i) - 1;
+    // Chunk starts in order: line starts and absolutely placed characters.
+    let mut starts: Vec<usize> = lines.iter().map(|l| l.0).chain(targets.iter().map(|t| t.0)).collect();
+    starts.sort_unstable();
+    // The left and right edges of the chunk starting at character `s`, from each character's pen and end.
+    let edges = |s: usize, pens: &[Option<f64>], ends: &[Option<f64>]| {
+        let e = starts.get(starts.partition_point(|&c| c <= s)).copied().unwrap_or(n);
+        let left = (s..e).filter_map(|j| pens[j]).fold(f64::INFINITY, f64::min);
+        let right = (s..e).filter_map(|j| ends[j]).fold(f64::NEG_INFINITY, f64::max);
+        (left.is_finite() && right.is_finite()).then_some((left, right))
+    };
     let mut line_left: Vec<f64> = lines.iter().map(|l| l.1).collect();
-    let mut wants: Vec<(usize, f64)> = targets.clone();
-    if lines.iter().chain(&targets).any(|c| anchor_of(c.0) > 0.0) {
-        let (runs, bytes) = assemble(cells, breaks);
-        let lay = measure(&with_runs(runs.0));
-        let (pens, ends) = pens(&lay, &bytes);
-        // Chunk starts in order: line starts and absolutely placed characters.
-        let mut starts: Vec<usize> = lines.iter().map(|l| l.0).chain(targets.iter().map(|t| t.0)).collect();
-        starts.sort_unstable();
-        let width = |s: usize| {
-            let k = starts.partition_point(|&c| c <= s);
-            let e = starts.get(k).copied().unwrap_or(n);
-            let end = (s..e).filter_map(|j| ends[j]).fold(f64::NEG_INFINITY, f64::max);
-            match pens[s] {
-                Some(p) if end.is_finite() => end - p,
-                _ => 0.0,
-            }
-        };
-        line_left = lines.iter().map(|&(s, lx)| lx - anchor_of(s) * width(s)).collect();
-        for w in &mut wants {
-            w.1 -= anchor_of(w.0) * width(w.0);
-        }
-    }
-    for w in &mut wants {
-        w.1 -= line_left[line_of(w.0)];
-    }
+    // Where each absolutely placed character's pen goes, from the left edge of its line's first chunk.
+    let mut wants: Vec<(usize, f64)> = vec![];
     // Kerning changes shaping (pair kerning is off for manually kerned characters): repeat until
     // every character sits on its x.
-    for _ in 0..4 {
+    for round in 0..4 {
         let (runs, bytes) = assemble(cells, breaks);
-        let lay = measure(&with_runs(runs.0));
-        let (pens, _) = pens(&lay, &bytes);
+        let mut text = with_runs(runs.0);
+        pin_direction(&mut text, rtl);
+        let (pens, ends) = pens(&measure(&text), &bytes);
+        // The edges of each line's first chunk, found once a round.
+        let first: Vec<Option<(f64, f64)>> = lines.iter().map(|&(s, _)| edges(s, &pens, &ends)).collect();
+        if round == 0 {
+            // The chunks as they lie before any is moved: each one's left edge on its anchor.
+            let left_at = |s: usize, x: f64, chunk: Option<(f64, f64)>| chunk.map_or(x, |(left, right)| x - anchor_of(s) * (right - left));
+            let first_left: Vec<f64> = lines.iter().zip(&first).map(|(&(s, lx), &chunk)| left_at(s, lx, chunk)).collect();
+            wants = targets
+                .iter()
+                .map(|&(i, x)| {
+                    let chunk = edges(i, &pens, &ends);
+                    // The pen of a right-to-left chunk's first character is right of the chunk's left edge.
+                    let pen = pens[i].zip(chunk).map_or(0.0, |(p, (left, _))| p - left);
+                    (i, left_at(i, x, chunk) + pen - first_left[line_of(i)])
+                })
+                .collect();
+            // A line's layout starts at the line's left edge, and its first chunk's left edge is `left` from there.
+            line_left = first_left.iter().zip(&first).map(|(&x, chunk)| x - chunk.map_or(0.0, |(left, _)| left)).collect();
+        }
         let (mut line, mut moved, mut worst) = (usize::MAX, 0.0, 0.0f64);
         for &(i, want) in &wants {
             let l = line_of(i);
             if l != line {
                 (line, moved) = (l, 0.0);
             }
-            let (Some(p), Some(p0)) = (pens[i], pens[lines[l].0]) else { continue };
+            let (Some(p), Some((p0, _))) = (pens[i], first[l]) else { continue };
             let d = want - (p - p0 + moved);
             cells[i - 1].kern += d;
             moved += d;
@@ -1606,6 +1610,17 @@ fn keep_reader_anchors(obj: &mut TextObject) {
     obj.set_paragraph_styles(styles);
 }
 
+/// SVG text runs left to right unless `direction: rtl` on the `<text>` says otherwise (`rtl`),
+/// whatever its first strong character: pinned (on every paragraph of `obj`) when that would read
+/// as right to left.
+fn pin_direction(obj: &mut TextObject, rtl: bool) {
+    if rtl {
+        obj.edit_paras(None, |pa| pa.direction = Some(ParaDirection::RightToLeft));
+    } else if obj.plain_text().split('\n').any(|p| vectorcraft_text::paragraph_is_rtl(p, None)) {
+        obj.edit_paras(None, |pa| pa.direction = Some(ParaDirection::LeftToRight));
+    }
+}
+
 /// A left-aligned point text of `runs` at the origin (for measuring).
 fn with_runs(runs: Vec<TextRun>) -> TextObject {
     let mut t = TextObject::point(Point::ZERO, "", CharStyle::default());
diff --git a/crates/svg/tests/it/import_text.rs b/crates/svg/tests/it/import_text.rs
index 01f541d8d6..92747cd05a 100644
--- a/crates/svg/tests/it/import_text.rs
+++ b/crates/svg/tests/it/import_text.rs
@@ -512,6 +512,45 @@ fn absolutely_placed_chunks_use_their_own_rtl_anchor() {
     }
 }
 
+/// A right-to-left chunk of several characters is anchored by its visual edges: its first
+/// character is drawn at its right, so the chunk runs left from that character's right edge.
+#[test]
+fn absolutely_placed_rtl_chunks_of_several_characters_anchor_by_their_visual_edges() {
+    // (markup, share of the right-to-left chunk's advance left of x = 200)
+    for (body, share) in [
+        (r#"<text x="80 200" y="40" font-size="20">a<tspan direction="rtl">אב</tspan></text>"#, 1.0),
+        (r#"<text x="80 200" y="40" font-size="20">a<tspan direction="rtl" text-anchor="middle">אב</tspan></text>"#, 0.5),
+        (r#"<text x="80 200" y="40" font-size="20">a<tspan direction="rtl" text-anchor="end">אב</tspan></text>"#, 0.0),
+        (r#"<text x="80 200" y="40" font-size="20">a<tspan text-anchor="end">אב</tspan></text>"#, 1.0),
+        // A digit is not a strong character: the text still runs left to right.
+        (r#"<text x="80 200" y="40" font-size="20">1<tspan direction="rtl" text-anchor="end">אב</tspan></text>"#, 0.0),
+        // The chunk starts a line, and another line holds absolutely placed characters.
+        (r#"<text y="40" font-size="20"><tspan x="200" direction="rtl">אב</tspan><tspan x="50 100" dy="30">ab</tspan></text>"#, 1.0),
+        (
+            r#"<text y="40" font-size="20"><tspan x="200" direction="rtl" text-anchor="middle">אב</tspan><tspan x="50 100" dy="30">ab</tspan></text>"#,
+            0.5,
+        ),
+        (
+            r#"<text y="40" font-size="20"><tspan x="200" direction="rtl" text-anchor="end">אב</tspan><tspan x="50 100" dy="30">ab</tspan></text>"#,
+            0.0,
+        ),
+    ] {
+        let d = open(body);
+        let t = only_text(&d);
+        let lay = layout(FontDb::global(), t);
+        let chunk: Vec<_> = lay.glyphs.iter().filter(|g| g.rtl).collect();
+        assert_eq!(chunk.len(), 2, "{body}");
+        assert!(chunk.iter().all(|g| g.advance > 1.0), "{body}: both letters have an advance");
+        let left = chunk.iter().map(|g| (t.xf * g.origin).x).fold(f64::INFINITY, f64::min);
+        let right = chunk.iter().map(|g| (t.xf * g.origin).x + g.advance).fold(f64::NEG_INFINITY, f64::max);
+        let want = 200.0 - share * (right - left);
+        assert!(close(left, want, 0.05), "{body}: the chunk spans {left}..{right}, so it does not start at {want}");
+        // The first character is the right one of the two.
+        let first = lay.glyphs.iter().filter(|g| g.rtl).min_by_key(|g| g.byte).map(|g| (t.xf * g.origin).x);
+        assert!(first.is_some_and(|x| x > left + 1.0), "{body}: the first character starts at {first:?}, the chunk at {left}");
+    }
+}
+
 #[test]
 fn a_small_line_gap_in_tiny_type_keeps_its_leading() {
     // 0.0085 against an auto leading of 0.006 differs by less than 0.01 but is not a whole multiple of it.
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index a202baa403..613bbd90d7 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1526,7 +1526,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
     A function-based PDF shading (type 1) whose colour changes along one axis only, as a browser writes a repeating linear gradient, comes in as a linear gradient over its domain, each hard colour change two stops at one offset; one whose colour changes in two directions comes in as its average colour, with a warning. Either paints only over the shading's domain. Both came in as a flat grey that wasn't in the file (#3621). Each such shading is read once per import, and all of them within one budget of 200,000 function evaluations, so a file filling thousands of paths with long functions still opens in about a second (it took minutes); past the budget they come in as their average colour, then grey, with a warning.
     A gap between glyphs of two sizes is measured against the smaller one, so a word set beside a much larger one with no space glyph between them (a browser's margin between two sizes, as in `≤ 4` and a small `hours`) keeps its word space (#3623).
     SVG import's style cascade, used for hidden objects, non-scaling strokes and type, tests each element only against the `<style>` rules for its id, its classes and its element name, and the rules whose selector ends in none of these (`*`, `[x]`).
-    SVG import places right-to-left point type and type on a path as [SVG 2's `text-anchor`](https://www.w3.org/TR/SVG2/text.html#TextAnchoringProperties) says: with `direction: rtl`, `start` puts the right edge of the text at its position (on a path, the text ends at `startOffset`) and `end` puts the left edge there. Each line and each absolutely placed chunk is anchored by the `text-anchor` and `direction` of the element holding its first character, a `<tspan>`'s own included, and each line starts at its own `x`. A letter-spaced right-to-left line keeps the tracking of all its letters inside the advance it anchors (`rtl_point_text_start_and_end_use_directional_edges`, `rtl_type_on_a_path_starts_at_its_directional_edge`, `rtl_letter_spaced_lines_stay_on_their_anchor`, `rtl_lines_use_each_chunk_first_character_direction_and_anchor`, `each_line_starts_at_its_own_x` and `absolutely_placed_chunks_use_their_own_rtl_anchor` in `crates/svg/tests/it/import_text.rs`).
+    SVG import places right-to-left point type and type on a path as [SVG 2's `text-anchor`](https://www.w3.org/TR/SVG2/text.html#TextAnchoringProperties) says: with `direction: rtl`, `start` puts the right edge of the text at its position (on a path, the text ends at `startOffset`) and `end` puts the left edge there. Each line and each absolutely placed chunk is anchored by the `text-anchor` and `direction` of the element holding its first character, a `<tspan>`'s own included, and each line starts at its own `x`. An absolutely placed chunk is anchored by the left and right edges of its glyphs as they are drawn, so a chunk of several right-to-left characters, whose first character is drawn at its right, sits on its anchor too. A letter-spaced right-to-left line keeps the tracking of all its letters inside the advance it anchors (`rtl_point_text_start_and_end_use_directional_edges`, `rtl_type_on_a_path_starts_at_its_directional_edge`, `rtl_letter_spaced_lines_stay_on_their_anchor`, `rtl_lines_use_each_chunk_first_character_direction_and_anchor`, `each_line_starts_at_its_own_x`, `absolutely_placed_chunks_use_their_own_rtl_anchor` and `absolutely_placed_rtl_chunks_of_several_characters_anchor_by_their_visual_edges` in `crates/svg/tests/it/import_text.rs`).
     A `.svgz` file copied in a file manager pastes as its art, as a copied `.svg` file does.
     SVG export (Save As, Export As, Export for Screens, Asset Export and the clipboard share the writer) writes simple shapes as SVG basic shapes, as the reference app does (an ellipse is an `ellipse` tag until an anchor is added, [forum](https://community.adobe.com/t5/illustrator-discussions/trouble-exporting-shape-with-points-to-svg/td-p/10720325); rectangles come out as `<rect>` and `<polygon>`, [forum](https://community.adobe.com/t5/illustrator-discussions/force-svg-export-using-all-lt-rect-gt/td-p/11282378)): an axis-aligned rectangle as `<rect>`, a circle or ellipse drawn with four standard arcs as `<circle>`/`<ellipse>`, a straight line as `<line>`, and other straight-segment paths as `<polygon>`/`<polyline>`, at the written precision (#4652). A rectangle or ellipse with a dashed stroke, whose dashes would start elsewhere, a turned ellipse, curves and compound paths stay `<path>`. `crates/svg/tests/it/basic_shapes.rs` checks each element, that the picture renders as the canvas does and that the geometry reimports.
     At a precision of 9 decimals or fewer, SVG export writes each number from an integer when the integer rounds it as the decimal formatter does; the formatter still writes values halfway between two written numbers and values too large for the integer. Exporting one path of 200,000 anchors takes a median of 43.4 ms instead of 167.0 ms on Windows 11, and 20,000 rectangles 81.4 ms instead of 141.4 ms, with the same SVG (`crates/svg/src/lib.rs`).

From d747f5b36574b9d3a779ed63387063aa25e71d76 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:34:35 -0800
Subject: [PATCH 17/48] Learn: Back to skills and the Quick skill guide card
 run learn.skills

learn.skills {} shows the Learn panel on its Skills tab with the list of
skills, with no skill and no tutorial open, and returns what learn.list
returns. Back to skills after a skill's last tutorial and the Quick skill
guide card on the For you tab now run it, so the control channel and MCP
can reach the same view.

- The command is listed in both UI command catalogs, and its label has a
  row in every catalog.
- Docs: docs/mcp.md, docs/target-app-parity.md, docs/ui-parity.md.
---
 crates/mcp/src/ui_catalog.rs             |  6 ++++
 crates/ui-egui/src/i18n/bg.tsv           |  1 +
 crates/ui-egui/src/i18n/bs.tsv           |  1 +
 crates/ui-egui/src/i18n/ca.tsv           |  1 +
 crates/ui-egui/src/i18n/cs.tsv           |  1 +
 crates/ui-egui/src/i18n/da.tsv           |  1 +
 crates/ui-egui/src/i18n/de.tsv           |  1 +
 crates/ui-egui/src/i18n/el.tsv           |  1 +
 crates/ui-egui/src/i18n/es.tsv           |  1 +
 crates/ui-egui/src/i18n/fi.tsv           |  1 +
 crates/ui-egui/src/i18n/fr.tsv           |  1 +
 crates/ui-egui/src/i18n/hi.tsv           |  1 +
 crates/ui-egui/src/i18n/hu.tsv           |  1 +
 crates/ui-egui/src/i18n/id.tsv           |  1 +
 crates/ui-egui/src/i18n/it.tsv           |  1 +
 crates/ui-egui/src/i18n/ja.tsv           |  1 +
 crates/ui-egui/src/i18n/ka.tsv           |  1 +
 crates/ui-egui/src/i18n/ko.tsv           |  1 +
 crates/ui-egui/src/i18n/nl.tsv           |  1 +
 crates/ui-egui/src/i18n/pl.tsv           |  1 +
 crates/ui-egui/src/i18n/pt-br.tsv        |  1 +
 crates/ui-egui/src/i18n/ru.tsv           |  1 +
 crates/ui-egui/src/i18n/sv.tsv           |  1 +
 crates/ui-egui/src/i18n/tr.tsv           |  1 +
 crates/ui-egui/src/i18n/uk.tsv           |  1 +
 crates/ui-egui/src/i18n/vi.tsv           |  1 +
 crates/ui-egui/src/i18n/zh-hans.tsv      |  1 +
 crates/ui-egui/src/i18n/zh-hant.tsv      |  1 +
 crates/ui-egui/src/menus/ui_commands.rs  |  6 ++++
 crates/ui-egui/src/panels/learn.rs       | 39 ++++++++++++++++--------
 crates/ui-egui/src/panels/learn/tests.rs | 35 +++++++++++++++++++++
 docs/mcp.md                              |  5 ++-
 docs/target-app-parity.md                |  2 +-
 docs/ui-parity.md                        |  2 +-
 34 files changed, 106 insertions(+), 16 deletions(-)

diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs
index bffe47bfa7..2337e08a23 100644
--- a/crates/mcp/src/ui_catalog.rs
+++ b/crates/mcp/src/ui_catalog.rs
@@ -646,6 +646,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "",
         "{} the Learn panel's skills in the order its Skills tab lists them: {skills: [{id, title, tutorials: [{id, title, steps: number of steps}]}]}",
     ),
+    (
+        "learn.skills",
+        "Back to Skills",
+        "",
+        "{} show the Learn panel on its Skills tab with the list of skills, with no skill and no tutorial open, as Back to skills after a skill's last tutorial and the Quick skill guide card do; returns what learn.list returns",
+    ),
     (
         "learn.show",
         "Show Tutorial",
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 0cc6e106ce..d78cc54a7f 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -6752,6 +6752,7 @@ breakText	Glyphs	Глифи
 	Open Tutorial Sample	Отваряне на примерния файл на урока
 	Finish Tutorial	Завършване на урок
 	Next Tutorial	Следващ урок
+	Back to Skills	Обратно към уменията
 @msg	tutorial `{id}` has no practice sample	урокът `{id}` няма примерен файл за упражнение
 @msg	open the practice sample of `{id}` first (see learn.openSample)	първо отворете примерния файл за упражнение на `{id}` (вижте learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	първо завършете `{id}` (вижте learn.finish)
diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv
index 2df8131afe..f0567886a3 100644
--- a/crates/ui-egui/src/i18n/bs.tsv
+++ b/crates/ui-egui/src/i18n/bs.tsv
@@ -6806,6 +6806,7 @@ shape	Open	Otvoren
 	Open Tutorial Sample	Otvori uzorak tutorijala
 	Finish Tutorial	Završi tutorijal
 	Next Tutorial	Sljedeći tutorijal
+	Back to Skills	Nazad na vještine
 @msg	tutorial `{id}` has no practice sample	tutorijal `{id}` nema uzorak za vježbu
 @msg	open the practice sample of `{id}` first (see learn.openSample)	prvo otvorite uzorak za vježbu tutorijala `{id}` (vidi learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	prvo završite `{id}` (vidi learn.finish)
diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv
index 71959a3767..ac567a79c9 100644
--- a/crates/ui-egui/src/i18n/ca.tsv
+++ b/crates/ui-egui/src/i18n/ca.tsv
@@ -7329,6 +7329,7 @@ breakText	Glyphs	Glifs
 	Open Tutorial Sample	Obre la mostra del tutorial
 	Finish Tutorial	Acaba el tutorial
 	Next Tutorial	Tutorial següent
+	Back to Skills	Torna a les habilitats
 @msg	tutorial `{id}` has no practice sample	el tutorial `{id}` no té cap mostra de pràctica
 @msg	open the practice sample of `{id}` first (see learn.openSample)	obriu primer la mostra de pràctica de `{id}` (vegeu learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	acabeu primer `{id}` (vegeu learn.finish)
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index ca6c1cb875..0a24396a38 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -7348,6 +7348,7 @@ breakText	Glyphs	Glyfy
 	Open Tutorial Sample	Otevřít ukázku výukového kurzu
 	Finish Tutorial	Dokončit výukový kurz
 	Next Tutorial	Další výukový kurz
+	Back to Skills	Zpět na dovednosti
 @msg	tutorial `{id}` has no practice sample	výukový kurz `{id}` nemá cvičnou ukázku
 @msg	open the practice sample of `{id}` first (see learn.openSample)	nejprve otevřete cvičnou ukázku kurzu `{id}` (viz learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	nejprve dokončete `{id}` (viz learn.finish)
diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv
index 70411cbd00..3cd2805bd1 100644
--- a/crates/ui-egui/src/i18n/da.tsv
+++ b/crates/ui-egui/src/i18n/da.tsv
@@ -6768,6 +6768,7 @@ breakText	Glyphs	Glyffer
 	Open Tutorial Sample	Åbn eksempel til vejledning
 	Finish Tutorial	Afslut vejledning
 	Next Tutorial	Næste vejledning
+	Back to Skills	Tilbage til færdigheder
 @msg	tutorial `{id}` has no practice sample	vejledningen `{id}` har intet øvelseseksempel
 @msg	open the practice sample of `{id}` first (see learn.openSample)	åbn først øvelseseksemplet til `{id}` (se learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	afslut først `{id}` (se learn.finish)
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index eceefc5fb0..86f53f6b93 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -6943,6 +6943,7 @@ breakText	Glyphs	Glyphen
 	Open Tutorial Sample	Übungsdatei des Lernprogramms öffnen
 	Finish Tutorial	Lernprogramm abschließen
 	Next Tutorial	Nächstes Lernprogramm
+	Back to Skills	Zurück zu den Fertigkeiten
 @msg	tutorial `{id}` has no practice sample	das Lernprogramm `{id}` hat keine Übungsdatei
 @msg	open the practice sample of `{id}` first (see learn.openSample)	öffnen Sie zuerst die Übungsdatei von `{id}` (siehe learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	schließen Sie zuerst `{id}` ab (siehe learn.finish)
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index 79e834ebee..337e0d08a1 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -7300,6 +7300,7 @@ breakText	Glyphs	Γλύφοι
 	Open Tutorial Sample	Άνοιγμα δείγματος οδηγού εκμάθησης
 	Finish Tutorial	Ολοκλήρωση οδηγού εκμάθησης
 	Next Tutorial	Επόμενος οδηγός εκμάθησης
+	Back to Skills	Πίσω στις δεξιότητες
 @msg	tutorial `{id}` has no practice sample	ο οδηγός εκμάθησης `{id}` δεν έχει δείγμα εξάσκησης
 @msg	open the practice sample of `{id}` first (see learn.openSample)	ανοίξτε πρώτα το δείγμα εξάσκησης του `{id}` (δείτε learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	ολοκληρώστε πρώτα το `{id}` (δείτε learn.finish)
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index 905221dc68..3717681302 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -7291,6 +7291,7 @@ breakText	Glyphs	Glifos
 	Open Tutorial Sample	Abrir muestra del tutorial
 	Finish Tutorial	Terminar tutorial
 	Next Tutorial	Tutorial siguiente
+	Back to Skills	Volver a las habilidades
 @msg	tutorial `{id}` has no practice sample	el tutorial `{id}` no tiene muestra de práctica
 @msg	open the practice sample of `{id}` first (see learn.openSample)	abre primero la muestra de práctica de `{id}` (consulta learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	termina primero `{id}` (consulta learn.finish)
diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv
index 2227a31c33..4a3e1750e1 100644
--- a/crates/ui-egui/src/i18n/fi.tsv
+++ b/crates/ui-egui/src/i18n/fi.tsv
@@ -7383,6 +7383,7 @@ breakText	Glyphs	Merkit
 	Open Tutorial Sample	Avaa opetusohjelman harjoitustiedosto
 	Finish Tutorial	Viimeistele opetusohjelma
 	Next Tutorial	Seuraava opetusohjelma
+	Back to Skills	Takaisin taitoihin
 @msg	tutorial `{id}` has no practice sample	opetusohjelmalla `{id}` ei ole harjoitustiedostoa
 @msg	open the practice sample of `{id}` first (see learn.openSample)	avaa ensin opetusohjelman `{id}` harjoitustiedosto (ks. learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	viimeistele ensin `{id}` (ks. learn.finish)
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index 22d5e3d376..cc0ae10971 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -7343,6 +7343,7 @@ breakText	Glyphs	Glyphes
 	Open Tutorial Sample	Ouvrir le fichier d’exercice du tutoriel
 	Finish Tutorial	Terminer le tutoriel
 	Next Tutorial	Tutoriel suivant
+	Back to Skills	Retour aux compétences
 @msg	tutorial `{id}` has no practice sample	le tutoriel `{id}` n’a pas de fichier d’exercice
 @msg	open the practice sample of `{id}` first (see learn.openSample)	ouvrez d’abord le fichier d’exercice de `{id}` (voir learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	terminez d’abord `{id}` (voir learn.finish)
diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv
index 996e534ef0..4f7b6c3715 100644
--- a/crates/ui-egui/src/i18n/hi.tsv
+++ b/crates/ui-egui/src/i18n/hi.tsv
@@ -8741,6 +8741,7 @@ theme	Appearance	अपीयरेंस
 	Open Tutorial Sample	ट्यूटोरियल का नमूना खोलें
 	Finish Tutorial	ट्यूटोरियल पूरा करें
 	Next Tutorial	अगला ट्यूटोरियल
+	Back to Skills	कौशल पर वापस जाएँ
 @msg	tutorial `{id}` has no practice sample	ट्यूटोरियल `{id}` का कोई अभ्यास नमूना नहीं है
 @msg	open the practice sample of `{id}` first (see learn.openSample)	पहले `{id}` का अभ्यास नमूना खोलें (learn.openSample देखें)
 @msg	finish `{id}` first (see learn.finish)	पहले `{id}` पूरा करें (learn.finish देखें)
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index 5c38da2fb4..92067127aa 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -7332,6 +7332,7 @@ breakText	Glyphs	Glifák
 	Open Tutorial Sample	Oktatóanyag mintafájljának megnyitása
 	Finish Tutorial	Oktatóanyag befejezése
 	Next Tutorial	Következő oktatóanyag
+	Back to Skills	Vissza a készségekhez
 @msg	tutorial `{id}` has no practice sample	nincs gyakorló mintafájl ehhez az oktatóanyaghoz: `{id}`
 @msg	open the practice sample of `{id}` first (see learn.openSample)	előbb nyissa meg a gyakorló mintafájlt ehhez: `{id}` (lásd: learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	előbb fejezze be ezt: `{id}` (lásd: learn.finish)
diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv
index 75b03775f3..0effb51048 100644
--- a/crates/ui-egui/src/i18n/id.tsv
+++ b/crates/ui-egui/src/i18n/id.tsv
@@ -6768,6 +6768,7 @@ breakText	Glyphs	Glif
 	Open Tutorial Sample	Buka contoh tutorial
 	Finish Tutorial	Selesaikan tutorial
 	Next Tutorial	Tutorial berikutnya
+	Back to Skills	Kembali ke keterampilan
 @msg	tutorial `{id}` has no practice sample	tutorial `{id}` tidak memiliki contoh latihan
 @msg	open the practice sample of `{id}` first (see learn.openSample)	buka contoh latihan `{id}` terlebih dahulu (lihat learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	selesaikan `{id}` terlebih dahulu (lihat learn.finish)
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index 1304d8cf61..5f2571e648 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -6977,6 +6977,7 @@ breakText	Glyphs	Glifi
 	Open Tutorial Sample	Apri l’esempio del tutorial
 	Finish Tutorial	Termina il tutorial
 	Next Tutorial	Tutorial successivo
+	Back to Skills	Torna alle competenze
 @msg	tutorial `{id}` has no practice sample	il tutorial `{id}` non ha un esempio di esercitazione
 @msg	open the practice sample of `{id}` first (see learn.openSample)	apri prima l’esempio di esercitazione di `{id}` (vedi learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	termina prima `{id}` (vedi learn.finish)
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index 1d5d882a82..9603ed5d36 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -7042,6 +7042,7 @@ breakText	Glyphs	字形
 	Open Tutorial Sample	チュートリアルのサンプルを開く
 	Finish Tutorial	チュートリアルを完了
 	Next Tutorial	次のチュートリアル
+	Back to Skills	スキルに戻る
 @msg	tutorial `{id}` has no practice sample	チュートリアル `{id}` には練習用サンプルがありません
 @msg	open the practice sample of `{id}` first (see learn.openSample)	先に `{id}` の練習用サンプルを開いてください (learn.openSample を参照)
 @msg	finish `{id}` first (see learn.finish)	先に `{id}` を完了してください (learn.finish を参照)
diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv
index 8e4de4c62d..d923131a58 100644
--- a/crates/ui-egui/src/i18n/ka.tsv
+++ b/crates/ui-egui/src/i18n/ka.tsv
@@ -7462,6 +7462,7 @@ font-script	Japanese	იაპონური
 	Open Tutorial Sample	გაკვეთილის ნიმუშის გახსნა
 	Finish Tutorial	გაკვეთილის დასრულება
 	Next Tutorial	შემდეგი გაკვეთილი
+	Back to Skills	უნარებზე დაბრუნება
 @msg	tutorial `{id}` has no practice sample	გაკვეთილს `{id}` არ აქვს სავარჯიშო ნიმუში
 @msg	open the practice sample of `{id}` first (see learn.openSample)	ჯერ გახსენით `{id}` გაკვეთილის სავარჯიშო ნიმუში (იხ. learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	ჯერ დაასრულეთ `{id}` (იხ. learn.finish)
diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv
index 7d8f77477b..1f277fca5c 100644
--- a/crates/ui-egui/src/i18n/ko.tsv
+++ b/crates/ui-egui/src/i18n/ko.tsv
@@ -6938,6 +6938,7 @@ breakText	Glyphs	글리프
 	Open Tutorial Sample	튜토리얼 샘플 열기
 	Finish Tutorial	튜토리얼 완료
 	Next Tutorial	다음 튜토리얼
+	Back to Skills	기술로 돌아가기
 @msg	tutorial `{id}` has no practice sample	튜토리얼 `{id}`에 연습용 샘플이 없습니다
 @msg	open the practice sample of `{id}` first (see learn.openSample)	먼저 `{id}`의 연습용 샘플을 여세요(learn.openSample 참조)
 @msg	finish `{id}` first (see learn.finish)	먼저 `{id}`을(를) 완료하세요(learn.finish 참조)
diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv
index db793697a6..2af19e1fa9 100644
--- a/crates/ui-egui/src/i18n/nl.tsv
+++ b/crates/ui-egui/src/i18n/nl.tsv
@@ -6819,6 +6819,7 @@ breakText	Glyphs	Glyphs
 	Open Tutorial Sample	Oefenbestand van tutorial openen
 	Finish Tutorial	Tutorial voltooien
 	Next Tutorial	Volgende tutorial
+	Back to Skills	Terug naar vaardigheden
 @msg	tutorial `{id}` has no practice sample	tutorial `{id}` heeft geen oefenbestand
 @msg	open the practice sample of `{id}` first (see learn.openSample)	open eerst het oefenbestand van `{id}` (zie learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	voltooi eerst `{id}` (zie learn.finish)
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index 372697fdef..581e28b65b 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -7204,6 +7204,7 @@ breakText	Glyphs	Glify
 	Open Tutorial Sample	Otwórz przykład samouczka
 	Finish Tutorial	Zakończ samouczek
 	Next Tutorial	Następny samouczek
+	Back to Skills	Powrót do umiejętności
 @msg	tutorial `{id}` has no practice sample	samouczek `{id}` nie ma przykładu do ćwiczeń
 @msg	open the practice sample of `{id}` first (see learn.openSample)	najpierw otwórz przykład do ćwiczeń samouczka `{id}` (patrz learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	najpierw zakończ `{id}` (patrz learn.finish)
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index 728f11dafa..81bf348c96 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -7421,6 +7421,7 @@ swatch	Yellow Green	Verde-amarelado
 	Open Tutorial Sample	Abrir Amostra do Tutorial
 	Finish Tutorial	Concluir Tutorial
 	Next Tutorial	Próximo Tutorial
+	Back to Skills	Voltar às Habilidades
 @msg	tutorial `{id}` has no practice sample	o tutorial `{id}` não tem amostra de prática
 @msg	open the practice sample of `{id}` first (see learn.openSample)	abra primeiro a amostra de prática de `{id}` (veja learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	conclua primeiro `{id}` (veja learn.finish)
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index 2f5708c436..4ab210b59d 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -7437,6 +7437,7 @@ shape	Open	Открытый
 	Open Tutorial Sample	Открыть пример урока
 	Finish Tutorial	Завершить урок
 	Next Tutorial	Следующий урок
+	Back to Skills	Назад к навыкам
 @msg	tutorial `{id}` has no practice sample	у урока `{id}` нет учебного примера
 @msg	open the practice sample of `{id}` first (see learn.openSample)	сначала откройте учебный пример урока `{id}` (см. learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	сначала завершите `{id}` (см. learn.finish)
diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv
index a05aa652d6..5c0ba43b1c 100644
--- a/crates/ui-egui/src/i18n/sv.tsv
+++ b/crates/ui-egui/src/i18n/sv.tsv
@@ -8787,6 +8787,7 @@ digits	Hindi	Hindi
 	Open Tutorial Sample	Öppna övningsexempel för självstudie
 	Finish Tutorial	Slutför självstudie
 	Next Tutorial	Nästa självstudie
+	Back to Skills	Tillbaka till färdigheter
 @msg	tutorial `{id}` has no practice sample	självstudien `{id}` har inget övningsexempel
 @msg	open the practice sample of `{id}` first (see learn.openSample)	öppna först övningsexemplet för `{id}` (se learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	slutför först `{id}` (se learn.finish)
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index 1c310c7f6e..9cc2607820 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -7304,6 +7304,7 @@ breakText	Glyphs	Glifler
 	Open Tutorial Sample	Öğretici Örneğini Aç
 	Finish Tutorial	Öğreticiyi Bitir
 	Next Tutorial	Sonraki Öğretici
+	Back to Skills	Becerilere Dön
 @msg	tutorial `{id}` has no practice sample	`{id}` öğreticisinin alıştırma örneği yok
 @msg	open the practice sample of `{id}` first (see learn.openSample)	önce `{id}` öğreticisinin alıştırma örneğini açın (bkz. learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	önce `{id}` öğreticisini bitirin (bkz. learn.finish)
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index 5f7de5c52f..593b863a16 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -6957,6 +6957,7 @@ breakText	Glyphs	Гліфи
 	Open Tutorial Sample	Відкрити приклад уроку
 	Finish Tutorial	Завершити урок
 	Next Tutorial	Наступний урок
+	Back to Skills	Назад до навичок
 @msg	tutorial `{id}` has no practice sample	урок `{id}` не має навчального прикладу
 @msg	open the practice sample of `{id}` first (see learn.openSample)	спочатку відкрийте навчальний приклад уроку `{id}` (див. learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	спочатку завершіть `{id}` (див. learn.finish)
diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv
index 5fad3e2493..1100b04ff9 100644
--- a/crates/ui-egui/src/i18n/vi.tsv
+++ b/crates/ui-egui/src/i18n/vi.tsv
@@ -6958,6 +6958,7 @@ breakText	Glyphs	Glyph
 	Open Tutorial Sample	Mở tệp mẫu của hướng dẫn
 	Finish Tutorial	Hoàn tất hướng dẫn
 	Next Tutorial	Hướng dẫn tiếp theo
+	Back to Skills	Quay lại kỹ năng
 @msg	tutorial `{id}` has no practice sample	hướng dẫn `{id}` không có tệp mẫu thực hành
 @msg	open the practice sample of `{id}` first (see learn.openSample)	hãy mở tệp mẫu thực hành của `{id}` trước (xem learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	hãy hoàn tất `{id}` trước (xem learn.finish)
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index f6e69e53c5..ca074f3497 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -7186,6 +7186,7 @@ breakText	Glyphs	字形
 	Open Tutorial Sample	打开教程示例
 	Finish Tutorial	完成教程
 	Next Tutorial	下一个教程
+	Back to Skills	返回技能
 @msg	tutorial `{id}` has no practice sample	教程 `{id}` 没有练习示例
 @msg	open the practice sample of `{id}` first (see learn.openSample)	请先打开 `{id}` 的练习示例 (请参阅 learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	请先完成 `{id}` (请参阅 learn.finish)
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index c9d6631fb3..756277bca9 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -6992,6 +6992,7 @@ breakText	Glyphs	字符
 	Open Tutorial Sample	開啟教學課程範例
 	Finish Tutorial	完成教學課程
 	Next Tutorial	下一個教學課程
+	Back to Skills	返回技能
 @msg	tutorial `{id}` has no practice sample	教學課程 `{id}` 沒有練習範例
 @msg	open the practice sample of `{id}` first (see learn.openSample)	請先開啟 `{id}` 的練習範例 (請參閱 learn.openSample)
 @msg	finish `{id}` first (see learn.finish)	請先完成 `{id}` (請參閱 learn.finish)
diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs
index 8e4aaab55e..bb4481e532 100644
--- a/crates/ui-egui/src/menus/ui_commands.rs
+++ b/crates/ui-egui/src/menus/ui_commands.rs
@@ -647,6 +647,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[
         "",
         "{} the Learn panel's skills in the order its Skills tab lists them: {skills: [{id, title, tutorials: [{id, title, steps: number of steps}]}]}",
     ),
+    (
+        "learn.skills",
+        "Back to Skills",
+        "",
+        "{} show the Learn panel on its Skills tab with the list of skills, with no skill and no tutorial open, as Back to skills after a skill's last tutorial and the Quick skill guide card do; returns what learn.list returns",
+    ),
     (
         "learn.show",
         "Show Tutorial",
diff --git a/crates/ui-egui/src/panels/learn.rs b/crates/ui-egui/src/panels/learn.rs
index 8941626a2d..ee7967c8a3 100644
--- a/crates/ui-egui/src/panels/learn.rs
+++ b/crates/ui-egui/src/panels/learn.rs
@@ -5,9 +5,10 @@
 //! tutorial previews its numbered steps. A tool's name in a step is a link that shows where the tool
 //! is ([`locate`]). Back goes up one level. Under the steps, View more opens the tutorial's practice
 //! sample as a new untitled document; Finish tutorial then marks it finished, and Next Up shows the
-//! next tutorial in the same skill. `learn.list` lists the tutorials, `learn.show` opens one,
-//! `learn.locateTool` shows where a tool is, `learn.openSample`, `learn.finish` and `learn.next` run
-//! the three practice controls, and `window.learn` shows or hides the panel.
+//! next tutorial in the same skill. `learn.list` lists the tutorials, `learn.skills` shows the list
+//! of skills, `learn.show` opens one tutorial, `learn.locateTool` shows where a tool is,
+//! `learn.openSample`, `learn.finish` and `learn.next` run the three practice controls, and
+//! `window.learn` shows or hides the panel.
 
 pub mod catalog;
 pub mod locate;
@@ -87,8 +88,10 @@ fn for_you(app: &mut VectorcraftApp, ui: &mut Ui) {
         });
     let resp = ui.interact(card.response.rect, ui.scope_id().with("quick-skill-guide"), Sense::click());
     resp.widget_info(|| egui::WidgetInfo::labeled(egui::Role::Button, ui.is_enabled(), tl!("Quick skill guide")));
-    if resp.clicked() {
-        app.ui.learn = View { tab: Tab::Skills, skill: None, tutorial: None };
+    if resp.clicked()
+        && let Err(e) = app.run("learn.skills", json!({}))
+    {
+        app.status(e);
     }
 }
 
@@ -182,15 +185,16 @@ fn tool_link(ui: &mut Ui, t: &Tokens, name: &str) -> egui::Response {
 fn practice(app: &mut VectorcraftApp, ui: &mut Ui, tutorial: &'static catalog::Tutorial) {
     let t = Tokens::get(ui.ctx());
     let id = tutorial.id;
+    let params = json!({ "tutorial": id });
     let mut run = None;
     ui.add_space(6.0);
     ui.horizontal_wrapped(|ui| {
         if ui.button(tl!("View more")).clicked() {
-            run = Some("learn.openSample");
+            run = Some(("learn.openSample", params.clone()));
         }
         let done = &app.ui.learn_practice;
         if done.opened.contains(&id) && !done.finished.contains(&id) && ui.button(tl!("Finish tutorial")).clicked() {
-            run = Some("learn.finish");
+            run = Some(("learn.finish", params.clone()));
         }
     });
     if app.ui.learn_practice.finished.contains(&id) {
@@ -199,7 +203,7 @@ fn practice(app: &mut VectorcraftApp, ui: &mut Ui, tutorial: &'static catalog::T
             Some(next) => {
                 ui.horizontal_wrapped(|ui| {
                     if ui.button(tl!("Next Up")).clicked() {
-                        run = Some("learn.next");
+                        run = Some(("learn.next", params.clone()));
                     }
                     ui.add(egui::Label::new(egui::RichText::new(next.title).color(t.text)).wrap());
                 });
@@ -207,13 +211,13 @@ fn practice(app: &mut VectorcraftApp, ui: &mut Ui, tutorial: &'static catalog::T
             None => {
                 ui.add(egui::Label::new(egui::RichText::new(tl!("You finished the last tutorial in this skill.")).color(t.text_dim)).wrap());
                 if ui.button(tl!("Back to skills")).clicked() {
-                    app.ui.learn = View { tab: Tab::Skills, skill: None, tutorial: None };
+                    run = Some(("learn.skills", json!({})));
                 }
             }
         }
     }
-    if let Some(cmd) = run
-        && let Err(e) = app.run(cmd, json!({ "tutorial": id }))
+    if let Some((cmd, params)) = run
+        && let Err(e) = app.run(cmd, params)
     {
         app.status(e);
     }
@@ -247,12 +251,13 @@ fn row(ui: &mut Ui, title: &str, tutorials: Option<usize>) -> egui::Response {
     resp.on_hover_cursor(egui::CursorIcon::PointingHand)
 }
 
-/// The Learn panel's UI commands: `window.learn`, `learn.list`, `learn.show`, `learn.locateTool`,
-/// `learn.openSample`, `learn.finish` and `learn.next`.
+/// The Learn panel's UI commands: `window.learn`, `learn.list`, `learn.skills`, `learn.show`,
+/// `learn.locateTool`, `learn.openSample`, `learn.finish` and `learn.next`.
 pub(crate) fn command(app: &mut VectorcraftApp, id: &str, p: &Value) -> Option<Result<Value, String>> {
     Some(match id {
         "window.learn" => toggle(app, p),
         "learn.list" => Ok(list()),
+        "learn.skills" => skills_list(app),
         "learn.show" => open(app, p),
         "learn.locateTool" => locate::locate_tool(app, p),
         "learn.openSample" => open_sample(app, p),
@@ -291,6 +296,14 @@ fn list() -> Value {
     json!({ "skills": skills.collect::<Vec<_>>() })
 }
 
+/// `learn.skills`: Back to skills, and the Quick skill guide card. Show the panel on the Skills tab
+/// with the list of skills, with no skill and no tutorial open → what `learn.list` answers.
+fn skills_list(app: &mut VectorcraftApp) -> Result<Value, String> {
+    crate::panel_docking::reveal_panel(app, ID)?;
+    app.ui.learn = View { tab: Tab::Skills, skill: None, tutorial: None };
+    Ok(list())
+}
+
 /// `learn.show {tutorial}`: show the panel on the Skills tab with that tutorial's steps → the
 /// tutorial. A missing or unknown id is an error and changes nothing.
 fn open(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
diff --git a/crates/ui-egui/src/panels/learn/tests.rs b/crates/ui-egui/src/panels/learn/tests.rs
index f302d8f436..4bd00648d1 100644
--- a/crates/ui-egui/src/panels/learn/tests.rs
+++ b/crates/ui-egui/src/panels/learn/tests.rs
@@ -421,6 +421,41 @@ fn learn_finish_and_learn_next_follow_the_practice() {
     assert_eq!(app.ui.learn, View { tab: Tab::Skills, skill: Some("color"), tutorial: Some("copy-colors") });
 }
 
+/// `learn.skills` shows the panel on the Skills tab with the list of skills and answers what
+/// `learn.list` answers. Back to skills and the Quick skill guide card run it: each one also shows
+/// a panel that was hidden, as the command does.
+#[test]
+fn learn_skills_shows_the_list_of_skills() {
+    let skills = View { tab: Tab::Skills, skill: None, tutorial: None };
+    assert!(crate::menus::UI_COMMANDS.iter().any(|c| c.0 == "learn.skills"), "learn.skills is in the UI command catalog");
+    let mut app = app();
+    app.run("learn.show", json!({"tutorial": "gradient"})).unwrap();
+    app.run("window.learn", json!({"show": false})).unwrap();
+    assert!(!shown(&app));
+    let list = app.run("learn.list", json!({})).unwrap();
+    assert_eq!(app.run("learn.skills", json!({})).unwrap(), list);
+    assert_eq!(app.ui.learn, skills);
+    assert!(shown(&app));
+
+    // Back to skills, after a skill's last tutorial.
+    let mut app = self::app();
+    let ctx = context();
+    app.run("learn.openSample", json!({"tutorial": "outline-type"})).unwrap();
+    app.run("learn.finish", json!({"tutorial": "outline-type"})).unwrap();
+    assert!(!shown(&app));
+    click(&mut app, &ctx, "Back to skills", show);
+    assert_eq!(app.ui.learn, skills);
+    assert!(shown(&app), "Back to skills runs learn.skills");
+
+    // The Quick skill guide card on the For you tab.
+    let mut app = self::app();
+    let ctx = context();
+    assert!(!shown(&app));
+    click(&mut app, &ctx, "Quick skill guide", show);
+    assert_eq!(app.ui.learn, skills);
+    assert!(shown(&app), "the Quick skill guide card runs learn.skills");
+}
+
 /// The practice commands reject a missing, mistyped or unknown tutorial id and change nothing.
 #[test]
 fn the_practice_commands_reject_a_missing_or_unknown_tutorial() {
diff --git a/docs/mcp.md b/docs/mcp.md
index 8e158a81a9..47dd6f2014 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -2683,7 +2683,9 @@ toggles it (`show` omitted or null), and answers whether it shows; Window › Le
 The panel counts as hidden while the dock is hidden or a full screen mode hides the panels. Showing it shows a hidden
 dock; in a full screen mode it makes Learn the front panel, which shows when the mode ends, and answers false. Any
 other value of `show` is an error and changes nothing. `learn.list {}` → `{skills: [{id, title, tutorials: [{id, title, steps}]}]}`, in the order the Skills tab
-lists them, where `steps` is the number of steps. `learn.show {tutorial}` shows the panel on its Skills tab with that
+lists them, where `steps` is the number of steps. `learn.skills {}` shows the panel on its Skills tab with the list of
+skills, with no skill and no tutorial open, as the Quick skill guide card and Back to skills do, and answers what
+`learn.list` answers. `learn.show {tutorial}` shows the panel on its Skills tab with that
 tutorial's steps → `{skill, tutorial, title, steps: [text]}`. A missing, non-string or unknown `tutorial` is an error
 and changes nothing.
 
@@ -2708,6 +2710,7 @@ is an error, and an error changes nothing. Behavior reference:
 {"name":"invoke_menu","arguments":{"command":"learn.openSample","params":{"tutorial":"pen-paths"}}}
 {"name":"invoke_menu","arguments":{"command":"learn.finish","params":{"tutorial":"pen-paths"}}}
 {"name":"invoke_menu","arguments":{"command":"learn.next","params":{"tutorial":"pen-paths"}}}
+{"name":"invoke_menu","arguments":{"command":"learn.skills","params":{}}}
 ```
 
 A step that names a tool shows the tool's name as a blue link. A click on it, or Enter or Space while it has the
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 4ac027eb78..4b4137bd68 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -864,7 +864,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Native macOS menu bar, vector tool cursors, a ⌘K command palette, middle-button panning with any tool. Native menus explicitly end tracking on command selection, outside window presses and Escape; menu updates wait until tracking ends, and a dismissing press never starts a canvas gesture (M14.8).
   - The Learn panel (Window › Learn, or Explore tutorials beside the search icon on the app bar) has a For you tab with a Get started section and a Quick skill guide card, and a Skills tab that lists VectorCraft's own skills with their tutorial counts and empty progress rings; a skill lists its tutorials, a tutorial shows its numbered steps, and Back goes up a level; `learn.list` and `learn.show {tutorial}` script it ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`).
   - A tool's name in a Learn tutorial step is a blue link that shows where the tool is without choosing it (`learn.locateTool {tool}`): its toolbar button is marked, a collapsed group's flyout opens with the tool's row marked, a torn-off strip comes to the front, and a tool no shown toolbar holds is marked in the All Tools drawer. The mark, its 3 seconds and the hidden-toolbar cases are VectorCraft's own rules ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `panels::learn::tests`, the `a_learn_link_*` tests in `toolbar::tests`).
-  - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish` and `learn.next` script them. Not done: the help page's short video, and progress kept between sessions and shown in the skill rings. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`.
+  - Under a tutorial's steps, View more opens the tutorial's own practice sample as a new untitled document, and once the tutorial is finished, Next Up moves to the next tutorial in the same skill, as the help page describes ([the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html)). The samples are VectorCraft's own drawings. A Finish tutorial button that shows once the sample is open, the untitled copy, Back to skills in place of Next Up after a skill's last tutorial, and Next Up showing the next tutorial without opening its sample are VectorCraft's own rules. `learn.openSample`, `learn.finish`, `learn.next` and `learn.skills` (Back to skills) script them. Not done: the help page's short video, and progress kept between sessions and shown in the skill rings. Regression tests: `view_more_opens_the_tutorial_s_sample_as_a_new_untitled_document`, `finishing_a_tutorial_offers_next_up_in_its_skill`, `the_practice_controls_work_from_the_keyboard`, `the_last_tutorial_of_a_skill_offers_back_to_skills`, `learn_finish_and_learn_next_follow_the_practice`, `learn_skills_shows_the_list_of_skills`, `the_practice_commands_reject_a_missing_or_unknown_tutorial`, `every_tutorial_has_its_own_readable_sample` and `the_next_tutorial_is_the_next_one_in_the_same_skill` in `crates/ui-egui/src/panels/learn/tests.rs`.
   - The errors of the blend spine commands (Move Spine Point, Reshape Spine Segment, Add Spine Point and Delete Spine Point) show in the status bar in the interface language: each has a row in every catalog that translates all status and error messages and in Bulgarian (`blend_spine_param_errors_are_translated`).
   - The errors of the 3D effects (Extrude & Bevel, Revolve, Inflate, Rotate and their Classic forms) show in the status bar in the interface language: the art a 3D effect cannot build a solid from, invalid light, graphics and surface settings, and the notes for an object that draws no 3D faces or more wireframe edges than the limit. Each has a row in every catalog that translates all status and error messages, and the effect's name and the values in the message are translated or kept as written (`three_d_refusals_are_translated_in_every_complete_catalog`, `three_d_refusals_translate_with_their_values`).
   - The errors of the parameter checks that many commands share show in the status bar in the interface language: a value that is not a number where a number goes (`object.move` with `"dx": "60 mm"`, and `object.rotate`, `object.setBounds` and the other commands that call `check_numbers`), a missing number or index, `ids` that are not a list of object ids, an object id that is not a non-negative integer or names no object, and a date that is not Unix seconds. Each has a row in every catalog that translates all status and error messages, and in Bulgarian, Danish, Indonesian and Dutch (`shared_param_check_errors_are_translated`).
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 86f05d0ad8..f82bbfc922 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -380,7 +380,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po
 |---|---|---|
 | Effect > Warp Options: style previews, orientation choices and percent controls | done | #1760; focused input, mixed-style and history checks passed; original captures reviewed. No geometry or optional Properties changes. |
 | Command search: Up and Down move through the results, Enter runs the highlighted one | done | #1798 (#1757) |
-| Learn panel: Window › Learn and Explore tutorials on the app bar open it; For you holds a Quick skill guide card, Skills lists VectorCraft's own skills with tutorial counts and empty progress rings, a tutorial shows its numbered steps, Back goes up a level; a tool's name in a step is a link that marks the tool where the toolbars show it (its button, its group's flyout, a torn-off strip, a toolbar made with New Toolbar or the All Tools drawer) without choosing it; View more opens the tutorial's practice sample as a new untitled document, Finish tutorial then marks it finished, and Next Up shows the next tutorial in the same skill (no video) | done | [the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `learn.list`, `learn.show`, `learn.locateTool`, `learn.openSample`, `learn.finish`, `learn.next`; the mark's look and 3-second lifetime are VectorCraft's own rules; `panels::learn::tests`, `toolbar::tests` |
+| Learn panel: Window › Learn and Explore tutorials on the app bar open it; For you holds a Quick skill guide card, Skills lists VectorCraft's own skills with tutorial counts and empty progress rings, a tutorial shows its numbered steps, Back goes up a level; a tool's name in a step is a link that marks the tool where the toolbars show it (its button, its group's flyout, a torn-off strip, a toolbar made with New Toolbar or the All Tools drawer) without choosing it; View more opens the tutorial's practice sample as a new untitled document, Finish tutorial then marks it finished, and Next Up shows the next tutorial in the same skill (no video) | done | [the help page](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/learn-skills-quick-skill-guide.html); `learn.list`, `learn.skills`, `learn.show`, `learn.locateTool`, `learn.openSample`, `learn.finish`, `learn.next`; the mark's look and 3-second lifetime are VectorCraft's own rules; `panels::learn::tests`, `toolbar::tests` |
 | Pathfinder panel: a group selected alone counts its nested shapes, so an expanded stroked object keeps the Shape Modes enabled | done | #1642 (#1635) |
 | Selected Grid Repeat shows row, column and corner handles and spacing sliders; bounding-box handles take priority where they meet | done | #2691, `tools/src/repeat_grid.rs`; [public behavior reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-grid-repeat-options.html); drags preview and commit `object.repeat.options` as one undo step, Escape cancels; Radial Repeat has no handles yet |
 | Grid Repeat Options (Object › Repeat › Options…) has a Preview checkbox: the repeat on the canvas follows the fields while the dialog is open, Cancel puts the original back without a history step, OK keeps the previewed values as one undo step | done | #2651; [public behavior reference](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/create-and-edit-patterns/set-grid-repeat-options.html) lists the Preview option for the grid options only, so Radial and Mirror Repeat Options have none; `dialogs/command.rs` tests |

From f918c91c13db8f1383f4ed90fcc093f766cea39b Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:36:38 -0800
Subject: [PATCH 18/48] Edit: settling an interaction keeps the warning of the
 preview it applies

With Real-time Drawing off, a command that ends a drag first (Undo, Redo,
Clear History, a plug-in command and the others) applies the drag's
deferred preview, but dropped the warning that preview gave, which
releasing the drag shows in the status bar.

- The applied preview's warning is now kept while a top-level command or
  the tool's actions run. A command's result carries it as
  `previewWarning`, and as `warning` when the command has no warning of
  its own, so the status bar shows it.
- Typing kept as its own step when a tool's drag begins, or when Cmd
  lends the Selection tool, shows the warning in the status bar.
- The Cmd-lend path no longer ignores an error from keeping the typing.

Docs: docs/mcp.md (undo/redo row), docs/target-app-parity.md.
---
 crates/engine/src/cmd/edit.rs          | 16 +++++--
 crates/engine/src/lib.rs               |  3 ++
 crates/engine/src/session/documents.rs |  1 +
 crates/engine/src/session/edit.rs      | 21 +++++++++
 crates/engine/src/session/execute.rs   | 52 ++++++++++++++++++++++-
 crates/engine/src/tests/prefs.rs       | 59 ++++++++++++++++++++++++++
 crates/engine/src/tooling.rs           | 43 ++++++++++++++-----
 docs/mcp.md                            |  2 +-
 docs/target-app-parity.md              |  1 +
 9 files changed, 182 insertions(+), 16 deletions(-)

diff --git a/crates/engine/src/cmd/edit.rs b/crates/engine/src/cmd/edit.rs
index f3befb3462..12b1d9603c 100644
--- a/crates/engine/src/cmd/edit.rs
+++ b/crates/engine/src/cmd/edit.rs
@@ -678,12 +678,22 @@ fn undo_group_end(s: &mut Session, p: &Value) -> Result<Value> {
 /// under an interaction that would then preview on, or cancel to, the document from before (#1719).
 /// A typing session also ends in the Type tool, whose caret and marked text (IME) must follow the
 /// document. A preview that Real-time Drawing off left unapplied is applied first, as the tool's own
-/// commit applies it; when it fails, the interaction is canceled.
+/// commit applies it; when it fails, the interaction is canceled. The applied preview's warning
+/// goes to the running command's result or the tool's status messages, as the tool's own commit
+/// reports it ([`Session::note_settled_warning`]).
 pub(crate) fn settle_interaction(s: &mut Session) -> Result<()> {
     let typing = typing_in_progress(s);
     match s.unapplied_interaction_preview().filter(|_| !s.previewing) {
-        Some((cmd, p)) if s.preview(&cmd, &p).is_err() => s.cancel_interaction()?,
-        _ => s.commit_interaction()?,
+        Some((cmd, p)) => match s.preview(&cmd, &p) {
+            Ok(v) => {
+                if let Some(w) = v.get("warning").and_then(Value::as_str) {
+                    s.note_settled_warning(w);
+                }
+                s.commit_interaction()?
+            }
+            Err(_) => s.cancel_interaction()?,
+        },
+        None => s.commit_interaction()?,
     }
     if typing {
         s.set_tool_option("endTyping", &Value::Bool(true));
diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs
index 3c3460ecb2..e3f2b91ee7 100644
--- a/crates/engine/src/lib.rs
+++ b/crates/engine/src/lib.rs
@@ -286,6 +286,9 @@ pub struct Session {
     /// While the active tool's actions run: their commands aren't "a command from outside the
     /// tool" ([`Session::after_command`]).
     pub(crate) in_tool_actions: bool,
+    /// The warnings of the previews that settling an interaction applied, while a top-level command
+    /// or the tool's actions collect them ([`Session::collect_settled_warnings`]).
+    settled_warnings: Option<Vec<String>>,
     /// While [`Session::preview`] runs its command: its edits are the interaction's own.
     previewing: bool,
     /// The images Remove Background decoded during the interaction's preview steps, emptied when
diff --git a/crates/engine/src/session/documents.rs b/crates/engine/src/session/documents.rs
index 3e9ae56423..bd6b3713a1 100644
--- a/crates/engine/src/session/documents.rs
+++ b/crates/engine/src/session/documents.rs
@@ -116,6 +116,7 @@ impl Session {
             screens_hand_off: None,
             recovery: Default::default(),
             in_tool_actions: false,
+            settled_warnings: None,
             previewing: false,
             decoded_images: Default::default(),
             envelope_defaults: None,
diff --git a/crates/engine/src/session/edit.rs b/crates/engine/src/session/edit.rs
index 3d0d9ba1c6..80ac7e0590 100644
--- a/crates/engine/src/session/edit.rs
+++ b/crates/engine/src/session/edit.rs
@@ -234,6 +234,27 @@ impl Session {
         self.active().and_then(|d| d.interaction.as_ref().filter(|it| std::sync::Arc::ptr_eq(&it.doc, &d.doc)).and_then(|it| it.preview.clone()))
     }
 
+    /// Keep `warning`, from a preview that settling an interaction applied, for whatever collects
+    /// such warnings now ([`Session::collect_settled_warnings`]). Nothing keeps it when nothing
+    /// collects, so it is never reported with a later, unrelated command.
+    pub(crate) fn note_settled_warning(&mut self, warning: &str) {
+        if let Some(kept) = &mut self.settled_warnings
+            && !kept.iter().any(|w| w == warning)
+        {
+            kept.push(warning.to_string());
+        }
+    }
+
+    /// Run `f`, and → its result with the warnings of the previews that settling an interaction
+    /// applied while it ran ([`Session::note_settled_warning`]). Warnings an outer `f` collects are
+    /// kept for it.
+    pub(crate) fn collect_settled_warnings<R>(&mut self, f: impl FnOnce(&mut Self) -> R) -> (R, Vec<String>) {
+        let outer = self.settled_warnings.replace(Vec::new());
+        let r = f(self);
+        let settled = std::mem::replace(&mut self.settled_warnings, outer).unwrap_or_default();
+        (r, settled)
+    }
+
     pub fn begin_interaction(&mut self, label: &str) -> Result<()> {
         if self.script_running() {
             return Err(EngineError::Busy);
diff --git a/crates/engine/src/session/execute.rs b/crates/engine/src/session/execute.rs
index 23079fe901..b03487604b 100644
--- a/crates/engine/src/session/execute.rs
+++ b/crates/engine/src/session/execute.rs
@@ -3,6 +3,27 @@ use super::{
     strip_replay_only, waits_for_tool_edit,
 };
 
+/// A command's result `r` with the warnings of the previews that settling an interaction applied
+/// before it ran: `previewWarning` holds them, and `warning` too when the command gives none of its
+/// own, so the status bar shows the command's own warning when there is one. A null result becomes
+/// an object holding them; any other result that isn't an object is returned as it is.
+fn with_settled_warnings(mut r: Value, settled: &[String]) -> Value {
+    if settled.is_empty() {
+        return r;
+    }
+    if r.is_null() {
+        r = Value::Object(serde_json::Map::new());
+    }
+    if let Value::Object(m) = &mut r {
+        let w = Value::String(settled.join("; "));
+        if m.get("warning").is_none_or(Value::is_null) {
+            m.insert("warning".into(), w.clone());
+        }
+        m.insert("previewWarning".into(), w);
+    }
+    r
+}
+
 impl Session {
     /// `spec`'s `enabled` with `ids` selected instead of the selection, which is then put back.
     fn enabled_with_selection(&mut self, spec: &CommandSpec, ids: Vec<NodeId>) -> std::result::Result<(), String> {
@@ -54,7 +75,14 @@ impl Session {
             self.finish_tool_edit_later()?;
         }
         let outer = std::mem::replace(&mut self.reading, !spec.journal || JOURNALED_READS.contains(&id));
-        let r = self.execute_spec(spec, id, params);
+        // A preview that a top-level command applied first (a drag with Real-time Drawing off, kept
+        // before Undo) reports its warning in the command's result.
+        let r = if self.depth == 0 {
+            let (r, settled) = self.collect_settled_warnings(|s| s.execute_spec(spec, id, params));
+            r.map(|v| with_settled_warnings(v, &settled))
+        } else {
+            self.execute_spec(spec, id, params)
+        };
         self.reading = outer;
         r
     }
@@ -364,3 +392,25 @@ impl Session {
         r
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use serde_json::json;
+
+    use super::with_settled_warnings;
+
+    /// The command's own warning stays the one the status bar shows, and the settled preview's is
+    /// kept beside it; a null result holds the preview's; other results are left as they are.
+    #[test]
+    fn settled_warnings_join_the_result() {
+        let settled = ["a".to_string(), "b".to_string()];
+        assert_eq!(
+            with_settled_warnings(json!({"ran": 1, "warning": "own"}), &settled),
+            json!({"ran": 1, "warning": "own", "previewWarning": "a; b"})
+        );
+        assert_eq!(with_settled_warnings(json!({"warning": null}), &settled), json!({"warning": "a; b", "previewWarning": "a; b"}));
+        assert_eq!(with_settled_warnings(json!(null), &settled[..1]), json!({"warning": "a", "previewWarning": "a"}));
+        assert_eq!(with_settled_warnings(json!([1]), &settled), json!([1]));
+        assert_eq!(with_settled_warnings(json!({"ran": 1}), &[]), json!({"ran": 1}));
+    }
+}
diff --git a/crates/engine/src/tests/prefs.rs b/crates/engine/src/tests/prefs.rs
index 14669fd357..cc99550b78 100644
--- a/crates/engine/src/tests/prefs.rs
+++ b/crates/engine/src/tests/prefs.rs
@@ -2473,6 +2473,65 @@ fn deferred_commit_forwards_preview_warnings() {
     assert!(ui.iter().any(|r| matches!(r, UiRequest::Status(m) if m.contains("type"))), "{ui:?}");
 }
 
+/// A session with a rectangle selected, and type too with `with_type`, tool `tool` chosen,
+/// Real-time Drawing off, and an interaction labeled `label` whose deferred Bloat preview warns
+/// that type is skipped when type is selected.
+fn deferred_bloat(label: &str, with_type: bool, tool: &str) -> Session {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 400, "height": 400})).unwrap();
+    let rect = s.execute("shape.rectangle", &json!({"x": 100, "y": 100, "width": 200, "height": 200})).unwrap();
+    let text = s.execute("text.create", &json!({"x": 300, "y": 200, "text": "Hi"})).unwrap();
+    let ids = if with_type { json!([rect["id"], text["id"]]) } else { json!([rect["id"]]) };
+    s.execute("select.set", &json!({ "ids": ids })).unwrap();
+    s.select_tool(tool, ViewInfo::default()).unwrap();
+    set_pref(&mut s, "realTimeDrawing", json!(false));
+    s.begin_interaction(label).unwrap();
+    let p = json!({"tool": "bloat", "points": [[290.0, 200.0]], "width": 200.0, "height": 200.0});
+    s.doc_mut().unwrap().interaction.as_mut().unwrap().preview = Some(("object.liquify".into(), p));
+    s
+}
+
+/// A command that applies a deferred preview before it runs (Undo, Clear History) reports the
+/// preview's warning in its result, as the tool's own commit reports it; the preview is its own
+/// step, which Undo takes back. A preview without a warning adds none.
+#[test]
+fn settling_a_deferred_preview_keeps_its_warning() {
+    let mut s = deferred_bloat("Bloat", true, "selection");
+    let before = s.doc().unwrap().history.undo.len();
+    let r = s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(r["undone"], "Bloat", "{r}");
+    assert!(r["warning"].as_str().is_some_and(|w| w.contains("type")), "{r}");
+    assert_eq!(r["previewWarning"], r["warning"], "{r}");
+    assert_eq!(s.doc().unwrap().history.undo.len(), before, "the preview was a step of its own, and Undo took it back");
+    let r = s.execute("edit.redo", &json!({})).unwrap();
+    assert!(r.get("warning").is_none() && r.get("previewWarning").is_none(), "nothing was settled: {r}");
+
+    let mut s = deferred_bloat("Bloat", true, "selection");
+    let r = s.execute("edit.clearHistory", &json!({})).unwrap();
+    assert!(r["warning"].as_str().is_some_and(|w| w.contains("type")), "{r}");
+
+    let mut s = deferred_bloat("Bloat", false, "selection");
+    let r = s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(r, json!({"undone": "Bloat"}));
+}
+
+/// Typing kept as its own step when a tool's drag begins, or when a Cmd press lends the Selection
+/// tool, shows its applied preview's warning in the status bar.
+#[test]
+fn settling_typing_for_a_tool_shows_its_preview_warning() {
+    use vectorcraft_tools::{Action, Mods};
+    let warned = |ui: &[UiRequest]| ui.iter().any(|r| matches!(r, UiRequest::Status(m) if m.contains("type")));
+    let mut s = deferred_bloat("Typing", true, "selection");
+    let ui = s.apply_actions(vec![Action::Begin("Move".into())]).unwrap();
+    assert!(warned(&ui), "{ui:?}");
+
+    let mut s = deferred_bloat("Typing", true, "rectangle");
+    let cmd = Mods { cmd: true, ..Default::default() };
+    let ui = s.pointer(&PointerEvent::new(PointerKind::Down, 50.0, 380.0).with_mods(cmd), ViewInfo::default()).unwrap();
+    assert!(warned(&ui), "{ui:?}");
+    s.pointer(&PointerEvent::new(PointerKind::Up, 50.0, 380.0).with_mods(cmd), ViewInfo::default()).unwrap();
+}
+
 /// File Handling › Use Low Resolution Proxy for Linked EPS (#394): off by default; toggling it does
 /// not replace full-resolution pixels already in the document.
 #[test]
diff --git a/crates/engine/src/tooling.rs b/crates/engine/src/tooling.rs
index ad1549140f..fa50c5ce6a 100644
--- a/crates/engine/src/tooling.rs
+++ b/crates/engine/src/tooling.rs
@@ -75,6 +75,15 @@ fn nine_slice_guide_preview(cmd: &str, p: &Value) -> bool {
         && p.as_object().is_some_and(|m| m.contains_key("nineSliceGuides") && m.keys().all(|k| k == "name" || k == "nineSliceGuides"))
 }
 
+/// `ui` with a status message first for each of `warnings` (which came before its requests) that it
+/// doesn't already show.
+fn with_status(mut ui: Vec<UiRequest>, warnings: Vec<String>) -> Vec<UiRequest> {
+    let new: Vec<UiRequest> =
+        warnings.into_iter().filter(|w| !ui.iter().any(|r| matches!(r, UiRequest::Status(s) if s == w))).map(UiRequest::Status).collect();
+    ui.splice(0..0, new);
+    ui
+}
+
 /// Requests from tools that only the frontend can fulfil.
 #[derive(Clone, Debug, PartialEq)]
 pub enum UiRequest {
@@ -227,24 +236,28 @@ impl Session {
 
     /// A press with Cmd held (Ctrl elsewhere) and any other tool than a selection tool: the
     /// selection tool [`Self::lent_tool`] takes the gesture, pressing without Cmd (a plain click,
-    /// not Select Behind). The tool lent to stays as it was, unaware, until the release.
-    fn lend_selection_tool(&mut self, ev: &PointerEvent) -> PointerEvent {
+    /// not Select Behind). The tool lent to stays as it was, unaware, until the release. → the event
+    /// for the tool, and the warnings of a preview that keeping the typing applied.
+    fn lend_selection_tool(&mut self, ev: &PointerEvent) -> Result<(PointerEvent, Vec<String>)> {
         if ev.kind != PointerKind::Down || !ev.mods.cmd || self.lender.is_some() {
-            return *ev;
+            return Ok((*ev, vec![]));
         }
-        let Some(id) = self.lent_tool(self.tool.id(), &ev.mods) else { return *ev };
+        let Some(id) = self.lent_tool(self.tool.id(), &ev.mods) else { return Ok((*ev, vec![])) };
         // Typing in progress is kept as its own step first: the lent tool's drag previews from the
-        // document its interaction started from, which would drop the typing (#1881).
+        // document its interaction started from, which would drop the typing (#1881). When it
+        // can't be kept, the press is not lent.
+        let mut settled = vec![];
         if crate::cmd::typing_in_progress(self) {
-            // Fails only without a document, and then there is no typing to keep.
-            let _ = crate::cmd::settle_interaction(self);
+            let (r, warnings) = self.collect_settled_warnings(crate::cmd::settle_interaction);
+            r?;
+            settled = warnings;
         }
         // The Selection and Group Selection tools act on the instance whole.
         self.select_whole_instance(id);
         let lent = self.make_tool(id);
         self.selection_at_lend = self.active().map(|d| (d.uid, d.selection.clone()));
         self.lender = Some(std::mem::replace(&mut self.tool, lent));
-        PointerEvent { mods: Mods { cmd: false, ..ev.mods }, ..*ev }
+        Ok((PointerEvent { mods: Mods { cmd: false, ..ev.mods }, ..*ev }, settled))
     }
 
     /// The lent selection tool's gesture is over: the tool it was lent to is back as it was (the
@@ -659,7 +672,8 @@ impl Session {
         }
         self.leave_draw_inside(ev, view)?;
         self.tell_tool_history_moved();
-        let ev = &self.lend_selection_tool(ev);
+        let (ev, settled) = self.lend_selection_tool(ev)?;
+        let ev = &ev;
         let lent = self.lender.is_some();
         let mut acts = self.with_tool_cx(view, |t, cx| t.pointer(cx, ev));
         if !keep {
@@ -670,7 +684,7 @@ impl Session {
             if keep && ev.kind == PointerKind::Up {
                 self.keep_tool_settings();
             }
-            self.apply_actions(acts)
+            self.apply_actions(acts).map(|ui| with_status(ui, settled))
         });
         // The tool's own edits do not move the history for it. A selection tool that Cmd lends
         // edits for the lender, which hears of the edit at its next event.
@@ -1375,7 +1389,14 @@ impl Session {
     /// Apply tool actions. Errors from previews are reported but keep the interaction alive.
     pub fn apply_actions(&mut self, acts: Vec<Action>) -> Result<Vec<UiRequest>> {
         let outer = std::mem::replace(&mut self.in_tool_actions, true);
-        let r = self.apply_tool_actions(acts);
+        // A preview that settling applied (typing kept as its own step before a drag begins) shows
+        // its warning in the status bar, as the tool's own commit shows its preview's.
+        let r = if !outer && self.depth == 0 {
+            let (r, settled) = self.collect_settled_warnings(|s| s.apply_tool_actions(acts));
+            r.map(|ui| with_status(ui, settled))
+        } else {
+            self.apply_tool_actions(acts)
+        };
         self.in_tool_actions = outer;
         if !outer && self.depth == 0 {
             self.trim_histories();
diff --git a/docs/mcp.md b/docs/mcp.md
index 274db05a34..9f415f39b9 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -640,7 +640,7 @@ sampler.
 | `transform` | `{ids?, dx?, dy?, rotate?, scale?, scaleX?, scaleY?, reflect?, shear?, origin?, copy?}` | Runs move, rotate, scale, reflect, shear in that order. `rotate` is in degrees counter-clockwise; a positive `shear` moves the top to the right. With `copy`, the first step duplicates. |
 | `create_graph` | `{type?, x, y, width, height, csv? \| series?, categories?, rows?}` | The nine Illustrator graph types: column, stacked column, bar, stacked bar, line, area, scatter, pie and radar. An empty CSV cell or a `null` in `rows` is a blank value; a number in straight quotes is a label. Edit later with `graph.setData` / `graph.setType` via `run_command`. `graph.column {design, columnType: vertical\|uniform\|repeating\|sliding, each, fractions: chop\|scale}` draws the columns or bars of the series picked with Group Selection (or `seriesIndexes`, or all of them) with a graph design saved by `graph.design`; with no `design` it returns the series' current design and options. Type in the design that holds a `%` followed by two digits shows each column's value, with at least the first digit's places before the decimal point and the second digit's places after it. |
 | `text_wrap` | `{ids?, offset?, invert?, release?}` | Area type below the objects (same layer) flows around them. |
-| `undo` / `redo` | `{}` | Many calls that change nothing record no undo step, for example `object.align` with nothing to move, `object.move` by 0 without `copy` and `object.showAll` with nothing hidden. `undo` (`edit.undo`) after such a call undoes the step before it. `inspect_document` lists the undo steps as `history`. `run_command` with `edit.clearHistory` removes every undo and redo step of the active document and returns `{cleared}`, the number of steps removed; the document stays as it is, and the command records no undo step. `run_command` with `edit.newDocumentFromState` and `{index?, created?}` makes a new document holding the art as it was at that state and makes it the active document, and returns `{index, title}`. `index` is a row of the History panel, with 0 the oldest state kept, and an omitted `index` uses the current state. An `index` that names no state is an error and changes nothing. `created` is File Info's created date in Unix seconds or null, and defaults to now. The new document takes the next `Untitled-N` name, is marked unsaved, has nothing selected and has no steps to undo or redo. It is out of symbol, opacity-mask and pattern editing, and the art drawn in a pattern's tile is stored in the pattern, as `object.pattern.done` stores it. The source document and its steps stay as they are, except that typing or a drag in progress is first kept as a step. While the Type tool edits type, `undo` and `redo` put its caret, with no characters selected, at the end of the text the step changed: after the text it puts back or retypes, or where the text it takes out was. A step that changes no characters, such as a formatting change, leaves the caret and the selection where they are. |
+| `undo` / `redo` | `{}` | Many calls that change nothing record no undo step, for example `object.align` with nothing to move, `object.move` by 0 without `copy` and `object.showAll` with nothing hidden. `undo` (`edit.undo`) after such a call undoes the step before it. `inspect_document` lists the undo steps as `history`. `run_command` with `edit.clearHistory` removes every undo and redo step of the active document and returns `{cleared}`, the number of steps removed; the document stays as it is, and the command records no undo step. `run_command` with `edit.newDocumentFromState` and `{index?, created?}` makes a new document holding the art as it was at that state and makes it the active document, and returns `{index, title}`. `index` is a row of the History panel, with 0 the oldest state kept, and an omitted `index` uses the current state. An `index` that names no state is an error and changes nothing. `created` is File Info's created date in Unix seconds or null, and defaults to now. The new document takes the next `Untitled-N` name, is marked unsaved, has nothing selected and has no steps to undo or redo. It is out of symbol, opacity-mask and pattern editing, and the art drawn in a pattern's tile is stored in the pattern, as `object.pattern.done` stores it. The source document and its steps stay as they are, except that typing or a drag in progress is first kept as a step. When a command keeps a drag whose preview Real-time Drawing off had not applied yet (`edit.undo`, `edit.redo`, `edit.clearHistory`, `edit.newDocumentFromState` and the other commands that end a drag first), and applying that preview gives a warning, the command's result carries it as `previewWarning`, and as `warning` too when the command gives no warning of its own; the app's status bar shows `warning`. While the Type tool edits type, `undo` and `redo` put its caret, with no characters selected, at the end of the text the step changed: after the text it puts back or retypes, or where the text it takes out was. A step that changes no characters, such as a formatting change, leaves the caret and the selection where they are. |
 
 For example, create editable Japanese area type with the engine's vertical writing mode:
 
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..b10fc90cd9 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1816,6 +1816,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 - **Filter plug-ins call commands (G17, #2186):** a filter at plug-in API level 2 with the `commands` permission names the commands it may run in its manifest's `commandAllowlist` and runs them with `env.vc_call`, reading each result with `env.vc_call_result`. Each call sees what the calls before it changed; the calls and the filter's output are one undo step, and a run that fails, is canceled or makes a call that fails leaves every document, its selection and its history as they were. Commands that read or write files, use the clipboard, change preferences or the view, run scripts, actions or plug-ins, switch documents or undo are never called, and a manifest that lists one is refused when the module is installed. The install dialog lists the allowed commands. A run makes at most 1,000 calls, and each call costs 10,000 instructions of its budget. Regressions: `crates/plugins/tests/call.rs`, `crates/engine/tests/plugin_call.rs`, `crates/engine/src/cmd/plugin_call.rs`. Scores and hours unchanged.
 - **The command sweep sends file and folder params into its temp folder by the command catalog:** the sweeps in `crates/engine/tests/command_sweep.rs` take each command's file and folder keys from the catalog (`cmd::location_keys`, the same key list the plug-in call rules use, less the keys that name part of the document in a command), read every key a params description names (`{path | name …}`, `{folder? (…)}` included) and its schema's params, and send every string under such a key, in arrays and in objects inside them (`paths: [{ids, path}]`), as a location in the temp folder, so a command added later is swept and checked without editing the sweep. `diffPath` counts as a file key, and Slice Options' `url` and Export for Screens' `folders` do not. Regressions: `sweep_cases_name_files_only_inside_the_temp_folder` and `sweep_cases_send_the_file_keys_of_the_command_catalog` in `command_sweep`, `location_keys_come_from_the_command_catalog` in `cmd::plugin_call`. Scores and hours unchanged.
 - **A drag ended by a command with Real-time Drawing off:** when Undo, Redo, a filter that calls commands or a plug-in command that calls commands ends a drag whose preview Real-time Drawing off has not applied yet, the preview is applied first and kept as an undo step of its own, as releasing the drag keeps it; a preview that fails cancels the drag. The filter or plug-in command is then given the objects where the drag left them. Regressions: `crates/engine/src/tests/plugins.rs`, `crates/engine/src/tests/prefs.rs`. Scores and hours unchanged.
+- **The warning of a preview applied when a command ends a drag:** a preview that Real-time Drawing off left unapplied, and that Undo, Clear History or another command applies before it runs, keeps its warning: the command's result carries it as `previewWarning`, and as `warning` when the command has none of its own, and the status bar shows it, as releasing the drag shows it. Typing kept as its own step when a tool's drag begins, or when Cmd lends the Selection tool, shows its applied preview's warning in the status bar too. Regressions: `settling_a_deferred_preview_keeps_its_warning` and `settling_typing_for_a_tool_shows_its_preview_warning` in `crates/engine/src/tests/prefs.rs`, `settled_warnings_join_the_result` in `crates/engine/src/session/execute.rs`. Scores and hours unchanged.
 - **Plug-in progress, Cancel and log lines (G17):** at plug-in API level 2 a plug-in with the `progress` permission imports `env.vc_progress`, `env.vc_cancelled` and `env.vc_log`. A heavy filter's and an export's progress windows show its progress as a percentage bar, their Cancel reaches it through `vc_cancelled`, a light filter with `progress` and no `commandAllowlist` runs in the background with the same progress window when it runs at once or OK runs it with Preview off, and its log lines go to the app's log with its id, capped per line and per run. Installing checks every import and names the one it refuses. Regressions: `crates/plugins/src/host.rs`, `crates/plugins/tests/abi.rs`, `crates/engine/src/tests/plugins.rs`, `crates/engine/tests/plugin_fuzz.rs`, `crates/ui-egui/src/tests/plugin_runs.rs`. Scores and hours unchanged.
 - **Live-effect plug-ins paint their output (G17, #121):** a live effect whose manifest has `"api": 2` and `"paintOutput": true` returns pieces, each drawn by itself in order with fills and strokes of its own in the filter's paint forms (a piece without them keeps the object's; an empty list paints none; an effect on a fill returns only fills, one on a stroke only strokes). The whole result is checked first: limits, numbers in range with nothing clamped, known keys only, and the swatches and patterns it names in the document; one fault draws that step of the stack unchanged, keeps the effect record and puts the plug-in's name and the field in `plugin.info`'s `lastError`. The pieces are drawn, measured and exported to PDF and SVG from the appearance stack without changing the document, and Expand Appearance writes them as ordinary paths in one undo step. Effects without the key behave as before. Regressions: `crates/plugins/src/painted/tests.rs`, `crates/plugins/src/manifest.rs`, `crates/engine/src/tests/plugins.rs`, `crates/engine/tests/plugin_fuzz.rs`. Scores and hours unchanged.
 - **Live-effect plug-ins while a document opens (G17):** the live-effect plug-in runs of a document's first view on screen share a 2,000 ms budget (VectorCraft's own value). A stage left out for time, or one that times out, fails, has no plug-in or meets Safe Mode, draws its input unchanged and is deferred; the status bar says how many, `effect.deferredStatus` lists them with their object, effect and reason, and Effect › Refresh Deferred Effects (`effect.refreshDeferred`) runs them again with a fresh budget. Each document has its own budget, an edit runs the stages it changes, and exports, Expand Appearance and commands run every stage under the 5 s limit of each run. The web build times the budget and each run's limit with the page's `performance.now()`. Regressions: `crates/plugins/src/deferred.rs`, `crates/plugins/src/effect.rs`, `crates/plugins/src/host.rs`, `crates/engine/src/tests/plugins.rs`, `crates/ui-egui/src/canvas/tests.rs`. Scores and hours unchanged.

From e8c3dace32a7c65a9195a5b25886c0b029664346 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 01:40:26 -0800
Subject: [PATCH 19/48] Effects: a group's geometry effects reshape what its
 members draw

A group's or layer's geometry effects now run after its members' own:
the geometry effects of each visible path and compound path in it and
of their fills and strokes, and a nested group's geometry and
Pathfinder effects, are applied first, at any depth, and the group's
effects reshape the result. A symbol instance's geometry effects run
after those of its symbol's members in the same way. Before, the group
reshaped the members' outlines and their own effects ran afterwards:
a 100 pt square with its own 10 pt Offset Path in a group with a 50%
Transform drew 70 pt wide, and it now draws 60 pt wide. Existing
documents with such groups draw differently.

The canvas, export (including groups that keep their type), Expand
Appearance and the art that Pathfinder operations and compound shapes
take from such a group use the same order. The reply of
effect.expandAppearance names such a group and no longer names the
members whose effects the group's art already holds.

The renderer now drops the art it keeps for a group when a plug-in is
installed or removed and a member of the group has a plug-in effect.

Docs: docs/target-app-parity.md. Not yet: the own geometry effects of
images, symbol instances, paths with a linked opacity mask or a 3D
effect, and nested groups with a 3D effect in a group still run after
the group's.
---
 crates/effects/src/bake.rs               |   2 +
 crates/effects/src/group.rs              |  85 ++++++-
 crates/effects/src/group/tests.rs        | 292 +++++++++++++++++++++++
 crates/effects/src/reshape.rs            |  89 +++++--
 crates/effects/src/tests/rasterfollow.rs |  10 +-
 crates/engine/src/tests/expand.rs        |  19 +-
 crates/engine/src/tests/objexpand.rs     |  19 ++
 crates/render/src/renderer/nodes.rs      |   5 +-
 crates/render/src/tests/memory.rs        |  10 +-
 docs/target-app-parity.md                |   1 +
 10 files changed, 496 insertions(+), 36 deletions(-)

diff --git a/crates/effects/src/bake.rs b/crates/effects/src/bake.rs
index 2b4953d151..b77f804de7 100644
--- a/crates/effects/src/bake.rs
+++ b/crates/effects/src/bake.rs
@@ -424,6 +424,8 @@ fn container_keeping_type(d: &Document, n: &Node) -> Option<Node> {
     if !kept {
         return None;
     }
+    // The members' own effects run first, as on the canvas.
+    crate::group::members_as_drawn(Some(d), &mut m);
     reshape_leaves(&mut m, &fx, &n.appearance.effects, Some(d));
     m.appearance.effects = crate::raster::without_geometry(&m.appearance.effects);
     m.appearance.effects.retain(|e| !is_pathfinder(&e.id));
diff --git a/crates/effects/src/group.rs b/crates/effects/src/group.rs
index 959bd5e857..a6581fa449 100644
--- a/crates/effects/src/group.rs
+++ b/crates/effects/src/group.rs
@@ -209,6 +209,8 @@ fn reshaped_art(doc: Option<&Document>, n: &Node, hook: Option<OutlineHook>, nod
             Some(area) => Some(reshaped(&area, n, doc)),
             None => {
                 let mut m = crate::reshape::outlined_members_with(None, doc, n, outline, nodes);
+                // The members' own effects run first, as on the canvas.
+                members_as_drawn(doc, &mut m);
                 let carry = crate::reshape::reshape_leaves_carrying(&mut m, &fx, &n.appearance.effects, doc);
                 // The group's own fills and strokes follow the effects as its members do.
                 if carry.moves(&m.appearance) {
@@ -225,6 +227,7 @@ fn reshaped_art(doc: Option<&Document>, n: &Node, hook: Option<OutlineHook>, nod
             let art = h(n).filter(|art| nodes.charge(art))?;
             let mut art = crate::reshape::symbol_art_with(&art, h, nodes, symbol);
             crate::reshape::outline_nested_text(doc, &mut art, false);
+            members_as_drawn(doc, &mut art);
             let carry = crate::reshape::reshape_leaves_carrying(&mut art, &fx, &n.appearance.effects, doc);
             // The art's own fills and strokes follow the effects as its members do.
             if carry.moves(&art.appearance) {
@@ -754,7 +757,8 @@ fn take_sublayer_guides(n: &mut Node, out: &mut Vec<Arc<Node>>, hidden: bool, lo
 }
 
 /// `n`, a group or layer, as plain art: its Pathfinder effects evaluated, its geometry effects
-/// reshaping all its members as one piece (the whole art's bounds as their reference box), and its
+/// reshaping all its members as one piece (the whole art's bounds as their reference box) after
+/// the members' own geometry and Pathfinder effects ([`members_as_drawn`]), and its
 /// own fills and strokes turned into art painting the members' geometry ([`member_shapes`]) below
 /// the members (after a clipping path) or above them, as its contents slot says. Its
 /// transparency, opacity mask and raster effects stay. `None` when it has none of these. Live
@@ -790,6 +794,7 @@ pub fn evaluate_container(doc: Option<&Document>, n: &Node) -> Option<Node> {
     }
     if !fx.is_empty() {
         m = crate::reshape::outlined_members(doc, &m);
+        members_as_drawn(doc, &mut m);
         let carry = crate::reshape::reshape_leaves_carrying(&mut m, &fx, &n.appearance.effects, doc);
         // The group's own fills and strokes paint the members as a whole: their gradients follow
         // the effects as the members' do.
@@ -821,5 +826,83 @@ pub fn evaluate_container(doc: Option<&Document>, n: &Node) -> Option<Node> {
     Some(m)
 }
 
+/// Replace each visible member of `n` with geometry or Pathfinder effects of its own, at every
+/// depth of its groups and layers, by the art it draws ([`evaluate_container`],
+/// [`crate::reshape::own_effects_art`]), so the geometry effects of `n` reshape what its members
+/// draw. A clip group's clipping path stays as it is, and so do images, symbol instances and the
+/// other objects that `own_effects_art` leaves alone, and a group or layer with a 3D effect with
+/// everything in it. Calls nested in one another, through the
+/// groups and layers it walks and the art it evaluates (symbol art and Pathfinder members
+/// included), stop at [`vectorcraft_doc::depth::MAX_DEPTH`] deep, and together they replace at
+/// most [`crate::SYMBOL_ART_MAX_NODES`] members: past either limit, members stay as they are.
+pub(crate) fn members_as_drawn(doc: Option<&Document>, n: &mut Node) {
+    let Some(_frame) = DrawnFrame::enter() else { return };
+    let clip = usize::from(n.clips());
+    let Some(ch) = n.children_mut() else { return };
+    for c in ch.iter_mut().skip(clip).filter(|c| c.visible) {
+        if !DrawnFrame::take_member() {
+            return;
+        }
+        // A group or layer with a 3D effect stays whole: the geometry effects listed after its 3D
+        // effect reshape its 3D art.
+        if is_container(c) && (crate::has_solid(c) || crate::has_revolve(c)) {
+            continue;
+        }
+        let art = if !is_container(c) {
+            crate::reshape::own_effects_art(doc, c)
+        } else if has_pathfinder(c) || !crate::reshape::geometry_effects(c).is_empty() {
+            evaluate_container(doc, c)
+        } else {
+            None
+        };
+        match art {
+            Some(a) => *c = Arc::new(a),
+            None if is_container(c) => members_as_drawn(doc, Arc::make_mut(c)),
+            None => {}
+        }
+    }
+}
+
+thread_local! {
+    /// How many [`members_as_drawn`] calls are running, one inside another, and how many members
+    /// they have visited since the outermost one started.
+    static DRAWN: std::cell::Cell<(usize, u64)> = const { std::cell::Cell::new((0, 0)) };
+}
+
+/// One running [`members_as_drawn`] call, counted in [`DRAWN`] until it is dropped.
+struct DrawnFrame;
+
+impl DrawnFrame {
+    /// Count one more call; `None` when [`vectorcraft_doc::depth::MAX_DEPTH`] are running. The
+    /// outermost call starts the count of members again.
+    fn enter() -> Option<Self> {
+        let (frames, members) = DRAWN.with(|d| d.get());
+        if frames >= vectorcraft_doc::depth::MAX_DEPTH {
+            return None;
+        }
+        DRAWN.with(|d| d.set((frames + 1, if frames == 0 { 0 } else { members })));
+        Some(DrawnFrame)
+    }
+
+    /// Count one more member visited; `false` once [`crate::SYMBOL_ART_MAX_NODES`] have been.
+    fn take_member() -> bool {
+        let (frames, members) = DRAWN.with(|d| d.get());
+        if members >= crate::SYMBOL_ART_MAX_NODES {
+            return false;
+        }
+        DRAWN.with(|d| d.set((frames, members + 1)));
+        true
+    }
+}
+
+impl Drop for DrawnFrame {
+    fn drop(&mut self) {
+        DRAWN.with(|d| {
+            let (frames, members) = d.get();
+            d.set((frames.saturating_sub(1), members));
+        });
+    }
+}
+
 #[cfg(test)]
 mod tests;
diff --git a/crates/effects/src/group/tests.rs b/crates/effects/src/group/tests.rs
index c169c807b2..c6e2a78c73 100644
--- a/crates/effects/src/group/tests.rs
+++ b/crates/effects/src/group/tests.rs
@@ -555,6 +555,298 @@ fn a_nested_groups_own_gradient_follows_the_outer_groups_transform_and_free_dist
     assert!(near(s, Point::new(0.0, 5.0)) && near(e, Point::new(20.0, 5.0)), "{s:?} {e:?}");
 }
 
+/// The bounds of what `n` draws, as the renderer draws it: a group or layer with an appearance of
+/// its own as the art [`evaluate_container`] makes of it, and each visible path and compound path
+/// with the geometry effects still on it applied, then those of each visible fill and stroke that
+/// has some.
+fn drawn_bounds(n: &Node) -> Option<Rect> {
+    if !n.visible {
+        return None;
+    }
+    if let Some(m) = evaluate_container(None, n) {
+        return drawn_bounds(&m);
+    }
+    if let Some(ch) = n.children()
+        && !matches!(n.kind, NodeKind::Compound { .. })
+    {
+        return ch.iter().filter_map(|c| drawn_bounds(c)).reduce(|a, b| a.union(b));
+    }
+    let (path, _) = crate::reshape::leaf_geometry(n)?;
+    let geometry = |fx: &[Effect]| -> Vec<Effect> { fx.iter().filter(|e| e.visible && crate::is_geometry(&e.id)).cloned().collect() };
+    let apply = |fx: &[Effect], p: &PathData| crate::apply_geometry(&geometry(fx), p, p.bounds().unwrap());
+    let g = apply(&n.appearance.effects, &path);
+    let items: Vec<&AppearanceItem> = n.appearance.items.iter().filter(|i| paints(i) && !geometry(i.effects()).is_empty()).collect();
+    if items.is_empty() {
+        return g.bounds();
+    }
+    items.iter().filter_map(|i| apply(i.effects(), &g).bounds()).reduce(|a, b| a.union(b))
+}
+
+fn black() -> Appearance {
+    Appearance::basic(Paint::solid(Color::BLACK), Paint::None, 0.0)
+}
+
+/// A black 100 pt square from (100, 100).
+fn square_at_100() -> Node {
+    Node::path(NodeId(1), shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)), black())
+}
+
+fn effect(id: &str, params: serde_json::Value) -> Effect {
+    Effect { id: id.into(), params, visible: true }
+}
+
+fn offset_10() -> Effect {
+    effect("path.offsetPath", serde_json::json!({"offset": 10}))
+}
+
+fn scaled(s: f64) -> Effect {
+    effect("distort.transform", serde_json::json!({"scaleH": s, "scaleV": s}))
+}
+
+fn with_effect(mut n: Node, e: Effect) -> Node {
+    n.appearance.effects.push(e);
+    n
+}
+
+/// The width that a group with `e` holding `member` draws at.
+fn drawn_width(member: Node, e: Effect) -> f64 {
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(member)]), e);
+    drawn_bounds(&g).unwrap().width()
+}
+
+/// A member's own Offset Path runs before its group's Transform: the square offset by 10 pt to
+/// 120 pt, then scaled by half, is 60 pt wide (70 pt the other way round).
+#[test]
+fn a_members_own_offset_runs_before_its_groups_scale() {
+    let w = drawn_width(with_effect(square_at_100(), offset_10()), scaled(50.0));
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+}
+
+/// A member's own Transform runs before its group's Offset Path: the square scaled to 200 pt, then
+/// offset by 10 pt, is 220 pt wide (240 pt the other way round).
+#[test]
+fn a_members_own_scale_runs_before_its_groups_offset() {
+    let w = drawn_width(with_effect(square_at_100(), scaled(200.0)), offset_10());
+    assert!((w - 220.0).abs() < 1e-6, "{w}");
+}
+
+/// A member inside a plain group inside the group takes its own effects first too.
+#[test]
+fn a_member_of_a_plain_nested_group_takes_its_own_effects_first() {
+    let w = drawn_width(Node::group(NodeId(5), vec![Arc::new(with_effect(square_at_100(), offset_10()))]), scaled(50.0));
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+}
+
+/// A nested group's own geometry effects run before the outer group's.
+#[test]
+fn a_nested_groups_own_effects_run_before_its_groups() {
+    let w = drawn_width(with_effect(Node::group(NodeId(5), vec![Arc::new(square_at_100())]), offset_10()), scaled(50.0));
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+}
+
+/// A nested group's Pathfinder effect runs before the outer group's geometry effects: the back
+/// square minus the front one is 50 pt wide, and offset by 10 pt it is 70 pt (offsetting the
+/// squares first leaves 50 pt).
+#[test]
+fn a_nested_groups_pathfinder_runs_before_its_groups_effects() {
+    let back = square_at_100();
+    let front = Node::path(NodeId(2), shapes::rectangle(Rect::new(150.0, 100.0, 250.0, 200.0)), black());
+    let nested = with_effect(Node::group(NodeId(5), vec![Arc::new(back), Arc::new(front)]), effect("pathfinder.subtract", serde_json::json!({})));
+    let w = drawn_width(nested, offset_10());
+    assert!((w - 70.0).abs() < 1e-6, "{w}");
+}
+
+/// The geometry effects of a member's own fill run before its group's: 60 pt, as for the
+/// member's own effect.
+#[test]
+fn a_members_fill_effects_run_before_its_groups() {
+    let mut member = square_at_100();
+    member.appearance.items[0].effects_mut().push(offset_10());
+    let w = drawn_width(member, scaled(50.0));
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+}
+
+/// A member whose fills have geometry effects stays one element of a knockout group: its fills do
+/// not knock each other out.
+#[test]
+fn a_member_drawn_as_its_fills_stays_one_knockout_element() {
+    let mut member = square_at_100();
+    member.appearance.items.push(AppearanceItem::Fill(vectorcraft_doc::FillLayer::new(Paint::solid(Color::rgb(1.0, 0.0, 0.0)))));
+    member.appearance.items[0].effects_mut().push(offset_10());
+    let mut g = with_effect(Node::group(NodeId(10), vec![Arc::new(member)]), scaled(50.0));
+    g.knockout = vectorcraft_doc::Knockout::On;
+    let art = evaluate_container(None, &g).unwrap();
+    let elements = Node::knockout_elements(art.children().unwrap());
+    assert_eq!(elements.len(), 1, "{:?}", elements.iter().map(|e| (e.id, &e.kind)).collect::<Vec<_>>());
+}
+
+/// The art a Pathfinder operation or compound shape takes from a group with geometry effects has
+/// the members' own effects applied first, as the canvas draws it.
+#[test]
+fn shape_art_of_a_group_applies_its_members_effects_first() {
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(with_effect(square_at_100(), offset_10()))]), scaled(50.0));
+    let art = shape_art(None, &g, None).unwrap();
+    let w = drawn_bounds(&art).unwrap().width();
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+    let leaves = member_leaves(None, &g, None);
+    let w = leaves.iter().filter_map(drawn_bounds).reduce(|a, b| a.union(b)).unwrap().width();
+    assert!((w - 60.0).abs() < 1e-6, "leaves: {w}");
+}
+
+/// A symbol instance's own geometry effects run after those of its symbol's members, as the canvas
+/// draws it and in the art a Pathfinder operation takes from it.
+#[test]
+fn a_symbol_instances_effects_run_after_its_symbols_members_own() {
+    let art = Node::group(NodeId(20), vec![Arc::new(with_effect(square_at_100(), offset_10()))]);
+    let instance =
+        with_effect(Node::new(NodeId(6), NodeKind::SymbolInstance { symbol: "s".into(), xf: vectorcraft_geom::Affine::IDENTITY }), scaled(50.0));
+    let drawn = crate::reshape(None, &instance, Some(&art)).unwrap();
+    let w = drawn_bounds(&drawn).unwrap().width();
+    assert!((w - 60.0).abs() < 1e-6, "drawn: {w}");
+    let hook = move |_: &Node| Some(art.clone());
+    let w = drawn_bounds(&shape_art(None, &instance, Some(&hook)).unwrap()).unwrap().width();
+    assert!((w - 60.0).abs() < 1e-6, "shape art: {w}");
+}
+
+/// Export bakes the group as the canvas draws it.
+#[test]
+fn a_baked_group_applies_its_members_effects_first() {
+    let mut d = Document::new(800.0, 800.0);
+    let layer = d.layers[0].id;
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(with_effect(square_at_100(), offset_10()))]), scaled(50.0));
+    d.insert(Some(layer), 0, g).unwrap();
+    let baked = crate::bake_document(&d).unwrap();
+    let w = baked.node(NodeId(10)).unwrap().geometric_bounds().unwrap().width();
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+}
+
+/// A group whose Transform effect only moves and copies keeps its type when baked; a nested
+/// group's own Transform still runs before the copies: the nested square scaled by half to 50 pt
+/// and copied 200 pt to the right spans 250 pt (copying first, then scaling both copies about
+/// their middle, spans 150 pt).
+#[test]
+fn a_baked_group_that_keeps_its_type_applies_its_members_effects_first() {
+    if skip_without_craft_fonts() {
+        return;
+    }
+    let style = CharStyle { size: 24.0, fill: Paint::solid(Color::BLACK), ..Default::default() };
+    let text = Node::new(NodeId(3), NodeKind::Text(Box::new(TextObject::point(Point::new(20.0, 60.0), "Type", style))));
+    let nested = with_effect(Node::group(NodeId(5), vec![Arc::new(square_at_100())]), scaled(50.0));
+    let g = with_effect(
+        Node::group(NodeId(10), vec![Arc::new(text), Arc::new(nested)]),
+        effect("distort.transform", serde_json::json!({"moveH": 200, "copies": 1})),
+    );
+    let mut d = Document::new(800.0, 800.0);
+    let layer = d.layers[0].id;
+    d.insert(Some(layer), 0, g).unwrap();
+    let baked = crate::bake_document(&d).unwrap();
+    let mut text = 0;
+    baked.walk(|n| text += usize::from(matches!(n.kind, NodeKind::Text(_))));
+    assert_eq!(text, 2, "the type stays type, copied");
+    let w = baked.node(NodeId(5)).unwrap().geometric_bounds().unwrap().width();
+    assert!((w - 250.0).abs() < 1e-6, "{w}");
+}
+
+/// A clip group's clipping path keeps its own effects; the clipped members take theirs first.
+#[test]
+fn a_clipping_path_keeps_its_own_effects_under_a_groups_effects() {
+    let mut clip = with_effect(square_at_100(), offset_10());
+    clip.id = NodeId(2);
+    if let NodeKind::Path { clipping, .. } = &mut clip.kind {
+        *clipping = true;
+    }
+    let clipped =
+        Node::new(NodeId(5), NodeKind::Group { children: vec![Arc::new(clip), Arc::new(with_effect(square_at_100(), offset_10()))], clip: true });
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(clipped)]), scaled(50.0));
+    let art = evaluate_container(None, &g).unwrap();
+    let clip_group = art.children().unwrap()[0].clone();
+    let ch = clip_group.children().unwrap();
+    assert!(matches!(ch[0].kind, NodeKind::Path { clipping: true, .. }), "{:?}", ch[0].kind);
+    assert_eq!(crate::reshape::geometry_effects(&ch[0]).len(), 1, "the clipping path keeps its Offset Path");
+    assert!(matches!(ch[1].kind, NodeKind::Group { .. }) && crate::reshape::geometry_effects(&ch[1]).is_empty(), "the member is drawn as its art");
+}
+
+/// A member with a linked opacity mask keeps its own effects on it, so its mask moves with it
+/// under the group's Transform; so does a member with a 3D effect, whose later geometry effects
+/// apply to its 3D art.
+#[test]
+fn members_with_linked_masks_or_3d_effects_keep_their_own_effects() {
+    let mut masked = with_effect(square_at_100(), offset_10());
+    masked.extras_mut().mask = Some(Box::new(vectorcraft_doc::OpacityMask::new(
+        Node::path(NodeId(2), shapes::rectangle(Rect::new(100.0, 100.0, 200.0, 200.0)), black()),
+        true,
+    )));
+    let mut solid = with_effect(square_at_100(), effect(crate::solids::EXTRUDE, serde_json::json!({})));
+    solid.id = NodeId(3);
+    solid.appearance.effects.push(scaled(50.0));
+    let moved = effect("distort.transform", serde_json::json!({"moveH": 50, "strokes": true}));
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(masked), Arc::new(solid)]), moved);
+    let art = evaluate_container(None, &g).unwrap();
+    let ch = art.children().unwrap();
+    assert!(matches!(ch[0].kind, NodeKind::Path { .. }) && crate::reshape::geometry_effects(&ch[0]).len() == 1, "{:?}", ch[0].kind);
+    let mask = ch[0].extras().mask.as_deref().unwrap().art.geometric_bounds().unwrap();
+    assert!((mask.x0 - 150.0).abs() < 1e-6, "the mask moves with the square: {mask:?}");
+    assert!(matches!(ch[1].kind, NodeKind::Path { .. }) && ch[1].appearance.effects.len() == 2, "{:?}", ch[1].kind);
+}
+
+/// A nested group with a 3D effect stays as it is, with its members: the Transform listed after
+/// its Extrude still applies to its 3D art.
+#[test]
+fn a_nested_group_with_a_3d_effect_keeps_its_own_effects() {
+    let inner = with_effect(square_at_100(), offset_10());
+    let mut solid = with_effect(Node::group(NodeId(5), vec![Arc::new(inner)]), effect(crate::solids::EXTRUDE, serde_json::json!({})));
+    solid.appearance.effects.push(scaled(50.0));
+    let moved = effect("distort.transform", serde_json::json!({"moveH": 50}));
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(solid)]), moved);
+    let art = evaluate_container(None, &g).unwrap();
+    let ch = art.children().unwrap();
+    assert!(
+        matches!(ch[0].kind, NodeKind::Group { .. }) && ch[0].id == NodeId(5) && ch[0].appearance.effects.len() == 2,
+        "{:?}",
+        ch[0].appearance.effects
+    );
+    let member = &ch[0].children().unwrap()[0];
+    assert!(matches!(member.kind, NodeKind::Path { .. }) && crate::reshape::geometry_effects(member).len() == 1, "{:?}", member.kind);
+}
+
+/// Members nested deeper than the depth limit keep their own effects as they are.
+#[test]
+fn members_past_the_depth_limit_stay_as_they_are() {
+    let mut n = with_effect(square_at_100(), offset_10());
+    for i in 0..vectorcraft_doc::depth::MAX_DEPTH {
+        n = Node::group(NodeId(100 + i as u64), vec![Arc::new(n)]);
+    }
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(n)]), scaled(50.0));
+    let art = evaluate_container(None, &g).unwrap();
+    let mut deepest = None;
+    art.walk(&mut |c: &Node| {
+        if c.id == NodeId(1) {
+            deepest = Some(c.clone());
+        }
+    });
+    let deepest = deepest.unwrap();
+    assert!(matches!(deepest.kind, NodeKind::Path { .. }), "{:?}", deepest.kind);
+    assert_eq!(crate::reshape::geometry_effects(&deepest).len(), 1);
+}
+
+/// The depth limit counts nested groups with effects of their own too.
+#[test]
+fn nested_groups_with_effects_count_toward_the_depth_limit() {
+    let mut n = with_effect(square_at_100(), offset_10());
+    for i in 0..vectorcraft_doc::depth::MAX_DEPTH {
+        n = with_effect(Node::group(NodeId(100 + i as u64), vec![Arc::new(n)]), effect("distort.transform", serde_json::json!({"moveH": 1})));
+    }
+    let g = with_effect(Node::group(NodeId(10), vec![Arc::new(n)]), scaled(50.0));
+    let art = evaluate_container(None, &g).unwrap();
+    let mut deepest = None;
+    art.walk(&mut |c: &Node| {
+        if c.id == NodeId(1) && matches!(c.kind, NodeKind::Path { .. }) {
+            deepest = Some(c.clone());
+        }
+    });
+    assert!(deepest.is_some_and(|d| crate::reshape::geometry_effects(&d).len() == 1), "the deepest member keeps its effect");
+}
+
 /// An image or a symbol instance that a group's Transform effect moves takes the placed gradients
 /// of its own fills along, as a path does, and each copy takes them as many times as it takes the
 /// transform.
diff --git a/crates/effects/src/reshape.rs b/crates/effects/src/reshape.rs
index 2bda0aa88f..c5aaed7309 100644
--- a/crates/effects/src/reshape.rs
+++ b/crates/effects/src/reshape.rs
@@ -524,9 +524,10 @@ fn with_id(art: &Node, id: NodeId) -> Node {
 /// `n` as plain art that geometry effects can reshape, without its transparency and object
 /// effects: type outlined ([`outline_text`]), live objects evaluated (type inside them outlined),
 /// a symbol instance as `symbol_art` (the symbol's art, stained as the caller draws it) placed by
-/// the instance's transform (through the symbol's 9-slice guides in `doc`, when it has them), its
-/// fills and strokes carrying the geometry effects of the instance's active fill and stroke
-/// ([`add_instance_row_effects`]).
+/// the instance's transform (through the symbol's 9-slice guides in `doc`, when it has them), as
+/// the art its members draw when the instance has geometry effects of its own
+/// ([`crate::group::members_as_drawn`]), its fills and strokes carrying the geometry effects of the
+/// instance's active fill and stroke ([`add_instance_row_effects`]).
 /// `None` for other kinds (images, paths, containers), and for an instance whose art placed
 /// through the guides could hold more than [`vectorcraft_doc::MAX_SYMBOL_NODES`] objects. A Repeat counts the Repeats in the art of
 /// `doc`'s symbols that its instances show toward its instance budget.
@@ -562,20 +563,16 @@ fn outline_art_with(
             Node::group(n.id, vec![Arc::new(a)])
         }
         // The object as the one piece the copies of its Transform effect are made from.
-        _ if has_transform_art(n) || (apart && has_transform_copies(n)) => {
-            let mut one = n.clone();
-            one.opacity = 1.0;
-            one.blend = Default::default();
-            one.isolate = false;
-            one.extras_mut().mask = None;
-            one.appearance.effects.clear();
-            Node::group(n.id, vec![Arc::new(one)])
-        }
+        _ if has_transform_art(n) || (apart && has_transform_copies(n)) => one_piece(n),
         _ if vectorcraft_doc::live::is_live(n) => evaluated_with(symbols, n, outline, nodes),
         _ => return None,
     };
     outline_nested_text(paint_doc, &mut art, false);
     if matches!(n.kind, NodeKind::SymbolInstance { .. }) {
+        // The instance's own geometry effects reshape what the symbol's members draw.
+        if !geometry_effects(n).is_empty() {
+            crate::group::members_as_drawn(paint_doc, &mut art);
+        }
         add_instance_row_effects(symbols, n, &mut art);
     }
     art.opacity = 1.0;
@@ -843,18 +840,64 @@ fn as_art_opts(
     }
     // The art is a group with `n`'s id (for an image without fills or strokes that paint, a clip
     // group).
-    let mut out = art;
-    out.name = n.name.clone();
-    out.visible = n.visible;
-    out.opacity = n.opacity;
-    out.blend = n.blend;
-    out.isolate = n.isolate;
+    Some(dressed(art, n))
+}
+
+/// `art`, the art made of `n`, with `n`'s name, visibility, transparency, opacity mask and
+/// remaining (raster) effects.
+fn dressed(mut art: Node, n: &Node) -> Node {
+    art.name = n.name.clone();
+    art.visible = n.visible;
+    art.opacity = n.opacity;
+    art.blend = n.blend;
+    art.isolate = n.isolate;
     // One element: its pieces never knock each other out.
-    out.knockout = vectorcraft_doc::Knockout::Off;
-    out.knockout_shape = n.knockout_shape;
-    out.extras_mut().mask = n.extras().mask.clone();
-    out.appearance.effects = crate::raster::without_geometry(&n.appearance.effects);
-    Some(out)
+    art.knockout = vectorcraft_doc::Knockout::Off;
+    art.knockout_shape = n.knockout_shape;
+    art.extras_mut().mask = n.extras().mask.clone();
+    art.appearance.effects = crate::raster::without_geometry(&n.appearance.effects);
+    art
+}
+
+/// A group with `n`'s id holding `n` without its transparency, opacity mask and effects: the one
+/// piece that `n`'s own geometry effects reshape.
+fn one_piece(n: &Node) -> Node {
+    let mut one = n.clone();
+    one.opacity = 1.0;
+    one.blend = Default::default();
+    one.isolate = false;
+    one.extras_mut().mask = None;
+    one.appearance.effects.clear();
+    Node::group(n.id, vec![Arc::new(one)])
+}
+
+/// Path or compound path `n` with its own geometry effects applied, as the art it draws: with
+/// geometry effects in a visible fill or stroke of its own, a group of one path for each fill and
+/// stroke, its effects and that fill's or stroke's applied ([`crate::bake_type_appearance`]);
+/// otherwise a group with `n`'s id holding the path reshaped by its effects ([`reshape_leaves`]).
+/// The art keeps `n`'s id, name, visibility, transparency, opacity mask and raster effects. `None`
+/// for a guide, for other kinds of objects, for a path with a linked opacity mask or a 3D effect,
+/// and when `n` has no visible geometry effect of its own or in a visible fill or stroke.
+pub(crate) fn own_effects_art(doc: Option<&Document>, n: &Node) -> Option<Node> {
+    if !matches!(n.kind, NodeKind::Path { guide: false, .. } | NodeKind::Compound { .. })
+        || n.extras().mask.as_ref().is_some_and(|m| m.linked)
+        || crate::has_solid(n)
+        || crate::has_revolve(n)
+    {
+        return None;
+    }
+    if n.appearance.items.iter().any(|i| crate::paints(i) && crate::has_geometry(i.effects())) {
+        // One element: its pieces never knock each other out.
+        return crate::bake_type_appearance(doc, n).map(|art| Node { knockout: vectorcraft_doc::Knockout::Off, ..art });
+    }
+    let fx = geometry_effects(n);
+    if fx.is_empty() {
+        return None;
+    }
+    let mut art = one_piece(n);
+    reshape_leaves(&mut art, &fx, &n.appearance.effects, doc);
+    transform_items(&mut art, doc);
+    Some(dressed(art, n))
 }
 
 /// Map every path under `art` (and its gradients), and every path in the art of the linked opacity
diff --git a/crates/effects/src/tests/rasterfollow.rs b/crates/effects/src/tests/rasterfollow.rs
index e0c7bc5130..aead8b72ce 100644
--- a/crates/effects/src/tests/rasterfollow.rs
+++ b/crates/effects/src/tests/rasterfollow.rs
@@ -523,11 +523,12 @@ fn a_groups_transform_applies_after_its_members_own() {
     let mut on_fill = fill_square(33, vec![shadow(10.0, 0.0, 0.0)]);
     on_fill.appearance.effects = vec![turn()];
     let art = crate::evaluate_container(None, &group(32, vec![on_fill], vec![uneven()])).unwrap();
-    assert!(near(&[fill_shadow(&node_in(&art, 33))], &[want]), "fill: {:?}", fill_shadow(&node_in(&art, 33)));
+    // The member is drawn as its art: a group with its id holding the turned square.
+    let filled = node_in(&art, 33).children().and_then(|ch| ch.first().map(|c| (**c).clone())).unwrap();
+    assert!(near(&[fill_shadow(&filled)], &[want]), "fill: {:?}", fill_shadow(&filled));
     let nested = group(34, vec![group(35, vec![square(36, vec![shadow(10.0, 0.0, 0.0)])], vec![turn()])], vec![uneven()]);
     let art = crate::evaluate_container(None, &nested).unwrap();
-    let inner = crate::evaluate_container(None, &node_in(&art, 35)).unwrap();
-    assert!(near(&shadows_in(&inner), &[want]), "nested: {:?}", shadows_in(&inner));
+    assert!(near(&shadows_in(&art), &[want]), "nested: {:?}", shadows_in(&art));
 }
 
 /// An object's Transform effect transforms the raster effects of its fills and strokes with the
@@ -645,7 +646,8 @@ fn a_groups_transform_moves_its_members_fills_shadows_beside_their_own_transform
         let art = crate::evaluate_container(None, &g).unwrap();
         for (id, _, want) in &cases {
             let member = node_in(&art, *id);
-            let drawn = shadows_in(&crate::reshape(None, &member, None).unwrap());
+            // The member is drawn as its art, its fill's own Transform effect applied.
+            let drawn = shadows_in(&member);
             assert!(!drawn.is_empty() && near(&drawn, &vec![*want; drawn.len()]), "Scale Strokes & Effects {strokes}: {id} {drawn:?}");
         }
     }
diff --git a/crates/engine/src/tests/expand.rs b/crates/engine/src/tests/expand.rs
index 3fd187016f..d853b91110 100644
--- a/crates/engine/src/tests/expand.rs
+++ b/crates/engine/src/tests/expand.rs
@@ -535,9 +535,9 @@ fn expanded_art_keeps_the_random_transforms_the_canvas_drew() {
 }
 
 /// The reply lists each object whose appearance expanded once, by the id it has in the document,
-/// starting with the selected object. In "group copies" the two copies of the square share an id
-/// until Expand Appearance gives them ids of their own, and the reply names the group, then each
-/// copy by its new id.
+/// starting with the selected object. In "group copies" the group's art holds the square with its
+/// stroke's effect applied, so the reply names the group alone; the two copies of the square share
+/// ids until Expand Appearance gives every object in them an id of its own.
 #[test]
 fn the_reply_names_each_expanded_copy_by_its_own_id() {
     for case in RANDOM_CASES {
@@ -551,8 +551,17 @@ fn the_reply_names_each_expanded_copy_by_its_own_id() {
         assert!(ids.iter().all(|&i| s.doc().unwrap().doc.node(NodeId(i)).is_some()), "{case}: {ids:?}");
         if case == "group copies" {
             let art = node(&s, id);
-            let copies: Vec<u64> = art.children().unwrap()[0].children().unwrap().iter().map(|c| c.id.0).collect();
-            assert_eq!(ids, [vec![id.0], copies].concat(), "{case}");
+            assert_eq!(ids, [id.0], "{case}");
+            let copies = art.children().unwrap();
+            assert_eq!(copies.len(), 2, "{case}");
+            let mut seen = std::collections::HashSet::new();
+            let mut repeated = vec![];
+            art.walk(&mut |n| {
+                if !seen.insert(n.id) {
+                    repeated.push(n.id);
+                }
+            });
+            assert!(repeated.is_empty(), "{case}: {repeated:?}");
         }
     }
 }
diff --git a/crates/engine/src/tests/objexpand.rs b/crates/engine/src/tests/objexpand.rs
index 38918cf2c4..1c931e0de8 100644
--- a/crates/engine/src/tests/objexpand.rs
+++ b/crates/engine/src/tests/objexpand.rs
@@ -257,6 +257,25 @@ fn shadows_under_a_groups_or_an_objects_transform_expand_appearance_as_the_canva
     }
 }
 
+/// A group's Transform effect runs after its member's own Offset Path in Expand Appearance as on
+/// the canvas: the 100 pt square offset to 120 pt and scaled by half expands 60 pt wide.
+#[test]
+fn a_groups_effects_after_its_members_own_expand_as_the_canvas_draws_them() {
+    let mut s = session();
+    run(&mut s, "shape.rectangle", json!({"x": 50, "y": 50, "width": 100, "height": 100}));
+    run(&mut s, "effect.apply", json!({"effect": "path.offsetPath", "params": {"offset": 10}}));
+    run(&mut s, "object.group", json!({}));
+    run(&mut s, "effect.apply", json!({"effect": "distort.transform", "params": {"scaleH": 50, "scaleV": 50}}));
+    let before = render(&s);
+    run(&mut s, "effect.expandAppearance", json!({}));
+    let after = render(&s);
+    let diff = differing(&before, &after, 64);
+    assert_eq!(diff, 0, "{diff} pixels differ");
+    let doc = &s.doc().unwrap().doc;
+    let w = doc.node(doc.layers[0].id).and_then(|l| l.geometric_bounds()).unwrap().width();
+    assert!((w - 60.0).abs() < 1e-6, "{w}");
+}
+
 #[test]
 fn a_placed_gradient_moved_by_a_warp_expands_as_the_canvas_draws_it() {
     // The object's own effect, and the fill's (the first appearance item).
diff --git a/crates/render/src/renderer/nodes.rs b/crates/render/src/renderer/nodes.rs
index 47f2dec770..f649453663 100644
--- a/crates/render/src/renderer/nodes.rs
+++ b/crates/render/src/renderer/nodes.rs
@@ -123,7 +123,7 @@ impl Renderer {
     /// ([`effects::plugin_revision`]), drop what the caches keep from plug-in effects: the effect
     /// geometry of paths with a plug-in effect, the cull bounds of objects that have one or hold one,
     /// of symbol instances and of the objects that hold them, and the art drawn for the effects of
-    /// objects with a plug-in effect. Rasters of raster effects and evaluations of live objects hold
+    /// objects that have a plug-in effect or hold one. Rasters of raster effects and evaluations of live objects hold
     /// the revision in their keys when what they draw has a plug-in effect (`fx::Inputs`,
     /// `live::resources_key`).
     ///
@@ -146,7 +146,8 @@ impl Renderer {
         if stale {
             self.fx_geom.retain(|_, e| !effects::has_plugin_effect(&e.node));
             self.geom.retain(|_, e| !holds_plugin_effect(&e.node) && !holds_instance(&e.node));
-            self.fx_arts.retain(|(node, ..)| !effects::has_plugin_effect(node));
+            // The art of a group holds what its members' plug-in effects draw.
+            self.fx_arts.retain(|(node, ..)| !holds_plugin_effect(node));
         }
     }
 
diff --git a/crates/render/src/tests/memory.rs b/crates/render/src/tests/memory.rs
index f95735baec..011f9fd7fe 100644
--- a/crates/render/src/tests/memory.rs
+++ b/crates/render/src/tests/memory.rs
@@ -1716,7 +1716,8 @@ fn installing_a_plugin_keeps_what_is_kept_for_other_objects() {
 }
 
 /// The art drawn for an object's effects follows the plug-ins installed: in the next frame, a group
-/// with a plug-in effect, the same group feathered (Feather clips to the art's outline), an
+/// with a plug-in effect, the same group feathered (Feather clips to the art's outline), a group
+/// with a Transform effect holding a square with a plug-in effect, an
 /// instance of symbol `S` ([`symbol_art`]) and type, each with a plug-in effect, are drawn as the
 /// plug-in installed again with another shape draws them.
 #[test]
@@ -1738,6 +1739,13 @@ fn effect_art_follows_the_plugins_installed() {
     plugin_change_draws_as_new(group(vec![]), ID, small.clone(), big.clone());
     let feather = effect("stylize.feather", serde_json::json!({"radius": 2.0}));
     plugin_change_draws_as_new(group(vec![feather]), ID, small.clone(), big.clone());
+    // A group with a Transform effect holding a square with the plug-in effect: the group's art
+    // holds what the plug-in draws for the square.
+    let mut d = Document::new(200.0, 100.0);
+    let square = filled(&mut d, rectangle(Rect::new(20.0, 30.0, 60.0, 70.0)), Paint::solid(Color::BLACK), vec![plugin()]);
+    let mut moved = Node::group(d.alloc_id(), vec![Arc::new(square)]);
+    moved.appearance.effects.push(effect("distort.transform", serde_json::json!({"moveH": 10.0})));
+    plugin_change_draws_as_new(with_art(d, vec![moved]), ID, small.clone(), big.clone());
     let mut d = Document::new(200.0, 100.0);
     let art = symbol_art(&mut d);
     d.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: "S".into(), art: Arc::new(art) });
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 086d4cfc0d..fa1eb472e8 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -605,6 +605,7 @@ since 2026-10-01.
 - **Transform effect options (#885):** Effect › Distort & Transform › Transform… has visible Transform Objects, Transform Patterns and Scale Strokes & Effects checkboxes (`distort.transform` params `objects`, `patterns`, `strokes`; files without them draw as before). With Transform Objects off the geometry stays and makes no copies; Scale Strokes & Effects scales stroke weights, dashes and the fills' and strokes' effect distances by the mean scale, and Transform Patterns moves pattern tiles, each copy `k` by the transformation `k` times. Such objects draw, export and expand through the same per-copy art, so the canvas and Expand Appearance agree (engine `tests_transformfx`, effects `tests_transformfx`, the dialog test). A Transform effect in a fill's or stroke's own effects applies the same options to that fill or stroke: its weight and dashes and its pattern follow the transformation, and with copies each copy is an object of its own; the canvas, export, Expand Appearance and Use Preview Bounds use the same art (effects `tests_transformfx`). The effects listed after it in that fill's or stroke's list keep their own distances and apply to the transformed art and to each copy, as an object's later effects do after the object's Transform effect: a Drop Shadow after it keeps its offset, an Offset Path after it offsets by its own distance, and an SVG filter after it keeps its scale and the origin of its user space. With Transform Objects off, the effects before it keep their distances too. Before, Scale Strokes & Effects scaled a fill's or stroke's later effects by the mean scale, so existing documents with such effects draw differently. Effects apply in the order they are listed ([Appearance attributes](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-graphic-styles/appearance-attributes-in-illustrator.html)); how the two options treat the effects after a fill's or stroke's own Transform effect is VectorCraft's own rule, following that order (effects `tests::rasterfollow::a_fills_own_transform_leaves_the_shadow_after_it`, `tests::rasterfollow::a_fills_own_transform_leaves_the_offset_after_it`, `tests::rasterfollow::a_fills_own_transform_leaves_the_svg_filter_after_it`, `tests::transformfx::a_fills_own_transform_with_scale_strokes_and_effects_leaves_its_later_effects`; engine `plugins::a_transform_after_a_painted_fill_effect_leaves_the_later_shadow_on_every_paint`). Public reference: [Scale objects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/scale-objects.html), [How to apply effects](https://helpx.adobe.com/illustrator/using/effects.html), [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html). Scores and hours unchanged.
 - **Raster effects before a Transform effect:** effects apply in the order they are listed ([Appearance attributes](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-graphic-styles/appearance-attributes-in-illustrator.html)). A Drop Shadow, glow, blur, Feather or pixel filter listed before a Transform effect in the same list (an object's effects, or a fill's or stroke's own) now follows that Transform effect: its sizes scale by the mean scale, and a Drop Shadow's offset turns, reflects and scales with the art. VectorCraft applies this rule with Scale Strokes & Effects on or off. Before, such an effect was drawn at its own distances around the transformed art. The canvas, export, Expand Appearance, Object › Expand, Outline Stroke and the 3D effects use the same values (effects `tests::rasterfollow`; render `a_transform_after_a_drop_shadow_scales_the_shadow_with_the_art`; engine `objexpand::a_shadow_before_a_transform_expands_as_the_canvas_draws_it`, `outlinestroke::a_shadow_before_a_transform_outlines_as_the_canvas_draws_it`). Not yet: a Transform effect that makes copies or moves at random leaves the raster effects before it as they are; a Rasterize effect before a Transform effect keeps its pixel grid and room around the art; the angles and light directions of pixel filters do not turn or reflect with the art. Scores and hours unchanged.
 - **Raster effects inside an object or group with a Transform effect:** effects applied to a group affect everything in it ([Appearance attributes](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-graphic-styles/appearance-attributes-in-illustrator.html)). How a Transform effect changes the raster effects inside a group or object is VectorCraft's own rule. A group's Transform effect that moves it once now transforms the raster effects of its members, of their fills and strokes, of nested groups and of the art of the linked opacity masks in it, after the members' own Transform effects. A raster effect that a member's own Transform effect with copies or random holds back keeps its value through that effect and still transforms with the group's. VectorCraft applies the same rule to the raster effects of an object's fills and strokes under the object's Transform effect. Sizes scale by the mean scale and a Drop Shadow's offset turns, reflects and scales, with Scale Strokes & Effects on or off. Before, they kept their values, or with Scale Strokes & Effects on scaled by the mean scale with the offset unturned. A group's or object's Transform effect that makes copies or moves at random leaves them as before. The canvas, the redraw region, export, Expand Appearance, Object › Expand and Outline Stroke use the same values (effects `tests::rasterfollow`, `group::tests::a_compound_shapes_transform_turns_its_fills_shadow`; render `a_transform_scales_the_shadows_of_fills_and_members_with_the_art`; engine `objexpand::a_fills_shadow_under_the_objects_transform_expands_as_the_canvas_draws_it`, `objexpand::shadows_under_a_groups_or_an_objects_transform_expand_appearance_as_the_canvas_draws_them`, `outlinestroke::a_strokes_shadow_under_the_objects_transform_outlines_as_the_canvas_draws_it`). Scores and hours unchanged.
+- **A group's geometry effects after its members' own:** effects applied to a group affect everything in it, and effects apply in the order they are listed ([Appearance attributes](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-graphic-styles/appearance-attributes-in-illustrator.html)). Running a group's effects after its members' own is VectorCraft's own rule. The geometry effects of a group or layer (the effects that reshape outlines, such as Distort & Transform, Offset Path and Warp) now reshape what its members draw: the geometry effects of each visible path and compound path in it and of their fills and strokes, and a nested group's own geometry and Pathfinder effects, run first, at any depth. A symbol instance's own geometry effects run after those of its symbol's members in the same way. Before, the group's effects reshaped the members' outlines and the members' own effects ran afterwards: a 100 pt square with its own 10 pt Offset Path in a group with a 50% Transform drew 70 pt wide, and it now draws 60 pt wide. Existing documents with such groups draw differently. The canvas, export, Expand Appearance and the art that Pathfinder operations and compound shapes take from such a group use the same order (effects `group::tests::a_members_own_offset_runs_before_its_groups_scale`, `group::tests::a_members_own_scale_runs_before_its_groups_offset`, `group::tests::a_member_of_a_plain_nested_group_takes_its_own_effects_first`, `group::tests::a_nested_groups_own_effects_run_before_its_groups`, `group::tests::a_nested_groups_pathfinder_runs_before_its_groups_effects`, `group::tests::a_members_fill_effects_run_before_its_groups`, `group::tests::shape_art_of_a_group_applies_its_members_effects_first`, `group::tests::a_symbol_instances_effects_run_after_its_symbols_members_own`, `group::tests::a_baked_group_applies_its_members_effects_first`, `group::tests::a_baked_group_that_keeps_its_type_applies_its_members_effects_first`, `tests::rasterfollow::a_groups_transform_applies_after_its_members_own`; engine `objexpand::a_groups_effects_after_its_members_own_expand_as_the_canvas_draws_them`). Not yet: the own geometry effects of images, symbol instances, paths with a linked opacity mask or a 3D effect, and nested groups with a 3D effect in the group still run after the group's. Scores and hours unchanged.
 - **Warp Options (#1760):** Effect > Warp and existing Appearance effect links share the fifteen existing styles, original schematic previews, orientation choices and percent Bend/Distortion controls. Focused tests passed for real numeric entry and slider input, Preview/Cancel, immediate Enter/OK, mixed-style edits, target/slot/visibility preservation and Undo/Redo. Each applied style stays unchanged until an explicit Style choice. Original style-menu and live-preview captures were reviewed; their numeric values were supplied programmatically. Public references: [Reshaping with effects](https://helpx.adobe.com/illustrator/using/reshaping-objects-effects.html) and [Using effects](https://helpx.adobe.com/illustrator/using/effects.html). Warp geometry, optional Properties integration and remembered defaults are unchanged; no broader parity claim.
 - **Placed gradients follow the Warp effects:** under each of the fifteen Warp styles with a bend or a distortion, a gradient placed with the Gradient tool moves and scales from the object's bounds before the warp to its bounds after it, as under Free Distort; a stroke's gradient uses those bounds inflated by the stroke. This holds for an object's own Warp and for a fill's or stroke's own, on the canvas and in Object › Expand of the fill. In a group with a Warp effect, each path's and compound path's gradients follow its own bounds, a nested group's own fills and strokes follow the nested group's bounds, and the group's own fills and strokes follow the group's bounds. In the art Pathfinder and compound shapes take, a symbol instance's Warp moves the gradients of its symbol's art by the art's bounds, and a compound shape's Warp moves its gradients by the bounds of its area. A gradient fitted to the object still fits the warped outline, and a warp with no bend and no distortion leaves the gradient exactly in place. Existing documents with a Warp effect on art with a placed gradient draw differently: before, the gradient stayed where it was while the outline changed. How gradients follow the warp is VectorCraft's own rule; what the Warp effects do to the object is described in [Reshaping with effects](https://helpx.adobe.com/illustrator/using/reshaping-objects-effects.html) (effects `tests::warp_bends_when_the_warp_moves_the_outline`, `bake::tests::baked_warps_move_placed_gradients_from_the_bounds_to_the_warped_bounds`, `bake::tests::a_warp_with_no_bend_leaves_a_placed_gradient_exactly_in_place`, `bake::tests::a_fills_and_a_strokes_own_warp_move_its_placed_gradient_with_the_bounds`, `group::tests::a_groups_warp_moves_the_gradients_placed_on_its_paths_by_each_paths_bounds`, `group::tests::a_groups_warp_moves_its_own_a_nested_groups_and_a_compound_paths_gradients_by_their_bounds`, `group::tests::shape_art_moves_the_gradients_of_a_symbol_instances_art_and_a_compound_shape_with_a_warp`; render `objectfx::a_paths_gradient_moves_and_scales_with_its_warped_bounds`; engine `objexpand::a_placed_gradient_moved_by_a_warp_expands_as_the_canvas_draws_it`). Scores and hours unchanged.
 - **Warp as a Bézier patch per style:** each of the fifteen Warp styles bends the object's bounds as one Bézier patch whose control points the style sets from the bend and the size of the bounds; the horizontal distortion then scales each column of control points about its middle and the vertical distortion scales each row. The Warp effects and warp envelopes share the map, and content with no width or no height takes the middle of the patch along that side. New warps, the built-in graphic styles' Warps and warps opened from `.ai` files carry `version` 1 for it. Warps in `.vectorcraft` documents saved before it read as `version` 0 and keep their earlier look, and edits keep a warp's version; a `version` 0 warp saved to `.ai` opens again with `version` 1, since the file holds only its settings. The patches are VectorCraft's own rules; the styles and ranges are those of the Warp options in [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html) (doc `live::tests::warp_nets_bend_each_style_as_its_own_patch`, `warp_net_arc_edges_are_concentric_circles`, `warp_net_distortion_scales_the_columns_then_the_rows`, `warp_net_takes_any_numbers`, `warp_net_bends_a_huge_box_without_overflowing`, `warp_envelopes_bend_flat_content_as_the_middle_of_the_patch`, `warp_envelopes_write_their_map_version_only_when_it_has_one`, `style_libs::tests::builtin_warp_styles_take_the_nets_map`; effects `tests::a_warp_draws_with_the_map_its_version_names`, `tests::a_warp_bends_a_flat_box_as_the_middle_of_its_patch`, `tests::new_warps_take_the_nets_version`; engine `effectedit::warps_keep_the_map_their_version_names`, `envelope::new_warp_envelopes_take_the_net_and_saved_ones_keep_their_map`; eps `ai_editing::tests::every_effect_a_graphic_style_holds_is_read_back`, `import::ai::tests::a_warp_envelope_opens_live`, `import::ai::tests::warp_envelopes_read_every_style`, `import::ai::style::tests::a_stack_of_fills_with_effects_of_their_own_is_read_as_itself`; ui-egui `dialogs::tests_warp::warp_options_edit_keeps_each_targets_map_version`). Scores and hours unchanged.

From 6ed3935e59a2826c5f47231d33d3892009cf64fd Mon Sep 17 00:00:00 2001
From: jmverges <juanmanuel.vergessolanas@gmail.com>
Date: Fri, 13 Nov 2026 12:43:47 +0000
Subject: [PATCH 20/48] Envelopes: a top object's side split at a cusp still
 follows its curve

Split where the curve stops (a cusp), both handles at the split lie on
the anchor, so their lengths say nothing of how the curve's parameter
divides between the two pieces, and the side fell back to the polygon
shares. When both handles lie within ONE_CURVE of the anchor, the
spans now come from how far each piece bends away from it (the second
derivatives, in proportion to the squares of the spans). The existing
check of every piece against the rebuilt curve is unchanged.

Test: a_split_curve_keeps_the_top_object_patch_when_split_at_a_cusp.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 crates/doc/src/live.rs      | 16 ++++++++++++++++
 crates/doc/src/live/mesh.rs | 18 +++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/crates/doc/src/live.rs b/crates/doc/src/live.rs
index e667f2972d..6c0e880ee1 100644
--- a/crates/doc/src/live.rs
+++ b/crates/doc/src/live.rs
@@ -612,6 +612,22 @@ mod tests {
         }
     }
 
+    #[test]
+    fn a_split_curve_keeps_the_top_object_patch_when_split_at_a_cusp() {
+        // The top curve stops at t = 0.25 (a cusp), and an anchor splits it there: both handles at
+        // the split lie on the anchor, and the patch with the corners given stays the unsplit
+        // curve's.
+        let cusp = CubicBez::new((0.0, 0.0), (30.0, -40.0), (-58.0, 24.0), (200.0, 0.0));
+        let pieces = [cusp.subsegment(0.0..0.25), cusp.subsegment(0.25..1.0)];
+        assert!(pieces[0].p2.distance(pieces[0].p3) < 1e-9 && pieces[1].p1.distance(pieces[1].p0) < 1e-9);
+        let whole = Coons::from_top_object(&top_of_pieces(&[cusp]), Some([0, 1, 2, 3])).unwrap();
+        let c = Coons::from_top_object(&top_of_pieces(&pieces), Some([0, 2, 3, 4])).unwrap();
+        for (u, v) in [(0.1, 0.0), (0.25, 0.0), (0.3, 0.2), (0.5, 0.5), (0.62, 0.0), (0.9, 0.7), (0.97, 1.0)] {
+            let (p, q) = (c.eval(u, v), whole.eval(u, v));
+            assert!(p.distance(q) < 1e-6, "({u}, {v}) → {p:?}, unsplit {q:?}");
+        }
+    }
+
     #[test]
     fn a_top_object_joins_a_split_curve_saved_with_rounded_coordinates() {
         // A file saves the pieces of a curve split into thirds, or into tenths, with its
diff --git a/crates/doc/src/live/mesh.rs b/crates/doc/src/live/mesh.rs
index 5e90a56462..dbebf9a439 100644
--- a/crates/doc/src/live/mesh.rs
+++ b/crates/doc/src/live/mesh.rs
@@ -362,7 +362,9 @@ fn control_polygon(c: &CubicBez) -> f64 {
 /// between them, when each control point of each piece lies within [`ONE_CURVE`] of the matching
 /// piece of that curve; `None` otherwise. Split at parameter `t`, a curve's handles on either side
 /// of the split lie in line, their lengths in proportion to the spans of its parameter the two
-/// pieces take. Those proportions give each piece's span, and the curve follows from the first
+/// pieces take; split where the curve stops (a cusp), both handles lie on the anchor, and the
+/// pieces' second derivatives there, in proportion to the squares of the spans, give the proportion
+/// instead. Those proportions give each piece's span, and the curve follows from the first
 /// piece's start and its handle, and the last piece's end and its handle, scaled up by their spans.
 /// Every piece is then checked against that curve's piece over its span, so error can't build up
 /// from one split to the next (the first piece's start and handle, and the last piece's end and
@@ -377,8 +379,18 @@ fn one_curve(pieces: &[CubicBez]) -> Option<CubicBez> {
     for pair in pieces.windows(2) {
         let [a, b] = pair else { return None };
         let (into, out) = (a.p3.distance(a.p2), b.p0.distance(b.p1));
-        let next = spans.last().copied().unwrap_or(1.0) * out / into;
-        if !(into > 0.0 && out > 0.0 && next.is_finite() && next > 0.0) {
+        let ratio = if into.max(out) <= ONE_CURVE {
+            // Split where the curve stops (a cusp), both handles lie on the anchor and say nothing
+            // of the spans; how far each piece bends away from its anchor, in proportion to the
+            // squares of the spans, says it instead.
+            let bend_in = ((a.p3 - a.p2) - (a.p2 - a.p1)).hypot();
+            let bend_out = ((b.p2 - b.p1) - (b.p1 - b.p0)).hypot();
+            (bend_out / bend_in).sqrt()
+        } else {
+            out / into
+        };
+        let next = spans.last().copied().unwrap_or(1.0) * ratio;
+        if !(next.is_finite() && next > 0.0) {
             return None;
         }
         spans.push(next);

From 349034dda2edbc9dd9140eda998692454a3647de Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:44:12 -0800
Subject: [PATCH 21/48] Smooth tool: each drag smooths the path under it, and
 repeated drags keep smoothing

Part of #2224.

A Smooth tool drag only refitted the anchors in its reach within
Fidelity, so a wobble wider than Fidelity stayed, and a second drag over
the same place changed nothing. Repeated refits also drifted away from
the path, and a drag over a whole closed path left a corner at its first
anchor.

- path.smoothRegion now smooths the stretch in reach along its length
  with a Gaussian whose spread is a third of the reach, then refits it
  within Fidelity. The run's outer end points and handles stay fixed.
- Each refit stays within twice the distance the smoothing moved the
  path (at least a tenth of Fidelity), so repeated drags do not drift
  (SimplifyOptions::smooth_moved_only).
- A whole closed path is smoothed across its start as a loop, so a
  bump at the first anchor is smoothed like any other and no corner is
  left. Object > Path > Smooth smooths a closed path across its start
  the same way.
---
 crates/engine/src/cmd/draw2/smooth.rs |  45 ++++---
 crates/engine/src/cmd/pathops.rs      |   2 +-
 crates/engine/src/tests/draw2.rs      | 163 ++++++++++++++++++++++++++
 crates/pathops/src/edit.rs            | 116 +++++++++++++++++-
 docs/target-app-parity.md             |   1 +
 5 files changed, 304 insertions(+), 23 deletions(-)

diff --git a/crates/engine/src/cmd/draw2/smooth.rs b/crates/engine/src/cmd/draw2/smooth.rs
index d63bdaea77..24e7577fc6 100644
--- a/crates/engine/src/cmd/draw2/smooth.rs
+++ b/crates/engine/src/cmd/draw2/smooth.rs
@@ -8,10 +8,22 @@ use super::{
 
 // ---------- Smooth ----------
 
-/// Refit the anchors of an open run `a[lo..=hi]` keeping its end points and outer handles.
-fn refit_run(anchors: &[Anchor], tol: f64) -> Vec<Anchor> {
+/// The spread (points) of the Gaussian the Smooth tool smooths a path along its length with before
+/// refitting it, as a share of the tool's reach: a third, so each point is averaged with the stretch
+/// of path within the reach on either side of it. VectorCraft's own value.
+const SMOOTH_SPREAD: f64 = 1.0 / 3.0;
+
+/// The options the Smooth tool refits with: the path smoothed along its length by a Gaussian of
+/// spread `sigma` (none at 0), then refitted within `tol` of that and within twice the distance the
+/// smoothing moved it, keeping a corner only where the path turns back on itself.
+fn refit_options(tol: f64, sigma: f64) -> SimplifyOptions {
+    SimplifyOptions { tolerance: tol, corner_angle_deg: 179.0, straight_lines: false, smooth: sigma, smooth_moved_only: true }
+}
+
+/// Smooth and refit the anchors of an open run `a[lo..=hi]` keeping its end points and outer handles.
+fn refit_run(anchors: &[Anchor], tol: f64, sigma: f64) -> Vec<Anchor> {
     let piece = PathData::single(SubPath::new(anchors.to_vec(), false));
-    let fitted = po::simplify_with(&piece, &SimplifyOptions { tolerance: tol, corner_angle_deg: 179.0, straight_lines: false, ..Default::default() });
+    let fitted = po::simplify_with(&piece, &refit_options(tol, sigma));
     let Some(mut out) = fitted.subpaths.into_iter().next().map(|s| s.anchors).filter(|a| a.len() >= 2) else { return anchors.to_vec() };
     let (f, l) = (anchors[0], anchors[anchors.len() - 1]);
     let last = out.len() - 1;
@@ -25,7 +37,7 @@ fn refit_run(anchors: &[Anchor], tol: f64) -> Vec<Anchor> {
     out
 }
 
-fn smooth_subpath(sp: &SubPath, near: &dyn Fn(Point) -> bool, tol: f64) -> Option<SubPath> {
+fn smooth_subpath(sp: &SubPath, near: &dyn Fn(Point) -> bool, tol: f64, sigma: f64) -> Option<SubPath> {
     let n = sp.anchors.len();
     let marked: Vec<bool> = sp.anchors.iter().map(|a| near(a.p)).collect();
     if n < 3 || !marked.iter().any(|m| *m) {
@@ -33,11 +45,8 @@ fn smooth_subpath(sp: &SubPath, near: &dyn Fn(Point) -> bool, tol: f64) -> Optio
     }
     if sp.closed {
         let Some(k) = marked.iter().position(|m| !m) else {
-            // Everything is in range: smooth the whole closed path.
-            let f = po::simplify_with(
-                &PathData::single(sp.clone()),
-                &SimplifyOptions { tolerance: tol, corner_angle_deg: 179.0, straight_lines: false, ..Default::default() },
-            );
+            // Everything is in range: smooth the whole closed path, across its start too.
+            let f = po::simplify_with(&PathData::single(sp.clone()), &refit_options(tol, sigma));
             return f.subpaths.into_iter().next();
         };
         // Rotate so an untouched anchor comes first, duplicate it at the end and treat as open.
@@ -48,14 +57,14 @@ fn smooth_subpath(sp: &SubPath, near: &dyn Fn(Point) -> bool, tol: f64) -> Optio
         open.anchors.push(open.anchors[0]);
         m.push(false);
         open.closed = false;
-        let mut res = smooth_open(&open.anchors, &m, near, tol);
+        let mut res = smooth_open(&open.anchors, &m, near, tol, sigma);
         let l = res.pop()?;
         if let Some(r0) = res.first_mut() {
             r0.h_in = l.h_in;
         }
         return Some(SubPath::new(res, true));
     }
-    Some(SubPath::new(smooth_open(&sp.anchors, &marked, near, tol), false))
+    Some(SubPath::new(smooth_open(&sp.anchors, &marked, near, tol, sigma), false))
 }
 
 /// The segment `c`, which ends in the drag's reach (`near`) and starts outside it, split where it
@@ -84,10 +93,11 @@ fn split_at_reach(c: CubicBez, near: &dyn Fn(Point) -> bool) -> Option<(CubicBez
     (hi > 0.02).then(|| (part(0.0..hi), part(hi..1.0)))
 }
 
-/// `anchors` with each run of `marked` ones refitted, together with the stretch of the segments
-/// leading into the run that is in the drag's reach (`near`): a short drag smooths what is under
-/// it, and the rest of a long segment next to it stays as it was (#1512).
-fn smooth_open(anchors: &[Anchor], marked: &[bool], near: &dyn Fn(Point) -> bool, tol: f64) -> Vec<Anchor> {
+/// `anchors` with each run of `marked` ones smoothed by a Gaussian of spread `sigma` and refitted
+/// within `tol`, together with the stretch of the segments leading into the run that is in the
+/// drag's reach (`near`): a short drag smooths what is under it, and the rest of a long segment next
+/// to it stays as it was (#1512).
+fn smooth_open(anchors: &[Anchor], marked: &[bool], near: &dyn Fn(Point) -> bool, tol: f64, sigma: f64) -> Vec<Anchor> {
     let n = anchors.len();
     let mut runs = vec![];
     let mut i = 0;
@@ -127,7 +137,7 @@ fn smooth_open(anchors: &[Anchor], marked: &[bool], near: &dyn Fn(Point) -> bool
             head = Some(Anchor { h_out: far.p1, ..*outer });
             *outer = Anchor::with_handles(far.p3, far.p2, reach.p1);
         }
-        let new = refit_run(&piece, tol);
+        let new = refit_run(&piece, tol, sigma);
         out.splice(lo..=hi, head.into_iter().chain(new).chain(tail));
     }
     out
@@ -138,6 +148,7 @@ pub(super) fn smooth_region(s: &mut Session, p: &Value) -> Result<Value> {
     let pts = points_param(p, "points", C)?;
     let radius = number_or(p, "radius", 12.0, C)?.max(0.0);
     let tol = number_or(p, "fidelity", 2.5, C)?.clamp(vectorcraft_tools::draw2::SMOOTH_MIN_FIDELITY, 100.0);
+    let sigma = radius * SMOOTH_SPREAD;
     let st = s.doc()?;
     let near = |q: Point| dist_to_polyline(&pts, q) <= radius;
     let mut plan = vec![];
@@ -148,7 +159,7 @@ pub(super) fn smooth_region(s: &mut Session, p: &Value) -> Result<Value> {
         let subs: Vec<SubPath> = pd
             .subpaths
             .iter()
-            .map(|sp| match smooth_subpath(sp, &near, tol) {
+            .map(|sp| match smooth_subpath(sp, &near, tol, sigma) {
                 Some(n) if n != *sp && n.anchors.len() >= 2 => {
                     changed = true;
                     n
diff --git a/crates/engine/src/cmd/pathops.rs b/crates/engine/src/cmd/pathops.rs
index c617c4de8e..ac57d1852f 100644
--- a/crates/engine/src/cmd/pathops.rs
+++ b/crates/engine/src/cmd/pathops.rs
@@ -1228,7 +1228,7 @@ fn simplify(s: &mut Session, p: &Value) -> Result<Value> {
         Some(l) => po::simplify_level_tolerance(l),
         None => given_tolerance.unwrap_or(1.0),
     };
-    let opts = po::SimplifyOptions { tolerance: tolerance.clamp(1e-4, 1e4), corner_angle_deg: corner_angle, straight_lines, smooth: 0.0 };
+    let opts = po::SimplifyOptions { tolerance: tolerance.clamp(1e-4, 1e4), corner_angle_deg: corner_angle, straight_lines, ..Default::default() };
     // A path with segments direct-selected simplifies only their runs, and keeps those runs (and the
     // other anchors it had selected) direct-selected.
     let roots = selected_roots(s)?;
diff --git a/crates/engine/src/tests/draw2.rs b/crates/engine/src/tests/draw2.rs
index 5986b618fd..23c4fcacce 100644
--- a/crates/engine/src/tests/draw2.rs
+++ b/crates/engine/src/tests/draw2.rs
@@ -1390,6 +1390,169 @@ fn a_short_smooth_drag_leaves_the_rest_of_long_segments_alone() {
     }
 }
 
+/// A selected path through `anchors` (x, y, and the in and out handles when given).
+fn smooth_test_path(s: &mut Session, anchors: &[serde_json::Value], closed: bool) -> NodeId {
+    let r = s.execute("path.create", &json!({"anchors": anchors, "closed": closed})).unwrap();
+    let id = NodeId(r["id"].as_u64().unwrap());
+    s.execute("select.set", &json!({"ids": [id.0]})).unwrap();
+    id
+}
+
+/// `path.smoothRegion` along `drag` with the Smooth tool's reach (12 pt at 100%) and default Fidelity.
+fn smooth_pass(s: &mut Session, drag: &[Point]) {
+    let pts: Vec<_> = drag.iter().map(|p| json!([p.x, p.y])).collect();
+    s.execute("path.smoothRegion", &json!({"points": pts, "radius": 12, "fidelity": 2.5})).unwrap();
+}
+
+/// Points 1/32 of a segment apart along every segment of `p`.
+fn smooth_test_samples(p: &PathData) -> Vec<Point> {
+    use kurbo::ParamCurve;
+    let mut v = vec![];
+    for sp in &p.subpaths {
+        for i in 0..sp.segment_count() {
+            let c = sp.segment(i);
+            v.extend((0..32).map(|k| c.eval(f64::from(k) / 32.0)));
+        }
+    }
+    v
+}
+
+/// How much `p` turns along its length, in radians: a wobbly path turns much more than a smooth one.
+fn total_turning(p: &PathData) -> f64 {
+    let pts = smooth_test_samples(p);
+    pts.windows(3)
+        .map(|w| (w[1] - w[0], w[2] - w[1]))
+        .filter(|(u, v)| u.hypot() > 1e-9 && v.hypot() > 1e-9)
+        .map(|(u, v)| u.cross(v).atan2(u.dot(v)).abs())
+        .sum()
+}
+
+/// Deterministic noise in -1..1.
+fn smooth_noise(seed: &mut u64) -> f64 {
+    *seed = seed.wrapping_mul(6364136223846793005).wrapping_add(1442695040888963407);
+    (*seed >> 11) as f64 / (1u64 << 53) as f64 * 2.0 - 1.0
+}
+
+/// A drag along y = `y` from x = `x0` to `x1`, one point every 5 pt.
+fn smooth_drag_along(y: f64, x0: f64, x1: f64) -> Vec<Point> {
+    let n = ((x1 - x0) / 5.0).ceil() as usize;
+    (0..=n).map(|i| Point::new(x0 + (x1 - x0) * i as f64 / n as f64, y)).collect()
+}
+
+/// Each drag of the Smooth tool smooths the path under it, and a second drag over the same place
+/// smooths it further, as the help page describes
+/// (https://helpx.adobe.com/illustrator/using/tool-techniques/smooth-tool.html): a curve that wobbles
+/// 4 pt either side of its line every 12 pt, with an anchor at each crest, wobbles less after each drag.
+#[test]
+fn each_smooth_drag_smooths_a_wobble_larger_than_fidelity_further() {
+    let mut s = session();
+    let anchors: Vec<_> = (0..=20)
+        .map(|k| {
+            let (x, y) = (100.0 + 12.0 * f64::from(k), if k % 2 == 0 { 196.0 } else { 204.0 });
+            json!({"x": x, "y": y, "in": [x - 4.4, y], "out": [x + 4.4, y]})
+        })
+        .collect();
+    let id = smooth_test_path(&mut s, &anchors, false);
+    let drag = smooth_drag_along(200.0, 90.0, 350.0);
+    let wobble =
+        |p: &PathData| smooth_test_samples(p).iter().filter(|q| (130.0..=310.0).contains(&q.x)).map(|q| (q.y - 200.0).abs()).fold(0.0, f64::max);
+    let mut before = path(&s, id);
+    for pass in 1..=2 {
+        smooth_pass(&mut s, &drag);
+        let after = path(&s, id);
+        assert_ne!(after, before, "pass {pass} changes the path");
+        let (t0, t1) = (total_turning(&before), total_turning(&after));
+        assert!(t1 < 0.9 * t0, "pass {pass}: turning {t0} -> {t1}");
+        let (w0, w1) = (wobble(&before), wobble(&after));
+        assert!(w1 < 0.8 * w0, "pass {pass}: wobble {w0} -> {w1}");
+        let (a, b) = (before.subpaths[0].anchors[0].p, after.subpaths[0].anchors[0].p);
+        assert_eq!(a, b, "pass {pass}: the path keeps its start");
+        before = after;
+    }
+}
+
+/// Smoothing a line with up to 1 pt of noise again and again, over all of it or over its middle,
+/// keeps it close to the line under the noise: each refit stays near the path it smooths.
+#[test]
+fn repeated_smooth_drags_stay_close_to_the_line_under_the_noise() {
+    let off = |p: &PathData| {
+        let d: Vec<f64> = smooth_test_samples(p).iter().map(|q| (q.y - 200.0).abs()).collect();
+        (d.iter().sum::<f64>() / d.len() as f64, d.iter().copied().fold(0.0, f64::max))
+    };
+    for (x0, x1) in [(90.0, 410.0), (150.0, 350.0)] {
+        let mut s = session();
+        let mut seed = 7u64;
+        let anchors: Vec<_> = (0..=60).map(|i| json!({"x": 100.0 + 5.0 * f64::from(i), "y": 200.0 + smooth_noise(&mut seed)})).collect();
+        let id = smooth_test_path(&mut s, &anchors, false);
+        let drag = smooth_drag_along(200.0, x0, x1);
+        let (mean0, _) = off(&path(&s, id));
+        for pass in 1..=5 {
+            smooth_pass(&mut s, &drag);
+            let (mean, max) = off(&path(&s, id));
+            assert!(
+                mean <= 1.1 * mean0 && max <= 1.5,
+                "drag {x0}-{x1}, pass {pass}: {mean} on average and {max} at most from the line, {mean0} before"
+            );
+        }
+    }
+}
+
+/// A drag over the whole of a noisy closed path leaves no corner where the path starts.
+#[test]
+fn smoothing_a_whole_closed_path_leaves_no_kink_at_its_start() {
+    let mut s = session();
+    let mut seed = 5u64;
+    let (c, r) = (Point::new(300.0, 300.0), 80.0);
+    let anchors: Vec<_> = (0..64)
+        .map(|i| {
+            let a = f64::from(i) / 64.0 * std::f64::consts::TAU;
+            let rr = r + 2.5 * smooth_noise(&mut seed);
+            json!({"x": c.x + rr * a.cos(), "y": c.y + rr * a.sin()})
+        })
+        .collect();
+    let id = smooth_test_path(&mut s, &anchors, true);
+    let ring: Vec<Point> = (0..=128).map(|i| f64::from(i) / 128.0 * std::f64::consts::TAU).map(|a| c + r * kurbo::Vec2::from_angle(a)).collect();
+    smooth_pass(&mut s, &ring);
+    let p = path(&s, id);
+    let sp = &p.subpaths[0];
+    assert!(sp.closed && sp.anchors.len() < 64, "{} anchors", sp.anchors.len());
+    let (last, first) = (sp.segment(sp.segment_count() - 1), sp.segment(0));
+    let tin = if last.p3.distance(last.p2) > 1e-9 { last.p3 - last.p2 } else { last.p3 - last.p1 };
+    let tout = if first.p1.distance(first.p0) > 1e-9 { first.p1 - first.p0 } else { first.p2 - first.p0 };
+    let kink = tin.cross(tout).atan2(tin.dot(tout)).abs().to_degrees();
+    assert!(kink <= 1.0, "a {kink}° corner at the start");
+}
+
+/// A drag over the whole of a closed path smooths a bump at its first anchor as much as the same
+/// bump on the far side of it.
+#[test]
+fn smoothing_a_whole_closed_path_smooths_a_bump_at_its_start() {
+    let mut s = session();
+    let (c, r) = (Point::new(300.0, 300.0), 80.0);
+    let anchors: Vec<_> = (0..64)
+        .map(|i| {
+            let a = f64::from(i) / 64.0 * std::f64::consts::TAU;
+            let rr = if i % 32 == 0 { r + 6.0 } else { r };
+            json!({"x": c.x + rr * a.cos(), "y": c.y + rr * a.sin()})
+        })
+        .collect();
+    let id = smooth_test_path(&mut s, &anchors, true);
+    let ring: Vec<Point> = (0..=128).map(|i| f64::from(i) / 128.0 * std::f64::consts::TAU).map(|a| c + r * kurbo::Vec2::from_angle(a)).collect();
+    // A Fidelity of 0.5 pt, so the refit follows the smoothed path closely on both sides.
+    let pts: Vec<_> = ring.iter().map(|p| json!([p.x, p.y])).collect();
+    s.execute("path.smoothRegion", &json!({"points": pts, "radius": 12, "fidelity": 0.5})).unwrap();
+    let p = path(&s, id);
+    use std::f64::consts::{PI, TAU};
+    // How far the path rises above the circle within 0.3 radians of the angle `near`.
+    let bump = |near: f64| {
+        let off = |q: &Point| (((q.y - c.y).atan2(q.x - c.x) - near + PI).rem_euclid(TAU) - PI).abs();
+        smooth_test_samples(&p).iter().filter(|q| off(q) < 0.3).map(|q| q.distance(c) - r).fold(0.0, f64::max)
+    };
+    let (start, far) = (bump(0.0), bump(PI));
+    assert!(far < 5.0, "the far bump stays {far} pt high");
+    assert!(start <= far + 0.5, "the bump at the start stays {start} pt high, the far one {far} pt");
+}
+
 #[test]
 fn join_tool_joins_two_lines() {
     let mut s = session();
diff --git a/crates/pathops/src/edit.rs b/crates/pathops/src/edit.rs
index d8d121ecb9..337130c282 100644
--- a/crates/pathops/src/edit.rs
+++ b/crates/pathops/src/edit.rs
@@ -22,14 +22,23 @@ pub struct SimplifyOptions {
     /// How far (points, the spread of a Gaussian along the path) the path is smoothed before it is
     /// refitted, so that bumps and jags come out as one curve ([`smooth_level`]); 0 for none.
     pub smooth: f64,
+    /// With [`smooth`](Self::smooth), refit each stretch fitted as one piece (between corners) within
+    /// twice the farthest the smoothing moved any of its points when that is less than `tolerance`, and
+    /// never within less than a tenth of `tolerance`. A stretch that smoothing barely moves anywhere
+    /// keeps its shape. The limit is the same along the whole stretch, so where smoothing moves some of
+    /// its points far, all of it is refitted within up to `tolerance`, as without this option.
+    pub smooth_moved_only: bool,
 }
 
 impl Default for SimplifyOptions {
     fn default() -> Self {
-        Self { tolerance: 0.5, corner_angle_deg: 30.0, straight_lines: false, smooth: 0.0 }
+        Self { tolerance: 0.5, corner_angle_deg: 30.0, straight_lines: false, smooth: 0.0, smooth_moved_only: false }
     }
 }
 
+/// The least share of the tolerance that [`SimplifyOptions::smooth_moved_only`] refits within.
+const SMOOTH_MOVED_FLOOR: f64 = 0.1;
+
 /// Simplify with the default corner threshold (30°).
 pub fn simplify(path: &PathData, tolerance: f64) -> PathData {
     simplify_with(path, &SimplifyOptions { tolerance, ..Default::default() })
@@ -310,16 +319,27 @@ pub(crate) fn simplify_run_within(run: &[Seg], opts: &SimplifyOptions, mut budge
 }
 
 /// Adds the refit of `part`, consecutive segments with no corner between them and the steps to
-/// sample each one with, to `result`. `ends` is the direction it leaves and arrives along, when not
-/// those of its first and last segments.
-fn refit_part(part: &[(&Seg, usize)], opts: &SimplifyOptions, tol: f64, ends: Option<Vec2>, result: &mut Vec<Seg>) {
+/// sample each one with, to `result`. `ends`, given only when `part` is a whole closed loop, is the
+/// direction it leaves and arrives along; when the loop is smoothed, the smoothing runs across its
+/// start and the direction comes from the smoothed samples there.
+fn refit_part(part: &[(&Seg, usize)], opts: &SimplifyOptions, tol: f64, mut ends: Option<Vec2>, result: &mut Vec<Seg>) {
     let (Some((first, _)), Some((last, _))) = (part.first(), part.last()) else { return };
     let mut pts = Vec::new();
     for (k, (s, steps)) in part.iter().enumerate() {
         sample(&s.c, *steps, &mut pts, k == 0);
     }
+    let mut tol = tol;
     if opts.smooth > 0.0 {
-        pts = smooth_points(&pts, opts.smooth);
+        let smoothed = if ends.is_some() { smooth_loop_points(&pts, opts.smooth) } else { smooth_points(&pts, opts.smooth) };
+        if ends.is_some()
+            && let (Some(&next), Some(&prev)) = (smoothed.get(1), smoothed.len().checked_sub(2).and_then(|i| smoothed.get(i)))
+        {
+            ends = unit(next - prev).or(ends);
+        }
+        if opts.smooth_moved_only {
+            tol = tol.min((2.0 * smoothing_moved(&pts, &smoothed)).max(tol * SMOOTH_MOVED_FLOOR));
+        }
+        pts = smoothed;
     }
     if opts.straight_lines {
         let keep = rdp(&pts, tol * (1.0 - SAMPLE_GAP));
@@ -346,6 +366,66 @@ fn smooth_points(pts: &[Point], sigma: f64) -> Vec<Point> {
     smooth_points_counted(pts, sigma, &mut 0)
 }
 
+/// [`smooth_points`] for the samples `pts` of a whole closed loop, whose last sample is its first:
+/// the samples at its start are smoothed like the others, and the first and last ones move together.
+/// The loop is smoothed twice as an open run of the same samples, once from its start and once from
+/// the sample nearest halfway round by length, where [`smooth_points`] keeps each run's ends in place.
+/// Each sample takes a blend of the two that runs smoothly round the loop, with weights
+/// `(1 ± cos θ) / 2`: `θ` goes from 0 at the start to π at the halfway sample and on to 2π at the end,
+/// in proportion to length, so the start takes only the second run and the halfway sample only the
+/// first, and no sample takes any of a run's fixed ends.
+fn smooth_loop_points(pts: &[Point], sigma: f64) -> Vec<Point> {
+    let Some(m) = pts.len().checked_sub(1).filter(|&m| m >= 3) else { return smooth_points(pts, sigma) };
+    let mut along = Vec::with_capacity(pts.len());
+    let mut total = 0.0;
+    for (i, p) in pts.iter().enumerate() {
+        if let Some(prev) = i.checked_sub(1).and_then(|j| pts.get(j)) {
+            total += prev.distance(*p);
+        }
+        along.push(total);
+    }
+    if !(total.is_finite() && total > 0.0) {
+        return smooth_points(pts, sigma);
+    }
+    let half = (1..m).min_by(|&a, &b| (along[a] - total / 2.0).abs().total_cmp(&(along[b] - total / 2.0).abs())).unwrap_or(m / 2);
+    let mid = along[half];
+    if !(mid > 0.0 && mid < total) {
+        return smooth_points(pts, sigma);
+    }
+    let ring = &pts[..m];
+    let turned: Vec<Point> = ring[half..].iter().chain(&ring[..=half]).copied().collect();
+    let from_half = smooth_points(&turned, sigma);
+    let mut out = smooth_points(pts, sigma);
+    for (i, (p, &s)) in out.iter_mut().zip(&along).enumerate() {
+        // Sample `i` of the loop is sample `i - half` of `turned`, round the loop.
+        let Some(&q) = from_half.get((i + m - half) % m) else { continue };
+        let theta = if s <= mid { s / mid } else { 1.0 + (s - mid) / (total - mid) } * std::f64::consts::PI;
+        let w = 0.5 * (1.0 + theta.cos());
+        *p = p.lerp(q, w);
+    }
+    if let Some(&start) = out.first()
+        && let Some(end) = out.last_mut()
+    {
+        *end = start;
+    }
+    out
+}
+
+/// How far [`smooth_points`] moved the samples `pts` to `smoothed` (the same number of points, in
+/// order) across the path: the largest distance from a smoothed point to the lines between the
+/// samples up to two on either side of the one it came from.
+fn smoothing_moved(pts: &[Point], smoothed: &[Point]) -> f64 {
+    smoothed
+        .iter()
+        .enumerate()
+        .map(|(i, &q)| {
+            let own = pts.get(i).map_or(f64::INFINITY, |p| p.distance(q));
+            let (lo, hi) = (i.saturating_sub(2), (i + 2).min(pts.len().saturating_sub(1)));
+            (lo..hi).filter_map(|j| Some(Line::new(*pts.get(j)?, *pts.get(j + 1)?).nearest(q, 1e-9).distance_sq.sqrt())).fold(own, f64::min)
+        })
+        .fold(0.0, f64::max)
+}
+
 /// How many groups of samples a spread holds at most in [`smooth_points`]. Weighing them in groups
 /// leaves each smoothed point within a thousandth of a spread of the mean of its samples weighed one
 /// by one.
@@ -678,6 +758,7 @@ pub fn smooth_options(path: &PathData, level: f64) -> SimplifyOptions {
         corner_angle_deg: SMOOTH_CORNER_DEG,
         straight_lines: false,
         smooth: size * 0.05 * level / 100.0,
+        smooth_moved_only: false,
     }
 }
 
@@ -1182,6 +1263,31 @@ mod tests {
         assert!(work <= 400 * pts.len(), "{work} steps for {} samples", pts.len());
     }
 
+    /// A spike on a closed loop whose samples are ten times denser on one half than on the other is
+    /// smoothed out wherever it is, including at the sample halfway through the list, which is only
+    /// about a quarter of the way round by length.
+    #[test]
+    fn loop_smoothing_smooths_a_spike_on_unevenly_sampled_loops() {
+        let c = Point::new(300.0, 300.0);
+        let on = |a: f64, r: f64| c + r * Vec2::from_angle(a);
+        let mut pts: Vec<Point> = (0..300).map(|i| on(f64::from(i) / 300.0 * std::f64::consts::PI, 100.0)).collect();
+        pts.extend((0..30).map(|i| on(std::f64::consts::PI * (1.0 + f64::from(i) / 30.0), 100.0)));
+        let m = pts.len();
+        pts.push(pts[0]);
+        for spike in [m / 2, 0, 100] {
+            let mut p = pts.clone();
+            p[spike] = on(std::f64::consts::PI * spike as f64 / 300.0, 105.0);
+            if spike == 0 {
+                p[m] = p[0];
+            }
+            let out = smooth_loop_points(&p, 10.0);
+            assert_eq!(out.len(), p.len());
+            assert_eq!(out[0], out[m], "spike at {spike}: the loop stays closed");
+            let left = out[spike].distance(c) - 100.0;
+            assert!(left < 1.0, "spike at {spike}: {left} pt of 5 pt left");
+        }
+    }
+
     #[test]
     fn the_samples_of_a_flat_loop_and_its_line_segments_stay_within_the_result_limit() {
         for (curved, kept) in [(1, 0), (32, 1), (40, 1_000_000), (1_000, MAX_RUN_RESULT - 1_000), (3, MAX_RUN_RESULT - 7)] {
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..e92aa04706 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1086,6 +1086,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
     Live curve fitting in the Pencil Tool Options is on by default; while it is off, the path shown while a stroke is drawn joins the stroke's points with straight segments, and the release fits the curve, as [Pencil Tool Options](https://web.archive.org/web/20261002104400/https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/pencil-tool-options.html) describes (`path.freehand` `fit`).
     In the Pencil and Paintbrush Tool Options, Edit selected paths within 0 px turns editing off, so a stroke that starts exactly on an end of a selected open path draws a new path; Close paths when ends are within 0 px turns closing off, so a stroke that ends exactly where it started stays open.
     The Pencil's and the Paintbrush's Fidelity is in screen pixels, the same at any zoom: their Tool Options give it in px, from 0.01 px on the logarithmic slider to 20 px and up to 100 px in the field, and the tool sends `path.freehand` the value in points at the current zoom (#5729). The Smooth tool's and the Blob Brush's Fidelity stays in points.
+    Each drag of the Smooth tool smooths the stretch of a selected path in its reach along its length before refitting it within Fidelity, so a wobble wider than Fidelity is smoothed out and another drag over the same place smooths it further, as [the help page](https://helpx.adobe.com/illustrator/using/tool-techniques/smooth-tool.html) describes (`path.smoothRegion`). The smoothing spread (a third of the reach) and the rule that each refit stays within twice the distance the smoothing moved the path, so repeated drags do not drift from it, are VectorCraft's own. A drag over the whole of a closed path smooths it across its first anchor too, so a bump there is smoothed like any other and no corner is left; Object › Path › Smooth smooths a closed path across its first anchor the same way.
     Before a press that draws a new path, the Pencil cursor shows a small star, as [Draw freeform paths with the Pencil tool](https://web.archive.org/web/20260926095638/https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/draw-freeform-paths-with-the-pencil-tool.html) describes; over a selected path within Edit selected paths' distance, which the press continues from an end or redraws, the star is not shown ([Reshape paths with the Pencil tool](https://web.archive.org/web/20260106004407/https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/reshape-paths-with-the-pencil-tool.html)).
     Keep selected in the Pencil and Paintbrush Tool Options is on by default: while it is on, a stroke selects the path it draws or continues and replaces the earlier selection. While it is off, a new stroke leaves nothing selected, the earlier selection included, as the reference application starts the stroke by dropping it (#5752); a continued or redrawn path is deselected while the rest of the selection stays (`path.freehand` `keepSelected`).
     With two open paths selected, a Pencil stroke from an end of one that ends within Edit selected paths' distance of an end of the other connects them into one path with the first path's appearance, in one undo step, as [Connect two paths with the Pencil tool](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/connect-two-paths-with-the-pencil-tool.html) describes (`path.freehand` `connect`).

From ba2a6fc1f379c94de2b8eb4b350a54ad2055f84d Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:48:43 -0800
Subject: [PATCH 22/48] Type: a further span beside a wrap object is measured
 across its line's height

Text wrap can split a line into spans that share a baseline. The spans
after the first were measured across the height of the line set in the
first one, so a taller line set in a later span could run into a wrap
object the shorter line stayed clear of. Each further span is now
measured again across the height of the line that goes in it. The line
gets the part that is free, and a span with no free part, or with a part
narrowed to less than the line's first word, is left empty. The
Every-line Composer and the line loop both place lines through
`Pen::place`, so they agree.

The Every-line Composer also keeps a line start whose line found no room
while a longer line from it would be taller. A taller line steps down
the frame by its own leading and can find room the shorter line's steps
missed.

Tests: a_further_span_is_measured_across_the_height_of_its_line,
composition_tries_a_longer_line_after_one_that_cannot_be_set.
---
 crates/text/src/composer.rs              | 16 +++-
 crates/text/src/layout/breaking.rs       | 19 ++++-
 crates/text/src/layout/wrapping_tests.rs | 94 ++++++++++++++++++++++++
 3 files changed, 123 insertions(+), 6 deletions(-)

diff --git a/crates/text/src/composer.rs b/crates/text/src/composer.rs
index 41b8b7f5c3..be738f639e 100644
--- a/crates/text/src/composer.rs
+++ b/crates/text/src/composer.rs
@@ -78,8 +78,9 @@ pub(crate) trait Measure {
     /// the search is to stop.
     fn line(&mut self, state: &Self::State, pos: usize, end: usize) -> Result<Option<(f64, Self::State)>, Exhausted>;
     /// Whether a line from `state` longer than `pos..end`, which [`Measure::line`] just measured,
-    /// may get more room than it. While it may, a line from `state` that is too long does not end
-    /// the reach of `state`. Lines from a state are all as wide by default.
+    /// may get more room than it. While it may, a line from `state` that is too long, or that
+    /// can't be set, does not end the reach of `state`. Lines from a state are all as wide by
+    /// default.
     fn may_widen(&mut self, _state: &Self::State, _pos: usize, _end: usize) -> bool {
         false
     }
@@ -235,8 +236,15 @@ pub(crate) fn compose_with<M: Measure>(
             // last glyph's advance, so a longer line from the same node is never narrower.
             let end = if hyphen || t <= a.pos { 0.0 } else { line_end_credit(t) };
             let natural = w[t] - w[a.pos] - credit - end + bp.hyphen;
-            // A line that can't be set (no room left in the frame) ends this node's reach.
-            let Some((lw, next)) = measure.line(&a.state, a.pos, bp.end).ok()? else { continue };
+            // A line that can't be set (no room left in the frame) ends this node's reach, unless a
+            // longer line may be placed elsewhere (a taller line steps down the frame by its own
+            // leading).
+            let Some((lw, next)) = measure.line(&a.state, a.pos, bp.end).ok()? else {
+                if measure.may_widen(&a.state, a.pos, bp.end) {
+                    keep.push(ai);
+                }
+                continue;
+            };
             // Adjustment ratio, badness and whether the line ends the active node's reach.
             let ratio = adjustment_ratio(natural, lw, st[t] - st[a.pos], sh[t] - sh[a.pos], last, p);
             let Some(ratio) = ratio.filter(|&r| r >= -1.0 || r.is_nan()) else {
diff --git a/crates/text/src/layout/breaking.rs b/crates/text/src/layout/breaking.rs
index 2eef2dd669..fd53a26428 100644
--- a/crates/text/src/layout/breaking.rs
+++ b/crates/text/src/layout/breaking.rs
@@ -110,9 +110,24 @@ impl Pen<'_> {
             let b = self.prev.map_or(0.0, |b| self.next_baseline(b, est));
             return Some((b, f64::NEG_INFINITY, f64::INFINITY, false));
         };
-        if !self.queued.is_empty() {
+        // A further span was measured across the height of the line set before it on its baseline.
+        // This line gets the part of it that is free across its own height: a taller line can
+        // reach a wrap object the line before it stayed clear of. A span with no such part is
+        // left empty, and so is a part the line's height made narrower than `min`.
+        while !self.queued.is_empty() {
             let (b, x0, x1) = self.queued.remove(0);
-            return Some((b, x0, x1, true));
+            let Some(r) = regions.get(self.ri) else { return Some((b, x0, x1, true)) };
+            let mut free = r.spans(b - est.asc, b + est.desc).into_iter().filter_map(|(s, e)| {
+                let (s, e) = (s.max(x0), e.min(x1));
+                let room = e - s - ind_l - ind_r;
+                let narrowed = s > x0 + EPS || e < x1 - EPS;
+                (room > est.asc.max(1.0) && (!narrowed || room + EPS >= min)).then_some((s, e))
+            });
+            let Some((s, e)) = free.next() else { continue };
+            // An object inside the span splits it: the parts after the first stay queued.
+            let rest: Vec<_> = free.map(|(s, e)| (b, s, e)).collect();
+            self.queued.splice(0..0, rest);
+            return Some((b, s, e, true));
         }
         loop {
             let r = regions.get(self.ri)?;
diff --git a/crates/text/src/layout/wrapping_tests.rs b/crates/text/src/layout/wrapping_tests.rs
index 9195764211..9d54e6a1cc 100644
--- a/crates/text/src/layout/wrapping_tests.rs
+++ b/crates/text/src/layout/wrapping_tests.rs
@@ -611,6 +611,100 @@ fn composition_tries_a_longer_line_that_gets_more_room() {
     assert_eq!(lines, Some(vec![(7, false)]));
 }
 
+/// A line measure for `compose_with` whose lines can't be set until they reach past glyph `from`
+/// (a line made taller there steps down the frame by its own leading, to a band the shorter
+/// line's steps miss), and are `wide` wide from there.
+struct Unplaced {
+    wide: f64,
+    from: usize,
+}
+
+impl crate::composer::Measure for Unplaced {
+    type State = usize;
+    fn first(&mut self) -> usize {
+        0
+    }
+    fn line(&mut self, _: &usize, _: usize, end: usize) -> Result<Option<(f64, usize)>, crate::composer::Exhausted> {
+        Ok((end > self.from).then_some((self.wide, end)))
+    }
+    fn may_widen(&mut self, _: &usize, _: usize, end: usize) -> bool {
+        end <= self.from
+    }
+}
+
+/// A line that can't be set does not end the composer's search from its start while a longer line
+/// may be placed elsewhere: the longer line is tried and set.
+#[test]
+fn composition_tries_a_longer_line_after_one_that_cannot_be_set() {
+    let text = "가나다 라마바";
+    let glyphs = korean(text, false);
+    let cands = candidates(text, &glyphs, None, Kinsoku::Hard);
+    let params = Params { justify_last: false, ragged: true, tolerance: f64::INFINITY, uniform_from: 0, hyphen_limit: 0 };
+    // "가나다" finds no room; the whole paragraph reaches past glyph 4 and fits 100.
+    let mut measure = Unplaced { wide: 100.0, from: 4 };
+    let lines = crate::composer::compose_with(&glyphs, &mut measure, &|_| 0.0, &|_| 0.0, &cands, &[], &params);
+    assert_eq!(lines, Some(vec![(7, false)]));
+}
+
+/// A further span beside a wrap object goes to the line set in it with the room across that line's
+/// own height. A line taller than the one before it on the baseline keeps clear of an object the
+/// shorter line did not reach, and moves down when the span has no room for it.
+#[test]
+fn a_further_span_is_measured_across_the_height_of_its_line() {
+    use std::cell::Cell;
+    use std::rc::Rc;
+    let frame = Rect::new(0.0, 0.0, 400.0, 400.0).to_path(0.1);
+    let wrap = |r: Rect| vectorcraft_doc::WrapShape {
+        path: PathData::from_bezpath(&r.to_path(0.1)),
+        wrap: vectorcraft_doc::TextWrap { offset: 0.0, invert: false },
+    };
+    let small = breaking::Metrics { asc: 10.0, desc: 3.0, lead: 14.0, cap: 7.0, xh: 5.0, top: 10.0 };
+    let tall = breaking::Metrics { asc: 30.0, desc: 9.0, lead: 42.0, cap: 21.0, xh: 15.0, top: 30.0 };
+    // An object down the middle of the frame splits every line in two, and `above` lies right of
+    // it over y 20 to 40. A small line after a baseline of 50 is set at 64, over y 54 to 67, clear
+    // of `above`; a tall line in the span right of it on that baseline covers y 34 to 73.
+    // The tall line starts with a word `word` wide.
+    let set = |above: Rect, word: f64| {
+        let regions = region::Region::cells(&frame, &LayoutOptions::default(), &[wrap(Rect::new(180.0, 0.0, 220.0, 400.0)), wrap(above)]);
+        let mut pen = breaking::Pen {
+            regions: Some(&regions),
+            ri: 0,
+            prev: Some(50.0),
+            pending: 0.0,
+            fb: FirstBaseline::Ascent,
+            fb_min: 0.0,
+            queued: vec![],
+            model: LeadingModel::RomanBaseline,
+            next_top: None,
+            no_room_for: f64::INFINITY,
+            steps_left: Rc::new(Cell::new(breaking::MAX_TOTAL_STEPS)),
+            search: Default::default(),
+        };
+        let left = pen.place(small, 0.0, 0.0, 0.0);
+        pen.settled(64.0, small);
+        let right = pen.place(tall, 0.0, 0.0, word);
+        (left, right)
+    };
+    let near = |got: Option<(f64, f64, f64, bool)>, want: (f64, f64, f64, bool)| {
+        got.is_some_and(|g| (g.0 - want.0).abs() < 0.01 && (g.1 - want.1).abs() < 0.01 && (g.2 - want.2).abs() < 0.01 && g.3 == want.3)
+    };
+    // `above` covers the right end of the span: the tall line gets the part left of it.
+    let (left, right) = set(Rect::new(300.0, 20.0, 400.0, 40.0), 0.0);
+    assert!(near(left, (64.0, 0.0, 180.0, false)), "{left:?}");
+    assert!(near(right, (64.0, 220.0, 300.0, true)), "{right:?}");
+    // That part is 80 wide: a tall line that starts with a wider word goes on the next baseline.
+    let (_, right) = set(Rect::new(300.0, 20.0, 400.0, 40.0), 100.0);
+    assert!(near(right, (106.0, 0.0, 180.0, false)), "{right:?}");
+    // `above` covers the whole span: the tall line goes on the next baseline, left of the object.
+    let (left, right) = set(Rect::new(220.0, 20.0, 400.0, 40.0), 0.0);
+    assert!(near(left, (64.0, 0.0, 180.0, false)), "{left:?}");
+    assert!(near(right, (106.0, 0.0, 180.0, false)), "{right:?}");
+    // `above` lies below the tall line: the span is as wide for it as for the small line, and it
+    // takes the span whatever its first word, as a further span always did.
+    let (_, right) = set(Rect::new(300.0, 300.0, 400.0, 320.0), 200.0);
+    assert!(near(right, (64.0, 220.0, 400.0, true)), "{right:?}");
+}
+
 /// The every-line composer's searches for the paragraphs of one frame share one budget: each takes
 /// the lines it tried and the baseline steps it spent from it, the layout's own steps stay as they
 /// were, and once the budget runs out the next paragraph's search stops (it is broken line by line).

From 6b55d7ca3ec83b16a70954b3f085aba3b01fee9e Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:50:59 -0800
Subject: [PATCH 23/48] Eyedropper: a whole pick that removes a series mark's
 painted row replaces the stored transparency

A whole pick from a source with no fill row, or no stroke row, removes
that row from the target. When the target is a graph series mark whose
row had paint, the pick now replaces the row opacity and blend mode the
graph keeps for that kind of row in the series. A row that had no paint
before the pick still leaves the kept values as they are, and a pick of
some attributes from such a source is unchanged.
---
 crates/engine/src/cmd/appearance.rs  |  6 +++--
 crates/engine/src/cmd/graph/tests.rs | 35 ++++++++++++++++++++++++++++
 docs/target-app-parity.md            |  2 +-
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/crates/engine/src/cmd/appearance.rs b/crates/engine/src/cmd/appearance.rs
index bdb808fe77..afe86769db 100644
--- a/crates/engine/src/cmd/appearance.rs
+++ b/crates/engine/src/cmd/appearance.rs
@@ -1365,17 +1365,19 @@ fn copy_from(s: &mut Session, p: &Value) -> Result<Value> {
         let (fill, stroke) = (attrs.appearance.fill, attrs.appearance.stroke);
         let source_has = |kind: bool| picked.appearance.items.iter().any(|it| it.is_fill() == kind);
         let source_shows = |kind: bool| picked.appearance.items.iter().any(|it| it.is_fill() == kind && it.visible());
+        // A whole pick replaces the stack: it removes the rows of a kind the source has no row of.
+        let whole = fill == FillAttrs::ALL && stroke == StrokeAttrs::ALL;
         let (paints, opacities) = if append {
             let rows = (fill.color && source_shows(true), stroke.color && source_shows(false));
             (rows, rows)
         } else {
             (
                 (fill.color, stroke.color || (stroke.weight && source_has(false))),
-                (fill.transparency && source_has(true), stroke.transparency && source_has(false)),
+                (fill.transparency && (whole || source_has(true)), stroke.transparency && (whole || source_has(false))),
             )
         };
         // A pick of some attributes edits the topmost row of its kind, which may be hidden; `append` and a whole pick write rows.
-        let rows_written = append || (fill == FillAttrs::ALL && stroke == StrokeAttrs::ALL);
+        let rows_written = append || whole;
         let top_shows = |id: NodeId, kind: bool| {
             let items = d.node(id).map_or(&[][..], |n| &n.appearance.items[..]);
             items.iter().rev().find(|it| it.is_fill() == kind).is_some_and(|it| it.visible())
diff --git a/crates/engine/src/cmd/graph/tests.rs b/crates/engine/src/cmd/graph/tests.rs
index f6fb3166e0..fcc2a593c1 100644
--- a/crates/engine/src/cmd/graph/tests.rs
+++ b/crates/engine/src/cmd/graph/tests.rs
@@ -1078,6 +1078,41 @@ fn an_eyedropper_pick_of_an_already_unpainted_row_leaves_series_transparency() {
     assert_eq!((kept.fill_opacity, kept.fill_blend), (Some(0.4), Some(BlendMode::Multiply)));
 }
 
+/// A whole Eyedropper pick from a source with no fill row, or no stroke row, removes that row from the mark. Where the
+/// mark's row had paint, the pick replaces the opacity and blend mode another mark of the series stored for that kind
+/// of row. Where the mark's row had no paint, the stored values stay.
+#[test]
+fn a_whole_eyedropper_pick_that_removes_a_painted_row_clears_its_stored_transparency() {
+    let stored = |s: &Session, id: NodeId, fill: bool| {
+        let kept = spec(s, id).series_paints[0].clone();
+        if fill { (kept.fill_opacity, kept.fill_blend) } else { (kept.stroke_opacity, kept.stroke_blend) }
+    };
+    for (fill, painted) in [(true, true), (false, true), (false, false)] {
+        let (mut s, id, _, marks) = column_marks();
+        let row = top_row(&s, marks[0], fill);
+        if painted {
+            s.execute("appearance.setItem", &json!({"ids": [marks[1].0], "index": row, "color": "#ff0000"})).unwrap();
+        }
+        s.execute("appearance.setItem", &json!({"ids": [marks[0].0], "index": row, "color": "#ff0000", "opacity": 40, "blend": "multiply"})).unwrap();
+        assert_eq!(stored(&s, id, fill), (Some(0.4), Some(BlendMode::Multiply)), "fill {fill}, painted {painted}");
+        let source = series(s.doc().unwrap().doc.node(id).unwrap(), 1).children().unwrap()[0].id;
+        s.execute("appearance.removeItem", &json!({"ids": [source.0], "index": top_row(&s, source, fill)})).unwrap();
+        let was = spec(&s, id).series_paints;
+        s.execute("appearance.copyFrom", &json!({"source": source.0, "ids": [marks[1].0]})).unwrap();
+        let mark = s.doc().unwrap().doc.node(marks[1]).unwrap().clone();
+        assert!(!mark.appearance.items.iter().any(|it| it.is_fill() == fill), "the pick removed the row: fill {fill}");
+        let want = if painted { (None, None) } else { (Some(0.4), Some(BlendMode::Multiply)) };
+        assert_eq!(stored(&s, id, fill), want, "fill {fill}, painted {painted}");
+        if painted {
+            let after = spec(&s, id).series_paints;
+            s.execute("edit.undo", &json!({})).unwrap();
+            assert_eq!(spec(&s, id).series_paints, was);
+            s.execute("edit.redo", &json!({})).unwrap();
+            assert_eq!(spec(&s, id).series_paints, after);
+        }
+    }
+}
+
 /// An appearance moved between two marks of one series leaves the series with the target's paint, not the source's
 /// empty one, and the series still shows when the graph is drawn again.
 #[test]
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index e9a95e71b0..cd9dc9d879 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1058,7 +1058,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - **Blend steps of brushed strokes:** the steps interpolate the pen pressure, tilt, bearing and rotation recorded with the Paintbrush, so a Calligraphic, Scatter or Art brush that varies with the pen changes gradually from one key to the next. A key without a recording counts as half pressure, half tilt and 0°, as brushes read it, and angles turn the shorter way round. When the blend starts a key's path at another anchor (an open path run from its end, a closed one turned to another start), the key's recordings, width profile and arrowheads turn with the path. Different brushes still switch halfway (VectorCraft's own rule; strokes blend their options, as [Blended objects overview](https://helpx.adobe.com/illustrator/desktop/manage-colors/apply-transparency-and-blending/blended-objects-overview.html) describes; `crates/doc/src/blend.rs`, `pen_pressure_tilt_and_angles_interpolate_for_brushes`, `stroke_profiles_turn_with_a_key_path_started_elsewhere`).
   - **Path editing (#494):** the handles shown are the handles that drag: Direct Selection drags those of a path selected as a whole (as the Pen leaves it), the Anchor Point tool and Pen+Alt no longer grab handles that Show handles when multiple anchors are selected hides, a handle shorter than the tolerance leaves its anchor to be picked, and the anchor tools pick within Selection & Anchor Display › Tolerance. A dragged segment keeps a smooth anchor at either end smooth. With Direct Selection, the Pen, the Curvature and the anchor tools, a path selected as a whole shows all its anchors selected, and the Control bar and the Properties panel offer Convert (corner, smooth) for them too; Remove and Cut wait for anchors direct-selected (#504). A handle drag gathers its snap targets once per drag (it took 21 ms per pointer move on a 20,000-path document, now 1 ms; `vectorcraft-cli perf` measures handle and segment drags on a 5,000-anchor path). Join merges the selected anchor points that lie on one another, as after Average, into one anchor (#1582, fixes #1533); Object › Path › Average & Join… (`path.averageJoin`, Cmd+Alt+Shift+J, the "Create corner or smooth join" shortcut of [Default keyboard shortcuts](https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html)) moves two open path ends to their midpoint and joins them there, a corner or smooth point as its dialog's Points choice asks, in one undo step.
   - **Graphs:** Column, Stacked Column, Bar, Stacked Bar, Line, Area, Scatter, Pie and Radar graph tools with Graph Data and Graph Type. A series starts in greyscale; Group Selection's fill and stroke, the paint, weight, opacity and blend mode of a mark's top visible fill or stroke row after an Appearance command, the Eyedropper, a graphic style, Default Fill and Stroke or Swap Fill and Stroke, and a mark's object opacity and blend mode, are kept separately on the graph and reapplied when its data, type or size changes, and through save, open and undo. Graph Type's Override Calculated Values (both `axisMin` and `axisMax`) uses exactly that value-axis range, split into the tick count (5 when automatic). Line graphs take Edge-to-Edge Lines (off by default: the points sit at the centres of their categories; graphs saved before the option keep their edge-to-edge lines), and radar graphs follow Mark Data Points and Connect Data Points. Blank cells (an empty CSV cell or `null`) are values left out, not zeros: columns, bars and stacked segments skip them, lines and scatter lines break around them and the value axis ignores them, while area, pie and radar draw them as 0; a number in straight quotes is a label, and the data window writes it back quoted. Graph types combine: Graph Type on series picked with Group Selection (or `series` indexes) draws them as their own type, with column, stacked column, line and area mixing on the vertical value axis and bar and stacked bar on the horizontal one; stacked columns take one slot of the cluster, lines draw in front of columns and areas behind. The value axis goes on the left, the right or both sides (column, stacked column, line, area and scatter graphs; bar graphs keep theirs along the bottom), and Separate Scales gives the series assigned to the right axis a scale of their own with its own tick values. Each value axis takes tick marks of no, short or full (across the plot) length and a count per division, and a prefix and suffix for its numbers; the category axis takes tick marks too (none by default), at or between its labels. Graph designs: Object › Graph › Design lists the designs with a preview of the selected one, and New Design (the selected art), Rename, Delete Design, Paste Design (a copy back to edit) and Select Unused, and Marker draws the data points and legend swatches of line, scatter and radar series with a design, scaled so its backmost object fills the default marker's square. Graph Data transposes rows and columns and switches a scatter graph's x and y, and a `|` in a category or series label starts a new line. Pie graphs take Legends in Wedges, Position (Even, Ratio sized by area, Stacked on one centre) and Sort (None, All, First). Graph Type takes column and cluster widths up to 1000% (overlapping past 100%) with First Row and First Column in Front (First Row orders each series' categories; across series the series order decides, so series stay one group each for Group Selection), draws filled lines, adds drop shadows behind columns, bars, lines and wedges, and puts the legend in rows across the top. Text formatted with the Character, Paragraph or Appearance controls, on the whole graph or on labels picked with Group Selection, is kept per kind of label (value axis numbers, category labels, legend labels) through the graph being drawn again. Object › Graph › Data opens a worksheet: cells picked with a click and edited above the sheet (Tab moves right, Enter down, the arrows between cells), Import Data from a tab-separated text file, Transpose, Switch x/y, Cell Style (decimals shown, column width), Revert and Apply. `graph.setData` returns and takes the data as CSV with each value written exactly, not rounded to two decimals, so applying the returned CSV changes nothing (#1485).
-    An Eyedropper pick that includes transparency and leaves a mark's top fill or stroke row without paint, where that row had paint before, also replaces the opacity and blend mode the graph keeps for that kind of row in the series; a row that had no paint before the pick leaves them as they are.
+    An Eyedropper pick that includes transparency and leaves a mark's top fill or stroke row without paint, or removes that row when the source has no row of that kind, where that row had paint before, also replaces the opacity and blend mode the graph keeps for that kind of row in the series; a row that had no paint before the pick leaves them as they are.
   - **Graph column designs:** Object › Graph › Column (`graph.column`) draws the columns, bars or stacked segments and the legend swatch of the series picked with Group Selection with a graph design: Vertically Scaled stretches it to each column's length, Uniformly Scaled scales it both ways and centers it, Repeating stacks a copy for each Each Design Represents value and chops or scales the last one (For Fractions), and Sliding keeps the part above the design's guide line in proportion and stretches the part below. The dialog lists the designs with a preview; the choice is saved with the graph and follows the design's rename and delete.
     Type in a column design that holds a `%` followed by two digits shows each column's value in place of the `%` and the digits: the first digit is the least number of places before the decimal point (zeros are added in front; 0 gives as many as the value needs), and the second digit sets the places after it, rounded. Unless it is inside a group that clips or has its own opacity or appearance, or inside a blend, compound shape, envelope, repeat or intertwined objects, the type keeps its size and is drawn once per column in a repeating design. The legend swatch leaves it out.
   - **Other:** Eyedropper, Gradient annotator, Artboard (Alt-drag duplicates an artboard, and its art with Move/Copy Artwork with Artboard on; Copy, Cut and Paste take the artboard with its art, Paste right of the last artboard, Paste in Place where it was, into this or another document, #446; Object › Artboards › Rearrange All Artboards lays them out in a grid by row or by column, in one row or one column, left to right or right to left, from the menu, the Artboards panel or Properties' Rearrange All, #681; Scale Artwork with Artboard, in the Control bar and Properties beside Move Artwork with Artboard, resizes the artboard proportionally with the art fully inside it and its guides, strokes and corners per the Scale preferences, #602), Measure, Type, Hand, Zoom, Rotate View.

From 3aa7ea2f78849a10806b619668e31c950ac685ca Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 04:58:39 -0800
Subject: [PATCH 24/48] Recolor Artwork: a weighed color recolors with the row
 it moved to

- recolor.weigh drops another row's entry for a color that moved, so
  recolor.apply recolors it with the row it moved to and the shares
  describe the recolor. A color that the first color of another row
  with a new color also lists stays where it is.
- Linked swatch colors are grouped through a map, so a row with many
  unlinked colors no longer compares each one with every group.
- The Prominent Colors bar reads the shares again when a row gains or
  loses a new color, since that changes which row takes a shared color.
---
 crates/engine/src/cmd/recolor.rs      | 80 +++++++++++++++++++--------
 crates/engine/src/tests/recolor.rs    | 32 +++++++++++
 crates/ui-egui/src/dialogs/recolor.rs | 24 +++++++-
 docs/mcp.md                           |  4 +-
 4 files changed, 113 insertions(+), 27 deletions(-)

diff --git a/crates/engine/src/cmd/recolor.rs b/crates/engine/src/cmd/recolor.rs
index f36486064c..85982ba5a0 100644
--- a/crates/engine/src/cmd/recolor.rs
+++ b/crates/engine/src/cmd/recolor.rs
@@ -70,7 +70,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Prominent Colors",
             [],
             None,
-            "{map: rows [{from, to, …}] or {current: new} as recolor.apply, weights?: [numbers ≥ 0, one per row; an excluded row's is ignored, and at least one other must be above 0], ids?: as recolor.colors} → {map: the rows as given, each with its current colours (from) moved as below, shares: [one per row: its percent of the uses (recolor.colors' count) of the current colours of the rows that aren't excluded; 0 for an excluded row]} for Recolor Artwork's Prominent Colors (VectorCraft's own rule): without weights the rows stay as they are. With weights, current colours move one at a time between the rows that aren't excluded and have a new colour (to), while a move brings each row's share of the uses nearer its share of the weights, first the colour nearest in Lab to the first colour of the row it goes to compared with the row it leaves; a row's first colour stays in it, the tints of one global swatch in a row move together, and a use counts for the row recolor.apply recolors it with (rows with a new colour first, an exact colour before a hex one, the first row that lists it), else for the first other row that lists it. The colours that can move are compared with the rows at most 50,000,000 times in all, and when they times the rows that aren't excluded pass that, none move. Changes nothing",
+            "{map: rows [{from, to, …}] or {current: new} as recolor.apply, weights?: [numbers ≥ 0, one per row; an excluded row's is ignored, and at least one other must be above 0], ids?: as recolor.colors} → {map: the rows as given, each with its current colours (from) moved as below, shares: [one per row: its percent of the uses (recolor.colors' count) of the current colours of the rows that aren't excluded; 0 for an excluded row]} for Recolor Artwork's Prominent Colors (VectorCraft's own rule): without weights the rows stay as they are. With weights, current colours move one at a time between the rows that aren't excluded and have a new colour (to), while a move brings each row's share of the uses nearer its share of the weights, first the colour nearest in Lab to the first colour of the row it goes to compared with the row it leaves; a row's first colour stays in it, the tints of one global swatch in a row move together, a colour that another row with a new colour lists first stays where it is, the other rows with a new colour drop their entries for a colour that moves, and a use counts for the row recolor.apply recolors it with (rows with a new colour first, an exact colour before a hex one, the first row that lists it), else for the first other row that lists it. The colours that can move are compared with the rows at most 50,000,000 times in all, and when they times the rows that aren't excluded pass that, none move. Changes nothing",
             has_doc,
             weigh
         ),
@@ -1126,25 +1126,35 @@ fn weigh(s: &mut Session, p: &Value) -> Result<Value> {
     }
     // Each current colour's uses and global swatch. A use counts where recolor.apply recolors it:
     // rows with a new colour first, exact colours before hex colours, the first row that lists it;
-    // then the other rows, in the same way.
-    let mut take = |m: &Match| -> (usize, Option<String>) {
-        let hits: Vec<usize> = match m {
-            Match::Key(k) => by_key.get(k).copied().into_iter().collect(),
-            Match::Hex(h) => by_hex.get(h).cloned().unwrap_or_default(),
-        };
-        let (mut uses, mut link) = (0, None);
-        for u in hits.into_iter().filter_map(|i| used[i].take()) {
-            uses += u.count;
-            link = link.or(u.swatch);
-        }
-        (uses, link)
-    };
+    // then the other rows, in the same way. `owner` holds the row and entry that took each colour,
+    // and `shadows` the entries of rows with a new colour whose colours other entries took.
+    let mut owner: Vec<Option<(usize, usize)>> = vec![None; used.len()];
+    let mut shadows: Vec<(usize, usize, Vec<usize>)> = vec![];
     let mut found: Vec<Vec<(usize, Option<String>)>> = rows.iter().map(|r| vec![(0, None); r.from.len()]).collect();
     for recolors in [true, false] {
         for hex in [false, true] {
             for (r, row) in rows.iter().enumerate().filter(|(_, r)| r.new_color().is_some() == recolors) {
                 for (e, m) in row.from.iter().enumerate().filter(|(_, m)| matches!(m, Match::Hex(_)) == hex) {
-                    found[r][e] = take(m);
+                    let hits: Vec<usize> = match m {
+                        Match::Key(k) => by_key.get(k).copied().into_iter().collect(),
+                        Match::Hex(h) => by_hex.get(h).cloned().unwrap_or_default(),
+                    };
+                    let (mut uses, mut link, mut took, mut taken) = (0, None, false, vec![]);
+                    for i in hits {
+                        match used[i].take() {
+                            Some(u) => {
+                                uses += u.count;
+                                link = link.or(u.swatch);
+                                took = true;
+                                owner[i] = Some((r, e));
+                            }
+                            None => taken.push(i),
+                        }
+                    }
+                    found[r][e] = (uses, link);
+                    if recolors && !took && !taken.is_empty() {
+                        shadows.push((r, e, taken));
+                    }
                 }
             }
         }
@@ -1152,22 +1162,41 @@ fn weigh(s: &mut Session, p: &Value) -> Result<Value> {
     // The units that move: in each row that isn't excluded, the colours linked to one global
     // swatch go together, each other colour on its own, and the unit of the first colour stays.
     let (mut units, mut members): (Vec<WeighUnit>, Vec<(usize, Vec<usize>)>) = (vec![], vec![]);
+    let mut unit_of: HashMap<(usize, usize), usize> = HashMap::new();
     for (n, &r) in active.iter().enumerate() {
         let mut groups: Vec<(Option<&String>, Vec<usize>, usize)> = vec![];
+        let mut by_link: HashMap<&String, usize> = HashMap::new();
         for (e, (uses, link)) in found[r].iter().enumerate() {
-            match groups.iter_mut().find(|g| link.is_some() && g.0 == link.as_ref()) {
-                Some(g) => {
-                    g.1.push(e);
-                    g.2 += uses;
+            let g = match link {
+                Some(l) => *by_link.entry(l).or_insert_with(|| {
+                    groups.push((Some(l), vec![], 0));
+                    groups.len() - 1
+                }),
+                None => {
+                    groups.push((None, vec![], 0));
+                    groups.len() - 1
                 }
-                None => groups.push((link.as_ref(), vec![e], *uses)),
-            }
+            };
+            groups[g].1.push(e);
+            groups[g].2 += uses;
         }
         for (k, (_, entries, uses)) in groups.into_iter().enumerate() {
+            for &e in &entries {
+                unit_of.insert((r, e), units.len());
+            }
             units.push(WeighUnit { color: rows[r].from[entries[0]].color(), uses: uses as f64, row: n, fixed: k == 0 });
             members.push((r, entries));
         }
     }
+    // recolor.apply matches a colour to the first row with a new colour that lists it. A colour
+    // that another such row's first colour also lists stays where it is; another row's other
+    // entries for a colour that moves are dropped from that row below.
+    let owners = |taken: &[usize]| -> Vec<usize> { taken.iter().filter_map(|&i| unit_of.get(&owner[i]?).copied()).collect() };
+    for (_, _, taken) in shadows.iter().filter(|(_, e, _)| *e == 0) {
+        for u in owners(taken) {
+            units[u].fixed = true;
+        }
+    }
     if let Some(w) = &weights {
         // Only rows with a new colour recolor what they hold, so only they give and take colours.
         let movers: Vec<usize> = (0..active.len()).filter(|&n| rows[active[n]].new_color().is_some()).collect();
@@ -1187,14 +1216,19 @@ fn weigh(s: &mut Session, p: &Value) -> Result<Value> {
     let mut out = given_rows(p);
     if weights.is_some() {
         // Each row's colours: those that stayed, in their order, then those that came to it.
+        // A row's entry for a colour that moved to another row would take it back, so it goes.
+        let moved = |u: usize| active[units[u].row] != members[u].0;
+        let dropped: std::collections::HashSet<(usize, usize)> =
+            shadows.iter().filter(|(_, e, taken)| *e != 0 && owners(taken).into_iter().any(moved)).map(|(r, e, _)| (*r, *e)).collect();
         let old: Vec<Vec<Value>> = out.iter().map(|r| r["from"].as_array().cloned().unwrap_or_default()).collect();
         let mut stayed: Vec<Vec<usize>> = active.iter().map(|_| vec![]).collect();
         let mut came: Vec<Vec<Value>> = active.iter().map(|_| vec![]).collect();
         for (u, (r, entries)) in units.iter().zip(&members) {
+            let kept = entries.iter().copied().filter(|&e| !dropped.contains(&(*r, e)));
             if active[u.row] == *r {
-                stayed[u.row].extend(entries);
+                stayed[u.row].extend(kept);
             } else {
-                came[u.row].extend(entries.iter().filter_map(|&e| old[*r].get(e).cloned()));
+                came[u.row].extend(kept.filter_map(|e| old[*r].get(e).cloned()));
             }
         }
         for (n, &r) in active.iter().enumerate() {
diff --git a/crates/engine/src/tests/recolor.rs b/crates/engine/src/tests/recolor.rs
index a065d09c42..b1a6af864b 100644
--- a/crates/engine/src/tests/recolor.rs
+++ b/crates/engine/src/tests/recolor.rs
@@ -1418,6 +1418,38 @@ fn weigh_moves_colors_to_the_rows_weights_and_changes_nothing() {
     assert_eq!(r["map"][2]["from"], json!(["#00ff00", PURPLE]));
 }
 
+/// A colour that two rows list moves only where recolor.apply recolors it with the row it moved
+/// to, so the shares describe the recolor.
+#[test]
+fn weigh_keeps_a_moved_color_from_rows_that_also_list_it() {
+    const GREEN: &str = "rgb 0 255 0";
+    let mut s = session();
+    let [_, _, purple, _] = prominent_art(&mut s);
+    rect(&mut s, json!("#00ff00"));
+    select_all(&mut s);
+    // The purple moves from the first row to the third; the second row's entry for it goes.
+    let map = json!([{"from": [RED, PURPLE], "to": "#000000"}, {"from": [BLUE, PURPLE], "to": "#ffffff"}, {"from": [GREEN], "to": "#ffff00"}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": map, "weights": [2, 1, 2]}));
+    assert_eq!(r["map"][0]["from"], json!([RED]));
+    assert_eq!(r["map"][1]["from"], json!([BLUE]));
+    assert_eq!(r["map"][2]["from"], json!([GREEN, PURPLE]));
+    assert_eq!(r["shares"], json!([40.0, 20.0, 40.0]));
+    run(&mut s, "recolor.apply", json!({"map": r["map"], "method": "exact"}));
+    assert_eq!(fill(&s, purple).to_hex(), "#ffff00", "the purple takes the row it moved to");
+    // A colour that another row lists first stays: that row would take it back.
+    let mut s = session();
+    let [_, _, purple, _] = prominent_art(&mut s);
+    rect(&mut s, json!("#00ff00"));
+    select_all(&mut s);
+    let map = json!([{"from": [RED, PURPLE], "to": "#000000"}, {"from": [PURPLE, BLUE], "to": "#ffffff"}, {"from": [GREEN], "to": "#ffff00"}]);
+    let r = run(&mut s, "recolor.weigh", json!({"map": map, "weights": [2, 1, 2]}));
+    assert_eq!(r["map"][0]["from"], json!([RED, PURPLE]));
+    assert_eq!(r["map"][1]["from"], json!([PURPLE, BLUE]));
+    assert_eq!(r["shares"], json!([60.0, 20.0, 20.0]));
+    run(&mut s, "recolor.apply", json!({"map": r["map"], "method": "exact"}));
+    assert_eq!(fill(&s, purple).to_hex(), "#000000", "the purple keeps the first row's colour");
+}
+
 #[test]
 fn weigh_moves_the_tints_of_a_global_swatch_together() {
     let mut s = session();
diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs
index 495c38f8d9..546b049510 100644
--- a/crates/ui-egui/src/dialogs/recolor.rs
+++ b/crates/ui-egui/src/dialogs/recolor.rs
@@ -228,8 +228,8 @@ fn sync(app: &mut VectorcraftApp, d: &mut Dialog) {
 
 /// The fields of Prominent Colors: the weights the rows are to take (`recolor.weigh`'s `weights`,
 /// one per row; a new list moves the rows' current colors), the weights they last took, each row's
-/// share of the art's uses (`recolor.weigh`'s `shares`) and the rows' current colors those were
-/// read for; a drag of a part's edge (each part's share of the bar while it lasts); and a request
+/// share of the art's uses (`recolor.weigh`'s `shares`) and the rows' current colors, exclusions
+/// and whether each has a new color, which those were read for; a drag of a part's edge (each part's share of the bar while it lasts); and a request
 /// from the New Color Group menu (`all` or `prominent`).
 const WEIGHTS: &str = "weights";
 const WEIGHED: &str = "__weighed";
@@ -273,7 +273,8 @@ fn sync_weights(app: &mut VectorcraftApp, d: &mut Dialog) {
         }
     }
     let rs = rows(d);
-    let of = Value::Array(rs.iter().map(|r| json!([r["from"], excluded(r)])).collect());
+    // A row with a new color takes a color before one without, so that changes the shares too.
+    let of = Value::Array(rs.iter().map(|r| json!([r["from"], excluded(r), !r["to"].is_null()])).collect());
     if d.fields.get(SHARES_OF) == Some(&of) {
         return;
     }
@@ -1875,6 +1876,23 @@ mod tests {
         assert_eq!(app.session.doc().unwrap().history.undo.len(), undo + 1, "one undo step");
     }
 
+    /// A row that takes a new color takes the colors it shares with other rows, so the bar reads
+    /// the shares again.
+    #[test]
+    fn a_new_color_for_a_row_reads_the_shares_again() {
+        let mut app = VectorcraftApp::new(vectorcraft_engine::Session::new(), Default::default());
+        let ctx = egui::Context::default();
+        prominent_setup(&mut app, &ctx);
+        let rows = json!([{"from": [RED, PURPLE], "to": null}, {"from": [RED, BLUE], "to": "rgb 255 255 0"}]);
+        app.ui.dialog.as_mut().unwrap().fields.insert("rows".into(), rows);
+        frame(&mut app, &ctx, 0.1, vec![], 0);
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields[SHARES], json!([25.0, 75.0]));
+        let rows = json!([{"from": [RED, PURPLE], "to": "rgb 0 255 0"}, {"from": [RED, BLUE], "to": "rgb 255 255 0"}]);
+        app.ui.dialog.as_mut().unwrap().fields.insert("rows".into(), rows);
+        frame(&mut app, &ctx, 0.2, vec![], 0);
+        assert_eq!(app.ui.dialog.as_ref().unwrap().fields[SHARES], json!([75.0, 25.0]));
+    }
+
     /// Dragging the edge between two parts of the bar to the left gives the right-hand part more
     /// weight; when the drag ends, the rows' current colors move.
     #[test]
diff --git a/docs/mcp.md b/docs/mcp.md
index 1f370735c6..c16f8943fd 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -3729,7 +3729,9 @@ rows come back unchanged. `weights` holds one number of 0 or more per row; an ex
 at least one other row needs a weight above 0. As VectorCraft's own rule, current colors then move one at a time
 between the rows that are not excluded and have a new color (`to`), as long as a move brings each row's share of the uses nearer its share of the
 weights. Of those moves, it takes first the color nearest in Lab to the first color of the row it goes to, compared
-with the row it leaves. A row keeps its first color, and the tints of one global swatch in a row move together. The
+with the row it leaves. A row keeps its first color, and the tints of one global swatch in a row move together. A
+color that the first color of another row with a new color also lists stays where it is. When a color moves, other
+rows with a new color drop their own entries for it, so `recolor.apply` recolors it with the row it moved to. The
 colors that can move are compared with the rows at most 50,000,000 times in all; when those colors times the rows
 that are not excluded pass that, no color moves. Colors that stay in a row keep their order, and the colors that come
 to it follow them. The command changes nothing; `recolor.apply` with the returned `map` recolors the art. In the Recolor Artwork dialog the

From 73a9c22361dadc91bbc0a9706ce8cd0dcc0c3095 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:17:40 -0800
Subject: [PATCH 25/48] =?UTF-8?q?Actions:=20Insert=20Menu=20Item=20adds=20?=
 =?UTF-8?q?Object=20=E2=80=BA=20Align=20and=20View=20menu=20commands?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Insert Menu Item… now lists the Object › Align items and the View menu
commands the app runs itself (Outline, Pixel Preview, Trim View,
Presentation Mode, Screen Mode, zoom, fit, Rotate View, and the show,
hide and snap items).

- An Align step holds the params its click sends at insertion, so a
  later Align To choice does not change it. A step that aligns to the
  key object stops the playback when the selection has no key.
- A View menu step plays in its place at every speed and adds no undo
  step. At Accelerated the steps on each side of it are one undo step
  each. Playing it while recording records it.
- Batch… refuses an action with an included View menu step.
- An action set file with a View menu step is version 6.
- The steps before a stop now play as saved steps, as other playback
  does, so a key that an older version recorded no longer fails there.

Docs: docs/mcp.md, docs/target-app-parity.md.
---
 crates/ui-egui/src/dialogs/action_batch.rs    |  20 +-
 .../src/dialogs/action_insert_menu_item.rs    |  59 +++-
 crates/ui-egui/src/i18n/bg.tsv                |   1 +
 crates/ui-egui/src/i18n/bs.tsv                |   1 +
 crates/ui-egui/src/i18n/ca.tsv                |   1 +
 crates/ui-egui/src/i18n/cs.tsv                |   1 +
 crates/ui-egui/src/i18n/da.tsv                |   1 +
 crates/ui-egui/src/i18n/de.tsv                |   1 +
 crates/ui-egui/src/i18n/el.tsv                |   1 +
 crates/ui-egui/src/i18n/es.tsv                |   1 +
 crates/ui-egui/src/i18n/fi.tsv                |   1 +
 crates/ui-egui/src/i18n/fr.tsv                |   1 +
 crates/ui-egui/src/i18n/hi.tsv                |   1 +
 crates/ui-egui/src/i18n/hu.tsv                |   1 +
 crates/ui-egui/src/i18n/id.tsv                |   1 +
 crates/ui-egui/src/i18n/it.tsv                |   1 +
 crates/ui-egui/src/i18n/ja.tsv                |   1 +
 crates/ui-egui/src/i18n/ka.tsv                |   1 +
 crates/ui-egui/src/i18n/ko.tsv                |   1 +
 crates/ui-egui/src/i18n/nl.tsv                |   1 +
 crates/ui-egui/src/i18n/pl.tsv                |   1 +
 crates/ui-egui/src/i18n/pt-br.tsv             |   1 +
 crates/ui-egui/src/i18n/ru.tsv                |   1 +
 crates/ui-egui/src/i18n/sv.tsv                |   1 +
 crates/ui-egui/src/i18n/tr.tsv                |   1 +
 crates/ui-egui/src/i18n/uk.tsv                |   1 +
 crates/ui-egui/src/i18n/vi.tsv                |   1 +
 crates/ui-egui/src/i18n/zh-hans.tsv           |   1 +
 crates/ui-egui/src/i18n/zh-hant.tsv           |   1 +
 crates/ui-egui/src/menus.rs                   |   2 +-
 crates/ui-egui/src/menus/entries.rs           |  61 +++-
 crates/ui-egui/src/menus/invoke.rs            |   5 +-
 crates/ui-egui/src/panels/actions.rs          | 304 ++++++++++++++++--
 crates/ui-egui/src/panels/actions/files.rs    |  17 +-
 crates/ui-egui/src/panels/align.rs            |   7 +
 docs/mcp.md                                   |  36 ++-
 docs/target-app-parity.md                     |   3 +-
 37 files changed, 471 insertions(+), 70 deletions(-)

diff --git a/crates/ui-egui/src/dialogs/action_batch.rs b/crates/ui-egui/src/dialogs/action_batch.rs
index 61ef75c5e1..3bf7d2efd0 100644
--- a/crates/ui-egui/src/dialogs/action_batch.rs
+++ b/crates/ui-egui/src/dialogs/action_batch.rs
@@ -23,14 +23,24 @@ pub fn open(app: &mut VectorcraftApp, set: usize, action: usize) -> Result<Value
     if a.steps.iter().enumerate().all(|(i, _)| a.excluded_steps.contains(&i)) {
         return Err("the action has no included steps".into());
     }
-    if crate::panels::actions::has_stop(&a.included_commands()) {
-        return Err("Batch cannot play an action with a stop".into());
-    }
+    refuse_steps(&a.included_commands())?;
     let name = a.name.clone();
     app.ui.dialog = Some(Dialog::new(KIND, initial_fields(set, action, &name)));
     Ok(Value::Null)
 }
 
+/// Err when the included steps `commands` hold a step that Batch does not play: a stop, or a View
+/// menu step, which acts on a document window ([`crate::panels::actions::is_ui_step`]).
+fn refuse_steps(commands: &[Value]) -> Result<(), String> {
+    if crate::panels::actions::has_stop(commands) {
+        return Err("Batch cannot play an action with a stop".into());
+    }
+    if commands.iter().any(crate::panels::actions::is_ui_step) {
+        return Err("Batch cannot play an action with a View menu step".into());
+    }
+    Ok(())
+}
+
 fn initial_fields(set: usize, action: usize, name: &str) -> Value {
     json!({
         "set": set,
@@ -119,9 +129,7 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result<Value, String> {
     if commands.is_empty() {
         return Err("the action has no included steps".into());
     }
-    if crate::panels::actions::has_stop(&commands) {
-        return Err("Batch cannot play an action with a stop".into());
-    }
+    refuse_steps(&commands)?;
     let source = d.str("source");
     if source == "folder" && d.str("folder").trim().is_empty() {
         return Err("choose a source folder".into());
diff --git a/crates/ui-egui/src/dialogs/action_insert_menu_item.rs b/crates/ui-egui/src/dialogs/action_insert_menu_item.rs
index 2cf0ab6127..0b4bd8dc7d 100644
--- a/crates/ui-egui/src/dialogs/action_insert_menu_item.rs
+++ b/crates/ui-egui/src/dialogs/action_insert_menu_item.rs
@@ -207,43 +207,86 @@ mod tests {
         assert_eq!((d.str("note"), d.str("command")), ("none".to_string(), "object.ungroup".to_string()), "a failed Find keeps the pick");
     }
 
-    /// The list holds the menu items that run an engine command without asking for values first,
-    /// outside the application, File, Window and Help menus, and leaves out Undo, Redo, the Pastes,
-    /// Object › Align, Image Trace's Make and Make and Expand, Pattern's Make and Edit Pattern and the
-    /// saved-selection, saved-view and recent-font items.
+    /// The list holds the menu items that run an engine command, and the View menu items that the
+    /// app runs itself, without asking for values first, outside the application, File, Window and
+    /// Help menus, and leaves out Undo, Redo, the Pastes, Image Trace's Make and Make and Expand,
+    /// Pattern's Make and Edit Pattern and the saved-selection, saved-view and recent-font items.
     #[test]
     fn the_list_holds_only_menu_items_that_can_be_steps() {
         let items = menus::insertable_items(true);
         assert!(items.len() > 100, "only {} items", items.len());
         for item in &items {
-            assert!(vectorcraft_engine::find_command(item.command).is_some(), "{item:?}");
+            let in_app = menus::plays_in_app(item.command);
+            assert!(vectorcraft_engine::find_command(item.command).is_some() != in_app, "{item:?}");
+            assert!(!in_app || item.path[0] == "View", "{item:?}");
             assert!(!item.label.ends_with('…'), "{item:?}");
             assert!(!["VectorCraft", "File", "Window", "Help"].contains(&item.path[0]), "{item:?}");
             assert!(item.params.is_object(), "{item:?}");
         }
         let has = |command: &str| items.iter().any(|i| i.command == command);
-        for command in ["object.group", "object.ungroup", "object.arrange.bringToFront"] {
+        for command in [
+            "object.group",
+            "object.ungroup",
+            "object.arrange.bringToFront",
+            "object.align",
+            "view.outline",
+            "view.zoomIn",
+            "view.fitArtboard",
+            "view.rotate",
+            "view.rulers",
+            "view.snapToGrid",
+            "view.guides.lock",
+        ] {
             assert!(has(command), "{command}");
         }
+        let aligns = items.iter().filter(|i| i.command == "object.align").count();
+        assert_eq!(aligns, 7, "each Object › Align item, by its params");
         for command in [
             "edit.undo",
             "edit.redo",
             "edit.paste",
             "edit.pasteInFront",
             "object.move",
-            "object.align",
             "imageTrace.make",
             "imageTrace.makeAndExpand",
             "object.pattern.make",
             "object.pattern.edit",
             "file.save",
-            "view.zoomIn",
+            "window.panel",
+            "view.goto1",
+            "view.saved.new",
             "select.recall1",
         ] {
             assert!(!has(command), "{command}");
         }
     }
 
+    /// Every View menu item that the app runs itself is listed, apart from the saved-view slots, the
+    /// Perspective Grid presets (`ui.` commands, whose items follow the presets in the preferences)
+    /// and the items that ask for values first.
+    #[test]
+    fn every_view_item_the_app_runs_is_listed() {
+        let items = menus::insertable_items(true);
+        let view = menus::menu_tree_named(true).into_iter().find(|(title, _)| *title == "View").map(|(_, items)| items).unwrap();
+        fn walk(items: &[menus::Item], out: &mut Vec<(&'static str, &'static str)>) {
+            for it in items {
+                match it {
+                    menus::Item::Cmd(label, id, _) => out.push((label, id)),
+                    menus::Item::Sub(_, children) => walk(children, out),
+                    _ => {}
+                }
+            }
+        }
+        let mut all = vec![];
+        walk(&view, &mut all);
+        for (label, id) in all {
+            let ui = vectorcraft_engine::find_command(id).is_none() && menus::UI_COMMANDS.iter().any(|c| c.0 == id);
+            if ui && !label.ends_with('…') && !id.starts_with("view.goto") && !id.starts_with("ui.") {
+                assert!(items.iter().any(|i| i.command == id), "{label} ({id})");
+            }
+        }
+    }
+
     /// Rows show their menu path in the UI language, and Find matches the English path, the shown
     /// one and the command id.
     #[test]
diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv
index 3828d9ba2d..6923892939 100644
--- a/crates/ui-egui/src/i18n/bg.tsv
+++ b/crates/ui-egui/src/i18n/bg.tsv
@@ -5995,6 +5995,7 @@ axis	Y Axis	Y ос
 @msg	message must be text	message трябва да бъде текст
 @msg	allowContinue must be true or false	allowContinue трябва да бъде true или false
 @msg	Batch cannot play an action with a stop	Пакет не може да изпълни действие със спиране
+@msg	Batch cannot play an action with a View menu step	Пакет не може да изпълни действие със стъпка от менюто Изглед
 	Insert Menu Item…	Вмъкване на елемент от меню…
 	Insert Menu Item	Вмъкване на елемент от меню
 	Insert Select Path	Вмъкване на избор на път
diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv
index 81fee3a079..67e7f3422a 100644
--- a/crates/ui-egui/src/i18n/bs.tsv
+++ b/crates/ui-egui/src/i18n/bs.tsv
@@ -6037,6 +6037,7 @@ axis	Y Axis	Y osa
 @msg	message must be text	message mora biti tekst
 @msg	allowContinue must be true or false	allowContinue mora biti true ili false
 @msg	Batch cannot play an action with a stop	Paketna obrada ne može reprodukovati akciju sa zaustavljanjem
+@msg	Batch cannot play an action with a View menu step	Paketna obrada ne može reprodukovati akciju s korakom iz menija Prikaz
 	Insert Menu Item…	Umetni stavku menija…
 	Insert Menu Item	Umetni stavku menija
 	Insert Select Path	Umetni odabir putanje
diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv
index 02ae0f4a09..06e11e4eea 100644
--- a/crates/ui-egui/src/i18n/ca.tsv
+++ b/crates/ui-egui/src/i18n/ca.tsv
@@ -4049,6 +4049,7 @@ digits	Malayalam	Malaiàlam
 @msg	message must be text	message ha de ser text
 @msg	allowContinue must be true or false	allowContinue ha de ser true o false
 @msg	Batch cannot play an action with a stop	Lot no pot reproduir una acció amb una aturada
+@msg	Batch cannot play an action with a View menu step	Lot no pot reproduir una acció amb un pas del menú Visualitza
 	Insert Menu Item…	Insereix un element de menú…
 	Insert Menu Item	Insereix un element de menú
 	Insert Select Path	Insereix una selecció de traçat
diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv
index 7e3794e8a1..4c53c0a420 100644
--- a/crates/ui-egui/src/i18n/cs.tsv
+++ b/crates/ui-egui/src/i18n/cs.tsv
@@ -6530,6 +6530,7 @@ axis	Y Axis	osa Y
 @msg	message must be text	message musí být text
 @msg	allowContinue must be true or false	allowContinue musí být true nebo false
 @msg	Batch cannot play an action with a stop	Dávka nemůže přehrát akci se zastavením
+@msg	Batch cannot play an action with a View menu step	Dávka nemůže přehrát akci s krokem z nabídky Zobrazení
 	Insert Menu Item…	Vložit položku nabídky…
 	Insert Menu Item	Vložit položku nabídky
 	Insert Select Path	Vložit výběr cesty
diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv
index f7011e23bf..b96fe18ef9 100644
--- a/crates/ui-egui/src/i18n/da.tsv
+++ b/crates/ui-egui/src/i18n/da.tsv
@@ -6012,6 +6012,7 @@ axis	Y Axis	Y-akse
 @msg	message must be text	message skal være tekst
 @msg	allowContinue must be true or false	allowContinue skal være true eller false
 @msg	Batch cannot play an action with a stop	Batch kan ikke afspille en handling med et stop
+@msg	Batch cannot play an action with a View menu step	Batch kan ikke afspille en handling med et trin fra menuen Vis
 	Insert Menu Item…	Indsæt menupunkt…
 	Insert Menu Item	Indsæt menupunkt
 	Insert Select Path	Indsæt kurvemarkering
diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv
index 4174537f87..2f34a07a7d 100644
--- a/crates/ui-egui/src/i18n/de.tsv
+++ b/crates/ui-egui/src/i18n/de.tsv
@@ -6121,6 +6121,7 @@ axis	Y Axis	Y-Achse
 @msg	message must be text	message muss Text sein
 @msg	allowContinue must be true or false	allowContinue muss true oder false sein
 @msg	Batch cannot play an action with a stop	Die Stapelverarbeitung kann keine Aktion mit einem Stopp abspielen
+@msg	Batch cannot play an action with a View menu step	Die Stapelverarbeitung kann keine Aktion mit einem Schritt aus dem Menü Ansicht abspielen
 	Insert Menu Item…	Menübefehl einfügen…
 	Insert Menu Item	Menübefehl einfügen
 	Insert Select Path	Pfadauswahl einfügen
diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv
index bde2fbee78..00c259c6ee 100644
--- a/crates/ui-egui/src/i18n/el.tsv
+++ b/crates/ui-egui/src/i18n/el.tsv
@@ -6481,6 +6481,7 @@ axis	Y Axis	Άξονας Y
 @msg	message must be text	Το message πρέπει να είναι κείμενο
 @msg	allowContinue must be true or false	Το allowContinue πρέπει να είναι true ή false
 @msg	Batch cannot play an action with a stop	Η μαζική επεξεργασία δεν μπορεί να αναπαράγει ενέργεια με διακοπή
+@msg	Batch cannot play an action with a View menu step	Η μαζική επεξεργασία δεν μπορεί να αναπαράγει ενέργεια με βήμα από το μενού Προβολή
 	Insert Menu Item…	Εισαγωγή στοιχείου μενού…
 	Insert Menu Item	Εισαγωγή στοιχείου μενού
 	Insert Select Path	Εισαγωγή επιλογής διαδρομής
diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv
index ff28d9dfc5..84b3c1b402 100644
--- a/crates/ui-egui/src/i18n/es.tsv
+++ b/crates/ui-egui/src/i18n/es.tsv
@@ -6472,6 +6472,7 @@ axis	Y Axis	Eje Y
 @msg	message must be text	message debe ser texto
 @msg	allowContinue must be true or false	allowContinue debe ser true o false
 @msg	Batch cannot play an action with a stop	Lote no puede reproducir una acción con una parada
+@msg	Batch cannot play an action with a View menu step	Lote no puede reproducir una acción con un paso del menú Ver
 	Insert Menu Item…	Insertar elemento de menú…
 	Insert Menu Item	Insertar elemento de menú
 	Insert Select Path	Insertar selección de trazado
diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv
index bb74188ed8..0bee1219f9 100644
--- a/crates/ui-egui/src/i18n/fi.tsv
+++ b/crates/ui-egui/src/i18n/fi.tsv
@@ -6560,6 +6560,7 @@ axis	Y Axis	Y-akseli
 @msg	message must be text	message on oltava tekstiä
 @msg	allowContinue must be true or false	allowContinue on oltava true tai false
 @msg	Batch cannot play an action with a stop	Erä ei voi toistaa toimintoa, jossa on pysäytys
+@msg	Batch cannot play an action with a View menu step	Erä ei voi toistaa toimintoa, jossa on Näytä-valikon vaihe
 	Insert Menu Item…	Lisää valikkokohta…
 	Insert Menu Item	Lisää valikkokohta
 	Insert Select Path	Lisää polun valinta
diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv
index 09c9c35b0d..e74a8144b2 100644
--- a/crates/ui-egui/src/i18n/fr.tsv
+++ b/crates/ui-egui/src/i18n/fr.tsv
@@ -6525,6 +6525,7 @@ axis	Y Axis	Axe Y
 @msg	message must be text	message doit être du texte
 @msg	allowContinue must be true or false	allowContinue doit valoir true ou false
 @msg	Batch cannot play an action with a stop	Le traitement par lots ne peut pas exécuter un script comportant un arrêt
+@msg	Batch cannot play an action with a View menu step	Le traitement par lots ne peut pas exécuter un script comportant une étape du menu Affichage
 	Insert Menu Item…	Insérer une commande de menu…
 	Insert Menu Item	Insérer une commande de menu
 	Insert Select Path	Insérer une sélection de tracé
diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv
index 9aa4bd7b99..8ce396dffc 100644
--- a/crates/ui-egui/src/i18n/hi.tsv
+++ b/crates/ui-egui/src/i18n/hi.tsv
@@ -3478,6 +3478,7 @@ antiAlias	Sharp	शार्प
 @msg	message must be text	message टेक्स्ट होना चाहिए
 @msg	allowContinue must be true or false	allowContinue true या false होना चाहिए
 @msg	Batch cannot play an action with a stop	बैच स्टॉप वाला एक्शन नहीं चला सकता
+@msg	Batch cannot play an action with a View menu step	बैच व्यू मेनू के चरण वाला एक्शन नहीं चला सकता
 	Insert Menu Item…	मेनू आइटम जोड़ें…
 	Insert Menu Item	मेनू आइटम जोड़ें
 	Insert Select Path	सिलेक्ट पाथ जोड़ें
diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv
index af6f586880..5c507dc7df 100644
--- a/crates/ui-egui/src/i18n/hu.tsv
+++ b/crates/ui-egui/src/i18n/hu.tsv
@@ -6513,6 +6513,7 @@ axis	Y Axis	Y tengely
 @msg	message must be text	message: szöveg kell
 @msg	allowContinue must be true or false	allowContinue: true vagy false kell
 @msg	Batch cannot play an action with a stop	A kötegelt feldolgozás nem játszhat le megállást tartalmazó műveletet
+@msg	Batch cannot play an action with a View menu step	A kötegelt feldolgozás nem játszhat le Nézet menübeli lépést tartalmazó műveletet
 	Insert Menu Item…	Menüelem beszúrása…
 	Insert Menu Item	Menüelem beszúrása
 	Insert Select Path	Útvonal kijelölésének beszúrása
diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv
index e0ba31ecd5..9a50c48251 100644
--- a/crates/ui-egui/src/i18n/id.tsv
+++ b/crates/ui-egui/src/i18n/id.tsv
@@ -6012,6 +6012,7 @@ axis	Y Axis	Sumbu Y
 @msg	message must be text	message harus berupa teks
 @msg	allowContinue must be true or false	allowContinue harus true atau false
 @msg	Batch cannot play an action with a stop	Batch tidak dapat memutar tindakan dengan titik henti
+@msg	Batch cannot play an action with a View menu step	Batch tidak dapat memutar tindakan dengan langkah menu Tampilan
 	Insert Menu Item…	Sisipkan item menu…
 	Insert Menu Item	Sisipkan item menu
 	Insert Select Path	Sisipkan pemilihan jalur
diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv
index ce0bc58ce5..9973763b74 100644
--- a/crates/ui-egui/src/i18n/it.tsv
+++ b/crates/ui-egui/src/i18n/it.tsv
@@ -6155,6 +6155,7 @@ axis	Y Axis	Asse Y
 @msg	message must be text	message deve essere testo
 @msg	allowContinue must be true or false	allowContinue deve essere true o false
 @msg	Batch cannot play an action with a stop	L'elaborazione batch non può eseguire un'azione con un'interruzione
+@msg	Batch cannot play an action with a View menu step	L'elaborazione batch non può eseguire un'azione con un passaggio del menu Visualizza
 	Insert Menu Item…	Inserisci voce di menu…
 	Insert Menu Item	Inserisci voce di menu
 	Insert Select Path	Inserisci selezione tracciato
diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv
index 1ecce4618a..92734972c1 100644
--- a/crates/ui-egui/src/i18n/ja.tsv
+++ b/crates/ui-egui/src/i18n/ja.tsv
@@ -6220,6 +6220,7 @@ axis	Y Axis	Y 軸
 @msg	message must be text	message にはテキストを指定してください
 @msg	allowContinue must be true or false	allowContinue には true または false を指定してください
 @msg	Batch cannot play an action with a stop	バッチでは停止を含むアクションを再生できません
+@msg	Batch cannot play an action with a View menu step	バッチでは表示メニューのステップを含むアクションを再生できません
 	Insert Menu Item…	メニュー項目を挿入…
 	Insert Menu Item	メニュー項目を挿入
 	Insert Select Path	パスの選択を挿入
diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv
index 3d6425c373..69d2769ab2 100644
--- a/crates/ui-egui/src/i18n/ka.tsv
+++ b/crates/ui-egui/src/i18n/ka.tsv
@@ -6481,6 +6481,7 @@ axis	Y Axis	Y ღერძი
 @msg	message must be text	message უნდა იყოს ტექსტი
 @msg	allowContinue must be true or false	allowContinue უნდა იყოს true ან false
 @msg	Batch cannot play an action with a stop	პაკეტურ დამუშავებას არ შეუძლია გაჩერების მქონე მოქმედების შესრულება
+@msg	Batch cannot play an action with a View menu step	პაკეტურ დამუშავებას არ შეუძლია ხედის მენიუს ნაბიჯის მქონე მოქმედების შესრულება
 	Insert Menu Item…	მენიუს ელემენტის ჩასმა…
 	Insert Menu Item	მენიუს ელემენტის ჩასმა
 	Insert Select Path	ტრაექტორიის მონიშვნის ჩასმა
diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv
index fb87488d64..d77c2ce633 100644
--- a/crates/ui-egui/src/i18n/ko.tsv
+++ b/crates/ui-egui/src/i18n/ko.tsv
@@ -6116,6 +6116,7 @@ axis	Y Axis	Y축
 @msg	message must be text	message의 값은 텍스트여야 합니다
 @msg	allowContinue must be true or false	allowContinue의 값은 true 또는 false여야 합니다
 @msg	Batch cannot play an action with a stop	일괄 처리에서는 중지가 있는 액션을 재생할 수 없습니다
+@msg	Batch cannot play an action with a View menu step	일괄 처리에서는 보기 메뉴 단계가 있는 액션을 재생할 수 없습니다
 	Insert Menu Item…	메뉴 항목 삽입…
 	Insert Menu Item	메뉴 항목 삽입
 	Insert Select Path	패스 선택 삽입
diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv
index b3388fa82a..c813d29720 100644
--- a/crates/ui-egui/src/i18n/nl.tsv
+++ b/crates/ui-egui/src/i18n/nl.tsv
@@ -6063,6 +6063,7 @@ axis	Y Axis	Y-as
 @msg	message must be text	message moet tekst zijn
 @msg	allowContinue must be true or false	allowContinue moet true of false zijn
 @msg	Batch cannot play an action with a stop	Batch kan geen actie met een stop afspelen
+@msg	Batch cannot play an action with a View menu step	Batch kan geen actie met een stap uit het menu Beeld afspelen
 	Insert Menu Item…	Menu-item invoegen…
 	Insert Menu Item	Menu-item invoegen
 	Insert Select Path	Pad selecteren invoegen
diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv
index 0729e35c79..ad825516fa 100644
--- a/crates/ui-egui/src/i18n/pl.tsv
+++ b/crates/ui-egui/src/i18n/pl.tsv
@@ -6384,6 +6384,7 @@ axis	Y Axis	Oś Y
 @msg	message must be text	message musi być tekstem
 @msg	allowContinue must be true or false	allowContinue musi mieć wartość true lub false
 @msg	Batch cannot play an action with a stop	Przetwarzanie wsadowe nie może odtworzyć operacji z zatrzymaniem
+@msg	Batch cannot play an action with a View menu step	Przetwarzanie wsadowe nie może odtworzyć operacji z krokiem z menu Widok
 	Insert Menu Item…	Wstaw polecenie menu…
 	Insert Menu Item	Wstaw polecenie menu
 	Insert Select Path	Wstaw zaznaczenie ścieżki
diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv
index 36f778dbd5..22f371a8fd 100644
--- a/crates/ui-egui/src/i18n/pt-br.tsv
+++ b/crates/ui-egui/src/i18n/pt-br.tsv
@@ -6445,6 +6445,7 @@ axis	Y Axis	Eixo Y
 @msg	message must be text	message deve ser texto
 @msg	allowContinue must be true or false	allowContinue deve ser true ou false
 @msg	Batch cannot play an action with a stop	Lote não pode reproduzir uma ação com uma parada
+@msg	Batch cannot play an action with a View menu step	Lote não pode reproduzir uma ação com uma etapa do menu Exibir
 	Insert Menu Item…	Inserir Item de Menu…
 	Insert Menu Item	Inserir Item de Menu
 	Insert Select Path	Inserir Seleção de Caminho
diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv
index 442a9612d4..a3a361b4c3 100644
--- a/crates/ui-egui/src/i18n/ru.tsv
+++ b/crates/ui-egui/src/i18n/ru.tsv
@@ -6141,6 +6141,7 @@ axis	Y Axis	Ось Y
 @msg	message must be text	message должно быть текстом
 @msg	allowContinue must be true or false	allowContinue должно быть true или false
 @msg	Batch cannot play an action with a stop	Пакет не может воспроизвести действие с остановкой
+@msg	Batch cannot play an action with a View menu step	Пакет не может воспроизвести действие с шагом из меню Просмотр
 	Insert Menu Item…	Вставить пункт меню…
 	Insert Menu Item	Вставить пункт меню
 	Insert Select Path	Вставить выделение контура
diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv
index 8a8f8453b6..3e2d4b9990 100644
--- a/crates/ui-egui/src/i18n/sv.tsv
+++ b/crates/ui-egui/src/i18n/sv.tsv
@@ -6511,6 +6511,7 @@ axis	Y Axis	Y-axel
 @msg	message must be text	message måste vara text
 @msg	allowContinue must be true or false	allowContinue måste vara true eller false
 @msg	Batch cannot play an action with a stop	Batch kan inte spela upp en åtgärd med ett stopp
+@msg	Batch cannot play an action with a View menu step	Batch kan inte spela upp en åtgärd med ett steg från menyn Visa
 	Insert Menu Item…	Infoga menyalternativ…
 	Insert Menu Item	Infoga menyalternativ
 	Insert Select Path	Infoga markering av bana
diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv
index ef8773c31b..d4edfbbc5b 100644
--- a/crates/ui-egui/src/i18n/tr.tsv
+++ b/crates/ui-egui/src/i18n/tr.tsv
@@ -6486,6 +6486,7 @@ axis	Y Axis	Y ekseni
 @msg	message must be text	"message" metin olmalıdır
 @msg	allowContinue must be true or false	"allowContinue" true veya false olmalıdır
 @msg	Batch cannot play an action with a stop	Toplu işlem durak içeren bir eylemi oynatamaz
+@msg	Batch cannot play an action with a View menu step	Toplu işlem Görünüm menüsü adımı içeren bir eylemi oynatamaz
 	Insert Menu Item…	Menü Öğesi Ekle…
 	Insert Menu Item	Menü Öğesi Ekle
 	Insert Select Path	Yol Seçimi Ekle
diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv
index 0bccbd8cb6..6fd22c7d02 100644
--- a/crates/ui-egui/src/i18n/uk.tsv
+++ b/crates/ui-egui/src/i18n/uk.tsv
@@ -6135,6 +6135,7 @@ axis	Y Axis	Вісь Y
 @msg	message must be text	message має бути текстом
 @msg	allowContinue must be true or false	allowContinue має бути true або false
 @msg	Batch cannot play an action with a stop	Пакет не може відтворити дію із зупинкою
+@msg	Batch cannot play an action with a View menu step	Пакет не може відтворити дію з кроком із меню Перегляд
 	Insert Menu Item…	Вставити пункт меню…
 	Insert Menu Item	Вставити пункт меню
 	Insert Select Path	Вставити виділення контуру
diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv
index 4f084029db..295e645ad2 100644
--- a/crates/ui-egui/src/i18n/vi.tsv
+++ b/crates/ui-egui/src/i18n/vi.tsv
@@ -6136,6 +6136,7 @@ axis	Y Axis	Trục Y
 @msg	message must be text	message phải là văn bản
 @msg	allowContinue must be true or false	allowContinue phải là true hoặc false
 @msg	Batch cannot play an action with a stop	Hàng loạt không thể phát hành động có điểm dừng
+@msg	Batch cannot play an action with a View menu step	Hàng loạt không thể phát hành động có bước của menu Hiển thị
 	Insert Menu Item…	Chèn mục menu…
 	Insert Menu Item	Chèn mục menu
 	Insert Select Path	Chèn chọn đường dẫn
diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv
index b04e65a65b..07059f8caf 100644
--- a/crates/ui-egui/src/i18n/zh-hans.tsv
+++ b/crates/ui-egui/src/i18n/zh-hans.tsv
@@ -6368,6 +6368,7 @@ axis	Y Axis	Y 轴
 @msg	message must be text	message 必须是文本
 @msg	allowContinue must be true or false	allowContinue 必须是 true 或 false
 @msg	Batch cannot play an action with a stop	批处理无法播放含有停止的动作
+@msg	Batch cannot play an action with a View menu step	批处理无法播放含有视图菜单步骤的动作
 	Insert Menu Item…	插入菜单项…
 	Insert Menu Item	插入菜单项
 	Insert Select Path	插入选择路径
diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv
index be62fde8a7..c03f36991f 100644
--- a/crates/ui-egui/src/i18n/zh-hant.tsv
+++ b/crates/ui-egui/src/i18n/zh-hant.tsv
@@ -6173,6 +6173,7 @@ axis	Y Axis	Y 軸
 @msg	message must be text	message 必須是文字
 @msg	allowContinue must be true or false	allowContinue 必須是 true 或 false
 @msg	Batch cannot play an action with a stop	批次無法播放含有停止的動作
+@msg	Batch cannot play an action with a View menu step	批次無法播放含有檢視選單步驟的動作
 	Insert Menu Item…	插入選單項目…
 	Insert Menu Item	插入選單項目
 	Insert Select Path	插入選取路徑
diff --git a/crates/ui-egui/src/menus.rs b/crates/ui-egui/src/menus.rs
index 26dd765d29..4e2d80bb45 100644
--- a/crates/ui-egui/src/menus.rs
+++ b/crates/ui-egui/src/menus.rs
@@ -65,7 +65,7 @@ pub(crate) use bar::{home_key, home_showing};
 use bar::{menu_body, pointer_reaches_title};
 pub use context::{context_items, context_menu_body, ruler_menu_body, ruler_unit_items};
 pub use entries::{
-    InsertableItem, MenuEntry, Row, context_entries, entry, insertable, insertable_items, menu_entries, pretty_shortcut, shown_shortcut,
+    InsertableItem, MenuEntry, Row, context_entries, entry, insertable, insertable_items, menu_entries, plays_in_app, pretty_shortcut, shown_shortcut,
 };
 pub(crate) use invoke::graph_dialog;
 #[cfg(test)]
diff --git a/crates/ui-egui/src/menus/entries.rs b/crates/ui-egui/src/menus/entries.rs
index 42ad7b6555..953b5b58f4 100644
--- a/crates/ui-egui/src/menus/entries.rs
+++ b/crates/ui-egui/src/menus/entries.rs
@@ -150,20 +150,65 @@ const NOT_INSERTED_MENUS: [&str; 4] = ["VectorCraft", "File", "Window", "Help"];
 /// Options panel.
 const MENU_ONLY_COMMANDS: [&str; 4] = ["imageTrace.make", "imageTrace.makeAndExpand", "object.pattern.make", "object.pattern.edit"];
 
+/// The View menu commands that the app runs itself, not the engine, and that can be steps of an
+/// action ([`plays_in_app`]): Outline, Pixel Preview, Trim View, Presentation Mode and Screen Mode,
+/// the zoom, fit and rotate view items, and the items that show or hide or turn snapping on or off.
+/// The saved-view slots are not among them.
+const UI_STEP_COMMANDS: [&str; 30] = [
+    "view.outline",
+    "view.pixelPreview",
+    "view.trimView",
+    "view.presentation",
+    "view.screenMode",
+    "view.zoomIn",
+    "view.zoomOut",
+    "view.fitArtboard",
+    "view.fitAll",
+    "view.actualSize",
+    "view.rotate",
+    "view.rotateToSelection",
+    "view.rotateReset",
+    "view.edges",
+    "view.artboards",
+    "view.template",
+    "view.rulers",
+    "view.videoRulers",
+    "view.boundingBox",
+    "view.textThreads",
+    "view.gradientAnnotator",
+    "view.cornerWidget",
+    "view.livePaintGaps",
+    "view.guides",
+    "view.smartGuides",
+    "view.grid",
+    "view.snapToGrid",
+    "view.snapToPixel",
+    "view.snapToPoint",
+    "view.snapToGlyph",
+];
+
+/// Whether a step that runs command `id` is a View menu command that the app runs itself
+/// ([`UI_STEP_COMMANDS`]). Action playback runs such a step on its own, as its menu item runs it,
+/// and not inside `command.batch`.
+pub fn plays_in_app(id: &str) -> bool {
+    UI_STEP_COMMANDS.contains(&id)
+}
+
 /// Whether the item labeled `label` in menu `title`, which runs command `id` with `p`, can be a step
 /// of an action. It can when it runs an engine command, which action playback runs as the menu
-/// does; its label does not end with "…", the mark of an item that asks for values first; it is not
-/// in a menu of [`NOT_INSERTED_MENUS`]; and it is not Undo, Redo, a Paste, an item that stands for a
-/// saved selection, a saved view or a recent font, a plug-in's item or an action's own command. Nor
-/// is it Object › Align, whose menu items add the Align To choice and the selection's key to their
-/// params when clicked ([`crate::panels::align::with_align_to`]), which playback does not, or another
-/// item of [`MENU_ONLY_COMMANDS`].
+/// does, or is a View menu item that the app runs itself ([`plays_in_app`]); its label does not end
+/// with "…", the mark of an item that asks for values first; it is not in a menu of
+/// [`NOT_INSERTED_MENUS`]; and it is not Undo, Redo, a Paste, an item that stands for a saved
+/// selection, a saved view or a recent font, a plug-in's item, an action's own command or another
+/// item of [`MENU_ONLY_COMMANDS`]. An Object › Align item can be a step: inserting it adds the Align
+/// To choice of that moment to its params, as clicking it does
+/// ([`crate::panels::align::with_align_to`]).
 pub fn insertable(title: &str, label: &str, id: &str, p: &Value) -> bool {
     use super::slots::{RECENT_FONT_IDS, SAVED_SELECTION_IDS, SAVED_VIEW_IDS};
-    vectorcraft_engine::find_command(id).is_some()
+    (vectorcraft_engine::find_command(id).is_some() || (title == "View" && plays_in_app(id)))
         && !label.ends_with('…')
         && !NOT_INSERTED_MENUS.contains(&title)
-        && !matches!(id, "edit.undo" | "edit.redo" | "command.batch" | "object.align")
+        && !matches!(id, "edit.undo" | "edit.redo" | "command.batch")
         && !MENU_ONLY_COMMANDS.contains(&id)
         && !id.starts_with("edit.paste")
         && !id.starts_with("prefs.")
diff --git a/crates/ui-egui/src/menus/invoke.rs b/crates/ui-egui/src/menus/invoke.rs
index 9d30b2a5b6..262e346c2c 100644
--- a/crates/ui-egui/src/menus/invoke.rs
+++ b/crates/ui-egui/src/menus/invoke.rs
@@ -178,10 +178,7 @@ pub fn invoke(app: &mut VectorcraftApp, id: &str, p: Value) {
     // Object → Align aligns to what the align buttons align to, unless the call names `to`. With
     // anchors selected (Direct Selection) it sends its params unchanged, and the points align to
     // their own bounds.
-    let follows_align_to = id == "object.align"
-        && p.as_object().is_some_and(|o| !o.contains_key("to"))
-        && app.session.active().is_some_and(|st| st.selection.anchors.is_empty());
-    let p = if follows_align_to { crate::panels::align::with_align_to(app, p) } else { p };
+    let p = if id == "object.align" { crate::panels::align::menu_align_params(app, p) } else { p };
     // Image Trace traces off the UI thread, with its progress (#3098).
     if matches!(id, "imageTrace.make" | "imageTrace.makeAndExpand") {
         if let Err(e) = crate::trace_runs::start(app, id, p, false) {
diff --git a/crates/ui-egui/src/panels/actions.rs b/crates/ui-egui/src/panels/actions.rs
index 8196ad27c2..a357e2cc3a 100644
--- a/crates/ui-egui/src/panels/actions.rs
+++ b/crates/ui-egui/src/panels/actions.rs
@@ -220,13 +220,17 @@ pub fn default_sets() -> Vec<ActionSet> {
 
 /// Plays an action at the speed [`UiState::action_playback`](crate::UiState::action_playback) sets.
 /// Accelerated runs every included step at once as a single undoable batch → what `command.batch`
-/// returns. Step by Step and Pause For run the first step now, each as its own undo step, and leave
-/// the rest to [`tick_playback`] → {results: [the first step's result], pending: the steps left}.
-/// While a paced playback is in progress, another action does not play.
+/// returns, {results}. Step by Step and Pause For run the first step now, each as its own undo step,
+/// and leave the rest to [`tick_playback`] → {results: [the first step's result], pending: the steps
+/// left}. While a paced playback is in progress, another action does not play.
 ///
 /// An action with an included stop ([`STOP_STEP`]) plays up to the stop and waits there at any speed
 /// ([`continue_playback`]). At Accelerated, the steps between two stops are one undo step. → {results:
 /// [the results of the steps run], pending: the steps left, stops included, atStop: true when it waits}
+///
+/// A View menu step ([`is_ui_step`]) runs on its own at every speed, in its place among the steps, and
+/// adds no undo step ([`run_steps`]). At Accelerated the steps before it and the steps after it are
+/// then one undo step each.
 pub fn play(app: &mut VectorcraftApp, set: usize, idx: usize) -> Result<Value, String> {
     let Some(a) = app.ui.action_sets.get(set).and_then(|s| s.actions.get(idx)).cloned() else { return Err("no such action".into()) };
     let commands = a.included_commands();
@@ -241,7 +245,7 @@ pub fn play(app: &mut VectorcraftApp, set: usize, idx: usize) -> Result<Value, S
         return play_with_stops(app, a.name, commands, options);
     }
     if options.speed == PlaybackSpeed::Accelerated {
-        return app.replay("command.batch", json!({"label": a.name, "commands": commands}));
+        return Ok(json!({"results": run_steps(app, &a.name, commands)?}));
     }
     let mut steps: std::collections::VecDeque<Value> = commands.into();
     let Some(first) = steps.pop_front() else { return Err("the action has no included steps".into()) };
@@ -259,10 +263,59 @@ pub fn play(app: &mut VectorcraftApp, set: usize, idx: usize) -> Result<Value, S
     Ok(json!({"results": [result], "pending": pending}))
 }
 
-/// Runs one step of a paced playback as its own undo step, named `label` → the step's result.
+/// Runs one step of a paced playback as its own undo step, named `label`, or a View menu step with
+/// no undo step ([`run_steps`]) → the step's result.
 fn play_step(app: &mut VectorcraftApp, label: &str, step: Value) -> Result<Value, String> {
-    let r = app.replay("command.batch", json!({"label": label, "commands": [step]}))?;
-    Ok(r.get("results").and_then(|r| r.get(0)).cloned().unwrap_or(Value::Null))
+    Ok(run_steps(app, label, vec![step])?.into_iter().next().unwrap_or(Value::Null))
+}
+
+/// Whether a step as [`Action::included_commands`] gives it is a View menu command that the app runs
+/// itself ([`crate::menus::plays_in_app`]), which `command.batch` does not run.
+pub(crate) fn is_ui_step(step: &Value) -> bool {
+    step.get("command").and_then(Value::as_str).is_some_and(crate::menus::plays_in_app)
+}
+
+/// Runs `steps` in order, as saved steps ([`VectorcraftApp::replay`]) → their results. The steps
+/// between two View menu steps ([`is_ui_step`]) run as one `command.batch` named `label`, which is one
+/// undo step; a View menu step runs on its own ([`play_ui_step`]). A step that fails ends the run with
+/// its error: the batch it is in changes nothing, and the steps before that batch stay done.
+fn run_steps(app: &mut VectorcraftApp, label: &str, steps: Vec<Value>) -> Result<Vec<Value>, String> {
+    fn batch(app: &mut VectorcraftApp, label: &str, run: Vec<Value>, results: &mut Vec<Value>) -> Result<(), String> {
+        if run.is_empty() {
+            return Ok(());
+        }
+        let r = app.replay("command.batch", json!({"label": label, "commands": run}))?;
+        results.extend(r.get("results").and_then(Value::as_array).cloned().unwrap_or_default());
+        Ok(())
+    }
+    let mut results = Vec::with_capacity(steps.len());
+    let mut run = vec![];
+    for step in steps {
+        if is_ui_step(&step) {
+            batch(app, label, std::mem::take(&mut run), &mut results)?;
+            results.push(play_ui_step(app, &step)?);
+        } else {
+            run.push(step);
+        }
+    }
+    batch(app, label, run, &mut results)?;
+    Ok(results)
+}
+
+/// Runs a View menu step as its menu item runs it, which adds no undo step → its result. While an
+/// action records, the step goes into the recording too, as a stop does, unless it does not fit in
+/// the action ([`recording_room`]): then the status bar shows the reason.
+fn play_ui_step(app: &mut VectorcraftApp, step: &Value) -> Result<Value, String> {
+    let command = step.get("command").and_then(Value::as_str).unwrap_or_default().to_string();
+    let params = step.get("params").filter(|p| !p.is_null()).cloned().unwrap_or_else(|| json!({}));
+    let r = app.replay(&command, params.clone())?;
+    if app.ui.recording.is_some() {
+        match recording_room(app, &command, &params) {
+            Ok(()) => app.session.journal.push((command, params)),
+            Err(e) => app.status(e),
+        }
+    }
+    Ok(r)
 }
 
 /// [`play`] for an action with a stop: runs what comes before the first stop, or at Step by Step and
@@ -271,18 +324,12 @@ fn play_with_stops(app: &mut VectorcraftApp, label: String, commands: Vec<Value>
     let mut steps: std::collections::VecDeque<Value> = commands.into();
     let run = next_run(&mut steps, options.speed);
     let ran = !run.is_empty();
-    let results = if ran { play_steps(app, &label, run)? } else { vec![] };
+    let results = if ran { run_steps(app, &label, run)? } else { vec![] };
     app.ui.action_playing = Some(Playing { label, steps, options, next_at: None, hold: false, doc: None, played_in: None, stop: None });
     after_run(app, ran);
     Ok(playback_result(app, results))
 }
 
-/// Runs steps of a playback as one undo step, named `label` → the steps' results.
-fn play_steps(app: &mut VectorcraftApp, label: &str, steps: Vec<Value>) -> Result<Vec<Value>, String> {
-    let r = app.run("command.batch", json!({"label": label, "commands": steps}))?;
-    Ok(r.get("results").and_then(Value::as_array).cloned().unwrap_or_default())
-}
-
 /// Takes the steps that run next as one undo step off the front of `steps`: at Accelerated all of
 /// them up to the next stop, at the other speeds one. None when a stop comes next.
 fn next_run(steps: &mut std::collections::VecDeque<Value>, speed: PlaybackSpeed) -> Vec<Value> {
@@ -429,7 +476,7 @@ pub fn continue_playback(app: &mut VectorcraftApp, _: &Value) -> Result<Value, S
     }
     close_stop_message(app);
     let ran = !run.is_empty();
-    let results = if ran { play_steps(app, &label, run).inspect_err(|_| app.ui.action_playing = None)? } else { vec![] };
+    let results = if ran { run_steps(app, &label, run).inspect_err(|_| app.ui.action_playing = None)? } else { vec![] };
     after_run(app, ran);
     Ok(playback_result(app, results))
 }
@@ -927,10 +974,15 @@ pub const INSERT_MENU_ITEM: &str = "ui.action.insertMenuItem";
 /// `ui.action.insertMenuItem {set?, action?, step?, command, params?}`: inserts the command of a
 /// menu item as a step, without running it. `command` and `params` (default: `{}`) are those of a
 /// menu item that can be a step ([`crate::menus::insertable_items`]); the step plays as the item
-/// runs. The place is as [`insert_stop`] takes it, and the step is selected as a stop is. A command
-/// and params that no such item has, a param of another type, params that are not an object, or a
-/// place [`insert_stop`] refuses is an error, and then nothing changes. Insert Menu Item's OK runs
-/// this. → {set, action, step}, or {recording: true}
+/// runs. An Object › Align item's step holds the params that clicking the item sends now
+/// ([`crate::panels::align::menu_align_params`]): with whole objects selected, the `to` of the key
+/// object, the artboard or the selection, so a later Align To choice does not change the step, and a
+/// step that aligns to the key object fails in playback when there is none then. A View menu item that the app runs itself
+/// ([`crate::menus::plays_in_app`]) plays on its own, with no undo step ([`play`]). The place is as
+/// [`insert_stop`] takes it, and the step is selected as a stop is. A command and params that no such
+/// item has, a param of another type, params that are not an object, or a place [`insert_stop`]
+/// refuses is an error, and then nothing changes. Insert Menu Item's OK runs this. → {set, action,
+/// step}, or {recording: true}
 pub fn insert_menu_item(app: &mut VectorcraftApp, p: &Value) -> Result<Value, String> {
     if !p.is_object() {
         return Err("`params` must be an object".into());
@@ -945,6 +997,7 @@ pub fn insert_menu_item(app: &mut VectorcraftApp, p: &Value) -> Result<Value, St
     if !items.iter().any(|item| item.command == command && item.params == params) {
         return Err("no menu item that can be inserted runs this command".into());
     }
+    let params = if command == "object.align" { super::align::menu_align_params(app, params) } else { params };
     insert(app, p, (command.to_string(), params))
 }
 
@@ -3184,7 +3237,7 @@ mod tests {
             (json!(long.to_string()), "an action in the action set file has more than 10,000 steps"),
             (json!(" ".repeat(files::MAX_SET_FILE + 1)), "the action set file is larger than 8 MiB"),
             (
-                json!("{\"format\": \"vcactions\", \"version\": 6, \"name\": \"S\", \"actions\": []}"),
+                json!("{\"format\": \"vcactions\", \"version\": 7, \"name\": \"S\", \"actions\": []}"),
                 "the action set file needs a later version of VectorCraft",
             ),
         ] {
@@ -4494,6 +4547,146 @@ mod tests {
         assert!(selected.is_some() && selected != rect, "the group step ran and selected the new group");
     }
 
+    /// [`app_with_three_moves`] with View › Outline inserted after the first move: the moves of 1,
+    /// Outline, then the moves of 2 and 4.
+    fn app_with_a_view_step() -> (VectorcraftApp, impl Fn(&VectorcraftApp) -> f64) {
+        let (mut app, x) = app_with_three_moves();
+        let doc = app.session.active().unwrap().doc.clone();
+        let r = app.run(INSERT_MENU_ITEM, json!({"set": 0, "action": 0, "step": 0, "command": "view.outline"})).unwrap();
+        assert_eq!(r, json!({"set": 0, "action": 0, "step": 1}));
+        assert!(!app.outline_view(), "inserting runs nothing");
+        assert!(std::sync::Arc::ptr_eq(&app.session.active().unwrap().doc, &doc));
+        assert_eq!(app.ui.action_sets[0].actions[0].steps[1], ("view.outline".to_string(), json!({})));
+        (app, x)
+    }
+
+    /// At Accelerated a View menu step plays in its place: the steps before it are one undo step,
+    /// the View step adds none, and the steps after it are one more.
+    #[test]
+    fn an_inserted_view_item_plays_in_its_place_at_accelerated() {
+        let (mut app, x) = app_with_a_view_step();
+        let before = undo_steps(&app);
+        let r = play(&mut app, 0, 0).unwrap();
+        assert_eq!(r["results"].as_array().map(Vec::len), Some(4), "{r}");
+        assert_eq!(r["results"][1], json!(true), "Outline turned on: {r}");
+        assert!(app.outline_view());
+        assert_eq!(x(&app), 7.0);
+        assert_eq!(undo_steps(&app), before + 2, "the moves on each side of Outline are one undo step each");
+        app.run("edit.undo", json!({})).unwrap();
+        assert_eq!(x(&app), 1.0, "Undo takes back the moves after Outline");
+        assert!(app.outline_view(), "and leaves the view as it is");
+    }
+
+    /// A step that fails after a View menu step ends the playback: the steps before it stay done and
+    /// the batch it is in changes nothing.
+    #[test]
+    fn a_failing_step_after_a_view_item_keeps_what_played_before_it() {
+        let (mut app, x) = app_with_a_view_step();
+        app.ui.action_sets[0].actions[0].steps.insert(3, ("object.align".into(), json!({})));
+        assert!(play(&mut app, 0, 0).is_err());
+        assert!(app.outline_view(), "Outline played");
+        assert_eq!(x(&app), 1.0, "the move before Outline stays, and the move of 2 in the failing batch is taken back");
+    }
+
+    /// At Step by Step and Pause For a View menu step is one step of the playback and adds no undo
+    /// step.
+    #[test]
+    fn an_inserted_view_item_plays_step_by_step_and_with_pauses() {
+        for speed in ["step", "pause"] {
+            let (mut app, x) = app_with_a_view_step();
+            app.run(PLAYBACK_OPTIONS, json!({"speed": speed})).unwrap();
+            let before = undo_steps(&app);
+            let r = play(&mut app, 0, 0).unwrap();
+            assert_eq!(r["pending"], json!(3), "{speed}: {r}");
+            assert!(!app.outline_view(), "{speed}: Outline waits its turn");
+            let mut now = 0.0;
+            for _ in 0..40 {
+                if app.ui.action_playing.is_none() {
+                    break;
+                }
+                now += 2.0;
+                frame(&mut app, now);
+            }
+            assert!(app.ui.action_playing.is_none(), "{speed}: the playback ended");
+            assert!(app.outline_view(), "{speed}");
+            assert_eq!(x(&app), 7.0, "{speed}");
+            assert_eq!(undo_steps(&app), before + 3, "{speed}: each move its own undo step, Outline none");
+        }
+    }
+
+    /// A View menu step before a stop plays before the playback waits there, and the steps after the
+    /// stop play on Continue.
+    #[test]
+    fn an_inserted_view_item_plays_up_to_a_stop() {
+        let (mut app, x) = app_with_a_view_step();
+        app.run(INSERT_STOP, json!({"set": 0, "action": 0, "step": 1})).unwrap();
+        let r = play(&mut app, 0, 0).unwrap();
+        assert_eq!(r["atStop"], json!(true), "{r}");
+        assert!(app.outline_view());
+        assert_eq!(x(&app), 1.0);
+        app.run(CONTINUE_PLAYBACK, json!({})).unwrap();
+        assert_eq!(x(&app), 7.0);
+        assert!(app.outline_view(), "Outline did not play again");
+    }
+
+    /// Playing an action with a View menu step while another records keeps the View step in the
+    /// recording, between the batches of the steps around it.
+    #[test]
+    fn a_view_step_played_while_recording_is_recorded() {
+        let (mut app, _) = app_with_a_view_step();
+        app.run(START_RECORDING, json!({})).unwrap();
+        play(&mut app, 0, 0).unwrap();
+        app.run(STOP_RECORDING, json!({})).unwrap();
+        let recorded = &app.ui.action_sets[0].actions.last().unwrap().steps;
+        let ids: Vec<&str> = recorded.iter().map(|(c, _)| c.as_str()).collect();
+        assert_eq!(ids, ["command.batch", "view.outline", "command.batch"]);
+        assert_eq!(recorded[1].1, json!({}));
+    }
+
+    /// Batch… refuses an action with an included View menu step, which acts on a document window,
+    /// and plays one whose View menu step is excluded.
+    #[test]
+    fn batch_refuses_an_action_with_a_view_step() {
+        let (mut app, _) = app_with_a_view_step();
+        assert_eq!(crate::dialogs::action_batch::open(&mut app, 0, 0).unwrap_err(), "Batch cannot play an action with a View menu step");
+        assert!(app.ui.dialog.is_none());
+        app.ui.action_sets[0].actions[0].excluded_steps.insert(1);
+        crate::dialogs::action_batch::open(&mut app, 0, 0).unwrap();
+    }
+
+    /// An action set with a View menu step saves as version 6 and loads back with the step; one whose
+    /// View menu step has params that are not an object is not an action set file.
+    #[test]
+    fn a_saved_view_step_survives_as_version_6() {
+        let (app, _) = app_with_a_view_step();
+        let saved = files::write_set(&app.ui.action_sets[0]);
+        let file: Value = serde_json::from_str(&saved).unwrap();
+        assert_eq!(file["version"], json!(6), "older builds must refuse a View menu step");
+        let loaded = files::read_set(&saved, "Test").unwrap();
+        assert_eq!(loaded.actions[0].steps, app.ui.action_sets[0].actions[0].steps);
+        for params in [json!(5), json!([1]), json!(null)] {
+            let step = json!({"command": "view.zoomIn", "params": params});
+            let bad = json!({"format": "vcactions", "version": 6, "name": "Bad", "actions": [{"name": "A", "steps": [step]}]});
+            assert_eq!(files::read_set(&bad.to_string(), "Test").unwrap_err(), "not an action set file", "{params}");
+        }
+    }
+
+    /// At Accelerated, the steps up to a stop play as saved steps, as they do without a stop: a key
+    /// their command no longer reads, recorded by an older version, is taken.
+    #[test]
+    fn steps_before_a_stop_play_with_a_key_no_longer_read() {
+        let (mut app, _) = app_with_three_moves();
+        let old = json!({"x": 10, "y": 50, "width": 20, "height": 20, "cornerStyle": "round"});
+        assert!(app.run("shape.rectangle", old.clone()).is_err());
+        let stop = (STOP_STEP.to_string(), json!({"message": "", "allowContinue": false}));
+        app.ui.action_sets[0].actions[0].steps = vec![("shape.rectangle".into(), old), stop];
+        let shapes = app.session.active().unwrap().doc.layers[0].children().unwrap().len();
+        let r = play(&mut app, 0, 0).unwrap();
+        assert_eq!(r["atStop"], json!(true), "{r}");
+        assert_eq!(app.session.active().unwrap().doc.layers[0].children().unwrap().len(), shapes + 1);
+        assert!(!app.session.replaying());
+    }
+
     #[test]
     fn insert_menu_item_refuses_what_no_menu_item_runs_and_changes_nothing() {
         let (mut app, _) = app_with_three_moves();
@@ -4515,11 +4708,15 @@ mod tests {
             (place(json!({"command": "file.save"})), none),
             (place(json!({"command": "object.move"})), none),
             (place(json!({"command": "object.move", "params": {"dx": 1, "dy": 0}})), none),
-            (place(json!({"command": "view.zoomIn"})), none),
             (place(json!({"command": INSERT_MENU_ITEM})), none),
             (place(json!({"command": "edit.paste"})), none),
-            // Align, whose menu items add the Align To choice when clicked.
-            (place(json!({"command": "object.align", "params": {"horizontal": "left"}})), none),
+            // The app's own commands outside the View menu, a saved-view slot and the View menu's New
+            // View…, which asks for a name first.
+            (place(json!({"command": "window.panel", "params": {"panel": "layers", "toggle": true}})), none),
+            (place(json!({"command": "view.goto1"})), none),
+            (place(json!({"command": "view.saved.new"})), none),
+            // Align To is the step's own: only the menu item's params are taken.
+            (place(json!({"command": "object.align", "params": {"horizontal": "left", "to": "selection"}})), none),
             // Image Trace, whose menu items trace off the UI thread with progress and Cancel.
             (place(json!({"command": "imageTrace.make", "params": {"preset": "Default"}})), none),
             (place(json!({"command": "imageTrace.makeAndExpand", "params": {"preset": "Default"}})), none),
@@ -4547,19 +4744,74 @@ mod tests {
     }
 
     /// A listed menu item runs from the menu what its step runs in playback: the click opens no
-    /// dialog, and it journals the item's own command with the item's own params.
+    /// dialog, and it journals the item's own command with the params its step holds. An Object ›
+    /// Align item's step holds the Align To choice that the click sends, and the app adds the active
+    /// artboard to both.
     #[test]
     fn every_listed_menu_item_runs_from_the_menu_what_its_step_holds() {
         for item in crate::menus::insertable_items(false) {
             let (mut app, _) = app_with_three_moves();
+            app.run(INSERT_MENU_ITEM, json!({"set": 0, "action": 0, "command": item.command, "params": item.params})).unwrap();
+            let held = app.ui.action_sets[0].actions[0].steps[3].1.clone();
             let start = app.session.journal.len();
             crate::menus::invoke(&mut app, item.command, item.params.clone());
             assert!(app.ui.dialog.is_none(), "{item:?} opens a dialog");
             let ran = app.session.journal_for_action(start);
-            assert!(ran.iter().all(|(c, p)| c != item.command || *p == item.params), "{item:?} ran {ran:?}");
+            let without_artboard = |p: &Value| {
+                let mut p = p.clone();
+                if let Some(o) = p.as_object_mut() {
+                    o.remove("artboard");
+                }
+                p
+            };
+            assert!(ran.iter().all(|(c, p)| c != item.command || without_artboard(p) == held), "{item:?} ran {ran:?}, its step holds {held}");
         }
     }
 
+    /// Object › Align items can be inserted, and the step keeps the Align To that the click sends at
+    /// insertion: a later Align To choice does not change it.
+    #[test]
+    fn an_inserted_align_item_keeps_the_align_to_of_its_insertion() {
+        let (mut app, _, ids) = app_with_two_rectangles();
+        app.run("select.set", json!({ "ids": ids })).unwrap();
+        app.ui.align_to = super::super::align::AlignTo::Artboard;
+        app.run(INSERT_MENU_ITEM, json!({"set": 0, "action": 0, "command": "object.align", "params": {"horizontal": "left"}})).unwrap();
+        app.ui.align_to = super::super::align::AlignTo::Selection;
+        app.run(INSERT_MENU_ITEM, json!({"set": 0, "action": 0, "command": "object.align", "params": {"horizontal": "left"}})).unwrap();
+        let steps = &app.ui.action_sets[0].actions[0].steps;
+        assert_eq!(steps[3], ("object.align".to_string(), json!({"horizontal": "left", "to": "artboard"})));
+        assert_eq!(steps[4], ("object.align".to_string(), json!({"horizontal": "left", "to": "selection"})));
+    }
+
+    /// With anchor points selected, an Object › Align item sends its params unchanged, and the points
+    /// align to their own bounds: its step holds the same params, without the Align To choice.
+    #[test]
+    fn an_inserted_align_item_with_anchors_selected_keeps_the_menu_params() {
+        let (mut app, _, [first, _]) = app_with_two_rectangles();
+        app.ui.align_to = super::super::align::AlignTo::Artboard;
+        app.run("select.anchors", json!({"id": first, "anchors": [[0, 0], [0, 1]]})).unwrap();
+        assert!(!app.session.active().unwrap().selection.anchors.is_empty());
+        app.run(INSERT_MENU_ITEM, json!({"set": 0, "action": 0, "command": "object.align", "params": {"horizontal": "left"}})).unwrap();
+        assert_eq!(app.ui.action_sets[0].actions[0].steps[3], ("object.align".to_string(), json!({"horizontal": "left"})));
+    }
+
+    /// A step that aligns to the key object fails in playback when the selection has no key then:
+    /// it does not align to the selection or the artboard instead, and the steps after it do not run.
+    #[test]
+    fn an_align_step_to_the_key_object_fails_without_a_key() {
+        let (mut app, _, [first, second]) = app_with_two_rectangles();
+        app.run("select.set", json!({"ids": [first, second]})).unwrap();
+        app.run("select.key", json!({"id": second})).unwrap();
+        app.ui.action_sets[0].actions[0].steps.clear();
+        app.run(INSERT_MENU_ITEM, json!({"set": 0, "action": 0, "command": "object.align", "params": {"horizontal": "left"}})).unwrap();
+        assert_eq!(app.ui.action_sets[0].actions[0].steps[0].1["to"], json!("key"));
+        app.ui.action_sets[0].actions[0].steps.push(("object.move".into(), json!({"dx": 5, "dy": 0})));
+        app.run("select.set", json!({"ids": [first, second]})).unwrap();
+        let before = (left_of(&app, first), left_of(&app, second));
+        assert!(play(&mut app, 0, 0).unwrap_err().contains("no key object"));
+        assert_eq!((left_of(&app, first), left_of(&app, second)), before, "nothing moved");
+    }
+
     #[test]
     fn insert_menu_item_goes_into_the_recording() {
         let (mut app, _) = app_with_three_moves();
@@ -5789,7 +6041,7 @@ mod tests {
                 json!({"format": "vcactions", "version": version, "name": "Old", "actions": [{"name": "A", "steps": [{"command": "object.move"}]}]});
             assert_eq!(files::read_set(&old.to_string(), "Test").unwrap().actions[0].steps.len(), 1, "version {version}");
         }
-        let later = json!({"format": "vcactions", "version": 6, "name": "New", "actions": []});
+        let later = json!({"format": "vcactions", "version": 7, "name": "New", "actions": []});
         assert_eq!(files::read_set(&later.to_string(), "Test").unwrap_err(), "the action set file needs a later version of VectorCraft");
         for params in [json!({"message": 5}), json!({"allowContinue": "yes"}), json!(42)] {
             let stop = json!({"command": "action.stop", "params": params});
diff --git a/crates/ui-egui/src/panels/actions/files.rs b/crates/ui-egui/src/panels/actions/files.rs
index 6aa8b95df4..911e6ae41b 100644
--- a/crates/ui-egui/src/panels/actions/files.rs
+++ b/crates/ui-egui/src/panels/actions/files.rs
@@ -1,6 +1,6 @@
 //! Action set files: the Actions panel menu's Save Actions… and Load Actions….
 //!
-//! An action set file (`.vcactions`) is JSON: `{"format": "vcactions", "version": 1 to 5, "name",
+//! An action set file (`.vcactions`) is JSON: `{"format": "vcactions", "version": 1 to 6, "name",
 //! "actions": [{"name", "steps": [{"command", "params", "excluded"?}], "key"?, "color"?}]}`. Each step is a
 //! command id and its params, as `command.batch` takes them, or a stop: the command `action.stop`
 //! with `{"message", "allowContinue"}`. A Select Object step is the command `select.byNote` with
@@ -10,9 +10,10 @@
 //! or with a value that is not one, has none. `excluded: true` keeps a step but skips it during
 //! playback. Sets with exclusions use version 2 so older builds refuse them rather than replay
 //! excluded steps, sets with stops use version 3 so older builds refuse them rather than fail at a
-//! stop, sets with Select Object steps use version 4 and sets with Select Path steps use version 5 so
-//! older builds refuse them rather than fail at that step. Other sets use version 1, and earlier
-//! version 1 to 4 files still work.
+//! stop, sets with Select Object steps use version 4, sets with Select Path steps use version 5 and
+//! sets with View menu steps ([`crate::menus::plays_in_app`]), whose params are an object, use
+//! version 6 so older builds refuse them rather than fail at that step. Other sets use version 1, and
+//! earlier version 1 to 5 files still work.
 //! Load Actions… also reads the action sets another app saves as text (`.aia`, through
 //! `actionSet.read`).
 
@@ -173,7 +174,9 @@ pub fn write_set(set: &ActionSet) -> String {
     let has_select_object = steps().any(|(command, params)| !select_objects_in(command, params).is_empty());
     let has_select_path = steps().any(|(command, params)| !select_paths_in(command, params).is_empty());
     let has_stop = steps().any(|(command, params)| !stops_in(command, params).is_empty());
+    let has_ui_step = steps().any(|(command, _)| crate::menus::plays_in_app(command));
     let version = match (has_select_path, has_select_object, has_stop, set.actions.iter().any(|a| !a.excluded_steps.is_empty())) {
+        _ if has_ui_step => 6,
         (true, ..) => 5,
         (false, true, ..) => 4,
         (false, false, true, _) => 3,
@@ -193,7 +196,7 @@ pub fn read_set(text: &str, name: &str) -> Result<ActionSet, String> {
     if f.format != ACTIONS_EXT {
         return Err("not an action set file".into());
     }
-    if !matches!(f.version, 1..=5) {
+    if !matches!(f.version, 1..=6) {
         return Err("the action set file needs a later version of VectorCraft".into());
     }
     if f.actions.len() > MAX_SET_ACTIONS {
@@ -214,6 +217,10 @@ pub fn read_set(text: &str, name: &str) -> Result<ActionSet, String> {
     if select_objects.any(|p| super::select_object_params(p).is_err()) {
         return Err("not an action set file".into());
     }
+    let mut ui_steps = f.actions.iter().flat_map(|a| &a.steps).filter(|s| crate::menus::plays_in_app(&s.command));
+    if ui_steps.any(|s| !s.params.is_object()) {
+        return Err("not an action set file".into());
+    }
     let actions = f
         .actions
         .into_iter()
diff --git a/crates/ui-egui/src/panels/align.rs b/crates/ui-egui/src/panels/align.rs
index 417468f642..02c7969be2 100644
--- a/crates/ui-egui/src/panels/align.rs
+++ b/crates/ui-egui/src/panels/align.rs
@@ -60,6 +60,13 @@ pub fn with_align_to(app: &VectorcraftApp, base: Value) -> Value {
     align_params(base, align_to(app), objects_aligned(app))
 }
 
+/// The params that an Object → Align menu item with params `p` sends: [`with_align_to`] unless `p`
+/// names `to` or anchor points are selected (Direct Selection), when `p` goes unchanged and the
+/// points align to their own bounds. Insert Menu Item stores the same params as the item's step.
+pub fn menu_align_params(app: &VectorcraftApp, p: Value) -> Value {
+    if p.as_object().is_some_and(|o| !o.contains_key("to")) && !has_anchors(app) { with_align_to(app, p) } else { p }
+}
+
 /// The selected objects that Align aligns as objects: none while anchor points are selected
 /// (Direct Selection), since the points align and a single path's points must not go to the
 /// artboard as a single object does (#1636).
diff --git a/docs/mcp.md b/docs/mcp.md
index 274db05a34..9aad4adf71 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -3016,15 +3016,18 @@ already walks Image Trace. Short agent entry points:
   the file at `path`, else a picked one, or the file's text `data`, adds its set after the other sets and returns
   `{set, name, actions}`. A set named like one already in the panel gets the next free number (`Print 2`), and the
   other sets and the current set stay as they are. An action set file (`.vcactions`) is JSON:
-  `{"format": "vcactions", "version": 1 to 5, "name", "actions": [{"name", "steps": [{"command", "params", "excluded"?}]}]}`, each step
+  `{"format": "vcactions", "version": 1 to 6, "name", "actions": [{"name", "steps": [{"command", "params", "excluded"?}]}]}`, each step
   a command id and its params as `command.batch` takes them, or a stop: the command `action.stop` with
   `{message, allowContinue}`. A Select Object step is the command `select.byNote` with `{note, caseSensitive,
-  wholeWord}`, and a Select Path step is the command `select.storedPath` with `{id, fingerprint}`. `excluded: true` preserves a step but omits it from playback;
-  an absent or false flag includes the step. Files with Select Path steps use version 5, files with Select Object steps
-  and no Select Path step use version 4, files with stops and neither use version 3, and files with excluded steps and
-  none of these use version 2, so older builds refuse them instead of playing the excluded steps or failing at a stop, a
-  Select Object step or a Select Path step; other files use version 1, and version 1 to 4 files still load. A file with another `format` or a `version` other than
-  1 to 5, a stop whose message is not text or whose `allowContinue` is not true or false, a Select Object step whose params `ui.action.insertSelectObject` would refuse, a file larger than 8 MiB, one with more than 1,000 actions and one with an action of more than 10,000 steps are
+  wholeWord}`, and a Select Path step is the command `select.storedPath` with `{id, fingerprint}`. A View menu step is
+  the id of a View menu command that the app runs itself (`view.outline`, `view.zoomIn`, `view.rotate` and the others
+  `ui.action.insertMenuItem` lists) with the item's params. `excluded: true` preserves a step but omits it from playback;
+  an absent or false flag includes the step. Files with View menu steps use version 6, files with Select Path steps and
+  no View menu step use version 5, files with Select Object steps and neither use version 4, files with stops and none
+  of these use version 3, and files with excluded steps and none of these use version 2, so older builds refuse them
+  instead of playing the excluded steps or failing at a stop, a Select Object step, a Select Path step or a View menu
+  step; other files use version 1, and version 1 to 5 files still load. A file with another `format` or a `version` other than
+  1 to 6, a stop whose message is not text or whose `allowContinue` is not true or false, a Select Object step whose params `ui.action.insertSelectObject` would refuse, a View menu step whose params are not an object, a file larger than 8 MiB, one with more than 1,000 actions and one with an action of more than 10,000 steps are
   refused, and no set is added. So is a file whose set `ui.actionSet.save` would write larger than 8 MiB (a file with
   less white space, a set name that gets a number, or an `.aia` set), with the error `the action set would be larger
   than 8 MiB`. The Actions panel menu's Save Actions… and Load Actions… run these; Load Actions… is
@@ -3089,7 +3092,12 @@ already walks Image Trace. Short agent entry points:
   here and in Batch…. An action with an included stop plays up to the stop at any speed and then waits, with its
   message box open, until `ui.action.continue` or `ui.action.stop`. At Accelerated the steps between two stops are one
   undoable batch each. The result is then `{results, pending, atStop?}`, with `atStop: true` when the action already
-  waits. Batch… refuses an action with an included stop, and a stop that is excluded does not hold playback.
+  waits. Batch… refuses an action with an included stop, and a stop that is excluded does not hold playback. A View
+  menu step (`ui.action.insertMenuItem`) plays at every speed in its place among the steps, as its menu item runs, and
+  adds no undo step. At Accelerated the steps before it and the steps after it are one undoable batch each, and the
+  result is `{results}` with every step's result in order. A step that fails ends the playback with its error: the
+  batch it is in changes nothing, and the steps before that batch stay done. While another action records, the View
+  menu step is recorded too. Batch… refuses an action with an included View menu step.
 - Actions: `ui.action.insertStop {set?, action?, step?, message?, allowContinue?}` inserts a stop. With `set` and
   `action`, the stop goes into that action, after step `step`, else after its last step, and the command returns
   `{set, action, step}`. Without them it goes into the recording in progress, after the steps recorded so far, and
@@ -3103,11 +3111,17 @@ already walks Image Trace. Short agent entry points:
   (`message`, `allowContinue`, `set`, `action`, `step`), whose OK runs this.
 - Actions: `ui.action.insertMenuItem {set?, action?, step?, command, params?}` inserts a menu item's command as a step
   without running it. `command` and `params` (default: `{}`) must be those of an item in the menus that can be a step:
-  an item that runs a document command without opening a dialog first, outside the File, Window and Help menus, and
-  not Undo, Redo, a Paste command, Object › Align (its items add the Align To choice when clicked), Object › Image
+  an item that runs a document command, or a View menu item that the app runs itself (Outline, Pixel Preview, Trim
+  View, Presentation Mode, Screen Mode, the zoom, fit and Rotate View items, and the show, hide and snap items), without
+  opening a dialog first, outside the File, Window and Help menus, and not Undo, Redo, a Paste command, Object › Image
   Trace › Make or Make and Expand (the menu traces off the UI thread, with progress and Cancel), Object › Pattern ›
   Make or Edit Pattern (the menu also opens the Pattern Options panel), a preference
-  toggle, an Actions command or a recent-font, saved-selection or saved-view slot. Disabled items are listed, and playback checks the step when it runs. With `set` and `action`, the
+  toggle, an Actions command, a Perspective Grid preset of the preferences or a recent-font, saved-selection or saved-view slot. Disabled items are listed, and playback checks the step when it runs. An Object › Align item's step
+  keeps the `to` its click sends at insertion (`key` while the selection has a key object or key guide, `artboard` for one selected
+  object or with Align to Artboard, else `selection`), so a later Align To choice does not change it, and a step that
+  aligns to the key object fails in playback when the selection has no key then. With anchor points selected the click
+  sends no `to`, and neither does the step. These are VectorCraft's own rules. A
+  View menu step plays as `ui.action.play` describes. With `set` and `action`, the
   step goes into that action, after step `step`, else after its last step, becomes the panel's selected step, and the
   command returns `{set, action, step}`. Without them it goes into the recording in progress and returns
   `{recording: true}`. A command no such item runs, params that are not an object, an index past the last set, action
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..65ba4db3a2 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -747,7 +747,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Actions panel: an action keeps to the limits that Load Actions… reads while it records and while its steps are excluded: at most 10,000 steps in an action and 8 MiB in its set's file, which are VectorCraft's own rules. Commands add steps to a recording until it stops ([the help page](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/record-actions.html)); a command whose step would pass a limit does not run, its document stays as it was, and the recording goes on. A command whose step passes a limit only as it runs, from values it adds to its step, keeps its edit; the status bar names the limit, later recorded commands do not run, and Stop Playing/Recording leaves its step out. A stop that playback reaches is not recorded then, and the status bar shows the reason. Clearing a checkmark keeps the step in the action and skips it in playback ([the help page](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/exclude-commands-from-actions.html)); an exclusion that would make the set's file larger than 8 MiB changes no checkmark, and one that makes the file smaller always works. Stop Playing/Recording leaves out any recorded steps still past a limit and names the limit in the status bar. Begin Recording, Duplicate, New Action, renaming an action, Action Options…, Set Options…, New Set… and Load Actions… (`.aia` sets included) also refuse a change that would give a set more than 1,000 actions or a file larger than 8 MiB, and change nothing then. Tests `panels::actions::tests::{recorded_commands_keep_an_action_at_10_000_steps, recorded_commands_keep_an_action_set_file_within_8_mib, a_recorded_command_whose_noted_values_do_not_fit_is_left_out, a_stop_reached_while_recording_a_full_action_is_left_out, stop_leaves_out_recorded_steps_past_the_limits, excluding_steps_keeps_an_action_set_file_within_8_mib, a_recorded_batch_that_edits_another_document_is_left_out_when_it_grows, a_set_renamed_while_it_records_is_measured_again, steps_recorded_after_an_exclusion_past_the_last_step_are_included, duplicate_keeps_action_set_files_within_their_limits, new_action_keeps_an_action_set_file_within_its_limits, renaming_keeps_an_action_set_file_within_8_mib, load_actions_refuses_a_set_that_would_save_larger_than_8_mib}`.
   - Actions panel: the panel menu's Playback Options… sets how actions play: Accelerated (the default) plays every step at once, Step by Step plays one step at a time with the canvas drawn after each, and Pause For waits the given number of seconds between steps ([Specify playback speed](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/specify-playback-speed.html); `ui.action.playbackOptions`). VectorCraft's own rules, which the page does not cover: the pause is a whole number of seconds from 1 to 60, the setting is kept with the UI preferences, a paced playback ends at Stop Playing/Recording or when a step comes due while another document is active, each step of a paced playback is its own undo step, and Batch… plays at full speed.
   - Actions panel: the panel menu's Insert Stop… opens Record Stop, with a Message box and Allow Continue, and adds a stop to the recording in progress, after the selected command, or at the end of the selected action ([Insert stops in actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-stops-in-actions.html); `ui.action.insertStop`). A playing action waits at the stop and shows the message so the user can do a manual task, and Play Current Selection plays the rest ([Illustrator CS5 help](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=459); `ui.action.continue`). With Allow Continue, the message box also has Continue. VectorCraft's own rules, which the pages do not cover: an empty message still waits, Stop Playing/Recording ends the playback and keeps the steps already played, the rest plays on the document active then, a stop waits at every playback speed, at Accelerated the steps between two stops are one undo step, Batch… refuses an action with an included stop, and Delete Selection on a selected step deletes that step, a stop or a command, without asking (`ui.action.deleteStep`).
-  - Actions panel: the panel menu's Insert Menu Item… adds a menu command to the recording in progress, after the selected step, or at the end of the selected action, without running it, and playback runs it as the menu does ([Insert non-recordable tasks into actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-non-recordable-tasks-into-actions.html); `ui.action.insertMenuItem`). The dialog's Find box picks the one item that matches the words typed, and a click on a listed item picks it. VectorCraft's own rules, which the page does not cover: items that open a dialog, the Object › Align items, Image Trace's Make and Make and Expand, Pattern's Make and Edit Pattern, and the File, Window and Help menu items are not listed, and an action holds at most 10,000 steps and its set file at most 8 MiB, for stops too.
+  - Actions panel: the panel menu's Insert Menu Item… adds a menu command to the recording in progress, after the selected step, or at the end of the selected action, without running it, and playback runs it as the menu does ([Insert non-recordable tasks into actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-non-recordable-tasks-into-actions.html); `ui.action.insertMenuItem`). The dialog's Find box picks the one item that matches the words typed, and a click on a listed item picks it. VectorCraft's own rules, which the page does not cover: items that open a dialog, Image Trace's Make and Make and Expand, Pattern's Make and Edit Pattern, and the File, Window and Help menu items are not listed, and an action holds at most 10,000 steps and its set file at most 8 MiB, for stops too.
+  - Actions panel: Insert Menu Item… also lists the Object › Align items and the View menu commands that act on the window rather than the document (Outline, Pixel Preview, Trim View, Presentation Mode, Screen Mode, zoom, fit, Rotate View, and the show, hide and snap items), which the help page names among the commands that cannot be recorded ([Insert non-recordable tasks into actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-non-recordable-tasks-into-actions.html); [Align and distribute objects](https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/align-and-distribute-objects.html); `ui.action.insertMenuItem`, `ui.action.play`). VectorCraft's own rules, which the pages do not cover: an Align step keeps the Align To choice of its insertion, and one that aligns to the key object stops the playback when there is no key; a View menu step plays in its place at every speed and adds no undo step, so at Accelerated the steps on each side of it are one undo step each; Batch… refuses an action with one; and a set file with one is version 6. Tests `panels::actions::tests::{an_inserted_view_item_plays_in_its_place_at_accelerated, an_inserted_view_item_plays_step_by_step_and_with_pauses, an_inserted_view_item_plays_up_to_a_stop, a_view_step_played_while_recording_is_recorded, a_saved_view_step_survives_as_version_6, an_inserted_align_item_keeps_the_align_to_of_its_insertion, an_align_step_to_the_key_object_fails_without_a_key}`.
   - Actions panel: with a path selected, the panel menu's Insert Select Path adds a step that selects that path to the recording in progress, after the selected step, or at the end of the selected action, without changing the selection ([Insert non-recordable tasks into actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-non-recordable-tasks-into-actions.html); `ui.action.insertSelectPath`, `select.storedPath`). VectorCraft's own rules, which the page does not cover: the selection must be one whole path or compound path that can be selected, the step stores the path's id and a fingerprint of its anchors, and playback selects the path only while it is still there unchanged and can be selected, else the step is an error and the selection stays; the row reads Select Path, and a set file with the step is version 5.
   - Actions panel: the panel menu's Select Object… opens Set Selection, where the note typed names the objects to select, and adds a step to the recording in progress, after the selected step, or at the end of the selected action; playback selects the objects whose Attributes note matches it, and the steps after it act on them ([Insert non-recordable tasks into actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-non-recordable-tasks-into-actions.html); `ui.action.insertSelectObject`, `select.byNote`). VectorCraft's own rules, which the page does not cover: the note matches anywhere and in any letter case unless Case Sensitive or Whole Word is checked, hidden and locked objects are left out, the objects found replace the selection, a step that finds none stops the playback with an error, and the note is at most 1,024 bytes. Action sets with the step save as version 4.
   - Actions panel: Delete Selection deletes the selected action set with its actions and keeps the other sets ([Actions panel overview](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html); `ui.actionSet.delete`). VectorCraft's own rules, which the overview does not cover: deleting a set asks first, Shift-click on a set's name selects a range of sets to delete together, the panel menu's Delete does the same, and Default Actions and the last set can be deleted. Undo does not bring a deleted set back.

From 6f3ffeb393a5393fbe1258be6bdc1e7bf76087d1 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:25:16 -0800
Subject: [PATCH 26/48] Plug-ins: plugin.install writes nothing to the store
 until the module is checked

plugin.install wrote the module and its grant to the Plug-ins folder,
attached the plug-in's settings and cache and turned a disabled plug-in
on before the registry's last approval check. When another session
revoked the grant, or recorded one for other bytes, after the command
recorded its own grant and before that check, the install was refused
but left the new module and grant in the folder for the next launch.
A plug-in another session installed under the same id between the
command's checks and the install took no part in the decision, so the
install replaced it without `replace: true`.

- registry::install_checked records the grant (or forgets it) and
  installs the plug-in as one step, after a caller check that sees the
  plug-in installed under the id and its grant; a refusal changes
  nothing.
- plugin.install commits through it before any store write, refusing
  with the existing messages when another plug-in now needs `replace`
  or the grant its approval came from changed. The store writes, the
  put-back on a failed write and the disabled-list update now run after
  the commit; their logic is unchanged.
- The grant call-site audit also counts registry::install_checked.

Docs: docs/plugins.md, docs/target-app-parity.md.
---
 crates/engine/src/cmd/plugin.rs     | 106 ++++++++++++++++++---------
 crates/engine/src/tests/plugins.rs  |  77 ++++++++++++++++++++
 crates/plugins/src/registry.rs      | 108 ++++++++++++++++++++++++++++
 crates/plugins/tests/grant_sites.rs |  13 ++--
 docs/plugins.md                     |   5 +-
 docs/target-app-parity.md           |   1 +
 6 files changed, 272 insertions(+), 38 deletions(-)

diff --git a/crates/engine/src/cmd/plugin.rs b/crates/engine/src/cmd/plugin.rs
index dfa44a1436..783eac5eb7 100644
--- a/crates/engine/src/cmd/plugin.rs
+++ b/crates/engine/src/cmd/plugin.rs
@@ -672,13 +672,23 @@ fn takes_over(s: &Session, plugin: &Plugin) -> bool {
     }
 }
 
+#[cfg(test)]
+thread_local! {
+    /// Tests: runs once in the next `plugin.install` on this thread after its checks and before it
+    /// installs, as another session changing the plug-ins in between would.
+    pub(crate) static BEFORE_INSTALL: std::cell::RefCell<Option<Box<dyn FnOnce()>>> = const { std::cell::RefCell::new(None) };
+}
+
 /// `plugin.install`: loads and checks the module, refuses `grant` and `allowHeavy` that neither an
 /// [`InstallApproval`] for this module nor the session allows, one that asks for a heavy budget
 /// unless `allowHeavy` says a person agreed, one that lists permissions no person has granted this
 /// very module unless `grant` lists them all, one that would take another module's place
-/// ([`takes_over`]) unless `replace` is true, and one whose SHA-256 isn't the `hash` given; records
-/// the grant with the module's hash, keeps it for the next start and installs it → its
-/// `plugin.list` entry. A module that lists no permissions ends any grant held for its id.
+/// ([`takes_over`]) unless `replace` is true, and one whose SHA-256 isn't the `hash` given. It then
+/// checks the plug-in installed under the id and its grant again while it records the grant with
+/// the module's hash and installs it ([`registry::install_checked`]), and only then keeps both for
+/// the next start → its `plugin.list` entry. A refused install changes neither the plug-in store
+/// nor the plug-ins and grants of the process. A module that lists no permissions ends any grant
+/// held for its id.
 fn install(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "plugin.install";
     // One use: spent whatever this install does.
@@ -696,21 +706,29 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
     {
         return Err(bad(C, "the module doesn't have the SHA-256 `hash` gives: nothing was installed"));
     }
-    if replace == Some(false) && registry::get(plugin.id()).is_some() {
-        return Err(bad(C, format!("a plug-in with id {:?} is already installed", plugin.id())));
-    }
-    // Another module under the id gets the settings and cache kept for it: whoever installs it asks
-    // the user first.
-    if replace != Some(true) && takes_over(s, &plugin) {
+    // The grant the checks below count on. The install checks it again, with the plug-in installed
+    // under the id, before anything is stored: another session may change either in between.
+    let seen_grant = registry::granted(plugin.id());
+    let installed_already = || bad(C, format!("a plug-in with id {:?} is already installed", plugin.id()));
+    let taken_over = || {
         let name = permissions::display_text(&plugin.manifest().name, permissions::MAX_SHOWN_NAME);
-        return Err(bad(
+        bad(
             C,
             format!(
                 "“{name}” is another module than the plug-in with id {:?} and would get the settings and cache kept for it: install it with `replace: true` once the user agrees",
                 plugin.id()
             ),
-        ));
+        )
+    };
+    if replace == Some(false) && registry::get(plugin.id()).is_some() {
+        return Err(installed_already());
     }
+    // Another module under the id gets the settings and cache kept for it: whoever installs it asks
+    // the user first.
+    if replace != Some(true) && takes_over(s, &plugin) {
+        return Err(taken_over());
+    }
+    let (installed_already, taken_over) = (installed_already(), taken_over());
     // `grant` and `allowHeavy` say that a person agreed, and a request alone can't say that.
     let approval = approval.filter(|a| a.covers(&plugin));
     if !s.plugin_grants_from_requests && ((grant.is_some() && approval.is_none()) || (allow_heavy && !approval.is_some_and(|a| a.heavy))) {
@@ -744,34 +762,61 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
     // this very module already covers all of them.
     let m = plugin.manifest();
     let wanted = m.permissions();
-    if !s.plugin_approved(&plugin) && !grant.as_ref().is_some_and(|g| wanted.iter().all(|w| g.contains(w))) {
+    let needs_approval = || {
         let name = permissions::display_text(&m.name, permissions::MAX_SHOWN_NAME);
         let asked = permissions::names(&wanted).join(", ");
-        return Err(bad(
+        bad(
             C,
             format!(
                 "“{name}” asks for the permissions {asked}: a person has to approve them in the desktop app, or pass `grant` in a session started with --allow-plugin-grants"
             ),
-        ));
+        )
+    };
+    let granted_here = grant.as_ref().is_some_and(|g| wanted.iter().all(|w| g.contains(w)));
+    if !s.plugin_approved(&plugin) && !granted_here {
+        return Err(needs_approval());
     }
+    let needs_approval = needs_approval();
+    let (id, hash, asks) = (m.id.clone(), plugin.hash().to_string(), m.asks_permissions());
+    let g = Grant { id: id.clone(), hash: hash.clone(), permissions: wanted };
+    let update = if asks { registry::GrantUpdate::Record(GrantToken::after_engine_approval(g.clone())) } else { registry::GrantUpdate::Revoke };
+    // Another module installed under the id since the checks above takes the place they found free,
+    // or held by these bytes. A grant that changed since no longer approves what they approved,
+    // unless `grant` approves this module by itself or the new grant covers it.
+    let check = |installed: Option<&Plugin>, held: Option<&Grant>| {
+        if let Some(installed) = installed {
+            match replace {
+                Some(false) => return Err(installed_already),
+                None if installed.hash() != hash => return Err(taken_over),
+                _ => {}
+            }
+        }
+        if asks && !granted_here && held != seen_grant.as_ref() && !held.is_some_and(|h| h.covers(&id, &hash, &g.permissions)) {
+            return Err(needs_approval);
+        }
+        Ok(())
+    };
+    #[cfg(test)]
+    if let Some(between) = BEFORE_INSTALL.take() {
+        between();
+    }
+    // The plug-in gets the settings and cache kept for its id. A module without permissions takes
+    // the id over, so nothing the user approved for the id applies any more.
+    let installed = registry::install_checked(plugin, update, check, || s.attach_plugin_storage(&id), err)?;
     // Installed plug-ins stay installed after a restart (#2541). The module is written first and its
     // grant only once it is there; when the grant can't be written, the store gets the module it
     // held back. A failed write of that module is only logged: the store then holds the new module,
     // which the grant doesn't cover. A write that reports a failure may still have put the old
     // module back, so the store is read again to tell which module it holds. A stored module that
     // can't be read back isn't replaced by one that needs a grant.
-    let previous = s.stored_plugin_bytes(plugin.id());
-    let mut stored = (previous.is_ok() || !m.asks_permissions()) && s.store_plugin(plugin.id(), &bytes);
-    let holds_new = |s: &Session| s.stored_plugin_bytes(plugin.id()).is_ok_and(|held| held.as_deref() == Some(&bytes[..]));
-    if m.asks_permissions() {
-        let g = Grant { id: m.id.clone(), hash: plugin.hash().to_string(), permissions: wanted };
-        registry::grant(GrantToken::after_engine_approval(g.clone()));
-        if stored && !s.store_grant(&m.id, Some(g)) {
-            stored = !s.put_back_plugin(plugin.id(), previous.ok().flatten().as_deref()) && holds_new(s);
+    let previous = s.stored_plugin_bytes(&id);
+    let mut stored = (previous.is_ok() || !asks) && s.store_plugin(&id, &bytes);
+    let holds_new = |s: &Session| s.stored_plugin_bytes(&id).is_ok_and(|held| held.as_deref() == Some(&bytes[..]));
+    if asks {
+        if stored && !s.store_grant(&id, Some(g)) {
+            stored = !s.put_back_plugin(&id, previous.ok().flatten().as_deref()) && holds_new(s);
         }
     } else {
-        // This module takes the id over, so nothing the user approved for the id applies any more.
-        registry::revoke(&m.id);
         // When the write failed, the old stored module stays in the folder and needs its grant at
         // the next launch. A grant that can't be removed still approves the old bytes, so the store
         // gets the module it held back. When that module can't be read or written back, or there
@@ -780,23 +825,21 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
         // approves nothing, and the new module stays; one that can't be opened or read may approve
         // the old bytes once it reads again.
         let writes = s.grant_writes();
-        if stored && !s.store_grant(&m.id, None) && s.holds_plugin_grant(&m.id) {
-            let back = previous.as_ref().is_ok_and(|held| s.put_back_plugin(plugin.id(), held.as_deref()));
+        if stored && !s.store_grant(&id, None) && s.holds_plugin_grant(&id) {
+            let back = previous.as_ref().is_ok_and(|held| s.put_back_plugin(&id, held.as_deref()));
             stored = !back && holds_new(s);
             if !back || matches!(previous, Ok(None)) {
-                s.ignore_stored_grant(&m.id, writes);
+                s.ignore_stored_grant(&id, writes);
             }
         }
     }
-    // It gets the settings and cache kept for its id.
-    s.attach_plugin_storage(plugin.id());
     // Installing a disabled plug-in again (an updated version) turns it on for the next launch too,
     // also when it is disabled by its stored file alone (it stopped a launch while loading). When
     // the new version could not replace the stored file, the old one stays disabled.
-    let file = s.stored_plugin_file(plugin.id());
+    let file = s.stored_plugin_file(&id);
     let mut changed = false;
     if file.is_none() || stored {
-        changed = safe_mode::set_enabled(&safe_mode::Item::of(&plugin), true);
+        changed = safe_mode::set_enabled(&safe_mode::Item::of(&installed), true);
         if let Some(file) = file {
             changed |= safe_mode::set_enabled(&safe_mode::Item::file(file), true);
         }
@@ -804,7 +847,6 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
     if changed {
         s.store_disabled_plugins();
     }
-    let installed = registry::install(plugin).map_err(err)?;
     let mut v = describe_installed(&installed);
     if !unknown.is_empty() {
         v["unknownCommands"] = json!(unknown);
diff --git a/crates/engine/src/tests/plugins.rs b/crates/engine/src/tests/plugins.rs
index cc4460d250..0fc731a388 100644
--- a/crates/engine/src/tests/plugins.rs
+++ b/crates/engine/src/tests/plugins.rs
@@ -2820,6 +2820,83 @@ fn a_failed_store_write_keeps_the_stored_module_with_its_grant() {
     vectorcraft_plugins::registry::revoke(id);
 }
 
+/// An install refused because another session revoked the grant its checks relied on writes
+/// nothing: a store that kept the grant and lost the module gets no module back, its grants stay as
+/// they were, and the plug-in installed with the id and the other session's revoke stand. `grant`
+/// approves the module by itself.
+#[test]
+fn a_grant_revoked_while_installing_leaves_the_store_as_it_was() {
+    use vectorcraft_plugins::permissions::sha256_hex;
+    use vectorcraft_plugins::registry;
+    let folder = crate::tests_links::Folder::new("plugin-store-revoked-while-installing");
+    let id = "test.engine.permissions.revokedwhileinstalling";
+    let bytes = asking(id, r#"["doc.read"]"#, &json!({"objects": []}));
+    let data = vectorcraft_format::base64_encode(&bytes);
+    let mut s = session();
+    s.attach_plugin_store(folder.0.clone());
+    run(&mut s, "plugin.install", json!({"dataBase64": data, "grant": ["doc.read"]}));
+    let grants = folder.0.join("grants.json");
+    let recorded = std::fs::read(&grants).unwrap();
+    let module = std::path::PathBuf::from(s.stored_plugin_file(id).unwrap());
+    std::fs::remove_file(&module).unwrap();
+
+    crate::cmd::plugin::BEFORE_INSTALL.set(Some(Box::new(move || {
+        registry::revoke(id);
+    })));
+    let e = s.execute("plugin.install", &json!({"dataBase64": data})).unwrap_err().to_string();
+    assert!(e.contains("asks for the permissions doc.read"), "{e}");
+    assert!(!module.exists(), "no module is stored");
+    assert_eq!(std::fs::read(&grants).unwrap(), recorded, "the grants stay as they were");
+    assert!(registry::granted(id).is_none(), "the other session's revoke stands");
+    assert_eq!(registry::get(id).map(|p| p.hash().to_string()), Some(sha256_hex(&bytes)), "the installed plug-in stays");
+
+    crate::cmd::plugin::BEFORE_INSTALL.set(Some(Box::new(move || {
+        registry::revoke(id);
+    })));
+    run(&mut s, "plugin.install", json!({"dataBase64": data, "grant": ["doc.read"]}));
+    assert_eq!(std::fs::read(&module).unwrap(), bytes, "a module `grant` approves is stored");
+    assert!(registry::granted(id).is_some_and(|g| g.hash == sha256_hex(&bytes)));
+    run(&mut s, "plugin.remove", json!({"id": id}));
+}
+
+/// A plug-in another session installs with the id while a module is checked takes the place the
+/// checks found free. Without `replace`, or with `replace: false`, the install is refused, writes no
+/// module and leaves that plug-in installed; with `replace: true` the module takes its place.
+#[test]
+fn a_plug_in_installed_while_installing_needs_replace() {
+    use vectorcraft_plugins::permissions::sha256_hex;
+    use vectorcraft_plugins::registry;
+    let folder = crate::tests_links::Folder::new("plugin-store-installed-while-installing");
+    let id = "test.engine.installedwhileinstalling";
+    let ours = asking(id, "[]", &json!({"objects": []}));
+    let theirs = asking(id, "[]", &json!({"objects": [], "documentData": null}));
+    let data = vectorcraft_format::base64_encode(&ours);
+    let mut s = session();
+    s.attach_plugin_store(folder.0.clone());
+    let module = std::path::PathBuf::from(s.stored_plugin_file(id).unwrap());
+    let installed = || registry::get(id).map(|p| p.hash().to_string());
+    let meanwhile = |theirs: Vec<u8>| -> Option<Box<dyn FnOnce()>> {
+        Some(Box::new(move || {
+            registry::install_bytes(&theirs).unwrap();
+        }))
+    };
+
+    for (replace, why) in [(Value::Null, "is another module than"), (json!(false), "is already installed")] {
+        crate::cmd::plugin::BEFORE_INSTALL.set(meanwhile(theirs.clone()));
+        let e = s.execute("plugin.install", &json!({"dataBase64": data, "replace": replace})).unwrap_err().to_string();
+        assert!(e.contains(why), "{replace}: {e}");
+        assert!(!module.exists(), "{replace}: no module is stored");
+        assert_eq!(installed(), Some(sha256_hex(&theirs)), "{replace}: the other plug-in stays installed");
+        registry::remove(id);
+    }
+
+    crate::cmd::plugin::BEFORE_INSTALL.set(meanwhile(theirs));
+    run(&mut s, "plugin.install", json!({"dataBase64": data, "replace": true}));
+    assert_eq!(std::fs::read(&module).unwrap(), ours);
+    assert_eq!(installed(), Some(sha256_hex(&ours)));
+    run(&mut s, "plugin.remove", json!({"id": id}));
+}
+
 /// Runs the test `name` of this module again in a process of its own → whether this is that
 /// process. The list of disabled plug-ins is kept for the whole process, and the other tests here
 /// read it again each time they attach a plug-in store.
diff --git a/crates/plugins/src/registry.rs b/crates/plugins/src/registry.rs
index ee3732908c..1178f7c9ac 100644
--- a/crates/plugins/src/registry.rs
+++ b/crates/plugins/src/registry.rs
@@ -82,6 +82,57 @@ pub fn install(mut plugin: Plugin) -> Result<Arc<Plugin>> {
     Ok(p)
 }
 
+/// What [`install_checked`] does to the grant recorded for the plug-in's id.
+pub enum GrantUpdate {
+    /// Records this grant, replacing an earlier one for the id ([`grant`]).
+    Record(GrantToken),
+    /// Forgets the grant for the id ([`revoke`]).
+    Revoke,
+}
+
+/// Installs `plugin` and updates the grant for its id as one step. While it holds the plug-ins and
+/// then the grants, `check` is given the plug-in installed under the id and the grant recorded for
+/// it. When `check` returns an error, nothing changes and that error is returned. A plug-in that
+/// lists permissions the grant `update` records doesn't give this very module is refused the same
+/// way, with [`Error::NeedsApproval`] passed through `refused`. Otherwise `attach` runs, the grant
+/// is updated and the plug-in is installed, replacing one with the same id. `check` and `attach`
+/// must not call the other functions of this module, which wait for the locks held here.
+pub fn install_checked<E>(
+    mut plugin: Plugin,
+    update: GrantUpdate,
+    check: impl FnOnce(Option<&Plugin>, Option<&Grant>) -> std::result::Result<(), E>,
+    attach: impl FnOnce(),
+    refused: impl FnOnce(Error) -> E,
+) -> std::result::Result<Arc<Plugin>, E> {
+    // The same order as `install`, which reads the grants while it holds the plug-ins.
+    let mut plugins = PLUGINS.write().unwrap_or_else(|e| e.into_inner());
+    let mut grants = GRANTS.write().unwrap_or_else(|e| e.into_inner());
+    let id = plugin.id().to_string();
+    check(plugins.get(&id).map(|p| &**p), grants.get(&id))?;
+    let m = plugin.manifest();
+    let granted = match &update {
+        GrantUpdate::Record(token) => Some(token.grant()),
+        GrantUpdate::Revoke => None,
+    };
+    if m.asks_permissions() && !granted.is_some_and(|g| g.covers(&m.id, plugin.hash(), &m.permissions())) {
+        return Err(refused(Error::NeedsApproval(crate::permissions::names(&m.permissions()).join(", "))));
+    }
+    attach();
+    match update {
+        GrantUpdate::Record(token) => {
+            let g = token.grant().clone();
+            grants.insert(g.id.clone(), g);
+        }
+        GrantUpdate::Revoke => {
+            grants.remove(&id);
+        }
+    }
+    plugin.set_serial(REVISION.fetch_add(1, Ordering::Relaxed) + 1);
+    let p = Arc::new(plugin);
+    plugins.insert(id, p.clone());
+    Ok(p)
+}
+
 /// Loads `bytes` with the default limits and installs the plug-in ([`install`]: one that lists
 /// permissions installs only when they were granted to this very module).
 pub fn install_bytes(bytes: &[u8]) -> Result<Arc<Plugin>> {
@@ -345,4 +396,61 @@ mod tests {
             assert!(granted(id).is_none() && remove(id), "{listed:?}");
         }
     }
+
+    /// `install_checked` gives `check` the plug-in and grant held for the id. When `check` refuses,
+    /// or the grant it would record doesn't approve the module, the plug-in, the grant and the
+    /// revision stay as they were and `attach` doesn't run; otherwise it records the grant (or
+    /// forgets it) and installs the module.
+    #[test]
+    fn install_checked_changes_nothing_when_refused() {
+        use crate::permissions::Permission::DocRead;
+        let _lock = crate::safe_mode::TEST_LOCK.lock().unwrap_or_else(|e| e.into_inner());
+        let id = "test.registry.checked";
+        let old = module(id, Some(r#"["doc.read"]"#), 8);
+        let new = module(id, Some(r#"["doc.read"]"#), 9);
+        grant(GrantToken::after_engine_approval(grant_for(id, &old, vec![DocRead])));
+        install_bytes(&old).unwrap();
+        let load = |bytes: &[u8]| Plugin::load(bytes, Limits::default()).unwrap();
+        let record = |bytes: &[u8]| GrantUpdate::Record(GrantToken::after_engine_approval(grant_for(id, bytes, vec![DocRead])));
+        let unchanged = |why: &str| {
+            assert_eq!(get(id).map(|p| p.hash().to_string()), Some(crate::permissions::sha256_hex(&old)), "{why}");
+            assert_eq!(granted(id), Some(grant_for(id, &old, vec![DocRead])), "{why}");
+        };
+        let attached = std::cell::Cell::new(false);
+        let before = revision();
+
+        let seen = std::cell::RefCell::new(None);
+        let e = install_checked(
+            load(&new),
+            record(&new),
+            |p, g| {
+                *seen.borrow_mut() = Some((p.map(|p| p.hash().to_string()), g.cloned()));
+                Err("refused")
+            },
+            || attached.set(true),
+            |_| "not approved",
+        )
+        .unwrap_err();
+        assert_eq!(e, "refused");
+        assert_eq!(seen.take(), Some((Some(crate::permissions::sha256_hex(&old)), Some(grant_for(id, &old, vec![DocRead])))));
+        unchanged("check refused");
+
+        let same = std::convert::identity::<Error>;
+        let e = install_checked(load(&new), record(&old), |_, _| Ok(()), || attached.set(true), same).unwrap_err();
+        assert_eq!(e, Error::NeedsApproval("doc.read".into()));
+        unchanged("a grant for other bytes");
+        let e = install_checked(load(&new), GrantUpdate::Revoke, |_, _| Ok(()), || attached.set(true), same).unwrap_err();
+        assert_eq!(e, Error::NeedsApproval("doc.read".into()));
+        unchanged("no grant");
+        assert!(!attached.get() && revision() == before, "nothing ran or moved");
+
+        let p = install_checked(load(&new), record(&new), |_, _| Ok(()), || attached.set(true), same).unwrap();
+        assert!(attached.get() && revision() > before);
+        assert_eq!(get(id).map(|p| p.hash().to_string()), Some(p.hash().to_string()));
+        assert_eq!(granted(id), Some(grant_for(id, &new, vec![DocRead])));
+        let plain = module(id, Some("[]"), 10);
+        install_checked(load(&plain), GrantUpdate::Revoke, |_, _| Ok(()), || {}, same).unwrap();
+        assert!(granted(id).is_none(), "a module without permissions forgets the grant");
+        assert!(remove(id));
+    }
 }
diff --git a/crates/plugins/tests/grant_sites.rs b/crates/plugins/tests/grant_sites.rs
index d0c0479337..a4bdb4b12b 100644
--- a/crates/plugins/tests/grant_sites.rs
+++ b/crates/plugins/tests/grant_sites.rs
@@ -1,7 +1,7 @@
 //! The shipped code that records a plug-in grant: only the engine's install approval and its load
-//! of the plug-in folder's grants file make a `GrantToken` and call `registry::grant`. A new call
-//! site fails this test until it is added to the list. It checks the source, not what native code
-//! can do at run time.
+//! of the plug-in folder's grants file make a `GrantToken` and call `registry::grant` or
+//! `registry::install_checked`. A new call site fails this test until it is added to the list. It
+//! checks the source, not what native code can do at run time.
 #![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
 
 use std::collections::BTreeMap;
@@ -11,10 +11,13 @@ use std::path::{Path, PathBuf};
 const EXPECTED: &[(&str, &str, usize)] = &[
     ("GrantToken::after_engine_approval", "crates/engine/src/cmd/plugin.rs", 1),
     ("GrantToken::from_engine_grants_file", "crates/engine/src/store.rs", 2),
-    ("registry::grant", "crates/engine/src/cmd/plugin.rs", 1),
     ("registry::grant", "crates/engine/src/store.rs", 2),
+    ("registry::install_checked", "crates/engine/src/cmd/plugin.rs", 1),
 ];
 
+/// The names the audit counts.
+const NAMES: [&str; 4] = ["GrantToken::after_engine_approval", "GrantToken::from_engine_grants_file", "registry::grant", "registry::install_checked"];
+
 /// Every `.rs` file under `dir`, without test files and folders.
 fn sources(dir: &Path, out: &mut Vec<PathBuf>) {
     let Ok(entries) = std::fs::read_dir(dir) else { return };
@@ -61,7 +64,7 @@ fn grant_token_call_sites_are_limited() {
         let text = std::fs::read_to_string(file).unwrap();
         let rel = file.strip_prefix(&root).unwrap().to_string_lossy().replace('\\', "/");
         for line in shipped(&text) {
-            for name in ["GrantToken::after_engine_approval", "GrantToken::from_engine_grants_file", "registry::grant"] {
+            for name in NAMES {
                 let n = count(line, name);
                 if n > 0 {
                     *found.entry((name, rel.clone())).or_default() += n;
diff --git a/docs/plugins.md b/docs/plugins.md
index 124cc76174..ac0d515af4 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -264,7 +264,10 @@ capability model proposed for PhotoCraft plug-ins
   hexadecimal digits covers nothing. `plugin.remove` forgets the grant, and so does a successful `plugin.install` of a
   module that lists no permissions under that id, so the earlier bytes need a new approval. When `plugin.remove` can't
   remove the grant from `grants.json`, it returns an error, the plug-in stays installed, and a second `plugin.remove`
-  tries again. A refused install leaves the grant as it is. When an install of a module that lists no permissions can't
+  tries again. A refused install leaves the grant, the plug-in installed with the id, the `Plug-ins` folder and the
+  list of disabled plug-ins as they are. When another session installs a plug-in with the id or changes its grant
+  while `plugin.install` checks a module, the install is refused, before anything is written to the `Plug-ins` folder,
+  if the other plug-in would need `replace: true` or the changed grant no longer approves the module. When an install of a module that lists no permissions can't
   write the module to the `Plug-ins` folder, or can't remove the grant from `grants.json`, the folder keeps the module
   it held and `grants.json` keeps the grant. The new module runs until the session ends. When the grant can't be
   removed and the module already stored can't be read back or written back, the new module stays in the folder, and
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..218a6e5e78 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1808,6 +1808,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 - **Plug-in approval needs a person (G17):** a plug-in's permissions and heavy budget are approved in a dialog that only a person can confirm: the control channel, MCP and injected input are refused, and `plugin.install` takes `grant` or `allowHeavy` only with that approval. `vectorcraft-cli mcp` and `run` refuse them unless started with `--allow-plugin-grants`. Regressions: `crates/engine/src/tests/plugins.rs`, `crates/ui-egui/src/tests/automation.rs`, `apps/vectorcraft-cli/tests/it/cli.rs`. Scores and hours unchanged.
 - **A dialog's OK runs what it was opened for:** `ui.dialog.set`, and MCP's `answer_dialog` through it, can set a `__` field only when it is a control of that kind of dialog (a section or tab shown, a link between two fields, a name or search being typed). Every other `__` field, such as the `__command` and `__params` of a confirmation or the generic parameter dialog, a plug-in command dialog's `__command` and `__plugin`, or the paste a swatch conflict waits to finish, is refused with "the `<kind>` dialog cannot set protected field `<field>`"; the request sets no field, and with `action: "confirm"` OK does not run. Regressions: `crates/ui-egui/src/tests/automation.rs`, `crates/ui-egui/src/control/tests.rs`. Scores and hours unchanged.
 - **Only an approval records a plug-in grant (G17):** `vectorcraft_plugins::registry::grant` takes a `GrantToken`, which the engine makes after an approval and when it loads `grants.json`, and `registry::install`, `install_bytes` and folder loads refuse a module that lists permissions no recorded grant gives this very module (`Error::NeedsApproval`), leaving the plug-in under its id and the revision as they were. A module without `permissions`, or with an empty list, installs as before. `docs/plugins.md` says what the approval does not protect against (native code linked into the app, another program running as the same user, the unsigned `grants.json`). Regressions: `crates/plugins/src/registry.rs`, `crates/plugins/tests/grant_sites.rs`, `crates/engine/src/tests/plugins.rs`. Scores and hours unchanged.
+- **A refused plug-in install writes nothing (G17):** `plugin.install` checks the plug-in installed under the module's id and its grant again while it records the grant and installs the module (`registry::install_checked`), and only then writes the module and its grant to the `Plug-ins` folder, attaches its settings and cache and turns a disabled plug-in on. When another session installed a plug-in with the id that would need `replace: true`, or changed the grant the checks relied on, the install is refused and the folder, `grants.json`, the disabled list and the installed plug-in stay as they were. VectorCraft's own rule. Regressions: `crates/engine/src/tests/plugins.rs`. Scores and hours unchanged.
 - **Plug-in approval waits before OK (G17):** the approval dialog's OK stays disabled until its question has been on screen in the focused window for half a second, VectorCraft's own value; a click, Enter, Space, or a press begun before then installs nothing, and the dialog stays open. The wait starts over for every new question, even one that reads the same, and when the window gets the focus back, so a question swapped in just before a click is not approved by it. Cancel works at once. Regressions: `crates/ui-egui/src/tests/plugins.rs`. Scores and hours unchanged.
 - **An install automation asked for needs the person to start it (G17):** an approval question that a control request, MCP, injected input or a file dialog one of them opened leads to keeps OK disabled and refuses every confirm, a person's click included; it says to choose Object › Plug-ins › Install Plug-in…, and `ui.installPlugin` answers `approval: "personMustStartInstall"`. The person's own Install Plug-in…, File › Open or drop inspects the module again and asks a new question. Automation's `replace: true` no longer skips the question about taking another module's place, and that question now opens in the approval dialog for everyone. VectorCraft's own rule. Regressions: `crates/ui-egui/src/tests/automation.rs`, `crates/ui-egui/src/tests/plugins.rs`. Scores and hours unchanged.
 - **A plug-in with no permissions ends its id's grant (G17):** installing a module that lists no permissions under a granted id forgets the grant, in the process and in `grants.json`, so the formerly approved bytes need a new approval. Attaching a `Plug-ins` folder whose module for that id lists no permissions forgets it too, and plug-in folders forget the process's grant. A refused install leaves the grant. Regressions: `crates/engine/src/tests/plugins.rs`, `crates/engine/tests/plugin_safe_mode.rs`. Scores and hours unchanged.

From 130f914868c45be698672e9ffb6eab07e9c5d1b7 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:27:02 -0800
Subject: [PATCH 27/48] Type: a threaded frame's empty last paragraph keeps a
 format given to it

A paragraph format given to the empty paragraph after a frame's last
paragraph break was lost when the story flowed again: the paragraph is
shared with the next frame's first paragraph, and the next frame's old
style replaced it, in that frame and in the frames after it.

- The thread reflow also notes which frames' last paragraph changed
  style, and story_paras_restyled keeps that style against the next
  frame's unedited first paragraph, across unedited empty frames too.
  When the same edit formats the next frame's first paragraph, that
  format applies, as before.
- story_paras keeps its behavior for its other callers.
- Tests cover area type and type on a path on either side, a next frame
  holding text, three frames, undo and redo, a format that changes
  nothing, and numbered list counts.
---
 crates/engine/src/cmd/threads.rs       |   7 +-
 crates/engine/src/cmd/threads/tests.rs | 124 +++++++++++++++++++++++++
 crates/text/src/thread.rs              |  13 ++-
 crates/text/src/thread/tests.rs        |  36 +++++++
 docs/target-app-parity.md              |   1 +
 docs/type-parity.md                    |   2 +-
 6 files changed, 180 insertions(+), 3 deletions(-)

diff --git a/crates/engine/src/cmd/threads.rs b/crates/engine/src/cmd/threads.rs
index 6c80c962d6..c1c3801e40 100644
--- a/crates/engine/src/cmd/threads.rs
+++ b/crates/engine/src/cmd/threads.rs
@@ -135,6 +135,7 @@ pub(crate) fn reflow(before: &Document, doc: &mut Document) {
         let mut story: Vec<TextRun> = vec![];
         let mut sources: Vec<TextObject> = vec![];
         let mut later_wins = vec![];
+        let mut earlier_wins = vec![];
         let mut live = vec![];
         for id in &thread {
             match (text_of(doc, *id), text_of(before, *id)) {
@@ -143,6 +144,9 @@ pub(crate) fn reflow(before: &Document, doc: &mut Document) {
                     // A frame whose first paragraph was just restyled gives the paragraph it
                     // shares with the frame before it that style.
                     later_wins.push(old.is_some_and(|o| o.para_at(0) != t.para_at(0)));
+                    // A frame whose last paragraph was just restyled keeps that style in the
+                    // paragraph it shares with the frame after it, even when it is empty.
+                    earlier_wins.push(old.is_some_and(|o| o.para_at(o.paragraph_count() - 1) != t.para_at(t.paragraph_count() - 1)));
                     sources.push(t.clone());
                     live.push(*id);
                 }
@@ -151,6 +155,7 @@ pub(crate) fn reflow(before: &Document, doc: &mut Document) {
                 (None, Some(old)) => {
                     story.extend(old.runs.iter().cloned());
                     later_wins.push(false);
+                    earlier_wins.push(false);
                     sources.push(old.clone());
                 }
                 (None, None) => {}
@@ -160,7 +165,7 @@ pub(crate) fn reflow(before: &Document, doc: &mut Document) {
             continue;
         }
         let source_refs: Vec<&TextObject> = sources.iter().collect();
-        let paras = vectorcraft_text::thread::story_paras(&source_refs, &later_wins);
+        let paras = vectorcraft_text::thread::story_paras_restyled(&source_refs, &later_wins, &earlier_wins);
         vectorcraft_text::edit::normalize(&mut story);
         if live.len() >= 2 {
             // Threaded frames keep their size: Auto Size is off for them (as in Illustrator).
diff --git a/crates/engine/src/cmd/threads/tests.rs b/crates/engine/src/cmd/threads/tests.rs
index b6ea41df3e..a622901c01 100644
--- a/crates/engine/src/cmd/threads/tests.rs
+++ b/crates/engine/src/cmd/threads/tests.rs
@@ -60,6 +60,130 @@ fn a_restyled_empty_frame_keeps_its_style_before_an_unedited_empty_frame() {
     assert_eq!([hyphenates(a, 0), hyphenates(a, 1), hyphenates(b, 0), hyphenates(c, 0)], [false, true, true, true]);
 }
 
+/// Every paragraph's left indent in frame `id`.
+fn left_indents(s: &Session, id: u64) -> Vec<f64> {
+    match &s.doc().unwrap().doc.node(NodeId(id)).unwrap().kind {
+        NodeKind::Text(t) => t.paragraph_styles().iter().map(|p| p.left_indent).collect(),
+        _ => panic!("not text"),
+    }
+}
+
+/// Area type `height` high holding `text`, threaded into `empties` empty rectangles after it.
+fn tail_thread(text: &str, height: f64, empties: usize) -> (Session, Vec<u64>) {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 800, "height": 300})).unwrap();
+    let a = new_id(s.execute("text.create", &json!({"x": 10, "y": 10, "text": text, "area": {"width": 150, "height": height}})).unwrap());
+    let mut ids = vec![a];
+    for k in 0..empties {
+        let x = 200.0 * (k + 1) as f64;
+        ids.push(new_id(s.execute("shape.rectangle", &json!({"x": x, "y": 10, "width": 150, "height": 60})).unwrap()));
+    }
+    s.execute("select.set", &json!({"ids": ids})).unwrap();
+    s.execute("text.thread.create", &json!({})).unwrap();
+    (s, ids)
+}
+
+/// Restyling a frame's empty last paragraph (after its final paragraph break) gives that
+/// paragraph the style in the next frame as well, instead of the next frame's old style.
+#[test]
+fn editing_a_frames_empty_last_paragraph_survives_thread_reflow() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 600, "height": 300})).unwrap();
+    let a =
+        s.execute("text.create", &json!({"x": 10, "y": 10, "text": "a\n", "area": {"width": 150, "height": 60}})).unwrap()["id"].as_u64().unwrap();
+    let b = s.execute("shape.rectangle", &json!({"x": 200, "y": 10, "width": 150, "height": 60})).unwrap()["id"].as_u64().unwrap();
+    s.execute("select.set", &json!({"ids": [a, b]})).unwrap();
+    s.execute("text.thread.create", &json!({})).unwrap();
+    assert_eq!([text(&s, a), text(&s, b)], ["a\n", ""]);
+    let steps = s.doc().unwrap().history.undo.len();
+    s.execute("text.setFormat", &json!({"ids": [a], "start": 2, "end": 2, "leftIndent": 30})).unwrap();
+    assert_eq!((left_indents(&s, a), left_indents(&s, b)), (vec![0.0, 30.0], vec![30.0]));
+    assert_eq!(s.doc().unwrap().history.undo.len(), steps + 1);
+    // The same format again changes nothing and records no undo step.
+    s.execute("text.setFormat", &json!({"ids": [a], "start": 2, "end": 2, "leftIndent": 30})).unwrap();
+    assert_eq!(s.doc().unwrap().history.undo.len(), steps + 1);
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!((left_indents(&s, a), left_indents(&s, b)), (vec![0.0, 0.0], vec![0.0]));
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!((left_indents(&s, a), left_indents(&s, b)), (vec![0.0, 30.0], vec![30.0]));
+    s.execute("edit.undo", &json!({})).unwrap();
+
+    // A format of the whole frame changes its last paragraph as well.
+    s.execute("text.setFormat", &json!({"ids": [a], "leftIndent": 20})).unwrap();
+    assert_eq!((left_indents(&s, a), left_indents(&s, b)), (vec![20.0, 20.0], vec![20.0]));
+    // Both frames formatted in one command agree.
+    s.execute("text.setFormat", &json!({"ids": [a, b], "leftIndent": 40})).unwrap();
+    assert_eq!((left_indents(&s, a), left_indents(&s, b)), (vec![40.0, 40.0], vec![40.0]));
+}
+
+/// The restyled empty last paragraph keeps its style when the next frame holds text that
+/// continues it, and across an unedited empty frame; a later restyle of a later frame still wins.
+#[test]
+fn a_restyled_empty_last_paragraph_keeps_its_style_against_later_frames() {
+    // One line high: the text added to the next frame stays there.
+    let (mut s, ids) = tail_thread("a\n", 20.0, 1);
+    let (a, b) = (ids[0], ids[1]);
+    s.execute("text.editRange", &json!({"id": b, "start": 0, "end": 0, "insert": "def"})).unwrap();
+    assert_eq!([text(&s, a), text(&s, b)], ["a\n", "def"]);
+    s.execute("text.setFormat", &json!({"ids": [a], "start": 2, "end": 2, "leftIndent": 30})).unwrap();
+    assert_eq!([text(&s, a), text(&s, b)], ["a\n", "def"]);
+    assert_eq!((left_indents(&s, a), left_indents(&s, b)), (vec![0.0, 30.0], vec![30.0]));
+
+    let (mut s, ids) = tail_thread("a\n", 60.0, 2);
+    s.execute("text.setFormat", &json!({"ids": [ids[0]], "start": 2, "end": 2, "leftIndent": 30})).unwrap();
+    assert_eq!(ids.iter().map(|id| left_indents(&s, *id)).collect::<Vec<_>>(), [vec![0.0, 30.0], vec![30.0], vec![30.0]]);
+    s.execute("text.setFormat", &json!({"ids": [ids[2]], "leftIndent": 10})).unwrap();
+    assert_eq!(ids.iter().map(|id| left_indents(&s, *id)).collect::<Vec<_>>(), [vec![0.0, 10.0], vec![10.0], vec![10.0]]);
+}
+
+/// The restyled last paragraph keeps its style with type on a path on either side of the boundary.
+#[test]
+fn a_restyled_empty_last_paragraph_flows_onto_type_on_a_path() {
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 800, "height": 300})).unwrap();
+    let a = new_id(s.execute("text.create", &json!({"x": 10, "y": 10, "text": "a\n", "area": {"width": 150, "height": 60}})).unwrap());
+    let on_path = type_on_a_line(&mut s);
+    s.execute("text.thread.add", &json!({"from": a, "to": on_path})).unwrap();
+    assert_eq!([text(&s, a), text(&s, on_path)], ["a\n", ""]);
+    s.execute("text.setFormat", &json!({"ids": [a], "start": 2, "end": 2, "leftIndent": 30})).unwrap();
+    assert_eq!((left_indents(&s, a), left_indents(&s, on_path)), (vec![0.0, 30.0], vec![30.0]));
+
+    // Type on a path before area type.
+    let mut s = Session::new();
+    s.execute("file.new", &json!({"width": 800, "height": 300})).unwrap();
+    let on_path = type_on_a_line(&mut s);
+    s.execute("text.editRange", &json!({"id": on_path, "start": 0, "end": 0, "insert": "a\n"})).unwrap();
+    let b = new_id(s.execute("shape.rectangle", &json!({"x": 400, "y": 10, "width": 150, "height": 60})).unwrap());
+    s.execute("text.thread.add", &json!({"from": on_path, "to": b})).unwrap();
+    assert_eq!([text(&s, on_path), text(&s, b)], ["a\n", ""]);
+    s.execute("text.setFormat", &json!({"ids": [on_path], "start": 2, "end": 2, "leftIndent": 30})).unwrap();
+    assert_eq!((left_indents(&s, on_path), left_indents(&s, b)), (vec![0.0, 30.0], vec![30.0]));
+}
+
+/// A restyled empty last paragraph in a numbered list is counted once, and the next frame's
+/// first paragraph does not continue the paragraph before the break.
+#[test]
+fn a_restyled_empty_last_list_paragraph_keeps_the_counts() {
+    let (mut s, ids) = tail_thread("One\nTwo\n", 60.0, 1);
+    let (a, b) = (ids[0], ids[1]);
+    s.execute("text.setFormat", &json!({"ids": [a, b], "list": "number"})).unwrap();
+    s.execute("text.setFormat", &json!({"ids": [a], "start": 8, "end": 8, "leftIndent": 30})).unwrap();
+    let doc = &s.doc().unwrap().doc;
+    let frame = |id| match &doc.node(NodeId(id)).unwrap().kind {
+        NodeKind::Text(t) => (**t).clone(),
+        _ => panic!("not text"),
+    };
+    let (ta, tb) = (frame(a), frame(b));
+    let shown = [ta.plain_text(), tb.plain_text()].concat();
+    assert_eq!(shown, "One\nTwo\n");
+    let split = ta.paragraph_count() - 1;
+    assert_eq!(ta.para_at(split).left_indent, 30.0, "{:?}", [ta.plain_text(), tb.plain_text()]);
+    assert_eq!(tb.para_at(0).left_indent, 30.0);
+    assert!(tb.para_at(0).list.is_some());
+    assert_eq!(tb.list_count as usize, split, "the paragraphs before the shared one are counted once");
+    assert_eq!(tb.first_para_continues, !ta.plain_text().ends_with('\n'));
+}
+
 #[test]
 fn thread_flows_reflows_on_edit_and_survives_delete() {
     let (mut s, a, b) = setup();
diff --git a/crates/text/src/thread.rs b/crates/text/src/thread.rs
index cfdd41cc78..aab09879ef 100644
--- a/crates/text/src/thread.rs
+++ b/crates/text/src/thread.rs
@@ -23,16 +23,26 @@ pub fn story(frames: &[&TextObject]) -> Vec<TextRun> {
 /// the earlier frame's part of the paragraph is empty (its slice ends with a paragraph break).
 /// An empty frame that was just restyled keeps its style against unedited empty frames after it.
 pub fn story_paras(frames: &[&TextObject], later_wins: &[bool]) -> Vec<ParaStyle> {
+    story_paras_restyled(frames, later_wins, &[])
+}
+
+/// [`story_paras`] that also knows which frames' last paragraph was just restyled
+/// (`earlier_wins[k]`, read for frames with text). Such a frame's last paragraph keeps its style
+/// against the unedited first paragraph of the frame after it, and of frames after unedited empty
+/// frames, even when the frame ends with a paragraph break. When the later frame's first paragraph
+/// was restyled too (`later_wins`), the later frame's style wins.
+pub fn story_paras_restyled(frames: &[&TextObject], later_wins: &[bool], earlier_wins: &[bool]) -> Vec<ParaStyle> {
     let mut out: Vec<ParaStyle> = vec![];
     let mut prev_empty_tail = true;
     let mut empty_tail_restyled = false;
+    let mut tail_restyled = false;
     for (k, f) in frames.iter().enumerate() {
         let text = f.plain_text();
         let restyled = later_wins.get(k).copied().unwrap_or(false);
         let mut styles = f.paragraph_styles().into_iter();
         if k > 0
             && let Some(first) = styles.next()
-            && (restyled || (prev_empty_tail && !(text.is_empty() && empty_tail_restyled)))
+            && (restyled || (prev_empty_tail && !tail_restyled && !(text.is_empty() && empty_tail_restyled)))
             && let Some(last) = out.last_mut()
         {
             *last = first;
@@ -43,6 +53,7 @@ pub fn story_paras(frames: &[&TextObject], later_wins: &[bool]) -> Vec<ParaStyle
         if !text.is_empty() {
             prev_empty_tail = text.ends_with('\n') || out.is_empty();
             empty_tail_restyled = false;
+            tail_restyled = earlier_wins.get(k).copied().unwrap_or(false);
         } else if restyled {
             empty_tail_restyled = true;
         }
diff --git a/crates/text/src/thread/tests.rs b/crates/text/src/thread/tests.rs
index c3f05cef42..f2fc323b02 100644
--- a/crates/text/src/thread/tests.rs
+++ b/crates/text/src/thread/tests.rs
@@ -196,6 +196,42 @@ fn a_restyled_empty_frame_keeps_its_style_after_a_paragraph_break() {
     assert_eq!(tail_style(&[&first, &restyled, &right], &[false, true, true]), Some(Justify::Right));
 }
 
+/// A frame whose empty last paragraph (after a final paragraph break) was just restyled keeps that
+/// style against the unedited first paragraph of the next frame, empty or with text, and across an
+/// unedited empty frame. A restyled first paragraph in the next frame still wins.
+#[test]
+fn restyled_empty_last_paragraph_wins_over_unedited_next_frame() {
+    let style = |j| ParaStyle { justify: j, ..Default::default() };
+    let mut first = frame(0.0);
+    first.runs = vec![TextRun { text: "a\n".into(), style: CharStyle::default(), inline: None }];
+    first.set_paragraph_styles(vec![style(Justify::Left), style(Justify::Center)]);
+    let empty = frame(200.0);
+    let mut with_text = frame(400.0);
+    with_text.runs = vec![TextRun { text: "def".into(), style: CharStyle::default(), inline: None }];
+    let justify = |frames: &[&TextObject], later: &[bool], earlier: &[bool]| {
+        story_paras_restyled(frames, later, earlier).iter().map(|p| p.justify).collect::<Vec<_>>()
+    };
+    use Justify::*;
+
+    assert_eq!(justify(&[&first, &empty], &[false, false], &[true, false]), [Left, Center]);
+    assert_eq!(justify(&[&first, &with_text], &[false, false], &[true, false]), [Left, Center]);
+    assert_eq!(justify(&[&first, &empty, &with_text], &[false, false, false], &[true, false, false]), [Left, Center]);
+    assert_eq!(justify(&[&first, &empty, &empty], &[false, false, false], &[true, false, false]), [Left, Center]);
+    // Without the edit, the next frame gives the paragraph its style, as before.
+    assert_eq!(justify(&[&first, &empty], &[false, false], &[false, false]), [Left, Left]);
+    assert_eq!(story_paras(&[&first, &with_text], &[]).iter().map(|p| p.justify).collect::<Vec<_>>(), [Left, Left]);
+    // A restyled first paragraph in the next frame wins over the restyled tail.
+    let mut right = with_text.clone();
+    right.set_all_paras(style(Right));
+    assert_eq!(justify(&[&first, &right], &[false, true], &[true, true]), [Left, Right]);
+    assert_eq!(justify(&[&first, &empty, &right], &[false, false, true], &[true, false, true]), [Left, Right]);
+    // A middle frame is the later side at one boundary and the earlier side at the next.
+    let mut middle = frame(200.0);
+    middle.runs = vec![TextRun { text: "b\n".into(), style: CharStyle::default(), inline: None }];
+    middle.set_paragraph_styles(vec![style(Right), style(JustifyAll)]);
+    assert_eq!(justify(&[&first, &middle, &with_text], &[false, true, false], &[false, true, false]), [Left, Right, JustifyAll]);
+}
+
 /// Numbered list paragraphs count on from one frame to the next: the second frame's first
 /// whole paragraph takes the next number. A paragraph split between the frames has its number
 /// in the first frame only, and the paragraph after it takes the next number.
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..81164e7e33 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1240,6 +1240,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   Exports to PDF, EPS, SVG, EMF, WMF and the raster formats warn about the area type and type on a path that they draw without the text that doesn't fit, and give their ids, as Print and Print Preview do.
   An edit copies a thread's story only when it changes one of the thread's frames: with a story of 50,000 characters threaded through 8 frames with a style change at every word, moving another object took 7.8 ms and now takes 0.013 ms, and a frame of a drag took 7.2 ms and now takes 0.012 ms (release build, `threaded_story_edit_timing`).
   A paragraph that continues from one threaded frame into the next has its first-line indent and bullet or number in the frame where it starts; in the next frame its first line starts where its wrapped lines start. In frames that are no longer threaded, copies of a frame and point type converted from one, the first paragraph has its indent and bullet or number again.
+  In threaded text, a paragraph format given to the empty paragraph after a frame's last paragraph break stays after the story flows again, in that frame and in the frames the paragraph continues into, unless the same edit also formats the next frame's first paragraph, whose format then applies (VectorCraft's own rule; `thread::tests::restyled_empty_last_paragraph_wins_over_unedited_next_frame`, `cmd::threads::tests::editing_a_frames_empty_last_paragraph_survives_thread_reflow`).
   Type › Convert To Point Type on a frame of threaded text makes point type of the text that frame holds and takes it out of the thread; the story flows through the other frames without that text, so each character is in the document once.
   Object › Rasterize on a frame of threaded text takes it out of the thread with the text it shows, which the image draws, and the other frames keep the text they hold. When the last frame is rasterized, the text it has no room for goes after the text of the last frame that stays.
   Type › Create Outlines, Object › Expand and Object › Expand Appearance on a frame of threaded text take it out of the thread with the text it shows, which the outlines draw, and the other frames keep the text they hold. When the last frame is outlined, the text it has no room for goes after the text of the last frame that stays. When Expand Appearance keeps the frame as type in a group with its shadow, outer glow or Crop Marks, the type stays in the thread. The public help on threads ([Create text threads between objects](https://helpx.adobe.com/illustrator/desktop/design-with-text/add-manage-text/create-text-threads-between-objects.html), [Remove or break text threads between objects](https://helpx.adobe.com/illustrator/desktop/design-with-text/add-manage-text/remove-or-break-text-threads-between-objects.html)) does not describe outlining a threaded frame; this handling is VectorCraft's own behavior.
diff --git a/docs/type-parity.md b/docs/type-parity.md
index 102a454c3b..4a3f624c1d 100644
--- a/docs/type-parity.md
+++ b/docs/type-parity.md
@@ -25,7 +25,7 @@ against Illustrator's public documentation; **estimated** unless noted.
 | Native font-family labels | partial | With Show Font Names in English off, localized legacy names are used when typographic names contain no native label (#2208); loaded-font and catalog-only regressions. Choosing among multiple native languages is unchanged. |
 | Point, area and type-on-a-path type; vertical variants | done / partial | vertical point, area and path type have initial support; fullwidth `！` / `？` keep the nominal glyph upright when no vertical alternate exists (Unicode Tu); in a non-rectangular area a word too wide for the top lines moves down to the first line that holds it (#1615); Escape while typing ends the edit, keeps the type selected and switches back to the tool whose double-click on type chose the Type tool (kept until another tool is chosen or another document or window becomes active, so later edits with the Type tool return there too), or to the Selection tool when there is no such tool, as when the Type tool was chosen from the toolbar or after such a switch (#1802), and Cmd+Enter (Ctrl+Enter on Windows and Linux) does the same unless a command is bound to it; `text.create` and `text.createInPath` take `justify` (#1752); MCP `add_text` forwards `vertical` to both commands; Type › Type Orientation sets every frame of a thread, and a thread's frames share one writing direction; the Type and Vertical Type tools make area type when a closed path's outline is clicked and type on a path when an open one is, with pointers that say which, as the public help describes ([Create text](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html), [Create type on a path](https://web.archive.org/web/20220127090635/https://helpx.adobe.com/illustrator/using/creating-type-path.html)) |
 | Area Type Options (rows, columns, inset, first baseline, Text Flow by rows or by columns, Auto Size, Shrink Text to Fit) | done | Text Flow fills the cells down each column first (By Columns, the default, as files from before it open) or across each row first (By Rows), in the dialog and `text.areaOptions {flow}` (#4978); the commands that make or restyle type say when it does not fit its frame; MCP `add_text` takes Auto Size and Shrink Text to Fit (#1471) |
-| Threaded text, Fit Headline, Text Wrap | done | Fit Headline sees wrapping in a frame one line tall (#1444); a thread holds area type and type on a path in any mix, as Illustrator links type in an area or along a path ([help](https://helpx.adobe.com/illustrator/using/manage-text-area.html)) |
+| Threaded text, Fit Headline, Text Wrap | done | Fit Headline sees wrapping in a frame one line tall (#1444); a thread holds area type and type on a path in any mix, as Illustrator links type in an area or along a path ([help](https://helpx.adobe.com/illustrator/using/manage-text-area.html)); a frame's empty last paragraph keeps a format given to it when the story flows again |
 | Threading from the ports: selected area type and type on a path show an in port and an out port, empty, with an arrow on a side where the frame is threaded, or with a red "+" in the out port when the text doesn't fit; a click on either port loads the text; a click on a closed path, area type or type on a path threads into it, a click on empty canvas makes a frame of the same kind, shape and size there, a drag draws a rectangular frame; the frame placed comes after the clicked one from its out port and before it from its in port (the story then starts there); Escape or another tool cancels; a double-click on a threaded port breaks the thread there | partial | #2572: the Selection tool, `text.thread.add {from, to?, rect?, at?, before?}`, as the reference app's help describes ports and threading ([archived help, Threading text between objects](https://web.archive.org/web/20210119051048/https://helpx.adobe.com/illustrator/using/creating-text.html), [create text threads](https://helpx.adobe.com/illustrator/desktop/design-with-text/add-manage-text/create-text-threads-between-objects.html)); area type's in port sits on the left side below the top-left corner, type on a path's just before its start bracket; Show Text Threads draws its lines between the same ports; with more than 1,000 such objects selected no ports are drawn. a double-click on a port where the frame is threaded breaks the thread there, the story flowing into the frames before the break and the frames after it left empty, still threaded with each other when two or more (`text.thread.break`, [archived help](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html)). Remaining: the ports only take clicks with the Selection tool, and the loaded cursor borrows the I-beam until it's drawn |
 | Type on a Path effects and options; brackets | done | #429; Type on a Path Options has a Preview checkbox (#5360, as public tutorials of the dialog show); Direct Selection shows the anchors and direction handles of selected type on a path's path and drags both, the brackets keeping their fractions of the path and the text reflowing along it (#3980, #3565; `text.reshapePath`, `text.setPathHandle`), as the [Direct Selection page](https://helpx.adobe.com/illustrator/using/tool-techniques/direct-selection-tool.html) describes for a path; Type › Dynamic Text (`type.dynamicText`, also on the Contextual Task Bar) sizes type on a path to fill the span between its brackets and fits it again after each edit, as the [Dynamic Text overview](https://helpx.adobe.com/photoshop/desktop/text-typography/work-with-dynamic-text/dynamic-text-overview.html) describes; the 0.1 pt steps, the 0.1 to 1,296 pt range and keeping the drawn sizes when it is turned off or threaded are VectorCraft's own rules (`crates/text/src/tests/fit.rs`, `crates/engine/src/tests/dynamic_text.rs`) |
 | Character and Paragraph panels, styles with overrides | done | Character-style Auto-leading resets, partial definitions, local leading overrides, override markers, Undo/Redo and native serialization have regression coverage; differing paragraph alignments leave the shared alignment buttons unselected (headless regressions, full integration CI and visual review pass); mixed-value display for other paragraph fields remains missing. Double-clicking a user character style's row opens its Character Style Options, and the dialog keeps a fixed width while its sections scroll when the window is shorter, so its buttons stay on screen; a paragraph style's row opens its Paragraph Style Options, the rename dialog the panel menu opens. Evidence: `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`, `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list` |

From 36c652d942b52b838bdccb7217f4cfd0cf51a33b Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:28:38 -0800
Subject: [PATCH 28/48] Control bar: no separator is left at the end of the bar
 when the controls after it are hidden

A separator that ends a group of the Control bar's controls is now painted
only when a control follows it in the bar. When the groups after it are off
in the panel menu, do not apply to the selection or the tool, or have no
room in the window, the bar ends with its last control. Two separators with
nothing between them (the artboard Transform link and the artboard Align
group, or tool options and the envelope controls) show as one. Each
separator keeps its room, so the groups keep their places and widths.

- Fill and Stroke, Opacity and Graphic Style, Character, image and Image
  Trace options, the Mirror & Cut, Crop Image, Puppet Warp and shape tool
  options, the artboard Transform link and the envelope controls draw
  their outer separator through group_separator. Paragraph and area type
  vertical alignment end through group_end, which draws its separator
  through boundary.
- Regression test: no_separator_is_left_at_the_end_of_the_control_bar
  sweeps window widths from 300 to 1500 points for each case.
---
 crates/ui-egui/src/addons/shapes.rs      | 12 ++--
 crates/ui-egui/src/chrome.rs             |  1 +
 crates/ui-egui/src/chrome/control_bar.rs | 77 ++++++++++++++++++--
 crates/ui-egui/src/chrome/tests.rs       | 90 ++++++++++++++++++++++++
 crates/ui-egui/src/dialogs/envelope.rs   |  2 +-
 crates/ui-egui/src/panels/artboards.rs   |  2 +-
 crates/ui-egui/src/panels/character.rs   |  2 +-
 crates/ui-egui/src/panels/image_trace.rs |  2 +-
 crates/ui-egui/src/place.rs              |  2 +-
 crates/ui-egui/src/toolbar.rs            |  6 +-
 docs/target-app-parity.md                |  1 +
 11 files changed, 176 insertions(+), 21 deletions(-)

diff --git a/crates/ui-egui/src/addons/shapes.rs b/crates/ui-egui/src/addons/shapes.rs
index e7971bb888..fae45a190e 100644
--- a/crates/ui-egui/src/addons/shapes.rs
+++ b/crates/ui-egui/src/addons/shapes.rs
@@ -42,7 +42,7 @@ pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) -> bool {
                 app.run("tool.setOption", json!({ "key": "shape", "value": s_id })).ok();
             }
         }
-        ui.separator();
+        crate::chrome::group_separator(ui);
     }
 
     match active_shape.as_str() {
@@ -106,7 +106,7 @@ fn draw_ellipse_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, se
     if widgets::flat_button(ui, tl!("Reset"), 52.0).clicked() {
         apply_shape(app, &[("arcMode", json!("whole")), ("arcStart", json!(0.0)), ("arcEnd", json!(0.0))], json!({ "reset": true }));
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 fn draw_rectangle_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, selected_custom: Option<CustomShape>) {
@@ -164,7 +164,7 @@ fn draw_rectangle_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value,
             json!({ "reset": true }),
         );
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 fn draw_polygon_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, active_shape: &str, selected_custom: Option<CustomShape>) {
@@ -225,7 +225,7 @@ fn draw_polygon_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, ac
             json!({ "reset": true }),
         );
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 fn draw_spiral_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, selected_custom: Option<CustomShape>) {
@@ -255,7 +255,7 @@ fn draw_spiral_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, sel
     if widgets::flat_button(ui, tl!("Reset"), 52.0).clicked() {
         apply_shape(app, &[("turns", json!(3.0)), ("divergence", json!(1.0)), ("innerRadius", json!(0.0))], json!({ "reset": true }));
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 fn draw_box3d_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, selected_custom: Option<CustomShape>) {
@@ -298,7 +298,7 @@ fn draw_box3d_controls(app: &mut VectorcraftApp, ui: &mut Ui, opts: &Value, sele
             json!({ "reset": true }),
         );
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 fn mode_str(m: EllipseMode) -> &'static str {
diff --git a/crates/ui-egui/src/chrome.rs b/crates/ui-egui/src/chrome.rs
index 855d542d08..ddf0040a2c 100644
--- a/crates/ui-egui/src/chrome.rs
+++ b/crates/ui-egui/src/chrome.rs
@@ -18,6 +18,7 @@ mod hints;
 mod status_bar;
 mod tabs;
 
+pub(crate) use control_bar::group_separator;
 pub use control_bar::{
     AnchorControls, CONTROL_BAR_EDGES, CONTROL_BAR_GROUPS, anchor_buttons, anchor_controls, control_bar, control_bar_moving, control_bar_placement,
     read_hidden_groups,
diff --git a/crates/ui-egui/src/chrome/control_bar.rs b/crates/ui-egui/src/chrome/control_bar.rs
index 9b862cf636..7cb577c812 100644
--- a/crates/ui-egui/src/chrome/control_bar.rs
+++ b/crates/ui-egui/src/chrome/control_bar.rs
@@ -202,7 +202,7 @@ fn buttons_width(ui: &Ui, n: usize) -> f32 {
 /// The separator that ends a group of the Control bar's controls, as [`group_end_width`] measures it.
 fn group_end(ui: &mut Ui) {
     ui.add_space(GROUP_GAP);
-    separator(ui);
+    boundary(ui, separator);
 }
 
 fn group_end_width(ui: &Ui) -> f32 {
@@ -218,6 +218,66 @@ fn separator_width(ui: &Ui) -> f32 {
     SEPARATOR + ui.spacing().item_spacing.x
 }
 
+/// A separator between two groups of the Control bar's controls, drawn in the bar's row `ui`: the
+/// pass that drew it, the range of the paint list that holds it (between two empty shapes), the
+/// row's next widget id just after it, and whether it reaches the end of the row, leaving no room
+/// for a control after it.
+#[derive(Clone, Copy)]
+struct Boundary {
+    pass: u64,
+    shapes: (usize, usize),
+    after: egui::Id,
+    at_end: bool,
+}
+
+/// The key of the row `ui`'s last [`Boundary`].
+fn boundary_key(ui: &Ui) -> egui::Id {
+    ui.unique_id().with("cb-group-boundary")
+}
+
+/// A separator between two groups of the Control bar's controls, drawn with `draw`. It stays only
+/// while a control follows it in the row: [`erase_trailing`] erases it at the end of the row when no
+/// control does or none has room, and the next separator erases it when no control comes between
+/// them. The separator keeps its room either way.
+fn boundary(ui: &mut Ui, draw: impl FnOnce(&mut Ui)) {
+    erase_trailing(ui);
+    let start = ui.painter().add(egui::Shape::Noop);
+    draw(ui);
+    let end = ui.painter().add(egui::Shape::Noop);
+    let at_end = ui.cursor().min.x >= ui.max_rect().right();
+    let b = Boundary { pass: ui.ctx().cumulative_pass_nr(), shapes: (start.0, end.0), after: ui.next_auto_id(), at_end };
+    let key = boundary_key(ui);
+    ui.data_mut(|d| d.insert_temp(key, b));
+}
+
+/// The separator that ends a group of the Control bar's controls, drawn as `ui.separator()` draws
+/// one, and left out when no control follows it ([`boundary`]).
+pub(crate) fn group_separator(ui: &mut Ui) {
+    boundary(ui, |ui| {
+        ui.separator();
+    });
+}
+
+/// Erases the row `ui`'s last group separator when no control was drawn after it in this pass, or
+/// none had room in the row. The end of the Control bar's controls row calls it too.
+fn erase_trailing(ui: &mut Ui) {
+    let key = boundary_key(ui);
+    let Some(b) = ui.data_mut(|d| {
+        let b = d.get_temp::<Boundary>(key);
+        d.remove::<Boundary>(key);
+        b
+    }) else {
+        return;
+    };
+    if b.pass != ui.ctx().cumulative_pass_nr() || (b.after != ui.next_auto_id() && !b.at_end) {
+        return;
+    }
+    let painter = ui.painter();
+    for i in b.shapes.0 + 1..b.shapes.1 {
+        painter.set(egui::layers::ShapeIdx(i), egui::Shape::Noop);
+    }
+}
+
 /// The room the controls at the end of the Control bar need: the Transform link, or Document Setup
 /// and Preferences with nothing selected, or none while the panel menu has that group off. The
 /// groups ahead of them (the Paragraph section, area type's vertical alignment, the Align buttons,
@@ -276,7 +336,7 @@ fn groups_before_transform(app: &mut VectorcraftApp, ui: &mut Ui, objects: usize
             }
         }
         if transform {
-            separator(ui);
+            boundary(ui, separator);
         }
     }
     transform
@@ -292,7 +352,7 @@ fn artboard_align_group(app: &mut VectorcraftApp, ui: &mut Ui) {
     if !group_on(app, "alignDistribute") || app.session.active().is_none() || ui.available_width() < separator_width(ui) + buttons_width(ui, 7) {
         return;
     }
-    separator(ui);
+    boundary(ui, separator);
     crate::panels::align::align_buttons(app, ui, BUTTON);
     if ui.available_width() >= crate::panels::align::align_to_menu_width(BUTTON) + ui.spacing().item_spacing.x {
         crate::panels::align::align_to_menu(app, ui, BUTTON);
@@ -479,7 +539,7 @@ fn panel_menu(app: &mut VectorcraftApp, ui: &mut Ui, rect: egui::Rect) {
 }
 
 /// The Control bar's Fill and Stroke group: the fill and stroke chips, the Stroke link, the weight
-/// and the width profile, and the separator after them.
+/// and the width profile, and the separator after them while a control follows ([`group_separator`]).
 fn fill_and_stroke(app: &mut VectorcraftApp, ui: &mut Ui) {
     let shown_stroke = crate::panels::current_stroke(app);
     let mixed = crate::panels::stroke_mixed(app, ui.ctx());
@@ -494,12 +554,12 @@ fn fill_and_stroke(app: &mut VectorcraftApp, ui: &mut Ui) {
         app.run("stroke.set", json!({"profile": id})).ok();
     }
     ui.add_space(4.0);
-    ui.separator();
+    group_separator(ui);
 }
 
 /// The Control bar's Opacity group (its link and field, showing `opacity`) and, with something
 /// `selected`, its Graphic Style group (Style, Recolor Artwork and Global Edit Options), each while
-/// the panel menu has it on, and the separator after them.
+/// the panel menu has it on, and the separator after them while a control follows.
 fn opacity_and_style(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, opacity: f32, selected: bool) {
     let (opacity_on, style_on) = (group_on(app, "opacity"), group_on(app, "graphicStyle") && selected);
     if opacity_on {
@@ -529,7 +589,7 @@ fn opacity_and_style(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, opacity:
         global_edit_options(app, ui);
     }
     if opacity_on || style_on {
-        ui.separator();
+        group_separator(ui);
     }
 }
 
@@ -680,6 +740,7 @@ fn contents(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, bar: egui::Rect,
         let (artboard_options, transform) = (group_on(app, "artboardOptions"), group_on(app, "transform"));
         if crate::panels::artboards::control_bar(app, ui, artboard_options, transform) {
             artboard_align_group(app, ui);
+            erase_trailing(ui);
             return;
         }
         if anchors != AnchorControls::None && group_on(app, "anchors") {
@@ -713,6 +774,7 @@ fn contents(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, bar: egui::Rect,
             crate::panels::character::control_bar(app, ui);
         }
         if !groups_before_transform(app, ui, sel.len()) {
+            erase_trailing(ui);
             return;
         }
         // The Transform link opens the whole Transform panel (reference point, rotate,
@@ -750,6 +812,7 @@ fn contents(app: &mut VectorcraftApp, ui: &mut Ui, t: &Tokens, bar: egui::Rect,
                 crate::panels::transform::constrain_link_at(app, ui, ui.interact(room, id, Sense::click()));
             }
         }
+        erase_trailing(ui);
     });
     // Controls that keep their size can still run into the button's room in a narrow window;
     // the button is left out then. A floating bar clips them, so its button always shows.
diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rs
index 626ff8c66e..346dcb9f05 100644
--- a/crates/ui-egui/src/chrome/tests.rs
+++ b/crates/ui-egui/src/chrome/tests.rs
@@ -2845,6 +2845,96 @@ fn the_artboard_tool_s_control_bar_follows_its_two_groups() {
     assert!(has(&bar, "Name:") && has(&bar, "Move Artwork with Artboard"), "{bar:?}");
 }
 
+/// The separators the docked Control bar draws in window `screen` (vertical lines most of the bar's
+/// height, left of the panel menu button), in order, with whether any other shape is drawn between
+/// each one and the next, or after the last one for the last.
+fn control_bar_separators(app: &mut crate::VectorcraftApp, ctx: &egui::Context, screen: egui::Rect) -> Vec<(f32, bool)> {
+    control_bar_frame_in(app, ctx, screen, vec![]);
+    let out = ctx.run_ui(egui::RawInput { screen_rect: Some(screen), ..Default::default() }, |ui| super::control_bar(app, ui));
+    let nodes: Vec<_> = out.platform_output.accesskit_update.map(|u| u.nodes.into_iter().map(|(_, n)| n).collect()).unwrap_or_default();
+    let menu_left =
+        nodes.iter().find(|n| n.label().is_some_and(|l| l == "Panel menu")).and_then(|n| n.bounds()).map_or(screen.right(), |b| b.x0 as f32);
+    let separator = |s: &egui::Shape| match s {
+        egui::Shape::LineSegment { points: [a, b], .. } if (a.x - b.x).abs() < 0.5 && (a.y - b.y).abs() >= 16.0 => Some(a.x),
+        _ => None,
+    };
+    let (mut lines, mut others) = (vec![], vec![]);
+    for cs in &out.shapes {
+        let r = cs.shape.visual_bounding_rect();
+        if !r.is_finite() || !cs.clip_rect.intersects(r) || r.min.x >= menu_left || r.width() > screen.width() / 2.0 {
+            continue;
+        }
+        match separator(&cs.shape) {
+            Some(x) => lines.push(x),
+            None => others.push(r.center().x),
+        }
+    }
+    lines.sort_by(f32::total_cmp);
+    (0..lines.len())
+        .map(|i| {
+            let next = lines.get(i + 1).copied().unwrap_or(f32::INFINITY);
+            (lines[i], others.iter().any(|&x| x > lines[i] && x < next))
+        })
+        .collect()
+}
+
+/// A Control bar separator stands only between two groups that draw controls: none is left at the
+/// end of the bar when the groups after it are off, do not apply or have no room, and none follows
+/// another with nothing between them, in every window width. With every group on, the separators
+/// between the groups stay.
+#[test]
+fn no_separator_is_left_at_the_end_of_the_control_bar() {
+    crate::i18n::set_current(crate::i18n::Lang::EN);
+    let mut app = crate::VectorcraftApp::new(Session::new(), Default::default());
+    app.run("file.new", json!({"width": 400, "height": 200})).unwrap();
+    let id = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 30, "height": 20})).unwrap()["id"].clone();
+    let ctx = egui::Context::default();
+    ctx.enable_accesskit();
+    crate::theme::install_fonts(&ctx);
+    let set = |app: &mut crate::VectorcraftApp, groups: &[&str], visible: bool| {
+        for group in groups {
+            app.run("window.control.options", json!({ "group": group, "visible": visible })).unwrap();
+        }
+    };
+    // The first width in each case where a separator has nothing after it.
+    let mut stray = vec![];
+    let mut check = |app: &mut crate::VectorcraftApp, case: &str| {
+        for w in (300..=1500).step_by(50) {
+            let screen = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(w as f32, 300.0));
+            let lines = control_bar_separators(app, &ctx, screen);
+            if lines.iter().any(|(_, followed)| !followed) {
+                stray.push(format!("{case}, {w} wide: {lines:?}"));
+                return;
+            }
+        }
+    };
+    app.run("select.set", json!({ "ids": [id] })).unwrap();
+    let wide = egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(1500.0, 300.0));
+    assert!(control_bar_separators(&mut app, &ctx, wide).len() >= 2, "the groups keep their separators");
+    check(&mut app, "every group on");
+    set(&mut app, &["transform", "alignDistribute"], false);
+    assert!(!control_bar_separators(&mut app, &ctx, wide).is_empty(), "Fill and Stroke and Opacity keep theirs");
+    check(&mut app, "Transform and Align off");
+    set(&mut app, &["opacity", "graphicStyle"], false);
+    check(&mut app, "Fill and Stroke last");
+    app.run("select.set", json!({ "ids": [] })).unwrap();
+    set(&mut app, &["opacity", "graphicStyle"], true);
+    set(&mut app, &["documentOptions"], false);
+    check(&mut app, "nothing selected, Document Options off");
+    app.select_tool("puppetWarp");
+    set(&mut app, &["fillStroke", "opacity"], false);
+    check(&mut app, "Puppet Warp options last");
+    app.select_tool("ellipse");
+    check(&mut app, "Ellipse options last");
+    set(&mut app, &["fillStroke", "opacity", "documentOptions", "transform", "alignDistribute"], true);
+    app.select_tool("artboard");
+    set(&mut app, &["artboardOptions"], false);
+    check(&mut app, "the artboard's Transform link and Align");
+    set(&mut app, &["alignDistribute"], false);
+    check(&mut app, "the artboard's Transform link last");
+    assert!(stray.is_empty(), "a separator with nothing after it: {stray:#?}");
+}
+
 /// The Anchor Points group holds Convert and Anchors for direct-selected anchors; off, the bar keeps
 /// its Anchor Point label.
 #[test]
diff --git a/crates/ui-egui/src/dialogs/envelope.rs b/crates/ui-egui/src/dialogs/envelope.rs
index 1513efc8f2..a73d68cd1a 100644
--- a/crates/ui-egui/src/dialogs/envelope.rs
+++ b/crates/ui-egui/src/dialogs/envelope.rs
@@ -255,7 +255,7 @@ fn bar_of(app: &VectorcraftApp) -> Option<(bool, Bar)> {
 pub fn control_bar(app: &mut VectorcraftApp, ui: &mut egui::Ui) {
     let Some((editing, bar)) = bar_of(app) else { return };
     let mut run: Option<(&str, Value)> = None;
-    ui.separator();
+    crate::chrome::group_separator(ui);
     for (contents, icon, tip) in [(false, "dc-mesh", tl!("Edit Envelope")), (true, "shapes", tl!("Edit Contents"))] {
         if widgets::icon_button(ui, icon, tip, editing == contents, 24.0).clicked() && editing != contents {
             run = Some(("object.envelope.editContents", json!({ "editing": contents })));
diff --git a/crates/ui-egui/src/panels/artboards.rs b/crates/ui-egui/src/panels/artboards.rs
index 774002a72d..0f7223f7e8 100644
--- a/crates/ui-egui/src/panels/artboards.rs
+++ b/crates/ui-egui/src/panels/artboards.rs
@@ -100,7 +100,7 @@ pub(crate) fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui, options: bool,
     }
     if transform {
         super::transform::link(app, ui);
-        ui.separator();
+        crate::chrome::group_separator(ui);
     }
     if options {
         art_option_boxes(app, ui, ui.available_width() < ART_OPTIONS_WIDTH);
diff --git a/crates/ui-egui/src/panels/character.rs b/crates/ui-egui/src/panels/character.rs
index 2ad678bf62..de42febef6 100644
--- a/crates/ui-egui/src/panels/character.rs
+++ b/crates/ui-egui/src/panels/character.rs
@@ -1073,7 +1073,7 @@ pub(crate) fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) {
     font_pickers(app, ui, &s, ("cb-font", "cb-font-style"), (150.0, 96.0));
     size_field(app, ui, "cb-font-size", 96.0);
     ui.add_space(4.0);
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 /// The panel state key of the panel menu's Show Snap to Glyph Options.
diff --git a/crates/ui-egui/src/panels/image_trace.rs b/crates/ui-egui/src/panels/image_trace.rs
index ce5a5955b8..7777380180 100644
--- a/crates/ui-egui/src/panels/image_trace.rs
+++ b/crates/ui-egui/src/panels/image_trace.rs
@@ -361,7 +361,7 @@ pub fn control_bar(app: &mut VectorcraftApp, ui: &mut Ui) -> bool {
     if widgets::flat_button(ui, tl!("Expand"), 64.0).clicked() {
         app.run("imageTrace.expand", json!({})).ok();
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
     true
 }
 
diff --git a/crates/ui-egui/src/place.rs b/crates/ui-egui/src/place.rs
index 1169422789..94ae695ca4 100644
--- a/crates/ui-egui/src/place.rs
+++ b/crates/ui-egui/src/place.rs
@@ -604,7 +604,7 @@ pub fn control_bar_details(app: &mut VectorcraftApp, ui: &mut egui::Ui) -> bool
             crate::menus::invoke(app, cmd, json!({}));
         }
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
     true
 }
 
diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs
index b1788e1e8a..e20d3c734d 100644
--- a/crates/ui-egui/src/toolbar.rs
+++ b/crates/ui-egui/src/toolbar.rs
@@ -528,7 +528,7 @@ pub fn control_bar_options(app: &mut VectorcraftApp, ui: &mut Ui) {
             app.run("tool.setOption", json!({ "key": key, "value": value })).ok();
         }
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 /// Crop Image's box: its centre (X, Y) and size (W, H) in the general unit, set through the tool's
@@ -564,7 +564,7 @@ fn crop_options(app: &mut VectorcraftApp, ui: &mut Ui) {
             crate::canvas::apply_requests(app, r);
         }
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 /// The Fill/Stroke proxy, Color/Gradient/None, the drawing modes, screen mode and Edit Toolbar, as
@@ -1155,7 +1155,7 @@ fn puppet_warp_options(app: &mut VectorcraftApp, ui: &mut Ui) {
     if widgets::flat_button(ui, "Select All Pins", 104.0).clicked() {
         app.run("tool.setOption", json!({ "key": "selectAllPins", "value": true })).ok();
     }
-    ui.separator();
+    crate::chrome::group_separator(ui);
 }
 
 #[cfg(test)]
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..9620fd452d 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -626,6 +626,7 @@ since 2026-10-01.
 - **Control bar's inline X, Y, W and H fields fit the bar:** the Control bar shows the inline X, Y, W and H fields only when all four, their labels as drawn in the current language and the W/H link fit inside the bar's margin; otherwise it shows the Transform link alone. This is VectorCraft's own layout rule. Regression test: `the_control_bar_shows_the_inline_transform_fields_only_when_they_fit` in `crates/ui-egui/src/chrome/tests.rs`.
 - **Control bar docks to the top or the bottom, or floats:** the Control bar's panel menu, at the bar's right end, has Dock to Top and Dock to Bottom, the edge in use checked and neither while the bar floats. Dragging the bar's gripper and releasing it within 24 points of the top (under the menu bar) or the bottom of the window docks it at that edge, with a band along that edge while it moves; releasing it farther from both edges floats the bar there, with its outline under the pointer while it moves, and a floating bar's gripper moves it or docks it again (`window.control.dock {edge: "top"|"bottom"|"float"}`), as the help page describes ([Control panel overview](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/control-panel-overview.html)). Escape cancels a gripper drag. The 24-point zones, the floating bar's 800-point width and first position, a release outside the window leaving the bar where it was, a window too short for a floating bar docking it at the nearer edge, the floating bar staying inside a window that shrinks, and keeping the edge and the floating position with the workspace, with older workspaces docking the bar at their edge, are VectorCraft's own rules. Regression tests: `the_control_bar_panel_menu_docks_it_to_the_top_or_the_bottom`, `dragging_the_control_bar_gripper_docks_it_at_the_nearer_edge`, `dragging_the_control_bar_gripper_away_from_both_edges_floats_it`, `floating_control_bar_moves_and_redocks_from_each_edge`, `floating_control_bar_menu_docks_to_either_edge`, `control_bar_drag_escape_restores_placement`, `control_bar_drag_release_outside_window_keeps_previous_placement`, `floating_control_bar_stays_reachable_in_tiny_and_resized_windows`, `the_control_bar_dock_command_takes_top_bottom_or_float` and `menus_stop_above_a_control_bar_docked_at_the_bottom` in `crates/ui-egui/src/chrome/tests.rs`, `saved_workspaces_restore_the_control_bar_edge` and `saved_workspaces_restore_floating_control_bar_position` in `crates/ui-egui/src/workspaces.rs`.
 - **Control bar panel menu turns groups of options on or off:** the Control bar's panel menu lists the bar's groups of options (Snapping, Anchor Points, Tool Options, Object Options, Image Options, Fill and Stroke, Opacity, Graphic Style, Character, Paragraph, Vertical Alignment, Align and Distribute, Transform, Artboard Options and Document Options) above Dock to Top and Dock to Bottom, each checked while it is on; a click turns that group off or on (`window.control.options {group, visible?}`), and a group that is off stays out of the bar even while its tool or object is selected, as the help page describes ([Control panel overview](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/control-panel-overview.html)). The list of groups and what each holds, every group on to start, a group that is off leaving its room to the groups after it, and keeping the groups with the preferences and the workspace are VectorCraft's own rules. Regression tests: `the_control_bar_panel_menu_turns_each_group_on_or_off`, `the_control_bar_keeps_its_label_and_menu_with_every_group_off`, `the_control_bar_panel_menu_scrolls_in_a_short_window`, `the_control_bar_options_command_turns_a_group_on_or_off`, `groups_that_are_off_leave_their_room_to_the_later_groups`, `the_artboard_tool_s_control_bar_follows_its_two_groups` and `the_anchor_points_group_holds_convert_and_anchors` in `crates/ui-egui/src/chrome/tests.rs`, `the_image_options_group_holds_the_image_and_trace_controls` in `crates/ui-egui/src/tests/place.rs`, `the_character_and_paragraph_groups_hold_the_type_controls` in `crates/ui-egui/src/panels/paragraph/tests.rs`, `saved_workspaces_restore_the_control_bar_groups` in `crates/ui-egui/src/workspaces.rs`.
+- **Control bar separators stand only between groups:** the Control bar draws a separator between two groups of options only when a control follows it in the bar. When the groups after a separator are off in the panel menu, do not apply to the selection or the tool, or have no room in the window, the bar ends with the last control and no separator; two separators with nothing between them show as one. Each separator keeps its room, so the groups keep their places. This is VectorCraft's own rule. Regression test: `no_separator_is_left_at_the_end_of_the_control_bar` in `crates/ui-egui/src/chrome/tests.rs`.
 - **Pattern-only backquote drags:** With Selection move, bounding-box scale or rotate, or the Rotate, Reflect, Scale or Shear tool, backquote held at mouse release applies the drag matrix to selected pattern paint while object geometry stays in place. The key may be pressed after mouse press; if released before the mouse button, the drag commits as an ordinary transform. Objects without pattern paint stay still; stroke-only patterns and patterned objects in mixed selections take the same matrix. Regression tests: `backquote_move_uses_release_state_and_one_commit` and `backquote_box_scale_and_rotate_use_pattern_matrix_at_release` in `select/tests.rs`, `backquote_drag_previews_and_commits_pattern_only_for_each_transform_tool` in `xform/transform.rs`, `selection_backquote_drag_changes_pattern_fill_and_stroke_without_moving_mixed_art` and `selection_backquote_drag_changes_stroke_only_pattern` in `tests/pattern.rs`, `egui_backtick_drag_uses_key_state_at_release` in `canvas/tests.rs`, and `synthetic_pointer_backquote_keeps_solid_object_in_place` in `control/tests.rs`. Scores and hours unchanged.
 - **Existing-guide Escape cancellation (G1):** Escape clears a pending guide press or drag through Selection and Direct/Group Selection, cancelling a begun preview. Eight app-input regressions cover both axes, move/copy, temporary selection-tool borrowing from idle Pen, preselected-guide document/interaction-start selection and Undo/Redo/saved-state preservation, later on-canvas motion/release, Shift-press cancellation, and ordinary-release/Enter/idle controls. Historical focused checks on `8ab574b7` recorded five expected RED failures with three passing controls, then all eight GREEN tests and the Direct Selection Escape control passed. All nine also passed in current full CI. A full CI retry on the five-unit combined source at `a0671777` passed all seven stages with 6,613 test outcomes on 2026-10-14. An earlier full-CI run on the identical source panicked in the randomized `ai_mutated_save_never_panics` test; the cause remains unresolved. This five-fix batch does not claim to repair that failure. The original 1280×960 headless app capture from `b076025a` was reviewed for one vertical Selection guide after Escape; source review found its scene unchanged on `a0671777`. Scores and hours unchanged.
 - **Escape in more tool drags:** Escape during an Anchor Point drag, a Mesh tool drag, a Direct Selection drag of a mesh point, a corner widget or the brackets of type on a path, or a Shape Builder drag cancels it: the art goes back to how the press found it, no undo step is added, the release does nothing, and the tool stays chosen. Escape during a Measure tool drag brings back the measurement before it. Regression tests: `escape_cancels_*` in `draw2/anchor/tests.rs`, `meshedit.rs`, `direct/tests.rs`, `builder/tests.rs` and `xform/measure.rs`, and `escape_cancels_an_anchor_point_mesh_shape_builder_or_measure_drag` in `tests/toolescape.rs`.

From 53e8391e418a420fa1c5e811ed5a1cf0d5ffdee3 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:33:17 -0800
Subject: [PATCH 29/48] Recolor Artwork: the Prominent Colors bar keeps the
 Edit tab's height

- With art, the bar is 10 pt tall and the Edit tab leaves out the gaps
  above the wheel and above the sliders. The dialog is as tall on the
  Edit tab as on the Assign tab, and all of it but the color chips fits
  a 1024 by 576 screen.
- recolor.weigh counts a use for the first row that is not excluded
  when an excluded row lists the same color first.
---
 crates/engine/src/cmd/recolor.rs      |  6 +++---
 crates/engine/src/tests/recolor.rs    |  3 +++
 crates/ui-egui/src/dialogs/recolor.rs | 22 ++++++++++++++++------
 docs/mcp.md                           |  4 ++--
 4 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/crates/engine/src/cmd/recolor.rs b/crates/engine/src/cmd/recolor.rs
index 85982ba5a0..8194f85547 100644
--- a/crates/engine/src/cmd/recolor.rs
+++ b/crates/engine/src/cmd/recolor.rs
@@ -70,7 +70,7 @@ pub fn specs() -> Vec<CommandSpec> {
             "Prominent Colors",
             [],
             None,
-            "{map: rows [{from, to, …}] or {current: new} as recolor.apply, weights?: [numbers ≥ 0, one per row; an excluded row's is ignored, and at least one other must be above 0], ids?: as recolor.colors} → {map: the rows as given, each with its current colours (from) moved as below, shares: [one per row: its percent of the uses (recolor.colors' count) of the current colours of the rows that aren't excluded; 0 for an excluded row]} for Recolor Artwork's Prominent Colors (VectorCraft's own rule): without weights the rows stay as they are. With weights, current colours move one at a time between the rows that aren't excluded and have a new colour (to), while a move brings each row's share of the uses nearer its share of the weights, first the colour nearest in Lab to the first colour of the row it goes to compared with the row it leaves; a row's first colour stays in it, the tints of one global swatch in a row move together, a colour that another row with a new colour lists first stays where it is, the other rows with a new colour drop their entries for a colour that moves, and a use counts for the row recolor.apply recolors it with (rows with a new colour first, an exact colour before a hex one, the first row that lists it), else for the first other row that lists it. The colours that can move are compared with the rows at most 50,000,000 times in all, and when they times the rows that aren't excluded pass that, none move. Changes nothing",
+            "{map: rows [{from, to, …}] or {current: new} as recolor.apply, weights?: [numbers ≥ 0, one per row; an excluded row's is ignored, and at least one other must be above 0], ids?: as recolor.colors} → {map: the rows as given, each with its current colours (from) moved as below, shares: [one per row: its percent of the uses (recolor.colors' count) of the current colours of the rows that aren't excluded; 0 for an excluded row]} for Recolor Artwork's Prominent Colors (VectorCraft's own rule): without weights the rows stay as they are. With weights, current colours move one at a time between the rows that aren't excluded and have a new colour (to), while a move brings each row's share of the uses nearer its share of the weights, first the colour nearest in Lab to the first colour of the row it goes to compared with the row it leaves; a row's first colour stays in it, the tints of one global swatch in a row move together, a colour that another row with a new colour lists first stays where it is, the other rows with a new colour drop their entries for a colour that moves, and a use counts for the row recolor.apply recolors it with (rows with a new colour first, an exact colour before a hex one, the first row that lists it), else for the first other row that isn't excluded and lists it. The colours that can move are compared with the rows at most 50,000,000 times in all, and when they times the rows that aren't excluded pass that, none move. Changes nothing",
             has_doc,
             weigh
         ),
@@ -1126,14 +1126,14 @@ fn weigh(s: &mut Session, p: &Value) -> Result<Value> {
     }
     // Each current colour's uses and global swatch. A use counts where recolor.apply recolors it:
     // rows with a new colour first, exact colours before hex colours, the first row that lists it;
-    // then the other rows, in the same way. `owner` holds the row and entry that took each colour,
+    // then the other rows that aren't excluded, in the same way. `owner` holds the row and entry that took each colour,
     // and `shadows` the entries of rows with a new colour whose colours other entries took.
     let mut owner: Vec<Option<(usize, usize)>> = vec![None; used.len()];
     let mut shadows: Vec<(usize, usize, Vec<usize>)> = vec![];
     let mut found: Vec<Vec<(usize, Option<String>)>> = rows.iter().map(|r| vec![(0, None); r.from.len()]).collect();
     for recolors in [true, false] {
         for hex in [false, true] {
-            for (r, row) in rows.iter().enumerate().filter(|(_, r)| r.new_color().is_some() == recolors) {
+            for (r, row) in rows.iter().enumerate().filter(|(_, r)| !r.exclude && r.new_color().is_some() == recolors) {
                 for (e, m) in row.from.iter().enumerate().filter(|(_, m)| matches!(m, Match::Hex(_)) == hex) {
                     let hits: Vec<usize> = match m {
                         Match::Key(k) => by_key.get(k).copied().into_iter().collect(),
diff --git a/crates/engine/src/tests/recolor.rs b/crates/engine/src/tests/recolor.rs
index b1a6af864b..90e7822ef8 100644
--- a/crates/engine/src/tests/recolor.rs
+++ b/crates/engine/src/tests/recolor.rs
@@ -1375,6 +1375,9 @@ fn weigh_gives_each_rows_share_of_the_uses() {
     // An excluded row has no share, and the others share the uses.
     let excl = json!([{"from": [RED, PURPLE], "to": null}, {"from": [BLUE], "to": null, "exclude": true}]);
     assert_eq!(run(&mut s, "recolor.weigh", json!({"map": excl}))["shares"], json!([100.0, 0.0]));
+    // An excluded row before another that lists the same colour doesn't take its uses.
+    let first = json!([{"from": [RED], "exclude": true}, {"from": [RED]}, {"from": [BLUE, PURPLE]}]);
+    assert_eq!(run(&mut s, "recolor.weigh", json!({"map": first}))["shares"], json!([0.0, 50.0, 50.0]));
     // A current colour that no art uses counts nothing, and a use counts for the first row only.
     let twice = json!({"map": [{"from": [RED, "#123456"]}, {"from": [RED, PURPLE, BLUE]}]});
     assert_eq!(run(&mut s, "recolor.weigh", twice)["shares"], json!([50.0, 50.0]));
diff --git a/crates/ui-egui/src/dialogs/recolor.rs b/crates/ui-egui/src/dialogs/recolor.rs
index 546b049510..ccdb4e8ca1 100644
--- a/crates/ui-egui/src/dialogs/recolor.rs
+++ b/crates/ui-egui/src/dialogs/recolor.rs
@@ -88,6 +88,9 @@ const WHEEL: f32 = 220.0;
 /// Height of the Edit tab's color bars area (the wheel with its Brightness slider), and of a bar.
 const BARS_H: f32 = WHEEL + 31.0;
 const BAR_H: f32 = 22.0;
+/// Without the Prominent Colors bar, the Edit tab's gaps above the wheel and above the sliders.
+const WHEEL_GAP: f32 = 8.0;
+const SLIDERS_GAP: f32 = 6.0;
 /// Height of the rows table, and of either tab (so switching tabs doesn't resize the dialog).
 const TABLE_H: f32 = 182.0;
 const TAB_H: f32 = 400.0;
@@ -237,8 +240,9 @@ const SHARES: &str = "__shares";
 const SHARES_OF: &str = "__sharesOf";
 const BAR_DRAG: &str = "__barDrag";
 const SAVE_GROUP: &str = "__saveGroup";
-/// Height of the Prominent Colors bar, and the smallest share of it a drag leaves a part.
-const PROMINENT_H: f32 = 18.0;
+/// Height of the Prominent Colors bar, and the smallest share of it a drag leaves a part. With the
+/// bar the Edit tab leaves out [`WHEEL_GAP`] and [`SLIDERS_GAP`], which keeps the tab's height.
+const PROMINENT_H: f32 = 10.0;
 const MIN_PART: f64 = 0.01;
 /// The ids of the bar's part `n` and of the edge after part `k`, with `n` or `k`.
 const PROMINENT_PART: &str = "recolor-prominent-part";
@@ -1282,7 +1286,12 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut [Value
             mode_menu(ui, d, &target, true);
         });
     });
-    ui.add_space(8.0);
+    // With art the Prominent Colors bar has the room of the two gaps, so the tab is no taller with
+    // it: on a short screen all of the tab but the chips has to fit.
+    let art = d.bool("__art");
+    if !art {
+        ui.add_space(WHEEL_GAP);
+    }
     let colors: Vec<Color> = active.iter().filter_map(|&i| to_color(&rows[i])).collect();
     let marked = base.and_then(|b| active.iter().position(|&i| i == b));
     let display = d.str("display");
@@ -1308,8 +1317,7 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut [Value
         });
     });
     // Prominent Colors: the art's new colors, each as wide as its share of the art.
-    if d.bool("__art") {
-        ui.add_space(6.0);
+    if art {
         prominent_bar(ui, d, rows);
     }
     if let Some(k) = w.pressed {
@@ -1335,7 +1343,9 @@ fn edit_tab(app: &VectorcraftApp, ui: &mut Ui, d: &mut Dialog, rows: &mut [Value
     if !ui.input(|i| i.pointer.any_down()) {
         d.fields.remove(DRAG);
     }
-    ui.add_space(6.0);
+    if !art {
+        ui.add_space(SLIDERS_GAP);
+    }
     if d.str("sliderMode") == GLOBAL {
         let sample = base.and_then(|b| to_color(&rows[b])).unwrap_or(Color::rgb(0.8, 0.45, 0.25));
         global_sliders(ui, d, sample);
diff --git a/docs/mcp.md b/docs/mcp.md
index c16f8943fd..ed0af97b00 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -3723,8 +3723,8 @@ excluded take the palette as their new colors in row order, the colors repeating
 returns them as `map`, each with `from` as a list, and `shares`: for each row, its percent of the uses (the `count` of
 `recolor.colors`) of the current colors of the rows that are not excluded, and 0 for an excluded row. A use counts for
 the row that `recolor.apply` recolors it with (rows with a new color first, an exact color before a hex color, then
-the first row that lists it), and otherwise for the first other row that lists it. A current color that no art uses
-counts nothing. Without `weights` the
+the first row that lists it), and otherwise for the first other row that is not excluded and lists it. A current
+color that no art uses counts nothing. Without `weights` the
 rows come back unchanged. `weights` holds one number of 0 or more per row; an excluded row's weight is ignored, and
 at least one other row needs a weight above 0. As VectorCraft's own rule, current colors then move one at a time
 between the rows that are not excluded and have a new color (`to`), as long as a move brings each row's share of the uses nearer its share of the

From 19ab99347975c6c62dfcc6f3e0184afaabbff22b Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:38:06 -0800
Subject: [PATCH 30/48] EPS: an image drawn more than once writes its samples
 once

An image placed several times in an EPS file (the pieces of an envelope
or a Warp effect, copies of one image, a symbol's instances) wrote its
whole ASCII85 data at every placement: 200 copies for one envelope at
the default fidelity, enough for a large photo to pass the 256 MB page
limit and lose pieces.

The samples of such an image are now written once in the setup as
VCim<i>, and each placement reads them from there:
- Level 3: a ReusableStreamDecode stream, rewound with resetfile and
  read through a new FlateDecode filter at each placement.
- Level 2: an array of strings of at most 49,152 compressed bytes, fed
  to RunLengthDecode by a procedure.

An image placed once is written where it is drawn, byte for byte as
before. The page limit counts a repeated image's samples once, and a
colorized image is reused per ink.
---
 crates/eps/src/scene.rs   | 277 +++++++++++++++++++++++++++++++-------
 crates/eps/src/tests.rs   | 235 +++++++++++++++++++++++++++++++-
 docs/target-app-parity.md |   1 +
 3 files changed, 461 insertions(+), 52 deletions(-)

diff --git a/crates/eps/src/scene.rs b/crates/eps/src/scene.rs
index e8ffa4b278..0ec561dd31 100644
--- a/crates/eps/src/scene.rs
+++ b/crates/eps/src/scene.rs
@@ -55,8 +55,99 @@ const MAX_DEVICE_N: usize = 32;
 const MISSING_PATTERN: &str = "missing patterns are written as mid-grey";
 const TOO_LARGE: &str = "the artwork is too large for EPS: what follows 256 MB of PostScript was left out";
 /// The most PostScript the page body may grow to: symbols and patterns that hold one another
-/// expand into every instance, so nesting depth alone doesn't bound the output.
+/// expand into every instance, so nesting depth alone doesn't bound the output. An image placed
+/// more than once counts its data once.
 const MAX_BODY: usize = 256 << 20;
+/// Most compressed bytes in one string of an image's samples at Level 2 (under PostScript's
+/// 65,535-byte string limit).
+const IMAGE_CHUNK: usize = 48 << 10;
+/// The start of the procedure that reads an image's data from the lines after it.
+const INLINE_SOURCE: &str = "{ /VCsrc currentfile /ASCII85Decode filter def\n";
+
+/// An image as written: what sets up its color, its image dictionary and its compressed samples.
+/// Placed once, it is written where it is drawn, its data following the operators that read it.
+/// Placed more than once, its samples are written once in the setup as `VCim<i>` (a reusable
+/// stream at Level 3, an array of strings at Level 2) and each placement reads them from there.
+struct ImageCode {
+    /// The color space or ink operators, each line ending in a line break.
+    prelude: String,
+    /// `<< /ImageType … /ImageMatrix […]` with its mask colors: the dictionary up to its data source.
+    dict: String,
+    /// The decoding filter of the samples: `/FlateDecode` or `/RunLengthDecode`.
+    filter: &'static str,
+    /// `image` or `imagemask`.
+    op: &'static str,
+    /// The compressed samples in ASCII85, as lines with the end marker.
+    ascii: String,
+    /// The compressed samples, kept at Level 2, where a reused image's samples are written as
+    /// strings of at most [`IMAGE_CHUNK`] bytes.
+    data: Vec<u8>,
+    /// How many placements in the page draw it.
+    uses: usize,
+    /// The length of [`ImageCode::push_inline`]'s text.
+    inline_len: usize,
+    /// The length of [`ImageCode::reference`]'s text.
+    ref_len: usize,
+}
+
+impl ImageCode {
+    /// The operators and data that draw the image where it is placed.
+    fn push_inline(&self, s: &mut String) {
+        s.push_str(&self.prelude);
+        s.push_str(INLINE_SOURCE);
+        s.push_str(&self.dict);
+        s.push_str(&self.inline_read());
+        s.push_str(&self.ascii);
+    }
+
+    /// The end of the procedure [`ImageCode::push_inline`] writes. The procedure is read whole
+    /// before it runs: the image data follows it, and flushing the ASCII85 filter afterwards reads
+    /// past its end marker.
+    fn inline_read(&self) -> String {
+        format!("\n/DataSource VCsrc {} filter >> {}\nVCsrc flushfile }} exec\n", self.filter, self.op)
+    }
+
+    /// The operators that draw the image `VCim<i>` holds, for an image placed more than once.
+    fn reference(&self, i: usize, level: Level) -> String {
+        match level {
+            // The stream is read again from its start.
+            Level::Three => {
+                format!("{}VCim{i} resetfile\n{}\n/DataSource VCim{i} {} filter >> {}\n", self.prelude, self.dict, self.filter, self.op)
+            }
+            // A procedure gives the strings in turn, then an empty string: the end of the data.
+            Level::Two => format!(
+                "{}/VCi 0 def\n{}\n/DataSource {{VCi VCim{i} length lt {{VCim{i} VCi get /VCi VCi 1 add def}} {{()}} ifelse}} {} filter >> {}\n",
+                self.prelude, self.dict, self.filter, self.op
+            ),
+        }
+    }
+
+    /// The setup's definition of `VCim<i>`: the image's compressed samples, once.
+    fn resource(&self, i: usize, level: Level) -> String {
+        let mut s = String::with_capacity(self.ascii.len() + 200);
+        match level {
+            Level::Three => {
+                // The stream reads all of its data when it is made, so the data follows the
+                // procedure that makes it.
+                let intent = if self.op == "imagemask" { 1 } else { 0 };
+                let _ = writeln!(
+                    s,
+                    "{{ /VCsrc currentfile /ASCII85Decode filter def\n/VCim{i} VCsrc << /Intent {intent} /AsyncRead false /CloseSource false >> /ReusableStreamDecode filter def\nVCsrc flushfile }} exec"
+                );
+                s.push_str(&self.ascii);
+            }
+            Level::Two => {
+                let _ = writeln!(s, "/VCim{i} [");
+                for chunk in self.data.chunks(IMAGE_CHUNK) {
+                    s.push_str("<~");
+                    s.push_str(&ps::ascii85(chunk));
+                }
+                s.push_str("] def\n");
+            }
+        }
+        s
+    }
+}
 
 /// What the walk wrote: definitions for the setup, the page, the spot colours it uses (name and
 /// CMYK equivalent) and the warnings.
@@ -157,10 +248,18 @@ pub(crate) struct Scene<'a> {
     device_n: Vec<String>,
     warnings: Vec<String>,
     brushes: Option<Vec<vectorcraft_brush::Brush>>,
-    /// Image keys → what draws them (`None`: left out).
-    images: HashMap<String, Option<Arc<String>>>,
+    /// Image keys → the index in `codes` of what draws them (`None`: left out).
+    images: HashMap<String, Option<usize>>,
     /// The source key and solid paint together identify a colorized encoding.
-    colorized_images: HashMap<(String, String), Option<Arc<String>>>,
+    colorized_images: HashMap<(String, String), Option<usize>>,
+    /// The encoded images.
+    codes: Vec<ImageCode>,
+    /// Where in `body` each placement of an encoded image goes (in order) and the index of its code.
+    placements: Vec<(usize, usize)>,
+    /// What the placements in `placements` add to `body`'s length when the page is finished.
+    pending: usize,
+    /// The most the page body may grow to ([`MAX_BODY`]).
+    max_body: usize,
     /// Symbols and brush art being written inside one another.
     nest: u32,
 }
@@ -181,10 +280,21 @@ impl<'a> Scene<'a> {
             brushes: None,
             images: HashMap::new(),
             colorized_images: HashMap::new(),
+            codes: vec![],
+            placements: vec![],
+            pending: 0,
+            max_body: MAX_BODY,
             nest: 0,
         }
     }
 
+    /// This scene with a page body of at most `max` bytes.
+    #[cfg(test)]
+    pub fn with_max_body(mut self, max: usize) -> Self {
+        self.max_body = max;
+        self
+    }
+
     pub fn run(mut self) -> Page {
         let doc = self.doc;
         for l in &doc.layers {
@@ -199,7 +309,27 @@ impl<'a> Scene<'a> {
         self.page()
     }
 
-    fn page(self) -> Page {
+    fn page(mut self) -> Page {
+        if !self.placements.is_empty() {
+            let level = self.o.level;
+            let mut body = String::with_capacity(self.body.len().saturating_add(self.pending));
+            let mut at = 0;
+            for &(offset, i) in &self.placements {
+                body.push_str(self.body.get(at..offset).unwrap_or_default());
+                at = offset;
+                let Some(code) = self.codes.get(i) else { continue };
+                if code.uses > 1 {
+                    body.push_str(&code.reference(i, level));
+                } else {
+                    code.push_inline(&mut body);
+                }
+            }
+            body.push_str(self.body.get(at..).unwrap_or_default());
+            self.body = body;
+            for (i, code) in self.codes.iter().enumerate().filter(|(_, c)| c.uses > 1) {
+                self.setup.push_str(&code.resource(i, level));
+            }
+        }
         let custom = self
             .spots
             .iter()
@@ -337,7 +467,7 @@ impl<'a> Scene<'a> {
         if let NodeKind::Layer { template: true, .. } = n.kind {
             return;
         }
-        if self.body.len() >= MAX_BODY {
+        if self.size() >= self.max_body {
             self.warn(TOO_LARGE);
             return;
         }
@@ -347,7 +477,7 @@ impl<'a> Scene<'a> {
             _ => {}
         }
         self.note_losses(n);
-        let was = self.body.len();
+        let (was, placed) = (self.body.len(), self.placements.len());
         match &n.kind {
             NodeKind::Layer { children, clip: false, .. } | NodeKind::Group { children, clip: false } => {
                 children.iter().for_each(|c| self.node(c, false));
@@ -402,12 +532,29 @@ impl<'a> Scene<'a> {
             // Ruler guides draw on screen only.
             NodeKind::RulerGuide { .. } => {}
         }
-        if self.body.len() > MAX_BODY {
+        if self.size() > self.max_body {
             self.body.truncate(was);
+            self.unplace(placed);
             self.warn(TOO_LARGE);
         }
     }
 
+    /// How long the page body will be: what is written and what its image placements add.
+    fn size(&self) -> usize {
+        self.body.len().saturating_add(self.pending)
+    }
+
+    /// Take back the image placements after the first `n`, last first.
+    fn unplace(&mut self, n: usize) {
+        while self.placements.len() > n {
+            let Some((_, i)) = self.placements.pop() else { break };
+            let Some(code) = self.codes.get_mut(i) else { continue };
+            code.uses = code.uses.saturating_sub(1);
+            let cost = if code.uses == 0 { code.inline_len } else { code.ref_len };
+            self.pending = self.pending.saturating_sub(cost);
+        }
+    }
+
     /// A clipping group: the art inside its first child's outline. The clipping path's fills
     /// paint behind the art (clipped) and its strokes over it (not clipped).
     fn clip_group(&mut self, children: &[Arc<Node>]) {
@@ -1229,7 +1376,7 @@ impl<'a> Scene<'a> {
         };
         let place = Affine::translate(area.origin().to_vec2()) * Affine::scale_non_uniform(area.width(), area.height());
         if let Some(image) = image {
-            self.place_image(&image, place);
+            self.place_inline(&image, place);
         }
     }
 
@@ -1241,18 +1388,29 @@ impl<'a> Scene<'a> {
             return;
         }
         let encoded = match self.images.get(key) {
-            Some(e) => e.clone(),
+            Some(e) => *e,
             None => {
-                let e = self.decode_image(blob).and_then(|img| self.encode_image(img.as_raw(), img.width(), img.height())).map(Arc::new);
-                self.images.insert(key.to_string(), e.clone());
+                let e = self.decode_image(blob).and_then(|img| self.encode_image(img.as_raw(), img.width(), img.height())).map(|c| self.add_code(c));
+                self.images.insert(key.to_string(), e);
                 e
             }
         };
-        if let Some(e) = encoded {
-            self.place_image(&e, place);
+        if let Some(i) = encoded {
+            self.place_image(i, place);
         }
     }
 
+    /// Keep `code` for the placements that draw it: its index in `codes`.
+    fn add_code(&mut self, mut code: ImageCode) -> usize {
+        let i = self.codes.len();
+        if self.o.level == Level::Three {
+            code.data = vec![];
+        }
+        code.ref_len = code.reference(i, self.o.level).len();
+        self.codes.push(code);
+        i
+    }
+
     /// Gray coverage in the selected process or Separation ink. Binary coverage is a stencil;
     /// continuous coverage leaves zero pixels untouched at Level 3 and writes them as paper at Level 2.
     fn colorized_image(&mut self, key: &str, blob: Option<&ImageBlob>, width: u32, height: u32, xf: Affine, paint: &Paint) {
@@ -1262,19 +1420,19 @@ impl<'a> Scene<'a> {
         }
         let cache = (key.to_string(), format!("{paint:?}"));
         let encoded = match self.colorized_images.get(&cache) {
-            Some(e) => e.clone(),
+            Some(e) => *e,
             None => {
-                let e = self.encode_colorized(blob, paint).map(Arc::new);
-                self.colorized_images.insert(cache, e.clone());
+                let e = self.encode_colorized(blob, paint).map(|c| self.add_code(c));
+                self.colorized_images.insert(cache, e);
                 e
             }
         };
-        if let Some(e) = encoded {
-            self.place_image(&e, place);
+        if let Some(i) = encoded {
+            self.place_image(i, place);
         }
     }
 
-    fn encode_colorized(&mut self, blob: Option<&ImageBlob>, paint: &Paint) -> Option<String> {
+    fn encode_colorized(&mut self, blob: Option<&ImageBlob>, paint: &Paint) -> Option<ImageCode> {
         let Some((w, h, coverage)) = blob.and_then(ImageBlob::coverage) else {
             self.warn(UNDECODED);
             return None;
@@ -1355,17 +1513,17 @@ impl<'a> Scene<'a> {
                 ("/RunLengthDecode", rl)
             }
         };
-        let mut out = String::new();
+        let mut prelude = String::new();
         if binary {
             // imagemask takes its current ink from the graphics state.
-            out.push_str(&self.ink_code(ink));
+            prelude.push_str(&self.ink_code(ink));
         } else {
             match ink {
                 Ink::Spot { space, .. } => {
-                    let _ = writeln!(out, "VCsp{space} setcolorspace");
+                    let _ = writeln!(prelude, "VCsp{space} setcolorspace");
                 }
                 Ink::Process(space, ..) => {
-                    let _ = writeln!(out, "{} setcolorspace", space.name());
+                    let _ = writeln!(prelude, "{} setcolorspace", space.name());
                 }
             }
         }
@@ -1374,19 +1532,16 @@ impl<'a> Scene<'a> {
             Ink::Process(space, ..) => space.n(),
         };
         let decode = if binary { "1 0".to_string() } else { "0 1 ".repeat(n).trim_end().to_string() };
-        let _ = write!(
-            out,
-            "{{ /VCsrc currentfile /ASCII85Decode filter def\n<< /ImageType {} /Width {w} /Height {h} /BitsPerComponent {} /Decode [{decode}] /ImageMatrix [{w} 0 0 {h} 0 0]",
+        let mut dict = format!(
+            "<< /ImageType {} /Width {w} /Height {h} /BitsPerComponent {} /Decode [{decode}] /ImageMatrix [{w} 0 0 {h} 0 0]",
             if keyed { 4 } else { 1 },
             if binary { 1 } else { 8 },
         );
         if keyed {
             let mask: Vec<String> = key.iter().take(n).map(|v| format!("{v} {v}")).collect();
-            let _ = write!(out, " /MaskColor [{}]", mask.join(" "));
+            let _ = write!(dict, " /MaskColor [{}]", mask.join(" "));
         }
-        let _ = writeln!(out, "\n/DataSource VCsrc {filter} filter >> {}\nVCsrc flushfile }} exec", if binary { "imagemask" } else { "image" });
-        out.push_str(&ps::ascii85(&encoded));
-        Some(out)
+        Some(image_code(prelude, dict, filter, if binary { "imagemask" } else { "image" }, encoded))
     }
 
     /// Ink-setting operators in the cached stencil body, built with the same path as solid fills.
@@ -1409,18 +1564,40 @@ impl<'a> Scene<'a> {
         Some(img.to_rgba8())
     }
 
-    /// Draw an image of [`Self::encode_image`] on the unit square mapped by `place`.
-    fn place_image(&mut self, encoded: &str, place: Affine) {
+    /// Draw the image of `codes[i]` on the unit square mapped by `place`. Its operators go in when
+    /// the page is finished ([`Self::page`]), once it is known how many placements draw it.
+    fn place_image(&mut self, i: usize, place: Affine) {
         if !invertible(place) {
             return;
         }
-        if self.body.len().saturating_add(encoded.len()).saturating_add(64) > MAX_BODY {
+        let Some(code) = self.codes.get(i) else { return };
+        let cost = if code.uses == 0 { code.inline_len } else { code.ref_len };
+        if self.size().saturating_add(cost).saturating_add(64) > self.max_body {
             self.warn(TOO_LARGE);
             return;
         }
         self.line("q");
         let _ = writeln!(self.body, "{} cm", ps::matrix(place));
-        self.body.push_str(encoded);
+        self.placements.push((self.body.len(), i));
+        self.pending = self.pending.saturating_add(cost);
+        if let Some(code) = self.codes.get_mut(i) {
+            code.uses += 1;
+        }
+        self.line("Q");
+    }
+
+    /// Draw `code`, an image drawn nowhere else, on the unit square mapped by `place`.
+    fn place_inline(&mut self, code: &ImageCode, place: Affine) {
+        if !invertible(place) {
+            return;
+        }
+        if self.size().saturating_add(code.inline_len).saturating_add(64) > self.max_body {
+            self.warn(TOO_LARGE);
+            return;
+        }
+        self.line("q");
+        let _ = writeln!(self.body, "{} cm", ps::matrix(place));
+        code.push_inline(&mut self.body);
         self.line("Q");
     }
 
@@ -1428,7 +1605,7 @@ impl<'a> Scene<'a> {
     /// them on the unit square: in the process colour space, transparent pixels masked out at
     /// Level 3 (a key colour no opaque pixel has), white at Level 2; partly transparent ones over
     /// white. `None` for an empty image.
-    fn encode_image(&mut self, rgba: &[u8], w: u32, h: u32) -> Option<String> {
+    fn encode_image(&mut self, rgba: &[u8], w: u32, h: u32) -> Option<ImageCode> {
         let space = if self.cmyk { Space::Cmyk } else { Space::Rgb };
         let mut cache: HashMap<[u8; 3], [u8; 4]> = HashMap::new();
         let cms = self.cms.clone();
@@ -1447,7 +1624,7 @@ impl<'a> Scene<'a> {
     /// Straight CMYK pixels with opacity (five bytes a pixel, `w` × `h`, rows from the top), drawn
     /// as [`Self::encode_image`] draws its pixels and keeping their ink amounts: partly
     /// transparent pixels lay down that share of each ink.
-    fn encode_inks(&mut self, cmyka: &[u8], w: u32, h: u32) -> Option<String> {
+    fn encode_inks(&mut self, cmyka: &[u8], w: u32, h: u32) -> Option<ImageCode> {
         self.encode_samples(cmyka.as_chunks::<5>().0, w, h, Space::Cmyk, |p: &[u8; 5], al| {
             [0, 1, 2, 3].map(|i| ((u32::from(p[i]) * al + 127) / 255) as u8)
         })
@@ -1463,7 +1640,7 @@ impl<'a> Scene<'a> {
         h: u32,
         space: Space,
         mut sample: impl FnMut(&[u8; N], u32) -> [u8; 4],
-    ) -> Option<String> {
+    ) -> Option<ImageCode> {
         if w == 0 || h == 0 {
             return None;
         }
@@ -1503,27 +1680,29 @@ impl<'a> Scene<'a> {
                 ("/RunLengthDecode", rl)
             }
         };
-        let mut out = String::with_capacity(encoded.len() * 5 / 4 + 400);
-        let _ = writeln!(out, "{} setcolorspace", space.name());
+        let prelude = format!("{} setcolorspace\n", space.name());
         let decode = "0 1 ".repeat(n);
-        let _ = write!(
-            out,
-            "{{ /VCsrc currentfile /ASCII85Decode filter def\n<< /ImageType {} /Width {w} /Height {h} /BitsPerComponent 8 /Decode [{}] /ImageMatrix [{w} 0 0 {h} 0 0]",
+        let mut dict = format!(
+            "<< /ImageType {} /Width {w} /Height {h} /BitsPerComponent 8 /Decode [{}] /ImageMatrix [{w} 0 0 {h} 0 0]",
             if keyed { 4 } else { 1 },
             decode.trim_end()
         );
         if keyed {
             let mask: Vec<String> = key.iter().take(n).map(|v| format!("{v} {v}")).collect();
-            let _ = write!(out, " /MaskColor [{}]", mask.join(" "));
+            let _ = write!(dict, " /MaskColor [{}]", mask.join(" "));
         }
-        // The procedure is read whole before it runs: the image data follows it, and flushing the
-        // ASCII85 filter afterwards reads past its end marker.
-        let _ = writeln!(out, "\n/DataSource VCsrc {filter} filter >> image\nVCsrc flushfile }} exec");
-        out.push_str(&ps::ascii85(&encoded));
-        Some(out)
+        Some(image_code(prelude, dict, filter, "image", encoded))
     }
 }
 
+/// An image of `prelude`, `dict`, `filter` and `op` (see [`ImageCode`]) with compressed samples
+/// `data`, not yet placed.
+fn image_code(prelude: String, dict: String, filter: &'static str, op: &'static str, data: Vec<u8>) -> ImageCode {
+    let mut code = ImageCode { prelude, dict, filter, op, ascii: ps::ascii85(&data), data, uses: 0, inline_len: 0, ref_len: 0 };
+    code.inline_len = code.prelude.len() + INLINE_SOURCE.len() + code.dict.len() + code.inline_read().len() + code.ascii.len();
+    code
+}
+
 /// `a` to `b` at `t`.
 fn mix(a: &[f32], b: &[f32], t: f32) -> Vec<f32> {
     a.iter().zip(b).map(|(x, y)| x + (y - x) * t).collect()
diff --git a/crates/eps/src/tests.rs b/crates/eps/src/tests.rs
index 13bdbb80e2..0d5649ead5 100644
--- a/crates/eps/src/tests.rs
+++ b/crates/eps/src/tests.rs
@@ -82,6 +82,17 @@ fn checked_page(ps: &str) -> String {
                 }
             }
             '{' | '[' => stack.push(c),
+            // An ASCII85 string: its digits are data.
+            '<' if chars.peek() == Some(&'~') => {
+                let mut last = ' ';
+                loop {
+                    let c = chars.next().expect("ASCII85 string closes");
+                    if last == '~' && c == '>' {
+                        break;
+                    }
+                    last = c;
+                }
+            }
             '<' if chars.peek() == Some(&'<') => {
                 chars.next();
                 stack.push('<');
@@ -679,15 +690,20 @@ fn png_doc() -> Document {
     for (x, _, p) in img.enumerate_pixels_mut() {
         *p = if x < 2 { image::Rgba([0, 200, 0, 255]) } else { image::Rgba([0, 0, 0, 0]) };
     }
+    image_doc(&img, 10.0)
+}
+
+/// A 200 × 200 pt document holding `img` as a PNG, its pixels `scale` points wide, at (10, 10).
+fn image_doc(img: &image::RgbaImage, scale: f64) -> Document {
     let mut png = vec![];
     img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).unwrap();
     let mut d = Document::new(200.0, 200.0);
     d.images.insert("pic".into(), ImageBlob::new("image/png", png));
     let im = ImageObject {
         key: "pic".into(),
-        width: 4,
-        height: 2,
-        xf: Affine::translate((10.0, 10.0)) * Affine::scale(10.0),
+        width: img.width(),
+        height: img.height(),
+        xf: Affine::translate((10.0, 10.0)) * Affine::scale(scale),
         link: None,
         placement: Default::default(),
         pixels: None,
@@ -988,6 +1004,219 @@ fn uncolorized_image_stays_on_original_eps_path() {
     assert_eq!(page_of(&color, &opts(&color)), original);
 }
 
+/// A copy of the first layer's object `i`, moved by `xf`, added on top.
+fn place_again(d: &mut Document, i: usize, xf: Affine) {
+    let mut n = (*d.layers[0].children().unwrap()[i]).clone();
+    n.id = d.alloc_id();
+    if let NodeKind::Image(im) = &mut n.kind {
+        im.xf = xf * im.xf;
+    }
+    d.insert(d.default_layer(), usize::MAX, n).unwrap();
+}
+
+/// Pixels of noise, opaque.
+fn noise(w: u32, h: u32) -> image::RgbaImage {
+    let mut seed = 1u32;
+    image::RgbaImage::from_fn(w, h, |_, _| {
+        let mut px = [255u8; 4];
+        for v in &mut px[..3] {
+            seed = seed.wrapping_mul(1_103_515_245).wrapping_add(12_345);
+            *v = (seed >> 16) as u8;
+        }
+        image::Rgba(px)
+    })
+}
+
+/// The pixels of each image an EPS file's page draws, read back from the page.
+fn imported_images(bytes: &[u8]) -> Vec<Vec<u8>> {
+    fn walk(n: &Node, d: &Document, out: &mut Vec<Vec<u8>>) {
+        if let NodeKind::Image(im) = &n.kind {
+            out.push(image::load_from_memory(&d.images[&im.key].bytes).unwrap().to_rgba8().into_raw());
+        }
+        for c in n.children().into_iter().flatten() {
+            walk(c, d, out);
+        }
+    }
+    let r = import_with(bytes, false).unwrap();
+    assert!(!r.preview, "{:?}", r.warnings);
+    let mut out = vec![];
+    for l in &r.document.layers {
+        walk(l, &r.document, &mut out);
+    }
+    out
+}
+
+/// The samples of an image placed more than once, from the setup that defines them: inflated at
+/// Level 3, each string run-length decoded in turn at Level 2.
+fn reused_samples(ps: &str, level: Level) -> Vec<u8> {
+    let setup = &ps[ps.find("%%BeginSetup").unwrap()..ps.find("%%EndSetup").unwrap()];
+    match level {
+        Level::Three => ps::inflate(&image_data(setup), 1 << 28).unwrap(),
+        Level::Two => {
+            let mut data = vec![];
+            for s in setup.split("<~").skip(1) {
+                let chunk = ps::ascii85_decode(&s[..s.find("~>").unwrap() + 2]).unwrap();
+                assert!(chunk.len() <= 65_535, "a string holds at most 65,535 bytes: {}", chunk.len());
+                data.extend(chunk);
+            }
+            unpack(&data)
+        }
+    }
+}
+
+/// The samples of a single image written where it is drawn.
+fn inline_samples(ps: &str, level: Level) -> Vec<u8> {
+    match level {
+        Level::Three => ps::inflate(&image_data(ps), 1 << 28).unwrap(),
+        Level::Two => unpack(&image_data(ps)),
+    }
+}
+
+/// How many placements draw the image the setup defines as `VCim<i>`.
+fn reuses(ps: &str, i: usize, level: Level) -> usize {
+    match level {
+        Level::Three => ps.matches(&format!("VCim{i} resetfile\n")).count(),
+        Level::Two => ps.matches(&format!("{{VCi VCim{i} length lt")).count(),
+    }
+}
+
+#[test]
+fn an_image_placed_twice_writes_its_samples_once_at_both_levels() {
+    let single = png_doc();
+    let mut d = single.clone();
+    place_again(&mut d, 0, Affine::translate((60.0, 80.0)) * Affine::rotate(0.5));
+    for level in Level::ALL {
+        let one = export(&single, &EpsOptions { level, ..opts(&single) }, None, None).unwrap();
+        let one_ps = text(&one);
+        assert!(!one_ps.contains("VCim"), "an image placed once is written where it is drawn: {one_ps}");
+        let out = export(&d, &EpsOptions { level, ..opts(&d) }, None, None).unwrap();
+        let ps = text(&out);
+        checked_page(&ps);
+        assert_eq!(reuses(&ps, 0, level), 2, "{ps}");
+        assert!(!ps.contains("VCim1"), "{ps}");
+        let body = &ps[ps.find("%%EndSetup").unwrap()..];
+        assert!(!body.contains("currentfile") && !body.contains("~>"), "no samples in the page: {ps}");
+        match level {
+            Level::Three => {
+                assert_eq!(ps.matches("/ReusableStreamDecode filter def").count(), 1, "{ps}");
+                assert!(ps.contains("/Intent 0 /AsyncRead false /CloseSource false"), "{ps}");
+                assert!(body.contains("/DataSource VCim0 /FlateDecode filter >> image\n"), "{ps}");
+            }
+            Level::Two => {
+                assert!(ps.contains("/VCim0 [\n<~") && !ps.contains("ReusableStreamDecode"), "{ps}");
+                assert!(body.contains("/VCi 0 def\n") && body.contains("/RunLengthDecode filter >> image\n"), "{ps}");
+            }
+        }
+        assert_eq!(reused_samples(&ps, level), inline_samples(&one_ps, level));
+        assert_eq!(out.warnings, one.warnings);
+        // Read back, each placement draws the image the single placement draws.
+        let once = imported_images(&one.bytes);
+        assert_eq!(once.len(), 1);
+        assert_eq!(imported_images(&out.bytes), vec![once[0].clone(); 2], "{level:?}");
+    }
+}
+
+/// An image in an envelope is drawn as clipped pieces, all from one copy of its samples, which the
+/// image placed beside the envelope also draws.
+#[test]
+fn an_envelopes_image_pieces_draw_one_copy_of_its_samples() {
+    let mut d = png_doc();
+    let mut content = (*d.layers[0].children().unwrap()[0]).clone();
+    content.id = d.alloc_id();
+    let kind = vectorcraft_doc::EnvelopeKind::Warp { style: "arc".into(), bend: 50.0, h: 0.0, v: 0.0, horizontal: true, version: 0 };
+    let envelope = Node::new(
+        d.alloc_id(),
+        NodeKind::Envelope {
+            content: vec![Arc::new(content)],
+            kind: Box::new(kind),
+            fidelity: 50.0,
+            editing: false,
+            options: Default::default(),
+            frame: Box::new(Affine::IDENTITY),
+        },
+    );
+    d.insert(d.default_layer(), usize::MAX, envelope).unwrap();
+    for level in Level::ALL {
+        let out = export(&d, &EpsOptions { level, ..opts(&d) }, None, None).unwrap();
+        let ps = text(&out);
+        checked_page(&ps);
+        // The plain image and 200 pieces: 10 × 10 cells of two triangles.
+        assert_eq!(reuses(&ps, 0, level), 201, "{ps}");
+        assert!(!ps.contains("VCim1"), "{ps}");
+        assert_eq!(ps.matches(if level == Level::Three { "/ReusableStreamDecode" } else { "<~" }).count(), 1, "{ps}");
+        assert!(!out.warnings.iter().any(|w| w.contains("too large")), "{:?}", out.warnings);
+    }
+}
+
+#[test]
+fn each_ink_of_a_colorized_image_placed_twice_is_written_once() {
+    let first = Paint::Solid { color: Color::rgb8(255, 0, 0), swatch: Some("Ink".into()), tint: 1.0 };
+    let mut d = colorized_doc(vec![0, 255, 0], Some(first));
+    let mut n = (*d.layers[0].children().unwrap()[0]).clone();
+    n.id = d.alloc_id();
+    n.extras_mut().colorize = Some(Box::new(Paint::Solid { color: Color::rgb8(255, 128, 128), swatch: Some("Ink".into()), tint: 0.5 }));
+    d.insert(d.default_layer(), usize::MAX, n).unwrap();
+    place_again(&mut d, 0, Affine::translate((0.0, 50.0)));
+    place_again(&mut d, 1, Affine::translate((0.0, 100.0)));
+    for level in Level::ALL {
+        let ps = page_of(&d, &EpsOptions { level, ..opts(&d) });
+        assert_eq!((reuses(&ps, 0, level), reuses(&ps, 1, level)), (2, 2), "{ps}");
+        assert_eq!(ps.matches("VCsp0 setcolorspace 1 setcolor\n").count(), 2, "{ps}");
+        assert_eq!(ps.matches("VCsp0 setcolorspace 0.5 setcolor\n").count(), 2, "{ps}");
+        assert_eq!(ps.matches("imagemask").count(), 4, "{ps}");
+        if level == Level::Three {
+            assert_eq!(ps.matches("/Intent 1 ").count(), 2, "image masks: {ps}");
+        }
+    }
+}
+
+/// Samples longer than PostScript's longest string: one stream at Level 3, several strings at
+/// Level 2, each placement reading all of them.
+#[test]
+fn samples_longer_than_a_string_are_reused_at_both_levels() {
+    let single = image_doc(&noise(160, 160), 1.0);
+    let mut d = single.clone();
+    place_again(&mut d, 0, Affine::translate((20.0, 0.0)));
+    for level in Level::ALL {
+        let one = export(&single, &EpsOptions { level, ..opts(&single) }, None, None).unwrap();
+        let out = export(&d, &EpsOptions { level, ..opts(&d) }, None, None).unwrap();
+        let ps = text(&out);
+        checked_page(&ps);
+        assert_eq!(reuses(&ps, 0, level), 2);
+        if level == Level::Two {
+            assert_eq!(ps.matches("<~").count(), 2, "160 × 160 × 3 run-length bytes take two strings");
+        }
+        let samples = reused_samples(&ps, level);
+        assert_eq!(samples.len(), 160 * 160 * 3);
+        assert_eq!(samples, inline_samples(&text(&one), level));
+        let once = imported_images(&one.bytes);
+        assert_eq!(imported_images(&out.bytes), vec![once[0].clone(); 2], "{level:?}");
+    }
+}
+
+/// The limit on the page body counts the samples of an image placed many times once. Art taken
+/// back for passing the limit takes its image placements with it.
+#[test]
+fn the_page_limit_counts_a_repeated_images_samples_once() {
+    let single = image_doc(&noise(40, 40), 1.0);
+    let o = opts(&single);
+    let inline = crate::scene::Scene::new(&single, &o).run().body.len();
+    let mut d = single.clone();
+    for k in 1..20 {
+        place_again(&mut d, 0, Affine::translate((f64::from(k), 0.0)));
+    }
+    let page = crate::scene::Scene::new(&d, &o).with_max_body(inline * 3).run();
+    assert!(page.warnings.is_empty(), "{:?}", page.warnings);
+    assert_eq!(reuses(&page.body, 0, Level::Three), 20);
+    assert!(page.setup.contains("/VCim0 VCsrc"));
+    // Past the limit, the placements that don't fit are left out with a warning.
+    let page = crate::scene::Scene::new(&d, &o).with_max_body(inline + 1000).run();
+    assert!(page.warnings.iter().any(|w| w.contains("too large")), "{:?}", page.warnings);
+    let placed = reuses(&page.body, 0, Level::Three);
+    assert!((2..20).contains(&placed), "{placed}");
+    assert!(page.body.len() + page.setup.len() <= inline + 1000 + 400, "{}", page.body.len());
+}
+
 #[test]
 fn run_length_and_ascii85_round_trip() {
     let cycle: Vec<u8> = (0..=255u8).cycle().take(1000).collect();
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..da47a31387 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -610,6 +610,7 @@ since 2026-10-01.
 - **Placed gradients follow the Warp effects:** under each of the fifteen Warp styles with a bend or a distortion, a gradient placed with the Gradient tool moves and scales from the object's bounds before the warp to its bounds after it, as under Free Distort; a stroke's gradient uses those bounds inflated by the stroke. This holds for an object's own Warp and for a fill's or stroke's own, on the canvas and in Object › Expand of the fill. In a group with a Warp effect, each path's and compound path's gradients follow its own bounds, a nested group's own fills and strokes follow the nested group's bounds, and the group's own fills and strokes follow the group's bounds. In the art Pathfinder and compound shapes take, a symbol instance's Warp moves the gradients of its symbol's art by the art's bounds, and a compound shape's Warp moves its gradients by the bounds of its area. A gradient fitted to the object still fits the warped outline, and a warp with no bend and no distortion leaves the gradient exactly in place. Existing documents with a Warp effect on art with a placed gradient draw differently: before, the gradient stayed where it was while the outline changed. How gradients follow the warp is VectorCraft's own rule; what the Warp effects do to the object is described in [Reshaping with effects](https://helpx.adobe.com/illustrator/using/reshaping-objects-effects.html) (effects `tests::warp_bends_when_the_warp_moves_the_outline`, `bake::tests::baked_warps_move_placed_gradients_from_the_bounds_to_the_warped_bounds`, `bake::tests::a_warp_with_no_bend_leaves_a_placed_gradient_exactly_in_place`, `bake::tests::a_fills_and_a_strokes_own_warp_move_its_placed_gradient_with_the_bounds`, `group::tests::a_groups_warp_moves_the_gradients_placed_on_its_paths_by_each_paths_bounds`, `group::tests::a_groups_warp_moves_its_own_a_nested_groups_and_a_compound_paths_gradients_by_their_bounds`, `group::tests::shape_art_moves_the_gradients_of_a_symbol_instances_art_and_a_compound_shape_with_a_warp`; render `objectfx::a_paths_gradient_moves_and_scales_with_its_warped_bounds`; engine `objexpand::a_placed_gradient_moved_by_a_warp_expands_as_the_canvas_draws_it`). Scores and hours unchanged.
 - **Warp as a Bézier patch per style:** each of the fifteen Warp styles bends the object's bounds as one Bézier patch whose control points the style sets from the bend and the size of the bounds; the horizontal distortion then scales each column of control points about its middle and the vertical distortion scales each row. The Warp effects and warp envelopes share the map, and content with no width or no height takes the middle of the patch along that side. New warps, the built-in graphic styles' Warps and warps opened from `.ai` files carry `version` 1 for it. Warps in `.vectorcraft` documents saved before it read as `version` 0 and keep their earlier look, and edits keep a warp's version; a `version` 0 warp saved to `.ai` opens again with `version` 1, since the file holds only its settings. The patches are VectorCraft's own rules; the styles and ranges are those of the Warp options in [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html) (doc `live::tests::warp_nets_bend_each_style_as_its_own_patch`, `warp_net_arc_edges_are_concentric_circles`, `warp_net_distortion_scales_the_columns_then_the_rows`, `warp_net_takes_any_numbers`, `warp_net_bends_a_huge_box_without_overflowing`, `warp_envelopes_bend_flat_content_as_the_middle_of_the_patch`, `warp_envelopes_write_their_map_version_only_when_it_has_one`, `style_libs::tests::builtin_warp_styles_take_the_nets_map`; effects `tests::a_warp_draws_with_the_map_its_version_names`, `tests::a_warp_bends_a_flat_box_as_the_middle_of_its_patch`, `tests::new_warps_take_the_nets_version`; engine `effectedit::warps_keep_the_map_their_version_names`, `envelope::new_warp_envelopes_take_the_net_and_saved_ones_keep_their_map`; eps `ai_editing::tests::every_effect_a_graphic_style_holds_is_read_back`, `import::ai::tests::a_warp_envelope_opens_live`, `import::ai::tests::warp_envelopes_read_every_style`, `import::ai::style::tests::a_stack_of_fills_with_effects_of_their_own_is_read_as_itself`; ui-egui `dialogs::tests_warp::warp_options_edit_keeps_each_targets_map_version`). Scores and hours unchanged.
 - **Warp effects bend images:** a Warp effect on an image, or on a group that holds one, bends the image's pixels with its frame, as the Warp effect is documented to distort bitmap images in [Reshaping with effects](https://helpx.adobe.com/illustrator/using/reshaping-objects-effects.html): after the last effect, the image is cut into 10 × 10 cells of two triangles, each a clipped piece under its own affine map. Effects after the Warp reshape only the frame, a second Warp bends the same pieces, and warps saved without a version bend the pixels with their earlier map, as they bend the frame. A placed gradient on a group that holds the image follows the group's bounds as the pieces draw them. SVG writes the image once for the pieces; PDF, EPS, `.ai` and PNG write the bent pieces. The images stay unbent when their pieces would make the art pass 2 million objects, and so does an image whose frame keeps its shape past the anchor budget. A grayscale image's fill color now colorizes the pieces of a warp or an envelope, and an image under any geometry effect keeps that color and its smoothing setting. Existing documents with a Warp effect on an image, or on a group that holds one, draw differently: before, the image showed unbent, cut by the bent frame. So do existing documents with a colorized image under an envelope or a geometry effect, or an image drawn without smoothing under a geometry effect: before, those lost the color or the setting. The cell count and the limits are VectorCraft's own (effects `tests::warped_images_stay_within_the_object_budget`, `tests::warped_images_keep_document_keys_and_hidden_images_apart`, `tests::an_image_whose_frame_passes_the_budget_stays_whole`, `tests::effects_after_a_warp_reshape_an_images_frame_and_not_its_pieces`, `tests::an_images_pixels_take_the_map_their_warps_version_names`, `tests::an_image_under_a_geometry_effect_keeps_its_color_and_smoothing`, `tests::a_nested_groups_gradient_follows_its_warped_image`; engine `warp_images::an_images_pixels_bend_with_effect_warp`, `a_warped_image_keeps_its_bend_in_svg`, `a_warped_image_keeps_its_bend_in_pdf`, `a_warped_image_keeps_its_bend_in_ai`, `a_warped_image_keeps_its_bend_in_eps`, `a_warped_image_keeps_its_bend_in_png`, `svg_writes_an_image_clipped_twice_in_a_users_group_twice`, `expand_appearance_of_a_warped_image_draws_as_the_canvas_did`, `a_colorized_image_keeps_its_color_when_warped`, `a_warp_on_a_group_bends_the_image_in_it`, `envelope_distort::a_colorized_image_keeps_its_color_in_an_envelope`). Scores and hours unchanged.
+- **EPS writes a repeated image's samples once:** an image drawn more than once in an EPS file (the pieces of an envelope or a Warp effect, copies of one image, or one image in a symbol's instances) has its compressed samples written once in the setup, and each placement reads them from there: a reusable stream rewound for each placement at Language Level 3 ([PostScript Language Reference, 3rd ed., §3.13](https://www.adobe.com/jp/print/postscript/pdfs/PLRM.pdf)), and an array of strings of at most 49,152 bytes fed to the image by a procedure at Level 2. An image drawn once is written where it is drawn, as before. The 256 MB limit on the page counts the samples once, so an envelope of a large photo no longer loses pieces to it. A colorized image is reused per ink (eps `tests::an_image_placed_twice_writes_its_samples_once_at_both_levels`, `tests::an_envelopes_image_pieces_draw_one_copy_of_its_samples`, `tests::each_ink_of_a_colorized_image_placed_twice_is_written_once`, `tests::samples_longer_than_a_string_are_reused_at_both_levels`, `tests::the_page_limit_counts_a_repeated_images_samples_once`). Scores and hours unchanged.
 - **Distort Appearance with Transform effect options:** with Envelope Options › Distort Appearance on, a path whose Transform effect has Scale Strokes & Effects or Transform Patterns on, or copies it with a gradient, is bent as the same per-copy art it draws and expands as outside the envelope: each copy's own stroke weight, dashes, pattern placement and gradient (effects `bake::tests`). Scores and hours unchanged.
 - **Fitted gradients turn with the Transform effect:** a gradient fitted to the object (not placed with the Gradient tool) turns, reflects and stretches with the object when its Transform effect rotates, reflects or scales it unevenly, as Object › Transform already does: the gradient is fixed to its fit on the geometry the effect takes, then follows the effect and the effects after it as a placed gradient does. Under moves and even scales it draws as a refit does, and a Transform effect that scales the object to nothing across leaves it fitted, with Scale Strokes & Effects or Transform Patterns on too, and on each copy. This holds on the canvas and in Object › Expand of the fill, for an object's own effects, a fill's or stroke's own, and a group's, where the gradients fitted to its paths, to its own fill, to the groups inside it and to its images' and symbol instances' own fills each fix to their own object's fit. Existing documents with such a Transform effect on fitted-gradient art draw differently: before, the gradient refit to the turned outline. The Gradient tool still shows a fitted gradient's vector at its unturned fit. How gradients follow the effect is VectorCraft's own rule; what the effect does to the object is described in [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html) (effects `bake::tests::a_fitted_gradient_turns_reflects_and_stretches_with_a_transform_effect`, `bake::tests::a_transform_effect_that_scales_to_nothing_leaves_a_fitted_gradient_fitted`, `group::tests::a_groups_transform_turns_the_gradients_fitted_to_its_members_and_its_own_fill`; render `objectfx::a_fitted_gradient_turns_and_reflects_with_its_transform_on_the_canvas`; engine `objexpand::a_fitted_gradient_turned_by_a_transform_expands_as_the_canvas_draws_it`). Scores and hours unchanged.
 - **Placed gradients follow Transform and Free Distort effects:** a gradient placed with the Gradient tool moves, turns and scales with the object when the object's Transform effect moves its outline, and each copy of the Transform effect takes it as many times as it takes the transform. Under Free Distort it moves and scales from the path's bounds before the effect to its bounds after it. This holds on the canvas, in export, in Expand Appearance, in Pathfinder and compound shapes, and in Object › Expand of the fill, for an object's own effects, a group's (the own fills of the group, of the groups inside it, of a symbol's art, and of the images and symbol instances it moves, included) and a fill's or stroke's own. A gradient on a path inside a group with a Transform effect now moves with the path (#2214 moved only the gradients of type), and so does a gradient on an image's or symbol instance's own fill. When a path keeps its shape because the effect would pass the geometry budget, the group's own gradients stay in place; a hidden path in a layer, which the layer's bounds leave out, does not hold them. A freeform gradient whose points were edited moves its points in the same way. How gradients follow each effect is VectorCraft's own rule; what each effect does to the object is described in [Distort and transform effects](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/distort-and-transform-effects-in-illustrator.html) (effects `bake::tests::a_baked_transform_moves_a_placed_gradient_with_the_path`, `bake::tests::a_strokes_own_transform_and_free_distort_move_its_placed_gradient`, `bake::tests::a_fills_gradient_follows_the_effects_around_its_transform_with_options`, `bake::tests::baked_free_distort_moves_placed_gradients_from_the_bounds_to_the_distorted_bounds`, `group::tests::a_groups_transform_and_free_distort_move_the_gradients_placed_on_its_paths`, `group::tests::a_groups_transform_moves_the_gradient_of_its_own_fill`, `group::tests::a_nested_groups_own_gradient_follows_the_outer_groups_transform_and_free_distort`, `group::tests::a_groups_transform_moves_the_gradients_placed_on_an_images_own_fills`, `group::tests::shape_art_moves_gradients_with_a_transform_effect`, `group::tests::shape_art_moves_the_gradient_of_a_symbol_instances_art_with_its_transform`, `tests::art_past_the_budget_keeps_its_own_gradients_in_place`, `tests::a_hidden_path_past_the_budget_leaves_a_layers_gradients_free_to_move`, `tests::edited_freeform_points_follow_a_transform_effect_and_free_distort`; render `objectfx::a_paths_gradient_moves_with_its_transform_and_free_distort`; engine `objexpand::a_placed_gradient_moved_by_a_transform_or_free_distort_expands_as_the_canvas_draws_it`). Scores and hours unchanged.- **Constrain Angle (#394):** General › Constrain Angle turns the arrow keys' axes (guides stay on the page's), holds Shift drags of the Selection, Direct Selection, Free Transform, Slice Selection, Reshape and Measure tools and the Pen's handles to the turned axes, and new rectangles, rounded rectangles, ellipses, grids, point and area type, Shift-drawn polygons and stars and the shape size dialogs are drawn along it with their bounding box turned; 0° and whole turns are exactly as before, quarter turns exact (<https://helpx.adobe.com/illustrator/desktop/manage-objects/arrange-objects/rotate-objects-by-specific-angles.html>). Tests: `tests_constrain_tools`, `tests_constrain_new` (engine), `geom` `constrain_axes` / `rotate_deg`, the shape, grid and type tool tests.

From 38bcbb817f9340ef375116eb54b8d60771598fff Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:38:03 -0800
Subject: [PATCH 31/48] Docs: Paragraph Style Options rows name the dialog and
 its seven sections

A double-click on a paragraph style's row and the panel menu both open
Paragraph Style Options (ui.paraStyleOptions, paraStyle.edit) with its
seven sections. The type-parity and ui-parity rows still called it the
rename dialog and named ui.paramDialog with paraStyle.rename; they now
name the dialog, its sections and its tests.

The target-app-parity entry said each section has a Reset Panel. Reset
Panel is unavailable in General, and the entry now states that.
---
 docs/target-app-parity.md | 2 +-
 docs/type-parity.md       | 2 +-
 docs/ui-parity.md         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..f4fe01ad13 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -661,7 +661,7 @@ since 2026-10-01.
 - **Character Style Options, Character Color and OpenType Features:** Character Style Options and New Character Style set a style's fill and stroke (None or a document swatch; a global swatch stays linked, with a Tint from 0% to 100%), stroke Weight, Overprint Fill and Overprint Stroke, and its Figure, Position, Standard and Discretionary Ligatures, Contextual, Stylistic and Titling Alternates, Swash, Ordinals, Fractions and Stylistic Sets 1 to 20; text that uses the style takes them and keeps its local overrides, and editing a global swatch later updates the style and its text. Empty controls remain unset, an explicit None, off, Default Figure or Default Position stays distinct from unset, each stylistic set is on, off or unset, a gradient or pattern paint stays until another paint is chosen, a changed OpenType control keeps the style's other feature tags, and each section's Reset Panel clears only its own attributes. Public references: [Character and paragraph styles](https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html) and [Format text with OpenType features](https://helpx.adobe.com/illustrator/desktop/design-with-text/special-characters-glyphs/format-text-with-opentype-features.html).
 - **Opening style options from the style panels:** a double-click on a user character style's row opens its Character Style Options (`ui.charStyleOptions`), as the panel menu's item does; a paragraph style's row opens its Paragraph Style Options (`ui.paraStyleOptions`), as the panel menu's item does. A single click still applies the style, the second click of the double-click does not apply it again, and the built-in Normal style opens no dialog. Test `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`.
 - **Character Style Options window size:** the dialog keeps a fixed width wide enough for the widest tab's controls and scrolls its sections inside a window shorter than them, so it stays on screen and its OK and Cancel buttons stay visible; the width is the same in every section and the height follows the section. Test `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list`.
-- **Paragraph Style Options, General, Basic Paragraph Formats, Composition, Hyphenation and Justification:** Paragraph Style Options (`ui.paraStyleOptions`, `paraStyle.edit`) and New Paragraph Style edit a style's name, Alignment, left, right and first-line indents, space before and after, composer, Roman Hanging Punctuation, Hyphenation with its options, and Word Spacing, Letter Spacing, Glyph Scaling, Auto Leading and Single Word Justification; paragraphs that use the style take them and keep their local overrides. Fields left as they were keep the style's values, empty fields remain unset, each section's Reset Panel clears only its own attributes, Preview can be canceled without changing history, OK saves one undo step, and out-of-range values keep the dialog open. The character formats of a paragraph style are not in the dialog yet. Public reference: [Character and paragraph styles](https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
+- **Paragraph Style Options, General, Basic Paragraph Formats, Composition, Hyphenation and Justification:** Paragraph Style Options (`ui.paraStyleOptions`, `paraStyle.edit`) and New Paragraph Style edit a style's name, Alignment, left, right and first-line indents, space before and after, composer, Roman Hanging Punctuation, Hyphenation with its options, and Word Spacing, Letter Spacing, Glyph Scaling, Auto Leading and Single Word Justification; paragraphs that use the style take them and keep their local overrides. Fields left as they were keep the style's values, empty fields remain unset, Reset Panel clears only the selected formatting section's attributes and is unavailable in General, Preview can be canceled without changing history, OK saves one undo step, and out-of-range values keep the dialog open. The character formats of a paragraph style are not in the dialog yet. Public reference: [Character and paragraph styles](https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
 - **Paragraph Style Options, Tabs:** the Tabs section of Paragraph Style Options and New Paragraph Style lists a style's tab stops and edits the selected stop's Alignment (Left, Center, Right or Decimal), position (X:, or Y: for vertical type), Leader and Align On character; Add, Delete Tab and Clear All Tabs add a stop 36 pt past the furthest, remove the selected one, or leave the style with no stops. OK sorts the stops by position, keeps the stop edited last of two at one position, and saves one undo step; Preview and Cancel restore the paragraphs, Reset Panel removes the style's tabs, and a position outside 0 to 100000 pt, a leader longer than 8 characters or more than 256 stops keeps the dialog open. Tests `dialogs::para_style_options::tests::tabs_section_edits_the_style_stops` and `tabs_preview_cancel_and_ok_update_the_paragraphs_in_one_undo_step`. Public reference: [Character and paragraph styles](https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
 - **Text styles redefined to the defaults:** New and Redefine Character Style and Paragraph Style capture every attribute of the selected text, including those at their defaults (Auto kerning, Roman baseline alignment, the default Hyphenation options, the Every-line Composer, no tab stops), and `charStyle.setAttrs` and `paraStyle.setAttrs` keep an attribute set to its default value. After a redefinition, text whose value still equals the old definition's takes the new value, a default included; local overrides stay, and text that still has the old value of an attribute the new definition leaves out goes back to the Normal style's value. The style panels show "+" only where the text differs from its style, including type with Auto alignment. Public reference: [Character and paragraph styles](https://web.archive.org/web/20260825113735/https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
 - **Text styles dragged onto the panel's buttons:** a style dragged from the Character Styles or Paragraph Styles panel onto Create New Style is copied (`charStyle.duplicate`, `paraStyle.duplicate`, which name the copy `<name> copy`) and the copy is highlighted; dragged onto Delete it is deleted (`charStyle.delete`, `paraStyle.delete`); the Normal style is not deleted. Each drop is one undo step. Public reference: [Character and paragraph styles](https://web.archive.org/web/20261015081534/https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
diff --git a/docs/type-parity.md b/docs/type-parity.md
index 102a454c3b..bde425487d 100644
--- a/docs/type-parity.md
+++ b/docs/type-parity.md
@@ -28,7 +28,7 @@ against Illustrator's public documentation; **estimated** unless noted.
 | Threaded text, Fit Headline, Text Wrap | done | Fit Headline sees wrapping in a frame one line tall (#1444); a thread holds area type and type on a path in any mix, as Illustrator links type in an area or along a path ([help](https://helpx.adobe.com/illustrator/using/manage-text-area.html)) |
 | Threading from the ports: selected area type and type on a path show an in port and an out port, empty, with an arrow on a side where the frame is threaded, or with a red "+" in the out port when the text doesn't fit; a click on either port loads the text; a click on a closed path, area type or type on a path threads into it, a click on empty canvas makes a frame of the same kind, shape and size there, a drag draws a rectangular frame; the frame placed comes after the clicked one from its out port and before it from its in port (the story then starts there); Escape or another tool cancels; a double-click on a threaded port breaks the thread there | partial | #2572: the Selection tool, `text.thread.add {from, to?, rect?, at?, before?}`, as the reference app's help describes ports and threading ([archived help, Threading text between objects](https://web.archive.org/web/20210119051048/https://helpx.adobe.com/illustrator/using/creating-text.html), [create text threads](https://helpx.adobe.com/illustrator/desktop/design-with-text/add-manage-text/create-text-threads-between-objects.html)); area type's in port sits on the left side below the top-left corner, type on a path's just before its start bracket; Show Text Threads draws its lines between the same ports; with more than 1,000 such objects selected no ports are drawn. a double-click on a port where the frame is threaded breaks the thread there, the story flowing into the frames before the break and the frames after it left empty, still threaded with each other when two or more (`text.thread.break`, [archived help](https://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html)). Remaining: the ports only take clicks with the Selection tool, and the loaded cursor borrows the I-beam until it's drawn |
 | Type on a Path effects and options; brackets | done | #429; Type on a Path Options has a Preview checkbox (#5360, as public tutorials of the dialog show); Direct Selection shows the anchors and direction handles of selected type on a path's path and drags both, the brackets keeping their fractions of the path and the text reflowing along it (#3980, #3565; `text.reshapePath`, `text.setPathHandle`), as the [Direct Selection page](https://helpx.adobe.com/illustrator/using/tool-techniques/direct-selection-tool.html) describes for a path; Type › Dynamic Text (`type.dynamicText`, also on the Contextual Task Bar) sizes type on a path to fill the span between its brackets and fits it again after each edit, as the [Dynamic Text overview](https://helpx.adobe.com/photoshop/desktop/text-typography/work-with-dynamic-text/dynamic-text-overview.html) describes; the 0.1 pt steps, the 0.1 to 1,296 pt range and keeping the drawn sizes when it is turned off or threaded are VectorCraft's own rules (`crates/text/src/tests/fit.rs`, `crates/engine/src/tests/dynamic_text.rs`) |
-| Character and Paragraph panels, styles with overrides | done | Character-style Auto-leading resets, partial definitions, local leading overrides, override markers, Undo/Redo and native serialization have regression coverage; differing paragraph alignments leave the shared alignment buttons unselected (headless regressions, full integration CI and visual review pass); mixed-value display for other paragraph fields remains missing. Double-clicking a user character style's row opens its Character Style Options, and the dialog keeps a fixed width while its sections scroll when the window is shorter, so its buttons stay on screen; a paragraph style's row opens its Paragraph Style Options, the rename dialog the panel menu opens. Evidence: `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`, `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list` |
+| Character and Paragraph panels, styles with overrides | done | Character-style Auto-leading resets, partial definitions, local leading overrides, override markers, Undo/Redo and native serialization have regression coverage; differing paragraph alignments leave the shared alignment buttons unselected (headless regressions, full integration CI and visual review pass); mixed-value display for other paragraph fields remains missing. Double-clicking a user character style's row opens its Character Style Options, and the dialog keeps a fixed width while its sections scroll when the window is shorter, so its buttons stay on screen; a paragraph style's row opens the same Paragraph Style Options dialog as the panel menu, with General, Basic Paragraph Formats, Tabs, Composition, Hyphenation, Justification and East Asian Composition Settings. Evidence: `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`, `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list`, `dialogs::para_style_options::tests::every_section_draws_its_fields`, `dialogs::para_style_options::tests::tabs_section_edits_the_style_stops` |
 | Copy or Cut selected characters, then paste as separate text art | done | A Type-range copy keeps the selected characters' font family, size and color when pasted on the canvas after leaving text editing, in the same document or another. On desktop the clipboard offers plain text to text consumers and rich art for canvas Paste; Paste Without Formatting while editing uses the destination text's style. `tests::clipboard::type_range_copy_stays_styled_when_pasted_as_art` (#5636) |
 | Character size and horizontal scale after object/group scaling | done | #1034: fields and setters compensate the stored affine; point size follows the transformed em-height axis, not the glyph ink bounds. Range edits, keyboard increments, leading and baseline shift use document points; rotation, reflection and shear remain editable. |
 | Preserve font sizes while scaling a group | missing | Separate enhancement; scaling still scales text with the other artwork. |
diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 5391e3dc5b..73d77ae7aa 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -479,7 +479,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po
 | Color Effects add-on (VectorCraft addition): Object › Plug-ins › Color Effects › Find Nearest Swatch… picks a Library (Document Swatches, a built-in library, or a library or colour book the user saved or loaded) and Fill and Stroke, lists each colour of the selection with its three closest swatches (chip, name, ΔE 2000), and Apply gives each colour its nearest swatch (global and spot swatches linked; a library's swatches added to the document first), one undo step | done | #4923; `addon.color.nearestSwatch`, `addon.color.applyNearestSwatch`, `crates/engine/src/cmd/addons/color/nearest.rs`, `crates/ui-egui/src/addons/color/nearest.rs` and their tests; not a feature of the reference app, so it is not scored |
 | Selection Tools add-on (VectorCraft addition): Object › Plug-ins › Selection Tools › Select by Artboards… lists every artboard (number, name, width × height in the document's units), filters them by name, chooses several (click, Shift-click for a range, Cmd/Ctrl-click to toggle; Select All / None act on the rows shown; a count of those chosen), fits a row's artboard in the window on double-click and makes it active, and on OK selects the objects overlapping, fully inside or fully outside the chosen artboards (Overlapping is All on Active Artboard's test) | done | #5525, #5548, #5549; `addon.select.byArtboards`, `crates/engine/src/cmd/addons/select.rs`, `crates/ui-egui/src/addons/select.rs` and their tests; not a feature of the reference app |
 | Selection Tools add-on (VectorCraft addition): Select Linked, Select Embedded, Select Missing and Select Modified in Object › Plug-ins › Selection Tools and the Links panel menu (off when no image has that status; Shift adds to the selection) select the images and placed documents with that link status, leaving out hidden, locked, template-layer and outside-isolation ones, which the status bar counts (e.g. "Selected 9 missing images; 3 more are hidden or locked"); Select by Link Status… lists them with name, status and format, searches by name, filters by status, picks with checkboxes and All / None, and selects with Zoom to Selection on by default | done | #5526; `addon.select.byLinkStatus`, `crates/engine/src/cmd/addons/select.rs`, `crates/ui-egui/src/addons/select/link_status.rs` and their tests; not a feature of the reference app |
-| Style panels: a double-click on a user character style's row opens its Character Style Options, and on a paragraph style's row its Paragraph Style Options (rename), and the Character Style Options dialog keeps a fixed width, its sections scrolling when the window is shorter so OK and Cancel stay on screen | done | `ui.charStyleOptions`, `ui.paramDialog` (`paraStyle.rename`); `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`, `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list` |
+| Style panels: a double-click on a user character style's row opens its Character Style Options, and on a paragraph style's row opens the same Paragraph Style Options as the panel menu, with General, Basic Paragraph Formats, Tabs, Composition, Hyphenation, Justification and East Asian Composition Settings; the Character Style Options dialog keeps a fixed width, its sections scrolling when the window is shorter so OK and Cancel stay on screen | done | `ui.charStyleOptions`, `ui.paraStyleOptions` (`paraStyle.edit`); `panels::text_styles::tests::double_clicking_a_character_style_row_opens_its_options`, `dialogs::char_style_options::tests::the_sections_scroll_in_a_window_shorter_than_the_general_list`, `dialogs::para_style_options::tests::every_section_draws_its_fields`, `dialogs::para_style_options::tests::tabs_section_edits_the_style_stops` |
 
 ## Look and feel
 

From e97113c5c91f5ff4aa2c5ba7db034b98953a5d63 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:40:21 -0800
Subject: [PATCH 32/48] Docs: `ui-parity.md` names all nine built-in brush
 libraries
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The Brush libraries row named four libraries. It now names the nine in
BUILTIN order (crates/engine/src/cmd/brushlib.rs), as the Window ›
Brush Libraries menu shows them, and says nine built-in libraries.
---
 docs/ui-parity.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ui-parity.md b/docs/ui-parity.md
index 5391e3dc5b..a425ae95cf 100644
--- a/docs/ui-parity.md
+++ b/docs/ui-parity.md
@@ -424,7 +424,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po
 | Attributes fill-rule controls with a compound member selected | done | Edits the compound's rule; direction still edits only the member; rendered-hole and Undo/Redo regression tests (#1197) |
 | Make Compound Path on a group (such as outlined type) keeps its backmost path's paint; compound paths joined into one keep their holes | done | #1537 |
 | Symbol libraries: Window › Symbol Libraries (Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons, User Defined, Other Library…, Save Symbols…) and the Symbols panel's Symbol Libraries Menu button and its menu's Open Symbol Library / Save Symbol Library…; a click on a library symbol adds it to the document's Symbols (one undo step, it becomes the current symbol), Shift/Cmd-clicks select for Add to Symbols, and a symbol dragged onto the canvas is added and placed where it is dropped | done | [public source](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/create-or-import-symbol-libraries.html), [Symbols panel options](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/symbols-panel-options.html), [placing from a library](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/create-and-place-symbols.html); `window.symbolLibrary`, `window.symbolLibrary.other`, `ui.saveSymbolLibrary` (dialog `saveSymbolLibrary`), `window.userSymbolLibrary1`…`10`; `panels::tests_symbol_libraries`; five built-in libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons, Skill Icons; original, generated in code) |
-| Brush libraries: Window › Brush Libraries (Art Ribbons, Calligraphic Nibs, Pattern Borders, Scatter Shapes, User Defined, Other Library…, Save Brushes…) and the Brushes panel's Brush Libraries Menu button and its menu's Open Brush Library / Save Brush Library…; a click on a library brush adds it to the document's Brushes (one undo step, it becomes the current brush, and selected paths take it in the same step), Shift/Cmd-clicks select for Add to Brushes, a brush dragged onto a path is added and applied to it and one dragged onto the Brushes panel is added; thumbnails render with the library's patterns and symbols | done | [public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel overview](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html); `window.brushLibrary`, `window.brushLibrary.other`, `ui.saveBrushLibrary` (dialog `saveBrushLibrary`), `window.userBrushLibrary1`…`10`; `panels::tests_brush_libraries`; four built-in libraries (original, generated in code) |
+| Brush libraries: Window › Brush Libraries (Art Ribbons, Ink and Wash, Calligraphic Nibs, Bristle Brushes, Pattern Borders, Scatter Shapes, Game Trails, Energy Beams, Dry Media, User Defined, Other Library…, Save Brushes…) and the Brushes panel's Brush Libraries Menu button and its menu's Open Brush Library / Save Brush Library…; a click on a library brush adds it to the document's Brushes (one undo step, it becomes the current brush, and selected paths take it in the same step), Shift/Cmd-clicks select for Add to Brushes, a brush dragged onto a path is added and applied to it and one dragged onto the Brushes panel is added; thumbnails render with the library's patterns and symbols | done | [public source](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/create-new-brush-libraries.html), [import brushes](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/import-brushes-from-brush-libraries-or-other-files.html), [Brushes panel overview](https://helpx.adobe.com/illustrator/desktop/paint-and-fill/apply-and-edit-strokes/brushes-panel-overview.html); `window.brushLibrary`, `window.brushLibrary.other`, `ui.saveBrushLibrary` (dialog `saveBrushLibrary`), `window.userBrushLibrary1`…`10`; `panels::tests_brush_libraries`; nine built-in libraries (original, generated in code) |
 | Symbols panel: New Symbol opens Symbol Options (Name) before making the symbol; Alt-click skips it | partial | #1560 (#1566); Registration 9-point grid in Symbol Options (`symbol.new` / `symbol.place`); Export Type (Graphic / Movie Clip) and Enable Guides for 9-Slice Scaling (scaled instances keep their corners; in symbol editing mode the guides are drawn over the art and the Selection tool drags them); Symbol Type (Dynamic Symbol / Static Symbol, new symbols dynamic; #4938) |
 | Dynamic symbols: an instance changes the fill, stroke, opacity and blend of objects in its symbol's art and stays linked; Reset in the Properties panel's Quick Actions and the Symbols panel menu (Reset Symbol Instance) | partial | #4938; `symbol.instance.setAppearance` (by child-index path) and `symbol.instance.reset`; redefining keeps the changes, Break Link bakes them; Direct Selection of a path, compound path or type object inside an instance, with the Fill/Stroke controls setting its solid fill or stroke, is on canvas; on-canvas editing beyond a solid fill and stroke, and `.ai` read and write, remain |
 | Pathfinder Trim, Merge and Crop remove strokes; Merge joins same-fill objects whatever their strokes | done | #1570 (#1572) |

From eb2f3ba71a97c98a25b4727f4ff7eb05bffad8ff Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:41:46 -0800
Subject: [PATCH 33/48] Tests: the font menu scroll bar test lists fonts of its
 own

font_menu::tests::the_scroll_bar_leaves_the_stars_clear starred every
family in the process-wide font database and listed that database, which
tests running alongside add fonts and composite fonts to. In full
parallel runs it sometimes failed with "8 families, no row stars drawn".
With the four bundled families alone it never reached the scroll bar
check, which ran only for seven or more families.

- The menu's header takes the font database it lists and hands it to
  the rows and the name-width measurement. The app passes the
  process-wide database as before.
- Each FontDb has an id of its own (FontDb::id), and the widest family
  name the menu keeps is stored with that id as well as the generation,
  so a width measured for one database is not used for another at the
  same generation.
- The test lists a database of the bundled fonts, stars its four
  families, opens on Inter, and runs the frames the scroll bar takes to
  appear. It checks that the rows overflow the list's scroll area, that
  a row star is drawn inside that area, and that each star stays left
  of the scroll bar's column (#2277).

With the list's scroll bar set to floating, the test fails with a star
under the bar. Without the id in the widest name's key,
each_font_database_has_its_own_widest_name fails.
---
 crates/text/src/fontdb.rs             |  2 +
 crates/text/src/fontdb/db.rs          | 10 ++++
 crates/ui-egui/src/font_menu.rs       | 66 ++++++++++++++----------
 crates/ui-egui/src/font_menu/tests.rs | 74 ++++++++++++++++++---------
 4 files changed, 101 insertions(+), 51 deletions(-)

diff --git a/crates/text/src/fontdb.rs b/crates/text/src/fontdb.rs
index 9e18b2a86c..ace69a4148 100644
--- a/crates/text/src/fontdb.rs
+++ b/crates/text/src/fontdb.rs
@@ -105,6 +105,8 @@ pub struct FontDb {
     family_cache: Mutex<Option<Arc<[String]>>>,
     menu_cache: Mutex<Option<MenuFamilies>>,
     generation: AtomicU64,
+    /// This database's [`FontDb::id`].
+    id: u64,
     /// System fallback state: characters no system font covers.
     #[cfg(not(target_arch = "wasm32"))]
     sys: Mutex<SysFallback>,
diff --git a/crates/text/src/fontdb/db.rs b/crates/text/src/fontdb/db.rs
index 4ef17c40c6..0e28d57528 100644
--- a/crates/text/src/fontdb/db.rs
+++ b/crates/text/src/fontdb/db.rs
@@ -21,6 +21,9 @@ use super::{Arc, AtomicU64, FontDb, FontPaths, HashMap, Mutex, Ordering, Path, P
 #[cfg(not(target_arch = "wasm32"))]
 use super::{ScanStamp, modified};
 
+/// The next [`FontDb::id`].
+static NEXT_ID: AtomicU64 = AtomicU64::new(0);
+
 impl FontDb {
     /// A database holding the bundled fonts, whose system font scan reads `font_dirs` (folders,
     /// read with their subfolders, and font files).
@@ -64,6 +67,7 @@ impl FontDb {
             family_cache: Mutex::new(None),
             menu_cache: Mutex::new(None),
             generation: AtomicU64::new(0),
+            id: NEXT_ID.fetch_add(1, Ordering::Relaxed),
             #[cfg(not(target_arch = "wasm32"))]
             sys: Mutex::new(SysFallback { enabled: true, ..Default::default() }),
             #[cfg(not(target_arch = "wasm32"))]
@@ -128,6 +132,12 @@ impl FontDb {
         self.generation.load(Ordering::Relaxed)
     }
 
+    /// A number no other database made in this process has: with [`FontDb::generation`], it tells
+    /// what a list built from a database was built from.
+    pub fn id(&self) -> u64 {
+        self.id
+    }
+
     /// Family names available (loaded plus installed system fonts), sorted and deduplicated.
     pub fn families(&self) -> Vec<String> {
         self.family_list().to_vec()
diff --git a/crates/ui-egui/src/font_menu.rs b/crates/ui-egui/src/font_menu.rs
index 4fbb7a7ffc..8e61f291e4 100644
--- a/crates/ui-egui/src/font_menu.rs
+++ b/crates/ui-egui/src/font_menu.rs
@@ -383,7 +383,7 @@ pub fn font_menu(
             |ui| {
                 // Wider than a narrow field, so the filters keep their rows and long names show.
                 ui.set_min_width(menu_width(ui, state, look));
-                header(ui, state_id, state, current, look)
+                header(ui, vectorcraft_text::FontDb::global(), state_id, state, current, look)
             },
             look.row,
             |h| h.rows.len(),
@@ -970,6 +970,8 @@ pub(crate) fn take_raw_wheel(ctx: &egui::Context, raw: &mut egui::RawInput) {
 
 /// What the menu's header hands its rows.
 struct Listed<'s> {
+    /// The fonts listed: [`vectorcraft_text::FontDb::global`] outside the unit tests.
+    db: &'s vectorcraft_text::FontDb,
     st: &'s mut MenuState,
     /// The rows listed.
     rows: Arc<[Row]>,
@@ -985,14 +987,28 @@ struct Listed<'s> {
 /// [`craft_ui::combo::Menu::show_rows_with_header`] lays them out.
 #[cfg(test)]
 fn list(ui: &mut Ui, state_id: egui::Id, st: &mut MenuState, current: &str, sample: Option<&str>, look: MenuLook) -> Option<FontPick> {
-    let h = header(ui, state_id, st, current, look);
+    list_of(ui, vectorcraft_text::FontDb::global(), state_id, st, current, sample, look).inner
+}
+
+/// [`list`] of the families in `db`, with the rows' scroll area as laid out.
+#[cfg(test)]
+fn list_of(
+    ui: &mut Ui,
+    db: &vectorcraft_text::FontDb,
+    state_id: egui::Id,
+    st: &mut MenuState,
+    current: &str,
+    sample: Option<&str>,
+    look: MenuLook,
+) -> egui::scroll_area::ScrollAreaOutput<Option<FontPick>> {
+    let h = header(ui, db, state_id, st, current, look);
     let total = h.rows.len();
-    egui::ScrollArea::vertical().max_height(ui.available_height()).show_rows(ui, look.row, total, |ui, range| rows(ui, range, h, sample, look)).inner
+    egui::ScrollArea::vertical().max_height(ui.available_height()).show_rows(ui, look.row, total, |ui, range| rows(ui, range, h, sample, look))
 }
 
 /// The top of the open menu, which stays in place: the search field, the filters, and the rows
-/// they list.
-fn header<'s>(ui: &mut Ui, state_id: egui::Id, st: &'s mut MenuState, current: &str, look: MenuLook) -> Listed<'s> {
+/// of `db` they list.
+fn header<'s>(ui: &mut Ui, db: &'s vectorcraft_text::FontDb, state_id: egui::Id, st: &'s mut MenuState, current: &str, look: MenuLook) -> Listed<'s> {
     let t = Tokens::get(ui.ctx());
     ui.style_mut().wrap_mode = Some(egui::TextWrapMode::Extend);
     // Each time the menu opens: no query, the current family highlighted and in view (the
@@ -1025,7 +1041,6 @@ fn header<'s>(ui: &mut Ui, state_id: egui::Id, st: &'s mut MenuState, current: &
     let query = widgets::search_field(ui, field, tl!("Search")).to_lowercase();
     let refilter = filters(ui, st, &t);
     let enter = ui.input(|i| i.key_pressed(egui::Key::Enter));
-    let db = vectorcraft_text::FontDb::global();
     // The current family by its own name (a document may name it in Japanese: ヒラギノ角ゴシック),
     // as it was before any preview.
     let current = db.canonical(&st.current, "").0;
@@ -1092,7 +1107,7 @@ fn header<'s>(ui: &mut Ui, state_id: egui::Id, st: &'s mut MenuState, current: &
     // The scroll bar beside the rows, not over them: a floating one covered the stars at their
     // right ends, so a favourite was hard to click (#2277).
     ui.spacing_mut().scroll = widgets::list_scroll_style();
-    Listed { st, rows, current: current.to_string(), enter, keyed, opening }
+    Listed { db, st, rows, current: current.to_string(), enter, keyed, opening }
 }
 
 /// One of the filters' chips.
@@ -1166,28 +1181,29 @@ fn filters(ui: &mut Ui, st: &mut MenuState, t: &Tokens) -> bool {
 /// [`WINDOW_SHARE`] of the window. The menu is never narrower than its field.
 fn menu_width(ui: &Ui, st: &MenuState, look: MenuLook) -> f32 {
     let sample = if look.samples { SAMPLE_W } else { 0.0 };
-    let names = name_width(ui, look.english_names, &st.rows).min(NAME_MAX);
+    let names = name_width(ui, vectorcraft_text::FontDb::global(), look.english_names, &st.rows).min(NAME_MAX);
     let row = DISCLOSURE + names + NAME_GAP + sample + STAR + 2.0 + widgets::list_scroll_style().allocated_width();
     // Rounding in the chips' widths must not wrap the widest row.
     let filters = if st.filters > 0.0 { st.filters.ceil() + 1.0 } else { 0.0 };
     filters.max(row).min(ui.ctx().content_rect().width() * WINDOW_SHARE)
 }
 
-/// The width of the widest name the menu lists after the disclosure triangle: the family names as
-/// Show Font Names in English shows them, and the style names among `rows` after their indent.
-fn name_width(ui: &Ui, english: bool, rows: &[Row]) -> f32 {
+/// The width of the widest name the menu lists after the disclosure triangle: the family names of
+/// `db` as Show Font Names in English shows them, and the style names among `rows` after their
+/// indent.
+fn name_width(ui: &Ui, db: &vectorcraft_text::FontDb, english: bool, rows: &[Row]) -> f32 {
     let font = egui::FontId::proportional(NAME_SIZE);
     let measure = |name: &str| ui.painter().layout_no_wrap(name.to_string(), font.clone(), Color32::WHITE).size().x;
     let styles = rows.iter().filter_map(Row::style).map(|s| STYLE_INDENT + measure(s)).fold(0.0, f32::max);
-    family_name_width(ui, english).max(styles)
+    family_name_width(ui, db, english).max(styles)
 }
 
-/// What the widest family name was measured for: the font list's generation, Show Font Names in
-/// English, and the number of fonts the interface draws with, which grows as faces for other
-/// scripts are added to it.
-fn family_name_key(ui: &Ui, english: bool) -> (u64, bool, usize) {
+/// What the widest family name was measured for: the font database and its generation, Show Font
+/// Names in English, and the number of fonts the interface draws with, which grows as faces for
+/// other scripts are added to it.
+fn family_name_key(ui: &Ui, db: &vectorcraft_text::FontDb, english: bool) -> (u64, u64, bool, usize) {
     let faces = ui.ctx().fonts(|f| f.definitions().font_data.len());
-    (vectorcraft_text::FontDb::global().generation(), english, faces)
+    (db.id(), db.generation(), english, faces)
 }
 
 /// The id under which the widest family name's width is kept with its [`family_name_key`].
@@ -1195,16 +1211,15 @@ fn family_name_id() -> egui::Id {
     egui::Id::unique("font-menu-name-width")
 }
 
-/// The width of the widest family name the menu lists, labeled as Show Font Names in English
-/// (`english`) labels it; worked out again only when its [`family_name_key`] changes.
-fn family_name_width(ui: &Ui, english: bool) -> f32 {
-    let key = family_name_key(ui, english);
-    if let Some((k, w)) = ui.data(|d| d.get_temp::<((u64, bool, usize), f32)>(family_name_id()))
+/// The width of the widest family name the menu lists from `db`, labeled as Show Font Names in
+/// English (`english`) labels it; worked out again only when its [`family_name_key`] changes.
+fn family_name_width(ui: &Ui, db: &vectorcraft_text::FontDb, english: bool) -> f32 {
+    let key = family_name_key(ui, db, english);
+    if let Some((k, w)) = ui.data(|d| d.get_temp::<((u64, u64, bool, usize), f32)>(family_name_id()))
         && k == key
     {
         return w;
     }
-    let db = vectorcraft_text::FontDb::global();
     let w = widest_label(ui, db.menu_family_list().iter().map(|f| db.family_display_name(f, english)).collect());
     ui.data_mut(|d| d.insert_temp(family_name_id(), (key, w)));
     w
@@ -1269,14 +1284,13 @@ fn heading_row(ui: &mut Ui, row_h: f32, label: &str, t: &Tokens) {
 /// The rows of the open menu in `range`, the ones in view: the menu's one scrolling part, under
 /// the search field and filters (#555).
 fn rows(ui: &mut Ui, range: std::ops::Range<usize>, h: Listed<'_>, sample: Option<&str>, look: MenuLook) -> Option<FontPick> {
-    let Listed { st, rows, current, enter, keyed, opening } = h;
+    let Listed { db, st, rows, current, enter, keyed, opening } = h;
     let current = current.as_str();
     let row_h = look.row;
     let t = Tokens::get(ui.ctx());
     let ink = sample_ink(look.on_white, t.text);
-    let db = vectorcraft_text::FontDb::global();
     let favorite = |f: &str| look.favorites.iter().any(|x| x.eq_ignore_ascii_case(f));
-    let widest = name_width(ui, look.english_names, &rows);
+    let widest = name_width(ui, db, look.english_names, &rows);
     if rows.is_empty() {
         // A filter or a font rescan can remove the row whose font was previewed.
         // Do not leave that font applied while the list has no candidate to highlight.
diff --git a/crates/ui-egui/src/font_menu/tests.rs b/crates/ui-egui/src/font_menu/tests.rs
index 88a524e15b..11a66cab00 100644
--- a/crates/ui-egui/src/font_menu/tests.rs
+++ b/crates/ui-egui/src/font_menu/tests.rs
@@ -21,40 +21,44 @@ fn the_thai_filter_lists_fonts_with_thai() {
 /// stay clear of it.
 #[test]
 fn the_scroll_bar_leaves_the_stars_clear() {
-    // Every family starred, so each row draws its star. Tests running alongside add fonts and
-    // composite fonts to the process-wide database, which the menu lists too: the ★ filter keeps
-    // the rows to the families starred here.
-    let all = vectorcraft_text::FontDb::global().families();
+    // A database of the bundled fonts alone, each family starred, so each row draws its star:
+    // fonts that tests running alongside add to the process-wide database stay out of the rows.
+    let db = vectorcraft_text::FontDb::with_font_dirs(vec![]);
+    let favorites: Vec<String> = ["Source Sans 3", "Source Serif 4", "Inter", "JetBrains Mono"].map(str::to_string).into();
     let ctx = egui::Context::default();
+    // Under the search field and the filters, room for fewer rows than the four families.
     let area = egui::Rect::from_min_size(egui::pos2(0.0, 0.0), egui::vec2(300.0, 160.0));
     let mut st = super::MenuState { favorites_only: true, ..Default::default() };
-    let look = super::MenuLook { samples: false, favorites: &all, ..Default::default() };
-    let mut stars = vec![];
-    for _ in 0..3 {
+    let look = super::MenuLook { samples: false, favorites: &favorites, ..Default::default() };
+    let (mut list, mut stars) = (None, vec![]);
+    // Frames enough for the scroll bar to finish appearing.
+    for _ in 0..30 {
         let mut out = ctx.run_ui(egui::RawInput { screen_rect: Some(area), ..Default::default() }, |ui| {
             let mut child = ui.new_child(egui::UiBuilder::new().max_rect(area));
-            super::list(&mut child, egui::Id::unique("fonts"), &mut st, "", None, look);
+            let shown = super::list_of(&mut child, &db, egui::Id::unique("fonts"), &mut st, "Inter", None, look);
+            list = Some((shown.inner_rect, shown.content_size));
         });
         out.textures_delta.clear();
         stars = out
             .shapes
             .iter()
             .filter_map(|c| match &c.shape {
-                // The rows' stars, not the ★ filter button at the top left.
-                egui::Shape::Text(t) if t.galley.text() == "★" && t.pos.x > area.center().x => Some(t.visual_bounding_rect().right()),
+                egui::Shape::Text(t) if t.galley.text() == "★" => Some(t.visual_bounding_rect()),
                 _ => None,
             })
             .collect();
     }
-    let families = st.rows.len();
-    assert!(!stars.is_empty() || families == 0, "{families} families, no row stars drawn");
-    // The rows don't fill the list without enough families to scroll, and then there is no bar.
-    if families as f32 * look.row > area.height() {
-        let bar = super::widgets::list_scroll_style();
-        let column = bar.bar_width + bar.bar_inner_margin + bar.bar_outer_margin;
-        for right in stars {
-            assert!(right <= area.right() - column + 0.5, "a star at {right} runs under the scroll bar");
-        }
+    let Some((inner, content)) = list else { panic!("the list was not drawn") };
+    let families: Vec<&str> = st.rows.iter().filter_map(super::Row::family).collect();
+    assert_eq!(families.len(), favorites.len(), "the starred families are listed: {families:?}");
+    assert!(content.y > inner.height() + 0.5, "the rows, {} high, fill a list {} high", content.y, inner.height());
+    // The rows' stars in the list, not the ★ filter above it.
+    let stars: Vec<_> = stars.into_iter().filter(|s| inner.contains(s.center())).collect();
+    assert!(!stars.is_empty(), "no row star drawn in the list at {inner:?}");
+    let bar = super::widgets::list_scroll_style();
+    let column = bar.bar_width + bar.bar_inner_margin + bar.bar_outer_margin;
+    for star in stars {
+        assert!(star.right() <= area.right() - column + 0.5, "a star at {} runs under the scroll bar", star.right());
     }
 }
 
@@ -104,14 +108,33 @@ fn the_widest_name_is_measured_again_when_the_interface_fonts_change() {
     };
     // A width no name has, kept as if measured for the fonts as they are.
     frame(&mut |ui| {
-        let key = super::family_name_key(ui, true);
+        let key = super::family_name_key(ui, vectorcraft_text::FontDb::global(), true);
         ui.data_mut(|d| d.insert_temp(super::family_name_id(), (key, -1.0_f32)));
     });
     frame(&mut |ui| {
         let data = ui.ctx().fonts(|f| f.definitions().font_data.values().next().cloned()).expect("an interface font");
         ui.ctx().add_font(egui::epaint::text::FontInsert { name: "font-menu-test-face".into(), data: (*data).clone(), families: vec![] });
     });
-    frame(&mut |ui| assert!(super::family_name_width(ui, true) >= 0.0, "measured again"));
+    frame(&mut |ui| assert!(super::family_name_width(ui, vectorcraft_text::FontDb::global(), true) >= 0.0, "measured again"));
+}
+
+/// The widest family name measured for one font database is not taken for another one at the same
+/// generation.
+#[test]
+fn each_font_database_has_its_own_widest_name() {
+    use vectorcraft_doc::CompositeFont;
+    let short = vectorcraft_text::FontDb::with_font_dirs(vec![]);
+    let long = vectorcraft_text::FontDb::with_font_dirs(vec![]);
+    assert!(short.set_composite_font(&CompositeFont::new("C", "Inter", "Regular")));
+    assert!(long.set_composite_font(&CompositeFont::new("A composite font with a name longer than any family", "Inter", "Regular")));
+    assert_eq!(short.generation(), long.generation());
+    let ctx = egui::Context::default();
+    let mut widths = (0.0, 0.0);
+    let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
+        widths = (super::family_name_width(ui, &short, true), super::family_name_width(ui, &long, true));
+    });
+    out.textures_delta.clear();
+    assert!(widths.1 > widths.0 + 1.0, "the long name's database measured {} and the other {}", widths.1, widths.0);
 }
 
 /// Without a row of filters drawn yet, the menu still makes room for the widest name, its sample,
@@ -125,7 +148,7 @@ fn the_menu_makes_room_for_the_widest_name_and_its_sample() {
     let mut out = ctx.run_ui(input, |ui| {
         let st = super::MenuState::default();
         let look = super::MenuLook::default();
-        let names = super::name_width(ui, look.english_names, &st.rows).min(NAME_MAX);
+        let names = super::name_width(ui, vectorcraft_text::FontDb::global(), look.english_names, &st.rows).min(NAME_MAX);
         assert!(names > 0.0, "a family is listed");
         let width = super::menu_width(ui, &st, look);
         assert!(width >= DISCLOSURE + names + NAME_GAP + SAMPLE_W + STAR, "the menu is {width} wide for a name {names} wide");
@@ -143,14 +166,15 @@ fn only_listed_style_names_widen_the_names() {
     let ctx = egui::Context::default();
     crate::theme::install_fonts(&ctx);
     let long = format!("SemiCondensed ExtraLight Italic {}", "W".repeat(80));
+    let db = vectorcraft_text::FontDb::global();
     let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
-        let families = super::name_width(ui, true, &[]);
+        let families = super::name_width(ui, db, true, &[]);
         let font = egui::FontId::proportional(super::NAME_SIZE);
         let style = STYLE_INDENT + ui.painter().layout_no_wrap(long.clone(), font, egui::Color32::WHITE).size().x;
         assert!(style > families, "the style name is wider than every family name");
         let listed = [Row::Family("A".into()), Row::Style("A".into(), long.clone())];
-        assert_eq!(super::name_width(ui, true, &listed), style);
-        assert!(super::name_width(ui, true, &listed[..1]) < style, "a style not listed is not measured");
+        assert_eq!(super::name_width(ui, db, true, &listed), style);
+        assert!(super::name_width(ui, db, true, &listed[..1]) < style, "a style not listed is not measured");
     });
     out.textures_delta.clear();
 }

From 4cf010c1305bbe464f5ca062abd3e537a3183254 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 05:15:33 -0800
Subject: [PATCH 34/48] Flatten: grouping sweeps skip boxes that a box already
 holds or cannot join

The sweep filtered by transparency kept every open box in one tree, so
a box without transparency met every open box without transparency it
overlapped, though such pairs never join. Both sweeps closed an open
box early only when a later box held it, so in a nest of boxes that
share their left and top edges and get smaller to the right and
bottom, each box met every earlier box around it. One see-through
object inside 512 nested opaque objects took 130,817 meets in the
unfiltered sweep and 131,328 in the filtered one.

The filtered sweep now keeps open see-through boxes and open opaque
boxes in separate trees. An opaque box looks only in the see-through
tree; a see-through box looks in both.

In both sweeps, a box inside an open box it met, ending no further
right, is not opened when that box joins everything it overlaps (any
box without the filter, a see-through box with it). Whatever later
overlaps the inner box overlaps the outer one.

The nest above now takes 512 meets in each sweep, and a nest of 512
boxes alone takes 511 in the unfiltered sweep where it took 130,816.
The groups are unchanged.
---
 crates/engine/src/cmd/flatten/analysis.rs | 222 ++++++++++++++++++----
 docs/target-app-parity.md                 |   1 +
 2 files changed, 191 insertions(+), 32 deletions(-)

diff --git a/crates/engine/src/cmd/flatten/analysis.rs b/crates/engine/src/cmd/flatten/analysis.rs
index 4ad89c773b..0adb06132a 100644
--- a/crates/engine/src/cmd/flatten/analysis.rs
+++ b/crates/engine/src/cmd/flatten/analysis.rs
@@ -135,6 +135,9 @@ fn touch(a: &Rect, b: &Rect) -> bool {
 struct Sets {
     parent: Vec<usize>,
     seeded: Vec<bool>,
+    /// How many open boxes the sweep's boxes met.
+    #[cfg(test)]
+    meets: usize,
 }
 
 impl Sets {
@@ -180,17 +183,25 @@ impl Sets {
 /// tops that knows the lowest bottom below each of its branches, so each box meets only the open
 /// boxes it overlaps, not every open one (many objects stacked in a column, sharing their
 /// horizontal extent, would otherwise compare every pair). An open box inside a later box of
-/// its group, ending no further right, is closed early: whatever overlaps it overlaps that box.
-/// Fails only when cancelled ([`vectorcraft_doc::cancel`]).
+/// its group, ending no further right, is closed early, and a box inside an open box of its group,
+/// ending no further right, isn't opened: whatever overlaps it overlaps that box. Fails only when
+/// cancelled ([`vectorcraft_doc::cancel`]).
 pub(super) fn overlapping(bounds: &[Option<Rect>]) -> Result<Vec<Vec<usize>>, Cancelled> {
     Ok(sweep(bounds, None)?.groups())
 }
 
 /// [`overlapping`]'s sweep. With `see_through`, two boxes are joined only when one of them is
-/// see-through, and an open box is closed early only inside a later see-through box.
+/// see-through, and an open box is closed early, or a box isn't opened, only inside a see-through
+/// box. The open
+/// see-through boxes and the open boxes without transparency are then in trees of their own, and
+/// a box without transparency meets only the see-through ones.
 fn sweep(bounds: &[Option<Rect>], see_through: Option<&[bool]>) -> Result<Sets, Cancelled> {
-    let mut sets = Sets { parent: (0..bounds.len()).collect(), seeded: (0..bounds.len()).map(|i| see_through.is_some_and(|s| s[i])).collect() };
-    let joins = |a: usize, b: usize| see_through.is_none_or(|s| s[a] || s[b]);
+    let mut sets = Sets {
+        parent: (0..bounds.len()).collect(),
+        seeded: (0..bounds.len()).map(|i| see_through.is_some_and(|s| s[i])).collect(),
+        #[cfg(test)]
+        meets: 0,
+    };
     let boxes: Vec<(usize, Rect)> = bounds.iter().enumerate().filter_map(|(i, b)| b.filter(finite).map(|b| (i, b))).collect();
     let n = boxes.len();
     // Each box's place in the tree: by top (then index).
@@ -201,9 +212,11 @@ fn sweep(bounds: &[Option<Rect>], see_through: Option<&[bool]>) -> Result<Sets,
     for (pos, &k) in by_top.iter().enumerate() {
         leaf[k] = pos;
     }
-    // The lowest bottom of the open boxes below each node (−∞: none open).
+    // The lowest bottom of the open boxes below each node (−∞: none open), in the tree of the
+    // boxes without transparency (every box without `see_through`) and the see-through boxes'.
     let size = n.next_power_of_two().max(1);
-    let mut low = vec![f64::NEG_INFINITY; 2 * size];
+    let mut low = [vec![f64::NEG_INFINITY; 2 * size], if see_through.is_some() { vec![f64::NEG_INFINITY; 2 * size] } else { vec![] }];
+    let tree = |k: usize| usize::from(see_through.is_some_and(|s| s[boxes[k].0]));
     let set = |low: &mut [f64], pos: usize, v: f64| {
         let mut i = pos + size;
         low[i] = v;
@@ -226,43 +239,63 @@ fn sweep(bounds: &[Option<Rect>], see_through: Option<&[bool]>) -> Result<Sets,
         while let Some(&c) = by_right.get(closing)
             && boxes[c].1.x1 < b.x0
         {
-            set(&mut low, leaf[c], f64::NEG_INFINITY);
+            set(&mut low[tree(c)], leaf[c], f64::NEG_INFINITY);
             closing += 1;
         }
-        // The open boxes with their top at most this bottom and their bottom at least this top.
+        // The open boxes it joins with their top at most this bottom and their bottom at least
+        // this top: every one, or with `see_through` the see-through ones and, for a see-through
+        // box, the others too.
+        let shadows = see_through.is_none_or(|s| s[boxes[k].0]);
+        let looks: &[usize] = match see_through {
+            None => &[0],
+            Some(_) if shadows => &[0, 1],
+            Some(_) => &[1],
+        };
         let below = tops.partition_point(|t| *t <= b.y1);
         met.clear();
-        stack.clear();
-        stack.push((1, 0, size));
-        while let Some((node, lo, hi)) = stack.pop() {
-            work += 1;
-            if work.is_multiple_of(4096) {
-                vectorcraft_doc::cancel::check()?;
+        for &t in looks {
+            stack.clear();
+            stack.push((1, 0, size));
+            while let Some((node, lo, hi)) = stack.pop() {
+                work += 1;
+                if work.is_multiple_of(4096) {
+                    vectorcraft_doc::cancel::check()?;
+                }
+                if lo >= below || low[t][node] < b.y0 {
+                    continue;
+                }
+                if hi - lo == 1 {
+                    met.push(by_top[lo]);
+                    continue;
+                }
+                let mid = (lo + hi) / 2;
+                stack.push((2 * node + 1, mid, hi));
+                stack.push((2 * node, lo, mid));
             }
-            if lo >= below || low[node] < b.y0 {
-                continue;
-            }
-            if hi - lo == 1 {
-                met.push(by_top[lo]);
-                continue;
-            }
-            let mid = (lo + hi) / 2;
-            stack.push((2 * node + 1, mid, hi));
-            stack.push((2 * node, lo, mid));
         }
+        #[cfg(test)]
+        {
+            sets.meets += met.len();
+        }
+        // An open box it met that holds it, ending no further right, and that joins whatever it
+        // overlaps: whatever later overlaps this box overlaps that one and joins it, so this box
+        // isn't opened.
+        let holder = met.iter().copied().find(|&o| {
+            let ob = boxes[o].1;
+            see_through.is_none_or(|s| s[boxes[o].0]) && b.x1 <= ob.x1 && ob.y0 <= b.y0 && b.y1 <= ob.y1
+        });
         // Whatever overlaps a box inside this one overlaps this one, and joins it when this one is
         // see-through.
-        let shadows = see_through.is_none_or(|s| s[boxes[k].0]);
         for &o in &met {
-            if joins(boxes[k].0, boxes[o].0) {
-                sets.join(boxes[k].0, boxes[o].0);
-            }
+            sets.join(boxes[k].0, boxes[o].0);
             let ob = boxes[o].1;
-            if shadows && ob.x1 <= b.x1 && b.y0 <= ob.y0 && ob.y1 <= b.y1 {
-                set(&mut low, leaf[o], f64::NEG_INFINITY);
+            if shadows && Some(o) != holder && ob.x1 <= b.x1 && b.y0 <= ob.y0 && ob.y1 <= b.y1 {
+                set(&mut low[tree(o)], leaf[o], f64::NEG_INFINITY);
             }
         }
-        set(&mut low, leaf[k], b.y1);
+        if holder.is_none() {
+            set(&mut low[tree(k)], leaf[k], b.y1);
+        }
     }
     Ok(sets)
 }
@@ -392,6 +425,11 @@ mod tests {
 
     /// What [`overlapping`] gives, comparing every pair.
     fn every_pair(bounds: &[Option<Rect>]) -> Vec<Vec<usize>> {
+        every_pair_joining(bounds, |_, _| true)
+    }
+
+    /// The groups of `bounds` comparing every pair, joining overlapping pairs that `joins`.
+    fn every_pair_joining(bounds: &[Option<Rect>], joins: impl Fn(usize, usize) -> bool) -> Vec<Vec<usize>> {
         let n = bounds.len();
         let mut group: Vec<usize> = (0..n).collect();
         let hit = |a: &Rect, b: &Rect| a.x0 <= b.x1 && b.x0 <= a.x1 && a.y0 <= b.y1 && b.y0 <= a.y1;
@@ -401,6 +439,7 @@ mod tests {
                 for j in 0..n {
                     if let (Some(a), Some(b)) = (bounds[i], bounds[j])
                         && hit(&a, &b)
+                        && joins(i, j)
                         && group[j] < group[i]
                     {
                         group[i] = group[j];
@@ -464,6 +503,69 @@ mod tests {
         assert_eq!(overlapping(&odd).unwrap(), vec![vec![0, 2], vec![1]]);
     }
 
+    /// `n` boxes sharing their left and top edges, each inside the one before.
+    fn shrinking_nest(n: usize) -> Vec<Option<Rect>> {
+        (0..n).map(|i| Some(Rect::new(0.0, 0.0, 2.0 * (n - i) as f64, 2.0 * (n - i) as f64))).collect()
+    }
+
+    /// Each box of a nest that shrinks to the right and bottom meets only the outermost box, which
+    /// stays open and holds it, not every box around it.
+    #[test]
+    fn a_shrinking_nest_meets_only_its_outermost_box() {
+        let n = 512;
+        let bounds = shrinking_nest(n);
+        let mut sets = sweep(&bounds, None).unwrap();
+        assert_eq!(sets.meets, n - 1);
+        assert_eq!(sets.groups(), every_pair(&bounds));
+        assert_eq!(sets.groups(), vec![(0..n).collect::<Vec<_>>()]);
+        // Equal boxes: the later one isn't opened and the earlier one stays open for the third.
+        let same = [Some(Rect::new(0.0, 0.0, 10.0, 10.0)), Some(Rect::new(0.0, 0.0, 10.0, 10.0)), Some(Rect::new(9.0, 9.0, 20.0, 20.0))];
+        assert_eq!(overlapping(&same).unwrap(), vec![vec![0, 1, 2]]);
+        // With transparency, an opaque box isn't opened inside a see-through box, and boxes inside
+        // an opaque box are opened: an opaque box that overlaps only the inner one still joins it
+        // when that one is see-through.
+        let see = [true, false];
+        let mut sets = sweep(&bounds[..2], Some(&see)).unwrap();
+        assert_eq!(sets.groups(), vec![vec![0, 1]]);
+        let held = [Some(Rect::new(0.0, 0.0, 20.0, 20.0)), Some(Rect::new(0.0, 0.0, 10.0, 10.0)), Some(Rect::new(5.0, 5.0, 8.0, 8.0))];
+        let mut sets = sweep(&held, Some(&[false, true, false])).unwrap();
+        assert_eq!(sets.groups(), vec![vec![0, 1, 2]]);
+        let mut sets = sweep(&held, Some(&[true, false, false])).unwrap();
+        assert_eq!(sets.groups(), vec![vec![0, 1, 2]]);
+        let mut sets = sweep(&held, Some(&[false, false, true])).unwrap();
+        assert_eq!(sets.groups(), vec![vec![0, 1, 2]]);
+        let mut sets = sweep(&held, Some(&[false, false, false])).unwrap();
+        assert_eq!(sets.groups(), vec![vec![0], vec![1], vec![2]]);
+    }
+
+    /// Boxes nested at shared corners and placed at random, some see-through, group with and
+    /// without transparency as comparing every pair groups them.
+    #[test]
+    fn nested_and_scattered_boxes_group_as_comparing_every_pair() {
+        let mut seed = 0x51_7cc1_b727_220au64;
+        let mut next = |m: f64| {
+            seed ^= seed << 13;
+            seed ^= seed >> 7;
+            seed ^= seed << 17;
+            (seed % 1000) as f64 / 1000.0 * m
+        };
+        for round in 0..40 {
+            let n = 6 + round * 3;
+            let bounds: Vec<Option<Rect>> = (0..n)
+                .map(|_| {
+                    // Corners on a coarse grid so that edges are often shared and boxes often nest.
+                    let (x, y) = ((next(6.0).floor()) * 10.0, (next(6.0).floor()) * 10.0);
+                    let (w, h) = ((next(5.0).floor() + 1.0) * 10.0, (next(5.0).floor() + 1.0) * 10.0);
+                    Some(Rect::new(x, y, x + w, y + h))
+                })
+                .collect();
+            assert_eq!(overlapping(&bounds).unwrap(), every_pair(&bounds), "round {round}");
+            let see: Vec<bool> = (0..n).map(|_| next(1.0) < 0.3).collect();
+            let mut sets = sweep(&bounds, Some(&see)).unwrap();
+            assert_eq!(sets.groups(), every_pair_joining(&bounds, |i, j| see[i] || see[j]), "round {round}, with transparency");
+        }
+    }
+
     /// A filled rectangle, unstroked.
     fn filled(id: u64, r: Rect) -> Node {
         let look = vectorcraft_doc::Appearance::basic(
@@ -583,6 +685,62 @@ mod tests {
         assert_eq!(flatten_groups(&reach, &painted, &vec![false; n], 0.0).unwrap().len(), n);
     }
 
+    /// A small see-through box, then `n` opaque boxes nested around it, each inside the one
+    /// before and sharing its left and top edges.
+    fn nest_around_a_see_through_box(n: usize) -> (Vec<Option<Rect>>, Vec<bool>) {
+        let mut bounds = vec![Some(Rect::new(0.0, 0.0, 1.0, 1.0))];
+        bounds.extend((0..n).map(|i| Some(Rect::new(0.0, 0.0, 2.0 * (n - i) as f64 + 1.0, 2.0 * (n - i) as f64 + 1.0))));
+        let mut see = vec![false; n + 1];
+        see[0] = true;
+        (bounds, see)
+    }
+
+    /// Opaque boxes nested in each other around a see-through box each meet only the see-through
+    /// box, not the open opaque boxes they can't join, and all join it.
+    #[test]
+    fn nested_opaque_boxes_meet_only_the_see_through_box() {
+        let n = 512;
+        let (bounds, see) = nest_around_a_see_through_box(n);
+        let mut sets = sweep(&bounds, Some(&see)).unwrap();
+        assert_eq!(sets.meets, n);
+        assert_eq!(sets.groups(), vec![(0..=n).collect::<Vec<_>>()]);
+        // The unfiltered sweep that runs before it meets each box once too.
+        let mut sets = sweep(&bounds, None).unwrap();
+        assert_eq!(sets.meets, n);
+        assert_eq!(sets.groups(), vec![(0..=n).collect::<Vec<_>>()]);
+        let (painted, see) = nest_around_a_see_through_box(40);
+        let reach: Vec<Option<Rect>> = painted.iter().map(|b| b.map(|b| b.inflate(1.0, 1.0))).collect();
+        for fringe in [0.0, 0.7] {
+            let groups = flatten_groups(&reach, &painted, &see, fringe).unwrap();
+            check(&reach, &painted, &see, fringe, &groups, &format!("nest, fringe {fringe}"));
+            assert_eq!(groups, vec![(0..=40).collect::<Vec<_>>()]);
+        }
+    }
+
+    /// An opaque box inside a later see-through box is closed: later boxes meet the see-through
+    /// box instead, and join the opaque one through it.
+    #[test]
+    fn a_see_through_box_closes_an_opaque_box_inside_it() {
+        // An opaque box, a see-through box around it, a see-through box over both and an opaque
+        // box over the first.
+        let bounds = [
+            Some(Rect::new(0.0, 0.0, 10.0, 10.0)),
+            Some(Rect::new(0.0, 0.0, 20.0, 20.0)),
+            Some(Rect::new(5.0, 5.0, 30.0, 30.0)),
+            Some(Rect::new(8.0, 8.0, 12.0, 12.0)),
+        ];
+        let see = [false, true, true, false];
+        let mut sets = sweep(&bounds, Some(&see)).unwrap();
+        // The second box meets the first; the third meets the second; the fourth meets the second
+        // and the third.
+        assert_eq!(sets.meets, 4);
+        assert_eq!(sets.groups(), vec![vec![0, 1, 2, 3]]);
+        // Opaque boxes alone meet nothing.
+        let mut sets = sweep(&bounds, Some(&[false; 4])).unwrap();
+        assert_eq!(sets.meets, 0);
+        assert_eq!(sets.groups().len(), 4);
+    }
+
     /// An opaque box between a member and its group's top that paints over the member joins, and
     /// so on along a chain; one under the member stays, but for one within the fringe.
     #[test]
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..f7a9e971be 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1251,6 +1251,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   Object › Flatten Transparency takes a frame of threaded text out of the thread in the same way when Convert All Text to Outlines outlines it or when the frame becomes flat regions or an image, and the other frames keep the text they hold.
   Object › Flatten Transparency, the Flattener Preview, and EPS, PDF and print output that flatten transparency stop building a group's flat regions at the first region past the raster/vector balance's limit (10^(balance/20), rounded down) and rasterize the whole group without building the remaining regions. Building every region gives the same flattened art and the same files. With Clip Complex Regions on, a group builds every region and its image is clipped to them.
   Object › Flatten Transparency, the Flattener Preview, and EPS, PDF and print output that flatten transparency leave art without transparency as it is when it overlaps only other art without transparency, unless it overlaps a member of a see-through object's group and lies above that member and below the group's topmost object. Such art joins the group, and the group takes the place of its topmost object, so the stacking order stays the same. In files without transparency with Clip Complex Regions on, art under the group within one image pixel of a member joins it too. The 1 pt antialiasing margin goes around a group's art once, however deeply its groups nest. On a grid of 3,000 rectangles with a 0.5 pt stroke, 60 of them with a drop shadow, the Flattener Preview counts 180 affected objects where it counted 3,000, and Flatten Transparency with the Medium preset makes 240 flat regions and 2 images where it made one image of the whole grid. These rules are VectorCraft's own (`tests::flatten::opaque_art_that_touches_only_opaque_art_stays`, `tests::flatten::opaque_art_the_group_would_move_under_joins_it`).
+  When they group art for flattening, Object › Flatten Transparency, the Flattener Preview, and EPS, PDF and print output that flatten transparency compare the box of an object without transparency only with the boxes of see-through objects in the pass that splits art by transparency. In both passes, a box that lies inside an earlier box that ends no further right and joins everything it overlaps is not compared with later boxes. With one see-through object inside 512 nested objects without transparency, the grouping compares 1,024 pairs of boxes where it compared 262,145, and the groups stay the same (`cmd::flatten::analysis::tests::nested_opaque_boxes_meet_only_the_see_through_box`, `a_shrinking_nest_meets_only_its_outermost_box`).
   New Symbol and Redefine Symbol on a frame of threaded text take it out of the thread with the text it shows, which the symbol's art holds, and the other frames keep the text they hold. When the last frame goes into the symbol, the text it has no room for goes after the text of the last frame that stays. When every frame of a thread goes into the symbol, the copy of the last frame keeps all its text.
   With Optical Margin Alignment on, or Roman Hanging Punctuation on in the first paragraph, the glyphs at the ends of left-to-right type on a path hang outside its brackets, measured along the path. The type hangs at the start bracket when its line is placed there, hangs at the end bracket when the line is placed there, and hangs at both when it is centered. Glyphs that hang past the end bracket do not make the type overflow, and a hang stops at an open path's end. SVG export writes such type as outlines.
   Type › Type on a Path › Center on Top and Center on Bottom (`type.pathCenter.top`, `type.pathCenter.bottom`, also on the Contextual Task Bar for type on a closed path) slide type on a closed path so the middle of its span lands on the path's topmost or bottommost point as drawn, keep the span's length, and set the first paragraph to Center unless it is Center or Justify Center. This is VectorCraft's own behavior (`crates/geom/src/arc.rs`, `crates/engine/src/tests/pathtype.rs`).

From 60daa85f5bbce949d23c917ec4cd7af78f47e66f Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:15:31 -0800
Subject: [PATCH 35/48] Actions: a View menu step in a recorded batch counts in
 action set files
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Save Actions… writes version 6 when a View menu step sits inside a
`command.batch` step, since playback runs that step on its own, and Load
Actions… refuses such a nested step whose params are not an object.
---
 crates/ui-egui/src/panels/actions.rs       | 12 +++++++++---
 crates/ui-egui/src/panels/actions/files.rs | 22 +++++++++++++++++++---
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/crates/ui-egui/src/panels/actions.rs b/crates/ui-egui/src/panels/actions.rs
index a357e2cc3a..81e3074394 100644
--- a/crates/ui-egui/src/panels/actions.rs
+++ b/crates/ui-egui/src/panels/actions.rs
@@ -4655,7 +4655,8 @@ mod tests {
     }
 
     /// An action set with a View menu step saves as version 6 and loads back with the step; one whose
-    /// View menu step has params that are not an object is not an action set file.
+    /// View menu step has params that are not an object is not an action set file. A View menu step
+    /// in a recorded batch counts too, since playback runs it as its own step.
     #[test]
     fn a_saved_view_step_survives_as_version_6() {
         let (app, _) = app_with_a_view_step();
@@ -4666,9 +4667,14 @@ mod tests {
         assert_eq!(loaded.actions[0].steps, app.ui.action_sets[0].actions[0].steps);
         for params in [json!(5), json!([1]), json!(null)] {
             let step = json!({"command": "view.zoomIn", "params": params});
-            let bad = json!({"format": "vcactions", "version": 6, "name": "Bad", "actions": [{"name": "A", "steps": [step]}]});
-            assert_eq!(files::read_set(&bad.to_string(), "Test").unwrap_err(), "not an action set file", "{params}");
+            for step in [step.clone(), json!({"command": "command.batch", "params": {"commands": [step]}})] {
+                let bad = json!({"format": "vcactions", "version": 6, "name": "Bad", "actions": [{"name": "A", "steps": [step]}]});
+                assert_eq!(files::read_set(&bad.to_string(), "Test").unwrap_err(), "not an action set file", "{step}");
+            }
         }
+        let nested = json!({"commands": [{"command": "view.outline", "params": {}}]});
+        let set = ActionSet::new("Nested", vec![Action::new("A", vec![("command.batch".into(), nested)])]);
+        assert_eq!(serde_json::from_str::<Value>(&files::write_set(&set)).unwrap()["version"], json!(6), "a step in a recorded batch counts");
     }
 
     /// At Accelerated, the steps up to a stop play as saved steps, as they do without a stop: a key
diff --git a/crates/ui-egui/src/panels/actions/files.rs b/crates/ui-egui/src/panels/actions/files.rs
index 911e6ae41b..a8ae79e713 100644
--- a/crates/ui-egui/src/panels/actions/files.rs
+++ b/crates/ui-egui/src/panels/actions/files.rs
@@ -153,6 +153,22 @@ fn select_paths_in<'a>(command: &str, params: &'a Value) -> Vec<&'a Value> {
     steps_in(super::SELECT_PATH_STEP, command, params)
 }
 
+/// The params of the View menu steps ([`crate::menus::plays_in_app`]) in a step, as [`stops_in`]
+/// finds stops.
+fn ui_steps_in<'a>(command: &str, params: &'a Value) -> Vec<&'a Value> {
+    if crate::menus::plays_in_app(command) {
+        return vec![params];
+    }
+    if command != "command.batch" {
+        return vec![];
+    }
+    let steps = params.get("commands").and_then(Value::as_array).into_iter().flatten();
+    steps
+        .filter(|step| step.get("command").and_then(Value::as_str).is_some_and(crate::menus::plays_in_app))
+        .map(|step| step.get("params").unwrap_or(&Value::Null))
+        .collect()
+}
+
 /// `set` as the text of an action set file.
 pub fn write_set(set: &ActionSet) -> String {
     let actions = set
@@ -174,7 +190,7 @@ pub fn write_set(set: &ActionSet) -> String {
     let has_select_object = steps().any(|(command, params)| !select_objects_in(command, params).is_empty());
     let has_select_path = steps().any(|(command, params)| !select_paths_in(command, params).is_empty());
     let has_stop = steps().any(|(command, params)| !stops_in(command, params).is_empty());
-    let has_ui_step = steps().any(|(command, _)| crate::menus::plays_in_app(command));
+    let has_ui_step = steps().any(|(command, params)| !ui_steps_in(command, params).is_empty());
     let version = match (has_select_path, has_select_object, has_stop, set.actions.iter().any(|a| !a.excluded_steps.is_empty())) {
         _ if has_ui_step => 6,
         (true, ..) => 5,
@@ -217,8 +233,8 @@ pub fn read_set(text: &str, name: &str) -> Result<ActionSet, String> {
     if select_objects.any(|p| super::select_object_params(p).is_err()) {
         return Err("not an action set file".into());
     }
-    let mut ui_steps = f.actions.iter().flat_map(|a| &a.steps).filter(|s| crate::menus::plays_in_app(&s.command));
-    if ui_steps.any(|s| !s.params.is_object()) {
+    let mut ui_steps = f.actions.iter().flat_map(|a| &a.steps).flat_map(|s| ui_steps_in(&s.command, &s.params));
+    if ui_steps.any(|p| !p.is_object()) {
         return Err("not an action set file".into());
     }
     let actions = f

From 75c74557bb837906b1d19c2f81372b910e29ce31 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:19:23 -0800
Subject: [PATCH 36/48] Scripts: $.fileName names the file of the code that
 reads it

$.fileName gave the file being run, so a function defined in a file
that #include inserted, in a file $.evalFile ran, or in an earlier run
of a named engine reported the calling file instead of its own.

- vectorcraft_js: HostItem::SiteGetter gives a getter the CallSite
  (source tag, line, column) of the code that reads it.
- $.fileName maps that place through the run's source maps, or the
  maps a named engine kept, to the file the code is in. It is empty in
  code from a script given as source and in kept code whose map was
  dropped. Code that eval or Function compiled still gets the file
  being run.

Docs: docs/mcp.md, docs/target-app-parity.md.
---
 crates/engine/src/script/include.rs       |  3 +-
 crates/engine/src/script/mod.rs           | 40 ++++++++++++++--
 crates/engine/src/tests/script_engines.rs | 46 ++++++++++++++++++
 crates/engine/src/tests/script_include.rs | 42 ++++++++++++++++
 crates/js/src/host.rs                     | 58 ++++++++++++++++++++++-
 crates/js/src/host_tests.rs               | 35 ++++++++++++++
 crates/js/src/lib.rs                      |  2 +-
 docs/mcp.md                               |  9 +++-
 docs/target-app-parity.md                 |  3 +-
 9 files changed, 227 insertions(+), 11 deletions(-)

diff --git a/crates/engine/src/script/include.rs b/crates/engine/src/script/include.rs
index 4ec68dbbde..f1928228df 100644
--- a/crates/engine/src/script/include.rs
+++ b/crates/engine/src/script/include.rs
@@ -321,7 +321,8 @@ impl Files {
         std::env::var("JSINCLUDE").map(|v| v.split(';').map(str::trim).filter(|p| !p.is_empty()).map(PathBuf::from).collect()).unwrap_or_default()
     }
 
-    /// The file being run now, as `$.fileName` gives it (empty for a script given as text).
+    /// The file being run now: the script, or the file `$.evalFile` is running (empty for a script
+    /// given as text). `$.fileName` gives it to code that `eval` or `Function` compiled.
     pub(crate) fn file_name(&self) -> String {
         self.frames.last().map(|f| f.shown.to_string()).unwrap_or_default()
     }
diff --git a/crates/engine/src/script/mod.rs b/crates/engine/src/script/mod.rs
index 53f6e18f75..22c9d2d4e5 100644
--- a/crates/engine/src/script/mod.rs
+++ b/crates/engine/src/script/mod.rs
@@ -822,6 +822,29 @@ impl Host {
         }
     }
 
+    /// `$.fileName` read by the code at `site`: the file that code is in, by the source map of the
+    /// source it came from (this run's script, a file `$.evalFile` gave, or code an earlier run of
+    /// the named engine compiled), so a function keeps the file it was defined in. Code from a file
+    /// `#include` inserted is in that file. A script given as text has no name, and neither has
+    /// code whose map the named engine no longer keeps. Code that `eval` or `Function` compiled has
+    /// no map, and is given the file being run now.
+    fn file_name_at(&self, site: vectorcraft_js::CallSite) -> String {
+        let name = |m: &include::SourceMap| m.locate(site.line, site.column).1.to_string();
+        let tag = site.source;
+        if tag == vectorcraft_js::UNKNOWN_SOURCE {
+            return self.files.borrow().file_name();
+        }
+        let script = self.script_tag.get();
+        match tag.checked_sub(script).filter(|_| script != vectorcraft_js::UNKNOWN_SOURCE) {
+            Some(0) => name(&self.script_map.borrow()),
+            Some(n) => self.eval_maps.borrow().get(n as usize - 1).map(name).unwrap_or_default(),
+            None => {
+                let kept = self.kept_maps.as_ref().map(|k| k.borrow());
+                kept.as_ref().and_then(|k| k.get(tag)).map(|k| name(&k.map)).unwrap_or_default()
+            }
+        }
+    }
+
     /// Adds a line to the run's console and, during a slice, to the session's.
     fn line(&self, entry: console::Entry, cut: bool) {
         let line = console::ConsoleLine { run: self.run, name: self.name.clone(), entry };
@@ -1254,9 +1277,9 @@ fn each_line(text: &str, mut done: impl FnMut(String, bool)) {
 
 /// The `$` object: `$.write(...values)` writes the values to the Script Console as `String(value)`
 /// gives them, one after another, and `$.writeln(...values)` does the same and ends the line.
-/// `$.evalFile(path[, timeout])` runs a file and gives its last value, `$.fileName` is the file
-/// being run and `$.includePath` the `#includepath` list. Its other members are
-/// [`dollar::members`].
+/// `$.evalFile(path[, timeout])` runs a file and gives its last value, `$.fileName` is the file the
+/// code reading it is in ([`Host::file_name_at`]) and `$.includePath` the `#includepath` list. Its
+/// other members are [`dollar::members`].
 fn dollar_object(link: &Link, info: dollar::RunInfo, localization: &Rc<vectorcraft_js::Localization>) -> Vec<(String, HostItem)> {
     let writer = |end: bool| {
         let l = link.clone();
@@ -1278,6 +1301,15 @@ fn dollar_object(link: &Link, info: dollar::RunInfo, localization: &Rc<vectorcra
             Ok(Data::String(text))
         }))
     };
+    let file_name = {
+        let l = link.clone();
+        HostItem::SiteGetter(Rc::new(move |site| {
+            let h = current(&l)?;
+            let text = h.file_name_at(site);
+            h.charge_call(text.len() as u64 + 2)?;
+            Ok(Data::String(text))
+        }))
+    };
     let eval_file = {
         let (l, end, strict) = (link.clone(), link.clone(), link.clone());
         HostItem::Evaluator {
@@ -1294,7 +1326,7 @@ fn dollar_object(link: &Link, info: dollar::RunInfo, localization: &Rc<vectorcra
         ("write".into(), writer(false)),
         ("writeln".into(), writer(true)),
         ("evalFile".into(), eval_file),
-        ("fileName".into(), getter(include::Files::file_name)),
+        ("fileName".into(), file_name),
         ("includePath".into(), getter(include::Files::include_path)),
     ];
     items.extend(dollar::members(link, info, localization));
diff --git a/crates/engine/src/tests/script_engines.rs b/crates/engine/src/tests/script_engines.rs
index 7e768c5875..dd27d9ff1f 100644
--- a/crates/engine/src/tests/script_engines.rs
+++ b/crates/engine/src/tests/script_engines.rs
@@ -202,6 +202,52 @@ fn an_error_in_code_an_earlier_run_kept_is_at_that_runs_file_and_line() {
     let _ = std::fs::remove_dir_all(base);
 }
 
+/// `$.fileName` in code an earlier run of a named engine kept names the file that code is in: that
+/// run's script, a file it included or a file `$.evalFile` gave, not the file of the run that calls
+/// it. Code from a script given as text, and code whose place the engine no longer keeps, has no
+/// name; a dropped engine takes its functions with it.
+#[test]
+fn a_kept_function_reads_the_file_name_of_the_file_it_is_in() {
+    let base: PathBuf = std::env::temp_dir().join(format!("vc-script-engines-file-name-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&base);
+    for dir in ["a", "b"] {
+        std::fs::create_dir_all(base.join(dir)).unwrap();
+    }
+    std::fs::write(base.join("a/inc.jsxinc"), "function fromInclude() { return $.fileName; }").unwrap();
+    std::fs::write(base.join("a/ev.jsxinc"), "\nfunction fromEval() { return $.fileName; }").unwrap();
+    let def = base.join("a/def.jsx");
+    std::fs::write(&def, "#targetengine e\nfunction where() { return $.fileName; }\n#include \"inc.jsxinc\"\n$.evalFile('ev.jsxinc');").unwrap();
+    let caller = base.join("b/caller.jsx");
+    let call = |s: &mut Session, text: &str| -> Vec<String> {
+        std::fs::write(&caller, text).unwrap();
+        let r = s.execute("script.run", &json!({"path": caller.to_string_lossy()})).unwrap();
+        r["log"][0].as_array().unwrap().iter().map(|v| v.as_str().unwrap().replace('\\', "/")).collect()
+    };
+    let mut s = Session::new();
+    s.execute("script.run", &json!({"path": def.to_string_lossy()})).unwrap();
+    let from_file = call(&mut s, "#targetengine e\nvc.log([where(), fromInclude(), fromEval(), $.fileName]);");
+    let from_text = log(&mut s, "#targetengine e\nvc.log([where(), $.fileName, eval('where()'), eval('$.fileName')]);");
+    run(&mut s, "#targetengine e\nfunction fromText() { return $.fileName; }").unwrap();
+    let text_kept = call(&mut s, "#targetengine e\nvc.log([fromText(), $.fileName]);");
+    // Each run's own place takes the room of the ones before, so def.jsx's places go.
+    TEST_KEPT_MAP_BYTES.with(|b| b.set(Some(300)));
+    for _ in 0..20 {
+        run(&mut s, "#targetengine e\nvar x = 1;").unwrap();
+    }
+    let evicted = call(&mut s, "#targetengine e\nvc.log([where(), fromEval(), $.fileName]);");
+    TEST_KEPT_MAP_BYTES.with(|b| b.set(None));
+    s.execute("script.engine.drop", &json!({"name": "e"})).unwrap();
+    let dropped = log(&mut s, "#targetengine e\nvc.log(typeof where);");
+    let _ = std::fs::remove_dir_all(&base);
+    let ends = |names: &[String], ends: &[&str]| names.len() == ends.len() && names.iter().zip(ends).all(|(n, e)| n.ends_with(e));
+    assert!(ends(&from_file, &["a/def.jsx", "a/inc.jsxinc", "a/ev.jsxinc", "b/caller.jsx"]), "{from_file:?}");
+    let shown: Vec<String> = from_text[0].as_array().unwrap().iter().map(|v| v.as_str().unwrap().replace('\\', "/")).collect();
+    assert!(ends(&shown, &["a/def.jsx", "", "a/def.jsx", ""]) && shown[1].is_empty() && shown[3].is_empty(), "{shown:?}");
+    assert!(text_kept[0].is_empty() && text_kept[1].ends_with("b/caller.jsx"), "{text_kept:?}");
+    assert!(evicted[0].is_empty() && evicted[1].is_empty() && evicted[2].ends_with("b/caller.jsx"), "{evicted:?}");
+    assert_eq!(dropped, json!(["undefined"]));
+}
+
 /// A named engine keeps the places of its earlier runs' code within its budget, the oldest going
 /// first, and the code still runs once its place is gone.
 #[test]
diff --git a/crates/engine/src/tests/script_include.rs b/crates/engine/src/tests/script_include.rs
index e5acc536cc..1bf259409d 100644
--- a/crates/engine/src/tests/script_include.rs
+++ b/crates/engine/src/tests/script_include.rs
@@ -374,6 +374,48 @@ fn script_eval_file_returns_last_value_and_shares_globals() {
     let _ = std::fs::remove_dir_all(base);
 }
 
+/// `$.fileName` names the file the code reading it is in: a function `$.evalFile` gave names its
+/// file after the file has returned, through nested files, and code an included file inserted names
+/// that file. Code that `eval` compiled names the file being run.
+#[test]
+fn script_file_name_names_the_file_of_the_code_that_reads_it() {
+    let base = folder("filename");
+    write(&base.join("main/inc.jsxinc"), "function fromInclude() { return $.fileName; }\nvar includedTop = $.fileName;");
+    write(
+        &base.join("main/sub/outer.jsx"),
+        "function fromOuter() { return $.fileName; }\nvar before = $.fileName;\n$.evalFile('inner.jsx');\nvar after = $.fileName;\nfromInner();",
+    );
+    write(&base.join("main/sub/inner.jsx"), "function fromInner() { return $.fileName; }\n$.fileName;");
+    let r = run(
+        &base,
+        "#include \"inc.jsxinc\"\nvar nested = $.evalFile('sub/outer.jsx');\n\
+         vc.log([fromInclude(), includedTop, before, after, nested, fromOuter(), fromInner(), $.fileName, eval('$.fileName')]);",
+    )
+    .unwrap();
+    let names: Vec<String> = r["log"][0].as_array().unwrap().iter().map(|v| v.as_str().unwrap().replace('\\', "/")).collect();
+    let ends = [
+        "main/inc.jsxinc",
+        "main/inc.jsxinc",
+        "sub/outer.jsx",
+        "sub/outer.jsx",
+        "sub/inner.jsx",
+        "sub/outer.jsx",
+        "sub/inner.jsx",
+        "main/main.jsx",
+        "main/main.jsx",
+    ];
+    assert_eq!(names.len(), ends.len(), "{names:?}");
+    for (name, end) in names.iter().zip(ends) {
+        assert!(name.ends_with(end), "{name} ends with {end}: {names:?}");
+    }
+    // A script given as text has no name, and neither have the functions it defines.
+    let r = Session::new()
+        .execute("script.run", &json!({"source": "function f() { return $.fileName; }\nvc.log([f(), $.fileName]);", "name": "t.js"}))
+        .unwrap();
+    assert_eq!(r["log"], json!([["", ""]]));
+    let _ = std::fs::remove_dir_all(base);
+}
+
 #[test]
 fn script_eval_file_outside_scope_refused() {
     let base = folder("evaloutside");
diff --git a/crates/js/src/host.rs b/crates/js/src/host.rs
index fbb5e4fc90..fb980843e8 100644
--- a/crates/js/src/host.rs
+++ b/crates/js/src/host.rs
@@ -74,6 +74,21 @@ pub enum HostError {
 /// A function the host gives a script, with its arguments converted.
 pub type HostFunction = Rc<dyn Fn(Vec<Data>) -> Result<Data, HostError>>;
 
+/// The place in the script's code that reads a [`HostItem::SiteGetter`] property: the source tag
+/// of that code, as [`crate::Realm::error_tag`] gives one, and the line and column there, counted
+/// from 1. A function an earlier script defined keeps its script's tag; code that `eval` or
+/// `Function` compiled has [`crate::UNKNOWN_SOURCE`]. A read with none of the script's code
+/// running has [`crate::UNKNOWN_SOURCE`] and line and column 0.
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct CallSite {
+    pub source: u32,
+    pub line: u32,
+    pub column: u32,
+}
+
+/// A getter the host gives a script that is told where the code reading it is.
+pub type SiteFunction = Rc<dyn Fn(CallSite) -> Result<Data, HostError>>;
+
 /// How one argument of a [`HostItem::Converted`] function is read.
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum Arg {
@@ -96,6 +111,8 @@ pub(crate) enum ArgRead {
     Text,
     /// One by one as the list says; those past its end are not read.
     Each(Rc<[Arg]>),
+    /// None: the function is given the [`CallSite`] of the code that calls it, as three numbers.
+    Site,
 }
 
 /// A member of an object the host adds to the global environment.
@@ -114,6 +131,9 @@ pub enum HostItem {
     /// A property whose value the function gives each time it is read, frozen as
     /// [`HostItem::Value`] gives its value.
     FrozenGetter(HostFunction),
+    /// A property whose value the function gives each time it is read, given the [`CallSite`] of
+    /// the code that reads it.
+    SiteGetter(SiteFunction),
     /// A property whose value `get` gives each time it is read, and that `set` is given each value
     /// assigned to it, as its one argument; an error from `set` is thrown to the script.
     Property {
@@ -357,7 +377,10 @@ impl Interp {
     /// Calls host function `f`: reads its arguments as `how` says, runs it, and gives its result to
     /// the script.
     pub(crate) fn call_data(&mut self, f: &crate::heap::DataFn, name: &Rc<str>, args: &[Value], how: &ArgRead) -> JsResult<Value> {
-        let data = self.read_args(name, args, how)?;
+        let data = match how {
+            ArgRead::Site => site_data(self.call_site()),
+            _ => self.read_args(name, args, how)?,
+        };
         // Only the script's own code, in a run that can pause, can wait for a result.
         let can_wait = self.in_slice && self.reentry == 0;
         self.can_wait.set(can_wait);
@@ -375,6 +398,18 @@ impl Interp {
         }
     }
 
+    /// Where the innermost frame of the script's code is: its source's tag and the line and column
+    /// of the instruction it is running.
+    fn call_site(&self) -> CallSite {
+        match self.script_frames().last() {
+            Some((code, pc, _)) => {
+                let (line, column) = code.line_column(pc.saturating_sub(1));
+                CallSite { source: code.source.tag, line, column }
+            }
+            None => CallSite { source: crate::UNKNOWN_SOURCE, line: 0, column: 0 },
+        }
+    }
+
     /// Calls evaluator `f` ([`HostItem::Evaluator`]): reads its arguments, runs it, and runs the
     /// source it gives as global code, as an indirect `eval` does, giving that code's completion
     /// value. A result that is not a string is given to the script as it is. `end` is called once
@@ -442,7 +477,7 @@ impl Interp {
         for (i, a) in args.iter().enumerate() {
             reading.path.push(Step::Index(u32::try_from(i).unwrap_or(u32::MAX)));
             let d = match how {
-                ArgRead::Data | ArgRead::Frozen => self.read_data(a, &mut reading),
+                ArgRead::Data | ArgRead::Frozen | ArgRead::Site => self.read_data(a, &mut reading),
                 ArgRead::Text => self.read_text(a, &mut reading),
                 ArgRead::Each(list) => match list.get(i) {
                     Some(Arg::TextOrUndefined) if matches!(a, Value::Undefined) => Ok(Data::Undefined),
@@ -531,6 +566,10 @@ impl Interp {
             HostItem::Value(d) => Prop::Data { value: self.write_data(d, 0, true)?, flags: ENUMERABLE },
             HostItem::Getter(f) => Prop::Accessor { get: Some(self.host_function(f, &full, ArgRead::Data)), set: None, flags: ENUMERABLE },
             HostItem::FrozenGetter(f) => Prop::Accessor { get: Some(self.host_function(f, &full, ArgRead::Frozen)), set: None, flags: ENUMERABLE },
+            HostItem::SiteGetter(f) => {
+                let get: HostFunction = Rc::new(move |data| f(read_site(&data)));
+                Prop::Accessor { get: Some(self.host_function(get, &full, ArgRead::Site)), set: None, flags: ENUMERABLE }
+            }
             HostItem::Property { get, set } => Prop::Accessor {
                 get: Some(self.host_function(get, &full, ArgRead::Data)),
                 set: Some(self.host_function(set, &full, ArgRead::Data)),
@@ -577,3 +616,18 @@ enum Slot {
     Index(usize),
     Name(String),
 }
+
+/// `site` as the three numbers [`ArgRead::Site`] gives its function.
+fn site_data(site: CallSite) -> Vec<Data> {
+    vec![Data::Number(f64::from(site.source)), Data::Number(f64::from(site.line)), Data::Number(f64::from(site.column))]
+}
+
+/// The [`CallSite`] that [`site_data`] gave as `data`.
+fn read_site(data: &[Data]) -> CallSite {
+    let at = |i: usize, missing: u32| match data.get(i) {
+        // Each number is a `u32` that `site_data` gave, so the conversion is exact.
+        Some(Data::Number(n)) => *n as u32,
+        _ => missing,
+    };
+    CallSite { source: at(0, crate::UNKNOWN_SOURCE), line: at(1, 0), column: at(2, 0) }
+}
diff --git a/crates/js/src/host_tests.rs b/crates/js/src/host_tests.rs
index de252c6c64..700efddfb2 100644
--- a/crates/js/src/host_tests.rs
+++ b/crates/js/src/host_tests.rs
@@ -271,6 +271,41 @@ fn a_frozen_getter_gives_a_frozen_value_each_time() {
     assert_eq!(r.run(source).unwrap(), JsValue::String("true,true,true,1,false,false".into()));
 }
 
+/// A site getter is told the source tag, line and column of the code that reads it: a function an
+/// earlier script or an evaluator's source defined keeps that source's tag, and code that `eval`
+/// compiled has none.
+#[test]
+fn a_site_getter_is_told_where_the_code_that_reads_it_is() {
+    let mut r = realm(10_000_000);
+    let seen: Rc<RefCell<Vec<CallSite>>> = Rc::default();
+    let log = seen.clone();
+    let site: SiteFunction = Rc::new(move |s| {
+        log.borrow_mut().push(s);
+        Ok(Data::Number(f64::from(s.line)))
+    });
+    let source: HostFunction = Rc::new(|_| Ok(Data::String("\n\nfunction inEval() { return host.site; }".into())));
+    let load = HostItem::Evaluator { source, end: Rc::new(|| {}), strict_writes: Rc::new(|| None) };
+    r.define_host_object("host", vec![("site".into(), HostItem::SiteGetter(site)), ("load".into(), load)]).unwrap();
+    r.run("function early() {\n  return  host.site;\n}\nhost.load();").unwrap();
+    let first = r.script_tag();
+    assert_eq!(r.run("\n\n\n\nhost.site + early() + inEval() + eval('host.site')").unwrap(), JsValue::Number(5.0 + 2.0 + 3.0 + 1.0));
+    let second = r.script_tag();
+    let sites = seen.borrow().clone();
+    assert_eq!(
+        sites,
+        vec![
+            CallSite { source: second, line: 5, column: 1 },
+            CallSite { source: first, line: 2, column: 11 },
+            CallSite { source: first + 1, line: 3, column: 28 },
+            CallSite { source: UNKNOWN_SOURCE, line: 1, column: 1 },
+        ]
+    );
+    seen.borrow_mut().clear();
+    // A getter a built-in calls is at the place of the code that called the built-in.
+    assert_eq!(r.run("\nObject.getOwnPropertyDescriptor(host, 'site').get.call(host)").unwrap(), JsValue::Number(2.0));
+    assert_eq!(seen.borrow().first().map(|s| s.source), Some(r.script_tag()));
+}
+
 #[test]
 fn a_text_function_takes_each_argument_as_string_gives_it() {
     let mut r = realm(1_000_000);
diff --git a/crates/js/src/lib.rs b/crates/js/src/lib.rs
index cad290f1af..2e61f2e1bb 100644
--- a/crates/js/src/lib.rs
+++ b/crates/js/src/lib.rs
@@ -80,7 +80,7 @@ pub use ast::{
 };
 pub use builtins::extensions::Localization;
 pub use error::{SyntaxError, TOO_DEEP, TOO_LONG};
-pub use host::{Arg, Data, DataLimits, HostError, HostFunction, HostItem, ScriptItem};
+pub use host::{Arg, CallSite, Data, DataLimits, HostError, HostFunction, HostItem, ScriptItem, SiteFunction};
 pub use lexer::{Goal, Lexer};
 pub use number::to_string as number_to_string;
 pub use realm::{Interrupt, JsValue, LimitKind, Limits, MAX_UNBROKEN_FUEL, Progress, Realm, RunError, RunErrorKind, UNKNOWN_SOURCE};
diff --git a/docs/mcp.md b/docs/mcp.md
index 274db05a34..1daefda51d 100644
--- a/docs/mcp.md
+++ b/docs/mcp.md
@@ -1947,8 +1947,10 @@ app through the global object `vc`, and writes to the Script Console and runs ot
   file). Its preprocessor lines are read as the script's are. `timeout` is a number of milliseconds from 0; the file
   is read at once and `timeout` is not waited on. The run's fuel and limits apply to the file. An empty path, a
   missing file and a refused path throw errors the script can catch.
-- `$.fileName` is the file being run, which is the file `$.evalFile` is running while it runs, and is empty for a
-  script given as `source`. `$.includePath` is the current `#includepath` list, separated by `;`. `$.engineName` is
+- `$.fileName` is the file of the code that reads it: the script, a file it included with `#include`, or a file
+  `$.evalFile` ran, also when a function that file defined is called after `$.evalFile` returned. It is empty in code
+  from a script given as `source`. In code that `eval` or `Function` compiled it is the file being run, which is the
+  file `$.evalFile` is running while it runs. `$.includePath` is the current `#includepath` list, separated by `;`. `$.engineName` is
   the name `#targetengine` gave the engine the script runs in (`VectorCraft` without the line) and is read-only.
 - `alert(message[, title, errorIcon])`, `confirm(message[, noAsDflt, title])` and `prompt(message, preset[, title])`
   open a dialog, described below. `vc.api.has("dialogs")` is true.
@@ -2092,6 +2094,9 @@ no engines, and the engines it left are dropped when their own thread next uses
   for 8 MiB of source maps, the oldest going first, and a run whose script does not compile keeps none. An error in
   code whose place is gone, or in code that `eval` or `Function` compiled, is reported without a line and column, and
   the code still runs.
+- `$.fileName` in code an earlier run compiled names the file that code is in, by the same places: the earlier run's
+  script, a file it included or a file its `$.evalFile` ran, not the calling run's file. It is empty in code from an
+  earlier script given as `source`, even when that run had a name, and in code whose place is gone.
 - `vc`, `$`, `alert`, `confirm` and `prompt` act for the run that calls them, including a copy an earlier run kept in a
   global. `vc.args` is the calling run's `args`, through a `vc` object an earlier run kept too. An engine
   holds no document: `vc.document` is a copy, read when it is called. What a run sets on `$` (`$.locale`,
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..f0d1ff4fcf 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -780,8 +780,9 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Scripts: an error `$.evalFile` throws for a file it cannot run is reported at that file's line and column only while no `catch` has taken it. Caught and thrown again later, in the script or in another file, it is reported where it was thrown again, and a new error whose message holds its text is reported where that error was thrown. VectorCraft's own rule. `crates/engine/src/tests/script_include.rs`, `crates/js/src/host_tests.rs`.
   - Scripts: an uncaught error that one or more `finally` blocks pass on unchanged, in the script or in a function it called, is reported at the line and column where it was thrown, in `script.run`'s report and the Script Console. An error a `finally` block throws is reported at that throw, and one its `return`, `break` or `continue` discards is not reported. VectorCraft's own rule. `crates/engine/src/tests/script_include.rs`, `crates/js/src/host_tests.rs`.
   - Scripts: an error a `finally` block passes on is still reported where it was thrown when the block's allocations collect garbage under a small heap limit, and a `finally` block that `return`, `break` or `continue` leaves drops the saved location of its error as it leaves, so a collection no longer counts that code as live. VectorCraft's own rule. `crates/js/src/host_tests.rs`.
-  - Scripts: a run reads its preprocessor lines before any of it runs: `#include` and `//@include` put another file in place of the line, looked for beside the including file, in the `#includepath` folders and in `JSINCLUDE`; `#script` names the run; `#target` and `#strict off` are taken, `#strict on` turns on strict write checks (below), `#targetengine` names the engine (below), and `#engine` is refused. `$.evalFile` runs a file with the same globals and returns its last value, and `$.fileName` and `$.includePath` give the file being run and the include folders. A script run from a file reads these files only in its folder and below, without `..` names or links that lead out, and an error in one is reported at its own file, line and column ([preprocessor directives](https://extendscript.docsforadobe.dev/extendscript-tools-features/preprocessor-directives/), [the `$` object](https://extendscript.docsforadobe.dev/extendscript-tools-features/dollar-object/); `crates/engine/src/tests/script_include.rs`).
+  - Scripts: a run reads its preprocessor lines before any of it runs: `#include` and `//@include` put another file in place of the line, looked for beside the including file, in the `#includepath` folders and in `JSINCLUDE`; `#script` names the run; `#target` and `#strict off` are taken, `#strict on` turns on strict write checks (below), `#targetengine` names the engine (below), and `#engine` is refused. `$.evalFile` runs a file with the same globals and returns its last value, and `$.fileName` and `$.includePath` give the current script's file and the include folders. A script run from a file reads these files only in its folder and below, without `..` names or links that lead out, and an error in one is reported at its own file, line and column ([preprocessor directives](https://extendscript.docsforadobe.dev/extendscript-tools-features/preprocessor-directives/), [the `$` object](https://extendscript.docsforadobe.dev/extendscript-tools-features/dollar-object/); `crates/engine/src/tests/script_include.rs`).
   - Scripts: `#targetengine name` (and `//@targetengine name`) runs the script in a named engine that lasts for the session, and a later script that names it sees the globals and functions earlier ones left ([preprocessor directives](https://extendscript.docsforadobe.dev/extendscript-tools-features/preprocessor-directives/)); `$.engineName` gives the name ([the `$` object](https://extendscript.docsforadobe.dev/extendscript-tools-features/dollar-object/)). VectorCraft's own rules: a script without the line and `#targetengine main` get a new engine each run, the line comes once in the script itself before its code, a session keeps 8 named engines with 64 MiB of heap each, an error or a stop keeps the globals the run set while the documents go back, kept host functions act for the run that calls them, `script.engines` lists the engines and `script.engine.drop` drops one, and the web build has none. `crates/engine/src/tests/script_engines.rs`.
+  - Scripts: `$.fileName` is a read-only name of the script file in use ([the help page](https://extendscript.docsforadobe.dev/extendscript-tools-features/dollar-object/)). VectorCraft's own rules: it names the file of the code that reads it, so a function a file included with `#include` or run with `$.evalFile` defined, or one an earlier run of a named engine kept, gives its own file and not the calling file; code from a script given as `source`, and kept code whose place the engine dropped, gives an empty name, and code that `eval` or `Function` compiled gives the file being run. `crates/engine/src/tests/script_include.rs`, `crates/engine/src/tests/script_engines.rs`.
   - Scripts: a runtime error is shown at the line that was running ([the help page](https://extendscript.docsforadobe.dev/extendscript-toolkit/debugging-in-the-toolkit/)). VectorCraft's own rules: an error in code an earlier run of a named engine compiled, such as a function it defined, is reported at that code's file, line and column (the earlier run's script, a file it included or a file its `$.evalFile` ran), while the report and its console line keep the calling run's name; a script given as text is named by its run's name, and each engine keeps these places for 8 MiB of source maps, the oldest going first. An error in code whose place is gone, or in code that `eval` or `Function` compiled, is reported without a line and column, and the code still runs. `crates/engine/src/tests/script_engines.rs`.
   - Scripts: `File` and `Folder` ([File object](https://extendscript.docsforadobe.dev/file-system-access/file-object/), [Folder object](https://extendscript.docsforadobe.dev/file-system-access/folder-object/)) name files and folders by platform or URI path, with `name`, `fsName`, `absoluteURI`, `relativeURI`, `parent`, `Folder.current` and `encode`/`decode`, and read them: `exists`, `length`, the dates, `getFiles` with a mask or a function, and `open('r')` with `read`, `readln`, `readch`, `seek`, `tell` and `close`, decoding by byte order mark, `encoding`, UTF-8 or CP1252. VectorCraft's own rules: a script reads only in its own folder and below (and inside the automation read roots when they are set); any other path and a network or device path are refused before anything is looked up, and a link that leads out is refused as well (`false` or `null`, with `error` set); a file is read whole up to 8 MiB and a run reads up to 32 MiB; writing, the file dialogs and `execute` are not available yet. `crates/engine/src/tests/script_io.rs`.
   - Scripts: `#strict on` (and `//@strict on`) runs the script with the checks the [`$` object](https://extendscript.docsforadobe.dev/extendscript-tools-features/dollar-object/) help page gives for `$.strict`: an assignment to a read-only property throws a `TypeError`, and so does a new property on an object that takes none. VectorCraft's own rules: a getter-only property counts as read-only, the objects that take no new properties are the non-extensible ones (`Object.preventExtensions`, `seal`, `freeze`, and the frozen `vc` and `$` objects), the last `#strict` line of the script and its includes sets the whole run, a file `$.evalFile` runs keeps its own line's checks for its code, and the rest of ES5 strict mode stays with `'use strict'`. Without the line, runs are unchanged. `crates/engine/src/tests/script_include.rs` (`strict_on_*`, `strict_mode_in_eval_file_is_scoped`), `crates/js/src/interp_tests.rs` (`strict_writes_are_separate_from_es5_strict`).

From 6d0556e60f5f1eafc5ebf6d54f89c05777609433 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:31:37 -0800
Subject: [PATCH 37/48] Type: a threaded story measures each frame with the
 paragraphs it needs

Distributing a story through threaded frames measured every frame but the
last with the whole rest of the story, and copied that rest several times
per frame, so a long story through many frames cost frames times story
length.

- The rest of the story is a borrowed view of the given runs (run index,
  byte offset, length). Each frame's share is copied once; the slices,
  styles of empty shares and the run left once the story is used up are
  the same as before.
- Area type without Shrink Text to Fit whose lines align to the top is
  first measured with the text through the end of the paragraph that
  reaches about twice the previous frame's share (at least 512 bytes),
  doubling while the story goes on. The share is taken when its text
  stops fitting before the last paragraph break measured; layout places
  lines in order, stops at the first that does not fit and shapes each
  paragraph on its own text. Type on a path, Shrink Text to Fit, other
  vertical alignments and a share ending in the story's last paragraph
  are measured with the whole rest.

Tests compare every slice with the earlier algorithm, kept in the tests,
for many kinds of frames, styles and paragraphs and 12 seeded stories.
A story of 1,500 paragraphs (55,892 bytes) through 40 frames was laid
out over 2,126,762 bytes while measuring and is now laid out over
21,035.
---
 crates/text/src/thread.rs       | 243 +++++++++++++++++++++++++---
 crates/text/src/thread/tests.rs | 272 +++++++++++++++++++++++++++++++-
 docs/target-app-parity.md       |   1 +
 3 files changed, 491 insertions(+), 25 deletions(-)

diff --git a/crates/text/src/thread.rs b/crates/text/src/thread.rs
index cfdd41cc78..0abd172bff 100644
--- a/crates/text/src/thread.rs
+++ b/crates/text/src/thread.rs
@@ -5,9 +5,9 @@
 //! with [`distribute`].
 
 use vectorcraft_doc::text::ListCounts;
-use vectorcraft_doc::{ParaStyle, TextObject, TextRun};
+use vectorcraft_doc::{CharStyle, ParaStyle, TextKind, TextObject, TextRun};
 
-use crate::edit::{normalize, runs_len, slice_runs, style_at};
+use crate::edit::{floor_char, normalize, runs_len};
 use crate::{FontDb, layout};
 
 /// The story: every frame's runs joined in thread order.
@@ -57,21 +57,23 @@ fn slice_paras(paras: &[ParaStyle], first: usize, runs: &[TextRun]) -> Vec<ParaS
     (first..first + n).map(|i| paras.get(i).cloned().unwrap_or_else(|| fallback.clone())).collect()
 }
 
-/// How many bytes of `runs` fit in `frame` (whole lines; a following break space or paragraph
+/// How many bytes of `probe`'s runs fit in it (whole lines; a following break space or paragraph
 /// break stays with the line that ends there, but on a path, where a space with no room
-/// overflows as any character does, it starts the next frame).
-fn fit(db: &FontDb, frame: &TextObject, runs: &[TextRun]) -> usize {
-    let mut probe = frame.clone();
-    probe.runs = runs.to_vec();
-    let lay = layout(db, &probe);
-    let text: String = runs.iter().map(|r| r.text.as_str()).collect();
+/// overflows as any character does, it starts the next frame), and for area type that overflows,
+/// where its first line that does not fit starts.
+fn fit(db: &FontDb, probe: &TextObject) -> (usize, Option<usize>) {
+    #[cfg(test)]
+    FIT_BYTES.set(FIT_BYTES.get() + runs_len(&probe.runs));
+    let lay = layout(db, probe);
+    let text: String = probe.runs.iter().map(|r| r.text.as_str()).collect();
     if !lay.overflow {
-        return text.len();
+        return (text.len(), None);
     }
     let mut end = lay.lines.last().map_or(0, |l| l.end);
     if lay.on_path {
-        return end;
+        return (end, None);
     }
+    let unplaced = end;
     let bytes = text.as_bytes();
     while end < bytes.len() && bytes[end] == b' ' {
         end += 1;
@@ -79,7 +81,179 @@ fn fit(db: &FontDb, frame: &TextObject, runs: &[TextRun]) -> usize {
     if end < bytes.len() && bytes[end] == b'\n' {
         end += 1;
     }
-    end
+    (end, Some(unplaced))
+}
+
+#[cfg(test)]
+thread_local! {
+    /// The bytes of text [`fit`] has laid out on this thread ([`fit_bytes`]).
+    static FIT_BYTES: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
+}
+
+/// The bytes of text [`fit`] has laid out on this thread.
+#[cfg(test)]
+fn fit_bytes() -> usize {
+    FIT_BYTES.get()
+}
+
+/// The fewest bytes of story a frame is measured with before the measured text grows.
+const MIN_MEASURE: usize = 512;
+
+/// What is left of a story while [`distribute_continuing_levels`] hands it out, `len` bytes
+/// borrowed from the story's runs: the runs from `run` on, the first of them without its first
+/// `skip` bytes. While `raw` they are all the runs given (`run` and `skip` are 0), empty runs
+/// included. Once a frame has taken a share they are the story after it as
+/// [`crate::edit::slice_runs`] cuts it: no empty runs, and a run cut after its first character
+/// without its glyph choice.
+#[derive(Clone, Copy)]
+struct Rest<'a> {
+    runs: &'a [TextRun],
+    run: usize,
+    skip: usize,
+    raw: bool,
+    len: usize,
+}
+
+impl<'a> Rest<'a> {
+    /// The runs' pieces in order: each piece's text, its run and whether the run was cut before it.
+    fn pieces(self) -> impl Iterator<Item = (&'a str, &'a TextRun, bool)> {
+        self.runs.get(self.run..).unwrap_or_default().iter().enumerate().filter_map(move |(k, r)| {
+            let at = if k == 0 { self.skip } else { 0 };
+            let text = r.text.get(at..)?;
+            (self.raw || !text.is_empty()).then_some((text, r, at > 0))
+        })
+    }
+
+    /// A piece's style: its run's, without the glyph choice when the run was cut before it.
+    fn style(r: &TextRun, cut: bool) -> CharStyle {
+        let mut style = r.style.clone();
+        if cut {
+            style.glyph_alternate = None;
+        }
+        style
+    }
+
+    /// [`crate::edit::slice_runs`] of the rest's runs.
+    fn slice(self, start: usize, end: usize) -> Vec<TextRun> {
+        let mut out = vec![];
+        let mut off = 0;
+        for (text, r, cut) in self.pieces() {
+            let (rs, re) = (off, off + text.len());
+            if rs >= end {
+                break;
+            }
+            let (a, b) = (start.max(rs), end.min(re));
+            if a < b {
+                let from = floor_char(text, a - rs);
+                let t = &text[from..floor_char(text, b - rs)];
+                if !t.is_empty() {
+                    out.push(TextRun { text: t.to_string(), style: Self::style(r, cut || from > 0), inline: r.inline.clone() });
+                }
+            }
+            off = re;
+        }
+        out
+    }
+
+    /// The rest's runs before byte `end`, which follows a paragraph break, as a frame is measured
+    /// with them: every run that starts before it (an empty one too, while the runs are the ones
+    /// given), the last one cut there.
+    fn before(self, end: usize) -> Vec<TextRun> {
+        let mut out = vec![];
+        let mut off = 0;
+        for (text, r, cut) in self.pieces() {
+            if off >= end {
+                break;
+            }
+            let t = text.get(..end - off).unwrap_or(text);
+            out.push(TextRun { text: t.to_string(), style: Self::style(r, cut), inline: r.inline.clone() });
+            off += text.len();
+        }
+        out
+    }
+
+    /// [`crate::edit::style_at`] of the rest's runs.
+    fn style_at(self, byte: usize) -> CharStyle {
+        let mut off = 0;
+        let mut last = None;
+        let mut first = None;
+        for (text, r, cut) in self.pieces() {
+            first = first.or(Some((r, cut)));
+            let end = off + text.len();
+            if byte < end || (byte == end && byte == off) {
+                return Self::style(r, cut);
+            }
+            if !text.is_empty() {
+                last = Some((r, cut));
+                if byte == end {
+                    return Self::style(r, cut);
+                }
+            }
+            off = end;
+        }
+        last.or(first).map(|(r, cut)| Self::style(r, cut)).unwrap_or_default()
+    }
+
+    /// The end of the first paragraph break at or after byte `from`, or None when the rest has no
+    /// break there.
+    fn break_after(self, from: usize) -> Option<usize> {
+        let mut off = 0;
+        for (text, _, _) in self.pieces() {
+            let at = from.saturating_sub(off);
+            if let Some(i) = text.as_bytes().get(at..).and_then(|b| b.iter().position(|&b| b == b'\n')) {
+                return Some(off + at + i + 1);
+            }
+            off += text.len();
+        }
+        None
+    }
+
+    /// All of the rest's runs.
+    fn all(self) -> Vec<TextRun> {
+        if self.raw { self.runs.to_vec() } else { self.slice(0, self.len) }
+    }
+
+    /// The rest after its first `n` bytes, as a slice of the story: the run that byte falls in
+    /// cut there (back to a character boundary, as [`crate::edit::slice_runs`] cuts it).
+    fn after(self, n: usize) -> Self {
+        let mut run = self.run;
+        let mut at = self.skip + n;
+        while let Some(r) = self.runs.get(run)
+            && at >= r.text.len()
+            && run + 1 < self.runs.len()
+        {
+            at -= r.text.len();
+            run += 1;
+        }
+        let skip = self.runs.get(run).map_or(0, |r| floor_char(&r.text, at));
+        let cut_back = at - skip;
+        Self { runs: self.runs, run, skip, raw: false, len: self.len + cut_back - n }
+    }
+}
+
+/// How many bytes of `rest` fit in `frame`, measured as `probe` makes the frame for some runs (with
+/// their paragraph styles, the list counts and the continuation mark).
+///
+/// Area type without Shrink Text to Fit whose lines align to the top is first measured with the
+/// whole paragraphs of the rest that end at or after byte `want`, and then with twice as many bytes
+/// each time, while the rest goes on past them. The layout places lines in order and stops at the
+/// first line that does not fit, and each paragraph is shaped and broken on its own text. So when
+/// that line starts before the last paragraph break measured, the frame holds the same bytes with
+/// the whole rest. Other type, and a rest that ends first, is measured with the whole rest.
+fn fit_rest(db: &FontDb, probe: impl Fn(Vec<TextRun>) -> TextObject, frame: &TextObject, rest: Rest<'_>, mut want: usize) -> usize {
+    let by_paragraph = matches!(frame.kind, TextKind::Area { .. })
+        && frame.area.fit.min_scale().is_none()
+        && frame.area.vertical_align == vectorcraft_doc::VerticalAlign::Top;
+    if by_paragraph {
+        while let Some(end) = rest.break_after(want.saturating_sub(1)).filter(|&end| end < rest.len) {
+            let (n, unplaced) = fit(db, &probe(rest.before(end)));
+            if unplaced.is_some_and(|u| u + 1 < end) {
+                return n;
+            }
+            want = end.saturating_mul(2);
+        }
+    }
+    fit(db, &probe(rest.all())).0
 }
 
 /// A frame's share of a story: its runs, its paragraphs' styles (one per paragraph) and the
@@ -175,31 +349,52 @@ pub fn distribute_continuing_levels(
     continued: bool,
     mut counts: ListCounts,
 ) -> Vec<Slice> {
-    let mut rest = runs.to_vec();
+    let mut story_rest = Rest { runs, run: 0, skip: 0, raw: true, len: runs_len(runs) };
+    // Once the story is used up, what is left is one empty run with the style there.
+    let mut used_up: Option<TextRun> = None;
     let mut out = Vec::with_capacity(frames.len());
     let mut next_para = 0;
     let mut continues = continued;
+    let mut want = MIN_MEASURE;
     for (i, f) in frames.iter().enumerate() {
         let first_para = next_para;
-        let len = runs_len(&rest);
+        let empty_story: [TextRun; 1];
+        let rest = match used_up.clone() {
+            Some(empty) => {
+                empty_story = [empty];
+                Rest { runs: &empty_story, run: 0, skip: 0, raw: true, len: 0 }
+            }
+            None => story_rest,
+        };
+        let len = rest.len;
         let own = [f.para.clone()];
         let (paras, first_para) = if paras.is_empty() { (&own[..], 0) } else { (paras, first_para) };
         let n = if i + 1 == frames.len() {
             len
         } else {
-            let mut probe = (*f).clone();
-            probe.runs = rest.clone();
-            probe.set_paragraph_styles(slice_paras(paras, first_para, &rest));
-            probe.set_list_counts(counts);
-            probe.first_para_continues = continues;
-            fit(db, &probe, &rest)
+            let probe = |runs: Vec<TextRun>| {
+                let mut probe = (*f).clone();
+                let styles = slice_paras(paras, first_para, &runs);
+                probe.runs = runs;
+                probe.set_paragraph_styles(styles);
+                probe.set_list_counts(counts);
+                probe.first_para_continues = continues;
+                probe
+            };
+            fit_rest(db, probe, f, rest, want)
         };
-        let mut head = slice_runs(&rest, 0, n);
+        want = n.saturating_mul(2).max(MIN_MEASURE);
+        let mut head = rest.slice(0, n);
         if head.is_empty() {
-            head.push(TextRun { text: String::new(), style: style_at(&rest, n), inline: None });
+            head.push(TextRun { text: String::new(), style: rest.style_at(n), inline: None });
+        }
+        if used_up.is_none() {
+            if n >= len {
+                used_up = Some(TextRun { text: String::new(), style: rest.style_at(len), inline: None });
+            } else {
+                story_rest = story_rest.after(n);
+            }
         }
-        let tail = slice_runs(&rest, n, len);
-        rest = if tail.is_empty() { vec![TextRun { text: String::new(), style: style_at(&rest, len), inline: None }] } else { tail };
         let head_paras = slice_paras(paras, first_para, &head);
         next_para += head_paras.len().saturating_sub(1);
         let next_counts = count_list_paragraphs(&head, &head_paras, counts);
diff --git a/crates/text/src/thread/tests.rs b/crates/text/src/thread/tests.rs
index c3f05cef42..5ae49442fb 100644
--- a/crates/text/src/thread/tests.rs
+++ b/crates/text/src/thread/tests.rs
@@ -1,5 +1,6 @@
 use super::*;
-use vectorcraft_doc::{CharStyle, Justify, TextKind};
+use crate::edit::{slice_runs, style_at};
+use vectorcraft_doc::{Justify, TextKind};
 use vectorcraft_geom::{Affine, PathData, Rect, shapes};
 
 fn frame(x: f64) -> TextObject {
@@ -412,6 +413,275 @@ fn list_levels_count_on_through_the_frames() {
     assert_eq!((parts[1].list_count, parts[1].list_level_counts.clone()), (1, vec![first.len() as u32 - 1]));
 }
 
+/// The shares the frames would take if each one were measured with the whole rest of the story:
+/// what [`distribute_continuing_levels`] gives, measuring each frame with less of it.
+fn whole_rest_shares(
+    db: &FontDb,
+    frames: &[&TextObject],
+    runs: &[TextRun],
+    paras: &[ParaStyle],
+    continued: bool,
+    mut counts: ListCounts,
+) -> Vec<Slice> {
+    let fit_whole = |frame: &TextObject, runs: &[TextRun]| {
+        let lay = layout(db, frame);
+        let text: String = runs.iter().map(|r| r.text.as_str()).collect();
+        if !lay.overflow {
+            return text.len();
+        }
+        let mut end = lay.lines.last().map_or(0, |l| l.end);
+        if lay.on_path {
+            return end;
+        }
+        let bytes = text.as_bytes();
+        while end < bytes.len() && bytes[end] == b' ' {
+            end += 1;
+        }
+        if end < bytes.len() && bytes[end] == b'\n' {
+            end += 1;
+        }
+        end
+    };
+    let mut rest = runs.to_vec();
+    let mut out = Vec::with_capacity(frames.len());
+    let mut next_para = 0;
+    let mut continues = continued;
+    for (i, f) in frames.iter().enumerate() {
+        let first_para = next_para;
+        let len = runs_len(&rest);
+        let own = [f.para.clone()];
+        let (paras, first_para) = if paras.is_empty() { (&own[..], 0) } else { (paras, first_para) };
+        let n = if i + 1 == frames.len() {
+            len
+        } else {
+            let mut probe = (*f).clone();
+            probe.runs = rest.clone();
+            probe.set_paragraph_styles(slice_paras(paras, first_para, &rest));
+            probe.set_list_counts(counts);
+            probe.first_para_continues = continues;
+            fit_whole(&probe, &rest)
+        };
+        let mut head = slice_runs(&rest, 0, n);
+        if head.is_empty() {
+            head.push(TextRun { text: String::new(), style: style_at(&rest, n), inline: None });
+        }
+        let tail = slice_runs(&rest, n, len);
+        rest = if tail.is_empty() { vec![TextRun { text: String::new(), style: style_at(&rest, len), inline: None }] } else { tail };
+        let head_paras = slice_paras(paras, first_para, &head);
+        next_para += head_paras.len().saturating_sub(1);
+        let next_counts = count_list_paragraphs(&head, &head_paras, counts);
+        let starts_continued = continues;
+        continues = continues_after(head.iter().rev().find_map(|r| r.text.bytes().last()), continues);
+        let (list_count, list_level_counts) = counts.parts();
+        out.push(Slice { runs: head, paras: head_paras, list_count, list_level_counts, continues: starts_continued });
+        counts = next_counts;
+    }
+    out
+}
+
+/// `frames` share `runs` as they would if each frame were measured with the whole rest, from the
+/// story's start and continuing from text before it; returns how many frames took text.
+fn same_as_whole_rest(db: &FontDb, frames: &[&TextObject], runs: &[TextRun], paras: &[ParaStyle], case: &str) -> usize {
+    let got = distribute(db, frames, runs, paras);
+    assert_eq!(got, whole_rest_shares(db, frames, runs, paras, false, ListCounts::default()), "{case}");
+    let counts = ListCounts::from_parts(3, &[2, 1]);
+    let continuing = distribute_continuing_levels(db, frames, runs, paras, true, counts);
+    assert_eq!(continuing, whole_rest_shares(db, frames, runs, paras, true, counts), "{case}, continuing");
+    got.iter().filter(|s| runs_len(&s.runs) > 0).count()
+}
+
+/// An area frame `w` by `h` at `x`.
+fn sized(x: f64, w: f64, h: f64) -> TextObject {
+    let mut t = frame(x);
+    t.kind = TextKind::Area { frame: shapes::rectangle(Rect::new(x, 0.0, x + w, h)) };
+    t
+}
+
+/// Numbered `n` short paragraphs.
+fn paragraphs(n: usize) -> String {
+    (1..=n).map(|i| format!("Item {i}: the quick brown fox jumps.")).collect::<Vec<_>>().join("\n")
+}
+
+/// Each frame takes the same share of a long story when it is measured with only the paragraphs
+/// it needs as when it is measured with the whole rest of the story, for every kind of frame,
+/// text and paragraph style that changes how much a frame holds.
+#[test]
+fn frames_take_the_shares_the_whole_rest_gives_them() {
+    use vectorcraft_doc::text::{NumberStyle, ParaList};
+    let db = FontDb::global();
+    let plain = CharStyle::default();
+    let big = CharStyle { size: 20.0, ..Default::default() };
+    let small = CharStyle { size: 7.0, ..Default::default() };
+    let story = |text: &str| vec![TextRun::new(text, plain.clone())];
+    let frames: Vec<TextObject> = (0..6).map(|k| frame(200.0 * k as f64)).collect();
+    fn refs(v: &[TextObject]) -> Vec<&TextObject> {
+        v.iter().collect()
+    }
+    let mut took = 0;
+
+    // Many short paragraphs, every one of its own style.
+    took += same_as_whole_rest(db, &refs(&frames), &story(&paragraphs(120)), &[], "short paragraphs");
+    let spaced: Vec<ParaStyle> = (0..120).map(|i| ParaStyle { space_before: (i % 4) as f64 * 3.0, ..Default::default() }).collect();
+    took += same_as_whole_rest(db, &refs(&frames), &story(&paragraphs(120)), &spaced, "spaced paragraphs");
+
+    // Frames of different sizes, one with no height and one too narrow for a word.
+    let uneven = vec![
+        sized(0.0, 120.0, 30.0),
+        sized(200.0, 120.0, 0.0),
+        sized(400.0, 200.0, 140.0),
+        sized(700.0, 4.0, 200.0),
+        sized(800.0, 60.0, 90.0),
+        frame(1000.0),
+    ];
+    took += same_as_whole_rest(db, &refs(&uneven), &story(&paragraphs(120)), &[], "uneven frames");
+
+    // A word longer than a line, and runs of spaces and empty paragraphs where frames end.
+    let long_word = format!("{}\n{}\n{}", "x".repeat(700), paragraphs(30), "y".repeat(900));
+    took += same_as_whole_rest(db, &refs(&frames), &story(&long_word), &[], "long words");
+    let breaks = (0..200).map(|i| if i % 5 == 0 { String::new() } else { format!("Line {i} ends here     ") }).collect::<Vec<_>>().join("\n");
+    took += same_as_whole_rest(db, &refs(&frames), &story(&breaks), &[], "spaces and empty paragraphs");
+    for k in [0usize, 1, 2, 3] {
+        let tall: Vec<TextObject> = (0..4).map(|i| sized(200.0 * i as f64, 120.0, 14.0 * (k + i + 1) as f64)).collect();
+        took += same_as_whole_rest(db, &refs(&tall), &story(&breaks), &[], &format!("frame heights {k}"));
+    }
+
+    // Style runs and inline graphics cut where frames end, and empty runs as given.
+    // Some runs start with a glyph choice, which a run cut after its first character loses.
+    let mut styled = vec![];
+    let text = paragraphs(90);
+    let words: Vec<&str> = text.split_inclusive(' ').collect();
+    for (i, three) in words.chunks(3).enumerate() {
+        let text = three.concat();
+        let mut style = [&plain, &big, &small][i % 3].clone();
+        if i % 4 == 0 {
+            let ch = text.chars().next().unwrap_or('I');
+            style.glyph_alternate = Some(vectorcraft_doc::GlyphChoice { ch, gid: 1, font: "Test".into(), version: String::new() });
+        }
+        styled.push(TextRun::new(text, style));
+        if i % 7 == 0 {
+            styled.push(TextRun::inline(vectorcraft_doc::InlineArt::new("sym"), plain.clone()));
+        }
+        if i % 11 == 0 {
+            styled.push(TextRun::new("", big.clone()));
+        }
+    }
+    took += same_as_whole_rest(db, &refs(&frames), &styled, &[], "style runs");
+
+    // Numbered lists at two levels, counted on from text before.
+    let at = |level| ParaStyle {
+        list: Some(ParaList::numbered(NumberStyle::Arabic).at_level(level)),
+        left_indent: 18.0,
+        first_line_indent: -18.0,
+        ..Default::default()
+    };
+    let listed: Vec<ParaStyle> = (0..120).map(|i| at(1 + i % 3 / 2)).collect();
+    took += same_as_whole_rest(db, &refs(&frames), &story(&paragraphs(120)), &listed, "lists");
+
+    // Justified and hyphenated paragraphs, long enough to run from frame to frame.
+    let text = "The quick brown fox jumps over the lazy dog, extraordinarily unbelievably. ".repeat(6);
+    let long_paras = (0..14).map(|_| text.trim_end()).collect::<Vec<_>>().join("\n");
+    let justified: Vec<ParaStyle> = (0..14)
+        .map(|i| ParaStyle { justify: [Justify::JustifyAll, Justify::JustifyLeft][i % 2], hyphenate: i % 3 != 0, ..Default::default() })
+        .collect();
+    took += same_as_whole_rest(db, &refs(&frames), &story(&long_paras), &justified, "justified and hyphenated");
+    // Paragraphs longer than a frame holds, each composed as a whole.
+    let tall: Vec<TextObject> = (0..5).map(|k| sized(200.0 * k as f64, 160.0, 160.0 + 40.0 * k as f64)).collect();
+    let very_long = (0..6).map(|_| text.repeat(4).trim_end().to_string()).collect::<Vec<_>>().join("\n");
+    for justify in [Justify::Left, Justify::JustifyLeft] {
+        let composed = [ParaStyle { justify, ..Default::default() }];
+        took += same_as_whole_rest(db, &refs(&tall), &story(&very_long), &composed, &format!("long paragraphs, {justify:?}"));
+    }
+
+    // Columns, vertical type, Shrink Text to Fit, lines aligned to the center, type on a path,
+    // and a last frame the story overflows.
+    let mut columns = frames.clone();
+    for f in &mut columns {
+        f.area.columns = 2;
+        f.area.gutter = 6.0;
+    }
+    took += same_as_whole_rest(db, &refs(&columns), &story(&paragraphs(120)), &[], "columns");
+    let mut vertical = frames.clone();
+    for f in &mut vertical {
+        f.vertical = true;
+    }
+    took += same_as_whole_rest(db, &refs(&vertical), &story(&paragraphs(80)), &[], "vertical type");
+    let mut mixed = frames.clone();
+    mixed[1].area.fit = vectorcraft_doc::AreaFit::ShrinkText { min_percent: 60.0 };
+    mixed[2].area.vertical_align = vectorcraft_doc::VerticalAlign::Center;
+    mixed[3] = path_frame(300.0);
+    took += same_as_whole_rest(db, &refs(&mixed), &story(&paragraphs(120)), &[], "other kinds of frame");
+    let two = [&frames[0], &frames[1]];
+    took += same_as_whole_rest(db, &two, &story(&paragraphs(200)), &[], "overflowing last frame");
+
+    // Short stories, an empty one and one of empty runs.
+    took += same_as_whole_rest(db, &refs(&frames), &story("Hi"), &[], "short story");
+    took += same_as_whole_rest(db, &refs(&frames), &story(""), &[], "empty story");
+    took += same_as_whole_rest(db, &refs(&frames), &[TextRun::new("", big.clone()), TextRun::new("", small.clone())], &[], "empty runs");
+    assert!(took > 40, "the frames took text: {took}");
+}
+
+/// A seeded mix of run splits, sizes, paragraph styles and frame sizes: each frame takes the share
+/// the whole rest gives it.
+#[test]
+fn seeded_stories_take_the_shares_the_whole_rest_gives_them() {
+    let db = FontDb::global();
+    let mut seed: u64 = 0x2545_f491_4f6c_dd1d;
+    let mut next = |n: u64| {
+        seed ^= seed << 13;
+        seed ^= seed >> 7;
+        seed ^= seed << 17;
+        seed % n
+    };
+    let words = ["fox", "a", "jumps", "extraordinary", "dog,", "the", "lazy", "over", "  ", "quick"];
+    for case in 0..12 {
+        let mut runs = vec![];
+        let mut paras = 1;
+        for _ in 0..(150 + next(250)) {
+            let mut text = words[next(words.len() as u64) as usize].to_string();
+            text.push(if next(6) == 0 {
+                paras += 1;
+                '\n'
+            } else {
+                ' '
+            });
+            let style = CharStyle { size: [12.0, 9.0, 16.0][next(3) as usize], tracking: [0.0, 50.0][next(2) as usize], ..Default::default() };
+            runs.push(TextRun::new(text, style));
+        }
+        normalize(&mut runs);
+        let styles: Vec<ParaStyle> = (0..paras)
+            .map(|_| ParaStyle {
+                justify: [Justify::Left, Justify::Center, Justify::JustifyLeft][next(3) as usize],
+                first_line_indent: [0.0, 12.0][next(2) as usize],
+                space_after: [0.0, 4.0][next(2) as usize],
+                ..Default::default()
+            })
+            .collect();
+        let frames: Vec<TextObject> = (0..2 + next(6)).map(|k| sized(200.0 * k as f64, 40.0 + next(120) as f64, 10.0 + next(120) as f64)).collect();
+        same_as_whole_rest(db, &frames.iter().collect::<Vec<_>>(), &runs, &styles, &format!("case {case}"));
+    }
+}
+
+/// A long story of short paragraphs through many frames: each frame is measured with about the
+/// text it takes and a little more, not with the whole rest of the story.
+#[test]
+fn many_frames_measure_about_the_text_they_take() {
+    let db = FontDb::global();
+    let text = paragraphs(1500);
+    let story = vec![TextRun::new(text.clone(), CharStyle::default())];
+    let frames: Vec<TextObject> = (0..40).map(|k| frame(200.0 * k as f64)).collect();
+    let refs: Vec<&TextObject> = frames.iter().collect();
+    let before = fit_bytes();
+    let parts = distribute(db, &refs, &story, &[]);
+    let measured = fit_bytes() - before;
+    let joined: String = parts.iter().flat_map(|p| &p.runs).map(|r| r.text.as_str()).collect();
+    assert_eq!(joined, text, "no character lost or duplicated");
+    let placed: usize = parts[..parts.len() - 1].iter().map(|p| runs_len(&p.runs)).sum();
+    let longest = text.split('\n').map(str::len).max().unwrap_or(0);
+    assert!(placed > 0 && placed < text.len() / 4, "the frames hold part of the story: {placed} of {}", text.len());
+    let bound = 4 * placed + frames.len() * 2 * (MIN_MEASURE + longest);
+    assert!(measured <= bound, "measured {measured} bytes for {placed} placed in {} frames (at most {bound})", frames.len());
+}
+
 #[test]
 fn short_story_leaves_later_frames_empty_with_a_style() {
     let db = FontDb::global();
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..71a62a7798 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1239,6 +1239,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   For Auto Size area type in columns, the bisection for the frame's height runs on the lines of the one-column layout, and its result is checked with at most two layouts of the columns. When the text wraps around objects or does not fit the one-column layout, or when the check fails, the columns are laid out at every step of the bisection, as before. Typing at the start of a story of 50,000 characters in 2 columns took 1,670 ms a keystroke and now takes 292 ms (release build, `auto_height_in_columns_typing_timing`).
   Exports to PDF, EPS, SVG, EMF, WMF and the raster formats warn about the area type and type on a path that they draw without the text that doesn't fit, and give their ids, as Print and Print Preview do.
   An edit copies a thread's story only when it changes one of the thread's frames: with a story of 50,000 characters threaded through 8 frames with a style change at every word, moving another object took 7.8 ms and now takes 0.013 ms, and a frame of a drag took 7.2 ms and now takes 0.012 ms (release build, `threaded_story_edit_timing`).
+  When a story flows through threaded area type, each frame is measured with the whole paragraphs of the story that it needs and a few more, not with the whole rest of the story, and it keeps the same text as before. A story of 1,500 one-line paragraphs (55,892 bytes) through 40 frames was laid out over 2,126,762 bytes of text while the frames were measured, and is now laid out over 21,035 (`thread::tests::many_frames_measure_about_the_text_they_take`). Type on a path, Shrink Text to Fit, lines aligned other than to the top, and a frame whose share ends in the story's last paragraph are still measured with the whole rest.
   A paragraph that continues from one threaded frame into the next has its first-line indent and bullet or number in the frame where it starts; in the next frame its first line starts where its wrapped lines start. In frames that are no longer threaded, copies of a frame and point type converted from one, the first paragraph has its indent and bullet or number again.
   Type › Convert To Point Type on a frame of threaded text makes point type of the text that frame holds and takes it out of the thread; the story flows through the other frames without that text, so each character is in the document once.
   Object › Rasterize on a frame of threaded text takes it out of the thread with the text it shows, which the image draws, and the other frames keep the text they hold. When the last frame is rasterized, the text it has no room for goes after the text of the last frame that stays.

From df975e63002255c5ebd15cc1f56282c1f0d10729 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:41:22 -0800
Subject: [PATCH 38/48] Justify: a line with a tab spreads the text after its
 last tab to the edge

A justified area type line counted a tab as a word space, so it gave
the tab a share of its room that no glyph drew, and the line ended
short of its measure. A word-tab-word line ended short too.

- The text up to a line's last tab keeps its spacing, each tab keeps
  its stop and its leader stays in its gap. The text after the last
  tab takes the line's room: word spacing, letter spacing and glyph
  scaling within their ranges, then its word spaces, or the gaps
  between its letters when it has none. Kashidas go in that text when
  it is one run.
- A tab separates two words, so Single Word Justification does not
  align a word-tab-word line.
- Right-to-left lines take the text drawn after the last tab drawn,
  measured as the line is drawn, and vertical lines work down the
  column. Point type keeps its natural width.

Docs: docs/target-app-parity.md, docs/type-parity.md.
---
 crates/text/src/layout/flow.rs   | 117 +++++++++++++++++++------
 crates/text/src/tests/justify.rs | 142 ++++++++++++++++++++++++++++++-
 docs/target-app-parity.md        |   1 +
 docs/type-parity.md              |   2 +-
 4 files changed, 232 insertions(+), 30 deletions(-)

diff --git a/crates/text/src/layout/flow.rs b/crates/text/src/layout/flow.rs
index aae91be1ee..a77e05e2cb 100644
--- a/crates/text/src/layout/flow.rs
+++ b/crates/text/src/layout/flow.rs
@@ -494,6 +494,9 @@ struct LineJustification {
     /// The tracking after the line's last character that its alignment leaves out of its width:
     /// [`LineGeometry::trailing`] for a line that isn't justified, 0 for one that is.
     trailing: f64,
+    /// The glyphs justification leaves at their natural advance, by offset from the line's first
+    /// glyph: on a line with a tab, those drawn up to its last tab ([`tab_fixed_glyphs`]).
+    fixed: Vec<bool>,
 }
 
 fn run_paragraph_lines(cx: &mut Ctx<'_>, pen: &mut Pen<'_>, t: &TextObject, mut paragraph: ParagraphData<'_, '_>) -> bool {
@@ -796,10 +799,48 @@ fn is_letter_gap(glyph: usize, held: &[usize], after: &[Option<usize>], index: u
     }
 }
 
-// A space that takes a share of a justified line's room: not a zero-width space, which is a line
-// break opportunity but not a word separator.
-fn is_justified_space(g: &SGlyph) -> bool {
-    g.is_space() && !is_format_control(g.ch)
+// The glyphs of a justified line that keep their natural advance, by offset from the line's first
+// glyph: on a line with a tab of its own (not a list marker's), every glyph drawn up to and
+// including the last such tab, so the tabs keep their stops and leaders. Justification spreads the
+// line's room over the glyphs drawn after that tab. Empty on a line without such a tab.
+fn tab_fixed_glyphs(paragraph: &ParagraphData<'_, '_>, line: &LineGeometry) -> Vec<bool> {
+    let sg = &paragraph.sg;
+    let Some(last) = line.drawn.iter().rposition(|&j| j >= paragraph.marker && sg.get(j).is_some_and(|g| g.ch == '\t' && g.len > 0)) else {
+        return Vec::new();
+    };
+    let mut fixed = vec![false; line.body.saturating_sub(line.index)];
+    for &j in line.drawn.iter().take(last + 1) {
+        if let Some(slot) = j.checked_sub(line.index).and_then(|k| fixed.get_mut(k)) {
+            *slot = true;
+        }
+    }
+    fixed
+}
+
+// Does justification leave glyph `glyph` of the line starting at `index` at its natural advance
+// (see [`tab_fixed_glyphs`])?
+fn is_tab_fixed(fixed: &[bool], index: usize, glyph: usize) -> bool {
+    glyph.checked_sub(index).and_then(|k| fixed.get(k)).copied().unwrap_or(false)
+}
+
+// The natural width of justified area type `line` with a tab, as [`emit_flow_line`] draws it from
+// the line's start: its glyphs in drawing order, each tab up to its stop from where the glyphs
+// drawn before it end, then the line's hyphen.
+fn tabbed_natural_width(paragraph: &ParagraphData<'_, '_>, line: &LineGeometry, fixed: &[bool]) -> f64 {
+    let sg = &paragraph.sg;
+    let start = line.ax0 - line.opt_l;
+    let mut x = start;
+    for &j in &line.drawn {
+        let Some(g) = sg.get(j) else { continue };
+        x += if g.ch == '\t' && g.len > 0 && is_tab_fixed(fixed, line.index, j) {
+            tab_advance(&paragraph.para.tabs, line.position.x0, x + line.opt_l, sg.get(j + 1..line.trimmed).unwrap_or_default()).0
+        } else if j + 1 == line.trimmed {
+            g.adv - line.end_trim
+        } else {
+            g.adv
+        };
+    }
+    x - start + line.hyphen.as_ref().map_or(0.0, |h| h.adv)
 }
 
 // May a pushed-in line close a CJK gap after `g`? Not after a list marker or an inline graphic,
@@ -845,7 +886,11 @@ fn justify_flow_line(cx: &Ctx<'_>, paragraph: &ParagraphData<'_, '_>, line: &Lin
         Justify::JustifyAll => (0, true),
     };
     justify &= paragraph.regions.is_some();
-    let spaces = (line.index..line.body).filter(|&j| j >= paragraph.marker && is_justified_space(&sg[j])).count();
+    // A tab keeps its stop: the glyphs drawn up to a line's last tab keep their advances, and the
+    // ones after it take the line's room.
+    let fixed = tab_fixed_glyphs(paragraph, line);
+    let free = |j: usize| !is_tab_fixed(&fixed, line.index, j);
+    let spaces = (line.index..line.body).filter(|&j| j >= paragraph.marker && free(j) && is_word_space(&sg[j])).count();
     // A gap that justification adds between two glyphs goes into the advance of the one
     // drawn first: `drawn_after(j)` is the glyph drawn right after glyph `j`, which in a
     // right-to-left line comes before it in the text.
@@ -855,10 +900,10 @@ fn justify_flow_line(cx: &Ctx<'_>, paragraph: &ParagraphData<'_, '_>, line: &Lin
             *slot = Some(b);
         }
     }
-    let cjk_gaps = (line.index..line.body).filter(|&j| is_cjk_gap(j, held, &after, line.index, sg)).count();
+    let cjk_gaps = (line.index..line.body).filter(|&j| free(j) && is_cjk_gap(j, held, &after, line.index, sg)).count();
     // Single Word Justification: a justified line holding one word (no word space) is
-    // spread between its letters (Full Justify) or aligned.
-    let single_word = justify && spaces == 0 && cjk_gaps == 0;
+    // spread between its letters (Full Justify) or aligned. A tab separates two words.
+    let single_word = justify && fixed.is_empty() && spaces == 0 && cjk_gaps == 0;
     (align, justify) = match (single_word, para.justification.single_word) {
         (false, _) | (true, SingleWordJustify::FullJustify) => (align, justify),
         (true, SingleWordJustify::AlignLeft) => (0, false),
@@ -867,12 +912,24 @@ fn justify_flow_line(cx: &Ctx<'_>, paragraph: &ParagraphData<'_, '_>, line: &Lin
     };
     // Insert Kashidas: the Arabic words of a horizontal line take its room on kashidas,
     // and the word spaces and gaps take what is left.
-    let kashidas = if justify && !cx.vertical && room > line.render_width + EPS {
-        kashida::plan(cx.text, sg, line.index..line.body, para.kashida, room - line.render_width, |byte| cx.style_at(byte).kashidas)
+    // On a line with a tab, the kashidas go in the text after its last tab, when that text is one
+    // run of characters.
+    let kashida_range = if fixed.is_empty() {
+        Some(line.index..line.body)
+    } else {
+        let start = (line.index..line.body).find(|&j| free(j)).unwrap_or(line.body);
+        let end = (line.index..line.body).rev().find(|&j| free(j)).map_or(start, |j| j + 1);
+        (start..end).all(free).then_some(start..end)
+    };
+    // A justified line with a tab is as wide as it is drawn: in a right-to-left line its tabs are
+    // drawn in another order than the one the line was measured in.
+    let natural = if justify && !fixed.is_empty() { tabbed_natural_width(paragraph, line, &fixed) } else { line.render_width };
+    let kashidas = if let Some(range) = kashida_range.filter(|r| justify && !cx.vertical && !r.is_empty() && room > natural + EPS) {
+        kashida::plan(cx.text, sg, range, para.kashida, room - natural, |byte| cx.style_at(byte).kashidas)
     } else {
         Vec::new()
     };
-    let width = line.render_width + kashidas.iter().map(|k| k.1).sum::<f64>();
+    let width = natural + kashidas.iter().map(|k| k.1).sum::<f64>();
     let (mut per_space, mut per_gap, mut per_cjk) = (0.0, 0.0, 0.0);
     let mut fit = LineFit::default();
     let mut squeeze = 0.0;
@@ -882,13 +939,17 @@ fn justify_flow_line(cx: &Ctx<'_>, paragraph: &ParagraphData<'_, '_>, line: &Lin
     let pushed_in = line.position.pushed_in && paragraph.regions.is_some() && cjk_gaps > 0 && width > room + EPS;
     if pushed_in {
         let ems: f64 = (line.index..line.body)
-            .filter(|&j| is_cjk_gap(j, held, &after, line.index, sg) && may_squeeze(&sg[j]))
+            .filter(|&j| free(j) && is_cjk_gap(j, held, &after, line.index, sg) && may_squeeze(&sg[j]))
             .map(|j| squeeze_em(&sg[j], cx.vertical))
             .sum();
         if ems > EPS {
             squeeze = ((room - width) / ems).max(-PUSH_IN_SQUEEZE);
         }
     } else if justify && (room - width).abs() > EPS {
+        // What justification may change of each glyph: nothing of one drawn up to the last tab.
+        let line_flex = || -> Vec<Flex> {
+            (line.index..line.body).map(|j| if free(j) { flow_line_flex(j, &paragraph.flex, held, hung) } else { Flex::default() }).collect()
+        };
         if cjk_gaps > 0 && room > width {
             // Spread over the CJK gaps and the word spaces alike.
             per_space = (room - width) / (cjk_gaps + spaces) as f64;
@@ -896,18 +957,20 @@ fn justify_flow_line(cx: &Ctx<'_>, paragraph: &ParagraphData<'_, '_>, line: &Lin
         } else if spaces > 0 {
             // Word spacing, letter spacing and glyph scaling within their ranges, then the
             // word spaces alone; composed lines may shrink word spaces (never below zero).
-            let flex: Vec<Flex> = (line.index..line.body).map(|j| flow_line_flex(j, &paragraph.flex, held, hung)).collect();
-            let floor =
-                (line.index..line.body).filter(|&j| j >= paragraph.marker && is_justified_space(&sg[j])).map(|j| sg[j].adv).fold(f64::MAX, f64::min);
+            let flex = line_flex();
+            let floor = (line.index..line.body)
+                .filter(|&j| j >= paragraph.marker && free(j) && is_word_space(&sg[j]))
+                .map(|j| sg[j].adv)
+                .fold(f64::MAX, f64::min);
             fit = fit_line(&flex, room - width, spaces, floor);
         } else if room > width {
             // One word: its letter spacing and glyph scaling, then the gaps between its glyphs.
-            let flex: Vec<Flex> = (line.index..line.body).map(|j| flow_line_flex(j, &paragraph.flex, held, hung)).collect();
+            let flex = line_flex();
             fit = fit_line(&flex, room - width, 0, 0.0);
             let used: f64 = flex.iter().map(|f| fit.letter(f) + fit.glyph(f)).sum();
             let rest = room - width - used;
             let hyphen = line.hyphen.is_some();
-            let gaps = (line.index..line.body).filter(|&j| is_letter_gap(j, held, &after, line.index, sg, hyphen)).count();
+            let gaps = (line.index..line.body).filter(|&j| free(j) && is_letter_gap(j, held, &after, line.index, sg, hyphen)).count();
             if gaps > 0 && rest > EPS {
                 per_gap = rest / gaps as f64;
             }
@@ -939,7 +1002,7 @@ fn justify_flow_line(cx: &Ctx<'_>, paragraph: &ParagraphData<'_, '_>, line: &Lin
             _ => line.ax1 + line.opt_r - width,
         }
     };
-    LineJustification { per_space, per_gap, per_cjk, squeeze, fit, start_x, after, kashidas, last_tab, trailing }
+    LineJustification { per_space, per_gap, per_cjk, squeeze, fit, start_x, after, kashidas, last_tab, trailing, fixed }
 }
 
 /// The advance and leader of tab `glyph_index` of `line`, at pen position `x`: up to its stop
@@ -1017,22 +1080,20 @@ fn emit_flow_line(cx: &mut Ctx<'_>, pen: &mut Pen<'_>, paragraph: &ParagraphData
         let mut leader = "";
         if glyph.ch == '\t' {
             (advance, leader) = tab_glyph(paragraph, line, justification, glyph_index, x, (tab_origin, tab_shift), advance);
-        } else if glyph_index < body {
+        } else if glyph_index < body && !is_tab_fixed(&justification.fixed, index, glyph_index) {
             let flex = flow_line_flex(glyph_index, &paragraph.flex, &line.held, &line.hung);
             if is_word_space(glyph) {
-                advance += justification.fit.space(&flex);
+                advance += justification.fit.space(&flex) + justification.per_space;
             } else {
                 advance += justification.fit.letter(&flex) + justification.fit.glyph(&flex);
                 scale = justification.fit.glyph_scale(&flex);
-            }
-            if is_justified_space(glyph) {
-                advance += justification.per_space;
-            } else if justification.per_cjk != 0.0 || justification.squeeze != 0.0 {
-                if is_cjk_gap(glyph_index, &line.held, &justification.after, index, sg) {
-                    advance += justification.per_cjk + squeeze_after(glyph, justification.squeeze, cx.vertical);
+                if justification.per_cjk != 0.0 || justification.squeeze != 0.0 {
+                    if is_cjk_gap(glyph_index, &line.held, &justification.after, index, sg) {
+                        advance += justification.per_cjk + squeeze_after(glyph, justification.squeeze, cx.vertical);
+                    }
+                } else if is_letter_gap(glyph_index, &line.held, &justification.after, index, sg, line.hyphen.is_some()) {
+                    advance += justification.per_gap;
                 }
-            } else if is_letter_gap(glyph_index, &line.held, &justification.after, index, sg, line.hyphen.is_some()) {
-                advance += justification.per_gap;
             }
         }
         // The kashida before a cluster in the text is drawn at the cluster's right, between
diff --git a/crates/text/src/tests/justify.rs b/crates/text/src/tests/justify.rs
index dd80eed25b..8212a652e3 100644
--- a/crates/text/src/tests/justify.rs
+++ b/crates/text/src/tests/justify.rs
@@ -4,7 +4,7 @@
 use crate::*;
 use kurbo::{Affine, Shape};
 use vectorcraft_doc::text::Kashida;
-use vectorcraft_doc::{CharStyle, JustificationOptions, Justify, SingleWordJustify, TextKind, TextRun};
+use vectorcraft_doc::{CharStyle, JustificationOptions, Justify, SingleWordJustify, TabAlign, TabStop, TextKind, TextRun};
 use vectorcraft_geom::PathData;
 
 fn db() -> &'static FontDb {
@@ -412,6 +412,146 @@ fn single_word_lines_follow_single_word_justification() {
     assert!((c0 - 15.0).abs() < 1e-3 && (c1 - (w - 15.0)).abs() < 1e-3, "centred: {c0}..{c1}");
 }
 
+/// Word spacing at 100% with no range: the line's room goes on its word spaces alone.
+fn no_ranges() -> JustificationOptions {
+    JustificationOptions { word_spacing: [100.0, 100.0, 100.0], ..JustificationOptions::default() }
+}
+
+/// `text` in a 300 pt wide frame with left tab stops at `stops` (a leader of `leader` on each).
+fn tabbed(text: &str, stops: &[f64], leader: &str, justify: Justify, j: JustificationOptions) -> TextLayout {
+    let mut t = area(text, 300.0, justify, j);
+    t.para.tabs = stops.iter().map(|&position| TabStop { position, align: TabAlign::Left, leader: leader.to_string(), align_on: '.' }).collect();
+    layout(db(), &t)
+}
+
+/// Where the glyph of the character at byte `b` ends.
+fn end(l: &TextLayout, b: usize) -> f64 {
+    at(l, b).origin.x + at(l, b).advance
+}
+
+/// A justified line with a tab: the text before its last tab keeps its spacing and the tab its
+/// stop, and the word spaces after the tab take the line's room, so the line ends on the far edge.
+#[test]
+fn a_justified_line_with_a_tab_spreads_the_text_after_it_to_the_edge() {
+    // A (0), A (1), space (2), B (3), B (4), tab (5), C (6), C (7), space (8), D (9), D (10); a
+    // soft return ends the line, so Justify Left justifies it.
+    let text = "AA BB\tCC DD\u{2028}x";
+    for j in [no_ranges(), JustificationOptions::default()] {
+        let natural = tabbed(text, &[150.0], "", Justify::Left, j.clone());
+        let l = tabbed(text, &[150.0], "", Justify::JustifyLeft, j);
+        for b in 0..5 {
+            assert!((at(&l, b).origin.x - at(&natural, b).origin.x).abs() < 1e-6, "byte {b} stays where it was");
+            assert!((at(&l, b).advance - at(&natural, b).advance).abs() < 1e-6, "byte {b} keeps its advance");
+        }
+        assert!((end(&l, 5) - 150.0).abs() < 1e-6, "the tab keeps its stop: {}", end(&l, 5));
+        assert!((end(&l, 10) - 300.0).abs() < 1e-6, "the last word ends on the edge: {}", end(&l, 10));
+        assert!((l.lines[0].x1 - 300.0).abs() < 1e-6, "the line's record ends there too: {}", l.lines[0].x1);
+        assert!(at(&l, 8).advance > at(&natural, 8).advance + 1.0, "the word space after the tab takes the room");
+    }
+}
+
+/// A leader stays inside its tab's gap on a justified line.
+#[test]
+fn a_justified_tab_keeps_its_leader_inside_its_gap() {
+    let l = tabbed("AA BB\tCC DD", &[150.0], ".", Justify::JustifyAll, no_ranges());
+    let tab = at(&l, 5);
+    let dots = tab.outline.bounding_box();
+    assert!(!tab.outline.elements().is_empty(), "the leader is drawn");
+    assert!(dots.x0 >= tab.origin.x - 1e-6 && dots.x1 <= 150.0 + 1e-6, "{dots:?} inside {}..150", tab.origin.x);
+    assert!((end(&l, 10) - 300.0).abs() < 1e-6, "{}", end(&l, 10));
+}
+
+/// Two words with a tab between them and no word space: the word after the tab is spread
+/// between its letters to the edge, whatever Single Word Justification says, since a tab
+/// separates two words.
+#[test]
+fn a_justified_word_tab_word_line_reaches_the_edge() {
+    // A (0), A (1), tab (2), B (3), B (4).
+    let text = "AA\tBB\u{2028}x";
+    for single_word in [SingleWordJustify::FullJustify, SingleWordJustify::AlignLeft, SingleWordJustify::AlignRight] {
+        let j = JustificationOptions { single_word, ..JustificationOptions::default() };
+        let natural = tabbed(text, &[150.0], "", Justify::Left, j.clone());
+        let l = tabbed(text, &[150.0], "", Justify::JustifyLeft, j);
+        assert!(at(&l, 0).origin.x.abs() < 1e-6, "{single_word:?}: starts at the left edge: {}", at(&l, 0).origin.x);
+        assert!((at(&l, 0).advance - at(&natural, 0).advance).abs() < 1e-6, "{single_word:?}: the word before the tab keeps its width");
+        assert!((end(&l, 2) - 150.0).abs() < 1e-6, "{single_word:?}: the tab keeps its stop: {}", end(&l, 2));
+        assert!((end(&l, 4) - 300.0).abs() < 1e-6, "{single_word:?}: ends on the edge: {}", end(&l, 4));
+    }
+}
+
+/// The last line of a paragraph: Justify All spreads the text after its tab to the edge, and
+/// Justify Left leaves it aligned left.
+#[test]
+fn the_last_line_with_a_tab_fills_the_measure_only_with_justify_all() {
+    let text = "AA BB\tCC DD";
+    let all = tabbed(text, &[150.0], "", Justify::JustifyAll, no_ranges());
+    assert!((end(&all, 5) - 150.0).abs() < 1e-6 && (end(&all, 10) - 300.0).abs() < 1e-6, "{} {}", end(&all, 5), end(&all, 10));
+    let left = tabbed(text, &[150.0], "", Justify::JustifyLeft, no_ranges());
+    let natural = tabbed(text, &[150.0], "", Justify::Left, no_ranges());
+    assert!((end(&left, 10) - end(&natural, 10)).abs() < 1e-6 && end(&left, 10) < 250.0, "{}", end(&left, 10));
+}
+
+/// A line with two tabs: both keep their stops, the word space between them keeps its width, and
+/// the text after the last tab takes the room.
+#[test]
+fn a_justified_line_takes_its_room_after_its_last_tab() {
+    // A (0), tab (1), B (2), space (3), C (4), tab (5), D (6), space (7), E (8).
+    let text = "A\tB C\tD E";
+    let natural = tabbed(text, &[80.0, 160.0], "", Justify::Left, no_ranges());
+    let l = tabbed(text, &[80.0, 160.0], "", Justify::JustifyAll, no_ranges());
+    assert!((end(&l, 1) - 80.0).abs() < 1e-6 && (end(&l, 5) - 160.0).abs() < 1e-6, "{} {}", end(&l, 1), end(&l, 5));
+    assert!((at(&l, 3).advance - at(&natural, 3).advance).abs() < 1e-6, "the space between the tabs keeps its width");
+    assert!((end(&l, 8) - 300.0).abs() < 1e-6, "{}", end(&l, 8));
+}
+
+/// Vertical area type: the tab keeps its stop down the column, and the text after it reaches the
+/// column's end.
+#[test]
+fn a_justified_vertical_line_with_a_tab_reaches_the_end_of_its_column() {
+    let mut t = area("AA BB\tCC DD", 100.0, Justify::JustifyAll, no_ranges());
+    t.kind = TextKind::Area { frame: PathData::from_bezpath(&Rect::new(0.0, 0.0, 100.0, 300.0).to_path(0.1)) };
+    t.vertical = true;
+    t.para.tabs = vec![TabStop { position: 150.0, align: TabAlign::Left, leader: String::new(), align_on: '.' }];
+    let l = layout(db(), &t);
+    let down = |b: usize| at(&l, b).origin.y + at(&l, b).advance;
+    assert!(at(&l, 0).origin.y.abs() < 1e-6, "{}", at(&l, 0).origin.y);
+    assert!((down(5) - 150.0).abs() < 1e-6, "the tab keeps its stop: {}", down(5));
+    assert!((down(10) - 300.0).abs() < 1e-6, "the last word ends at the column's end: {}", down(10));
+}
+
+/// Right-to-left area type: the glyphs drawn up to the last tab drawn keep their advances, the tab
+/// its stop, and the text drawn after it reaches the right edge.
+#[test]
+fn a_justified_right_to_left_line_with_a_tab_spans_its_measure() {
+    // א (0), ב (2), space (4), ג (5), ד (7), tab (9), ה (10), ו (12), space (14), ז (15), ח (17).
+    let text = "אב גד\tהו זח";
+    let natural = tabbed(text, &[150.0], "", Justify::Right, no_ranges());
+    let l = tabbed(text, &[150.0], "", Justify::JustifyAll, no_ranges());
+    let mut drawn: Vec<&PositionedGlyph> = l.glyphs.iter().collect();
+    drawn.sort_by(|a, b| a.origin.x.total_cmp(&b.origin.x));
+    assert!(drawn[0].origin.x.abs() < 1e-6, "starts at the left edge: {:?}", drawn[0].origin);
+    let tab = drawn.iter().position(|g| g.byte == 9).unwrap();
+    for g in &drawn[..tab] {
+        assert!((g.advance - at(&natural, g.byte).advance).abs() < 1e-6, "byte {} keeps its advance", g.byte);
+    }
+    assert!((end(&l, 9) - 150.0).abs() < 1e-6, "the tab keeps its stop: {}", end(&l, 9));
+    let last = drawn.last().unwrap();
+    assert!((last.origin.x + last.advance - 300.0).abs() < 1e-6, "ends on the right edge: {}", last.origin.x + last.advance);
+    assert!((l.lines[0].x1 - 300.0).abs() < 1e-6, "{}", l.lines[0].x1);
+}
+
+/// Point type has no measure to fill: a justified line with a tab keeps its natural width.
+#[test]
+fn justified_point_type_with_a_tab_keeps_its_width() {
+    let mut t = point("AA BB\tCC DD", no_ranges());
+    t.para.justify = Justify::JustifyAll;
+    t.para.tabs = vec![TabStop { position: 150.0, align: TabAlign::Left, leader: String::new(), align_on: '.' }];
+    let l = layout(db(), &t);
+    t.para.justify = Justify::Left;
+    let natural = layout(db(), &t);
+    assert!((end(&l, 10) - end(&natural, 10)).abs() < 1e-6, "{} {}", end(&l, 10), end(&natural, 10));
+}
+
 /// An OpenType (GSUB) Arabic face with a tatweel: craft-fonts' Noto Sans Arabic when the build has
 /// craft-fonts (`CRAFT_FONTS_DIR`), else an installed one. None skips the test.
 fn arabic_face(test: &str) -> Option<std::sync::Arc<FontFace>> {
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..206365d7f1 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -667,6 +667,7 @@ since 2026-10-01.
 - **Text styles dragged onto the panel's buttons:** a style dragged from the Character Styles or Paragraph Styles panel onto Create New Style is copied (`charStyle.duplicate`, `paraStyle.duplicate`, which name the copy `<name> copy`) and the copy is highlighted; dragged onto Delete it is deleted (`charStyle.delete`, `paraStyle.delete`); the Normal style is not deleted. Each drop is one undo step. Public reference: [Character and paragraph styles](https://web.archive.org/web/20261015081534/https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
 - **Auto Leading outside the layout:** a paragraph's Justification… › Auto Leading (<https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/adjust-word-and-letterspacing-in-justified-text.html>) also sets the Leading the Character panel shows for Auto type (blank where the selected paragraphs differ), the leading the Alt+↑/↓ nudge (`type.step`) steps from, each paragraph's own, and the lines Fill with Placeholder Text counts in area type. Evidence: `ParaStyle::effective_leading` (`crates/doc/src/text.rs` test `paragraph_effective_leading_follows_auto_leading`), `tests_prefs::auto_leading_steps_and_fills_from_the_paragraph_auto_leading`, `panels::character` test `leading_field_shows_the_paragraph_auto_leading`.
 - **Letter spacing and Full Justify between shaped clusters:** Desired Letter Spacing on any line, the letter spacing range of a justified line, and Single Word Justification's Full Justify add space only between shaped clusters, in horizontal, right-to-left and vertical type, so a combining mark stays on its letter and a Devanagari syllable's glyphs stay together. They add no space next to a zero-width format control (a soft hyphen, a bidi mark, embedding, override or isolate, a zero-width space, a joiner or non-joiner, a word joiner, a variation selector, a tag, the byte order mark), so a word wrapped in an override still reaches both edges of a justified line, and a Kinsoku push-in counts no gap at one either. A zero-width space is a line break opportunity but not a word separator ([CSS Text Level 3](https://www.w3.org/TR/css-text-3/#word-separator) does not list it), so a justified line gives it no share of its room. Desired Letter Spacing between the letters on either side of a zero-width space goes after the zero-width space, so a line that breaks there ends at its last letter, and the line breaker does not measure a gap after it. A line that Full Justify spreads and that ends in a drawn hyphen puts the same gap between its last letter and the hyphen. The cluster boundary is VectorCraft's own rule, based on the typographic character unit of [CSS Text Level 3](https://www.w3.org/TR/css-text-3/#typographic-character-unit). Tests `tests::justify::single_word_full_justify_keeps_combining_mark_with_base`, `desired_and_fitted_letter_spacing_skip_shaped_cluster`, `rtl_single_word_cluster_gap_follows_drawn_order`, `vertical_single_word_cluster_gap_follows_drawn_order`, `single_word_full_justify_keeps_conjunct_cluster`, `desired_letter_spacing_skips_bidi_format_controls`, `letter_spacing_and_full_justify_skip_joiners_and_soft_hyphens`, `format_controls_are_the_zero_width_default_ignorables`, `zero_width_space_takes_no_word_space_room`, `desired_letter_spacing_ends_a_line_broken_at_a_zero_width_space_without_a_gap`, `single_word_full_justify_spreads_up_to_the_drawn_hyphen` and `layout::wrapping_tests::kinsoku_shori_type_counts_no_gap_at_a_format_control`. Public reference: the help page (<https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/adjust-word-and-letterspacing-in-justified-text.html>).
+- **Justified lines with tabs:** a tab is not a word space, so a justified area type line no longer gives it a share of its room that no glyph draws. On a justified line with a tab, the text up to the last tab keeps its spacing, each tab keeps its stop and its leader stays in its gap, and the text after the last tab takes the room (word spaces first, then letter spacing, glyph scaling and the gaps between its letters), so the line ends on the far edge. A tab separates two words, so Single Word Justification does not align a word-tab-word line. Right-to-left lines take the text drawn after the last tab drawn, and vertical lines work down the column. Spreading the room after the last tab is VectorCraft's own rule. Tests `tests::justify::a_justified_line_with_a_tab_spreads_the_text_after_it_to_the_edge`, `a_justified_tab_keeps_its_leader_inside_its_gap`, `a_justified_word_tab_word_line_reaches_the_edge`, `the_last_line_with_a_tab_fills_the_measure_only_with_justify_all`, `a_justified_line_takes_its_room_after_its_last_tab`, `a_justified_vertical_line_with_a_tab_reaches_the_end_of_its_column`, `a_justified_right_to_left_line_with_a_tab_spans_its_measure` and `justified_point_type_with_a_tab_keeps_its_width`. Public reference: the help pages (<https://helpx.adobe.com/illustrator/using/formatting-paragraphs.html>, <https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/adjust-word-and-letterspacing-in-justified-text.html>).
 - **The text style panel menus' Duplicate and Delete:** in the Character Styles and Paragraph Styles panel menus, Duplicate highlights the copy, as Create New Style highlights the new style, and Delete leaves no style highlighted, as the Delete button does, so Duplicate, Clear Overrides, Redefine and Style Options are disabled until another style is clicked. A highlighted style that is renamed in Style Options or deleted by a command is no longer highlighted either. The tests `panels::text_styles::tests::panel_menu_duplicate_and_delete_update_the_highlighted_style` and `a_highlighted_style_that_is_no_longer_listed_is_not_highlighted` cover this. Public reference: [Character and paragraph styles](https://web.archive.org/web/20261015081534/https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
 - **Names of new styles and symbols:** `charStyle.new` and `paraStyle.new` trim the white space around the name they are given, as `charStyle.rename` and `paraStyle.rename` do, and refuse a name that is then empty; Duplicate names its copy from the trimmed name. `symbol.new` and `symbol.duplicate` trim the name as Symbol Options does, and `library.use` adds a library's text style under its trimmed name. Public reference: [Character and paragraph styles](https://web.archive.org/web/20260825113735/https://helpx.adobe.com/illustrator/using/character-paragraph-styles.html).
 - **Naming a new text style first:** Alt-click on New in the Character Styles or Paragraph Styles panel opens New Character Style or New Paragraph Style (`ui.newCharStyle`, `ui.newParaStyle`) with the name a plain click's style gets; OK makes the style from the text selected when the dialog opened, and Cancel adds none. Tests `panels::text_styles::tests::alt_clicking_new_character_style_asks_for_its_name` and `alt_clicking_new_paragraph_style_asks_for_its_name`. Public reference: [Default keyboard shortcuts](https://web.archive.org/web/20260726060015/https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html), which lists Alt-click for opening panel options and names Actions, Brushes, Swatches and Symbols as exceptions.
diff --git a/docs/type-parity.md b/docs/type-parity.md
index 102a454c3b..b8397e8404 100644
--- a/docs/type-parity.md
+++ b/docs/type-parity.md
@@ -48,7 +48,7 @@ against Illustrator's public documentation; **estimated** unless noted.
 | Hyphenation… and Justification… options | done | Eleven Indian languages use attributed patterns and preserve syllables in both composers (#4947). Hyphenation… (`ui.hyphenation`, `text.setFormat`) sets each paragraph's Words Longer Than, After First, Before Last, Hyphen Limit, Hyphenation Zone (Single-line Composer only) and Hyphenate Capitalized Words, and paragraph styles carry them (#2310). Justification… (`ui.justification`, `text.setFormat`, #2755) sets Word Spacing, Letter Spacing and Glyph Scaling (Minimum, Desired, Maximum), Auto Leading and Single Word Justification; Desired applies to every line, justified lines and the Every-line Composer use the ranges. Vertical type isn't glyph scaled; type on a path doesn't use them. Evidence: `crates/text/src/tests/justify.rs`, `dialogs::justification::tests` |
 | Roman Hanging Punctuation | done | Paragraph panel menu › Roman Hanging Punctuation, `text.setFormat {romanHangingPunctuation}` (#2756): per paragraph, Optical Margin Alignment's punctuation and amounts without the letters; paragraph styles carry it. Evidence: `tests::roman_hanging_punctuation_hangs_punctuation_but_not_letters`, `typecmd::area_tests::roman_hanging_punctuation_is_set_per_paragraph_and_saved_only_when_on` |
 | Hyphenation… and Justification… options | done | Eleven Indian languages use attributed patterns and preserve syllables in both composers (#4947). Hyphenation… (`ui.hyphenation`, `text.setFormat`) sets each paragraph's Words Longer Than, After First, Before Last, Hyphen Limit, Hyphenation Zone (Single-line Composer only) and Hyphenate Capitalized Words, and paragraph styles carry them (#2310). Justification… (`ui.justification`, `text.setFormat`, #2755) sets Word Spacing, Letter Spacing and Glyph Scaling (Minimum, Desired, Maximum), Auto Leading and Single Word Justification; Desired applies to every line, justified lines and the Every-line Composer use the ranges. Vertical type isn't glyph scaled; type on a path doesn't use them. Auto Leading also sets the Leading the Character panel shows for Auto type, the leading Alt+↑/↓ (`type.step`) steps from, per paragraph, and the lines Fill with Placeholder Text counts. Evidence: `crates/text/src/tests/justify.rs`, `dialogs::justification::tests`, `tests_prefs::auto_leading_steps_and_fills_from_the_paragraph_auto_leading`, `panels::character` test `leading_field_shows_the_paragraph_auto_leading` |
-| Tab stops and leaders; Tabs panel | partial | Tabs panel and stops with leaders in the model (`text.tabs.set`); a stop drags from where the press landed (#1458); leaders fill the tab's gap, repeated on a grid so they line up from line to line (#1877); Ctrl-dragging a stop (Command on macOS) moves all the stops together; in right-aligned area type the text before a line's last tab sits at its stops, from the left edge, and the text after it against the right edge, as Illustrator's own layout in a user's `.ai` sets a price list (evidence: `tests::right_aligned_area_type_sets_the_text_after_its_last_tab_against_the_edge`; centred and justified lines are still aligned as a whole) |
+| Tab stops and leaders; Tabs panel | partial | Tabs panel and stops with leaders in the model (`text.tabs.set`); a stop drags from where the press landed (#1458); leaders fill the tab's gap, repeated on a grid so they line up from line to line (#1877); Ctrl-dragging a stop (Command on macOS) moves all the stops together; in right-aligned area type the text before a line's last tab sits at its stops, from the left edge, and the text after it against the right edge, as Illustrator's own layout in a user's `.ai` sets a price list (evidence: `tests::right_aligned_area_type_sets_the_text_after_its_last_tab_against_the_edge`; centred lines are still aligned as a whole); in justified area type the text up to a line's last tab keeps its spacing and its tabs their stops, and the text after the last tab takes the line's room to the far edge, VectorCraft's own rule (evidence: `tests::justify::a_justified_line_with_a_tab_spreads_the_text_after_it_to_the_edge` and the other tab tests in `crates/text/src/tests/justify.rs`) |
 | Hidden characters (Show Hidden Characters) | done | `type.hiddenCharacters` |
 | Spell check (Check Spelling, Auto Spell Check, custom dictionary) | partial | the engine (#4936): `text.spelling.check` lists the unknown words of the document's type, each run in its Language, at the bytes `text.editRange` changes, and `text.spelling.suggest` gives suggestions, both from craft-proof, each paragraph on its own (English from the first dictionary it finds: a Hunspell dictionary in the user's dictionaries folder, the SCOWL dictionary built in from craft-i18n, a system Hunspell dictionary, and last the public-domain Moby word list built into it; other languages from the dictionaries craft-proof finds for them). The custom dictionary commands are done: `text.spelling.addWord`, `removeWord` and `changeWord` (Add, and Edit Custom Dictionary's Add, Delete and Change), and `text.spelling.dictionary` lists the words, saved to `Custom Dictionary.txt` beside the preferences; Ignore All: `text.spelling.ignoreAll` skips a word in the active document while it is open. Auto Spell Check is done: Edit › Spelling › Auto Spell Check (`edit.autoSpellCheck`, off at first, saved with the view settings) draws a red wavy line under the unknown words of the visible type, leaves out type with effects, and follows edits, the custom dictionary and Ignore All. A right-click on an underlined word lists the words its dictionary suggests (each replaces it in one undo step, `text.editRange`), or No Suggestions, then Ignore All and Add to Dictionary, and a right-click on type has Spelling › Auto Spell Check, checked while it is on. Edit › Edit Custom Dictionary… lists the custom dictionary's words, with an Entry field and Add, Delete and Change, applied on Done (Cancel leaves the dictionary as it was). The Check Spelling dialog remains. Evidence: `crates/engine/src/tests/spelling.rs`, `crates/ui-egui/src/canvas/tests.rs` (`auto_spell_check_*`), `crates/ui-egui/src/tests/contextmenu.rs` (the right-click), `crates/ui-egui/src/dialogs/custom_dictionary.rs` (the dialog). |
 | Smart Punctuation, Change Case, Find & Replace | done | |

From e11155c692084aafed6d2339462907b19d50d0e7 Mon Sep 17 00:00:00 2001
From: jmverges <juanmanuel.vergessolanas@gmail.com>
Date: Fri, 13 Nov 2026 14:42:07 +0000
Subject: [PATCH 39/48] Envelopes: a top object's split goes by the longer of
 handles or bends

The previous commit took the spans from how far each piece bends away
from the split whenever both handles there were within ONE_CURVE of the
anchor. A curve that barely moves at the split but doesn't bend there
(a straight one, say) has short handles and no bend, so that gave 0/0
and the side fell back to the polygon shares. Now the spans come from
whichever pair is the longer: the handles, or the bends (which go with
the squares of the spans). The check of every piece against the
rebuilt curve is unchanged.

Test: a_split_curve_keeps_the_top_object_patch_where_it_barely_moves_and_runs_straight.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 crates/doc/src/live.rs      | 17 +++++++++++++++++
 crates/doc/src/live/mesh.rs | 19 ++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/crates/doc/src/live.rs b/crates/doc/src/live.rs
index 6c0e880ee1..cf7a4d2fa0 100644
--- a/crates/doc/src/live.rs
+++ b/crates/doc/src/live.rs
@@ -628,6 +628,23 @@ mod tests {
         }
     }
 
+    #[test]
+    fn a_split_curve_keeps_the_top_object_patch_where_it_barely_moves_and_runs_straight() {
+        // A straight top curve that barely moves at t = 0.25 and doesn't bend there: split there,
+        // the handles at the split are a few thousandths of a point long and the pieces don't bend
+        // at all, and the patch with the corners given stays the unsplit curve's.
+        let slow = CubicBez::new((0.0, 0.0), (28.578125, 0.0), (-57.109375, 0.0), (200.0, 0.0));
+        let pieces = [slow.subsegment(0.0..0.25), slow.subsegment(0.25..1.0)];
+        let (into, out) = (pieces[0].p3.distance(pieces[0].p2), pieces[1].p0.distance(pieces[1].p1));
+        assert!(into > 0.0 && out > 0.0 && into.max(out) < 0.01, "{into} {out}");
+        let whole = Coons::from_top_object(&top_of_pieces(&[slow]), Some([0, 1, 2, 3])).unwrap();
+        let c = Coons::from_top_object(&top_of_pieces(&pieces), Some([0, 2, 3, 4])).unwrap();
+        for (u, v) in [(0.1, 0.0), (0.25, 0.0), (0.3, 0.2), (0.5, 0.5), (0.62, 0.0), (0.9, 0.7), (0.97, 1.0)] {
+            let (p, q) = (c.eval(u, v), whole.eval(u, v));
+            assert!(p.distance(q) < 1e-6, "({u}, {v}) → {p:?}, unsplit {q:?}");
+        }
+    }
+
     #[test]
     fn a_top_object_joins_a_split_curve_saved_with_rounded_coordinates() {
         // A file saves the pieces of a curve split into thirds, or into tenths, with its
diff --git a/crates/doc/src/live/mesh.rs b/crates/doc/src/live/mesh.rs
index dbebf9a439..b6d5bbc88d 100644
--- a/crates/doc/src/live/mesh.rs
+++ b/crates/doc/src/live/mesh.rs
@@ -364,7 +364,7 @@ fn control_polygon(c: &CubicBez) -> f64 {
 /// of the split lie in line, their lengths in proportion to the spans of its parameter the two
 /// pieces take; split where the curve stops (a cusp), both handles lie on the anchor, and the
 /// pieces' second derivatives there, in proportion to the squares of the spans, give the proportion
-/// instead. Those proportions give each piece's span, and the curve follows from the first
+/// instead (whichever of the two pairs is the longer). Those proportions give each piece's span, and the curve follows from the first
 /// piece's start and its handle, and the last piece's end and its handle, scaled up by their spans.
 /// Every piece is then checked against that curve's piece over its span, so error can't build up
 /// from one split to the next (the first piece's start and handle, and the last piece's end and
@@ -379,16 +379,13 @@ fn one_curve(pieces: &[CubicBez]) -> Option<CubicBez> {
     for pair in pieces.windows(2) {
         let [a, b] = pair else { return None };
         let (into, out) = (a.p3.distance(a.p2), b.p0.distance(b.p1));
-        let ratio = if into.max(out) <= ONE_CURVE {
-            // Split where the curve stops (a cusp), both handles lie on the anchor and say nothing
-            // of the spans; how far each piece bends away from its anchor, in proportion to the
-            // squares of the spans, says it instead.
-            let bend_in = ((a.p3 - a.p2) - (a.p2 - a.p1)).hypot();
-            let bend_out = ((b.p2 - b.p1) - (b.p1 - b.p0)).hypot();
-            (bend_out / bend_in).sqrt()
-        } else {
-            out / into
-        };
+        // How far each piece bends away from the anchor goes with the squares of the spans. Split
+        // where the curve stops (a cusp), both handles lie on the anchor and say nothing of the
+        // spans, and the bends say it; where the curve runs straight through the split, the bends
+        // are nothing and the handles say it. Whichever pair is the longer is the one to go by.
+        let bend_in = ((a.p3 - a.p2) - (a.p2 - a.p1)).hypot();
+        let bend_out = ((b.p2 - b.p1) - (b.p1 - b.p0)).hypot();
+        let ratio = if into.min(out) >= bend_in.min(bend_out) { out / into } else { (bend_out / bend_in).sqrt() };
         let next = spans.last().copied().unwrap_or(1.0) * ratio;
         if !(next.is_finite() && next > 0.0) {
             return None;

From 5d5b8aa53bdc851c1b6040089dea2a6bee47018d Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:43:32 -0800
Subject: [PATCH 40/48] i18n: Hindi messages keep their English meaning and the
 catalog's terms
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

193 Hindi rows outside the plug-in messages said something other than
their English: "a number of points" read as "many digits", swatches as
clocks, crop as a harvest, resolution as a resolve, and saving used
words the glossary replaces. Others left English prose in place,
dropped a clause ("to keep them all", "what follows it") or ran the
sentence backwards.

- Rows use सेव, स्वॉच, क्रॉप, रिज़ॉल्यूशन, पाथ and टाइप (for a text
  object) as docs/localization-hi.md sets them.
- Values a command reads (enum values, preset names, OpenType tags)
  stay as the English writes them.
- A test checks those terms and the point unit in every Hindi row, and
  another pins rows whose quantity or clause was lost.
- docs/localization-hi.md, docs/localization-parity.md and
  docs/target-app-parity.md carry the new counts and a wording note.
---
 crates/ui-egui/src/i18n/hi.tsv   | 386 +++++++++++++++----------------
 crates/ui-egui/src/i18n/tests.rs |  53 +++++
 docs/localization-hi.md          |  12 +
 docs/localization-parity.md      |   2 +-
 docs/target-app-parity.md        |   1 +
 5 files changed, 260 insertions(+), 194 deletions(-)

diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv
index 9aa4bd7b99..976722d62c 100644
--- a/crates/ui-egui/src/i18n/hi.tsv
+++ b/crates/ui-egui/src/i18n/hi.tsv
@@ -754,7 +754,7 @@ antiAlias	Sharp	शार्प
 	Changed since the last check.	आखिरी चेक के बाद से बदल गया।
 	Changed since the last Refresh.	आखिरी रिफ्रेश के बाद से बदल गया।
 	Changes allowed:	परिवर्तन की अनुमति:
-	Changes made since it was last saved will be lost.	क्योंकि यह पिछले बचाया गया था परिवर्तन खो दिया जाएगा।
+	Changes made since it was last saved will be lost.	पिछली बार सेव करने के बाद किए गए बदलाव खो जाएँगे।
 	Changes the reference app's preferences	संदर्भ ऐप की वरीयताओं को बदलता है
 	Changing these settings changes how raster effects look when exported, flattened or expanded.	ये सेटिंग्स बदलने से एक्सपोर्ट, फ़्लैटन या एक्सपैंड किए गए रास्टर इफ़ेक्ट्स का रूप बदलता है।
 	Channel	चैनल
@@ -776,7 +776,7 @@ antiAlias	Sharp	शार्प
 	Character:	कैरेक्टर:
 	Charcoal	चारकोल
 	Charcoal…	चारकोल…
-	Check an artboard to save.	बचाने के लिए एक आर्टबोर्ड की जाँच करें।
+	Check an artboard to save.	सेव करने के लिए किसी आर्टबोर्ड पर चेक लगाएँ।
 	Check Document	डॉक्यूमेंट की जाँच करें
 	Check for Updates…	अपडेट जाँचें…
 	Check Links	चेक लिंक
@@ -818,9 +818,9 @@ antiAlias	Sharp	शार्प
 	Click or drag	क्लिक करें या खींचें
 	Click the art with the Gradient tool to add or select points.	पॉइंट जोड़ने या सिलेक्ट करने के लिए ग्रेडिएंट टूल से आर्टवर्क पर क्लिक करें।
 	Click the first point	पहले बिंदु पर क्लिक करें
-	Click the ramp or a type button to apply a gradient.	एक ग्रेडिएंट लगाने के लिए रैंप या एक प्रकार का बटन पर क्लिक करें।
+	Click the ramp or a type button to apply a gradient.	ग्रेडिएंट लगाने के लिए रैंप या किसी प्रकार बटन पर क्लिक करें।
 	Click to add a tab stop, drag to move it, drag it off the ruler to delete it	टैब स्टॉप जोड़ने के लिए क्लिक करें, खिसकाने के लिए ड्रैग करें, हटाने के लिए रूलर से बाहर ड्रैग करें
-	Click to apply to the selected type	सिलेक्टेड प्रकार पर लागू करने के लिए क्लिक करें
+	Click to apply to the selected type	सिलेक्टेड टाइप पर लागू करने के लिए क्लिक करें
 	Click to choose a swatch, Shift-click to mix a colour	स्वॉच चुनने के लिए क्लिक करें, रंग मिलाने के लिए Shift-क्लिक करें
 	Click to edit	संपादित करने के लिए क्लिक करें
 	Click to edit the mask; Alt-click to view only the mask; Shift-click to disable or enable it	मास्क एडिट करने के लिए क्लिक करें; केवल मास्क देखने के लिए Alt-क्लिक करें; उसे अक्षम या सक्षम करने के लिए Shift-क्लिक करें
@@ -858,7 +858,7 @@ antiAlias	Sharp	शार्प
 	Close paths when ends are within:	जब समाप्त होता है तो बंद पाथ भीतर होते हैं:
 	Close the circular ends of open profiles. Partial sweeps keep their cut sides open.	खुली प्रोफ़ाइल के गोल सिरे बंद करें। आंशिक स्वीप की कटी हुई साइड खुली रहती हैं।
 	Closed	बंद
-	Closing bracket with no opening one	कोई ओपन करने के साथ समापन ब्रैकेट
+	Closing bracket with no opening one	बंद करने वाला ब्रैकेट, जिसका कोई खोलने वाला ब्रैकेट नहीं है
 	Clumped	गुच्छेदार
 	Cmd	Cmd
 	CMYK	CMYK
@@ -1069,7 +1069,7 @@ antiAlias	Sharp	शार्प
 	Couldn't {} {name}: {e}	{name} को {} नहीं किया जा सका: {e}
 	Couldn't copy to the system clipboard: {e}	सिस्टम क्लिपबोर्ड को कॉपी नहीं कर सका: {e}
 	Couldn't paste from the clipboard: {e}	क्लिपबोर्ड से पेस्ट नहीं कर सका: {e}
-	Couldn't save recovery data: {e}	वसूली डेटा नहीं बचा सकता: {e}
+	Couldn't save recovery data: {e}	रिकवरी डेटा सेव नहीं किया जा सका: {e}
 	Count	गिनती
 	Count:	गिनती:
 	Cove	कोव
@@ -1119,7 +1119,7 @@ antiAlias	Sharp	शार्प
 	CRLF (Windows)	CRLF (Windows)
 	Croatian	क्रोएशियाई
 	Crop	क्रॉप करें
-	Crop Image	फसल की इमेज
+	Crop Image	इमेज क्रॉप करें
 	Image Tools	इमेज टूल
 	Remove Background…	पृष्ठभूमि हटाएँ…
 	Remove Background	पृष्ठभूमि हटाएँ
@@ -1134,7 +1134,7 @@ antiAlias	Sharp	शार्प
 	Remove Color Mask	रंग मास्क हटाएँ
 	Apply Color Mask	रंग मास्क लागू करें
 	Crop Marks	क्रॉप मार्क
-	Crop To	करने के लिए फसल
+	Crop To	इसके अनुसार क्रॉप करें
 	Cross	क्रॉस
 	Crosshatch	क्रॉसहैच
 	Crosshatch…	क्रॉसहैच…
@@ -1326,7 +1326,7 @@ antiAlias	Sharp	शार्प
 	Diffusion	डिफ़्यूज़न
 	Digits	अंक
 	Dim Copies to:	प्रतियाँ इतनी मंद करें:
-	Dim Images to:	करने के लिए इमेज:
+	Dim Images to:	इमेज इतनी मंद करें:
 	Dimension	आयाम
 	Dimension Lines	आयाम लाइन
 	Dimension Text	आयाम टेक्स्ट
@@ -1343,7 +1343,7 @@ antiAlias	Sharp	शार्प
 	Disable Auto Add/Delete	ऑटो जोड़ना/हटाना अक्षम करें
 	Disable Opacity Mask	ओपेसिटी मास्क अक्षम करें
 	Discard	डिस्कर्ड
-	Discard Empty Type	डिस्कर्ड खाली प्रकार
+	Discard Empty Type	खाली टाइप हटाएँ
 	Discard Recovered Documents	रिकवर किए डॉक्यूमेंट डिस्कार्ड करें
 	Discard White Overprint in Output	आउटपुट में अलार्म व्हाइट ओवरप्रिंट
 	Discord	Discord
@@ -1410,7 +1410,7 @@ antiAlias	Sharp	शार्प
 	Document Raster Effects Settings…	डॉक्यूमेंट रास्टर इफ़ेक्ट्स सेटिंग्स…
 	Document Setup	डॉक्यूमेंट सेटअप
 	Document Setup…	डॉक्यूमेंट सेटअप…
-	Document Swatches	डॉक्यूमेंट Swatch
+	Document Swatches	डॉक्यूमेंट स्वॉचेस
 	Document Title:	डॉक्यूमेंट शीर्षक:
 	Document Tools	डॉक्यूमेंट टूल
 	Documents you create appear here.	डॉक्यूमेंट जो आप यहाँ दिखाई देते हैं।
@@ -1536,7 +1536,7 @@ antiAlias	Sharp	शार्प
 	Ease In Out	बाहर में आसानी
 	Ease Out	ईज़ आउट
 	Ease Out In	ईज़ आउट इन
-	East Asian Type	पूर्वी एशियाई प्रकार
+	East Asian Type	पूर्वी एशियाई टाइप
 	Edge	किनारा
 	Edge Brightness	किनारे की ब्राइटनेस
 	Edge Fidelity	किनारे की सटीकता
@@ -1841,7 +1841,7 @@ antiAlias	Sharp	शार्प
 	Fill Grid	ग्रिड भरें
 	Fill Line	लाइन भरें
 	Fill new strokes	नए स्ट्रोक भरें
-	Fill New Type Objects With Placeholder Text	प्लेसहोल्डर टेक्स्ट के साथ नए प्रकार के ऑब्जेक्ट भरें
+	Fill New Type Objects With Placeholder Text	नए टाइप ऑब्जेक्ट्स में प्लेसहोल्डर टेक्स्ट भरें
 	Fill Pattern	पैटर्न भरें
 	Fill Rule	नियम भरें
 	Fill with Placeholder Text	प्लेसहोल्डर टेक्स्ट से भरें
@@ -2217,8 +2217,8 @@ antiAlias	Sharp	शार्प
 	High Fidelity Photo	उच्च निष्ठा फोटो
 	High Performance (discrete)	उच्च निष्पादन (डिस्क्रीट)
 	High Quality Print	उच्च गुणवत्ता वाले प्रिंट
-	High resolution	उच्च संकल्प
-	High Resolution	उच्च संकल्प
+	High resolution	उच्च रिज़ॉल्यूशन
+	High Resolution	उच्च रिज़ॉल्यूशन
 	Highlight	हाइलाइट
 	Highlight Alternate Glyphs	हाइलाइट अल्टरनेटर ग्लिफ़
 	Highlight anchors on mouse over	माउस ओवर पर हाइलाइट एंकर
@@ -2427,11 +2427,11 @@ antiAlias	Sharp	शार्प
 	Justification	जस्टिफ़िकेशन
 	Justification…	जस्टिफ़िकेशन…
 	Justify	जस्टिफ़ाई करें
-	Justify all lines	सभी लाइनों को जस्ट करें
+	Justify all lines	सभी लाइनें जस्टिफ़ाई करें
 	Justify Vertically	वर्टिकल दिशा में जस्टिफ़ाई करें
-	Justify with last line aligned center	अंतिम पंक्ति संरेखित केंद्र के साथ Justify
+	Justify with last line aligned center	आखिरी लाइन बीच में अलाइन करके जस्टिफ़ाई करें
 	Justify with last line aligned left	आखिरी लाइन बाएँ अलाइन करके जस्टिफ़ाई करें
-	Justify with last line aligned right	अंतिम पंक्ति के साथ Justify सही गठबंधन
+	Justify with last line aligned right	आखिरी लाइन दाएँ अलाइन करके जस्टिफ़ाई करें
 	Kaku #2	काकू #2
 	Kaku #3	काकू #3
 	Kannada	कन्नड़
@@ -2445,7 +2445,7 @@ antiAlias	Sharp	शार्प
 	Keep Plain Text	प्लेन टेक्स्ट रखें
 	Keep selected	सिलेक्ट करें
 	Keep Shared Points Together	साझा अंक एक साथ रखें
-	Keep the pasted color as a new swatch with a numbered name.	पेस्ट किए गए रंग को एक नए swatch के रूप में रखें।
+	Keep the pasted color as a new swatch with a numbered name.	पेस्ट किए गए रंग को क्रमांकित नाम वाले नए स्वॉच के रूप में रखें।
 	Keep this row's colors (exclude)	इस पंक्ति के रंग (बाहर) रखें
 	Keep visible surfaces only when expanding	विस्तार करते समय केवल दृश्यमान सतहों को रखें
 	Keep:	ध्यान रखें:
@@ -2597,7 +2597,7 @@ antiAlias	Sharp	शार्प
 	Lines +/−	पंक्तियाँ +/−
 	Lines added	जोड़ी गई पंक्तियाँ
 	Lines deleted	हटाई गई पंक्तियाँ
-	Lines: clicks add points joined by a line	लाइन्स: क्लिक्स ऐड पॉइंट्स एक लाइन से जुड़ गए
+	Lines: clicks add points joined by a line	लाइन्स: क्लिक से पॉइंट जुड़ते हैं, जिन्हें एक लाइन जोड़ती है
 	Link	लिंक करें
 	Link Block Series	लिंक ब्लॉक श्रृंखला
 	Link harmony colors	लिंक सद्भाव रंग
@@ -2679,8 +2679,8 @@ antiAlias	Sharp	शार्प
 	Lossy:	हानि:
 	Low	निम्न
 	Low Fidelity Photo	लो फिडेलिटी फोटो
-	Low Resolution	कम संकल्प
-	Low resolution (150 ppi)	कम संकल्प (150 ppi)
+	Low Resolution	कम रिज़ॉल्यूशन
+	Low resolution (150 ppi)	कम रिज़ॉल्यूशन (150 ppi)
 	lowercase	लोअरकेस
 	Luminosity	ल्यूमिनोसिटी
 	LZW Compression	LZW संपीड़न
@@ -2692,7 +2692,7 @@ antiAlias	Sharp	शार्प
 	Magic Wand Tool	मैजिक वैंड टूल
 	Maintain Envelope Shape	लिफाफे आकार को बनाए रखें
 	Make	बनाएँ
-	Make a theme on Create and save it.	Create पर थीम बनाकर सेव करें।
+	Make a theme on Create and save it.	बनाएँ टैब पर थीम बनाकर उसे सेव करें।
 	Make all bleed settings the same	सभी ब्लीड सेटिंग्स एक जैसी करें
 	Make and Expand	बनाएँ और एक्सपैंड करें
 	Make Blend	ब्लेंड बनाएँ
@@ -2765,7 +2765,7 @@ antiAlias	Sharp	शार्प
 	Medium Gray	मध्यम ग्रे
 	Medium Light	मध्यम प्रकाश
 	Medium Lines	मध्यम रेखाएँ
-	Medium Resolution	मध्यम संकल्प
+	Medium Resolution	मध्यम रिज़ॉल्यूशन
 	Medium Strokes	मध्यम स्ट्रोक
 	Medium Thumbnail View	मध्यम थंबनेल
 	Medium Thumbnails	मध्यम थंबनेल
@@ -3040,8 +3040,8 @@ antiAlias	Sharp	शार्प
 	No options	कोई ऑप्शन्स
 	No printer settings to open here	यहाँ ओपन करने के लिए कोई प्रिंटर सेटिंग नहीं
 	No results	कोई परिणाम नहीं
-	No saved themes	कोई बचाया विषयों
-	No saved views (View → New View…)	कोई बचाया दृष्टिकोण (देखें → नया दृश्य)
+	No saved themes	कोई सेव की गई थीम नहीं
+	No saved views (View → New View…)	कोई सेव किया गया व्यू नहीं (व्यू → नया दृश्य…)
 	No selection	कोई सिलेक्शन नहीं
 	No Selection	कोई सिलेक्शन नहीं
 	No Slices	कोई स्लाइस नहीं
@@ -3337,7 +3337,7 @@ antiAlias	Sharp	शार्प
 	Paragraph:	पैराग्राफ़:
 	Parametric Shape	पैरामीट्रिक आकार
 	Parametric Shape Tool	पैरामीट्रिक आकार टूल
-	Part of ArtCraft. MIT OR Apache-2.0. Fonts: Source Sans 3, Inter, JetBrains Mono (OFL). Icons: Lucide (ISC) + VectorCraft.	ArtCraft. MIT OR Apache-2.0. Fonts: Source Sans 3, Inter, JetBrains Mono (OFL). प्रतीक: Lucide (ISC) + VectorCraft.
+	Part of ArtCraft. MIT OR Apache-2.0. Fonts: Source Sans 3, Inter, JetBrains Mono (OFL). Icons: Lucide (ISC) + VectorCraft.	ArtCraft का हिस्सा। MIT OR Apache-2.0. फ़ॉन्ट: Source Sans 3, Inter, JetBrains Mono (OFL). आइकन: Lucide (ISC) + VectorCraft.
 	Part of ArtCraft. MIT OR Apache-2.0. Fonts: Source Sans 3, Inter, JetBrains Mono, Noto Sans SC (OFL). Icons: Lucide (ISC) + VectorCraft.	ArtCraft का हिस्सा। MIT OR Apache-2.0। फ़ॉन्ट: Source Sans 3, Inter, JetBrains Mono, Noto Sans SC (OFL)। आइकन: Lucide (ISC) + VectorCraft।
 	Password	पासवर्ड
 	Paste	पेस्ट करें
@@ -3375,7 +3375,7 @@ antiAlias	Sharp	शार्प
 	Pattern Editing	पैटर्न संपादन
 	Pattern Options	पैटर्न ऑप्शन्स
 	Pattern options are available in pattern editing mode.	पैटर्न ऑप्शन्स पैटर्न संपादन मोड में उपलब्ध हैं।
-	Pattern Swatches	पैटर्न Swatches
+	Pattern Swatches	पैटर्न स्वॉचेस
 	Pattern Type	पैटर्न प्रकार
 	Patterns	पैटर्न्स
 	Pause For	इतने समय रुकें
@@ -3446,7 +3446,7 @@ antiAlias	Sharp	शार्प
 	Place	प्लेस करें
 	Place DXF	DXF रखें
 	Place from Library	लाइब्रेरी
-	Place onto a new locked, dimmed template layer below the current layer	वर्तमान लेयर के नीचे एक नए बंद, dimmed टेम्पलेट लेयर पर रखें
+	Place onto a new locked, dimmed template layer below the current layer	वर्तमान लेयर के नीचे एक नए लॉक्ड, डिम किए गए टेम्पलेट लेयर पर रखें
 	Place PDF	PDF रखें
 	Place Symbol Instance	सिंबल इंस्टेंस प्लेस करें
 	Place the pages with the placement again	पृष्ठों को फिर से प्लेसमेंट के साथ रखें
@@ -3521,7 +3521,7 @@ antiAlias	Sharp	शार्प
 	Points	पॉइंट्स
 	Points per segment	प्रति खंड अंक
 	Points:	पॉइंट्स:
-	Points: clicks add free points	अंक: क्लिक मुफ्त अंक जोड़ते हैं
+	Points: clicks add free points	पॉइंट्स: क्लिक से अलग-अलग पॉइंट जुड़ते हैं
 	Polar Grid	ध्रुवीय ग्रिड
 	Polar Grid Tool	ध्रुवीय ग्रिड टूल
 	Polar Grid Tool Options	ध्रुवीय ग्रिड टूल ऑप्शन्स
@@ -3943,8 +3943,8 @@ antiAlias	Sharp	शार्प
 	Reset Preferences	प्रेफ़रेंसेज़ रीसेट करें
 	Export Preferences…	प्रेफ़रेंसेज़ निर्यात करें…
 	Import Preferences…	प्रेफ़रेंसेज़ आयात करें…
-	Save the applied preferences to a JSON file	लागू प्रेफ़रेंसेज़ को JSON फ़ाइल में सहेजें
-	Apply the preferences in a file Export Preferences saved	प्रेफ़रेंसेज़ निर्यात करें से सहेजी गई फ़ाइल की प्रेफ़रेंसेज़ लागू करें
+	Save the applied preferences to a JSON file	लागू प्रेफ़रेंसेज़ को JSON फ़ाइल में सेव करें
+	Apply the preferences in a file Export Preferences saved	प्रेफ़रेंसेज़ निर्यात करें से सेव की गई फ़ाइल की प्रेफ़रेंसेज़ लागू करें
 	Export Preferences	प्रेफ़रेंसेज़ निर्यात करें
 	Import Preferences	प्रेफ़रेंसेज़ आयात करें
 	Search Preferences	प्रेफ़रेंसेज़ में खोजें
@@ -3991,7 +3991,7 @@ antiAlias	Sharp	शार्प
 	Resize panel window	पैनल विंडो का साइज़ बदलें
 	Resize panels	पैनलों का साइज़ बदलें
 	Resize Slice	स्लाइस का आकार
-	Resize Type Area	प्रकार क्षेत्र का आकार
+	Resize Type Area	टाइप एरिया का आकार बदलें
 	Resolution:	रिज़ॉल्यूशन:
 	Responsive	उत्तरदायी
 	Restore	पुनर्स्थापित करें
@@ -4234,7 +4234,7 @@ antiAlias	Sharp	शार्प
 	Saved View 8	सेव्ड व्यू 8
 	Saved View 9	सेव्ड व्यू 9
 	Saved Views	सेव किया गया दृश्य
-	Saves the current bars, toolbar and panel layout.	वर्तमान बार, टूलबार और पैनल लेआउट को बचाता है।
+	Saves the current bars, toolbar and panel layout.	वर्तमान बार, टूलबार और पैनल लेआउट को सेव करता है।
 	Saving	सेव किया जा रहा है
 	Saving {}	बचत {}
 	Saving Poster.vectorcraft	बचत Poster.vectorcraft
@@ -4349,7 +4349,7 @@ antiAlias	Sharp	शार्प
 	Select styled art and click New Graphic Style.	स्टाइलबद्ध कला सिलेक्ट करें और नई ग्राफिक स्टाइल क्लिक करें।
 	Select text	टेक्स्ट चुनें
 	Select Text by Font	फ़ॉन्ट द्वारा टेक्स्ट सिलेक्ट करें
-	Select text or click into text with the Type tool to insert glyphs	टेक्स्ट सिलेक्ट करें या glyphs डालने के लिए टाइप टूल के साथ टेक्स्ट में क्लिक करें
+	Select text or click into text with the Type tool to insert glyphs	टेक्स्ट सिलेक्ट करें या ग्लिफ़ डालने के लिए टाइप टूल से टेक्स्ट में क्लिक करें
 	Select text to set its OpenType features.	अपनी OpenType सुविधाओं को सेट करने के लिए टेक्स्ट सिलेक्ट करें।
 	Select the art (and, on top of it, the mask object)	कला सिलेक्ट करें (और इसके शीर्ष पर, मास्क ऑब्जेक्ट)
 	Select Tool	टूल सिलेक्ट करें
@@ -4363,7 +4363,7 @@ antiAlias	Sharp	शार्प
 	Selected Styles Only (0)	केवल सिलेक्टेड स्टाइल्स (0)
 	Selected Swatches	सिलेक्टेड स्वॉचेस
 	Selected Swatches Only	केवल सिलेक्टेड स्वॉचेस
-	Selected Swatches Only (0)	केवल सिलेक्टेड Swatches (0)
+	Selected Swatches Only (0)	केवल सिलेक्टेड स्वॉचेस (0)
 	Selected Symbols Only	केवल सिलेक्टेड सिंबल
 	Selected: {n}, Total number of files to export: {m}	सिलेक्टेड: {n}, निर्यात करने के लिए फ़ाइलों की कुल संख्या: {m}
 	Selection	सिलेक्शन
@@ -4497,7 +4497,7 @@ antiAlias	Sharp	शार्प
 	Show all open documents	सभी खुला डॉक्यूमेंट दिखाएं
 	Show all plates	सभी प्लेटें दिखाएं
 	Show All Plates	सभी प्लेटें दिखाएं
-	Show All Swatches	सभी Swatches दिखाएँ
+	Show All Swatches	सभी स्वॉचेस दिखाएँ
 	Show and print from the Lab definition; PDF files carry it as the ink's alternate color.	लैब परिभाषा से शो और प्रिंट करें; PDF फ़ाइलें इसे स्याही के वैकल्पिक रंग के रूप में ले जाती हैं।
 	Show and separate through the working CMYK space, as in older documents.	पुराने डॉक्यूमेंट्स के रूप में कार्य CMYK अंतरिक्ष के माध्यम से दिखाएँ और अलग करें।
 	Show Artboards	आर्टबोर्ड्स दिखाएँ
@@ -4544,7 +4544,7 @@ antiAlias	Sharp	शार्प
 	Show Original Path	मूल पाथ दिखाएं
 	Show Package	पैकेज करें दिखाएँ
 	Show Panel	शो पैनल
-	Show Pattern Swatches	पैटर्न Swatches दिखाएँ
+	Show Pattern Swatches	पैटर्न स्वॉचेस दिखाएँ
 	Show Perspective Grid	पर्सपेक्टिव ग्रिड दिखाएँ
 	Show Pixel Grid (Above 600% Zoom)	प्रदर्शन पिक्सेल ग्रिड (600% ज़ूम ऊपर)
 	Show Presets	प्रीसेट्स दिखाएँ
@@ -4868,7 +4868,7 @@ antiAlias	Sharp	शार्प
 	Swatch Conflicts	स्वॉच विरोध
 	Swatch exchange files keep solid colors only.	स्वॉच एक्सचेंज फ़ाइलों में केवल सॉलिड रंग रहते हैं।
 	Swatch Libraries	स्वॉच लाइब्रेरीज़
-	Swatch Libraries Menu	घड़ी लाइब्रेरीों मेनू
+	Swatch Libraries Menu	स्वॉच लाइब्रेरीज़ मेनू
 	Swatch Library	स्वॉच लाइब्रेरी
 	Swatch Name:	स्वॉच का नाम:
 	Swatch Options	स्वॉच ऑप्शन्स
@@ -4954,7 +4954,7 @@ antiAlias	Sharp	शार्प
 	Temperature/Tint	तापमान / तापमान
 	Temperature/Tint…	तापमान / टिंट…
 	Template	टेम्पलेट
-	Template literal not closed	टेम्पलेट साक्षर नहीं बंद
+	Template literal not closed	टेम्पलेट लिटरल बंद नहीं हुआ
 	Templates	टेम्पलेट्स
 	Templates Folder	टेम्पलेट्स फ़ोल्डर
 	Tetrad	टेट्राड
@@ -5186,10 +5186,10 @@ antiAlias	Sharp	शार्प
 	Center on Bottom	नीचे केंद्रित करें
 	Type on a Path Tool	पाथ पर टाइप टूल
 	Type Optimized	टाइप ऑप्टिमाइज़
-	Type Orientation	प्रकार अभिविन्यास
+	Type Orientation	टाइप ओरिएंटेशन
 	Type stays text, and every stroke is a line with its lineweight and dashes.	टाइप टेक्स्ट बना रहता है। हर स्ट्रोक अपने लाइनवेट और डैश वाली लाइन बनता है।
 	Type Tool	टाइप टूल
-	Type Tools	प्रकार टूल
+	Type Tools	टाइप टूल्स
 	Type:	प्रकार:
 	Type…	टाइप…
 	Typing	टाइपिंग
@@ -5204,7 +5204,7 @@ antiAlias	Sharp	शार्प
 	Undo {name}	{name} पूर्ववत करें
 	Unembed	एम्बेड हटाएँ
 	Unembed…	एम्बेड हटाएँ…
-	Unembedded to {}	Unembed to {}
+	Unembedded to {}	एम्बेड हटाकर {} में रखा गया
 	Ungroup	समूह तोड़ें
 	Ungroup Color Group	रंग समूह का ग्रूपिंग हटाएँ
 	Unicode	यूनिकोड
@@ -5260,8 +5260,8 @@ antiAlias	Sharp	शार्प
 	Use Default	डिफ़ॉल्ट का उपयोग करें
 	Use document bleed settings	डॉक्यूमेंट की ब्लीड सेटिंग्स उपयोग करें
 	Use Document Raster Effects Resolution	डॉक्यूमेंट के रास्टर इफ़ेक्ट्स का रिज़ॉल्यूशन उपयोग करें
-	Use Even-Odd Fill Rule	यहां तक कि-Odd भरण नियम का उपयोग करें
-	Use Japanese Crop Marks	जापानी फसल मार्क्स का प्रयोग करें
+	Use Even-Odd Fill Rule	ईवन-ऑड फ़िल नियम का उपयोग करें
+	Use Japanese Crop Marks	जापानी क्रॉप मार्क्स का उपयोग करें
 	Use Library Item	लाइब्रेरी आइटम का उपयोग करें
 	Use Low Resolution Proxy for Linked EPS	लिंक्ड ईपीएस के लिए कम रिज़ॉल्यूशन प्रॉक्सी का उपयोग करें
 	Use Non-Zero Winding Fill Rule	गैर-ज़ीरो विंडिंग फिल नियम का उपयोग करें
@@ -5273,7 +5273,7 @@ antiAlias	Sharp	शार्प
 	Use Square for Previews	प्रीव्यू के लिए स्क्वायर का उपयोग करें
 	Use System Defaults for Edit Original	सिस्टम डिफ़ॉल्ट का उपयोग करने के लिए संपादित करें मूल
 	Use Text for Previews	प्रीव्यू के लिए टेक्स्ट का उपयोग करें
-	Use the document's swatch: pasted colors take its color.	डॉक्यूमेंट की घड़ी का उपयोग करें: पेस्ट किए गए रंग अपना रंग लेते हैं।
+	Use the document's swatch: pasted colors take its color.	डॉक्यूमेंट का स्वॉच इस्तेमाल करें: पेस्ट किए गए रंग उसका रंग ले लेते हैं।
 	Use the Selected Text's Font	सिलेक्टेड टेक्स्ट के फ़ॉन्ट का उपयोग करें
 	Use Typographer's Quotes	टाइपोग्राफ़िक उद्धरण चिह्न उपयोग करें
 	User Brush Library 1	उपयोगकर्ता ब्रश लाइब्रेरी 1
@@ -5350,7 +5350,7 @@ antiAlias	Sharp	शार्प
 	VectorCraft on getartcraft.com	getartcraft.com पर VectorCraft
 	VectorCraft on GitHub	GitHub पर VectorCraft
 	VectorCraft read this script without running it.	VectorCraft ने इस स्क्रिप्ट को रन किए बिना पढ़ा।
-	VectorCraft Swatches (.vcswatches)	वेक्टर क्रेफ्ट Swatches (.vcswatches)
+	VectorCraft Swatches (.vcswatches)	VectorCraft स्वॉचेस (.vcswatches)
 	VectorCraft Updates	वेक्टर क्रेफ्ट अपडेट
 	Vectors	वेक्टर
 	Version	संस्करण
@@ -5474,7 +5474,7 @@ antiAlias	Sharp	शार्प
 	Yes	हाँ
 	Yonroku-ban	योनरोकु-बान
 	Your browser downloads the files (several as one .zip).	आपका ब्राउज़र फ़ाइलों को डाउनलोड करता है (एक ज़िप के रूप में कई)।
-	Your changes will be lost if you don't save them.	यदि आप उन्हें नहीं बचाते हैं तो आपका परिवर्तन खो जाएगा।
+	Your changes will be lost if you don't save them.	अगर आप अपने बदलाव सेव नहीं करते हैं, तो वे खो जाएँगे।
 	Zero-Opacity Objects	शून्य-ऑपेसिटी ऑब्जेक्ट
 	Zig Zag…	ज़िग ज़ैग…
 	Zoom	ज़ूम
@@ -5686,8 +5686,8 @@ antiAlias	Sharp	शार्प
 @msg	{_1} is not a file	{_1} एक फ़ाइल नहीं है
 @msg	{_1} is reserved by the system	{_1} सिस्टम द्वारा आरक्षित है
 @msg	{_1} isn't a path	{_1} एक पाथ नहीं है
-@msg	{_1} MB of document, at most {_2} MB	{_1} MB of document, at most {_2} MB
-@msg	{_1} MB of images, at most {_2} MB	{_1} MB of images, at most {_2} MB
+@msg	{_1} MB of document, at most {_2} MB	डॉक्यूमेंट के {_1} MB, अधिकतम {_2} MB
+@msg	{_1} MB of images, at most {_2} MB	इमेज के {_1} MB, अधिकतम {_2} MB
 @msg	{_1} objects (limit {MAX_OBJECTS})	{_1} ऑब्जेक्ट्स (सीमा {MAX_OBJECTS})
 @msg	{_1} options: {e}	{_1} ऑप्शन्स: {e}
 @msg	{_1} paints nothing to rasterize	{_1} कुछ भी नहीं पेंट करता है
@@ -5697,7 +5697,7 @@ antiAlias	Sharp	शार्प
 @msg	{_1}: belongs to another account	{_1}: किसी अन्य खाते से संबंधित है
 @msg	{_1}: not a folder of its own	{_1}: अपने खुद के फ़ोल्डर नहीं
 @msg	{_1}: not a plain file	{_1}: एक सादे फ़ाइल नहीं
-@msg	{_1}: not saved, so not closed	{_1}: बचाया नहीं गया, इसलिए बंद नहीं हुआ
+@msg	{_1}: not saved, so not closed	{_1}: सेव नहीं हुआ, इसलिए बंद नहीं हुआ
 @msg	{_1}: they came in as the page's art	{_1}: वे पृष्ठ की कला के रूप में आए
 @msg	{at}: {msg}	{at}: {msg}
 @msg	{bpp}-bit bitmaps can't be read	{bpp}-bit bitmaps पढ़ा नहीं जा सकता
@@ -5748,7 +5748,7 @@ antiAlias	Sharp	शार्प
 @msg	{kind} images can't be opened (see document.formats)	{kind} इमेज ओपन नहीं हो सकतीं (document.formats देखें)
 @msg	{label} currently requires a path, compound path, type, group, blend or symbol instance. Expand other objects first.	{label} के लिए वर्तमान में एक पाथ, यौगिक पाथ, टाइप, समूह, ब्लेंड या सिंबल इंस्टेंस आवश्यक है। पहले अन्य ऑब्जेक्ट को एक्सपैंड करें।
 @msg	{label} can't build a solid from an image: trace it first with Object › Image Trace › Make.	{label} इमेज से ठोस नहीं बना सकता: पहले ऑब्जेक्ट › इमेज ट्रेस › बनाएँ से उसे ट्रेस करें।
-@msg	{label} keeps 1 of the document's {n} artboards: the file reopens with one. Turn on Preserve Editing Capabilities to keep them all.	{label} डॉक्यूमेंट के {n} आर्टबोर्ड में से 1 रखता है: फ़ाइल एक के साथ फिर से खुलती है। उन्हें रखने के लिए संरक्षित संपादन क्षमताओं को चालू करें।
+@msg	{label} keeps 1 of the document's {n} artboards: the file reopens with one. Turn on Preserve Editing Capabilities to keep them all.	{label} डॉक्यूमेंट के {n} आर्टबोर्ड में से 1 रखता है: फ़ाइल एक आर्टबोर्ड के साथ फिर से खुलती है। सभी आर्टबोर्ड रखने के लिए संपादन क्षमताओं को संरक्षित करना विकल्प चालू करें।
 @msg	{label} must be a number	{label} एक नंबर होना चाहिए
 @msg	{label} must be a number above 0 and at most {max}	{label} 0 से ऊपर और सबसे {max} पर होना चाहिए
 @msg	{label} must be at most {max} characters	{label} में अधिकतम {max} वर्ण होने चाहिए
@@ -5775,7 +5775,7 @@ antiAlias	Sharp	शार्प
 @msg	{name}: CRC or size mismatch	{name}: CRC or size mismatch
 @msg	{name}: no local header	{name}: कोई स्थानीय हैडर नहीं
 @msg	{name}: no such recovery entry	{name}: ऐसी कोई वसूली प्रविष्टि नहीं
-@msg	{name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing	{name}: केवल इस Affinity फ़ाइल के एम्बेडेड प्रीव्यू को पढ़ा जा सकता है; फ़ाइल का उपयोग करें > इसे अपनी चेतावनी के साथ देखने के लिए ओपन करें, या SVG या PDF को Affinity से पहले निर्यात करें।
+@msg	{name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing	{name}: इस Affinity फ़ाइल का केवल एम्बेडेड प्रीव्यू पढ़ा जा सका; इसे इसकी चेतावनी के साथ देखने के लिए फ़ाइल › ओपन का उपयोग करें, या प्लेस करने से पहले Affinity से SVG या PDF निर्यात करें
 @msg	{native}; its embedded preview can't be read either ({e})	{native}; इसका एम्बेड किया प्रीव्यू भी पढ़ा नहीं जा सका ({e})
 @msg	{note}) ({more}	{note} ({more})
 @msg	{path} can't be found: relink it first	{path} पाया नहीं जा सकता: इसे पहली बार फिर से लिंक करें
@@ -5785,7 +5785,7 @@ antiAlias	Sharp	शार्प
 @msg	{path}: not a file	{path}: एक फ़ाइल नहीं
 @msg	{status} ({e})	{status} ({e})
 @msg	{std} files are CMYK, and the file would have colours in {_1}	{std} फ़ाइलें CMYK हैं, और फ़ाइल में {_1} में रंग होंगे।
-@msg	{std} files embed their fonts, and the file would have one that isn't	{std} फ़ाइलें अपने फ़ॉन्ट एम्बेड करती हैं, और फ़ाइल में एक ऐसा होता है जो नहीं है।
+@msg	{std} files embed their fonts, and the file would have one that isn't	{std} फ़ाइलें अपने फ़ॉन्ट एम्बेड करती हैं, और इस फ़ाइल में एक ऐसा फ़ॉन्ट होता जो एम्बेड नहीं है
 @msg	{target} is the file this document was read from, and reading it left things out ({what}): writing over it would lose them for good. Write another file instead, or pass acknowledgeLoss: true to replace it anyway	यह डॉक्यूमेंट {target} से पढ़ा गया था और पढ़ते समय कुछ चीज़ें छूट गईं ({what}): उसी फ़ाइल पर लिखने से वे स्थायी रूप से खो जाएँगी। दूसरी फ़ाइल लिखें या फिर भी बदलने के लिए acknowledgeLoss: true दें
 @msg	{tool} isn't in a toolbar group of several tools	{tool} कई टूल्स के टूलबार समूह में नहीं है
 @msg	{ty} brushes need selected art (or params.{k})	{ty} ब्रश के लिए सिलेक्टेड आर्टवर्क (या params.{k}) चाहिए
@@ -5801,7 +5801,7 @@ antiAlias	Sharp	शार्प
 @msg	`{_1}` is a live effect: apply it with effect.apply {{"effect": "{_2}"}}	`{_1}` एक लाइव इफ़ेक्ट है: इसे effect.apply {{"effect": "{_2}"}} के साथ लागू करें
 @msg	`{_1}` is an exporter: export with document.export {{"format": "{_2}"}}	`{_1}` एक एक्सपोर्टर है: document.export {{"format": "{_2}"}} से एक्सपोर्ट करें
 @msg	`{_1}` is built in and always listed	`{_1}` बनाया गया है और हमेशा सूचीबद्ध है
-@msg	`{_1}` is no save command	`{_1}` कोई बचत आदेश नहीं है
+@msg	`{_1}` is no save command	`{_1}` कोई सेव कमांड नहीं है
 @msg	`{_1}` is not a font file the last text.findFontFiles search found	`{_1}` पिछली text.findFontFiles सर्च में मिली फ़ॉन्ट फ़ाइल नहीं है
 @msg	`{_1}` would be overwritten by the package: choose a different folder or name	`{_1}` पैकेज द्वारा ओवरराइट किया जाएगा: एक अलग फ़ोल्डर या नाम चुनें
 @msg	`{_1}`: {msg}	`{_1}`: {msg}
@@ -5810,7 +5810,7 @@ antiAlias	Sharp	शार्प
 @msg	`{f}` belongs to a VectorCraft that is running	`{f}` एक VectorCraft से संबंधित है जो चल रहा है
 @msg	`{f}` is the copy of a document open now	`{f}` एक डॉक्यूमेंट की प्रतिलिपि है जो अब खुला है
 @msg	`{file}` has no art to place	`{file}` के पास कोई कला नहीं है
-@msg	`{file}` is over {_1} MB	`{file}` is over {_1} MB
+@msg	`{file}` is over {_1} MB	`{file}` {_1} MB से बड़ी है
 @msg	`{file}` isn't a VectorCraft document, a PDF or a PDF-compatible .ai file	`{file}` एक VectorCraft डॉक्यूमेंट नहीं है, एक PDF या एक PDF-compatible.ai फ़ाइल
 @msg	`{given}` isn't a library panel (see window.swatchLibrary)	`{given}` एक लाइब्रेरी पैनल नहीं है (देखें window.swatchLibrary)
 @msg	`{id}` has no envelope dialog	`{id}` में कोई लिफाफा संवाद नहीं है
@@ -5826,7 +5826,7 @@ antiAlias	Sharp	शार्प
 @msg	`{k}` must be {what}, not {v}	`{k}` होना चाहिए {what}, नहीं {v}
 @msg	`{k}` must be a byte offset	`{k}` को एक बाइट ऑफ़सेट होना चाहिए
 @msg	`{k}` must be a number	`{k}` एक संख्या होना चाहिए
-@msg	`{k}` must be a number of points	`{k}` को कई अंक होना चाहिए
+@msg	`{k}` must be a number of points	`{k}` पॉइंट में एक संख्या होनी चाहिए
 @msg	`{k}` must be a string	`{k}` एक स्ट्रिंग होना चाहिए
 @msg	`{k}` must be a whole number	`{k}` एक पूर्ण संख्या होना चाहिए
 @msg	`{k}` must be from {lo} to {hi} for {key}	`{k}` होना चाहिए {lo} से {hi} {key} के लिए
@@ -5871,7 +5871,7 @@ antiAlias	Sharp	शार्प
 @msg	`{n}` can't be deleted	`{n}` को हटाया नहीं जा सकता
 @msg	`{n}` can't be merged	`{n}` को विलय नहीं किया जा सकता है
 @msg	`{n}` can't be moved	`{n}` को स्थानांतरित नहीं किया जा सकता है
-@msg	`{n}` is not a colour swatch	`{n}` एक रंग की घड़ी नहीं है
+@msg	`{n}` is not a colour swatch	`{n}` रंग स्वॉच नहीं है
 @msg	`{n}` isn't a solid colour	`{n}` एक ठोस रंग नहीं है
 @msg	`{n}`: colour groups hold solid colours only	`{n}`: रंग समूहों में केवल ठोस रंग होते हैं
 @msg	`{name}` can't be deleted	`{name}` को हटाया नहीं जा सकता है
@@ -5894,21 +5894,21 @@ antiAlias	Sharp	शार्प
 @msg	`{name}` is a built-in workspace; choose another name	`{name}` एक अंतर्निहित वर्कस्पेस है; एक और नाम चुनें
 @msg	`{name}` is a process colour: tints apply to global and spot colours	`{name}` एक प्रक्रिया रंग है: टिंट वैश्विक और स्पॉट रंगों पर लागू होते हैं
 @msg	`{name}` is a static symbol: set its Symbol Type to Dynamic first	`{name}` एक स्थिर सिंबल है: अपने सिंबल प्रकार को पहले गतिशील करने के लिए सेट करें
-@msg	Only the fill, stroke, opacity and blend of a path, compound path or type selected in a symbol instance can change	प्रतीक इंस्टेंस में चयनित पथ, संयोजित पथ या पाठ का केवल भराव, स्ट्रोक, अपारदर्शिता और ब्लेंड बदला जा सकता है
-@msg	`{name}` is a tint of `{base}`: edit `{base}` (a tint swatch only takes a new name)	`{name}` `{base}` का एक टिंट है: `{base}` संपादित करें (केवल एक टिंट swatch केवल एक नया नाम लेता है)
+@msg	Only the fill, stroke, opacity and blend of a path, compound path or type selected in a symbol instance can change	सिंबल इंस्टेंस में सिलेक्ट किए गए पाथ, कंपाउंड पाथ या टाइप का केवल फ़िल, स्ट्रोक, ओपेसिटी और ब्लेंड बदला जा सकता है
+@msg	`{name}` is a tint of `{base}`: edit `{base}` (a tint swatch only takes a new name)	`{name}` `{base}` का एक टिंट है: `{base}` संपादित करें (टिंट स्वॉच केवल नया नाम लेता है)
 @msg	`{name}` is a working space: choose another with edit.colorSettings first	`{name}` वर्किंग स्पेस है: पहले edit.colorSettings से दूसरा चुनें
 @msg	`{name}` is built in and stays	`{name}` बनाया गया है और रहता है
 @msg	`{name}` is no recovery entry name	`{name}` कोई वसूली प्रविष्टि नाम नहीं है
-@msg	`{name}` isn't a colour swatch	`{name}` is not a color swatch
-@msg	`{name}` takes a paint of its own kind (colour, gradient or pattern)	`{name}` अपने खुद के प्रकार (रंग, ग्रेडिएंट या पैटर्न) का एक रंग लेता है।
+@msg	`{name}` isn't a colour swatch	`{name}` रंग स्वॉच नहीं है
+@msg	`{name}` takes a paint of its own kind (colour, gradient or pattern)	`{name}` अपने ही प्रकार का पेंट लेता है (रंग, ग्रेडिएंट या पैटर्न)
 @msg	`{name}`: Minimum must not exceed Desired, nor Desired Maximum	`{name}`: न्यूनतम इच्छा से अधिक नहीं होना चाहिए, न ही इच्छा अधिकतम
 @msg	`{other}` doesn't trace an image	`{other}` एक इमेज का पता नहीं लगा
 @msg	`{path}` must be a bool or an object of bools	`{path}` एक bool होना चाहिए या एक ऑब्जेक्ट होना चाहिए।
 @msg	`{s}` is not a colour (#rrggbb or a preset name)	`{s}` एक रंग नहीं है (#rrggbb या एक पूर्व निर्धारित नाम)
 @msg	`{s}`: the step's references copy in more than {_1} MB of values	`{s}`: चरण के संदर्भ मूल्य के {_1} MB से अधिक में प्रतिलिपि बनाते हैं
 @msg	`{tag}` is not an axis tag: a tag is four characters, such as "wght"	`{tag}` एक अक्ष टैग नहीं है: एक टैग चार वर्ण हैं, जैसे कि "wght"
-@msg	`{text}`: step {i}'s result has no such value (write $$ for a literal $)	`{text}`: चरण {i} के परिणाम में ऐसा कोई मूल्य नहीं है (एक साक्षर $ के लिए $$ लिखना)
-@msg	`{text}`: there is no step {i} before this one (steps count from 0; write $$ for a literal $)	`{text}`: इस से पहले कोई स्टेप {i} नहीं है (स्टेप 0 से गिनते हैं; $$ को साक्षर $ के लिए लिखें)
+@msg	`{text}`: step {i}'s result has no such value (write $$ for a literal $)	`{text}`: चरण {i} के परिणाम में ऐसा कोई मान नहीं है (शाब्दिक $ के लिए $$ लिखें)
+@msg	`{text}`: there is no step {i} before this one (steps count from 0; write $$ for a literal $)	`{text}`: इससे पहले कोई चरण {i} नहीं है (चरण 0 से गिने जाते हैं; शाब्दिक $ के लिए $$ लिखें)
 @msg	`{to}` is empty or already used	`{to}` खाली है या पहले से ही इस्तेमाल किया जाता है
 @msg	`{to}` is not an available name	`{to}` उपलब्ध नहीं है
 @msg	`{tool}` isn't a freehand tool	`{tool}` एक फ्रीहैंड टूल नहीं है
@@ -6002,7 +6002,7 @@ antiAlias	Sharp	शार्प
 @msg	`gap` must be from 0 to 6 pt	`gap` 0 से 6 तक होना चाहिए।
 @msg	`gid` must be a glyph id, not {v}	`gid` एक glyph id होना चाहिए, नहीं {v}
 @msg	`globalAdjust` must be an object	`globalAdjust` एक ऑब्जेक्ट होना चाहिए
-@msg	`glyphAlternate` belongs to one character, not to a character style (text.setGlyphAlternate sets it)	`glyphAlternate` एक चरित्र से संबंधित है, एक चरित्र स्टाइल के लिए नहीं (text.setGlyphAlternate इसे सेट)
+@msg	`glyphAlternate` belongs to one character, not to a character style (text.setGlyphAlternate sets it)	`glyphAlternate` एक कैरेक्टर का होता है, कैरेक्टर स्टाइल का नहीं (इसे text.setGlyphAlternate सेट करता है)
 @msg	`gradient` must be an object	`gradient` एक ऑब्जेक्ट होना चाहिए
 @msg	`groupColors` must be an array	`groupColors` को ऐरे होना चाहिए
 @msg	`guide` must be a guide index (guide.list)	`guide` एक गाइड सूचकांक (guide.list) होना चाहिए।
@@ -6076,7 +6076,7 @@ antiAlias	Sharp	शार्प
 @msg	`path` must be a path object	`path` एक पाथ ऑब्जेक्ट होना चाहिए
 @msg	`pathfinder` must be an object	`pathfinder` एक ऑब्जेक्ट होना चाहिए
 @msg	`pivot` must be a whole number from 0 to 8	`pivot` 0 से 8 तक पूरी संख्या होना चाहिए
-@msg	`points` must be a list of [x, y] points	`points` को [x, y] अंक की एक सूची होना चाहिए
+@msg	`points` must be a list of [x, y] points	`points` को [x, y] पॉइंट की सूची होना चाहिए
 @msg	`points` must be a list of point indexes	`points` को पॉइंट इंडेक्स की सूची होना चाहिए
 @msg	`points` must be an array of point indices	`points` को पॉइंट इंडेक्स की ऐरे होना चाहिए
 @msg	`points` must be point indexes	`points` में पॉइंट इंडेक्स होने चाहिए
@@ -6099,14 +6099,14 @@ antiAlias	Sharp	शार्प
 @msg	`select` must be true or false	`select` को true या false होना चाहिए
 @msg	`seriesIndexes` is a non-empty list of series indexes	`seriesIndexes` श्रृंखला सूचकांकों की एक गैर-खाली सूची है
 @msg	`seriesIndexes` needs a `type` or a `valueAxis`	`seriesIndexes` को `type` या `valueAxis` की आवश्यकता होती है
-@msg	`shift` must be a number of points	`shift` को कई अंक होना चाहिए
+@msg	`shift` must be a number of points	`shift` पॉइंट में एक संख्या होनी चाहिए
 @msg	`showCenter` must be true or false	`showCenter` को true या false होना चाहिए
 @msg	`singleWordJustification` must be "fullJustify", "alignLeft", "alignCenter" or "alignRight"	`singleWordJustification` को "fullJustify", "alignLeft", "alignCenter" या "alignRight" होना चाहिए।
 @msg	`size` is a percentage of the base text's size, 1 to 100	`size` आधार टेक्स्ट के आकार का एक प्रतिशत है, 1 से 100
 @msg	`source` and `target` are the same object	`source` और `target` एक ही ऑब्जेक्ट है
 @msg	`source` must be `folder` or `datasets`	`source` होना चाहिए `folder` या `datasets` होना चाहिए
 @msg	`spacing` must be a number	`spacing` होना चाहिए
-@msg	`spacing` must be a number of points, 0 or more, or "auto"	`spacing` को कई अंक, 0 या उससे अधिक, या "auto" होना चाहिए।
+@msg	`spacing` must be a number of points, 0 or more, or "auto"	`spacing` पॉइंट में 0 या उससे बड़ी संख्या, या "auto" होनी चाहिए
 @msg	`start` must be a finite number	`start` को परिमित संख्या होना चाहिए
 @msg	`starts` must be an array of anchor indices (or nulls)	`starts` को एंकर इंडेक्स (या null) की ऐरे होना चाहिए
 @msg	`status` must be linked, embedded, missing or modified, or a list of them	`status` को लिंक, एम्बेडेड, लापता या संशोधित किया जाना चाहिए, या उनमें से एक सूची
@@ -6124,7 +6124,7 @@ antiAlias	Sharp	शार्प
 @msg	`t` must be from 0 to 1	`t` 0 से 1 तक होना चाहिए
 @msg	`target` must be "object" or "contents", not {v}	`target` को "object" या "contents" होना चाहिए, नहीं {v}
 @msg	`tint` applies to global and spot colours	`tint` वैश्विक और स्पॉट रंगों पर लागू होता है
-@msg	`tint` goes with a global or spot `swatch`	`tint` एक वैश्विक या स्थान `swatch` के साथ चला जाता है
+@msg	`tint` goes with a global or spot `swatch`	`tint` किसी ग्लोबल या स्पॉट `swatch` के साथ दिया जाता है
 @msg	`tint` must be a number (%)	`tint` एक नंबर होना चाहिए (%)
 @msg	`tint` needs a global or spot colour	`tint` को वैश्विक या स्पॉट रंग की आवश्यकता होती है
 @msg	`to` is already threaded	`to` पहले से ही पिरोया है
@@ -6174,7 +6174,7 @@ antiAlias	Sharp	शार्प
 @msg	a document needs at least one layer	डॉक्यूमेंट की कम से कम एक लेयर की आवश्यकता होती है
 @msg	a DXF drawing has one origin: pass useArtboards: true for one drawing per artboard	एक DXF ड्राइंग का एक मूल होता है: हर आर्टबोर्ड के लिए एक ड्राइंग के लिए useArtboards: true दें
 @msg	a feConvolveMatrix filter's order is {x}×{y}, which overflows the kernel-size multiply usvg makes	एक feConvolveMatrix फिल्टर का आदेश {x} ×{y} है, जो कर्नेल-आकार की बहुप्लाई usvg को ओवरफ्लो करता है।
-@msg	a freeform gradient keeps at least one point	एक freeform ग्रेडिएंट कम से कम एक बिंदु रखता है
+@msg	a freeform gradient keeps at least one point	फ़्रीफ़ॉर्म ग्रेडिएंट में कम से कम एक पॉइंट रहता है
 @msg	a gradient needs at least two stops	कम से कम दो स्टॉप की आवश्यकता होती है
 @msg	a gradient preset is already called {n}	gradient preset पहले से ही कहा जाता है {n}
 @msg	a graph has at most {_1} series, so it transposes with at most that many categories	एक ग्राफ में सबसे {_1} श्रृंखला है, इसलिए यह उस कई श्रेणियों के साथ ट्रांसपोजित होता है।
@@ -6188,7 +6188,7 @@ antiAlias	Sharp	शार्प
 @msg	a layer's form can't be read	एक लेयर का रूप नहीं पढ़ा जा सकता है
 @msg	a layer's form has no box	एक लेयर के रूप में कोई बॉक्स नहीं है
 @msg	a layer's form has no dictionary	एक लेयर के रूप में कोई शब्दकोश नहीं है
-@msg	a legend draws at most {MAX_CHIPS} swatches	एक किंवदंती सबसे {MAX_CHIPS} swatches पर आकर्षित होती है
+@msg	a legend draws at most {MAX_CHIPS} swatches	लेजेंड अधिकतम {MAX_CHIPS} स्वॉच बनाता है
 @msg	a linked image can't become a gradient mesh: embed it first	एक संबद्ध इमेज एक ग्रेडिएंट जाल नहीं बन सकती है: इसे पहले एम्बेड करें
 @msg	a live effect runs while the document is drawn, so it can't be `heavy`	जब डॉक्यूमेंट तैयार हो जाता है, तो यह `heavy` नहीं हो सकता है।
 @msg	a mask has more than one art block	एक मास्क एक से अधिक कला ब्लॉक है
@@ -6206,7 +6206,7 @@ antiAlias	Sharp	शार्प
 @msg	a page tree kid isn't a reference	एक पृष्ठ पेड़ बच्चा एक संदर्भ नहीं है
 @msg	a page tree node has no kids	पृष्ठ पेड़ नोड में कोई बच्चे नहीं है
 @msg	a page's placement is not finite	एक पृष्ठ का प्लेसमेंट परिमित नहीं है
-@msg	a path has too many points	एक पाथ में बहुत अधिक अंक होते हैं
+@msg	a path has too many points	पाथ में बहुत अधिक पॉइंट हैं
 @msg	a path inside a compound path, blend, envelope, repeat or Intertwine group can't take objects	एक जटिल पाथ के अंदर एक पाथ, मिश्रण, लिफ़ाफ़ाफ़ा, दोहराने या इंटरट्विन समूह ऑब्जेक्ट नहीं ले सकता है
 @msg	a pattern layer doesn't end what it starts	एक पैटर्न लेयर अंत नहीं है कि यह क्या शुरू होता है
 @msg	a pattern layer's colors hold something else	एक पैटर्न लेयर के रंग कुछ और पकड़ते हैं
@@ -6231,16 +6231,16 @@ antiAlias	Sharp	शार्प
 @msg	A profile supports one Revolve effect. Edit the existing effect's options instead.	एक प्रोफ़ाइल एक रिवॉल्व इफ़ेक्ट का समर्थन करता है। इसके बजाय मौजूदा इफ़ेक्ट के ऑप्शन्स को संपादित करें।
 @msg	a row can't go into itself	एक पंक्ति अपने आप में नहीं जा सकती
 @msg	a series goes on the left or the right value axis	एक श्रृंखला बाएं या दाएं मूल्य अक्ष पर जाती है
-@msg	a slice size must be a positive number of points	एक स्लाइस आकार अंक की एक सकारात्मक संख्या होना चाहिए
-@msg	a spine keeps at least two points	रीढ़ की हड्डी कम से कम दो अंक रखती है
+@msg	a slice size must be a positive number of points	स्लाइस का आकार पॉइंट में एक धनात्मक संख्या होनी चाहिए
+@msg	a spine keeps at least two points	स्पाइन में कम से कम दो पॉइंट रहते हैं
 @msg	a start must be an anchor index ≥ 0 or null	प्रारंभ में एक एंकर इंडेक्स होना चाहिए ≥ 0 या null
 @msg	a stream runs past the end	एक स्ट्रीम अंत तक चलता है
 @msg	a stream's length is wrong	धारा की लंबाई गलत है
 @msg	a stream's length isn't a number	एक धारा की लंबाई नहीं है
 @msg	a style named `{name}` already exists	`{name}` नामक एक स्टाइल पहले से मौजूद है
 @msg	a style named `{to}` already exists	`{to}` नामक एक स्टाइल पहले से मौजूद है
-@msg	a swatch needs a colour, gradient or pattern	एक swatch एक रंग, ग्रेडिएंट या पैटर्न की जरूरत है
-@msg	a swatch or color group named `{n}` exists	`{n}` नामक एक swatch या रंग समूह मौजूद है
+@msg	a swatch needs a colour, gradient or pattern	स्वॉच को रंग, ग्रेडिएंट या पैटर्न चाहिए
+@msg	a swatch or color group named `{n}` exists	`{n}` नाम का स्वॉच या रंग समूह पहले से मौजूद है
 @msg	a symbol can't hold an instance of itself	एक सिंबल खुद का एक उदाहरण नहीं पकड़ सकता है
 @msg	a symbol named `{n}` already exists	पहले से ही `{n}` नाम का सिंबल मौजूद है
 @msg	a theme has 1 to {THEME_SIZE} colours	थीम में 1 से {THEME_SIZE} रंग होते हैं
@@ -6302,10 +6302,10 @@ antiAlias	Sharp	शार्प
 @msg	antiAlias `{id}`: none, art or type	antiAlias `{id}`: none, art या type
 @msg	appearance must be flat|center|edge	appearance को flat|center|edge होना चाहिए
 @msg	apply is "fill" or "stroke", not `{other}`	apply "fill" या "stroke" है, नहीं `{other}`
-@msg	area must be a closed polygon of 3 to 100000 [x, y] points	area: क्षेत्र 3 से 100000 [x, y] अंक के एक बंद बहुभुज होना चाहिए
-@msg	area type {_1} is named twice	क्षेत्र के प्रकार {_1} को दो बार नाम दिया गया है
-@msg	area type in frames too short for a line of the font it shows in got taller frames ({_1}): their type wouldn't show otherwise	फ्रेम में क्षेत्र प्रकार फ़ॉन्ट की एक पंक्ति के लिए बहुत कम है, यह लंबा फ्रेम ({_1}) में दिखाता है: उनका प्रकार अन्यथा नहीं दिखाई देगा
-@msg	area type needs a path that encloses an area	क्षेत्र के प्रकार को एक पाथ की आवश्यकता होती है जो एक क्षेत्र को घेरता है
+@msg	area must be a closed polygon of 3 to 100000 [x, y] points	area: क्षेत्र 3 से 100000 [x, y] पॉइंट का एक बंद बहुभुज होना चाहिए
+@msg	area type {_1} is named twice	एरिया टाइप {_1} का नाम दो बार दिया गया है
+@msg	area type in frames too short for a line of the font it shows in got taller frames ({_1}): their type wouldn't show otherwise	अपने फ़ॉन्ट की एक लाइन के लिए बहुत छोटे फ़्रेम वाले एरिया टाइप को लंबे फ़्रेम दिए गए ({_1}): वरना उनका टाइप नहीं दिखता
+@msg	area type needs a path that encloses an area	एरिया टाइप को ऐसा पाथ चाहिए जो किसी क्षेत्र को घेरता हो
 @msg	arrowAlign must be extend|tip, got {o}	arrowAlign होना चाहिए thetip, get {o}
 @msg	arrowScale must be [start, end]	arrowScale होना चाहिए [शुरू, अंत]
 @msg	artboard {0} does not exist	आर्टबोर्ड {0} मौजूद नहीं है
@@ -6460,7 +6460,7 @@ antiAlias	Sharp	शार्प
 @msg	colorTable.{what}: `{h}` is not a colour such as "#ff8800"	colorTable.{what}: `{h}`, "#ff8800" जैसा रंग नहीं है
 @msg	colorTable.{what}: at most {MAX_TABLE} colours	colorTable.{what}: अधिकतम {MAX_TABLE} रंग
 @msg	colour groups can't go into colour groups	रंग समूह रंग समूहों में नहीं जा सकते हैं
-@msg	colour, mode and spot apply to solid-colour swatches only	रंग, मोड और स्पॉट केवल ठोस रंग की घड़ी पर लागू होते हैं
+@msg	colour, mode and spot apply to solid-colour swatches only	रंग, मोड और स्पॉट केवल ठोस रंग वाले स्वॉच पर लागू होते हैं
 @msg	column {column}: `{cell}` is a `%` column of graph data files, which are not read	कॉलम {column}: `{cell}` ग्राफ़ डेटा फ़ाइल का `%` कॉलम है, जिसे पढ़ा नहीं जाता
 @msg	column {column}: `{cell}` names `{name}`, which is a {_1} variable	कॉलम {column}: `{cell}` नाम `{name}`, जो एक {_1} चर है
 @msg	column {column}: `{cell}` names no variable	कॉलम {column}: `{cell}` नाम कोई चर नहीं
@@ -6477,7 +6477,7 @@ antiAlias	Sharp	शार्प
 @msg	composer must be "singleLine" or "everyLine"	composer: संगीतकार "singleLine" या "everyLine" होना चाहिए।
 @msg	compound {_1} must contain exactly one open path to join	यौगिक {_1} में शामिल होने के लिए बिल्कुल एक खुला रास्ता होना चाहिए
 @msg	compound paths can only contain paths	यौगिक पाथ में केवल पाथ हो सकते हैं
-@msg	compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes	मिश्रित आकार पाथ, यौगिक पाथ, समूह, मिश्रित आकार, प्रकार, मिश्रण और लिफाफे लेते हैं
+@msg	compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes	कंपाउंड शेप पाथ, कंपाउंड पाथ, समूह, कंपाउंड शेप, टाइप, ब्लेंड और एन्वेलप लेते हैं
 @msg	compressed (RLE) bitmaps can't be read yet	संकुचित (RLE) bitmaps अभी तक पढ़ा नहीं जा सकता है
 @msg	connect end must be "start" or "end"	कनेक्ट अंत "start" या "end" होना चाहिए
 @msg	connect needs a path other than the one extended	connect: कनेक्ट एक विस्तारित के अलावा एक पाथ की जरूरत है
@@ -6502,8 +6502,8 @@ antiAlias	Sharp	शार्प
 @msg	Ran {name}	{name} चलाई गई
 @msg	The script was stopped and its changes were undone	स्क्रिप्ट रोकी गई और उसके बदलाव पूर्ववत किए गए
 @msg	a script is running: stop it or wait for it to finish	एक स्क्रिप्ट चल रही है: उसे रोकें या पूरा होने की प्रतीक्षा करें
-@msg	this is a compiled script, which cannot be run; use its source text	यह कंपाइल की हुई स्क्रिप्ट है, जिसे चलाया नहीं जा सकता; इसका स्रोत पाठ इस्तेमाल करें
-@msg	the script is not UTF-8 text	स्क्रिप्ट UTF-8 पाठ नहीं है
+@msg	this is a compiled script, which cannot be run; use its source text	यह कंपाइल की हुई स्क्रिप्ट है, जिसे चलाया नहीं जा सकता; इसका सोर्स टेक्स्ट इस्तेमाल करें
+@msg	the script is not UTF-8 text	स्क्रिप्ट UTF-8 टेक्स्ट नहीं है
 @msg	the script is too large to run	स्क्रिप्ट चलाने के लिए बहुत बड़ी है
 @msg	a drag or an undo group is open; finish it before running a script	कोई ड्रैग या पूर्ववत समूह खुला है; स्क्रिप्ट चलाने से पहले उसे पूरा करें
 @msg	the script left a document that cannot be kept	स्क्रिप्ट ने ऐसा दस्तावेज़ छोड़ा है जिसे रखा नहीं जा सकता
@@ -6527,7 +6527,7 @@ antiAlias	Sharp	शार्प
 @msg	Script files cannot be opened in another application	स्क्रिप्ट फ़ाइलें किसी अन्य ऐप्लिकेशन में नहीं खोली जा सकतीं
 @msg	Script file access is unavailable on the web	वेब पर स्क्रिप्ट फ़ाइल पहुँच उपलब्ध नहीं है
 @msg	Script has 256 files open	स्क्रिप्ट ने 256 फ़ाइलें खोल रखी हैं
-@msg	Script file path exceeds 32,767 characters	स्क्रिप्ट फ़ाइल का पथ 32,767 वर्णों से अधिक है
+@msg	Script file path exceeds 32,767 characters	स्क्रिप्ट फ़ाइल का पाथ 32,767 वर्णों से अधिक है
 @msg	Script folder mask takes too many steps to match	स्क्रिप्ट फ़ोल्डर मास्क के मिलान में बहुत अधिक चरण लगते हैं
 @msg	the script opened more file data than one run may open (32 MiB)	स्क्रिप्ट ने एक रन में खोले जा सकने वाले फ़ाइल डेटा से अधिक डेटा खोला (32 MiB)
 @msg	File.seek: takes a position and a mode	File.seek: एक स्थिति और एक मोड लेता है
@@ -6535,9 +6535,9 @@ antiAlias	Sharp	शार्प
 @msg	vc.run: takes a command id and an object of parameters	vc.run: एक कमांड id और पैरामीटर का एक ऑब्जेक्ट लेता है
 @msg	vc.run: the parameters must be an object	vc.run: पैरामीटर एक ऑब्जेक्ट होने चाहिए
 @msg	vc.run: the result{place} is too large for a script	vc.run: परिणाम{place} स्क्रिप्ट के लिए बहुत बड़ा है
-@msg	$.evalFile requires a file path	$.evalFile के लिए फ़ाइल पथ आवश्यक है
+@msg	$.evalFile requires a file path	$.evalFile के लिए फ़ाइल पाथ आवश्यक है
 @msg	$.evalFile: the timeout must be a finite number of milliseconds, 0 or more	$.evalFile: टाइमआउट मिलीसेकंड की एक सीमित संख्या होनी चाहिए, 0 या अधिक
-@msg	$.evalFile: takes a file path and a timeout	$.evalFile: एक फ़ाइल पथ और एक टाइमआउट लेता है
+@msg	$.evalFile: takes a file path and a timeout	$.evalFile: एक फ़ाइल पाथ और एक टाइमआउट लेता है
 @msg	{name}: line {line}, column {column} of {file}: {e} (thrown)	{name}: {file} की लाइन {line}, कॉलम {column}: {e} (थ्रो किया गया)
 @msg	{name}: line {line}, column {column}: {e} (thrown)	{name}: लाइन {line}, कॉलम {column}: {e} (थ्रो किया गया)
 @msg	{name}: {e} (thrown)	{name}: {e} (थ्रो किया गया)
@@ -6600,7 +6600,7 @@ antiAlias	Sharp	शार्प
 @msg	copyrightStatus must be unknown, copyrighted or publicDomain	copyrightStatus को unknown, copyrighted या publicDomain होना चाहिए
 @msg	copyrightUrl must be a URL (no spaces, at most 2048 characters)	copyrightUrl को URL होना चाहिए (स्पेस नहीं, अधिकतम 2048 अक्षर)
 @msg	Corners edits the corners of a path	कॉर्नर एक पाथ के कोनों को संपादित करता है
-@msg	corners must be 4 [x, y] points (TL, TR, BR, BL)	corners: कोनों 4 [x, y] अंक (TL, TR, BR, BL) होना चाहिए
+@msg	corners must be 4 [x, y] points (TL, TR, BR, BL)	corners में 4 [x, y] पॉइंट (TL, TR, BR, BL) होने चाहिए
 @msg	could not decode image: {0}	इमेज को डीकोड नहीं कर सकता: {0}
 @msg	Couldn't copy to the system clipboard: {e}	सिस्टम क्लिपबोर्ड को कॉपी नहीं कर सका: {e}
 @msg	Couldn't open {name}: {e}	नहीं खोल सकता {name}: {e}
@@ -6610,19 +6610,19 @@ antiAlias	Sharp	शार्प
 @msg	Couldn't place {name}: the document it was dropped on was closed	नहीं था {name}: यह डॉक्यूमेंट बंद हो गया था
 @msg	Couldn't place {name}: the document it was placed in was closed	नहीं था {name}: यह डॉक्यूमेंट बंद किया गया था
 @msg	Couldn't read {name}: {e}	नहीं पढ़ सकता {name}: {e}
-@msg	Couldn't save recovery data: {e}	वसूली डेटा नहीं बचा सकता: {e}
+@msg	Couldn't save recovery data: {e}	रिकवरी डेटा सेव नहीं किया जा सका: {e}
 @msg	counterPer `{c}`: item or file	counterPer `{c}`: item या file
 @msg	Create from Guides: the document has no artboard	गाइड से बनाएँ: डॉक्यूमेंट में कोई आर्टबोर्ड नहीं है
 @msg	Create from Guides: the guides make more than {MAX_PIECES} slices	गाइड से बनाएँ: गाइड {MAX_PIECES} स्लाइस से अधिक बनाते हैं
 @msg	Create from Selection: the selection has no area	सिलेक्शन से बनाएँ: सिलेक्शन में कोई क्षेत्र नहीं है
 @msg	Create needs fills, strokes or both	जरूरतों को पूरा करने, स्ट्रोक या दोनों की जरूरत है
 @msg	Create Outlines: select text objects	आउटलाइन बनाएं: टेक्स्ट ऑब्जेक्ट चुनें
-@msg	crop `{_1}`: only PDF pages have art, trim, bleed and media boxes; use "crop" or "bounding"	फसल `{_1}`: केवल PDF पृष्ठों में कला, ट्रिम, ब्लीड और मीडिया बॉक्स हैं; "crop" या "bounding" का उपयोग करें
-@msg	crop rectangle doesn't overlap the image	फसल आयत इमेज को ओवरलैप नहीं करता है
+@msg	crop `{_1}`: only PDF pages have art, trim, bleed and media boxes; use "crop" or "bounding"	क्रॉप `{_1}`: केवल PDF पेजों में आर्ट, ट्रिम, ब्लीड और मीडिया बॉक्स होते हैं; "crop" या "bounding" का उपयोग करें
+@msg	crop rectangle doesn't overlap the image	क्रॉप आयत इमेज को ओवरलैप नहीं करता
 @msg	cross-reference and object streams aren't supported	क्रॉस-रिफरेंस और ऑब्जेक्ट स्ट्रीम्स का समर्थन नहीं किया जाता है
 @msg	CSS options: {e}	सीएसएस ऑप्शन्स: {e}
 @msg	CSV has a header but no data rows	CSV एक हेडर है लेकिन कोई डेटा पंक्ति नहीं है
-@msg	CSV holds NUL bytes: save it as UTF-8, or as UTF-16 with a byte-order mark	CSV ने NUL बाइट्स को रखा: इसे UTF-8 या UTF-16 के रूप में बाइट-ऑर्डर मार्क के साथ बचाओ
+@msg	CSV holds NUL bytes: save it as UTF-8, or as UTF-16 with a byte-order mark	CSV में NUL बाइट्स हैं: इसे UTF-8 के रूप में, या बाइट-ऑर्डर मार्क के साथ UTF-16 के रूप में सेव करें
 @msg	CSV is empty	CSV खाली है
 @msg	CSV is larger than {MAX_CSV_BYTES} bytes	CSV {MAX_CSV_BYTES} bytes से बड़ा है
 @msg	CSV is not UTF-16	CSV UTF-16 नहीं है
@@ -6791,12 +6791,12 @@ antiAlias	Sharp	शार्प
 @msg	give a fraction `t` from 0 to 1	0 से 1 तक एक अंश `t` देना
 @msg	give a mode or r/g/b, c/m/y/k, gray or tint adjustments	एक मोड या आर / जी / बी, सी / एम / वाई / के, ग्रे या टिंट समायोजन देते हैं
 @msg	give a name, or paint the active proxy with a saved preset	एक सेव किए गए प्रीसेट के साथ सक्रिय प्रॉक्सी को नाम देना, या पेंट करना
-@msg	give a name, or select a stroke with a saved profile	एक नाम देना, या एक बचाया प्रोफ़ाइल के साथ एक स्ट्रोक का सिलेक्शन
+@msg	give a name, or select a stroke with a saved profile	कोई नाम दें, या सेव की गई प्रोफ़ाइल वाला स्ट्रोक सिलेक्ट करें
 @msg	give a pattern name or select an object painted with a pattern	एक पैटर्न का नाम देना या एक पैटर्न के साथ चित्रित एक ऑब्जेक्ट का सिलेक्शन करना
 @msg	give at least one of `name`, `kind`, `text`, `within`, `intersects`, `minWidth`, `maxWidth`, `minHeight`, `maxHeight`, `minThickness`, `maxThickness`, `minArea`, `maxArea`, `minAnchors`, `maxAnchors`	इनमें से कम से कम एक दें: `name`, `kind`, `text`, `within`, `intersects`, `minWidth`, `maxWidth`, `minHeight`, `maxHeight`, `minThickness`, `maxThickness`, `minArea`, `maxArea`, `minAnchors`, `maxAnchors`
 @msg	give at least one of clip, invert, disabled, linked	कम से कम एक क्लिप, उलटा, विकलांग, लिंक्ड देना
 @msg	give both `start` and `end` [x, y] (or neither)	`start` और `end` दोनों [x, y] दें (या दोनों न दें)
-@msg	give color, none, swatch or gradient	रंग, कोई नहीं, घड़ी या ग्रेडिएंट देना
+@msg	give color, none, swatch or gradient	color, none, swatch या gradient दें
 @msg	give corners of the path: anchors between two straight sides	पाथ के कोने: दो सीधे पक्षों के बीच एंकर
 @msg	give corners of the path: anchors where its sides meet at an angle	पाथ के कोने: एंकर जहां इसके पक्ष एक कोण पर मिलते हैं
 @msg	give dataBase64	dataBase64 दें
@@ -6837,7 +6837,7 @@ antiAlias	Sharp	शार्प
 @msg	give the settings to change, e.g. {"formats"}]}	सेटिंग्स को बदलने के लिए, उदाहरण के लिए {"formats"}]}
 @msg	give the style a name	स्टाइल को एक नाम दें
 @msg	give two or more style `names`	दो या अधिक स्टाइल `names`
-@msg	give two or more swatches	दो या अधिक swatch
+@msg	give two or more swatches	दो या अधिक स्वॉच दें
 @msg	give x, y, or a handle's length or angle	x, y, या एक हैंडल की लंबाई या कोण देना
 @msg	Global Edit is off	ग्लोबल एडिट बंद है
 @msg	Global Edit works on paths, compound paths, symbol instances and groups of them	ग्लोबल एडिट पाथ, मिश्रित पाथ, सिंबल उदाहरणों और उनके समूहों पर काम करता है
@@ -6880,7 +6880,7 @@ antiAlias	Sharp	शार्प
 @msg	Image Trace finished, but its document was closed	इमेज ट्रेस समाप्त हो गया, लेकिन इसका डॉक्यूमेंट बंद हो गया।
 @msg	Image Trace finished, but the image or its settings changed meanwhile: trace it again	इमेज ट्रेस समाप्त हो गया, लेकिन इस बीच इमेज या इसकी सेटिंग्स बदल गई: इसे फिर से ट्रेस करें
 @msg	Image Trace: the traced image is missing	इमेज ट्रेस: ज्ञात इमेज गायब है
-@msg	image would be too large; lower the resolution	इमेज बहुत बड़ी होगी; संकल्प को कम करें
+@msg	image would be too large; lower the resolution	इमेज बहुत बड़ी होगी; रिज़ॉल्यूशन कम करें
 @msg	imageMap `{m}`: none, client or server	imageMap `{m}`: none, client या server
 @msg	Imported {what}: {_1}	आयात {what}: {_1}
 @msg	Imported library {name}	आयातित लाइब्रेरी {name}
@@ -6964,7 +6964,7 @@ antiAlias	Sharp	शार्प
 @msg	its page has text, and its layers have no text objects to put it in	इसके पृष्ठ में टेक्स्ट है, और इसकी लेयर्स में कोई टेक्स्ट ऑब्जेक्ट नहीं है जिसे इसमें डाल दिया जाता है
 @msg	its preview was placed instead, at screen resolution	इसके बजाय इसके प्रीव्यू को स्क्रीन रिज़ॉल्यूशन पर रखा गया था।
 @msg	its section ending with `%{end}` doesn't end	इसका खंड `%{end}` के साथ समाप्त नहीं होता है
-@msg	its type is to come in as outlines, which only its page has	इसके प्रकार को रूपरेखा के रूप में जाना जाता है, जो केवल इसके पेज में है
+@msg	its type is to come in as outlines, which only its page has	इसका टाइप आउटलाइन के रूप में आना है, जो केवल इसके पेज में हैं
 @msg	its Windows metafile preview was opened instead, which may simplify the art	इसके बजाय विंडोज मेटाफ़ाइल प्रीव्यू ओपन किया गया था, जो कला को सरल बना सकता है
 @msg	its zlib compression is damaged	इसके zlib संपीड़न क्षतिग्रस्त है
 @msg	its Zstandard compression is damaged	इसके Zstandard संपीड़न क्षतिग्रस्त है
@@ -7001,9 +7001,9 @@ antiAlias	Sharp	शार्प
 @msg	lineEndings `{other}`: lf or crlf	lineEndings `{other}`: lf या crlf
 @msg	linked pictures show the low-resolution preview saved in the file until their files are found: relink them in the Links panel	लिंक किए गए चित्रों से पता चलता है कि फ़ाइल में सेव किए जाने वाले निम्न-रिज़ॉल्यूशन प्रीव्यू को उनकी फ़ाइलों को मिलने तक: लिंक पैनल में उन्हें फिर से लिंक करें
 @msg	linked pictures with no preview in the file show a placeholder until their files are found: relink them in the Links panel	फ़ाइल में कोई प्रीव्यू के साथ जुड़े चित्र एक प्लेसहोल्डर दिखाते हैं जब तक कि उनकी फ़ाइलें नहीं मिलती: उन्हें लिंक पैनल में फिर से लिंक करें
-@msg	linked type areas past VectorCraft's limits were left out	संबंधित प्रकार के क्षेत्र अतीत VectorCraft की सीमाओं को छोड़ दिया गया था
+@msg	linked type areas past VectorCraft's limits were left out	VectorCraft की सीमाओं से आगे के लिंक्ड टाइप एरिया छोड़ दिए गए
 @msg	Live Paint Merge: select a Live Paint group and the paths to add	लाइव पेंट मर्ज: जोड़ने के लिए एक लाइव पेंट समूह और पाथ सिलेक्ट करें
-@msg	Live Paint takes paths and compound paths: convert type, images and other objects to paths first	लाइव पेंट पाथ और यौगिक पाथ लेता है: प्रकार, इमेज और अन्य ऑब्जेक्ट्स को पहले पाथ में परिवर्तित करें
+@msg	Live Paint takes paths and compound paths: convert type, images and other objects to paths first	लाइव पेंट पाथ और कंपाउंड पाथ लेता है: पहले टाइप, इमेज और अन्य ऑब्जेक्ट्स को पाथ में बदलें
 @msg	Live Paint: select paths or compound paths	लाइव पेंट: पाथ या यौगिक पाथ सिलेक्ट करें
 @msg	Live Paint: these paths are too degenerate to paint	लाइव पेंट: इन पाथ को पेंट करने के लिए बहुत अलग किया जाता है
 @msg	loading profiles from disk isn't available in the browser	डिस्क से लोडिंग प्रोफ़ाइल ब्राउज़र में उपलब्ध नहीं है
@@ -7042,7 +7042,7 @@ antiAlias	Sharp	शार्प
 @msg	missing `group`	लापता `group`
 @msg	missing `id`	लापता `id`
 @msg	missing `id` (see plugin.list)	अनुपलब्ध `id` (plugin.list देखें)
-@msg	missing `id`: give one, or select one type object	लापता `id`: एक देना, या एक प्रकार का ऑब्जेक्ट चुनें
+@msg	missing `id`: give one, or select one type object	लापता `id`: एक दें, या एक टाइप ऑब्जेक्ट सिलेक्ट करें
 @msg	missing `index` (a point index, or null to clear)	लापता `index` (a बिंदु सूचकांक, या स्पष्ट करने के लिए null)
 @msg	missing `index` (a stop index, or null to clear)	लापता `index` (a स्टॉप इंडेक्स, या स्पष्ट करने के लिए null)
 @msg	missing `index` (an item index or null)	लापता `index` (एक आइटम सूचकांक या null)
@@ -7141,7 +7141,7 @@ antiAlias	Sharp	शार्प
 @msg	nineSlice must be true or false	nineSlice को true या false होना चाहिए
 @msg	nineSliceGuides must be [left, top, right, bottom], each -16..16, with left + right < 1 and top + bottom < 1	nineSliceGuides को [left, top, right, bottom] होना चाहिए, हर मान -16..16, और left + right < 1 तथा top + bottom < 1
 @msg	no action set is current	कोई कार्रवाई सेट चालू नहीं है
-@msg	no action set to save	बचाने के लिए कोई कार्रवाई सेट नहीं
+@msg	no action set to save	सेव करने के लिए कोई एक्शन सेट नहीं
 @msg	no active data set	कोई सक्रिय डेटा सेट नहीं
 @msg	no active document	कोई सक्रिय डॉक्यूमेंट
 @msg	no active perspective plane	कोई सक्रिय पर्सपेक्टिव विमान नहीं
@@ -7172,7 +7172,7 @@ antiAlias	Sharp	शार्प
 @msg	no changes since the last save	आखिरी सेव के बाद से कोई बदलाव नहीं
 @msg	no character at byte {start}	byte {start} पर कोई चरित्र नहीं
 @msg	no character style `{name}`	कोई कैरेक्टर स्टाइल `{name}`
-@msg	no clock to keep a heartbeat by	दिल की धड़कन को दूर रखने के लिए कोई घड़ी नहीं
+@msg	no clock to keep a heartbeat by	हार्टबीट का समय रखने के लिए कोई घड़ी नहीं
 @msg	no color group `{name}` in the document (see swatch.list)	डॉक्यूमेंट में कोई रंग समूह `{name}` (देखें swatch.list)
 @msg	no colour	कोई रंग नहीं
 @msg	no colour group `{g}`	कोई रंग समूह `{g}`
@@ -7214,7 +7214,7 @@ antiAlias	Sharp	शार्प
 @msg	no free recovery area	कोई मुफ्त वसूली क्षेत्र
 @msg	no gradient preset `{name}` (see gradient.presets.list)	कोई gradient preset `{name}` (view gradient.presets.list)
 @msg	no gradient stop or freeform point is selected	कोई क्रमिक स्टॉप या फ्रीफॉर्म पॉइंट नहीं चुना जाता है
-@msg	no gradient swatch `{name}`	कोई gradient swatch `{name}`
+@msg	no gradient swatch `{name}`	कोई ग्रेडिएंट स्वॉच `{name}` नहीं
 @msg	no graphic style `{n}`	कोई ग्राफिक स्टाइल `{n}`
 @msg	no graphic style `{n}` in `{_1}`	`{_1}` में कोई ग्राफिक स्टाइल `{n}` नहीं
 @msg	no graphic style `{name}`	कोई ग्राफिक स्टाइल `{name}`
@@ -7249,9 +7249,9 @@ antiAlias	Sharp	शार्प
 @msg	No paragraph breaks to remove	हटाने के लिए कोई पैराग्राफ ब्रेक नहीं
 @msg	no parent layer	कोई अभिभावक लेयर नहीं
 @msg	no Pathfinder operation applied yet	अभी तक कोई पाथफाइंडर ऑपरेशन लागू नहीं है
-@msg	no pattern `{name}`	कोई पैटर्न नहीं `{name}`
+@msg	no pattern `{name}`	कोई पैटर्न `{name}` नहीं
 @msg	no pattern named `{choice}`	`{choice}` नाम का कोई पैटर्न नहीं
-@msg	no pattern swatch `{name}`	कोई पैटर्न नहीं `{name}`
+@msg	no pattern swatch `{name}`	कोई पैटर्न स्वॉच `{name}` नहीं
 @msg	no PDF preset named `{n}`	कोई PDF प्रीसेट नहीं है जिसका नाम `{n}` है
 @msg	no perspective grid preset named `{b}` (see perspective.presets.list)	`{b}` नाम का कोई पर्सपेक्टिव ग्रिड प्रीसेट नहीं है (perspective.presets.list देखें)
 @msg	no perspective grid preset named `{n}`	कोई पर्सपेक्टिव ग्रिड प्रीसेट जिसका नाम `{n}` है
@@ -7277,32 +7277,32 @@ antiAlias	Sharp	शार्प
 @msg	no recovery copy `{f}` (see file.recovery.list)	कोई पुनर्प्राप्ति प्रतिलिपि `{f}` (file.recovery.list देखें)
 @msg	no revert command	कोई रिवर्स कमांड नहीं
 @msg	no rows	कोई पंक्ति नहीं
-@msg	no saved export preset `{name}`	कोई बचाया निर्यात पूर्व निर्धारित `{name}`
+@msg	no saved export preset `{name}`	कोई सेव किया गया निर्यात प्रीसेट `{name}` नहीं
 @msg	no saved export presets to export (name built-in ones in `names`)	एक्सपोर्ट करने के लिए सेव किए हुए एक्सपोर्ट प्रीसेट नहीं हैं (अंतर्निहित प्रीसेट के नाम `names` में दें)
-@msg	no saved gradient preset called {name}	कोई बचाया ग्रेडिएंट पूर्व निर्धारित {name} कहा जाता है
-@msg	no saved gradient presets	कोई बचाया ग्रेडिएंट presets
-@msg	no saved PDF preset named `{name}`	कोई बचाया PDF preset नामित `{name}`
+@msg	no saved gradient preset called {name}	{name} नाम का कोई सेव किया गया ग्रेडिएंट प्रीसेट नहीं
+@msg	no saved gradient presets	कोई सेव किया गया ग्रेडिएंट प्रीसेट नहीं
+@msg	no saved PDF preset named `{name}`	`{name}` नाम का कोई सेव किया गया PDF प्रीसेट नहीं
 @msg	no saved PDF preset named `{name}` (built-in presets are read-only: start a new one from them)	`{name}` नामक कोई सेव्ड PDF प्रीसेट नहीं (बिल्ट-इन प्रीसेट केवल पढ़ा जाता है: उनमें से एक नया प्रारंभ करें)
-@msg	no saved preset called `{name}`	कोई बचाया प्रीसेट `{name}` कहा जाता है
+@msg	no saved preset called `{name}`	`{name}` नाम का कोई सेव किया गया प्रीसेट नहीं
 @msg	no saved preset named `{name}`	`{name}` नामक सेव्ड प्रीसेट
-@msg	no saved preset named `{name}` to rename	नाम बदलने के लिए `{name}` नाम की कोई बचत पूर्व निर्धारित नहीं है
-@msg	no saved presets	कोई बचाया प्रीसेट नहीं
+@msg	no saved preset named `{name}` to rename	नाम बदलने के लिए `{name}` नाम का कोई सेव किया गया प्रीसेट नहीं है
+@msg	no saved presets	कोई सेव किया गया प्रीसेट नहीं
 @msg	no saved presets to export (name [Default] in `names` to export it)	एक्सपोर्ट करने के लिए सेव किए हुए प्रीसेट नहीं हैं ([Default] एक्सपोर्ट करने के लिए उसका नाम `names` में दें)
 @msg	no saved presets to export (name built-in ones in `names`)	एक्सपोर्ट करने के लिए सेव किए हुए प्रीसेट नहीं हैं (अंतर्निहित प्रीसेट के नाम `names` में दें)
 @msg	no saved print preset named `{name}`	`{name}` नामक कोई सेव्ड प्रिंट प्रीसेट नहीं
 @msg	no saved print preset named `{name}` ({DEFAULT_PRESET} is protected: start a new one from it)	`{name}` ({DEFAULT_PRESET} नामक कोई सेव्ड प्रिंट प्रीसेट संरक्षित नहीं है: इससे एक नया प्रारंभ करें)
-@msg	no saved profile called {name}	कोई बचाया प्रोफ़ाइल {name} कहा जाता है
-@msg	no saved profiles	कोई बचाया प्रोफ़ाइल नहीं
-@msg	no saved selection `{name}`	कोई बचाया सिलेक्शन `{name}`
-@msg	no saved selection recalled	कोई बचाया सिलेक्शन याद नहीं
-@msg	no saved selections	कोई बचाया सिलेक्शन नहीं
-@msg	No saved selections (Select → Save Selection…)	कोई बचाया सिलेक्शन नहीं (चुनें → सिलेक्शन सेव करें)
-@msg	no saved theme called {name} (see colorTheme.list)	कोई बचाया थीम जिसे {name} कहा जाता है (colorTheme.list देखें)
-@msg	no saved themes	कोई बचाया विषयों
-@msg	no saved views	कोई बचाया दृष्टिकोण
-@msg	No saved views (View → New View…)	कोई बचाया दृष्टिकोण (देखें → नया दृश्य)
+@msg	no saved profile called {name}	{name} नाम की कोई सेव की गई प्रोफ़ाइल नहीं
+@msg	no saved profiles	कोई सेव की गई प्रोफ़ाइल नहीं
+@msg	no saved selection `{name}`	कोई सेव किया गया सिलेक्शन `{name}` नहीं
+@msg	no saved selection recalled	कोई सेव किया गया सिलेक्शन वापस नहीं लाया गया
+@msg	no saved selections	कोई सेव किया गया सिलेक्शन नहीं
+@msg	No saved selections (Select → Save Selection…)	कोई सेव किया गया सिलेक्शन नहीं (सिलेक्ट → सिलेक्शन सेव करें…)
+@msg	no saved theme called {name} (see colorTheme.list)	{name} नाम की कोई सेव की गई थीम नहीं (colorTheme.list देखें)
+@msg	no saved themes	कोई सेव की गई थीम नहीं
+@msg	no saved views	कोई सेव किया गया व्यू नहीं
+@msg	No saved views (View → New View…)	कोई सेव किया गया व्यू नहीं (व्यू → नया दृश्य…)
 @msg	no segment {segment} on line {line}	कोई खंड {segment} लाइन {line} पर
-@msg	no selected slice in the image: select slices, or save all of them	इमेज में कोई सिलेक्टेड स्लाइस नहीं: स्लाइस सिलेक्ट करें, या उनमें से सभी को बचाओ
+@msg	no selected slice in the image: select slices, or save all of them	इमेज में कोई सिलेक्टेड स्लाइस नहीं: स्लाइस सिलेक्ट करें, या सभी स्लाइस सेव करें
 @msg	no selection bounds	कोई सिलेक्शन सीमा नहीं
 @msg	no series {i}	कोई श्रृंखला {i}
 @msg	no similar objects found (rotated or reflected copies are not matched); change the Global Edit Options and try again	कोई समान ऑब्जेक्ट नहीं पाया (घूर्णित या परिलक्षित प्रतियां मिलान नहीं की जाती हैं); वैश्विक संपादन ऑप्शन्स बदलें और फिर से प्रयास करें
@@ -7332,7 +7332,7 @@ antiAlias	Sharp	शार्प
 @msg	no such recent file	ऐसी कोई हाल की फ़ाइल नहीं
 @msg	no such recent font	ऐसा नहीं हाल ही में फ़ॉन्ट
 @msg	no such rows	ऐसी कोई पंक्ति नहीं
-@msg	no such saved selection	इस तरह के बचाया सिलेक्शन नहीं
+@msg	no such saved selection	ऐसा कोई सेव किया गया सिलेक्शन नहीं
 @msg	no such segment	ऐसा कोई खंड नहीं
 @msg	no such spine point	ऐसी कोई रीढ़ की हड्डी नहीं
 @msg	no such spine segment	ऐसा कोई खंड नहीं
@@ -7340,17 +7340,17 @@ antiAlias	Sharp	शार्प
 @msg	no such user library	ऐसी कोई उपयोगकर्ता लाइब्रेरी नहीं
 @msg	no such view	कोई ऐसा दृश्य नहीं
 @msg	no such width point	ऐसी कोई चौड़ाई बिंदु नहीं
-@msg	no swatch `{keep}`	नहीं `{keep}`
-@msg	no swatch `{n}`	कोई swatch `{n}`
-@msg	no swatch `{n}` (swatches and colour groups move separately)	कोई swatch `{n}` (swatches और रंग समूहों अलग से स्थानांतरित)
-@msg	no swatch `{name}`	कोई swatch `{name}`
-@msg	no swatch library `{key}` (see swatch.library.list; "{DOCUMENT_SWATCHES}": the document's swatches)	कोई swatch लाइब्रेरी `{key}` (देखें swatch.library.list; "{DOCUMENT_SWATCHES}": डॉक्यूमेंट का swatches)
-@msg	no swatch library `{key}` (see swatch.library.list; "document": the document's swatches)	कोई swatch लाइब्रेरी `{key}` (देखें swatch.library.list; "document": डॉक्यूमेंट के swatches)
-@msg	no swatch library `{key}` (see swatch.library.list)	कोई swatch लाइब्रेरी `{key}` (swatch.library.list देखें)
-@msg	no swatch library `{l}` (see swatch.library.list)	कोई swatch लाइब्रेरी `{l}` (देखें swatch.library.list)
-@msg	no swatch named `{n}`	`{n}` नाम का कोई swatch
-@msg	no swatch or colour group `{n}`	कोई swatch या रंग समूह `{n}`
-@msg	no swatch or colour group `{n}` in `{_1}`	कोई swatch या रंग समूह `{n}` में `{_1}`
+@msg	no swatch `{keep}`	कोई स्वॉच `{keep}` नहीं
+@msg	no swatch `{n}`	कोई स्वॉच `{n}` नहीं
+@msg	no swatch `{n}` (swatches and colour groups move separately)	कोई स्वॉच `{n}` नहीं (स्वॉच और रंग समूह अलग-अलग मूव होते हैं)
+@msg	no swatch `{name}`	कोई स्वॉच `{name}` नहीं
+@msg	no swatch library `{key}` (see swatch.library.list; "{DOCUMENT_SWATCHES}": the document's swatches)	कोई स्वॉच लाइब्रेरी `{key}` नहीं (swatch.library.list देखें; "{DOCUMENT_SWATCHES}": डॉक्यूमेंट के स्वॉच)
+@msg	no swatch library `{key}` (see swatch.library.list; "document": the document's swatches)	कोई स्वॉच लाइब्रेरी `{key}` नहीं (swatch.library.list देखें; "document": डॉक्यूमेंट के स्वॉच)
+@msg	no swatch library `{key}` (see swatch.library.list)	कोई स्वॉच लाइब्रेरी `{key}` नहीं (swatch.library.list देखें)
+@msg	no swatch library `{l}` (see swatch.library.list)	कोई स्वॉच लाइब्रेरी `{l}` नहीं (swatch.library.list देखें)
+@msg	no swatch named `{n}`	`{n}` नाम का कोई स्वॉच नहीं
+@msg	no swatch or colour group `{n}`	कोई स्वॉच या रंग समूह `{n}` नहीं
+@msg	no swatch or colour group `{n}` in `{_1}`	`{_1}` में कोई स्वॉच या रंग समूह `{n}` नहीं
 @msg	no symbol `{n}`	कोई सिंबल `{n}`
 @msg	no symbol `{n}` in `{_1}`	`{_1}` में कोई सिंबल `{n}`
 @msg	no symbol instances selected	सिलेक्टेड कोई सिंबल उदाहरण नहीं
@@ -7364,7 +7364,7 @@ antiAlias	Sharp	शार्प
 @msg	no toolbar named `{name}`	कोई टूलबार जिसका नाम `{name}` है
 @msg	no tracing preset `{preset}` (see imageTrace.presets)	कोई अनुरेखण पूर्व निर्धारित `{preset}` (imageTrace.presets देखें)
 @msg	no user library folder here	यहां कोई उपयोगकर्ता लाइब्रेरी फ़ोल्डर नहीं
-@msg	no user library folder here (save with a path, or without one to get the data)	यहां कोई उपयोगकर्ता लाइब्रेरी फ़ोल्डर नहीं (एक पाथ के साथ या बिना किसी डेटा को प्राप्त करने के लिए)
+@msg	no user library folder here (save with a path, or without one to get the data)	यहाँ कोई यूज़र लाइब्रेरी फ़ोल्डर नहीं है (पाथ के साथ सेव करें, या डेटा पाने के लिए बिना पाथ के)
 @msg	no user workspace `{from}`	कोई उपयोगकर्ता वर्कस्पेस `{from}`
 @msg	no variable named `{from}`	कोई चर नाम `{from}`
 @msg	no variable named `{name}`	कोई चर नाम `{name}`
@@ -7421,7 +7421,7 @@ antiAlias	Sharp	शार्प
 @msg	not an export presets file: {e}	एक निर्यात प्रीसेट फ़ाइल नहीं: {e}
 @msg	not an image VectorCraft reads (see document.formats)	यह ऐसी इमेज नहीं है जिसे VectorCraft पढ़ सके (document.formats देखें)
 @msg	not an RTF file: it doesn't start with {\\rtf	RTF फ़ाइल नहीं: यह {\rtf के साथ शुरू नहीं होता है
-@msg	not area type (text in a frame) outside perspective	नहीं क्षेत्र के प्रकार (एक फ्रेम में टेक्स्ट) बाहर पर्सपेक्टिव
+@msg	not area type (text in a frame) outside perspective	पर्सपेक्टिव के बाहर का एरिया टाइप (फ़्रेम में टेक्स्ट) नहीं है
 @msg	not editing an opacity mask	एक opacity मास्क संपादित न करें
 @msg	not found	नहीं मिला
 @msg	not in pattern editing mode	पैटर्न संपादन मोड में नहीं
@@ -7436,7 +7436,7 @@ antiAlias	Sharp	शार्प
 @msg	nothing to bind	बाध्य करने के लिए कुछ नहीं
 @msg	nothing to change	बदलने के लिए कुछ भी नहीं
 @msg	nothing to change: give dx, dy, hScale, vScale or rotation	कुछ भी बदलने के लिए: देना dx, dy, hScale, vScale या रोटेशन
-@msg	nothing to crop	फसल के लिए कुछ नहीं
+@msg	nothing to crop	क्रॉप करने के लिए कुछ नहीं
 @msg	nothing to distort	विकृत करने के लिए कुछ भी नहीं
 @msg	nothing to export	निर्यात करने के लिए कुछ नहीं
 @msg	nothing to export: the document has no visible art	निर्यात करने के लिए कुछ भी नहीं: डॉक्यूमेंट में कोई दृश्य कला नहीं है
@@ -7447,7 +7447,7 @@ antiAlias	Sharp	शार्प
 @msg	nothing to print: every artboard picked is blank	मुद्रित करने के लिए कुछ भी नहीं: हर आर्टबोर्ड चुना खाली है
 @msg	nothing to print: the document has no art that prints	प्रिंट करने के लिए कुछ भी नहीं: डॉक्यूमेंट में कोई कला नहीं है जो प्रिंट करता है
 @msg	nothing to redo	फिर से करने के लिए कुछ नहीं
-@msg	nothing to save: the document has no visible art	बचाने के लिए कुछ नहीं: डॉक्यूमेंट में कोई दृश्य कला नहीं है
+@msg	nothing to save: the document has no visible art	सेव करने के लिए कुछ नहीं: डॉक्यूमेंट में कोई दिखने वाला आर्टवर्क नहीं है
 @msg	Nothing to split at the cursor	कर्सर पर विभाजन करने के लिए कुछ भी नहीं
 @msg	nothing to undo	पूर्ववत करने के लिए कुछ नहीं
 @msg	nothing to warp	कुछ भी नहीं
@@ -7489,11 +7489,11 @@ antiAlias	Sharp	शार्प
 @msg	only a dock group above or below others collapses, not one beside another	केवल दूसरों के ऊपर या नीचे एक डॉक समूह गिर जाता है, एक दूसरे के बगल में नहीं
 @msg	only an exporter or an importer declares `extensions`	केवल एक्सपोर्टर या इंपोर्टर `extensions` घोषित करता है
 @msg	only an object of the Global Edit other than the one it started from can be left out	केवल ग्लोबल एडिट का एक ऑब्जेक्ट, इसके अलावा इसे शुरू किया जा सकता है, छोड़ दिया जा सकता है
-@msg	only groups, layers, type and images have a Contents (Characters) row	केवल समूहों, लेयर्स, प्रकार और इमेज में एक सामग्री (Character) पंक्ति है
+@msg	only groups, layers, type and images have a Contents (Characters) row	केवल समूहों, लेयर्स, टाइप और इमेज में सामग्री (कैरेक्टर्स) पंक्ति होती है
 @msg	only http, https and mailto URLs open in the browser, not “{url}”	केवल http, https और Mailto URL ब्राउज़र में खुलते हैं, न कि "{url}"
 @msg	only interior mesh lines can be deleted	केवल आंतरिक जाल लाइनों को हटाया जा सकता है
 @msg	only solid colours can be added (not gradients or patterns)	केवल ठोस रंगों को जोड़ा जा सकता है (ग्रेडिएंट या पैटर्न नहीं)
-@msg	only solid-colour swatches can be spot colours	केवल ठोस रंग की घड़ी स्पॉट रंग हो सकती है
+@msg	only solid-colour swatches can be spot colours	केवल ठोस रंग वाले स्वॉच स्पॉट रंग हो सकते हैं
 @msg	only this Affinity file's embedded preview could be read; use File › Open to see it with its warning	केवल इस Affinity फ़ाइल के एम्बेडेड प्रीव्यू को पढ़ा जा सकता है; फ़ाइल का उपयोग करें > इसे अपनी चेतावनी के साथ देखने के लिए ओपन करें
 @msg	only this Affinity file's embedded preview could be read: use File › Open to see it with its warning, or export SVG or PDF from Affinity first	केवल इस Affinity फ़ाइल के एम्बेडेड प्रीव्यू को पढ़ा जा सकता है: फ़ाइल का उपयोग करें > इसे अपनी चेतावनी के साथ देखने के लिए ओपन करें, या पहले Affinity से SVG या PDF निर्यात करें
 @msg	onto must name a floating panel	onto: पर एक फ्लोटिंग पैनल का नाम होना चाहिए
@@ -7530,10 +7530,10 @@ antiAlias	Sharp	शार्प
 @msg	page {page}: `{name}` has {n} {pages}	पेज {page}: `{name}` में {n} {pages} हैं
 @msg	page art conflicts with image data for {key}	{key} के लिए इमेज डेटा के साथ पृष्ठ कला संघर्ष
 @msg	page art conflicts with pattern {name}	पैटर्न {name} के साथ पृष्ठ कला संघर्ष
-@msg	page art conflicts with swatch {name}	Swatch {name} के साथ पृष्ठ कला संघर्ष
+@msg	page art conflicts with swatch {name}	पेज आर्टवर्क स्वॉच {name} से मेल नहीं खाता
 @msg	page art is missing image data for {key}	पृष्ठ कला {key} के लिए इमेज डेटा लापता है
 @msg	page art is missing pattern {name}	पृष्ठ कला लापता पैटर्न {name} है
-@msg	page art is missing swatch {name}	पृष्ठ कला लापता है swatch {name}
+@msg	page art is missing swatch {name}	पेज आर्टवर्क में स्वॉच {name} नहीं है
 @msg	page must be a whole number from 1	page: पृष्ठ 1 से एक पूरी संख्या होना चाहिए
 @msg	page size {w} × {h}	{w} × {h}
 @msg	page thumbnail: {e}	पेज थंबनेल: {e}
@@ -7571,7 +7571,7 @@ antiAlias	Sharp	शार्प
 @msg	pdfs `{m}`: single or multiple	pdfs `{m}`: एकल या एकाधिक
 @msg	percent must be above 0 and at most 6400, not {p}	percent: प्रतिशत 0 से अधिक होना चाहिए और अधिक 6400 पर, नहीं {p}
 @msg	Persistent libraries not found: {files}	Persistent लाइब्रेरीों नहीं मिला: {files}
-@msg	pick a colour, gradient or pattern to save as a swatch	एक swatch के रूप में बचाने के लिए एक रंग, ग्रेडिएंट या पैटर्न चुनें
+@msg	pick a colour, gradient or pattern to save as a swatch	स्वॉच के रूप में सेव करने के लिए रंग, ग्रेडिएंट या पैटर्न चुनें
 @msg	pickColorFrom is "artwork" or "swatches", not {v}	pickColorFrom को "artwork" या "swatches" होना चाहिए, {v} नहीं
 @msg	pins and moved must be non-empty lists of the same length	पिन और ले जाने के लिए समान लंबाई की गैर-खाली सूची होनी चाहिए
 @msg	pins must be [[x,y]…]	pins: पिन होना चाहिए [[x,y]...]
@@ -7640,15 +7640,15 @@ antiAlias	Sharp	शार्प
 @msg	release a layer or a group	एक लेयर या एक समूह को छोड़ दें
 @msg	Release Guides: no guides	रिलीज़ गाइड: कोई गाइड नहीं
 @msg	Release: no layer to put the rectangle in	रिलीज: आयत को डालने के लिए कोई लेयर नहीं
-@msg	Reload the page to go on (changes not saved yet may be lost).	पेज को फिर से लोड करने के लिए (बदलने की अभी तक नहीं बचा जा सकता)।
+@msg	Reload the page to go on (changes not saved yet may be lost).	जारी रखने के लिए पेज फिर से लोड करें (जो बदलाव अभी सेव नहीं हुए, वे खो सकते हैं)।
 @msg	replace keeps the replaced object's place and transform: drop template, at and rect	प्रतिस्थापित ऑब्जेक्ट के स्थान को बनाए रखता है और बदल देता है: ड्रॉप टेम्पलेट, पर और आयतन
 @msg	Replace Spine: select a blend and a path	Spine: एक मिश्रण और एक पाथ चुनें
 @msg	replace: select the one object to replace	प्रतिस्थापित करने के लिए एक ऑब्जेक्ट सिलेक्ट करें
 @msg	replace: the object to replace was changed or deleted	प्रतिस्थापित करने के लिए ऑब्जेक्ट को बदल दिया गया था या हटा दिया गया
 @msg	Reset {_1}	रीसेट करें {_1}
 @msg	resolution must be a number or screen|medium|high	resolution: रिज़ॉल्यूशन एक नंबर या स्क्रीन होना चाहिए
-@msg	resolution must be between 1 and 2400 ppi	resolution: संकल्प 1 और 2400 ppi के बीच होना चाहिए
-@msg	resolutions must be between 1 and 2400 ppi	resolutions: संकल्प 1 और 2400 ppi के बीच होना चाहिए
+@msg	resolution must be between 1 and 2400 ppi	resolution: रिज़ॉल्यूशन 1 और 2400 ppi के बीच होना चाहिए
+@msg	resolutions must be between 1 and 2400 ppi	resolutions: रिज़ॉल्यूशन 1 और 2400 ppi के बीच होना चाहिए
 @msg	result would exceed the canvas (coordinates out of range)	परिणाम कैनवास से अधिक होगा (श्रेणी से बाहर समन्वय)
 @msg	rotation must be a number of degrees	rotation: रोटेशन डिग्री की एक संख्या होना चाहिए
 @msg	rotation must be finite	rotation: रोटेशन को परिमित होना चाहिए
@@ -7672,14 +7672,14 @@ antiAlias	Sharp	शार्प
 @msg	Saving	सेव किया जा रहा है
 @msg	Saving {_1}	बचत {_1}
 @msg	Saving recovery data for {_1}	{_1} के लिए रिकवरी डेटा सेव करना
-@msg	scale `{s}`: a factor such as 2x, a width (100w), a height (100h) or a resolution (72ppi)	पैमाने `{s}`: एक कारक जैसे 2x, चौड़ाई (100w), ऊंचाई (100h) या एक संकल्प (72ppi)
+@msg	scale `{s}`: a factor such as 2x, a width (100w), a height (100h) or a resolution (72ppi)	पैमाने `{s}`: एक कारक जैसे 2x, चौड़ाई (100w), ऊंचाई (100h) या एक रिज़ॉल्यूशन (72ppi)
 @msg	scale must be a number above 0, at most 64	scale: पैमाने 0 से अधिक होना चाहिए, अधिकांश 64 में
 @msg	scale must be a number from {_1} to {_2}, not {_3}	scale: स्केल {_1} से {_2} के लिए एक नंबर होना चाहिए, नहीं {_3}
 @msg	scale must be a number from {_1} to {_2}, not {s}	scale: स्केल {_1} से {_2} के लिए एक नंबर होना चाहिए, नहीं {s}
 @msg	Scale must be drawing:real, for example 1:10	स्केल ड्राइंग होना चाहिए:वास्तविक, उदाहरण के लिए 1:10
 @msg	scale must be non-zero	scale: स्केल होना चाहिए गैर-zero
 @msg	Scale ratio must be between 1:1000000 and 1000000:1	स्केल अनुपात 1:1000000 और 1000000:1 के बीच होना चाहिए
-@msg	Scale Text Attributes: selected type has no scale to bake	स्केल टेक्स्ट एट्रिब्यूट्स: सिलेक्टेड प्रकार में बेक करने के लिए कोई स्केल नहीं है
+@msg	Scale Text Attributes: selected type has no scale to bake	स्केल टेक्स्ट एट्रिब्यूट्स: सिलेक्टेड टाइप में बेक करने के लिए कोई स्केल नहीं है
 @msg	scope must be selection or all (got {other})	scope: गुंजाइश का सिलेक्शन होना चाहिए या सभी ({other}) होना चाहिए।
 @msg	scribble is too long	स्क्रिबल बहुत लंबा है
 @msg	searching a folder isn't available on the web	एक फ़ोल्डर खोज वेब पर उपलब्ध नहीं है
@@ -7728,10 +7728,10 @@ antiAlias	Sharp	शार्प
 @msg	select an object with a freeform gradient	एक फ्रीफॉर्म ग्रेडिएंट के साथ एक ऑब्जेक्ट सिलेक्ट करें
 @msg	select an object with an opacity mask	एक opacity मास्क के साथ एक ऑब्जेक्ट सिलेक्ट करें
 @msg	select an Objects on Path group	पाथ समूह पर एक ऑब्जेक्ट चुनें
-@msg	select area type	क्षेत्र प्रकार सिलेक्ट करें
-@msg	select area type (text in a frame)	क्षेत्र प्रकार (एक फ्रेम में टेक्स्ट) सिलेक्ट करें
-@msg	select area type and closed paths (at least one area type object)	क्षेत्र प्रकार और बंद पाथ (कम से कम एक क्षेत्र प्रकार ऑब्जेक्ट) सिलेक्ट करें
-@msg	select area type whose first line can fit its frame	क्षेत्र के प्रकार सिलेक्ट करें जिनकी पहली पंक्ति अपने फ्रेम को फिट कर सकती है
+@msg	select area type	एरिया टाइप सिलेक्ट करें
+@msg	select area type (text in a frame)	एरिया टाइप (फ़्रेम में टेक्स्ट) सिलेक्ट करें
+@msg	select area type and closed paths (at least one area type object)	एरिया टाइप और बंद पाथ सिलेक्ट करें (कम से कम एक एरिया टाइप ऑब्जेक्ट)
+@msg	select area type whose first line can fit its frame	ऐसा एरिया टाइप सिलेक्ट करें जिसकी पहली लाइन उसके फ़्रेम में आ सके
 @msg	select artwork (or a colour group) to recolor	फिर से रंग करने के लिए आर्टवर्क (या एक रंग समूह) सिलेक्ट करें
 @msg	Recolor completed; {locked} and {hidden} were left unchanged	रीकलर पूरा हुआ; ये अपरिवर्तित रहे: {locked} और {hidden}
 @msg	Recolor completed; {objects} were left unchanged	रीकलर पूरा हुआ; ये अपरिवर्तित रहे: {objects}
@@ -7747,7 +7747,7 @@ antiAlias	Sharp	शार्प
 @msg	Select dimensions to update	अद्यतन करने के लिए आयाम सिलेक्ट करें
 @msg	select exactly two objects	वास्तव में दो ऑब्जेक्ट चुनें
 @msg	select exactly two path ends to join	वास्तव में दो पाथ में शामिल होने के लिए समाप्त होता है चुनें
-@msg	Select horizontal point or area type whose text fits	क्षैतिज बिंदु या क्षेत्र के प्रकार सिलेक्ट करें जिसका टेक्स्ट फिट बैठता है
+@msg	Select horizontal point or area type whose text fits	ऐसा क्षैतिज पॉइंट टाइप या एरिया टाइप सिलेक्ट करें जिसका टेक्स्ट फ़िट होता है
 @msg	select instances of one symbol	एक सिंबल के उदाहरण चुनें
 @msg	select members of a compound shape	एक मिश्रित आकार के सदस्यों सिलेक्ट करें
 @msg	select objects or give `color`	ऑब्जेक्ट्स सिलेक्ट करें या `color` देना
@@ -7767,13 +7767,13 @@ antiAlias	Sharp	शार्प
 @msg	select paths with dashed strokes to expand	विस्तृत करने के लिए डैश स्ट्रोक के साथ पाथ सिलेक्ट करें
 @msg	select paths, or segments, to divide	विभाजित करने के लिए पाथ, या खंड चुनें
 @msg	select plain rectangles, ellipses or regular polygons to convert	बदलने के लिए सादे आयत, अंडाकार या नियमित बहुभुजों सिलेक्ट करें
-@msg	Select point type	बिंदु प्रकार चुनें
+@msg	Select point type	पॉइंट टाइप सिलेक्ट करें
 @msg	select rows or objects to collect	इकट्ठा करने के लिए पंक्तियों या ऑब्जेक्ट्स सिलेक्ट करें
 @msg	select segments, or paths, to add points to	खंडों, या पाथ का सिलेक्ट करने के लिए, अंक जोड़ने के लिए
-@msg	select some type first	पहले कुछ प्रकार का सिलेक्शन
+@msg	select some type first	पहले कुछ टाइप सिलेक्ट करें
 @msg	select something to export	निर्यात करने के लिए कुछ का सिलेक्शन
 @msg	select something to export (or turn off selectedOnly)	एक्सपोर्ट करने के लिए कुछ चुनें (या selectedOnly बंद करें)
-@msg	Select text or click into text with the Type tool to insert glyphs	टेक्स्ट सिलेक्ट करें या glyphs डालने के लिए टाइप टूल के साथ टेक्स्ट में क्लिक करें
+@msg	Select text or click into text with the Type tool to insert glyphs	टेक्स्ट सिलेक्ट करें या ग्लिफ़ डालने के लिए टाइप टूल से टेक्स्ट में क्लिक करें
 @msg	select text to redefine the style from	से स्टाइल को फिर से परिभाषित करने के लिए टेक्स्ट सिलेक्ट करें
 @msg	select the art and, on top of it, the mask object	कला सिलेक्ट करें और इसके शीर्ष पर, मास्क ऑब्जेक्ट
 @msg	select the art for the design	डिजाइन के लिए कला का सिलेक्शन
@@ -7797,8 +7797,8 @@ antiAlias	Sharp	शार्प
 @msg	select two or more objects to distribute	वितरित करने के लिए दो या दो से अधिक ऑब्जेक्ट चुनें
 @msg	select two or more objects to intertwine	दो या दो से अधिक ऑब्जेक्ट्स सिलेक्ट करें
 @msg	Select two or more objects, or a group	दो या अधिक ऑब्जेक्ट चुनें, या एक समूह चुनें
-@msg	Select two or more one-line point type objects on one baseline to combine	गठबंधन करने के लिए एक बेसलाइन पर दो या एक से अधिक बिंदु प्रकार की ऑब्जेक्टएं चुनें
-@msg	Select two or more one-line point type objects to join	शामिल होने के लिए दो या दो से अधिक एक लाइन बिंदु प्रकार के ऑब्जेक्ट चुनें
+@msg	Select two or more one-line point type objects on one baseline to combine	मिलाने के लिए एक ही बेसलाइन पर दो या अधिक एक-लाइन पॉइंट टाइप ऑब्जेक्ट सिलेक्ट करें
+@msg	Select two or more one-line point type objects to join	जोड़ने के लिए दो या अधिक एक-लाइन पॉइंट टाइप ऑब्जेक्ट सिलेक्ट करें
 @msg	select two or more slices to combine	गठबंधन करने के लिए दो या दो से अधिक स्लाइस चुनें
 @msg	select type in perspective	पर्सपेक्टिव में टाइप करें
 @msg	select type on a path	एक पाथ पर टाइप करें
@@ -7818,14 +7818,14 @@ antiAlias	Sharp	शार्प
 @msg	Show All Hidden Attributes: nothing is hidden	Show all Hidden Attributes: कुछ भी छिपा नहीं है
 @msg	show must be true or false	show को true या false होना चाहिए
 @msg	Simplify Anchors: the paths have too many anchors to simplify at once	एंकर को सरलीकृत करें: पाथ में एक बार में सरल बनाने के लिए कई एंकर हैं
-@msg	size must be "small", "medium", "large" or a number of points over 0 up to {_1}	size: आकार "small", "medium", "large" या 0 से अधिक अंक {_1} तक होना चाहिए
+@msg	size must be "small", "medium", "large" or a number of points over 0 up to {_1}	size: आकार "small", "medium", "large" या पॉइंट में 0 से अधिक और {_1} तक की संख्या होना चाहिए
 @msg	size must be positive	size: आकार सकारात्मक होना चाहिए
 @msg	sizeMode is "fixed" or "pressure", not {other}	sizeMode को "fixed" या "pressure" होना चाहिए, {other} नहीं
 @msg	sizeMode is "fixed" or "pressure", not `{other}`	sizeMode को "fixed" या "pressure" होना चाहिए, `{other}` नहीं
 @msg	sizeVariation must be 0 or more	sizeVariation को 0 या अधिक होना चाहिए
 @msg	smallCaps must be true or false	smallCaps को true या false होना चाहिए
 @msg	some text is hidden or locked, so its font wasn't replaced	कुछ टेक्स्ट छिपा हुआ है या बंद कर दिया गया है, इसलिए इसका फ़ॉन्ट प्रतिस्थापित नहीं किया गया था
-@msg	sort `{x}`: name, kind or status	टाइप `{x}`: नाम, प्रकार या स्थिति
+@msg	sort `{x}`: name, kind or status	sort `{x}`: name, kind या status होना चाहिए
 @msg	source must be the id of a Shaper Group's original shape	source: स्रोत एक शेपर ग्रुप के मूल आकार का आईडी होना चाहिए
 @msg	source paths are too large for Shaper	स्रोत पाथ शेपर के लिए बहुत बड़े हैं
 @msg	span must be "object" or "selection", got {v}	span: स्पैन को "object" या "selection" होना चाहिए, {v} मिला
@@ -7958,7 +7958,7 @@ antiAlias	Sharp	शार्प
 @msg	the Color Picker is not open	रंग पिकर खुला नहीं है
 @msg	the compound shape is too complex to expand	मिश्रित आकार का विस्तार करने के लिए बहुत जटिल है
 @msg	the compressed file unpacks to more than {_1} MB	संकुचित फ़ाइल {_1} MB से अधिक के लिए अनपैक
-@msg	the compressed file unpacks to more than VectorCraft reads ({_1} MB of document, {_2} MB per image)	संकुचित फ़ाइल unpacks से अधिक वेक्टर क्रेफ्ट reads ({_1} MB of document, {_2} MB per image)
+@msg	the compressed file unpacks to more than VectorCraft reads ({_1} MB of document, {_2} MB per image)	संपीड़ित फ़ाइल खुलकर उससे बड़ी हो जाती है जितना VectorCraft पढ़ता है (डॉक्यूमेंट के {_1} MB, हर इमेज के {_2} MB)
 @msg	the container of the listed objects is gone	सूचीबद्ध ऑब्जेक्ट्स का कंटेनर चला गया है
 @msg	the copy `{user_id}` can't be read as a library	प्रतिलिपि `{user_id}` को लाइब्रेरी के रूप में नहीं पढ़ा जा सकता है।
 @msg	the copy would leave the canvas	प्रतिलिपि कैनवास को छोड़ देगी
@@ -7970,16 +7970,16 @@ antiAlias	Sharp	शार्प
 @msg	the design is too big to draw in every column of this graph	डिजाइन इस ग्राफ़ के हर स्तंभ में आकर्षित करने के लिए बहुत बड़ा है
 @msg	the dialog it was opened over is no longer open	जिस डायलॉग के ऊपर इसे ओपन किया गया था, वह अब खुला नहीं है
 @msg	the dictionary stack overflowed	शब्दकोश स्टैक अतिप्रवाह
-@msg	the document has never been saved	कभी नहीं बचाया गया है
-@msg	the document has never been saved: give `folder`	डॉक्यूमेंट को कभी बचाया नहीं गया है: `folder` देना
+@msg	the document has never been saved	डॉक्यूमेंट कभी सेव नहीं किया गया है
+@msg	the document has never been saved: give `folder`	डॉक्यूमेंट कभी सेव नहीं किया गया है: `folder` दें
 @msg	the document has no artboard	डॉक्यूमेंट में कोई आर्टबोर्ड नहीं है
 @msg	the document has no artboards	डॉक्यूमेंट में कोई आर्टबोर्ड नहीं है
-@msg	the document has no brushes to save	डॉक्यूमेंट को बचाने के लिए कोई ब्रश नहीं है
+@msg	the document has no brushes to save	डॉक्यूमेंट में सेव करने के लिए कोई ब्रश नहीं है
 @msg	the document has no patterns	डॉक्यूमेंट में कोई पैटर्न नहीं है
 @msg	the document has no slices	डॉक्यूमेंट में कोई स्लाइस नहीं है
 @msg	the document has no symbols	डॉक्यूमेंट में कोई सिंबल नहीं है
 @msg	the document has no symbols to save	डॉक्यूमेंट में सेव करने के लिए कोई सिंबल नहीं है
-@msg	the document is too large to save compressed ({0}): save it with Use Compression off	डॉक्यूमेंट संपीड़ित ({0}) को बचाने के लिए बहुत बड़ा है: इसे बंद संपीड़न का उपयोग करें
+@msg	the document is too large to save compressed ({0}): save it with Use Compression off	डॉक्यूमेंट संपीड़ित करके सेव करने के लिए बहुत बड़ा है ({0}): इसे संपीड़न का उपयोग करें बंद करके सेव करें
 @msg	the drawing has no layout `{_1}` (it has {_2})	ड्राइंग में कोई लेआउट नहीं है `{_1}` (इसमें {_2} है)
 @msg	the drawing is no longer loaded	ड्राइंग अब लोड नहीं है
 @msg	the drawing is too large to open	ड्राइंग ओपन करने के लिए बहुत बड़ा है
@@ -7993,11 +7993,11 @@ antiAlias	Sharp	शार्प
 @msg	the export returned unreadable data	निर्यात अपठनीय डेटा वापस आ गया
 @msg	the export wrote no file	निर्यात ने कोई फ़ाइल नहीं लिखी
 @msg	the file holds no `variableSets` element	फ़ाइल में `variableSets` एलिमेंट नहीं है
-@msg	the file holds only a placeholder page, not its art (it was saved without PDF compatibility): save it again with PDF compatibility on, or as PDF or SVG	फ़ाइल केवल एक प्लेसहोल्डर पेज रखती है, इसकी कला नहीं है (यह PDF संगतता के बिना बचाया गया था): इसे फिर से PDF संगतता के साथ सेव करें, या PDF या SVG के रूप में
+@msg	the file holds only a placeholder page, not its art (it was saved without PDF compatibility): save it again with PDF compatibility on, or as PDF or SVG	फ़ाइल में केवल एक प्लेसहोल्डर पेज है, उसका आर्टवर्क नहीं (इसे PDF संगतता के बिना सेव किया गया था): इसे PDF संगतता चालू करके फिर से सेव करें, या PDF या SVG के रूप में सेव करें
 @msg	the file is larger than {_1} MB	फ़ाइल {_1} MB से बड़ा है
 @msg	the file is too large	फ़ाइल बहुत बड़ी है
 @msg	the file stopped being read (please report this bug)	फ़ाइल को पढ़ना बंद कर दिया गया (कृपया इस बग की रिपोर्ट करें)
-@msg	the file was read up to an error ({why}): what follows it was left out	फ़ाइल को एक त्रुटि ({why}) तक पढ़ा गया था: इस प्रकार यह छोड़ दिया गया था
+@msg	the file was read up to an error ({why}): what follows it was left out	फ़ाइल एक त्रुटि ({why}) तक पढ़ी गई: उसके बाद का हिस्सा छोड़ दिया गया
 @msg	the file was updated or encrypted already	फ़ाइल को पहले से ही अद्यतन या एन्क्रिप्ट किया गया था
 @msg	the file's layers weren't read ({_1}): it comes in as its page, in one layer	फ़ाइल की लेयरें नहीं पढ़ी गईं ({_1}): यह अपने पृष्ठ के रूप में आता है, एक लेयर में
 @msg	the file's layers weren't read from its editing data ({_1}): they come from its PDF part	फ़ाइल की लेयर्स को इसके संपादन डेटा ({_1}) से नहीं पढ़ा गया था: वे अपने PDF भाग से आते हैं
@@ -8083,7 +8083,7 @@ antiAlias	Sharp	शार्प
 @msg	the operator needs more values than the stack holds	ऑपरेटर को स्टैक की तुलना में अधिक मूल्यों की आवश्यकता होती है
 @msg	the package came back damaged	पैकेज वापस क्षतिग्रस्त हो गया
 @msg	the page has no area	पृष्ठ का कोई क्षेत्र नहीं है
-@msg	the page's type in an unread object's box isn't in its page art	पृष्ठ का प्रकार एक अपठित ऑब्जेक्ट के बॉक्स में नहीं है इसके पृष्ठ कला में
+@msg	the page's type in an unread object's box isn't in its page art	किसी न पढ़े गए ऑब्जेक्ट के बॉक्स में मौजूद पेज का टाइप उसके पेज आर्टवर्क में नहीं है
 @msg	the paint behind the proxy is not a gradient	प्रॉक्सी के पीछे पेंट एक ग्रेडिएंट नहीं है
 @msg	the parent must be a layer or sublayer	माता-पिता को एक लेयर या सबलायर होना चाहिए
 @msg	the path can't be extended	पाथ को बढ़ाया नहीं जा सकता
@@ -8111,7 +8111,7 @@ antiAlias	Sharp	शार्प
 @msg	the Pixar file's header is damaged	पिक्सार फ़ाइल का हेडर क्षतिग्रस्त हो गया है
 @msg	the Pixar file's image data is damaged	Pixar फ़ाइल की इमेज डेटा क्षतिग्रस्त हो गया है
 @msg	The point type has no transform to reset	पॉइंट टाइप में रीसेट करने के लिए कोई परिवर्तन नहीं होता है
-@msg	The point type is aligned that way already	बिंदु प्रकार को पहले से ही संरेखित किया जाता है
+@msg	The point type is aligned that way already	पॉइंट टाइप पहले से ही उसी तरह अलाइन है
 @msg	the pointer is beyond the plane's horizon	सूचक विमान के क्षितिज से परे है
 @msg	the preview image is empty	प्रीव्यू इमेज खाली है
 @msg	the print job has no data	प्रिंट नौकरी के पास कोई डेटा नहीं है
@@ -8119,7 +8119,7 @@ antiAlias	Sharp	शार्प
 @msg	the program ends a dictionary it didn't begin	कार्यक्रम एक शब्दकोश को समाप्त करता है यह शुरू नहीं हुआ था
 @msg	the program goes past one of the reader's limits	कार्यक्रम रीडर की सीमाओं में से एक के पास जाता है
 @msg	the program opens a file, which the reader can't do	कार्यक्रम एक फ़ाइल खोलता है, जिसे टेक्स्टक नहीं कर सकता
-@msg	the program restores a saved state that was already restored	कार्यक्रम एक बचाया राज्य है कि पहले से ही बहाल किया गया था बहाल कर देता है
+@msg	the program restores a saved state that was already restored	प्रोग्राम एक सेव की गई स्थिति को फिर से बहाल करता है, जो पहले ही बहाल हो चुकी थी
 @msg	the program runs too long	कार्यक्रम बहुत लंबे समय तक चलता है
 @msg	the program runs, deletes or renames a file, which the reader can't do	कार्यक्रम एक फ़ाइल को चलाता है, हटाता है या उसका नाम बदलता है, जिसे टेक्स्टक नहीं कर सकता
 @msg	the program uses too much memory	कार्यक्रम बहुत ज्यादा मेमोरी का उपयोग करता है
@@ -8133,7 +8133,7 @@ antiAlias	Sharp	शार्प
 @msg	the rectangle needs a size and must lie on the canvas	आयत एक आकार की जरूरत है और कैनवास पर झूठ होना चाहिए
 @msg	the replacement font is not available	प्रतिस्थापन फ़ॉन्ट उपलब्ध नहीं है
 @msg	the RTF file has too many paragraphs or formatting changes to place as type (at most {MAX_PARAGRAPHS} paragraphs and {MAX_RUNS} runs)	RTF फ़ाइल में कई पैराग्राफ या प्रारूपण परिवर्तन होते हैं जो टाइप (अधिकांश {MAX_PARAGRAPHS} पैराग्राफ और {MAX_RUNS} रन पर) होते हैं।
-@msg	the RTF file is too large to place as type (at most {_1} MB)	RTF फ़ाइल बहुत बड़े प्रकार के रूप में जगह है (अधिकांश {_1} MB पर)
+@msg	the RTF file is too large to place as type (at most {_1} MB)	RTF फ़ाइल टाइप के रूप में प्लेस करने के लिए बहुत बड़ी है (अधिकतम {_1} MB)
 @msg	the runtime panicked	रनटाइम क्रैश हो गया
 @msg	the Save PDF dialog didn't open	सेव करें PDF संवाद खुला नहीं था
 @msg	the scale is not a usable number	स्केल एक प्रयोग योग्य संख्या नहीं है
@@ -8180,7 +8180,7 @@ antiAlias	Sharp	शार्प
 @msg	the top object must be a path, compound path or text object to use as a clipping mask	शीर्ष ऑब्जेक्ट एक क्लिपिंग मास्क के रूप में उपयोग करने के लिए एक पाथ, यौगिक पाथ या टेक्स्ट ऑब्जेक्ट होना चाहिए
 @msg	the trace was cancelled	निशान रद्द कर दिया गया था
 @msg	the trailer has no size	ट्रेलर में कोई आकार नहीं है
-@msg	the type object is flattened to nothing	प्रकार ऑब्जेक्ट कुछ भी नहीं करने के लिए flattened है
+@msg	the type object is flattened to nothing	फ़्लैटन करने पर टाइप ऑब्जेक्ट में कुछ नहीं रहता
 @msg	the value of axis `{tag}` must be a number or null	धुरी का मूल्य `{tag}` होना चाहिए एक नंबर या null होना चाहिए
 @msg	the variable library declares more than {MAX_LIBRARY_DATASETS} data sets	परिवर्तनीय लाइब्रेरी {MAX_LIBRARY_DATASETS} डेटा सेट से अधिक घोषित करता है
 @msg	the variable library declares more than {MAX_LIBRARY_ENTITIES} entities	वेरिएबल लाइब्रेरी {MAX_LIBRARY_ENTITIES} संस्थाओं से अधिक की घोषणा करती है।
@@ -8203,12 +8203,12 @@ antiAlias	Sharp	शार्प
 @msg	the Word document is encrypted or protected with a password; save it without one to place it	वर्ड डॉक्यूमेंट को एन्क्रिप्ट किया गया है या पासवर्ड के साथ संरक्षित किया गया है; इसे बिना किसी स्थान के सेव करें
 @msg	the Word document is too large to place (its {name} stream holds more than {_1} MB)	वर्ड डॉक्यूमेंट बहुत बड़ा होता है (यह {name} स्ट्रीम {_1} MB से अधिक रखता है)
 @msg	the Word document was last saved with fast save, which VectorCraft doesn't read; save it again with fast save turned off	वर्ड डॉक्यूमेंट को फास्ट सेव के साथ आखिरी सेव किया गया था, जो VectorCraft को पढ़ा नहीं जाता है; इसे फिर से फास्ट सेव के साथ सेव करना बंद हो गया
-@msg	the Word document was saved by Word 6.0 or Word 95, which VectorCraft doesn't read; save it as a Word 97-2003 document	वर्ड डॉक्यूमेंट को वर्ड 6.0 या वर्ड 95 द्वारा बचाया गया था, जो VectorCraft को पढ़ा नहीं जाता है; इसे वर्ड 97-2003 डॉक्यूमेंट के रूप में सेव करें
+@msg	the Word document was saved by Word 6.0 or Word 95, which VectorCraft doesn't read; save it as a Word 97-2003 document	Word डॉक्यूमेंट Word 6.0 या Word 95 से सेव किया गया था, जिसे VectorCraft नहीं पढ़ता; इसे Word 97-2003 डॉक्यूमेंट के रूप में सेव करें
 @msg	the Word document's text is made of more than {MAX_PIECES} pieces, too many to place	वर्ड डॉक्यूमेंट का टेक्स्ट {MAX_PIECES} टुकड़ों से भी अधिक है, बहुत से जगह
 @msg	the written PDF has no catalog	लिखित PDF में कोई कैटलॉग नहीं है
 @msg	the written PDF has no cross-reference table	लिखित PDF में कोई क्रॉस-रिफरेंस टेबल नहीं है
 @msg	the written PDF's metadata can't be edited	PDF के मेटाडाटा को संपादित नहीं किया जा सकता है
-@msg	there are no colour swatches to draw	आकर्षित करने के लिए कोई रंग नहीं है
+@msg	there are no colour swatches to draw	ड्रॉ करने के लिए कोई रंग स्वॉच नहीं है
 @msg	there are no objects to release	जारी करने के लिए कोई ऑब्जेक्ट नहीं है
 @msg	there are no printer settings to open here	यहां ओपन करने के लिए कोई प्रिंटर सेटिंग नहीं है
 @msg	there is already a design named `{name}`	there: पहले से ही `{name}` नामक एक डिज़ाइन है।
@@ -8220,12 +8220,12 @@ antiAlias	Sharp	शार्प
 @msg	there is no library: create one first	वहाँ कोई लाइब्रेरी नहीं है: पहले एक बनाना
 @msg	these paths are too degenerate for Shaper	इन पाथ को शेपर के लिए बहुत अलग किया जाता है
 @msg	thickness must be from 0.01 to 5000 pt	thickness: मोटाई 0.01 से 5000 तक होना चाहिए
-@msg	this file was saved without PDF compatibility, and its editing data can't be read ({why})	इस फ़ाइल को PDF संगतता के बिना बचाया गया था, और इसके संपादन डेटा को पढ़ा नहीं जा सकता ({why})
+@msg	this file was saved without PDF compatibility, and its editing data can't be read ({why})	यह फ़ाइल PDF संगतता के बिना सेव की गई थी, और इसका एडिटिंग डेटा पढ़ा नहीं जा सकता ({why})
 @msg	this file's PostScript couldn't be read ({why}): {what}	इस फ़ाइल के पोस्टस्क्रिप्ट को पढ़ा नहीं जा सकता ({why}): {what}
 @msg	this format holds one artboard: export several as PDF or with document.exportForScreens	इस फ़ॉर्मैट में एक आर्टबोर्ड रहता है: कई आर्टबोर्ड PDF में या document.exportForScreens से एक्सपोर्ट करें
 @msg	this is a DWG drawing, which can't be read: save it from the CAD app as an ASCII DXF and open that	this: यह एक डीडब्ल्यूजी ड्राइंग है, जिसे पढ़ा नहीं जा सकता है: इसे सीएडी ऐप से ASCII DXF के रूप में सेव करें और इसे ओपन करें कि
-@msg	this is a PostScript file (an .ai saved in an older format or without PDF compatibility, or an EPS file), not a PDF: File › Open and File › Place read it as EPS	this: यह एक पोस्टस्क्रिप्ट फ़ाइल है (एक .ai एक पुराने फ़ॉर्मैट में या बिना PDF संगतता, या एक ईपीएस फ़ाइल में बचाया), एक PDF नहीं: फ़ाइल> खुला और फ़ाइल> इसे ईपीएस के रूप में पढ़े
-@msg	this is a PostScript file (an .ai saved in an older format or without PDF compatibility, or an EPS file), which can't be opened yet: save it as PDF, PDF-compatible .ai or SVG	this: यह एक पोस्टस्क्रिप्ट फ़ाइल है (एक .ai एक पुराने फ़ॉर्मैट में या बिना PDF संगतता, या एक ईपीएस फ़ाइल में बचाया), जिसे अभी तक ओपन किया नहीं जा सकता है: इसे PDF, PDF-संगत .ai या SVG के रूप में सेव करें
+@msg	this is a PostScript file (an .ai saved in an older format or without PDF compatibility, or an EPS file), not a PDF: File › Open and File › Place read it as EPS	यह एक PostScript फ़ाइल है (पुराने फ़ॉर्मैट में या PDF संगतता के बिना सेव की गई .ai, या EPS फ़ाइल), PDF नहीं: फ़ाइल › ओपन और फ़ाइल › प्लेस इसे EPS के रूप में पढ़ते हैं
+@msg	this is a PostScript file (an .ai saved in an older format or without PDF compatibility, or an EPS file), which can't be opened yet: save it as PDF, PDF-compatible .ai or SVG	यह एक PostScript फ़ाइल है (पुराने फ़ॉर्मैट में या PDF संगतता के बिना सेव की गई .ai, या EPS फ़ाइल), जिसे अभी ओपन नहीं किया जा सकता: इसे PDF, PDF-संगत .ai या SVG के रूप में सेव करें
 @msg	this is not a PostScript file	this: यह पोस्टस्क्रिप्ट फ़ाइल नहीं है
 @msg	this isn't a flat-colour logo ({_1}% of its solid areas match a few flat colours), so Flat Logo mode would turn its gradients into patches: use Color mode instead	यह एक फ्लैट रंग का लोगो नहीं है ({_1}% अपने ठोस क्षेत्रों में कुछ फ्लैट रंगों से मेल खाता है), इसलिए फ्लैट लोगो मोड अपने ग्रेडिएंट को पैच में बदल देगा: इसके बजाय कलर मोड का उपयोग करें
 @msg	this kind of brush has no options dialog yet	इस तरह के ब्रश में अभी तक कोई ऑप्शन्स संवाद नहीं है
@@ -8255,10 +8255,10 @@ antiAlias	Sharp	शार्प
 @msg	too many objects selected (at most 20000)	बहुत सारे ऑब्जेक्ट्स सिलेक्टेड (अधिकांश 20000 पर)
 @msg	too many overlapping paths for Shaper	शेपर के लिए कई ओवरलैपिंग पाथ
 @msg	Too many pieces to make at once	बहुत सारे टुकड़े एक बार में बनाने के लिए
-@msg	too many saved clips	कई बचाया क्लिप
-@msg	too many saved graphics states	कई बचाया ग्राफिक्स राज्यों
+@msg	too many saved clips	बहुत अधिक सेव किए गए क्लिप
+@msg	too many saved graphics states	बहुत अधिक सेव की गई ग्राफ़िक्स स्टेट्स
 @msg	too many Shaper edits	बहुत सारे शेपर संपादन
-@msg	Too many type objects to change at once	एक बार में बदलने के लिए कई प्रकार की ऑब्जेक्टएं
+@msg	Too many type objects to change at once	एक साथ बदलने के लिए बहुत अधिक टाइप ऑब्जेक्ट्स
 @msg	tool (a tool id) is required	टूल (एक टूल आईडी) की आवश्यकता होती है
 @msg	tool shortcuts must be a single key (optionally with Shift)	टूल शॉर्टकट एक कुंजी होने चाहिए (वैकल्पिक रूप से Shift के साथ)
 @msg	toolbar (a toolbar's name) must be a string	टूलबार (एक टूलबार का नाम) एक स्ट्रिंग होना चाहिए
@@ -8267,14 +8267,14 @@ antiAlias	Sharp	शार्प
 @msg	Trap: no edges of different colours meet among the selected objects	ट्रैप: विभिन्न रंगों के कोई किनारे सिलेक्टेड ऑब्जेक्ट्स के बीच मिलते हैं
 @msg	Trap: select two or more objects filled with solid colours	ट्रैप: ठोस रंगों से भरे दो या दो से अधिक ऑब्जेक्ट चुनें
 @msg	truncated	छंटनी
-@msg	two saved selections would be named `{_1}`	दो बचाया सिलेक्शन `{_1}` नाम दिया जाएगा
+@msg	two saved selections would be named `{_1}`	दो सेव किए गए सिलेक्शन का नाम `{_1}` होगा
 @msg	type dimension cannot be represented with this text transform	इस टेक्स्ट को बदलने के साथ टाइप आयाम का प्रतिनिधित्व नहीं किया जा सकता है
-@msg	type dimension must be finite	प्रकार आयाम को परिमित होना चाहिए
+@msg	type dimension must be finite	टाइप का आयाम परिमित होना चाहिए
 @msg	type must be static or dynamic, not {v}	type: प्रकार स्थिर या गतिशील होना चाहिए, न कि {v}
-@msg	type objects can't be isolated	प्रकार ऑब्जेक्ट पृथक नहीं किया जा सकता है
+@msg	type objects can't be isolated	टाइप ऑब्जेक्ट्स को आइसोलेट नहीं किया जा सकता
 @msg	type that changes writing direction inside a text object opens in the direction of its first character	टेक्स्ट ऑब्जेक्ट के भीतर लेखन दिशा बदलने वाला टेक्स्ट अपने पहले वर्ण की दिशा में खुलता है
-@msg	type used as a mask in linked areas, wraparound text or a compound path doesn't clip	प्रकार जुड़े क्षेत्रों में एक मास्क के रूप में इस्तेमाल किया, रैपराउंड टेक्स्ट या एक मिश्रित पाथ क्लिप नहीं करता है
-@msg	Unembedded to {_1}	Unembed to {_1}
+@msg	type used as a mask in linked areas, wraparound text or a compound path doesn't clip	लिंक्ड एरिया, रैपअराउंड टेक्स्ट या कंपाउंड पाथ में मास्क के रूप में इस्तेमाल किया गया टाइप क्लिप नहीं करता
+@msg	Unembedded to {_1}	एम्बेड हटाकर {_1} में रखा गया
 @msg	unexpected host trap	होस्ट में अप्रत्याशित ट्रैप
 @msg	unexpected resources	अप्रत्याशित संसाधन
 @msg	unknown {k} key `{key}` (size, position)	अज्ञात {k} कुंजी `{key}` (आकार, स्थिति)
@@ -8306,9 +8306,9 @@ antiAlias	Sharp	शार्प
 @msg	unknown effect `{id}`	अज्ञात इफ़ेक्ट `{id}`
 @msg	unknown end {e}	अज्ञात अंत {e}
 @msg	unknown File Info field `{k}`	अज्ञात फ़ाइल जानकारी क्षेत्र `{k}`
-@msg	unknown flattenerPreset `{name}` (High Resolution, Medium Resolution, Low Resolution or a saved one: see flattener.presets.list)	अज्ञात flattenerPreset `{name}` (उच्च संकल्प, मध्यम संकल्प, कम संकल्प या एक बचाया: flattener.presets.list देखें)
+@msg	unknown flattenerPreset `{name}` (High Resolution, Medium Resolution, Low Resolution or a saved one: see flattener.presets.list)	अज्ञात flattenerPreset `{name}` (High Resolution, Medium Resolution, Low Resolution या कोई सेव किया गया प्रीसेट: flattener.presets.list देखें)
 @msg	unknown format	अज्ञात स्वरूप
-@msg	unknown format `{f}` (Save writes {_1})	अज्ञात फ़ॉर्मैट `{f}` (Save लिखते हैं {_1})
+@msg	unknown format `{f}` (Save writes {_1})	अज्ञात फ़ॉर्मैट `{f}` (सेव {_1} लिखता है)
 @msg	unknown format `{f}` (vcswatches, gpl, ase or css)	अज्ञात फ़ॉर्मैट `{f}` (vcswatches, gpl, ase या css)
 @msg	unknown freeform mode `{m}` (points, lines)	अज्ञात फ्रीफॉर्म मोड `{m}` (बिंदुओं, लाइनों)
 @msg	unknown from {f}	{f} से अज्ञात
@@ -8335,7 +8335,7 @@ antiAlias	Sharp	शार्प
 @msg	unknown model `{other}` (keep, new or document)	अज्ञात मॉडल `{other}` (keep, नया या डॉक्यूमेंट)
 @msg	unknown op {o}	अज्ञात op {o}
 @msg	unknown OpenType feature `{t}`	अज्ञात ओपन टाइप सुविधा `{t}`
-@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom; prefix - to turn off)	अज्ञात ओपन टाइप सुविधा `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01-ss20, नमक, titl, pnum, lnum, sups, subs, numr, dnom; prefix - बंद करने के लिए)
+@msg	unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom; prefix - to turn off)	अज्ञात OpenType फ़ीचर `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom; बंद करने के लिए आगे - लगाएँ)
 @msg	unknown OpenType feature `{t}` in featureChanges (the tags `features` takes)	featureChanges में अज्ञात OpenType फ़ीचर `{t}` (वे टैग जो `features` लेता है)
 @msg	unknown option `{path}.{k}`	अज्ञात ऑप्शन `{path}.{k}`
 @msg	unknown order `{o}`: toggle, front, forward, backward or back	अज्ञात आदेश `{o}`: टॉगल, फ्रंट, फॉरवर्ड, बैकवर्ड या बैक
@@ -8367,7 +8367,7 @@ antiAlias	Sharp	शार्प
 @msg	not a preferences file: no `format`	प्रेफ़रेंसेज़ फ़ाइल नहीं: `format` नहीं है
 @msg	not a preferences file: no `version`	प्रेफ़रेंसेज़ फ़ाइल नहीं: `version` नहीं है
 @msg	not a preferences file: no `prefs`	प्रेफ़रेंसेज़ फ़ाइल नहीं: `prefs` नहीं है
-@msg	the file was saved by a newer version of VectorCraft (version {v})	फ़ाइल VectorCraft के नए संस्करण से सहेजी गई थी (संस्करण {v})
+@msg	the file was saved by a newer version of VectorCraft (version {v})	फ़ाइल VectorCraft के नए संस्करण (संस्करण {v}) से सेव की गई थी
 @msg	the file holds no preferences	फ़ाइल में कोई प्रेफ़रेंस नहीं है
 @msg	`{key}` names a folder, which preferences files leave out	`{key}` एक फ़ोल्डर बताता है, और प्रेफ़रेंसेज़ फ़ाइलों में फ़ोल्डर नहीं होते
 @msg	the file is larger than 1 MB	फ़ाइल 1 MB से बड़ी है
@@ -8375,14 +8375,14 @@ antiAlias	Sharp	शार्प
 @msg	`{key}` must be an object	`{key}` एक ऑब्जेक्ट होना चाहिए
 @msg	`prefs.import` runs on its own, not as a batch step	`prefs.import` अकेले चलता है, बैच के चरण के रूप में नहीं
 @msg	unknown preset (one of {_1})	अज्ञात प्रीसेट ({_1} में से एक)
-@msg	unknown preset `{name}` (high, medium, low or a saved one: see flattener.presets.list)	अज्ञात प्रीसेट `{name}` (उच्च, मध्यम, निम्न या एक बचाया: flattener.presets.list देखें)
+@msg	unknown preset `{name}` (high, medium, low or a saved one: see flattener.presets.list)	अज्ञात प्रीसेट `{name}` (high, medium, low या कोई सेव किया गया प्रीसेट: flattener.presets.list देखें)
 @msg	unknown preset `{name}` (see flattener.presets.list)	अज्ञात प्रीसेट `{name}` (देखें flattener.presets.list)
 @msg	unknown preset `{name}` (see webExport.presets.list)	अज्ञात प्रीसेट `{name}` (see webExport.presets.list)
 @msg	unknown preset `{name}`: not a built-in or saved preset (see imageTrace.presets)	अज्ञात प्रीसेट `{name}`: एक अंतर्निहित या सेव किए गए प्रीसेट नहीं (imageTrace.presets देखें)
 @msg	unknown profile {id} (see stroke.widthProfile.list)	अज्ञात प्रोफ़ाइल {id} (view stroke.widthProfile.list)
 @msg	unknown proof target `{t}`	अज्ञात प्रमाण लक्ष्य `{t}`
 @msg	unknown quotes key `{k}` (double, single)	अज्ञात उद्धरण कुंजी `{k}` (डबल, सिंगल)
-@msg	unknown resolution `{v}`	अज्ञात संकल्प `{v}`
+@msg	unknown resolution `{v}`	अज्ञात रिज़ॉल्यूशन `{v}`
 @msg	unknown rule `{r}` (see color.harmony)	अज्ञात नियम `{r}` (देखें color.harmony)
 @msg	unknown rule `{rule}` ({_1})	अज्ञात नियम `{rule}` ({_1})
 @msg	unknown setting `{k}`	अज्ञात सेटिंग `{k}`
@@ -8658,7 +8658,7 @@ theme	Appearance	अपीयरेंस
 @msg	Safe Mode is on: plug-ins don't load or run until VectorCraft starts normally	सुरक्षित मोड चालू है: जब तक VectorCraft सामान्य रूप से शुरू नहीं होता, प्लग-इन लोड या चलाए नहीं जाते
 @msg	give `id` or `file` (see plugin.safeMode)	`id` या `file` दें (plugin.safeMode देखें)
 @msg	that plug-in isn't disabled (see plugin.safeMode)	वह प्लग-इन अक्षम नहीं है (plugin.safeMode देखें)
-@msg	Couldn't save the disabled plug-ins for the next launch	अगली बार लॉन्च के लिए अक्षम प्लग-इन सहेजे नहीं जा सके
+@msg	Couldn't save the disabled plug-ins for the next launch	अगली बार लॉन्च के लिए अक्षम प्लग-इन सेव नहीं किए जा सके
 @msg	Expand Appearance: a plug-in effect in the selection can't be expanded in Safe Mode	उपस्थिति का विस्तार: सिलेक्शन में किसी प्लग-इन इफ़ेक्ट का सुरक्षित मोड में विस्तार नहीं किया जा सकता
 
 # Align to Pixel Grid
diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs
index 66caa1c3a4..b65d4b5dbe 100644
--- a/crates/ui-egui/src/i18n/tests.rs
+++ b/crates/ui-egui/src/i18n/tests.rs
@@ -32,6 +32,59 @@ fn hindi_resolves_locales_and_uses_zero_one_plurals() {
     }
 }
 
+/// Every Hindi row uses the terms `docs/localization-hi.md` sets for what its English names:
+/// सेव for saving, स्वॉच for a swatch, क्रॉप for cropping, रिज़ॉल्यूशन for a resolution and पाथ for
+/// a path, never पाठ (a reading), and a number of points is a number (संख्या) in points (पॉइंट).
+#[test]
+fn hindi_rows_use_the_glossary_term_for_what_their_english_names() {
+    let hi = Lang::from_code("hi").expect("hi registered");
+    let (entries, _) = parse_entries(hi.0.source);
+    let mut wrong = Vec::new();
+    for (_, src, translation) in &entries {
+        let english = src.to_lowercase();
+        let names = |words: &[&str]| english.split(|c: char| !c.is_ascii_alphabetic()).any(|w| words.contains(&w));
+        let banned: [(bool, &[&str]); 6] = [
+            (names(&["save", "saves", "saved", "saving"]), &["बचा", "सहेज"]),
+            (names(&["swatch", "swatches"]), &["घड़ी"]),
+            (names(&["crop"]), &["फसल"]),
+            (names(&["resolution", "resolutions"]), &["संकल्प"]),
+            (names(&["path", "paths"]), &["पथ"]),
+            (true, &["पाठ", "कई अंक"]),
+        ];
+        for (applies, words) in banned {
+            if let Some(word) = words.iter().find(|w| applies && translation.contains(**w)) {
+                wrong.push(format!("{word} in {src:?} -> {translation:?}"));
+            }
+        }
+        if english.contains("number of points") && !(translation.contains("संख्या") && translation.contains("पॉइंट")) {
+            wrong.push(format!("no number in points in {src:?} -> {translation:?}"));
+        }
+    }
+    assert!(wrong.is_empty(), "{} Hindi rows use the wrong term:\n{}", wrong.len(), wrong.join("\n"));
+}
+
+/// Hindi messages and labels keep the condition, quantity and clauses of their English.
+#[test]
+fn hindi_rows_keep_the_meaning_of_their_english() {
+    let hi = Lang::from_code("hi").expect("hi registered");
+    assert_eq!(message(hi, "`shift` must be a number of points"), "`shift` पॉइंट में एक संख्या होनी चाहिए");
+    assert_eq!(
+        message(hi, "`spacing` must be a number of points, 0 or more, or \"auto\""),
+        "`spacing` पॉइंट में 0 या उससे बड़ी संख्या, या \"auto\" होनी चाहिए"
+    );
+    assert_eq!(tr(hi, "Check an artboard to save."), "सेव करने के लिए किसी आर्टबोर्ड पर चेक लगाएँ।");
+    assert_eq!(tr(hi, "Save the applied preferences to a JSON file"), "लागू प्रेफ़रेंसेज़ को JSON फ़ाइल में सेव करें");
+    assert_eq!(message(hi, "the script is not UTF-8 text"), "स्क्रिप्ट UTF-8 टेक्स्ट नहीं है");
+    assert_eq!(message(hi, "only solid-colour swatches can be spot colours"), "केवल ठोस रंग वाले स्वॉच स्पॉट रंग हो सकते हैं");
+    assert_eq!(message(hi, "select area type"), "एरिया टाइप सिलेक्ट करें");
+    assert_eq!(message(hi, "12 MB of images, at most 10 MB"), "इमेज के 12 MB, अधिकतम 10 MB");
+    let all =
+        message(hi, "SVG keeps 1 of the document's 3 artboards: the file reopens with one. Turn on Preserve Editing Capabilities to keep them all.");
+    assert!(all.contains("3 आर्टबोर्ड में से 1") && all.contains("सभी आर्टबोर्ड रखने के लिए"), "{all}");
+    let left_out = message(hi, "the file was read up to an error (bad xref): what follows it was left out");
+    assert!(left_out.contains("उसके बाद का हिस्सा छोड़ दिया गया"), "{left_out}");
+}
+
 /// Locale tags name their language by region or script (in either case, with an encoding or
 /// modifier), and a tag that names no language resolves to none.
 #[test]
diff --git a/docs/localization-hi.md b/docs/localization-hi.md
index c130a7b088..d8dbcaf145 100644
--- a/docs/localization-hi.md
+++ b/docs/localization-hi.md
@@ -25,6 +25,13 @@ Hindi integer counts use the first plural form for 0 and 1 and the second for 2+
 Both `@plural` and `@msgplural` rows have two forms. The latter translate status messages when
 displayed; the engine, control channel and MCP continue to return English messages.
 
+In diagnostics, "a number of points" is a numeric value in the point unit: write संख्या and
+पॉइंट, never कई अंक ("many digits"). Keep every bound and alternative the English lists, and
+every clause such as "all" or "what follows it". Type as a text object is टाइप (एरिया टाइप,
+पॉइंट टाइप), not प्रकार, which stays for a kind. `hindi_rows_use_the_glossary_term_for_what_their_english_names`
+in `crates/ui-egui/src/i18n/tests.rs` checks the save, swatch, crop, resolution and path terms
+and the point unit in every row.
+
 ## Terminology
 
 | English | Hindi |
@@ -42,6 +49,7 @@ displayed; the engine, control channel and MCP continue to return English messag
 | Fill / Stroke | फ़िल / स्ट्रोक |
 | Gradient / Mesh / Blend | ग्रेडिएंट / मेश / ब्लेंड |
 | Pattern / Swatch | पैटर्न / स्वॉच |
+| Type (text object) / Crop / Resolution | टाइप / क्रॉप / रिज़ॉल्यूशन |
 | Appearance / Graphic style | अपीयरेंस / ग्राफ़िक स्टाइल |
 | Symbol / Envelope | सिंबल / एन्वेलप |
 | Clipping mask / Opacity mask | क्लिपिंग मास्क / ओपेसिटी मास्क |
@@ -61,6 +69,10 @@ The draft has 7,877 unique rows, including 2,537 `@msg`, 45 `@msgplural` and 38
 Its source set combines the sibling catalogs with the current test scanner's UI/undo and error
 message dumps, so it includes runtime labels outside the literal scanner. Row count is not a
 percentage of the application's entire interface.
+On 2026-11-13 the catalog has 8,732 rows, including 3,003 `@msg`, 47 `@msgplural` and 41
+`@plural` rows. A wording pass on that date corrected 193 rows outside the plug-in
+messages for meaning, dropped clauses, English left in place and the save, swatch, crop,
+resolution, path and type terms. It is not a native proofread.
 
 The comparison covers release `v0.21.1` (`f6aa4309`) and current `main` (`3c7d9e1f`). Their
 non-English catalogs have no missing Hindi keys except the names deliberately kept in English.
diff --git a/docs/localization-parity.md b/docs/localization-parity.md
index 25dd92d552..7c90093cb6 100644
--- a/docs/localization-parity.md
+++ b/docs/localization-parity.md
@@ -29,7 +29,7 @@ Chinese by `imachus`). Only Georgian is recorded as reviewed by a native speaker
 | English | `en` | source, 100% | all | Latin | — | full | — |
 | Simplified Chinese (Mandarin) | `zh-hans` | 5,102 rows, 791 of them `@msg` (counted 2026-10-21): menus, `tl!` literals and messages complete when counted | all | CJK UI font from craft-fonts (BIZ UDPGothic) when embedded, else a system font; IME with marked text at the caret; vertical type partial ([type-parity.md](type-parity.md)) | no | full | — (review) |
 | Spanish | `es` | 4,009 / 4,020 (99.7%) | all (604 messages) | Latin | no | full | — (review) |
-| Hindi | `hi` | 7,877 rows (2026-11-06): 2,537 `@msg`, 45 `@msgplural`, 38 `@plural`; no gaps in the untranslated report | menus, dialogs, tooltips and scanned messages; contributor-approved loanword terminology; agent wording pass | UI and document text shape with HarfRust; installed desktop Devanagari fallback, or a `Deva` craft-fonts face; web font still needed | contributor terminology review; wider proofread welcome | complete catalog, machine-assisted draft | native review, layout and web font |
+| Hindi | `hi` | 8,732 rows (2026-11-13): 3,003 `@msg`, 47 `@msgplural`, 41 `@plural`; no gaps in the untranslated report | menus, dialogs, tooltips and scanned messages; contributor-approved loanword terminology; agent wording pass | UI and document text shape with HarfRust; installed desktop Devanagari fallback, or a `Deva` craft-fonts face; web font still needed | contributor terminology review; 2026-11-13 wording pass on messages and longer labels, with a glossary-term test; wider proofread welcome | complete catalog, machine-assisted draft | native review, layout and web font |
 | Arabic | `ar` | 0 | none | document text: bidi layout and Paragraph Direction; interface: no right-to-left layout, no Arabic shaping in egui | no | none | 25–40 |
 | French | `fr` | 4,020 / 4,020 (100%) | all | Latin | no | full | — (review) |
 | Portuguese | `pt-br` | 6,106 catalog entries (counted 2026-10-31 on `main` at `d26dd933a`): menus, `tl!` literals and messages complete when counted; one/other plurals | all | Latin | contributor is a Brazilian Portuguese speaker; further native review welcome | full | — (review) |
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..a09b7eec98 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -842,6 +842,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - Window › Toolbars › Manage Toolbars… and Manage Toolbars… in the All Tools drawer's menu open a dialog that lists the toolbars made with New Toolbar: a new name typed for the selected toolbar renames it, + copies it with its tools (with none selected, + makes a blank toolbar), and the trash can deletes it. Each change shows under Window › Toolbars and stays in the workspace (<https://helpx.adobe.com/illustrator/using/tools.html>; `window.toolbar.manage`, `window.toolbar.rename`, `window.toolbar.duplicate`, `window.toolbar.delete`; `manage_toolbars_renames_duplicates_and_deletes`).
   - Window › Toolbars › Keep Tools Beside the Canvas, a VectorCraft layout option that is off by default, docks the Tools panel between left-side panels and the canvas instead of at the window's left edge; the canvas's left edge then also docks a floating Tools panel, and workspaces keep the setting. Scores are unchanged (`window.toolsBesideCanvas`; `docked_tools_keep_the_window_edge_unless_kept_beside_the_canvas`, `tools_redock_at_the_targets_of_the_chosen_placement`).
   - Hindi (2026-11-06): Hindi (`hi`): 7,877-row machine-assisted catalog, zero/one singular plurals, desktop font fallback and optional Devanagari craft-fonts fallback; all 55 translation tests pass; native review and a web font remain; scores and estimates unchanged. [Terminology and limitations](localization-hi.md).
+  - Hindi wording (2026-11-13): rows outside the plug-in messages keep their English's meaning, quantities and clauses, and use the catalog's save, swatch, crop, resolution, path and type terms; a test checks those terms and the point unit in every row; native review remains; scores and estimates unchanged.
   - Window › Help Bar shows or hides the tool-help strip at the bottom of the window apart from the status bar (`window.helpBar`). Each setting is kept with the UI preferences and in saved workspaces, and Presentation Mode hides both bars. Layouts saved before the setting existed show the Help Bar where they show the status bar (`help_bar_toggle_is_independent_and_saved_in_workspaces`, `help_bar_and_status_bar_render_independently`, `legacy_help_bar_visibility_follows_each_layouts_status_bar`, `a_help_bar_setting_the_file_lacks_is_saved`).
   - Czech render-site labels: desktop/web file filters, diagnostics, suggested preset names and contributor tooltips/plurals now use catalog lookups; gradients have Czech adjective agreement and printer marks have a separate context (PDF/Print and Summary). Search, Home, toolbar/panel tooltips and Preferences already look up their labels. Every complete catalog has rows for these labels and for the Roman and Japanese printer mark styles. Evidence: `i18n::tests::czech_render_site_follow_up`, `i18n::tests::complete_catalogs_translate_render_site_labels`, `dialogs::tests_modal::printer_mark_labels_are_distinct_from_language_names`; see [localization-parity.md](localization-parity.md).
   - The History panel, Edit › Undo and Edit › Redo translate the names of the steps that apply or redefine a character or paragraph style and of the step that redefines a graphic style: each such step keeps its template (`Apply {name}`, `Redefine {name}`, `Redefine Graphic Style “{name}”`) and the style's name, every complete catalog has a row for each template, and the panel and the menu show the style's name as the document holds it, except the Normal styles' names, which they show in the interface language (`steps_named_after_a_style_list_the_template_around_the_name`, `undo_and_redo_name_a_style_step_around_the_style_name`).

From 666084fb814804dc5a81059fd510e3b1fbcd44fc Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:46:06 -0800
Subject: [PATCH 41/48] Blend: find the spine segment for an arc length with a
 binary search

Spine::at_length walked the first subpath's segments from the start
until one ended at or past the arc length, so placing every blend step,
spread key, blend widget and Objects on Path attachment cost one
comparison per earlier segment. It now searches the anchors' arc
lengths, which never decrease, and picks the same segment: the first
whose end is at or past the length, so an exact anchor length and
repeated lengths from zero-length segments keep their segment. The
point and tangent evaluation is unchanged.

Tests compare the search with the old walk on open and closed spines,
one segment, curves, zero-length segments, every anchor, both ends,
out-of-range and non-finite lengths, and check that a 4,096-segment
spine needs at most 13 comparisons.
---
 crates/doc/src/blend.rs   | 116 ++++++++++++++++++++++++++++++++------
 docs/target-app-parity.md |   1 +
 2 files changed, 100 insertions(+), 17 deletions(-)

diff --git a/crates/doc/src/blend.rs b/crates/doc/src/blend.rs
index d9e179286f..f4877b0a49 100644
--- a/crates/doc/src/blend.rs
+++ b/crates/doc/src/blend.rs
@@ -1326,27 +1326,39 @@ impl Spine {
         let s = if s.is_finite() { s.clamp(0.0, self.length()) } else { 0.0 };
         let sp = &self.subpath;
         let n = sp.segment_count();
-        let mut start = 0.0;
-        for i in 0..n {
-            let c = sp.segment(i);
-            let end = self.anchor_length(i + 1).unwrap_or(self.length());
-            if s <= end || i + 1 == n {
-                let local_s = (s - start).max(0.0) / (end - start).max(1e-12) * c.arclen(1e-9);
-                let t = c.inv_arclen(local_s, 1e-9).clamp(0.0, 1.0);
-                let e = c.eval(t);
-                let tv = c.deriv().eval(t).to_vec2();
-                // Where a handle sits on its anchor the derivative vanishes there: take the
-                // direction between points a little before and after instead.
-                let tv = if tv.hypot2() < 1e-24 { c.eval((t + 1e-3).min(1.0)) - c.eval((t - 1e-3).max(0.0)) } else { tv };
-                return (Point::new(e.x, e.y), tv.y.atan2(tv.x));
-            }
-            start = end;
+        if n == 0 {
+            return (self.pts.first().copied().unwrap_or_default(), 0.0);
         }
-        // Only a spine without segments gets here: the loop returns at the last one.
-        (self.pts.first().copied().unwrap_or_default(), 0.0)
+        let i = segment_at(&self.anchors, n, s, || {});
+        let c = sp.segment(i);
+        let start = if i == 0 { 0.0 } else { self.anchor_length(i).unwrap_or(0.0) };
+        let end = self.anchor_length(i + 1).unwrap_or(self.length());
+        let local_s = (s - start).max(0.0) / (end - start).max(1e-12) * c.arclen(1e-9);
+        let t = c.inv_arclen(local_s, 1e-9).clamp(0.0, 1.0);
+        let e = c.eval(t);
+        let tv = c.deriv().eval(t).to_vec2();
+        // Where a handle sits on its anchor the derivative vanishes there: take the
+        // direction between points a little before and after instead.
+        let tv = if tv.hypot2() < 1e-24 { c.eval((t + 1e-3).min(1.0)) - c.eval((t - 1e-3).max(0.0)) } else { tv };
+        (Point::new(e.x, e.y), tv.y.atan2(tv.x))
     }
 }
 
+/// The segment of a spine with `n` segments (`n > 0`) that holds arc length `s`: the first one whose
+/// end is at or past `s`, or the last one when none is. `anchors` holds the arc length at each
+/// anchor, so segment `i` ends at `anchors[i + 1]`, and the last segment of a closed spine, which has
+/// no entry for its end, ends at the spine's length. The lengths never decrease (each is a sum of
+/// distances that are not negative, at most `+inf` and never NaN), so a binary search finds the
+/// segment in about `log2(n)` comparisons. `probe` is called once for each comparison.
+fn segment_at(anchors: &[f64], n: usize, s: f64, mut probe: impl FnMut()) -> usize {
+    let ends = anchors.get(1..n.min(anchors.len())).unwrap_or_default();
+    ends.partition_point(|&end| {
+        probe();
+        end < s
+    })
+    .min(n.saturating_sub(1))
+}
+
 /// The anchor of the first subpath each key sits on, when they are all valid for `n` anchors.
 fn pinned(spec: &BlendSpec, keys: usize, n: usize) -> Option<Vec<usize>> {
     (spec.key_anchors.len() == keys && keys >= 2 && spec.key_anchors.iter().all(|a| (*a as usize) < n))
@@ -1891,6 +1903,76 @@ mod tests {
         assert!(end.is_finite(), "{end}");
     }
 
+    /// [`Spine::at_length`] by walking the segments from the first, as a reference for the search.
+    fn walked_at_length(sp: &Spine, s: f64) -> (Point, f64) {
+        let s = if s.is_finite() { s.clamp(0.0, sp.length()) } else { 0.0 };
+        let n = sp.subpath.segment_count();
+        let mut start = 0.0;
+        for i in 0..n {
+            let c = sp.subpath.segment(i);
+            let end = sp.anchor_length(i + 1).unwrap_or(sp.length());
+            if s <= end || i + 1 == n {
+                let local_s = (s - start).max(0.0) / (end - start).max(1e-12) * c.arclen(1e-9);
+                let t = c.inv_arclen(local_s, 1e-9).clamp(0.0, 1.0);
+                let e = c.eval(t);
+                let tv = c.deriv().eval(t).to_vec2();
+                let tv = if tv.hypot2() < 1e-24 { c.eval((t + 1e-3).min(1.0)) - c.eval((t - 1e-3).max(0.0)) } else { tv };
+                return (Point::new(e.x, e.y), tv.y.atan2(tv.x));
+            }
+            start = end;
+        }
+        panic!("a spine without segments")
+    }
+
+    /// The search picks the same segment as walking them in order, so points and tangents stay the
+    /// same: on open and closed spines, one segment, curves, and zero-length segments whose anchors
+    /// share an arc length; at every anchor, between anchors, at both ends, past them, and for
+    /// values that are not finite.
+    #[test]
+    fn spine_lookup_matches_walking_the_segments() {
+        let p = Point::new;
+        let bow = SubPath::new(
+            vec![Anchor::smooth(p(0.0, 0.0), p(50.0, 50.0)), Anchor::smooth(p(100.0, 0.0), p(150.0, -50.0)), Anchor::corner(p(200.0, 0.0))],
+            false,
+        );
+        let spines = [
+            SubPath::polyline(&[p(0.0, 0.0), p(10.0, 0.0), p(10.0, 0.0), p(10.0, 0.0), p(30.0, 5.0), p(30.0, 5.0)], false),
+            SubPath::polyline(&[p(0.0, 0.0), p(0.0, 0.0), p(40.0, 0.0), p(40.0, 30.0)], true),
+            SubPath::polyline(&[p(0.0, 0.0), p(40.0, 0.0), p(40.0, 30.0), p(0.0, 0.0)], true),
+            SubPath::polyline(&[p(0.0, 0.0), p(25.0, 25.0)], false),
+            SubPath::polyline(&[p(0.0, 0.0), p(25.0, 25.0)], true),
+            bow.clone(),
+            SubPath { closed: true, ..bow },
+        ];
+        for sub in spines {
+            let sp = Spine::new(&PathData::single(sub)).unwrap();
+            let len = sp.length();
+            let mut lengths = vec![0.0, len, -1.0, len + 1.0, -len, f64::NAN, f64::INFINITY, f64::NEG_INFINITY, f64::MAX, f64::MIN];
+            lengths.extend(sp.anchors.iter().flat_map(|&a| [a, a - 1e-9, a + 1e-9]));
+            lengths.extend((0..=400).map(|k| len * k as f64 / 400.0));
+            for s in lengths {
+                assert_eq!(sp.at_length(s), walked_at_length(&sp, s), "s = {s} on {:?}", sp.anchors);
+            }
+        }
+    }
+
+    /// Finding the segment for an arc length on a spine of thousands of segments takes a few
+    /// comparisons, not one for each segment before it.
+    #[test]
+    fn spine_lookup_compares_a_few_segment_ends() {
+        let pts: Vec<Point> = (0..=4096).map(|i| Point::new(i as f64, if i % 2 == 0 { 0.0 } else { 1.0 })).collect();
+        let sp = Spine::new(&PathData::single(SubPath::polyline(&pts, false))).unwrap();
+        let n = sp.subpath.segment_count();
+        assert_eq!(n, 4096);
+        for s in [sp.length() - 0.5, sp.length(), sp.length() / 2.0, 0.25] {
+            let mut compared = 0;
+            let i = segment_at(&sp.anchors, n, s, || compared += 1);
+            assert!(compared <= 13, "{compared} comparisons at {s}");
+            assert_eq!(sp.at_length(s), walked_at_length(&sp, s));
+            assert!(sp.anchors[i] <= s && (i + 1 == n || s <= sp.anchors[i + 1]), "segment {i} at {s}");
+        }
+    }
+
     #[test]
     fn easing_keeps_the_ends_and_stays_monotone() {
         use crate::live::{BlendEase, BlendEaseType as K};
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..0c9c800549 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1781,6 +1781,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 - **Blend, mesh and envelope points by number:** `object.blend.spine.moveAnchor`, `reshapeSegment` and `removeAnchor`, `object.mesh.setPointColor`, `movePoint` and `deletePoint`, and `object.envelope.setMeshPoint` refuse an `anchor`, `segment` or `index` that is not a whole number, and `object.envelope.setMeshPoint` refuses a negative `index`. Specified Steps (`object.blend.make`, `object.blend.options`) and the rows and columns of `object.mesh.create`, `object.envelope.makeWithMesh` and `resetWithMesh` must be whole numbers too.
 
 - **Blend widgets on the canvas:** with one blend selected that has a spine, the Selection and Blend tools show two widgets 16 px above and below the spine's halfway point (further out, joined to that point by a line, where the boxes of three or more other objects crowd the spot), as the [Blend panel help page](https://helpx.adobe.com/illustrator/desktop/manage-colors/apply-transparency-and-blending/blend-panel-overview.html) describes an upper widget for Appearance and a lower one for Easing. The upper one sets Shift and the lower one Ramp, keeping the Type, and the lower one shows only when the steps follow that spine; a blend made without a spine shows neither. A drag along the spine changes the value by one per screen pixel from its value at the press, the arrow keys during the drag by one (Shift: ten), and Escape or a tool switch cancels it. A drag is one undo step, or none when the value ends where it started. The placement, the drag and the keys are VectorCraft's own rules. `object.blend.setEasing` sets the same values for agents. Evidence: `blendwidget::tests`, `tests::blendopts::{set_easing_edits_one_blend_and_refuses_what_it_cannot_set, dragging_a_blend_widget_is_one_undo_step_and_a_click_or_escape_none}`, `shortcuts::tests::shift_arrows_step_a_pressed_blend_widget_by_ten`.
+- **Positions along a blend spine:** blend steps, keys spread along a spine, the blend widgets and Objects on Path find the spine segment for each arc length with a binary search over the anchors' arc lengths, so a spine of 4,096 segments takes at most 13 comparisons per position instead of one per segment before it. Points and tangents are unchanged, including at anchors shared by zero-length segments. Evidence: `blend::tests::{spine_lookup_compares_a_few_segment_ends, spine_lookup_matches_walking_the_segments}`.
 
 - **Blend, mesh and envelope numbers given as text:** `object.blend.make` and `object.blend.options` (`steps`, `distance`, `value`), `object.envelope.makeWithWarp`, `resetWithWarp` and `options` (`bend`, `h`, `v`, `horizontalDistortion`, `verticalDistortion`), `object.envelope.makeWithMesh` and `resetWithMesh` (`rows`, `cols`, `columns`), `object.envelope.options` (`fidelity`), `object.mesh.create` (`rows`, `cols`, `columns`, `highlight`) and `object.mesh.setPointColor` (`opacity`) refuse a value other than a number or null, such as `"8"`, and change nothing. `object.mesh.create` refuses an `at` that is not `[x, y]`.
 

From 1ce6431a99fb188e92d3992c45204a6f59125d2e Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:53:42 -0800
Subject: [PATCH 42/48] SVG import: raster images follow their EXIF or TIFF
 orientation

An <image> whose EXIF orientation or TIFF Orientation tag turns or flips
its pixels, linked or as a data URL, is turned before usvg reads it: the
pixels are stored as they are shown, the width and height swap, and the
box fits the turned image under preserveAspectRatio, as CSS
image-orientation: from-image describes. A turned CMYK JPEG or TIFF keeps
its inks as a CMYK TIFF, as does a CMYK TIFF that is not turned.

- Data URLs of type image/tiff, and untyped TIFF bytes, are read.
- TIFFs with extra channels, CCITT Group 3 TIFFs and planar CMYK TIFFs
  are read as Open and Place read them.
- Converted images decode within the decode allowance, and a TIFF that
  claims more strips or tiles than the decoder can count is refused
  before any decoder opens it.
- exif_orientation moves to vectorcraft-doc so Open/Place and SVG import
  share it.

Tests: crates/svg/tests/it/image_orientation.rs.
---
 crates/doc/src/cmyk.rs                   |  15 ++
 crates/engine/src/cmd/fileio/load.rs     |  16 +-
 crates/svg/src/import/files.rs           | 149 ++++++++++--
 crates/svg/src/import/importer.rs        |   6 +
 crates/svg/tests/it/image_orientation.rs | 278 +++++++++++++++++++++++
 crates/svg/tests/it/main.rs              |   1 +
 docs/target-app-parity.md                |   1 +
 7 files changed, 431 insertions(+), 35 deletions(-)
 create mode 100644 crates/svg/tests/it/image_orientation.rs

diff --git a/crates/doc/src/cmyk.rs b/crates/doc/src/cmyk.rs
index ea2c44215e..391fc39633 100644
--- a/crates/doc/src/cmyk.rs
+++ b/crates/doc/src/cmyk.rs
@@ -140,6 +140,21 @@ pub fn tiff_orientation(bytes: &[u8]) -> Option<u16> {
     d.find_tag_unsigned::<u16>(tiff::tags::Tag::Orientation).ok().flatten()
 }
 
+/// The EXIF orientation of encoded image `bytes` when it turns or flips the pixels; `None` when
+/// it leaves them as stored, or the image has none. A TIFF the image decoder can't open (one with
+/// extra samples) has its Orientation tag read from its first image ([`tiff_orientation`]). Reads
+/// only the image's header and metadata; `None` for an [`oversized_tiff`], which no decoder opens.
+pub fn exif_orientation(bytes: &[u8]) -> Option<image::metadata::Orientation> {
+    use image::ImageDecoder as _;
+    use image::metadata::Orientation;
+    if oversized_tiff(bytes).is_some() {
+        return None;
+    }
+    let decoded = || image::ImageReader::new(Cursor::new(bytes)).with_guessed_format().ok()?.into_decoder().ok()?.orientation().ok();
+    let tagged = || tiff_orientation(bytes).and_then(|v| Orientation::from_exif(u8::try_from(v).ok()?));
+    decoded().or_else(tagged).filter(|o| *o != Orientation::NoTransforms)
+}
+
 /// Does the TIFF `d` reads store one plane per channel (PlanarConfiguration 2)?
 fn planar(d: &mut tiff::decoder::Decoder<Cursor<&[u8]>>) -> bool {
     d.find_tag_unsigned::<u16>(tiff::tags::Tag::PlanarConfiguration).ok().flatten().is_some_and(|p| p != 1)
diff --git a/crates/engine/src/cmd/fileio/load.rs b/crates/engine/src/cmd/fileio/load.rs
index e9f6ecf3d4..4df490af13 100644
--- a/crates/engine/src/cmd/fileio/load.rs
+++ b/crates/engine/src/cmd/fileio/load.rs
@@ -868,7 +868,7 @@ pub(crate) fn size_note(bytes: &[u8]) -> Option<String> {
 /// A TIFF with more strips or tiles than the decoder can count
 /// ([`vectorcraft_doc::cmyk::oversized_tiff`]) is refused as too large to draw. JPEG XL images are
 /// read with [`jxlread`] and stored as PNG, with the ICC profile their colors are left in.
-/// A PNG, JPEG, GIF, WebP or TIFF whose orientation ([`exif_orientation`]) turns or flips it is
+/// A PNG, JPEG, GIF, WebP or TIFF whose orientation ([`vectorcraft_doc::cmyk::exif_orientation`]) turns or flips it is
 /// stored as it is shown, with its resolution's axes swapped when it turns a quarter; a CMYK JPEG
 /// or TIFF keeps its inks, 8 bits each, as a CMYK TIFF ([`vectorcraft_doc::cmyk::turned_cmyk`]).
 pub fn raster_image(bytes: &[u8]) -> Result<RasterImage> {
@@ -909,7 +909,7 @@ pub fn raster_image(bytes: &[u8]) -> Result<RasterImage> {
     let f = image_format(kind).ok_or_else(|| err(format!("{kind:?} images can't be opened (see document.formats)")))?;
     // A photo whose EXIF orientation turns or flips it (a camera held upright) is stored as it is
     // seen, so it places the way it was taken (#4284); the others keep their own bytes.
-    let orientation = matches!(f.id, "png" | "jpg" | "gif" | "webp" | "tiff").then(|| exif_orientation(bytes)).flatten();
+    let orientation = matches!(f.id, "png" | "jpg" | "gif" | "webp" | "tiff").then(|| vectorcraft_doc::cmyk::exif_orientation(bytes)).flatten();
     let turned = orientation.is_some();
     // The resolution describes the stored pixels; a quarter turn swaps its axes.
     let quarter = orientation.is_some_and(|o| o.to_exif() >= 5);
@@ -957,18 +957,6 @@ pub fn raster_image(bytes: &[u8]) -> Result<RasterImage> {
     as_png(img, None, shown_ppi)
 }
 
-/// The EXIF orientation of encoded image `bytes` when it turns or flips the pixels; `None` when
-/// it leaves them as stored, or the image has none. A TIFF the image decoder can't open (one with
-/// extra samples) has its Orientation tag read from its first image
-/// ([`vectorcraft_doc::cmyk::tiff_orientation`]).
-pub(crate) fn exif_orientation(bytes: &[u8]) -> Option<image::metadata::Orientation> {
-    use image::ImageDecoder as _;
-    use image::metadata::Orientation;
-    let decoded = || image::ImageReader::new(Cursor::new(bytes)).with_guessed_format().ok()?.into_decoder().ok()?.orientation().ok();
-    let tagged = || vectorcraft_doc::cmyk::tiff_orientation(bytes).and_then(|v| Orientation::from_exif(u8::try_from(v).ok()?));
-    decoded().or_else(tagged).filter(|o| *o != Orientation::NoTransforms)
-}
-
 /// `img` stored as a PNG that keeps the file's resolution and carries `icc`, the ICC profile its
 /// colors are in.
 pub(super) fn as_png(img: image::RgbaImage, icc: Option<Vec<u8>>, ppi: Option<(f64, f64)>) -> Result<RasterImage> {
diff --git a/crates/svg/src/import/files.rs b/crates/svg/src/import/files.rs
index 1a4c06f0e6..0472bc83e9 100644
--- a/crates/svg/src/import/files.rs
+++ b/crates/svg/src/import/files.rs
@@ -3,11 +3,15 @@
 //! stays a linked image ([`LinkInfo`]); an SVG file becomes vector art. One that can't be read
 //! (missing, remote, not an image) becomes a placeholder that keeps the link and its place, so it
 //! can be relinked, and a warning.
+//!
+//! A raster image, linked or a data URL, whose orientation (EXIF, or a TIFF's Orientation tag)
+//! turns or flips its pixels is turned before usvg gets it, so it is sized, fitted and stored as
+//! it is shown.
 
 use std::collections::HashMap;
 use std::path::Path;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicU64, AtomicUsize, Ordering};
+use std::sync::{Arc, Mutex};
 
 use usvg::{ImageHrefResolver, ImageKind, roxmltree};
 use vectorcraft_doc::LinkInfo;
@@ -44,6 +48,20 @@ pub(in crate::import) struct Files {
     svg_images: AtomicUsize,
     /// SVG images were left out for exceeding [`MAX_NESTED_SVG_IMAGES`].
     too_many_svg_images: AtomicBool,
+    /// The CMYK TIFF stored in place of a turned CMYK image, by the address of the PNG usvg got
+    /// (kept here too, so the address stays its own).
+    cmyk: Mutex<HashMap<usize, (Bytes, Bytes)>>,
+}
+
+/// Encoded image bytes, shared.
+type Bytes = Arc<Vec<u8>>;
+
+/// Raster bytes as usvg gets them.
+struct Shown {
+    kind: RasterKind,
+    bytes: Arc<Vec<u8>>,
+    /// The CMYK TIFF stored in their place: a turned CMYK image's inks, turned.
+    cmyk: Option<Vec<u8>>,
 }
 
 /// How usvg holds the bytes of a raster of one format (`ImageKind::PNG`…).
@@ -174,27 +192,37 @@ impl Files {
         files
     }
 
-    /// What usvg gets for a file read (`bytes`, linked by `link`): a raster usvg reads (others are
-    /// stored as PNG) or an SVG; `None` for anything else.
+    /// What usvg gets for a file read (`bytes`, linked by `link`): a raster as [`shown`] gives it
+    /// (formats usvg doesn't read are stored as PNG) or an SVG; `None` for anything else.
     fn source(&mut self, bytes: Vec<u8>, link: LinkInfo) -> Option<Source> {
         let Ok(format) = image::guess_format(&bytes) else {
             // Unpacked once, here, within what the SVGZ images may unpack to.
             let text = crate::text_within(&bytes, &self.unpacked).ok()?;
             return text.contains("<svg").then(|| Source::Svg(Arc::from(text.as_ref())));
         };
-        let Some(kind) = raster(format) else {
-            let img = image::load_from_memory_with_format(&bytes, format).ok()?;
-            let mut png = Vec::new();
-            img.write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png).ok()?;
-            let png = Arc::new(png);
-            self.links.insert(key(&png), Linked { link, missing: false });
-            return Some(Source::Raster(ImageKind::PNG, png));
-        };
-        let bytes = Arc::new(bytes);
+        let (kind, bytes) = self.keep(shown(Arc::new(bytes), format)?);
         self.links.insert(key(&bytes), Linked { link, missing: false });
         Some(Source::Raster(kind, bytes))
     }
 
+    /// What usvg gets for `shown`, with its CMYK TIFF, when it has one, noted to store in its
+    /// place ([`Files::stored`]).
+    fn keep(&self, shown: Shown) -> (RasterKind, Arc<Vec<u8>>) {
+        if let Some(cmyk) = shown.cmyk
+            && let Ok(mut stored) = self.cmyk.lock()
+        {
+            stored.insert(key(&shown.bytes), (shown.bytes.clone(), Arc::new(cmyk)));
+        }
+        (shown.kind, shown.bytes)
+    }
+
+    /// The CMYK TIFF stored in place of the image whose data usvg got as `kind`: a CMYK JPEG or
+    /// TIFF its orientation turns, which usvg got as PNG.
+    pub(in crate::import) fn stored(&self, kind: &ImageKind) -> Option<Arc<Vec<u8>>> {
+        let ImageKind::PNG(b) = kind else { return None };
+        self.cmyk.lock().ok()?.get(&key(b)).map(|(_, tiff)| tiff.clone())
+    }
+
     /// Does href `h` show a placeholder?
     fn placeholder(&self, h: &str) -> bool {
         matches!(self.sources.get(h), Some(Source::Raster(_, b)) if self.links.get(&key(b)).is_some_and(|l| l.missing))
@@ -241,21 +269,24 @@ impl Files {
     pub(in crate::import) fn resolver(&self, height: usize) -> ImageHrefResolver<'_> {
         self.depth.store(height, Ordering::Relaxed);
         ImageHrefResolver {
-            // By type as usvg reads them; one without a type (`text/plain`) by its bytes: a
-            // raster usvg reads, else SVG.
+            // By type as usvg reads them, and TIFF; one without a type (`text/plain`) by its
+            // bytes: one of those rasters, else SVG. A raster as [`shown`] gives it.
             resolve_data: Box::new(move |mime, bytes, opts| {
-                let kind = match mime {
-                    "image/jpg" | "image/jpeg" => ImageKind::JPEG,
-                    "image/png" => ImageKind::PNG,
-                    "image/gif" => ImageKind::GIF,
-                    "image/webp" => ImageKind::WEBP,
+                use image::ImageFormat as F;
+                let format = match mime {
+                    "image/jpg" | "image/jpeg" => F::Jpeg,
+                    "image/png" => F::Png,
+                    "image/gif" => F::Gif,
+                    "image/webp" => F::WebP,
+                    "image/tiff" => F::Tiff,
                     "image/svg+xml" => return self.svg_data(&bytes, opts),
-                    "text/plain" => match image::guess_format(&bytes).ok().and_then(raster) {
-                        Some(kind) => kind,
+                    "text/plain" => match image::guess_format(&bytes).ok().filter(|f| raster(*f).is_some() || *f == F::Tiff) {
+                        Some(format) => format,
                         None => return self.svg_data(&bytes, opts),
                     },
                     _ => return None,
                 };
+                let (kind, bytes) = self.keep(shown(bytes, format)?);
                 Some(kind(bytes))
             }),
             resolve_string: Box::new(move |h, opts| match self.sources.get(h).or_else(|| self.sources.get(h.trim()))? {
@@ -312,6 +343,82 @@ fn raster(format: image::ImageFormat) -> Option<RasterKind> {
     }
 }
 
+/// Encoded raster `bytes`, `format` by their type (or by their bytes when they have none), as usvg
+/// gets them, as Open and Place store them: unchanged when usvg reads the format and the image's
+/// orientation ([`vectorcraft_doc::cmyk::exif_orientation`], read for PNG, JPEG, GIF, WebP and
+/// TIFF) leaves the pixels as stored. Otherwise the pixels are read ([`decoded`],
+/// [`tiff_pixels`]), turned or flipped as the orientation says, and written as PNG, so usvg sizes
+/// and fits the image as it is shown. A CMYK TIFF also keeps its inks as a CMYK TIFF
+/// ([`vectorcraft_doc::cmyk::stored_cmyk_tiff`]), and a CMYK JPEG or TIFF that is turned keeps them
+/// turned ([`vectorcraft_doc::cmyk::turned_cmyk`]). `None` when the pixels can't be read, and for
+/// a TIFF with more strips or tiles than the decoder can count
+/// ([`vectorcraft_doc::cmyk::oversized_tiff`]), before any decoder opens it.
+fn shown(bytes: Arc<Vec<u8>>, format: image::ImageFormat) -> Option<Shown> {
+    use image::ImageFormat as F;
+    if vectorcraft_doc::cmyk::oversized_tiff(&bytes).is_some() {
+        return None;
+    }
+    let orientation =
+        matches!(format, F::Png | F::Jpeg | F::Gif | F::WebP | F::Tiff).then(|| vectorcraft_doc::cmyk::exif_orientation(&bytes)).flatten();
+    if let Some(kind) = raster(format)
+        && orientation.is_none()
+    {
+        return Some(Shown { kind, bytes, cmyk: None });
+    }
+    let tiff = image::guess_format(&bytes).ok() == Some(F::Tiff);
+    let mut img = if tiff { tiff_pixels(&bytes)? } else { decoded(&bytes, format)? };
+    let cmyk = match orientation {
+        Some(o) if matches!(format, F::Jpeg | F::Tiff) => vectorcraft_doc::cmyk::turned_cmyk(&bytes, o, None).map(|(tiff, _)| tiff),
+        None if tiff => vectorcraft_doc::cmyk::stored_cmyk_tiff(&bytes, None),
+        _ => None,
+    };
+    if let Some(orientation) = orientation {
+        img.apply_orientation(orientation);
+    }
+    let mut png = Vec::new();
+    img.write_to(&mut std::io::Cursor::new(&mut png), F::Png).ok()?;
+    Some(Shown { kind: ImageKind::PNG, bytes: Arc::new(png), cmyk })
+}
+
+/// The pixels of encoded image `bytes` (`format` when their bytes don't say), as stored, decoded
+/// within [`vectorcraft_doc::MAX_RASTER_ALLOC`], counted as decoded and as RGBA, as Open and Place
+/// decode them; `None` when they can't be.
+fn decoded(bytes: &[u8], format: image::ImageFormat) -> Option<image::DynamicImage> {
+    use image::ImageDecoder as _;
+    let max = vectorcraft_doc::MAX_RASTER_ALLOC;
+    let mut reader = image::ImageReader::new(std::io::Cursor::new(bytes)).with_guessed_format().ok()?;
+    if reader.format().is_none() {
+        reader.set_format(format);
+    }
+    let mut limits = image::Limits::default();
+    limits.max_alloc = Some(max);
+    reader.limits(limits);
+    let decoder = reader.into_decoder().ok()?;
+    let (w, h) = decoder.dimensions();
+    if decoder.total_bytes() > max || u64::from(w) * u64::from(h) * 4 > max {
+        return None;
+    }
+    image::DynamicImage::from_decoder(decoder).ok()
+}
+
+/// The pixels of TIFF `bytes`, as stored, read as Open and Place read them: a TIFF with extra
+/// samples (CMYK or gray with alpha) as RGBA, CMYK converted with the active color settings
+/// ([`vectorcraft_doc::cmyk::extra_samples_tiff_rgba`]); a 1-bit TIFF compressed with CCITT Group
+/// 3 as RGBA ([`vectorcraft_doc::cmyk::group3_tiff_rgba`]); others by [`decoded`], a CMYK TIFF
+/// that stores one plane per ink with its inks written together first
+/// ([`vectorcraft_doc::cmyk::stored_cmyk_tiff`]). `None` when they can't be read.
+fn tiff_pixels(bytes: &[u8]) -> Option<image::DynamicImage> {
+    use image::DynamicImage::ImageRgba8;
+    let cms = vectorcraft_color::cms::active();
+    if let Some(img) = vectorcraft_doc::cmyk::extra_samples_tiff_rgba(bytes, |c| cms.cmyk_to_srgb(c, false)) {
+        return Some(ImageRgba8(img));
+    }
+    if let Some(read) = vectorcraft_doc::cmyk::group3_tiff_rgba(bytes) {
+        return read.ok().map(ImageRgba8);
+    }
+    decoded(bytes, image::ImageFormat::Tiff).or_else(|| decoded(&vectorcraft_doc::cmyk::stored_cmyk_tiff(bytes, None)?, image::ImageFormat::Tiff))
+}
+
 /// No image: left out, noted in `why` when `noted`.
 fn leave_out(why: &AtomicBool, noted: bool) -> Option<ImageKind> {
     if noted {
diff --git a/crates/svg/src/import/importer.rs b/crates/svg/src/import/importer.rs
index 306a0c17d2..2eede1f7be 100644
--- a/crates/svg/src/import/importer.rs
+++ b/crates/svg/src/import/importer.rs
@@ -771,6 +771,12 @@ impl Importer {
             .ok()
             .and_then(|r| r.into_dimensions().ok())
             .unwrap_or((size.width().round().max(1.0) as u32, size.height().round().max(1.0) as u32));
+        // A turned CMYK image is stored as the CMYK TIFF of its inks, the size of the PNG usvg got.
+        let cmyk = self.files.stored(i.kind());
+        let (bytes, mime) = match &cmyk {
+            Some(tiff) => (tiff, "image/tiff"),
+            None => (bytes, mime),
+        };
         // A linked file keeps a preview; a placeholder is all a missing one has (its preview).
         let linked = self.files.linked(i.kind());
         let missing = linked.is_some_and(|l| l.missing);
diff --git a/crates/svg/tests/it/image_orientation.rs b/crates/svg/tests/it/image_orientation.rs
new file mode 100644
index 0000000000..fbf412a0bb
--- /dev/null
+++ b/crates/svg/tests/it/image_orientation.rs
@@ -0,0 +1,278 @@
+//! Raster images whose orientation (EXIF, or a TIFF's Orientation tag) turns their pixels import
+//! as they are shown, linked or as data URLs: the pixels turned, the width and height swapped, and
+//! the turned image fitted to the `<image>` box.
+
+use std::path::PathBuf;
+
+use vectorcraft_doc::{Document, ImageObject, LinkInfo, Node, NodeKind};
+use vectorcraft_geom::Rect;
+use vectorcraft_svg::{ImportOptions, base64_encode, import_with, import_with_report};
+
+fn svg(body: &str) -> String {
+    format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="200" height="120">{body}</svg>"#)
+}
+
+fn images(d: &Document) -> Vec<(&Node, &ImageObject)> {
+    let mut v = Vec::new();
+    d.walk(|n| {
+        if let NodeKind::Image(im) = &n.kind {
+            v.push((n, &**im));
+        }
+    });
+    v
+}
+
+/// The one image `body` imports to, with its warnings, its link read from `dir` when given.
+fn import_one(body: &str, dir: Option<&PathBuf>) -> (Document, ImageObject) {
+    let read = |path: &str| std::fs::read(path).ok().map(|b| (b, LinkInfo::new(path)));
+    let folder = dir.map(|d| d.to_string_lossy().into_owned());
+    let (d, w) = match &folder {
+        Some(f) => import_with(&svg(body), &ImportOptions { folder: Some(f), read: Some(&read) }).unwrap(),
+        None => import_with_report(&svg(body)).unwrap(),
+    };
+    assert!(w.is_empty(), "{w:?}");
+    let im = match &images(&d)[..] {
+        [(_, im)] => (*im).clone(),
+        other => panic!("{} images", other.len()),
+    };
+    (d, im)
+}
+
+/// A fresh folder for one test's files.
+fn folder(name: &str) -> PathBuf {
+    let dir = std::env::temp_dir().join(format!("vectorcraft-svg-orientation-{name}-{}", std::process::id()));
+    let _ = std::fs::remove_dir_all(&dir);
+    std::fs::create_dir_all(&dir).unwrap();
+    dir
+}
+
+/// A 16 × 8 JPEG, red on the left half, with an EXIF segment giving Orientation `orientation`
+/// when there is one.
+fn jpeg(orientation: Option<u16>) -> Vec<u8> {
+    let rgb = image::RgbImage::from_fn(16, 8, |x, _| if x < 8 { image::Rgb([220, 0, 0]) } else { image::Rgb([255, 255, 255]) });
+    let mut jpg = Vec::new();
+    image::DynamicImage::ImageRgb8(rgb).write_to(&mut std::io::Cursor::new(&mut jpg), image::ImageFormat::Jpeg).unwrap();
+    let Some(orientation) = orientation else { return jpg };
+    let o = orientation.to_le_bytes();
+    let exif: Vec<u8> =
+        [b"Exif\0\0".as_slice(), b"II", &[0x2a, 0, 8, 0, 0, 0], &[1, 0], &[0x12, 0x01, 3, 0, 1, 0, 0, 0, o[0], o[1], 0, 0], &[0, 0, 0, 0]].concat();
+    let mut tagged = jpg[..2].to_vec();
+    tagged.extend([0xff, 0xe1]);
+    tagged.extend(u16::try_from(exif.len() + 2).unwrap().to_be_bytes());
+    tagged.extend(&exif);
+    tagged.extend(&jpg[2..]);
+    tagged
+}
+
+/// A little-endian, uncompressed TIFF of `w` × `h` pixels of `samples` 8-bit samples each (1 for
+/// gray, 2 for gray with an unassociated alpha channel, 4 for CMYK inks), `data` row by row, with
+/// an Orientation tag (274) of `orientation`. Its RowsPerStrip (278) value is at byte [`ROWS_AT`]
+/// and its PlanarConfiguration (284, 1) value at [`PLANAR_AT`].
+fn tiff(w: u32, h: u32, samples: u16, data: &[u8], orientation: u16) -> Vec<u8> {
+    let entries: u32 = if samples == 2 { 12 } else { 11 };
+    let ifd_end = 8 + 2 + entries * 12 + 4;
+    let bits_at = ifd_end;
+    let data_at = bits_at + if samples > 2 { 2 * u32::from(samples) } else { 0 };
+    let entry = |tag: u16, kind: u16, count: u32, value: u32| {
+        [&tag.to_le_bytes()[..], &kind.to_le_bytes(), &count.to_le_bytes(), &value.to_le_bytes()].concat()
+    };
+    // Two SHORTs fit in the entry; more are written after the directory.
+    let bits = match samples {
+        1 => 8,
+        2 => 8 | 8 << 16,
+        _ => bits_at,
+    };
+    let photometric = if samples == 4 { 5 } else { 1 };
+    let mut out = [b"II".as_slice(), &[0x2a, 0], &8u32.to_le_bytes(), &u16::try_from(entries).unwrap().to_le_bytes()].concat();
+    // ExtraSamples (338): unassociated alpha.
+    let extra = (samples == 2).then(|| entry(338, 3, 1, 2));
+    for e in [
+        entry(256, 4, 1, w),
+        entry(257, 4, 1, h),
+        entry(258, 3, u32::from(samples), bits),
+        entry(259, 3, 1, 1),
+        entry(262, 3, 1, photometric),
+        entry(273, 4, 1, data_at),
+        entry(274, 3, 1, u32::from(orientation)),
+        entry(277, 3, 1, u32::from(samples)),
+        entry(278, 4, 1, h),
+        entry(279, 4, 1, u32::try_from(data.len()).unwrap()),
+        entry(284, 3, 1, 1),
+    ]
+    .into_iter()
+    .chain(extra)
+    {
+        out.extend(e);
+    }
+    out.extend(0u32.to_le_bytes());
+    if samples > 2 {
+        for _ in 0..samples {
+            out.extend(8u16.to_le_bytes());
+        }
+    }
+    assert_eq!(out.len(), data_at as usize);
+    out.extend(data);
+    out
+}
+
+/// Where [`tiff`] writes the RowsPerStrip value (the ninth entry) and the PlanarConfiguration value
+/// (the eleventh).
+const ROWS_AT: usize = 8 + 2 + 8 * 12 + 8;
+const PLANAR_AT: usize = 8 + 2 + 10 * 12 + 8;
+
+/// A 4 × 2 gray TIFF, black on the left half, turned a quarter clockwise by Orientation 6.
+fn gray_tiff() -> Vec<u8> {
+    tiff(4, 2, 1, &[0, 0, 255, 255, 0, 0, 255, 255], 6)
+}
+
+/// Where the image's own box goes on the page.
+fn placed(im: &ImageObject) -> Rect {
+    im.xf.transform_rect_bbox(Rect::new(0.0, 0.0, f64::from(im.width), f64::from(im.height)))
+}
+
+fn near(a: Rect, b: Rect) -> bool {
+    [(a.x0, b.x0), (a.y0, b.y0), (a.x1, b.x1), (a.y1, b.y1)].iter().all(|(p, q)| (p - q).abs() < 1e-6)
+}
+
+/// The stored pixels of `im`, as RGB.
+fn pixels(d: &Document, im: &ImageObject) -> image::RgbImage {
+    image::load_from_memory(&d.images[&im.key].bytes).unwrap().to_rgb8()
+}
+
+fn red(p: &image::Rgb<u8>) -> bool {
+    p[0] > 150 && p[1] < 80
+}
+
+/// A JPEG whose EXIF Orientation 6 turns it a quarter clockwise shows upright, linked and as a
+/// data URL alike: 8 × 16, the left half on top, fitted (centered) in a square box as the turned
+/// image is, and stored without an orientation that would turn it again.
+#[test]
+fn a_turned_jpeg_imports_upright() {
+    let jpg = jpeg(Some(6));
+    let dir = folder("jpeg");
+    std::fs::write(dir.join("photo.jpg"), &jpg).unwrap();
+    let data = format!("data:image/jpeg;base64,{}", base64_encode(&jpg));
+    let untyped = format!("data:;base64,{}", base64_encode(&jpg));
+    for href in ["photo.jpg", data.as_str(), untyped.as_str()] {
+        let (d, im) = import_one(&format!(r#"<image href="{href}" x="10" y="20" width="80" height="80"/>"#), Some(&dir));
+        let what = &href[..href.len().min(20)];
+        assert_eq!((im.width, im.height), (8, 16), "{what}: turned a quarter");
+        assert!(near(placed(&im), Rect::new(30.0, 20.0, 70.0, 100.0)), "{what}: fitted as turned: {:?}", placed(&im));
+        let px = pixels(&d, &im);
+        assert!(red(px.get_pixel(4, 3)) && !red(px.get_pixel(4, 12)), "{what}: the left half is on top");
+        assert_eq!(vectorcraft_doc::cmyk::exif_orientation(&d.images[&im.key].bytes), None, "{what}: not turned again");
+        assert_eq!(im.link.is_some(), href == "photo.jpg", "{what}");
+    }
+}
+
+/// With `preserveAspectRatio="none"` the turned image fills the box.
+#[test]
+fn a_turned_jpeg_stretches_to_the_box_as_turned() {
+    let data = format!("data:image/jpeg;base64,{}", base64_encode(&jpeg(Some(6))));
+    let (_, im) = import_one(&format!(r#"<image href="{data}" x="10" y="20" width="80" height="40" preserveAspectRatio="none"/>"#), None);
+    assert_eq!((im.width, im.height), (8, 16));
+    assert!(near(placed(&im), Rect::new(10.0, 20.0, 90.0, 60.0)), "{:?}", placed(&im));
+}
+
+/// A JPEG without an orientation, or with Orientation 1, keeps its own bytes.
+#[test]
+fn an_upright_jpeg_keeps_its_bytes() {
+    for jpg in [jpeg(None), jpeg(Some(1))] {
+        let data = format!("data:image/jpeg;base64,{}", base64_encode(&jpg));
+        let (d, im) = import_one(&format!(r#"<image href="{data}" width="80" height="80"/>"#), None);
+        assert_eq!((im.width, im.height), (16, 8));
+        assert_eq!(*d.images[&im.key].bytes, jpg);
+        assert_eq!(d.images[&im.key].mime, "image/jpeg");
+    }
+}
+
+/// A TIFF whose Orientation tag is 6 shows upright, linked, as an `image/tiff` data URL and as a
+/// data URL without a type.
+#[test]
+fn a_turned_tiff_imports_upright() {
+    let tif = gray_tiff();
+    let dir = folder("tiff");
+    std::fs::write(dir.join("scan.tif"), &tif).unwrap();
+    let data = format!("data:image/tiff;base64,{}", base64_encode(&tif));
+    let untyped = format!("data:;base64,{}", base64_encode(&tif));
+    for href in ["scan.tif", data.as_str(), untyped.as_str()] {
+        let (d, im) = import_one(&format!(r#"<image href="{href}" width="20" height="40"/>"#), Some(&dir));
+        let what = &href[..href.len().min(20)];
+        assert_eq!((im.width, im.height), (2, 4), "{what}: turned a quarter");
+        assert!(near(placed(&im), Rect::new(0.0, 0.0, 20.0, 40.0)), "{what}: {:?}", placed(&im));
+        let px = image::load_from_memory(&d.images[&im.key].bytes).unwrap().to_luma8();
+        assert_eq!((px.get_pixel(0, 0)[0], px.get_pixel(1, 1)[0], px.get_pixel(0, 3)[0]), (0, 0, 255), "{what}: the left half is on top");
+    }
+}
+
+/// A CMYK TIFF keeps its inks as a CMYK TIFF, turned when its orientation turns it.
+#[test]
+fn a_cmyk_tiff_keeps_its_inks_turned_or_not() {
+    let (c, none) = ([255u8, 0, 0, 0], [0u8; 4]);
+    let data: Vec<u8> = [c, c, none, none, c, c, none, none].concat();
+    for (orientation, (w, h), cyan_at, none_at) in [(1, (4usize, 2usize), (1, 1), (2, 0)), (6, (2, 4), (1, 1), (0, 2))] {
+        let tif = tiff(4, 2, 4, &data, orientation);
+        let href = format!("data:image/tiff;base64,{}", base64_encode(&tif));
+        let (d, im) = import_one(&format!(r#"<image href="{href}" width="20" height="40"/>"#), None);
+        let what = format!("orientation {orientation}");
+        assert_eq!((im.width as usize, im.height as usize), (w, h), "{what}");
+        let blob = &d.images[&im.key];
+        assert_eq!(blob.mime, "image/tiff", "{what}");
+        let inks = blob.cmyk().expect("CMYK inks");
+        assert_eq!((inks.width as usize, inks.height as usize), (w, h), "{what}");
+        let ink = |(x, y): (usize, usize)| &inks.data[(y * w + x) * 4..][..4];
+        assert_eq!((ink((0, 0)), ink(cyan_at), ink(none_at)), (&c[..], &c[..], &none[..]), "{what}: cyan on the left, or on top");
+    }
+}
+
+/// A gray TIFF with an alpha channel, which the image decoder can't read, imports as Open and
+/// Place read it, with its transparency: upright, and turned by Orientation 6.
+#[test]
+fn a_gray_tiff_with_alpha_imports_turned_or_not() {
+    let (black, clear) = ([0u8, 255], [255u8, 0]);
+    let data: Vec<u8> = [black, black, clear, clear, black, black, clear, clear].concat();
+    for (orientation, size, black_at, clear_at) in [(1, (4, 2), (0, 1), (3, 0)), (6, (2, 4), (1, 1), (0, 3))] {
+        let href = format!("data:image/tiff;base64,{}", base64_encode(&tiff(4, 2, 2, &data, orientation)));
+        let (d, im) = import_one(&format!(r#"<image href="{href}" width="20" height="40"/>"#), None);
+        assert_eq!((im.width, im.height), size, "orientation {orientation}");
+        let px = image::load_from_memory(&d.images[&im.key].bytes).unwrap().to_rgba8();
+        assert_eq!(px.get_pixel(black_at.0, black_at.1).0, [0, 0, 0, 255], "orientation {orientation}: black");
+        assert_eq!(px.get_pixel(clear_at.0, clear_at.1)[3], 0, "orientation {orientation}: clear");
+    }
+}
+
+/// A turned TIFF whose header claims more strips than the decoder can count (2^31 + 1 rows a
+/// strip each, times 5 planes) is refused without a panic: linked, it is a placeholder with a
+/// warning; as a data URL, it is left out.
+#[test]
+fn a_tiff_with_more_strips_than_can_be_counted_is_refused() {
+    let mut tif = tiff(3, 1 << 31 | 1, 5, &[0; 30], 6);
+    tif[ROWS_AT..ROWS_AT + 4].copy_from_slice(&1u32.to_le_bytes());
+    tif[PLANAR_AT..PLANAR_AT + 2].copy_from_slice(&2u16.to_le_bytes());
+    assert_eq!(vectorcraft_doc::cmyk::oversized_tiff(&tif), Some((3, 1 << 31 | 1)));
+    let dir = folder("oversized");
+    std::fs::write(dir.join("huge.tif"), &tif).unwrap();
+    let read = |path: &str| std::fs::read(path).ok().map(|b| (b, LinkInfo::new(path)));
+    let f = dir.to_string_lossy();
+    let (d, w) =
+        import_with(&svg(r#"<image href="huge.tif" width="20" height="40"/>"#), &ImportOptions { folder: Some(&f), read: Some(&read) }).unwrap();
+    assert!(w.iter().any(|w| w.contains("huge.tif") && w.contains("is not an image VectorCraft reads")), "{w:?}");
+    let [(_, im)] = images(&d)[..] else { panic!("{} images", images(&d).len()) };
+    assert!(d.images[&im.key].is_proxy(), "a placeholder");
+    let data = format!("data:image/tiff;base64,{}", base64_encode(&tif));
+    let (d, _) = import_with_report(&svg(&format!(r#"<image href="{data}" width="20" height="40"/>"#))).unwrap();
+    assert!(images(&d).is_empty());
+}
+
+/// A turned JPEG inside an SVG shown as an image is turned too.
+#[test]
+fn a_turned_jpeg_in_an_svg_image_imports_upright() {
+    let jpg = format!("data:image/jpeg;base64,{}", base64_encode(&jpeg(Some(6))));
+    let inner = format!(r#"<svg xmlns="http://www.w3.org/2000/svg" width="80" height="80"><image href="{jpg}" width="80" height="80"/></svg>"#);
+    let nested = format!("data:image/svg+xml;base64,{}", base64_encode(inner.as_bytes()));
+    let (d, im) = import_one(&format!(r#"<image href="{nested}" width="80" height="80"/>"#), None);
+    assert_eq!((im.width, im.height), (8, 16));
+    assert!(near(placed(&im), Rect::new(20.0, 0.0, 60.0, 80.0)), "{:?}", placed(&im));
+    let px = pixels(&d, &im);
+    assert!(red(px.get_pixel(4, 3)) && !red(px.get_pixel(4, 12)));
+}
diff --git a/crates/svg/tests/it/main.rs b/crates/svg/tests/it/main.rs
index b241f2e75b..05546891f4 100644
--- a/crates/svg/tests/it/main.rs
+++ b/crates/svg/tests/it/main.rs
@@ -20,6 +20,7 @@ mod font_weights;
 mod foreign_attributes;
 mod gradients;
 mod ids;
+mod image_orientation;
 mod import_details;
 mod import_live;
 mod import_text;
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..67a9b05567 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1640,6 +1640,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - On the desktop, Paste from a menu or shortcut captures another app's bitmap or reads a copied image file on the UI thread, then decodes the image on the file-reading worker. The status bar shows "Pasting" until the image is pasted. Windows device-independent bitmaps and Linux clipboard images are encoded as PNG on that worker. A Copy or Cut made while the image is read keeps its internal clipboard. `edit.paste*` over MCP and scripts reads the bitmap at once.
   - The pixels of a PNG, JPEG, GIF or WebP file that Place decodes to check them are kept in the image store the renderers share, so the canvas's first frame with the placed image draws them without decoding the file again on the UI thread: File › Place, a file dropped on the canvas, a click or drag of the place cursor, `file.place`, and Paste of such an image. A CMYK JPEG is still decoded when it is first drawn (`crates/ui-egui/src/placing.rs`, `crates/render/src/tests.rs`).
   - A photo whose EXIF orientation turns or flips it (a camera held upright or upside down) is placed and opened upright, as it was taken; the image is stored as it is seen (#4284). A quarter turn swaps the resolution's axes, so the image keeps its physical size. TIFFs read without the image decoder (grayscale with extra channels, CCITT Group 3, CMYK with one plane per ink) follow their Orientation tag too, and a turned CMYK JPEG or TIFF keeps its inks, 8 bits each, as a CMYK TIFF.
+  - SVG import shows a raster `<image>` whose EXIF orientation or TIFF Orientation tag turns or flips it upright, linked or as a data URL, and inside an SVG shown as an image: the pixels are stored turned, the width and height swap, and the `<image>` box fits the turned image under `preserveAspectRatio`, as CSS `image-orientation: from-image` describes (<https://www.w3.org/TR/css-images-3/#the-image-orientation>). A turned CMYK JPEG or TIFF keeps its inks as a CMYK TIFF, as does a CMYK TIFF that is not turned. TIFF data URLs (`image/tiff`, or untyped TIFF bytes) are read, and TIFFs with an alpha or other extra channel, CCITT Group 3 TIFFs and CMYK TIFFs stored one plane per ink are read as Open and Place read them. The pixels are decoded within the decode allowance, and a TIFF claiming more strips or tiles than the decoder can count is refused before it is decoded (`crates/svg/tests/it/image_orientation.rs`).
   - File › Place and a file dropped on the canvas refuse a PNG, JPEG, GIF or WebP file whose pixels can't be read, such as one cut short by a download or a sync still running, and the status bar shows "Couldn't place <name>: the image's pixels can't be read". Paste and Relink refuse such an image too, and Update Links, or Open when it reads the file again, counts it as missing. A JPEG cut short still places when its pixels can be decoded (`file.place`, `crates/engine/src/tests_place.rs`).
   - On the desktop, Copy and Cut make the system clipboard's formats (text, SVG, PDF, PNG) from a copy of the clipboard on the thread that writes background saves and exports, and write them when they are ready; while that thread has a save, an export, a print or a recovery copy to finish, they are made and written at once. Until they are written, Paste in VectorCraft takes the internal clipboard, and while a text field or the Type tool has the keyboard the app waits for them. Another Copy or Cut, or a copy of text in VectorCraft, drops them.
   - On the desktop with Enable Background Export on (Preferences › File Handling), File › Package… collects the linked files and fonts and writes the package from the document as it was at OK on the thread that writes background saves and exports, with "Packaging" in the status bar and the busy spinner until it is written; a save of unsaved changes that Package starts is written first. `file.package` over MCP and scripts replies as before.

From b1c684e912686c4ef34db8595378ea202f42014d Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:24:53 -0800
Subject: [PATCH 43/48] Scripts: E4X operations count their temporary storage
 against the heap limit

Assigning to a named child counts its list of the matching children, and
assigning through an empty XMLList counts the chain of targets it climbs,
before either changes the tree. copy(), toXMLString(), normalize(), the
`..` selector and the depth check on insertion hold the stack they keep
for each open level of the tree. Inserting an XMLList, and assigning one
to an item of an XMLList, hold their copy of the list's items.

copy() reads attributes in place, and toXMLString() reads attributes and
namespace declarations in place, instead of copying the lists. copy()
charges the declarations it copies before it copies them. Deleting by
name or assigning an attribute compacts the remaining links in place
instead of building a second list.

toXMLString() holds the set of prefixes a namespace lookup passes, and
picks a new nsN prefix in one pass over the declarations in scope
instead of rescanning them for each candidate.

The parser holds its open elements and their names, the text it gathers,
each tag's attribute values, the sets that check declarations and
attribute names, and its one copy of an element's namespaces, and it
charges the strings of the namespace declarations it makes. The
allowance it holds from the source's length covers the copy a value
takes as it becomes a string.

Comparing XML values, converting them to strings, assigning an XMLList
to an attribute, and reading a name, a qualifier, a namespace URI or
embedded text from a string built by joining strings flatten it with
flat_charged. An attribute name read from a string reserves its copy,
and an element name shares the string.

Docs: docs/target-app-parity.md.
---
 crates/js/src/xml.rs       | 471 ++++++++++++++++++++++++-------------
 crates/js/src/xml_tests.rs | 245 +++++++++++++++++++
 docs/target-app-parity.md  |   1 +
 3 files changed, 549 insertions(+), 168 deletions(-)

diff --git a/crates/js/src/xml.rs b/crates/js/src/xml.rs
index 8d83162a50..f49c94eb46 100644
--- a/crates/js/src/xml.rs
+++ b/crates/js/src/xml.rs
@@ -7,6 +7,7 @@
 //! each new node, name, reference or output unit is charged to the heap before it is made.
 
 use std::collections::{HashMap, HashSet};
+use std::hash::Hash;
 use std::rc::Rc;
 
 use crate::LimitKind;
@@ -18,7 +19,7 @@ use crate::heap::{
     XmlListData, XmlName, XmlNode, XmlNs, key, string_bytes,
 };
 use crate::interp::{Abrupt, ErrorType, HeldBytes, Interp, JsResult};
-use crate::string_builtins::{UNITS_PER_FUEL, flat_charged};
+use crate::string_builtins::{UNITS_PER_FUEL, flat_charged, push_held, reserve_units};
 use crate::value::{Str, Value, index_key};
 
 fn parser_units(s: &str) -> Vec<u16> {
@@ -295,26 +296,40 @@ fn name_bytes(n: &XmlName) -> usize {
     string_bytes(n.local.len()) + n.uri.as_ref().map_or(0, |u| string_bytes(u.len())) + n.prefix.as_ref().map_or(0, |p| string_bytes(p.len()))
 }
 
-/// The namespace `stack` declares for `uri`, nearest first, skipping prefixes redeclared nearer.
-/// `prefer` picks that prefix when several match; `need_prefix` rejects the default namespace.
-fn ns_lookup(stack: &[XmlNs], uri: &Key, prefer: Option<&Key>, need_prefix: bool) -> Option<XmlNs> {
-    let mut seen: HashSet<&[u16]> = HashSet::new();
-    let mut best = None;
-    for ns in stack.iter().rev() {
-        let Some(p) = &ns.prefix else { continue };
-        if !seen.insert(p) {
-            continue;
-        }
-        if ns.uri == *uri && !(need_prefix && p.is_empty()) {
-            if prefer == Some(p) {
-                return Some(ns.clone());
-            }
-            if best.is_none() {
-                best = Some(ns.clone());
-            }
-        }
+/// Inserts `item` into `set`, first holding an upper estimate of the bytes of the set's new table
+/// when it must grow. Returns whether `item` was new.
+fn insert_held<T: Eq + Hash>(interp: &mut Interp, held: &mut HeldBytes, set: &mut HashSet<T>, item: T) -> JsResult<bool> {
+    if set.len() == set.capacity() && !set.contains(&item) {
+        let more = set.capacity().max(4);
+        held.add(interp, more.saturating_mul(size_of::<T>() + 1).saturating_mul(16) / 7)?;
+        set.reserve(more);
     }
-    best
+    Ok(set.insert(item))
+}
+
+/// Makes room in `list` for `more` items, first holding the bytes of its new capacity when it must
+/// grow. The capacity at least doubles, as a push's would.
+fn reserve_held<T>(interp: &mut Interp, held: &mut HeldBytes, list: &mut Vec<T>, more: usize) -> JsResult<()> {
+    if list.capacity() - list.len() < more {
+        let cap = list.len().saturating_add(more).max(list.capacity().saturating_mul(2));
+        held.add(interp, (cap - list.capacity()).saturating_mul(size_of::<T>()))?;
+        list.reserve_exact(cap - list.len());
+    }
+    Ok(())
+}
+
+/// The number `n` of a prefix written `ns<n>` in decimal without leading zeros, as
+/// [`Interp::fresh_prefix`] makes them.
+fn prefix_number(prefix: &[u16]) -> Option<usize> {
+    let digits = prefix.strip_prefix(&[u16::from(b'n'), u16::from(b's')])?;
+    let (&first, _) = digits.split_first()?;
+    if digits.len() > 9 || (first == u16::from(b'0') && digits.len() > 1) {
+        return None;
+    }
+    digits.iter().try_fold(0usize, |n, &c| {
+        let d = c.checked_sub(u16::from(b'0')).filter(|d| *d < 10)?;
+        Some(n * 10 + usize::from(d))
+    })
 }
 
 fn prefix_in_scope<'a>(stack: &'a [XmlNs], prefix: &[u16]) -> Option<&'a XmlNs> {
@@ -345,18 +360,6 @@ fn units_are(units: &[u16], text: &str) -> bool {
     units.iter().copied().eq(text.encode_utf16())
 }
 
-/// A prefix no entry of `stack` uses.
-fn fresh_prefix(stack: &[XmlNs]) -> Key {
-    let mut n = 0u32;
-    loop {
-        let candidate = key(&format!("ns{n}"));
-        if prefix_in_scope(stack, &candidate).is_none() {
-            return candidate;
-        }
-        n += 1;
-    }
-}
-
 /// One open element while serializing.
 struct OutFrame {
     node: ObjId,
@@ -579,13 +582,16 @@ impl Interp {
 
     // ---- names ----
 
-    fn name_from_string(&mut self, s: &[u16]) -> JsResult<NameRef> {
+    /// The name `s` gives: an attribute name after `@`, which is copied after its units are
+    /// reserved, and otherwise an element name that shares `s`.
+    fn name_from_string(&mut self, s: &Key) -> JsResult<NameRef> {
         if let Some((&0x40, rest)) = s.split_first() {
             let uri = if rest == STAR { None } else { Some(Rc::from(Vec::new())) };
+            reserve_units(self, rest.len())?;
             return Ok(NameRef { uri, local: Rc::from(rest), attribute: true });
         }
-        let uri = if s == STAR { None } else { Some(self.xml_default_uri()?) };
-        Ok(NameRef { uri, local: Rc::from(s), attribute: false })
+        let uri = if **s == *STAR { None } else { Some(self.xml_default_uri()?) };
+        Ok(NameRef { uri, local: s.clone(), attribute: false })
     }
 
     /// ToXMLName, with a canonical array index read as a position (ECMA-357 section 10.6).
@@ -593,7 +599,7 @@ impl Interp {
         match k {
             Value::Number(n) if *n >= 0.0 && n.fract() == 0.0 && *n < 4_294_967_295.0 => Ok(Access::Index(*n as u32)),
             Value::String(s) => {
-                let flat = s.flat();
+                let flat = flat_charged(self, s)?;
                 if let Some(i) = canonical_index(&flat) {
                     return Ok(Access::Index(i));
                 }
@@ -603,7 +609,8 @@ impl Interp {
                 if let Some(Class::QName { name, attribute, .. }) = self.heap.object(*o).map(|ob| &ob.class) {
                     return Ok(Access::Name(NameRef { uri: name.uri.clone(), local: name.local.clone(), attribute: *attribute }));
                 }
-                let s = self.to_str(k)?.flat();
+                let s = self.to_str(k)?;
+                let s = flat_charged(self, &s)?;
                 if let Some(i) = canonical_index(&s) {
                     return Ok(Access::Index(i));
                 }
@@ -787,31 +794,33 @@ impl Interp {
         if n.attribute {
             let count = self.xml_node(x)?.attrs.len();
             self.xml_take_fuel(count)?;
-            let attrs = std::mem::take(&mut self.xml_node_mut(x)?.attrs);
-            let mut kept = Vec::with_capacity(attrs.len());
-            for a in attrs {
+            let mut kept = 0;
+            for k in 0..count {
+                let Some(a) = self.xml_node(x)?.attrs.get(k).copied() else { break };
                 let hit = self.xml_node(a)?.name.as_ref().is_some_and(|q| n.matches(q));
                 if hit {
                     self.xml_node_mut(a)?.parent = None;
                 } else {
-                    kept.push(a);
+                    self.xml_node_mut(x)?.attrs.swap(kept, k);
+                    kept += 1;
                 }
             }
-            self.xml_node_mut(x)?.attrs = kept;
+            self.xml_node_mut(x)?.attrs.truncate(kept);
             return Ok(());
         }
         let count = self.children_len(x)?;
         self.xml_take_fuel(count)?;
-        let children = std::mem::take(&mut self.xml_node_mut(x)?.children);
-        let mut kept = Vec::with_capacity(children.len());
-        for c in children {
+        let mut kept = 0;
+        for k in 0..count {
+            let Some(c) = self.child_at(x, k)? else { break };
             if n.matches_child(self.xml_node(c)?) {
                 self.xml_node_mut(c)?.parent = None;
             } else {
-                kept.push(c);
+                self.xml_node_mut(x)?.children.swap(kept, k);
+                kept += 1;
             }
         }
-        self.xml_node_mut(x)?.children = kept;
+        self.xml_node_mut(x)?.children.truncate(kept);
         Ok(())
     }
 
@@ -939,7 +948,7 @@ impl Interp {
             self.use_fuel()?;
             cur = self.xml_node(a)?.parent;
         }
-        let height = self.node_height(v)?;
+        let height = self.rooted(&[Value::Object(x), Value::Object(v)], |i| i.node_height(v))?;
         if depth.saturating_add(height) > self.options.max_depth {
             return Err(Abrupt::Limit(LimitKind::Heap));
         }
@@ -971,7 +980,9 @@ impl Interp {
 
     /// The levels of the tree at `root`, counting it.
     fn node_height(&mut self, root: ObjId) -> JsResult<usize> {
-        let mut stack = vec![(root, 0usize)];
+        let mut held = HeldBytes::new(self);
+        let mut stack = Vec::new();
+        push_held(self, &mut held, &mut stack, (root, 0usize))?;
         let mut height = 1;
         while let Some(&(node, next)) = stack.last() {
             self.use_fuel()?;
@@ -980,7 +991,7 @@ impl Interp {
                     if let Some(top) = stack.last_mut() {
                         top.1 += 1;
                     }
-                    stack.push((c, 0));
+                    push_held(self, &mut held, &mut stack, (c, 0))?;
                     height = height.max(stack.len());
                 }
                 None => {
@@ -1049,19 +1060,22 @@ impl Interp {
     }
 
     /// Takes the fuel and heap to put every item of `l` under `x` and returns the nodes to place,
-    /// from [`Self::child_for_item`]. The tree does not change here, so a limit leaves it as it
-    /// was.
-    fn reserve_list_insert(&mut self, x: ObjId, l: ObjId) -> JsResult<Vec<ObjId>> {
+    /// from [`Self::child_for_item`], with the hold on the list of them, which the caller keeps
+    /// until they are placed. The tree does not change here, so a limit leaves it as it was.
+    fn reserve_list_insert(&mut self, x: ObjId, l: ObjId) -> JsResult<(Vec<ObjId>, HeldBytes)> {
+        let count = self.list_len(l)?;
+        let roots = [Value::Object(x), Value::Object(l)];
+        let mut held = HeldBytes::new(self);
+        self.rooted(&roots, |i| held.add(i, size_of::<ObjId>().saturating_mul(count)))?;
         let mut items = self.xml_list(l)?.items.clone();
         let bytes = XML_REF_BYTES.saturating_mul(items.len());
-        let roots = [Value::Object(x), Value::Object(l)];
         self.rooted(&roots, |i| i.xml_charge(bytes))?;
         let len = self.children_len(x)?;
         for (j, item) in items.iter_mut().enumerate() {
             *item = self.child_for_item(*item, &roots)?;
             self.place_fuel(len + j, *item)?;
         }
-        Ok(items)
+        Ok((items, held))
     }
 
     /// Puts `items` at `at` in order, after [`Self::reserve_list_insert`].
@@ -1100,7 +1114,7 @@ impl Interp {
                 self.insert_node(x, at, *v)?;
             }
             Content::List(l) => {
-                let items = self.reserve_list_insert(x, *l)?;
+                let (items, _held) = self.reserve_list_insert(x, *l)?;
                 self.place_children(x, at, &items)?;
             }
         }
@@ -1152,7 +1166,7 @@ impl Interp {
             }
             Content::List(l) => {
                 self.check_attach(x, c)?;
-                let items = self.reserve_list_insert(x, *l)?;
+                let (items, _held) = self.reserve_list_insert(x, *l)?;
                 let len = self.children_len(x)?;
                 self.xml_text_fuel(len)?;
                 if at < len {
@@ -1229,7 +1243,8 @@ impl Interp {
                     s.push_units(self, &[SPACE])?;
                 }
                 let Some(item) = self.list_at(*l, i)? else { break };
-                let text = self.node_to_str(item)?.flat();
+                let text = self.node_to_str(item)?;
+                let text = flat_charged(self, &text)?;
                 s.push_units(self, &text)?;
             }
             let Value::String(s) = s.finish(self) else { return Err(Abrupt::Internal("not a string".into())) };
@@ -1240,9 +1255,9 @@ impl Interp {
         let mut found = None;
         let count = self.xml_node(x)?.attrs.len();
         self.xml_take_fuel(count)?;
-        let attrs = std::mem::take(&mut self.xml_node_mut(x)?.attrs);
-        let mut kept = Vec::with_capacity(attrs.len());
-        for a in attrs {
+        let mut kept = 0;
+        for k in 0..count {
+            let Some(a) = self.xml_node(x)?.attrs.get(k).copied() else { break };
             let hit = self.xml_node(a)?.name.as_ref().is_some_and(|q| n.matches(q));
             if hit && found.is_some() {
                 self.xml_node_mut(a)?.parent = None;
@@ -1250,10 +1265,11 @@ impl Interp {
                 if hit {
                     found = Some(a);
                 }
-                kept.push(a);
+                self.xml_node_mut(x)?.attrs.swap(kept, k);
+                kept += 1;
             }
         }
-        self.xml_node_mut(x)?.attrs = kept;
+        self.xml_node_mut(x)?.attrs.truncate(kept);
         if let Some(a) = found {
             self.xml_node_mut(a)?.value = value;
             return Ok(());
@@ -1280,11 +1296,13 @@ impl Interp {
         }
         let len = self.children_len(x)?;
         self.xml_take_fuel(len)?;
+        self.xml_keep(x);
+        let mut held = HeldBytes::new(self);
         let mut matches = Vec::new();
         for k in 0..len {
             let Some(child) = self.child_at(x, k)? else { break };
             if n.matches_child(self.xml_node(child)?) {
-                matches.push(child);
+                push_held(self, &mut held, &mut matches, child)?;
             }
         }
         match c {
@@ -1378,6 +1396,8 @@ impl Interp {
 
     /// The steps of [`Self::resolve_value`], setting `created` to the first element they add.
     fn resolve_value_adding(&mut self, x: ObjId, created: &mut Option<ObjId>) -> JsResult<Option<ObjId>> {
+        self.xml_keep(x);
+        let mut held = HeldBytes::new(self);
         let mut chain = Vec::new();
         let mut cur = x;
         let base = loop {
@@ -1391,7 +1411,7 @@ impl Interp {
             if *name.local == *STAR {
                 return Ok(None);
             }
-            chain.push(l);
+            push_held(self, &mut held, &mut chain, l)?;
             cur = target;
         };
         let mut base = base;
@@ -1615,6 +1635,9 @@ impl Interp {
                     Some(parent) => self.index_in_parent(parent, item)?.map(|q| (parent, q)),
                     None => None,
                 };
+                let count = self.list_len(c)?;
+                let mut held = HeldBytes::new(self);
+                self.rooted(&[Value::Object(x), Value::Object(c)], |i| held.add(i, size_of::<ObjId>().saturating_mul(count)))?;
                 let mut items = self.xml_list(c)?.items.clone();
                 if place.is_some() {
                     let roots = [Value::Object(x), Value::Object(c)];
@@ -1682,6 +1705,8 @@ impl Interp {
     // ---- copies ----
 
     fn copy_shallow(&mut self, src: ObjId, parent: Option<ObjId>) -> JsResult<ObjId> {
+        let declared = self.xml_node(src)?.ns.len();
+        self.xml_charge(XML_NS_BYTES.saturating_mul(declared))?;
         let node = self.xml_node(src)?;
         let copy = XmlNode {
             kind: node.kind,
@@ -1692,11 +1717,11 @@ impl Interp {
             children: Vec::new(),
             ns: node.ns.clone(),
         };
-        let attrs = node.attrs.clone();
-        self.xml_charge(XML_NS_BYTES.saturating_mul(copy.ns.len()))?;
         let c = self.new_xml_node(copy)?;
         self.xml_keep(c);
-        for a in attrs {
+        let mut k = 0;
+        while let Some(a) = self.xml_node(src)?.attrs.get(k).copied() {
+            k += 1;
             self.use_fuel()?;
             let n = self.xml_node(a)?;
             let attr = XmlNode {
@@ -1721,7 +1746,9 @@ impl Interp {
             let top = i.copy_shallow(root, None)?;
             i.xml_keep(top);
             let mark = i.temp_roots.len();
-            let mut stack = vec![(root, top, 0usize)];
+            let mut held = HeldBytes::new(i);
+            let mut stack = Vec::new();
+            push_held(i, &mut held, &mut stack, (root, top, 0usize))?;
             while let Some(&(src, dst, next)) = stack.last() {
                 i.use_fuel()?;
                 i.temp_roots.truncate(mark);
@@ -1733,7 +1760,7 @@ impl Interp {
                         let c = i.copy_shallow(child, Some(dst))?;
                         i.xml_charge_link(c)?;
                         i.xml_node_mut(dst)?.children.push(c);
-                        stack.push((child, c, 0));
+                        push_held(i, &mut held, &mut stack, (child, c, 0))?;
                     }
                     None => {
                         stack.pop();
@@ -1778,9 +1805,18 @@ impl Interp {
 
     // ---- comparison ----
 
+    /// The namespace, local name and value of the attribute `id`, flattening a value that is a
+    /// rope with [`flat_charged`].
+    fn attr_key(&mut self, id: ObjId) -> JsResult<(Option<Key>, Key, Key)> {
+        let n = self.xml_node(id)?;
+        let name = n.name.as_ref().ok_or_else(|| Abrupt::Internal("attribute without a name".into()))?;
+        let (uri, local, value) = (name.uri.clone(), name.local.clone(), n.value.clone());
+        Ok((uri, local, flat_charged(self, &value)?))
+    }
+
     fn same_shallow(&mut self, a: ObjId, b: ObjId) -> JsResult<bool> {
         let (x, y) = (self.xml_node(a)?, self.xml_node(b)?);
-        if x.kind != y.kind || x.attrs.len() != y.attrs.len() || x.children.len() != y.children.len() || x.value.flat() != y.value.flat() {
+        if x.kind != y.kind || x.attrs.len() != y.attrs.len() || x.children.len() != y.children.len() || x.value.len() != y.value.len() {
             return Ok(false);
         }
         match (&x.name, &y.name) {
@@ -1788,26 +1824,25 @@ impl Interp {
             (Some(p), Some(q)) if p.local == q.local && p.uri == q.uri => {}
             _ => return Ok(false),
         }
-        if x.attrs.is_empty() {
+        let (xv, yv) = (x.value.clone(), y.value.clone());
+        if flat_charged(self, &xv)? != flat_charged(self, &yv)? {
+            return Ok(false);
+        }
+        let count = self.xml_node(a)?.attrs.len();
+        if count == 0 {
             return Ok(true);
         }
-        let count = x.attrs.len();
         self.xml_take_fuel(count)?;
         let mut held = HeldBytes::new(self);
         held.add(self, ATTR_COUNT_BYTES.saturating_mul(count))?;
-        let (x, y) = (self.xml_node(a)?, self.xml_node(b)?);
-        let (xa, ya) = (x.attrs.clone(), y.attrs.clone());
         let mut counts: HashMap<(Option<Key>, Key, Key), usize> = HashMap::new();
-        let attr_key = |i: &Self, id: ObjId| -> JsResult<(Option<Key>, Key, Key)> {
-            let n = i.xml_node(id)?;
-            let name = n.name.as_ref().ok_or_else(|| Abrupt::Internal("attribute without a name".into()))?;
-            Ok((name.uri.clone(), name.local.clone(), n.value.flat()))
-        };
-        for a in xa {
-            *counts.entry(attr_key(self, a)?).or_default() += 1;
+        for k in 0..count {
+            let Some(id) = self.xml_node(a)?.attrs.get(k).copied() else { break };
+            *counts.entry(self.attr_key(id)?).or_default() += 1;
         }
-        for b in ya {
-            match counts.get_mut(&attr_key(self, b)?) {
+        for k in 0..count {
+            let Some(id) = self.xml_node(b)?.attrs.get(k).copied() else { break };
+            match counts.get_mut(&self.attr_key(id)?) {
                 Some(n) if *n > 0 => *n -= 1,
                 _ => return Ok(false),
             }
@@ -1884,7 +1919,8 @@ impl Interp {
             let (xk, yk) = (self.xml_kind(x)?, self.xml_kind(y)?);
             let textual = |k| matches!(k, XmlKind::Text | XmlKind::Attribute);
             if (textual(xk) && self.node_simple(y)?) || (textual(yk) && self.node_simple(x)?) {
-                return Ok(Some(self.node_to_str(x)?.flat() == self.node_to_str(y)?.flat()));
+                let (s, other) = (self.node_to_str(x)?, self.node_to_str(y)?);
+                return Ok(Some(flat_charged(self, &s)? == flat_charged(self, &other)?));
             }
             return self.node_equals(x, y).map(Some);
         }
@@ -1900,9 +1936,9 @@ impl Interp {
             if let Xv::Node(n) = self.classify(x)
                 && self.node_simple(n)?
             {
-                let s = self.node_to_str(n)?.flat();
-                let other = self.to_str(y)?.flat();
-                return Ok(Some(s == other));
+                let s = self.node_to_str(n)?;
+                let other = self.to_str(y)?;
+                return Ok(Some(flat_charged(self, &s)? == flat_charged(self, &other)?));
             }
         }
         Ok(None)
@@ -1951,7 +1987,9 @@ impl Interp {
 
     /// The nodes under `x` matching `n`, in document order ([[Descendants]], section 9.1.1.8).
     pub(crate) fn node_descendants(&mut self, x: ObjId, n: &NameRef, out: ObjId) -> JsResult<()> {
-        let mut stack = vec![(x, 0usize)];
+        let mut held = HeldBytes::new(self);
+        let mut stack = Vec::new();
+        push_held(self, &mut held, &mut stack, (x, 0usize))?;
         if n.attribute {
             self.collect_matching(x, n, out)?;
         }
@@ -1969,14 +2007,16 @@ impl Interp {
             } else if n.matches_child(self.xml_node(child)?) {
                 self.list_push(out, child)?;
             }
-            stack.push((child, 0));
+            push_held(self, &mut held, &mut stack, (child, 0))?;
         }
         Ok(())
     }
 
     /// Merges adjacent text and removes empty text under `root` (ECMA-357 section 13.4.4.26).
     pub(crate) fn node_normalize(&mut self, root: ObjId) -> JsResult<()> {
-        let mut stack = vec![(root, 0usize)];
+        let mut held = HeldBytes::new(self);
+        let mut stack = Vec::new();
+        push_held(self, &mut held, &mut stack, (root, 0usize))?;
         while let Some(&(x, mut i)) = stack.last() {
             self.use_fuel()?;
             let Some(child) = self.child_at(x, i)? else {
@@ -2010,7 +2050,7 @@ impl Interp {
                 frame.1 = i + 1;
             }
             if kind == XmlKind::Element {
-                stack.push((child, 0));
+                push_held(self, &mut held, &mut stack, (child, 0))?;
             }
         }
         Ok(())
@@ -2032,7 +2072,8 @@ impl Interp {
             let Some(c) = self.child_at(x, i)? else { break };
             let node = self.xml_node(c)?;
             if !matches!(node.kind, XmlKind::Comment | XmlKind::Pi) {
-                let text = node.value.flat();
+                let text = node.value.clone();
+                let text = flat_charged(self, &text)?;
                 out.push_units(self, &text)?;
             }
         }
@@ -2069,7 +2110,8 @@ impl Interp {
             self.use_fuel()?;
             let Some(item) = self.list_at(l, i)? else { break };
             if !matches!(self.xml_kind(item)?, XmlKind::Comment | XmlKind::Pi) {
-                let text = self.node_to_str(item)?.flat();
+                let text = self.node_to_str(item)?;
+                let text = flat_charged(self, &text)?;
                 out.push_units(self, &text)?;
             }
         }
@@ -2107,6 +2149,46 @@ impl Interp {
         out.push_units(self, text.get(from..).unwrap_or_default())
     }
 
+    /// The namespace `stack` declares for `uri`, nearest first, skipping prefixes redeclared nearer.
+    /// `prefer` picks that prefix when several match; `need_prefix` rejects the default namespace.
+    /// The set of prefixes it has passed is held against the heap limit.
+    fn ns_lookup(&mut self, stack: &[XmlNs], uri: &Key, prefer: Option<&Key>, need_prefix: bool) -> JsResult<Option<XmlNs>> {
+        let mut held = HeldBytes::new(self);
+        let mut seen: HashSet<&[u16]> = HashSet::new();
+        let mut best = None;
+        for ns in stack.iter().rev() {
+            let Some(p) = &ns.prefix else { continue };
+            if !insert_held(self, &mut held, &mut seen, &p[..])? {
+                continue;
+            }
+            if ns.uri == *uri && !(need_prefix && p.is_empty()) {
+                if prefer == Some(p) {
+                    return Ok(Some(ns.clone()));
+                }
+                if best.is_none() {
+                    best = Some(ns.clone());
+                }
+            }
+        }
+        Ok(best)
+    }
+
+    /// The first of `ns0`, `ns1`, ... that no entry of `stack` uses. One of the first
+    /// `stack.len() + 1` is free, so one pass over `stack` marks the used ones.
+    fn fresh_prefix(&mut self, stack: &[XmlNs]) -> JsResult<Key> {
+        self.xml_take_fuel(stack.len() + 1)?;
+        let mut held = HeldBytes::new(self);
+        held.add(self, stack.len() + 1)?;
+        let mut used = vec![false; stack.len() + 1];
+        for ns in stack {
+            if let Some(slot) = ns.prefix.as_deref().and_then(prefix_number).and_then(|n| used.get_mut(n)) {
+                *slot = true;
+            }
+        }
+        let n = used.iter().position(|u| !u).unwrap_or(stack.len());
+        Ok(key(&format!("ns{n}")))
+    }
+
     /// Picks the prefix of a name in `scope`, adding a declaration to `scope` when none is there.
     fn out_prefix(&mut self, name: &XmlName, scope: &mut Vec<XmlNs>, attribute: bool) -> JsResult<Key> {
         self.xml_take_fuel(scope.len() + 1)?;
@@ -2122,13 +2204,13 @@ impl Interp {
         if *uri == *key(XML_URI) {
             return Ok(key("xml"));
         }
-        if let Some(ns) = ns_lookup(scope, &uri, name.prefix.as_ref(), attribute) {
+        if let Some(ns) = self.ns_lookup(scope, &uri, name.prefix.as_ref(), attribute)? {
             return Ok(ns.prefix.unwrap_or(empty));
         }
         let prefix = match &name.prefix {
             Some(p) if !(attribute && p.is_empty()) && prefix_in_scope(scope, p).is_none() => p.clone(),
             _ if !attribute && prefix_in_scope(scope, &empty).is_none() => empty,
-            _ => fresh_prefix(scope),
+            _ => self.fresh_prefix(scope)?,
         };
         self.xml_charge(XML_NS_BYTES)?;
         scope.push(XmlNs { prefix: Some(prefix.clone()), uri });
@@ -2143,8 +2225,7 @@ impl Interp {
         out.push_units(self, local)
     }
 
-    /// Writes `x`; an element with children is left open on `stack`.
-    #[allow(clippy::too_many_arguments)]
+    /// Writes `x`, and returns the frame of an element with children, which is left open.
     fn write_enter(
         &mut self,
         out: &mut Builder,
@@ -2153,11 +2234,11 @@ impl Interp {
         settings: &Settings,
         pretty: bool,
         scope: &mut Vec<XmlNs>,
-        stack: &mut Vec<OutFrame>,
-    ) -> JsResult<()> {
+    ) -> JsResult<Option<OutFrame>> {
         self.use_fuel()?;
         let node = self.xml_node(x)?;
-        let (kind, value) = (node.kind, node.value.flat());
+        let (kind, value) = (node.kind, node.value.clone());
+        let value = flat_charged(self, &value)?;
         self.xml_text_fuel(value.len())?;
         if pretty {
             out.push_repeated(self, &[SPACE], indent)?;
@@ -2165,13 +2246,18 @@ impl Interp {
         match kind {
             XmlKind::Text => {
                 let trimmed: &[u16] = if pretty { trim_xml_space(&value) } else { &value };
-                return self.write_escaped(out, trimmed, false);
+                self.write_escaped(out, trimmed, false)?;
+                return Ok(None);
+            }
+            XmlKind::Attribute => {
+                self.write_escaped(out, &value, true)?;
+                return Ok(None);
             }
-            XmlKind::Attribute => return self.write_escaped(out, &value, true),
             XmlKind::Comment => {
                 out.push_str(self, "<!--")?;
                 out.push_units(self, &value)?;
-                return out.push_str(self, "-->");
+                out.push_str(self, "-->")?;
+                return Ok(None);
             }
             XmlKind::Pi => {
                 let target = self.xml_node(x)?.name.as_ref().map(|n| n.local.clone()).unwrap_or_else(|| Rc::from(Vec::new()));
@@ -2179,47 +2265,46 @@ impl Interp {
                 out.push_units(self, &target)?;
                 out.push_units(self, &[SPACE])?;
                 out.push_units(self, &value)?;
-                return out.push_str(self, "?>");
+                out.push_str(self, "?>")?;
+                return Ok(None);
             }
             XmlKind::Element => {}
         }
         let ns_mark = scope.len();
         let node = self.xml_node(x)?;
-        let declared = node.ns.clone();
-        let attrs = node.attrs.clone();
+        let declared = node.ns.len();
         let name = node.name.clone().ok_or_else(|| Abrupt::Internal("element without a name".into()))?;
-        self.xml_take_fuel(declared.len().saturating_mul(scope.len() + 1))?;
-        let mut unnamed = Vec::new();
-        for ns in declared {
-            if ns.prefix.is_none() {
-                unnamed.push(ns);
-            } else if !scope.iter().any(|a| a.uri == ns.uri && a.prefix == ns.prefix) {
-                self.xml_charge(XML_NS_BYTES)?;
-                scope.push(ns);
-            }
-        }
-        for ns in unnamed {
-            if !scope.iter().any(|a| a.uri == ns.uri) {
-                let prefix = fresh_prefix(scope);
-                self.xml_charge(XML_NS_BYTES)?;
-                scope.push(XmlNs { prefix: Some(prefix), uri: ns.uri });
+        self.xml_take_fuel(declared.saturating_mul(scope.len() + 1))?;
+        for unnamed in [false, true] {
+            let mut k = 0;
+            while let Some(ns) = self.xml_node(x)?.ns.get(k).cloned() {
+                k += 1;
+                if ns.prefix.is_none() != unnamed {
+                    continue;
+                }
+                if !unnamed && !scope.iter().any(|a| a.uri == ns.uri && a.prefix == ns.prefix) {
+                    self.xml_charge(XML_NS_BYTES)?;
+                    scope.push(ns);
+                } else if unnamed && !scope.iter().any(|a| a.uri == ns.uri) {
+                    let prefix = self.fresh_prefix(scope)?;
+                    self.xml_charge(XML_NS_BYTES)?;
+                    scope.push(XmlNs { prefix: Some(prefix), uri: ns.uri });
+                }
             }
         }
         let prefix = self.out_prefix(&name, scope, false)?;
-        let mut attr_prefixes = Vec::new();
-        for &a in &attrs {
-            self.use_fuel()?;
-            let an = self.xml_node(a)?.name.clone().ok_or_else(|| Abrupt::Internal("attribute without a name".into()))?;
-            attr_prefixes.push(self.out_prefix(&an, scope, true)?);
-        }
         out.push_units(self, &[LT])?;
         self.write_name(out, &prefix, &name.local)?;
-        for (&a, attr_prefix) in attrs.iter().zip(&attr_prefixes) {
-            let an = self.xml_node(a)?;
-            let local = an.name.as_ref().map(|q| q.local.clone()).unwrap_or_else(|| Rc::from(Vec::new()));
-            let value = an.value.flat();
+        let mut k = 0;
+        while let Some(a) = self.xml_node(x)?.attrs.get(k).copied() {
+            k += 1;
+            self.use_fuel()?;
+            let an = self.xml_node(a)?.name.clone().ok_or_else(|| Abrupt::Internal("attribute without a name".into()))?;
+            let attr_prefix = self.out_prefix(&an, scope, true)?;
+            let value = self.xml_node(a)?.value.clone();
+            let value = flat_charged(self, &value)?;
             out.push_units(self, &[SPACE])?;
-            self.write_name(out, attr_prefix, &local)?;
+            self.write_name(out, &attr_prefix, &an.local)?;
             out.push_units(self, &[EQ, DQUOTE])?;
             self.write_escaped(out, &value, true)?;
             out.push_units(self, &[DQUOTE])?;
@@ -2239,7 +2324,8 @@ impl Interp {
         let count = self.children_len(x)?;
         if count == 0 {
             scope.truncate(ns_mark);
-            return out.push_str(self, "/>");
+            out.push_str(self, "/>")?;
+            return Ok(None);
         }
         out.push_units(self, &[GT])?;
         let first_is_text = match self.child_at(x, 0)? {
@@ -2248,14 +2334,17 @@ impl Interp {
         };
         let pretty_children = pretty && (count > 1 || !first_is_text);
         let child_indent = if pretty_children { indent.saturating_add(u64::from(settings.indent)) } else { 0 };
-        stack.push(OutFrame { node: x, next: 0, indent, child_indent, pretty_children, ns_mark, prefix, local: name.local });
-        Ok(())
+        Ok(Some(OutFrame { node: x, next: 0, indent, child_indent, pretty_children, ns_mark, prefix, local: name.local }))
     }
 
+    /// Writes the tree at `root`. Its open elements are held against the heap limit.
     fn write_node(&mut self, out: &mut Builder, root: ObjId, indent: u64, settings: &Settings, pretty: bool) -> JsResult<()> {
         let mut scope: Vec<XmlNs> = Vec::new();
+        let mut held = HeldBytes::new(self);
         let mut stack: Vec<OutFrame> = Vec::new();
-        self.write_enter(out, root, indent, settings, pretty, &mut scope, &mut stack)?;
+        if let Some(frame) = self.write_enter(out, root, indent, settings, pretty, &mut scope)? {
+            push_held(self, &mut held, &mut stack, frame)?;
+        }
         while let Some(frame) = stack.last_mut() {
             let (node, next, child_indent, pretty_children) = (frame.node, frame.next, frame.child_indent, frame.pretty_children);
             frame.next += 1;
@@ -2264,7 +2353,9 @@ impl Interp {
                     if pretty_children {
                         out.push_units(self, &[LF])?;
                     }
-                    self.write_enter(out, child, child_indent, settings, pretty && pretty_children, &mut scope, &mut stack)?;
+                    if let Some(frame) = self.write_enter(out, child, child_indent, settings, pretty && pretty_children, &mut scope)? {
+                        push_held(self, &mut held, &mut stack, frame)?;
+                    }
                 }
                 None => {
                     let Some(frame) = stack.pop() else { break };
@@ -2311,8 +2402,11 @@ impl Interp {
         self.throw(ErrorType::Syntax, message)
     }
 
-    fn decode_into(&mut self, src: &[u16], from: usize, to: usize, out: &mut Vec<u16>, attribute: bool) -> JsResult<()> {
+    /// Decodes `src[from..to]` onto `out`, holding the room it takes in `out` with `held` first. The
+    /// decoded text is never longer than the source.
+    fn decode_into(&mut self, src: &[u16], from: usize, to: usize, out: &mut Vec<u16>, attribute: bool, held: &mut HeldBytes) -> JsResult<()> {
         self.xml_text_fuel(to.saturating_sub(from))?;
+        reserve_held(self, held, out, to.saturating_sub(from))?;
         let mut pos = from;
         while pos < to {
             let Some(&c) = src.get(pos) else { break };
@@ -2427,7 +2521,16 @@ impl Interp {
         Ok(())
     }
 
-    fn flush_text(&mut self, text: &mut Vec<u16>, ignore_whitespace: bool, open: &[ObjId], roots: &mut Vec<ObjId>) -> JsResult<()> {
+    /// Makes a text node of `text`, unless it is empty or ignored white space. Taking the buffer
+    /// releases `text_held`, its hold.
+    fn flush_text(
+        &mut self,
+        text: &mut Vec<u16>,
+        text_held: &mut HeldBytes,
+        ignore_whitespace: bool,
+        open: &[ObjId],
+        roots: &mut Vec<ObjId>,
+    ) -> JsResult<()> {
         if text.is_empty() {
             return Ok(());
         }
@@ -2435,16 +2538,22 @@ impl Interp {
             text.clear();
             return Ok(());
         }
-        let t = self.new_text_node(Str::from_units(std::mem::take(text)), None)?;
+        let value = Str::from_units(std::mem::take(text));
+        *text_held = HeldBytes::new(self);
+        let t = self.new_text_node(value, None)?;
         self.place_parsed(t, open, roots)
     }
 
+    /// Parses the open tag at `src[pos]` and returns the offset after it. An element left open is
+    /// pushed onto `open` and its name onto `names`, both held with `stack_held`. The attributes,
+    /// sets and copies it works with are held until it returns.
     fn parse_open_tag(
         &mut self,
         src: &[u16],
         pos: usize,
         open: &mut Vec<ObjId>,
         names: &mut Vec<(usize, usize)>,
+        stack_held: &mut HeldBytes,
         roots: &mut Vec<ObjId>,
     ) -> JsResult<usize> {
         if open.len() >= self.options.max_depth {
@@ -2455,6 +2564,7 @@ impl Interp {
         let raw_name = src.get(name_start..name_end).unwrap_or_default();
         let (elem_prefix, elem_local) = self.split_name(raw_name)?;
         let mut at = name_end;
+        let mut held = HeldBytes::new(self);
         let mut raw_attrs: Vec<(usize, usize, Vec<u16>)> = Vec::new();
         let closes = loop {
             let before = at;
@@ -2492,27 +2602,31 @@ impl Interp {
                         return Err(self.syntax("'<' cannot appear in an attribute value"));
                     }
                     let mut value = Vec::new();
-                    self.decode_into(src, value_start, value_end, &mut value, true)?;
-                    raw_attrs.push((at, end, value));
+                    self.decode_into(src, value_start, value_end, &mut value, true, &mut held)?;
+                    push_held(self, &mut held, &mut raw_attrs, (at, end, value))?;
                     at = value_end + 1;
                 }
             }
         };
         self.xml_charge(XML_NS_BYTES.saturating_mul(raw_attrs.len()))?;
-        let mut ns: Vec<XmlNs> = Vec::new();
-        let mut seen_decl: HashSet<Vec<u16>> = HashSet::new();
+        let xmlns = key("xmlns");
+        let declares = |raw: &[u16]| raw == &xmlns[..] || raw.strip_prefix(&xmlns[..]).is_some_and(|rest| rest.first() == Some(&COLON));
+        let decls = raw_attrs.iter().filter(|(start, end, _)| declares(src.get(*start..*end).unwrap_or_default())).count();
+        let mut ns: Vec<XmlNs> = Vec::with_capacity(decls);
+        let mut seen_decl: HashSet<&[u16]> = HashSet::new();
         for (start, end, value) in &raw_attrs {
             let raw = src.get(*start..*end).unwrap_or_default();
-            if raw == key("xmlns").as_ref() {
+            if raw == &xmlns[..] {
                 if !ns_binding_allowed(&[], value) {
                     return Err(self.syntax(RESERVED_NS_BINDING));
                 }
-                if !seen_decl.insert(Vec::new()) {
+                if !insert_held(self, &mut held, &mut seen_decl, &[] as &[u16])? {
                     return Err(self.syntax("a namespace is declared twice"));
                 }
+                self.xml_charge(string_bytes(0).saturating_add(string_bytes(value.len())))?;
                 ns.push(XmlNs { prefix: Some(Rc::from(Vec::new())), uri: Rc::from(value.as_slice()) });
             } else if let (Some(p), local) = self.split_name(raw)?
-                && p == key("xmlns").as_ref()
+                && p == &xmlns[..]
             {
                 if value.is_empty() {
                     return Err(self.syntax("a namespace prefix cannot be declared with an empty URI"));
@@ -2520,9 +2634,10 @@ impl Interp {
                 if !ns_binding_allowed(local, value) {
                     return Err(self.syntax(RESERVED_NS_BINDING));
                 }
-                if !seen_decl.insert(local.to_vec()) {
+                if !insert_held(self, &mut held, &mut seen_decl, local)? {
                     return Err(self.syntax("a namespace is declared twice"));
                 }
+                self.xml_charge(string_bytes(local.len()).saturating_add(string_bytes(value.len())))?;
                 ns.push(XmlNs { prefix: Some(Rc::from(local)), uri: Rc::from(value.as_slice()) });
             }
         }
@@ -2547,7 +2662,8 @@ impl Interp {
             ns,
         })?;
         self.place_parsed(element, open, roots)?;
-        let mut unique: HashSet<(Key, Vec<u16>)> = HashSet::new();
+        let mut unique: HashSet<(Key, &[u16])> = HashSet::new();
+        let mut own: Option<Vec<XmlNs>> = None;
         for (start, end, value) in raw_attrs {
             self.use_fuel()?;
             let raw = src.get(start..end).unwrap_or_default();
@@ -2557,15 +2673,19 @@ impl Interp {
             }
             let (auri, stored_prefix): (Key, Key) = match prefix {
                 Some(p) => {
-                    let own = self.xml_node(element)?.ns.clone();
-                    match self.resolve_prefix(p, &own, open)? {
+                    if own.is_none() {
+                        let count = self.xml_node(element)?.ns.len();
+                        held.add(self, size_of::<XmlNs>().saturating_mul(count))?;
+                        own = Some(self.xml_node(element)?.ns.clone());
+                    }
+                    match self.resolve_prefix(p, own.as_deref().unwrap_or_default(), open)? {
                         Some(u) => (u, Rc::from(p)),
                         None => return Err(self.syntax("an XML name uses an undeclared namespace prefix")),
                     }
                 }
                 None => (Rc::from(Vec::new()), Rc::from(Vec::new())),
             };
-            if !unique.insert((auri.clone(), local.to_vec())) {
+            if !insert_held(self, &mut held, &mut unique, (auri.clone(), local))? {
                 return Err(self.type_error("an XML element has two attributes with the same name"));
             }
             let a = self.new_xml_node(XmlNode {
@@ -2581,8 +2701,8 @@ impl Interp {
             self.xml_node_mut(element)?.attrs.push(a);
         }
         if !closes {
-            open.push(element);
-            names.push((name_start, name_end));
+            push_held(self, stack_held, open, element)?;
+            push_held(self, stack_held, names, (name_start, name_end))?;
         }
         Ok(at)
     }
@@ -2605,10 +2725,14 @@ impl Interp {
     }
 
     /// Parses XML text into nodes, kept reachable through the temporary roots until the caller's
-    /// scope ends.
+    /// scope ends. The open elements and their names, the text being gathered and each tag's
+    /// attributes are held as they grow. The allowance held from the source's length covers the
+    /// copy a value's units take as it becomes a string, before the node that holds it is charged.
     pub(crate) fn xml_parse(&mut self, source: &[u16]) -> JsResult<Vec<ObjId>> {
         let mut held = HeldBytes::new(self);
         held.add(self, string_bytes(source.len()).saturating_mul(2))?;
+        let mut stack_held = HeldBytes::new(self);
+        let mut text_held = HeldBytes::new(self);
         let settings = self.xml_settings()?;
         let mut src = source;
         let offset_start = skip_xml_space(src, 0);
@@ -2638,7 +2762,7 @@ impl Interp {
                     self.xml_text_fuel(end - pos)?;
                     return Err(self.syntax("']]>' cannot appear in XML text"));
                 }
-                self.decode_into(src, pos, end, &mut text, false)?;
+                self.decode_into(src, pos, end, &mut text, false, &mut text_held)?;
                 pos = end;
                 continue;
             }
@@ -2650,11 +2774,13 @@ impl Interp {
                 };
                 self.xml_text_fuel(end - pos)?;
                 self.check_units(src, pos + 9, end)?;
-                text.extend_from_slice(src.get(pos + 9..end).unwrap_or_default());
+                let section = src.get(pos + 9..end).unwrap_or_default();
+                reserve_held(self, &mut text_held, &mut text, section.len())?;
+                text.extend_from_slice(section);
                 pos = end + 3;
                 continue;
             }
-            self.flush_text(&mut text, settings.ignore_whitespace, &open, &mut roots)?;
+            self.flush_text(&mut text, &mut text_held, settings.ignore_whitespace, &open, &mut roots)?;
             if rest.starts_with(&parser_units("<!--")) {
                 let Some(end) = Self::find_from(src, pos + 4, &parser_units("--")) else {
                     self.xml_text_fuel(src.len() - pos)?;
@@ -2666,7 +2792,7 @@ impl Interp {
                 }
                 self.check_units(src, pos + 4, end)?;
                 if !settings.ignore_comments {
-                    let value = Str::from_units(src.get(pos + 4..end).unwrap_or_default().to_vec());
+                    let value = Str::from_rc(Rc::from(src.get(pos + 4..end).unwrap_or_default()));
                     let n = self.new_xml_node(XmlNode {
                         kind: XmlKind::Comment,
                         name: None,
@@ -2698,7 +2824,7 @@ impl Interp {
                     while from < end && src.get(from).copied().is_some_and(is_xml_space) {
                         from += 1;
                     }
-                    let value = Str::from_units(src.get(from..end).unwrap_or_default().to_vec());
+                    let value = Str::from_rc(Rc::from(src.get(from..end).unwrap_or_default()));
                     let name = XmlName { uri: Some(Rc::from(Vec::new())), local: Rc::from(target), prefix: None };
                     let n = self.new_xml_node(XmlNode {
                         kind: XmlKind::Pi,
@@ -2715,13 +2841,13 @@ impl Interp {
             } else if rest.get(1) == Some(&SLASH) {
                 pos = self.parse_close_tag(src, pos, &mut open, &mut names)?;
             } else {
-                pos = self.parse_open_tag(src, pos, &mut open, &mut names, &mut roots)?;
+                pos = self.parse_open_tag(src, pos, &mut open, &mut names, &mut stack_held, &mut roots)?;
             }
         }
         if !open.is_empty() {
             return Err(self.syntax("an XML element is not closed"));
         }
-        self.flush_text(&mut text, settings.ignore_whitespace, &open, &mut roots)?;
+        self.flush_text(&mut text, &mut text_held, settings.ignore_whitespace, &open, &mut roots)?;
         Ok(roots)
     }
 
@@ -2752,7 +2878,8 @@ impl Interp {
                 (name.uri.clone(), name.local.clone())
             }
             v => {
-                let local = self.to_str(v)?.flat();
+                let local = self.to_str(v)?;
+                let local = flat_charged(self, &local)?;
                 let uri = if *local == *STAR {
                     None
                 } else if attribute {
@@ -2770,9 +2897,15 @@ impl Interp {
                 Value::Object(o) => match self.heap.object(*o).map(|ob| &ob.class) {
                     Some(Class::Namespace(ns)) => Some(ns.uri.clone()),
                     Some(Class::QName { name, .. }) => name.uri.clone(),
-                    _ => Some(self.to_str(&q)?.flat()),
+                    _ => {
+                        let s = self.to_str(&q)?;
+                        Some(flat_charged(self, &s)?)
+                    }
                 },
-                _ => Some(self.to_str(&q)?.flat()),
+                _ => {
+                    let s = self.to_str(&q)?;
+                    Some(flat_charged(self, &s)?)
+                }
             };
         }
         let id = self.new_reference_name(XmlName { uri, local, prefix: None }, attribute)?;
@@ -2816,7 +2949,8 @@ impl Interp {
         let result = match kind {
             0 if self.is_xml(&v) => self.xml_string_of(&v, Some(false))?,
             0 | 1 => {
-                let text = self.to_str(&v)?.flat();
+                let text = self.to_str(&v)?;
+                let text = flat_charged(self, &text)?;
                 let mut out = Builder::new();
                 self.write_escaped(&mut out, &text, kind == 1)?;
                 let Value::String(s) = out.finish(self) else { return Err(Abrupt::Internal("not a string".into())) };
@@ -2991,7 +3125,8 @@ impl Interp {
                 _ => {}
             }
         }
-        Ok(self.to_str(v)?.flat())
+        let s = self.to_str(v)?;
+        flat_charged(self, &s)
     }
 
     pub(crate) fn op_set_default_namespace(&mut self) -> JsResult<()> {
diff --git a/crates/js/src/xml_tests.rs b/crates/js/src/xml_tests.rs
index f9f66c8c26..b23aafaf42 100644
--- a/crates/js/src/xml_tests.rs
+++ b/crates/js/src/xml_tests.rs
@@ -1185,6 +1185,251 @@ fn a_limit_during_normalize_does_not_repeat_text() {
     assert!(fuel_stops(setup, "x.normalize()", check) > 0);
 }
 
+/// A realm whose trees may be 100,000 levels deep, with `squeeze`, after `setup` ran with no limit.
+fn deep_realm(setup: &str) -> Realm {
+    let mut r = Realm::with_options(Options { max_depth: 100_000, ..e4x() }, Limits::default());
+    let interp = r.interp();
+    let global = interp.global;
+    assert!(crate::builtins::method(interp, global, "squeeze", squeeze, 1).is_ok());
+    r.run(setup).unwrap();
+    r
+}
+
+/// How `action` ends after `setup` in a [`deep_realm`], asserting that `check` is true after it
+/// with the limits lifted.
+fn squeezed(setup: &str, action: &str, check: &str) -> Result<JsValue, RunErrorKind> {
+    let mut r = deep_realm(setup);
+    let got = r.run(action).map_err(|e| e.kind);
+    r.set_limits(Limits::default());
+    assert_eq!(r.run(check), Ok(JsValue::Bool(true)), "{action}: {got:?}");
+    got
+}
+
+/// The least spare heap, found by bisection, at which `action` ends without the heap limit after
+/// `setup` in a [`deep_realm`].
+fn least_room(setup: &str, action: &str) -> usize {
+    let ends = |spare: usize| match deep_realm(setup).run(&format!("squeeze({spare}); {action}")) {
+        Ok(_) => true,
+        Err(e) if e.kind == RunErrorKind::Limit(LimitKind::Heap) => false,
+        Err(e) => panic!("{action}: {e:?}"),
+    };
+    let (mut lo, mut hi) = (0usize, 1usize << 22);
+    assert!(ends(hi), "{action}");
+    while lo < hi {
+        let mid = lo + (hi - lo) / 2;
+        if ends(mid) {
+            hi = mid;
+        } else {
+            lo = mid + 1;
+        }
+    }
+    lo
+}
+
+/// Scripts that make `x`, an `r` element over 2,000 elements named `d`, nested in the first and
+/// side by side, named `wide_name`, in the second. Both also make `t`, an empty element, and turn
+/// pretty printing off.
+fn deep_and_wide(wide_name: &str) -> (String, String) {
+    let common = "XML.prettyPrinting = false; var t = <t/>; var s = '';";
+    let deep = format!(
+        "{common} for (var i = 0; i < 2000; i++) s += '<d>'; for (var i = 0; i < 2000; i++) s += '</d>'; var x = new XML('<r>' + s + '</r>');"
+    );
+    let wide = format!("{common} for (var i = 0; i < 2000; i++) s += '<{wide_name}/>'; var x = new XML('<r>' + s + '</r>');");
+    (deep, wide)
+}
+
+#[test]
+fn tree_walks_hold_their_stacks_against_the_heap_limit() {
+    // A walk keeps a frame for each open level, so the deep tree needs room for 2,000 frames that
+    // the wide tree, with as many nodes and the same markup length, does not.
+    let mut wrong = Vec::new();
+    for (action, wide_name, frame) in [
+        ("x.copy(); 1", "d", 8),
+        ("x..z.length()", "d", 8),
+        ("x.normalize(); 1", "d", 8),
+        ("t.appendChild(x); 1", "d", 8),
+        ("x.toXMLString().length", "dddd", 32),
+    ] {
+        let (deep, wide) = deep_and_wide(wide_name);
+        let (d, w) = (least_room(&deep, action), least_room(&wide, action));
+        if d < w + 2000 * frame {
+            wrong.push(format!("{action}: deep {d}, wide {w}"));
+        }
+    }
+    assert!(wrong.is_empty(), "{wrong:#?}");
+    let (deep, _) = deep_and_wide("d");
+    let same = "var y = x.copy(); var a = x, b = y, n = 0; while (a.d.length()) { a = a.d[0]; b = b.d[0]; n++; if (b.parent().d[0] !== b) break; } \
+                n === 2000 && y.parent() === null && y == x && y.toXMLString() === x.toXMLString()";
+    assert_eq!(squeezed(&deep, same, "true"), Ok(JsValue::Bool(true)));
+}
+
+#[test]
+fn assignments_hold_the_matches_and_targets_they_collect() {
+    let heap = Err(RunErrorKind::Limit(LimitKind::Heap));
+    let wide = "var x = <r/>; for (var i = 0; i < 4000; i++) x.appendChild(<b/>);";
+    let kept = "x.*.length() === 4000 && x.b[3999].parent() === x";
+    assert_eq!(squeezed(wide, "squeeze(4096); x.b = 'v'; 1", kept), heap);
+    let first = "var old = x.b[0]; x.b = 'v'; x.*.length() === 1 && x.b[0] === old && x.b == 'v'";
+    assert_eq!(squeezed(wide, first, "x.b[0].parent() === x"), Ok(JsValue::Bool(true)));
+    // `l` is an empty list 4,000 `.b` steps below `x.a`, which holds two elements, so the
+    // assignment adds nothing.
+    let chain = "var x = <r><a/><a/></r>; var l = x.a; for (var i = 0; i < 4000; i++) l = l.b;";
+    let same = "x.*.length() === 2 && x.a.*.length() === 0";
+    assert_eq!(squeezed(chain, "squeeze(4096); l.c = 'v'; 1", same), heap);
+    assert_eq!(squeezed(chain, "l.c = 'v'; 1", same), Ok(JsValue::Number(1.0)));
+}
+
+#[test]
+fn serializing_charges_the_text_it_flattens() {
+    // `k` is a rope of 32,768 units. Both trees hold the same 65,536 units of text, as a rope in the
+    // first and as flat text in the second.
+    let k = "var k = 'x'; for (var i = 0; i < 15; i++) k += k; XML.prettyPrinting = false;";
+    let rope = format!("{k} var x = <r/>; x.appendChild(k); x.appendChild(k); x.normalize();");
+    let flat = format!("{k} var x = new XML('<r>' + k + k + '</r>');");
+    let action = "x.toXMLString().length";
+    let (r, f) = (least_room(&rope, action), least_room(&flat, action));
+    assert!(r >= f + 100_000, "rope {r}, flat {f}");
+    let attr = format!("{k} var x = <r/>; x.@a = k + k;");
+    let same = "var s = x.toXMLString(); s.length > 65536 && s.indexOf(k + k) > 0 && new XML(s).toXMLString() === s";
+    for setup in [rope, attr] {
+        assert_eq!(squeezed(&setup, same, "true"), Ok(JsValue::Bool(true)), "{setup}");
+    }
+}
+
+/// A script that makes `x`, a `r:r` element over 2,000 nested `r:d` elements in the same
+/// namespace, each of which declares one more prefix: a new one each time, or `q10000` each time.
+fn nested_prefixes(same: bool) -> String {
+    let prefix = if same { "10000" } else { "' + (10000 + i) + '" };
+    format!(
+        "XML.prettyPrinting = false; var s = ''; for (var i = 0; i < 2000; i++) s += '<r:d xmlns:q{prefix}=\"u' + (10000 + i) + '\">'; \
+         for (var i = 0; i < 2000; i++) s += '</r:d>'; var x = new XML('<r:r xmlns:r=\"R\">' + s + '</r:r>');"
+    )
+}
+
+#[test]
+fn serializing_holds_the_prefixes_a_lookup_passes() {
+    // Finding the `r` prefix from the deepest element passes 2,000 prefixes when each level
+    // declares a new one, and one when they all declare `q10000`.
+    let action = "x.toXMLString().length";
+    let (new, same) = (least_room(&nested_prefixes(false), action), least_room(&nested_prefixes(true), action));
+    assert!(new >= same + 2000 * 16, "new {new}, same {same}");
+    let check = "var s = x.toXMLString(); s.indexOf('<r:r xmlns:r=\"R\"><r:d xmlns:q10000=\"u10000\"><r:d xmlns:q10001=\"u10001\">') === 0 && new XML(s).toXMLString() === s";
+    assert_eq!(squeezed(&nested_prefixes(false), check, "true"), Ok(JsValue::Bool(true)));
+}
+
+#[test]
+fn a_new_prefix_is_the_first_free_ns_number() {
+    let setup = "XML.prettyPrinting = false; var n = new Namespace('urn:z');";
+    for (decls, prefix) in [
+        ("", "ns0"),
+        (" xmlns:ns0=\"a\" xmlns:ns1=\"b\" xmlns:ns3=\"c\" xmlns:ns02=\"d\"", "ns2"),
+        (" xmlns:ns0=\"a\" xmlns:ns1=\"b\" xmlns:nsx=\"c\" xmlns:ns2=\"d\"", "ns3"),
+    ] {
+        truth(&format!(
+            "{setup} var x = <r{decls}/>; x.@n::a = 'v'; var s = x.toXMLString(); \
+             s.indexOf(' {prefix}:a=\"v\"') > 0 && s.indexOf(' xmlns:{prefix}=\"urn:z\"') > 0 && new XML(s).@n::a == 'v'"
+        ));
+    }
+    truth(&format!(
+        "{setup} var s = ''; for (var i = 0; i < 500; i++) s += ' xmlns:ns' + i + '=\"u' + i + '\"'; var x = new XML('<r' + s + '/>'); x.@n::a = 'v'; \
+         x.toXMLString().indexOf(' ns500:a=\"v\"') > 0"
+    ));
+}
+
+/// A script that makes `x`, an `r` element over 4,000 `b` elements, `l`, the list of them, and
+/// `t`, an empty element.
+const MANY_B: &str = "XML.prettyPrinting = false; var x = <r/>; for (var i = 0; i < 4000; i++) x.appendChild(<b/>); var l = x.b; var t = <t/>;";
+
+#[test]
+fn inserting_a_list_holds_its_copy_of_the_items() {
+    // Both actions move the same 4,000 elements under `t`. The first charges the links, 8 bytes
+    // each, before any element leaves `x`, and holds its copy of the list's items, 4 bytes each;
+    // the second moves them one at a time.
+    let list = least_room(MANY_B, "t.prependChild(l); 1");
+    let one_by_one = least_room(MANY_B, "for (var i = 0; i < 4000; i++) t.prependChild(l[i]); 1");
+    assert!(list >= one_by_one + 4000 * (8 + 2), "list {list}, one by one {one_by_one}");
+    let moved = "t.prependChild(l); t.*.length() === 4000 && x.*.length() === 0 && t.b[3999].parent() === t";
+    assert_eq!(squeezed(MANY_B, moved, "true"), Ok(JsValue::Bool(true)));
+}
+
+#[test]
+fn assigning_a_list_to_a_list_item_holds_its_copy_of_the_items() {
+    // Both actions put the 4,000 elements of `l` under `m`. The first, through the list `m.a`,
+    // also makes a list of them, 8 bytes each, and holds a copy of its items, 4 bytes each.
+    let setup = format!("{MANY_B} var m = <m><a/></m>; var la = m.a;");
+    let through_list = least_room(&setup, "la[0] = l; 1");
+    let direct = least_room(&setup, "m.prependChild(l); 1");
+    assert!(through_list >= direct + 4000 * 10, "through the list {through_list}, direct {direct}");
+    let placed = "la[0] = l; m.*.length() === 4000 && la.length() === 4000 && la[3999] === m.b[3999] && x.*.length() === 0";
+    assert_eq!(squeezed(&setup, placed, "true"), Ok(JsValue::Bool(true)));
+}
+
+#[test]
+fn parsing_holds_its_open_elements_and_attribute_scratch() {
+    // The deep markup leaves 2,000 elements open at once and the wide markup, of the same
+    // length, leaves none. The open elements and their names take 2,048 times 20 bytes, and the
+    // longer names of the wide markup take 2,000 times 6 bytes more.
+    let (deep, wide) = deep_and_wide("dddd");
+    let action = "new XML('<r>' + s + '</r>'); 1";
+    let (d, w) = (least_room(&deep, action), least_room(&wide, action));
+    // Both elements declare 2,001 namespaces and have one attribute. Resolving the prefix of the
+    // attribute in the first reads a copy of the element's namespaces.
+    let decls = "var d = ''; for (var i = 10000; i < 12000; i++) d += ' xmlns:n' + i + '=\"u\"';";
+    let prefixed = least_room(decls, "new XML('<r' + d + ' xmlns:p=\"P\" p:a=\"v\"/>'); 1");
+    let plain = least_room(decls, "new XML('<r' + d + ' xmlns:p=\"P\" pa=\"v\"/>'); 1");
+    assert!(d >= w + 2000 * 8 && prefixed >= plain + 2000 * 32, "deep {d}, wide {w}, prefixed {prefixed}, plain {plain}");
+    truth(&format!(
+        "{decls} var x = new XML('<r' + d + ' xmlns:p=\"P\" p:a=\"v\" b=\"w\"/>'); x.@b == 'w' && x.namespaceDeclarations().length == 2001"
+    ));
+}
+
+#[test]
+fn flattening_a_rope_in_xml_code_is_charged() {
+    let k = "var k = 'x'; for (var i = 0; i < 15; i++) k += k; XML.prettyPrinting = false; var x = <r/>, y = <r/>;";
+    // Each pair holds the same 65,536 units as ropes in the first script and as flat text in the
+    // second: the text of `x` and `y`, an attribute of `x` and `y`, and the string `s2`.
+    let text = (
+        format!("{k} for each (var e in [x, y]) {{ e.appendChild(k); e.appendChild(k); e.normalize(); }}"),
+        format!("{k} x = new XML('<r>' + k + k + '</r>'); y = new XML('<r>' + k + k + '</r>');"),
+    );
+    let attr = (format!("{k} x.@a = k + k; y.@a = k + k;"), format!("{k} x = new XML('<r a=\"' + k + k + '\"/>'); y = new XML(x.toXMLString());"));
+    let o = "var o = { toString: function () { return s2; } };";
+    let string = (format!("{k} var s2 = k + k; {o}"), format!("{k} var s2 = new XML('<r>' + k + k + '</r>').toString(); {o}"));
+    let mut wrong = Vec::new();
+    for ((rope, flat), action) in [
+        (&text, "x == y"),
+        (&attr, "x == y"),
+        (&text, "x.text()[0] == y.text()[0]"),
+        (&text, "x.text()[0] == 'z'"),
+        (&string, "<e/> == s2"),
+        (&text, "x.toString().length"),
+        (&text, "x.text().toString().length"),
+        (&string, "x.@[s2].length()"),
+        (&string, "x.s2::b.length()"),
+        (&string, "x.o::b.length()"),
+        (&string, "default xml namespace = s2; 1"),
+        (&string, "x[s2].length()"),
+        (&string, "x[o].length()"),
+    ] {
+        let (r, f) = (least_room(rope, action), least_room(flat, action));
+        if r < f + 100_000 {
+            wrong.push(format!("{action}: rope {r}, flat {f}"));
+        }
+    }
+    // A name read from a flat string is a copy of its units after `@` for an attribute, and shares
+    // the string for an element.
+    let names = format!("{} var at = new XML('<r>@' + k + k + '</r>').toString();", string.1);
+    let (a, e) = (least_room(&names, "x[at].length()"), least_room(&names, "x[s2].length()"));
+    if a < e + 100_000 {
+        wrong.push(format!("names: attribute {a}, element {e}"));
+    }
+    assert!(wrong.is_empty(), "{wrong:#?}");
+    let same = "x == y && x.text()[0] == y.text()[0] && x.toString() === s && x.text().toString() === s && !(x.text()[0] == 'z')";
+    for setup in [&text.0, &text.1] {
+        assert_eq!(squeezed(&format!("{setup} var s = k + k;"), same, "true"), Ok(JsValue::Bool(true)), "{setup}");
+    }
+}
+
 /// Runs `action` as [`heap_stops`] does, and asserts that every run completes or stops at the heap
 /// limit and that `check` is true after it. Returns how many runs stopped.
 fn heap_stops_only(setup: &str, action: &str, check: &str) -> usize {
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..40ca4ecdab 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -811,6 +811,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
   - `vectorcraft-js` has `String`, `Number`, `RegExp` and `Date` as ECMAScript 5.1 defines them (sections 15.5, 15.7, 15.9 and 15.10, https://262.ecma-international.org/5.1/), with Annex B's `substr`, `getYear`, `setYear` and `toGMTString`. `toFixed`, `toExponential` and `toPrecision` format a number from its exact decimal value, and `toString(radix)` writes any base from 2 to 36. Regular expressions (flags `g`, `i` and `m`) run on a backtracking matcher whose choice points and capture state count against the heap limit and which takes fuel for every step, so a catastrophic pattern stops at the fuel limit and 50,000 nested groups give a `SyntaxError` at the default depth limit. A string method that would build a string past the heap limit stops before it allocates. `Date` reads the clock and time zone the host sets (`Realm::set_clock`, `Realm::set_time_zone`; local time is UTC by default). `cargo xtask test262` runs the suite's `built-ins` tests for the four (https://github.com/tc39/test262): of the runs of the ES5 tests that need only the built-ins present, 1,379 of 1,411 pass for `String`, 298 of 298 for `Number`, 954 of 988 for `RegExp` and 8 of 8 for `Date`. The others expect later editions' rules (built-in functions whose `length` can be deleted, flags given with a RegExp object, a negative `lastIndex`, `RegExp.prototype` as a plain object, and `RegExp.prototype`'s `global`, `ignoreCase` and `multiline` properties that can be deleted). Tests: `crates/js/src/text_tests.rs`, `crates/js/tests/test262.rs`.
   - With `Options::e4x` set, an E4X name standing alone (`@a`, `@ns::a`, `@[expr]`, `ns::a`, `*`) inside `with` or a filter predicate can be assigned, with `=` or a compound operator, incremented, decremented, deleted and used as a `for` or `for each` variable, as well as read. Each of these uses the nearest XML or XMLList value in scope that holds the name and evaluates the name once. When no XML value in scope holds the name, the read or write throws a `ReferenceError` before the right-hand side runs and creates no child or attribute, as ECMA-357 section 11.1 (https://ecma-international.org/publications-and-standards/standards/ecma-357/) specifies, so a filter such as `list.(@id == '1')` throws when an item has no `@id` and no outer XML value holds one. Tests: `crates/js/src/xml_tests.rs`.
   - `vectorcraft-js` runs ECMAScript for XML (ECMA-357, 2nd edition, https://ecma-international.org/publications-and-standards/standards/ecma-357/) when `Options::e4x` is set, which it is not by default: XML and XMLList literals with embedded `{}` expressions, the `..`, `.@`, `.*`, `.()` and `::` selectors, assignment and `delete` on selected nodes, `for each`, `default xml namespace`, and the `XML`, `XMLList`, `Namespace` and `QName` objects with their methods and settings. `xml.xpath(expression[, variables])` evaluates an XPath 1.0 expression (https://www.w3.org/TR/1999/REC-xpath-19991116/) with all 13 axes and the 27 core functions, and returns the selected nodes as an XMLList in document order without repeats. Each property of `variables` binds the variable of its name, an XMLList runs the expression on each of its elements in turn, and a prefix in a name test resolves through the context element's in-scope namespaces. An expression that breaks the grammar gives a `SyntaxError`; an unknown function, a wrong argument count, an unbound prefix or variable, and a result that is not a node-set or that holds the root or a namespace node give a `TypeError`. `id()` selects nothing, and evaluation uses no native stack, takes fuel and counts against the heap limit. `<!DOCTYPE>` in an XML string gives a `SyntaxError`. An XML declaration at the start of an XML string, after optional white space, is checked against XML 1.0's grammar (https://www.w3.org/TR/xml/#NT-XMLDecl): a version of `1.` and digits, then an optional encoding name and an optional standalone `yes` or `no`, in that order; any other declaration, or one with a character XML does not allow, gives a `SyntaxError`. The parser takes fuel for the length of every name, white space run and declaration it scans, and for the text it searched when a quote, CDATA section, comment or processing instruction is not closed. Parsing, serializing, comparing and copying trees use no native stack, and each takes fuel and counts against the heap limit. Inserting a node into itself or its descendants throws a `TypeError` before the tree changes, a literal or XML string nested past `Options::max_depth` gives a `SyntaxError`, and a tree built past that depth stops at the heap limit. Tests: `crates/js/src/xml_tests.rs`.
+  - Scripts: assigning to a named child of an XML element (`x.b = v`) counts its list of the matching children against the heap limit, and assigning through an empty XMLList counts the chain of targets it climbs, so an assignment that would not fit stops before the tree changes. `copy()`, `toXMLString()`, `normalize()`, the `..` selector and inserting a node count the stack they keep for each open level of the tree, `copy()` and `toXMLString()` read an element's attributes in place instead of copying the list, `toXMLString()` also reads its namespace declarations in place, and `copy()` counts the declarations it copies before it copies them. `toXMLString()` counts the flat copy it makes of text or an attribute value built by joining strings. Deleting children or attributes by name, and assigning an attribute, remove the nodes in place instead of building a second list. `toXMLString()` counts the set of prefixes it passes looking up a namespace, and picks a new `ns` prefix in one pass over the declarations in scope. Inserting an XMLList, and assigning one to an item of an XMLList, count their copy of the list's items. Parsing counts the open elements, the text it gathers, each tag's attributes and the sets that check them, and the namespace declarations it makes. Comparing XML values, converting them to strings, and reading a name, a namespace or embedded text from a string built by joining strings count the flat copy they make; an attribute name read from a string counts its copy. Tests: `crates/js/src/xml_tests.rs`.
 - **UI:** Illustrator 2026 layout restyled to measured values:
   - Medium Dark theme, categorized and Advanced toolbars (a tool group's flyout opens on a right press, a long press or a press on its corner triangle), 35 pt document tabs, 33 pt panel tabs.
   - Hint bar, contextual task bar, 19 dock panels with ≡ menus.

From 4fae51023ef36e90619f7fed9955559c7b554174 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:54:55 -0800
Subject: [PATCH 44/48] Paths: Remove Anchor Points removes many anchors of a
 subpath in one pass

Object > Path > Remove Anchor Points removed each selected anchor with
its own Vec::remove, shifting the rest of the subpath every time, so
removing k anchors from an n-anchor subpath took O(k*n) moves.

- pathops: remove_anchors removes a subpath's anchors the last first,
  reading each anchor's current neighbors, handles, length and closed
  state as removing them one at a time does, and compacts the anchor
  list once. remove_anchor and remove_anchors share one refit, so the
  result is bit for bit the same.
- engine: the command groups the selected anchors by subpath, works out
  the next selected anchor with each subpath reading only its own
  selected anchors, and takes emptied paths out of the selection
  together (Selection::remove_all).
- Tests compare remove_anchors bit for bit with remove_anchor over 600
  generated subpaths and focused cases, count the anchors moved (2001
  anchors, every other one removed: at most one move per anchor left,
  500,500 one at a time), and compare the next-anchor selection and
  the command on many paths and subpaths with removing one at a time.
---
 crates/doc/src/selection.rs            |  19 ++
 crates/doc/src/selection/tests.rs      |  29 +++
 crates/engine/src/cmd/draw2/anchors.rs | 102 +++++++++--
 crates/engine/src/tests/draw2.rs       |  43 +++++
 crates/pathops/src/edit.rs             | 241 +++++++++++++++++++++++--
 crates/pathops/src/lib.rs              |   4 +-
 6 files changed, 397 insertions(+), 41 deletions(-)

diff --git a/crates/doc/src/selection.rs b/crates/doc/src/selection.rs
index 6f0db556e0..4ef6446247 100644
--- a/crates/doc/src/selection.rs
+++ b/crates/doc/src/selection.rs
@@ -144,6 +144,25 @@ impl Selection {
             self.key = None;
         }
     }
+    /// [`Self::remove`] for each of `ids`, going through the selected objects once.
+    pub fn remove_all(&mut self, ids: impl IntoIterator<Item = NodeId>) {
+        let ids: HashSet<NodeId> = ids.into_iter().collect();
+        if ids.is_empty() {
+            return;
+        }
+        self.target = None;
+        self.slices.clear();
+        self.symbol_part = None;
+        self.on_path_member = None;
+        self.objects.retain(|x| !ids.contains(x));
+        for id in &ids {
+            self.anchors.remove(id);
+            self.segments.remove(id);
+        }
+        if self.key.is_some_and(|k| ids.contains(&k)) {
+            self.key = None;
+        }
+    }
     /// Select slices `ids` (see [`Selection::slices`]) and nothing else.
     pub fn set_slices(&mut self, ids: impl IntoIterator<Item = NodeId>) {
         self.clear();
diff --git a/crates/doc/src/selection/tests.rs b/crates/doc/src/selection/tests.rs
index d9df845129..b6090f8993 100644
--- a/crates/doc/src/selection/tests.rs
+++ b/crates/doc/src/selection/tests.rs
@@ -16,6 +16,35 @@ fn basic_ops() {
     assert!(s.is_empty());
 }
 
+#[test]
+fn remove_all_does_what_removing_each_does() {
+    let mut s = Selection::default();
+    for i in 1..=6 {
+        s.add(NodeId(i));
+    }
+    for i in [2, 4, 5] {
+        s.anchors.insert(NodeId(i), BTreeSet::from([(0, 1)]));
+        s.segments.insert(NodeId(i), BTreeSet::from([(0, 0)]));
+    }
+    s.key = Some(NodeId(4));
+    s.target = Some(NodeId(3));
+    s.slices = vec![NodeId(9)];
+    s.guides = vec![NodeId(10)];
+    s.on_path_member = Some(NodeId(11));
+    let mut one_by_one = s.clone();
+    for id in [NodeId(4), NodeId(1), NodeId(4), NodeId(7)] {
+        one_by_one.remove(id);
+    }
+    let mut all = s.clone();
+    all.remove_all([NodeId(4), NodeId(1), NodeId(4), NodeId(7)]);
+    assert_eq!(all, one_by_one);
+    assert_eq!(all.objects, [NodeId(2), NodeId(3), NodeId(5), NodeId(6)]);
+    // Removing nothing leaves the selection as it was.
+    let mut none = s.clone();
+    none.remove_all([]);
+    assert_eq!(none, s);
+}
+
 #[test]
 fn guides_are_selected_on_their_own() {
     let mut s = Selection::default();
diff --git a/crates/engine/src/cmd/draw2/anchors.rs b/crates/engine/src/cmd/draw2/anchors.rs
index 10254f3cd3..5b80fcc80f 100644
--- a/crates/engine/src/cmd/draw2/anchors.rs
+++ b/crates/engine/src/cmd/draw2/anchors.rs
@@ -116,8 +116,11 @@ pub(super) fn remove_anchor(s: &mut Session, p: &Value) -> Result<Value> {
             return Err(EngineError::Other("no such anchor".into()));
         }
         let mut emptied = Beside::replacing(d, &[id]);
-        let removed = remove_anchors_of(d, sel, &mut emptied, id, [(si, ai)], curvature)?;
+        let removed = remove_anchors_of(d, sel, &mut emptied, id, vec![(si, ai)], curvature)?;
         emptied.finish(d)?;
+        if removed {
+            sel.remove(id);
+        }
         Ok(removed)
     })?;
     Ok(json!({ "removedObject": removed }))
@@ -136,14 +139,14 @@ pub(super) fn remove_anchors(s: &mut Session, _: &Value) -> Result<Value> {
         return Err(bad("path.removeAnchors", "direct-select anchor points of a path"));
     }
     let removed = s.edit("Remove Anchor Points", |d, sel| {
-        let mut removed = 0;
+        let mut gone = Vec::new();
         let mut emptied = Beside::replacing(d, &jobs.iter().map(|(id, _)| *id).collect::<Vec<_>>());
         for (id, anchors) in jobs {
             let shape: Vec<(usize, bool)> =
                 d.node(id).and_then(Node::path_data).map(|p| p.subpaths.iter().map(|sp| (sp.anchors.len(), sp.closed)).collect()).unwrap_or_default();
             let next = following_anchors(&shape, &anchors);
             if remove_anchors_of(d, sel, &mut emptied, id, anchors, false)? {
-                removed += 1;
+                gone.push(id);
             } else if !next.is_empty() {
                 // The next anchor along is selected, so the next Remove Anchor Points goes on from
                 // there without picking it first (#2241).
@@ -151,7 +154,8 @@ pub(super) fn remove_anchors(s: &mut Session, _: &Value) -> Result<Value> {
             }
         }
         emptied.finish(d)?;
-        Ok(removed)
+        sel.remove_all(gone.iter().copied());
+        Ok(gone.len())
     })?;
     Ok(json!({ "removedObjects": removed }))
 }
@@ -160,19 +164,32 @@ pub(super) fn remove_anchors(s: &mut Session, _: &Value) -> Result<Value> {
 /// path whose subpaths have `shape` (anchor count, closed): in each subpath, the anchor after its
 /// last removed one, round the end of a closed subpath, or the one before it at an open subpath's
 /// end. Indexes are those after the removal, without the subpaths left with fewer than two anchors.
+/// `removed` is in ascending order without repeats, as a selection holds it, and each subpath reads
+/// only its own pairs.
 fn following_anchors(shape: &[(usize, bool)], removed: &[(usize, usize)]) -> BTreeSet<(usize, usize)> {
     let mut next = BTreeSet::new();
     let mut kept = 0;
+    let mut rest = removed;
     for (si, &(n, closed)) in shape.iter().enumerate() {
-        let gone: BTreeSet<usize> = removed.iter().filter(|&&(s, a)| s == si && a < n).map(|&(_, a)| a).collect();
+        let (mine, after) = rest.split_at(rest.iter().take_while(|&&(s, _)| s == si).count());
+        rest = after;
+        let gone = &mine[..mine.partition_point(|&(_, a)| a < n)];
         if n - gone.len() < 2 {
             continue;
         }
-        if let Some(&last) = gone.last() {
-            let wrap = if closed { 0..last } else { 0..0 };
-            let after = (last + 1..n).chain(wrap).find(|a| !gone.contains(a));
-            if let Some(a) = after.or_else(|| (0..last).rev().find(|a| !gone.contains(a))) {
-                next.insert((kept, a - gone.range(..a).count()));
+        if let Some(&(_, last)) = gone.last() {
+            // Anchors past `last` are all left. Below it, the first one left (round a closed
+            // subpath's end) is past the removed run from 0, and the last one left is below the
+            // removed run down from `last`.
+            let a = if last + 1 < n {
+                Some(last + 1)
+            } else if closed {
+                Some(gone.iter().zip(0..).take_while(|&(&(_, g), k)| g == k).count())
+            } else {
+                last.checked_sub(gone.iter().rev().zip((0..=last).rev()).take_while(|&(&(_, g), k)| g == k).count())
+            };
+            if let Some(a) = a {
+                next.insert((kept, a - gone.partition_point(|&(_, g)| g < a)));
             }
         }
         kept += 1;
@@ -183,34 +200,37 @@ fn following_anchors(shape: &[(usize, bool)], removed: &[(usize, usize)]) -> BTr
 /// Remove `anchors` (subpath, anchor) of path `id` without opening it, refitting the curve round
 /// each one, or with `curvature` re-curving it as the Curvature tool curves its points
 /// ([`vectorcraft_tools::draw2::curvature_remove`]). A subpath left with one anchor is removed,
-/// and a path left with no subpath is removed through `emptied`. True when the path went.
+/// and a path left with no subpath is removed through `emptied`; the caller then takes it out of
+/// the selection. True when the path went.
 fn remove_anchors_of(
     d: &mut Document,
     sel: &mut Selection,
     emptied: &mut Beside,
     id: NodeId,
-    anchors: impl IntoIterator<Item = (usize, usize)>,
+    mut anchors: Vec<(usize, usize)>,
     curvature: bool,
 ) -> Result<bool> {
-    let mut anchors: Vec<(usize, usize)> = anchors.into_iter().collect();
     // The last first, so the indexes still to come stay valid.
     anchors.sort_unstable_by(|a, b| b.cmp(a));
     anchors.dedup();
     let path = path_mut(d, id)?;
-    for (si, ai) in anchors {
-        if let Some(sp) = path.subpaths.get_mut(si) {
-            if curvature {
+    let mut rest = &anchors[..];
+    while let Some(&(si, _)) = rest.first() {
+        let (mine, after) = rest.split_at(rest.iter().take_while(|&&(s, _)| s == si).count());
+        rest = after;
+        let Some(sp) = path.subpaths.get_mut(si) else { continue };
+        if curvature {
+            for &(_, ai) in mine {
                 vectorcraft_tools::draw2::curvature_remove(sp, ai);
-            } else {
-                po::remove_anchor(sp, ai);
             }
+        } else {
+            po::remove_anchors(sp, &mine.iter().map(|&(_, ai)| ai).collect::<Vec<_>>());
         }
     }
     path.subpaths.retain(|sp| sp.anchors.len() >= 2);
     let gone = path.is_empty();
     if gone {
         emptied.put(d, id, vec![])?;
-        sel.remove(id);
     } else {
         sel.anchors.remove(&id);
         sel.segments.remove(&id);
@@ -277,3 +297,47 @@ pub(super) fn reshape_segment(s: &mut Session, p: &Value) -> Result<Value> {
     })?;
     ok()
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    /// [`following_anchors`] by its definition: for each subpath, a search of the anchors after
+    /// its last removed one, round a closed end, then before it.
+    fn following_by_search(shape: &[(usize, bool)], removed: &[(usize, usize)]) -> BTreeSet<(usize, usize)> {
+        let mut next = BTreeSet::new();
+        let mut kept = 0;
+        for (si, &(n, closed)) in shape.iter().enumerate() {
+            let gone: BTreeSet<usize> = removed.iter().filter(|&&(s, a)| s == si && a < n).map(|&(_, a)| a).collect();
+            if n - gone.len() < 2 {
+                continue;
+            }
+            if let Some(&last) = gone.last() {
+                let wrap = if closed { 0..last } else { 0..0 };
+                let after = (last + 1..n).chain(wrap).find(|a| !gone.contains(a));
+                if let Some(a) = after.or_else(|| (0..last).rev().find(|a| !gone.contains(a))) {
+                    next.insert((kept, a - gone.range(..a).count()));
+                }
+            }
+            kept += 1;
+        }
+        next
+    }
+
+    #[test]
+    fn following_anchors_matches_a_search_along_each_subpath() {
+        let mut seed = 0x2545_f491_4f6c_dd1d_u64;
+        let mut rnd = |m: u64| {
+            seed ^= seed << 13;
+            seed ^= seed >> 7;
+            seed ^= seed << 17;
+            (seed % m) as usize
+        };
+        for case in 0..2000 {
+            let shape: Vec<(usize, bool)> = (0..rnd(5) + 1).map(|_| (rnd(9), rnd(2) == 0)).collect();
+            let removed: BTreeSet<(usize, usize)> = (0..rnd(14)).map(|_| (rnd(shape.len() as u64 + 1), rnd(11))).collect();
+            let removed: Vec<_> = removed.into_iter().collect();
+            assert_eq!(following_anchors(&shape, &removed), following_by_search(&shape, &removed), "case {case}: {shape:?} removing {removed:?}");
+        }
+    }
+}
diff --git a/crates/engine/src/tests/draw2.rs b/crates/engine/src/tests/draw2.rs
index 5986b618fd..104c2c144c 100644
--- a/crates/engine/src/tests/draw2.rs
+++ b/crates/engine/src/tests/draw2.rs
@@ -2533,6 +2533,49 @@ fn remove_anchor_points_selects_one_next_anchor_per_subpath_and_per_path() {
     assert_eq!(selected_anchors(&s, other), [(0, 0)]);
 }
 
+#[test]
+fn remove_anchor_points_on_many_paths_and_subpaths_matches_removing_one_at_a_time() {
+    // Many anchors over many subpaths and paths, curved and straight, open and closed: each
+    // subpath ends as removing its anchors one at a time, the last first, leaves it. Paths left
+    // with nothing go, the rest stay selected in order, and one undo step brings all back.
+    let mut s = session();
+    let curvy = "M0 0 C10 20 30 20 40 0 C50 -20 70 -20 80 0 C90 20 110 20 120 0 C130 -20 150 -20 160 0 Z \
+                 M0 100 L40 120 C60 140 80 80 100 100 L140 90 L180 110 L220 100";
+    let ids: Vec<NodeId> = (0..4).map(|i| path_from(&mut s, if i == 2 { "M0 0 L10 0 L20 5" } else { curvy })).collect();
+    let picks: [&[(usize, usize)]; 4] =
+        [&[(0, 0), (0, 2), (0, 3), (1, 1), (1, 2), (1, 5)], &[(0, 1), (1, 0), (1, 6)], &[(0, 0), (0, 1)], &[(0, 3), (1, 3), (1, 4)]];
+    for (k, (&id, &anchors)) in ids.iter().zip(&picks).enumerate() {
+        let mode = if k == 0 { "set" } else { "add" };
+        s.execute("select.anchors", &json!({"id": id.0, "anchors": anchors, "mode": mode})).unwrap();
+    }
+    let before: Vec<PathData> = ids.iter().map(|&id| path(&s, id)).collect();
+    assert_eq!(s.execute("path.removeAnchors", &json!({})).unwrap()["removedObjects"], 1);
+    for (k, &id) in ids.iter().enumerate() {
+        let mut want = before[k].clone();
+        let mut order = picks[k].to_vec();
+        order.sort_unstable_by(|a, b| b.cmp(a));
+        for (si, ai) in order {
+            vectorcraft_pathops::remove_anchor(&mut want.subpaths[si], ai);
+        }
+        want.subpaths.retain(|sp| sp.anchors.len() >= 2);
+        if want.subpaths.is_empty() {
+            assert!(s.doc().unwrap().doc.node(id).is_none(), "path {k} goes");
+        } else {
+            assert_eq!(path(&s, id).subpaths, want.subpaths, "path {k}");
+        }
+    }
+    let kept = [ids[0], ids[1], ids[3]];
+    assert_eq!(s.doc().unwrap().selection.objects, kept);
+    s.execute("edit.undo", &json!({})).unwrap();
+    for (k, &id) in ids.iter().enumerate() {
+        assert_eq!(path(&s, id), before[k]);
+        assert_eq!(selected_anchors(&s, id), picks[k]);
+    }
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert!(s.doc().unwrap().doc.node(ids[2]).is_none());
+    assert_eq!(s.doc().unwrap().selection.objects, kept);
+}
+
 #[test]
 fn remove_anchor_point_tool_and_delete_still_select_the_remainder_whole() {
     // Only Remove Anchor Points moves the selection on. The Delete Anchor Point tool leaves the
diff --git a/crates/pathops/src/edit.rs b/crates/pathops/src/edit.rs
index d8d121ecb9..87b9885f75 100644
--- a/crates/pathops/src/edit.rs
+++ b/crates/pathops/src/edit.rs
@@ -860,27 +860,10 @@ pub fn remove_anchor(sp: &mut SubPath, index: usize) -> bool {
         return false;
     }
     if (sp.closed || (index > 0 && index + 1 < n)) && n >= 3 {
-        let (pi, ni) = ((index + n - 1) % n, (index + 1) % n);
-        if !(sp.segment_is_line(pi) && sp.segment_is_line(index)) {
-            let (left, right) = (sp.segment(pi), sp.segment(index));
-            const N: usize = 16;
-            let mut pts = Vec::with_capacity(2 * N + 1);
-            sample(&left, N, &mut pts, true);
-            sample(&right, N, &mut pts, false);
-            let (t0, t1) = (start_tangent(&left), end_tangent(&right));
-            // The new curve passes the removed point at some parameter k: the left samples sit
-            // at k·i/N, the right ones at k + (1 − k)·i/N. Search k for the closest fit.
-            let fit = |k: f64| {
-                let u = (0..=N).map(|i| k * i as f64 / N as f64).chain((1..=N).map(|i| k + (1.0 - k) * i as f64 / N as f64)).collect();
-                fit_single_from(&pts, u, t0, t1)
-            };
-            let (c, _, _) = golden_min(fit, 0.0, 1.0);
-            if c.p1.is_finite() && c.p2.is_finite() {
-                sp.anchors[pi].h_out = c.p1;
-                sp.anchors[ni].h_in = c.p2;
-            }
-        }
+        refit_across(&mut sp.anchors, (index + n - 1) % n, index, (index + 1) % n);
     }
+    #[cfg(test)]
+    tests::count_moves(n - index - 1);
     sp.anchors.remove(index);
     if !sp.closed {
         // A new end has nothing beyond it.
@@ -897,6 +880,101 @@ pub fn remove_anchor(sp: &mut SubPath, index: usize) -> bool {
     true
 }
 
+/// Refit the facing handles of anchors `pi` and `ni` so one cubic follows the two segments that
+/// meet at anchor `index` between them ([`remove_anchor`]). Two straight segments are left as
+/// they are, and so are the handles when the fit is not finite.
+fn refit_across(anchors: &mut [Anchor], pi: usize, index: usize, ni: usize) {
+    let (Some(&a), Some(&b), Some(&c)) = (anchors.get(pi), anchors.get(index), anchors.get(ni)) else { return };
+    let line = |a: &Anchor, b: &Anchor| !a.has_out() && !b.has_in();
+    if line(&a, &b) && line(&b, &c) {
+        return;
+    }
+    let (left, right) = (CubicBez::new(a.p, a.h_out, b.h_in, b.p), CubicBez::new(b.p, b.h_out, c.h_in, c.p));
+    const N: usize = 16;
+    let mut pts = Vec::with_capacity(2 * N + 1);
+    sample(&left, N, &mut pts, true);
+    sample(&right, N, &mut pts, false);
+    let (t0, t1) = (start_tangent(&left), end_tangent(&right));
+    // The new curve passes the removed point at some parameter k: the left samples sit at k·i/N,
+    // the right ones at k + (1 − k)·i/N. Search k for the closest fit.
+    let fit = |k: f64| {
+        let u = (0..=N).map(|i| k * i as f64 / N as f64).chain((1..=N).map(|i| k + (1.0 - k) * i as f64 / N as f64)).collect();
+        fit_single_from(&pts, u, t0, t1)
+    };
+    let (curve, _, _) = golden_min(fit, 0.0, 1.0);
+    if curve.p1.is_finite() && curve.p2.is_finite() {
+        anchors[pi].h_out = curve.p1;
+        anchors[ni].h_in = curve.p2;
+    }
+}
+
+/// [`remove_anchor`] for each of `indexes`, the last first, with the same result, moving each
+/// anchor that stays at most once: removing many anchors from a long subpath one at a time shifts
+/// the rest of it each time. Indexes out of range and repeats are skipped. Returns how many
+/// anchors were removed.
+pub fn remove_anchors(sp: &mut SubPath, indexes: &[usize]) -> usize {
+    let total = sp.anchors.len();
+    let mut targets: Vec<usize> = indexes.iter().copied().filter(|&i| i < total).collect();
+    targets.sort_unstable_by(|a, b| b.cmp(a));
+    targets.dedup();
+    if targets.is_empty() {
+        return 0;
+    }
+    // Every anchor below the one being removed is still there, so it keeps its index, the one
+    // before it is `index - 1` and the first one left is anchor 0 until anchor 0 itself goes.
+    let mut gone = vec![false; total];
+    let mut len = total;
+    let mut last = total - 1;
+    // The lowest anchor removed so far and the first one left after it.
+    let (mut lowest, mut after_lowest) = (total, None);
+    for &index in &targets {
+        let next = if index + 1 < lowest { Some(index + 1) } else { after_lowest };
+        if (sp.closed || (index > 0 && next.is_some())) && len >= 3 {
+            let pi = if index > 0 { index - 1 } else { last };
+            refit_across(&mut sp.anchors, pi, index, next.unwrap_or(0));
+        }
+        gone[index] = true;
+        len -= 1;
+        (lowest, after_lowest) = (index, next);
+        if next.is_none() {
+            last = index.saturating_sub(1);
+        }
+        if len == 0 {
+            continue;
+        }
+        let first = if index > 0 { 0 } else { next.unwrap_or(0) };
+        if !sp.closed {
+            // A new end has nothing beyond it.
+            if let Some(a) = sp.anchors.get_mut(first) {
+                a.h_in = a.p;
+            }
+            if let Some(a) = sp.anchors.get_mut(last) {
+                a.h_out = a.p;
+            }
+        }
+        if len < 3 {
+            let ends = [first, last].map(|i| sp.anchors.get(i).is_some_and(|a| a.has_in() || a.has_out()));
+            sp.closed = sp.closed && len == 2 && (ends[0] || ends[1]);
+        }
+    }
+    if len == 0 {
+        sp.closed = false;
+    }
+    let mut kept = 0;
+    for (i, &g) in gone.iter().enumerate() {
+        if !g {
+            if kept != i {
+                sp.anchors[kept] = sp.anchors[i];
+                #[cfg(test)]
+                tests::count_moves(1);
+            }
+            kept += 1;
+        }
+    }
+    sp.anchors.truncate(kept);
+    targets.len()
+}
+
 /// The fit `f` (curve, error, worst point) with the least error for an argument in `[a, b]`, by a
 /// golden-section search (a bounded number of steps).
 fn golden_min(f: impl Fn(f64) -> (CubicBez, f64, usize), mut a: f64, mut b: f64) -> (CubicBez, f64, usize) {
@@ -1107,6 +1185,129 @@ fn end_point(sp: &SubPath, last: bool) -> Option<Point> {
 mod tests {
     use super::*;
 
+    std::thread_local! {
+        /// Anchors moved within a subpath's anchor list by [`remove_anchor`] and [`remove_anchors`].
+        static MOVES: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
+    }
+
+    pub(super) fn count_moves(n: usize) {
+        MOVES.set(MOVES.get() + n);
+    }
+
+    /// A subpath of `n` anchors from `seed`: corners, smooth points and points with one handle.
+    fn random_subpath(seed: &mut u64, n: usize, closed: bool) -> SubPath {
+        let mut rnd = || {
+            *seed ^= *seed << 13;
+            *seed ^= *seed >> 7;
+            *seed ^= *seed << 17;
+            *seed
+        };
+        let anchors = (0..n)
+            .map(|i| {
+                let p = Point::new(i as f64 * 20.0 + (rnd() % 100) as f64 / 10.0, (rnd() % 400) as f64 / 4.0);
+                let off = Vec2::new((rnd() % 300) as f64 / 10.0 - 15.0, (rnd() % 300) as f64 / 10.0 - 15.0);
+                match rnd() % 4 {
+                    0 => Anchor::corner(p),
+                    1 => Anchor::smooth(p, p + off),
+                    2 => Anchor::with_handles(p, p, p + off),
+                    _ => Anchor::with_handles(p, p - off, p),
+                }
+            })
+            .collect();
+        SubPath::new(anchors, closed)
+    }
+
+    /// `sp` with [`remove_anchor`] run for each of `indexes`, the last first.
+    fn one_at_a_time(sp: &SubPath, indexes: &[usize]) -> SubPath {
+        let mut order = indexes.to_vec();
+        order.sort_unstable_by(|a, b| b.cmp(a));
+        order.dedup();
+        let mut out = sp.clone();
+        for i in order {
+            remove_anchor(&mut out, i);
+        }
+        out
+    }
+
+    fn assert_same_bits(got: &SubPath, want: &SubPath, what: &str) {
+        let bits = |sp: &SubPath| -> Vec<[u64; 6]> {
+            sp.anchors.iter().map(|a| [a.p.x, a.p.y, a.h_in.x, a.h_in.y, a.h_out.x, a.h_out.y].map(f64::to_bits)).collect()
+        };
+        assert_eq!(got.closed, want.closed, "closed: {what}");
+        assert_eq!(bits(got), bits(want), "{what}");
+        assert_eq!(got.anchors.iter().map(|a| a.kind).collect::<Vec<_>>(), want.anchors.iter().map(|a| a.kind).collect::<Vec<_>>(), "{what}");
+    }
+
+    #[test]
+    fn removing_anchors_together_gives_what_removing_them_one_at_a_time_gives() {
+        let mut seed = 0x9e37_79b9_7f4a_7c15_u64;
+        for case in 0..600 {
+            let n = case % 40 + 1;
+            let closed = case % 2 == 0;
+            let sp = random_subpath(&mut seed, n, closed);
+            seed ^= seed << 13;
+            seed ^= seed >> 7;
+            seed ^= seed << 17;
+            // Up to n + 2 picks over 0..n + 2: runs of neighbors, both ends, everything, repeats
+            // and indexes past the end.
+            let picks = (seed % (n as u64 + 3)) as usize;
+            let mut indexes: Vec<usize> = (0..picks).map(|k| ((seed >> (k % 48)) as usize).wrapping_add(k * 7) % (n + 2)).collect();
+            if case % 5 == 0 {
+                indexes = (0..n).collect();
+            }
+            let mut got = sp.clone();
+            let removed = remove_anchors(&mut got, &indexes);
+            let want = one_at_a_time(&sp, &indexes);
+            let what = format!("case {case}: {n} anchors, closed {closed}, removing {indexes:?}");
+            assert_same_bits(&got, &want, &what);
+            assert_eq!(removed, sp.anchors.len() - want.anchors.len(), "{what}");
+        }
+    }
+
+    #[test]
+    fn removing_anchors_together_keeps_each_step_of_one_at_a_time() {
+        let curve = |p: Point, d: f64| Anchor::smooth(p, p + Vec2::new(d, 25.0));
+        let pts = [Point::new(0.0, 0.0), Point::new(50.0, 40.0), Point::new(100.0, 0.0), Point::new(150.0, 40.0), Point::new(200.0, 0.0)];
+        let cases: Vec<(SubPath, Vec<usize>)> = vec![
+            // A refit at one removal makes the next segment curved, which the next removal refits.
+            (
+                SubPath::new(
+                    vec![Anchor::corner(pts[0]), Anchor::corner(pts[1]), curve(pts[2], 20.0), Anchor::corner(pts[3]), Anchor::corner(pts[4])],
+                    false,
+                ),
+                vec![1, 2, 3],
+            ),
+            // The last anchor of an open path goes, then the one before it becomes the end.
+            (SubPath::new(pts.iter().map(|&p| curve(p, 15.0)).collect(), false), vec![2, 3, 4]),
+            // The first anchor of a closed path refits across the wrap.
+            (SubPath::new(pts.iter().map(|&p| curve(p, -10.0)).collect(), true), vec![0, 4]),
+            // A closed path down to two anchors stays closed with a handle, and opens without one.
+            (SubPath::new(pts.iter().map(|&p| curve(p, 10.0)).collect(), true), vec![1, 2, 3]),
+            (SubPath::polyline(&pts, true), vec![1, 2, 3]),
+            (SubPath::polyline(&pts, true), vec![0, 1, 2, 3]),
+            (SubPath::polyline(&pts[..1], false), vec![0]),
+            (SubPath::new(vec![], true), vec![0]),
+        ];
+        for (sp, indexes) in cases {
+            let mut got = sp.clone();
+            remove_anchors(&mut got, &indexes);
+            assert_same_bits(&got, &one_at_a_time(&sp, &indexes), &format!("{sp:?} removing {indexes:?}"));
+        }
+    }
+
+    #[test]
+    fn removing_anchors_together_moves_each_anchor_left_at_most_once() {
+        let n = 2001;
+        let pts: Vec<Point> = (0..n).map(|i| Point::new(i as f64, (i % 2) as f64)).collect();
+        let mut sp = SubPath::polyline(&pts, false);
+        let every_other: Vec<usize> = (1..n).step_by(2).collect();
+        MOVES.set(0);
+        assert_eq!(remove_anchors(&mut sp, &every_other), n / 2);
+        assert_eq!(sp.anchors.len(), n - n / 2);
+        let moves = MOVES.get();
+        assert!(moves < n, "{moves} anchors moved to remove {} of {n}", n / 2);
+    }
+
     /// The samples Object › Path › Smooth at `level` smooths for `sp`, a subpath with no corner,
     /// and the spread it smooths them with.
     fn smooth_samples(sp: &SubPath, level: f64) -> (Vec<Point>, f64) {
diff --git a/crates/pathops/src/lib.rs b/crates/pathops/src/lib.rs
index 291c956786..49b7c051f1 100644
--- a/crates/pathops/src/lib.rs
+++ b/crates/pathops/src/lib.rs
@@ -23,8 +23,8 @@ pub use boolean::{
 };
 pub use edit::{
     AverageAxis, SIMPLIFY_LEVEL, SMOOTH_AUTO_LEVEL, SimplifiedPart, SimplifyOptions, add_anchor_points, auto_simplify_level, average, join,
-    remove_anchor, remove_redundant_points, simplify, simplify_level_tolerance, simplify_part, simplify_with, smooth, smooth_level, smooth_options,
-    split_into_grid,
+    remove_anchor, remove_anchors, remove_redundant_points, simplify, simplify_level_tolerance, simplify_part, simplify_with, smooth, smooth_level,
+    smooth_options, split_into_grid,
 };
 pub use fit::{fit_cubics, fit_cubics_through};
 pub use offset::{Cap, Join, MAX_OFFSET_SEGMENT_PAIRS, offset_path, outline_stroke, stroke_region, try_offset_path};

From ccb14182e905848311dc6d61f417ace8eabf4bcf Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:38:10 -0800
Subject: [PATCH 45/48] Plug-ins: plugin.install approves from the grant it
 checks again, and others wait for its store writes

Without a plug-in store, plugin.install read the process grant once
for its later check and again for its approval. A grant another session
recorded between the two reads approved the module; when that session
revoked it before the install, the check saw the grant it first read
and the install recorded the revoked grant again. The approval now comes
from the first read.

plugin.install published the plug-in before it wrote the module and its
grant to the Plug-ins folder. A plugin.remove in another session in
between removed the plug-in, its file and its grant, and the install then
wrote both back, so the plug-in loaded with its grant at the next launch.
A session attaching the folder in between loaded the old version, which
kept running while the folder held the new one. plugin.remove, loads of
the stored plug-ins and loads of a plug-ins folder now wait until an
install has written the folder, and an install waits for them.

Docs: docs/plugins.md, docs/target-app-parity.md.
---
 crates/engine/src/cmd/plugin.rs    |  58 ++++++++++++++--
 crates/engine/src/store.rs         |   2 +
 crates/engine/src/tests/plugins.rs | 105 +++++++++++++++++++++++++++++
 docs/plugins.md                    |   5 +-
 docs/target-app-parity.md          |   2 +-
 5 files changed, 166 insertions(+), 6 deletions(-)

diff --git a/crates/engine/src/cmd/plugin.rs b/crates/engine/src/cmd/plugin.rs
index 783eac5eb7..3fa082bdb0 100644
--- a/crates/engine/src/cmd/plugin.rs
+++ b/crates/engine/src/cmd/plugin.rs
@@ -677,6 +677,35 @@ thread_local! {
     /// Tests: runs once in the next `plugin.install` on this thread after its checks and before it
     /// installs, as another session changing the plug-ins in between would.
     pub(crate) static BEFORE_INSTALL: std::cell::RefCell<Option<Box<dyn FnOnce()>>> = const { std::cell::RefCell::new(None) };
+    /// Tests: runs once in the next `plugin.install` on this thread right after it reads the grant
+    /// held for the id.
+    pub(crate) static AFTER_GRANT_READ: std::cell::RefCell<Option<Box<dyn FnOnce()>>> = const { std::cell::RefCell::new(None) };
+    /// Tests: runs once in the next `plugin.install` on this thread after it installs and before it
+    /// writes the store.
+    pub(crate) static BEFORE_STORE: std::cell::RefCell<Option<Box<dyn FnOnce()>>> = const { std::cell::RefCell::new(None) };
+    /// Tests: runs once on this thread when [`hold_plugin_changes`] finds the lock held and waits.
+    pub(crate) static WHILE_WAITING: std::cell::RefCell<Option<Box<dyn FnOnce()>>> = const { std::cell::RefCell::new(None) };
+}
+
+/// Held by `plugin.install` from its first read of the grant until the store holds what it
+/// installed, and throughout by `plugin.remove`, by loads of the stored plug-ins
+/// ([`Session::load_stored_plugins`]) and by loads of a plug-ins folder: these run one after the
+/// other across sessions.
+static PLUGIN_CHANGES: Mutex<()> = Mutex::new(());
+
+/// Takes [`PLUGIN_CHANGES`], waiting while another session holds it.
+pub(crate) fn hold_plugin_changes() -> std::sync::MutexGuard<'static, ()> {
+    match PLUGIN_CHANGES.try_lock() {
+        Ok(held) => held,
+        Err(std::sync::TryLockError::Poisoned(e)) => e.into_inner(),
+        Err(std::sync::TryLockError::WouldBlock) => {
+            #[cfg(test)]
+            if let Some(waiting) = WHILE_WAITING.take() {
+                waiting();
+            }
+            PLUGIN_CHANGES.lock().unwrap_or_else(|e| e.into_inner())
+        }
+    }
 }
 
 /// `plugin.install`: loads and checks the module, refuses `grant` and `allowHeavy` that neither an
@@ -688,7 +717,8 @@ thread_local! {
 /// the module's hash and installs it ([`registry::install_checked`]), and only then keeps both for
 /// the next start → its `plugin.list` entry. A refused install changes neither the plug-in store
 /// nor the plug-ins and grants of the process. A module that lists no permissions ends any grant
-/// held for its id.
+/// held for its id. A `plugin.remove` in another session waits until the install has written the
+/// store.
 fn install(s: &mut Session, p: &Value) -> Result<Value> {
     const C: &str = "plugin.install";
     // One use: spent whatever this install does.
@@ -706,9 +736,16 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
     {
         return Err(bad(C, "the module doesn't have the SHA-256 `hash` gives: nothing was installed"));
     }
-    // The grant the checks below count on. The install checks it again, with the plug-in installed
-    // under the id, before anything is stored: another session may change either in between.
+    // A removal in another session waits until the store holds what this install wrote.
+    let _held = hold_plugin_changes();
+    // The grant the checks below count on, the approval included. The install checks it again,
+    // with the plug-in installed under the id, before anything is stored: another session may
+    // change either in between.
     let seen_grant = registry::granted(plugin.id());
+    #[cfg(test)]
+    if let Some(between) = AFTER_GRANT_READ.take() {
+        between();
+    }
     let installed_already = || bad(C, format!("a plug-in with id {:?} is already installed", plugin.id()));
     let taken_over = || {
         let name = permissions::display_text(&plugin.manifest().name, permissions::MAX_SHOWN_NAME);
@@ -773,7 +810,12 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
         )
     };
     let granted_here = grant.as_ref().is_some_and(|g| wanted.iter().all(|w| g.contains(w)));
-    if !s.plugin_approved(&plugin) && !granted_here {
+    // Without a plug-in store, the grant read above approves the module or doesn't.
+    let approved = match s.plugin_dir {
+        None => !m.asks_permissions() || seen_grant.as_ref().is_some_and(|g| g.covers(&m.id, plugin.hash(), &wanted)),
+        Some(_) => s.plugin_approved(&plugin),
+    };
+    if !approved && !granted_here {
         return Err(needs_approval());
     }
     let needs_approval = needs_approval();
@@ -803,6 +845,10 @@ fn install(s: &mut Session, p: &Value) -> Result<Value> {
     // The plug-in gets the settings and cache kept for its id. A module without permissions takes
     // the id over, so nothing the user approved for the id applies any more.
     let installed = registry::install_checked(plugin, update, check, || s.attach_plugin_storage(&id), err)?;
+    #[cfg(test)]
+    if let Some(between) = BEFORE_STORE.take() {
+        between();
+    }
     // Installed plug-ins stay installed after a restart (#2541). The module is written first and its
     // grant only once it is there; when the grant can't be written, the store gets the module it
     // held back. A failed write of that module is only logged: the store then holds the new module,
@@ -946,6 +992,8 @@ fn load_folder(s: &Session, folder: &str) -> Value {
         None if crate::file_access::current().is_none() => Ok(()),
         None => Err(format!("automation path rejected: {} isn't valid text", f.display())),
     };
+    // A `plugin.install` in another session finishes writing the store first.
+    let _held = hold_plugin_changes();
     match registry::load_folder_where(std::path::Path::new(folder), allow, s.plugin_folder_approver()) {
         Ok(r) => {
             for id in &r.loaded {
@@ -1116,6 +1164,8 @@ fn info(_: &mut Session, p: &Value) -> Result<Value> {
 
 fn remove(s: &mut Session, p: &Value) -> Result<Value> {
     let id = str_param(p, "id").ok_or_else(|| bad("plugin.remove", "missing `id`"))?;
+    // An install in another session finishes its store writes first.
+    let _held = hold_plugin_changes();
     let installed = registry::get(id).is_some();
     // Settings and cache the store keeps for an id that isn't installed are deleted too.
     let stored = !installed && vectorcraft_plugins::manifest::valid_id(id) && s.has_plugin_storage(id);
diff --git a/crates/engine/src/store.rs b/crates/engine/src/store.rs
index 4943353ee0..8a18ce9824 100644
--- a/crates/engine/src/store.rs
+++ b/crates/engine/src/store.rs
@@ -421,6 +421,8 @@ impl Session {
         if safe_mode::active() {
             return;
         }
+        // A `plugin.install` in another session writes the store before this reads it.
+        let _held = crate::cmd::plugin::hold_plugin_changes();
         let grants = self.counted_grants(&dir);
         let limits = vectorcraft_plugins::Limits::default();
         let mut left = MAX_PLUGIN_STORE;
diff --git a/crates/engine/src/tests/plugins.rs b/crates/engine/src/tests/plugins.rs
index 0fc731a388..2661e85787 100644
--- a/crates/engine/src/tests/plugins.rs
+++ b/crates/engine/src/tests/plugins.rs
@@ -2897,6 +2897,111 @@ fn a_plug_in_installed_while_installing_needs_replace() {
     run(&mut s, "plugin.remove", json!({"id": id}));
 }
 
+/// Without a plug-in store, the install's approval comes from the grant it read first, the one it
+/// checks again before it installs: a grant another session records after that read approves
+/// nothing, so a revoke that follows it can't be undone by the install recording it again.
+#[test]
+fn a_grant_recorded_and_revoked_while_installing_approves_nothing() {
+    use vectorcraft_plugins::permissions::{Grant, GrantToken, Permission, sha256_hex};
+    use vectorcraft_plugins::registry;
+    let id = "test.engine.permissions.recordedwhileinstalling";
+    let bytes = asking(id, r#"["doc.read"]"#, &json!({"objects": []}));
+    let data = vectorcraft_format::base64_encode(&bytes);
+    let mut s = session();
+    let g = Grant { id: id.into(), hash: sha256_hex(&bytes), permissions: vec![Permission::DocRead] };
+    crate::cmd::plugin::AFTER_GRANT_READ.set(Some(Box::new(move || {
+        registry::grant(GrantToken::after_engine_approval(g));
+    })));
+    let e = s.execute("plugin.install", &json!({"dataBase64": data})).unwrap_err().to_string();
+    assert!(e.contains("asks for the permissions doc.read"), "{e}");
+    assert!(registry::get(id).is_none(), "nothing is installed");
+    registry::revoke(id);
+}
+
+/// A `plugin.remove` in another session while a module is installed waits until the install has
+/// written the store, then removes the module, its grant and the plug-in: nothing of it stays in
+/// the store for the next launch.
+#[test]
+fn a_removal_while_installing_leaves_nothing_in_the_store() {
+    use vectorcraft_plugins::registry;
+    let folder = crate::tests_links::Folder::new("plugin-store-removed-while-installing");
+    let id = "test.engine.permissions.removedwhileinstalling";
+    let bytes = asking(id, r#"["doc.read"]"#, &json!({"objects": []}));
+    let data = vectorcraft_format::base64_encode(&bytes);
+    let mut s = session();
+    s.attach_plugin_store(folder.0.clone());
+    let module = std::path::PathBuf::from(s.stored_plugin_file(id).unwrap());
+    let grants = folder.0.join("grants.json");
+
+    let (said, heard) = std::sync::mpsc::channel::<&'static str>();
+    let (handed, remover) = std::sync::mpsc::channel();
+    let dir = folder.0.clone();
+    crate::cmd::plugin::BEFORE_STORE.set(Some(Box::new(move || {
+        let thread = std::thread::spawn(move || {
+            let tell = said.clone();
+            crate::cmd::plugin::WHILE_WAITING.set(Some(Box::new(move || {
+                let _ = tell.send("waiting");
+            })));
+            let mut other = session();
+            other.attach_plugin_store(dir);
+            let removed = other.execute("plugin.remove", &json!({"id": id})).map(|_| ()).map_err(|e| e.to_string());
+            let _ = said.send("removed");
+            removed
+        });
+        // The removal has finished, or waits for this install.
+        let first = heard.recv().unwrap_or("gone");
+        let _ = handed.send((first, thread));
+    })));
+    run(&mut s, "plugin.install", json!({"dataBase64": data, "grant": ["doc.read"]}));
+    let (first, thread) = remover.recv().unwrap();
+    assert_eq!(thread.join().unwrap(), Ok(()));
+    assert!(registry::get(id).is_none() && registry::granted(id).is_none(), "the plug-in and its grant are gone");
+    assert!(!module.exists(), "no module stays in the store");
+    assert!(!std::fs::read_to_string(&grants).is_ok_and(|g| g.contains(id)), "no grant stays in the store");
+    assert_eq!(first, "waiting", "the removal waits for the install");
+}
+
+/// Another session that attaches the plug-in store while a new version is installed loads the
+/// stored plug-ins once the install has written the store: the version that runs is the one the
+/// store keeps for the next launch.
+#[test]
+fn a_store_loaded_while_installing_loads_the_new_version() {
+    use vectorcraft_plugins::permissions::sha256_hex;
+    use vectorcraft_plugins::registry;
+    let folder = crate::tests_links::Folder::new("plugin-store-loaded-while-installing");
+    let id = "test.engine.permissions.loadedwhileinstalling";
+    let old = asking(id, r#"["doc.read"]"#, &json!({"objects": []}));
+    let new = asking(id, r#"["doc.read"]"#, &json!({"objects": [], "documentData": null}));
+    let mut s = session();
+    s.attach_plugin_store(folder.0.clone());
+    run(&mut s, "plugin.install", json!({"dataBase64": vectorcraft_format::base64_encode(&old), "grant": ["doc.read"]}));
+
+    let (said, heard) = std::sync::mpsc::channel::<&'static str>();
+    let (handed, loader) = std::sync::mpsc::channel();
+    let dir = folder.0.clone();
+    crate::cmd::plugin::BEFORE_STORE.set(Some(Box::new(move || {
+        let thread = std::thread::spawn(move || {
+            let tell = said.clone();
+            crate::cmd::plugin::WHILE_WAITING.set(Some(Box::new(move || {
+                let _ = tell.send("waiting");
+            })));
+            session().attach_plugin_store(dir);
+            let _ = said.send("loaded");
+        });
+        // The load has finished, or waits for this install.
+        let first = heard.recv().unwrap_or("gone");
+        let _ = handed.send((first, thread));
+    })));
+    let data = vectorcraft_format::base64_encode(&new);
+    run(&mut s, "plugin.install", json!({"dataBase64": data, "grant": ["doc.read"], "replace": true}));
+    let (first, thread) = loader.recv().unwrap();
+    thread.join().unwrap();
+    assert_eq!(registry::get(id).map(|p| p.hash().to_string()), Some(sha256_hex(&new)), "the new version runs");
+    assert_eq!(std::fs::read(s.stored_plugin_file(id).unwrap()).unwrap(), new, "the store keeps the new version");
+    assert_eq!(first, "waiting", "the load waits for the install");
+    run(&mut s, "plugin.remove", json!({"id": id}));
+}
+
 /// Runs the test `name` of this module again in a process of its own → whether this is that
 /// process. The list of disabled plug-ins is kept for the whole process, and the other tests here
 /// read it again each time they attach a plug-in store.
diff --git a/docs/plugins.md b/docs/plugins.md
index ac0d515af4..a932983acd 100644
--- a/docs/plugins.md
+++ b/docs/plugins.md
@@ -267,7 +267,10 @@ capability model proposed for PhotoCraft plug-ins
   tries again. A refused install leaves the grant, the plug-in installed with the id, the `Plug-ins` folder and the
   list of disabled plug-ins as they are. When another session installs a plug-in with the id or changes its grant
   while `plugin.install` checks a module, the install is refused, before anything is written to the `Plug-ins` folder,
-  if the other plug-in would need `replace: true` or the changed grant no longer approves the module. When an install of a module that lists no permissions can't
+  if the other plug-in would need `replace: true` or the changed grant no longer approves the module. A
+  `plugin.remove` in another session waits until the install has written the `Plug-ins` folder, and then removes the
+  module and its grant. Loading the `Plug-ins` folder or a plug-ins folder in another session waits for it too. When
+  an install of a module that lists no permissions can't
   write the module to the `Plug-ins` folder, or can't remove the grant from `grants.json`, the folder keeps the module
   it held and `grants.json` keeps the grant. The new module runs until the session ends. When the grant can't be
   removed and the module already stored can't be read back or written back, the new module stays in the folder, and
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index 218a6e5e78..5ae711b523 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -1808,7 +1808,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur
 - **Plug-in approval needs a person (G17):** a plug-in's permissions and heavy budget are approved in a dialog that only a person can confirm: the control channel, MCP and injected input are refused, and `plugin.install` takes `grant` or `allowHeavy` only with that approval. `vectorcraft-cli mcp` and `run` refuse them unless started with `--allow-plugin-grants`. Regressions: `crates/engine/src/tests/plugins.rs`, `crates/ui-egui/src/tests/automation.rs`, `apps/vectorcraft-cli/tests/it/cli.rs`. Scores and hours unchanged.
 - **A dialog's OK runs what it was opened for:** `ui.dialog.set`, and MCP's `answer_dialog` through it, can set a `__` field only when it is a control of that kind of dialog (a section or tab shown, a link between two fields, a name or search being typed). Every other `__` field, such as the `__command` and `__params` of a confirmation or the generic parameter dialog, a plug-in command dialog's `__command` and `__plugin`, or the paste a swatch conflict waits to finish, is refused with "the `<kind>` dialog cannot set protected field `<field>`"; the request sets no field, and with `action: "confirm"` OK does not run. Regressions: `crates/ui-egui/src/tests/automation.rs`, `crates/ui-egui/src/control/tests.rs`. Scores and hours unchanged.
 - **Only an approval records a plug-in grant (G17):** `vectorcraft_plugins::registry::grant` takes a `GrantToken`, which the engine makes after an approval and when it loads `grants.json`, and `registry::install`, `install_bytes` and folder loads refuse a module that lists permissions no recorded grant gives this very module (`Error::NeedsApproval`), leaving the plug-in under its id and the revision as they were. A module without `permissions`, or with an empty list, installs as before. `docs/plugins.md` says what the approval does not protect against (native code linked into the app, another program running as the same user, the unsigned `grants.json`). Regressions: `crates/plugins/src/registry.rs`, `crates/plugins/tests/grant_sites.rs`, `crates/engine/src/tests/plugins.rs`. Scores and hours unchanged.
-- **A refused plug-in install writes nothing (G17):** `plugin.install` checks the plug-in installed under the module's id and its grant again while it records the grant and installs the module (`registry::install_checked`), and only then writes the module and its grant to the `Plug-ins` folder, attaches its settings and cache and turns a disabled plug-in on. When another session installed a plug-in with the id that would need `replace: true`, or changed the grant the checks relied on, the install is refused and the folder, `grants.json`, the disabled list and the installed plug-in stay as they were. VectorCraft's own rule. Regressions: `crates/engine/src/tests/plugins.rs`. Scores and hours unchanged.
+- **A refused plug-in install writes nothing (G17):** `plugin.install` checks the plug-in installed under the module's id and its grant again while it records the grant and installs the module (`registry::install_checked`), and only then writes the module and its grant to the `Plug-ins` folder, attaches its settings and cache and turns a disabled plug-in on. When another session installed a plug-in with the id that would need `replace: true`, or changed the grant the checks relied on, the install is refused and the folder, `grants.json`, the disabled list and the installed plug-in stay as they were. Without a plug-in store, the approval comes from the grant the install checks again. A `plugin.remove`, or a load of the folder or of a plug-ins folder, in another session waits until the install has written the folder. VectorCraft's own rule. Regressions: `crates/engine/src/tests/plugins.rs`. Scores and hours unchanged.
 - **Plug-in approval waits before OK (G17):** the approval dialog's OK stays disabled until its question has been on screen in the focused window for half a second, VectorCraft's own value; a click, Enter, Space, or a press begun before then installs nothing, and the dialog stays open. The wait starts over for every new question, even one that reads the same, and when the window gets the focus back, so a question swapped in just before a click is not approved by it. Cancel works at once. Regressions: `crates/ui-egui/src/tests/plugins.rs`. Scores and hours unchanged.
 - **An install automation asked for needs the person to start it (G17):** an approval question that a control request, MCP, injected input or a file dialog one of them opened leads to keeps OK disabled and refuses every confirm, a person's click included; it says to choose Object › Plug-ins › Install Plug-in…, and `ui.installPlugin` answers `approval: "personMustStartInstall"`. The person's own Install Plug-in…, File › Open or drop inspects the module again and asks a new question. Automation's `replace: true` no longer skips the question about taking another module's place, and that question now opens in the approval dialog for everyone. VectorCraft's own rule. Regressions: `crates/ui-egui/src/tests/automation.rs`, `crates/ui-egui/src/tests/plugins.rs`. Scores and hours unchanged.
 - **A plug-in with no permissions ends its id's grant (G17):** installing a module that lists no permissions under a granted id forgets the grant, in the process and in `grants.json`, so the formerly approved bytes need a new approval. Attaching a `Plug-ins` folder whose module for that id lists no permissions forgets it too, and plug-in folders forget the process's grant. A refused install leaves the grant. Regressions: `crates/engine/src/tests/plugins.rs`, `crates/engine/tests/plugin_safe_mode.rs`. Scores and hours unchanged.

From fb9160be7aaf92f39900c3db303be3241fa6dd00 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 06:58:01 -0800
Subject: [PATCH 46/48] Paths: Delete, Cut and Cut Path read each subpath's own
 selected anchors

Clear, path.deleteAnchors, Cut, Copy and Cut Path scanned every selected
anchor or segment of a path once for each of its subpaths, so a path with
thousands of subpaths took time that grew with the square of their count.
The selection sets are ordered by subpath, so a new helper, subpath_refs,
reads one subpath's entries with a range lookup instead. The results are
unchanged.

With one selected interior anchor on each of 8,000 open subpaths of one
path, Clear took a median of 74 ms of thread CPU time before and 3 ms
after (release build, five runs each; the timings are noisy because the
CPU was shared and loaded).

Tests in delete_path_pieces.rs check exact surviving subpaths and their
order for anchor and segment selections across open and closed subpaths,
an untouched subpath, references to missing subpaths and indexes, one
Undo/Redo step and a second Clear, and Cut Path on several subpaths.
---
 crates/engine/src/cmd/clipboard.rs           |   8 +-
 crates/engine/src/cmd/edit.rs                |   2 +-
 crates/engine/src/cmd/path.rs                |  12 +-
 crates/engine/tests/it/delete_path_pieces.rs | 147 ++++++++++++++++++-
 docs/target-app-parity.md                    |   1 +
 5 files changed, 159 insertions(+), 11 deletions(-)

diff --git a/crates/engine/src/cmd/clipboard.rs b/crates/engine/src/cmd/clipboard.rs
index d28bd0e6c9..446634d21c 100644
--- a/crates/engine/src/cmd/clipboard.rs
+++ b/crates/engine/src/cmd/clipboard.rs
@@ -143,17 +143,13 @@ pub(crate) fn subpath_selected_segments(
     let has_explicit_segs = seg_refs.is_some_and(|segments| !segments.is_empty());
     if has_explicit_segs {
         if let Some(segments) = seg_refs {
-            for &(s, seg) in segments {
-                if s == si && seg < seg_count {
-                    selected_segs.insert(seg);
-                }
-            }
+            selected_segs.extend(super::path::subpath_refs(segments, si).filter(|&seg| seg < seg_count));
         }
         return selected_segs;
     }
 
     if let Some(anchors) = anchor_refs {
-        let sub_anchors: BTreeSet<usize> = anchors.iter().filter_map(|&(s, a)| (s == si && a < n).then_some(a)).collect();
+        let sub_anchors: BTreeSet<usize> = super::path::subpath_refs(anchors, si).filter(|&a| a < n).collect();
         if !sub_anchors.is_empty() {
             for i in 0..seg_count {
                 let next = (i + 1) % n;
diff --git a/crates/engine/src/cmd/edit.rs b/crates/engine/src/cmd/edit.rs
index f3befb3462..474a87e457 100644
--- a/crates/engine/src/cmd/edit.rs
+++ b/crates/engine/src/cmd/edit.rs
@@ -1086,7 +1086,7 @@ fn cut_direct_selection(s: &mut Session, roots: &[NodeId]) -> Result<Value> {
                     subpaths.extend(super::path::without_segments(sp, &cuts));
                 } else {
                     // Picked anchors leave the path with their connections, as Clear removes them.
-                    let gone: BTreeSet<usize> = anchor_refs.into_iter().flatten().filter_map(|&(s, a)| (s == si).then_some(a)).collect();
+                    let gone: BTreeSet<usize> = anchor_refs.into_iter().flat_map(|refs| super::path::subpath_refs(refs, si)).collect();
                     subpaths.extend(super::path::without_anchors(sp, &gone));
                 }
             }
diff --git a/crates/engine/src/cmd/path.rs b/crates/engine/src/cmd/path.rs
index b4639f0de5..ed5aaac79c 100644
--- a/crates/engine/src/cmd/path.rs
+++ b/crates/engine/src/cmd/path.rs
@@ -1276,7 +1276,7 @@ pub(crate) fn delete_anchors(s: &mut Session, p: &Value) -> Result<Value> {
                         .into_iter()
                         .enumerate()
                         .flat_map(|(si, sp)| {
-                            let cuts = refs.iter().filter_map(|&(s, seg)| (s == si).then_some(seg)).collect();
+                            let cuts = subpath_refs(refs, si).collect();
                             without_segments(sp, &cuts)
                         })
                         .filter(|s| s.anchors.len() >= 2)
@@ -1288,7 +1288,7 @@ pub(crate) fn delete_anchors(s: &mut Session, p: &Value) -> Result<Value> {
                         .into_iter()
                         .enumerate()
                         .flat_map(|(si, sp)| {
-                            let gone = set.iter().filter_map(|&(s, ai)| (s == si).then_some(ai)).collect();
+                            let gone = subpath_refs(set, si).collect();
                             without_anchors(sp, &gone)
                         })
                         .filter(|s| s.anchors.len() >= 2)
@@ -1314,6 +1314,12 @@ pub(crate) fn delete_anchors(s: &mut Session, p: &Value) -> Result<Value> {
     ok()
 }
 
+/// The anchor or segment indexes in `refs` that belong to subpath `si`, in index order.
+/// `refs` is ordered by subpath first, so this reads only that subpath's entries.
+pub(super) fn subpath_refs(refs: &BTreeSet<(usize, usize)>, si: usize) -> impl Iterator<Item = usize> + '_ {
+    refs.range((si, 0)..=(si, usize::MAX)).map(|&(_, i)| i)
+}
+
 /// Retain path `id` from `d` without copying its geometry before deletion takes its subpaths.
 /// The shared snapshot supplies the original path classification and, only if needed, gradient
 /// bounds after the working node's geometry has moved. Returns `NoNode` for a missing/non-path ID.
@@ -1722,7 +1728,7 @@ fn cut_at_anchors(s: &mut Session, _: &Value) -> Result<Value> {
         let Some(pd) = st.doc.node(*id).and_then(|n| n.path_data()) else { continue };
         let (mut subs, mut starts) = (vec![], vec![]);
         for (si, sp) in pd.subpaths.iter().enumerate() {
-            let at: BTreeSet<usize> = set.iter().filter(|(s, _)| *s == si).map(|(_, a)| *a).collect();
+            let at: BTreeSet<usize> = subpath_refs(set, si).collect();
             let pieces = sp.cut_at(&at);
             // The pieces that start at a cut: every piece of an opened closed subpath, all but the
             // first of an open one.
diff --git a/crates/engine/tests/it/delete_path_pieces.rs b/crates/engine/tests/it/delete_path_pieces.rs
index 0d8b7171f7..afc304e99f 100644
--- a/crates/engine/tests/it/delete_path_pieces.rs
+++ b/crates/engine/tests/it/delete_path_pieces.rs
@@ -2,7 +2,7 @@
 
 use serde_json::json;
 use vectorcraft_color::{Gradient, GradientGeom, GradientKind, GradientPaint, Paint};
-use vectorcraft_doc::{Appearance, NodeId, NodeKind};
+use vectorcraft_doc::{Appearance, NodeId, NodeKind, selection::Selection};
 use vectorcraft_engine::Session;
 use vectorcraft_geom::{Affine, Anchor, PathData, Rect, SubPath};
 use vectorcraft_testkit::{invariants::check_session, raster::render_artboard};
@@ -226,6 +226,151 @@ fn deletion_split_preserves_gradient_placement() {
     }
 }
 
+/// Subpath `i` of a multi-subpath test path: four cubic anchors on their own row, so every piece
+/// that survives a deletion can be matched exactly.
+fn row(i: usize, closed: bool) -> SubPath {
+    let y = 10.0 + 3.0 * i as f64;
+    let anchors = (0..4)
+        .map(|k| {
+            let mut a = Anchor::corner((10.0 + 20.0 * f64::from(k), y).into());
+            a.h_in = a.p + (-3.0, -1.0);
+            a.h_out = a.p + (3.0, 1.0);
+            a
+        })
+        .collect();
+    SubPath::new(anchors, closed)
+}
+
+/// An open piece made of `indexes` of `sp`, its unused end handles retracted as deletion leaves them.
+fn piece(sp: &SubPath, indexes: &[usize]) -> SubPath {
+    let mut run: Vec<Anchor> = indexes.iter().map(|&i| sp.anchors[i]).collect();
+    if let Some(first) = run.first_mut() {
+        first.h_in = first.p;
+    }
+    if let Some(last) = run.last_mut() {
+        last.h_out = last.p;
+    }
+    SubPath::new(run, false)
+}
+
+/// Put `subpaths` into a new path object and return its ID.
+fn multi_subpath_path(s: &mut Session, subpaths: Vec<SubPath>) -> NodeId {
+    let id = rectangle(s);
+    *std::sync::Arc::make_mut(&mut s.doc_mut().unwrap().doc).node_mut(id).unwrap().path_data_mut().unwrap() = PathData::new(subpaths);
+    id
+}
+
+/// Run `command` on the current selection, check the path's surviving subpaths and that one Undo
+/// restores the document and `before_selection` and one Redo repeats the edit, then check that a
+/// second Clear removes the survivors.
+fn delete_and_check(s: &mut Session, command: &str, id: NodeId, expected: &[SubPath], before_selection: &Selection) {
+    let before_doc = serde_json::to_value(&s.doc().unwrap().doc).unwrap();
+    let history = s.doc().unwrap().history.undo.len();
+    s.execute(command, &json!({})).unwrap();
+    let st = s.doc().unwrap();
+    assert_eq!(st.doc.node(id).unwrap().path_data().unwrap().subpaths, expected, "{command}");
+    assert_eq!(st.selection.objects, [id], "{command}: a multi-subpath path keeps its object");
+    assert!(st.selection.anchors.is_empty() && st.selection.segments.is_empty());
+    assert_eq!(st.history.undo.len(), history + 1);
+    let after_doc = serde_json::to_value(&st.doc).unwrap();
+    let after_selection = st.selection.clone();
+    check_session(s).unwrap();
+    s.execute("edit.undo", &json!({})).unwrap();
+    assert_eq!(serde_json::to_value(&s.doc().unwrap().doc).unwrap(), before_doc);
+    assert_eq!(&s.doc().unwrap().selection, before_selection);
+    s.execute("edit.redo", &json!({})).unwrap();
+    assert_eq!(serde_json::to_value(&s.doc().unwrap().doc).unwrap(), after_doc);
+    assert_eq!(s.doc().unwrap().selection, after_selection);
+    s.execute("edit.clear", &json!({})).unwrap();
+    assert!(s.doc().unwrap().doc.node(id).is_none(), "{command}: the second Clear removes the survivors");
+}
+
+/// Selected anchors on many subpaths each remove only their own subpath's anchors; anchors named on
+/// a subpath or index the path does not have remove nothing.
+#[test]
+fn deleting_anchors_on_many_subpaths_removes_each_subpaths_own_anchors() {
+    for command in ["edit.clear", "path.deleteAnchors", "edit.cut"] {
+        let mut s = session();
+        let subpaths: Vec<SubPath> = (0..6).map(|i| row(i, i % 2 == 1)).collect();
+        let id = multi_subpath_path(&mut s, subpaths.clone());
+        s.execute("select.anchors", &json!({"id": id.0, "anchors": [[0, 1], [1, 2], [2, 0], [2, 9], [4, 3], [5, 1], [7, 1]]})).unwrap();
+        // Subpath 3 has no selected anchor and stays closed and unchanged.
+        let expected = [
+            piece(&subpaths[0], &[2, 3]),
+            piece(&subpaths[1], &[3, 0, 1]),
+            piece(&subpaths[2], &[1, 2, 3]),
+            subpaths[3].clone(),
+            piece(&subpaths[4], &[0, 1, 2]),
+            piece(&subpaths[5], &[2, 3, 0]),
+        ];
+        let before = s.doc().unwrap().selection.clone();
+        delete_and_check(&mut s, command, id, &expected, &before);
+    }
+}
+
+/// Selected segments on many subpaths each cut only their own subpath; a segment reference to a
+/// subpath or segment the path does not have cuts nothing.
+#[test]
+fn deleting_segments_on_many_subpaths_cuts_each_subpaths_own_segments() {
+    for command in ["edit.clear", "path.deleteAnchors", "edit.cut"] {
+        let mut s = session();
+        let subpaths: Vec<SubPath> = (0..6).map(|i| row(i, i % 2 == 1)).collect();
+        let id = multi_subpath_path(&mut s, subpaths.clone());
+        s.execute("select.segments", &json!({"id": id.0, "segments": [[0, 1], [1, 3], [4, 0], [5, 1]]})).unwrap();
+        // Undo prunes the restored selection (`Selection::prune`), which drops references to
+        // segments the path does not have, so it restores the selection as it is here.
+        let before = s.doc().unwrap().selection.clone();
+        // `select.segments` refuses references to missing segments, so these are added directly.
+        let refs = s.doc_mut().unwrap().selection.segments.get_mut(&id).unwrap();
+        refs.extend([(2, 9), (7, 0)]);
+        let expected = [
+            piece(&subpaths[0], &[0, 1]),
+            piece(&subpaths[0], &[2, 3]),
+            piece(&subpaths[1], &[0, 1, 2, 3]),
+            subpaths[2].clone(),
+            subpaths[3].clone(),
+            piece(&subpaths[4], &[1, 2, 3]),
+            piece(&subpaths[5], &[2, 3, 0, 1]),
+        ];
+        delete_and_check(&mut s, command, id, &expected, &before);
+    }
+}
+
+/// One selected interior anchor on each of many subpaths removes exactly that anchor from each,
+/// keeping the subpaths in their original order.
+#[test]
+fn deleting_one_anchor_on_each_of_many_subpaths_keeps_subpath_order() {
+    let mut s = session();
+    let subpaths: Vec<SubPath> = (0..400).map(|i| row(i, false)).collect();
+    let id = multi_subpath_path(&mut s, subpaths.clone());
+    let refs: Vec<[usize; 2]> = (0..400).filter(|i| i % 7 != 3).map(|i| [i, 1]).collect();
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": refs})).unwrap();
+    let expected: Vec<SubPath> = subpaths.iter().enumerate().map(|(i, sp)| if i % 7 == 3 { sp.clone() } else { piece(sp, &[2, 3]) }).collect();
+    let before = s.doc().unwrap().selection.clone();
+    delete_and_check(&mut s, "edit.clear", id, &expected, &before);
+}
+
+/// Cut Path cuts each subpath of a multi-subpath path only at that subpath's selected anchors.
+#[test]
+fn cutting_at_anchors_on_many_subpaths_cuts_each_subpath_at_its_own_anchors() {
+    let mut s = session();
+    let subpaths: Vec<SubPath> = (0..6).map(|i| row(i, i % 2 == 1)).collect();
+    let id = multi_subpath_path(&mut s, subpaths.clone());
+    let refs = [(0, 1), (1, 2), (2, 9), (4, 2), (5, 0), (5, 2), (7, 1)];
+    s.execute("select.anchors", &json!({"id": id.0, "anchors": refs.map(|(a, b)| [a, b])})).unwrap();
+    s.execute("path.cutAtAnchors", &json!({})).unwrap();
+    let expected: Vec<SubPath> = subpaths
+        .iter()
+        .enumerate()
+        .flat_map(|(si, sp)| sp.cut_at(&refs.iter().filter(|r| r.0 == si).map(|r| r.1).collect::<std::collections::BTreeSet<_>>()))
+        .collect();
+    // Subpaths 0 and 4 become two pieces each, closed subpath 1 opens into one, closed subpath 5
+    // becomes two, and subpaths 2 and 3 stay as they were.
+    assert_eq!(expected.len(), 9);
+    assert_eq!(s.doc().unwrap().doc.node(id).unwrap().path_data().unwrap().subpaths, expected);
+    check_session(&s).unwrap();
+}
+
 /// A connected remainder keeps automatic fitting; pinning is needed only for separate objects.
 #[test]
 fn deleting_one_segment_keeps_unplaced_gradients() {
diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md
index f04ee3c910..094697b277 100644
--- a/docs/target-app-parity.md
+++ b/docs/target-app-parity.md
@@ -569,6 +569,7 @@ since 2026-10-01.
 
 
 - **Selection — disconnected path deletion (#3380, deletion only):** Clear/Delete and Cut turn surviving disconnected pieces of an ordinary contour into independent selected sibling objects. The first keeps its ID; all keep appearance, baked transforms and stacking order. `deletion_split_preserves_gradient_placement` compares rendered survivors with the original paint space and checks linear/radial fill/stroke vectors, already placed gradients and atomic Undo/Redo; connected remainders keep automatic fitting. Existing multi-subpath paths and explicit compound members retain their semantics. Original synthetic regressions in `crates/engine/tests/it/delete_path_pieces.rs` cover styled/transformed rectangles, cubic handles, compound preservation and atomic Undo/Redo; `crates/ui-egui/src/tests/removeanchors.rs` covers real-frame Delete/Backspace and a second Delete removing all survivors. Segment endpoint highlighting remains open. Scores and hours unchanged.
+- **Selection: deletion on paths with many subpaths:** Clear/Delete, `path.deleteAnchors`, Copy, Cut and Cut Path read each subpath's selected anchors or segments directly from the path's ordered selection, instead of scanning every selected anchor or segment of the path once per subpath. The result is unchanged: `crates/engine/tests/it/delete_path_pieces.rs` checks exact surviving subpaths and their order, open and closed contours, an untouched subpath, references to missing subpaths and indexes, one Undo/Redo step and a second Delete, for anchor and segment selections on one path. Scores and hours unchanged.
 - **Panel collapse controls (#5925, in part):** The small » in a floating tab-group header moves that group into the side icon rail, reusing the existing rail or creating one. An opened rail panel has the same control to fold its flyout back into the rail, including after a tab switch. Both controls preserve the tab group and its menu; other floating groups and full-width docked headers stay as they were. Pointer regressions in `crates/ui-egui/src/panel_docking/tests.rs` cover grouped tabs, reopening, separate groups, a missing rail, the menu and flyout closure after switching tabs; `native_tests.rs` covers the native-window click and removal of the empty palette. Scores and estimates unchanged.
 
 - 3D lighting presets: `crates/effects/src/lighting_presets.rs`, `crates/engine/src/cmd/effectcmd/lighting_presets_tests.rs` and the pointer tests in `crates/ui-egui/src/dialogs/revolve/tests.rs` cover recognition, atomic targeting, native round trips, preview, Cancel, reset and Undo.

From 7f18643ada19a3701187c69a4af33d2673d6287f Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 07:12:59 -0800
Subject: [PATCH 47/48] Type: measuring a threaded frame copies its own text
 once

Each measurement of a frame's share started from a copy of the whole frame, its own runs included, and then replaced the runs. The frame is now copied once without its own text, and each measurement copies that. A test counts the frame text copied to measure frames that already hold text.
---
 crates/text/src/thread.rs       | 25 ++++++++++++++++++++++++-
 crates/text/src/thread/tests.rs | 23 +++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/crates/text/src/thread.rs b/crates/text/src/thread.rs
index 0abd172bff..7850fcc717 100644
--- a/crates/text/src/thread.rs
+++ b/crates/text/src/thread.rs
@@ -96,6 +96,25 @@ fn fit_bytes() -> usize {
     FIT_BYTES.get()
 }
 
+#[cfg(test)]
+thread_local! {
+    /// The bytes of frames' own text copied on this thread to measure them ([`probe_copied`]).
+    static PROBE_COPIED: std::cell::Cell<usize> = const { std::cell::Cell::new(0) };
+}
+
+/// The bytes of frames' own text copied on this thread to measure them.
+#[cfg(test)]
+fn probe_copied() -> usize {
+    PROBE_COPIED.get()
+}
+
+/// A copy of `frame` to measure text in, its own text counted as copied ([`probe_copied`]).
+fn copy_to_measure(frame: &TextObject) -> TextObject {
+    #[cfg(test)]
+    PROBE_COPIED.set(PROBE_COPIED.get() + runs_len(&frame.runs));
+    frame.clone()
+}
+
 /// The fewest bytes of story a frame is measured with before the measured text grows.
 const MIN_MEASURE: usize = 512;
 
@@ -372,8 +391,12 @@ pub fn distribute_continuing_levels(
         let n = if i + 1 == frames.len() {
             len
         } else {
+            // The frame without its own text, copied once and then for each measurement.
+            let mut base = copy_to_measure(f);
+            base.runs = Vec::new();
+            base.paras = Vec::new();
             let probe = |runs: Vec<TextRun>| {
-                let mut probe = (*f).clone();
+                let mut probe = copy_to_measure(&base);
                 let styles = slice_paras(paras, first_para, &runs);
                 probe.runs = runs;
                 probe.set_paragraph_styles(styles);
diff --git a/crates/text/src/thread/tests.rs b/crates/text/src/thread/tests.rs
index 5ae49442fb..eac74d635f 100644
--- a/crates/text/src/thread/tests.rs
+++ b/crates/text/src/thread/tests.rs
@@ -682,6 +682,29 @@ fn many_frames_measure_about_the_text_they_take() {
     assert!(measured <= bound, "measured {measured} bytes for {placed} placed in {} frames (at most {bound})", frames.len());
 }
 
+/// Frames that already hold text and take a story over several measurements each: each frame's own
+/// text is copied once to measure it, not once for each measurement.
+#[test]
+fn frames_with_text_copy_it_once_to_measure_it() {
+    let db = FontDb::global();
+    let text = paragraphs(600);
+    let story = vec![TextRun::new(text.clone(), CharStyle::default())];
+    let mut frames: Vec<TextObject> = (0..4).map(|k| sized(400.0 * k as f64, 300.0, 600.0)).collect();
+    for f in &mut frames {
+        f.runs = vec![TextRun::new("Old text. ".repeat(500), CharStyle::default())];
+    }
+    let refs: Vec<&TextObject> = frames.iter().collect();
+    let (fit_before, copied_before) = (fit_bytes(), probe_copied());
+    let parts = distribute(db, &refs, &story, &[]);
+    let (measured, copied) = (fit_bytes() - fit_before, probe_copied() - copied_before);
+    let joined: String = parts.iter().flat_map(|p| &p.runs).map(|r| r.text.as_str()).collect();
+    assert_eq!(joined, text, "no character lost or duplicated");
+    let first = runs_len(&parts[0].runs);
+    assert!(measured > 2 * first, "the first frame is measured more than once: {measured} bytes for {first}");
+    let own: usize = frames[..frames.len() - 1].iter().map(|f| runs_len(&f.runs)).sum();
+    assert_eq!(copied, own, "each frame before the last copies its own text once to measure it");
+}
+
 #[test]
 fn short_story_leaves_later_frames_empty_with_a_style() {
     let db = FontDb::global();

From 07522fb4e6b92f0d470ebd0d94ac6f2831ae8c37 Mon Sep 17 00:00:00 2001
From: dotCooCoo <RobertLeeLW@gmail.com>
Date: Fri, 13 Nov 2026 07:01:50 -0800
Subject: [PATCH 48/48] Tests: ui-egui tests remove the temp folders they make

Place, taskbar, opening, Save Options, Missing Fonts and one control
test left their folders in the system temp folder after every run.
Other opening and control tests removed theirs only at the end of a
passing test, so a failing one left its folder.

- A test-only Folder guard (crate::tests_folder) removes its folder
  with everything in it when dropped, also when the test panics, as
  the find-files tests' Tree guard does (#6948).
- The opening and control tests that made their own folders use it.
- Each Place test gets its own folder instead of one shared per-process
  folder, so one test's cleanup cannot remove another's files.
- The Missing Fonts helper no longer removes and remakes the folder
  vectorcraft_testkit::temp_dir made, which keeps it owner-only on Unix.
- vectorcraft_testkit::temp_dir is unchanged.
---
 crates/ui-egui/src/control/tests.rs           | 35 +++----
 .../src/dialogs/missing_fonts/tests.rs        | 16 ++--
 .../ui-egui/src/dialogs/save_options/tests.rs | 11 ++-
 crates/ui-egui/src/lib.rs                     |  4 +-
 crates/ui-egui/src/opening/tests.rs           | 33 ++-----
 crates/ui-egui/src/tests.rs                   |  1 +
 crates/ui-egui/src/tests/folder.rs            | 76 +++++++++++++++
 crates/ui-egui/src/tests/place.rs             | 93 +++++++++++--------
 crates/ui-egui/src/tests/taskbar.rs           |  8 +-
 9 files changed, 171 insertions(+), 106 deletions(-)
 create mode 100644 crates/ui-egui/src/tests/folder.rs

diff --git a/crates/ui-egui/src/control/tests.rs b/crates/ui-egui/src/control/tests.rs
index 19751bd3cd..ac8fbfa3eb 100644
--- a/crates/ui-egui/src/control/tests.rs
+++ b/crates/ui-egui/src/control/tests.rs
@@ -33,11 +33,9 @@ fn hiding(hidden: &[(&str, &str)], readable: &[&str]) -> super::Hiding {
 
 /// [`super::hide_library_ids`] on `reply`, under a read root made for `tag`.
 fn hide_under_a_root(tag: &str, reply: &mut Value, hidden: &super::Hiding) {
-    let root = std::env::temp_dir().join(format!("vc-{tag}-root-{}", std::process::id()));
-    std::fs::create_dir_all(&root).unwrap();
-    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&root], &[]).unwrap();
+    let root = crate::tests_folder::Folder::new(&format!("{tag}-root"));
+    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[root.as_path()], &[]).unwrap();
     vectorcraft_engine::file_access::confine(roots.as_ref(), || super::hide_library_ids(reply, hidden));
-    let _ = std::fs::remove_dir_all(root);
 }
 
 /// Encoded file data in a reply, a base64 string under `dataBase64`, `pngBase64`, `thumbnailBase64`
@@ -73,7 +71,7 @@ fn a_reply_keeps_encoded_data_that_holds_a_hidden_path() {
 /// space do not keep it.
 #[test]
 fn a_reply_keeps_a_hidden_path_only_inside_a_known_library_id() {
-    let base = std::env::temp_dir().join(format!("vc-continuation-{}", std::process::id()));
+    let base = crate::tests_folder::Folder::new("continuation");
     let root = base.join("in");
     std::fs::create_dir_all(&root).unwrap();
     let hidden_path = base.join("in x").join("b.svg").to_string_lossy().into_owned();
@@ -84,7 +82,6 @@ fn a_reply_keeps_a_hidden_path_only_inside_a_known_library_id() {
     let mut reply = json!({"error": format!("kept {hidden_path}.bak, {other}{up} and {known}")});
     let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&root], &[]).unwrap();
     vectorcraft_engine::file_access::confine(roots.as_ref(), || super::hide_library_ids(&mut reply, &hidden));
-    let _ = std::fs::remove_dir_all(base);
     assert_eq!(reply["error"], json!(format!("kept b.svg.bak, b.svg (2){up} and {known}")), "{reply}");
     // A readable library's id with a space after the hidden part stays whole.
     // A readable id with a `..` part does not keep the hidden part.
@@ -250,7 +247,7 @@ fn a_reply_hides_a_hidden_relative_path_written_as_absolute() {
 /// by their file names; plain text and a path inside the root are not.
 #[test]
 fn a_request_sends_paths_that_an_error_hides() {
-    let base = std::env::temp_dir().join(format!("vc-sent-paths-{}", std::process::id()));
+    let base = crate::tests_folder::Folder::new("sent-paths");
     let root = base.join("in");
     std::fs::create_dir_all(&root).unwrap();
     let inside = root.join("a.svg").to_string_lossy().into_owned();
@@ -259,7 +256,6 @@ fn a_request_sends_paths_that_an_error_hides() {
     let mut sent = Vec::new();
     let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&root], &[]).unwrap();
     vectorcraft_engine::file_access::confine(roots.as_ref(), || super::sent_paths(&params, &mut sent));
-    let _ = std::fs::remove_dir_all(base);
     let pair = |path: &str, name: &str| (format!("loaded/{path}"), format!("loaded/{name}"));
     let want = [
         pair("outside/h.svg", "h.svg"),
@@ -276,7 +272,7 @@ fn a_request_sends_paths_that_an_error_hides() {
 /// relative name and a path inside the root are not.
 #[test]
 fn an_absolute_path_outside_the_read_root_is_unreadable() {
-    let base = std::env::temp_dir().join(format!("vc-unreadable-absolute-{}", std::process::id()));
+    let base = crate::tests_folder::Folder::new("unreadable-absolute");
     std::fs::create_dir_all(base.join("in")).unwrap();
     let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&base.join("in")], &[]).unwrap();
     let inside = base.join("in").join("a.svg").to_string_lossy().into_owned();
@@ -295,7 +291,6 @@ fn an_absolute_path_outside_the_read_root_is_unreadable() {
         assert!(!super::unreadable_absolute("keep"));
         assert!(!super::unreadable_absolute(&inside));
     });
-    let _ = std::fs::remove_dir_all(base);
 }
 
 /// Without a read root, a `file:` URL that names another host may be read, and a recorded step keeps
@@ -395,12 +390,10 @@ fn a_reply_keeps_a_longer_path_that_ends_with_a_hidden_relative_path() {
 #[cfg(not(windows))]
 #[test]
 fn a_sent_path_keeps_a_backslash_in_its_file_name() {
-    let root = std::env::temp_dir().join(format!("vc-sent-backslash-{}", std::process::id()));
-    std::fs::create_dir_all(&root).unwrap();
-    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&root], &[]).unwrap();
+    let root = crate::tests_folder::Folder::new("sent-backslash");
+    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[root.as_path()], &[]).unwrap();
     let mut sent = Vec::new();
     vectorcraft_engine::file_access::confine(roots.as_ref(), || super::sent_paths(&json!({"path": "/out/weird\\name.svg"}), &mut sent));
-    let _ = std::fs::remove_dir_all(root);
     assert_eq!(sent, [("loaded//out/weird\\name.svg".to_string(), "loaded/weird\\name.svg".to_string())]);
 }
 
@@ -412,13 +405,11 @@ fn a_hidden_library_at_the_top_of_the_file_system_keeps_its_shown_id() {
     let panel = "library:swatches:loaded//b.svg".to_string();
     app.ui.color_guide_limit = "loaded//b.svg".to_string();
     app.ui.open_panel = Some(panel);
-    let root = std::env::temp_dir().join(format!("vc-top-level-library-{}", std::process::id()));
-    std::fs::create_dir_all(&root).unwrap();
-    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&root], &[]).unwrap();
+    let root = crate::tests_folder::Folder::new("top-level-library");
+    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[root.as_path()], &[]).unwrap();
     let (inspected, docking) = vectorcraft_engine::file_access::confine(roots.as_ref(), || {
         (input_request(&mut app, "ui.inspect", json!({})), input_request(&mut app, "ui.docking", json!({})))
     });
-    let _ = std::fs::remove_dir_all(root);
     assert_eq!(inspected["result"]["ui"]["color_guide_limit"], "loaded/b.svg", "{inspected}");
     assert_eq!(inspected["result"]["ui"]["open_panel"], "library:swatches:loaded/b.svg", "{inspected}");
     assert_eq!(docking["result"]["flyout"], "library:swatches:loaded/b.svg", "{docking}");
@@ -429,9 +420,8 @@ fn a_hidden_library_at_the_top_of_the_file_system_keeps_its_shown_id() {
 #[test]
 fn a_sent_path_reads_the_same_whatever_the_outcome() {
     let app = VectorcraftApp::new(Session::new(), Services::default());
-    let root = std::env::temp_dir().join(format!("vc-sent-outcome-{}", std::process::id()));
-    std::fs::create_dir_all(&root).unwrap();
-    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[&root], &[]).unwrap();
+    let root = crate::tests_folder::Folder::new("sent-outcome");
+    let roots = vectorcraft_engine::file_access::AutomationRoots::new(&[root.as_path()], &[]).unwrap();
     let sent = json!({"path": "/outside/b.svg"});
     let mut done = json!({"ok": true, "result": {"path": "/outside/b.svg"}});
     let mut failed = json!({"ok": false, "error": "can't read /outside/b.svg"});
@@ -439,7 +429,6 @@ fn a_sent_path_reads_the_same_whatever_the_outcome() {
         super::hide_in_reply(&app, &mut done, &sent, super::Hiding::default());
         super::hide_in_reply(&app, &mut failed, &sent, super::Hiding::default());
     });
-    let _ = std::fs::remove_dir_all(root);
     assert_eq!(done["result"]["path"], "b.svg", "{done}");
     assert_eq!(failed["error"], "can't read b.svg", "{failed}");
 }
@@ -1157,7 +1146,7 @@ fn panels_that_redraw_apply_a_merge_on_another_thread_first() {
 /// applies the merge first: the file holds it, and closing asks to save it.
 #[test]
 fn save_and_close_apply_a_merge_on_another_thread_first() {
-    let dir = vectorcraft_testkit::temp_dir("control-merge-save");
+    let dir = crate::tests_folder::Folder::adopt(vectorcraft_testkit::temp_dir("control-merge-save"));
     for then in ["file.saveAs", "file.exportAs", "file.close"] {
         let services = Services { write: Some(Box::new(|p: &str, b: &[u8]| std::fs::write(p, b).map_err(|e| e.to_string()))), ..Default::default() };
         let mut app = VectorcraftApp::new(Session::new(), services);
diff --git a/crates/ui-egui/src/dialogs/missing_fonts/tests.rs b/crates/ui-egui/src/dialogs/missing_fonts/tests.rs
index 0f57b99f46..b173deb49c 100644
--- a/crates/ui-egui/src/dialogs/missing_fonts/tests.rs
+++ b/crates/ui-egui/src/dialogs/missing_fonts/tests.rs
@@ -1,21 +1,20 @@
-use std::path::{Path, PathBuf};
+use std::path::Path;
 use std::time::Instant;
 
 use vectorcraft_engine::Session;
 use vectorcraft_engine::cmd::findfiles::Rules;
 
 use super::*;
+use crate::tests_folder::Folder;
 
 fn frame(app: &mut VectorcraftApp) -> String {
     crate::tests_labels::painted_text(app, |app, ui| super::super::show(app, ui.ctx()))
 }
 
-/// A fresh temporary folder (canonical, as a search reports it).
-fn folder(tag: &str) -> PathBuf {
+/// A fresh temporary folder (canonical, as a search reports it), removed when dropped.
+fn folder(tag: &str) -> Folder {
     let dir = vectorcraft_testkit::temp_dir(&format!("missing-fonts-{tag}"));
-    let _ = std::fs::remove_dir_all(&dir);
-    std::fs::create_dir_all(&dir).unwrap();
-    vectorcraft_engine::cmd::findfiles::plain(std::fs::canonicalize(&dir).unwrap())
+    Folder::adopt(vectorcraft_engine::cmd::findfiles::plain(std::fs::canonicalize(&dir).unwrap()))
 }
 
 /// An app that reads files and whose searches may go anywhere in `root`, on two threads.
@@ -191,7 +190,7 @@ fn closing_the_dialog_stops_its_search() {
     app.session.search_threads = Some(1);
     app.run("file.new", json!({"width": 400, "height": 300})).unwrap();
     app.run("text.create", json!({"x": 10, "y": 40, "text": "Gone", "font": "No Such Font Family"})).unwrap();
-    app.run("ui.missingFontsDialog", json!({"folder": root})).unwrap();
+    app.run("ui.missingFontsDialog", json!({"folder": root.as_path()})).unwrap();
     let id = app.ui.dialog_search.expect("the dialog's search");
     super::super::cancel(&mut app);
     assert!(app.ui.dialog.is_none() && app.ui.dialog_search.is_none());
@@ -275,7 +274,8 @@ fn the_question_comes_back_after_a_dialog_that_took_its_place() {
 /// opens without the question.
 #[test]
 fn generic_families_are_not_asked_about() {
-    let mut app = app_for(&folder("generic"));
+    let root = folder("generic");
+    let mut app = app_for(&root);
     let svg = r#"<svg xmlns="http://www.w3.org/2000/svg" width="100" height="100"><text x="10" y="40" font-family="sans-serif">A</text></svg>"#;
     crate::io::open_bytes(&mut app, "generic.svg", svg.as_bytes(), None).unwrap();
     let listed = app.session.execute("text.fonts", &json!({})).unwrap();
diff --git a/crates/ui-egui/src/dialogs/save_options/tests.rs b/crates/ui-egui/src/dialogs/save_options/tests.rs
index 968d79568c..7a1aeb3849 100644
--- a/crates/ui-egui/src/dialogs/save_options/tests.rs
+++ b/crates/ui-egui/src/dialogs/save_options/tests.rs
@@ -4,6 +4,7 @@ use std::rc::Rc;
 use vectorcraft_engine::Session;
 
 use super::*;
+use crate::tests_folder::Folder;
 use crate::{FilePick, Services, theme};
 
 type Written = Rc<RefCell<Vec<(String, Vec<u8>)>>>;
@@ -197,7 +198,7 @@ fn board_files_of(app: &VectorcraftApp, boards: [bool; 4]) -> Vec<Option<String>
 #[test]
 fn the_enter_that_closed_the_save_panel_does_not_confirm_the_options() {
     let (mut app, written, _) = desktop("again.ai");
-    let dir = vectorcraft_testkit::temp_dir("ai-options-enter");
+    let dir = Folder::adopt(vectorcraft_testkit::temp_dir("ai-options-enter"));
     let orig = dir.join("orig.ai");
     std::fs::write(&orig, vectorcraft_testkit::ai::ai(&vectorcraft_testkit::ai::sample_data(), vectorcraft_testkit::ai::page_pdf())).unwrap();
     app.run("document.open", json!({"path": orig.to_string_lossy()})).unwrap();
@@ -215,7 +216,7 @@ fn the_enter_that_closed_the_save_panel_does_not_confirm_the_options() {
 #[test]
 fn save_a_copy_and_template_suggest_their_names() {
     let (mut app, written, picks) = desktop("copy.vectorcraft");
-    let folder = vectorcraft_testkit::temp_dir("save-template-dialog");
+    let folder = Folder::adopt(vectorcraft_testkit::temp_dir("save-template-dialog"));
     app.session.prefs.templates_folder = folder.to_string_lossy().into_owned();
     app.run("file.saveCopy", json!({})).unwrap();
     assert_eq!(picks.borrow()[0].name, "Untitled-1 copy.vectorcraft");
@@ -237,7 +238,8 @@ fn save_a_copy_and_template_suggest_their_names() {
 #[test]
 fn save_as_template_writes_ait_when_it_is_picked() {
     let (mut app, written, _) = desktop("flyer.ait");
-    app.session.prefs.templates_folder = vectorcraft_testkit::temp_dir("save-template-ait").to_string_lossy().into_owned();
+    let folder = Folder::adopt(vectorcraft_testkit::temp_dir("save-template-ait"));
+    app.session.prefs.templates_folder = folder.to_string_lossy().into_owned();
     app.run("file.saveAsTemplate", json!({})).unwrap();
     assert!(app.ui.dialog.is_none(), "a template asks no options");
     let (path, bytes) = written.borrow()[0].clone();
@@ -285,9 +287,10 @@ fn the_native_options_have_no_precision_row() {
 /// replaced with the template's, as Save As replaces the extension of a format it doesn't write.
 #[test]
 fn save_as_template_replaces_a_save_formats_extension() {
+    let folder = Folder::adopt(vectorcraft_testkit::temp_dir("save-template-ext"));
     for (picked, saved) in [("card.pdf", "card.vctemplate"), ("card.vectorcraft", "card.vctemplate"), ("card.svg", "card.vctemplate")] {
         let (mut app, written, _) = desktop(picked);
-        app.session.prefs.templates_folder = vectorcraft_testkit::temp_dir("save-template-ext").to_string_lossy().into_owned();
+        app.session.prefs.templates_folder = folder.to_string_lossy().into_owned();
         app.run("file.saveAsTemplate", json!({})).unwrap();
         let (path, bytes) = written.borrow()[0].clone();
         assert_eq!(path, saved, "typed {picked}");
diff --git a/crates/ui-egui/src/lib.rs b/crates/ui-egui/src/lib.rs
index c4c6ded189..d768854cb4 100644
--- a/crates/ui-egui/src/lib.rs
+++ b/crates/ui-egui/src/lib.rs
@@ -91,8 +91,8 @@ pub mod workspaces;
 mod document_drag;
 #[cfg(test)]
 use tests::{
-    background as tests_background, labels as tests_labels, picks as tests_picks, removeanchors as tests_removeanchors, svg as tests_svg,
-    synthetic as tests_synthetic, sysclip as tests_sysclip,
+    background as tests_background, folder as tests_folder, labels as tests_labels, picks as tests_picks, removeanchors as tests_removeanchors,
+    svg as tests_svg, synthetic as tests_synthetic, sysclip as tests_sysclip,
 };
 #[cfg(test)]
 mod tests;
diff --git a/crates/ui-egui/src/opening/tests.rs b/crates/ui-egui/src/opening/tests.rs
index ef62509bf3..5840df50cc 100644
--- a/crates/ui-egui/src/opening/tests.rs
+++ b/crates/ui-egui/src/opening/tests.rs
@@ -56,13 +56,9 @@ fn install_importer(app: &mut VectorcraftApp, src: &str) {
 }
 
 /// A file for the importers below, in a folder of its own.
-fn importer_file(tag: &str) -> (std::path::PathBuf, String) {
-    let dir = std::env::temp_dir().join(format!("vc-ui-opening-{tag}-{}", std::process::id()));
-    let _ = std::fs::remove_dir_all(&dir);
-    std::fs::create_dir_all(&dir).unwrap();
-    let file = dir.join("a.tob");
-    std::fs::write(&file, "not json").unwrap();
-    let file = file.to_string_lossy().into_owned();
+fn importer_file(tag: &str) -> (crate::tests_folder::Folder, String) {
+    let dir = crate::tests_folder::Folder::new(&format!("ui-opening-{tag}"));
+    let file = dir.file("a.tob", b"not json");
     (dir, file)
 }
 
@@ -73,7 +69,7 @@ fn importer_file(tag: &str) -> (std::path::PathBuf, String) {
 fn open_with_runs_the_importer_off_the_ui_thread() {
     use vectorcraft_plugins::wat::{self as tpl, Given};
     let rect = r#"{"objects":[{"type":"path","path":{"subpaths":[{"closed":true,"anchors":[{"p":[10,20]},{"p":[110,20]},{"p":[110,70]},{"p":[10,70]}]}]}}]}"#;
-    let (dir, file) = importer_file("with");
+    let (_dir, file) = importer_file("with");
     let mut app = VectorcraftApp::new(Session::new(), Services::default());
     app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
     let params = r#"{"density":{"type":"number","min":0,"max":10,"default":4}}"#;
@@ -97,14 +93,13 @@ fn open_with_runs_the_importer_off_the_ui_thread() {
     assert!(app.ui.dialog.is_some(), "the failure is reported in a dialog");
     assert!(app.ui.recent_files.is_empty());
     app.run("plugin.remove", json!({"id": "test.opening.with"})).unwrap();
-    let _ = std::fs::remove_dir_all(&dir);
 }
 
 /// Cancel stops an importer that never returns, on the thread reading the file.
 #[test]
 fn cancel_stops_a_running_importer() {
     use vectorcraft_plugins::wat as tpl;
-    let (dir, file) = importer_file("cancel");
+    let (_dir, file) = importer_file("cancel");
     let mut app = VectorcraftApp::new(Session::new(), Services::default());
     app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
     install_importer(&mut app, &tpl::module(&tpl::importer("test.opening.spins", r#"["tob"]"#, "{}"), "(loop $l (br $l)) (i64.const 0)", "", 1));
@@ -115,7 +110,6 @@ fn cancel_stops_a_running_importer() {
     assert!(r.as_ref().err().is_some_and(|e| e.contains("cancelled")), "{:?}", r.err());
     assert!(app.session.documents().is_empty());
     app.run("plugin.remove", json!({"id": "test.opening.spins"})).unwrap();
-    let _ = std::fs::remove_dir_all(&dir);
 }
 
 /// #1694: a file that finishes opening while a dialog is up waits for it to close, so the
@@ -289,8 +283,7 @@ fn a_file_read_off_the_ui_thread_opens_as_one_read_at_once() {
 #[test]
 fn a_file_read_off_the_ui_thread_has_its_links_and_type_as_one_read_at_once() {
     use image::ImageFormat::{Bmp, Jpeg, Png, Tiff};
-    let dir = std::env::temp_dir().join(format!("vc-opening-links-{}", std::process::id()));
-    let _ = std::fs::remove_dir_all(&dir);
+    let dir = crate::tests_folder::Folder::new("opening-links");
     let (before, after) = (dir.join("before"), dir.join("after"));
     std::fs::create_dir_all(&before).unwrap();
     let file = |folder: &std::path::Path, name: &str| folder.join(name).to_string_lossy().into_owned();
@@ -336,7 +329,6 @@ fn a_file_read_off_the_ui_thread_has_its_links_and_type_as_one_read_at_once() {
         assert!(st.history.undo.is_empty() && !st.is_dirty(), "{update}");
         assert_eq!(asked(&app), question, "{update}");
     }
-    let _ = std::fs::remove_dir_all(&dir);
 }
 
 /// A file opened under automation roots is installed under them too: the open keeps the scope it
@@ -344,7 +336,7 @@ fn a_file_read_off_the_ui_thread_has_its_links_and_type_as_one_read_at_once() {
 #[test]
 fn a_file_opened_under_automation_roots_finishes_under_them() {
     use vectorcraft_engine::file_access;
-    let dir = scope_dir();
+    let dir = crate::tests_folder::Folder::new("opening-scope");
     let roots = file_access::AutomationRoots::new(&[dir.as_path()], &[]).unwrap();
     let mut app = VectorcraftApp::new(Session::new(), Services::default());
     file_access::confine(roots.as_ref(), || {
@@ -355,12 +347,6 @@ fn a_file_opened_under_automation_roots_finishes_under_them() {
     assert!(scope.run(file_access::current).is_some(), "the roots go with the open");
 }
 
-fn scope_dir() -> std::path::PathBuf {
-    let dir = std::env::temp_dir().join(format!("vectorcraft-opening-scope-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    dir
-}
-
 /// A file asked for again while it is still being read is not read a second time (#3455).
 #[test]
 fn a_file_asked_for_again_while_it_is_read_opens_once() {
@@ -378,9 +364,7 @@ fn a_file_asked_for_again_while_it_is_read_opens_once() {
 /// the dialog acts on its own document (#5369).
 #[test]
 fn a_queued_reopen_that_asks_holds_back_files_ready_to_open() {
-    let dir = std::env::temp_dir().join(format!("vectorcraft-opening-queued-{}", std::process::id()));
-    let _ = std::fs::remove_dir_all(&dir);
-    std::fs::create_dir_all(&dir).unwrap();
+    let dir = crate::tests_folder::Folder::new("opening-queued");
     let mut app = VectorcraftApp::new(Session::new(), Services::default());
     app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
     let (doc, other) = (dir.join("doc.vectorcraft"), dir.join("other.vectorcraft"));
@@ -407,7 +391,6 @@ fn a_queued_reopen_that_asks_holds_back_files_ready_to_open() {
     assert_eq!(app.session.doc().unwrap().path.as_deref(), Some(&*doc), "the dialog's document stays active");
     assert_eq!(app.opening.activate.first().map(|(p, _)| p), Some(&other), "the later activation waits");
     assert_eq!(app.opening.pending.len(), 1, "the other file waits");
-    let _ = std::fs::remove_dir_all(dir);
 }
 
 /// Of two files read off the UI thread and ready in the same frame, the first that opens and asks
diff --git a/crates/ui-egui/src/tests.rs b/crates/ui-egui/src/tests.rs
index 07d88595d7..b37ed0d10c 100644
--- a/crates/ui-egui/src/tests.rs
+++ b/crates/ui-egui/src/tests.rs
@@ -8,6 +8,7 @@ mod cut;
 mod distortkeys;
 mod docsetup;
 mod document_drag;
+pub(super) mod folder;
 mod font_menu;
 mod fonts;
 mod guide_escape;
diff --git a/crates/ui-egui/src/tests/folder.rs b/crates/ui-egui/src/tests/folder.rs
new file mode 100644
index 0000000000..e8b4dfae8d
--- /dev/null
+++ b/crates/ui-egui/src/tests/folder.rs
@@ -0,0 +1,76 @@
+//! A test's temporary folder, removed with everything in it when the test ends.
+
+use std::path::PathBuf;
+
+/// A test's folder, removed with everything in it when dropped, also when the test panics, as
+/// the engine's find-files tests remove their trees. A removal that fails (a file still held open)
+/// is ignored.
+pub(crate) struct Folder(PathBuf);
+
+impl Folder {
+    /// A new empty folder `vectorcraft-<name>-<process id>` in the system temporary folder. One
+    /// left there by an earlier process with the same id is removed first.
+    pub(crate) fn new(name: &str) -> Self {
+        let dir = std::env::temp_dir().join(format!("vectorcraft-{name}-{}", std::process::id()));
+        let _ = std::fs::remove_dir_all(&dir);
+        std::fs::create_dir_all(&dir).unwrap();
+        Self(dir)
+    }
+
+    /// The folder at `dir`, made by the caller, removed when dropped.
+    pub(crate) fn adopt(dir: PathBuf) -> Self {
+        Self(dir)
+    }
+
+    /// `bytes` written to a file `name` in the folder → its path.
+    pub(crate) fn file(&self, name: &str, bytes: &[u8]) -> String {
+        let path = self.0.join(name);
+        std::fs::write(&path, bytes).unwrap();
+        path.to_string_lossy().into_owned()
+    }
+}
+
+impl std::ops::Deref for Folder {
+    type Target = PathBuf;
+    fn deref(&self) -> &PathBuf {
+        &self.0
+    }
+}
+
+impl Drop for Folder {
+    fn drop(&mut self) {
+        let _ = std::fs::remove_dir_all(&self.0);
+    }
+}
+
+#[test]
+fn a_folder_is_removed_when_its_test_ends() {
+    let folder = Folder::new("ui-folder-ends");
+    let path = folder.to_path_buf();
+    std::fs::create_dir_all(path.join("nested")).unwrap();
+    folder.file("nested/a.txt", b"a");
+    assert!(path.join("nested").join("a.txt").is_file());
+    drop(folder);
+    assert!(!path.exists(), "{} is left", path.display());
+}
+
+#[test]
+fn a_folder_is_removed_when_its_test_panics() {
+    let path = std::env::temp_dir().join(format!("vectorcraft-ui-folder-panics-{}", std::process::id()));
+    let r = vectorcraft_testkit::catch_quiet::<()>(|| {
+        let folder = Folder::new("ui-folder-panics");
+        folder.file("a.txt", b"a");
+        panic!("the test fails");
+    });
+    assert_eq!(r.err().as_deref(), Some("the test fails"));
+    assert!(!path.exists(), "{} is left", path.display());
+}
+
+#[test]
+fn an_adopted_test_kit_folder_is_removed_when_its_test_ends() {
+    let folder = Folder::adopt(vectorcraft_testkit::temp_dir("ui-folder-adopted"));
+    let path = folder.to_path_buf();
+    folder.file("a.txt", b"a");
+    drop(folder);
+    assert!(!path.exists(), "{} is left", path.display());
+}
diff --git a/crates/ui-egui/src/tests/place.rs b/crates/ui-egui/src/tests/place.rs
index 60f80f4fa4..9c67861eeb 100644
--- a/crates/ui-egui/src/tests/place.rs
+++ b/crates/ui-egui/src/tests/place.rs
@@ -11,6 +11,7 @@ use vectorcraft_engine::Session;
 use crate::VectorcraftApp;
 use crate::canvas::Xf;
 use crate::place::{DropAt, DropTarget};
+use crate::tests_folder::Folder;
 
 /// A `w`×`h` red PNG declaring `ppi`.
 fn png(w: u32, h: u32, ppi: f64) -> Vec<u8> {
@@ -19,15 +20,6 @@ fn png(w: u32, h: u32, ppi: f64) -> Vec<u8> {
     vectorcraft_engine::cmd::fileio::ppi::with_png_resolution(&out, (ppi, ppi))
 }
 
-/// `bytes` written to a fresh temporary file named `name` → its path.
-fn temp_file(name: &str, bytes: &[u8]) -> String {
-    let dir = std::env::temp_dir().join(format!("vectorcraft-ui-place-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    let path = dir.join(name);
-    std::fs::write(&path, bytes).unwrap();
-    path.to_string_lossy().to_string()
-}
-
 /// An app reading files from disk, with a 400×300 document.
 fn app() -> VectorcraftApp {
     let services = crate::Services { read: Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string()))), ..Default::default() };
@@ -166,7 +158,8 @@ fn a_dropped_swatch_library_opens_in_the_library_panel() {
     let mut app = app();
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
-    let gpl = temp_file("dropped.gpl", b"GIMP Palette\nName: Dropped\n#\n255   0   0\tRed\n  0 128 255\tSky\n");
+    let dir = Folder::new("ui-place-swatches");
+    let gpl = dir.file("dropped.gpl", b"GIMP Palette\nName: Dropped\n#\n255   0   0\tRed\n  0 128 255\tSky\n");
     frame(&mut app, &ctx, vec![], &[&gpl], false);
     let id = format!("loaded/{gpl}");
     assert_eq!(crate::panels::library_panel::last_open(&app.ui).map(|o| o.id.as_str()), Some(id.as_str()), "{}", app.ui.status);
@@ -184,7 +177,8 @@ fn a_dropped_script_shows_its_check() {
     let mut app = app();
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
-    let path = temp_file("dropped.jsx", b"#target acme\napp.executeMenuCommand('acmecopyall');\n");
+    let dir = Folder::new("ui-place-script");
+    let path = dir.file("dropped.jsx", b"#target acme\napp.executeMenuCommand('acmecopyall');\n");
     frame(&mut app, &ctx, vec![], &[&path], false);
     let d = app.ui.dialog.as_ref().expect("the check is shown");
     assert_eq!(d.kind, crate::dialogs::script_check::KIND, "{}", app.ui.status);
@@ -203,7 +197,8 @@ fn a_dropped_libraries_panel_file_is_added_as_a_new_library() {
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
     let file = json!({"name": "Dropped", "colors": [{"name": "Red", "color": {"model": "rgb", "r": 1, "g": 0, "b": 0}}]});
-    let path = temp_file("dropped.vclibrary", file.to_string().as_bytes());
+    let dir = Folder::new("ui-place-library");
+    let path = dir.file("dropped.vclibrary", file.to_string().as_bytes());
     frame(&mut app, &ctx, vec![], &[&path], false);
     assert_eq!(app.ui.status, "Imported library Dropped");
     let lib = app.session.execute("library.get", &json!({})).unwrap();
@@ -220,7 +215,8 @@ fn a_dropped_shortcut_set_opens_import_shortcut_set() {
     let ctx = egui::Context::default();
     let rect = laid_out(&mut app, &ctx);
     let set = "/Menus {\n /Acme\\ Undo { /Modifiers 11 /Key 902 }\n}\n";
-    let path = temp_file("dropped.kys", set.as_bytes());
+    let dir = Folder::new("ui-place-shortcuts");
+    let path = dir.file("dropped.kys", set.as_bytes());
     frame(&mut app, &ctx, vec![], &[&path], false);
     let kind = |app: &VectorcraftApp| app.ui.dialog.as_ref().map(|d| d.kind.clone());
     assert_eq!(kind(&app).as_deref(), Some(crate::dialogs::shortcut_import::KIND), "{}", app.ui.status);
@@ -237,7 +233,8 @@ fn a_dropped_png_is_placed_in_the_middle_of_the_view() {
     let mut app = app();
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
-    let path = temp_file("drop.png", &png(20, 10, 72.0));
+    let dir = Folder::new("ui-place-png");
+    let path = dir.file("drop.png", &png(20, 10, 72.0));
     // Where egui last saw the pointer is stale during a desktop drag: it doesn't count.
     frame(&mut app, &ctx, vec![egui::Event::PointerMoved(Pos2::new(5.0, 5.0))], &[&path], false);
     let n = selected_image(&app);
@@ -258,8 +255,9 @@ fn a_dropped_document_opens_as_a_tab_of_its_own() {
     let mut app = app();
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
-    let svg = temp_file("dropped.svg", SVG.as_bytes());
-    let pic = temp_file("with-it.png", &png(8, 8, 72.0));
+    let dir = Folder::new("ui-place-tab");
+    let svg = dir.file("dropped.svg", SVG.as_bytes());
+    let pic = dir.file("with-it.png", &png(8, 8, 72.0));
     frame(&mut app, &ctx, vec![], &[&svg, &pic], false);
     assert_eq!(app.session.documents().len(), 2, "opened, not placed");
     assert_eq!(app.session.active_index(), Some(1), "the document opened is shown");
@@ -270,7 +268,8 @@ fn a_dropped_document_opens_as_a_tab_of_its_own() {
 
 #[test]
 fn a_native_svg_drop_uses_file_open_even_with_a_path_only_handle() {
-    let path = temp_file("path-only.svg", SVG.as_bytes());
+    let dir = Folder::new("ui-place-path-only");
+    let path = dir.file("path-only.svg", SVG.as_bytes());
     let mut dropped = app();
     let ctx = egui::Context::default();
     laid_out(&mut dropped, &ctx);
@@ -317,8 +316,9 @@ fn multiple_svg_drops_open_individually() {
     let mut app = app();
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
-    let a = temp_file("first.svg", SVG.as_bytes());
-    let b = temp_file("second.svg", SVG.as_bytes());
+    let dir = Folder::new("ui-place-several-svg");
+    let a = dir.file("first.svg", SVG.as_bytes());
+    let b = dir.file("second.svg", SVG.as_bytes());
     frame(&mut app, &ctx, vec![], &[&a, &b], false);
     assert_eq!(app.session.documents().len(), 3);
     assert_eq!(app.session.active().unwrap().path.as_deref(), Some(b.as_str()));
@@ -330,15 +330,16 @@ fn unsupported_and_unreadable_drops_leave_the_document_open() {
     let mut app = app();
     let ctx = egui::Context::default();
     laid_out(&mut app, &ctx);
-    let invalid = temp_file("not-art.xyz", b"not an image or document");
+    let dir = Folder::new("ui-place-unreadable");
+    let invalid = dir.file("not-art.xyz", b"not an image or document");
     frame(&mut app, &ctx, vec![], &[&invalid], false);
     assert!(app.ui.status.contains("Couldn't place not-art.xyz"), "{}", app.ui.status);
 
-    let invalid_svg = temp_file("broken.svg", b"<svg");
+    let invalid_svg = dir.file("broken.svg", b"<svg");
     frame(&mut app, &ctx, vec![], &[&invalid_svg], false);
     assert!(app.ui.status.contains("Couldn't open broken.svg"), "{}", app.ui.status);
 
-    let missing = temp_file("unreadable.svg", SVG.as_bytes());
+    let missing = dir.file("unreadable.svg", SVG.as_bytes());
     std::fs::remove_file(&missing).unwrap();
     frame(&mut app, &ctx, vec![], &[&missing], false);
     assert!(app.ui.status.contains("Couldn't open unreadable.svg"), "{}", app.ui.status);
@@ -350,7 +351,8 @@ fn unsupported_and_unreadable_drops_leave_the_document_open() {
 fn files_dropped_with_no_document_open_open_and_are_recent() {
     let mut app = VectorcraftApp::new(Session::new(), Default::default());
     let ctx = egui::Context::default();
-    let path = temp_file("open-me.png", &png(8, 8, 72.0));
+    let dir = Folder::new("ui-place-no-document");
+    let path = dir.file("open-me.png", &png(8, 8, 72.0));
     frame(&mut app, &ctx, vec![], &[], false);
     frame(&mut app, &ctx, vec![], &[&path], false);
     assert_eq!(app.session.documents().len(), 1, "no document: the drop opens");
@@ -407,8 +409,9 @@ fn a_file_read_after_another_document_became_active_lands_where_it_was_dropped()
 #[test]
 fn the_place_dialog_lists_the_files_and_loads_the_cursor_with_several() {
     let mut app = app();
-    let a = temp_file("a.png", &png(300, 150, 300.0));
-    let b = temp_file("b.png", &png(10, 10, 72.0));
+    let dir = Folder::new("ui-place-dialog");
+    let a = dir.file("a.png", &png(300, 150, 300.0));
+    let b = dir.file("b.png", &png(10, 10, 72.0));
     app.run("file.place", json!({"paths": [a, b]})).unwrap();
     let d = app.ui.dialog.as_ref().expect("the Place dialog");
     assert_eq!(d.kind, crate::dialogs::place::KIND);
@@ -448,7 +451,8 @@ fn the_place_dialog_lists_the_files_and_loads_the_cursor_with_several() {
 fn one_file_places_centred_in_the_view_and_replace_swaps_the_selection() {
     let mut app = app();
     app.view_mut().unwrap().center = vectorcraft_geom::Point::new(120.0, 80.0);
-    place_picked(&mut app, &temp_file("one.png", &png(300, 150, 300.0)));
+    let dir = Folder::new("ui-place-replace");
+    place_picked(&mut app, &dir.file("one.png", &png(300, 150, 300.0)));
     let d = app.ui.dialog.as_ref().expect("the Place dialog");
     assert_eq!(d.kind, crate::dialogs::place::KIND);
     assert!(d.bool("link") && !d.bool("__replace"), "Link on; Replace needs one selected object");
@@ -462,7 +466,7 @@ fn one_file_places_centred_in_the_view_and_replace_swaps_the_selection() {
     let first = selected_image(&app);
     assert_eq!(first.geometric_bounds().unwrap().center(), vectorcraft_geom::Point::new(120.0, 80.0), "centred in the view");
     // With one object selected, Replace applies.
-    place_picked(&mut app, &temp_file("two.png", &png(40, 40, 144.0)));
+    place_picked(&mut app, &dir.file("two.png", &png(40, 40, 144.0)));
     assert!(app.ui.dialog.as_ref().unwrap().bool("__replace"));
     app.ui.dialog.as_mut().unwrap().fields.insert("replace".into(), json!(true));
     app.ui.dialog.as_mut().unwrap().fields.insert("link".into(), json!(false));
@@ -476,7 +480,8 @@ fn one_file_places_centred_in_the_view_and_replace_swaps_the_selection() {
 #[test]
 fn the_control_bar_shows_the_image_file_link_colour_mode_and_ppi() {
     let mut app = app();
-    let path = temp_file("photo.png", &png(30, 30, 300.0));
+    let dir = Folder::new("ui-place-control-bar");
+    let path = dir.file("photo.png", &png(30, 30, 300.0));
     app.run("file.place", json!({"path": path})).unwrap();
     let text = crate::tests_labels::painted_text(&mut app, crate::chrome::control_bar);
     for s in ["Linked File", "photo.png", "RGB   PPI: 300"] {
@@ -493,7 +498,8 @@ fn the_control_bar_shows_the_image_file_link_colour_mode_and_ppi() {
 #[test]
 fn the_control_bar_label_follows_edits_undo_documents_and_selection() {
     let mut app = app();
-    let path = temp_file("label.png", &png(30, 30, 72.0));
+    let dir = Folder::new("ui-place-label");
+    let path = dir.file("label.png", &png(30, 30, 72.0));
     app.run("file.place", json!({"path": path})).unwrap();
     let text = |app: &mut VectorcraftApp| crate::tests_labels::painted_text(app, crate::chrome::control_bar);
     assert!(text(&mut app).contains("Linked File"));
@@ -539,7 +545,8 @@ fn the_control_bars_file_name_relinks_the_image() {
     for s in ["Replace…", "Go To Link", "Edit Original", "Update Link", "Placement Options…"] {
         item(&mut app, &ctx, s);
     }
-    let other = temp_file("blue.png", &png(60, 30, 72.0));
+    let dir = Folder::new("ui-place-relink");
+    let other = dir.file("blue.png", &png(60, 30, 72.0));
     let picked = other.clone();
     app.services.pick_open = Some(Box::new(move |_: &crate::FilePick| Some(picked.clone())));
     let p = item(&mut app, &ctx, "Replace…");
@@ -657,7 +664,8 @@ fn a_vectorcraft_document_places_linked_and_edit_original_opens_it() {
     src.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
     src.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 50})).unwrap();
     let bytes = vectorcraft_format::save_file(&src.active().unwrap().doc);
-    let path = temp_file("badge.vectorcraft", &bytes);
+    let dir = Folder::new("ui-place-document");
+    let path = dir.file("badge.vectorcraft", &bytes);
     place_picked(&mut app, &path);
     let d = app.ui.dialog.as_ref().expect("the Place dialog");
     assert!(d.bool("link") && d.bool("__documents") && !d.bool("__others"), "Link on, for a document");
@@ -674,7 +682,7 @@ fn a_vectorcraft_document_places_linked_and_edit_original_opens_it() {
     assert_eq!(app.session.documents().len(), tabs + 1);
     assert_eq!(app.session.active().unwrap().path.as_deref(), Some(path.as_str()));
     // A PNG keeps the image tooltip; a PNG and a document, both.
-    let pic = temp_file("pic.png", &png(10, 10, 72.0));
+    let pic = dir.file("pic.png", &png(10, 10, 72.0));
     place_picked(&mut app, &pic);
     let d = app.ui.dialog.as_ref().unwrap();
     assert!(!d.bool("__documents") && crate::dialogs::place::link_tip(d).contains("image file"));
@@ -693,7 +701,8 @@ fn the_place_dialog_links_a_pdf_page_and_embeds_it_with_link_off() {
     src.execute("file.new", &json!({"width": 100, "height": 50})).unwrap();
     src.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 100, "height": 50})).unwrap();
     let pdf = src.execute("document.serialize", &json!({"format": "pdf", "preserveEditing": false})).unwrap();
-    let path = temp_file("flyer.pdf", &vectorcraft_format::base64_decode(pdf["dataBase64"].as_str().unwrap()).unwrap());
+    let dir = Folder::new("ui-place-pdf");
+    let path = dir.file("flyer.pdf", &vectorcraft_format::base64_decode(pdf["dataBase64"].as_str().unwrap()).unwrap());
     // Link on (the default): one locked object, linked to the file.
     place_picked(&mut app, &path);
     let d = app.ui.dialog.as_ref().expect("the Place dialog");
@@ -715,7 +724,8 @@ fn the_place_dialog_links_a_pdf_page_and_embeds_it_with_link_off() {
 fn the_place_dialog_does_not_offer_a_postscript_ai_as_a_locked_object() {
     let mut app = app();
     let ps = b"%!PS-Adobe-3.0\n%%BoundingBox: 0 0 100 100\n%%EndComments\n1 0 0 setrgbcolor 10 10 50 50 rectfill\nshowpage\n%%EOF\n";
-    let path = temp_file("legacy.ai", ps);
+    let dir = Folder::new("ui-place-postscript");
+    let path = dir.file("legacy.ai", ps);
     // file.place embeds a .ai saved without PDF compatibility, even with Link on.
     let r = app.session.execute("file.place", &json!({"path": path, "link": true})).unwrap();
     assert_eq!(r["linked"], json!(false), "{r}");
@@ -748,7 +758,8 @@ fn holding_escape_with_the_place_cursor_loaded_discards_one_file() {
     app.run("shortcuts.set", json!({"id": "select.none", "shortcut": "Escape", "force": true})).unwrap();
     let id = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 20, "height": 20})).unwrap()["id"].clone();
     app.run("select.set", json!({"ids": [id]})).unwrap();
-    let paths: Vec<String> = ["held-a.png", "held-b.png", "held-c.png"].iter().map(|name| temp_file(name, &png(10, 10, 72.0))).collect();
+    let dir = Folder::new("ui-place-held-escape");
+    let paths: Vec<String> = ["held-a.png", "held-b.png", "held-c.png"].iter().map(|name| dir.file(name, &png(10, 10, 72.0))).collect();
     app.run("file.place", json!({"paths": paths})).unwrap();
     crate::dialogs::confirm(&mut app).unwrap();
     assert_eq!(app.session.tool_options()["count"], 3);
@@ -774,7 +785,8 @@ fn holding_a_chord_bound_to_a_command_repeats_it_with_the_place_cursor_loaded()
     let ctx = egui::Context::default();
     crate::theme::install_fonts(&ctx);
     app.run("shortcuts.set", json!({"id": "view.zoomIn", "shortcut": "Shift+Escape", "force": true})).unwrap();
-    let paths: Vec<String> = ["chord-a.png", "chord-b.png"].iter().map(|name| temp_file(name, &png(10, 10, 72.0))).collect();
+    let dir = Folder::new("ui-place-held-chord");
+    let paths: Vec<String> = ["chord-a.png", "chord-b.png"].iter().map(|name| dir.file(name, &png(10, 10, 72.0))).collect();
     app.run("file.place", json!({"paths": paths})).unwrap();
     crate::dialogs::confirm(&mut app).unwrap();
     let modifiers = egui::Modifiers::SHIFT;
@@ -793,7 +805,8 @@ fn holding_a_chord_bound_to_a_command_repeats_it_with_the_place_cursor_loaded()
 fn crop_image_shows_a_box_that_apply_crops_to() {
     use vectorcraft_tools::ToolKey;
     let mut app = app();
-    place_picked(&mut app, &temp_file("crop.png", &png(100, 50, 72.0)));
+    let dir = Folder::new("ui-place-crop");
+    place_picked(&mut app, &dir.file("crop.png", &png(100, 50, 72.0)));
     app.ui.dialog.as_mut().unwrap().fields.insert("link".into(), json!(false));
     crate::dialogs::confirm(&mut app).unwrap();
     let whole = selected_image(&app).geometric_bounds().unwrap();
@@ -899,7 +912,8 @@ fn a_file_placed_while_idle_follows_its_changes() {
     // Half a second later, before the next look is due, a file is placed. The place itself is a
     // frame (as any command); then nothing happens for 3 s.
     time += 0.5;
-    let path = temp_file("idle-watch.png", &png(40, 30, 72.0));
+    let dir = Folder::new("ui-place-idle-watch");
+    let path = dir.file("idle-watch.png", &png(40, 30, 72.0));
     app.run("file.place", json!({"path": path})).unwrap();
     let id = app.session.active().unwrap().selection.objects[0];
     idle(&mut app, &ctx, &mut time, 3.0, &|_| false);
@@ -925,7 +939,8 @@ fn a_look_whose_worker_stopped_does_not_stop_later_looks() {
     // Every frame renders on this thread: a frame finished by the render worker asks for a repaint.
     app.canvas.worker_started = true;
     app.run("prefs.set", json!({"key": "updateLinks", "value": "automatically"})).unwrap();
-    let path = temp_file("stopped-watch.png", &png(40, 30, 72.0));
+    let dir = Folder::new("ui-place-stopped-watch");
+    let path = dir.file("stopped-watch.png", &png(40, 30, 72.0));
     app.run("file.place", json!({"path": path})).unwrap();
     let id = app.session.active().unwrap().selection.objects[0];
     let ctx = egui::Context::default();
diff --git a/crates/ui-egui/src/tests/taskbar.rs b/crates/ui-egui/src/tests/taskbar.rs
index 4cece18050..d5199e0220 100644
--- a/crates/ui-egui/src/tests/taskbar.rs
+++ b/crates/ui-egui/src/tests/taskbar.rs
@@ -121,12 +121,10 @@ fn an_image_with_vector_art_offers_make_clipping_mask() {
     image::RgbaImage::from_pixel(20, 20, image::Rgba([0, 128, 255, 255]))
         .write_to(&mut std::io::Cursor::new(&mut png), image::ImageFormat::Png)
         .unwrap();
-    let dir = std::env::temp_dir().join(format!("vectorcraft-ui-taskbar-{}", std::process::id()));
-    std::fs::create_dir_all(&dir).unwrap();
-    let path = dir.join("blue.png");
-    std::fs::write(&path, &png).unwrap();
+    let dir = crate::tests_folder::Folder::new("ui-taskbar");
+    let path = dir.file("blue.png", &png);
     app.services.read = Some(Box::new(|p: &str| std::fs::read(p).map_err(|e| e.to_string())));
-    app.run("file.place", json!({"path": path.to_string_lossy(), "link": false})).unwrap();
+    app.run("file.place", json!({"path": path, "link": false})).unwrap();
     let img = app.session.active().unwrap().selection.objects[0].0;
     assert!(matches!(kind(&app, img), NodeKind::Image(_)));
     let shape = id(app.run("shape.ellipse", json!({"x": 150, "y": 100, "width": 60, "height": 60})).unwrap());