From 70e10dd553d040c9a258b6c61008574b1dff6560 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Tue, 17 Nov 2026 15:39:56 -0800 Subject: [PATCH] Width Point Edit: a discontinuous point shows and edits both sets of side widths Opening Width Point Edit on either half of a discontinuous width point now shows the Incoming and Outgoing side widths, each with Side 1, Side 2, Total Width and its own link. OK sets both halves in one stroke.widthPoint.set and one undo step, and Delete removes both. Single Width Only keeps the incoming or the outgoing widths as one continuous point. A continuous point keeps the one-set layout. stroke.widthPoint.set takes outIndex, outLeft, outRight and single for this. With adjustAdjoining, the nearest point before follows the incoming change and the nearest point after follows the outgoing change, once each. Indices that are not the two halves of one discontinuous point, another t, or another single value are refused without changing the document or its history. Help page: https://helpx.adobe.com/illustrator/using/stroke-object.html describes editing the widths on each side of a discontinuous point in this dialog. The group labels, the adjoining rule and Delete removing both halves are VectorCraft's own. --- crates/engine/src/cmd/distortcmds.rs | 87 +++++++++-- crates/engine/src/tests/widthpoints.rs | 104 +++++++++++++ crates/ui-egui/src/dialogs/width_point.rs | 124 ++++++++++++--- .../ui-egui/src/dialogs/width_point/tests.rs | 143 ++++++++++++++++++ crates/ui-egui/src/i18n/bg.tsv | 6 + crates/ui-egui/src/i18n/bs.tsv | 6 + crates/ui-egui/src/i18n/ca.tsv | 6 + crates/ui-egui/src/i18n/cs.tsv | 6 + crates/ui-egui/src/i18n/da.tsv | 6 + crates/ui-egui/src/i18n/de.tsv | 6 + crates/ui-egui/src/i18n/el.tsv | 6 + crates/ui-egui/src/i18n/es.tsv | 6 + crates/ui-egui/src/i18n/fi.tsv | 6 + crates/ui-egui/src/i18n/fr.tsv | 6 + crates/ui-egui/src/i18n/gu.tsv | 3 + crates/ui-egui/src/i18n/hi.tsv | 6 + crates/ui-egui/src/i18n/hu.tsv | 6 + crates/ui-egui/src/i18n/id.tsv | 6 + crates/ui-egui/src/i18n/it.tsv | 6 + crates/ui-egui/src/i18n/ja.tsv | 6 + crates/ui-egui/src/i18n/ka.tsv | 6 + crates/ui-egui/src/i18n/ko.tsv | 6 + crates/ui-egui/src/i18n/nl.tsv | 6 + crates/ui-egui/src/i18n/pl.tsv | 6 + crates/ui-egui/src/i18n/pt-br.tsv | 6 + crates/ui-egui/src/i18n/ru.tsv | 6 + crates/ui-egui/src/i18n/sv.tsv | 6 + crates/ui-egui/src/i18n/tr.tsv | 6 + crates/ui-egui/src/i18n/uk.tsv | 6 + crates/ui-egui/src/i18n/vi.tsv | 6 + crates/ui-egui/src/i18n/zh-hans.tsv | 6 + crates/ui-egui/src/i18n/zh-hant.tsv | 6 + docs/control-protocol.md | 3 + docs/mcp.md | 8 + docs/target-app-parity.md | 1 + 35 files changed, 603 insertions(+), 32 deletions(-) diff --git a/crates/engine/src/cmd/distortcmds.rs b/crates/engine/src/cmd/distortcmds.rs index 1e78f210e6..2e2f672af4 100644 --- a/crates/engine/src/cmd/distortcmds.rs +++ b/crates/engine/src/cmd/distortcmds.rs @@ -16,7 +16,7 @@ use vectorcraft_tools::distort::{PinSet, arap, collect_points, mesh_for, project use super::edit::{duplicate_in, outermost, refuse_symbol_part, selected_roots}; use super::{ CommandSpec, Result, Session, bad, check_numbers, check_switches, cmd, f64_or, f64_req, finite_numbers, has_doc, has_selection, matrix_param, - named_id, named_ids, number_or, object_param, ok, point_indices, point_param, str_param, switch_or, targets, + named_id, named_ids, number_or, object_param, ok, point_indices, point_param, str_param, switch_or, targets, text_param, u64_req, }; use crate::EngineError; @@ -35,7 +35,7 @@ pub fn specs() -> Vec { "Width Point", [], None, - "{id, t: 0..1 (fraction of the path length), left, right: side widths in pt, index?: width point to edit or move, adjustAdjoining?: bool (the nearest points either side change their widths in proportion, using the sampled widths for a new point)} → {index}. Without index a point already at t is replaced; a point moved onto another one's t joins it as a discontinuous point (on the side it came from), so the width steps there. Creates a uniform profile first if needed", + "{id, t: 0..1 (fraction of the path length), left, right: side widths in pt, index?: width point to edit or move, adjustAdjoining?: bool (the nearest points either side change their widths in proportion, using the sampled widths for a new point), outIndex?, outLeft, outRight: the outgoing half of the discontinuous point whose incoming half is index, single?: \"incoming\" | \"outgoing\"} → {index}. Without index a point already at t is replaced; a point moved onto another one's t joins it as a discontinuous point (on the side it came from), so the width steps there. With outIndex both halves change in one step and keep their place (t must be theirs); adjustAdjoining then changes the nearest point before from the incoming half and the nearest point after from the outgoing half. single keeps only that half's widths, leaving one continuous point. Creates a uniform profile first if needed", has_doc, width_point_set ), @@ -265,8 +265,9 @@ fn place(points: &mut Vec<(f64, f64, f64)>, mut pt: (f64, f64, f64), from_below: } /// Adjust Adjoining Width Points: point `i` changes from `old` to `new` widths, and the nearest -/// points at other positions either side change in proportion (by the same amount from zero). -fn adjust_adjoining(points: &mut [(f64, f64, f64)], i: usize, old: (f64, f64, f64), new: (f64, f64, f64)) { +/// points at other positions on the sides `sides` names (before, after) change in proportion (by +/// the same amount from zero). +fn adjust_adjoining(points: &mut [(f64, f64, f64)], i: usize, old: (f64, f64, f64), new: (f64, f64, f64), sides: [bool; 2]) { let t = points[i].0; let scale = |v: f64, o: f64, n: f64| { let width = if o > 1e-9 { @@ -284,8 +285,8 @@ fn adjust_adjoining(points: &mut [(f64, f64, f64)], i: usize, old: (f64, f64, f6 }; width.max(0.0) }; - let before = (0..i).rev().find(|j| (points[*j].0 - t).abs() > SAME_T); - let after = (i + 1..points.len()).find(|j| (points[*j].0 - t).abs() > SAME_T); + let before = (0..i).rev().find(|j| (points[*j].0 - t).abs() > SAME_T).filter(|_| sides[0]); + let after = (i + 1..points.len()).find(|j| (points[*j].0 - t).abs() > SAME_T).filter(|_| sides[1]); for j in before.into_iter().chain(after) { let q = &mut points[j]; (q.1, q.2) = (scale(q.1, old.1, new.1), scale(q.2, old.2, new.2)); @@ -303,6 +304,45 @@ fn same_points(a: Option<&WidthProfile>, b: Option<&WidthProfile>) -> bool { } } +/// Set both halves of the discontinuous point whose incoming half is `i` and outgoing half `j` to +/// the widths of `inc` and `out` (their places are ignored: the point keeps its place). With +/// `single` (`true` for the outgoing half) only that half's widths remain, as one continuous point. +/// With `adjust`, the nearest point before changes with the incoming half and the nearest point after +/// with the outgoing half, once each. → the index of the point (its incoming half). +fn set_pair( + points: &mut Vec<(f64, f64, f64)>, + (i, inc): (usize, (f64, f64, f64)), + (j, out): (usize, (f64, f64, f64)), + adjust: bool, + single: Option, +) -> Result { + const C: &str = "stroke.widthPoint.set"; + let at = points.get(i).map_or(f64::NAN, |q| q.0); + let halves: Vec = (0..points.len()).filter(|k| (points[*k].0 - at).abs() <= SAME_T).collect(); + if halves != [i, j] { + return Err(bad(C, "`index` and `outIndex` must be the two halves of one discontinuous width point")); + } + let (old_in, old_out) = (points[i], points[j]); + if (old_in.0 - inc.0).abs() > SAME_T { + return Err(bad(C, "a discontinuous width point keeps its place")); + } + let (new_in, new_out) = match single { + None => ((old_in.0, inc.1, inc.2), (old_out.0, out.1, out.2)), + Some(false) => ((old_in.0, inc.1, inc.2), (old_in.0, inc.1, inc.2)), + Some(true) => ((old_in.0, out.1, out.2), (old_in.0, out.1, out.2)), + }; + if adjust { + adjust_adjoining(points, i, old_in, new_in, [true, false]); + adjust_adjoining(points, j, old_out, new_out, [false, true]); + } + points[i] = new_in; + points[j] = new_out; + if single.is_some() { + points.remove(j); + } + Ok(i) +} + fn width_point_set(s: &mut Session, p: &Value) -> Result { const C: &str = "stroke.widthPoint.set"; let id = object_param(p, "id", C)?.ok_or_else(|| bad(C, "missing id"))?; @@ -312,6 +352,23 @@ fn width_point_set(s: &mut Session, p: &Value) -> Result { return Err(bad(C, "left/right must be non-negative widths")); } let adjust = switch_or(p, "adjustAdjoining", false, C)?; + let single = match text_param(p, "single", C)? { + None => None, + Some(side @ ("incoming" | "outgoing")) => Some(side == "outgoing"), + Some(_) => return Err(bad(C, "`single` must be `incoming` or `outgoing`")), + }; + // The outgoing half of a discontinuous point: its index and side widths (points). + let out = match p.get("outIndex") { + None | Some(Value::Null) if single.is_none() => None, + _ => { + let j = usize::try_from(u64_req(p, "outIndex", C)?).map_err(|_| bad(C, "no such width point"))?; + let (l, r) = (f64_req(p, "outLeft", C)?, f64_req(p, "outRight", C)?); + if !(l.is_finite() && r.is_finite()) || l < 0.0 || r < 0.0 || l.max(r) > 1.0e5 { + return Err(bad(C, "left/right must be non-negative widths")); + } + Some((j, l, r)) + } + }; // When the profile comes out as it was, within a rounding error (1e-9), the document and its undo // history stay as they are. let mut pos = 0; @@ -324,11 +381,19 @@ fn width_point_set(s: &mut Session, p: &Value) -> Result { return Err(bad(C, "width factors must be finite")); } let mut prof = st.profile.take().unwrap_or_else(uniform); - pos = match point_index(p, &prof, C)? { - Some(i) => { + pos = match (point_index(p, &prof, C)?, out) { + (None, Some(_)) => return Err(bad(C, "missing index")), + (Some(i), Some((j, l, r))) => { + let out = (t, l / half, r / half); + if !out.1.is_finite() || !out.2.is_finite() { + return Err(bad(C, "width factors must be finite")); + } + set_pair(&mut prof.points, (i, pt), (j, out), adjust, single)? + } + (Some(i), None) => { let old = prof.points[i]; if adjust { - adjust_adjoining(&mut prof.points, i, old, pt); + adjust_adjoining(&mut prof.points, i, old, pt, [true, true]); } if (old.0 - t).abs() <= SAME_T { // Widths only: it keeps its place (and its side of a discontinuous point). @@ -339,12 +404,12 @@ fn width_point_set(s: &mut Session, p: &Value) -> Result { place(&mut prof.points, pt, old.0 < t) } } - None => { + (None, None) => { let old = adjust.then(|| prof.at(t)); prof.points.retain(|q| (q.0 - t).abs() > SAME_T); let i = place(&mut prof.points, pt, true); if let Some((left, right)) = old { - adjust_adjoining(&mut prof.points, i, (t, left, right), pt); + adjust_adjoining(&mut prof.points, i, (t, left, right), pt, [true, true]); } i } diff --git a/crates/engine/src/tests/widthpoints.rs b/crates/engine/src/tests/widthpoints.rs index 6aa324aa90..68b7099d68 100644 --- a/crates/engine/src/tests/widthpoints.rs +++ b/crates/engine/src/tests/widthpoints.rs @@ -167,6 +167,110 @@ fn adjust_adjoining_scales_the_neighbours() { assert_eq!(points(&s, id), vec![(0.5, 4.0, 1.0)]); } +/// A line with a discontinuous point in the middle: 1× before it, 2× after it. +fn pair_session(points: serde_json::Value) -> (Session, NodeId) { + let (mut s, id) = line_session(); + s.execute("stroke.widthProfile.set", &json!({"ids": [id.0], "points": points})).unwrap(); + s.doc_mut().unwrap().mark_saved(); + (s, id) +} + +#[test] +fn paired_set_edits_both_halves_in_one_step() { + let (mut s, id) = pair_session(json!([[0, 1, 1], [0.5, 1, 1], [0.5, 2, 2], [1, 1, 1]])); + let before = s.doc().unwrap().doc.clone(); + let undo = s.doc().unwrap().history.undo.len(); + let p = json!({"id": id.0, "index": 1, "t": 0.5, "left": 10, "right": 5, "outIndex": 2, "outLeft": 15, "outRight": 20}); + assert_eq!(set(&mut s, p.clone()), 1); + assert_eq!(points(&s, id), vec![(0.0, 1.0, 1.0), (0.5, 2.0, 1.0), (0.5, 3.0, 4.0), (1.0, 1.0, 1.0)]); + assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1); + let after = s.doc().unwrap().doc.clone(); + // The same widths again change nothing and record no undo step. + set(&mut s, p); + assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(s.doc().unwrap().doc, before); + s.execute("edit.redo", &json!({})).unwrap(); + assert_eq!(s.doc().unwrap().doc, after); +} + +#[test] +fn paired_set_adjusts_the_point_before_and_the_point_after_once_each() { + let (mut s, id) = pair_session(json!([[0, 1, 1], [0.5, 1, 1], [0.5, 2, 2], [1, 1, 1]])); + // The incoming half doubles and the outgoing half halves: the start doubles, the end halves. + set( + &mut s, + json!({"id": id.0, "index": 1, "t": 0.5, "left": 10, "right": 10, "outIndex": 2, "outLeft": 5, "outRight": 5, "adjustAdjoining": true}), + ); + assert_eq!(points(&s, id), vec![(0.0, 2.0, 2.0), (0.5, 2.0, 2.0), (0.5, 1.0, 1.0), (1.0, 0.5, 0.5)]); + // A discontinuous point at the start has only a point after it to adjust. + let (mut s, id) = pair_session(json!([[0, 1, 1], [0, 2, 2], [1, 1, 1]])); + set( + &mut s, + json!({"id": id.0, "index": 0, "t": 0, "left": 10, "right": 10, "outIndex": 1, "outLeft": 20, "outRight": 20, "adjustAdjoining": true}), + ); + assert_eq!(points(&s, id), vec![(0.0, 2.0, 2.0), (0.0, 4.0, 4.0), (1.0, 2.0, 2.0)]); +} + +#[test] +fn single_width_only_leaves_one_continuous_point() { + for (single, kept) in [("incoming", (2.0, 1.0)), ("outgoing", (3.0, 4.0))] { + let (mut s, id) = pair_session(json!([[0, 1, 1], [0.5, 1, 1], [0.5, 2, 2], [1, 1, 1]])); + let before = s.doc().unwrap().doc.clone(); + let undo = s.doc().unwrap().history.undo.len(); + let p = json!({"id": id.0, "index": 1, "t": 0.5, "left": 10, "right": 5, "outIndex": 2, "outLeft": 15, "outRight": 20, "single": single}); + assert_eq!(set(&mut s, p), 1); + assert_eq!(points(&s, id), vec![(0.0, 1.0, 1.0), (0.5, kept.0, kept.1), (1.0, 1.0, 1.0)], "{single}"); + assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(s.doc().unwrap().doc, before); + } + // With Adjust Adjoining, each neighbor follows the change of the half beside it. + let (mut s, id) = pair_session(json!([[0, 1, 1], [0.5, 1, 1], [0.5, 2, 2], [1, 1, 1]])); + let p = json!({"id": id.0, "index": 1, "t": 0.5, "left": 5, "right": 5, "outIndex": 2, "outLeft": 5, "outRight": 5, "single": "incoming", "adjustAdjoining": true}); + set(&mut s, p); + assert_eq!(points(&s, id), vec![(0.0, 1.0, 1.0), (0.5, 1.0, 1.0), (1.0, 0.5, 0.5)]); +} + +#[test] +fn paired_set_refuses_what_is_not_one_discontinuous_point() { + let (mut s, id) = pair_session(json!([[0, 1, 1], [0.25, 1, 1], [0.5, 1, 1], [0.5, 2, 2], [0.75, 3, 3], [0.75, 3, 3], [0.75, 3, 3], [1, 1, 1]])); + let before = s.doc().unwrap().doc.clone(); + let undo = s.doc().unwrap().history.undo.len(); + let pair = |extra: serde_json::Value| { + let mut p = json!({"id": id.0, "index": 2, "t": 0.5, "left": 5, "right": 5, "outIndex": 3, "outLeft": 5, "outRight": 5}); + for (k, v) in extra.as_object().unwrap() { + if v.is_null() { + p.as_object_mut().unwrap().remove(k); + } else { + p[k] = v.clone(); + } + } + p + }; + for p in [ + pair(json!({"index": 1, "t": 0.25, "outIndex": 2})), + pair(json!({"outIndex": 4})), + pair(json!({"index": 3, "outIndex": 2})), + pair(json!({"outIndex": 99})), + pair(json!({"outIndex": "3"})), + pair(json!({"outIndex": -1})), + pair(json!({"t": 0.6})), + pair(json!({"index": 4, "t": 0.75, "outIndex": 5})), + pair(json!({"index": null})), + pair(json!({"outLeft": null})), + pair(json!({"outRight": -1})), + pair(json!({"outLeft": 1.0e6})), + pair(json!({"single": "both"})), + pair(json!({"single": true})), + json!({"id": id.0, "index": 2, "t": 0.5, "left": 5, "right": 5, "single": "incoming"}), + ] { + assert!(s.execute("stroke.widthPoint.set", &p).is_err(), "accepted {p}"); + assert_eq!(s.doc().unwrap().doc, before, "{p}"); + assert_eq!(s.doc().unwrap().history.undo.len(), undo); + } +} + #[test] fn flipping_along_swaps_the_sides_of_a_discontinuous_point() { let (mut s, id) = line_session(); diff --git a/crates/ui-egui/src/dialogs/width_point.rs b/crates/ui-egui/src/dialogs/width_point.rs index afa27c2abf..f0d2cfb158 100644 --- a/crates/ui-egui/src/dialogs/width_point.rs +++ b/crates/ui-egui/src/dialogs/width_point.rs @@ -6,11 +6,20 @@ //! OK runs `stroke.widthPoint.set`; Delete removes an existing point (`stroke.widthPoint.remove`) //! or discards a prospective point without changing the document. //! -//! Fields: `id`, `index` (an existing width point, otherwise null), `t` (its place), `side1`, -//! `side2` (the left and right widths, points), `linked`, `adjustAdjoining`; Delete sets `discard: true` and confirms. +//! On either half of a discontinuous point the dialog shows both sets of side widths, Incoming +//! (before the point along the path) and Outgoing (after it), and Single Width Only keeps one of +//! them as a continuous point. OK sets both halves in one `stroke.widthPoint.set` (one undo step), +//! and Delete removes both halves. +//! +//! Fields: `id`, `index` (an existing width point, otherwise null; the incoming half of a +//! discontinuous point), `t` (its place), `side1`, `side2` (the left and right widths, points), +//! `linked`, `adjustAdjoining`; for a discontinuous point also `outIndex`, `outSide1`, `outSide2`, +//! `outLinked` (the outgoing half) and `single` (`""`, `"incoming"` or `"outgoing"`); Delete sets +//! `discard: true` and confirms. use egui::vec2; use serde_json::{Value, json}; +use vectorcraft_doc::Unit; use vectorcraft_engine::doc::NodeId; use super::swatch_options::{grid, label}; @@ -21,6 +30,10 @@ use crate::{VectorcraftApp, widgets}; /// The dialog kind of Width Point Edit. pub const KIND: &str = "widthPoint"; +/// Width points closer than this (in t) are the two halves of one discontinuous point, as the +/// engine and the Width tool count them. +const SAME_T: f64 = 1e-6; + pub(super) const SPEC: DialogSpec = DialogSpec { heading: |_| tl!("Width Point Edit").into(), body, confirm, discard: Some("Delete"), min_width: 300.0, ..DialogSpec::FORM }; @@ -31,9 +44,21 @@ fn point(app: &VectorcraftApp, id: u64, index: usize) -> Option<(f64, f64, f64)> st.profile.as_ref()?.points.get(index).map(|&(t, l, r)| (t, l * half, r * half)) } +/// The incoming and outgoing halves of the discontinuous point that width point `index` of `id` +/// belongs to, or none when no other point shares its place (or more than one does). +fn halves(app: &VectorcraftApp, id: u64, index: usize) -> Option<(usize, usize)> { + let points = &app.session.active()?.doc.node(NodeId(id))?.appearance.stroke()?.profile.as_ref()?.points; + let t = points.get(index)?.0; + match (0..points.len()).filter(|i| (points[*i].0 - t).abs() <= SAME_T).collect::>()[..] { + [a, b] => Some((a, b)), + _ => None, + } +} + /// Open Width Point Edit for `index`, or a prospective point at fraction `t` without an index /// (`{id, index?, t?, adjustAdjoining?}`). Opening only samples the stroke: confirmation creates -/// the point. Adjoining adjustment defaults to false. +/// the point. Adjoining adjustment defaults to false. Either half of a discontinuous point opens +/// both. pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result { let id = p.get("id").and_then(Value::as_u64).ok_or("give the path `id`")?; let doc = &app.session.active().ok_or("no document")?.doc; @@ -42,6 +67,8 @@ pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result { Some(v) => Some(v.as_u64().and_then(|i| usize::try_from(i).ok()).ok_or("no such width point")?), None => None, }; + let pair = index.and_then(|i| halves(app, id, i)); + let index = pair.map_or(index, |(a, _)| Some(a)); let (t, l, r) = if let Some(index) = index { point(app, id, index).ok_or("no such width point")? } else { @@ -59,45 +86,86 @@ pub fn open(app: &mut VectorcraftApp, p: &Value) -> Result { (t, l, r) }; let adjust = p.get("adjustAdjoining").and_then(Value::as_bool).unwrap_or(false); - let fields = json!({"id": id, "index": index, "t": t, "side1": l, "side2": r, "linked": (l - r).abs() < 1e-9, "adjustAdjoining": adjust}); + let mut fields = json!({"id": id, "index": index, "t": t, "side1": l, "side2": r, "linked": (l - r).abs() < 1e-9, "adjustAdjoining": adjust}); + if let Some((_, out)) = pair { + let (_, l, r) = point(app, id, out).ok_or("no such width point")?; + for (key, value) in [ + ("outIndex", json!(out)), + ("outSide1", json!(l)), + ("outSide2", json!(r)), + ("outLinked", json!((l - r).abs() < 1e-9)), + ("single", json!("")), + ] { + fields[key] = value; + } + } app.ui.dialog = Some(Dialog::new(KIND, fields)); Ok(Value::Null) } -fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { - let unit = app.session.stroke_unit(); - let (s1, s2, linked) = (d.f64("side1", 0.0), d.f64("side2", 0.0), d.bool("linked")); - let mut sides = None; +/// Whether the dialog edits a discontinuous point. +fn paired(d: &Dialog) -> bool { + d.fields.get("outIndex").is_some_and(|v| !v.is_null()) +} + +/// One set of side widths: Side 1 with its link, Side 2 and Total Width, kept in the fields `keys` +/// (side 1, side 2, linked) and shown in the number fields `ids`. +fn sides(ui: &mut egui::Ui, d: &mut Dialog, unit: Unit, keys: [&str; 3], ids: [&str; 3]) { + let [k1, k2, kl] = keys; + let (s1, s2, linked) = (d.f64(k1, 0.0), d.f64(k2, 0.0), d.bool(kl)); + let mut new = None; grid(ui, |ui| { label(ui, tl!("Side 1:")); ui.horizontal(|ui| { - if let Some(v) = widgets::num_field(ui, "wp-side1", Some(s1), unit, 90.0) { - sides = Some((v, if linked { v } else { s2 })); + if let Some(v) = widgets::num_field(ui, ids[0], Some(s1), unit, 90.0) { + new = Some((v, if linked { v } else { s2 })); } if widgets::icon_button(ui, if linked { "link" } else { "link-2-off" }, tl!("Keep both sides the same width"), linked, 22.0).clicked() { - d.fields.insert("linked".into(), json!(!linked)); + d.fields.insert(kl.into(), json!(!linked)); if !linked { - sides = Some((s1, s1)); + new = Some((s1, s1)); } } }); ui.end_row(); label(ui, tl!("Side 2:")); - if let Some(v) = widgets::num_field(ui, "wp-side2", Some(s2), unit, 90.0) { - sides = Some((if linked { v } else { s1 }, v)); + if let Some(v) = widgets::num_field(ui, ids[1], Some(s2), unit, 90.0) { + new = Some((if linked { v } else { s1 }, v)); } ui.end_row(); label(ui, tl!("Total Width:")); - if let Some(v) = widgets::num_field(ui, "wp-total", Some(s1 + s2), unit, 90.0) { + if let Some(v) = widgets::num_field(ui, ids[2], Some(s1 + s2), unit, 90.0) { // Both sides in proportion (equal halves from nothing). let k = if s1 + s2 > 1e-9 { v / (s1 + s2) } else { 0.0 }; - sides = Some(if k > 0.0 { (s1 * k, s2 * k) } else { (v / 2.0, v / 2.0) }); + new = Some(if k > 0.0 { (s1 * k, s2 * k) } else { (v / 2.0, v / 2.0) }); } ui.end_row(); }); - if let Some((a, b)) = sides { - d.fields.insert("side1".into(), json!(a.max(0.0))); - d.fields.insert("side2".into(), json!(b.max(0.0))); + if let Some((a, b)) = new { + d.fields.insert(k1.into(), json!(a.max(0.0))); + d.fields.insert(k2.into(), json!(b.max(0.0))); + } +} + +fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { + let unit = app.session.stroke_unit(); + let incoming = (["side1", "side2", "linked"], ["wp-side1", "wp-side2", "wp-total"]); + if paired(d) { + widgets::section_header(ui, tl!("Incoming")); + ui.push_id("wp-incoming", |ui| sides(ui, d, unit, incoming.0, incoming.1)); + widgets::section_header(ui, tl!("Outgoing")); + ui.push_id("wp-outgoing", |ui| sides(ui, d, unit, ["outSide1", "outSide2", "outLinked"], ["wp-out-side1", "wp-out-side2", "wp-out-total"])); + widgets::section_header(ui, tl!("Single Width Only")); + ui.horizontal(|ui| { + let single = d.str("single"); + for (value, text) in [("", tl!("None")), ("incoming", tl!("Incoming")), ("outgoing", tl!("Outgoing"))] { + if widgets::radio(ui, text, single == value, true) { + d.fields.insert("single".into(), json!(value)); + } + } + }); + } else { + sides(ui, d, unit, incoming.0, incoming.1); } ui.add_space(4.0); ui.allocate_ui(vec2(ui.available_width(), 22.0), |ui| { @@ -110,16 +178,30 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { let (id, index) = (d.fields.get("id").cloned().unwrap_or_default(), d.fields.get("index").cloned().unwrap_or_default()); + let out = d.fields.get("outIndex").filter(|_| paired(d)).cloned(); if d.bool("discard") { if index.is_null() { // Deleting a prospective point discards the dialog; no document point exists yet. app.ui.dialog = None; return Ok(Value::Null); } - return run_and_close(app, "stroke.widthPoint.remove", json!({"id": id, "index": index})); + let p = match out { + Some(out) => json!({"id": id, "indices": [index, out]}), + None => json!({"id": id, "index": index}), + }; + return run_and_close(app, "stroke.widthPoint.remove", p); } let (left, right) = (d.f64("side1", 0.0), d.f64("side2", 0.0)); - let p = json!({"id": id, "index": index, "t": d.f64("t", 0.0), "left": left, "right": right, "adjustAdjoining": d.bool("adjustAdjoining")}); + let mut p = json!({"id": id, "index": index, "t": d.f64("t", 0.0), "left": left, "right": right, "adjustAdjoining": d.bool("adjustAdjoining")}); + if let Some(out) = out { + p["outIndex"] = out; + p["outLeft"] = json!(d.f64("outSide1", 0.0)); + p["outRight"] = json!(d.f64("outSide2", 0.0)); + let single = d.str("single"); + if !single.is_empty() { + p["single"] = json!(single); + } + } run_and_close(app, "stroke.widthPoint.set", p) } diff --git a/crates/ui-egui/src/dialogs/width_point/tests.rs b/crates/ui-egui/src/dialogs/width_point/tests.rs index 4c5b972f12..ab07b971ae 100644 --- a/crates/ui-egui/src/dialogs/width_point/tests.rs +++ b/crates/ui-egui/src/dialogs/width_point/tests.rs @@ -400,3 +400,146 @@ fn new_width_point_checkbox_adjusts_adjoining_in_one_step() { fn new_width_point_checkbox_off_preserves_adjoining() { creation_adjoining_checkbox(false); } + +/// [`app`]'s line with a discontinuous point in the middle: 4 + 4 pt before it, 2 + 6 pt after it. +fn pair_app() -> (VectorcraftApp, u64) { + let (mut app, id) = app(); + app.run("stroke.widthProfile.set", json!({"ids": [id], "points": [[0, 1, 1], [0.5, 0.8, 0.8], [0.5, 0.4, 1.2], [1, 1, 1]]})).unwrap(); + app.session.doc_mut().unwrap().mark_saved(); + (app, id) +} + +fn assert_pair_fields(d: &Dialog) { + assert_eq!((d.fields["index"].clone(), d.fields["outIndex"].clone()), (json!(1), json!(2))); + assert_eq!((d.f64("side1", 0.0), d.f64("side2", 0.0), d.bool("linked")), (4.0, 4.0, true)); + assert_eq!((d.f64("outSide1", 0.0), d.f64("outSide2", 0.0), d.bool("outLinked")), (2.0, 6.0, false)); + assert_eq!(d.str("single"), ""); +} + +#[test] +fn either_half_of_a_discontinuous_point_shows_both_sets_of_side_widths() { + for index in [1, 2] { + let (mut app, id) = pair_app(); + app.run("ui.widthPointEdit", json!({"id": id, "index": index})).unwrap(); + assert_pair_fields(app.ui.dialog.as_ref().unwrap()); + let shown = frame(&mut app); + for s in ["Incoming", "Outgoing", "Single Width Only", "None", "Adjust Adjoining Width Points", "Delete"] { + assert!(shown.iter().any(|t| t == s), "{s} in {shown:?}"); + } + for s in ["Side 1:", "Side 2:", "Total Width:"] { + assert_eq!(shown.iter().filter(|t| *t == s).count(), 2, "{s} in each set: {shown:?}"); + } + } + // Double-clicking the point with the Width tool opens the same two sets. + let (mut app, _) = pair_app(); + let view = app.view_info(); + app.select_tool("width"); + crate::canvas::dispatch(&mut app, &PointerEvent::new(PointerKind::DoubleClick, 200.0, 150.0), view); + assert_pair_fields(app.ui.dialog.as_ref().expect("Width Point Edit opened")); + // A continuous point keeps one set. + let (mut app, id) = pair_app(); + app.run("ui.widthPointEdit", json!({"id": id, "index": 0})).unwrap(); + assert!(app.ui.dialog.as_ref().unwrap().fields.get("outIndex").is_none()); + let shown = frame(&mut app); + assert!(!shown.iter().any(|t| t == "Incoming" || t == "Outgoing"), "{shown:?}"); + assert_eq!(shown.iter().filter(|t| *t == "Side 1:").count(), 1); +} + +#[test] +fn ok_sets_both_halves_of_a_discontinuous_point_in_one_step() { + let (mut app, id) = pair_app(); + let before = app.session.doc().unwrap().doc.clone(); + let history = creation_history(&app); + // Cancel after edits changes nothing. + app.run("ui.widthPointEdit", json!({"id": id, "index": 2})).unwrap(); + app.ui.dialog.as_mut().unwrap().fields.insert("outSide1".into(), json!(9)); + super::super::cancel(&mut app); + assert_eq!(app.session.doc().unwrap().doc, before); + assert_eq!(creation_history(&app), history); + app.run("ui.widthPointEdit", json!({"id": id, "index": 2})).unwrap(); + let d = app.ui.dialog.as_mut().unwrap(); + for (key, value) in [("side1", 6), ("side2", 2), ("outSide1", 1), ("outSide2", 3)] { + d.fields.insert(key.into(), json!(value)); + } + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(points(&app, id), vec![(0.0, 1.0, 1.0), (0.5, 1.2, 0.4), (0.5, 0.2, 0.6), (1.0, 1.0, 1.0)]); + assert_eq!(creation_history(&app), (history.0 + 1, 0, true)); + let after = app.session.doc().unwrap().doc.clone(); + app.run("edit.undo", json!({})).unwrap(); + assert_eq!(app.session.doc().unwrap().doc, before); + app.run("edit.redo", json!({})).unwrap(); + assert_eq!(app.session.doc().unwrap().doc, after); + // OK with nothing changed records no undo step. + app.run("ui.widthPointEdit", json!({"id": id, "index": 1})).unwrap(); + super::super::confirm(&mut app).unwrap(); + assert_eq!(creation_history(&app), (history.0 + 1, 0, true)); +} + +#[test] +fn delete_removes_both_halves_of_a_discontinuous_point() { + let (mut app, id) = pair_app(); + let before = app.session.doc().unwrap().doc.clone(); + let history = creation_history(&app); + app.run("ui.widthPointEdit", json!({"id": id, "index": 1})).unwrap(); + app.ui.dialog.as_mut().unwrap().fields.insert("discard".into(), json!(true)); + super::super::confirm(&mut app).unwrap(); + assert_eq!(points(&app, id), vec![(0.0, 1.0, 1.0), (1.0, 1.0, 1.0)]); + assert_eq!(creation_history(&app).0, history.0 + 1); + app.run("edit.undo", json!({})).unwrap(); + assert_eq!(app.session.doc().unwrap().doc, before); +} + +/// Click the last visible text `label` in the dialog (a radio after a heading of the same name). +fn click_last(app: &mut VectorcraftApp, ctx: &egui::Context, label: &str) { + for _ in 0..4 { + creation_dialog_frame(app, ctx, vec![]); + } + let texts = creation_dialog_frame(app, ctx, vec![]); + let pos = texts.iter().rev().find(|(text, _)| text == label).unwrap_or_else(|| panic!("missing visible control {label}: {texts:?}")).1.center(); + for pressed in [true, false] { + let button = egui::Event::PointerButton { pos, button: egui::PointerButton::Primary, pressed, modifiers: Default::default() }; + creation_dialog_frame(app, ctx, vec![egui::Event::PointerMoved(pos), button]); + } + creation_dialog_frame(app, ctx, vec![]); +} + +#[test] +fn single_width_only_keeps_the_chosen_half_as_one_point() { + for (choice, kept) in [("Incoming", (0.8, 0.8)), ("Outgoing", (0.4, 1.2))] { + let (mut app, id) = pair_app(); + let before = app.session.doc().unwrap().doc.clone(); + let history = creation_history(&app); + app.run("ui.widthPointEdit", json!({"id": id, "index": 1})).unwrap(); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + crate::theme::apply(&ctx, Default::default()); + click_last(&mut app, &ctx, choice); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("single"), choice.to_lowercase()); + click_last(&mut app, &ctx, "OK"); + assert!(app.ui.dialog.is_none()); + assert_eq!(points(&app, id), vec![(0.0, 1.0, 1.0), (0.5, kept.0, kept.1), (1.0, 1.0, 1.0)], "{choice}"); + assert_eq!(creation_history(&app), (history.0 + 1, 0, true)); + app.run("edit.undo", json!({})).unwrap(); + assert_eq!(app.session.doc().unwrap().doc, before); + } +} + +#[test] +fn a_compound_member_edits_both_halves_of_its_owners_point() { + let (mut app, line) = app(); + let second = app.run("shape.line", json!({"x1": 320, "y1": 50, "x2": 320, "y2": 250})).unwrap()["id"].as_u64().unwrap(); + app.run("select.set", json!({"ids": [line, second]})).unwrap(); + let owner = app.run("object.compoundPath.make", json!({})).unwrap()["id"].as_u64().unwrap(); + app.run("stroke.widthProfile.set", json!({"ids": [owner], "points": [[0, 1, 1], [0.5, 0.8, 0.8], [0.5, 0.4, 1.2], [1, 1, 1]]})).unwrap(); + app.run("ui.widthPointEdit", json!({"id": second, "index": 2})).unwrap(); + let d = app.ui.dialog.as_mut().unwrap(); + assert_eq!(d.fields["id"], json!(owner)); + d.fields.insert("adjustAdjoining".into(), json!(true)); + d.fields.insert("side1".into(), json!(8)); + d.fields.insert("outSide2".into(), json!(3)); + super::super::confirm(&mut app).unwrap(); + // The incoming change (Side 1 doubled) doubles the start's Side 1; the outgoing one (Side 2 + // halved) halves the end's Side 2. + assert_eq!(points(&app, owner), vec![(0.0, 2.0, 1.0), (0.5, 1.6, 0.8), (0.5, 0.4, 0.6), (1.0, 1.0, 0.5)]); +} diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index bb039bb08e..c4c9b173fc 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -128,6 +128,9 @@ Additional Plug-ins Folder Допълнителна папка за плъгини Additional Fonts Folder Допълнителна папка за шрифтове Adjust Adjoining Width Points Регулиране на прилежащите точки за ширина + Incoming Входяща + Outgoing Изходяща + Single Width Only Само една ширина Adjust Color Balance… Коригиране на цветовия баланс… Adjust Colors Коригиране на цветовете Adjust Options: Параметри на коригиране: @@ -4737,6 +4740,9 @@ axis Both И двете @msg no such user library няма такава потребителска библиотека @msg no such view няма такъв изглед @msg no such width point няма такава точка за ширина +@msg `single` must be `incoming` or `outgoing` `single` трябва да е `incoming` или `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` и `outIndex` трябва да са двете половини на една прекъсната точка за ширина +@msg a discontinuous width point keeps its place прекъснатата точка за ширина запазва мястото си @msg no swatch `{name}` няма образец `{name}` @msg no swatch library `{l}` (see swatch.library.list) няма библиотека с образци `{l}` (вижте swatch.library.list) @msg no symbol instances selected няма избрани екземпляри на символ diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 99f23d313c..35a6849e94 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -3329,6 +3329,9 @@ antiAlias Sharp Oštro Variable Options Opcije varijable Define a variable first Prvo definišite varijablu Adjust Adjoining Width Points Podesi susjedne tačke širine + Incoming Ulazna + Outgoing Izlazna + Single Width Only Samo jedna širina Keep both sides the same width Zadrži obje strane iste širine Side 1: Strana 1: Side 2: Strana 2: @@ -5144,6 +5147,9 @@ imageTrace Outline Obris @msg no such user library nema takve korisničke biblioteke @msg no such view nema takvog pogleda @msg no such width point nema takve tačke širine +@msg `single` must be `incoming` or `outgoing` `single` mora biti `incoming` ili `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` i `outIndex` moraju biti dvije polovine jedne isprekidane tačke širine +@msg a discontinuous width point keeps its place isprekidana tačka širine zadržava svoje mjesto @msg no swatch `{name}` nema uzorka boje `{name}` @msg no swatch library `{l}` (see swatch.library.list) nema biblioteke uzoraka boja `{l}` (vidi swatch.library.list) @msg no symbol instances selected nisu odabrane instance simbola diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index c54311799d..e1657921f4 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -223,6 +223,9 @@ Additional Fonts Folder Carpeta addicional de tipus de lletra Additional Plug-ins Folder Carpeta addicional de complements Adjust Adjoining Width Points Ajusta els punts d’amplada contigus + Incoming Entrant + Outgoing Sortint + Single Width Only Només una amplada Adjust Color Balance… Ajusta l’equilibri de color… Adjust Colors Ajusta els colors Adjust Options: Opcions d’ajust: @@ -6274,6 +6277,9 @@ liquify-list-end {0}, {1} {0} i {1} @msg no such user library no existeix aquesta biblioteca d’usuari @msg no such view no existeix aquesta vista @msg no such width point no existeix aquest punt d’amplada +@msg `single` must be `incoming` or `outgoing` `single` ha de ser `incoming` o `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` i `outIndex` han de ser les dues meitats d’un mateix punt d’amplada discontinu +@msg a discontinuous width point keeps its place un punt d’amplada discontinu manté la seva posició @msg no swatch `{name}` no hi ha la mostra `{name}` @msg no swatch library `{l}` (see swatch.library.list) no hi ha la biblioteca de mostres `{l}` (vegeu swatch.library.list) @msg no symbol `{n}` no hi ha el símbol `{n}` diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index a5d7bb948a..d1f49616cf 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -3419,6 +3419,9 @@ antiAlias Sharp Ostré Variable Options Možnosti proměnné Define a variable first Nejprve definujte proměnnou Adjust Adjoining Width Points Upravit sousední body šířky + Incoming Příchozí + Outgoing Odchozí + Single Width Only Pouze jedna šířka Keep both sides the same width Zachovat stejnou šířku obou stran Side 1: Strana 1: Side 2: Strana 2: @@ -5417,6 +5420,9 @@ liquify-list-end {0}, {1} {0} a {1} @msg no such user library taková uživatelská knihovna neexistuje @msg no such view takové zobrazení neexistuje @msg no such width point takový bod šířky neexistuje +@msg `single` must be `incoming` or `outgoing` `single` musí být `incoming` nebo `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` a `outIndex` musí být dvě poloviny jednoho nespojitého bodu šířky +@msg a discontinuous width point keeps its place nespojitý bod šířky si zachovává své místo @msg no swatch `{name}` položka vzorníku `{name}` neexistuje @msg no swatch library `{l}` (see swatch.library.list) knihovna vzorníku `{l}` neexistuje (viz swatch.library.list) @msg no symbol instances selected nejsou vybrány žádné instance symbolů diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 08100f593f..7be089384e 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -5856,6 +5856,9 @@ antiAlias Sharp Skarp Variable Options Indstillinger for variabel Define a variable first Definér først en variabel Adjust Adjoining Width Points Justér tilstødende breddepunkter + Incoming Indgående + Outgoing Udgående + Single Width Only Kun én bredde Keep both sides the same width Bevar samme bredde på begge sider Side 1: Side 1: Side 2: Side 2: @@ -7595,6 +7598,9 @@ imageTrace Outline Kontur @msg no such user library intet sådant brugerbibliotek @msg no such view ingen sådan visning @msg no such width point intet sådant breddepunkt +@msg `single` must be `incoming` or `outgoing` `single` skal være `incoming` eller `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` og `outIndex` skal være de to halvdele af ét diskontinuert breddepunkt +@msg a discontinuous width point keeps its place et diskontinuert breddepunkt bevarer sin placering @msg no swatch `{name}` ingen farveprøve `{name}` @msg no swatch library `{l}` (see swatch.library.list) intet farveprøvebibliotek `{l}` (se swatch.library.list) @msg no symbol instances selected ingen symbolforekomster markeret diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 10147b2d45..518c312c5b 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -117,6 +117,9 @@ Additional Plug-ins Folder Zusätzlicher Plug-in-Ordner Additional Fonts Folder Zusätzlicher Schriftenordner Adjust Adjoining Width Points Angrenzende Breitenpunkte anpassen + Incoming Eingehend + Outgoing Ausgehend + Single Width Only Nur eine Breite Adjust Color Balance… Farbbalance anpassen… Adjust Colors Farben anpassen Adjust Options: Anpassungsoptionen: @@ -5019,6 +5022,9 @@ liquify-list-end {0}, {1} {0} und {1} @msg no such user library keine solche Benutzerbibliothek @msg no such view keine solche Ansicht @msg no such width point kein solcher Breitenpunkt +@msg `single` must be `incoming` or `outgoing` `single` muss `incoming` oder `outgoing` sein +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` und `outIndex` müssen die beiden Hälften eines unterbrochenen Breitenpunkts sein +@msg a discontinuous width point keeps its place ein unterbrochener Breitenpunkt behält seine Position @msg no swatch `{name}` kein Farbfeld `{name}` @msg no swatch library `{l}` (see swatch.library.list) keine Farbfeldbibliothek `{l}` (siehe swatch.library.list) @msg no symbol instances selected keine Symbolinstanzen ausgewählt diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 1ebf6e5684..32480d4f66 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -122,6 +122,9 @@ Additional Plug-ins Folder Πρόσθετος φάκελος επεκτάσεων Additional Fonts Folder Πρόσθετος φάκελος γραμματοσειρών Adjust Adjoining Width Points Ρύθμιση γειτονικών σημείων πλάτους + Incoming Εισερχόμενο + Outgoing Εξερχόμενο + Single Width Only Μόνο ένα πλάτος Adjust Color Balance… Ρύθμιση ισορροπίας χρωμάτων… Adjust Colors Ρύθμιση χρωμάτων Adjust Options: Επιλογές ρύθμισης: @@ -5076,6 +5079,9 @@ digits Malayalam Μαλαγιάλαμ @msg no such user library δεν υπάρχει τέτοια βιβλιοθήκη χρήστη @msg no such view δεν υπάρχει τέτοια προβολή @msg no such width point δεν υπάρχει τέτοιο σημείο πλάτους +@msg `single` must be `incoming` or `outgoing` το `single` πρέπει να είναι `incoming` ή `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point τα `index` και `outIndex` πρέπει να είναι τα δύο μισά ενός ασυνεχούς σημείου πλάτους +@msg a discontinuous width point keeps its place ένα ασυνεχές σημείο πλάτους διατηρεί τη θέση του @msg no swatch `{name}` δεν υπάρχει δείγμα χρώματος `{name}` @msg no swatch library `{l}` (see swatch.library.list) δεν υπάρχει βιβλιοθήκη δειγμάτων `{l}` (δείτε swatch.library.list) @msg no symbol instances selected δεν έχουν επιλεγεί στιγμιότυπα συμβόλων diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index a456910a16..cc8eb4d0d5 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -142,6 +142,9 @@ Additional Plug-ins Folder Carpeta de plugins adicionales Additional Fonts Folder Carpeta de fuentes adicionales Adjust Adjoining Width Points Ajustar puntos de anchura contiguos + Incoming Entrante + Outgoing Saliente + Single Width Only Solo una anchura Adjust Color Balance… Ajustar equilibrio de color… Adjust Colors Ajustar colores Adjust Options: Opciones de ajuste: @@ -5122,6 +5125,9 @@ liquify-list-end {0}, {1} {0}, {1} @msg no such user library no existe esa biblioteca de usuario @msg no such view no existe esa vista @msg no such width point no existe ese punto de anchura +@msg `single` must be `incoming` or `outgoing` `single` debe ser `incoming` u `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` y `outIndex` deben ser las dos mitades de un mismo punto de anchura discontinuo +@msg a discontinuous width point keeps its place un punto de anchura discontinuo conserva su posición @msg no swatch `{name}` no existe la muestra `{name}` @msg no swatch library `{l}` (see swatch.library.list) no existe la biblioteca de muestras `{l}` (consulta swatch.library.list) @msg no symbol instances selected no hay instancias de símbolo seleccionadas diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index bff46fc0d7..42996a4107 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -3363,6 +3363,9 @@ antiAlias Sharp Terävä Variable Options Muuttujan asetukset Define a variable first Määritä ensin muuttuja Adjust Adjoining Width Points Säädä viereisiä leveyspisteitä + Incoming Saapuva + Outgoing Lähtevä + Single Width Only Vain yksi leveys Keep both sides the same width Pidä molemmat puolet samanlevyisinä Side 1: Puoli 1: Side 2: Puoli 2: @@ -5346,6 +5349,9 @@ liquify-list-end {0}, {1} {0} ja {1} @msg no such user library käyttäjäkirjastoa ei ole @msg no such view näkymää ei ole @msg no such width point leveyspistettä ei ole +@msg `single` must be `incoming` or `outgoing` `single` on oltava `incoming` tai `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` ja `outIndex` on oltava saman epäjatkuvan leveyspisteen kaksi puolikasta +@msg a discontinuous width point keeps its place epäjatkuva leveyspiste pysyy paikallaan @msg no swatch `{name}` ei värimallia `{name}` @msg no swatch library `{l}` (see swatch.library.list) ei värimallikirjastoa `{l}` (ks. swatch.library.list) @msg no symbol instances selected symboli-ilmentymiä ei ole valittu diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 3be3497f97..96b007cbe5 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -143,6 +143,9 @@ Additional Plug-ins Folder Dossier de modules externes supplémentaires Additional Fonts Folder Dossier de polices supplémentaires Adjust Adjoining Width Points Ajuster les points de largeur adjacents + Incoming Entrant + Outgoing Sortant + Single Width Only Une seule largeur Adjust Color Balance… Régler la balance des couleurs… Adjust Colors Régler les couleurs Adjust Options: Options de réglage : @@ -5084,6 +5087,9 @@ liquify-list-end {0}, {1} {0} et {1} @msg no such user library bibliothèque utilisateur inexistante @msg no such view vue inexistante @msg no such width point point de largeur inexistant +@msg `single` must be `incoming` or `outgoing` `single` doit valoir `incoming` ou `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` et `outIndex` doivent être les deux moitiés d’un même point de largeur discontinu +@msg a discontinuous width point keeps its place un point de largeur discontinu garde sa position @msg no swatch `{name}` aucune nuance `{name}` @msg no swatch library `{l}` (see swatch.library.list) aucune bibliothèque de nuances `{l}` (voir swatch.library.list) @msg no symbol instances selected aucune instance de symbole sélectionnée diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index c427fc527c..04cb534fcb 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -164,6 +164,9 @@ Additional Fonts Folder વધારાનું ફોન્ટ ફોલ્ડર Additional Plug-ins Folder વધારાનું પ્લગ-ઇન ફોલ્ડર Adjust Adjoining Width Points અડીને આવેલા પહોળાઈ બિંદુઓ ગોઠવો + Incoming આવતી બાજુ + Outgoing જતી બાજુ + Single Width Only ફક્ત એક પહોળાઈ Adjust Color Balance… રંગ બૅલેન્સ ગોઠવો… Adjust Colors રંગ ગોઠવો Adjust Options: ગોઠવણ વિકલ્પો: diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index cbfb4f51d1..1d66fd3f60 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -257,6 +257,9 @@ Additional Fonts Folder अतिरिक्त फ़ॉन्ट फ़ोल्डर Additional Plug-ins Folder अतिरिक्त प्लग-इन फ़ोल्डर Adjust Adjoining Width Points सटे हुए चौड़ाई पॉइंट समायोजित करें + Incoming आने वाली ओर + Outgoing जाने वाली ओर + Single Width Only केवल एक चौड़ाई Adjust Color Balance… कलर बैलेंस समायोजित करें… Adjust Colors रंग समायोजित करें Adjust Options: समायोजन ऑप्शन्स: @@ -7831,6 +7834,9 @@ liquify-list-end {0}, {1} {0} और {1} @msg no such user library ऐसी कोई उपयोगकर्ता लाइब्रेरी नहीं @msg no such view कोई ऐसा दृश्य नहीं @msg no such width point ऐसी कोई चौड़ाई बिंदु नहीं +@msg `single` must be `incoming` or `outgoing` `single` का मान `incoming` या `outgoing` होना चाहिए +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` और `outIndex` एक ही असतत चौड़ाई बिंदु के दो हिस्से होने चाहिए +@msg a discontinuous width point keeps its place असतत चौड़ाई बिंदु अपनी जगह पर रहता है @msg no swatch `{keep}` कोई स्वॉच `{keep}` नहीं @msg no swatch `{n}` कोई स्वॉच `{n}` नहीं @msg no swatch `{n}` (swatches and colour groups move separately) कोई स्वॉच `{n}` नहीं (स्वॉच और रंग समूह अलग-अलग मूव होते हैं) diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 0f81a72036..bfaf6595a4 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -211,6 +211,9 @@ Additional Fonts Folder További betűtípusok mappája Additional Plug-ins Folder További bővítmények mappája Adjust Adjoining Width Points Szomszédos szélességi pontok igazítása + Incoming Bejövő + Outgoing Kimenő + Single Width Only Csak egy szélesség Adjust Color Balance… Színegyensúly beállítása… Adjust Colors Színek beállítása Adjust Options: Módosítandó: @@ -5794,6 +5797,9 @@ liquify-list-end {0}, {1} {0} és {1} @msg no such user library nincs ilyen felhasználói könyvtár @msg no such view nincs ilyen nézet @msg no such width point nincs ilyen szélességi pont +@msg `single` must be `incoming` or `outgoing` a `single` értéke `incoming` vagy `outgoing` lehet +@msg `index` and `outIndex` must be the two halves of one discontinuous width point az `index` és az `outIndex` egyetlen szakadásos szélességi pont két fele kell legyen +@msg a discontinuous width point keeps its place a szakadásos szélességi pont megtartja a helyét @msg no swatch `{name}` nincs ilyen színminta: `{name}` @msg no swatch library `{l}` (see swatch.library.list) nincs ilyen színminta-könyvtár: `{l}` (lásd: swatch.library.list) @msg no symbol instances selected nincs kijelölt szimbólumpéldány diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 28ea2b5ab3..ab7574d1b4 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -3108,6 +3108,9 @@ antiAlias Sharp Tajam Variable Options Opsi variabel Define a variable first Tentukan variabel terlebih dahulu Adjust Adjoining Width Points Sesuaikan titik lebar bersebelahan + Incoming Masuk + Outgoing Keluar + Single Width Only Hanya satu lebar Keep both sides the same width Pertahankan kedua sisi tetap sama lebar Side 1: Sisi 1: Side 2: Sisi 2: @@ -4842,6 +4845,9 @@ imageTrace Outline Kontur @msg no such user library tidak ada pustaka pengguna seperti itu @msg no such view tidak ada tampilan seperti itu @msg no such width point tidak ada titik lebar seperti itu +@msg `single` must be `incoming` or `outgoing` `single` harus `incoming` atau `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` dan `outIndex` harus berupa dua bagian dari satu titik lebar terputus +@msg a discontinuous width point keeps its place titik lebar terputus tetap di tempatnya @msg no swatch `{name}` tidak ada swatch `{name}` @msg no swatch library `{l}` (see swatch.library.list) tidak ada pustaka swatch `{l}` (lihat swatch.library.list) @msg no symbol instances selected tidak ada instans simbol yang dipilih diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 8f2ed3216c..e027397aa1 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -142,6 +142,9 @@ Additional Plug-ins Folder Cartella plug-in aggiuntivi Additional Fonts Folder Cartella font aggiuntivi Adjust Adjoining Width Points Regola punti di larghezza adiacenti + Incoming In entrata + Outgoing In uscita + Single Width Only Solo una larghezza Adjust Color Balance… Regola bilanciamento colore… Adjust Colors Regola colori Adjust Options: Opzioni di regolazione: @@ -5152,6 +5155,9 @@ liquify-list-end {0}, {1} {0} e {1} @msg no such user library libreria utente inesistente @msg no such view vista inesistente @msg no such width point punto di larghezza inesistente +@msg `single` must be `incoming` or `outgoing` `single` deve essere `incoming` o `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` e `outIndex` devono essere le due metà di un unico punto di larghezza discontinuo +@msg a discontinuous width point keeps its place un punto di larghezza discontinuo mantiene la sua posizione @msg no swatch `{name}` nessun campione `{name}` @msg no swatch library `{l}` (see swatch.library.list) nessuna libreria campioni `{l}` (vedi swatch.library.list) @msg no symbol instances selected nessuna istanza di simbolo selezionata diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index c429f204a1..edfb3f603d 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -1075,6 +1075,9 @@ digits Malayalam マラヤーラム数字 Additional Plug-ins Folder 追加プラグインフォルダー Additional Fonts Folder 追加フォントフォルダー Adjust Adjoining Width Points 隣接する幅ポイントを調整 + Incoming 入り側 + Outgoing 出側 + Single Width Only 1 つの幅のみ Adjust Colors カラーを調整 Adjust Options: 調整オプション: Advanced Options 詳細オプション @@ -5264,6 +5267,9 @@ swatch Bright Violet ビビッドバイオレット @msg `{color}` is not a colour (#rrggbb or a preset name) `{color}` はカラーではありません (#rrggbb またはプリセット名で指定してください) @msg give the path `id` and the width point `index` パスの `id` と幅ポイントの `index` を指定してください @msg no such width point 指定された幅ポイントが見つかりません +@msg `single` must be `incoming` or `outgoing` `single` は `incoming` または `outgoing` にしてください +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` と `outIndex` は 1 つの不連続な幅ポイントの 2 つの半分である必要があります +@msg a discontinuous width point keeps its place 不連続な幅ポイントの位置は変わりません @msg onto must name a panel floating in another group onto には、別のグループでフローティングしているパネルを指定してください @msg below and above must name a panel floating in another group below と above には別のグループでフローティングしているパネルを指定してください @msg give only one of onto, below and above onto、below、above のうち 1 つだけを指定してください diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 414f45171c..6113bfc54c 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -5193,6 +5193,9 @@ antiAlias Sharp მკვეთრი Variable Options ცვლადის პარამეტრები Define a variable first ჯერ განსაზღვრეთ ცვლადი Adjust Adjoining Width Points მეზობელი სიგანის წერტილების მორგება + Incoming შემავალი + Outgoing გამავალი + Single Width Only მხოლოდ ერთი სიგანე Keep both sides the same width ორივე მხარის ერთნაირი სიგანე Side 1: მხარე 1: Side 2: მხარე 2: @@ -6926,6 +6929,9 @@ font-technology Variable ცვლადი @msg no such user library მომხმარებლის ასეთი ბიბლიოთეკა არ არის @msg no such view ასეთი ხედი არ არის @msg no such width point ასეთი სიგანის წერტილი არ არის +@msg `single` must be `incoming` or `outgoing` `single` უნდა იყოს `incoming` ან `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` და `outIndex` უნდა იყოს ერთი წყვეტილი სიგანის წერტილის ორი ნახევარი +@msg a discontinuous width point keeps its place წყვეტილი სიგანის წერტილი თავის ადგილს ინარჩუნებს @msg no swatch `{name}` ფერის ნიმუში `{name}` არ არის @msg no swatch library `{l}` (see swatch.library.list) ფერის ნიმუშების ბიბლიოთეკა `{l}` არ არის (იხ. swatch.library.list) @msg no symbol instances selected სიმბოლოს ეგზემპლარები მონიშნული არ არის diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index dbda53243f..ddbdb73519 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -1065,6 +1065,9 @@ digits Malayalam 말라얄람어 Additional Plug-ins Folder 추가 플러그인 폴더 Additional Fonts Folder 추가 글꼴 폴더 Adjust Adjoining Width Points 인접한 너비 점 조정 + Incoming 들어오는 쪽 + Outgoing 나가는 쪽 + Single Width Only 한 너비만 Adjust Colors 색상 조정 Adjust Options: 조정 옵션: Advanced Options 고급 옵션 @@ -5191,6 +5194,9 @@ theme Appearance 외관 @msg `{color}` is not a colour (#rrggbb or a preset name) `{color}`은(는) 색상이 아닙니다(#rrggbb 또는 프리셋 이름) @msg give the path `id` and the width point `index` 패스 `id`와 너비 점 `index`를 지정하세요 @msg no such width point 해당 너비 점이 없습니다 +@msg `single` must be `incoming` or `outgoing` `single`은 `incoming` 또는 `outgoing`이어야 합니다 +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index`와 `outIndex`는 하나의 불연속 너비 점의 두 절반이어야 합니다 +@msg a discontinuous width point keeps its place 불연속 너비 점은 위치를 유지합니다 @msg onto must name a panel floating in another group onto는 다른 그룹에 떠 있는 패널을 지정해야 합니다 @msg below and above must name a panel floating in another group below와 above는 다른 그룹에 떠 있는 패널을 지정해야 합니다 @msg give only one of onto, below and above onto, below, above 중 하나만 지정하세요 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 69aef91cfc..52280d9c6b 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -3730,6 +3730,9 @@ antiAlias Sharp Scherp Variable Options Variabeleopties Define a variable first Definieer eerst een variabele Adjust Adjoining Width Points Aangrenzende breedtepunten aanpassen + Incoming Inkomend + Outgoing Uitgaand + Single Width Only Slechts één breedte Keep both sides the same width Beide zijden dezelfde breedte houden Side 1: Zijde 1: Side 2: Zijde 2: @@ -5468,6 +5471,9 @@ imageTrace Outline Contour @msg no such user library gebruikersbibliotheek bestaat niet @msg no such view weergave bestaat niet @msg no such width point breedtepunt bestaat niet +@msg `single` must be `incoming` or `outgoing` `single` moet `incoming` of `outgoing` zijn +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` en `outIndex` moeten de twee helften van één onderbroken breedtepunt zijn +@msg a discontinuous width point keeps its place een onderbroken breedtepunt behoudt zijn plaats @msg no swatch `{name}` geen staal `{name}` @msg no swatch library `{l}` (see swatch.library.list) geen stalenbibliotheek `{l}` (zie swatch.library.list) @msg no symbol instances selected geen symboolinstanties geselecteerd diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 0147515ffe..4f0d60b51f 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -3300,6 +3300,9 @@ antiAlias Sharp Ostre Variable Options Opcje zmiennej Define a variable first Najpierw zdefiniuj zmienną Adjust Adjoining Width Points Dopasuj sąsiednie punkty szerokości + Incoming Wejściowa + Outgoing Wyjściowa + Single Width Only Tylko jedna szerokość Keep both sides the same width Zachowaj jednakową szerokość obu stron Side 1: Strona 1: Side 2: Strona 2: @@ -5240,6 +5243,9 @@ liquify-list-end {0}, {1} {0} i {1} @msg no such user library brak takiej biblioteki użytkownika @msg no such view brak takiego widoku @msg no such width point brak takiego punktu szerokości +@msg `single` must be `incoming` or `outgoing` `single` musi mieć wartość `incoming` lub `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` i `outIndex` muszą być dwiema połówkami jednego nieciągłego punktu szerokości +@msg a discontinuous width point keeps its place nieciągły punkt szerokości zachowuje swoje położenie @msg no swatch `{name}` brak próbki `{name}` @msg no swatch library `{l}` (see swatch.library.list) brak biblioteki próbek `{l}` (patrz swatch.library.list) @msg no symbol instances selected nie zaznaczono wystąpień symboli diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 8201db7ab6..0d3a38037e 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -148,6 +148,9 @@ Additional Plug-ins Folder Pasta Adicional de Plug-ins Additional Fonts Folder Pasta Adicional de Fontes Adjust Adjoining Width Points Ajustar Pontos de Largura Adjacentes + Incoming Entrada + Outgoing Saída + Single Width Only Somente Uma Largura Adjust Color Balance… Ajustar Equilíbrio de Cores… Adjust Colors Ajustar Cores Adjust Options: Opções de Ajuste: @@ -4426,6 +4429,9 @@ axis Both Ambos @msg no such user library biblioteca do usuário inexistente @msg no such view vista inexistente @msg no such width point ponto de largura inexistente +@msg `single` must be `incoming` or `outgoing` `single` deve ser `incoming` ou `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` e `outIndex` devem ser as duas metades de um mesmo ponto de largura descontínuo +@msg a discontinuous width point keeps its place um ponto de largura descontínuo mantém sua posição @msg no swatch `{name}` nenhuma amostra `{name}` @msg no swatch library `{l}` (see swatch.library.list) nenhuma biblioteca de amostras `{l}` (veja swatch.library.list) @msg no symbol instances selected nenhuma instância de símbolo selecionada diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index d1593508d3..d995df8349 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -140,6 +140,9 @@ Additional Plug-ins Folder Папка дополнительных модулей Additional Fonts Folder Папка дополнительных шрифтов Adjust Adjoining Width Points Настроить смежные точки ширины + Incoming Входящая + Outgoing Исходящая + Single Width Only Только одна ширина Adjust Color Balance… Настроить цветовой баланс… Adjust Colors Настроить цвета Adjust Options: Параметры настройки: @@ -5146,6 +5149,9 @@ liquify-list-end {0}, {1} {0} и {1} @msg no such user library такой пользовательской библиотеки нет @msg no such view такого вида нет @msg no such width point такой точки ширины нет +@msg `single` must be `incoming` or `outgoing` `single` должен быть `incoming` или `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` и `outIndex` должны быть двумя половинами одной разрывной точки ширины +@msg a discontinuous width point keeps its place разрывная точка ширины сохраняет своё место @msg no swatch `{name}` нет образца `{name}` @msg no swatch library `{l}` (see swatch.library.list) нет библиотеки образцов `{l}` (см. swatch.library.list) @msg no symbol instances selected экземпляры символов не выделены diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 5c0420fcd3..928d85a7d3 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -130,6 +130,9 @@ Additional Plug-ins Folder Mapp för ytterligare plugins Additional Fonts Folder Mapp för ytterligare typsnitt Adjust Adjoining Width Points Justera angränsande breddpunkter + Incoming Inkommande + Outgoing Utgående + Single Width Only Endast en bredd Adjust Color Balance… Justera färgbalans… Adjust Colors Justera färger Adjust Options: Justeringsalternativ: @@ -5019,6 +5022,9 @@ liquify-list-end {0}, {1} {0} och {1} @msg no such user library användarbiblioteket finns inte @msg no such view vyn finns inte @msg no such width point breddpunkten finns inte +@msg `single` must be `incoming` or `outgoing` `single` måste vara `incoming` eller `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` och `outIndex` måste vara de två halvorna av en och samma diskontinuerliga breddpunkt +@msg a discontinuous width point keeps its place en diskontinuerlig breddpunkt behåller sin plats @msg no swatch `{name}` ingen färgruta `{name}` @msg no swatch library `{l}` (see swatch.library.list) inget färgrutebibliotek `{l}` (se swatch.library.list) @msg no symbol instances selected inga symbolinstanser är markerade diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 910a7fc5b1..a4a40055e6 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -127,6 +127,9 @@ Additional Plug-ins Folder Ek Eklentiler Klasörü Additional Fonts Folder Ek Yazı Tipleri Klasörü Adjust Adjoining Width Points Bitişik Genişlik Noktalarını Ayarlayın + Incoming Gelen + Outgoing Giden + Single Width Only Yalnızca Tek Genişlik Adjust Color Balance… Renk Dengesini Ayarlayın… Adjust Colors Renkleri Ayarla Adjust Options: Seçenekleri Ayarlayın: @@ -4833,6 +4836,9 @@ liquify-list-end {0}, {1} {0} ve {1} @msg no such user library böyle bir kullanıcı kütüphanesi yok @msg no such view öyle bir görüş yok @msg no such width point böyle bir genişlik noktası yok +@msg `single` must be `incoming` or `outgoing` `single`, `incoming` veya `outgoing` olmalıdır +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` ve `outIndex`, tek bir süreksiz genişlik noktasının iki yarısı olmalıdır +@msg a discontinuous width point keeps its place süreksiz genişlik noktası yerini korur @msg no swatch `{name}` renk örneği yok `{name}` @msg no swatch library `{l}` (see swatch.library.list) renk örneği kitaplığı yok `{l}` (bkz. swatch.library.list) @msg no symbol instances selected sembol örneği seçilmedi diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index dbd6d2609e..ee0e19b530 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -136,6 +136,9 @@ Additional Plug-ins Folder Папка додаткових модулів Additional Fonts Folder Папка додаткових шрифтів Adjust Adjoining Width Points Налаштувати суміжні точки ширини + Incoming Вхідна + Outgoing Вихідна + Single Width Only Лише одна ширина Adjust Color Balance… Налаштувати колірний баланс… Adjust Colors Налаштувати кольори Adjust Options: Параметри налаштування: @@ -5136,6 +5139,9 @@ liquify-list-end {0}, {1} {0} і {1} @msg no such user library такої користувацької бібліотеки немає @msg no such view такого виду немає @msg no such width point такої точки ширини немає +@msg `single` must be `incoming` or `outgoing` `single` має бути `incoming` або `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` і `outIndex` мають бути двома половинами однієї розривної точки ширини +@msg a discontinuous width point keeps its place розривна точка ширини зберігає своє місце @msg no swatch `{name}` немає зразка `{name}` @msg no swatch library `{l}` (see swatch.library.list) немає бібліотеки зразків `{l}` (див. swatch.library.list) @msg no symbol instances selected екземпляри символів не виділені diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 519c5d8f0d..3989702763 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -157,6 +157,9 @@ Additional Fonts Folder Thư mục phông bổ sung Additional Plug-ins Folder Thư mục plug-in bổ sung Adjust Adjoining Width Points Điều chỉnh các điểm chiều rộng kề nhau + Incoming Phía vào + Outgoing Phía ra + Single Width Only Chỉ một chiều rộng Adjust Color Balance… Điều chỉnh cân bằng màu… Adjust Colors Điều chỉnh màu sắc Adjust Options: Tùy chọn điều chỉnh: @@ -5480,6 +5483,9 @@ liquify-list-end {0}, {1} {0} và {1} @msg no such user library không có thư viện người dùng như vậy @msg no such view không có chế độ xem như vậy @msg no such width point không có điểm chiều rộng như vậy +@msg `single` must be `incoming` or `outgoing` `single` phải là `incoming` hoặc `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` và `outIndex` phải là hai nửa của cùng một điểm chiều rộng gián đoạn +@msg a discontinuous width point keeps its place điểm chiều rộng gián đoạn giữ nguyên vị trí @msg no swatch `{name}` không có mẫu màu `{name}` @msg no swatch library `{l}` (see swatch.library.list) không có thư viện mẫu màu `{l}` (xem swatch.library.list) @msg no symbol instances selected chưa chọn đối tượng ký hiệu diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index c6696a9ec6..ee850ca586 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -91,6 +91,9 @@ Additional Plug-ins Folder 附加增效工具文件夹 Additional Fonts Folder 附加字体文件夹 Adjust Adjoining Width Points 调整相邻宽度点 + Incoming 入侧 + Outgoing 出侧 + Single Width Only 仅保留一个宽度 Adjust Color Balance… 调整色彩平衡… Adjust Colors 调整颜色 Adjust Options: 调整选项: @@ -4945,6 +4948,9 @@ imageTrace Outline 轮廓 @msg `{color}` is not a colour (#rrggbb or a preset name) `{color}` 不是颜色 (#rrggbb 或预设名称) @msg give the path `id` and the width point `index` 请给出路径的 `id` 和宽度点的 `index` @msg no such width point 没有此宽度点 +@msg `single` must be `incoming` or `outgoing` `single` 必须是 `incoming` 或 `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` 和 `outIndex` 必须是同一个不连续宽度点的两半 +@msg a discontinuous width point keeps its place 不连续宽度点保持原位 @msg onto must name a panel floating in another group onto 必须指定浮动在另一个组中的面板 @msg below and above must name a panel floating in another group below 和 above 必须指定浮动在另一个组中的面板 @msg give only one of onto, below and above onto、below 和 above 只能给出一个 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 1480422931..4b620e3162 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -100,6 +100,9 @@ Additional Plug-ins Folder 額外的增效模組資料夾 Additional Fonts Folder 額外的字體資料夾 Adjust Adjoining Width Points 調整相鄰寬度點 + Incoming 入側 + Outgoing 出側 + Single Width Only 僅保留一個寬度 Adjust Color Balance… 調整色彩平衡… Adjust Colors 調整顏色 Adjust Options: 調整選項: @@ -2481,6 +2484,9 @@ file-filter Templates 範本 @msg `{color}` is not a colour (#rrggbb or a preset name) `{color}` 不是顏色 (#rrggbb 或預設集名稱) @msg give the path `id` and the width point `index` 請提供路徑的 `id` 和寬度點的 `index` @msg no such width point 沒有這個寬度點 +@msg `single` must be `incoming` or `outgoing` `single` 必須是 `incoming` 或 `outgoing` +@msg `index` and `outIndex` must be the two halves of one discontinuous width point `index` 和 `outIndex` 必須是同一個不連續寬度點的兩半 +@msg a discontinuous width point keeps its place 不連續寬度點保持原位 @msg onto must name a panel floating in another group onto 必須指定浮動在另一個群組中的面板 @msg below and above must name a panel floating in another group below 和 above 必須指定浮動在另一個群組中的面板 @msg give only one of onto, below and above onto、below 和 above 只能提供其中一個 diff --git a/docs/control-protocol.md b/docs/control-protocol.md index adac088a13..e599f9800f 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -592,6 +592,9 @@ Width Point Edit: double-clicking a width point with the Width tool, or `ui.widt `widthPoint` dialog (fields `id`, `index`, `t`, `side1` and `side2`: the left and right widths in points, `linked`, `adjustAdjoining`). `ui.dialog.confirm` runs `stroke.widthPoint.set` with them; `ui.dialog.set {field: "discard", value: true}` then confirm (the Delete button) removes the point with `stroke.widthPoint.remove`. +Either half of a discontinuous point opens both: `index` is the incoming half, and `outIndex`, `outSide1`, `outSide2` +and `outLinked` hold the outgoing half; `single` (`""`, `"incoming"` or `"outgoing"`) is Single Width Only. Confirm +sets both halves in one `stroke.widthPoint.set` (one undo step), and Delete removes both. Corners: double-clicking a Live Corners widget with the Selection or Direct Selection tool, or `ui.corners {id?, corners?}`, opens the `corners` dialog for a path's corners (the Direct-Selected ones, else every corner; fields `id`, diff --git a/docs/mcp.md b/docs/mcp.md index 4c1b661f42..b45ff0563d 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -7235,6 +7235,14 @@ writes over it. with `index`, edits or moves one; `adjustAdjoining` changes the nearest points either side in proportion. Moving a point onto another one's `t` (or `stroke.widthPoint.copy {id, index, t}` landing there) makes a discontinuous point: two points at the same `t` (the width before it, then after it), and the stroke's width steps there. +`stroke.widthPoint.set {id, t, index, left, right, outIndex, outLeft, outRight, single?, adjustAdjoining?}` sets both +halves of one in one undo step: `index` is the incoming half, `outIndex` the outgoing half after it, and `t` must be +their place. With `adjustAdjoining`, the nearest point before changes with the incoming half and the nearest point +after with the outgoing half. `single: "incoming"` or `"outgoing"` keeps only that half's widths, leaving one +continuous point. Indices that are not the two halves of one discontinuous point (three or more points at one `t` +included), another `t`, or another `single` value are errors that leave the document and its undo history unchanged. +Width Point Edit on either half shows both halves as Incoming and Outgoing, with Single Width Only, and its Delete +removes both. `document.inspect` reports a path's `strokeOptions.widthPoints` (`[t, left, right]`, factors of half the weight; null for a uniform stroke). `stroke.widthPoint.remove {id, index | indices}` deletes points; `stroke.widthProfile.set {ids, points}` replaces them all, as dragging several Shift-selected points with the Width tool does in one undo step. diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index ef83de54ad..db7068cd52 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -773,6 +773,7 @@ since 2026-10-01. - **Tab stop drag guide:** while a stop is dragged on the Tabs panel's ruler, the canvas draws a line through the text whose stops the ruler shows, where the stop would land: across the frame cell the paragraph starts in for area type, measured from where the frame lets the paragraph's first line start (the cell's edge inside the inset, or past a text wrap object), and across the paragraph's lines from the type's origin for point type. It turns with rotated type and runs across the columns of vertical type. In a Ctrl-drag (Command on macOS) it follows the grabbed stop. No line is drawn while a release would delete the stop, and the line goes on release, on Escape, when no button is down, and when the panel is closed. It is not a document object and records no undo step. Its extent, color and these rules are VectorCraft's own. A stop drag whose release the ruler does not get also ends then, as a marker drag already did. Tests `panels::tabs::tests::dragging_a_stop_draws_a_guide_through_the_text`, `a_command_drag_guide_follows_the_grabbed_stop`, `the_stop_guide_ends_with_the_drag`, `the_stop_guide_follows_rotated_point_and_vertical_type` and `the_stop_guide_starts_where_a_wrap_object_lets_the_line_start`. Public reference: [Manage tab stops](https://helpx.adobe.com/illustrator/desktop/measure-and-align/grids-and-guides/manage-tab-stops.html), which describes a guide shown through the selected text during a tab stop move. - **Tabs indent markers on threaded frames:** when a marker drag gives the paragraphs of a threaded story values of their own, the Tabs panel sends one `text.setFormat {paragraphIndents}` with an entry for each paragraph of the story, whatever order the frames were selected in with the Selection tool, so the story flows through its frames again once rather than once for each paragraph, and a drag that changes no paragraph runs nothing; a paragraph that runs on from one frame into the next gets one entry, after Type tool Select All too. A selected story is one text: with the Selection tool, a marker drag on any of its frames sets every paragraph of the story, in its locked and hidden frames too. Tests `panels::tabs::tests::indent_markers_on_selected_threaded_frames_follow_the_story_and_set_a_split_paragraph_once`, `indent_markers_over_many_threaded_paragraphs_send_one_format_command`, `indent_markers_after_select_all_list_a_split_paragraph_once`, `indent_markers_on_some_threaded_frames_list_the_whole_story_once`, `indent_markers_on_one_threaded_frame_set_its_locked_and_hidden_frames`, `cmd::threads::tests::paragraph_indents_flow_a_threaded_story_once_as_one_command_per_paragraph_would`, `paragraph_indents_over_thousands_of_paragraphs_flow_the_story_once` and `paragraph_indents_check_every_entry_and_skip_a_change_that_changes_nothing`, and `cmd::typecmd::area_tests::set_format_refuses_a_param_of_the_wrong_type`. Public reference: [Indent text](https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/indent-text.html). - **Width Point Edit:** Shift-double-click enables Adjust Adjoining Width Points; plain double-click and direct opening retain the default. Tool dispatch and headless dialog tests cover neighboring widths, Undo/Redo and Cancel. Public reference: [Variable-width strokes](https://helpx.adobe.com/illustrator/using/stroke-object.html). +- **Width Point Edit on a discontinuous point:** opening the dialog on either half shows both sets of side widths, Incoming and Outgoing, each with Side 1, Side 2, Total Width and its own link; OK sets both halves in one `stroke.widthPoint.set` and one undo step, and Delete removes both. Single Width Only keeps the incoming or the outgoing widths as one continuous point. With Adjust Adjoining Width Points, the nearest point before follows the incoming change and the nearest point after follows the outgoing change; the group layout and that rule are VectorCraft's own. Tests `dialogs::width_point::tests::either_half_of_a_discontinuous_point_shows_both_sets_of_side_widths`, `ok_sets_both_halves_of_a_discontinuous_point_in_one_step`, `delete_removes_both_halves_of_a_discontinuous_point`, `single_width_only_keeps_the_chosen_half_as_one_point` and `a_compound_member_edits_both_halves_of_its_owners_point`, and `tests::widthpoints::paired_set_*` and `single_width_only_leaves_one_continuous_point`. Public references: [Apply stroke on an object](https://helpx.adobe.com/illustrator/using/stroke-object.html), which describes editing the widths before and after a discontinuous point in that dialog, and an [archived user guide, p. 161](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=167), which describes keeping either the incoming or the outgoing width to leave one continuous point. Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a feature lands. - **New ruler guides (G1):** Alt swaps orientation while dragging from either ruler, following the [public shortcut reference](https://helpx.adobe.com/illustrator/using/default-keyboard-shortcuts.html). Preview, snapping and final placement use the current axis. Tool and egui event tests exercise both rulers, modifier changes, cancellation and one-step Undo/Redo; existing-guide Alt-copy and ruler-origin gestures are unchanged.