diff --git a/ROADMAP.md b/ROADMAP.md index 236fc185eb..ea37f12caf 100644 --- a/ROADMAP.md +++ b/ROADMAP.md @@ -157,6 +157,7 @@ Ranked; detail in [docs/roadmap.md](docs/roadmap.md) and [docs/gaps.md](docs/gap - 2026-11-18: Common Tangents also takes a point (a path of one anchor) and a convex closed path: the lines from the point that touch the path, and the line from the point to the path's center if asked; a point on the outline gets the one tangent there, and a point inside gets none, with a message (#7846). A VectorCraft addition: headline numbers unchanged. - 2026-11-15: With Smart Guides and Snap to Tangent on, a Line Segment drag pressed on one convex curved path and dragged near another lands on a common tangent of the two: both ends move to where the line touches the paths, each labeled "tangent" (#7845). A VectorCraft addition: headline numbers unchanged. - 2026-11-15: Smooth Bridge joins the Path Precision Tools add-on (Object › Plug-ins › Path Precision Tools): two selected circles become one closed outline joined by two concave arcs that touch both circles, so every anchor is smooth; the arcs' radius is a percentage of the smaller circle's radius (1 to 1000%, 100% by default), and Keep Originals adds the outline above the circles instead of replacing them. A dialog with Preview, one undo step (`addon.pathtools.bridge`). A VectorCraft addition: headline numbers unchanged. +- 2026-11-18: Smooth Bridge also joins three or more circles: every two whose outlines are within Reach (10 pt by default) are joined, the bridges that connect become one shape each, and a circle bridged to no other stays as it is (at most 2000 circles); with Constant Gap the arcs' radius is the smaller circle's radius plus a gap (#8030). A VectorCraft addition: headline numbers unchanged. - 2026-11-03: Text Tweaker, the first tool of the Type Tools add-on (Object › Plug-ins › Type Tools): one character attribute (size, baseline shift, rotation, horizontal or vertical scale, tracking, leading or stroke weight) goes letter by letter from a start value to an end value along a straight ramp, an ease, a bow, a spike or at random with a seed, set as the Character panel sets it, while the text stays live; a dialog with Preview, one undo step (`addon.type.textTweaker`, #4924). A VectorCraft addition: headline numbers unchanged. - 2026-11-01: Group Overlapping Objects joins the Arrange Tools add-on (Object › Plug-ins › Arrange Tools): the selected objects whose visual bounds overlap or touch, chains included, go into one group each, within their own layer or group, at the stacking place of their frontmost member; objects that overlap nothing stay as they are. One undo step, a sweep along x so thousands of loose pieces group quickly (at most 20000 objects). A VectorCraft addition: headline numbers unchanged. - 2026-10-31: Export for Screens works as the reference app's dialog: Artboards and Assets tabs with a grid or list of thumbnails, Clear Selection and Prefix, Create Sub-folders by Scale or Format (on by default), Export PDFs As Single File (the chosen artboards as one PDF's pages, `pdfs: "single"`) or Multiple Files, iOS and Android rows, format presets in a ☰ menu, and a count of the files the export writes (#4895). About 55 community PRs and fixes landed the same day: Find Font, Replace Font, Outline Stroke and Expand leave hidden and locked art alone (with a warning); DXF export writes LINE and ELLIPSE entities and outlines only the strokes a CAD line can't draw; Blob Brush Angle and Roundness; Shift-constrained Perspective Selection; Grid Repeat Options Preview; a gradient mesh from a file budgeted at about a million quads; width-profile strokes keep their shape zoomed out; `.ai`/EPS import fidelity (area type, envelopes, transparency in dictionaries, character styles); PDF import finds hyphenated and CMap-suffixed font names; Windows renders follow the process's core affinity; Enter or Escape in a floating panel's field no longer reaches the canvas (#4803); Properties shows Blend Options for any selected blend (#4817); Artwork Cleanup finds doubled type (#4835) and joins stacked lines into one object (Join Point Text, #4826). Headline numbers unchanged. diff --git a/crates/doc/src/flare.rs b/crates/doc/src/flare.rs new file mode 100644 index 0000000000..5551bfd3ed --- /dev/null +++ b/crates/doc/src/flare.rs @@ -0,0 +1,440 @@ +//! Flare objects: the settings a flare group was drawn with (the Flare tool, `shape.flare`). Its +//! children are ordinary paths for every renderer and exporter; the settings let it be drawn again. +use serde::{Deserialize, Serialize}; +use serde_json::Value; +use vectorcraft_color::{BlendMode, Color, Gradient, GradientGeom, GradientKind, GradientPaint, GradientStop, Paint}; +use vectorcraft_geom::{Affine, BezPath, PathData, Point, Rect, Vec2, shapes}; + +use crate::Appearance; +use crate::node::{Node, NodeId, NodeKind}; + +/// The seed of the sizes a flare's rays and rings take when its settings give none. +pub const DEFAULT_SEED: u64 = 0x2545_f491_4f6c_dd1d; + +/// One part of a flare: its name, outline, fill and opacity. +pub type Part = (&'static str, PathData, Paint, f32); + +/// The number `key` of the settings `v`, or `default`. +fn number(v: &Value, key: &str, default: f64) -> f64 { + v.get(key).and_then(Value::as_f64).unwrap_or(default) +} + +/// The parts of a flare with the settings `v` (`shape.flare`'s params, each one given): a bright +/// center, a halo ring, rays of varying length and rings along the path to the end point. +pub fn parts(v: &Value) -> Vec { + let c = Point::new(number(v, "cx", 0.0), number(v, "cy", 0.0)); + let end = Point::new(number(v, "x2", c.x), number(v, "y2", c.y)); + let pct = |k: &str| (number(v, k, 0.0) / 100.0).clamp(0.0, 10.0); + let r = (number(v, "diameter", 100.0) / 2.0).max(0.5); + let opacity = pct("opacity").min(1.0) as f32; + let brightness = pct("brightness").min(1.0) as f32; + let growth = pct("growth"); + let fuzz = pct("fuzziness").min(1.0); + let rays = v.get("rays").and_then(Value::as_u64).unwrap_or(0).min(50) as usize; + let longest = pct("longest"); + let ray_fuzz = pct("rayFuzziness").min(1.0); + let ray_turn = number(v, "rotation", 0.0).to_radians(); + let rings = v.get("rings").and_then(Value::as_u64).unwrap_or(0).min(50) as usize; + let largest = pct("largest"); + // Deterministic pseudo-random sizes (same parameters → same flare). `ringSeed` places the rings + // along the path from a sequence of its own; their count and sizes and the other parts stay. + // Xorshift64. Both streams start from a nonzero state. + let random = |mut state: u64| { + move || { + state ^= state << 13; + state ^= state >> 7; + state ^= state << 17; + (state >> 11) as f64 / (1u64 << 53) as f64 + } + }; + let mut rnd = random(v.get("seed").and_then(Value::as_u64).unwrap_or(DEFAULT_SEED) | 1); + // Each `ringSeed` below 2^53 (what a JSON number holds exactly) gets a state of its own. + let mut ring_at = v.get("ringSeed").and_then(Value::as_u64).filter(|r| *r < 1 << 53).map(|r| { + // SplitMix64 initializes the ring-position stream. + let mut z = r.wrapping_add(0x9e37_79b9_7f4a_7c15); + z = (z ^ (z >> 30)).wrapping_mul(0xbf58_476d_1ce4_e5b9); + z = (z ^ (z >> 27)).wrapping_mul(0x94d0_49bb_1331_11eb); + random(z ^ (z >> 31)) + }); + let stop = |offset: f32, opacity: f32| GradientStop { opacity, ..GradientStop::new(offset, Color::WHITE) }; + let radial = |centre: Point, radius: f64, stops: Vec| { + let mut g = GradientPaint::new(Gradient::new(GradientKind::Radial, stops)); + g.geom = Some(GradientGeom { start: centre, end: centre + Vec2::new(radius, 0.0), aspect: 1.0, focal: None }); + Paint::Gradient(Box::new(g)) + }; + let circle = |centre: Point, radius: f64| shapes::ellipse(Rect::from_center_size(centre, (radius * 2.0, radius * 2.0))); + let mut parts: Vec = vec![]; + // Halo: a soft ring just outside the centre. + let halo_r = r * (1.0 + growth) * 1.6; + let inner = (1.0 - fuzz as f32 * 0.6).clamp(0.05, 0.95); + parts.push(("Halo", circle(c, halo_r), radial(c, halo_r, vec![stop(0.0, 0.0), stop(inner * 0.75, 0.0), stop(inner, 0.5), stop(1.0, 0.0)]), 1.0)); + // Rays: thin spikes of random length (Longest = % of the centre radius), fading outwards. + // `rotation` turns them clockwise about the center. + if rays > 0 { + let mut bp = BezPath::new(); + let mut reach: f64 = 0.0; + for i in 0..rays { + let a = std::f64::consts::TAU * (i as f64 + rnd() * 0.6) / rays as f64 + ray_turn; + let len = r * longest * (1.0 - ray_fuzz * 0.75 * rnd()).max(0.1); + reach = reach.max(len); + let w = r * 0.035; + let dir = Vec2::new(a.cos(), a.sin()); + let n = Vec2::new(-dir.y, dir.x) * w; + bp.move_to(c + n); + bp.line_to(c + dir * len); + bp.line_to(c - n); + bp.line_to(c - dir * (w * 4.0)); + bp.close_path(); + } + parts.push(("Rays", PathData::from_bezpath(&bp), radial(c, reach, vec![stop(0.0, 0.9), stop(0.25, 0.35), stop(1.0, 0.0)]), 1.0)); + } + // Centre: bright core fading to transparent. + parts.push(("Center", circle(c, r), radial(c, r, vec![stop(0.0, 1.0), stop(0.25 + brightness * 0.5, 0.6), stop(1.0, 0.0)]), opacity)); + // Rings along the path to the end point (Largest = % of the average ring size). + for _ in 0..rings { + let t = rnd(); + let t = ring_at.as_mut().map_or(t, |next| next()); + let at = c + (end - c) * t; + let rr = (r * largest * (0.25 + rnd() * 0.75)).max(0.5); + let solid = rnd() < 0.5; + let stops = if solid { + vec![stop(0.0, 0.25), stop(0.8, 0.2), stop(1.0, 0.0)] + } else { + vec![stop(0.0, 0.0), stop(0.7, 0.05), stop(0.92, 0.35), stop(1.0, 0.0)] + }; + parts.push(("Ring", circle(at, rr), radial(at, rr, stops), 1.0)); + } + parts +} + +/// Part `part` of a flare as the object `id`, transformed by `xf` (the transform its flare has had +/// since it was drawn), with the pixel-aligned property when `aligned`. +pub fn part_node(id: NodeId, part: Part, xf: Affine, aligned: bool) -> Node { + let (name, pd, paint, op) = part; + let mut n = Node::path(id, pd, Appearance::basic(paint, Paint::None, 0.0)); + n.name = Some(name.into()); + n.blend = BlendMode::Screen; + n.opacity = op; + if aligned { + n.extras_mut().pixel_aligned = true; + } + if xf != Affine::IDENTITY { + n.transform(xf, false); + } + n +} + +/// The ellipse of a radial gradient's placement `geom` as the symmetric matrix `[xx, xy, yy]` that +/// maps it to the unit circle's: the same for every end point and aspect that give that ellipse +/// (transforms applied one by one and all at once can put the end on different axes of it). +fn ellipse(geom: &GradientGeom) -> [f64; 3] { + let u = geom.end - geom.start; + let w = Vec2::new(-u.y, u.x) * geom.aspect; + [u.x * u.x + w.x * w.x, u.x * u.y + w.x * w.y, u.y * u.y + w.y * w.y] +} + +/// The ellipse `[xx, xy, yy]` ([`ellipse`]) as its size, the length of its longer half-axis, and +/// its shape: the ratio of its shorter axis to its longer one, then the cosine and sine of twice +/// the longer axis's angle, each times one minus that ratio (0 for a circle). Each number is a +/// length or a ratio of lengths, never a squared length that a tiny flare or a narrow gradient +/// makes smaller than the tolerance. +fn ellipse_size_and_shape(geom: &GradientGeom) -> (f64, [f64; 3]) { + let [xx, xy, yy] = ellipse(geom); + let half_diff = (xx - yy) / 2.0; + let d = half_diff.hypot(xy); + let longer = (xx + yy) / 2.0 + d; + if longer.is_nan() || longer <= 0.0 { + return (0.0, [0.0; 3]); + } + // The product of the half-axes is the area factor of the map from the unit circle, `u` across + // `w` as [`ellipse`] builds them: a sum of squares times the aspect, without the cancellation + // of `xx * yy - xy * xy` for a narrow ellipse. + let u = geom.end - geom.start; + let w = Vec2::new(-u.y, u.x) * geom.aspect; + let ratio = ((u.x * w.y - u.y * w.x).abs() / longer).min(1.0); + let (cos, sin) = if d > 0.0 { (half_diff / d, xy / d) } else { (0.0, 0.0) }; + (longer.sqrt(), [ratio, (1.0 - ratio) * cos, (1.0 - ratio) * sin]) +} + +/// `n` as JSON without what depends on how its transforms were applied: its id, the angle of its +/// bounding box, and which axis of a gradient's ellipse its end point is on (the ellipse stays: its +/// size in the placement, and its shape beside the placement, out of reach of a pixel-aligned +/// part's snap allowance, which is a length). +fn comparable(n: &Node) -> Value { + fn strip(v: &mut Value) { + match v { + Value::Object(m) => { + for key in ["id", "bbox_angle"] { + m.remove(key); + } + if let Some(geom) = m.get_mut("geom") + && let Ok(g) = serde_json::from_value::(geom.clone()) + && let Value::Object(geom) = geom + { + let (size, shape) = ellipse_size_and_shape(&g); + geom.remove("end"); + geom.remove("aspect"); + geom.insert("ellipse".into(), serde_json::json!(size)); + m.insert("ellipseShape".into(), serde_json::json!(shape)); + } + m.values_mut().for_each(strip); + } + Value::Array(a) => a.iter_mut().for_each(strip), + _ => {} + } + } + let mut v = serde_json::to_value(n).unwrap_or(Value::Null); + strip(&mut v); + v +} + +/// How close, relative to its size, a number in an outline or a gradient's placement must be to the +/// one its transforms give: a few thousandths of a point near the edge of the canvas. +const GEOMETRY_TOL: f64 = 1e-9; + +/// Whether `a` and `b` are the same JSON, with each number within `tol` relative to its size; each +/// number in an outline (`path`) or a gradient's placement (`geom`) is within [`GEOMETRY_TOL`] +/// relative to its size (or `tol`, when smaller), and `snap` points as well. +fn close(a: &Value, b: &Value, tol: f64, snap: f64, geometry: bool) -> bool { + match (a, b) { + (Value::Number(x), Value::Number(y)) => match (x.as_f64(), y.as_f64()) { + (Some(x), Some(y)) => { + let (snap, tol) = if geometry { (snap, tol.min(GEOMETRY_TOL)) } else { (0.0, tol) }; + (x - y).abs() <= snap + tol * (1.0 + x.abs().max(y.abs())) + } + _ => x == y, + }, + (Value::Array(x), Value::Array(y)) => x.len() == y.len() && x.iter().zip(y).all(|(x, y)| close(x, y, tol, snap, geometry)), + (Value::Object(x), Value::Object(y)) => { + x.len() == y.len() + && x.iter().all(|(k, v)| { + // A gradient's shape is ratios: compared as closely as geometry, without the snap. + let snap = if k == "ellipseShape" { 0.0 } else { snap }; + y.get(k).is_some_and(|w| close(v, w, tol, snap, geometry || k == "path" || k == "geom" || k == "ellipseShape")) + }) + } + _ => a == b, + } +} + +/// Whether `a` and `b` are the same JSON, with each number within `tol` relative to its size. +pub fn json_close(a: &Value, b: &Value, tol: f64) -> bool { + close(a, b, tol, 0.0, false) +} + +/// How far a pixel-aligned object's points may be from where its transforms put them: snapping to +/// the pixel grid moves each by up to a pixel. +const PIXEL_SNAP: f64 = 1.0; + +/// The settings of a flare group ([`crate::NodeExtras::flare`]). +#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] +pub struct FlareSpec { + /// `shape.flare`'s params the flare was drawn with, each one given: the center (`cx`, `cy`) and + /// the rings' end point (`x2`, `y2`) are in the coordinates it was drawn in. + pub params: serde_json::Value, + /// The transform its art has had since it was drawn (moves, scales, rotations, reflections and + /// shears). + #[serde(default = "identity", skip_serializing_if = "is_identity")] + pub transform: Affine, +} + +fn identity() -> Affine { + Affine::IDENTITY +} + +fn is_identity(a: &Affine) -> bool { + *a == Affine::IDENTITY +} + +impl FlareSpec { + /// The settings of a flare drawn with `params`, not transformed since. + pub fn new(params: serde_json::Value) -> Self { + Self { params, transform: Affine::IDENTITY } + } + + /// The point `key_x`, `key_y` of the params, where it is in the document now. + fn point(&self, key_x: &str, key_y: &str) -> Option { + let x = self.params.get(key_x)?.as_f64()?; + let y = self.params.get(key_y)?.as_f64()?; + Some(self.transform * Point::new(x, y)).filter(|p| p.x.is_finite() && p.y.is_finite()) + } + + /// The flare's center, where it is in the document now. + pub fn center(&self) -> Option { + self.point("cx", "cy") + } + + /// The rings' end point, where it is in the document now. + pub fn end(&self) -> Option { + self.point("x2", "y2") + } + + /// Its art transformed by `a`. + pub fn transform(&mut self, a: Affine) { + self.transform = a * self.transform; + } + + /// Whether `group`'s parts are still the ones these settings draw, in place: none was edited, + /// distorted, removed or added, and the transform can be undone. The parts are compared where + /// they are in the document, at any scale. + pub fn draws(&self, group: &Node) -> bool { + let NodeKind::Group { children, .. } = &group.kind else { return false }; + if !self.transform.is_finite() || self.transform.determinant() == 0.0 || !self.transform.inverse().is_finite() { + return false; + } + let expected = parts(&self.params); + expected.len() == children.len() + && expected.into_iter().zip(children).all(|(part, child)| { + let aligned = child.extras().pixel_aligned; + let snap = if aligned { PIXEL_SNAP } else { 0.0 }; + close(&comparable(&part_node(child.id, part, self.transform, aligned)), &comparable(child), 1e-6, snap, false) + }) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use serde_json::json; + + /// A flare's center and end point follow its art through a transform, and a save and reload + /// keeps its settings. + #[test] + fn a_flare_keeps_its_settings_through_a_transform_and_a_save() { + let mut g = Node::group(NodeId(1), vec![std::sync::Arc::new(Node::path(NodeId(2), PathData::default(), Default::default()))]); + g.extras_mut().flare = Some(Box::new(FlareSpec::new(json!({ "cx": 10.0, "cy": 20.0, "x2": 110.0, "y2": 20.0, "seed": 7 })))); + g.transform(Affine::translate((5.0, 0.0)) * Affine::rotate(std::f64::consts::FRAC_PI_2), false); + let spec = g.extras().flare.as_deref().cloned().unwrap_or_else(|| panic!("no flare")); + let c = spec.center().unwrap_or_else(|| panic!("no center")); + let e = spec.end().unwrap_or_else(|| panic!("no end")); + assert!((c.x - -15.0).abs() < 1e-9 && (c.y - 10.0).abs() < 1e-9, "{c:?}"); + assert!((e.x - -15.0).abs() < 1e-9 && (e.y - 110.0).abs() < 1e-9, "{e:?}"); + let text = serde_json::to_string(&g).unwrap_or_else(|e| panic!("{e}")); + let back: Node = serde_json::from_str(&text).unwrap_or_else(|e| panic!("{e}")); + assert_eq!(back.extras().flare.as_deref(), Some(&spec)); + // A flare that was not transformed writes no transform. + let plain = FlareSpec::new(json!({ "cx": 1.0 })); + assert_eq!(serde_json::to_value(&plain).unwrap_or_default(), json!({ "params": { "cx": 1.0 } })); + } + + /// A flare group draws its settings until a part's gradient, opacity or outline is edited; a + /// pixel-aligned part may sit up to a pixel from where its transforms put it, but only in its + /// outline and its gradient's placement. + #[test] + fn a_flare_with_an_edited_part_no_longer_draws_its_settings() { + let v = json!({ "cx": 50.0, "cy": 50.0, "x2": 250.0, "y2": 50.0, "rays": 5, "rings": 2, "seed": 9, "diameter": 40.0, + "opacity": 50.0, "brightness": 30.0, "growth": 20.0, "fuzziness": 50.0, "longest": 300.0, "rayFuzziness": 100.0, + "rotation": 0.0, "largest": 50.0 }); + let flare = |aligned: bool| { + let xf = Affine::rotate(0.3) * Affine::scale_non_uniform(1.5, 0.75); + let children = parts(&v).into_iter().enumerate().map(|(i, p)| std::sync::Arc::new(part_node(NodeId(10 + i as u64), p, xf, aligned))); + let mut g = Node::group(NodeId(1), children.collect()); + g.extras_mut().flare = Some(Box::new(FlareSpec { params: v.clone(), transform: xf })); + g + }; + let spec = |g: &Node| g.extras().flare.as_deref().cloned().unwrap_or_else(|| panic!("no flare")); + let edit = |g: &mut Node, f: &dyn Fn(&mut Node)| { + let NodeKind::Group { children, .. } = &mut g.kind else { panic!("not a group") }; + // The center, drawn at half opacity. + f(std::sync::Arc::make_mut(&mut children[2])); + }; + for aligned in [false, true] { + let g = flare(aligned); + assert!(spec(&g).draws(&g), "aligned {aligned}"); + let mut moved = g.clone(); + edit(&mut moved, &|n| n.transform(Affine::translate((0.4, 0.0)), false)); + assert_eq!(spec(&moved).draws(&moved), aligned, "a fraction of a pixel, aligned {aligned}"); + let mut faded = g.clone(); + edit(&mut faded, &|n| n.opacity *= 0.8); + assert!(!spec(&faded).draws(&faded), "opacity, aligned {aligned}"); + let mut shifted = g.clone(); + edit(&mut shifted, &|n| { + if let Some(crate::AppearanceItem::Fill(fill)) = n.appearance.items.first_mut() + && let Paint::Gradient(gp) = &mut fill.paint + && let Some(geom) = &mut gp.geom + { + geom.start.x += 20.0; + } + }); + assert!(!spec(&shifted).draws(&shifted), "gradient placement, aligned {aligned}"); + let mut squashed = g.clone(); + edit(&mut squashed, &|n| { + if let Some(crate::AppearanceItem::Fill(fill)) = n.appearance.items.first_mut() + && let Paint::Gradient(gp) = &mut fill.paint + && let Some(geom) = &mut gp.geom + { + geom.aspect *= 0.5; + } + }); + assert!(!spec(&squashed).draws(&squashed), "gradient shape, aligned {aligned}"); + } + } + + /// An ellipse's size and shape are the same whichever axis its end point is on, and a narrow + /// gradient made narrower, or turned, changes its shape by more than [`GEOMETRY_TOL`]. + #[test] + fn an_ellipse_shape_tells_narrow_gradients_apart() { + let geom = |end: (f64, f64), aspect: f64| GradientGeom { start: Point::new(1.0, 2.0), end: Point::new(end.0, end.1), aspect, focal: None }; + let of = ellipse_size_and_shape; + let (size, shape) = of(&geom((11.0, 2.0), 0.5)); + // The same ellipse with its end point on the other axis. + let (size2, shape2) = of(&geom((1.0, 7.0), 2.0)); + assert!((size - size2).abs() < 1e-12 && shape.iter().zip(shape2).all(|(a, b)| (a - b).abs() < 1e-12), "{shape:?} {shape2:?}"); + // A very narrow ellipse, given both ways, keeps its shape to within the tolerance. + let (thin, thin2) = (of(&geom((11.0, 2.0), 1e-8)).1, of(&geom((1.0, 2.0 + 1e-7), 1e8)).1); + assert!(thin.iter().zip(thin2).all(|(a, b)| (a - b).abs() < GEOMETRY_TOL), "{thin:?} {thin2:?}"); + let narrow = of(&geom((11.0, 2.0), 1e-4)).1; + for other in [of(&geom((11.0, 2.0), 5e-5)).1, of(&geom((1.0, 12.0), 1e-4)).1] { + assert!(narrow.iter().zip(other).any(|(a, b)| (a - b).abs() > 1e3 * GEOMETRY_TOL), "{narrow:?} {other:?}"); + } + assert_eq!(of(&geom((1.0, 2.0), 1.0)), (0.0, [0.0; 3])); + } + + /// A flare scaled far down, in one direction or in all, anywhere on the canvas, still draws its + /// settings, and a part's gradient whose shape was edited is still told apart; a flattened flare + /// does not draw its settings. + #[test] + fn a_flare_scaled_far_down_still_draws_its_settings() { + let v = json!({ "cx": 50.0, "cy": 50.0, "x2": 250.0, "y2": 50.0, "rays": 5, "rings": 2, "seed": 9, "diameter": 40.0 }); + let flare_aligned = |xf: Affine, aligned: bool| { + let children = parts(&v).into_iter().enumerate().map(|(i, p)| std::sync::Arc::new(part_node(NodeId(10 + i as u64), p, xf, aligned))); + let mut g = Node::group(NodeId(1), children.collect()); + g.extras_mut().flare = Some(Box::new(FlareSpec { params: v.clone(), transform: xf })); + g + }; + let flare = |xf: Affine| flare_aligned(xf, false); + // The center's gradient placement, to edit. + let center_geom = |g: &mut Node, f: &dyn Fn(&mut GradientGeom)| { + let NodeKind::Group { children, .. } = &mut g.kind else { panic!("not a group") }; + if let Some(crate::AppearanceItem::Fill(fill)) = std::sync::Arc::make_mut(&mut children[2]).appearance.items.first_mut() + && let Paint::Gradient(gp) = &mut fill.paint + && let Some(geom) = &mut gp.geom + { + f(geom); + } else { + panic!("the center has no gradient fill"); + } + }; + let draws = |g: &Node| g.extras().flare.as_deref().is_some_and(|spec| spec.draws(g)); + assert!(draws(&flare(Affine::scale(1e-7))), "scaled to 0.00001%"); + assert!(draws(&flare(Affine::rotate(0.3) * Affine::scale_non_uniform(1.0, 1e-10))), "shrunk far on one axis"); + assert!(draws(&flare(Affine::translate((crate::MAX_COORD - 1000.0, 0.0)) * Affine::scale(0.5))), "near the edge of the canvas"); + assert!(draws(&flare(Affine::translate((1000.0, 0.0)) * Affine::scale(1e-5))), "scaled to 0.001% and moved away"); + assert!(!draws(&flare(Affine::scale_non_uniform(1.0, 0.0))), "flattened"); + // At that size a part whose gradient's shape was edited no longer draws the settings. + let mut squashed = flare(Affine::scale(1e-6)); + assert!(draws(&squashed), "scaled to 0.0001%"); + center_geom(&mut squashed, &|geom| geom.aspect *= 0.5); + assert!(!draws(&squashed), "gradient shape at 0.0001%"); + // A pixel-aligned part may sit up to a pixel off, but its gradient's shape may not change, + // even when the ellipse keeps its size. + let mut reshaped = flare_aligned(Affine::IDENTITY, true); + assert!(draws(&reshaped), "aligned"); + center_geom(&mut reshaped, &|geom| { + let a = geom.aspect; + geom.aspect = a * 0.5; + geom.end = geom.start + (geom.end - geom.start) * ((1.0 + a * a) / (1.0 + a * a / 4.0)).sqrt(); + }); + assert!(!draws(&reshaped), "gradient shape of the same size, aligned"); + } +} diff --git a/crates/doc/src/lib.rs b/crates/doc/src/lib.rs index 123e31bc08..fd1071711b 100644 --- a/crates/doc/src/lib.rs +++ b/crates/doc/src/lib.rs @@ -17,6 +17,7 @@ pub mod corners; pub mod decode; pub mod depth; pub mod dimension; +pub mod flare; pub mod graph; mod halftone_radii; pub mod hit; @@ -170,7 +171,7 @@ use limits::MAX_NEXT_ID; pub use limits::{DocError, FORMAT_VERSION, MAX_COORD}; pub use records::{ImageBlob, MaskEdit, NewArtIds, SavedSelection, SavedView, SvgFilter, Symbol, SymbolEdit}; pub use stored_art::{StoredPlace, StoredRoot}; -pub use units::{ColorMode, Unit, decimal_point, finite_in_every_unit, parse_number}; +pub use units::{ColorMode, Unit, arithmetic_signs, decimal_point, finite_in_every_unit, parse_number}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] pub struct Document { diff --git a/crates/doc/src/mem.rs b/crates/doc/src/mem.rs index 68aaedd68e..278ee7cf22 100644 --- a/crates/doc/src/mem.rs +++ b/crates/doc/src/mem.rs @@ -271,6 +271,7 @@ fn node_bytes(n: &Node, other: Option<&Node>, counted: &mut HashSet) -> u .as_deref() .map_or(0, |m| ALLOC + size_of::() + m.key.capacity() + m.from.capacity() + m.colors.capacity() * 3); b += e.trace.as_ref().map_or(0, |t| ALLOC + size_of::() + json_bytes(t)); + b += e.flare.as_ref().map_or(0, |f| ALLOC + size_of::() + json_bytes(&f.params)); b += e.intertwine.as_deref().map_or(0, |a| ALLOC + size_of::() + path_bytes(a)); if e.intertwine_tiers.capacity() > 0 { b += ALLOC + e.intertwine_tiers.capacity() * size_of::() + e.intertwine_tiers.iter().map(path_bytes).sum::(); diff --git a/crates/doc/src/node/extras.rs b/crates/doc/src/node/extras.rs index f75e473039..06a62cb171 100644 --- a/crates/doc/src/node/extras.rs +++ b/crates/doc/src/node/extras.rs @@ -41,6 +41,9 @@ pub struct NodeExtras { /// Dimension object: the live measurement it draws; its ordinary group children hold its /// exportable appearance (Object › Dimensions, the Dimension tool). pub dimension: Option>, + /// Flare object: the settings its group was drawn with (the Flare tool); its ordinary group + /// children hold its art. + pub flare: Option>, /// Object › Intertwine: as a member of an Intertwine group, the area (document coordinates, /// filled non-zero) where this object is drawn over the group's other members. pub intertwine: Option>, @@ -100,6 +103,7 @@ pub(super) static NO_EXTRAS: NodeExtras = NodeExtras { slice: None, perspective: None, dimension: None, + flare: None, intertwine: None, intertwine_tiers: Vec::new(), live_paint_gaps: None, diff --git a/crates/doc/src/node/ops.rs b/crates/doc/src/node/ops.rs index 6f72655c1d..e83aae1b09 100644 --- a/crates/doc/src/node/ops.rs +++ b/crates/doc/src/node/ops.rs @@ -520,6 +520,12 @@ impl Node { { dimension.transform(a); } + // So does a flare's center and end point. + if let Some(e) = self.extras_if_any() + && let Some(flare) = &mut e.flare + { + flare.transform(a); + } // The path the objects are attached to, before it is transformed. let on_path_before = self.on_path_data().cloned(); if !self.is_layer() { diff --git a/crates/doc/src/node/wire.rs b/crates/doc/src/node/wire.rs index c47097b8cc..2b473f0cc7 100644 --- a/crates/doc/src/node/wire.rs +++ b/crates/doc/src/node/wire.rs @@ -45,6 +45,7 @@ impl Serialize for Node { is_default(&self.bbox_angle), e.perspective.is_none(), e.dimension.is_none(), + e.flare.is_none(), e.intertwine.is_none(), e.intertwine_tiers.is_empty(), e.live_paint_gaps.is_none(), @@ -91,6 +92,7 @@ impl Serialize for Node { field!("bbox_angle", &self.bbox_angle); field!("perspective", &e.perspective); field!("dimension", &e.dimension); + field!("flare", &e.flare); field!("intertwine", &e.intertwine); field!("intertwine_tiers", &e.intertwine_tiers); field!("live_paint_gaps", &e.live_paint_gaps); @@ -228,6 +230,8 @@ pub(super) struct NodeWire { #[serde(default)] dimension: Option>, #[serde(default)] + flare: Option>, + #[serde(default)] intertwine: Option>, #[serde(default, deserialize_with = "counted_list")] intertwine_tiers: Vec, @@ -271,6 +275,7 @@ impl From for Node { slice: w.slice, perspective: w.perspective, dimension: w.dimension, + flare: w.flare, intertwine: w.intertwine, intertwine_tiers: w.intertwine_tiers, live_paint_gaps: w.live_paint_gaps, diff --git a/crates/doc/src/tests/units.rs b/crates/doc/src/tests/units.rs index c53f60a227..96fe4aab69 100644 --- a/crates/doc/src/tests/units.rs +++ b/crates/doc/src/tests/units.rs @@ -94,11 +94,59 @@ fn a_very_long_expression_reads_as_nothing() { } } +/// `x`, `X` and `×` multiply as `*` does (#8435), units and percentages included; a lowercase `x` +/// right after a `p` stays the `px` unit. +#[test] +fn x_is_a_multiplication_sign() { + let (mm, cm) = (72.0 / 25.4, 72.0 / 2.54); + for (u, s, want) in [ + (Unit::Points, "10x2", 20.0), + (Unit::Points, "10 x 2", 20.0), + (Unit::Points, "10X2", 20.0), + (Unit::Points, "10×2", 20.0), + (Unit::Points, "10x-2", -20.0), + (Unit::Points, "10/2x5", 25.0), + (Unit::Points, "1+2x3", 7.0), + (Unit::Millimeters, "2x3 mm", 6.0 * mm), + (Unit::Points, "2x3mm", 6.0 * mm), + (Unit::Points, "3mm x 2", 6.0 * mm), + (Unit::Centimeters, "3cmx50%", 1.5 * cm), + (Unit::Points, "2p x 2", 48.0), + (Unit::Points, "10px", 10.0), + (Unit::Points, "2px x 3", 6.0), + (Unit::Points, "2pxx3", 6.0), + (Unit::Millimeters, "4x3 px", 12.0), + // Only a lowercase x after a p is the px suffix. + (Unit::Points, "2pX3", 72.0), + (Unit::Points, "2p×3", 72.0), + // Text that used to be refused now reads as a product. + (Unit::Points, "8.5x11 in", 93.5 * 72.0), + (Unit::Points, "0x10", 0.0), + ] { + let got = u.parse(s).unwrap_or_else(|| panic!("{u:?} can't read `{s}`")); + assert!((got - want).abs() < 1e-9, "{u:?}: `{s}` → {got}, want {want}"); + } + for s in ["x", "x2", "5x", "5 x x 2", "xx", "2px3"] { + assert_eq!(Unit::Points.parse(s), None, "{s}"); + } + assert_eq!(crate::parse_number("45x2"), Some(90.0)); + assert_eq!(crate::parse_number(" 45 X 2 "), Some(90.0)); + assert_eq!(crate::parse_number("45×2"), Some(90.0)); + assert_eq!(crate::parse_number("90x-1"), Some(-90.0)); + assert_eq!(crate::parse_number("x"), None); + // Each sign counts toward the 128-sign limit as a `*` would. + assert_eq!(Unit::Points.parse(&format!("1{}", "x1".repeat(128))), Some(1.0)); + assert_eq!(Unit::Points.parse(&format!("1{}", "x1".repeat(129))), None); + assert_eq!(crate::parse_number(&format!("1{}", "×1".repeat(129))), None); + assert_eq!(crate::arithmetic_signs("1+2x3X4×5*6/7-8"), 7); + assert_eq!(crate::arithmetic_signs("2px x 3"), 1); +} + proptest! { /// Field text made of digits, operators, `%`, spaces and unit letters reads as a finite value /// or as nothing and does not panic. #[test] - fn arithmetic_text_reads_as_a_finite_value_or_nothing(s in "[0-9.+*/% ptxinmcfyd-]{0,24}") { + fn arithmetic_text_reads_as_a_finite_value_or_nothing(s in "[0-9.+*/% ptxXinmcfyd×-]{0,24}") { for u in Unit::ALL { if let Some(v) = u.parse(&s) { prop_assert!(v.is_finite(), "{u:?}: `{s}` → {v}"); diff --git a/crates/doc/src/units.rs b/crates/doc/src/units.rs index 7e061d02c0..f61319326c 100644 --- a/crates/doc/src/units.rs +++ b/crates/doc/src/units.rs @@ -157,12 +157,17 @@ impl Unit { /// that share of everything before it (`50pt+25%` is 62.5 pt, `100pt+20pt-50%` is 60 pt). A /// percentage on its own (`50%`) reads as nothing. /// - /// Text with more than 128 `+ - * /` signs reads as nothing. + /// `x`, `X` and `×` multiply as `*` does (`10x2` is 20, `2x3 mm` is 6 mm), except a lowercase + /// `x` right after a `p`, which is the `px` suffix (`2px x 3` is 6 px, and `2px3` reads as + /// nothing; write `2p x 3` for picas). `X` and `×` after a `p` multiply (`2pX3` is 6 picas). + /// + /// Text with more than 128 `+ - * /` signs ([`arithmetic_signs`], a multiplication sign counted + /// as `*`) reads as nothing. pub fn parse(self, s: &str) -> Option { - if s.chars().filter(|c| matches!(c, '+' | '-' | '*' | '/')).count() > MAX_MEASURE_OPERATORS { + if arithmetic_signs(s) > MAX_MEASURE_OPERATORS { return None; } - parse_measure(s, self).filter(|v| v.is_finite()) + parse_measure(×_as_asterisks(s), self).filter(|v| v.is_finite()) } /// The value naming this unit in the Units preferences (`points`, `millimeters`, /// `feetInches`). @@ -215,6 +220,46 @@ impl Unit { /// The most `+ - * /` signs [`Unit::parse`] reads in one text. const MAX_MEASURE_OPERATORS: usize = 128; +/// The number of `+ - * /` signs in `s`, each multiplication sign typed as `x`, `X` or `×` +/// ([`Unit::parse`]) counted as a `*`. +pub fn arithmetic_signs(s: &str) -> usize { + let mut prev = None; + s.chars() + .filter(|&c| { + let sign = matches!(c, '+' | '-' | '*' | '/') || is_times(c, prev); + prev = Some(c); + sign + }) + .count() +} + +/// Is `c`, after `prev`, a multiplication sign typed as `x`, `X` or `×`? A lowercase `x` right +/// after a `p` is the `px` suffix (`2px x 3`), also where a number follows it (`2px3`). +fn is_times(c: char, prev: Option) -> bool { + matches!(c, 'X' | '×') || (c == 'x' && prev != Some('p')) +} + +/// `s` with each multiplication sign ([`is_times`]) written as `*` (`10 x 2` is `10 * 2`); text +/// without one is not copied. +fn times_as_asterisks(s: &str) -> std::borrow::Cow<'_, str> { + let mut prev = None; + let any = s.chars().any(|c| { + let times = is_times(c, prev); + prev = Some(c); + times + }); + if !any { + return s.into(); + } + let mut out = String::with_capacity(s.len()); + let mut prev = None; + for c in s.chars() { + out.push(if is_times(c, prev) { '*' } else { c }); + prev = Some(c); + } + out.into() +} + fn parse_measure(s: &str, default: Unit) -> Option { let s = s.trim(); // Simple arithmetic on the right (Illustrator fields accept "10+5", "100/2", "3in*2"). @@ -348,9 +393,10 @@ pub fn finite_in_every_unit(pt: f64) -> bool { } /// A unitless field value (percent, degrees, counts) with the same `+ - * /` arithmetic as -/// [`Unit::parse`] (`45*2`, `100/3`); text other than digits, `.` and operators reads as nothing. +/// [`Unit::parse`] (`45*2`, `45x2`, `100/3`); text other than digits, `.` and operators reads as +/// nothing. pub fn parse_number(s: &str) -> Option { - if !s.chars().all(|c| c.is_ascii_digit() || " .+-*/".contains(c)) { + if !s.chars().all(|c| c.is_ascii_digit() || " .+-*/xX×".contains(c)) { return None; } // A leading `+` is a sign (`+5`), as a plain number read it. diff --git a/crates/engine/src/cmd.rs b/crates/engine/src/cmd.rs index dc37c7d532..359fc8761f 100644 --- a/crates/engine/src/cmd.rs +++ b/crates/engine/src/cmd.rs @@ -32,6 +32,7 @@ pub mod expand; pub(crate) mod fileinfo; pub mod fileio; pub mod findfiles; +pub mod flare; pub mod flatten; pub mod fontfiles; mod fonts; @@ -885,7 +886,8 @@ pub use compoundshape::OPEN_PATHS_ADD_NO_AREA; /// Pathfinder Options (`Prefs::pathfinder`). pub use pathops::{PATHFINDER_PRECISION_RANGE, PathfinderOptions}; -/// The Attributes panel's state ([`Session::attributes_info`]). +/// The Attributes panel's state ([`Session::attributes_info`]) and how many recent URLs it keeps. +pub use attributes::RECENT_URLS; pub use overprint::AttributesInfo; /// Object → Flatten Transparency settings (`object.flattenTransparency`). diff --git a/crates/engine/src/cmd/addons/pathtools/bridge.rs b/crates/engine/src/cmd/addons/pathtools/bridge.rs index 2120b040e7..4d4eb9cdf8 100644 --- a/crates/engine/src/cmd/addons/pathtools/bridge.rs +++ b/crates/engine/src/cmd/addons/pathtools/bridge.rs @@ -1,5 +1,6 @@ //! Smooth Bridge: two selected circles joined into one outline by two concave arcs that touch both -//! circles, replacing the circles or added above them. +//! circles, or three or more each joined the same way to the others within reach and united where +//! the bridges connect, replacing the circles or added above them. use serde_json::{Value, json}; use vectorcraft_doc::{NodeId, NodeKind}; @@ -20,6 +21,12 @@ const LABEL: &str = "Smooth Bridge"; /// The arcs' radius as a percentage of the smaller circle's radius: by default, and the range. const RADIUS: f64 = 100.0; const RADII: (f64, f64) = (1.0, 1000.0); +/// The gap (pt) added to the smaller circle's radius to give the arcs' radius: the range. +const GAPS: (f64, f64) = (0.0, 1000.0); +/// How far apart (pt) the outlines of two of three or more circles may be for a bridge between +/// them: by default, and the range. +const REACH: f64 = 10.0; +const REACHES: (f64, f64) = (0.0, 10000.0); pub(super) fn specs() -> Vec { vec![cmd!( @@ -27,16 +34,33 @@ pub(super) fn specs() -> Vec { "Smooth Bridge", ["Object", "Plug-ins", "Path Precision Tools"], None, - "{radius?: % 1..1000 (100; the radius of the bridge's two arcs as a percentage of the smaller circle's radius: larger makes a wider, gentler bridge), keepOriginals?: bool (false: the outline replaces the two circles, painted as the upper one; true: it goes directly above the upper one and the circles stay), ids?: [id, id] (default: the selection)} join two circles (paths whose outline is a circle, not hidden or locked) into one closed outline: around each circle on its side away from the other, and along two concave arcs, one on each side, that touch both circles so the outline runs on smoothly into them. Overlapping and touching circles are joined too; one circle inside the other, or circles too far apart for the radius (the arcs would not reach both, or would cross), is an error, which suggests a larger radius when one up to 1000% would bridge them. One undo step; the outline is selected → {id}", + "{radius?: % 1..1000 (100; the radius of each bridge's two arcs as a percentage of the smaller circle's radius: larger makes a wider, gentler bridge), gap?: pt 0..1000 (instead of radius: the arcs' radius is the smaller circle's radius plus this gap, so each arc stays this gap away from a circle of the smaller circle's size about the arc's center; for equal circles this gap apart that is where a third circle this gap from both sits, as in a triangular grid, so the channels around an empty place in such a grid are one width; giving both is an error), reach?: pt 0..10000 (10; with three or more circles: how far apart two circles' outlines may be for a bridge between them, overlapping ones included; two circles are bridged at any distance), keepOriginals?: bool (false: each outline replaces its circles, painted as the topmost of them; true: it goes directly above that circle and the circles stay), ids?: [id] (default: the selection)} join circles (paths whose outline is a circle, not hidden or locked) into metaball (aka meatball) shapes. Two circles become one closed outline: around each circle on its side away from the other, and along two concave arcs, one on each side, that touch both circles so the outline runs on smoothly into them. With three or more, every two circles within reach are bridged the same way, and the bridges that connect are united into one shape each (holes smaller than 1% of the smallest circle's area are filled); a pair within reach but too far apart for the radius gets no bridge, and so does one whose neck would be thinner than the precision its shape is united at, and a circle bridged to no other is left as it is. Overlapping and touching circles are joined too. One circle inside another (among three or more, any such pair within reach) is an error; so are two circles too far apart for the radius (the arcs would not reach both, or would cross), or three or more with no pair the arcs can join, which suggests a larger radius or gap when the largest one would bridge them; so are no two circles within reach, more than 2000 circles and more than 8000 bridges. One undo step; the outlines (and the circles left as they are) are selected → {ids, alone}, with {id} too for two circles", has_selection, bridge )] } fn bridge(s: &mut Session, p: &Value) -> Result { - let percent = given(p, "radius", Some(RADII), C)?.unwrap_or(RADIUS); + let percent = given(p, "radius", Some(RADII), C)?; + let gap = given(p, "gap", Some(GAPS), C)?; + let reach = given(p, "reach", Some(REACHES), C)?.unwrap_or(REACH); + if percent.is_some() && gap.is_some() { + // As the parameter check words it (`EXCLUSIVE_KEYS`), for a caller that skips that check. + let (key, other) = ("radius", "gap"); + return Err(bad(C, format!("give `{key}` or `{other}`, not both"))); + } + let arc = match gap { + Some(gap) => pt::ArcRadius::Gap(gap), + None => pt::ArcRadius::Share(percent.unwrap_or(RADIUS) / 100.0), + }; let keep = switch_or(p, "keepOriginals", false, C)?; - let roots = checked_ids_or_selection(s, p, C)?; + let mut roots = checked_ids_or_selection(s, p, C)?; + // An id given twice is one circle. + roots.sort_unstable(); + roots.dedup(); + if roots.len() > pt::MAX_BRIDGED_CIRCLES { + return Err(bad(C, "select at most 2000 circles to bridge")); + } let circles: Vec<(NodeId, pt::Circle)> = { let d = &s.doc()?.doc; let editable = d.editable(); @@ -48,48 +72,93 @@ fn bridge(s: &mut Session, p: &Value) -> Result { }) .collect() }; - let ([(below, a), (above, b)], 2) = (circles.as_slice(), roots.len()) else { - return Err(bad(C, "select two circles to bridge")); - }; - let (below, above) = (*below, *above); - let at = |percent: f64| pt::smooth_bridge(*a, *b, a.radius.min(b.radius) * percent / 100.0); - let outline = match at(percent) { - Ok(sp) => PathData::single(sp), - Err(pt::BridgeError::Inside) => return Err(bad(C, "one circle is inside the other")), - // A larger radius bridges circles a smaller one cannot, so only suggest one that is allowed. - Err(pt::BridgeError::TooFar) if at(RADII.1).is_ok() => { - return Err(bad(C, "the circles are too far apart for this radius: raise the radius")); + if circles.len() != roots.len() || circles.len() < 2 { + return Err(bad(C, "select two or more circles to bridge")); + } + let only: Vec = circles.iter().map(|(_, c)| *c).collect(); + // Each shape: the circles it joins, in paint order, and its outline. + let (shapes, alone): (Vec<(Vec, PathData)>, Vec) = match only.as_slice() { + [a, b] => match pt::smooth_bridge(*a, *b, arc.between(*a, *b)) { + Ok(sp) => (vec![(roots_of(&circles, &[0, 1]), PathData::single(sp))], vec![]), + Err(e) => return Err(refusal(e, arc, |largest| pt::smooth_bridge(*a, *b, largest.between(*a, *b)).is_ok())), + }, + _ => { + let made = pt::bridge_many(&only, arc, reach).map_err(|e| match e { + pt::ManyError::TooManyCircles => bad(C, "select at most 2000 circles to bridge"), + pt::ManyError::TooManyBridges => bad(C, "that makes too many bridges (at most 8000): lower the reach"), + pt::ManyError::NoneInReach => bad(C, "no two circles are within reach: raise the reach"), + pt::ManyError::TooComplex => bad(C, "the bridged circles are too complex to unite"), + // Under the many-circle rules: a pair the largest radius or gap bridges on its own + // can still have a neck too thin to unite among the others. + pt::ManyError::Pair(_, _, e) => refusal(e, arc, |largest| pt::bridges_any(&only, largest, reach)), + pt::ManyError::Bad => bad(C, "select two or more circles to bridge"), + })?; + let shapes = made.joined.into_iter().map(|j| (roots_of(&circles, &j.members), j.outline)).collect(); + (shapes, roots_of(&circles, &made.alone)) } - Err(pt::BridgeError::TooFar) => return Err(bad(C, "the circles are too far apart for this radius")), - Err(pt::BridgeError::Bad) => return Err(bad(C, "select two circles to bridge")), }; - let id = s.edit(LABEL, |d, sel| { - let id = if keep { - // A copy of the upper circle (its appearance) with the outline as its path, right above - // it; the circles stay as they are, live shapes included. - // Fresh ids throughout, its opacity mask's art included. - let upper = d.node(above).cloned().ok_or(EngineError::NoNode(above))?; - let mut n = d.reid(&upper); - if let NodeKind::Path { path, live, .. } = &mut n.kind { - *path = outline; - *live = None; + let made = s.edit(LABEL, |d, sel| { + let mut made = Vec::with_capacity(shapes.len()); + if keep { + // A copy of each shape's topmost circle (its appearance) with the outline as its path, + // right above it; the circles stay as they are, live shapes included. Fresh ids + // throughout, an opacity mask's art included. + let tops: Vec = shapes.iter().filter_map(|(members, _)| members.last().copied()).collect(); + let mut beside = Beside::above(d, &tops); + for ((_, outline), top) in shapes.into_iter().zip(tops) { + let upper = d.node(top).cloned().ok_or(EngineError::NoNode(top))?; + let mut n = d.reid(&upper); + if let NodeKind::Path { path, live, .. } = &mut n.kind { + *path = outline; + *live = None; + } + made.push(n.id); + beside.put(d, top, vec![n])?; } - let id = n.id; - let mut beside = Beside::above(d, &[above]); - beside.put(d, above, vec![n])?; beside.finish(d)?; - id } else { - // The upper circle becomes the outline (a plain path now) and the lower one goes. - if let Some(NodeKind::Path { path, live, .. }) = d.node_mut(above).map(|n| &mut n.kind) { - *path = outline; - *live = None; + // Each shape's topmost circle becomes its outline (a plain path now) and the others go. + let mut gone = vec![]; + for (members, outline) in shapes { + let Some((&top, rest)) = members.split_last() else { continue }; + if let Some(NodeKind::Path { path, live, .. }) = d.node_mut(top).map(|n| &mut n.kind) { + *path = outline; + *live = None; + } + made.push(top); + gone.extend_from_slice(rest); } - remove_each(d, &[below])?; - above - }; - sel.set([id]); - Ok(id) + remove_each(d, &gone)?; + } + sel.set(made.iter().chain(&alone).copied()); + Ok(made) })?; - Ok(json!({ "id": id.0 })) + let mut out = json!({ "ids": made.iter().map(|id| id.0).collect::>(), "alone": alone.iter().map(|id| id.0).collect::>() }); + if let ([id], 2) = (made.as_slice(), only.len()) { + out["id"] = json!(id.0); + } + Ok(out) +} + +/// The ids of `circles` at indices `at`, in paint order (the circles are listed in paint order). +fn roots_of(circles: &[(NodeId, pt::Circle)], at: &[usize]) -> Vec { + at.iter().filter_map(|&i| circles.get(i)).map(|(id, _)| *id).collect() +} + +/// The error for circles that arcs of `arc` can't bridge. A larger radius or gap bridges circles a +/// smaller one cannot, so it suggests one only when `bridges` says the largest allowed would. +fn refusal(e: pt::BridgeError, arc: pt::ArcRadius, bridges: impl FnOnce(pt::ArcRadius) -> bool) -> EngineError { + let largest = match arc { + pt::ArcRadius::Share(_) => pt::ArcRadius::Share(RADII.1 / 100.0), + pt::ArcRadius::Gap(_) => pt::ArcRadius::Gap(GAPS.1), + }; + let would = e == pt::BridgeError::TooFar && bridges(largest); + match (e, arc, would) { + (pt::BridgeError::Inside, ..) => bad(C, "one circle is inside the other"), + (pt::BridgeError::TooFar, pt::ArcRadius::Share(_), true) => bad(C, "the circles are too far apart for this radius: raise the radius"), + (pt::BridgeError::TooFar, pt::ArcRadius::Share(_), false) => bad(C, "the circles are too far apart for this radius"), + (pt::BridgeError::TooFar, pt::ArcRadius::Gap(_), true) => bad(C, "the circles are too far apart for this gap: raise the gap"), + (pt::BridgeError::TooFar, pt::ArcRadius::Gap(_), false) => bad(C, "the circles are too far apart for this gap"), + (pt::BridgeError::Bad, ..) => bad(C, "select two or more circles to bridge"), + } } diff --git a/crates/engine/src/cmd/addons/pathtools/bridge/tests.rs b/crates/engine/src/cmd/addons/pathtools/bridge/tests.rs index 01320c07c1..745f216b68 100644 --- a/crates/engine/src/cmd/addons/pathtools/bridge/tests.rs +++ b/crates/engine/src/cmd/addons/pathtools/bridge/tests.rs @@ -1,5 +1,5 @@ -//! Smooth Bridge: the outline in place of the circles or above them, one undo step, the radius, -//! and what it refuses. +//! Smooth Bridge: the outline in place of the circles or above them, one undo step, the radius or +//! gap, many circles joined to their neighbors within reach, and what it refuses. use serde_json::{Value, json}; use vectorcraft_doc::{NodeId, NodeKind}; @@ -46,6 +46,8 @@ fn two_circles_become_one_outline_in_the_upper_ones_place() { let steps = s.doc().unwrap().history.undo.len(); let r = s.execute(BRIDGE, &json!({})).unwrap(); assert_eq!(r["id"], json!(b.0)); + assert_eq!(r["ids"], json!([b.0]), "the same result fields as for more circles"); + assert_eq!(r["alone"], json!([])); assert_eq!(top_level(&s), [b]); let d = &s.doc().unwrap().doc; let NodeKind::Path { path, live, .. } = &d.node(b).unwrap().kind else { panic!("a path") }; @@ -158,9 +160,11 @@ fn far_apart_nested_and_other_objects_are_refused() { assert!(e.ends_with("the circles are too far apart for this radius"), "{e}"); } assert!(err(&mut s, json!({"ids": [a.0, inner.0]})).contains("one circle is inside the other")); - for ids in [json!([a.0, square.0]), json!([a.0, oval.0]), json!([a.0]), json!([a.0, far.0, inner.0])] { - assert!(err(&mut s, json!({ "ids": ids })).contains("select two circles to bridge"), "{ids}"); + for ids in [json!([a.0, square.0]), json!([a.0, oval.0]), json!([a.0]), json!([a.0, far.0, square.0])] { + assert!(err(&mut s, json!({ "ids": ids })).contains("select two or more circles to bridge"), "{ids}"); } + // Three circles: each two within reach are bridged, and one inside another is refused there too. + assert!(err(&mut s, json!({"ids": [a.0, far.0, inner.0]})).contains("one circle is inside the other")); assert!(err(&mut s, json!({"ids": [a.0, far.0], "radius": 0.5})).contains("`radius` must be from 1 to 1000")); assert!(err(&mut s, json!({"ids": [a.0, far.0], "radius": 1001})).contains("`radius`")); assert!(err(&mut s, json!({"ids": [a.0, far.0], "radius": "big"})).contains("`radius` must be a number")); @@ -169,6 +173,174 @@ fn far_apart_nested_and_other_objects_are_refused() { assert_eq!(s.doc().unwrap().history.undo.len(), steps, "nothing changed, no undo step"); } +/// A 3 × 3 grid of circles of radius 10, 4 apart (centers 24 apart), in rows from (100, 100). +fn grid(s: &mut Session) -> Vec { + (0..9).map(|k| circle(s, 100.0 + 24.0 * (k % 3) as f64, 100.0 + 24.0 * (k / 3) as f64, 10.0)).collect() +} + +fn ids(v: &Value) -> Vec { + v.as_array().unwrap().iter().map(|i| NodeId(i.as_u64().unwrap())).collect() +} + +fn path(s: &Session, id: NodeId) -> vectorcraft_geom::PathData { + s.doc().unwrap().doc.node(id).unwrap().path_data().unwrap().clone() +} + +#[test] +fn a_grid_of_circles_joins_each_to_its_neighbors_in_one_shape() { + let mut s = session(); + let g = grid(&mut s); + select(&mut s, &g); + let steps = s.doc().unwrap().history.undo.len(); + // Reach 5: the side neighbors (4 apart) are bridged, the diagonal ones (about 13.9 apart) not. + let r = s.execute(BRIDGE, &json!({"gap": 4, "reach": 5})).unwrap(); + assert_eq!(ids(&r["ids"]), [g[8]], "one shape, in the topmost circle's place"); + assert_eq!(ids(&r["alone"]), []); + assert_eq!(top_level(&s), [g[8]]); + assert_eq!(s.doc().unwrap().selection.objects.to_vec(), [g[8]]); + assert_eq!(s.doc().unwrap().history.undo.len(), steps + 1, "one undo step"); + // Its outline and a hole in each square of four circles, which no diagonal bridge fills. + let outline = path(&s, g[8]); + assert_eq!(outline.subpaths.len(), 5, "{}", outline.subpaths.len()); + let inside = |p: &vectorcraft_geom::PathData, x: f64, y: f64| p.to_bezpath().winding(vectorcraft_geom::kurbo::Point::new(x, y)) != 0; + assert!(inside(&outline, 112.0, 100.0) && inside(&outline, 100.0, 112.0) && !inside(&outline, 112.0, 112.0)); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(top_level(&s), g); + // Reach 15 takes in the diagonal neighbors, whose bridges fill the middle of each square. + select(&mut s, &g); + s.execute(BRIDGE, &json!({"gap": 4, "reach": 15})).unwrap(); + let outline = path(&s, g[8]); + assert_eq!(outline.subpaths.len(), 1); + assert!(inside(&outline, 112.0, 112.0)); +} + +#[test] +fn a_circle_with_no_neighbor_in_reach_stays_as_it_is() { + let mut s = session(); + let g = grid(&mut s); + let far = circle(&mut s, 300.0, 250.0, 10.0); + let pair = [circle(&mut s, 300.0, 40.0, 8.0), circle(&mut s, 320.0, 40.0, 8.0)]; + let mut all = g.clone(); + all.extend([far, pair[0], pair[1]]); + let r = s.execute(BRIDGE, &json!({"ids": all.iter().map(|i| i.0).collect::>(), "reach": 5})).unwrap(); + assert_eq!(ids(&r["ids"]), [g[8], pair[1]]); + assert_eq!(ids(&r["alone"]), [far]); + assert_eq!(top_level(&s), [g[8], far, pair[1]]); + assert!(matches!(&s.doc().unwrap().doc.node(far).unwrap().kind, NodeKind::Path { live: Some(_), .. }), "untouched"); + let mut selected = s.doc().unwrap().selection.objects.to_vec(); + selected.sort(); + let mut want = vec![g[8], pair[1], far]; + want.sort(); + assert_eq!(selected, want, "the shapes and the circle left alone"); +} + +#[test] +fn keep_originals_adds_each_shape_above_its_topmost_circle() { + let mut s = session(); + let row: Vec = (0..3).map(|i| circle(&mut s, 100.0 + 25.0 * i as f64, 100.0, 10.0)).collect(); + let other = [circle(&mut s, 100.0, 200.0, 10.0), circle(&mut s, 122.0, 200.0, 10.0)]; + s.execute("paint.setFill", &json!({"ids": [row[2].0], "color": "#00ff00"})).unwrap(); + let all: Vec = row.iter().chain(&other).map(|i| i.0).collect(); + let r = s.execute(BRIDGE, &json!({"ids": all, "keepOriginals": true})).unwrap(); + let made = ids(&r["ids"]); + assert_eq!(made.len(), 2); + assert_eq!(top_level(&s), [row[0], row[1], row[2], made[0], other[0], other[1], made[1]]); + let d = &s.doc().unwrap().doc; + assert_eq!(d.node(made[0]).unwrap().appearance, d.node(row[2]).unwrap().appearance, "painted as the topmost circle"); + let b = d.node(made[0]).unwrap().path_data().unwrap().bounds().unwrap(); + assert!((b.x0 - 90.0).abs() < 1e-2 && (b.x1 - 160.0).abs() < 1e-2, "{b:?}"); +} + +#[test] +fn the_gap_form_gives_arcs_the_smaller_radius_plus_the_gap() { + let area_with = |p: Value| { + let mut s = session(); + let a = circle(&mut s, 100.0, 100.0, 10.0); + let b = circle(&mut s, 124.0, 100.0, 10.0); + let mut p = p; + p["ids"] = json!([a.0, b.0]); + let id = NodeId(s.execute(BRIDGE, &p).unwrap()["id"].as_u64().unwrap()); + area(&s, id) + }; + // Radius 10 plus a gap of 4 is 140% of 10. + let (gap, percent) = (area_with(json!({"gap": 4})), area_with(json!({"radius": 140}))); + assert!((gap - percent).abs() < 1e-9, "{gap} {percent}"); + assert!(area_with(json!({"gap": 0})) < gap && gap < area_with(json!({"gap": 20}))); +} + +#[test] +fn many_circle_and_gap_refusals() { + let mut s = session(); + let a = circle(&mut s, 50.0, 100.0, 10.0); + let b = circle(&mut s, 250.0, 100.0, 10.0); + let c = circle(&mut s, 330.0, 100.0, 10.0); + let far = circle(&mut s, 380.0, 100.0, 10.0); + let before = top_level(&s); + let steps = s.doc().unwrap().history.undo.len(); + assert!(err(&mut s, json!({"ids": [a.0, b.0], "radius": 100, "gap": 4})).contains("give `radius` or `gap`, not both")); + // Centers 200 apart: a gap of 0 does not bridge them, the largest (1000 pt) does. With centers + // 330 apart even that one closes the neck: it stays open only below 2 × √(10² + 2 × 10 × 1010) + // ≈ 285. + assert!(err(&mut s, json!({"ids": [a.0, b.0], "gap": 0})).ends_with("too far apart for this gap: raise the gap")); + assert!(err(&mut s, json!({"ids": [a.0, far.0], "gap": 0})).ends_with("the circles are too far apart for this gap")); + assert!(err(&mut s, json!({"ids": [a.0, b.0, c.0], "reach": 5})).contains("no two circles are within reach: raise the reach")); + // b and c are 60 apart: within a reach of 100, but too far for the default radius. + assert!(err(&mut s, json!({"ids": [a.0, b.0, c.0], "reach": 100})).ends_with("too far apart for this radius: raise the radius")); + assert!(err(&mut s, json!({"ids": [a.0, b.0, c.0], "reach": -1})).contains("`reach` must be from 0 to 10000")); + assert!(err(&mut s, json!({"ids": [a.0, b.0], "gap": 1001})).contains("`gap` must be from 0 to 1000")); + assert_eq!(top_level(&s), before); + assert_eq!(s.doc().unwrap().history.undo.len(), steps, "nothing changed, no undo step"); +} + +#[test] +fn a_larger_radius_is_suggested_only_when_it_bridges_among_the_other_circles() { + let mut s = session(); + // Centers 91.65 apart: the largest radius (1000%, 100 pt) bridges these two on their own, but + // with a neck about 0.0007 pt wide, too thin to unite among three or more circles. + let a = circle(&mut s, 20.0, 100.0, 10.0); + let b = circle(&mut s, 111.65, 100.0, 10.0); + let far = circle(&mut s, 380.0, 100.0, 10.0); + assert!(s.execute(BRIDGE, &json!({"ids": [a.0, b.0], "radius": 1000})).is_ok()); + s.execute("edit.undo", &json!({})).unwrap(); + assert!(err(&mut s, json!({"ids": [a.0, b.0]})).ends_with("too far apart for this radius: raise the radius")); + for radius in [100, 1000] { + let e = err(&mut s, json!({"ids": [a.0, b.0, far.0], "radius": radius, "reach": 100})); + assert!(e.ends_with("the circles are too far apart for this radius"), "{e}"); + } +} + +#[test] +fn too_many_circles_or_bridges_are_refused() { + let mut s = session(); + // 130 overlapping circles in a row: 8,385 pairs within reach. + let row: Vec = (0..130).map(|i| circle(&mut s, 20.0 + i as f64 * 0.2, 100.0, 10.0).0).collect(); + assert!(err(&mut s, json!({ "ids": row })).contains("that makes too many bridges (at most 8000): lower the reach")); + let many: Vec = (0..2001).map(|i| circle(&mut s, 20.0 + (i % 50) as f64 * 7.0, 150.0 + (i / 50) as f64 * 3.0, 1.0).0).collect(); + assert!(err(&mut s, json!({ "ids": many })).contains("select at most 2000 circles to bridge")); +} + +#[test] +fn an_id_given_twice_is_one_circle() { + let mut s = session(); + let a = circle(&mut s, 100.0, 100.0, 20.0); + let b = circle(&mut s, 150.0, 100.0, 20.0); + let r = s.execute(BRIDGE, &json!({"ids": [a.0, a.0, b.0]})).unwrap(); + assert_eq!(r["id"], json!(b.0), "two circles, bridged"); + assert_eq!(top_level(&s), [b]); +} + +#[test] +fn small_circles_at_the_default_reach_bridge_the_pairs_the_arcs_can_join() { + let mut s = session(); + // Radius 3: arcs of 3 pt (100%) join a and b (2 apart) but close before reaching c (6 from b, + // within the default reach of 10). + let (a, b, c) = (circle(&mut s, 100.0, 100.0, 3.0), circle(&mut s, 108.0, 100.0, 3.0), circle(&mut s, 120.0, 100.0, 3.0)); + let r = s.execute(BRIDGE, &json!({"ids": [a.0, b.0, c.0]})).unwrap(); + assert_eq!(ids(&r["ids"]), [b]); + assert_eq!(ids(&r["alone"]), [c]); + assert_eq!(top_level(&s), [b, c]); +} + #[test] fn locked_and_hidden_circles_are_not_bridged() { let mut s = session(); @@ -176,9 +348,9 @@ fn locked_and_hidden_circles_are_not_bridged() { let b = circle(&mut s, 150.0, 100.0, 20.0); select(&mut s, &[b]); s.execute("object.lock", &json!({})).unwrap(); - assert!(err(&mut s, json!({"ids": [a.0, b.0]})).contains("select two circles to bridge")); + assert!(err(&mut s, json!({"ids": [a.0, b.0]})).contains("select two or more circles to bridge")); s.execute("object.unlockAll", &json!({})).unwrap(); select(&mut s, &[a]); s.execute("object.hide", &json!({})).unwrap(); - assert!(err(&mut s, json!({"ids": [a.0, b.0]})).contains("select two circles to bridge")); + assert!(err(&mut s, json!({"ids": [a.0, b.0]})).contains("select two or more circles to bridge")); } diff --git a/crates/engine/src/cmd/addons/units.rs b/crates/engine/src/cmd/addons/units.rs index b5d844709a..4da4f68b79 100644 --- a/crates/engine/src/cmd/addons/units.rs +++ b/crates/engine/src/cmd/addons/units.rs @@ -10,7 +10,7 @@ mod tests; use serde_json::{Value, json}; -use vectorcraft_doc::{OrientedBox, Unit, decimal_point, finite_in_every_unit}; +use vectorcraft_doc::{OrientedBox, Unit, arithmetic_signs, decimal_point, finite_in_every_unit}; use vectorcraft_render::effects; use super::super::{CommandSpec, always, bad, cmd, has_selection}; @@ -22,8 +22,8 @@ const SELECTION_SIZE: &str = "addon.units.selectionSize"; const SHOWN_CHARS: usize = 64; /// The longest `value` or `unit` text `addon.units.convert` reads, in bytes. const MAX_TEXT_LEN: usize = 1024; -/// The most `+ - * /` signs `addon.units.convert` reads in one `value`: [`Unit::parse`] takes one -/// level of recursion per sign. +/// The most `+ - * /` signs `addon.units.convert` reads in one `value`, a multiplication sign +/// counted as a `*`: [`Unit::parse`] takes one level of recursion per sign. const MAX_OPERATORS: usize = 128; pub fn specs() -> Vec { @@ -33,7 +33,7 @@ pub fn specs() -> Vec { "Convert Units", [], None, - "{value: a length (a number, or text as a number field reads it, with a unit suffix and + - * / arithmetic: \"10mm\", \"1in/2\", \"2p6\", \"3cm*50%\"; a decimal comma reads as a point: \"0,5 mm\"; at most 1024 bytes and 128 operators), unit?: the unit of a number without a suffix (a unit's name, suffix or key: points, picas, inches, millimeters, centimeters, pixels, feetInches, meters, yards, feet, q, ha; default: points)} the length in every unit of Preferences › Units › East Asian Type, written as the number fields write it (rounded to 3 decimals in pt, px, picas, Q and Ha and to 4 in the others; pixels are points). Nothing in the document changes → {points, units: [{unit (its key), label, number (no suffix), text (with the suffix)}]}", + "{value: a length (a number, or text as a number field reads it, with a unit suffix and + - * / arithmetic, x, X or × multiplying as * does: \"10mm\", \"1in/2\", \"2p6\", \"3cm*50%\", \"2x3 mm\"; a decimal comma reads as a point: \"0,5 mm\"; at most 1024 bytes and 128 operators, each multiplication sign counted), unit?: the unit of a number without a suffix (a unit's name, suffix or key: points, picas, inches, millimeters, centimeters, pixels, feetInches, meters, yards, feet, q, ha; default: points)} the length in every unit of Preferences › Units › East Asian Type, written as the number fields write it (rounded to 3 decimals in pt, px, picas, Q and Ha and to 4 in the others; pixels are points). Nothing in the document changes → {points, units: [{unit (its key), label, number (no suffix), text (with the suffix)}]}", always, convert ), @@ -88,9 +88,9 @@ fn convert(_: &mut Session, p: &Value) -> Result { } /// Is `s` short enough to read: at most [`MAX_TEXT_LEN`] bytes and [`MAX_OPERATORS`] `+ - * /` -/// signs? +/// signs, a multiplication sign typed as `x`, `X` or `×` counted as a `*` ([`arithmetic_signs`])? fn readable(s: &str) -> bool { - s.len() <= MAX_TEXT_LEN && s.chars().filter(|c| matches!(c, '+' | '-' | '*' | '/')).count() <= MAX_OPERATORS + s.len() <= MAX_TEXT_LEN && arithmetic_signs(s) <= MAX_OPERATORS } /// `v` as an error message shows it: text cut at [`SHOWN_CHARS`] characters with "…", as JSON, diff --git a/crates/engine/src/cmd/addons/units/tests.rs b/crates/engine/src/cmd/addons/units/tests.rs index f914c53092..802fb5dfdf 100644 --- a/crates/engine/src/cmd/addons/units/tests.rs +++ b/crates/engine/src/cmd/addons/units/tests.rs @@ -76,6 +76,12 @@ fn values_read_as_number_fields_read_them() { assert!(near(pt(&mut s, json!({"value": "1,500+2", "unit": "mm"})), 3.5 * 72.0 / 25.4)); // A sum of 128 signs still reads. assert!(near(pt(&mut s, json!({"value": format!("1{}", "+1".repeat(128))})), 129.0)); + // x, X and × multiply as * does, and each counts toward the 128 signs. + assert!(near(pt(&mut s, json!({"value": "2x3 mm"})), 6.0 * 72.0 / 25.4)); + assert!(near(pt(&mut s, json!({"value": "10X2"})), 20.0)); + assert!(near(pt(&mut s, json!({"value": "0,5×4 in"})), 144.0)); + assert!(near(pt(&mut s, json!({"value": format!("1{}", "x1".repeat(128))})), 1.0)); + assert!(s.execute("addon.units.convert", &json!({"value": format!("1{}", "x1".repeat(129))})).is_err()); } #[test] diff --git a/crates/engine/src/cmd/attributes.rs b/crates/engine/src/cmd/attributes.rs index 684d33a53d..b257a978db 100644 --- a/crates/engine/src/cmd/attributes.rs +++ b/crates/engine/src/cmd/attributes.rs @@ -12,8 +12,9 @@ use super::overprint::{AttributesInfo, apply_overprint, edit_counted, overprint_ use super::path::paths_in; use super::{CommandSpec, NodeId, Result, Session, bad, cmd, has_doc, str_param, targets}; -/// How many URLs the Attributes panel's recent list keeps. -const RECENT_URLS: usize = 10; +/// How many URLs the Attributes panel's recent list keeps: the most its Panel Options lets the +/// URL menu list. +pub const RECENT_URLS: usize = 30; pub fn specs() -> Vec { vec![ @@ -22,7 +23,7 @@ pub fn specs() -> Vec { "Attributes", [], None, - "{overprintFill?: bool, overprintStroke?: bool (aimed as object.setOverprint's fill and stroke, item? too), showCenter?: bool (the canvas shows the selected object's centre point), imageMap?: \"none\"|\"rectangle\"|\"polygon\", url?: string (\"\" removes it; SVG, PDF and .ai export link the object), note?: string, ids?|id?, item?: appearance item index|null, target?: \"object\"|\"contents\"} set the Attributes panel's values on ids or the selection, as one undo step; a URL given joins the recent URLs (attributes.info) → {changed: objects}", + "{overprintFill?: bool, overprintStroke?: bool (aimed as object.setOverprint's fill and stroke, item? too), showCenter?: bool (the canvas shows the selected object's centre point), imageMap?: \"none\"|\"rectangle\"|\"polygon\", url?: string (\"\" removes it; SVG, PDF and .ai export link the object), note?: string, ids?|id?, item?: appearance item index|null, target?: \"object\"|\"contents\"} set the Attributes panel's values on ids or the selection, as one undo step; a URL given joins the recent URLs (attributes.info, newest first, at most 30) → {changed: objects}", has_doc, set ), diff --git a/crates/engine/src/cmd/brushlib.rs b/crates/engine/src/cmd/brushlib.rs index 2f4d0388db..dc5a619adb 100644 --- a/crates/engine/src/cmd/brushlib.rs +++ b/crates/engine/src/cmd/brushlib.rs @@ -12,7 +12,8 @@ use std::sync::{Arc, LazyLock}; use serde_json::{Value, json}; use vectorcraft_brush::{ - self as brush, ArtBrush, Bristle, BristleShape, Brush, BrushKind, Calligraphic, Colorization, PatternBrush, PatternFit, Scatter, Variation, + self as brush, ArtBrush, ArtScale, Bristle, BristleShape, Brush, BrushKind, Calligraphic, Colorization, PatternBrush, PatternFit, Scatter, + Variation, }; use vectorcraft_color::{Color, Paint}; use vectorcraft_doc::{Appearance, AppearanceItem, Document, FillLayer, Node, NodeId, NodeKind, PatternDef, Symbol}; @@ -180,6 +181,7 @@ pub const BUILTIN: &[BuiltinBrushLibrary] = &[ BuiltinBrushLibrary { id: "energy-beams", name: "Energy Beams", make: energy_beams }, BuiltinBrushLibrary { id: "dry-media", name: "Dry Media", make: dry_media }, BuiltinBrushLibrary { id: "tech-circuit", name: "Tech Circuit", make: tech_circuit }, + BuiltinBrushLibrary { id: "arrows", name: "Arrows", make: arrows }, ]; /// Built-in library `id`, made once. @@ -233,6 +235,54 @@ fn art(name: &str, art: Node, colorization: Colorization) -> Brush { Brush { name: name.into(), kind: BrushKind::Art(ArtBrush { art, colorization, ..Default::default() }) } } +/// An Arrows brush whose art stretches only between `start` and `end` (fractions of its length). +fn arrow_art(name: &str, art: Node, start: f64, end: f64) -> Brush { + Brush { + name: name.into(), + kind: BrushKind::Art(ArtBrush { + art, + scale: ArtScale::BetweenGuides { start, end }, + colorization: Colorization::Tints, + ..Default::default() + }), + } +} + +/// Arrows: original art brushes whose stems stretch while their heads keep their proportions. +fn arrows() -> BrushLibrary { + let shaft = || black(shapes::rectangle(Rect::new(0.0, -1.0, 82.0, 1.0))); + let head = || black(polygon(&[(76.0, -7.0), (100.0, 0.0), (76.0, 7.0), (82.0, 0.0)])); + let solid = group(vec![shaft(), head()]); + let outline = group(vec![shaft(), black(polygon(&[(76.0, -7.0), (100.0, 0.0), (76.0, 7.0), (78.0, 4.0), (91.0, 0.0), (78.0, -4.0)]))]); + let double = group(vec![ + black(shapes::rectangle(Rect::new(18.0, -1.0, 82.0, 1.0))), + head(), + black(polygon(&[(24.0, -7.0), (0.0, 0.0), (24.0, 7.0), (18.0, 0.0)])), + ]); + let chevrons = group(vec![shaft(), head(), black(polygon(&[(53.0, -5.0), (66.0, 0.0), (53.0, 5.0), (56.0, 0.0)]))]); + let dashed = group( + (0..5) + .map(|i| { + let x = f64::from(i) * 16.0; + black(shapes::rectangle(Rect::new(x, -1.0, x + 10.0, 1.0))) + }) + .chain(std::iter::once(head())) + .collect(), + ); + built( + "Arrows", + Document::new(100.0, 100.0), + vec![ + arrow_art("Solid Arrow", solid, 0.0, 0.76), + arrow_art("Open Arrow", outline, 0.0, 0.76), + arrow_art("Double Arrow", double, 0.24, 0.76), + // The second chevron starts at 53 pt, so only the shaft before it stretches. + arrow_art("Chevron Arrow", chevrons, 0.0, 0.53), + arrow_art("Dashed Arrow", dashed, 0.0, 0.76), + ], + ) +} + /// Art Ribbons: art brushes, 100 pt long, drawn here; Striped Ribbon is filled with the library's /// own pattern, Pinstripes. fn art_ribbons() -> BrushLibrary { diff --git a/crates/engine/src/cmd/create.rs b/crates/engine/src/cmd/create.rs index 803057885a..4bf123ea17 100644 --- a/crates/engine/src/cmd/create.rs +++ b/crates/engine/src/cmd/create.rs @@ -55,7 +55,16 @@ pub fn specs() -> Vec { None, "{cx, cy, diameter=100, opacity=50 (%), brightness=30 (%), growth=20 (%), fuzziness=50 (%), rays=15, longest=300 (%), rayFuzziness=100 (%), rotation=0 (deg, turns the rays clockwise), x2?, y2? (ring end; else pathLength at direction), pathLength=300, rings=10, largest=50 (%), direction=45 (deg counter-clockwise from 3 o'clock: where the rings run from the centre), seed?, ringSeed? (whole number below 2^53: deterministically places every ring along the path, including the first for small seed values, keeping their count and sizes)} → {id}", has_doc, - flare + super::flare::flare + ), + cmd!( + "shape.editFlare", + "Edit Flare", + [], + None, + "{ids?|id?: flares (default: the selected flares), cx?, cy? (the center, where it is drawn now), x2?, y2? (the rings' end point, where it is drawn now; else pathLength at direction from the center, both where it is drawn now, when either is given; else where it was), diameter?, opacity?, brightness?, growth?, fuzziness?, rays?, longest?, rayFuzziness?, rotation? (deg, turns the rays clockwise), pathLength?, rings?, largest?, direction? (as shape.flare: what is left out stays as it was)} draws each flare again in its place, moved, scaled, rotated, reflected or sheared as it has been since it was drawn, as one undo step (none when nothing changes); a flare whose parts were edited, or that is locked or hidden, is not one → {ids}", + has_doc, + super::flare::edit_flare ), cmd!( "shape.circleThroughPoints", @@ -515,149 +524,6 @@ fn star(s: &mut Session, p: &Value) -> Result { add_art_turned(s, "Star", path_kind(path, None), constrained_turn(s, rot)) } -/// Flare tool: a lens flare built from radial-gradient paths in Screen mode — a bright centre, a halo -/// ring, rays of varying length and rings along the path to the end point. -fn flare(s: &mut Session, p: &Value) -> Result { - use vectorcraft_color::{BlendMode, Gradient, GradientGeom, GradientKind, GradientPaint, GradientStop, Paint}; - let c = Point::new(f64_req(p, "cx", "shape.flare")?, f64_req(p, "cy", "shape.flare")?); - let numbers = [ - "diameter", - "opacity", - "brightness", - "growth", - "fuzziness", - "rays", - "longest", - "rayFuzziness", - "rotation", - "rings", - "largest", - "x2", - "y2", - "direction", - "pathLength", - "seed", - "ringSeed", - ]; - check_numbers(p, &numbers, "shape.flare")?; - let pct = |k: &str, d: f64| (f64_or(p, k, d) / 100.0).clamp(0.0, 10.0); - let r = (f64_or(p, "diameter", 100.0) / 2.0).max(0.5); - let opacity = pct("opacity", 50.0).min(1.0) as f32; - let brightness = pct("brightness", 30.0).min(1.0) as f32; - let growth = pct("growth", 20.0); - let fuzz = pct("fuzziness", 50.0).min(1.0); - let rays = p.get("rays").and_then(Value::as_u64).unwrap_or(15).min(50) as usize; - let longest = pct("longest", 300.0); - let ray_fuzz = pct("rayFuzziness", 100.0).min(1.0); - let ray_turn = f64_or(p, "rotation", 0.0).to_radians(); - let rings = p.get("rings").and_then(Value::as_u64).unwrap_or(10).min(50) as usize; - let largest = pct("largest", 50.0); - let end = match (p.get("x2").and_then(Value::as_f64), p.get("y2").and_then(Value::as_f64)) { - (Some(x), Some(y)) => Point::new(x, y), - _ => { - let a = f64_or(p, "direction", 45.0).to_radians(); - c + vectorcraft_geom::Vec2::new(a.cos(), -a.sin()) * f64_or(p, "pathLength", 300.0) - } - }; - // Deterministic pseudo-random sizes (same parameters → same flare). `ringSeed` places the rings - // along the path from a sequence of its own; their count and sizes and the other parts stay. - let seed_of = |key: &str| match p.get(key) { - None | Some(Value::Null) => Ok(None), - Some(v) => v.as_u64().map(Some).ok_or_else(|| bad("shape.flare", format!("`{key}` must be a whole number of at least 0, not {v}"))), - }; - // Xorshift64. Both streams start from a nonzero state. - let random = |mut state: u64| { - move || { - state ^= state << 13; - state ^= state >> 7; - state ^= state << 17; - (state >> 11) as f64 / (1u64 << 53) as f64 - } - }; - let mut rnd = random(seed_of("seed")?.unwrap_or(0x2545_f491_4f6c_dd1d) | 1); - // Each `ringSeed` below 2^53 (what a JSON number holds exactly) gets a state of its own. - let ring_seed = match seed_of("ringSeed")? { - Some(r) if r >= 1 << 53 => return Err(bad("shape.flare", format!("`ringSeed` must be below 2^53, not {r}"))), - r => r, - }; - let mut ring_at = ring_seed.map(|r| { - // SplitMix64 initializes the ring-position stream. - let mut z = r.wrapping_add(0x9e37_79b9_7f4a_7c15); - z = (z ^ (z >> 30)).wrapping_mul(0xbf58_476d_1ce4_e5b9); - z = (z ^ (z >> 27)).wrapping_mul(0x94d0_49bb_1331_11eb); - random(z ^ (z >> 31)) - }); - let stop = |offset: f32, opacity: f32| GradientStop { opacity, ..GradientStop::new(offset, vectorcraft_color::Color::WHITE) }; - let radial = |centre: Point, radius: f64, stops: Vec| { - let mut g = GradientPaint::new(Gradient::new(GradientKind::Radial, stops)); - g.geom = Some(GradientGeom { start: centre, end: centre + vectorcraft_geom::Vec2::new(radius, 0.0), aspect: 1.0, focal: None }); - Paint::Gradient(Box::new(g)) - }; - let circle = |centre: Point, radius: f64| shapes::ellipse(Rect::from_center_size(centre, (radius * 2.0, radius * 2.0))); - let mut parts: Vec<(&str, PathData, Paint, f32)> = vec![]; - // Halo: a soft ring just outside the centre. - let halo_r = r * (1.0 + growth) * 1.6; - let inner = (1.0 - fuzz as f32 * 0.6).clamp(0.05, 0.95); - parts.push(("Halo", circle(c, halo_r), radial(c, halo_r, vec![stop(0.0, 0.0), stop(inner * 0.75, 0.0), stop(inner, 0.5), stop(1.0, 0.0)]), 1.0)); - // Rays: thin spikes of random length (Longest = % of the centre radius), fading outwards. - // `rotation` turns them clockwise about the center. - if rays > 0 { - let mut bp = vectorcraft_geom::BezPath::new(); - let mut reach: f64 = 0.0; - for i in 0..rays { - let a = std::f64::consts::TAU * (i as f64 + rnd() * 0.6) / rays as f64 + ray_turn; - let len = r * longest * (1.0 - ray_fuzz * 0.75 * rnd()).max(0.1); - reach = reach.max(len); - let w = r * 0.035; - let dir = vectorcraft_geom::Vec2::new(a.cos(), a.sin()); - let n = vectorcraft_geom::Vec2::new(-dir.y, dir.x) * w; - bp.move_to(c + n); - bp.line_to(c + dir * len); - bp.line_to(c - n); - bp.line_to(c - dir * (w * 4.0)); - bp.close_path(); - } - parts.push(("Rays", PathData::from_bezpath(&bp), radial(c, reach, vec![stop(0.0, 0.9), stop(0.25, 0.35), stop(1.0, 0.0)]), 1.0)); - } - // Centre: bright core fading to transparent. - parts.push(("Center", circle(c, r), radial(c, r, vec![stop(0.0, 1.0), stop(0.25 + brightness * 0.5, 0.6), stop(1.0, 0.0)]), opacity)); - // Rings along the path to the end point (Largest = % of the average ring size). - for _ in 0..rings { - let t = rnd(); - let t = ring_at.as_mut().map_or(t, |next| next()); - let at = c + (end - c) * t; - let rr = (r * largest * (0.25 + rnd() * 0.75)).max(0.5); - let solid = rnd() < 0.5; - let stops = if solid { - vec![stop(0.0, 0.25), stop(0.8, 0.2), stop(1.0, 0.0)] - } else { - vec![stop(0.0, 0.0), stop(0.7, 0.05), stop(0.92, 0.35), stop(1.0, 0.0)] - }; - parts.push(("Ring", circle(at, rr), radial(at, rr, stops), 1.0)); - } - let parent = s.doc()?.target_parent()?; - let id = s.edit("Flare", |d, sel| { - let children = parts - .into_iter() - .map(|(name, pd, paint, op)| { - let mut n = Node::path(d.alloc_id(), pd, Appearance::basic(paint, Paint::None, 0.0)); - n.name = Some(name.into()); - n.blend = BlendMode::Screen; - n.opacity = op; - super::object::align_new_object(d, &mut n); - std::sync::Arc::new(n) - }) - .collect(); - let gid = d.alloc_id(); - let mut g = Node::group(gid, children); - g.name = Some("Flare".into()); - d.insert(parent, usize::MAX, g)?; - sel.set([gid]); - Ok(gid) - })?; - Ok(json!({ "id": id.0 })) -} - fn line(s: &mut Session, p: &Value) -> Result { let a = Point::new(f64_req(p, "x1", "shape.line")?, f64_req(p, "y1", "shape.line")?); let b = Point::new(f64_req(p, "x2", "shape.line")?, f64_req(p, "y2", "shape.line")?); diff --git a/crates/engine/src/cmd/expand.rs b/crates/engine/src/cmd/expand.rs index 7117899baf..d63489fb2e 100644 --- a/crates/engine/src/cmd/expand.rs +++ b/crates/engine/src/cmd/expand.rs @@ -182,7 +182,7 @@ impl Expandable { n.walk(&mut |c| { let shape = matches!(c.kind, NodeKind::Path { .. } | NodeKind::Compound { .. }); e.text |= matches!(c.kind, NodeKind::Text(_)); - e.live |= matches!(c.kind, NodeKind::Path { live: Some(_), .. }); + e.live |= matches!(c.kind, NodeKind::Path { live: Some(_), .. }) || c.extras().flare.is_some(); e.effects |= !c.appearance.effects.is_empty(); e.envelope |= matches!(c.kind, NodeKind::Envelope { .. }); e.blends |= matches!(c.kind, NodeKind::Blend { .. }); @@ -503,10 +503,14 @@ fn end_dimension_links(s: &mut Session, ended: &mut Vec) -> Result<() Ok(()) } +/// Makes the live shapes in `n` plain paths, and the flares plain groups of their parts. fn drop_live(n: &mut Node) { if let NodeKind::Path { live, .. } = &mut n.kind { *live = None; } + if n.extras().flare.is_some() { + n.extras_mut().flare = None; + } if let Some(ch) = n.children_mut() { for c in ch.iter_mut() { drop_live(Arc::make_mut(c)); diff --git a/crates/engine/src/cmd/fileio/access.rs b/crates/engine/src/cmd/fileio/access.rs index bd55624b32..8ca1fedcd7 100644 --- a/crates/engine/src/cmd/fileio/access.rs +++ b/crates/engine/src/cmd/fileio/access.rs @@ -297,7 +297,17 @@ pub(crate) fn write_file(path: &str, bytes: &[u8]) -> Result<()> { vectorcraft_doc::cancel::check()?; may_write(path)?; // Never a half-written file: see [`write_atomic`]. - write_atomic(std::path::Path::new(path), bytes).map_err(|e| EngineError::Other(format!("{path}: {e}"))) + write_atomic(std::path::Path::new(path), bytes).map_err(|e| write_error(path, e)) +} + +/// The error writing `path` failed with: [`EngineError::Cancelled`] for work canceled before the +/// file was put in place ([`vectorcraft_format::write_atomic_with`]), otherwise the path and the reason. +#[cfg(not(target_arch = "wasm32"))] +fn write_error(path: &str, error: std::io::Error) -> EngineError { + if error.get_ref().is_some_and(|e| e.is::()) { + return EngineError::Cancelled; + } + EngineError::Other(format!("{path}: {error}")) } /// [`write_file`] with what `fill` writes into the file (a save streamed into it). @@ -305,7 +315,7 @@ pub(crate) fn write_file(path: &str, bytes: &[u8]) -> Result<()> { pub fn write_file_with(path: &str, fill: &mut dyn FnMut(&mut dyn std::io::Write) -> std::io::Result<()>) -> Result<()> { vectorcraft_doc::cancel::check()?; may_write(path)?; - vectorcraft_format::write_atomic_with(std::path::Path::new(path), |f| fill(f)).map_err(|e| EngineError::Other(format!("{path}: {e}"))) + vectorcraft_format::write_atomic_with(std::path::Path::new(path), |f| fill(f)).map_err(|e| write_error(path, e)) } /// The save commands' writer: preserves a filesystem location refusal as a typed error. Other @@ -324,8 +334,10 @@ pub fn write_save_file_with(path: &str, fill: &mut dyn FnMut(&mut dyn std::io::W #[cfg(not(target_arch = "wasm32"))] pub(super) fn save_write_error(path: &str, error: std::io::Error) -> EngineError { - let reason = format!("{path}: {error}"); - if vectorcraft_format::read_only_location(&error) { EngineError::ReadOnlyLocation(reason) } else { EngineError::Other(reason) } + if !vectorcraft_format::read_only_location(&error) { + return write_error(path, error); + } + EngineError::ReadOnlyLocation(format!("{path}: {error}")) } #[cfg(target_arch = "wasm32")] diff --git a/crates/engine/src/cmd/fileio/load.rs b/crates/engine/src/cmd/fileio/load.rs index 4e59e378a5..8249fe6b71 100644 --- a/crates/engine/src/cmd/fileio/load.rs +++ b/crates/engine/src/cmd/fileio/load.rs @@ -962,7 +962,8 @@ pub(crate) fn size_note(bytes: &[u8]) -> Option { /// TIFF ([`vectorcraft_doc::cmyk::turned_cmyk`]). An image the decoder reads and that is stored as /// PNG keeps its gray or RGB samples at 8 or 16 bits, and the gray or RGB ICC profile they are in; /// other samples become 8-bit RGBA. A PSD/PSB composite's stored image keeps its imported -/// clipping path ([`image_clip`]). +/// clipping path ([`image_clip`]), and a PNG or TIFF that keeps such a path (as Unembed writes +/// it) is read with that path. pub fn raster_image(bytes: &[u8]) -> Result { let ppi = super::ppi::resolution(bytes); if let Some((w, h)) = vectorcraft_doc::cmyk::oversized_tiff(bytes) { @@ -1139,13 +1140,15 @@ pub fn texture_image(bytes: &[u8]) -> Result { texture.and_then(|t| t.to_stored()).ok_or_else(|| err("the image can't be read as a texture")) } -/// An image's encoded `bytes`, `width` × `height` pixels, ready to embed. +/// An image's encoded `bytes`, `width` × `height` pixels, ready to embed, with the clipping path a +/// PNG or TIFF made from a PSD or PSB file keeps ([`image_clip`]). fn stored(bytes: Vec, mime: &'static str, (width, height): (u32, u32), ppi: Option<(f64, f64)>) -> Result { if width == 0 || height == 0 { return Err(err("the image is empty")); } let blob = ImageBlob::new(mime, bytes); - Ok(RasterImage { key: blob.content_key(), blob, width, height, ppi, clip: None }) + let clip = image_clip(&blob).map(|path| (path, vectorcraft_geom::FillRule::EvenOdd)); + Ok(RasterImage { key: blob.content_key(), blob, width, height, ppi, clip }) } /// The keyword of the PNG text chunk holding the clipping path of the file a PNG was made from diff --git a/crates/engine/src/cmd/fileio/pdf.rs b/crates/engine/src/cmd/fileio/pdf.rs index daa20ac2b0..651ef89e19 100644 --- a/crates/engine/src/cmd/fileio/pdf.rs +++ b/crates/engine/src/cmd/fileio/pdf.rs @@ -69,7 +69,7 @@ pub(crate) const OPTIONS: &[FormatOption] = &[ name: "bleed", ty: "object", default: "null", - description: "{useDocument, top, bottom, left, right} in points: the page grows by the bleed (BleedBox) around its artboard (TrimBox); a PDF/X file with no bleed on a side where the document's bleed has one comes back with a warning", + description: "{useDocument, top, bottom, left, right} in points: the page grows by the bleed (BleedBox) around its artboard (TrimBox); a PDF/X file with no bleed on a side where the document's bleed has one comes back with a warning, and so do objects that reach the trim edge on a side with a bleed but stop short of the bleed edge", }, FormatOption { name: "output", @@ -128,7 +128,7 @@ pub fn specs() -> Vec { "Export PDF", [], None, - "{path?, preset?: \"VectorCraft Default\" (built-in or saved: pdf.preset.list), artboard? | artboards?: [i…] | range?: \"1-3, 5\" (1-based; default all, one page each), useArtboards?: true (false: one page, the bounds of the visible art the page draws (non-printing layers left out unless includeNonPrinting or createLayers keeps them), as document.export writes it; artboard, artboards and range are then ignored, Preserve Editing is left out (with a warning when it is on), and a document with no visible art is refused), standard?: none|pdfA2b|pdfX1a (CMYK, grey and spot colours only: colours and images converted to output.destination or the CMYK output intent, untagged; transparency flattened with flattenerPreset; PDF 1.3)|pdfX3 (colours ICC-tagged, CMYK in the output intent's profile as DeviceCMYK; transparency flattened; PDF 1.3)|pdfX4 (transparency and layers kept; colours ICC-tagged, CMYK in the output intent's profile as DeviceCMYK; PDF 1.6 at most) (PDF/X: a /GTS_PDFX output intent, by default the CMYK profile in effect, embedded; TrimBox, Trapped, GTS_PDFXVersion, title and dates; fonts embedded or outlined), compatibility?: 1.3 (no transparency: it is flattened with flattenerPreset, without the layers the file leaves out; images keep no see-through pixels)|1.4|1.5|1.6|1.7 (default)|2.0 (choosing a standard sets its version: 1.7 for pdfA2b, 1.6 for pdfX4, 1.3 for pdfX1a and pdfX3, which write 1.4 as 1.3 too; pdfA2b refuses 1.3; in pdfA2b files, and with longPagesInPoints: false, a page with a side longer than 14,400 pt keeps its size with a UserUnit from 1.6 on: 1.5 is then written as 1.6, with 1.5's encryption, and so is 1.4 in pdfA2b files, with a warning; PDF/X files and other 1.3 and 1.4 files write it in points, and 1.3 and 1.4 (pdfX1a and pdfX3 too) refuse a page past 32,767 pt whose size or art needs a real number past 32,767; a page whose short side is 3 pt or longer but would be under 3 units at that UserUnit gets a smaller one that keeps the short side at 3 units; a warning gives each such page's size), longPagesInPoints?: true (such a page is written at its size in points, without a UserUnit, at every version, and 1.5 stays 1.5, in files without a standard (PDF/A files keep the UserUnit); apps that keep to the limit cut it to 200 in; false: the UserUnit as above, with a warning that names this option), preserveEditing? (on in VectorCraft Default: the native document as an embedded file, which document.open restores; choosing a standard turns it off, a standard refuses it), thumbnails? (each page drawn as a /Thumb image, 106 px on its long side), fastWebView? (a linearised file: the first page shows while the rest downloads; it stays linearised when encrypted), viewAfterSaving? (the app opens the written file), createLayers? (each layer and sublayer but template layers as a PDF layer, an optional content group listed under its layer's: hidden layers off, non-printing ones /PrintState /OFF, locked ones locked; needs 1.5 or later; they reopen as layers; choosing pdfX1a or pdfX3 turns it off; they refuse it), includeNonPrinting? (keep layers whose Print option is off; left out by default unless createLayers), flattenerPreset?: \"\" (High Resolution) | high | medium | low | a saved preset (flattener.presets.list): what PDF 1.3 files flatten transparency with, flattener?: {object.flattenTransparency options over it}, compression?: {color?, gray?: {downsample: none|average|subsample|bicubic, ppi: 300, abovePpi: 450, compression: none|zip|jpeg|jpeg2000|auto, quality: minimum|low|medium|high|maximum}, mono?: {downsample, ppi: 1200, abovePpi: 1800, compression: none|ccittG3|ccittG4|zip|runLength} (black-and-white images), compressText?: true} (images above abovePpi are resampled to ppi; auto keeps JPEGs JPEG, the others lossless; JPEG needs opaque images; none, jpeg2000, CCITT and runLength are written as ZIP with a warning), marks?: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25 (trim marks and targets), offset: 6 (pt from the artboard, at least the bleed)} (printer's marks in [Registration], every plate: trim marks, registration targets mid-side, CMYK/spot/black-tint colour bars on top, page information (title, artboard, date UTC) below), bleed?: {useDocument (the document's bleed, document.setup), top, bottom, left, right} (pt; art in the bleed is kept; a PDF/X file with no bleed on a side where the document's bleed has one comes back with a warning). Each page: TrimBox = artboard, BleedBox = artboard + bleed, MediaBox = that + the marks' room (art clipped to the BleedBox), output?: {conversion: none (default)|destination (every colour into the destination profile's model, CMYK or RGB, also colours of that model in another profile)|preserveNumbers (only colours of the other model and Lab; those in the destination's model keep their numbers) (grey stays grey; images are converted too, and with destination and an sRGB destination a gray or RGB image tagged with an ICC profile is converted from it and written untagged; with destination and a CMYK destination, or another RGB one images are converted to (not when colours are ICC-tagged), an RGB image tagged with one is converted from it through sRGB; with preserveNumbers (and pdfX1a) only untagged images keep their numbers: an RGB image tagged with one is converted from it to sRGB or through sRGB to the destination, and a gray one is converted from it in an sRGB destination; any other image whose colors are converted (a CMYK image, an RGB one going to a CMYK destination, or with destination to an RGB one other than sRGB) but whose pixels can't be decoded or written that way is left out with a warning; printer's marks are not), destination: profile name (edit.colorSettings lists them; default: the document's profile for its colour mode), profiles: none (device colours; images are written without the ICC profiles they carry, a JPEG without its ICC_PROFILE segments, but in PDF/A, pdfX3 and pdfX4)|all|destination|taggedSource (documents assigned a profile: edit.assignProfile)|default (not set, the default; \"default\" unsets a preset's value, null keeps it: device colours, and gray and RGB images keep the profiles they carry, but in pdfX1a) (ICC-based colours: CMYK with the destination or document CMYK profile, RGB as sRGB, grey with the sRGB tone curve; PDF/A, pdfX3 and pdfX4 always, whatever profiles says, but in pdfX3 and pdfX4 CMYK colors in the profile of a CMYK output intent are DeviceCMYK, and with none and a CMYK output intent pdfX3 and pdfX4 write every CMYK color as DeviceCMYK, unless colors are converted to a CMYK destination of another profile; a CMYK image that keeps its numbers carries the CMYK profile it embeds with all and taggedSource, and in PDF/A, pdfX3 and pdfX4 unless destination, never in pdfX1a, nor when CMYK colors are DeviceCMYK and either its profile is the output intent's or profiles is none), outputIntent: profile name (embedded as the catalog's /GTS_PDFX output intent; a name that isn't a profile is only named, which pdfX1a and pdfX3 allow only with a registry and pdfX4 refuses; pdfX1a needs a CMYK one), outputCondition, outputConditionId (default: outputIntent), registry, trapped (/Trapped /True; /False when an output intent is written)} (PDF/A files keep their own output intent), advanced?: {fontSubsetPercent: 100 (below 100 is accepted with a warning: fonts are always embedded as subsets), outlineText: false (type as real, selectable and searchable text in embedded subset fonts with a ToUnicode map; fonts whose licence forbids embedding, or allows only whole fonts, stay outlines with a warning; true: every glyph as an outline), overprint: preserve (overprinting fills and strokes set /OP /op true, /OPM 1; white ones knock out with document.setup discardWhiteOverprint)|discard (they knock out)}, security?: {openPassword, permissionsPassword, printing: none|low|high, changes: none|pages|forms|comments|any, copy, screenReader, plaintextMetadata}, acknowledgeLoss?: bool (write over the file the document was read from although reading it left things out), format?: \"pdf\"} → {path, bytes, warnings}; no path → {dataBase64, bytes, warnings}. The options apply over the preset (null keeps its value); options accepted but not applied yet come back as warnings; a standard with a PDF version it doesn't allow and a password with a standard are refused, and so is a PDF/X file that would still break its standard (transparency the flattener left, RGB in pdfX1a, a font not embedded) or a PDF 1.3 file with transparency left. document.export {format: pdf} takes the same options. A key PDF doesn't take, and an unknown key inside one of the option objects, are refused. Under automation read roots, a PDF that carries the native document (preserveEditing on, every artboard, useArtboards not false) is refused, before any file is written, while the document links a JavaScript file outside them (svgInteractivity; a URL is not checked)", + "{path?, preset?: \"VectorCraft Default\" (built-in or saved: pdf.preset.list), artboard? | artboards?: [i…] | range?: \"1-3, 5\" (1-based; default all, one page each), useArtboards?: true (false: one page, the bounds of the visible art the page draws (non-printing layers left out unless includeNonPrinting or createLayers keeps them), as document.export writes it; artboard, artboards and range are then ignored, Preserve Editing is left out (with a warning when it is on), and a document with no visible art is refused), standard?: none|pdfA2b|pdfX1a (CMYK, grey and spot colours only: colours and images converted to output.destination or the CMYK output intent, untagged; transparency flattened with flattenerPreset; PDF 1.3)|pdfX3 (colours ICC-tagged, CMYK in the output intent's profile as DeviceCMYK; transparency flattened; PDF 1.3)|pdfX4 (transparency and layers kept; colours ICC-tagged, CMYK in the output intent's profile as DeviceCMYK; PDF 1.6 at most) (PDF/X: a /GTS_PDFX output intent, by default the CMYK profile in effect, embedded; TrimBox, Trapped, GTS_PDFXVersion, title and dates; fonts embedded or outlined), compatibility?: 1.3 (no transparency: it is flattened with flattenerPreset, without the layers the file leaves out; images keep no see-through pixels)|1.4|1.5|1.6|1.7 (default)|2.0 (choosing a standard sets its version: 1.7 for pdfA2b, 1.6 for pdfX4, 1.3 for pdfX1a and pdfX3, which write 1.4 as 1.3 too; pdfA2b refuses 1.3; in pdfA2b files, and with longPagesInPoints: false, a page with a side longer than 14,400 pt keeps its size with a UserUnit from 1.6 on: 1.5 is then written as 1.6, with 1.5's encryption, and so is 1.4 in pdfA2b files, with a warning; PDF/X files and other 1.3 and 1.4 files write it in points, and 1.3 and 1.4 (pdfX1a and pdfX3 too) refuse a page past 32,767 pt whose size or art needs a real number past 32,767; a page whose short side is 3 pt or longer but would be under 3 units at that UserUnit gets a smaller one that keeps the short side at 3 units; a warning gives each such page's size), longPagesInPoints?: true (such a page is written at its size in points, without a UserUnit, at every version, and 1.5 stays 1.5, in files without a standard (PDF/A files keep the UserUnit); apps that keep to the limit cut it to 200 in; false: the UserUnit as above, with a warning that names this option), preserveEditing? (on in VectorCraft Default: the native document as an embedded file, which document.open restores; choosing a standard turns it off, a standard refuses it), thumbnails? (each page drawn as a /Thumb image, 106 px on its long side), fastWebView? (a linearised file: the first page shows while the rest downloads; it stays linearised when encrypted), viewAfterSaving? (the app opens the written file), createLayers? (each layer and sublayer but template layers as a PDF layer, an optional content group listed under its layer's: hidden layers off, non-printing ones /PrintState /OFF, locked ones locked; needs 1.5 or later; they reopen as layers; choosing pdfX1a or pdfX3 turns it off; they refuse it), includeNonPrinting? (keep layers whose Print option is off; left out by default unless createLayers), flattenerPreset?: \"\" (High Resolution) | high | medium | low | a saved preset (flattener.presets.list): what PDF 1.3 files flatten transparency with, flattener?: {object.flattenTransparency options over it}, compression?: {color?, gray?: {downsample: none|average|subsample|bicubic, ppi: 300, abovePpi: 450, compression: none|zip|jpeg|jpeg2000|auto, quality: minimum|low|medium|high|maximum}, mono?: {downsample, ppi: 1200, abovePpi: 1800, compression: none|ccittG3|ccittG4|zip|runLength} (black-and-white images), compressText?: true} (images above abovePpi are resampled to ppi; auto keeps JPEGs JPEG, the others lossless; JPEG needs opaque images; none, jpeg2000, CCITT and runLength are written as ZIP with a warning), marks?: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25 (trim marks and targets), offset: 6 (pt from the artboard, at least the bleed)} (printer's marks in [Registration], every plate: trim marks, registration targets mid-side, CMYK/spot/black-tint colour bars on top, page information (title, artboard, date UTC) below), bleed?: {useDocument (the document's bleed, document.setup), top, bottom, left, right} (pt; art in the bleed is kept; a PDF/X file with no bleed on a side where the document's bleed has one comes back with a warning, and so does a count of the visible objects that reach the trim edge (within 0.5 pt) on a side with a bleed but end before the bleed edge; layers that don't print are left out unless includeNonPrinting, and art and boxes are written unchanged). Each page: TrimBox = artboard, BleedBox = artboard + bleed, MediaBox = that + the marks' room (art clipped to the BleedBox), output?: {conversion: none (default)|destination (every colour into the destination profile's model, CMYK or RGB, also colours of that model in another profile)|preserveNumbers (only colours of the other model and Lab; those in the destination's model keep their numbers) (grey stays grey; images are converted too, and with destination and an sRGB destination a gray or RGB image tagged with an ICC profile is converted from it and written untagged; with destination and a CMYK destination, or another RGB one images are converted to (not when colours are ICC-tagged), an RGB image tagged with one is converted from it through sRGB; with preserveNumbers (and pdfX1a) only untagged images keep their numbers: an RGB image tagged with one is converted from it to sRGB or through sRGB to the destination, and a gray one is converted from it in an sRGB destination; any other image whose colors are converted (a CMYK image, an RGB one going to a CMYK destination, or with destination to an RGB one other than sRGB) but whose pixels can't be decoded or written that way is left out with a warning; printer's marks are not), destination: profile name (edit.colorSettings lists them; default: the document's profile for its colour mode), profiles: none (device colours; images are written without the ICC profiles they carry, a JPEG without its ICC_PROFILE segments, but in PDF/A, pdfX3 and pdfX4)|all|destination|taggedSource (documents assigned a profile: edit.assignProfile)|default (not set, the default; \"default\" unsets a preset's value, null keeps it: device colours, and gray and RGB images keep the profiles they carry, but in pdfX1a) (ICC-based colours: CMYK with the destination or document CMYK profile, RGB as sRGB, grey with the sRGB tone curve; PDF/A, pdfX3 and pdfX4 always, whatever profiles says, but in pdfX3 and pdfX4 CMYK colors in the profile of a CMYK output intent are DeviceCMYK, and with none and a CMYK output intent pdfX3 and pdfX4 write every CMYK color as DeviceCMYK, unless colors are converted to a CMYK destination of another profile; a CMYK image that keeps its numbers carries the CMYK profile it embeds with all and taggedSource, and in PDF/A, pdfX3 and pdfX4 unless destination, never in pdfX1a, nor when CMYK colors are DeviceCMYK and either its profile is the output intent's or profiles is none), outputIntent: profile name (embedded as the catalog's /GTS_PDFX output intent; a name that isn't a profile is only named, which pdfX1a and pdfX3 allow only with a registry and pdfX4 refuses; pdfX1a needs a CMYK one), outputCondition, outputConditionId (default: outputIntent), registry, trapped (/Trapped /True; /False when an output intent is written)} (PDF/A files keep their own output intent), advanced?: {fontSubsetPercent: 100 (below 100 is accepted with a warning: fonts are always embedded as subsets), outlineText: false (type as real, selectable and searchable text in embedded subset fonts with a ToUnicode map; fonts whose licence forbids embedding, or allows only whole fonts, stay outlines with a warning; true: every glyph as an outline), overprint: preserve (overprinting fills and strokes set /OP /op true, /OPM 1; white ones knock out with document.setup discardWhiteOverprint)|discard (they knock out)}, security?: {openPassword, permissionsPassword, printing: none|low|high, changes: none|pages|forms|comments|any, copy, screenReader, plaintextMetadata}, acknowledgeLoss?: bool (write over the file the document was read from although reading it left things out), format?: \"pdf\"} → {path, bytes, warnings}; no path → {dataBase64, bytes, warnings}. The options apply over the preset (null keeps its value); options accepted but not applied yet come back as warnings; a standard with a PDF version it doesn't allow and a password with a standard are refused, and so is a PDF/X file that would still break its standard (transparency the flattener left, RGB in pdfX1a, a font not embedded) or a PDF 1.3 file with transparency left. document.export {format: pdf} takes the same options. A key PDF doesn't take, and an unknown key inside one of the option objects, are refused. Under automation read roots, a PDF that carries the native document (preserveEditing on, every artboard, useArtboards not false) is refused, before any file is written, while the document links a JavaScript file outside them (svgInteractivity; a URL is not checked)", has_doc, export_pdf ), @@ -295,6 +295,8 @@ pub(super) fn encode_art_page(cmd: &str, doc: &Document, p: &Value) -> Result Result, non_printing: bool) -> usize { + let bleed = bleed.map(|b| if b.is_finite() && b > EDGE_TOLERANCE { b } else { 0.0 }); + if bleed.iter().all(|b| *b == 0.0) { + return 0; + } + let trims: Vec = match artboards { + Some(picked) => picked.iter().filter_map(|&i| doc.artboards.get(i)).map(|a| a.rect).collect(), + None => doc.artboards.iter().map(|a| a.rect).collect(), + }; + let symbols = doc.symbol_boxes(); + let mut count = 0; + // Each object with the clipping path of the layers above it. + let mut stack: Vec<(&Node, Option)> = doc.layers.iter().map(|l| (&**l, None)).collect(); + while let Some((n, clip)) = stack.pop() { + if let NodeKind::Layer { template, printable, children, clip: clipping, .. } = &n.kind { + // An opacity mask decides what shows, so a masked layer's art is not measured. + if !n.visible || *template || !(*printable || non_printing) || n.opacity <= 0.0 || n.extras().mask.is_some() { + continue; + } + // A clipping layer's first child clips the others, and its fills and strokes are an + // object of their own. + let (inner, members) = if *clipping { + let Some(own) = clip_region(children, &symbols) else { continue }; + let inner = clip.map_or(own, |c| c.intersect(own)); + if let Some(first) = children.first() + && let Drawn::Bounds(b) = clip_paint_drawn(first, inner, &symbols) + { + let b = clip.map_or(b, |c| c.intersect(b)); + if b.area() > 0.0 && trims.iter().any(|t| stops_short(b, *t, bleed)) { + count += 1; + } + } + (Some(inner), children.get(1..).unwrap_or_default()) + } else { + (clip, &children[..]) + }; + stack.extend(members.iter().map(|c| (&**c, inner))); + continue; + } + let Drawn::Bounds(b) = drawn_bounds(n, &symbols) else { continue }; + let b = clip.map_or(b, |c| c.intersect(b)); + if b.area() > 0.0 && trims.iter().any(|t| stops_short(b, *t, bleed)) { + count += 1; + } + } + count +} + +/// What [`drawn_bounds`] finds an object draws. +enum Drawn { + /// Nothing: it is hidden, a guide, at 0% opacity, or a path that paints nothing. + Nothing, + /// Art within these bounds. + Bounds(vectorcraft_geom::Rect), + /// Art whose bounds aren't known, which is not measured: brush art paints past the visual + /// bounds by an amount they don't give, an opacity mask hides part of what they hold, and area + /// type and type on a path are bounded by their frame or path. + Unknown, +} + +/// Whether path or compound path `n` paints: one of its fills and strokes is visible, has a paint +/// and an opacity above 0 and, a stroke, a width above 0. Other objects count as painting. +fn paints(n: &Node) -> bool { + !matches!(n.kind, NodeKind::Path { .. } | NodeKind::Compound { .. }) + || n.appearance.items.iter().any(|i| { + i.visible() && i.opacity() > 0.0 && !i.paint().is_none() && !matches!(i, vectorcraft_doc::AppearanceItem::Stroke(s) if s.width <= 0.0) + }) +} + +/// What `n` draws on a page, by its visual bounds (strokes included): a group without a clipping +/// path by the members that draw, and a clip group by the part of them inside its clipping path +/// together with what the clipping path paints itself ([`clip_paint_drawn`]). +/// Hidden objects, guides, objects at 0% opacity and paths that paint nothing draw nothing. Art +/// with a brushed stroke that draws, in `n` or (outside groups) in the objects it holds, art with +/// an opacity mask, and area type and type on a path are [`Drawn::Unknown`]. +fn drawn_bounds(n: &Node, symbols: &vectorcraft_doc::SymbolBoxes) -> Drawn { + if !n.visible || n.is_guide() || n.opacity <= 0.0 || !paints(n) { + return Drawn::Nothing; + } + // An opacity mask decides what shows of the object, and the bounds of area type and type on a + // path are its frame or path, not its glyphs. + let frame_bounds = matches!(&n.kind, NodeKind::Text(t) if !matches!(t.kind, vectorcraft_doc::TextKind::Point)); + if vectorcraft_brush::reach(n) > 0.0 || n.extras().mask.is_some() || frame_bounds { + return Drawn::Unknown; + } + let members = |children: &[Arc]| { + let mut out = Some(None); + for c in children { + out = match (out, drawn_bounds(c, symbols)) { + (None, _) | (_, Drawn::Unknown) => None, + (Some(acc), Drawn::Bounds(b)) => Some(vectorcraft_geom::union_opt(acc, Some(b))), + (keep, Drawn::Nothing) => keep, + }; + } + out + }; + let measured = match &n.kind { + NodeKind::Group { clip: false, .. } => match members(n.editing_children()) { + Some(art) => art.and_then(|_| n.visual_of_members(std::iter::once(art))), + None => return Drawn::Unknown, + }, + NodeKind::Group { clip: true, children } => { + let Some(region) = clip_region(children, symbols) else { return Drawn::Nothing }; + let Some(art) = members(children.get(1..).unwrap_or_default()) else { return Drawn::Unknown }; + let art = art.map(|a| region.intersect(a)).filter(|b| b.area() > 0.0); + match children.first().map_or(Drawn::Nothing, |first| clip_paint_drawn(first, region, symbols)) { + Drawn::Unknown => return Drawn::Unknown, + Drawn::Bounds(b) => vectorcraft_geom::union_opt(art, Some(b)), + Drawn::Nothing => art, + } + } + _ if vectorcraft_brush::reach_within(n) > 0.0 => return Drawn::Unknown, + _ => n.visual_bounds_with(symbols), + }; + measured.map_or(Drawn::Nothing, Drawn::Bounds) +} + +/// The region the clipping path of a clip group or clipping layer with `children` clips to: its +/// geometric bounds, without its strokes. +fn clip_region(children: &[Arc], symbols: &vectorcraft_doc::SymbolBoxes) -> Option { + children.first()?.geometric_bounds_with(symbols) +} + +/// What clipping path `clip` paints itself ([`Node::clip_paint`]): its fills inside `region`, the +/// region it clips to, and its strokes over the clipped art, unclipped. +fn clip_paint_drawn(clip: &Node, region: vectorcraft_geom::Rect, symbols: &vectorcraft_doc::SymbolBoxes) -> Drawn { + let paint = clip.clip_paint(); + let mut out = None; + for (part, clipped) in [(paint.fill, true), (paint.stroke, false)] { + let Some(part) = part else { continue }; + match drawn_bounds(&part, symbols) { + Drawn::Unknown => return Drawn::Unknown, + Drawn::Nothing => {} + Drawn::Bounds(b) => { + let b = if clipped { region.intersect(b) } else { b }; + out = vectorcraft_geom::union_opt(out, Some(b).filter(|b| b.area() > 0.0)); + } + } + } + out.map_or(Drawn::Nothing, Drawn::Bounds) +} + +/// Whether bounds `b` reach the trim edge `t` (within [`EDGE_TOLERANCE`] on either side of it) on a +/// side where `bleed` (`[top, bottom, left, right]`) is above 0 and end before the bleed edge there. +/// Document space has y down. +fn stops_short(b: vectorcraft_geom::Rect, t: vectorcraft_geom::Rect, [top, bottom, left, right]: [f64; 4]) -> bool { + let tol = EDGE_TOLERANCE; + let across = b.x0 < t.x1 && b.x1 > t.x0; + let down = b.y0 < t.y1 && b.y1 > t.y0; + let reaches = |near: f64, far: f64, edge: f64| near <= edge + tol && far >= edge - tol; + (across && top > 0.0 && reaches(b.y0, b.y1, t.y0) && b.y0 > t.y0 - top + tol) + || (across && bottom > 0.0 && reaches(-b.y1, -b.y0, -t.y1) && b.y1 < t.y1 + bottom - tol) + || (down && left > 0.0 && reaches(b.x0, b.x1, t.x0) && b.x0 > t.x0 - left + tol) + || (down && right > 0.0 && reaches(-b.x1, -b.x0, -t.x1) && b.x1 < t.x1 + right - tol) +} + +/// The warning for `n` objects that [`short_of_bleed`] finds; `None` for none. +pub fn short_of_bleed_warning(n: usize) -> Option { + match n { + 0 => None, + 1 => Some(format!("1 object {SHORT_OF_BLEED_ONE}")), + _ => Some(format!("{n} objects {SHORT_OF_BLEED_OTHER}")), + } +} + +/// The end of [`short_of_bleed_warning`] for one object and for more. +const SHORT_OF_BLEED_ONE: &str = "reaches the trim edge but stops short of the bleed"; +const SHORT_OF_BLEED_OTHER: &str = "reach the trim edge but stop short of the bleed"; + +/// Whether `text` is a warning [`short_of_bleed_warning`] gives. +pub fn is_short_of_bleed(text: &str) -> bool { + text.ends_with(SHORT_OF_BLEED_ONE) || text.ends_with(SHORT_OF_BLEED_OTHER) +} + /// The end of the writer's warning for a page longer than 14,400 pt written with a `UserUnit` /// above 1. const SHOWN_SMALLER: &str = "so apps that ignore UserUnit show it that many times smaller"; @@ -340,7 +527,7 @@ pub(super) fn encode_at(cmd: &str, doc: &Document, p: &Value, modified: Option = placed.into_iter().map(Note::loss).collect(); // The editing data leaves out an Export for Screens folder outside the read roots. let native = || Ok(vectorcraft_format::save(&super::access::with_readable_settings_folder(doc), false)); - let (bytes, drawn) = encode_carrying_at(cmd, &full, p, modified, native, || Ok(None))?; + let (bytes, drawn) = encode_carrying_at(cmd, &full, p, modified, true, native, || Ok(None))?; notes.extend(drawn); if notes.iter().any(|n| n.text.ends_with(SHOWN_SMALLER)) && options(cmd, &full, p)?.settings.standard == Standard::None { for n in notes.iter_mut().filter(|n| n.text.ends_with(SHOWN_SMALLER)) { @@ -364,7 +551,8 @@ fn overflow_warning(cmd: &str, doc: &Document, p: &Value) -> Result Result>, private: impl FnOnce() -> Result)>>, ) -> Result<(Vec, Vec)> { - encode_carrying_at(cmd, doc, p, None, native, private) + encode_carrying_at(cmd, doc, p, None, false, native, private) } /// [`encode_carrying`] modified at `modified` (Unix seconds) when given, instead of the time of -/// writing. +/// writing, warning about art that stops short of the bleed when `bleed_check` is true. fn encode_carrying_at( cmd: &str, doc: &Document, p: &Value, modified: Option, + bleed_check: bool, native: impl FnOnce() -> Result>, private: impl FnOnce() -> Result)>>, ) -> Result<(Vec, Vec)> { let mut opts = options_at(cmd, doc, p, modified.or_else(vectorcraft_doc::metadata::output_time))?; + // Measured before the pages' background colors join the art. Only art that prints counts: + // createLayers writes non-printing layers with /PrintState /OFF, so they count only with + // includeNonPrinting, which writes them as printing art. + let set = &opts.settings; + let short = if bleed_check { short_of_bleed(doc, set.bleed_of(doc), opts.artboards.as_deref(), set.include_non_printing) } else { 0 }; // The pages' background colors, behind the art (the editing data keeps them as colors). let pages = opts.artboards.clone().unwrap_or_else(|| (0..doc.artboards.len()).collect()); let filled = super::export::with_artboard_fills(doc, p, pages).map_err(|e| bad(cmd, e))?; @@ -401,6 +595,8 @@ fn encode_carrying_at( if opts.settings.leaves_out_bleed(doc) { notes.push(Note::loss(BLEED_LEFT_OUT)); } + // Art that reaches the trim edge but leaves part of the page's bleed empty. + notes.extend(short_of_bleed_warning(short).map(Note::loss)); if opts.settings.preserve_editing { if opts.artboards.as_ref().is_none_or(|v| v.iter().copied().eq(0..doc.artboards.len())) { opts.native = Some(native()?); diff --git a/crates/engine/src/cmd/fileio/save.rs b/crates/engine/src/cmd/fileio/save.rs index 8a9b29fec2..7150d68dbb 100644 --- a/crates/engine/src/cmd/fileio/save.rs +++ b/crates/engine/src/cmd/fileio/save.rs @@ -629,6 +629,24 @@ impl std::io::Write for Counted { } } +/// A writer that fails once the work running on this thread is canceled +/// ([`crate::cancel::is_cancelled`]), so a streamed save stops writing into its temporary file. +/// It sits under the stream's buffer: it is checked once per buffer written, not per write. +struct StopsWhenCancelled(W); + +impl std::io::Write for StopsWhenCancelled { + fn write(&mut self, buf: &[u8]) -> std::io::Result { + if crate::cancel::is_cancelled() { + return Err(std::io::Error::other(crate::cancel::Cancelled)); + } + self.0.write(buf) + } + + fn flush(&mut self) -> std::io::Result<()> { + self.0.flush() + } +} + /// The artboards a native or `.ai` save also writes to files of their own: with /// `separateArtboards`, those `range` names (default all). fn separate_boards(cmd: &str, f: &Format, doc: &Document, p: &Value) -> Result> { @@ -1026,10 +1044,15 @@ impl SaveJob { } /// [`SaveJob::write`], once `stop` has seen the paths of every file it writes to a path, in - /// order: when `stop` returns a value, nothing is written and that value is returned. + /// order: when `stop` returns a value, nothing is written and that value is returned. Work + /// canceled ([`crate::cancel`]) before the first file is written returns + /// [`crate::EngineError::Cancelled`] and writes nothing; once the first file is written, the + /// others are written too. pub fn write_unless(&self, stop: impl FnOnce(&[&str]) -> Option, mut write: impl FnMut(&str, &[u8]) -> Result<()>) -> Result { let (plan, doc) = (&self.plan, &*self.doc); + crate::cancel::check()?; let enc = self.encode()?; + crate::cancel::check()?; let extra = json!({ "format": plan.format.id, "warnings": enc.notes() }); let Some(path) = &plan.path else { let mut out = write_encoded(None, &plan.name, doc, &enc, extra)?; @@ -1046,8 +1069,13 @@ impl SaveJob { if let Some(stopped) = stop(&files.iter().map(|(p, _)| p.as_str()).collect::>()) { return Ok(stopped); } - for (p, bytes) in &files { - write(p, bytes)?; + for (i, (p, bytes)) in files.iter().enumerate() { + if i == 0 { + write(p, bytes)?; + } else { + // Once a file is in place, a Cancel no longer stops the save: the set is written whole. + crate::cancel::scope(&crate::cancel::CancelToken::new(), None, || write(p, bytes))?; + } } let bytes = files.first().map_or(0, |f| f.1.len()); let mut out = super::merge(json!({ "path": path, "bytes": bytes }), extra); @@ -1070,11 +1098,15 @@ impl SaveJob { /// [`SaveJob::write`] through `stream`, which writes the file at a path with what the filler /// it is given writes (atomically, as [`vectorcraft_format::write_atomic_with`]). A native /// file goes into it as it is encoded ([`SaveJob::streams`]), never held whole in memory; - /// other files are encoded first, then written into it. + /// other files are encoded first, then written into it. Work canceled ([`crate::cancel`]) + /// while the native file is encoded, or before its filler returns, returns + /// [`crate::EngineError::Cancelled`]: the filler fails, so `stream` keeps the file as it was + /// (the atomic writer checks once more before it puts the file in place). pub fn write_streamed(&self, stream: StreamWrite) -> Result { let (Some(path), true) = (&self.plan.path, self.streams()) else { return self.write(|p, b| stream(p, &mut |w| w.write_all(b))); }; + crate::cancel::check()?; let (cmd, f) = (self.plan.mode.command(), self.plan.format); let doc = self.doc.without_edit_modes(); let doc = match f.id { @@ -1091,16 +1123,22 @@ impl SaveJob { let mut failed = None; let mut written = 0u64; let mut fill = |w: &mut dyn std::io::Write| { - let mut out = Counted { inner: std::io::BufWriter::with_capacity(STREAM_BUFFER, w), n: 0 }; + let mut out = Counted { inner: std::io::BufWriter::with_capacity(STREAM_BUFFER, StopsWhenCancelled(w)), n: 0 }; let r = super::native::encode_to(cmd, f, &doc, &self.params, &mut out); written = out.n; - match r { + let r = match r { Ok(()) => out.inner.flush(), Err(e) => { failed = Some(e); Err(std::io::Error::other("the file couldn't be encoded")) } + }; + // The last check before the file is replaced: a canceled save leaves it as it was. + if crate::cancel::is_cancelled() { + failed = Some(crate::EngineError::Cancelled); + return Err(std::io::Error::other(crate::cancel::Cancelled)); } + r }; let r = stream(path, &mut fill); r.map_err(|e| failed.take().unwrap_or(e))?; diff --git a/crates/engine/src/cmd/fileio/screens.rs b/crates/engine/src/cmd/fileio/screens.rs index 3663d3e2f6..442f38e3cc 100644 --- a/crates/engine/src/cmd/fileio/screens.rs +++ b/crates/engine/src/cmd/fileio/screens.rs @@ -1349,10 +1349,14 @@ fn encode_and_write(export: ScreenExport, writer: &mut dyn FnMut(&str, &[u8]) -> } // The document a PDF row writes: with Include Bleed, the artboards as they are. let pdf_doc = ungrown.as_deref(); + // A PDF page of an artboard has the artboard as its trim, with or without Include Bleed. A + // page of its art's bounds has every object at its edge: it doesn't say whether art stops + // short of the bleed. + let artboard_page = o.assets.is_none() && o.layers.is_none() && o.selection.is_none(); let mut write = |doc: &Document, format: &str, options: &Value| -> Result> { // The steps are the files: an encoder's own steps (artboards, pages) are not reported. let (bytes, given) = vectorcraft_doc::cancel::quiet(|| encode_with_notes(doc, format, options))?; - for n in given { + for n in given.into_iter().filter(|n| artboard_page || !super::pdf::is_short_of_bleed(&n.text)) { add_note(&mut notes, n); } Ok(bytes) diff --git a/crates/engine/src/cmd/fileio/tests.rs b/crates/engine/src/cmd/fileio/tests.rs index f3161c229d..56e2a12f30 100644 --- a/crates/engine/src/cmd/fileio/tests.rs +++ b/crates/engine/src/cmd/fileio/tests.rs @@ -935,6 +935,109 @@ fn a_save_that_fails_while_streaming_leaves_the_file_as_it_was() { let _ = std::fs::remove_dir_all(&d); } +/// A save canceled (Background Save's Cancel) before it starts, while a native file streams into +/// its temporary file, or after the last byte went into it, fails with `Cancelled` and leaves the +/// file as it was, with no temporary file behind. A file encoded first is never written. +#[test] +fn a_canceled_save_leaves_the_file_as_it_was() { + /// Passes every write on, and cancels the save after the first one. + struct CancelAfterFirst<'a> { + inner: &'a mut dyn std::io::Write, + token: crate::cancel::CancelToken, + } + impl std::io::Write for CancelAfterFirst<'_> { + fn write(&mut self, b: &[u8]) -> std::io::Result { + let n = self.inner.write(b)?; + self.token.cancel(); + Ok(n) + } + fn flush(&mut self) -> std::io::Result<()> { + self.inner.flush() + } + } + let d = tmp_dir("stream-cancel"); + // A small document's file goes in one piece; a large one's in several. + for count in [1, 1500] { + let mut s = session(2000.0, 2000.0, 1); + for i in 0..count { + s.execute("shape.rectangle", &json!({"x": i % 100 * 20, "y": i / 100 * 20, "width": 10, "height": 10})).unwrap(); + } + let path = d.join("a.vectorcraft").to_string_lossy().to_string(); + s.execute("file.saveCopy", &json!({"path": path})).unwrap(); + let before = std::fs::read(&path).unwrap(); + s.execute("shape.ellipse", &json!({"x": 0, "y": 0, "width": 50, "height": 50})).unwrap(); + let plan = save_plan(&s, SaveMode::Copy, &json!({"path": path})).unwrap(); + let job = save_job(&mut s, plan).unwrap(); + assert!(job.streams()); + let token = crate::cancel::CancelToken::new(); + let r = crate::cancel::scope(&token, None, || { + job.write_streamed(&mut |p, fill| super::write_file_with(p, &mut |w| fill(&mut CancelAfterFirst { inner: w, token: token.clone() }))) + }); + assert!(matches!(r, Err(EngineError::Cancelled)), "{count}: {r:?}"); + assert_eq!(std::fs::read(&path).unwrap(), before, "{count} objects"); + assert_eq!(std::fs::read_dir(&d).unwrap().count(), 1, "no temporary file is left"); + // Canceled before it starts: the file isn't opened. + let mut opened = false; + let r = crate::cancel::scope(&token, None, || { + job.write_streamed(&mut |_, _| { + opened = true; + Ok(()) + }) + }); + assert!(matches!(r, Err(EngineError::Cancelled)) && !opened, "{r:?}"); + } + // A file encoded first (SVG): nothing reaches the writer. + let mut s = session(200.0, 100.0, 1); + s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 50, "height": 20})).unwrap(); + let plan = save_plan(&s, SaveMode::Copy, &json!({"path": d.join("a.svg").to_string_lossy()})).unwrap(); + let job = save_job(&mut s, plan).unwrap(); + let token = crate::cancel::CancelToken::new(); + token.cancel(); + let mut writes = 0; + let r = crate::cancel::scope(&token, None, || { + job.write_streamed(&mut |_, _| { + writes += 1; + Ok(()) + }) + }); + assert!(matches!(r, Err(EngineError::Cancelled)), "{r:?}"); + let r = crate::cancel::scope(&token, None, || { + job.write(|_, _| { + writes += 1; + Ok(()) + }) + }); + assert!(matches!(r, Err(EngineError::Cancelled)) && writes == 0, "{r:?}"); + assert!(!d.join("a.svg").exists()); + let _ = std::fs::remove_dir_all(&d); +} + +/// A save that writes several files (EPS with Use Artboards) and is canceled once its first file is +/// in place writes the others too and succeeds: the set is never left half written. +#[test] +fn a_save_canceled_after_its_first_file_writes_them_all() { + let d = tmp_dir("cancel-files"); + let mut s = session(100.0, 100.0, 2); + s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 30, "height": 30})).unwrap(); + let path = d.join("logo.eps").to_string_lossy().to_string(); + let plan = save_plan(&s, SaveMode::Copy, &json!({"path": path, "options": {"useArtboards": true}})).unwrap(); + let job = save_job(&mut s, plan).unwrap(); + let token = crate::cancel::CancelToken::new(); + let mut written = vec![]; + let r = crate::cancel::scope(&token, None, || { + job.write(|p, b| { + super::write_save_file(p, b)?; + written.push(p.to_string()); + token.cancel(); + Ok(()) + }) + }); + assert!(r.is_ok(), "{r:?}"); + assert_eq!(written.len(), 3, "{written:?}"); + assert!(written.iter().all(|p| std::path::Path::new(p).is_file()), "{written:?}"); + let _ = std::fs::remove_dir_all(&d); +} + /// A save that fails leaves File Info's dates and the saved state alone; one that works stamps them. #[test] fn a_failed_save_does_not_stamp_the_documents_dates() { diff --git a/crates/engine/src/cmd/fileio/tests_pdfx.rs b/crates/engine/src/cmd/fileio/tests_pdfx.rs index 188e0158ca..424bf3a6b6 100644 --- a/crates/engine/src/cmd/fileio/tests_pdfx.rs +++ b/crates/engine/src/cmd/fileio/tests_pdfx.rs @@ -171,6 +171,226 @@ fn a_pdfx_file_that_leaves_out_the_document_bleed_warns() { assert!(!left_out(&warnings), "{warnings:?}"); } +/// A 200 × 100 pt document with no art, bleed `bleed` (pt). +fn bleed_session(bleed: Value) -> Session { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 200, "height": 100})).unwrap(); + s.execute("document.setup", &json!({ "bleed": bleed })).unwrap(); + s +} + +/// A rectangle from (x0, y0) to (x1, y1) without a stroke, on the current layer. +fn plain_rect(s: &mut Session, [x0, y0, x1, y1]: [f64; 4]) -> Value { + let id = s.execute("shape.rectangle", &json!({"x": x0, "y": y0, "width": x1 - x0, "height": y1 - y0})).unwrap()["id"].clone(); + s.execute("paint.setStroke", &json!({"ids": [id], "none": true})).unwrap(); + id +} + +/// The warnings of a PDF that carries the document's bleed that say art stops short of it. +fn short_of_bleed(s: &mut Session) -> Vec { + let (_, warnings) = pdf(s, json!({"bleed": {"useDocument": true}})); + warnings.into_iter().filter(|w| super::pdf::is_short_of_bleed(w)).collect() +} + +const MM: f64 = 72.0 / 25.4; + +/// A bleed raised from 2 mm to 5 mm leaves a background that filled the old bleed, and a band +/// placed against the trim edge, short of the new one: the export warns once, counting both. +#[test] +fn art_that_reaches_the_trim_edge_but_stops_short_of_the_bleed_warns() { + let mut s = bleed_session(json!(2.0 * MM)); + let (b, w, h) = (2.0 * MM, 200.0, 100.0); + plain_rect(&mut s, [-b, -b, w + b, h + b]); + plain_rect(&mut s, [0.0, 0.0, w, 20.0]); + // At 2 mm the background reaches the bleed; the band stops at the trim edge. + assert_eq!(short_of_bleed(&mut s), ["1 object reaches the trim edge but stops short of the bleed"]); + s.execute("document.setup", &json!({"bleed": 5.0 * MM})).unwrap(); + assert_eq!(short_of_bleed(&mut s), ["2 objects reach the trim edge but stop short of the bleed"]); + // The PDF/X presets carry the document's bleed. + let (_, warnings) = pdf(&mut s, json!({"preset": "PDF/X-4:2010"})); + assert!(warnings.iter().any(|w| super::pdf::is_short_of_bleed(w)), "{warnings:?}"); + // A PDF/X file with a bleed on the top alone leaves out the rest of the document's bleed, and + // the background and the band stop short at the top: the warning comes right after + // BLEED_LEFT_OUT. + let (_, warnings) = pdf(&mut s, json!({"standard": "pdfX4", "bleed": {"top": 9}})); + assert_eq!(warnings.first().map(String::as_str), Some(super::pdf::BLEED_LEFT_OUT), "{warnings:?}"); + assert_eq!(warnings.get(1).map(String::as_str), Some("2 objects reach the trim edge but stop short of the bleed"), "{warnings:?}"); + // A page without the bleed (the default preset) doesn't warn, and neither does a page of the art's bounds. + let (_, warnings) = pdf(&mut s, json!({})); + assert!(!warnings.iter().any(|w| super::pdf::is_short_of_bleed(w)), "{warnings:?}"); + let (_, warnings) = pdf(&mut s, json!({"bleed": {"useDocument": true}, "useArtboards": false})); + assert!(!warnings.iter().any(|w| super::pdf::is_short_of_bleed(w)), "{warnings:?}"); + // An explicit bleed counts too, and the Summary lists the warning. + let (_, warnings) = pdf(&mut s, json!({"bleed": {"top": 9, "bottom": 9, "left": 9, "right": 9}})); + assert!(warnings.iter().any(|w| super::pdf::is_short_of_bleed(w)), "{warnings:?}"); + let v = s.execute("document.pdfSettings", &json!({"bleed": {"useDocument": true}, "includeDocument": true})).unwrap(); + assert!(v["warnings"].as_array().unwrap().iter().any(|w| super::pdf::is_short_of_bleed(w.as_str().unwrap())), "{v}"); + // A group counts once, measured by its visible members: a hidden member that fills the bleed + // doesn't hide a visible one at the trim edge. + let mut s = bleed_session(json!(9)); + let fill = plain_rect(&mut s, [-9.0, -9.0, 209.0, 109.0]); + let band = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + let side = plain_rect(&mut s, [0.0, 40.0, 20.0, 60.0]); + s.execute("object.group", &json!({"ids": [fill, band, side]})).unwrap(); + s.execute("object.hide", &json!({"ids": [fill]})).unwrap(); + assert_eq!(short_of_bleed(&mut s), ["1 object reaches the trim edge but stops short of the bleed"]); + // A clip group is measured by the art inside its clipping path, not by a clipping path that + // reaches the bleed edge. + let mut s = bleed_session(json!(9)); + let art = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + let clip = plain_rect(&mut s, [-9.0, -9.0, 209.0, 109.0]); + s.execute("select.set", &json!({"ids": [art, clip]})).unwrap(); + s.execute("object.clippingMask.make", &json!({})).unwrap(); + assert_eq!(short_of_bleed(&mut s).len(), 1); + // A clipping path that paints a fill reaching the trim edge counts, though the art it clips is + // inside: in a clip group, and as an object of its own in a clipping layer. + let mut s = bleed_session(json!(9)); + let art = plain_rect(&mut s, [20.0, 30.0, 60.0, 60.0]); + let clip = plain_rect(&mut s, [0.0, 0.0, 200.0, 100.0]); + s.execute("select.set", &json!({"ids": [art, clip]})).unwrap(); + s.execute("object.clippingMask.make", &json!({})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + s.execute("paint.setFill", &json!({"ids": [clip], "color": "#ff0000"})).unwrap(); + assert_eq!(short_of_bleed(&mut s).len(), 1); + let mut s = bleed_session(json!(9)); + let clipping = s.execute("layer.new", &json!({})).unwrap()["id"].clone(); + plain_rect(&mut s, [20.0, 30.0, 60.0, 60.0]); + let clip = plain_rect(&mut s, [0.0, 0.0, 200.0, 100.0]); + s.execute("layer.clippingMask.toggle", &json!({"id": clipping})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + s.execute("paint.setFill", &json!({"ids": [clip], "color": "#ff0000"})).unwrap(); + assert_eq!(short_of_bleed(&mut s).len(), 1); + // A hidden brushed member doesn't keep a group's visible art at the trim edge from counting. + let mut s = bleed_session(json!(9)); + let brushed = plain_rect(&mut s, [-9.0, -9.0, 209.0, 109.0]); + s.execute("brush.apply", &json!({"ids": [brushed], "name": "Charcoal"})).unwrap(); + let band = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + s.execute("object.group", &json!({"ids": [brushed, band]})).unwrap(); + s.execute("object.hide", &json!({"ids": [brushed]})).unwrap(); + assert_eq!(short_of_bleed(&mut s).len(), 1); + // A clipping layer clips its art to the clipping path's geometry, not to the stroke around it: + // the stroke reaches the trim edge, but the art it clips stops 5 pt inside. + let mut s = bleed_session(json!(9)); + let clipping = s.execute("layer.new", &json!({})).unwrap()["id"].clone(); + plain_rect(&mut s, [-9.0, -9.0, 209.0, 109.0]); + let clip = plain_rect(&mut s, [5.0, 5.0, 195.0, 95.0]); + s.execute("layer.clippingMask.toggle", &json!({"id": clipping})).unwrap(); + s.execute("paint.setStroke", &json!({"ids": [clip], "color": "#ff0000"})).unwrap(); + s.execute("stroke.set", &json!({"ids": [clip], "weight": 10})).unwrap(); + assert_eq!(short_of_bleed(&mut s), ["1 object reaches the trim edge but stops short of the bleed"]); +} + +/// No warning for art that already fills the bleed, art inside the trim, a document without a +/// bleed, art on hidden, non-printing or template layers, a side without a bleed, area type, a +/// masked object, or a `.ai` save. +#[test] +fn art_that_fills_the_bleed_or_stays_inside_does_not_warn() { + let mut s = bleed_session(json!(9)); + plain_rect(&mut s, [-9.0, -9.0, 209.0, 109.0]); + plain_rect(&mut s, [-20.0, 40.0, 50.0, 60.0]); + plain_rect(&mut s, [10.0, 10.0, 190.0, 90.0]); + assert!(short_of_bleed(&mut s).is_empty()); + // A document without a bleed has nothing to fall short of. + let mut s = bleed_session(json!(0)); + plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + assert!(short_of_bleed(&mut s).is_empty()); + // Layers that don't print. + for props in [json!({"visible": false}), json!({"printable": false}), json!({"template": true})] { + let mut s = bleed_session(json!(9)); + let layer = s.execute("layer.new", &json!({})).unwrap()["id"].clone(); + plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + let mut p = props.clone(); + p["id"] = layer; + s.execute("layer.setProps", &p).unwrap(); + assert!(short_of_bleed(&mut s).is_empty(), "{props}"); + } + // A hidden object, and a group whose hidden member is the one at the trim edge. + let mut s = bleed_session(json!(9)); + let id = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + s.execute("object.hide", &json!({"ids": [id]})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + let mut s = bleed_session(json!(9)); + let edge = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + let inside = plain_rect(&mut s, [10.0, 30.0, 50.0, 60.0]); + s.execute("object.group", &json!({"ids": [edge, inside]})).unwrap(); + s.execute("object.hide", &json!({"ids": [edge]})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // Art that lies in the bleed alone, away from the trim edge. + let mut s = bleed_session(json!(9)); + plain_rect(&mut s, [20.0, -5.0, 60.0, -3.0]); + assert!(short_of_bleed(&mut s).is_empty()); + // A guide in a group at the trim edge. + let mut s = bleed_session(json!(9)); + let guide = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + s.execute("view.guides.make", &json!({})).unwrap(); + let inside = plain_rect(&mut s, [10.0, 30.0, 50.0, 60.0]); + s.execute("object.group", &json!({"ids": [guide, inside]})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // A brushed stroke, whose brush art can paint past its visual bounds, is not measured. + let mut s = bleed_session(json!(9)); + let id = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + s.execute("brush.apply", &json!({"ids": [id], "name": "Charcoal"})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // A path with no fill and no stroke paints nothing. + let mut s = bleed_session(json!(9)); + let id = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + s.execute("paint.setFill", &json!({"ids": [id], "none": true})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // An object at 0% opacity draws nothing. + let mut s = bleed_session(json!(9)); + let id = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + s.execute("object.setProps", &json!({"ids": [id], "opacity": 0})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // A clipping layer whose clipping path lies inside the trim draws none of its art at the edge. + let mut s = bleed_session(json!(9)); + let clipping = s.execute("layer.new", &json!({})).unwrap()["id"].clone(); + plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + plain_rect(&mut s, [10.0, 10.0, 60.0, 60.0]); + s.execute("layer.clippingMask.toggle", &json!({"id": clipping})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // A bleed on the top alone: art short at the left doesn't count, art short at the top does. + let mut s = bleed_session(json!([9, 0, 0, 0])); + plain_rect(&mut s, [0.0, 30.0, 40.0, 60.0]); + assert!(short_of_bleed(&mut s).is_empty()); + plain_rect(&mut s, [60.0, 0.0, 100.0, 40.0]); + assert_eq!(short_of_bleed(&mut s).len(), 1); + // Area type is bounded by its frame, not its glyphs: a frame at the trim edge is not measured. + let mut s = bleed_session(json!(9)); + s.execute("text.create", &json!({"x": 0, "y": 0, "text": "Title", "size": 12, "area": {"width": 200, "height": 40}})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // An opacity mask decides what shows of the object, so a masked object is not measured. + let mut s = bleed_session(json!(9)); + let band = plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + let mask = plain_rect(&mut s, [20.0, 30.0, 60.0, 60.0]); + s.execute("transparency.makeOpacityMask", &json!({"ids": [band, mask]})).unwrap(); + assert!(short_of_bleed(&mut s).is_empty()); + // A `.ai` save with a bleed doesn't warn: the check is PDF export's. + let mut s = bleed_session(json!(9)); + plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + assert_eq!(short_of_bleed(&mut s).len(), 1); + let r = s.execute("document.export", &json!({"format": "ai", "bleed": {"useDocument": true}})).unwrap(); + assert!(!r["warnings"].to_string().contains("short of the bleed"), "{}", r["warnings"]); +} + +/// The warning changes neither the art nor the page boxes. +#[test] +fn the_bleed_warning_changes_no_geometry_and_no_page_box() { + let mut s = bleed_session(json!(9)); + plain_rect(&mut s, [0.0, 0.0, 200.0, 20.0]); + let before = s.doc().unwrap().doc.clone(); + let v = s.execute("document.exportPdf", &json!({"bleed": {"useDocument": true}})).unwrap(); + assert!(v["warnings"].as_array().unwrap().iter().any(|w| super::pdf::is_short_of_bleed(w.as_str().unwrap())), "{v}"); + assert_eq!(s.doc().unwrap().doc, before); + let info = s.execute("document.pdfInfo", &json!({"name": "x.pdf", "dataBase64": v["dataBase64"]})).unwrap(); + let boxes = &info["pageInfo"][0]["boxes"]; + let side = |b: &Value| { + let n: Vec = b.as_array().unwrap().iter().map(|x| x.as_f64().unwrap()).collect(); + (((n[2] - n[0]) * 100.0).round() / 100.0, ((n[3] - n[1]) * 100.0).round() / 100.0) + }; + assert_eq!(side(&boxes["trim"]), (200.0, 100.0), "{info}"); + assert_eq!(side(&boxes["bleed"]), (218.0, 118.0), "{info}"); +} + /// The ink amounts (0..1) `doc` shows at `p` in its images (the topmost image there). fn image_inks_at(doc: &vectorcraft_doc::Document, p: vectorcraft_geom::Point) -> Option<[f32; 4]> { fn visit(n: &vectorcraft_doc::Node, out: &mut Vec) { diff --git a/crates/engine/src/cmd/fileio/tests_psdread.rs b/crates/engine/src/cmd/fileio/tests_psdread.rs index 249a3f320c..881519fbda 100644 --- a/crates/engine/src/cmd/fileio/tests_psdread.rs +++ b/crates/engine/src/cmd/fileio/tests_psdread.rs @@ -602,6 +602,56 @@ fn relink_and_update_follow_the_clipping_path_of_a_linked_psd() { assert_eq!(clip_group(&s.doc().unwrap().doc, group), (squared, true, NodeId(image)), "links.update reads the clipping path again"); } +/// Unembed keeps the clip group of the clipping path an embedded PSD file's image came with, with a +/// path and with a folder, and so do relinking to the written file, placing it and opening it. +#[test] +fn unembed_keeps_the_clipping_path_of_an_embedded_psd() { + let dir = vectorcraft_testkit::TempDir::new("psd-unembed-clip"); + // An RGB file is kept as a PNG, a CMYK one as a TIFF. + let cmyk = psd(1, 4, (100, 50), 8, 4, &[], &triangle_resources(), &[], &raw(&[&[0; 5000], &[255; 5000], &[255; 5000], &[0; 5000]])); + let files = [("rgb", red_psd(&triangle_resources())), ("cmyk", cmyk)]; + for ((kind, file), folder) in files.iter().flat_map(|f| [(f, false), (f, true)]) { + let data = vectorcraft_format::base64_encode(file); + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 50})).unwrap(); + let r = s.execute("file.place", &json!({"name": "cut.psd", "dataBase64": data, "at": [50, 25]})).unwrap(); + let (group, image) = (NodeId(r["ids"][0].as_u64().unwrap()), NodeId(r["image"].as_u64().unwrap())); + let before = clip_group(&s.doc().unwrap().doc, group); + // Without an extension the image is written in the format it is stored in. + let path = if folder { + let out = dir.join(format!("folder-{kind}")); + std::fs::create_dir_all(&out).unwrap(); + let r = s.execute("links.unembed", &json!({"ids": [image.0], "folder": out})).unwrap(); + r["unembedded"][0]["path"].as_str().unwrap().to_string() + } else { + let r = s.execute("links.unembed", &json!({"id": image.0, "path": dir.join(format!("written-{kind}"))})).unwrap(); + r["path"].as_str().unwrap().to_string() + }; + let ext = if *kind == "rgb" { ["png"].as_slice() } else { ["tif", "tiff"].as_slice() }; + assert!(ext.contains(&super::extension(&path).as_str()), "{kind}: {path}"); + for step in ["unembed", "relink"] { + if step == "relink" { + s.execute("links.relink", &json!({"ids": [image.0], "path": path})).unwrap(); + } + let d = &s.doc().unwrap().doc; + let NodeKind::Image(im) = &d.node(image).unwrap().kind else { panic!("an image") }; + assert!(im.link.is_some(), "linked to the file written"); + assert_eq!(clip_group(d, group), before, "{kind}, {step}, folder: {folder}"); + } + // Placing the written file gives the same clip group as placing the PSD file did. + let r = s.execute("file.place", &json!({"path": path, "at": [50, 25]})).unwrap(); + let placed = NodeId(r["ids"][0].as_u64().unwrap()); + let (anchors, even_odd, _) = clip_group(&s.doc().unwrap().doc, placed); + assert_eq!((anchors, even_odd), (before.0.clone(), true), "{kind}, place"); + // Opening it gives a document of the image in that clip group. + s.execute("document.open", &json!({"path": path})).unwrap(); + let d = &s.doc().unwrap().doc; + let top = d.layers[0].children().and_then(|c| c.first()).map(|c| c.id).expect("an object"); + let (anchors, even_odd, _) = clip_group(d, top); + assert_eq!((anchors, even_odd), (before.0.clone(), true), "{kind}, open"); + } +} + /// The PNG a PSD file's merged image is kept as holds the clipping path the file names, and only a /// text chunk within the size limit that reads as a path gives one back. #[test] diff --git a/crates/engine/src/cmd/fileio/tests_screens.rs b/crates/engine/src/cmd/fileio/tests_screens.rs index c7c258b304..74356b6f31 100644 --- a/crates/engine/src/cmd/fileio/tests_screens.rs +++ b/crates/engine/src/cmd/fileio/tests_screens.rs @@ -610,6 +610,35 @@ fn include_bleed_pdfx_rows_do_not_warn_about_the_bleed() { assert!(warned(&export(&mut s, json!({"includeBleed": true, "selection": "one", "formats": row})))); } +/// A PDF row with a bleed warns about art that reaches an artboard's edge and stops short of the +/// bleed, with or without Include Bleed: the page's trim is the artboard either way. It doesn't +/// warn about art that reaches the bleed, or on a page of a selection's bounds. +#[test] +fn pdf_rows_warn_about_art_short_of_the_bleed_on_artboard_pages_only() { + let warned = |r: &Value| r["warnings"].as_array().unwrap().iter().any(|w| super::pdf::is_short_of_bleed(w.as_str().unwrap())); + let row = json!([{"format": "pdf", "bleed": {"useDocument": true}}]); + let mut s = session(1); + s.execute("document.setup", &json!({"bleed": 6})).unwrap(); + // Against the artboard's top edge. + s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 40, "height": 10})).unwrap(); + assert!(warned(&export(&mut s, json!({"formats": row})))); + assert!(warned(&export(&mut s, json!({"includeBleed": true, "formats": row})))); + assert!(warned(&export(&mut s, json!({"includeBleed": true, "formats": [{"format": "pdf"}]}))), "the row takes the document's bleed"); + assert!(!warned(&export(&mut s, json!({"selection": "one", "formats": row})))); + assert!(!warned(&export(&mut s, json!({"includeBleed": true, "selection": "one", "formats": row})))); + // Out to the bleed edge on the top, left and right. + let mut s = session(1); + s.execute("document.setup", &json!({"bleed": 6})).unwrap(); + s.execute("shape.rectangle", &json!({"x": -6, "y": -6, "width": 52, "height": 16})).unwrap(); + assert!(!warned(&export(&mut s, json!({"formats": row})))); + assert!(!warned(&export(&mut s, json!({"includeBleed": true, "formats": row})))); + // Without a document bleed, a row's own bleed warns. + let mut s = session(1); + s.execute("shape.rectangle", &json!({"x": 0, "y": 0, "width": 40, "height": 10})).unwrap(); + let row = json!([{"format": "pdf", "bleed": {"top": 6, "bottom": 6, "left": 6, "right": 6}}]); + assert!(warned(&export(&mut s, json!({"includeBleed": true, "formats": row})))); +} + /// Each `[x0 y0 x1 y1]` that follows `key` in a PDF's bytes, in the order the file has them, read /// as text without VectorCraft's PDF reader (PDF 32000-1:2008, 14.11.2, Page Boundaries). fn raw_boxes(pdf: &[u8], key: &str) -> Vec<[f64; 4]> { diff --git a/crates/engine/src/cmd/flare.rs b/crates/engine/src/cmd/flare.rs new file mode 100644 index 0000000000..8871ddf921 --- /dev/null +++ b/crates/engine/src/cmd/flare.rs @@ -0,0 +1,246 @@ +//! Flares (the Flare tool): `shape.flare` draws a group of radial-gradient paths that keeps the +//! settings it was drawn with ([`FlareSpec`]), and `shape.editFlare` draws it again from them. + +use std::sync::Arc; + +use serde_json::{Value, json}; +use vectorcraft_doc::flare::{DEFAULT_SEED, FlareSpec, json_close, part_node, parts}; +use vectorcraft_doc::{Document, Node, NodeId}; +use vectorcraft_geom::{Affine, Point, Vec2}; + +use super::{EngineError, Result, Session, bad, check_numbers, f64_or, f64_req, given_objects, number_or}; + +const C: &str = "shape.editFlare"; + +/// `shape.flare`'s settings besides the center, the rings' end point, the counts and the seed: +/// (key, default). +const SETTINGS: [(&str, f64); 9] = [ + ("diameter", 100.0), + ("opacity", 50.0), + ("brightness", 30.0), + ("growth", 20.0), + ("fuzziness", 50.0), + ("longest", 300.0), + ("rayFuzziness", 100.0), + ("rotation", 0.0), + ("largest", 50.0), +]; + +/// The whole number of 0 or more `p` gives for `key`, or `default`. +fn count_or(p: &Value, key: &str, default: u64, cmd: &str) -> Result { + let n = number_or(p, key, default as f64, cmd)?; + if n.is_finite() && n >= 0.0 && n.fract() == 0.0 { + Ok(n as u64) + } else { + Err(bad(cmd, format!("`{key}` must be a whole number of at least 0, not {n}"))) + } +} + +/// `end`, the rings' end point, or an error naming `x2` or `y2` when that coordinate is not a +/// finite number (a `pathLength` so large that the end point overflows). +fn finite_end(end: Point, cmd: &str) -> Result { + match [("x2", end.x), ("y2", end.y)].into_iter().find(|(_, v)| !v.is_finite()) { + None => Ok(end), + Some((key, _)) => Err(bad(cmd, format!("{key} must be a finite coordinate"))), + } +} + +/// `shape.flare`'s params `p` with every setting given: the defaults filled in, the counts at most +/// 50 and the rings' end point as `x2`, `y2` (from `pathLength` and `direction` when `p` gives no +/// end point), with `ringSeed` when `p` gives one. +fn settings_of(p: &Value, cmd: &str) -> Result { + let c = Point::new(f64_req(p, "cx", cmd)?, f64_req(p, "cy", cmd)?); + let mut numbers: Vec<&str> = SETTINGS.iter().map(|(key, _)| *key).collect(); + numbers.extend(["x2", "y2", "direction", "pathLength", "seed", "ringSeed"]); + check_numbers(p, &numbers, cmd)?; + let seed_of = |key: &str| match p.get(key) { + None | Some(Value::Null) => Ok(None), + Some(v) => v.as_u64().map(Some).ok_or_else(|| bad(cmd, format!("`{key}` must be a whole number of at least 0, not {v}"))), + }; + let seed = seed_of("seed")?.unwrap_or(DEFAULT_SEED); + // Each `ringSeed` below 2^53 (what a JSON number holds exactly) places the rings anew. + let ring_seed = match seed_of("ringSeed")? { + Some(r) if r >= 1 << 53 => return Err(bad(cmd, format!("`ringSeed` must be below 2^53, not {r}"))), + r => r, + }; + let rays = count_or(p, "rays", 15, cmd)?.min(50); + let rings = count_or(p, "rings", 10, cmd)?.min(50); + let end = match (p.get("x2").and_then(Value::as_f64), p.get("y2").and_then(Value::as_f64)) { + (Some(x), Some(y)) => Point::new(x, y), + _ => { + let a = f64_or(p, "direction", 45.0).to_radians(); + finite_end(c + Vec2::new(a.cos(), -a.sin()) * f64_or(p, "pathLength", 300.0), cmd)? + } + }; + let mut v = json!({ "cx": c.x, "cy": c.y, "x2": end.x, "y2": end.y, "rays": rays, "rings": rings, "seed": seed }); + if let Some(r) = ring_seed { + v["ringSeed"] = json!(r); + } + for (key, default) in SETTINGS { + v[key] = json!(f64_or(p, key, default)); + } + Ok(v) +} + +/// The objects of a flare drawn with the settings `v`, transformed by `xf`. A new flare's parts +/// (`old` None) get new ids and take the document's Align New Objects to Pixel Grid. A flare drawn +/// again from its parts `old` keeps, for each part, the id and pixel-aligned property of the old +/// part it replaces (the same kind of part, counted in order: the second ring replaces the second +/// ring); a part that replaces none gets a new id and the first old part's property. +fn part_nodes(d: &mut Document, v: &Value, xf: Affine, old: Option<&[Arc]>) -> Vec> { + let mut seen: Vec<&str> = vec![]; + parts(v) + .into_iter() + .map(|part| { + let name = part.0; + let nth = seen.iter().filter(|n| **n == name).count(); + seen.push(name); + let replaced = old.and_then(|old| old.iter().filter(|c| c.name.as_deref() == Some(name)).nth(nth)); + let id = replaced.map_or_else(|| d.alloc_id(), |c| c.id); + let mut n = part_node(id, part, Affine::IDENTITY, false); + match old { + None => super::object::align_new_object(d, &mut n), + Some(old) => n.extras_mut().pixel_aligned = replaced.or(old.first()).is_some_and(|c| c.extras().pixel_aligned), + } + if xf != Affine::IDENTITY { + n.transform(xf, false); + } + Arc::new(n) + }) + .collect() +} + +/// `shape.flare`: a flare group that keeps its settings. +pub(super) fn flare(s: &mut Session, p: &Value) -> Result { + let v = settings_of(p, "shape.flare")?; + let parent = s.doc()?.target_parent()?; + let id = s.edit("Flare", |d, sel| { + let children = part_nodes(d, &v, Affine::IDENTITY, None); + let gid = d.alloc_id(); + let mut g = Node::group(gid, children); + g.name = Some("Flare".into()); + g.extras_mut().flare = Some(Box::new(FlareSpec::new(v))); + d.insert(parent, usize::MAX, g)?; + sel.set([gid]); + Ok(gid) + })?; + Ok(json!({ "id": id.0 })) +} + +/// The settings of flare `id`: a group drawn by the Flare tool whose parts are still the ones its +/// settings draw, in place ([`FlareSpec::draws`]). A flare whose parts were edited, distorted, +/// removed or added to, or whose art was flattened to a line, is no longer one. +pub fn flare_settings(d: &Document, id: NodeId) -> Option { + let n = d.node(id)?; + let spec = n.extras().flare.as_deref()?; + // Settings a file holds are read as `shape.flare` reads them. + let spec = FlareSpec { params: settings_of(&spec.params, "shape.flare").ok()?, transform: spec.transform }; + spec.draws(n).then_some(spec) +} + +/// The flares `shape.editFlare` changes: those `p` names, else the selected flares. Each must be a +/// flare that can be edited. +fn flares_to_edit(s: &Session, p: &Value) -> Result> { + let given = given_objects(s, p, C)?; + let d = &s.doc()?.doc; + let flare = |id: NodeId| flare_settings(d, id).filter(|_| d.is_editable(id)).map(|spec| (id, spec)); + let flares: Vec<(NodeId, FlareSpec)> = match &given { + Some(ids) => ids.iter().map(|id| flare(*id)).collect::>>().unwrap_or_default(), + None => s.doc()?.selection.objects.iter().filter_map(|id| flare(*id)).collect(), + }; + if flares.is_empty() { + return Err(EngineError::Other("select a flare".into())); + } + Ok(flares) +} + +/// The settings `old` changed as `p` asks (`shape.editFlare`'s params). The center and the end +/// point `p` gives are in the document, where the flare is now drawn, which `xf` maps from where +/// it was drawn. +fn edited(old: &Value, p: &Value, xf: Affine) -> Result { + let mut v = old.clone(); + let inv = xf.inverse(); + let point = |kx: &str, ky: &str| -> Result> { + if p.get(kx).is_none_or(Value::is_null) && p.get(ky).is_none_or(Value::is_null) { + return Ok(None); + } + // A point that leaves the finite range where the flare was drawn is refused, not stored. + let q = inv * Point::new(f64_req(p, kx, C)?, f64_req(p, ky, C)?); + match [(kx, q.x), (ky, q.y)].into_iter().find(|(_, v)| !v.is_finite()) { + None => Ok(Some(q)), + Some((key, _)) => Err(bad(C, format!("{key} must be a finite coordinate"))), + } + }; + let c = point("cx", "cy")?; + let end = point("x2", "y2")?; + if let Some(c) = c { + v["cx"] = json!(c.x); + v["cy"] = json!(c.y); + } + let centre = Point::new(f64_or(&v, "cx", 0.0), f64_or(&v, "cy", 0.0)); + let old_end = Point::new(f64_or(&v, "x2", centre.x), f64_or(&v, "y2", centre.y)); + let end = match end { + Some(e) => e, + None if p.get("pathLength").is_some_and(|l| !l.is_null()) || p.get("direction").is_some_and(|a| !a.is_null()) => { + // The path length and the direction are where the flare is drawn now; the direction is + // measured counter-clockwise from 3 o'clock, as `shape.flare` takes it. + let (c, e) = (xf * centre, xf * old_end); + let d = e - c; + let a = number_or(p, "direction", (-d.y).atan2(d.x).to_degrees(), C)?.to_radians(); + finite_end(inv * (c + Vec2::new(a.cos(), -a.sin()) * number_or(p, "pathLength", d.hypot(), C)?), C)? + } + // Moving the center leaves the rings' end point where it is. + None => old_end, + }; + v["x2"] = json!(end.x); + v["y2"] = json!(end.y); + for (key, _) in SETTINGS { + if p.get(key).is_some_and(|x| !x.is_null()) { + v[key] = json!(number_or(p, key, 0.0, C)?); + } + } + for key in ["rays", "rings"] { + if p.get(key).is_some_and(|x| !x.is_null()) { + v[key] = json!(count_or(p, key, 0, C)?.min(50)); + } + } + settings_of(&v, C) +} + +/// `shape.editFlare`: draw the flares again with the settings `p` changes, each in its place and +/// transformed as it has been since it was drawn, as one undo step. +pub(super) fn edit_flare(s: &mut Session, p: &Value) -> Result { + let mut numbers: Vec<&str> = SETTINGS.iter().map(|(key, _)| *key).collect(); + numbers.extend(["cx", "cy", "x2", "y2", "pathLength", "direction", "rays", "rings"]); + check_numbers(p, &numbers, C)?; + let flares = flares_to_edit(s, p)?; + let mut changed: Vec<(NodeId, FlareSpec)> = vec![]; + for (id, spec) in &flares { + let v = edited(&spec.params, p, spec.transform)?; + if !json_close(&v, &spec.params, 1e-9) { + changed.push((*id, FlareSpec { params: v, transform: spec.transform })); + } + } + let ids: Vec = flares.iter().map(|(id, _)| id.0).collect(); + // Nothing changes: no undo step. + if changed.is_empty() { + return Ok(json!({ "ids": ids })); + } + let edited_ids: Vec = changed.iter().map(|(id, _)| *id).collect(); + s.edit("Edit Flare", |d, _| { + for (id, spec) in changed { + let old: Vec> = d.node(id).and_then(Node::children).cloned().unwrap_or_default(); + let children = part_nodes(d, &spec.params, spec.transform, Some(&old)); + let n = d.node_mut(id).ok_or(EngineError::NoNode(id))?; + if let Some(ch) = n.children_mut() { + *ch = children; + } + n.extras_mut().flare = Some(Box::new(spec)); + } + if !crate::sanity::objects_in_range(d, &edited_ids) { + return Err(EngineError::Other("result would exceed the canvas (coordinates out of range)".into())); + } + Ok(()) + })?; + Ok(json!({ "ids": ids })) +} diff --git a/crates/engine/src/cmd/links.rs b/crates/engine/src/cmd/links.rs index 55c6612494..392d6340c6 100644 --- a/crates/engine/src/cmd/links.rs +++ b/crates/engine/src/cmd/links.rs @@ -108,7 +108,7 @@ pub fn specs() -> Vec { "Unembed", [], None, - "{id?: an embedded image (default: the one selected), path?, ids?: [image ids] (instead of id; one id is the same as id), folder?} write the image's pixels to the file at path (PNG, JPEG, GIF or WebP as stored, other images as PNG; a path ending in .png/.jpg/.jpeg/.gif/.webp/.tif/.tiff/.bmp converts them) and link the image to it, keeping its bounds. One undo step → {id, path}; no path → {name, dataBase64} (nothing changes: there is no file to link to). With folder: write each embedded image of ids or id (default: the selected embedded images) to a new file in folder, as stored (as PNG when that format is not one of VectorCraft's raster file formats), named after the image (characters a file name can't hold become _; Image when nothing is left), with Name 2 … Name 99 when the name is taken; a file already there is never replaced. Linked images among ids are left as they are. Each image links to its file and keeps its bounds. One undo step (undo does not remove the files); when a file can't be written, the files this call wrote are removed and nothing changes → {unembedded: [{id, path}], skipped: [ids of linked images]}; id with ids, path with folder, and ids of more or fewer than one image without folder are errors", + "{id?: an embedded image (default: the one selected), path?, ids?: [image ids] (instead of id; one id is the same as id), folder?} write the image's pixels to the file at path (PNG, JPEG, GIF or WebP as stored, other images as PNG; a path ending in .png/.jpg/.jpeg/.gif/.webp/.tif/.tiff/.bmp converts them) and link the image to it, keeping its bounds; written as stored (here and with folder), an image from a PSD or PSB file keeps the clip group of the clipping path that file names, and the file written keeps the path, so Open, Place, Relink and Update Links read the file with that clip group. One undo step → {id, path}; no path → {name, dataBase64} (nothing changes: there is no file to link to). With folder: write each embedded image of ids or id (default: the selected embedded images) to a new file in folder, as stored (as PNG when that format is not one of VectorCraft's raster file formats), named after the image (characters a file name can't hold become _; Image when nothing is left), with Name 2 … Name 99 when the name is taken; a file already there is never replaced. Linked images among ids are left as they are. Each image links to its file and keeps its bounds. One undo step (undo does not remove the files); when a file can't be written, the files this call wrote are removed and nothing changes → {unembedded: [{id, path}], skipped: [ids of linked images]}; id with ids, path with folder, and ids of more or fewer than one image without folder are errors", has_doc, unembed ), @@ -634,7 +634,8 @@ pub(crate) fn readable_and_kept(blob: ImageBlob, unread: bool, linked: bool) -> /// The linked image file `bytes` (read from `path`, when there is one), read with its preview: a /// DCS file's plates, else its image ([`super::place::dcs::raster`]); an error when its pixels -/// can't be read ([`readable`]). +/// can't be read ([`readable`]). A PNG or TIFF that Unembed wrote from a PSD or PSB file's image +/// is read with the clipping path it keeps ([`fileio::raster_image`]). fn linked_image(bytes: &[u8], path: Option<&str>) -> Result { let mut img = super::place::dcs::raster(bytes, path)?; img.blob = readable(img.blob, kept_unread(bytes), true)?; diff --git a/crates/engine/src/cmd/live/blend.rs b/crates/engine/src/cmd/live/blend.rs index a2cb0e3f91..cfb87afdb3 100644 --- a/crates/engine/src/cmd/live/blend.rs +++ b/crates/engine/src/cmd/live/blend.rs @@ -214,6 +214,25 @@ fn spine_points_param(p: &Value, cmd: &str) -> Result> { list.iter().map(|i| i.as_u64().and_then(|i| usize::try_from(i).ok()).ok_or_else(wrong)).collect() } +/// Whether linking handle `out` of spine point `index` at `q` would leave the blend's spine as it +/// is (false when the blend or the point is not there, for the edit to report it). +fn spine_link_unchanged(s: &Session, p: &Value, cmd: &str, index: usize, out: bool, q: Point) -> Result { + let id = match crate::cmd::object_param(p, "id", cmd)? { + Some(id) => Some(id), + None => selected_of(s, is_blend).first().copied(), + }; + let d = &s.doc()?.doc; + let Some(NodeKind::Blend { children, spec }) = id.and_then(|id| d.node(id)).map(|n| &n.kind) else { return Ok(false) }; + let Some((path, _)) = live::pin_spine(children, spec) else { return Ok(false) }; + Ok(path.subpaths.first().is_some_and(|sp| { + sp.anchors.get(index).is_some_and(|a| { + let mut linked = *a; + linked.link_handle(out, q, sp.has_segment(index, !out)); + linked == *a + }) + })) +} + pub(super) fn spine_move_anchor(s: &mut Session, p: &Value) -> Result { const C: &str = "object.blend.spine.moveAnchor"; let index = index_param(p, "anchor", C)?; @@ -225,15 +244,33 @@ pub(super) fn spine_move_anchor(s: &mut Session, p: &Value) -> Result { Some(_) => return Err(bad(C, "handle must be in or out")), }; let independent = switch_or(p, "independent", false, C)?; + let link = switch_or(p, "link", false, C)?; let with = spine_points_param(p, C)?; // Any `with`, even an empty list, asks to move points, which a handle drag doesn't. if handle.is_some() && p.get("with").is_some_and(|v| !v.is_null()) { return Err(bad(C, "`with` moves points, not a handle")); } + if link && independent { + return Err(bad(C, "`link` and `independent` cannot both be true")); + } + if link && handle.is_none() { + return Err(bad(C, "`link` places a handle: give `handle`")); + } + if link && let Some(out) = handle { + // A spine point the linked handles would leave as it is records no undo step. + if spine_link_unchanged(s, p, C, index, out, q)? { + return ok(); + } + } edit_spine(s, p, C, "Reshape Spine", |sp, anchors, keys| { + let pull_out = handle.is_some_and(|out| sp.has_segment(index, !out)); let a = sp.anchors.get_mut(index).ok_or_else(|| bad(C, "no such spine point"))?; if let Some(out) = handle { - a.set_handle(out, q, independent); + if link { + a.link_handle(out, q, pull_out); + } else { + a.set_handle(out, q, independent); + } return Ok(()); } let delta = q - a.p; diff --git a/crates/engine/src/cmd/live/commands.rs b/crates/engine/src/cmd/live/commands.rs index 79b2915aa0..991ebf103c 100644 --- a/crates/engine/src/cmd/live/commands.rs +++ b/crates/engine/src/cmd/live/commands.rs @@ -99,7 +99,7 @@ pub fn specs() -> Vec { "Move Spine Point", [], None, - "{id? (default: the selected blend), anchor: index, x, y, with?: [index…], handle?: in|out, independent?: bool} move a point of the blend's spine (its handles along), and the points `with` names by as much, or with `handle` place that handle's end at (x, y) (a smooth point keeps the other handle in line unless `independent`). A key object sitting on a moved point moves with it. The first edit turns the straight spine into a path", + "{id? (default: the selected blend), anchor: index, x, y, with?: [index…], handle?: in|out, independent?: bool, link?: bool} move a point of the blend's spine (its handles along), and the points `with` names by as much, or with `handle` place that handle's end at (x, y) (a smooth point keeps the other handle in line unless `independent`; `link` makes the point smooth with the other handle in line at its own length, a retracted one pulled out to the moved handle's length where a segment leaves the point on its side; `link` needs `handle` and cannot go with `independent`). A key object sitting on a moved point moves with it. The first edit turns the straight spine into a path", has_doc, spine_move_anchor ), diff --git a/crates/engine/src/cmd/overprint.rs b/crates/engine/src/cmd/overprint.rs index e8957691ec..7435f04a3a 100644 --- a/crates/engine/src/cmd/overprint.rs +++ b/crates/engine/src/cmd/overprint.rs @@ -30,7 +30,7 @@ pub fn specs() -> Vec { "Attributes", [], None, - "{ids?|id?, item?, target?: \"object\"|\"contents\"} → {ids, overprintFill, overprintStroke, showCenter, imageMap: \"none\"|\"rectangle\"|\"polygon\", url, note, fillRule: \"nonZero\"|\"evenOdd\" (of the paths and compound paths in them), reversed (their subpaths run counter-clockwise on screen: Reverse Path Direction On), recentUrls: [newest first]} the Attributes panel's values for `ids` or the selection, overprint aimed as object.setOverprint aims; a value is null where they differ (or nothing has a fill, stroke or path)", + "{ids?|id?, item?, target?: \"object\"|\"contents\"} → {ids, overprintFill, overprintStroke, showCenter, imageMap: \"none\"|\"rectangle\"|\"polygon\", url, note, fillRule: \"nonZero\"|\"evenOdd\" (of the paths and compound paths in them), reversed (their subpaths run counter-clockwise on screen: Reverse Path Direction On), recentUrls: [newest first, at most 30]} the Attributes panel's values for `ids` or the selection, overprint aimed as object.setOverprint aims; a value is null where they differ (or nothing has a fill, stroke or path)", has_doc, |s, p| Ok(attributes(s, p)?.to_json()) ), diff --git a/crates/engine/src/cmd/params.rs b/crates/engine/src/cmd/params.rs index 50e73f5a0d..8e7d7f7b0f 100644 --- a/crates/engine/src/cmd/params.rs +++ b/crates/engine/src/cmd/params.rs @@ -382,6 +382,7 @@ pub fn check_keys(id: &str, doc: &'static str, params: &Value) -> Result<()> { const EXCLUSIVE_KEYS: &[(&str, &str, &str)] = &[ ("addon.pathtools.cornerSet", "items", "ids"), ("addon.pathtools.cornerRemove", "items", "ids"), + ("addon.pathtools.bridge", "radius", "gap"), ("links.unembed", "id", "ids"), ("links.unembed", "path", "folder"), ]; diff --git a/crates/engine/src/cmd/path.rs b/crates/engine/src/cmd/path.rs index 0960e5ca28..f2a1b1d9f7 100644 --- a/crates/engine/src/cmd/path.rs +++ b/crates/engine/src/cmd/path.rs @@ -50,7 +50,7 @@ pub fn specs() -> Vec { "Move Direction Handle", [], None, - "{id, subpath?, anchor, which: \"in\"|\"out\", x, y, independent?: bool}", + "{id, subpath?, anchor, which: \"in\"|\"out\", x, y, independent?: bool, link?: bool} move a direction handle; independent moves only that side and makes the anchor a corner; link makes the anchor smooth with the other handle in line at its own length (a retracted one is pulled out to the moved handle's length where a segment leaves the anchor on its side); link and independent cannot both be true; both default false", has_doc, set_handle ), @@ -457,6 +457,9 @@ fn set_handle(s: &mut Session, p: &Value) -> Result { let ai = index_opt(p, "anchor", "path.setHandle")?.ok_or_else(|| bad("path.setHandle", "missing anchor"))?; let out = str_param(p, "which") != Some("in"); let pos = Point::new(f64_req(p, "x", "path.setHandle")?, f64_req(p, "y", "path.setHandle")?); + if switch_or(p, "link", false, "path.setHandle")? { + return link_handle(s, p, id, si, ai, out, pos); + } let independent = switch_or(p, "independent", false, "path.setHandle")?; // A handle already there, on an anchor already of the kind it would get, changes nothing and // records no undo step. The handle is compared directly: `set_handle` would recompute the @@ -476,6 +479,42 @@ fn set_handle(s: &mut Session, p: &Value) -> Result { ok() } +/// `path.setHandle` with `link` (the Anchor Point tool's Alt-drag on a handle): the handle goes to +/// (x, y) and the anchor becomes smooth, its other handle turned in line at its own length. A +/// retracted other handle is pulled out to the moved handle's length when a segment leaves the +/// anchor on its side, and stays retracted at an open end. An anchor the edit would leave as it +/// is records no undo step. +fn link_handle(s: &mut Session, p: &Value, id: NodeId, si: usize, ai: usize, out: bool, pos: Point) -> Result { + const C: &str = "path.setHandle"; + if switch_or(p, "independent", false, C)? { + return Err(bad(C, "`link` and `independent` cannot both be true")); + } + if !(pos.x.abs() < 1e9 && pos.y.abs() < 1e9) { + return Err(bad(C, "x and y must be finite")); + } + if s.script_running() { + return Err(EngineError::Busy); + } + let unchanged = s.doc()?.doc.node(id).and_then(|n| n.path_data()).and_then(|pd| pd.subpaths.get(si)).is_some_and(|sp| { + sp.anchors.get(ai).is_some_and(|a| { + let mut linked = *a; + linked.link_handle(out, pos, sp.has_segment(ai, !out)); + linked == *a + }) + }); + if unchanged { + return ok(); + } + s.edit("Reshape", |d, _| { + let sp = path_mut(d, id)?.subpaths.get_mut(si).ok_or_else(|| EngineError::Other("no such anchor".into()))?; + let pull_out = sp.has_segment(ai, !out); + let a = sp.anchors.get_mut(ai).ok_or_else(|| EngineError::Other("no such anchor".into()))?; + a.link_handle(out, pos, pull_out); + Ok(()) + })?; + ok() +} + /// `path.moveAnchor`: one anchor to (x, y), its handles keeping their offsets (the Anchor Point /// tool's Shift-drag). fn move_anchor(s: &mut Session, p: &Value) -> Result { diff --git a/crates/engine/src/cmd/plugin_call/reviewed.rs b/crates/engine/src/cmd/plugin_call/reviewed.rs index b703fee792..5a10ae3d9c 100644 --- a/crates/engine/src/cmd/plugin_call/reviewed.rs +++ b/crates/engine/src/cmd/plugin_call/reviewed.rs @@ -557,6 +557,7 @@ pub(super) const ALLOWED: &[&str] = &[ "select.update", "shape.arc", "shape.circleThroughPoints", + "shape.editFlare", "shape.ellipse", "shape.flare", "shape.line", diff --git a/crates/engine/src/cmd/prefscmds.rs b/crates/engine/src/cmd/prefscmds.rs index 774c450065..491284bb23 100644 --- a/crates/engine/src/cmd/prefscmds.rs +++ b/crates/engine/src/cmd/prefscmds.rs @@ -157,6 +157,8 @@ pub const PREF_SPECS: &[PrefSpec] = &[ p!("scrubNumericFields", "General", "Options", "Scrub Numeric Fields by Dragging", bool), p!("trackpadRotateView", "General", "Options", "Trackpad Gesture to Rotate View", bool), p!("holdToolKeys", "General", "Options", "Hold a Tool Shortcut to Use the Tool Temporarily", bool), + p!("holdShortcuts", "General", "Options", "Hold Shortcuts", bool), + p!("keyHoldDelay", "General", "Options", "Hold Shortcut Delay", num(0.2, 1.0, "s")), p!("boundingBoxWhileMovingAndDrawing", "General", "Options", "Show Bounding Box While Moving and Drawing", bool), // Selection & Anchor Display p!("selectionTolerance", "Selection & Anchor Display", "Selection", "Tolerance", num(1.0, 8.0, "px")), diff --git a/crates/engine/src/lib.rs b/crates/engine/src/lib.rs index 640ce94d5f..94ea383690 100644 --- a/crates/engine/src/lib.rs +++ b/crates/engine/src/lib.rs @@ -29,6 +29,7 @@ use vectorcraft_tools::{PaintDefaults, Tool}; pub use cmd::clipboard::{Clipboard, SourceLayer}; pub use cmd::create::constrain_click; pub use cmd::distortcmds::{perspective_click, width_point_pair}; +pub use cmd::flare::flare_settings; pub use cmd::graph::{GraphTypeSubject, calculated_axes as graph_calculated_axes, graph_type_subject}; pub use cmd::params::{check_keys, check_params}; pub use cmd::pathops::auto_simplify_level; @@ -198,7 +199,8 @@ pub struct Session { /// `plugin.install` takes `grant` and `allowHeavy` from any request /// ([`Session::allow_plugin_grants_from_requests`]). plugin_grants_from_requests: bool, - /// URLs recently given in the Attributes panel (`attributes.set {url}`), newest first; not saved. + /// URLs recently given in the Attributes panel (`attributes.set {url}`), newest first, at most + /// [`cmd::RECENT_URLS`]; not saved. pub recent_urls: Vec, /// The saved tracing presets' revision and latest changes ([`Session::trace_presets_revision`]). pub(crate) trace_preset_changes: cmd::TracePresetChanges, @@ -417,7 +419,7 @@ use history::history_budget_for; pub use history::{History, HistoryEntry, NamedStep, default_history_budget}; pub(crate) use interaction::PreviewCopies; pub use interaction::{Interaction, LastTransform, UndoGroup, UndoScope}; -pub use prefs::{DrawMode, PluginBudget, Prefs}; +pub use prefs::{DrawMode, KEY_HOLD_DELAY, KEY_HOLD_DELAY_RANGE, PluginBudget, Prefs}; pub use sanity::TOO_DEEP; pub(crate) use sanity::{deselect_hidden, is_guide_path}; #[cfg(test)] diff --git a/crates/engine/src/prefs.rs b/crates/engine/src/prefs.rs index 6d044eace3..d2e615992a 100644 --- a/crates/engine/src/prefs.rs +++ b/crates/engine/src/prefs.rs @@ -97,6 +97,13 @@ pub struct Prefs { /// A single-key tool shortcut held down chooses its tool until the key is let go, and then the /// tool active before comes back; a quick press chooses the tool for good. pub hold_tool_keys: bool, + /// Hold shortcuts act (Edit › Keyboard Shortcuts › Hold Shortcuts, off by default): a key with a + /// hold shortcut runs it when held for [`Self::key_hold_delay`], and its own shortcut when let go + /// sooner. Off, every key runs on its press and the dialog shows no Hold column. + pub hold_shortcuts: bool, + /// Seconds a key with a hold shortcut must stay down before the hold shortcut runs (Hold + /// Shortcut Delay, 0.2 to 1.0). VectorCraft's own default, 0.35. + pub key_hold_delay: f64, /// With View › Show Bounding Box on, the bounding box stays visible while a drag moves the /// selection, and the shape tools that show it draw it around the shape being drawn. Off (the /// default), it hides during a move and while a shape is drawn, except that a Selection tool @@ -420,6 +427,21 @@ pub struct Prefs { pub import_matches: Vec, } +/// The default Hold Shortcut Delay, in seconds (VectorCraft's own value). +pub const KEY_HOLD_DELAY: f64 = 0.35; +/// The range of the Hold Shortcut Delay, in seconds. +pub const KEY_HOLD_DELAY_RANGE: (f64, f64) = (0.2, 1.0); + +impl Prefs { + /// The Hold Shortcut Delay in seconds, inside its range. A restored settings file is not + /// checked against the range, so a value outside it is brought inside, and one that is not a + /// number gives the default. + pub fn key_hold_delay(&self) -> f64 { + let (min, max) = KEY_HOLD_DELAY_RANGE; + if self.key_hold_delay.is_finite() { self.key_hold_delay.clamp(min, max) } else { KEY_HOLD_DELAY } + } +} + impl Default for Prefs { fn default() -> Self { let s = |v: &str| v.to_string(); @@ -451,6 +473,8 @@ impl Default for Prefs { scrub_numeric_fields: true, trackpad_rotate_view: true, hold_tool_keys: true, + hold_shortcuts: false, + key_hold_delay: KEY_HOLD_DELAY, bounding_box_while_moving_and_drawing: false, paste_offset: 10.0, selection_tolerance: 3.0, diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index 1c517031a0..38692e9056 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -3393,6 +3393,149 @@ fn flare_rotation_turns_only_the_rays() { } } +/// A flare keeps its settings: `shape.editFlare` draws it again with the settings changed, in its +/// place and transformed as it has been since, as one undo step (none when nothing changes). A +/// flare with a changed part, a locked one and an expanded one are not edited. +#[test] +fn edit_flare_draws_a_transformed_flare_again_in_its_place_in_one_undo_step() { + let mut s = session(); + let p = json!({"cx": 200, "cy": 200, "diameter": 60, "rays": 9, "rings": 4, "x2": 400, "y2": 200, "seed": 3}); + let id = NodeId(s.execute("shape.flare", &p).unwrap()["id"].as_u64().unwrap()); + // Reflected twice, sheared and back, turned a quarter and moved: it stays a flare. + for (c, p) in [ + ("object.reflect", json!({"axis": "vertical"})), + ("object.reflect", json!({"axis": "horizontal"})), + ("object.shear", json!({"angle": 30})), + ("object.shear", json!({"angle": -30})), + ("object.rotate", json!({"angle": 90})), + ("object.move", json!({"dx": 50, "dy": 10})), + ] { + s.execute(c, &p).unwrap(); + } + let spec = |s: &Session| flare_settings(&s.doc().unwrap().doc, id).expect("still a flare"); + let part = |s: &Session, name: &str| { + let g = s.doc().unwrap().doc.node(id).unwrap(); + g.children().unwrap().iter().filter(|c| c.name.as_deref() == Some(name)).map(|c| c.geometric_bounds().unwrap()).collect::>() + }; + let (c, e) = (spec(&s).center().unwrap(), spec(&s).end().unwrap()); + // The quarter turn made the rings run vertically, 200 points from the center. + assert!((c.distance(e) - 200.0).abs() < 1e-6 && (c.x - e.x).abs() < 1e-6, "{c:?} {e:?}"); + let undo = s.doc().unwrap().history.undo.len(); + s.execute("shape.editFlare", &json!({"diameter": 100, "rings": 6, "rays": 0})).unwrap(); + assert_eq!(s.doc().unwrap().history.undo.len(), undo + 1); + assert_eq!(s.doc().unwrap().selection.objects, vec![id]); + let centre = part(&s, "Center")[0]; + assert!(centre.center().distance(c) < 1e-6 && (centre.width() - 100.0).abs() < 1e-6, "{centre:?}"); + assert_eq!((part(&s, "Ring").len(), part(&s, "Rays").len()), (6, 0)); + assert!(spec(&s).end().unwrap().distance(e) < 1e-6, "the end point stays"); + // Each ring lies on the line from the center to the end point. + assert!(part(&s, "Ring").iter().all(|r| (r.center().x - c.x).abs() < 1e-6), "{:?}", part(&s, "Ring")); + // The center handle, where it is drawn now: the end point stays where it is. + s.execute("shape.editFlare", &json!({"ids": [id.0], "cx": c.x + 20.0, "cy": c.y})).unwrap(); + assert!(spec(&s).center().unwrap().distance(Point::new(c.x + 20.0, c.y)) < 1e-6); + assert!(spec(&s).end().unwrap().distance(e) < 1e-6); + assert!(part(&s, "Center")[0].center().distance(Point::new(c.x + 20.0, c.y)) < 1e-6); + // The end handle, then the path length and direction. + s.execute("shape.editFlare", &json!({"x2": c.x + 20.0, "y2": c.y + 80.0})).unwrap(); + assert!(spec(&s).end().unwrap().distance(Point::new(c.x + 20.0, c.y + 80.0)) < 1e-6); + // The path length and direction are where the flare is drawn now, though it was turned. + s.execute("shape.editFlare", &json!({"direction": 0, "pathLength": 50})).unwrap(); + assert!(spec(&s).end().unwrap().distance(Point::new(c.x + 70.0, c.y)) < 1e-6, "{:?}", spec(&s).end()); + s.execute("edit.undo", &json!({})).unwrap(); + // Nothing changes: no undo step. + let undo = s.doc().unwrap().history.undo.len(); + s.execute("shape.editFlare", &json!({"diameter": 100})).unwrap(); + assert_eq!(s.doc().unwrap().history.undo.len(), undo); + // Bad values are refused. + for bad in [json!({"rings": 2.5}), json!({"diameter": "big"}), json!({"cx": 10}), json!({"diameter": 1e20})] { + assert!(s.execute("shape.editFlare", &bad).is_err(), "{bad}"); + } + assert_eq!(s.doc().unwrap().history.undo.len(), undo); + s.execute("edit.undo", &json!({})).unwrap(); + assert!(spec(&s).end().unwrap().distance(e) < 1e-6, "undo puts the end point back"); + // A changed part: no longer a flare. + s.edit("Opacity", |d, _| { + let ring = d.node(id).unwrap().children().unwrap().iter().find(|c| c.name.as_deref() == Some("Center")).unwrap().id; + d.node_mut(ring).unwrap().opacity = 0.25; + Ok(()) + }) + .unwrap(); + assert_eq!(s.execute("shape.editFlare", &json!({"rings": 3})).unwrap_err().to_string(), "select a flare"); + s.execute("edit.undo", &json!({})).unwrap(); + // A locked flare. + s.execute("object.lock", &json!({})).unwrap(); + assert!(s.execute("shape.editFlare", &json!({"ids": [id.0], "rings": 3})).is_err()); + s.execute("object.unlockAll", &json!({})).unwrap(); + // Object › Expand: a plain group that is no longer a flare. + s.execute("object.expand", &json!({"object": true, "fill": false, "stroke": false})).unwrap(); + assert!(s.doc().unwrap().doc.node(id).unwrap().extras().flare.is_none()); + assert!(s.execute("shape.editFlare", &json!({"rings": 3})).is_err()); +} + +/// `shape.flare` reads whole-number counts written as floats, and refuses fractions. +#[test] +fn flare_counts_are_whole_numbers() { + let mut s = session(); + let id = NodeId(s.execute("shape.flare", &json!({"cx": 100, "cy": 100, "rays": 4.0, "rings": 2})).unwrap()["id"].as_u64().unwrap()); + let g = s.doc().unwrap().doc.node(id).unwrap(); + let rays = g.children().unwrap().iter().find(|c| c.name.as_deref() == Some("Rays")).unwrap(); + assert_eq!(rays.path_data().unwrap().subpaths.len(), 4); + assert!(s.execute("shape.flare", &json!({"cx": 100, "cy": 100, "rays": 2.5})).is_err()); +} + +/// `shape.editFlare` on a flare scaled far down: a `pathLength`, an end point or a center that, +/// taken back to where the flare was drawn, is not a finite number is an error, and the flare keeps +/// its settings. +#[test] +fn edit_flare_end_points_that_are_not_finite_are_errors() { + let mut s = session(); + let id = NodeId(s.execute("shape.flare", &json!({"cx": 100, "cy": 100, "rings": 2})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.scale", &json!({"sx": 1e-4, "sy": 1e-4})).unwrap(); + let before = flare_settings(&s.doc().unwrap().doc, id).expect("a flare"); + for (p, key) in [ + (json!({"pathLength": 1e305}), "x2"), + (json!({"x2": 1e305, "y2": 0}), "x2"), + (json!({"x2": 0, "y2": -1e305}), "y2"), + (json!({"cx": 1e305, "cy": 0}), "cx"), + ] { + let err = s.execute("shape.editFlare", &p).unwrap_err().to_string(); + assert!(err.ends_with(&format!("{key} must be a finite coordinate")), "{p}: {err}"); + assert_eq!(flare_settings(&s.doc().unwrap().doc, id).expect("still a flare"), before, "{p}"); + } +} + +/// A flare drawn again keeps its parts' pixel-aligned property, whatever the document's Align New +/// Objects to Pixel Grid is now, and a pixel-aligned flare that was moved is still a flare. +#[test] +fn edit_flare_keeps_its_parts_pixel_alignment() { + let mut s = session(); + let aligned = |s: &Session, id: NodeId| -> Vec { + s.doc().unwrap().doc.node(id).unwrap().children().unwrap().iter().map(|c| c.extras().pixel_aligned).collect() + }; + s.execute("document.setup", &json!({"alignNewObjectsToPixelGrid": true})).unwrap(); + let on = NodeId(s.execute("shape.flare", &json!({"cx": 100.3, "cy": 200.6, "rings": 2})).unwrap()["id"].as_u64().unwrap()); + s.execute("object.move", &json!({"dx": 10.25, "dy": 3.5})).unwrap(); + s.execute("document.setup", &json!({"alignNewObjectsToPixelGrid": false})).unwrap(); + let part = |s: &Session, id: NodeId, name: &str| -> NodeId { + s.doc().unwrap().doc.node(id).unwrap().children().unwrap().iter().find(|c| c.name.as_deref() == Some(name)).unwrap().id + }; + let centre = part(&s, on, "Center"); + s.execute("shape.editFlare", &json!({"rings": 4})).unwrap(); + assert!(aligned(&s, on).len() > 4 && aligned(&s, on).iter().all(|a| *a)); + // Each part drawn again keeps its id and its own property: without the rays, the center does + // not take theirs. + assert_eq!(part(&s, on, "Center"), centre); + s.execute("object.setPixelAligned", &json!({"ids": [centre.0], "on": false})).unwrap(); + s.execute("select.set", &json!({"ids": [on.0]})).unwrap(); + s.execute("shape.editFlare", &json!({"rays": 0})).unwrap(); + let node = |s: &Session, id: NodeId| s.doc().unwrap().doc.node(id).unwrap().extras().pixel_aligned; + assert!(!node(&s, centre) && node(&s, part(&s, on, "Halo"))); + let off = NodeId(s.execute("shape.flare", &json!({"cx": 300.3, "cy": 200.6, "rings": 2})).unwrap()["id"].as_u64().unwrap()); + s.execute("document.setup", &json!({"alignNewObjectsToPixelGrid": true})).unwrap(); + s.execute("shape.editFlare", &json!({"rings": 4})).unwrap(); + assert!(aligned(&s, off).iter().all(|a| !*a)); +} + /// `shape.flare`'s `ringSeed` places the rings along the path anew and keeps their count and /// sizes and the other parts; the same `ringSeed` draws the same flare, neighboring ones differ, /// and a seed that is not a whole number of at least 0 (for `ringSeed`, below 2^53) is refused. @@ -3453,6 +3596,38 @@ fn flare_small_ring_seeds_spread_the_first_ring_along_the_path() { assert!(hi - lo > 250.0, "small seeds spread the first ring along the path: {positions:?}"); } +/// A flare drawn with a small `ringSeed` and then drawn again by `shape.editFlare` keeps its first +/// ring where `shape.flare` put it: the SplitMix64-initialized Xorshift64 stream's first value +/// along the path, for each seed. +#[test] +fn edit_flare_draws_the_first_ring_of_a_small_ring_seed_where_it_was() { + let first_t = |seed: u64| { + let mut z = seed.wrapping_add(0x9e37_79b9_7f4a_7c15); + z = (z ^ (z >> 30)).wrapping_mul(0xbf58_476d_1ce4_e5b9); + z = (z ^ (z >> 27)).wrapping_mul(0x94d0_49bb_1331_11eb); + let mut state = z ^ (z >> 31); + state ^= state << 13; + state ^= state >> 7; + state ^= state << 17; + (state >> 11) as f64 / (1u64 << 53) as f64 + }; + let ring_x = |s: &Session, id: NodeId| { + let NodeKind::Group { children, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("flare is a group") }; + children.iter().find(|n| n.name.as_deref() == Some("Ring")).unwrap().geometric_bounds().unwrap().center().x + }; + let mut s = session(); + for seed in [0, 1, 2, 5, 11] { + let p = json!({"cx": 20, "cy": 30, "x2": 1020, "y2": 30, "rays": 0, "rings": 1, "ringSeed": seed}); + let id = NodeId(s.execute("shape.flare", &p).unwrap()["id"].as_u64().unwrap()); + let expected = 20.0 + 1000.0 * first_t(seed); + assert!((ring_x(&s, id) - expected).abs() < 1e-6, "seed {seed}: drawn at {}, expected {expected}", ring_x(&s, id)); + s.execute("shape.editFlare", &json!({"ids": [id.0], "opacity": 80})).unwrap(); + assert!((ring_x(&s, id) - expected).abs() < 1e-6, "seed {seed}: drawn again at {}, expected {expected}", ring_x(&s, id)); + s.execute("shape.editFlare", &json!({"ids": [id.0], "opacity": 40})).unwrap(); + assert!((ring_x(&s, id) - expected).abs() < 1e-6, "seed {seed}: a second edit keeps the ring"); + } +} + /// `shape.ellipse` without `anchors`, or with 4, draws the live ellipse it always drew. #[test] fn ellipse_with_four_anchors_is_the_live_ellipse() { diff --git a/crates/engine/src/tests/anchor_edit_work.rs b/crates/engine/src/tests/anchor_edit_work.rs index 5401bc0bf8..5130d30c26 100644 --- a/crates/engine/src/tests/anchor_edit_work.rs +++ b/crates/engine/src/tests/anchor_edit_work.rs @@ -176,3 +176,61 @@ fn a_handle_already_in_place_on_a_smooth_anchor_records_no_undo_step() { .unwrap(); assert_eq!(undo_steps(&s), 1); } + +/// `path.setHandle` with `link` makes a corner smooth: the other handle turns in line at its own +/// length, a retracted one is pulled out to the moved handle's length where a segment leaves the +/// anchor on its side and stays retracted at an open end. A handle already in place on a corner +/// still links; a request that changes nothing records no undo step; `link` that is not a boolean +/// or goes with `independent` is refused. +#[test] +fn a_linked_handle_makes_the_anchor_smooth() { + let (mut s, id) = long_path(100); + let p = anchor(&s, id, 5).p; + let corner = Anchor { p, h_in: p + Vec2::new(-6.0, 8.0), h_out: p + Vec2::new(3.0, 0.0), kind: AnchorKind::Corner }; + let path = Arc::make_mut(&mut s.doc_mut().unwrap().doc).node_mut(id).unwrap().path_data_mut().unwrap(); + path.subpaths[0].anchors[5] = corner; + let link = |x: f64, y: f64, ai: usize| json!({"id": id.0, "anchor": ai, "which": "out", "x": x, "y": y, "link": true}); + let near = |a: Point, b: Point| a.distance(b) < 1e-9; + + // The out handle stays where it is; the corner becomes smooth, the in handle turned opposite it. + s.execute("path.setHandle", &link(corner.h_out.x, corner.h_out.y, 5)).unwrap(); + assert_eq!(undo_steps(&s), 1); + let a = anchor(&s, id, 5); + assert_eq!((a.kind, a.h_out), (AnchorKind::Smooth, corner.h_out)); + assert!(near(a.h_in, p + Vec2::new(-10.0, 0.0)), "{a:?}"); + // Moved: the in handle keeps its length of 10. + let to = p + Vec2::new(4.0, 3.0); + s.execute("path.setHandle", &link(to.x, to.y, 5)).unwrap(); + assert_eq!(undo_steps(&s), 2); + let a = anchor(&s, id, 5); + assert!(a.kind == AnchorKind::Smooth && a.h_out == to && near(a.h_in, p + Vec2::new(-8.0, -6.0)), "{a:?}"); + // The same request again changes nothing. + s.execute("path.setHandle", &link(to.x, to.y, 5)).unwrap(); + assert_eq!(undo_steps(&s), 2); + + // A retracted in handle on an inner anchor is pulled out; at the open start it stays retracted. + let q = anchor(&s, id, 7).p; + s.execute("path.setHandle", &link(q.x, q.y + 5.0, 7)).unwrap(); + let a = anchor(&s, id, 7); + assert!(a.kind == AnchorKind::Smooth && near(a.h_in, q + Vec2::new(0.0, -5.0)), "{a:?}"); + let q = anchor(&s, id, 0).p; + s.execute("path.setHandle", &link(q.x, q.y + 5.0, 0)).unwrap(); + let a = anchor(&s, id, 0); + assert!(a.kind == AnchorKind::Smooth && a.h_in == q && a.h_out == q + Vec2::new(0.0, 5.0), "{a:?}"); + + let before = s.doc().unwrap().doc.clone(); + let undo = undo_steps(&s); + for bad in [ + json!({"id": id.0, "anchor": 5, "which": "out", "x": 0, "y": 0, "link": "yes"}), + json!({"id": id.0, "anchor": 5, "which": "out", "x": 0, "y": 0, "link": 1}), + json!({"id": id.0, "anchor": 5, "which": "out", "x": 0, "y": 0, "link": true, "independent": true}), + json!({"id": id.0, "anchor": 5, "which": "out", "x": 0, "y": 0, "link": true, "independent": "no"}), + json!({"id": id.0, "anchor": 100, "which": "out", "x": 0, "y": 0, "link": true}), + json!({"id": id.0, "anchor": 7, "which": "out", "x": 1.7e308, "y": 1.7e308, "link": true}), + json!({"id": id.0, "anchor": 7, "which": "out", "x": 0, "y": -1e9, "link": true}), + ] { + assert!(s.execute("path.setHandle", &bad).is_err(), "{bad}"); + } + assert!(s.doc().unwrap().doc == before, "a refused request changed the document"); + assert_eq!(undo_steps(&s), undo); +} diff --git a/crates/engine/src/tests/attributes.rs b/crates/engine/src/tests/attributes.rs index b6d00111e2..35dda8656b 100644 --- a/crates/engine/src/tests/attributes.rs +++ b/crates/engine/src/tests/attributes.rs @@ -90,6 +90,23 @@ fn values_that_differ_read_null_and_recent_urls_keep_the_newest_first() { assert_eq!(info(&mut s, json!({"ids": [p.0, a.0]}))["showCenter"], Value::Null); } +/// The recent URLs keep the 30 newest distinct URLs, the most the panel's URL menu can list, and +/// a URL given again moves to the front without taking a second place. +#[test] +fn recent_urls_keep_the_thirty_newest() { + let mut s = session(); + rect(&mut s, 0.0); + for i in 0..35 { + run(&mut s, "attributes.set", json!({"url": format!("https://example.com/{i}")})); + } + let want: Vec = (5..35).rev().map(|i| format!("https://example.com/{i}")).collect(); + assert_eq!(info(&mut s, json!({}))["recentUrls"], json!(want)); + run(&mut s, "attributes.set", json!({"url": "https://example.com/20"})); + let urls = info(&mut s, json!({}))["recentUrls"].as_array().unwrap().clone(); + assert_eq!((urls.len(), urls[0].as_str(), urls[1].as_str()), (30, Some("https://example.com/20"), Some("https://example.com/34"))); + assert_eq!(urls.iter().filter(|u| *u == "https://example.com/20").count(), 1); +} + /// A five-pointed star drawn as one self-intersecting path (its centre is wound twice). fn star(s: &mut Session) -> NodeId { let (c, r) = (50.0f64, 45.0f64); diff --git a/crates/engine/src/tests/blendspine.rs b/crates/engine/src/tests/blendspine.rs index c22eb188b7..7f7c7fffa4 100644 --- a/crates/engine/src/tests/blendspine.rs +++ b/crates/engine/src/tests/blendspine.rs @@ -431,3 +431,35 @@ fn a_spine_segment_bends_with_perpendicular_handles() { use vectorcraft_geom::kurbo::ParamCurve; assert!(sp.segment(0).eval(0.5).distance(Point::new(55.0, 45.0)) < 1e-9, "{sp:?}"); } + +/// `link` with `handle` makes a spine point smooth, the other handle in line opposite the moved +/// one, without moving the keys; the same request again records no undo step, and `link` that is +/// not a boolean, goes with `independent` or comes without `handle` is refused. +#[test] +fn a_linked_spine_handle_makes_the_point_smooth() { + let mut s = session(); + let (_, _, g) = blend(&mut s); + s.execute("object.blend.spine.addAnchor", &json!({"x": 55, "y": 5})).unwrap(); + let undo = |s: &Session| s.doc().unwrap().history.undo.len(); + let link = json!({"anchor": 1, "handle": "out", "x": 75, "y": 25, "link": true}); + s.execute("object.blend.spine.moveAnchor", &link).unwrap(); + let a = spec(&s, g).spine.unwrap().subpaths[0].anchors[1]; + assert_eq!((a.kind, a.h_out), (vectorcraft_geom::AnchorKind::Smooth, Point::new(75.0, 25.0))); + let (din, dout) = (a.h_in - a.p, a.h_out - a.p); + assert!(din.hypot() > 1e-6 && (din.normalize() + dout.normalize()).hypot() < 1e-9, "{a:?}"); + let st = steps(&s, g); + assert_eq!((center(&st[0]), center(&st[2])), (Point::new(5.0, 5.0), Point::new(105.0, 5.0)), "the keys stay put"); + let done = undo(&s); + s.execute("object.blend.spine.moveAnchor", &link).unwrap(); + assert_eq!(undo(&s), done, "an unchanged spine recorded an undo step"); + let before = spec(&s, g); + for bad in [ + json!({"anchor": 1, "handle": "out", "x": 75, "y": 25, "link": "yes"}), + json!({"anchor": 1, "handle": "out", "x": 75, "y": 25, "link": true, "independent": true}), + json!({"anchor": 1, "x": 75, "y": 25, "link": true}), + ] { + assert!(s.execute("object.blend.spine.moveAnchor", &bad).is_err(), "{bad}"); + } + assert_eq!(spec(&s, g), before); + assert_eq!(undo(&s), done); +} diff --git a/crates/engine/src/tests/brushlib.rs b/crates/engine/src/tests/brushlib.rs index f960ca91d3..38aadcc712 100644 --- a/crates/engine/src/tests/brushlib.rs +++ b/crates/engine/src/tests/brushlib.rs @@ -117,7 +117,8 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() { "game-trails", "energy-beams", "dry-media", - "tech-circuit" + "tech-circuit", + "arrows" ] ); assert!(libs.iter().all(|l| l["category"] == "builtIn")); @@ -145,6 +146,12 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() { [("Chalk Grain", "art"), ("Graphite Pencil", "art"), ("Wax Crayon", "art"), ("Charcoal Dust", "art")] ); assert_eq!((libs[9]["name"].as_str(), libs[9]["count"].as_u64()), (Some("Dry Media"), Some(4))); + let arrows = run(&mut s, "brush.library", json!({"library": "Arrows"})); + assert_eq!( + arrows["brushes"].as_array().unwrap().iter().map(|b| (b["name"].as_str().unwrap(), b["type"].as_str().unwrap())).collect::>(), + [("Solid Arrow", "art"), ("Open Arrow", "art"), ("Double Arrow", "art"), ("Chevron Arrow", "art"), ("Dashed Arrow", "art")] + ); + assert_eq!((libs[11]["name"].as_str(), libs[11]["count"].as_u64()), (Some("Arrows"), Some(5))); run(&mut s, "file.new", json!({"width": 200, "height": 200})); let id = run(&mut s, "shape.rectangle", json!({"x": 10, "y": 20, "width": 40, "height": 8}))["id"].as_u64().unwrap(); let added = run(&mut s, "brush.addFromLibrary", json!({"library": "energy-beams", "name": "Laser Bolt", "apply": true, "ids": [id]})); @@ -162,6 +169,7 @@ fn the_builtin_libraries_are_original_brushes_generated_in_code() { ("game-trails", "art"), ("energy-beams", "art"), ("dry-media", "art"), + ("arrows", "art"), ] { let (_, lib) = cmd::brushlib::library(&s, id).unwrap(); assert!(lib.len() >= 4, "{id}"); @@ -220,6 +228,78 @@ fn black_stroke() -> vectorcraft_doc::StrokeLayer { vectorcraft_doc::StrokeLayer::new(vectorcraft_color::Paint::solid(vectorcraft_color::Color::BLACK), 1.0) } +#[test] +fn arrows_library_lists_renders_and_applies_original_brushes() { + let mut s = session(); + let listed = run(&mut s, "brush.libraries", json!({})); + let entry = listed["libraries"].as_array().unwrap().iter().find(|l| l["id"] == "arrows").unwrap(); + assert_eq!((entry["name"].as_str(), entry["category"].as_str(), entry["count"].as_u64()), (Some("Arrows"), Some("builtIn"), Some(5))); + let (_, lib) = cmd::brushlib::library(&s, "Arrows").unwrap(); + assert_eq!( + lib.brushes.iter().map(|b| (b.name.as_str(), b.kind.type_id())).collect::>(), + [("Solid Arrow", "art"), ("Open Arrow", "art"), ("Double Arrow", "art"), ("Chevron Arrow", "art"), ("Dashed Arrow", "art")] + ); + for b in &lib.brushes { + for length in [2.0, 200.0] { + let pieces = vectorcraft_brush::stroke_pieces(&lib.doc, b, &line_to(length), &black_stroke()); + let pts = anchors(&pieces.iter().collect::>()); + assert!(!pts.is_empty() && pts.iter().all(|p| p.x.is_finite() && p.y.is_finite()), "{} at {length} pt", b.name); + } + } + let path = run(&mut s, "shape.line", json!({"x1": 10, "y1": 20, "x2": 210, "y2": 20}))["id"].as_u64().unwrap(); + let before = undo_len(&s); + let added = run(&mut s, "brush.addFromLibrary", json!({"library": "arrows", "name": "Double Arrow", "apply": true, "ids": [path]})); + assert_eq!(strs(&added["added"]), ["Double Arrow"]); + assert_eq!(added["applied"], json!([path])); + assert_eq!(undo_len(&s), before + 1); + assert_eq!(doc(&s).node(NodeId(path)).unwrap().appearance.stroke().unwrap().brush.as_deref(), Some("Double Arrow")); + run(&mut s, "edit.undo", json!({})); + assert!(vectorcraft_brush::find(doc(&s), "Double Arrow").is_none()); + run(&mut s, "edit.redo", json!({})); + assert_eq!(brush(&s, "Double Arrow"), lib.brushes[2]); +} + +#[test] +fn the_chevron_arrows_second_chevron_keeps_its_length_on_a_long_path() { + let s = session(); + let (_, lib) = cmd::brushlib::library(&s, "Arrows").unwrap(); + let b = lib.brush("Chevron Arrow").unwrap(); + let widths = |length: f64| { + let pieces = vectorcraft_brush::stroke_pieces(&lib.doc, b, &line_to(length), &black_stroke()); + let children = pieces[0].children().unwrap(); + assert_eq!(children.len(), 3, "shaft, head and second chevron"); + children[1..].iter().map(|n| n.geometric_bounds().unwrap().width()).collect::>() + }; + let short = widths(100.0); + for (long, short) in widths(400.0).into_iter().zip(short) { + assert!((long - short).abs() < 1e-6, "the heads keep their length: {long} on 400 pt, {short} on 100 pt"); + } +} + +#[test] +fn dashed_arrow_keeps_separate_dashes_and_survives_library_save() { + let mut s = session(); + let (_, lib) = cmd::brushlib::library(&s, "Arrows").unwrap(); + let b = lib.brush("Dashed Arrow").unwrap(); + let mut curve = line_to(40.0); + curve.curve_to((60.0, -40.0), (140.0, 40.0), (200.0, 0.0)); + for path in [line_to(2.0), line_to(200.0), curve] { + let pieces = vectorcraft_brush::stroke_pieces(&lib.doc, b, &path, &black_stroke()); + let pts = anchors(&pieces.iter().collect::>()); + assert!(!pts.is_empty() && pts.iter().all(|p| p.x.is_finite() && p.y.is_finite())); + } + let pieces = vectorcraft_brush::stroke_pieces(&lib.doc, b, &line_to(200.0), &black_stroke()); + let children = pieces[0].children().unwrap(); + assert_eq!(children.len(), 6, "five separate dashes and one head"); + let bounds: Vec<_> = children.iter().map(|n| n.geometric_bounds().unwrap()).collect(); + assert!(bounds.windows(2).all(|p| p[0].x1 < p[1].x0), "the dashes and head remain separated"); + run(&mut s, "brush.addFromLibrary", json!({"library": "arrows", "name": "Dashed Arrow"})); + let saved = run(&mut s, "brush.saveLibrary", json!({"names": ["Dashed Arrow"]})); + let bytes = vectorcraft_format::base64_decode(saved["dataBase64"].as_str().unwrap()).unwrap(); + let reopened = vectorcraft_format::load(&bytes).unwrap(); + assert_eq!(vectorcraft_brush::find(&reopened, "Dashed Arrow").unwrap(), *b); +} + /// Original circuit art and repeat tiles survive adding, applying and saving a library. #[test] fn the_tech_circuit_library_constructs_adds_and_applies_each_brush() { diff --git a/crates/engine/src/tests/pathops.rs b/crates/engine/src/tests/pathops.rs index f20af794c4..dff77c1ce4 100644 --- a/crates/engine/src/tests/pathops.rs +++ b/crates/engine/src/tests/pathops.rs @@ -1121,6 +1121,10 @@ fn path_commands_refuse_a_param_of_the_wrong_type() { s.execute("select.set", &json!({"ids": [a.0]})).unwrap(); let r = ids(&s.execute("object.path.offsetPath", &json!({"offset": "0.1 in", "joins": "Bevel"})).unwrap()); assert!(close(bounds(&s, r[0]), Rect::new(92.8, 92.8, 157.2, 147.2), 1e-2), "{:?}", bounds(&s, r[0])); + // A product with a unit, which the offset used to refuse: 0.05x2 in is 0.1 in. + s.execute("select.set", &json!({"ids": [a.0]})).unwrap(); + let r = ids(&s.execute("object.path.offsetPath", &json!({"offset": "0.05x2 in", "joins": "Bevel"})).unwrap()); + assert!(close(bounds(&s, r[0]), Rect::new(92.8, 92.8, 157.2, 147.2), 1e-2), "{:?}", bounds(&s, r[0])); // Null switches keep Clean Up's defaults, which remove the stray point. let r = s.execute("object.path.cleanUp", &json!({"strayPoints": null, "unpaintedObjects": null, "emptyTextPaths": null})).unwrap(); assert_eq!(r["removed"], 1); diff --git a/crates/engine/src/tests/prefs_file.rs b/crates/engine/src/tests/prefs_file.rs index c2822ba937..bfe98b901b 100644 --- a/crates/engine/src/tests/prefs_file.rs +++ b/crates/engine/src/tests/prefs_file.rs @@ -176,3 +176,24 @@ fn a_file_over_the_limit_is_refused_before_it_is_parsed() { assert!(s.execute("prefs.import", &json!({"path": missing.to_string_lossy()})).is_err()); assert_eq!(s.prefs.to_json().to_string(), before); } + +/// Hold Shortcuts is off by default. The Hold Shortcut Delay takes 0.2 to 1.0 s and refuses other +/// values; a value from a settings file outside the range is brought inside it. +#[test] +fn hold_shortcut_preferences() { + let mut s = Session::new(); + assert!(!s.prefs.hold_shortcuts); + assert_eq!(s.prefs.key_hold_delay(), 0.35); + for ok in [0.2, 1.0] { + s.execute("prefs.set", &json!({"key": "keyHoldDelay", "value": ok})).unwrap(); + assert_eq!(s.prefs.key_hold_delay(), ok); + } + for bad in [0.1, 1.5] { + assert!(is_bad_params(s.execute("prefs.set", &json!({"key": "keyHoldDelay", "value": bad}))), "{bad}"); + } + s.execute("prefs.set", &json!({"key": "holdShortcuts", "value": true})).unwrap(); + assert!(s.prefs.hold_shortcuts); + let restored: Prefs = serde_json::from_value(json!({"keyHoldDelay": 5.0})).unwrap(); + assert_eq!(restored.key_hold_delay(), 1.0); + assert!(!restored.hold_shortcuts); +} diff --git a/crates/engine/tests/command_sweep.rs b/crates/engine/tests/command_sweep.rs index 4f49a25b03..b8114f705c 100644 --- a/crates/engine/tests/command_sweep.rs +++ b/crates/engine/tests/command_sweep.rs @@ -1012,6 +1012,8 @@ fn structured_junk() { ("addon.pathtools.bridge", json!({"radius": 1e-308, "keepOriginals": "x"})), ("addon.pathtools.bridge", json!({"radius": 1000, "keepOriginals": true, "ids": [0, 1, 2, 3, u64::MAX]})), ("addon.pathtools.bridge", json!({"radius": f64::MAX, "ids": [1, 1], "junk": [0]})), + ("addon.pathtools.bridge", json!({"gap": -1e308, "reach": f64::MAX, "ids": [0, 1, 2]})), + ("addon.pathtools.bridge", json!({"gap": 1000, "reach": 10000, "radius": null, "keepOriginals": true})), // Refused before anything is written: no format of that name, a time that is no time. ("addon.document.saveTimestampedCopy", json!({"format": "png", "folder": 7})), ("addon.document.saveTimestampedCopy", json!({"format": "svg", "time": [1e308], "folder": null})), diff --git a/crates/format/src/atomic.rs b/crates/format/src/atomic.rs index 8e7149cad2..e8f3c42b8e 100644 --- a/crates/format/src/atomic.rs +++ b/crates/format/src/atomic.rs @@ -9,6 +9,10 @@ //! are on disk, and the error names them. Where that copy of the old file can't be made, the file //! is left as it was and the save fails. //! +//! Work canceled ([`vectorcraft_doc::cancel`]) by the time the temporary file is written and flushed +//! puts nothing in place: the temporary file is removed, the file stays as it was (or absent), and +//! the error wraps [`vectorcraft_doc::cancel::Cancelled`]. +//! //! On macOS `File::sync_all` is a full flush (`F_FULLFSYNC`), which SMB shares refuse with //! `ENOTSUP` and virtiofs shares (folders shared into a macOS VM) with `ENOTTY`, while a plain //! `fsync` works: [`sync_file`] falls back to the plain one there (#1620). @@ -43,7 +47,8 @@ pub fn write_atomic(path: &Path, bytes: &[u8]) -> io::Result<()> { } /// Write `path` atomically with `fill`, which writes the content into the temporary file. When -/// `fill` or flushing fails the temporary file is removed and `path` is left untouched. When the +/// `fill` or flushing fails, or the work was canceled meanwhile ([`vectorcraft_doc::cancel`]), the +/// temporary file is removed and `path` is left untouched. When the /// folder refuses the temporary file or the rename, the content is copied into `path` instead (see /// the module docs). pub fn write_atomic_with(path: &Path, fill: impl FnOnce(&mut File) -> io::Result<()>) -> io::Result<()> { @@ -79,7 +84,7 @@ fn write_atomic_stepping( (tmp, f, Some(e)) } }; - let filled = fill(&mut f).and_then(|()| sync_file(&f)); + let filled = fill(&mut f).and_then(|()| sync_file(&f)).and_then(|()| not_cancelled()); drop(f); if let Err(e) = filled { // Best effort: the temporary file is all there is to clean up. @@ -176,7 +181,7 @@ fn write_new_linking( ) -> io::Result<()> { let tmp = temp_path(path)?; let mut f = OpenOptions::new().write(true).create_new(true).open(&tmp)?; - let filled = fill(&mut f).and_then(|()| sync_file(&f)); + let filled = fill(&mut f).and_then(|()| sync_file(&f)).and_then(|()| not_cancelled()); drop(f); let placed = filled.and_then(|()| match link(&tmp, path) { Err(e) if e.kind() != io::ErrorKind::AlreadyExists => copy_new(&tmp, path), @@ -187,6 +192,12 @@ fn write_new_linking( placed } +/// `Err` wrapping [`vectorcraft_doc::cancel::Cancelled`] when the work running on this thread has +/// been canceled: the last check before a written temporary file is put in place. +fn not_cancelled() -> io::Result<()> { + vectorcraft_doc::cancel::check().map_err(io::Error::other) +} + /// Create `path` (never replacing anything) with the content of the file `from`; a failed copy /// removes it again. fn copy_new(from: &Path, path: &Path) -> io::Result<()> { @@ -408,6 +419,39 @@ mod tests { let _ = std::fs::remove_dir_all(&d); } + /// Work canceled by the time the temporary file is written and flushed puts nothing in place: + /// the old file stays as it was, also where the folder refuses the rename (no copy over it), a + /// new file is not created, and no temporary file is left. + #[test] + fn canceled_work_puts_nothing_in_place() { + use vectorcraft_doc::cancel::{CancelToken, Cancelled, scope}; + fn cancelled(e: &io::Error) -> bool { + e.get_ref().is_some_and(|e| e.is::()) + } + let d = dir("cancel"); + let path = d.join("doc.vectorcraft"); + std::fs::write(&path, b"original").unwrap(); + let token = CancelToken::new(); + let r = scope(&token, None, || { + write_atomic_with(&path, |f| { + f.write_all(b"new")?; + token.cancel(); + Ok(()) + }) + }); + assert!(r.as_ref().is_err_and(cancelled), "{r:?}"); + let refused = |_: &Path, _: &Path| -> io::Result<()> { Err(io::Error::from(io::ErrorKind::PermissionDenied)) }; + let r = scope(&token, None, || write_atomic_stepping(&path, |f| f.write_all(b"new"), create_new, refused)); + assert!(r.as_ref().is_err_and(cancelled), "{r:?}"); + assert_eq!(std::fs::read(&path).unwrap(), b"original"); + let new = d.join("new.vectorcraft"); + let r = scope(&token, None, || write_new_with(&new, |f| f.write_all(b"new"))); + assert!(r.as_ref().is_err_and(cancelled), "{r:?}"); + assert!(!new.exists()); + assert!(leftovers(&d, "doc.vectorcraft").is_empty(), "{:?}", leftovers(&d, "doc.vectorcraft")); + let _ = std::fs::remove_dir_all(&d); + } + #[test] fn the_original_file_survives_a_failed_write() { let d = dir("fail"); diff --git a/crates/geom/src/path.rs b/crates/geom/src/path.rs index c5343171ef..abd72b255e 100644 --- a/crates/geom/src/path.rs +++ b/crates/geom/src/path.rs @@ -158,10 +158,56 @@ impl Anchor { let dir = p - pos; let l = dir.hypot(); if l > 1e-9 { - *other = p + dir * (len / l); + let turned = p + dir * (len / l); + if turned.is_finite() { + *other = turned; + } else { + // Long handles overflow the squares above: measure with `f64::hypot` and scale + // the unit direction, leaving the handle where it is if that is not finite. + let (v, l) = (*other - p, dir.x.hypot(dir.y)); + let turned = p + (dir / l) * v.x.hypot(v.y); + if turned.is_finite() { + *other = turned; + } + } } } } + /// Place the end of the outgoing (`out`) or incoming handle at `pos` and make the anchor smooth: + /// the other handle turns to lie in line with it on the far side of the anchor, at its own + /// length. A retracted other handle is pulled out to the moved handle's length when `pull_out` + /// and stays retracted otherwise. A handle placed on the anchor, or where the turned handle's + /// end would not be a finite point, gives no direction: it is placed, and the other handle and + /// the anchor's kind stay as they are. + pub fn link_handle(&mut self, out: bool, pos: Point, pull_out: bool) { + let p = self.p; + let (moved, other) = if out { (&mut self.h_out, &mut self.h_in) } else { (&mut self.h_in, &mut self.h_out) }; + *moved = pos; + // `f64::hypot` keeps long handles from overflowing the square of their length. + let dir = p - pos; + let l = dir.x.hypot(dir.y); + if !(l > EPS && l.is_finite()) { + return; + } + let v = *other - p; + let len = v.x.hypot(v.y); + let len = if len > EPS { + len + } else if pull_out { + l + } else { + 0.0 + }; + if len > 0.0 { + // The unit direction first, so a short handle does not overflow the scale factor. + let turned = p + (dir / l) * len; + if !turned.is_finite() { + return; + } + *other = turned; + } + self.kind = AnchorKind::Smooth; + } /// Swap handles (used when reversing path direction). pub fn reversed(&self) -> Self { Self { p: self.p, h_in: self.h_out, h_out: self.h_in, kind: self.kind } @@ -280,6 +326,11 @@ impl SubPath { pub fn polyline(points: &[Point], closed: bool) -> Self { Self { anchors: points.iter().map(|&p| Anchor::corner(p)).collect(), closed } } + /// Whether anchor `ai` has a segment on its outgoing (`out`) or incoming side. + pub fn has_segment(&self, ai: usize, out: bool) -> bool { + let n = self.anchors.len(); + ai < n && n > 1 && (self.closed || if out { ai + 1 < n } else { ai > 0 }) + } /// Number of segments (a closed path has one more, back to the start). pub fn segment_count(&self) -> usize { let n = self.anchors.len(); @@ -1103,4 +1154,73 @@ mod tests { let back: PathData = serde_json::from_str(&s).unwrap(); assert_eq!(p, back); } + + /// `link_handle` makes a corner smooth: the other handle turns onto the far side of the anchor + /// at its own length; a retracted one is pulled out to the moved handle's length only when + /// asked, and a handle placed on the anchor changes nothing else. + #[test] + fn link_handle_makes_a_corner_smooth_keeping_the_other_length() { + let p = Point::new(10.0, 10.0); + let mut a = Anchor { p, h_in: Point::new(10.0, 0.0), h_out: Point::new(13.0, 10.0), kind: AnchorKind::Corner }; + a.link_handle(true, Point::new(14.0, 13.0), false); + assert_eq!(a.kind, AnchorKind::Smooth); + assert_eq!(a.h_out, Point::new(14.0, 13.0)); + // The in handle keeps its length of 10, opposite the out handle's direction (4, 3) / 5. + assert!(a.h_in.distance(Point::new(2.0, 4.0)) < 1e-9, "{:?}", a.h_in); + + let retracted = Anchor { p, h_in: p, h_out: Point::new(13.0, 10.0), kind: AnchorKind::Corner }; + let mut pulled = retracted; + pulled.link_handle(true, Point::new(13.0, 14.0), true); + assert_eq!((pulled.kind, pulled.h_in), (AnchorKind::Smooth, Point::new(7.0, 6.0))); + let mut kept = retracted; + kept.link_handle(true, Point::new(13.0, 14.0), false); + assert_eq!((kept.kind, kept.h_in), (AnchorKind::Smooth, p)); + + let mut on_anchor = Anchor { p, h_in: Point::new(10.0, 0.0), h_out: Point::new(13.0, 10.0), kind: AnchorKind::Corner }; + on_anchor.link_handle(false, p, true); + assert_eq!(on_anchor, Anchor { p, h_in: p, h_out: Point::new(13.0, 10.0), kind: AnchorKind::Corner }); + + // A handle so far away that its distance overflows leaves the other handle finite. + let far = Point::new(1.7e308, 1.7e308); + let mut overflow = retracted; + overflow.link_handle(true, far, true); + assert_eq!(overflow, Anchor { p, h_in: p, h_out: far, kind: AnchorKind::Corner }); + // A very long other handle turned by a very short one stays finite, at its own length. + let mut long = Anchor { p: Point::ZERO, h_in: Point::new(1e308, 0.0), h_out: Point::ZERO, kind: AnchorKind::Corner }; + long.link_handle(true, Point::new(0.0, 1e-8), false); + assert_eq!((long.kind, long.h_in), (AnchorKind::Smooth, Point::new(0.0, -1e308))); + // One whose turned end would leave the finite range is left where it is. + let edge = Point::new(-1.5e308, 0.0); + let mut beyond = Anchor { p: edge, h_in: Point::new(1.5e308, 0.0), h_out: edge, kind: AnchorKind::Corner }; + beyond.link_handle(true, Point::new(-1.5e308 + 1e300, 0.0), false); + assert_eq!((beyond.kind, beyond.h_in), (AnchorKind::Corner, Point::new(1.5e308, 0.0))); + } + + /// `set_handle` on a smooth anchor turns a very long other handle without overflowing, and + /// leaves it where it is when its turned end would not be a finite point. + #[test] + fn set_handle_on_a_smooth_anchor_keeps_long_handles_finite() { + let mut long = Anchor { p: Point::ZERO, h_in: Point::new(-1e308, 0.0), h_out: Point::new(1.0, 0.0), kind: AnchorKind::Smooth }; + long.set_handle(true, Point::new(0.0, 1e-8), false); + assert_eq!(long.h_in, Point::new(0.0, -1e308)); + let edge = Point::new(-1.5e308, 0.0); + let mut beyond = Anchor { p: edge, h_in: Point::new(-1.6e308, 0.0), h_out: Point::new(1.5e308, 0.0), kind: AnchorKind::Smooth }; + beyond.set_handle(false, Point::new(-1.5e308 + 1e300, 0.0), false); + assert_eq!(beyond.h_out, Point::new(1.5e308, 0.0)); + } + + /// `has_segment` sees a segment on each side of an inner anchor, none past an open path's ends, + /// and both sides on a closed path of two anchors or more. + #[test] + fn has_segment_follows_the_open_ends() { + let pts = [Point::ZERO, Point::new(10.0, 0.0), Point::new(10.0, 10.0)]; + let open = SubPath::polyline(&pts, false); + assert!(!open.has_segment(0, false) && open.has_segment(0, true)); + assert!(open.has_segment(1, false) && open.has_segment(1, true)); + assert!(open.has_segment(2, false) && !open.has_segment(2, true)); + assert!(!open.has_segment(3, false)); + let closed = SubPath::polyline(&pts, true); + assert!(closed.has_segment(0, false) && closed.has_segment(2, true)); + assert!(!SubPath::polyline(&pts[..1], true).has_segment(0, true)); + } } diff --git a/crates/mcp/src/tests.rs b/crates/mcp/src/tests.rs index 58c9c42e45..870f4a23a3 100644 --- a/crates/mcp/src/tests.rs +++ b/crates/mcp/src/tests.rs @@ -323,6 +323,7 @@ fn headless_command_list_includes_ui_commands() { "app.quit", "window.arrange.tile", "align.horizontalLeft", + "align.toKeyObject", "ui.action.play", ]; for (n, id) in want.iter().enumerate() { diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs index 2f4bee78e5..88f60fd6c8 100644 --- a/crates/mcp/src/ui_catalog.rs +++ b/crates/mcp/src/ui_catalog.rs @@ -190,8 +190,13 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "Cmd+I", "{} open the Check Spelling dialog to walk through unrecognized words with suggestions, ignore, change and dictionary options", ), - ("shortcuts.set", "Set Keyboard Shortcut", "", "{id: command id or tool:, shortcut: \"Cmd+Shift+K\" | \"\" (none) | null (default), force?}"), - ("shortcuts.list", "List Keyboard Shortcuts", "", "{query?} → [{id, label, group, shortcut, default, overridden}]"), + ( + "shortcuts.set", + "Set Keyboard Shortcut", + "", + "{id: command id or tool:, shortcut?: \"Cmd+Shift+K\" | \"\" (none) | null (default), hold?: a character key alone or with Shift (\"X\", \"Shift+X\", \".\") | \"\" | null (none), force?} → {id, shortcut, hold, removedFrom}; `hold` alone leaves the shortcut as it is; a command listed only with a shortcut takes a hold only with one and loses it with the shortcut; a hold shortcut acts while the holdShortcuts preference is on", + ), + ("shortcuts.list", "List Keyboard Shortcuts", "", "{query?} → [{id, label, group, shortcut, hold, default, overridden}]"), ("shortcuts.conflicts", "Keyboard Shortcut Conflicts", "", "{} → [{shortcut, ids}]"), ("shortcuts.reset", "Reset Keyboard Shortcuts", "", "{}"), ( @@ -205,7 +210,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "shortcuts.exportText", "Export Keyboard Shortcuts as Text…", "", - "{path?, format?: \"text\"|\"sheet\"|\"csv\" (default text), pageSize?: \"letter\"|\"a4\" (sheet only; default A4 when the current document prints on A4, else letter)} save the current set's tools and menu commands with their shortcuts (Keyboard Shortcuts › Export Text…). text: a UTF-8 text file: the set's name, then a Tools and a Menu Commands section in the dialog's order, one `nameshortcut` line per row, empty after the tab when it has none. sheet: a printable PDF on landscape pages that lists the rows with a shortcut, Tools and then a group per top-level menu, under a colored band per group, shortcut then name, in four columns. csv: a UTF-8 CSV file (RFC 4180 quoting, CRLF) with a `Group,Command,Shortcut` header and one record per row in the sheet's groups, in the UI language; a field that starts with = + - @ and has more after it starts with '. A `path` is written as given. Without it, pick a file: the desktop save dialog offers the three formats (text first) unless `format` names one, and the file type picked decides and gives the name its extension; with no dialog, writer or download, returns {text} (text, csv) or {pdf: base64} (sheet); a bad `format` or `pageSize` is an error", + "{path?, format?: \"text\"|\"sheet\"|\"csv\" (default text), pageSize?: \"letter\"|\"a4\" (sheet only; default A4 when the current document prints on A4, else letter)} save the current set's tools and menu commands with their shortcuts (Keyboard Shortcuts › Export Text…). text: a UTF-8 text file: the set's name, then a Tools and a Menu Commands section in the dialog's order, one `nameshortcut` line per row, empty after the tab when it has none, and while the holdShortcuts preference is on a third `Hold ` column on a row with a hold shortcut. sheet: a printable PDF on landscape pages that lists the rows with a shortcut, Tools and then a group per top-level menu, under a colored band per group, shortcut then name, in four columns. csv: a UTF-8 CSV file (RFC 4180 quoting, CRLF) with a `Group,Command,Shortcut` header and one record per row in the sheet's groups, in the UI language; a field that starts with = + - @ and has more after it starts with '. A `path` is written as given. Without it, pick a file: the desktop save dialog offers the three formats (text first) unless `format` names one, and the file type picked decides and gives the name its extension; with no dialog, writer or download, returns {text} (text, csv) or {pdf: base64} (sheet); a bad `format` or `pageSize` is an error", ), ("shortcuts.import", "Import Keyboard Shortcuts…", "", "{path? | data?}"), ( @@ -380,6 +385,24 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "", "{} the Align panel's Horizontal Distribute Space button: object.distributeSpacing {axis: \"horizontal\"} with to: \"key\" while there is a key, else the Align To choice, and spacing: the Distribute Spacing value while there is a key; with the Artboard tool chosen, the artboard command of the same name (artboard.distribute, artboard.distributeSpacing) with the same direction on the artboards the tool has selected, to: \"artboard\" (the active artboard) and spacing: the Distribute Spacing value while Align to Artboard is chosen, else \"selection\"", ), + ( + "align.toSelection", + "Align to Selection", + "", + "{} the Align panel's Align to Selection button: Align To becomes Selection (saved with the preferences, ui.inspect › ui.align_to) and the key object, key guide or key anchor is let go → {alignTo: the choice the Align panel then shows: \"selection\", or \"artboard\" while one object is selected, since one object aligns to the artboard}; with the Artboard tool chosen the selected objects keep their key", + ), + ( + "align.toKeyObject", + "Align to Key Object", + "", + "{} the Align panel's Align to Key Object button: with no key, the topmost of two or more selected objects becomes the key object, or a ruler guide selected with one object the key guide; the stored Selection or Artboard choice stays → {alignTo: \"key\"}; an error (\"no key object\") when there is no key and nothing to make one of, which includes a topmost selected object inside another selected object; an error (\"Align to Key Object isn't available with the Artboard tool\") with the Artboard tool chosen", + ), + ( + "align.toArtboard", + "Align to Artboard", + "", + "{} the Align panel's Align to Artboard button: Align To becomes Artboard (saved with the preferences, ui.inspect › ui.align_to) and the key object, key guide or key anchor is let go → {alignTo: \"artboard\"}; with the Artboard tool chosen the selected objects keep their key", + ), ( "type.bold", "Bold", @@ -422,6 +445,18 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "Cmd+Shift+U", "{} the Character panel's Underline button: underline the selected type (or the Type tool's selection), or remove the underline when the text the Character panel shows is underlined (text.setFormat {underline}) → underlined", ), + ( + "type.superscript", + "Superscript", + "Cmd+Shift+=", + "{} the Character panel's Superscript button: the selected type (or the Type tool's selection, all of its text at a caret) becomes superscript, or Normal when all of it is superscript already (text.setFormat {position}). Without selected type the keys zoom in, as Cmd+= does → \"superscript\" | \"normal\"", + ), + ( + "type.subscript", + "Subscript", + "Cmd+Alt+Shift+=", + "{} the Character panel's Subscript button: the selected type (or the Type tool's selection, all of its text at a caret) becomes subscript, or Normal when all of it is subscript already (text.setFormat {position}) → \"subscript\" | \"normal\"", + ), ( "type.lineComposer", "Toggle Line Composer", @@ -1043,7 +1078,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "tool.options", "Tool Options…", "", - "{tool: id} what double-clicking a tool button opens: hand → fits the artboard in the window (view.fitArtboard), zoom → 100% (view.actualSize), rotate|scale|reflect|shear → that Object › Transform dialog (dialog `rotate`, `scale`, `reflect` or `shear`; error `nothing selected` without a selection), selection|directSelection|groupSelection → the Move dialog (dialog `move`; the same error), gradient|magicWand → the Gradient or Magic Wand panel (window.panel), artboard → Artboard Options of the active artboard (dialog `artboardOptions`, fields index, name, x, y, width, height, showCenterMark, showCrossHairs; OK runs artboard.setProps, and with other artboards selected with the Artboard tool a new width or height goes to each of them too, in its `artboards` list, each resized about the reference point the form used for that size, or about its top-left corner when the size was set in the fields directly), flare → Flare Tool Options (dialog `flareOptions`, fields diameter and pathLength (pt), opacity, brightness, growth, fuzziness, longest, rayFuzziness, largest (%), rays, rings, direction (°), raysOn, ringsOn; OK runs tool.setOption {tool: \"flare\", values}: the next flare dragged out uses them, and a Flare click's dialog, which also has x, y and preview (on initially), previews one there and accepts it as one Undo step; Cancel rolls back the preview), lineSegment|arc|rectangularGrid|polarGrid → that tool's Tool Options, its click dialog without x and y (dialog kind = the tool id, `__toolOptions: true`; lineSegment: length (pt), angle (°), fillLine; arc: lengthX, lengthY (pt), reference (0–8), arcType: open|closed, baseAlong: x|y, slope (−100…100), fillArc; rectangularGrid: width, height (pt, the Default Size), reference (0–8), rows, columns, rowSkew, columnSkew (%), frame, fill; polarGrid: the same with concentric, radial, concentricSkew, radialSkew and compound for rows, columns, the skews and frame; OK runs tool.setOption {tool, values} and draws nothing: the next drag uses them (Fill Line, the arc's type, base, slope and fill, the grids' dividers, skews and switches) and a click's dialog opens at them), columnGraph|stackedColumnGraph|barGraph|stackedBarGraph|lineGraph|areaGraph|scatterGraph|pieGraph|radarGraph → Graph Type for the selected graph, or for the series picked in it with Group Selection (dialog `graphType`, fields the options graph.setType {} returns under their names, with legend, pieLegend, piePosition, pieSort, firstRowInFront, firstColumnInFront, filledLines and lineWidth held for every type; overrideValues and rightOverrideValues, Override Calculated Values of the left or only value axis and of the right one: while one is on OK sends axisMin, axisMax and ticks, or rightAxisMin, rightAxisMax and rightTicks, filled with the calculated values where the graph has none, and one turned off sends null, null and 0; __page: options|valueAxis|rightAxis|categoryAxis, the page shown, options when the type picked has no such page; OK runs graph.setType, and with nothing changed closes without a step of history; an overridden value axis whose maximum is not more than its minimum is an error and the dialog stays open; an error without a selected graph), typeOnPath|verticalTypeOnPath → Type on a Path Options for the selected type on a path (dialog `command` running type.pathOptions; error `nothing selected` without a selection, and the command's error when no type on a path is selected),symbolSprayer|symbolShifter|symbolScruncher|symbolSizer|symbolSpinner|symbolStainer|symbolScreener|symbolStyler → Symbolism Tools Options (dialog `symbolismOptions`, fields tool, diameter (pt), intensity and density (1–10), shared by the eight tools; OK runs tool.setOption {tool, values}), blend → Blend Options, perspectiveGrid → Perspective Grid Options, eyedropper → Eyedropper Options (dialog `eyedropperOptions`, fields sampleSize, pickUp, apply; OK runs eyedropper.setOptions), printTiling → resets the print tiling (print.tiling.set {reset: true}), warp|twirl|pucker|bloat|scallop|crystallize|wrinkle → that tool's Tool Options (dialog `liquifyOptions`, fields tool, width, height, angle, intensity %, usePressure, detail, simplify, simplifyOn, rate, complexity, horizontal %, vertical %, affectAnchors, affectIn, affectOut, showBrush; OK runs tool.setOption {tool, values}), pencil|paintbrush|smooth|blobBrush|eraser → that tool's Tool Options (dialog `freehandOptions`, fields tool and the options the tool keeps: fidelity (px for pencil, paintbrush and smooth, the same at any zoom; pt for blobBrush), fill, keepSelected (on for pencil and paintbrush, off for blobBrush), mergeOnlySelection (off), closeWithin and editWithin (px, 0 is off), livePreview (pencil, on: off draws a thin line while the stroke is drawn, and the path's fill and stroke on release), size (pt), angle (°, −180–180; 0) and roundness (%, 1–100; 100) of the eraser's tip; OK runs tool.setOption {tool, values}), livePaintSelection → Live Paint Selection Tool Options (dialog `livePaintSelectionOptions`, fields selectFills and selectStrokes (both on), color (the highlight color, #rrggbb or a layer color's name; #ff2a2a), width (the highlight's width, 1–20 px; 4); OK runs tool.setOption {tool: \"livePaintSelection\", values}; a color with an alpha part (#rrggbbaa or #rgba) is an error and OK changes nothing), livePaintBucket → Live Paint Bucket Options (dialog `livePaintBucketOptions`, fields paintFills (on) and paintStrokes (off), cursorSwatchPreview (on: the active fill or stroke shows above the pointer between the color swatches before and after it; Left and Right without modifiers step it through the color swatches whether it is on or off), highlight (on), color (the highlight color, #rrggbb or a layer color's name; #ff2a2a), width (the face highlight's width, 1–20 px; 4; an edge's highlight is half as wide); OK runs tool.setOption {tool: \"livePaintBucket\", values}; a color with an alpha part (#rrggbbaa or #rgba) is an error and OK changes nothing), shapeBuilder → Shape Builder Tool Options (dialog `shapeBuilderOptions`, fields gapDetection (off), gapLength (pt, 0–72; 3), openFilledAsClosed (on), clickStrokeSplitsPath (off), pickColorFrom: artwork|swatches (artwork), cursorSwatchPreview (off), selection: freeform|straightLine (freeform), highlightFill (on), highlightStroke (on), highlightColor (#rrggbb or a layer color's name; #ff4f4f); OK runs tool.setOption {tool: \"shapeBuilder\", values}; a highlightColor with an alpha part (#rrggbbaa or #rgba) is an error and OK changes nothing), objectsOnPath → Objects on Path Tool Options (dialog `objectsOnPathOptions`, fields pivot (0–8, row by row from the top left; 4, the center) and rotate (°, −360–360; 0); Reset puts 4 and 0 back; Save runs tool.setOption {tool: \"objectsOnPath\", values}: the objects attached next use them, groups attached before keep theirs)", + "{tool: id} what double-clicking a tool button opens: hand → fits the artboard in the window (view.fitArtboard), zoom → 100% (view.actualSize), rotate|scale|reflect|shear → that Object › Transform dialog (dialog `rotate`, `scale`, `reflect` or `shear`; error `nothing selected` without a selection), selection|directSelection|groupSelection → the Move dialog (dialog `move`; the same error), gradient|magicWand → the Gradient or Magic Wand panel (window.panel), artboard → Artboard Options of the active artboard (dialog `artboardOptions`, fields index, name, x, y, width, height, showCenterMark, showCrossHairs; OK runs artboard.setProps, and with other artboards selected with the Artboard tool a new width or height goes to each of them too, in its `artboards` list, each resized about the reference point the form used for that size, or about its top-left corner when the size was set in the fields directly), flare → Flare Tool Options (dialog `flareOptions`, fields diameter and pathLength (pt), opacity, brightness, growth, fuzziness, longest, rayFuzziness, largest (%), rays, rings, direction (°), raysOn, ringsOn; OK runs tool.setOption {tool: \"flare\", values}: the next flare dragged out uses them, and a Flare click's dialog, which also has x, y and preview (on initially), previews one there and accepts it as one Undo step; Cancel rolls back the preview; with flares selected, the fields show the first one's settings, `flares` lists them and OK runs shape.editFlare with the settings changed instead, leaving the tool's options), lineSegment|arc|rectangularGrid|polarGrid → that tool's Tool Options, its click dialog without x and y (dialog kind = the tool id, `__toolOptions: true`; lineSegment: length (pt), angle (°), fillLine; arc: lengthX, lengthY (pt), reference (0–8), arcType: open|closed, baseAlong: x|y, slope (−100…100), fillArc; rectangularGrid: width, height (pt, the Default Size), reference (0–8), rows, columns, rowSkew, columnSkew (%), frame, fill; polarGrid: the same with concentric, radial, concentricSkew, radialSkew and compound for rows, columns, the skews and frame; OK runs tool.setOption {tool, values} and draws nothing: the next drag uses them (Fill Line, the arc's type, base, slope and fill, the grids' dividers, skews and switches) and a click's dialog opens at them), columnGraph|stackedColumnGraph|barGraph|stackedBarGraph|lineGraph|areaGraph|scatterGraph|pieGraph|radarGraph → Graph Type for the selected graph, or for the series picked in it with Group Selection (dialog `graphType`, fields the options graph.setType {} returns under their names, with legend, pieLegend, piePosition, pieSort, firstRowInFront, firstColumnInFront, filledLines and lineWidth held for every type; overrideValues and rightOverrideValues, Override Calculated Values of the left or only value axis and of the right one: while one is on OK sends axisMin, axisMax and ticks, or rightAxisMin, rightAxisMax and rightTicks, filled with the calculated values where the graph has none, and one turned off sends null, null and 0; __page: options|valueAxis|rightAxis|categoryAxis, the page shown, options when the type picked has no such page; OK runs graph.setType, and with nothing changed closes without a step of history; an overridden value axis whose maximum is not more than its minimum is an error and the dialog stays open; an error without a selected graph), typeOnPath|verticalTypeOnPath → Type on a Path Options for the selected type on a path (dialog `command` running type.pathOptions; error `nothing selected` without a selection, and the command's error when no type on a path is selected),symbolSprayer|symbolShifter|symbolScruncher|symbolSizer|symbolSpinner|symbolStainer|symbolScreener|symbolStyler → Symbolism Tools Options (dialog `symbolismOptions`, fields tool, diameter (pt), intensity and density (1–10), shared by the eight tools; OK runs tool.setOption {tool, values}), blend → Blend Options, perspectiveGrid → Perspective Grid Options, eyedropper → Eyedropper Options (dialog `eyedropperOptions`, fields sampleSize, pickUp, apply; OK runs eyedropper.setOptions), printTiling → resets the print tiling (print.tiling.set {reset: true}), warp|twirl|pucker|bloat|scallop|crystallize|wrinkle → that tool's Tool Options (dialog `liquifyOptions`, fields tool, width, height, angle, intensity %, usePressure, detail, simplify, simplifyOn, rate, complexity, horizontal %, vertical %, affectAnchors, affectIn, affectOut, showBrush; OK runs tool.setOption {tool, values}), pencil|paintbrush|smooth|blobBrush|eraser → that tool's Tool Options (dialog `freehandOptions`, fields tool and the options the tool keeps: fidelity (px for pencil, paintbrush and smooth, the same at any zoom; pt for blobBrush), fill, keepSelected (on for pencil and paintbrush, off for blobBrush), mergeOnlySelection (off), closeWithin and editWithin (px, 0 is off), livePreview (pencil, on: off draws a thin line while the stroke is drawn, and the path's fill and stroke on release), size (pt), angle (°, −180–180; 0) and roundness (%, 1–100; 100) of the eraser's tip; OK runs tool.setOption {tool, values}), livePaintSelection → Live Paint Selection Tool Options (dialog `livePaintSelectionOptions`, fields selectFills and selectStrokes (both on), color (the highlight color, #rrggbb or a layer color's name; #ff2a2a), width (the highlight's width, 1–20 px; 4); OK runs tool.setOption {tool: \"livePaintSelection\", values}; a color with an alpha part (#rrggbbaa or #rgba) is an error and OK changes nothing), livePaintBucket → Live Paint Bucket Options (dialog `livePaintBucketOptions`, fields paintFills (on) and paintStrokes (off), cursorSwatchPreview (on: the active fill or stroke shows above the pointer between the color swatches before and after it; Left and Right without modifiers step it through the color swatches whether it is on or off), highlight (on), color (the highlight color, #rrggbb or a layer color's name; #ff2a2a), width (the face highlight's width, 1–20 px; 4; an edge's highlight is half as wide); OK runs tool.setOption {tool: \"livePaintBucket\", values}; a color with an alpha part (#rrggbbaa or #rgba) is an error and OK changes nothing), shapeBuilder → Shape Builder Tool Options (dialog `shapeBuilderOptions`, fields gapDetection (off), gapLength (pt, 0–72; 3), openFilledAsClosed (on), clickStrokeSplitsPath (off), pickColorFrom: artwork|swatches (artwork), cursorSwatchPreview (off), selection: freeform|straightLine (freeform), highlightFill (on), highlightStroke (on), highlightColor (#rrggbb or a layer color's name; #ff4f4f); OK runs tool.setOption {tool: \"shapeBuilder\", values}; a highlightColor with an alpha part (#rrggbbaa or #rgba) is an error and OK changes nothing), objectsOnPath → Objects on Path Tool Options (dialog `objectsOnPathOptions`, fields pivot (0–8, row by row from the top left; 4, the center) and rotate (°, −360–360; 0); Reset puts 4 and 0 back; Save runs tool.setOption {tool: \"objectsOnPath\", values}: the objects attached next use them, groups attached before keep theirs)", ), ( "ui.colorGuideOptions", @@ -1163,6 +1198,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "", "{color?: #rrggbb or a preset name (Light Red, the default, then the layer colors such as \"Light Blue\"), solidDashes?: bool (Draw Dashed Lines as Solid Lines, off by default: the Navigator's thumbnail draws dashed strokes without their dashes; the canvas, printing and exports keep them), viewArtboardContentsOnly?: bool (View Artboard Contents Only in the panel menu, on by default and for UI state saved without it: the thumbnail fits the artboards and draws only the art inside them, cut at each artboard's edges; off, it also shows the art on the pasteboard)} set the Navigator panel's options, the color its view box is drawn in, solid dashes and artboard contents only (kept with the UI state) → {color, solidDashes, viewArtboardContentsOnly}; with none, open its Panel Options (dialog `navigatorPanelOptions`, fields color, solidDashes; OK sets them); an error for a value that is not a color or not true or false, which changes nothing", ), + ( + "ui.attributesPanelOptions", + "Panel Options…", + "", + "{count?: 1–30 (10 by default)} set how many of the recent URLs (attributes.info › recentUrls, which keeps 30) the Attributes panel's URL menu lists, newest first (kept with the UI state) → {count}; without count, open its Panel Options (dialog `attributesPanelOptions`, field count; OK sets it); an error for a count that is not a whole number from 1 to 30, which changes nothing", + ), ( "ui.layersExpand", "Expand Layers Panel Rows", @@ -1531,6 +1572,18 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "", "{} close the export progress dialog; the exports go on, shown in the status bar → {hidden: n}", ), + ( + "file.cancelSave", + "Cancel Save", + "", + "{} stop every save running in the background (Background Save) before it replaces its file: the file stays as it was and the document keeps its file and stays modified; a save whose file was already being replaced finishes and is reported as saved → {cancelled: n}", + ), + ( + "file.saveInBackground", + "Continue in Background", + "", + "{} close the save progress window; the saves go on, shown in the status bar → {hidden: n}", + ), ( "file.cancelOpen", "Cancel Opening", @@ -1735,6 +1788,12 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "", "{mode?: \"replace\" | \"append\"} Reset Actions. replace (the default) replaces every set in the Actions panel with a new copy of the built-in Default Actions set, makes it current and selected, clears the panel's selected action and step and its expanded actions, and closes an open Set Options, New Action, Batch or step dialog that names a set; when the panel already shows only the built-in set as it comes in that state, nothing changes, the sets keep their ids and changed is false. append adds a new copy of the built-in set after the sets there are, with the next free number when its name is in use (Default Actions 2), and keeps the current set and the selection. Omitted params count as {}. Params of another type, another key, another mode, or a reset while an action records or plays (also while it waits at a stop) is an error and changes nothing. No undo step is recorded. The panel menu's Reset Actions asks first (dialog `resetActions`): OK runs this with replace, Append with append → {changed, mode, set: the first built-in set's index}", ), + ( + "ui.actionSet.clear", + "Clear Actions", + "", + "{ids?: [id]} Clear Actions: delete every set in the Actions panel with its actions, the built-in Default Actions set included, so no set is current or selected; the panel's selected action and step and its expanded actions are cleared, and an open Set Options, New Action, Batch or step dialog that names a set closes. ids holds the panel's own set ids in panel order, which the menu's question passes: when the sets are no longer exactly those, nothing is deleted. With no sets, nothing changes and cleared is 0. Omitted params count as {}. Params of another type, another key, ids that is not a list of ids, or a clear while an action records or plays (also while it waits at a stop) is an error and changes nothing. No undo step is recorded. The panel menu's Clear Actions (disabled with no sets and while an action records or plays) asks first, and OK runs this → {cleared: the number of sets deleted}", + ), ("file.showPackage", "Show Package", "", "{folder} show a package folder (file.package's folder) in the file manager → {folder}"), ( "docInfo.save", diff --git a/crates/pathops/src/addons/pathtools.rs b/crates/pathops/src/addons/pathtools.rs index d8ad6ae8e4..ed01ec3ce8 100644 --- a/crates/pathops/src/addons/pathtools.rs +++ b/crates/pathops/src/addons/pathtools.rs @@ -4,10 +4,10 @@ //! tool shows over a path, open paths lengthened or shortened at an end ([`extend`]), the places //! where paths cross ([`crossings`]), the stretches between them ([`spans`]), anchors slid along //! their path ([`slide`]), touching edges merged ([`shared_edge`]), paths divided into dashes -//! ([`divide_dashes`]), two circles joined by a smooth bridge ([`smooth_bridge`]), the common -//! tangents of two convex outlines ([`common_tangents`]), the -//! Parametric Shape Tool's shapes ([`shapes`]) and the circles that touch two or three shapes -//! ([`tangent_circles`]). +//! ([`divide_dashes`]), two circles joined by a smooth bridge ([`smooth_bridge`]) or many circles +//! joined to their neighbors ([`bridge_many`]), the common tangents of two convex outlines +//! ([`common_tangents`]), the Parametric Shape Tool's shapes ([`shapes`]) and the circles that touch +//! two or three shapes ([`tangent_circles`]). mod bridge; mod crossings; @@ -27,7 +27,9 @@ use std::collections::BTreeSet; use kurbo::{CubicBez, ParamCurve, ParamCurveArclen, ParamCurveNearest, Point, Vec2}; use vectorcraft_geom::{Anchor, AnchorKind, PathData, SubPath}; -pub use bridge::{BridgeError, circle_of, smooth_bridge}; +pub use bridge::{ + ArcRadius, BridgeError, Bridged, Joined, MAX_BRIDGED_CIRCLES, MAX_BRIDGES, ManyError, bridge_many, bridges_any, circle_of, smooth_bridge, +}; pub use crossings::{MAX_CROSSED_BY_SEGMENTS, MAX_CROSSING_SEGMENTS, Place, Work, crossings, crossings_on, crossings_on_within, insert_at}; pub use dashes::{DashSpec, Piece, divide_dashes}; pub use extend::{ExtendMode, extend_length_to, extend_open}; diff --git a/crates/pathops/src/addons/pathtools/bridge.rs b/crates/pathops/src/addons/pathtools/bridge.rs index 43ee629a91..f0afa31dc8 100644 --- a/crates/pathops/src/addons/pathtools/bridge.rs +++ b/crates/pathops/src/addons/pathtools/bridge.rs @@ -1,10 +1,14 @@ //! Smooth Bridge: two circles joined into one outline by two concave arcs, each touching both -//! circles from outside, so the outline runs on smoothly from each circle into the bridge. +//! circles from outside, so the outline runs on smoothly from each circle into the bridge; and +//! many circles joined at once, each to the others within reach ([`bridge_many`]). +use std::collections::{BTreeMap, HashMap, HashSet}; use std::f64::consts::{FRAC_PI_2, PI, SQRT_2, TAU}; use kurbo::{CubicBez, ParamCurve, Point, Shape, Vec2}; -use vectorcraft_geom::{Anchor, AnchorKind, PathData, SubPath}; +use vectorcraft_geom::{Anchor, AnchorKind, FillRule, PathData, SubPath, shapes}; + +use crate::boolean::{DEFAULT_PRECISION, try_unite_all_with}; use super::Circle; @@ -58,6 +62,64 @@ pub fn circle_of(path: &PathData) -> Option { /// a tangent there. Overlapping and touching circles are joined too. A larger radius makes a wider, /// gentler bridge; farther apart circles make a narrower one, until the arcs would cross. pub fn smooth_bridge(a: Circle, b: Circle, radius: f64) -> Result { + let t = touches(a, b, radius)?; + let mut segs = vec![]; + arc(&mut segs, a.center, a.radius, t.a1, t.a2, Some(-t.u)); + arc(&mut segs, t.p2, radius, t.a2, t.b2, None); + arc(&mut segs, b.center, b.radius, t.b2, t.b1, Some(t.u)); + arc(&mut segs, t.p1, radius, t.b1, t.a1, None); + closed(&segs, AnchorKind::Smooth) +} + +/// The part of [`smooth_bridge`]'s outline between the circles: the two arcs, joined across each +/// circle by a straight line between the arc ends on it. Each line lies inside its circle, so the +/// two circles and this shape unite into the outline, with each circle drawn once however many +/// bridges it has. +fn neck(a: Circle, b: Circle, radius: f64) -> Result { + let t = touches(a, b, radius)?; + let line = |p: Point, q: Point| CubicBez::new(p, p, q, q); + let mut segs = vec![]; + arc(&mut segs, t.p2, radius, t.a2, t.b2, None); + segs.push(line(t.b2, t.b1)); + arc(&mut segs, t.p1, radius, t.b1, t.a1, None); + segs.push(line(t.a1, t.a2)); + closed(&segs, AnchorKind::Corner) +} + +/// A closed subpath through the cubics `segs`, each starting where the one before it ends, with +/// anchors of `kind`; [`BridgeError::Bad`] when a point does not fit in `f64`. +fn closed(segs: &[CubicBez], kind: AnchorKind) -> Result { + let count = segs.len(); + let anchors: Vec = (0..count) + .filter_map(|i| { + let (prev, seg) = (segs.get((i + count - 1) % count)?, segs.get(i)?); + Some(Anchor { p: seg.p0, h_in: prev.p2, h_out: seg.p1, kind }) + }) + .collect(); + let finite_point = |p: Point| p.x.is_finite() && p.y.is_finite(); + if !anchors.iter().all(|q| finite_point(q.p) && finite_point(q.h_in) && finite_point(q.h_out)) { + return Err(BridgeError::Bad); + } + Ok(SubPath::new(anchors, true)) +} + +/// Where the arcs of radius `radius` that bridge circles `a` and `b` lie: the unit vector from +/// `a`'s center to `b`'s, and on each side the arc's center (`p1`, `p2`) and where it touches `a` +/// and `b`; and the neck's width where the arcs come nearest each other between the circles +/// (infinite when that is at the circles). +struct Touches { + waist: f64, + u: Vec2, + p1: Point, + a1: Point, + b1: Point, + p2: Point, + a2: Point, + b2: Point, +} + +/// The arcs of [`smooth_bridge`], or why there are none. +fn touches(a: Circle, b: Circle, radius: f64) -> Result { let finite = |x: f64| x.is_finite() && x > 0.0; let points = [a.center, b.center].iter().all(|c| c.x.is_finite() && c.y.is_finite()); if !finite(radius) || !finite(a.radius) || !finite(b.radius) || !points { @@ -95,29 +157,237 @@ pub fn smooth_bridge(a: Circle, b: Circle, radius: f64) -> Result = (0..count) - .map(|i| { - let (prev, seg) = (segs[(i + count - 1) % count], segs[i]); - Anchor { p: seg.p0, h_in: prev.p2, h_out: seg.p1, kind: AnchorKind::Smooth } - }) - .collect(); - let finite_point = |p: Point| p.x.is_finite() && p.y.is_finite(); - if !anchors.iter().all(|q| finite_point(q.p) && finite_point(q.h_in) && finite_point(q.h_out)) { - return Err(BridgeError::Bad); + let waist = if along > 0.0 && along < d { 2.0 * (across - radius) } else { f64::INFINITY }; + Ok(Touches { waist, u, p1, a1, b1, p2, a2, b2 }) +} + +/// The most circles [`bridge_many`] takes. +pub const MAX_BRIDGED_CIRCLES: usize = 2000; +/// The most bridges [`bridge_many`] makes. +pub const MAX_BRIDGES: usize = 8000; +/// Holes [`bridge_many`] fills: those smaller than this share of the area of the smallest circle +/// they join. +const SPECK: f64 = 0.01; + +/// The radius of the arcs that bridge two circles. +#[derive(Clone, Copy, Debug, PartialEq)] +pub enum ArcRadius { + /// This share of the smaller circle's radius (1 is the same radius). + Share(f64), + /// The smaller circle's radius plus this gap (pt). Each arc is then this gap outside a circle + /// of the smaller circle's radius about the arc's center: for equal circles that gap apart, + /// the place of a third circle that gap from both, as in a triangular grid. + Gap(f64), +} + +impl ArcRadius { + /// The arcs' radius (pt) for circles `a` and `b`. + pub fn between(self, a: Circle, b: Circle) -> f64 { + let r = a.radius.min(b.radius); + match self { + ArcRadius::Share(share) => r * share, + ArcRadius::Gap(gap) => r + gap, + } } - Ok(SubPath::new(anchors, true)) +} + +/// Circles that bridges join into one shape: their indices, ascending, and the shape's outline. +#[derive(Clone, Debug, PartialEq)] +pub struct Joined { + pub members: Vec, + pub outline: PathData, +} + +/// What [`bridge_many`] makes: the joined shapes, in the order of their first member, and the +/// indices of the circles left alone, ascending. +#[derive(Clone, Debug, Default, PartialEq)] +pub struct Bridged { + pub joined: Vec, + pub alone: Vec, +} + +/// Why [`bridge_many`] makes nothing. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum ManyError { + /// More than [`MAX_BRIDGED_CIRCLES`] circles. + TooManyCircles, + /// More than [`MAX_BRIDGES`] pairs of circles within reach that the arcs can bridge. + TooManyBridges, + /// No two circles are within reach of each other. + NoneInReach, + /// The circles at these indices are within reach but [`smooth_bridge`] can't join them: one is + /// inside the other, or no pair within reach is near enough for the arcs (the first such pair). + Pair(usize, usize, BridgeError), + /// A reach that is not a finite size of 0 or more, or a circle that is not a finite size above 0. + Bad, + /// A joined shape too complex to unite. + TooComplex, +} + +/// Every pair of `circles` whose outlines are at most `reach` (pt) apart, overlapping ones +/// included, joined by a [`smooth_bridge`] with arcs of radius `arc`, and the bridges that connect +/// united into one shape each, without holes smaller than 1% of the smallest circle's area. A pair +/// too far apart for the arcs gets no bridge; a circle bridged to no other is left alone. One +/// circle inside another is an error, and so is no pair that the arcs can join. +pub fn bridge_many(circles: &[Circle], arc: ArcRadius, reach: f64) -> Result { + let (pairs, too_far, roots, precision) = bridgeable(circles, arc, reach)?; + match (pairs.is_empty(), too_far) { + (true, Some((i, j))) => return Err(ManyError::Pair(i, j, BridgeError::TooFar)), + (true, None) => return Err(ManyError::NoneInReach), + (false, _) => {} + } + let mut necks = Vec::with_capacity(pairs.len()); + for &((i, j), _) in &pairs { + let (a, b) = (circles[i], circles[j]); + let sp = neck(a, b, arc.between(a, b)).map_err(|e| ManyError::Pair(i, j, e))?; + necks.push(((i, j), PathData::single(sp))); + } + let mut sets: BTreeMap, Vec<&PathData>)> = BTreeMap::new(); + for &((i, j), ref neck) in &necks { + let (members, parts) = sets.entry(roots[i]).or_default(); + members.extend([i, j]); + parts.push(neck); + } + let mut out = Bridged::default(); + for (set, (mut members, parts)) in sets { + members.sort_unstable(); + members.dedup(); + // Each circle once, and the necks between them. + let rounds: Vec = members + .iter() + .filter_map(|&i| circles.get(i)) + .map(|c| shapes::ellipse(kurbo::Rect::from_center_size(c.center, (2.0 * c.radius, 2.0 * c.radius)))) + .collect(); + let fills: Vec<(&PathData, FillRule)> = rounds.iter().chain(parts).map(|p| (p, FillRule::NonZero)).collect(); + let smallest = members.iter().filter_map(|&i| circles.get(i)).map(|c| c.radius).fold(f64::INFINITY, f64::min); + let mut outline = try_unite_all_with(&fills, precision[set]).map_err(|_| ManyError::TooComplex)?; + // Where three bridges' arcs nearly meet, the union leaves a speck of a hole; a contour that + // encloses a circle is far larger than this. + let speck = SPECK * PI * smallest * smallest; + outline.subpaths.retain(|sp| PathData::single(sp.clone()).to_bezpath().area().abs() >= speck); + out.joined.push(Joined { members, outline }); + } + let joined: HashSet = necks.iter().flat_map(|&((i, j), _)| [i, j]).collect(); + out.alone = (0..circles.len()).filter(|i| !joined.contains(i)).collect(); + Ok(out) +} + +/// Whether [`bridge_many`] would bridge at least one pair of `circles` with arcs of `arc` and +/// `reach`, under the same rules (a neck too thin for its shape's precision included), without +/// making the bridges or uniting them. +pub fn bridges_any(circles: &[Circle], arc: ArcRadius, reach: f64) -> bool { + bridgeable(circles, arc, reach).is_ok_and(|(pairs, ..)| !pairs.is_empty()) +} + +/// What [`bridgeable`] finds: the pairs [`bridge_many`] bridges with their necks' widths, the +/// lowest pair within reach that it can't bridge, each circle's set (its lowest index) and each +/// set's precision, under its lowest index. +type Bridgeable = (Vec<(Pair, f64)>, Option, Vec, Vec); + +/// The pairs of `circles` that [`bridge_many`] bridges, and how it sorts them into sets. +fn bridgeable(circles: &[Circle], arc: ArcRadius, reach: f64) -> Result { + if circles.len() > MAX_BRIDGED_CIRCLES { + return Err(ManyError::TooManyCircles); + } + let fine = |c: &Circle| c.center.x.is_finite() && c.center.y.is_finite() && c.radius.is_finite() && c.radius > 0.0; + if !(reach.is_finite() && reach >= 0.0) || !circles.iter().all(fine) { + return Err(ManyError::Bad); + } + let (mut pairs, mut too_far) = pairs_within(circles, reach, arc)?; + // Each set of connected circles, under its lowest index, is united at a precision fine enough + // for its smallest circle. A neck narrower than twice that would not survive the union, so its + // pair gets no bridge; that can split a set and make its precision coarser, so the sets are + // found again until no neck is dropped. + let (roots, precision) = loop { + let mut parent: Vec = (0..circles.len()).collect(); + for &((i, j), _) in &pairs { + let (ri, rj) = (root(&mut parent, i), root(&mut parent, j)); + parent[ri.max(rj)] = ri.min(rj); + } + let roots: Vec = (0..circles.len()).map(|i| root(&mut parent, i)).collect(); + let mut precision = vec![DEFAULT_PRECISION; circles.len()]; + for (&r, c) in roots.iter().zip(circles) { + precision[r] = precision[r].min(c.radius * 1e-3); + } + let thin = |&((i, _), waist): &(Pair, f64)| waist < 2.0 * precision[roots[i]]; + if !pairs.iter().any(thin) { + break (roots, precision); + } + for &(pair, _) in pairs.iter().filter(|&p| thin(p)) { + too_far = Some(too_far.map_or(pair, |t| t.min(pair))); + } + pairs.retain(|p| !thin(p)); + }; + Ok((pairs, too_far, roots, precision)) +} + +/// Two circles' indices, the lower first. +type Pair = (usize, usize); +/// What [`pairs_within`] finds: the pairs the arcs can bridge, each with its neck's width, and the +/// lowest pair too far apart for them. +type Within = (Vec<(Pair, f64)>, Option); + +/// The set `i` is in: the lowest index in it, with the path to it shortened on the way. +fn root(parent: &mut [usize], mut i: usize) -> usize { + while parent[i] != i { + parent[i] = parent[parent[i]]; + i = parent[i]; + } + i +} + +/// Every pair of indices `(i, j)`, `i < j`, ascending, of `circles` whose outlines are at most +/// `reach` apart and that arcs of `arc` can bridge, with the width of the neck between them, and +/// the lowest pair within reach that they can't because it is too far apart for them. Circles go +/// into a grid of cells as wide as the farthest two centers within reach can be, so each circle is +/// compared only with those in its own cell and the eight around it. +fn pairs_within(circles: &[Circle], reach: f64, arc: ArcRadius) -> Result { + let biggest = circles.iter().map(|c| c.radius).fold(0.0, f64::max); + let cell = 2.0 * biggest + reach; + if !(cell.is_finite() && cell > 0.0) { + return Err(ManyError::Bad); + } + // Saturating casts: a cell beyond i64 shares the last one, which only adds comparisons. + let key = |p: Point| ((p.x / cell).floor() as i64, (p.y / cell).floor() as i64); + let mut grid: HashMap<(i64, i64), Vec> = HashMap::new(); + for (i, c) in circles.iter().enumerate() { + grid.entry(key(c.center)).or_default().push(i); + } + let (mut pairs, mut too_far) = (vec![], None::); + for (i, &c) in circles.iter().enumerate() { + let (x, y) = key(c.center); + for (dx, dy) in (-1..=1).flat_map(|dx| (-1..=1).map(move |dy| (dx, dy))) { + let Some(near) = grid.get(&(x.saturating_add(dx), y.saturating_add(dy))) else { continue }; + for &j in near.iter().filter(|&&j| j > i) { + let o = circles[j]; + if c.center.distance(o.center) - c.radius - o.radius > reach { + continue; + } + // Only the arcs' ends are worked out here; the bridge itself is made later. + match touches(c, o, arc.between(c, o)) { + Ok(t) => pairs.push(((i, j), t.waist)), + Err(BridgeError::TooFar) => too_far = Some(too_far.map_or((i, j), |t| t.min((i, j)))), + Err(e) => return Err(ManyError::Pair(i, j, e)), + } + } + } + // Saturated cells can list a pair twice, so the count is checked again after `dedup`. + if pairs.len() > 9 * MAX_BRIDGES { + return Err(ManyError::TooManyBridges); + } + } + pairs.sort_unstable_by_key(|&(pair, _)| pair); + pairs.dedup_by_key(|&mut (pair, _)| pair); + if pairs.len() > MAX_BRIDGES { + return Err(ManyError::TooManyBridges); + } + Ok((pairs, too_far)) } /// Append to `out` the arc of the circle about `center` with radius `r` from `from` to `to` (both @@ -331,6 +601,198 @@ mod tests { assert_eq!(smooth_bridge(circle(f64::INFINITY, 0.0, 10.0), b, 10.0), Err(BridgeError::Bad)); } + /// A 3 × 3 grid of circles of radius 10, 4 apart (centers 24 apart), top-left at the origin. + fn grid() -> Vec { + (0..9).map(|k| circle(24.0 * (k % 3) as f64, 24.0 * (k / 3) as f64, 10.0)).collect() + } + + fn area(path: &PathData) -> f64 { + crate::area(path, FillRule::NonZero) + } + + fn inside(path: &PathData, x: f64, y: f64) -> bool { + path.to_bezpath().winding(Point::new(x, y)) != 0 + } + + #[test] + fn a_grid_joins_each_circle_to_its_neighbors_within_reach() { + // Reach 5: the side neighbors (4 apart) are joined, the diagonal ones (about 13.9 apart) not. + let b = bridge_many(&grid(), ArcRadius::Gap(4.0), 5.0).unwrap(); + assert_eq!(b.alone, Vec::::new()); + let [one] = b.joined.as_slice() else { panic!("{} shapes", b.joined.len()) }; + assert_eq!(one.members, (0..9).collect::>()); + for (x, y) in [(12.0, 0.0), (0.0, 12.0), (36.0, 48.0), (48.0, 36.0), (24.0, 24.0)] { + assert!(inside(&one.outline, x, y), "bridged at ({x}, {y})"); + } + // Between four circles the side bridges' arcs leave a hole: no diagonal bridge fills it. + for (x, y) in [(12.0, 12.0), (36.0, 36.0)] { + assert!(!inside(&one.outline, x, y), "a hole at ({x}, {y})"); + } + let hull = PathData::single(SubPath::polyline( + &[Point::new(-10.0, -10.0), Point::new(58.0, -10.0), Point::new(58.0, 58.0), Point::new(-10.0, 58.0)], + true, + )); + assert!(area(&one.outline) < area(&hull)); + assert_eq!(one.outline.subpaths.len(), 5, "the outline and a hole in each square"); + // Reach 15 takes in the diagonal neighbors too, and their bridges fill the middle of each + // square. The specks of holes (about 0.1 pt²) where side and diagonal arcs nearly meet are + // filled. + let b = bridge_many(&grid(), ArcRadius::Gap(4.0), 15.0).unwrap(); + let [one] = b.joined.as_slice() else { panic!("{} shapes", b.joined.len()) }; + assert!(inside(&one.outline, 12.0, 12.0) && inside(&one.outline, 36.0, 36.0)); + assert_eq!(one.outline.subpaths.len(), 1); + } + + #[test] + fn a_circle_with_no_neighbor_in_reach_is_left_alone() { + let mut circles = grid(); + circles.truncate(2); + circles.push(circle(200.0, 0.0, 10.0)); + circles.push(circle(224.0, 0.0, 10.0)); + circles.push(circle(100.0, 100.0, 10.0)); + let b = bridge_many(&circles, ArcRadius::Share(1.0), 5.0).unwrap(); + assert_eq!(b.joined.iter().map(|j| j.members.clone()).collect::>(), [vec![0, 1], vec![2, 3]]); + assert_eq!(b.alone, [4]); + // Each pair alone is the two-circle bridge. + let two = smooth_bridge(circles[0], circles[1], 10.0).unwrap(); + let (got, want) = (area(&b.joined[0].outline), area(&PathData::single(two))); + assert!((got - want).abs() < 1e-3 * want, "{got} {want}"); + } + + #[test] + fn a_ring_around_an_empty_place_leaves_a_round_hole_the_gap_wider_than_a_circle() { + // Six circles of radius 10 around an empty place at the origin, each 4 from its two + // neighbors and from where a seventh circle would be (centers 24 from the origin). + let ring: Vec = (0..6).map(|k| f64::from(k) * PI / 3.0).map(|t| circle(24.0 * t.cos(), 24.0 * t.sin(), 10.0)).collect(); + let b = bridge_many(&ring, ArcRadius::Gap(4.0), 5.0).unwrap(); + let [one] = b.joined.as_slice() else { panic!("{} shapes", b.joined.len()) }; + assert_eq!(one.members, (0..6).collect::>()); + assert_eq!(one.outline.subpaths.len(), 2, "the outline and the hole"); + // The hole's edge is 14 from the origin all the way round: a circle of radius 10 there + // would be 4 from the shape everywhere, the same as from each of the six. + let hole = one.outline.subpaths.iter().min_by(|p, q| { + let size = |sp: &SubPath| PathData::single(sp.clone()).to_bezpath().area().abs(); + size(p).total_cmp(&size(q)) + }); + let edge = outline(hole.unwrap()); + let (near, far) = edge.iter().map(|p| p.distance(Point::ZERO)).fold((f64::INFINITY, 0.0f64), |(n, f), d| (n.min(d), f.max(d))); + assert!((near - 14.0).abs() < 1e-2 && (far - 14.0).abs() < 1e-2, "{near} to {far}"); + } + + #[test] + fn many_circles_make_the_two_circle_outline_for_each_pair() { + // Overlapping, touching, unequal and unequal overlapping pairs, each with a far circle. + for (a, b, share) in [ + (circle(0.0, 0.0, 20.0), circle(30.0, 0.0, 20.0), 0.5), + (circle(0.0, 0.0, 20.0), circle(40.0, 0.0, 20.0), 0.5), + (circle(0.0, 0.0, 30.0), circle(70.0, 0.0, 10.0), 4.0), + (circle(0.0, 0.0, 10.0), circle(25.0, 0.0, 30.0), 10.0), + // Circles far smaller than the union's usual precision (0.01 pt). + (circle(0.0, 0.0, 0.004), circle(0.01, 0.0, 0.004), 1.0), + ] { + let made = bridge_many(&[a, b, circle(1000.0, 0.0, 5.0)], ArcRadius::Share(share), 40.0).unwrap(); + assert_eq!(made.alone, [2]); + let two = smooth_bridge(a, b, share * a.radius.min(b.radius)).unwrap(); + let (got, want) = (area(&made.joined[0].outline), area(&PathData::single(two))); + assert!((got - want).abs() < 1e-3 * want, "{a:?}: {got} {want}"); + } + } + + #[test] + fn a_pair_too_far_apart_for_the_arcs_gets_no_bridge() { + // b and c are within reach (6 apart) but arcs of radius 3 close before they reach both. + let (a, b, c) = (circle(0.0, 0.0, 3.0), circle(8.0, 0.0, 3.0), circle(20.0, 0.0, 3.0)); + assert_eq!(smooth_bridge(b, c, 3.0), Err(BridgeError::TooFar)); + let made = bridge_many(&[a, b, c], ArcRadius::Share(1.0), 10.0).unwrap(); + assert_eq!(made.joined.iter().map(|j| j.members.clone()).collect::>(), [vec![0, 1]]); + assert_eq!(made.alone, [2]); + // Arcs of radius 10 between circles of radius 10 just under 20√3 apart leave a neck about + // 0.00003 pt wide, too thin for the union: that pair is left unbridged too. + let (a, b, c) = (circle(0.0, 0.0, 10.0), circle(34.6409, 0.0, 10.0), circle(58.6409, 0.0, 10.0)); + assert!(smooth_bridge(a, b, 10.0).is_ok(), "two circles alone are bridged"); + let made = bridge_many(&[a, b, c], ArcRadius::Share(1.0), 20.0).unwrap(); + assert_eq!(made.joined.iter().map(|j| j.members.clone()).collect::>(), [vec![1, 2]]); + assert_eq!(made.alone, [0]); + // Two tiny circles far off are united at a finer precision, which does not change that. + let tiny = [circle(500.0, 0.0, 0.01), circle(500.025, 0.0, 0.01)]; + let made = bridge_many(&[a, b, c, tiny[0], tiny[1]], ArcRadius::Share(1.0), 20.0).unwrap(); + assert_eq!(made.joined.iter().map(|j| j.members.clone()).collect::>(), [vec![1, 2], vec![3, 4]]); + assert_eq!(made.alone, [0]); + // 260 touching circles in a row with a wide reach: 33,670 pairs within reach, far more than + // the bridge limit, but only the 259 touching pairs are near enough for the arcs. + let row: Vec = (0..260).map(|i| circle(f64::from(i) * 20.0, 0.0, 10.0)).collect(); + let made = bridge_many(&row, ArcRadius::Share(1.0), 6000.0).unwrap(); + let [one] = made.joined.as_slice() else { panic!("{} shapes", made.joined.len()) }; + assert_eq!(one.members.len(), 260); + assert!(made.alone.is_empty()); + } + + #[test] + fn the_gap_form_keeps_the_gap_from_a_circle_at_each_arcs_center() { + // Two circles 4 apart; with a gap of 4 each arc's center is 24 from both centers, where a + // third circle of the same size is 4 from both (as in a triangular grid). + let (a, b) = (circle(0.0, 0.0, 10.0), circle(24.0, 0.0, 10.0)); + let r = ArcRadius::Gap(4.0).between(a, b); + assert_eq!(r, 14.0); + let sp = smooth_bridge(a, b, r).unwrap(); + for third in [circle(12.0, 432f64.sqrt(), 10.0), circle(12.0, -(432f64.sqrt()), 10.0)] { + let gaps: Vec = outline(&sp).iter().map(|p| p.distance(third.center) - third.radius).collect(); + // No part of the bridge comes nearer than the gap, and a stretch of it is that gap away. + assert!(gaps.iter().all(|&g| g > 4.0 - 1e-2), "{:?}", gaps.iter().copied().fold(f64::INFINITY, f64::min)); + let along = gaps.iter().filter(|&&g| (g - 4.0).abs() < 1e-2).count(); + assert!(along >= 32, "{along}"); + } + // The same for unequal circles: the gap is kept from a circle of the smaller one's size. + let (a, b) = (circle(0.0, 0.0, 15.0), circle(30.0, 5.0, 8.0)); + let r = ArcRadius::Gap(3.0).between(a, b); + let sp = smooth_bridge(a, b, r).unwrap(); + let d = (b.center - a.center).hypot(); + let (ra, rb) = (15.0 + r, 8.0 + r); + let along = (d * d + ra * ra - rb * rb) / (2.0 * d); + let u = (b.center - a.center) / d; + let center = a.center + u * along + Vec2::new(-u.y, u.x) * (ra * ra - along * along).sqrt(); + let gaps: Vec = outline(&sp).iter().map(|p| p.distance(center) - 8.0).collect(); + assert!(gaps.iter().all(|&g| g > 3.0 - 1e-2) && gaps.iter().filter(|&&g| (g - 3.0).abs() < 1e-2).count() >= 16); + } + + #[test] + fn the_gap_form_is_the_percentage_form_of_the_radius_plus_the_gap() { + for (a, b, gap) in [(circle(0.0, 0.0, 10.0), circle(24.0, 0.0, 10.0), 4.0), (circle(0.0, 0.0, 20.0), circle(40.0, 30.0, 10.0), 7.5)] { + let small = a.radius.min(b.radius); + let share = ArcRadius::Share((small + gap) / small); + assert!((ArcRadius::Gap(gap).between(a, b) - share.between(a, b)).abs() < 1e-12); + let (g, s) = (smooth_bridge(a, b, ArcRadius::Gap(gap).between(a, b)).unwrap(), smooth_bridge(a, b, share.between(a, b)).unwrap()); + for (p, q) in g.anchors.iter().zip(&s.anchors) { + assert!(p.p.distance(q.p) < 1e-9 && p.h_in.distance(q.h_in) < 1e-9 && p.h_out.distance(q.h_out) < 1e-9); + } + assert_eq!(g.anchors.len(), s.anchors.len()); + } + // Over a grid the two forms make the same shape too. + let by_gap = bridge_many(&grid(), ArcRadius::Gap(4.0), 5.0).unwrap(); + let by_share = bridge_many(&grid(), ArcRadius::Share(1.4), 5.0).unwrap(); + let (g, s) = (area(&by_gap.joined[0].outline), area(&by_share.joined[0].outline)); + assert!((g - s).abs() < 1e-6 * g, "{g} {s}"); + } + + #[test] + fn too_many_circles_or_bridges_and_bad_pairs_are_refused() { + let many = vec![circle(0.0, 0.0, 1.0); MAX_BRIDGED_CIRCLES + 1]; + assert_eq!(bridge_many(&many, ArcRadius::Share(1.0), 1.0), Err(ManyError::TooManyCircles)); + // 200 circles in a tight row: 19,900 pairs within reach. + let row: Vec = (0..200).map(|i| circle(i as f64 * 0.1, 0.0, 10.0)).collect(); + assert_eq!(bridge_many(&row, ArcRadius::Share(1.0), 1.0), Err(ManyError::TooManyBridges)); + let spread: Vec = (0..3).map(|i| circle(i as f64 * 100.0, 0.0, 10.0)).collect(); + assert_eq!(bridge_many(&spread, ArcRadius::Share(1.0), 5.0), Err(ManyError::NoneInReach)); + let nested = [circle(0.0, 0.0, 30.0), circle(5.0, 0.0, 10.0), circle(200.0, 0.0, 10.0)]; + assert_eq!(bridge_many(&nested, ArcRadius::Share(1.0), 5.0), Err(ManyError::Pair(0, 1, BridgeError::Inside))); + // Within reach (40 apart) but too far for arcs of radius 1. + let far = [circle(0.0, 0.0, 10.0), circle(60.0, 0.0, 10.0), circle(300.0, 0.0, 10.0)]; + assert_eq!(bridge_many(&far, ArcRadius::Share(0.1), 50.0), Err(ManyError::Pair(0, 1, BridgeError::TooFar))); + assert_eq!(bridge_many(&far, ArcRadius::Share(1.0), f64::NAN), Err(ManyError::Bad)); + assert_eq!(bridge_many(&far, ArcRadius::Share(1.0), -1.0), Err(ManyError::Bad)); + assert_eq!(bridge_many(&[circle(f64::INFINITY, 0.0, 1.0), far[0]], ArcRadius::Share(1.0), 1.0), Err(ManyError::Bad)); + } + #[test] fn huge_circles_bridge_with_finite_anchors_or_are_refused() { // Squaring these lengths overflows f64. diff --git a/crates/svg/src/import/text.rs b/crates/svg/src/import/text.rs index f814ea65a9..55a14740b1 100644 --- a/crates/svg/src/import/text.rs +++ b/crates/svg/src/import/text.rs @@ -29,7 +29,7 @@ use craft_svg::tree::usvg; use std::borrow::Cow; -use std::cell::RefCell; +use std::cell::{OnceCell, RefCell}; use std::collections::HashMap; use std::fmt::Write as _; use std::ops::{Range, RangeInclusive}; @@ -774,6 +774,10 @@ struct Ctx { /// no usable one. The styles of a `` instance share it, so each path is found and parsed /// once however many `` elements show its text. paths: Rc>>>>, + /// Each element id in the document and the first element in document order that carries it + /// ([`Self::element`]). It is built when the first `` names an element, and the + /// styles of a `` instance share it. + ids: Rc, roxmltree::NodeId>>>, } /// The path a `` follows ([`Ctx::text_path`]). @@ -788,6 +792,11 @@ struct FollowedPath { thread_local! { /// How many times [`Ctx::read_text_path`] has read a ``'s path on this thread. static TEXT_PATH_READS: std::cell::Cell = const { std::cell::Cell::new(0) }; + /// How many times [`Ctx::element`] has walked a document's elements on this thread. + static ID_WALKS: std::cell::Cell = const { std::cell::Cell::new(0) }; + /// When set, [`Ctx::element`] walks the document for each id instead of using the map, so + /// tests can compare the two. + static LINEAR_IDS: std::cell::Cell = const { std::cell::Cell::new(false) }; } impl Ctx { @@ -802,6 +811,7 @@ impl Ctx { elems: RefCell::default(), strong: RefCell::default(), paths: Rc::default(), + ids: Rc::default(), }; let root = xml.root_element(); let dim = |a: &str| root.attribute(a).and_then(|v| cx.length(v, DEFAULT_FONT_SIZE, 0.0)).filter(|v| *v > 0.0); @@ -824,6 +834,7 @@ impl Ctx { elems: RefCell::default(), strong: RefCell::default(), paths: self.paths.clone(), + ids: self.ids.clone(), } } @@ -1219,7 +1230,7 @@ impl Ctx { Some(d) => BezPath::from_svg(d).ok()?, None => { let id = href(tp)?.trim().strip_prefix('#')?; - let el = xml.descendants().find(|n| n.is_element() && n.attribute("id") == Some(id))?; + let el = self.element(xml, id)?; let d = match el.tag_name().name() { "path" => el.attribute("d")?.to_string(), _ => self.shape_path(el)?, @@ -1238,6 +1249,32 @@ impl Ctx { usable.then_some(FollowedPath { path: bp, author_length }) } + /// The first element in document order whose `id` is `id`, as the DOM's `getElementById` + /// finds it (https://dom.spec.whatwg.org/#dom-nonelementparentnode-getelementbyid). The first + /// call walks `xml` once to build [`Self::ids`]; later calls look the id up there. `xml` is + /// the document [`Self::new`] read. + fn element<'a, 'i>(&self, xml: &'a roxmltree::Document<'i>, id: &str) -> Option> { + #[cfg(test)] + if LINEAR_IDS.get() { + ID_WALKS.set(ID_WALKS.get() + 1); + return xml.descendants().find(|n| n.is_element() && n.attribute("id") == Some(id)); + } + let ids = self.ids.get_or_init(|| { + #[cfg(test)] + ID_WALKS.set(ID_WALKS.get() + 1); + let mut ids = HashMap::new(); + for n in xml.descendants().filter(|n| n.is_element()) { + if let Some(id) = n.attribute("id") { + ids.entry(Box::from(id)).or_insert(n.id()); + } + } + ids + }); + let el = xml.get_node(*ids.get(id)?)?; + debug_assert_eq!(el.attribute("id"), Some(id), "the id map was built from another document"); + Some(el) + } + /// The equivalent path of a basic shape (SVG 2 › Basic Shapes), as path data: what a /// `` that points at it follows. Circles and ellipses start at 3 o'clock and rounded /// rects at the end of the top-left corner, all running clockwise; lines and polylines follow diff --git a/crates/svg/src/import/text/tests.rs b/crates/svg/src/import/text/tests.rs index a6bcf07265..18ec0ec102 100644 --- a/crates/svg/src/import/text/tests.rs +++ b/crates/svg/src/import/text/tests.rs @@ -1,4 +1,5 @@ use super::*; +use vectorcraft_doc::Document; /// The texts [`prepare`] builds from `body` and how many times it read a ``'s path. fn prepared(body: &str) -> (usize, u64, Vec) { @@ -27,3 +28,134 @@ fn uses_of_a_text_on_a_path_read_the_path_once() { )); assert_eq!((texts, reads), (51, 1)); } + +/// How many times [`prepare`] walked the document's elements to find the element a +/// `` names. +fn id_walks(body: &str) -> u64 { + let svg = format!(r#"{body}"#); + let xml = roxmltree::Document::parse(&svg).unwrap(); + let before = ID_WALKS.get(); + prepare(&svg, &xml, None, 96.0, &mut vec![]); + ID_WALKS.get() - before +} + +/// The texts on paths in one file find the elements they name through one walk of the document. +#[test] +fn text_paths_find_their_elements_in_one_walk() { + let paths: String = (0..20).map(|i| format!(r#""#)).collect(); + let texts: String = (0..20).map(|i| format!(r##"Path"##)).collect(); + assert_eq!(id_walks(&format!("{paths}{texts}")), 1); + // Texts shown only through `` elements share the walk, and a missing id needs no other. + let uses: String = (0..20).map(|i| format!(r##""##)).collect(); + let missing = r##"Path"##; + assert_eq!(id_walks(&format!("{paths}{texts}{uses}{missing}")), 1); + // A file whose texts name no element is not walked. + assert_eq!(id_walks(r#"PlainInline"#), 0); + assert_eq!(id_walks(r#"No hash"#), 0); +} + +/// The document and warnings [`crate::import`] gives for `body`, with each ``'s +/// element found through the map of ids or, with `linear`, by walking the document for each one. +fn imported(body: &str, linear: bool) -> (Document, Vec) { + let svg = format!(r#"{body}"#); + LINEAR_IDS.set(linear); + let out = crate::import::import(&svg, &crate::ImportOptions::default(), crate::MAX_NODES); + LINEAR_IDS.set(false); + out.unwrap_or_else(|e| panic!("{e}")) +} + +/// The text objects of `d`, in paint order. +fn text_objects(d: &Document) -> Vec { + let mut v = vec![]; + d.walk(|n| { + if let vectorcraft_doc::NodeKind::Text(t) = &n.kind { + v.push((**t).clone()); + } + }); + v +} + +/// The map of ids finds the element the document walk finds: the first element in document order +/// with the id, whatever it is. +#[test] +fn text_paths_find_the_element_a_document_walk_finds() { + let cases = [ + // Several paths, one of them named twice, and shapes. + r##" + + First + Second + Circle + Rect"##, + // A missing id, an empty one, and one without a `#`. + r##"Missing + EmptyBare"##, + // The first element with the id has no path; the later path is not used. + r##"Group"##, + // Ids on texts and groups, one of them named twice. + r##"SelfLaterGroup"##, + // Uses of texts on paths, and an inline path beside an href. + r##"Used + Inline"##, + ]; + for body in cases { + let map = imported(body, false); + assert_eq!(map, imported(body, true), "{body}"); + assert!(!text_objects(&map.0).is_empty(), "{body}"); + } +} + +/// With two elements of one id, a `` follows the first. +#[test] +fn a_text_path_follows_the_first_element_with_its_id() { + let text = r##"Path"##; + let first = text_objects(&imported(&format!(r#"{text}"#), false).0); + let only = text_objects(&imported(&format!(r#"{text}"#), false).0); + let second = text_objects(&imported(&format!(r#"{text}"#), false).0); + assert!(matches!(first[0].kind, TextKind::OnPath { .. }), "{:?}", first[0].kind); + assert_eq!(first, only); + assert_ne!(first, second); + // A first element with no path leaves the text without one. + let (doc, warnings) = imported(&format!(r#"{text}"#), false); + assert!(!matches!(text_objects(&doc)[0].kind, TextKind::OnPath { .. }), "{warnings:?}"); +} + +/// Times importing a file with 20,000 paths and 2,000 texts on paths, finding each ``'s +/// element through the map of ids and by walking the document for each one, after checking that +/// the two give the same document. Run it with +/// `cargo test --release -p vectorcraft-svg --lib text_path_lookup_timing -- --ignored --nocapture`. +#[test] +#[ignore = "timing; run by hand in a release build"] +fn text_path_lookup_timing() { + let mut body = String::new(); + for i in 0..20_000 { + let _ = write!(body, r#""#, i % 400, i % 400); + if i % 10 == 9 { + let k = (i * 7919) % 20_000; + let _ = write!(body, r##"L{i}"##); + } + } + let svg = format!(r#"{body}"#); + let run = |linear: bool| { + LINEAR_IDS.set(linear); + let start = std::time::Instant::now(); + let out = crate::import::import(&svg, &crate::ImportOptions::default(), crate::MAX_NODES); + let took = start.elapsed(); + LINEAR_IDS.set(false); + (out.unwrap_or_else(|e| panic!("{e}")), took) + }; + let (map, _) = run(false); + let (walk, _) = run(true); + assert_eq!(map, walk); + assert_eq!(text_objects(&map.0).len(), 2_000); + let (mut maps, mut walks) = (vec![], vec![]); + for _ in 0..7 { + walks.push(run(true).1); + maps.push(run(false).1); + } + println!("walk per textPath: {walks:?}"); + println!("map of ids: {maps:?}"); + walks.sort(); + maps.sort(); + println!("median: walk {:?}, map {:?}", walks[3], maps[3]); +} diff --git a/crates/tools/src/draw2/anchor.rs b/crates/tools/src/draw2/anchor.rs index 3389746f2d..93d2595016 100644 --- a/crates/tools/src/draw2/anchor.rs +++ b/crates/tools/src/draw2/anchor.rs @@ -4,7 +4,8 @@ //! Delete: click an anchor to remove it, re-fitting the neighbouring curve (Alt = add). //! Anchor Point: click a smooth anchor → corner; drag an anchor → pull out smooth handles; click a //! handle end → retract that handle only (#2267); drag a handle → move it independently (Shift: at -//! 45° steps round its anchor); drag a segment → reshape the curve, a selected blend's spine's too, +//! 45° steps round its anchor; Alt: link it with the opposite handle, the anchor made smooth, except +//! when the Pen lends the tool); drag a segment → reshape the curve, a selected blend's spine's too, //! straight or curved (#1111; Shift: its handles at right angles to the line between its anchors, //! at one length). Shift held at the press on an anchor moves it instead, handles and all (Shift //! still held: at 45° steps from where it was). Space held during a convert- or handle-drag moves @@ -103,6 +104,9 @@ pub struct AnchorTool { measure: Option<(Point, f64, f64)>, /// While Space is held during a convert/handle drag, the shape gesture to return to. space_resume: Option, + /// Lent by the Pen for its Alt gestures: Alt-dragging a handle moves it independently, as + /// without Alt, instead of linking it with the opposite handle. + lent: bool, } impl AnchorTool { @@ -113,7 +117,20 @@ impl AnchorTool { "scissors" => "scissors", _ => "addAnchor", }; - Self { id, state: State::Idle, guides: vec![], snap: HandleSnap::default(), measure: None, space_resume: None } + Self { id, state: State::Idle, guides: vec![], snap: HandleSnap::default(), measure: None, space_resume: None, lent: false } + } + + /// The Anchor Point tool as the Pen lends it with Alt held: an Alt-drag on a handle moves only + /// that handle. + pub(crate) fn lent_by_pen() -> Self { + Self { lent: true, ..Self::new("anchorPoint") } + } + + /// The handle-drag params: Alt held on the chosen Anchor Point tool links the handle with the + /// opposite one, making the anchor smooth; otherwise the handle moves independently. + fn handle_mode(&self, mut params: serde_json::Value, alt: bool) -> serde_json::Value { + params[if alt && !self.lent { "link" } else { "independent" }] = json!(true); + params } fn anchor_pos(cx: &ToolContext, id: NodeId, si: usize, ai: usize) -> Option { @@ -458,7 +475,10 @@ impl Tool for AnchorTool { }; Action::Preview( "object.blend.spine.moveAnchor".into(), - json!({"id": id.0, "anchor": ai, "handle": if out { "out" } else { "in" }, "x": q.x, "y": q.y, "independent": true}), + self.handle_mode( + json!({"id": id.0, "anchor": ai, "handle": if out { "out" } else { "in" }, "x": q.x, "y": q.y}), + ev.mods.alt, + ), ) } State::Handle { id, si, ai, out, .. } => { @@ -466,7 +486,10 @@ impl Tool for AnchorTool { self.guides = guides; Action::Preview( "path.setHandle".into(), - json!({"id": id.0, "subpath": si, "anchor": ai, "which": if out { "out" } else { "in" }, "x": q.x, "y": q.y, "independent": true}), + self.handle_mode( + json!({"id": id.0, "subpath": si, "anchor": ai, "which": if out { "out" } else { "in" }, "x": q.x, "y": q.y}), + ev.mods.alt, + ), ) } State::Reshape { id, seg, t, start, spine: true, .. } => Action::Preview( diff --git a/crates/tools/src/draw2/anchor/tests.rs b/crates/tools/src/draw2/anchor/tests.rs index 903ae5bea8..4e4af7f997 100644 --- a/crates/tools/src/draw2/anchor/tests.rs +++ b/crates/tools/src/draw2/anchor/tests.rs @@ -610,3 +610,88 @@ fn anchor_point_shift_drag_honors_measurement_labels() { assert!(t.overlays(&on).iter().any(|o| matches!(o, Overlay::Measure { text, .. } if text == &want))); assert!(!t.overlays(&off).iter().any(|o| matches!(o, Overlay::Measure { .. }))); } + +/// Alt held while dragging a handle links it with the opposite handle (`link`), making the +/// anchor smooth; without Alt the handle moves on its own. Shift with Alt keeps the 45° steps, an +/// Alt-click still retracts the handle, and Escape cancels the linking drag. The Pen, lending the +/// tool for its Alt gestures, keeps moving the handle on its own. +#[test] +fn anchor_point_alt_drag_links_a_handle_with_the_opposite_one() { + let (mut d, _) = doc_with_rect(); + let l = d.layers[0].id; + let id = d.alloc_id(); + let mut sp = vectorcraft_geom::SubPath::polyline(&[Point::new(100.0, 300.0), Point::new(200.0, 300.0), Point::new(300.0, 300.0)], false); + // A corner: handles at (240, 320) and (170, 320), not in line. + sp.anchors[1] = Anchor::with_handles(Point::new(200.0, 300.0), Point::new(170.0, 320.0), Point::new(240.0, 320.0)); + let path = vectorcraft_geom::PathData::single(sp); + d.insert(Some(l), 1, vectorcraft_doc::Node::path(id, path, vectorcraft_doc::Appearance::default_art())).unwrap(); + let mut s = Selection::default(); + s.set([id]); + let p = paint(); + let cx = cx(&d, &s, &p); + let alt = Mods { alt: true, ..Mods::default() }; + let drag = |t: &mut AnchorTool, mods: Mods, x: f64, y: f64| { + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 240.0, 320.0).with_mods(mods)); + t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, x, y).with_mods(mods)) + }; + let set = |x: f64, y: f64, key: &str| { + let mut params = json!({"id": id.0, "subpath": 0, "anchor": 1, "which": "out", "x": x, "y": y}); + params[key] = json!(true); + Action::Preview("path.setHandle".into(), params) + }; + + let mut t = AnchorTool::new("anchorPoint"); + assert_eq!(drag(&mut t, alt, 250.0, 340.0), vec![Action::Begin("Reshape".into()), set(250.0, 340.0, "link")]); + assert_eq!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 340.0).with_mods(alt)), vec![Action::Commit]); + // Without Alt the handle moves on its own, as before. + assert_eq!(drag(&mut t, Mods::default(), 250.0, 340.0), vec![Action::Begin("Reshape".into()), set(250.0, 340.0, "independent")]); + t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 340.0)); + + // Shift with Alt: the linked handle stays at 45° steps round its anchor. + let shift_alt = Mods { shift: true, alt: true, ..Mods::default() }; + let a = drag(&mut t, shift_alt, 250.0, 345.0); + let Some(Action::Preview(c, args)) = a.get(1) else { panic!("{a:?}") }; + assert_eq!((c.as_str(), &args["link"], args.get("independent")), ("path.setHandle", &json!(true), None)); + let (dx, dy) = (args["x"].as_f64().unwrap_or(f64::NAN) - 200.0, args["y"].as_f64().unwrap_or(f64::NAN) - 300.0); + assert!(dx > 0.0 && (dx - dy).abs() < 1e-6, "{args}"); + t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 345.0)); + + // An Alt-click on the handle retracts it, as a click without Alt does. + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 240.0, 320.0).with_mods(alt)); + assert_eq!( + t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 240.0, 320.0).with_mods(alt)), + vec![Action::Exec( + "path.setHandle".into(), + json!({"id": id.0, "subpath": 0, "anchor": 1, "which": "out", "x": 200.0, "y": 300.0, "independent": true}) + )] + ); + + // Escape cancels the linking drag; its release does nothing. + drag(&mut t, alt, 250.0, 340.0); + assert_eq!(t.key(&cx, ToolKey::Escape, Mods::default()), vec![Action::Cancel]); + assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 250.0, 340.0).with_mods(alt)).is_empty()); + + // Lent by the Pen, Alt-drag moves the handle on its own. + let mut lent = AnchorTool::lent_by_pen(); + assert_eq!(drag(&mut lent, alt, 250.0, 340.0), vec![Action::Begin("Reshape".into()), set(250.0, 340.0, "independent")]); +} + +/// Alt-dragging a selected blend's spine handle links it with the opposite one. +#[test] +fn anchor_point_alt_drag_links_a_blend_spine_handle() { + let (d, id, sel) = blend_spine_doc(true); + let p = paint(); + let c = cx(&d, &sel, &p); + let alt = Mods { alt: true, ..Mods::default() }; + let mut tool = AnchorTool::new("anchorPoint"); + tool.pointer(&c, &PointerEvent::new(PointerKind::Down, 190.0, 330.0).with_mods(alt)); + let actions = tool.pointer(&c, &PointerEvent::new(PointerKind::Drag, 190.0, 350.0).with_mods(alt)); + assert_eq!( + actions.get(1), + Some(&Action::Preview( + "object.blend.spine.moveAnchor".into(), + json!({"id": id.0, "anchor": 1, "handle": "out", "x": 190.0, "y": 350.0, "link": true}) + )) + ); + assert_eq!(tool.pointer(&c, &PointerEvent::new(PointerKind::Up, 190.0, 350.0).with_mods(alt)), vec![Action::Commit]); +} diff --git a/crates/tools/src/extra.rs b/crates/tools/src/extra.rs index 5eed055eaa..d9d210096e 100644 --- a/crates/tools/src/extra.rs +++ b/crates/tools/src/extra.rs @@ -6,7 +6,9 @@ //! on macOS) draws a flare there with them at once), then a click sets the //! end point of the rings (↑/↓ add or remove rings and ~ places them anew); Space held during //! either drag moves the flare. The rest comes -//! from the tool's options (the Flare Tool Options, which last). Reshape: a click on a selected +//! from the tool's options (the Flare Tool Options, which last). With one flare selected, the tool +//! shows its center and end handles, and dragging either changes the flare's length and direction +//! (`shape.editFlare`). Reshape: a click on a selected //! path sets a focal point (adding an anchor on a segment), Shift-click adds or removes more, and //! a drag from a focal point moves them all; the engine's `path.reshape` stretches the selected //! anchors between them and the anchors that stay. @@ -83,6 +85,40 @@ pub struct FlareTool { /// Whether the flare has rays and rings (the options' Rays and Rings checkboxes). rays_on: bool, rings_on: bool, + /// A drag of the selected flare's center or end handle. + handle: Option, +} + +/// A drag of a selected flare's handle: the flare, whether it is the end handle (else the center), +/// where the handle was, where it was pressed, whether Alt (Option on macOS) was held at the press +/// and whether the drag has begun its undo step. +#[derive(Clone, Copy, Debug)] +struct HandleDrag { + id: vectorcraft_doc::NodeId, + end: bool, + from: Point, + at: Point, + alt: bool, + began: bool, +} + +/// The flare whose handles the Flare tool shows: the one selected object, when it is a flare that +/// can be edited, with its center and the rings' end point. +fn selected_flare(cx: &ToolContext) -> Option<(vectorcraft_doc::NodeId, Point, Point)> { + let [id] = cx.selection.objects.as_slice() else { return None }; + if !cx.doc.is_editable(*id) { + return None; + } + let node = cx.doc.node(*id)?; + let spec = node.extras().flare.as_deref().filter(|spec| spec.draws(node))?; + Some((*id, spec.center()?, spec.end()?)) +} + +/// `shape.editFlare`'s params for handle drag `h` with the pointer at `pointer`: the handle moves +/// as far as the pointer has. +fn handle_params(h: HandleDrag, pointer: Point) -> Value { + let p = h.from + (pointer - h.at); + if h.end { json!({ "ids": [h.id.0], "x2": p.x, "y2": p.y }) } else { json!({ "ids": [h.id.0], "cx": p.x, "cy": p.y }) } } impl Default for FlareTool { @@ -104,6 +140,7 @@ impl Default for FlareTool { values: FLARE_OPTIONS.map(|(_, default, _, _)| default), rays_on: true, rings_on: true, + handle: None, } } } @@ -251,7 +288,7 @@ impl Tool for FlareTool { "flare" } fn busy(&self) -> bool { - self.drag.is_some() || self.placed.is_some() + self.drag.is_some() || self.placed.is_some() || self.handle.is_some() } fn pointer(&mut self, cx: &ToolContext, ev: &PointerEvent) -> Vec { self.hover = ev.pos; @@ -261,8 +298,43 @@ impl Tool for FlareTool { if quote_pressed && self.rings_on && self.placed.is_some() && matches!(ev.kind, PointerKind::Drag | PointerKind::Move | PointerKind::Up) { self.ring_seed = Some(next_ring_seed(self.ring_seed, ev.pos)); } + if let Some(mut h) = self.handle { + return match ev.kind { + PointerKind::Drag if h.began => vec![Action::Preview("shape.editFlare".into(), handle_params(h, ev.pos))], + PointerKind::Drag if ev.pos.distance(h.at) < cx.tol(3.0) => vec![], + PointerKind::Drag => { + h.began = true; + self.handle = Some(h); + vec![Action::Begin("Edit Flare".into()), Action::Preview("shape.editFlare".into(), handle_params(h, ev.pos))] + } + PointerKind::Up => { + self.handle = None; + if h.began { + vec![Action::Preview("shape.editFlare".into(), handle_params(h, ev.pos)), Action::Commit] + } else if h.alt { + // A click on a handle without a drag is a click with the tool. + self.click_flare(cx, h.at) + } else { + vec![Action::Dialog("flare".into(), json!({ "x": h.at.x, "y": h.at.y }))] + } + } + _ => vec![], + }; + } match ev.kind { PointerKind::Down => { + // A press on the selected flare's center or end handle drags that handle. + if self.placed.is_none() + && let Some((id, c, e)) = selected_flare(cx) + { + let tol = cx.tol(4.0); + let (dc, de) = (ev.pos.distance(c), ev.pos.distance(e)); + if dc.min(de) <= tol { + let end = de < dc; + self.handle = Some(HandleDrag { id, end, from: if end { e } else { c }, at: ev.pos, alt: ev.mods.alt, began: false }); + return vec![]; + } + } if self.placed.is_none() { self.drag = Some((ev.pos, ev.pos)); self.rays = None; @@ -350,6 +422,11 @@ impl Tool for FlareTool { }; return vec![Action::Preview("shape.flare".into(), preview)]; } + if key == ToolKey::Escape + && let Some(h) = self.handle.take() + { + return if h.began { vec![Action::Cancel] } else { vec![] }; + } if key == ToolKey::Escape && self.busy() { self.rays = None; self.rings = None; @@ -367,16 +444,27 @@ impl Tool for FlareTool { // Switching away after the centre drag keeps the flare with the rings its options give. self.drag = None; self.held = None; + if self.handle.take().is_some_and(|h| h.began) { + return vec![Action::Commit]; + } if self.placed.take().is_some() && std::mem::take(&mut self.began) { vec![Action::Commit] } else { vec![] } } - fn overlays(&self, _cx: &ToolContext) -> Vec { + fn overlays(&self, cx: &ToolContext) -> Vec { match (self.drag, self.placed) { (Some((c, p)), _) => { let r = self.center_diameter(p.distance(c)) / 2.0; vec![Overlay::Path { path: ellipse_path(c, r, r, 0.0), color: BLUE, width: 1.0, dashed: false }] } (_, Some((c, _))) => vec![Overlay::Line { a: c, b: self.hover, color: BLUE, dashed: true }], - _ => vec![], + // The selected flare's center and end handles. + _ => match selected_flare(cx) { + Some((_, c, e)) => vec![ + Overlay::Line { a: c, b: e, color: BLUE, dashed: true }, + Overlay::Anchor { p: c, color: BLUE, filled: self.handle.is_some_and(|h| !h.end), size: 7.0 }, + Overlay::Anchor { p: e, color: BLUE, filled: self.handle.is_some_and(|h| h.end), size: 7.0 }, + ], + None => vec![], + }, } } fn cursor(&self, _cx: &ToolContext, _p: Point, _mods: Mods) -> Cursor { @@ -1021,6 +1109,69 @@ mod tests { assert_eq!(t.turn, 10.0); } + /// With one flare selected, the tool shows its center and end handles where the flare is now + /// drawn, and dragging either edits the flare (`shape.editFlare`) as one undo step; a press + /// away from them draws a new flare. + #[test] + fn dragging_a_selected_flares_handles_changes_its_length_and_direction() { + use crate::testutil::*; + use vectorcraft_doc::flare::{FlareSpec, part_node, parts}; + use vectorcraft_doc::{Node, Selection}; + let (mut d, _) = doc_with_rect(); + let gid = d.alloc_id(); + let v = json!({ "cx": 100.0, "cy": 100.0, "x2": 300.0, "y2": 100.0, "rays": 3, "rings": 2, "seed": 5, "diameter": 30.0, + "opacity": 50.0, "brightness": 30.0, "growth": 20.0, "fuzziness": 50.0, "longest": 300.0, "rayFuzziness": 100.0, + "rotation": 0.0, "largest": 50.0 }); + let xf = vectorcraft_geom::Affine::translate((10.0, 20.0)); + let children: Vec<_> = parts(&v).into_iter().map(|part| std::sync::Arc::new(part_node(d.alloc_id(), part, xf, false))).collect(); + let edited = children[0].id; + let mut g = Node::group(gid, children); + g.extras_mut().flare = Some(Box::new(FlareSpec { params: v, transform: xf })); + let layer = d.layers[0].id; + d.insert(Some(layer), usize::MAX, g).unwrap_or_else(|e| panic!("{e}")); + let s = Selection { objects: vec![gid], ..Default::default() }; + let p = paint(); + let cx = cx(&d, &s, &p); + let mut t = FlareTool::default(); + let ov = t.overlays(&cx); + let anchors: Vec = ov.iter().filter_map(|o| if let Overlay::Anchor { p, .. } = o { Some(*p) } else { None }).collect(); + assert_eq!(anchors, vec![Point::new(110.0, 120.0), Point::new(310.0, 120.0)]); + // The end handle, grabbed 2 points off: it moves as far as the pointer. + assert!(t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 312.0, 120.0)).is_empty()); + assert!(t.busy()); + let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 312.0, 160.0)); + assert_eq!(a.first(), Some(&Action::Begin("Edit Flare".into()))); + let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 302.0, 200.0)); + assert_eq!(a, vec![Action::Preview("shape.editFlare".into(), json!({ "ids": [gid.0], "x2": 300.0, "y2": 200.0 })), Action::Commit]); + // The center handle; Escape cancels its drag. + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 110.0, 121.0)); + let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 150.0, 121.0)); + assert_eq!(a.last(), Some(&Action::Preview("shape.editFlare".into(), json!({ "ids": [gid.0], "cx": 150.0, "cy": 120.0 })))); + assert_eq!(t.key(&cx, ToolKey::Escape, Mods::default()), vec![Action::Cancel]); + assert!(!t.busy()); + // A click on a handle without a drag is a click with the tool: it opens the dialog, and + // with Alt held it draws a flare there with the tool's options. + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 110.0, 120.0)); + let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 110.0, 120.0)); + assert_eq!(a, vec![Action::Dialog("flare".into(), json!({ "x": 110.0, "y": 120.0 }))]); + assert!(!t.busy()); + let alt = Mods { alt: true, ..Default::default() }; + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 310.0, 121.0).with_mods(alt)); + let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Up, 310.0, 121.0).with_mods(alt)); + assert_eq!(a, vec![Action::Exec("shape.flare".into(), flare_params(&t.options(), Point::new(310.0, 121.0)))]); + assert!(!t.busy()); + // Away from the handles a drag draws a new flare. + t.pointer(&cx, &PointerEvent::new(PointerKind::Down, 200.0, 300.0)); + let a = t.pointer(&cx, &PointerEvent::new(PointerKind::Drag, 240.0, 300.0)); + assert_eq!(a.first(), Some(&Action::Begin("Flare".into()))); + // Without a flare selected, no handles show. + let none = Selection::default(); + assert!(FlareTool::default().overlays(&crate::testutil::cx(&d, &none, &p)).is_empty()); + // A flare with an edited part is no longer edited as a flare: no handles show. + d.node_mut(edited).unwrap_or_else(|| panic!("no part")).opacity = 0.25; + assert!(FlareTool::default().overlays(&crate::testutil::cx(&d, &s, &p)).is_empty()); + } + /// Space held while dragging out a flare moves it at its current size and turn, in the center /// drag and in the drag that places the rings' end point; let go, the drag goes on from there. #[test] diff --git a/crates/tools/src/pen.rs b/crates/tools/src/pen.rs index 0322c82ca3..7b12599b62 100644 --- a/crates/tools/src/pen.rs +++ b/crates/tools/src/pen.rs @@ -631,7 +631,7 @@ impl PenTool { if !alt_converts(cx, ev.pos, ev.mods) { return None; } - let mut t = AnchorTool::new("anchorPoint"); + let mut t = AnchorTool::lent_by_pen(); let acts = t.pointer(cx, ev); if !t.busy() { return None; diff --git a/crates/tools/src/select.rs b/crates/tools/src/select.rs index 583a0e42c3..e9c3e2bb03 100644 --- a/crates/tools/src/select.rs +++ b/crates/tools/src/select.rs @@ -1412,11 +1412,17 @@ fn object_behind(cx: &ToolContext, p: Point) -> Option { /// object selected whole between it and the art under the pointer, such as members of a group /// picked with Group Selection. A press there keeps the selection and a drag moves it (#8047). A /// member with only some anchors or segments selected does not count: the press selects `top`. +/// A member with every anchor selected (as `select.anchors` and `select.key` leave a path) counts. fn selected_under(cx: &ToolContext, h: &Hit, top: NodeId) -> Option { if cx.selection.contains(top) { return Some(top); } - let whole = |id: NodeId| cx.selection.contains(id) && cx.selection.partial(id).is_none() && !cx.selection.segments.contains_key(&id); + let every_anchor = |id: NodeId| { + cx.selection + .partial(id) + .is_none_or(|picked| cx.doc.node(id).and_then(|n| n.path_data()).is_some_and(|p| p.anchors().all(|(s, i, _)| picked.contains(&(s, i))))) + }; + let whole = |id: NodeId| cx.selection.contains(id) && every_anchor(id) && !cx.selection.segments.contains_key(&id); let below = h.ancestry.iter().position(|id| *id == top).map_or(&[][..], |i| h.ancestry.get(i..).unwrap_or_default()); below.iter().copied().chain(std::iter::once(h.leaf)).find(|id| whole(*id)) } diff --git a/crates/tools/src/select/tests.rs b/crates/tools/src/select/tests.rs index a39c528a1d..5c52201a6f 100644 --- a/crates/tools/src/select/tests.rs +++ b/crates/tools/src/select/tests.rs @@ -2889,4 +2889,12 @@ fn a_press_on_a_selected_member_of_a_group_moves_the_selected_members() { let c = cx(&d, &s, &p); let down = SelectionTool::default().pointer(&c, &ev(PointerKind::Down, 125.0, 125.0)); assert_eq!(down, vec![Action::Exec("select.set".into(), json!({"ids": [outer.0]}))]); + // Every anchor of the member picked (as `select.anchors` and `select.key` leave it) selects + // it whole: the press moves it. + s.anchors.insert(a, [(0, 0), (0, 1), (0, 2), (0, 3)].into_iter().collect()); + let c = cx(&d, &s, &p); + let mut t = SelectionTool::default(); + assert_eq!(t.cursor(&c, Point::new(125.0, 125.0), Mods::default()), Cursor::Move, "every anchor"); + let down = t.pointer(&c, &ev(PointerKind::Down, 125.0, 125.0)); + assert!(!is_select(&down), "every anchor: {down:?}"); } diff --git a/crates/ui-egui/src/addons/pathtools/bridge.rs b/crates/ui-egui/src/addons/pathtools/bridge.rs index 4b9926d616..5d6a18d282 100644 --- a/crates/ui-egui/src/addons/pathtools/bridge.rs +++ b/crates/ui-egui/src/addons/pathtools/bridge.rs @@ -1,6 +1,7 @@ //! Smooth Bridge in the interface: its dialog (the arcs' radius as a percentage of the smaller -//! circle's radius, Keep Originals), which previews on the canvas and runs `addon.pathtools.bridge` -//! on OK. +//! circle's radius, or with Constant Gap that radius plus a gap; the reach, unavailable with two +//! circles selected; Keep Originals), which previews on the canvas and runs +//! `addon.pathtools.bridge` on OK. use egui::Ui; use serde_json::{Value, json}; @@ -16,27 +17,61 @@ pub const KIND: &str = "smoothBridge"; /// The radius the command takes (%), and its default. const RADII: std::ops::RangeInclusive = 1.0..=1000.0; const RADIUS: f64 = 100.0; +/// The gap the command takes (pt), and the dialog's first one. +const GAPS: std::ops::RangeInclusive = 0.0..=1000.0; +const GAP: f64 = 4.0; +/// The reach the command takes (pt), and its default. +const REACHES: std::ops::RangeInclusive = 0.0..=10000.0; +const REACH: f64 = 10.0; const LABEL_W: f32 = 60.0; const FIELD_W: f32 = 90.0; /// The dialog's fields to start with: the command's defaults. pub(crate) fn fields() -> Value { - json!({ "radius": RADIUS, "keepOriginals": false }) + json!({ "radius": RADIUS, "constantGap": false, "gap": GAP, "reach": REACH, "keepOriginals": false }) } pub(crate) const SPEC: DialogSpec = DialogSpec { heading: |_| tl!("Smooth Bridge").to_string(), body, confirm, preview: true, min_width: 280.0, ..DialogSpec::FORM }; -/// The command's parameters from the dialog's fields. +/// The command's parameters from the dialog's fields: the radius, or with Constant Gap the gap. fn params(d: &Dialog) -> Value { - json!({ "radius": d.f64("radius", RADIUS), "keepOriginals": d.bool("keepOriginals") }) + let (reach, keep) = (d.f64("reach", REACH), d.bool("keepOriginals")); + if d.bool("constantGap") { + json!({ "gap": d.f64("gap", GAP), "reach": reach, "keepOriginals": keep }) + } else { + json!({ "radius": d.f64("radius", RADIUS), "reach": reach, "keepOriginals": keep }) + } } fn body(app: &mut VectorcraftApp, ui: &mut Ui, d: &mut Dialog) -> bool { - widgets::label_row(ui, tl!("Radius:"), LABEL_W, |ui| { - if let Some(v) = widgets::range_field(ui, ("dlg-num", "radius"), d.f64("radius", RADIUS), RADII, "%", 0, FIELD_W) { - d.fields.insert("radius".into(), json!(v)); + let unit = app.session.general_unit(); + form::check(ui, d, "constantGap", tl!("Constant Gap")); + if d.bool("constantGap") { + widgets::label_row(ui, tl!("Gap:"), LABEL_W, |ui| { + form::length_within(ui, d, "gap", unit, FIELD_W, Some(GAPS)); + }); + } else { + widgets::label_row(ui, tl!("Radius:"), LABEL_W, |ui| { + if let Some(v) = widgets::range_field(ui, ("dlg-num", "radius"), d.f64("radius", RADIUS), RADII, "%", 0, FIELD_W) { + d.fields.insert("radius".into(), json!(v)); + } + }); + } + // The reach applies to three or more circles; two are bridged at any distance. Counted once, + // before a preview replaces the selection with its result. + let many = match d.fields.get("many").and_then(Value::as_bool) { + Some(many) => many, + None => { + let many = app.session.doc().map(|doc| doc.selection.objects.len() > 2).unwrap_or(true); + d.fields.insert("many".into(), json!(many)); + many } + }; + ui.add_enabled_ui(many, |ui| { + widgets::label_row(ui, tl!("Reach:"), LABEL_W, |ui| { + form::length_within(ui, d, "reach", unit, FIELD_W, Some(REACHES)); + }); }); form::check(ui, d, "keepOriginals", tl!("Keep Originals")); form::preview(app, ui, d, "Smooth Bridge", COMMAND, params(d)); @@ -72,9 +107,11 @@ mod tests { menus::invoke(&mut app, &cmd, p); assert_eq!(app.ui.dialog.as_ref().map(|d| d.kind.as_str()), Some(super::KIND)); let shown = painted_text(&mut app, |app, ui| crate::dialogs::show(app, ui.ctx())); - for s in ["Smooth Bridge", "Radius:", "Keep Originals", "Preview"] { + for s in ["Smooth Bridge", "Constant Gap", "Radius:", "Reach:", "Keep Originals", "Preview"] { assert!(shown.contains(s), "{s} in {shown}"); } + assert!(!shown.contains("Gap:"), "{shown}"); + assert!(!app.ui.dialog.as_ref().unwrap().bool("many"), "Reach unavailable for two circles"); let count = |app: &VectorcraftApp| app.session.doc().unwrap().doc.layers[0].children().unwrap().len(); app.ui.dialog.as_mut().unwrap().fields.insert("preview".into(), json!(true)); painted_text(&mut app, |app, ui| crate::dialogs::show(app, ui.ctx())); @@ -89,4 +126,30 @@ mod tests { assert_eq!(app.session.doc().unwrap().history.undo.len(), n + 1); assert_eq!(count(&app), 3, "the circles and the outline above them"); } + + #[test] + fn constant_gap_shows_the_gap_and_bridges_many_circles_within_reach() { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 400, "height": 300})).unwrap(); + // Three circles 4 apart in a row and one far off. + let ids: Vec = [100.0, 124.0, 148.0, 300.0].iter().map(|&x| circle(&mut app, x, 10.0)).collect(); + app.run("select.set", json!({ "ids": ids })).unwrap(); + menus::invoke(&mut app, super::COMMAND, serde_json::Value::Null); + let d = app.ui.dialog.as_mut().unwrap(); + d.fields.insert("constantGap".into(), json!(true)); + let shown = painted_text(&mut app, |app, ui| crate::dialogs::show(app, ui.ctx())); + assert!(shown.contains("Gap:") && !shown.contains("Radius:"), "{shown}"); + // A preview leaves two objects selected (one shape and the far circle); Reach stays + // available for the four circles the command still bridges. + app.ui.dialog.as_mut().unwrap().fields.insert("preview".into(), json!(true)); + painted_text(&mut app, |app, ui| crate::dialogs::show(app, ui.ctx())); + painted_text(&mut app, |app, ui| crate::dialogs::show(app, ui.ctx())); + assert_eq!(app.session.doc().unwrap().selection.objects.len(), 2, "previewed"); + assert!(app.ui.dialog.as_ref().unwrap().bool("many"), "Reach available for four circles"); + let p = super::params(app.ui.dialog.as_ref().unwrap()); + assert_eq!(p, json!({"gap": 4.0, "reach": 10.0, "keepOriginals": false}), "the gap, not the radius"); + crate::dialogs::confirm(&mut app).unwrap(); + let top: Vec = app.session.doc().unwrap().doc.layers[0].children().unwrap().iter().map(|n| n.id.0).collect(); + assert_eq!(top, [ids[2], ids[3]], "one shape in the topmost joined circle's place, and the far circle"); + } } diff --git a/crates/ui-egui/src/app.rs b/crates/ui-egui/src/app.rs index 355437623d..11c87d07ac 100644 --- a/crates/ui-egui/src/app.rs +++ b/crates/ui-egui/src/app.rs @@ -198,6 +198,7 @@ impl VectorcraftApp { input_frames: vec![], shortcuts_frames: vec![], held_tool: Vec::new(), + hold_keys: Default::default(), synthetic_injected: false, injected_events: vec![], injected_generation: InputGeneration::default(), diff --git a/crates/ui-egui/src/background.rs b/crates/ui-egui/src/background.rs index b0bdcc6287..f1a3032cf0 100644 --- a/crates/ui-egui/src/background.rs +++ b/crates/ui-egui/src/background.rs @@ -1,7 +1,9 @@ //! Background Save and Background Export (Preferences → File Handling): a save or an export encodes //! and writes a snapshot of the document on a worker thread while editing goes on. The status bar //! shows what is in progress; the result is applied on the UI thread when it arrives (a save marks -//! the document saved as of its snapshot, so edits made meanwhile keep it modified). +//! the document saved as of its snapshot, so edits made meanwhile keep it modified). Exports and +//! saves show in the progress window ([`crate::export_progress`]) with Cancel and Continue in +//! Background. //! //! It needs a thread-safe writer from the host ([`crate::Services::write_shared`], desktop); //! without one (the web, which downloads) the work runs at once, as with the preference off. @@ -44,15 +46,27 @@ struct Task { scope: ScopeHandle, } +/// What a job that shows in the progress window does: its Cancel and Continue in Background act on +/// the jobs of its kind. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum Kind { + /// An export (Background Export): `file.cancelExport`, `file.exportInBackground`. + Export, + /// A save (Background Save): `file.cancelSave`, `file.saveInBackground`. + Save, +} + /// A job in progress. pub struct Job { id: u64, + /// What the job does, for the progress window and its commands. + pub kind: Kind, /// What the status bar and `ui.inspect` show ("Saving Poster.vectorcraft"); empty for work they /// don't show. pub label: String, /// The document the job reads (`DocState::uid`), if any. pub doc: Option, - /// How far an export has got, and its Cancel ([`crate::export_progress`] shows it). + /// How far an export or a save has got, and its Cancel ([`crate::export_progress`] shows it). pub progress: Option>, /// Continue in Background: the progress dialog no longer shows this job. pub hidden: bool, @@ -83,6 +97,9 @@ pub struct Background { next_id: u64, /// Work started while this is set runs at once, whatever the preferences ([`in_foreground`]). foreground: bool, + /// [`crate::state::UiState::status_sets`] right after Cancel Save set its line, or after a save + /// it reached set the line that followed it; `None` before any Cancel Save. + pub(crate) save_cancel_line: Option, } impl Background { @@ -119,18 +136,41 @@ impl Background { /// Cancel every export in progress → how many there were. pub fn cancel_exports(&mut self) -> usize { + self.cancel(Kind::Export) + } + + /// Hide the exports in progress from the progress dialog (they go on) → how many there were. + pub fn hide_exports(&mut self) -> usize { + self.hide(Kind::Export) + } + + /// Cancel every save in progress that the progress window can show → how many there were. + pub fn cancel_saves(&mut self) -> usize { + self.cancel(Kind::Save) + } + + /// Hide the saves in progress from the progress window (they go on) → how many there were. + pub fn hide_saves(&mut self) -> usize { + self.hide(Kind::Save) + } + + /// Is a job of `kind` in progress that can still be canceled? + pub fn running(&self, kind: Kind) -> bool { + self.jobs.iter().any(|j| j.kind == kind && j.progress.is_some() && !j.cancelled()) + } + + fn cancel(&mut self, kind: Kind) -> usize { let mut n = 0; - for p in self.jobs.iter().filter(|j| !j.cancelled()).filter_map(|j| j.progress.as_ref()) { + for p in self.jobs.iter().filter(|j| j.kind == kind && !j.cancelled()).filter_map(|j| j.progress.as_ref()) { p.cancel(); n += 1; } n } - /// Hide the exports in progress from the progress dialog (they go on) → how many there were. - pub fn hide_exports(&mut self) -> usize { + fn hide(&mut self, kind: Kind) -> usize { let mut n = 0; - for j in self.jobs.iter_mut().filter(|j| j.progress.is_some() && !j.hidden && !j.cancelled()) { + for j in self.jobs.iter_mut().filter(|j| j.kind == kind && j.progress.is_some() && !j.hidden && !j.cancelled()) { j.hidden = true; n += 1; } @@ -163,6 +203,34 @@ pub fn run_with_progress( progress: Option>, work: impl FnOnce(Writer) -> Result + Send + 'static, then: impl FnOnce(&mut VectorcraftApp, Result) -> Result + 'static, +) -> Result { + start(app, enabled, label, doc, progress, Kind::Export, work, then) +} + +/// [`run_with_progress`] for a save of document `doc`: the progress window shows it as a save, and +/// its Cancel is `file.cancelSave`. +pub fn run_saving( + app: &mut VectorcraftApp, + enabled: bool, + label: String, + doc: u64, + progress: Arc, + work: impl FnOnce(Writer) -> Result + Send + 'static, + then: impl FnOnce(&mut VectorcraftApp, Result) -> Result + 'static, +) -> Result { + start(app, enabled, label, Some(doc), Some(progress), Kind::Save, work, then) +} + +#[allow(clippy::too_many_arguments)] +fn start( + app: &mut VectorcraftApp, + enabled: bool, + label: String, + doc: Option, + progress: Option>, + kind: Kind, + work: impl FnOnce(Writer) -> Result + Send + 'static, + then: impl FnOnce(&mut VectorcraftApp, Result) -> Result + 'static, ) -> Result { let mut work: Work = Box::new(work); let shared = app.services.write_shared.clone().filter(|_| enabled && !app.background.foreground && app.services.download.is_none()); @@ -174,7 +242,8 @@ pub fn run_with_progress( let (sets, status) = (app.ui.status_sets, if label.is_empty() { String::new() } else { format!("{label}…") }); let bg = &mut app.background; bg.next_id += 1; - bg.jobs.push(Job { id, label: label.clone(), doc, progress, hidden: false, sets, line: status.clone(), then: Box::new(then) }); + let line = status.clone(); + bg.jobs.push(Job { id, kind, label: label.clone(), doc, progress, hidden: false, sets, line, then: Box::new(then) }); if label.is_empty() { return Ok(json!({ "background": true })); } diff --git a/crates/ui-egui/src/canvas/panes.rs b/crates/ui-egui/src/canvas/panes.rs index 6b1d8ac3f2..cef27dab18 100644 --- a/crates/ui-egui/src/canvas/panes.rs +++ b/crates/ui-egui/src/canvas/panes.rs @@ -10,12 +10,12 @@ use std::collections::HashMap; use std::sync::Arc; use super::grid::LineLook; -use super::outline::{c32, node_outline, stroke_path, too_many_anchors}; +use super::outline::{c32, node_outline, to_screen_path, too_many_anchors}; use super::view::fit_zoom; use super::{ - Affine, CacheKey, Point, Rect, RulerScale, Sense, Stroke, StrokeKind, Tokens, Ui, VectorcraftApp, View, Xf, artboard_edges, backdrop, cache_key, - dim_on_canvas, frame_options, frame_ppp, frame_view, grid, guides_of, json, paint_paper, pixel_region, placed_key, plugin_key, pos2, rulers, - shows_artboards, textured_quad, vec2, view_rects, + Affine, BezPath, CacheKey, Point, Rect, RulerScale, Sense, Stroke, StrokeKind, Tokens, Ui, VectorcraftApp, View, Xf, artboard_edges, backdrop, + cache_key, dim_on_canvas, frame_options, frame_ppp, frame_view, grid, guides_of, json, paint_paper, pixel_region, placed_key, plugin_key, pos2, + rulers, shows_artboards, textured_quad, vec2, view_rects, }; use crate::doc_windows::Win; use crate::thumb_worker::ThumbWorker; @@ -46,6 +46,29 @@ pub struct Panes { /// By slot: the size of the view's area its view was last fitted to in a pane, and the zoom and /// center the fit gave. fits: HashMap, + /// By slot: the outlines of the selected objects the pane drew last, and what they show. + outlines: HashMap, + /// How many times a pane's outlines were made. + outlines_made: u64, +} + +/// A pane's selected-object outlines as screen shapes, and the document revision, document, +/// selection and screen mapping they were made for. +struct Outlines { + revision: u64, + /// A weak reference to the document: while it exists, no other document can take the + /// allocation's address. + doc: std::sync::Weak, + selection: Vec, + affine: [f64; 6], + shapes: Vec, +} + +impl Outlines { + /// Whether these outlines show `st`'s selection through the screen mapping `affine`. + fn shows(&self, st: &vectorcraft_engine::DocState, affine: &[f64; 6]) -> bool { + self.revision == st.revision && self.doc.ptr_eq(&Arc::downgrade(&st.doc)) && self.affine == *affine && self.selection == st.selection.objects + } } impl Panes { @@ -56,6 +79,7 @@ impl Panes { self.last.clear(); self.last_slots.clear(); self.fits.clear(); + self.outlines.clear(); } /// Upload `img`, the render `key` describes, for `slot`. @@ -311,6 +335,9 @@ pub(crate) fn tiled_area(app: &mut VectorcraftApp, ui: &mut Ui) -> bool { app.canvas.panes.clear(); } app.canvas.panes.last.clear(); + // Only the floating windows draw panes now. + let floating = &app.ui.floating; + app.canvas.panes.outlines.retain(|(u, n), _| floating.iter().any(|w| w.uid == *u && w.view == *n)); app.canvas.panes.last_slots.clear(); return false; } @@ -326,6 +353,7 @@ pub(crate) fn tiled_area(app: &mut VectorcraftApp, ui: &mut Ui) -> bool { app.canvas.panes.shown.retain(|s, _| live.contains(s)); app.canvas.panes.pending.retain(|s, _| live.contains(s)); app.canvas.panes.fits.retain(|s, _| live.contains(s)); + app.canvas.panes.outlines.retain(|s, _| live.contains(s)); // A window that moved to another pane fits it, and so does a window whose pane changed place or // size because a window opened, closed, floated or docked, or because the panes came back from // one window. A window that keeps its pane keeps its zoom and scroll, as when a tab brings its @@ -563,7 +591,9 @@ fn draw_pane(app: &mut VectorcraftApp, ui: &Ui, w: Win, cell: egui::Rect) -> boo guides_of(app, st, (&painter, &xf, &t), rect); } if app.ui.view.edges { - selected_objects(st, &painter, &xf); + selected_objects(&mut app.canvas.panes, slot, st, &painter, &xf); + } else { + app.canvas.panes.outlines.remove(&slot); } if app.ui.view.rulers && app.ui.screen_mode < 3 { rulers(ui, full, &xf, None, RulerScale::document(app.session.general_unit(), st.doc.ruler_origin_for(v.artboard)), &t); @@ -581,23 +611,45 @@ fn draw_pane(app: &mut VectorcraftApp, ui: &Ui, w: Win, cell: egui::Rect) -> boo resp.contains_pointer() && ui.input(|inp| inp.pointer.any_pressed()) } -/// The outlines of the objects selected in `st`, in their layers' colors; their bounds when they -/// have too many points to outline. -fn selected_objects(st: &vectorcraft_engine::DocState, painter: &egui::Painter, xf: &Xf) { +/// Draw the outlines of the objects selected in `st` ([`outline_shapes`]) in `slot`'s pane, from +/// the outlines `panes` kept for the slot while they show the same revision, document, selection +/// and screen mapping, and made again otherwise. +fn selected_objects(panes: &mut Panes, slot: Slot, st: &vectorcraft_engine::DocState, painter: &egui::Painter, xf: &Xf) { + let affine = xf.affine().as_coeffs(); + if !panes.outlines.get(&slot).is_some_and(|o| o.shows(st, &affine)) { + let shapes = outline_shapes(st, xf); + let kept = Outlines { revision: st.revision, doc: Arc::downgrade(&st.doc), selection: st.selection.objects.clone(), affine, shapes }; + panes.outlines.insert(slot, kept); + panes.outlines_made += 1; + } + for shape in panes.outlines.get(&slot).map_or(&[][..], |o| &o.shapes) { + painter.add(shape.clone()); + } +} + +/// The outlines of the objects selected in `st` as lines on the screen through `xf`, in their +/// layers' colors; their bounds when they have too many points to outline. +fn outline_shapes(st: &vectorcraft_engine::DocState, xf: &Xf) -> Vec { + let mut shapes = vec![]; + if st.selection.objects.is_empty() { + return shapes; + } let symbols = st.doc.symbol_boxes(); let nodes: Vec<(vectorcraft_doc::NodeId, &vectorcraft_doc::Node)> = st.selection.objects.iter().filter_map(|id| Some((*id, st.doc.node(*id)?))).collect(); let color = |id: vectorcraft_doc::NodeId| Stroke::new(1.0, c32(st.doc.layer_color(id))); + let mut stroke = |bp: &BezPath, s: Stroke| shapes.extend(to_screen_path(bp, xf).into_iter().map(|line| egui::Shape::line(line, s))); if too_many_anchors(nodes.iter().map(|(_, n)| *n)) { let bounds = nodes.iter().filter_map(|(_, n)| n.geometric_bounds_with(&symbols)).reduce(|a, b| a.union(b)); if let (Some(b), Some((id, _))) = (bounds, nodes.first()) { - stroke_path(painter, &vectorcraft_geom::shapes::rectangle(b).to_bezpath(), xf, color(*id)); + stroke(&vectorcraft_geom::shapes::rectangle(b).to_bezpath(), color(*id)); } - return; + return shapes; } for (id, n) in nodes { - stroke_path(painter, &node_outline(n, &symbols), xf, color(id)); + stroke(&node_outline(n, &symbols), color(id)); } + shapes } #[cfg(test)] diff --git a/crates/ui-egui/src/canvas/panes/tests.rs b/crates/ui-egui/src/canvas/panes/tests.rs index 6c7a8cf755..15e5e138d3 100644 --- a/crates/ui-egui/src/canvas/panes/tests.rs +++ b/crates/ui-egui/src/canvas/panes/tests.rs @@ -875,6 +875,149 @@ fn other_panes_draw_their_guides_and_selected_objects() { assert_ne!(layer, Color32::TRANSPARENT); } +/// The selected objects' outlines as the panes made them on every frame before they kept them, +/// to hold the kept outlines against. +fn outlines_made_each_frame(st: &vectorcraft_engine::DocState, xf: &Xf) -> Vec { + let mut shapes = vec![]; + let symbols = st.doc.symbol_boxes(); + let nodes: Vec<(vectorcraft_doc::NodeId, &vectorcraft_doc::Node)> = + st.selection.objects.iter().filter_map(|id| Some((*id, st.doc.node(*id)?))).collect(); + let color = |id: vectorcraft_doc::NodeId| Stroke::new(1.0, c32(st.doc.layer_color(id))); + let mut stroke_path = |bp: &BezPath, s: Stroke| { + for line in to_screen_path(bp, xf) { + shapes.push(Shape::line(line, s)); + } + }; + if too_many_anchors(nodes.iter().map(|(_, n)| *n)) { + let bounds = nodes.iter().filter_map(|(_, n)| n.geometric_bounds_with(&symbols)).reduce(|a, b| a.union(b)); + if let (Some(b), Some((id, _))) = (bounds, nodes.first()) { + stroke_path(&vectorcraft_geom::shapes::rectangle(b).to_bezpath(), color(*id)); + } + return shapes; + } + for (id, n) in nodes { + stroke_path(&node_outline(n, &symbols), color(id)); + } + shapes +} + +/// The first document's pane in a tiled pair: the outlines it keeps, after checking that they +/// equal the outlines made afresh through its view and that the frame `drawn` holds them in order. +fn kept_outlines<'a>(app: &'a VectorcraftApp, ctx: &egui::Context, drawn: &[Shape]) -> &'a [Shape] { + let pane = panes(app).1[0]; + let xf = Xf::new(view_rects(app, pane, ctx.pixels_per_point()).1, &app.views[0]); + let slot = (app.session.documents()[0].uid, 1); + let kept = &app.canvas.panes.outlines.get(&slot).expect("the pane keeps its outlines").shapes; + assert_eq!(kept, &outlines_made_each_frame(&app.session.documents()[0], &xf), "the kept outlines are the ones made afresh"); + assert!(kept.is_empty() || drawn.windows(kept.len()).any(|w| w == kept.as_slice()), "the pane draws the kept outlines"); + kept +} + +/// Run `cmd` on the first document of a tiled pair, then make the second current again. +fn in_first(app: &mut VectorcraftApp, cmd: &str, args: serde_json::Value) -> serde_json::Value { + app.run("document.activate", json!({"index": 0})).unwrap(); + let out = app.session.execute(cmd, &args).unwrap(); + app.run("document.activate", json!({"index": 1})).unwrap(); + out +} + +#[test] +fn kept_outlines_do_not_show_for_a_new_document_that_takes_a_freed_documents_address() { + let affine = [1.0, 0.0, 0.0, 1.0, 0.0, 0.0]; + let st = vectorcraft_engine::DocState::new(vectorcraft_doc::Document::new(400.0, 300.0), None); + let kept = Outlines { revision: st.revision, doc: Arc::downgrade(&st.doc), selection: vec![], affine, shapes: vec![] }; + assert!(kept.shows(&st, &affine), "the outlines show the document they were made for"); + let freed = Arc::as_ptr(&st.doc); + drop(st); + let mut reused = false; + for _ in 0..64 { + let other = vectorcraft_engine::DocState::new(vectorcraft_doc::Document::new(400.0, 300.0), None); + reused |= Arc::as_ptr(&other.doc) == freed; + assert!(!kept.shows(&other, &affine), "a different document with the same revision, selection and mapping is not the one shown"); + } + assert!(!reused, "the weak reference keeps the freed document's address from being taken"); +} + +#[test] +fn other_panes_keep_their_selected_outlines_until_the_document_selection_or_view_changes() { + let mut app = app_with(2); + app.run("document.activate", json!({"index": 1})).unwrap(); + app.run("window.arrange.tile", json!({})).unwrap(); + let ctx = egui::Context::default(); + let rect = in_first(&mut app, "shape.rectangle", json!({"x": 50, "y": 50, "width": 100, "height": 80}))["id"].clone(); + let ellipse = in_first(&mut app, "shape.ellipse", json!({"x": 200, "y": 100, "width": 90, "height": 60}))["id"].clone(); + in_first(&mut app, "select.set", json!({"ids": [rect, ellipse]})); + frame(&mut app, &ctx, vec![]); + let drawn = frame(&mut app, &ctx, vec![]); + assert!(kept_outlines(&app, &ctx, &drawn).len() >= 2, "the rectangle and the ellipse are outlined"); + let made = app.canvas.panes.outlines_made; + let drawn = frame(&mut app, &ctx, vec![]); + kept_outlines(&app, &ctx, &drawn); + assert_eq!(app.canvas.panes.outlines_made, made, "an unchanged frame draws the kept outlines"); + let changed = |app: &mut VectorcraftApp, what: &str| { + let made = app.canvas.panes.outlines_made; + let drawn = frame(app, &ctx, vec![]); + kept_outlines(app, &ctx, &drawn); + assert_eq!(app.canvas.panes.outlines_made, made + 1, "{what} makes the outlines again, once"); + let drawn = frame(app, &ctx, vec![]); + kept_outlines(app, &ctx, &drawn); + assert_eq!(app.canvas.panes.outlines_made, made + 1, "the frame after {what} draws the kept outlines"); + }; + in_first(&mut app, "select.set", json!({"ids": [ellipse]})); + changed(&mut app, "a new selection"); + in_first(&mut app, "object.move", json!({"dx": 30, "dy": -10})); + changed(&mut app, "a move"); + let layer = app.session.documents()[0].doc.layers[0].id.0; + in_first(&mut app, "layer.setProps", json!({"id": layer, "color": "#20a040"})); + changed(&mut app, "a new layer color"); + app.views[0].center.x += 25.0; + changed(&mut app, "a pan"); + app.views[0].zoom *= 1.5; + app.views[0].rotation = 20.0; + changed(&mut app, "a zoom and a turn"); + app.ui.view.edges = false; + frame(&mut app, &ctx, vec![]); + assert!(app.canvas.panes.outlines.is_empty(), "with Edges off no outlines are kept"); + app.ui.view.edges = true; + changed(&mut app, "Edges on again"); + in_first(&mut app, "select.none", json!({})); + changed(&mut app, "an empty selection"); + let drawn = frame(&mut app, &ctx, vec![]); + assert!(kept_outlines(&app, &ctx, &drawn).is_empty()); + // 30,000 rectangles have more points than the outlines are made for: the pane keeps the bounds. + let st = &app.session.documents()[0]; + let rect = st.doc.node(vectorcraft_doc::NodeId(rect.as_u64().unwrap())).cloned().unwrap(); + app.run("document.activate", json!({"index": 0})).unwrap(); + app.session + .edit("Fill", |d, _| { + let layer = d.layers[0].id; + for _ in 0..30_000 { + let mut n = rect.clone(); + n.id = d.alloc_id(); + d.insert(Some(layer), usize::MAX, n)?; + } + Ok(()) + }) + .unwrap(); + app.run("select.all", json!({})).unwrap(); + app.run("document.activate", json!({"index": 1})).unwrap(); + changed(&mut app, "selecting more points than are outlined"); + let drawn = frame(&mut app, &ctx, vec![]); + assert_eq!(kept_outlines(&app, &ctx, &drawn).len(), 1, "one rectangle around the bounds"); + app.run("window.arrange.consolidateAllWindows", json!({})).unwrap(); + frame(&mut app, &ctx, vec![]); + assert!(app.canvas.panes.outlines.is_empty(), "Consolidate All Windows forgets the outlines"); + // Panes that stop showing before their render arrives keep no outlines either. + app.run("window.arrange.tile", json!({})).unwrap(); + frame(&mut app, &ctx, vec![]); + assert_eq!(app.canvas.panes.outlines.len(), 1); + app.ui.tiled = false; + app.canvas.panes.shown.clear(); + app.canvas.panes.last.clear(); + frame(&mut app, &ctx, vec![]); + assert!(app.canvas.panes.outlines.is_empty(), "no pane shows, so no outlines are kept"); +} + #[test] fn opening_a_document_while_tiled_fits_each_document_to_its_new_pane() { let mut app = app_with(2); @@ -1209,3 +1352,82 @@ fn tiled_documents_blend_translucent_art_over_their_own_paper_before_display_con assert!(differs(want, blend(s, front_paper)), "the front document's paper blends to another color"); assert!(differs(got, over(plain(s), under)), "the art converted alone shows another color"); } + +fn thread_cpu_ns() -> Option { + std::fs::read_to_string("/proc/thread-self/schedstat").ok()?.split_whitespace().next()?.parse().ok() +} + +/// Time a pane's selected-object outlines with every object of a document selected: 2,000 and +/// 20,000 rectangles, 20,000 ellipses, and 150,000 rectangles (more points than are outlined, so +/// the pane draws their bounds). Each frame is a whole egui pass that draws the outlines and the +/// tessellation of what it drew, made afresh on every frame ([`outlines_made_each_frame`]) or +/// drawn from the kept outlines ([`selected_objects`]). The sides alternate, and the median time +/// per frame of 7 runs is printed. +/// Run with `cargo test --release -p vectorcraft-ui-egui --lib pane_outlines_timing -- --ignored --nocapture`. +#[test] +#[ignore = "manual timing probe; performance depends on machine load"] +fn pane_outlines_timing() { + const FRAMES: u32 = 20; + let clock = if thread_cpu_ns().is_some() { "thread CPU time" } else { "wall-clock time" }; + eprintln!("{clock} per frame, median of 7 runs of {FRAMES} frames"); + for (count, shape) in [(2_000, "shape.rectangle"), (20_000, "shape.rectangle"), (20_000, "shape.ellipse"), (150_000, "shape.rectangle")] { + let mut app = app_with(1); + let id = app.run(shape, json!({"x": 20, "y": 20, "width": 60, "height": 40})).unwrap()["id"].as_u64().unwrap(); + let node = app.session.active().unwrap().doc.node(vectorcraft_doc::NodeId(id)).cloned().unwrap(); + app.session + .edit("Fill", |d, _| { + let layer = d.layers[0].id; + for _ in 1..count { + let mut n = node.clone(); + n.id = d.alloc_id(); + d.insert(Some(layer), usize::MAX, n)?; + } + Ok(()) + }) + .unwrap(); + app.run("select.all", json!({})).unwrap(); + let st = app.session.active().unwrap(); + assert_eq!(st.selection.objects.len(), count); + let ctx = egui::Context::default(); + let area = egui::Rect::from_min_size(Pos2::ZERO, vec2(1200.0, 800.0)); + let xf = Xf { rect: area, zoom: 4.0, center: Point::new(50.0, 40.0), rot: 0.0 }; + let mut kept = Panes::default(); + let slot = (st.uid, 1); + let mut pass = |fresh: bool| { + let raw = egui::RawInput { screen_rect: Some(area), ..Default::default() }; + let out = ctx.run_ui(raw, |ui| { + let painter = ui.painter_at(area); + if fresh { + for s in outlines_made_each_frame(st, &xf) { + painter.add(s); + } + } else { + selected_objects(&mut kept, slot, st, &painter, &xf); + } + }); + ctx.tessellate(out.shapes, out.pixels_per_point).len() + }; + assert_eq!(pass(true), pass(false), "both sides draw as much"); + let mut time = |fresh: bool| { + let (cpu, wall) = (thread_cpu_ns(), std::time::Instant::now()); + for _ in 0..FRAMES { + pass(fresh); + } + let ns = thread_cpu_ns().zip(cpu).map_or_else(|| wall.elapsed().as_nanos(), |(b, a)| b - a); + ns as f64 / f64::from(FRAMES) / 1e6 + }; + let (mut fresh, mut cached) = (vec![], vec![]); + for _ in 0..7 { + fresh.push(time(true)); + cached.push(time(false)); + } + let median = |v: &mut Vec| { + v.sort_by(f64::total_cmp); + v[v.len() / 2] + }; + let shapes = kept.outlines.get(&slot).map_or(0, |o| o.shapes.len()); + eprintln!("{count} x {shape} ({shapes} lines drawn)"); + eprintln!(" made every frame: {:>9.3} ms {fresh:.3?}", median(&mut fresh)); + eprintln!(" kept: {:>9.3} ms {cached:.3?}", median(&mut cached)); + } +} diff --git a/crates/ui-egui/src/chrome/tests.rs b/crates/ui-egui/src/chrome/tests.rs index 629e6a0ef0..4c9506b13c 100644 --- a/crates/ui-egui/src/chrome/tests.rs +++ b/crates/ui-egui/src/chrome/tests.rs @@ -943,7 +943,7 @@ fn german_script_status_preserves_authored_error_and_translates_native_error() { // A change of language while the message stays keeps the script's text. failed(&mut app, "throw new Error('invalid array length')", false); crate::i18n::set_current(crate::i18n::Lang::from_code("fr").expect("fr registered")); - assert_eq!(super::status_bar::status_message(&app), "t.js : ligne 1, colonne 1 : Error: invalid array length (levée)"); + assert_eq!(super::status_bar::status_message(&app), "t.js\u{a0}: ligne 1, colonne 1\u{a0}: Error: invalid array length (levée)"); crate::i18n::set_current(crate::i18n::Lang::EN); assert_eq!(super::status_bar::status_message(&app), app.ui.status); // After a run that completes, the message is an ordinary one. diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index 56b5660b58..9e9c4e6816 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -15,6 +15,7 @@ pub mod action_select_object; pub mod action_set_options; pub mod action_stop; pub mod artboard_options; +pub mod attributes_panel_options; pub mod blend_options; mod brush_art_options; pub mod brush_delete; @@ -477,6 +478,7 @@ registry! { LayerOptions: [layer_options::KIND] => layer_options::SPEC, LayersPanelOptions: [layers_panel_options::KIND] => layers_panel_options::SPEC, NavigatorPanelOptions: [navigator_panel_options::KIND] => navigator_panel_options::SPEC, + AttributesPanelOptions: [attributes_panel_options::KIND] => attributes_panel_options::SPEC, PathfinderOptions: [pathfinder_options::KIND] => pathfinder_options::SPEC, PixelSnapOptions: [pixel_snap_options::KIND] => pixel_snap_options::SPEC, RearrangeArtboards: [rearrange_artboards::KIND] => rearrange_artboards::SPEC, diff --git a/crates/ui-egui/src/dialogs/attributes_panel_options.rs b/crates/ui-egui/src/dialogs/attributes_panel_options.rs new file mode 100644 index 0000000000..2a5a7356ff --- /dev/null +++ b/crates/ui-egui/src/dialogs/attributes_panel_options.rs @@ -0,0 +1,82 @@ +//! Attributes panel › Panel Options…: how many recent URLs the panel's URL menu lists. +//! +//! Field: `count` (1–30). OK runs `ui.attributesPanelOptions` with it (kept with the UI state). + +use serde_json::{Value, json}; + +use super::DialogSpec; +use super::swatch_options::{grid, label}; +use crate::panels::attributes::DEFAULT_RECENT_URLS; +use crate::state::Dialog; +use crate::{VectorcraftApp, widgets}; + +/// The dialog kind of the Attributes Panel Options. +pub const KIND: &str = "attributesPanelOptions"; + +pub(super) const SPEC: DialogSpec = + DialogSpec { heading: |_| tl!("Attributes Panel Options").into(), body, confirm, min_width: 280.0, ..DialogSpec::FORM }; + +/// `ui.attributesPanelOptions` without options: open the dialog on the panel's options. +pub fn open(app: &mut VectorcraftApp) -> Result { + let count = app.ui.attributes_panel.shown(); + app.ui.dialog = Some(Dialog::new(KIND, json!({ "count": count }))); + Ok(Value::Null) +} + +fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { + grid(ui, |ui| { + label(ui, tl!("Number of Recent URLs:")); + let v = d.f64("count", f64::from(DEFAULT_RECENT_URLS)); + let max = vectorcraft_engine::cmd::RECENT_URLS as f64; + if let Some(v) = widgets::range_field(ui, "attributes-recent-urls", v, 1.0..=max, "", 0, 60.0) { + d.fields.insert("count".into(), json!(v)); + } + ui.end_row(); + }); + false +} + +/// OK: set the count; a count that is refused leaves the dialog open. +fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { + let params = json!({ "count": d.fields.get("count").cloned().unwrap_or(Value::Null) }); + let r = app.run("ui.attributesPanelOptions", params)?; + app.ui.dialog = None; + Ok(r) +} + +#[cfg(test)] +mod tests { + use super::*; + use vectorcraft_engine::Session; + + /// The dialog opens on the panel's count (10 by default), OK sets it, kept with the UI state, + /// and a count out of range is refused, leaving the dialog open and the count as it was. + #[test] + fn panel_options_set_the_recent_url_count() { + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("ui.attributesPanelOptions", json!({})).unwrap(); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.kind.as_str(), d.f64("count", 0.0)), (KIND, 10.0)); + // Drawn headlessly in the shared frame. + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let mut out = ctx.run_ui(Default::default(), |ui| super::super::show(&mut app, ui.ctx())); + out.textures_delta.clear(); + let set = |app: &mut VectorcraftApp, count: Value| { + app.ui.dialog.as_mut().unwrap().fields.insert("count".into(), count); + super::super::confirm(app) + }; + assert_eq!(set(&mut app, json!(25.0)).unwrap(), json!({"count": 25})); + assert!(app.ui.dialog.is_none()); + assert_eq!(app.ui.attributes_panel.recent_urls, 25); + app.run("ui.attributesPanelOptions", json!({})).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().f64("count", 0.0), 25.0, "opens on the current count"); + assert!(set(&mut app, json!(31)).is_err()); + assert!(app.ui.dialog.is_some() && app.ui.attributes_panel.recent_urls == 25, "a refused count changes nothing"); + // Cancel closes the dialog without applying what was typed. + app.ui.dialog.as_mut().unwrap().fields.insert("count".into(), json!(3)); + super::super::cancel(&mut app); + assert!(app.ui.dialog.is_none()); + assert_eq!(app.ui.attributes_panel.recent_urls, 25); + } +} diff --git a/crates/ui-egui/src/dialogs/document_setup.rs b/crates/ui-egui/src/dialogs/document_setup.rs index da6fa09b16..78cc370cfc 100644 --- a/crates/ui-egui/src/dialogs/document_setup.rs +++ b/crates/ui-egui/src/dialogs/document_setup.rs @@ -7,13 +7,16 @@ //! tab's `colorMode`, `convertColors`, `rgbProfile` and `cmykProfile` (null: the working space). //! OK runs `document.setup` with them: one undo step. When the Color tab changed something, OK runs //! `document.setup`, `edit.assignProfile` and `file.documentColorMode` in one `command.batch`, -//! and the document's changes are still one undo step. On an error the dialog stays open. +//! and the document's changes are still one undo step. On an error the dialog stays open. When OK +//! raises the bleed on a side, the status bar counts the objects that reach an artboard's trim edge +//! on a side OK raised but stop short of the new bleed there. use serde_json::{Map, Value, json}; use vectorcraft_color::cms::ProfileKind; -use vectorcraft_doc::setup::{GRID_COLOR_PRESETS, LANGUAGES}; +use vectorcraft_doc::setup::{GRID_COLOR_PRESETS, LANGUAGES, bleed_in_range}; use vectorcraft_doc::{ColorMode, GridSize, Quotes, Unit}; use vectorcraft_engine::cmd::colormgmt::doc_profiles; +use vectorcraft_engine::cmd::fileio::pdf; use super::{DialogSpec, form}; use crate::state::Dialog; @@ -102,6 +105,7 @@ fn color_commands(app: &VectorcraftApp, d: &Dialog) -> Result, String fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { let params: Map = d.fields.iter().filter(|(k, _)| !UI_ONLY.contains(&k.as_str())).map(|(k, v)| (k.clone(), v.clone())).collect(); let color = color_commands(app, d)?; + let before = app.session.active().map(|st| st.doc.setup.bleed); let r = if color.is_empty() { app.run("document.setup", Value::Object(params)) } else { @@ -110,10 +114,24 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { }; if r.is_ok() { app.ui.dialog = None; + if let Some(note) = before.and_then(|b| short_of_bleed_note(app, b)) { + app.status(note); + } } r } +/// The status note after OK raised the bleed on a side from `before`: how many objects reach an +/// artboard's trim edge on a side whose bleed grew but stop short of the new bleed there. `None` +/// when no side grew or no object stops short. +fn short_of_bleed_note(app: &VectorcraftApp, before: [f64; 4]) -> Option { + let doc = &app.session.active()?.doc; + // In the range the PDF pages keep the document's bleed to. + let (bleed, before) = (bleed_in_range(doc.setup.bleed), bleed_in_range(before)); + let raised: [f64; 4] = std::array::from_fn(|i| if bleed[i] > before[i] { bleed[i] } else { 0.0 }); + pdf::short_of_bleed_warning(pdf::short_of_bleed(doc, raised, None, false)) +} + fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { let tab = TABS.iter().position(|t| *t == d.str("tab")).unwrap_or(0); if let Some(i) = widgets::tab_bar(ui, &TABS, tab) { @@ -529,6 +547,51 @@ mod tests { assert!(app.ui.dialog.is_some()); } + /// OK with a larger bleed shows how many objects reach the trim edge but stop short of it; a + /// smaller bleed, or a larger one that no object falls short of, shows no such note. + #[test] + fn ok_with_a_larger_bleed_counts_the_art_short_of_it() { + let short = |app: &VectorcraftApp| app.ui.status.contains("short of the bleed"); + let ok_with_sides = |app: &mut VectorcraftApp, bleed: [f64; 4]| { + app.status(""); + app.run("file.documentSetup", json!({})).unwrap(); + app.ui.dialog.as_mut().unwrap().fields.insert("bleed".into(), json!(bleed)); + crate::dialogs::confirm(app).unwrap(); + }; + let ok_with_bleed = |app: &mut VectorcraftApp, bleed: f64| ok_with_sides(app, [bleed; 4]); + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + // A background that fills a 4 pt bleed on the top, left and right. + let id = app.run("shape.rectangle", json!({"x": -4, "y": -4, "width": 208, "height": 50})).unwrap()["id"].clone(); + app.run("paint.setStroke", json!({"ids": [id], "none": true})).unwrap(); + ok_with_bleed(&mut app, 4.0); + assert!(!short(&app), "{}", app.ui.status); + ok_with_bleed(&mut app, 9.0); + assert_eq!(app.ui.status, "1 object reaches the trim edge but stops short of the bleed"); + ok_with_bleed(&mut app, 6.0); + assert!(!short(&app), "{}", app.ui.status); + // Only the sides whose bleed grows count: the background stops short at the top, left and + // right, so a larger bottom bleed alone shows no note, and a larger top bleed does. + ok_with_sides(&mut app, [6.0, 12.0, 6.0, 6.0]); + assert!(!short(&app), "{}", app.ui.status); + ok_with_sides(&mut app, [12.0, 12.0, 6.0, 6.0]); + assert!(short(&app), "{}", app.ui.status); + // Art inside the trim falls short of no bleed. + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 50, "height": 50})).unwrap(); + ok_with_bleed(&mut app, 9.0); + assert!(!short(&app), "{}", app.ui.status); + assert_eq!(app.session.active().unwrap().doc.setup.bleed, [9.0; 4]); + // A bleed that isn't a number, as a file can hold, counts as none before OK, as in the PDF. + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 200, "height": 50})).unwrap(); + std::sync::Arc::make_mut(&mut app.session.doc_mut().unwrap().doc).setup.bleed = [f64::NAN; 4]; + ok_with_bleed(&mut app, 9.0); + assert_eq!(app.ui.status, "1 object reaches the trim edge but stops short of the bleed"); + } + /// Highlight Substituted Fonts is in Preferences › Type, so the General tab shows only the /// substituted glyphs highlight, and OK still applies. #[test] diff --git a/crates/ui-egui/src/dialogs/flare_options.rs b/crates/ui-egui/src/dialogs/flare_options.rs index 5b6834d46e..8c5cbcf5fc 100644 --- a/crates/ui-egui/src/dialogs/flare_options.rs +++ b/crates/ui-egui/src/dialogs/flare_options.rs @@ -5,18 +5,22 @@ //! grid shows). While Alt (Option on macOS) is held, Cancel reads Reset, which puts every option //! back to the tool's default and leaves the dialog open (`ui.dialogReset`). A click-opened //! dialog previews its settings live; Reset refreshes that preview and Cancel rolls it back. +//! Opened from the toolbar with flares selected, it shows the first one's settings, and OK draws +//! the selected flares again with the settings changed in the dialog (`shape.editFlare`); the tool +//! keeps its options. //! //! Fields: the options (`vectorcraft_tools::extra::FLARE_OPTIONS`): `diameter` and `pathLength` //! (points), `opacity`, `brightness`, `growth`, `fuzziness`, `longest`, `rayFuzziness` and -//! `largest` (%), `rays` and `rings` (counts), `direction` (degrees); `raysOn` and `ringsOn`; and -//! `x`, `y` where a click opened it, with `preview` on initially for that click. +//! `largest` (%), `rays` and `rings` (counts), `direction` (degrees); `raysOn` and `ringsOn`; +//! `x`, `y` where a click opened it, with `preview` on initially for that click; and `flares` +//! (ids) with `shown` (the settings the dialog opened with) for the selected flares. use serde_json::{Map, Value, json}; use vectorcraft_geom::Point; use vectorcraft_tools::extra::{FLARE_OPTIONS, flare_params}; use super::document_setup::check; -use super::{DialogResult, DialogSpec, form, set_tool_options_and_close}; +use super::{DialogResult, DialogSpec, form, run_and_close, set_tool_options_and_close}; use crate::state::Dialog; use crate::{VectorcraftApp, widgets}; @@ -38,7 +42,8 @@ const LABEL_W: f32 = 78.0; const FIELD_W: f32 = 90.0; /// Open the Flare Tool Options with the tool's values; `at`: where a click opened them, to draw a -/// flare there on OK. +/// flare there on OK. Opened without a click while flares are selected, they show the first one's +/// settings, to change the selected flares on OK. pub fn open(app: &mut VectorcraftApp, at: Option) -> Value { let mut fields = match app.session.tool_options_of("flare") { Value::Object(o) => o, @@ -48,11 +53,79 @@ pub fn open(app: &mut VectorcraftApp, at: Option) -> Value { fields.insert("preview".into(), json!(true)); fields.insert("x".into(), json!(p.x)); fields.insert("y".into(), json!(p.y)); + } else if let Some((ids, settings)) = selected_flares(app) { + // A flare without rays or rings shows that checkbox off, with the tool's count. + for (key, on) in [("rays", "raysOn"), ("rings", "ringsOn")] { + let n = settings.get(key).and_then(Value::as_f64).unwrap_or(0.0); + fields.insert(on.into(), json!(n > 0.0)); + if n > 0.0 { + fields.insert(key.into(), json!(n)); + } + } + for (key, ..) in FLARE_OPTIONS.iter().filter(|(k, ..)| !matches!(*k, "rays" | "rings")) { + if let Some(v) = settings.get(*key) { + fields.insert(key.to_string(), v.clone()); + } + } + fields.insert("shown".into(), Value::Object(shown(&fields))); + fields.insert("flares".into(), json!(ids)); } app.ui.dialog = Some(Dialog { kind: KIND.into(), fields }); json!({ "dialog": KIND }) } +/// The selected flares that can be edited (ids) and the first one's settings as the dialog shows +/// them: its rings' path length and direction from its center to its end point, where the flare is +/// drawn now. +fn selected_flares(app: &VectorcraftApp) -> Option<(Vec, Map)> { + let st = app.session.doc().ok()?; + let flares: Vec<_> = st + .selection + .objects + .iter() + .filter(|id| st.doc.is_editable(**id)) + .filter_map(|id| vectorcraft_engine::flare_settings(&st.doc, *id).map(|spec| (id.0, spec))) + .collect(); + let (_, first) = flares.first()?; + let Value::Object(mut settings) = first.params.clone() else { return None }; + let d = first.end()? - first.center()?; + settings.insert("pathLength".into(), json!(d.hypot())); + // Counter-clockwise from 3 o'clock, 0° to 360°, as `shape.flare` takes it. + settings.insert("direction".into(), json!((-d.y).atan2(d.x).to_degrees().rem_euclid(360.0))); + Some((flares.iter().map(|(id, _)| *id).collect(), settings)) +} + +/// The settings `fields` give a flare: each option, with a count of 0 when its checkbox is off. +fn shown(fields: &Map) -> Map { + let get = |key: &str, default: f64| fields.get(key).and_then(Value::as_f64).unwrap_or(default); + let on = |key: &str| fields.get(key).and_then(Value::as_bool) != Some(false); + FLARE_OPTIONS + .iter() + .map(|&(key, default, ..)| { + let v = match key { + "rays" if !on("raysOn") => 0.0, + "rings" if !on("ringsOn") => 0.0, + "rays" | "rings" => get(key, default).round(), + _ => get(key, default), + }; + (key.to_string(), json!(v)) + }) + .collect() +} + +/// `shape.editFlare`'s params for the selected flares: the settings changed since the dialog opened. +fn edit_params(d: &Dialog) -> Option { + let ids = d.fields.get("flares")?.clone(); + let start = d.fields.get("shown").and_then(Value::as_object).cloned().unwrap_or_default(); + let mut params = json!({ "ids": ids }); + for (key, v) in shown(&d.fields) { + if start.get(&key) != Some(&v) { + params[key.as_str()] = if matches!(key.as_str(), "rays" | "rings") { json!(v.as_f64().unwrap_or(0.0) as u64) } else { v }; + } + } + Some(params) +} + /// A row for option `key`, kept within its range: a distance in `unit`, else a number. fn field(ui: &mut egui::Ui, d: &mut Dialog, unit: vectorcraft_doc::Unit, (key, label): (&str, &str)) { let Some(&(_, default, lo, hi)) = FLARE_OPTIONS.iter().find(|(k, ..)| *k == key) else { return }; @@ -119,8 +192,12 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { false } -/// A click-created flare previews at that original click; toolbar options draw no artwork. +/// A click-created flare previews at that original click, and the selected flares preview with the +/// settings changed; toolbar options draw no artwork. fn preview_command(app: &VectorcraftApp, d: &Dialog) -> Option<(String, Value)> { + if let Some(params) = edit_params(d) { + return Some(("shape.editFlare".into(), params)); + } let at = Point::new(d.fields.get("x")?.as_f64().filter(|v| v.is_finite())?, d.fields.get("y")?.as_f64().filter(|v| v.is_finite())?); // Use the same clamping and whole-count conversion as accepted tool settings. let mut tool = vectorcraft_tools::create("flare"); @@ -143,8 +220,16 @@ fn reset(_: &VectorcraftApp, d: &mut Dialog) -> Result<(), String> { Ok(()) } -/// OK: set the tool's options; opened by a click, draw a flare there with them. +/// OK: set the tool's options; opened by a click, draw a flare there with them. Opened for the +/// selected flares, draw them again with the settings changed, leaving the tool's options. fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> DialogResult { + if let Some(params) = edit_params(d) { + return if d.fields.contains_key(form::PREVIEWED) { + form::commit_preview(app, "shape.editFlare", params) + } else { + run_and_close(app, "shape.editFlare", params) + }; + } let command = preview_command(app, d); if command.is_none() && (d.fields.contains_key("x") || d.fields.contains_key("y") || d.fields.contains_key(form::PREVIEWED)) { return Err("Flare click coordinates must be finite numbers".into()); @@ -321,6 +406,41 @@ mod tests { assert_eq!(app.session.tool_options_of("flare"), before); } + /// With a flare selected, the toolbar's Flare Tool Options show its settings, and OK draws it + /// again with the settings changed, as one undo step, leaving the tool's options. + #[test] + fn with_a_flare_selected_the_options_show_its_settings_and_ok_draws_it_again() { + let mut app = app(); + let flare = json!({"cx": 200, "cy": 200, "diameter": 60, "rays": 0, "rings": 4, "x2": 200, "y2": 0, "largest": 80, "seed": 5}); + app.run("shape.flare", flare).unwrap(); + app.run("object.move", json!({"dx": 30, "dy": 0})).unwrap(); + let options = app.session.tool_options_of("flare"); + app.run("tool.options", json!({"tool": "flare"})).unwrap(); + painted(&mut app); + let d = app.ui.dialog.as_mut().unwrap(); + let shown = (d.f64("diameter", 0.0), d.bool("raysOn"), d.f64("rays", 0.0), d.f64("rings", 0.0), d.f64("largest", 0.0)); + assert_eq!(shown, (60.0, false, 15.0, 4.0, 80.0)); + assert!((d.f64("pathLength", 0.0) - 200.0).abs() < 1e-9 && (d.f64("direction", 0.0) - 90.0).abs() < 1e-9); + d.fields.insert("rings".into(), json!(7)); + d.fields.insert("raysOn".into(), json!(true)); + let depth = app.session.doc().unwrap().history.undo.len(); + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(app.session.doc().unwrap().history.undo.len(), depth + 1); + let parts = flare_parts(&app); + assert_eq!((parts.iter().filter(|p| *p == "Ring").count(), parts.iter().any(|p| p == "Rays")), (7, true), "{parts:?}"); + // Still where it was moved to. + let doc = &app.session.doc().unwrap().doc; + let id = app.session.doc().unwrap().selection.objects[0]; + assert!(vectorcraft_engine::flare_settings(doc, id).unwrap().center().unwrap().distance(Point::new(230.0, 200.0)) < 1e-9); + assert_eq!(app.session.tool_options_of("flare"), options); + // With nothing selected, the dialog shows the tool's options again. + app.run("select.none", json!({})).unwrap(); + app.run("tool.options", json!({"tool": "flare"})).unwrap(); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.f64("diameter", 0.0), d.fields.contains_key("flares")), (100.0, false)); + } + #[test] fn ui_dialog_reset_puts_the_defaults_back_and_keeps_where_a_click_opened_it() { let mut app = app(); diff --git a/crates/ui-egui/src/dialogs/freehand.rs b/crates/ui-egui/src/dialogs/freehand.rs index 78fdd8bdd1..aa793afef2 100644 --- a/crates/ui-egui/src/dialogs/freehand.rs +++ b/crates/ui-egui/src/dialogs/freehand.rs @@ -280,6 +280,7 @@ fn body(_app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { variation: (0.0, 100.0), }; varied(ui, d, &roundness, &Variation::ALL); + tip_preview(ui, d, roundness.range.0); size_rows(ui, d, &Variation::ALL); } else { if d.fields.contains_key("angle") { @@ -291,7 +292,7 @@ fn body(_app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { } } if d.str("tool") == "blobBrush" { - blob_tip_preview(ui, d); + tip_preview(ui, d, 0.0); } // The Eraser's Size rows are above. if !eraser && d.fields.contains_key("sizeMode") { @@ -331,26 +332,26 @@ fn body(_app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { false } -/// Side of the Blob Brush tip preview's square, in points. +/// Side of the Blob Brush's and the Eraser's tip preview square, in points. const TIP_PREVIEW: f32 = 64.0; -/// Half the length of the Blob Brush tip in its preview, in points. +/// Half the length of the tip in its preview, in points. const TIP_LONG: f32 = 18.0; /// How far from a Roundness dot of the tip preview a press still takes the dot, in points. const TIP_DOT_REACH: f32 = 8.0; -/// The Blob Brush's tip preview: a square with the tip at its Angle and Roundness, a line with an -/// arrowhead along its long axis and a black dot at each end of its short axis, and beside it three -/// dabs of the tip, the middle one darker. A click or a drag that starts on a dot sets the -/// Roundness from the pointer's distance from the center along the short axis -/// ([`blob_tip_roundness_at`]) until the release, inside the square or out of it, and gives the +/// The Blob Brush's and the Eraser's tip preview: a square with the tip at its Angle and +/// Roundness, a line with an arrowhead along its long axis and a black dot at each end of its short +/// axis, and beside it three dabs of the tip, the middle one darker. A click or a drag that starts +/// on a dot sets the Roundness from the pointer's distance from the center along the short axis +/// ([`tip_roundness_at`]) until the release, inside the square or out of it, and gives the /// Roundness slider the keyboard focus. A click or a drag that starts anywhere else in the square /// points the Angle at the pointer and gives the Angle slider the focus. Screen readers get the /// square as the Angle slider and then the Roundness slider, and their keys step the Angle within -/// -180° to 180° and the Roundness within 0% to 100% as a dialog slider's do +/// -180° to 180° and the Roundness within `min_roundness` to 100% as a dialog slider's do /// ([`widgets::stepped_area`]). -fn blob_tip_preview(ui: &mut egui::Ui, d: &mut Dialog) { +fn tip_preview(ui: &mut egui::Ui, d: &mut Dialog, min_roundness: f64) { let t = Tokens::get(ui.ctx()); let (rect, _) = ui.allocate_exact_size(egui::vec2(CONTENT_W, TIP_PREVIEW), egui::Sense::hover()); let square = egui::Rect::from_min_size(rect.min, egui::vec2(TIP_PREVIEW, TIP_PREVIEW)); @@ -359,7 +360,7 @@ fn blob_tip_preview(ui: &mut egui::Ui, d: &mut Dialog) { // Whether the press that started this click or drag was on a dot: it is kept until the release. let on_dot = response.id.with("on-dot"); let near_dot = |p: egui::Pos2, d: &Dialog| { - blob_tip_dots(center, d.f64("angle", 0.0), d.f64("roundness", 100.0)).iter().any(|dot| dot.distance(p) <= TIP_DOT_REACH) + tip_dots(center, d.f64("angle", 0.0), d.f64("roundness", 100.0)).iter().any(|dot| dot.distance(p) <= TIP_DOT_REACH) }; let mut started = ui.data(|m| m.get_temp::(on_dot)); if started.is_none() && response.is_pointer_button_down_on() { @@ -383,7 +384,7 @@ fn blob_tip_preview(ui: &mut egui::Ui, d: &mut Dialog) { if let Some((p, _)) = widgets::pointer_phase(&response) { let delta = p - center; if dot_drag { - d.fields.insert("roundness".into(), json!(blob_tip_roundness_at(delta, d.f64("angle", 0.0)))); + d.fields.insert("roundness".into(), json!(tip_roundness_at(delta, d.f64("angle", 0.0), min_roundness))); } else if delta.length_sq() > 1.0 { d.fields.insert("angle".into(), json!(f64::from((-delta.y).atan2(delta.x)).to_degrees().round())); } @@ -406,13 +407,13 @@ fn blob_tip_preview(ui: &mut egui::Ui, d: &mut Dialog) { if dot_drag && (response.drag_started() || response.clicked()) { widgets::focus_by_pointer(ui, roundness.id); } - let shown = widgets::SliderValue::field(d.f64("roundness", 100.0), 0.0..=100.0, "%", 0); + let shown = widgets::SliderValue::field(d.f64("roundness", 100.0), min_roundness..=100.0, "%", 0); if let Some(r) = widgets::stepped_area(ui, &roundness, tl!("Roundness"), Some(shown)) { d.fields.insert("roundness".into(), json!(r)); } - let (u, v) = blob_tip_axes(d.f64("angle", 0.0)); + let (u, v) = tip_axes(d.f64("angle", 0.0)); let long = TIP_LONG; - let short = long * blob_tip_short_ratio(d.f64("roundness", 100.0)); + let short = long * tip_short_ratio(d.f64("roundness", 100.0)); let dab = |center: egui::Pos2, color: egui::Color32| { let points = (0..32) .map(|i| { @@ -427,7 +428,7 @@ fn blob_tip_preview(ui: &mut egui::Ui, d: &mut Dialog) { let arrowhead = vec![center + u * 28.0, center + u * 22.0 + v * 3.0, center + u * 22.0 - v * 3.0]; painter.add(egui::Shape::convex_polygon(arrowhead, t.accent, egui::Stroke::NONE)); // Black with a white rim, so a dot shows on the tip and on the square in either theme. - for dot in blob_tip_dots(center, d.f64("angle", 0.0), d.f64("roundness", 100.0)) { + for dot in tip_dots(center, d.f64("angle", 0.0), d.f64("roundness", 100.0)) { painter.circle(dot, 3.0, egui::Color32::BLACK, egui::Stroke::new(1.0, egui::Color32::WHITE)); } let strip = square.right() + 2.5 * long; @@ -438,7 +439,7 @@ fn blob_tip_preview(ui: &mut egui::Ui, d: &mut Dialog) { /// The tip preview's long axis on screen at Angle `angle` (degrees, y down: a positive angle tilts /// it up to the right), and its short axis. -fn blob_tip_axes(angle: f64) -> (egui::Vec2, egui::Vec2) { +fn tip_axes(angle: f64) -> (egui::Vec2, egui::Vec2) { let a = angle.clamp(-180.0, 180.0).to_radians(); let u = egui::vec2(a.cos() as f32, -a.sin() as f32); (u, egui::vec2(-u.y, u.x)) @@ -446,23 +447,23 @@ fn blob_tip_axes(angle: f64) -> (egui::Vec2, egui::Vec2) { /// The two Roundness dots of the tip preview centered on `center`: the ends of the tip's short /// axis at Angle `angle` and Roundness `roundness`. -fn blob_tip_dots(center: egui::Pos2, angle: f64, roundness: f64) -> [egui::Pos2; 2] { - let (_, v) = blob_tip_axes(angle); - let short = v * (TIP_LONG * blob_tip_short_ratio(roundness)); +fn tip_dots(center: egui::Pos2, angle: f64, roundness: f64) -> [egui::Pos2; 2] { + let (_, v) = tip_axes(angle); + let short = v * (TIP_LONG * tip_short_ratio(roundness)); [center + short, center - short] } -/// The Roundness, in whole percent from 0 to 100, that a dot of the tip preview dragged to `offset` -/// from the preview's center gives at Angle `angle`: the distance along the tip's short axis, on -/// either side of the center, as a percentage of half the tip's length. -fn blob_tip_roundness_at(offset: egui::Vec2, angle: f64) -> f64 { - let (_, v) = blob_tip_axes(angle); - (f64::from(offset.dot(v).abs() / TIP_LONG) * 100.0).round().clamp(0.0, 100.0) +/// The Roundness, in whole percent from `min` to 100, that a dot of the tip preview dragged to +/// `offset` from the preview's center gives at Angle `angle`: the distance along the tip's short +/// axis, on either side of the center, as a percentage of half the tip's length. +fn tip_roundness_at(offset: egui::Vec2, angle: f64, min: f64) -> f64 { + let (_, v) = tip_axes(angle); + (f64::from(offset.dot(v).abs() / TIP_LONG) * 100.0).round().clamp(min, 100.0) } /// The preview tip's short axis as a fraction of its long axis: Roundness in percent, with 0 -/// percent drawn as 0.1 percent, the minimum the brush draws with. -fn blob_tip_short_ratio(roundness: f64) -> f32 { +/// percent drawn as 0.1 percent, the minimum the Blob Brush draws with. +fn tip_short_ratio(roundness: f64) -> f32 { (roundness.clamp(0.0, 100.0) as f32 / 100.0).max(0.001) } diff --git a/crates/ui-egui/src/dialogs/freehand/tests.rs b/crates/ui-egui/src/dialogs/freehand/tests.rs index 6ec010a8bd..e324bbbd45 100644 --- a/crates/ui-egui/src/dialogs/freehand/tests.rs +++ b/crates/ui-egui/src/dialogs/freehand/tests.rs @@ -50,7 +50,12 @@ fn a_refused_fidelity_keeps_the_dialog_open() { fn the_tip_preview_is_as_flat_as_the_tip_the_brush_draws() { for roundness in [-5.0, 0.0, 0.05, 0.1, 1.0, 50.0, 100.0, 120.0] { let drawn = vectorcraft_tools::draw2::blob_tip(0.0, roundness).as_coeffs()[3] as f32; - assert!((blob_tip_short_ratio(roundness) - drawn).abs() < 1e-6, "roundness {roundness}: drawn {drawn}"); + assert!((tip_short_ratio(roundness) - drawn).abs() < 1e-6, "roundness {roundness}: drawn {drawn}"); + } + // The Eraser's Roundness runs from 1% to 100%, where its tip and the Blob Brush's are the same. + for roundness in [1.0, 2.0, 50.0, 100.0] { + let drawn = vectorcraft_tools::draw2::eraser_tip(0.0, roundness).as_coeffs()[3] as f32; + assert!((tip_short_ratio(roundness) - drawn).abs() < 1e-6, "Eraser roundness {roundness}: drawn {drawn}"); } } @@ -61,23 +66,35 @@ fn the_tip_preview_is_as_flat_as_the_tip_the_brush_draws() { #[test] fn a_roundness_dot_sets_its_distance_along_the_short_axis() { for angle in [0.0, 30.0, 90.0, -135.0, 180.0] { - let (u, v) = blob_tip_axes(angle); + let (u, v) = tip_axes(angle); for (along, want) in [(0.0, 0.0), (4.5, 25.0), (-9.0, 50.0), (18.0, 100.0), (-18.0, 100.0), (40.0, 100.0), (-400.0, 100.0)] { for sideways in [0.0, 7.0, -30.0] { - assert_eq!(blob_tip_roundness_at(v * along + u * sideways, angle), want, "angle {angle}, {along} along, {sideways} sideways"); + assert_eq!(tip_roundness_at(v * along + u * sideways, angle, 0.0), want, "angle {angle}, {along} along, {sideways} sideways"); } } let center = egui::pos2(32.0, 32.0); for roundness in [0.0, 1.0, 37.0, 50.0, 99.0, 100.0] { - let [a, b] = blob_tip_dots(center, angle, roundness); + let [a, b] = tip_dots(center, angle, roundness); assert!(((a - center) + (b - center)).length() < 1e-4, "the dots face each other across the center"); for dot in [a, b] { - assert_eq!(blob_tip_roundness_at(dot - center, angle), roundness, "angle {angle}"); + assert_eq!(tip_roundness_at(dot - center, angle, 0.0), roundness, "angle {angle}"); } } } } +/// With the Eraser's 1% minimum, a Roundness dot dragged to the center or near it gives 1%, and +/// any farther distance gives the same Roundness as with no minimum. +#[test] +fn a_roundness_dot_keeps_the_eraser_at_one_percent_or_more() { + for angle in [0.0, 45.0, -90.0] { + let (u, v) = tip_axes(angle); + for (along, want) in [(0.0, 1.0), (0.05, 1.0), (-0.1, 1.0), (0.18, 1.0), (0.36, 2.0), (-9.0, 50.0), (30.0, 100.0)] { + assert_eq!(tip_roundness_at(v * along + u * 5.0, angle, 1.0), want, "angle {angle}, {along} along"); + } + } +} + /// The labels the open dialog paints. fn painted(app: &mut VectorcraftApp) -> String { crate::tests_labels::painted_text(app, |app, ui| super::super::show(app, ui.ctx())) diff --git a/crates/ui-egui/src/dialogs/package.rs b/crates/ui-egui/src/dialogs/package.rs index 25d17d3902..3e69af017c 100644 --- a/crates/ui-egui/src/dialogs/package.rs +++ b/crates/ui-egui/src/dialogs/package.rs @@ -173,10 +173,10 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { Ok(r) } -/// Did a save whose applied result is `r` write the document (no error, and no question asked -/// before writing)? +/// Did a save whose applied result is `r` write the document (no error, no question asked before +/// writing, and not canceled by Cancel Save)? fn saved(r: &Result) -> bool { - r.as_ref().is_ok_and(|r| r.get("pending").is_none()) + r.as_ref().is_ok_and(|r| r.get("pending").is_none() && r.get("cancelled").and_then(Value::as_bool) != Some(true)) } /// Report the package `r` (`file.package`'s reply): the status bar, the web's download, and the diff --git a/crates/ui-egui/src/dialogs/shortcut_import.rs b/crates/ui-egui/src/dialogs/shortcut_import.rs index e6c9a6ee0a..3409a0b987 100644 --- a/crates/ui-egui/src/dialogs/shortcut_import.rs +++ b/crates/ui-egui/src/dialogs/shortcut_import.rs @@ -518,6 +518,10 @@ pub fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { } if let Some(k) = app.ui.dialog.as_mut() { k.fields.insert("overrides".into(), crate::keymap::stored::to_value(&shortcut_editor::saved_overrides(km.overrides(), &ov))); + // VectorCraft's defaults have no hold shortcuts; Add to the Current Shortcuts keeps them. + if !current { + k.fields.insert("holds".into(), json!({})); + } k.fields.insert("set".into(), json!(set)); k.fields.insert("__message".into(), json!(tl!("Imported. Press OK to keep the imported set."))); } diff --git a/crates/ui-egui/src/dialogs/tests.rs b/crates/ui-egui/src/dialogs/tests.rs index 5cd84a8ae3..de651d45cb 100644 --- a/crates/ui-egui/src/dialogs/tests.rs +++ b/crates/ui-egui/src/dialogs/tests.rs @@ -2965,6 +2965,62 @@ fn a_drag_on_a_blob_brush_tip_dot_sets_the_roundness() { assert_eq!(values(&app), (46.0, 1.0), "Tab goes on to the Roundness slider"); } +/// The Eraser Tool Options show the same tip preview as the Blob Brush, with the Angle and +/// Roundness sliders for screen readers. A drag on the arrowhead sets only the Angle, and a drag on +/// a black dot sets only the Roundness, which stays within the Eraser's 1% to 100% for a drag and +/// for the keys. The fields show the new values, OK sets the tool's options to them, and Cancel +/// leaves the options as they were. +#[test] +fn the_eraser_tip_preview_sets_the_angle_and_roundness_by_dragging() { + use egui::Key::{ArrowDown, Home}; + use egui::Modifiers as M; + let mut app = app(); + app.run("tool.options", json!({"tool": "eraser"})).unwrap(); + let values = |app: &VectorcraftApp| { + let d = app.ui.dialog.as_ref().expect("Eraser Tool Options is open"); + (d.f64("angle", f64::NAN), d.f64("roundness", f64::NAN)) + }; + let mut f = Frames::new(); + f.run(&mut app, vec![]); + let out = f.run(&mut app, vec![]); + let (_, value, text) = slider_node(&out, "Angle"); + assert_eq!((value, text.as_deref()), (Some(0.0), Some("0°"))); + let (_, value, text) = slider_node(&out, "Roundness"); + assert_eq!((value, text.as_deref()), (Some(100.0), Some("100%"))); + let center = f.control(&mut app, "Angle", egui::accesskit::Role::Slider); + // At 0° the arrowhead points right, 22 pt to 28 pt from the center. + f.drag(&mut app, center + egui::vec2(25.0, 0.0), egui::vec2(-5.0, -20.0)); + assert_eq!(values(&app), (45.0, 100.0), "the arrowhead dragged up to the right"); + // At 45° and 100% the dots are 18 pt from the center, up to the left and down to the right. + let v = egui::vec2(1.0, 1.0).normalized(); + f.drag(&mut app, center + v * 18.0, -v * 9.0); + assert_eq!(values(&app), (45.0, 50.0), "the dot dragged half way to the center"); + f.drag(&mut app, center + v * 9.0, -v * 9.0); + assert_eq!(values(&app), (45.0, 1.0), "the dot dragged to the center stops at 1%"); + f.key(&mut app, ArrowDown, M::NONE); + f.key(&mut app, Home, M::NONE); + assert_eq!(values(&app), (45.0, 1.0), "the keys stop at 1%"); + let out = f.run(&mut app, vec![]); + assert_eq!(slider_node(&out, "Roundness").2.as_deref(), Some("1%")); + let d = app.ui.dialog.as_mut().expect("Eraser Tool Options is open"); + d.fields.insert("roundness".into(), json!(30)); + let out = f.run(&mut app, vec![]); + assert_eq!(slider_node(&out, "Roundness").2.as_deref(), Some("30%"), "the preview follows the field"); + confirm(&mut app).unwrap(); + let o = app.session.tool_options_of("eraser"); + assert_eq!((o["angle"].as_f64(), o["roundness"].as_f64()), (Some(45.0), Some(30.0))); + app.run("tool.options", json!({"tool": "eraser"})).unwrap(); + let mut f = Frames::new(); + f.run(&mut app, vec![]); + f.run(&mut app, vec![]); + let center = f.control(&mut app, "Angle", egui::accesskit::Role::Slider); + f.drag(&mut app, center + egui::vec2(18.0, 18.0), egui::vec2(2.0, 2.0)); + assert_eq!(values(&app), (-45.0, 30.0), "the drag points the Angle down to the right"); + app.ui.dialog = None; + let o = app.session.tool_options_of("eraser"); + assert_eq!((o["angle"].as_f64(), o["roundness"].as_f64()), (Some(45.0), Some(30.0)), "Cancel keeps the options"); +} + /// Screen readers can set the Blob Brush tip preview's Angle to a number: the slider offers the /// set-value action, a fraction rounds to the whole degrees the field shows, a number past -180° to /// 180° sets the nearer end, the last request in a frame wins, and a value that is not a finite diff --git a/crates/ui-egui/src/dialogs/tests_package.rs b/crates/ui-egui/src/dialogs/tests_package.rs index 0c0f8e492a..e89e5501f5 100644 --- a/crates/ui-egui/src/dialogs/tests_package.rs +++ b/crates/ui-egui/src/dialogs/tests_package.rs @@ -280,6 +280,27 @@ fn a_failed_save_before_packaging_writes_no_package() { } } +/// A save before packaging that Cancel Save stops writes no package either: the document keeps +/// its unsaved changes, so the package would not hold it as saved. +#[test] +fn a_canceled_save_before_packaging_writes_no_package() { + let dir = Folder::new("canceled-save"); + let gate = Gate::default(); + let (mut app, files) = saved_with_worker(&dir, &gate); + let out = dir.path("out"); + // An export holds the worker, so the save waits behind it and Cancel comes before it starts. + crate::io::export(&mut app, Some("svg"), Some(dir.path("first.svg")), &json!({})).unwrap(); + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 10, "height": 10})).unwrap(); + package_dialog(&mut app, &out); + assert_eq!(confirm(&mut app).unwrap()["background"], true); + assert_eq!(app.run("file.cancelSave", json!({})).unwrap()["cancelled"], 1); + gate.open(); + background::wait_all(&mut app); + assert_eq!(written(&files), [dir.path("first.svg")], "only the export"); + assert!(!std::path::Path::new(&out).join("card Folder").exists(), "no package folder"); + assert!(app.session.active().unwrap().is_dirty(), "the save was canceled"); +} + /// A package that an automation request confined to its roots asks for, started once the /// document's background save is written, is still confined to those roots, though the save's /// result arrives outside the request. diff --git a/crates/ui-egui/src/dialogs/tests_shortcut_import.rs b/crates/ui-egui/src/dialogs/tests_shortcut_import.rs index 066f7f4682..a4f8ba9d4b 100644 --- a/crates/ui-egui/src/dialogs/tests_shortcut_import.rs +++ b/crates/ui-egui/src/dialogs/tests_shortcut_import.rs @@ -234,6 +234,24 @@ fn cancel_and_apply_go_back_to_keyboard_shortcuts() { assert_eq!((app.ui.shortcut_set.as_str(), app.ui.shortcut_overrides.len()), ("Acme Keys", 3)); } +/// Started from VectorCraft's defaults, an import leaves no hold shortcut in the working set; added +/// to the current shortcuts, it keeps them. OK keeps what the working set shows. +#[test] +fn an_import_from_the_defaults_clears_the_hold_shortcuts() { + let mut app = app(); + earlier_answers(&mut app); + for (start, kept) in [("defaults", json!({})), ("current", json!({"paint.swap": "X"}))] { + app.ui.shortcut_holds = [("paint.swap".to_string(), "X".to_string())].into(); + shortcut_editor::open(&mut app); + super::shortcut_import::open(&mut app, "/sets/Acme Keys.kys", SET.as_bytes()).unwrap(); + set(&mut app, "start", json!(start)); + confirm(&mut app).unwrap(); + assert_eq!(dialog(&app).fields["holds"], kept, "{start}"); + confirm(&mut app).unwrap(); + assert_eq!(json!(app.ui.shortcut_holds), kept, "{start}: OK keeps it"); + } +} + /// A document's Missing Fonts dialog that Keyboard Shortcuts replaced waits while Cancel goes back /// from Import Shortcut Set to Keyboard Shortcuts, and opens again once Keyboard Shortcuts closes. #[test] diff --git a/crates/ui-egui/src/export_progress.rs b/crates/ui-egui/src/export_progress.rs index 3d392c3a35..ebde2f8be2 100644 --- a/crates/ui-egui/src/export_progress.rs +++ b/crates/ui-egui/src/export_progress.rs @@ -7,11 +7,17 @@ //! Cancel), Continue in Background (`file.exportInBackground`) closes the //! dialog and leaves the export to the status bar. //! +//! A save running in the background (Background Save) shows in the same window, with a moving bar +//! (a save counts no steps) and how many more saves wait: Cancel (`file.cancelSave`, also Esc) +//! stops it before it replaces its file, and Continue in Background (`file.saveInBackground`) +//! leaves it to the status bar. +//! //! It opens after [`DELAY`] so a quick export doesn't flash it, and waits while another dialog is //! open (the overwrite question, an options dialog): never two modals at once. use serde_json::json; +use crate::background::Kind; use crate::dialogs::modal; use crate::theme::Tokens; use crate::{VectorcraftApp, widgets}; @@ -24,11 +30,12 @@ fn seen_id() -> egui::Id { egui::Id::unique("export-progress-seen") } -/// What the dialog shows: (label, steps done, steps in all, share done, exports after this one, -/// what the steps are). +/// What the dialog shows: (label, steps done, steps in all, share done, jobs of its kind after this +/// one, what the steps are). fn shown(app: &VectorcraftApp, now: f64, ctx: &egui::Context) -> Option<(String, u64, u64, f32, usize, Steps)> { let jobs: Vec<_> = app.background.jobs.iter().filter(|j| !j.hidden && !j.cancelled()).filter(|j| j.progress.is_some()).collect(); let first = jobs.first()?; + let more = jobs.iter().filter(|j| j.kind == first.kind).count() - 1; let since = ctx.data_mut(|m| { let seen = m.get_temp_mut_or_insert_with(seen_id(), || (first.id(), now)); if seen.0 != first.id() { @@ -42,11 +49,12 @@ fn shown(app: &VectorcraftApp, now: f64, ctx: &egui::Context) -> Option<(String, let (done, total) = first.progress.as_ref().map(|p| p.counts()).unwrap_or_default(); let frac = first.progress.as_ref().and_then(|p| p.fraction()).unwrap_or(0.0) as f32; let steps = match &first.progress { + _ if first.kind == Kind::Save => Steps::Save, Some(p) if p.counts_share() => Steps::Share, Some(p) if p.counts_files() => Steps::Files, _ => Steps::Artboards, }; - Some((first.label.clone(), done, total, frac, jobs.len() - 1, steps)) + Some((first.label.clone(), done, total, frac, more, steps)) } /// What an export's steps are. @@ -57,6 +65,8 @@ enum Steps { Files, /// An exporter plug-in's own steps, shown as a share of the work. Share, + /// A save, which counts no steps: a moving bar. + Save, } /// Draws the window for the first export running in the background that wasn't hidden or @@ -71,6 +81,15 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { let t = Tokens::get(ctx); let heading = format!("{}…", crate::i18n::msg(&label)); let pressed = window(ctx, "export-progress", &heading, |ui| { + if steps == Steps::Save { + indeterminate(ui, tl!("Encoding and writing the file…")); + if more > 0 { + ui.add_space(6.0); + let queued = crate::i18n::tn(more as u64, "{n} more save waiting", "{n} more saves waiting"); + ui.label(egui::RichText::new(queued).size(11.5).color(t.text_dim)); + } + return; + } // One step says nothing a spinner doesn't: the bar would sit at 0 % until the file is written. if steps == Steps::Share && total > 0 { share(ui, tl!("Encoding and writing the file…"), frac); @@ -95,10 +114,12 @@ pub fn show(app: &mut VectorcraftApp, ctx: &egui::Context) { ui.label(egui::RichText::new(queued).size(11.5).color(t.text_dim)); } }); - let id = match pressed { - Some(Pressed::Cancel) => "file.cancelExport", - Some(Pressed::Hide) => "file.exportInBackground", - None => return, + let id = match (pressed, steps == Steps::Save) { + (Some(Pressed::Cancel), false) => "file.cancelExport", + (Some(Pressed::Hide), false) => "file.exportInBackground", + (Some(Pressed::Cancel), true) => "file.cancelSave", + (Some(Pressed::Hide), true) => "file.saveInBackground", + (None, _) => return, }; if let Err(e) = app.run(id, json!({})) { app.status(e); @@ -298,6 +319,45 @@ mod tests { assert!(app.background.jobs.is_empty()); } + /// A Background Save shows in the window after the delay, with a moving bar and how many more + /// saves wait, never over another dialog; Continue in Background hides it and the saves go on. + /// With Background Save off the save is written at once and no window shows. + #[test] + fn a_background_save_shows_in_the_window_and_continue_hides_it() { + let go = Arc::new(std::sync::atomic::AtomicBool::new(false)); + let mut app = app(go.clone()); + for name in ["a", "b"] { + app.run("file.new", json!({"width": 100, "height": 100})).unwrap(); + let r = app.run("file.save", json!({"path": format!("/docs/{name}.vectorcraft")})).unwrap(); + assert_eq!(r["background"], true, "{r}"); + } + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + assert!(!frame(&mut app, &ctx, 0.0).contains("Saving a.vectorcraft"), "not before the delay"); + // Another dialog is open: the window waits. + app.ui.dialog = Some(crate::state::Dialog::new("about", json!({}))); + frame(&mut app, &ctx, 1.0); + assert!(!frame(&mut app, &ctx, 1.1).contains("Saving a.vectorcraft"), "never over another dialog"); + app.ui.dialog = None; + frame(&mut app, &ctx, 1.2); + let shown = frame(&mut app, &ctx, 1.3); + assert!(shown.contains("Saving a.vectorcraft…") && shown.contains("1 more save waiting"), "{shown}"); + assert!(shown.contains("Cancel") && shown.contains("Continue in Background") && !shown.contains("export"), "{shown}"); + assert_eq!(app.run("file.saveInBackground", json!({})).unwrap()["hidden"], 2); + assert!(!frame(&mut app, &ctx, 2.0).contains("Saving"), "hidden saves aren't shown"); + assert!(crate::menus::enabled(&app, "file.cancelSave"), "they can still be canceled"); + go.store(true, std::sync::atomic::Ordering::SeqCst); + background::wait_all(&mut app); + assert!(app.background.jobs.is_empty()); + assert_eq!(app.session.active().unwrap().path.as_deref(), Some("/docs/b.vectorcraft")); + app.session.execute("prefs.set", &json!({"values": {"backgroundSave": false}})).unwrap(); + app.services.write = Some(Box::new(|_: &str, _: &[u8]| Ok(()))); + app.run("file.new", json!({"width": 100, "height": 100})).unwrap(); + let r = app.run("file.save", json!({"path": "/docs/c.vectorcraft"})); + assert!(r.as_ref().is_ok_and(|r| r.get("background").is_none()), "{r:?}"); + assert!(app.background.jobs.is_empty() && !frame(&mut app, &ctx, 3.0).contains("Saving")); + } + #[test] fn an_export_of_files_counts_files() { let go = Arc::new(std::sync::atomic::AtomicBool::new(false)); diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index 1e4f0bb8bb..d371a5f1e4 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -842,6 +842,7 @@ font-technology Variable Променливи Duplicate Action or Action Set Дублиране на действие или набор от действия Delete the action set “{name}” and its actions? Изтриване на набора от действия „{name}“ и неговите действия? Delete the selected action sets and their actions? Изтриване на избраните набори от действия и техните действия? + Delete all action sets and their actions? Изтриване на всички набори от действия и техните действия? Delete Theme Изтриване на тема Delete theme Изтриване на тема Delete these {n} graphic styles? Изтриване на тези {n} графични стила? @@ -1303,6 +1304,7 @@ font-technology Variable Променливи Fit to Selected Art Побиране спрямо избраната графика Flag… Знаме… Flare Взрив + Edit Flare Редактиране на взрива Flare Tool Инструмент „Взрив“ Flare Tool Options Опции на инструмента „Взрив“ Halo Ореол @@ -2179,6 +2181,9 @@ font-technology Variable Променливи Navigate Навигация Navigator Навигатор Navigator Panel Options Опции за панела „Навигатор“ + Attributes Panel Options Опции за панела „Атрибути“ + Number of Recent URLs: Брой скорошни URL адреси: +@msg `count` must be a whole number from 1 to 30 `count` трябва да е цяло число от 1 до 30 Draw Dashed Lines as Solid Lines Изчертаване на прекъснатите линии като плътни Needs the desktop app Изисква десктоп приложение Neutral Gradients Неутрални градиенти @@ -2645,6 +2650,7 @@ font-technology Variable Променливи Save Actions… Запазване на действия… Load Actions… Зареждане на действия… Replace Actions… Замяна на действия… + Clear Actions Изчистване на действия Reset Actions Нулиране на действия Replace the current actions with the default set? Да се заменят ли текущите действия с набора по подразбиране? Append adds the default set after the current sets instead. С „Добавяне“ наборът по подразбиране се добавя след текущите набори. @@ -3084,6 +3090,8 @@ digits Malayalam Малаялам The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Колелцето на мишката с натиснат Cmd/Ctrl превърта платното настрани. Dragging sideways on a numeric field's label changes the field's value. Влаченето настрани върху етикета на числово поле променя стойността на полето. A two-finger rotate gesture on a trackpad rotates the canvas view. Жест за завъртане с два пръста върху тъчпад завърта изгледа на платното. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Задържането на клавиш изпълнява инструмента или командата от колоната „Задръжте“ в „Клавишни комбинации“; краткото натискане изпълнява обичайната му комбинация. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Колко секунди трябва да се задържи клавиш, преди вместо обичайната му комбинация да се изпълни комбинацията му със задържане. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Когато премествате котвени точки, всяка крива с една преместена крайна точка запазва формата си спрямо краищата си. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Задържането на клавишната комбинация на инструмент го избира, докато я пуснете, а след това отново се избира предишният инструмент. Shows the bounding box while you move the selection or draw a shape. Показва ограничителната рамка, докато премествате селекцията или рисувате форма. @@ -4810,6 +4818,7 @@ axis Both И двете @msg no graphic style `{n}` няма графичен стил `{n}` @msg no interaction in progress няма текущо взаимодействие @msg no key object няма основен обект +@msg Align to Key Object isn't available with the Artboard tool „Подравняване спрямо ключов обект“ не е налично с инструмента „Работна област“ @msg no library `{key}` (see {list}) няма библиотека `{key}` (вижте {list}) @msg no native format няма нативен формат @msg no pages няма страници @@ -4861,6 +4870,8 @@ axis Both И двете @msg no such spine point няма такава точка от оста @msg `with` must be a list of at most 10000 spine point indexes `with` трябва да е списък с най-много 10000 индекса на точки от оста @msg `with` moves points, not a handle `with` мести точки, не дръжка +@msg `link` and `independent` cannot both be true `link` и `independent` не могат и двата да са true +@msg `link` places a handle: give `handle` `link` поставя дръжка: задайте `handle` @msg no such spine segment няма такъв сегмент от оста @msg no such subpath няма такъв подпът @msg no such user library няма такава потребителска библиотека @@ -4947,6 +4958,7 @@ axis Both И двете @msg select a blend изберете преход (blend) @msg select a blend or give `id` изберете преливане или задайте неговия `id` @msg select a clip group изберете група за изрязване +@msg select a flare изберете взрив @msg select a gradient mesh изберете мрежа на градиент (gradient mesh) @msg select a linked image: an embedded one has no file изберете свързано изображение: вграденото няма файл @msg select a repeat изберете повторение (repeat) @@ -5160,6 +5172,7 @@ axis Both И двете @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} свързано изображение е променено на диска: „Обновяване на връзките“ показва новата версия|{n} свързани изображения са променени на диска: „Обновяване на връзките“ показва новите версии @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Обновен е {n} свързан файл, променен на диска|Обновени са {n} свързани файла, променени на диска @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings документът задава изтичане, което този PDF/X файл пропуска: включете „Използване на настройките за изтичане на документа“ +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} обект достига ръба на обрязване, но не стига до изтичането|{n} обекта достигат ръба на обрязване, но не стигат до изтичането @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} е експортиран с {n} бележка: {first}|{what} е експортиран с {n} бележки: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} шрифтов файл вече е в {folder}|{n} шрифтови файла вече са в {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} шрифтов файл вече е в {folder}; {failed} не можаха да бъдат добавени: {reason}|{n} шрифтови файла вече са в {folder}; {failed} не можаха да бъдат добавени: {reason} @@ -6334,6 +6347,9 @@ theme Appearance Външен вид Continue in Background Продължаване във фонов режим Cancel Export Отказ от експортирането @msg Export cancelled Експортирането е отказано + Cancel Save Отказ от записването +@plural {n} more save waiting|{n} more saves waiting Още {n} записване в изчакване|Още {n} записвания в изчакване +@msg Save canceled Записването е отказано # Paragraph panel menu › Justification… Desired Желано Word Spacing: Разстояние между думите: @@ -6637,6 +6653,12 @@ axis Y Axis Y ос Bus Lines Шинни линии Terminal Nodes Крайни възли +# Original arrow art brushes. + Arrows Стрелки + Solid Arrow Плътна стрелка + Open Arrow Отворена стрелка + Chevron Arrow Стрелка с шеврон + Notched Ribbon Назъбена лента Double Line Двойна линия Wave Вълна @@ -7291,10 +7313,18 @@ breakText Glyphs Глифи Smooth Bridge… Плавен мост… Smooth Bridge Плавен мост Keep Originals Запазване на оригиналите -@msg select two circles to bridge изберете два кръга за свързване +@msg select two or more circles to bridge изберете два или повече кръга за свързване @msg one circle is inside the other единият кръг е вътре в другия @msg the circles are too far apart for this radius: raise the radius кръговете са твърде далеч един от друг за този радиус: увеличете радиуса @msg the circles are too far apart for this radius кръговете са твърде далеч един от друг за този радиус + Constant Gap Постоянно разстояние + Reach: Обхват: +@msg the circles are too far apart for this gap: raise the gap кръговете са твърде далеч един от друг за това разстояние: увеличете разстоянието +@msg the circles are too far apart for this gap кръговете са твърде далеч един от друг за това разстояние +@msg no two circles are within reach: raise the reach няма два кръга в обхват: увеличете обхвата +@msg select at most 2000 circles to bridge изберете най-много 2000 кръга за свързване +@msg that makes too many bridges (at most 8000): lower the reach това дава твърде много мостове (най-много 8000): намалете обхвата +@msg the bridged circles are too complex to unite свързаните кръгове са твърде сложни за обединяване # Path Precision Tools add-on: Common Tangents. Common Tangents… Общи допирателни… Common Tangents Общи допирателни @@ -7654,6 +7684,17 @@ breakText Glyphs Глифи @msg A joint does not close by {gap} pt. Една връзка не се затваря с {gap} pt. @msg Two panels pass through each other. Два панела минават един през друг. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer трябва да е "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" + Tap Кратко натискане + Clear Hold Изчистване на задържането + Hold Shortcuts Комбинации със задържане + Hold Shortcut Delay Забавяне на комбинациите със задържане + How hold shortcuts work Как работят комбинациите със задържане + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Щракнете и натиснете клавиш, който да се задържа за това (Esc отменя). Задържането на клавиша изпълнява това; краткото натискане изпълнява собствената комбинация на клавиша. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Краткото натискане на клавиш изпълнява неговата комбинация. Задържането на клавиша за времето на забавяне изпълнява вместо това инструмента или командата от колоната му „Задръжте“. Комбинация със задържане е клавиш с буква, цифра или препинателен знак, самостоятелно или с Shift. +@msg Hold {_1} is already used by {_2} Задържането на {_1} вече се използва от {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) комбинация със задържане е клавиш, който въвежда знак, самостоятелно или с Shift ({shown} съдържа Cmd, Ctrl или Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} не може да бъде комбинация със задържане: използвайте буква, цифра или препинателен знак + Dashed Arrow Пунктирана стрелка Pressure Sensitive Чувствителни на натиск Flex Ribbon Гъвкава лента Pulse Stroke Пулсиращ щрих diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index b5925b93ef..00d07d469d 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -810,6 +810,9 @@ Magic Wand Čarobni štapić Navigator Navigator Navigator Panel Options Opcije panela navigatora + Attributes Panel Options Opcije panela atributa + Number of Recent URLs: Broj nedavnih URL-ova: +@msg `count` must be a whole number from 1 to 30 `count` mora biti cijeli broj od 1 do 30 Draw Dashed Lines as Solid Lines Crtaj isprekidane linije kao pune Pattern Options Opcije uzorka Properties Svojstva @@ -1561,6 +1564,7 @@ lighting Light Svjetlo Save Actions… Sačuvaj akcije… Load Actions… Učitaj akcije… Replace Actions… Zamijeni akcije… + Clear Actions Očisti akcije Reset Actions Vrati akcije na početno Replace the current actions with the default set? Zamijeniti trenutne akcije zadanim skupom? Append adds the default set after the current sets instead. Dugme Dodaj umjesto toga dodaje zadani skup iza trenutnih skupova. @@ -1865,6 +1869,7 @@ digits Malayalam Malajalam Duplicate Action or Action Set Dupliciraj akciju ili skup akcija Delete the action set “{name}” and its actions? Izbrisati skup akcija „{name}” i njegove akcije? Delete the selected action sets and their actions? Izbrisati odabrane skupove akcija i njihove akcije? + Delete all action sets and their actions? Izbrisati sve skupove akcija i njihove akcije? Delete these {n} graphic styles? Izbrisati ove grafičke stilove ({n})? Delete this {n} graphic style? Izbrisati ovaj grafički stil ({n})? Graphic Style Libraries Menu Meni biblioteka grafičkih stilova @@ -4260,6 +4265,7 @@ theme Appearance Izgled Set Tab Stops Postavi tabulatore Tab Stops Tabulatori Flare Odsjaj + Edit Flare Uredi odsjaj Rays Zrake Rectangle Pravougaonik Paintbrush Kist @@ -4551,6 +4557,8 @@ font-technology Variable Varijabilni The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Točkić miša uz pritisnut Cmd/Ctrl pomjera platno u stranu. Dragging sideways on a numeric field's label changes the field's value. Prevlačenje u stranu po oznaci brojčanog polja mijenja vrijednost polja. A two-finger rotate gesture on a trackpad rotates the canvas view. Pokret rotacije s dva prsta na dodirnoj podlozi rotira prikaz platna. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Držanje tipke pokreće alat ili naredbu iz njene kolone „Zadrži“ u Prečicama na tastaturi; kratki pritisak pokreće njenu uobičajenu prečicu. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Koliko sekundi tipka mora biti pritisnuta prije nego što se umjesto uobičajene prečice pokrene njena prečica zadržavanjem. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Kada pomjerate sidrene tačke, svaka kriva s jednim pomjerenim krajem zadržava svoj oblik u odnosu na svoje krajeve. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Držanje prečice alata bira taj alat dok je ne pustite, a zatim se ponovo bira prethodni alat. Shows the bounding box while you move the selection or draw a shape. Prikazuje granični okvir dok pomjerate odabir ili crtate oblik. @@ -5223,6 +5231,7 @@ imageTrace Outline Obris @msg no graphic style `{n}` nema grafičkog stila `{n}` @msg no interaction in progress nema interakcije u toku @msg no key object nema ključnog objekta +@msg Align to Key Object isn't available with the Artboard tool „Poravnaj s ključnim objektom“ nije dostupno s alatom radna ploča @msg no library `{key}` (see {list}) nema biblioteke `{key}` (vidi {list}) @msg no native format nema izvornog formata @msg no pages nema stranica @@ -5278,6 +5287,8 @@ imageTrace Outline Obris @msg no such spine point nema takve tačke kičme @msg `with` must be a list of at most 10000 spine point indexes `with` mora biti lista od najviše 10000 indeksa tačaka kičme @msg `with` moves points, not a handle `with` pomjera tačke, ne ručicu +@msg `link` and `independent` cannot both be true `link` i `independent` ne mogu oba biti true +@msg `link` places a handle: give `handle` `link` postavlja ručicu: navedite `handle` @msg no such spine segment nema takvog segmenta kičme @msg no such subpath nema takve podputanje @msg no such user library nema takve korisničke biblioteke @@ -5366,6 +5377,7 @@ imageTrace Outline Obris @msg select a blend odaberite stapanje @msg select a blend or give `id` odaberite stapanje ili navedite `id` @msg select a clip group odaberite grupu isijecanja +@msg select a flare odaberite odsjaj @msg select a gradient mesh odaberite gradijentnu mrežu @msg select a linked image: an embedded one has no file odaberite povezanu sliku: ugrađena nema datoteku @msg select a repeat odaberite ponavljanje @@ -5589,6 +5601,7 @@ imageTrace Outline Obris @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} povezana slika promijenjena je na disku: Ažuriraj veze prikazuje novu verziju|{n} povezane slike promijenjene su na disku: Ažuriraj veze prikazuje nove verzije|{n} povezanih slika promijenjeno je na disku: Ažuriraj veze prikazuje nove verzije @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Ažurirana je {n} povezana datoteka promijenjena na disku|Ažurirane su {n} povezane datoteke promijenjene na disku|Ažurirano je {n} povezanih datoteka promijenjenih na disku @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings dokument zadaje napust koji ova PDF/X datoteka izostavlja: uključite „Koristi postavke napusta dokumenta“ +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objekt doseže rub obreza, ali ne doseže napust|{n} objekta dosežu rub obreza, ali ne dosežu napust|{n} objekata doseže rub obreza, ali ne doseže napust @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Izvezeno {what} s {n} bilješkom: {first}|Izvezeno {what} s {n} bilješke: {first}|Izvezeno {what} s {n} bilješki: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} datoteka fonta sada je u {folder}|{n} datoteke fontova sada su u {folder}|{n} datoteka fontova sada je u {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} datoteka fonta sada je u {folder}; {failed} nije moguće dodati: {reason}|{n} datoteke fontova sada su u {folder}; {failed} nije moguće dodati: {reason}|{n} datoteka fontova sada je u {folder}; {failed} nije moguće dodati: {reason} @@ -6358,6 +6371,9 @@ mark-style Japanese Japanski Continue in Background Nastavi u pozadini Cancel Export Otkaži izvoz @msg Export cancelled Izvoz otkazan + Cancel Save Otkaži čuvanje +@plural {n} more save waiting|{n} more saves waiting Čeka još {n} čuvanje|Čekaju još {n} čuvanja|Čeka još {n} čuvanja +@msg Save canceled Čuvanje otkazano Desired Željeno Word Spacing: Razmak riječi: Letter Spacing: Razmak slova: @@ -6693,6 +6709,12 @@ axis Y Axis Y osa Bus Lines Linije sabirnice Terminal Nodes Priključni čvorovi +# Original arrow art brushes. + Arrows Strelice + Solid Arrow Puna strelica + Open Arrow Otvorena strelica + Chevron Arrow Strelica sa ševronom + Notched Ribbon Zarezana traka Double Line Dvostruka linija Wave Talas @@ -7340,10 +7362,18 @@ shape Open Otvoren Smooth Bridge… Glatki most… Smooth Bridge Glatki most Keep Originals Zadrži originale -@msg select two circles to bridge odaberite dva kruga za premošćavanje +@msg select two or more circles to bridge odaberite dva ili više krugova za premošćavanje @msg one circle is inside the other jedan krug je unutar drugog @msg the circles are too far apart for this radius: raise the radius krugovi su predaleko jedan od drugog za ovaj radijus: povećajte radijus @msg the circles are too far apart for this radius krugovi su predaleko jedan od drugog za ovaj radijus + Constant Gap Stalni razmak + Reach: Domet: +@msg the circles are too far apart for this gap: raise the gap krugovi su predaleko jedan od drugog za ovaj razmak: povećajte razmak +@msg the circles are too far apart for this gap krugovi su predaleko jedan od drugog za ovaj razmak +@msg no two circles are within reach: raise the reach nijedna dva kruga nisu u dometu: povećajte domet +@msg select at most 2000 circles to bridge odaberite najviše 2000 krugova za premošćavanje +@msg that makes too many bridges (at most 8000): lower the reach to daje previše mostova (najviše 8000): smanjite domet +@msg the bridged circles are too complex to unite premošteni krugovi su previše složeni za spajanje # Path Precision Tools add-on: Common Tangents. Common Tangents… Zajedničke tangente… Common Tangents Zajedničke tangente @@ -7709,6 +7739,17 @@ shape Open Otvoren @msg A joint does not close by {gap} pt. Spoj se ne zatvara za {gap} pt. @msg Two panels pass through each other. Dva panela prolaze jedan kroz drugi. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer mora biti "singleLine", "everyLine", "standardSingleLine" ili "standardEveryLine" + Tap Kratki pritisak + Clear Hold Očisti zadržavanje + Hold Shortcuts Prečice zadržavanjem + Hold Shortcut Delay Kašnjenje prečica zadržavanjem + How hold shortcuts work Kako rade prečice zadržavanjem + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Kliknite, zatim pritisnite tipku koju treba zadržati za ovo (Esc otkazuje). Zadržavanje tipke pokreće ovo; kratki pritisak pokreće vlastitu prečicu tipke. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Kratki pritisak tipke pokreće njenu prečicu. Zadržavanje tipke tokom kašnjenja umjesto toga pokreće alat ili naredbu iz njene kolone Zadrži. Prečica zadržavanjem je tipka sa slovom, cifrom ili interpunkcijskim znakom, sama ili sa Shift. +@msg Hold {_1} is already used by {_2} Zadržavanje {_1} već koristi {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) prečica zadržavanjem je tipka koja upisuje znak, sama ili sa Shift ({shown} ima Cmd, Ctrl ili Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} ne može biti prečica zadržavanjem: koristite slovo, cifru ili interpunkcijsku tipku + Dashed Arrow Isprekidana strelica Pressure Sensitive Osjetljivo na pritisak Flex Ribbon Savijajuća traka Pulse Stroke Pulsirajući potez diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 10862f53b4..78e5a77c9e 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -1227,6 +1227,7 @@ antiAlias Sharp Nítid Duplicate Action or Action Set Duplica l’acció o el conjunt d’accions Delete the action set “{name}” and its actions? Voleu suprimir el conjunt d’accions “{name}” i les seves accions? Delete the selected action sets and their actions? Voleu suprimir els conjunts d’accions seleccionats i les seves accions? + Delete all action sets and their actions? Voleu suprimir tots els conjunts d’accions i les seves accions? Delete the library “{name}”? Voleu suprimir la biblioteca “{name}”? Delete Theme Suprimeix el tema Delete theme Suprimeix el tema @@ -1836,6 +1837,7 @@ digits Malayalam Malaiàlam Fixed Fix Flag… Marca… Flare Resplendor + Edit Flare Edita el resplendor Flare Tool Eina de resplendor Flare Tool Options Opcions de l’eina de resplendor Flat Angle Angle pla @@ -2861,6 +2863,9 @@ digits Malayalam Malaiàlam Navigate Navega Navigator Navegador Navigator Panel Options Opcions del panell Navegador + Attributes Panel Options Opcions del panell Atributs + Number of Recent URLs: Nombre d’URL recents: +@msg `count` must be a whole number from 1 to 30 `count` ha de ser un nombre enter d’1 a 30 Draw Dashed Lines as Solid Lines Dibuixa les línies discontínues com a contínues Needs a choice Necessita una tria Needs a key Necessita una clau @@ -3423,6 +3428,7 @@ digits Malayalam Malaiàlam Save Actions… Desa les accions… Load Actions… Carrega accions… Replace Actions… Reemplaça les accions… + Clear Actions Esborra les accions Reset Actions Restableix les accions Replace the current actions with the default set? Voleu reemplaçar les accions actuals pel conjunt predeterminat? Append adds the default set after the current sets instead. Amb Afegeix, el conjunt predeterminat s’afegeix després dels conjunts actuals. @@ -3935,6 +3941,8 @@ digits Malayalam Malaiàlam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La roda del ratolí amb Cmd/Ctrl premut desplaça el llenç en horitzontal. Dragging sideways on a numeric field's label changes the field's value. Arrossegar en horitzontal sobre l’etiqueta d’un camp numèric canvia el valor del camp. A two-finger rotate gesture on a trackpad rotates the canvas view. Un gest de rotació amb dos dits al trackpad gira la vista del llenç. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Mantenir premuda una tecla executa l’eina o l’ordre de la seva columna Mantén a Dreceres de teclat; una pulsació breu executa la seva drecera habitual. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Quants segons cal mantenir premuda una tecla perquè s’executi la seva drecera de pulsació llarga en lloc de la drecera habitual. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Quan moveu punts d’ancoratge, cada corba amb un extrem desplaçat conserva la forma respecte dels seus extrems. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Mantenir premuda la drecera d’una eina la tria fins que la deixeu anar, i després es torna a triar l’eina anterior. Shows the bounding box while you move the selection or draw a shape. Mostra el quadre delimitador mentre moveu la selecció o dibuixeu una forma. @@ -4301,6 +4309,12 @@ digits Malayalam Malaiàlam Bus Lines Línies de bus Terminal Nodes Nodes terminals +# Original arrow art brushes. + Arrows Fletxes + Solid Arrow Fletxa sòlida + Open Arrow Fletxa oberta + Chevron Arrow Fletxa amb galó + Notched Ribbon Cinta dentada Double Line Línia doble Wave Ona @@ -6426,6 +6440,9 @@ liquify-list-end {0}, {1} {0} i {1} @msg Expand: no gradient fills Expandeix: no hi ha farciments de degradat @msg Expand: nothing to expand Expandeix: no hi ha res per expandir @msg Export cancelled Exportació cancel·lada + Cancel Save Cancel·la el desament +@plural {n} more save waiting|{n} more saves waiting {n} desament més en espera|{n} desaments més en espera +@msg Save canceled Desament cancel·lat @msg Exported {path} S’ha exportat {path} @msg Exported {what} S’ha exportat {what} @msg Exporting {_1} S’està exportant {_1} @@ -6636,6 +6653,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg no history state {v} no hi ha cap estat de l’historial {v} @msg no interaction in progress no hi ha cap interacció en curs @msg no key object no hi ha objecte clau +@msg Align to Key Object isn't available with the Artboard tool «Alinea a l’objecte clau» no està disponible amb l’eina de tauler @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}) @@ -6707,6 +6725,8 @@ liquify-list-end {0}, {1} {0} i {1} @msg no such spine point no existeix aquest punt de l’espina @msg `with` must be a list of at most 10000 spine point indexes `with` ha de ser una llista d’un màxim de 10000 índexs de punts de l’espina @msg `with` moves points, not a handle `with` mou punts, no una nansa +@msg `link` and `independent` cannot both be true `link` i `independent` no poden ser true alhora +@msg `link` places a handle: give `handle` `link` col·loca una nansa: indiqueu `handle` @msg no such spine segment no existeix aquest segment de l’espina @msg no such subpath no existeix aquest subtraçat @msg no such user library no existeix aquesta biblioteca d’usuari @@ -6852,6 +6872,7 @@ liquify-list-end {0}, {1} {0} i {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} imatge enllaçada ha canviat al disc: Actualitza els enllaços mostra la versió nova|{n} imatges enllaçades han canviat al disc: Actualitza els enllaços mostra les versions noves @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk S’ha actualitzat {n} fitxer enllaçat que ha canviat al disc|S’han actualitzat {n} fitxers enllaçats que han canviat al disc @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings el document defineix un sangrat que aquest fitxer PDF/X omet: activeu «Utilitza la configuració de sangrat del document» +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objecte arriba a la vora de tall però no arriba al sangrat|{n} objectes arriben a la vora de tall però no arriben al sangrat @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} S’ha exportat {what} amb {n} nota: {first}|S’ha exportat {what} amb {n} notes: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} fitxer de tipus de lletra ja és a {folder}|{n} fitxers de tipus de lletra ja són a {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} fitxer de tipus de lletra ja és a {folder}; {failed} no s’han pogut afegir: {reason}|{n} fitxers de tipus de lletra ja són a {folder}; {failed} no s’han pogut afegir: {reason} @@ -6896,6 +6917,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg select a blend selecciona una fusió @msg select a blend or give `id` selecciona una fusió o dona `id` @msg select a clip group selecciona un grup de retall +@msg select a flare selecciona un resplendor @msg select a gradient mesh selecciona una malla de degradat @msg select a linked image: an embedded one has no file selecciona una imatge enllaçada: una d’incrustada no té fitxer @msg select a Live Paint group selecciona un grup de pintura interactiva @@ -8084,10 +8106,18 @@ breakText Glyphs Glifs Smooth Bridge… Pont suau… Smooth Bridge Pont suau Keep Originals Conserva els originals -@msg select two circles to bridge seleccioneu dos cercles per unir-los +@msg select two or more circles to bridge seleccioneu dos o més cercles per unir-los @msg one circle is inside the other un cercle és dins de l’altre @msg the circles are too far apart for this radius: raise the radius els cercles estan massa separats per a aquest radi: augmenteu el radi @msg the circles are too far apart for this radius els cercles estan massa separats per a aquest radi + Constant Gap Separació constant + Reach: Abast: +@msg the circles are too far apart for this gap: raise the gap els cercles estan massa separats per a aquesta separació: augmenteu la separació +@msg the circles are too far apart for this gap els cercles estan massa separats per a aquesta separació +@msg no two circles are within reach: raise the reach no hi ha dos cercles dins de l’abast: augmenteu l’abast +@msg select at most 2000 circles to bridge seleccioneu com a màxim 2000 cercles per unir-los +@msg that makes too many bridges (at most 8000): lower the reach això fa massa ponts (com a màxim 8000): reduïu l’abast +@msg the bridged circles are too complex to unite els cercles units són massa complexos per combinar-los # Path Precision Tools add-on: Common Tangents. Common Tangents… Tangents comunes… Common Tangents Tangents comunes @@ -8611,6 +8641,17 @@ breakText Glyphs Glifs @msg A joint does not close by {gap} pt. Una unió no es tanca per {gap} pt. @msg Two panels pass through each other. Dos panells es travessen l’un a l’altre. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer ha de ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" + Tap Pulsació breu + Clear Hold Esborra la pulsació llarga + Hold Shortcuts Dreceres de pulsació llarga + Hold Shortcut Delay Retard de les dreceres de pulsació llarga + How hold shortcuts work Com funcionen les dreceres de pulsació llarga + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Fes clic i prem una tecla per mantenir premuda per a això (Esc cancel·la). Mantenir premuda la tecla executa això; una pulsació breu executa la drecera pròpia de la tecla. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Una pulsació breu d’una tecla executa la seva drecera. Mantenir premuda la tecla durant el retard executa en canvi l’eina o l’ordre de la seva columna Mantén. Una drecera de pulsació llarga és una tecla de lletra, xifra o puntuació, sola o amb Shift. +@msg Hold {_1} is already used by {_2} La pulsació llarga de {_1} ja la fa servir {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) una drecera de pulsació llarga és una tecla que escriu un caràcter, sola o amb Shift ({shown} té Cmd, Ctrl o Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} no pot ser una drecera de pulsació llarga: fes servir una lletra, una xifra o una tecla de puntuació + Dashed Arrow Fletxa discontínua @msg a line or other open path that encloses no area contributes no area to the compound shape; to include it, apply Object › Path › Outline Stroke to it first una línia o un altre traçat obert que no tanca cap àrea no aporta cap àrea a la forma composta; per incloure’l, apliqueu-hi primer Objecte › Traçat › Contorneja el traç Pressure Sensitive Sensible a la pressió Flex Ribbon Cinta flexible diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index af6848f26c..bd3e76ec50 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -824,6 +824,9 @@ Magic Wand Kouzelná hůlka Navigator Navigátor Navigator Panel Options Možnosti panelu Navigátor + Attributes Panel Options Možnosti panelu Atributy + Number of Recent URLs: Počet nedávných URL: +@msg `count` must be a whole number from 1 to 30 `count` musí být celé číslo od 1 do 30 Draw Dashed Lines as Solid Lines Kreslit čárkované čáry jako plné Pattern Options Možnosti vzorku Properties Vlastnosti @@ -1590,6 +1593,7 @@ lighting Light Světlo Save Actions… Uložit akce… Load Actions… Načíst akce… Replace Actions… Nahradit akce… + Clear Actions Vymazat akce Reset Actions Obnovit akce Replace the current actions with the default set? Nahradit aktuální akce výchozí sadou? Append adds the default set after the current sets instead. Tlačítko Připojit místo toho přidá výchozí sadu za aktuální sady. @@ -1937,6 +1941,7 @@ digits Malayalam Malajálamské Duplicate Action or Action Set Duplikovat akci nebo sadu akcí Delete the action set “{name}” and its actions? Odstranit sadu akcí „{name}“ a její akce? Delete the selected action sets and their actions? Odstranit vybrané sady akcí a jejich akce? + Delete all action sets and their actions? Odstranit všechny sady akcí a jejich akce? Delete these {n} graphic styles? Odstranit tyto grafické styly ({n})? Delete this {n} graphic style? Odstranit tento grafický styl ({n})? Graphic Style Libraries Menu Nabídka knihoven grafických stylů @@ -4371,6 +4376,7 @@ theme Appearance Motiv Set Tab Stops Nastavit zarážky tabulátoru Tab Stops Zarážky tabulátoru Flare Odlesk + Edit Flare Upravit odlesk Rays Paprsky Rectangle Obdélník Paintbrush Štětec @@ -4662,6 +4668,8 @@ font-technology Variable Variabilní The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Kolečko myši s podrženou klávesou Cmd/Ctrl posouvá plátno do stran. Dragging sideways on a numeric field's label changes the field's value. Tažení do stran po popisku číselného pole mění hodnotu pole. A two-finger rotate gesture on a trackpad rotates the canvas view. Gesto otočení dvěma prsty na trackpadu otáčí zobrazení plátna. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Podržení klávesy spustí nástroj nebo příkaz ze sloupce Podržení v Klávesových zkratkách; krátký stisk spustí její obvyklou zkratku. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Jak dlouho v sekundách je nutné klávesu podržet, než se místo obvyklé zkratky spustí její zkratka podržením. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Když přesouváte kotvové body, každá křivka s jedním přesunutým koncem si zachová tvar vůči svým koncům. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Podržení zkratky nástroje vybere nástroj, dokud ji nepustíte, a pak se znovu vybere předchozí nástroj. Shows the bounding box while you move the selection or draw a shape. Zobrazí ohraničovací rámeček, když přesouváte výběr nebo kreslíte tvar. @@ -5541,6 +5549,7 @@ liquify-list-end {0}, {1} {0} a {1} @msg no graphic style `{n}` grafický styl `{n}` neexistuje @msg no interaction in progress neprobíhá žádná interakce @msg no key object žádný klíčový objekt +@msg Align to Key Object isn't available with the Artboard tool „Zarovnat ke klíčovému objektu“ není s nástrojem Pracovní plocha k dispozici @msg no library `{key}` (see {list}) knihovna `{key}` neexistuje (viz {list}) @msg no native format chybí nativní formát @msg no pages žádné stránky @@ -5596,6 +5605,8 @@ liquify-list-end {0}, {1} {0} a {1} @msg no such spine point takový bod páteře neexistuje @msg `with` must be a list of at most 10000 spine point indexes `with` musí být seznam nejvýše 10000 indexů bodů páteře @msg `with` moves points, not a handle `with` posouvá body, ne táhlo +@msg `link` and `independent` cannot both be true `link` a `independent` nemohou být zároveň true +@msg `link` places a handle: give `handle` `link` umisťuje táhlo: zadejte `handle` @msg no such spine segment takový segment páteře neexistuje @msg no such subpath taková dílčí cesta neexistuje @msg no such user library taková uživatelská knihovna neexistuje @@ -5684,6 +5695,7 @@ liquify-list-end {0}, {1} {0} a {1} @msg select a blend vyberte prolnutí @msg select a blend or give `id` vyberte prolnutí, nebo zadejte `id` @msg select a clip group vyberte ořezovou skupinu +@msg select a flare vyberte odlesk @msg select a gradient mesh vyberte přechodovou síť @msg select a linked image: an embedded one has no file vyberte propojený obrázek: vložený nemá soubor @msg select a repeat vyberte opakování @@ -5941,6 +5953,7 @@ variable-list-end {0}, {1} {0} a {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions Na disku se změnil {n} propojený obrázek: novou verzi zobrazí Aktualizovat propojení|Na disku se změnily {n} propojené obrázky: nové verze zobrazí Aktualizovat propojení|Na disku se změnilo {n} propojených obrázků: nové verze zobrazí Aktualizovat propojení @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Aktualizován {n} propojený soubor změněný na disku|Aktualizovány {n} propojené soubory změněné na disku|Aktualizováno {n} propojených souborů změněných na disku @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings dokument nastavuje spadávku, kterou tento soubor PDF/X vynechává: zapněte „Použít nastavení spadávky dokumentu“ +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objekt sahá k hraně ořezu, ale nedosahuje do spadávky|{n} objekty sahají k hraně ořezu, ale nedosahují do spadávky|{n} objektů sahá k hraně ořezu, ale nedosahuje do spadávky @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Exportováno: {what}, {n} poznámka: {first}|Exportováno: {what}, {n} poznámky: {first}|Exportováno: {what}, {n} poznámek: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} soubor písma je nyní ve složce {folder}|{n} soubory písem jsou nyní ve složce {folder}|{n} souborů písem je nyní ve složce {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} soubor písma je nyní ve složce {folder}; nepodařilo se přidat {failed}: {reason}|{n} soubory písem jsou nyní ve složce {folder}; nepodařilo se přidat {failed}: {reason}|{n} souborů písem je nyní ve složce {folder}; nepodařilo se přidat {failed}: {reason} @@ -6867,6 +6880,9 @@ mark-style Japanese Japonské Continue in Background Pokračovat na pozadí Cancel Export Zrušit export @msg Export cancelled Export byl zrušen + Cancel Save Zrušit ukládání +@plural {n} more save waiting|{n} more saves waiting Čeká ještě {n} uložení|Čekají ještě {n} uložení|Čeká ještě {n} uložení +@msg Save canceled Ukládání bylo zrušeno # Paragraph panel menu › Justification… Desired Požadované Word Spacing: Mezery mezi slovy: @@ -7385,6 +7401,12 @@ axis Y Axis osa Y Bus Lines Sběrnicové linky Terminal Nodes Koncové uzly +# Original arrow art brushes. + Arrows Šipky + Solid Arrow Plná šipka + Open Arrow Otevřená šipka + Chevron Arrow Šipka s krokví + Notched Ribbon Vroubkovaná stuha Double Line Dvojitá čára Wave Vlna @@ -8069,10 +8091,18 @@ breakText Glyphs Glyfy Smooth Bridge… Hladký most… Smooth Bridge Hladký most Keep Originals Zachovat originály -@msg select two circles to bridge vyberte dva kruhy k propojení +@msg select two or more circles to bridge vyberte dva nebo více kruhů k propojení @msg one circle is inside the other jeden kruh je uvnitř druhého @msg the circles are too far apart for this radius: raise the radius kruhy jsou pro tento poloměr příliš daleko od sebe: zvětšete poloměr @msg the circles are too far apart for this radius kruhy jsou pro tento poloměr příliš daleko od sebe + Constant Gap Stálá mezera + Reach: Dosah: +@msg the circles are too far apart for this gap: raise the gap kruhy jsou pro tuto mezeru příliš daleko od sebe: zvětšete mezeru +@msg the circles are too far apart for this gap kruhy jsou pro tuto mezeru příliš daleko od sebe +@msg no two circles are within reach: raise the reach žádné dva kruhy nejsou v dosahu: zvětšete dosah +@msg select at most 2000 circles to bridge vyberte nejvýše 2000 kruhů k propojení +@msg that makes too many bridges (at most 8000): lower the reach to dává příliš mnoho mostů (nejvýše 8000): zmenšete dosah +@msg the bridged circles are too complex to unite propojené kruhy jsou příliš složité na sloučení # Path Precision Tools add-on: Common Tangents. Common Tangents… Společné tečny… Common Tangents Společné tečny @@ -10376,6 +10406,16 @@ breakText Glyphs Glyfy No objects are selected. Nejsou vybrány žádné objekty. Open a document to mark its fold lines. Otevřete dokument, abyste označili jeho linie skladu. Remove Fold Line Role Odstranit typ linie + Tap Krátký stisk + Clear Hold Vymazat podržení + Hold Shortcuts Zkratky podržením + Hold Shortcut Delay Prodleva zkratek podržením + How hold shortcuts work Jak fungují zkratky podržením + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Klikněte a stiskněte klávesu, kterou pro toto podržíte (Esc zruší). Podržení klávesy spustí toto; krátký stisk spustí vlastní zkratku klávesy. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Krátký stisk klávesy spustí její zkratku. Podržení klávesy po dobu prodlevy místo toho spustí nástroj nebo příkaz z jejího sloupce Podržení. Zkratka podržením je klávesa s písmenem, číslicí nebo interpunkcí, samotná nebo se Shiftem. +@msg Hold {_1} is already used by {_2} Podržení {_1} už používá {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) zkratka podržením je klávesa, která píše znak, samotná nebo se Shiftem ({shown} obsahuje Cmd, Ctrl nebo Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} nemůže být zkratkou podržením: použijte písmeno, číslici nebo interpunkční klávesu Check Zkontrolovat Check Fold Lines Zkontrolovat linie skladu @msg No cut lines are in the selection. Ve výběru nejsou žádné linie řezu. @@ -10396,6 +10436,7 @@ breakText Glyphs Glyfy @msg A panel is not joined to the rest by a crease. Panel není se zbytkem spojen žádnou linií bigu. @msg A fold line is on a non-printing layer. Linie skladu je na netisknutelné vrstvě. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panely: {panels}, panty: {hinges}, chyby: {errors}, upozornění: {warnings} + Dashed Arrow Přerušovaná šipka Pressure Sensitive Citlivé na tlak Flex Ribbon Pružná stuha Pulse Stroke Pulzující tah diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 31214cf5a1..3fb128a27a 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -295,6 +295,8 @@ liquify-list-end {0}, {1} {0} og {1} @msg no such spine point intet sådant rygradpunkt @msg `with` must be a list of at most 10000 spine point indexes `with` skal være en liste med højst 10000 rygradpunktindekser @msg `with` moves points, not a handle `with` flytter punkter, ikke et håndtag +@msg `link` and `independent` cannot both be true `link` og `independent` kan ikke begge være true +@msg `link` places a handle: give `handle` `link` placerer et håndtag: angiv `handle` @msg no such spine segment intet sådant rygradsegment @msg node {_1} is on a locked artboard node {_1} ligger på en låst tegneflade @msg not a blend ikke en blanding @@ -3497,6 +3499,9 @@ liquify-list-end {0}, {1} {0} og {1} Magic Wand Magisk tryllestav Navigator Navigator Navigator Panel Options Indstillinger for navigatorpanelet + Attributes Panel Options Indstillinger for attributpanelet + Number of Recent URLs: Antal seneste URL'er: +@msg `count` must be a whole number from 1 to 30 `count` skal være et heltal fra 1 til 30 Draw Dashed Lines as Solid Lines Tegn stiplede linjer som hele linjer Pattern Options Mønsterindstillinger Properties Egenskaber @@ -4217,6 +4222,7 @@ lighting Light Lys Save Actions… Gem handlinger… Load Actions… Indlæs handlinger… Replace Actions… Erstat handlinger… + Clear Actions Ryd handlinger Reset Actions Nulstil handlinger Replace the current actions with the default set? Vil du erstatte de aktuelle handlinger med standardsættet? Append adds the default set after the current sets instead. Tilføj tilføjer i stedet standardsættet efter de aktuelle sæt. @@ -4561,6 +4567,7 @@ digits Malayalam Malayalam Duplicate Action or Action Set Duplikér handling eller handlingssæt Delete the action set “{name}” and its actions? Slet handlingssættet »{name}« og dets handlinger? Delete the selected action sets and their actions? Slet de markerede handlingssæt og deres handlinger? + Delete all action sets and their actions? Slet alle handlingssæt og deres handlinger? Delete these {n} graphic styles? Slet disse {n} grafiske typografier? Delete this {n} graphic style? Slet denne {n} grafiske typografi? Graphic Style Libraries Menu Menu med biblioteker af grafiske typografier @@ -6801,6 +6808,7 @@ theme Appearance Udseende Set Tab Stops Angiv tabulatorstop Tab Stops Tabulatorstop Flare Flare + Edit Flare Redigér flare Rays Stråler Rectangle Rektangel Paintbrush Malerpensel @@ -7081,6 +7089,8 @@ font-technology Variable Variable The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Musehjulet med Cmd/Ctrl holdt nede ruller lærredet sidelæns. Dragging sideways on a numeric field's label changes the field's value. Når du trækker sidelæns på et talfelts etiket, ændres feltets værdi. A two-finger rotate gesture on a trackpad rotates the canvas view. En rotationsbevægelse med to fingre på en pegeplade roterer visningen af lærredet. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Når du holder en tast nede, køres værktøjet eller kommandoen i dens Hold-kolonne i Tastaturgenveje; et kort tryk kører dens sædvanlige genvej. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Hvor mange sekunder en tast skal holdes nede, før dens holdegenvej køres i stedet for dens sædvanlige genvej. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Når du flytter ankerpunkter, beholder hver kurve med ét flyttet endepunkt sin form i forhold til sine endepunkter. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Når du holder et værktøjs genvejstast nede, er værktøjet valgt, indtil du slipper, og derefter vælges det forrige værktøj igen. Shows the bounding box while you move the selection or draw a shape. Viser afgrænsningsboksen, mens du flytter markeringen eller tegner en form. @@ -7711,6 +7721,7 @@ imageTrace Outline Kontur @msg no graphic style `{n}` ingen grafisk stil `{n}` @msg no interaction in progress ingen interaktion i gang @msg no key object intet nøgleobjekt +@msg Align to Key Object isn't available with the Artboard tool Juster til nøgleobjekt er ikke tilgængelig med tegnebrætværktøjet @msg no library `{key}` (see {list}) intet bibliotek `{key}` (se {list}) @msg no native format intet indbygget format @msg no pages ingen sider @@ -7841,6 +7852,7 @@ imageTrace Outline Kontur @msg select a Live Paint group markér en Live Paint-gruppe @msg select a blend markér en blanding @msg select a clip group markér en klipgruppe +@msg select a flare markér en flare @msg select a gradient mesh markér et gradientnet @msg select a linked image: an embedded one has no file markér et linket billede: et indlejret har ingen fil @msg select a repeat markér en gentagelse @@ -8048,6 +8060,7 @@ imageTrace Outline Kontur @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} linket billede er ændret på disken: Opdatér links viser den nye version|{n} linkede billeder er ændret på disken: Opdatér links viser de nye versioner @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Opdaterede {n} linket fil ændret på disken|Opdaterede {n} linkede filer ændret på disken @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings dokumentet angiver et udløb, som denne PDF/X-fil udelader: slå „Brug dokumentets udløbsindstillinger“ til +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objekt når til beskæringskanten, men stopper før udløbet|{n} objekter når til beskæringskanten, men stopper før udløbet @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Eksporterede {what} med {n} note: {first}|Eksporterede {what} med {n} noter: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} skrifttypefil er nu i {folder}|{n} skrifttypefiler er nu i {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} skrifttypefil er nu i {folder}; {failed} kunne ikke tilføjes: {reason}|{n} skrifttypefiler er nu i {folder}; {failed} kunne ikke tilføjes: {reason} @@ -9149,6 +9162,9 @@ swatch Bright Violet Kraftig violet Continue in Background Fortsæt i baggrunden Cancel Export Annullér eksport @msg Export cancelled Eksport annulleret + Cancel Save Annullér gemning +@plural {n} more save waiting|{n} more saves waiting {n} gemning mere venter|{n} gemninger mere venter +@msg Save canceled Gemning annulleret # Paragraph panel menu › Justification… Desired Ønsket Word Spacing: Ordafstand: @@ -9470,6 +9486,12 @@ axis Y Axis Y-akse Bus Lines Buslinjer Terminal Nodes Terminalpunkter +# Original arrow art brushes. + Arrows Pile + Solid Arrow Massiv pil + Open Arrow Åben pil + Chevron Arrow Chevronpil + Notched Ribbon Takket bånd Double Line Dobbelt linje Wave Bølge @@ -10123,10 +10145,18 @@ breakText Glyphs Glyffer Smooth Bridge… Blød bro… Smooth Bridge Blød bro Keep Originals Behold originaler -@msg select two circles to bridge vælg to cirkler, der skal forbindes +@msg select two or more circles to bridge vælg to eller flere cirkler, der skal forbindes @msg one circle is inside the other den ene cirkel er inden i den anden @msg the circles are too far apart for this radius: raise the radius cirklerne er for langt fra hinanden til denne radius: gør radius større @msg the circles are too far apart for this radius cirklerne er for langt fra hinanden til denne radius + Constant Gap Konstant afstand + Reach: Rækkevidde: +@msg the circles are too far apart for this gap: raise the gap cirklerne er for langt fra hinanden til denne afstand: gør afstanden større +@msg the circles are too far apart for this gap cirklerne er for langt fra hinanden til denne afstand +@msg no two circles are within reach: raise the reach ingen to cirkler er inden for rækkevidde: gør rækkevidden større +@msg select at most 2000 circles to bridge vælg højst 2000 cirkler, der skal forbindes +@msg that makes too many bridges (at most 8000): lower the reach det giver for mange broer (højst 8000): gør rækkevidden mindre +@msg the bridged circles are too complex to unite de forbundne cirkler er for komplekse til at blive samlet # Path Precision Tools add-on: Common Tangents. Common Tangents… Fælles tangenter… Common Tangents Fælles tangenter @@ -10499,6 +10529,17 @@ breakText Glyphs Glyffer @msg A joint does not close by {gap} pt. En samling lukker ikke med {gap} pt. @msg Two panels pass through each other. To paneler går gennem hinanden. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer skal være "singleLine", "everyLine", "standardSingleLine" eller "standardEveryLine" + Tap Kort tryk + Clear Hold Ryd hold + Hold Shortcuts Holdegenveje + Hold Shortcut Delay Forsinkelse for holdegenveje + How hold shortcuts work Sådan virker holdegenveje + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Klik, og tryk derefter på en tast, der skal holdes nede for dette (Esc annullerer). Når tasten holdes nede, køres dette; et kort tryk kører tastens egen genvej. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Et kort tryk på en tast kører dens genvej. Når tasten holdes nede i forsinkelsens varighed, køres i stedet værktøjet eller kommandoen i dens Hold-kolonne. En holdegenvej er en bogstav-, ciffer- eller tegnsætningstast, alene eller med Shift. +@msg Hold {_1} is already used by {_2} Hold {_1} bruges allerede af {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) en holdegenvej er en tast, der skriver et tegn, alene eller med Shift ({shown} har Cmd, Ctrl eller Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} kan ikke være en holdegenvej: brug et bogstav, et ciffer eller en tegnsætningstast + Dashed Arrow Stiplet pil @msg a line or other open path that encloses no area contributes no area to the compound shape; to include it, apply Object › Path › Outline Stroke to it first en linje eller anden åben kurve, der ikke omslutter noget område, tilføjer intet område til den sammensatte figur; anvend først Objekt › Kurve › Streg til kontur på den for at tage den med Pressure Sensitive Trykfølsom Flex Ribbon Fleksibelt bånd diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 0d99c071a2..6ad4e3850b 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -854,6 +854,7 @@ font-technology Variable Variabel Duplicate Action or Action Set Aktion oder Aktionssatz duplizieren Delete the action set “{name}” and its actions? Aktionssatz „{name}“ und seine Aktionen löschen? Delete the selected action sets and their actions? Ausgewählte Aktionssätze und ihre Aktionen löschen? + Delete all action sets and their actions? Alle Aktionssätze und ihre Aktionen löschen? Delete Theme Thema löschen Delete theme Thema löschen Delete these {n} graphic styles? Diese {n} Grafikstile löschen? @@ -1357,6 +1358,7 @@ font-technology Variable Variabel Fit to Selected Art An ausgewählte Grafik anpassen Flag… Flagge… Flare Blendenfleck + Edit Flare Blendenfleck bearbeiten Flare Tool Blendenfleck-Werkzeug Flare Tool Options Optionen für das Blendenfleck-Werkzeug Halo Lichtkranz @@ -2275,6 +2277,9 @@ file-filter Templates Vorlagen Navigate Navigieren Navigator Navigator Navigator Panel Options Optionen für das Navigatorbedienfeld + Attributes Panel Options Optionen für das Attributebedienfeld + Number of Recent URLs: Anzahl zuletzt verwendeter URLs: +@msg `count` must be a whole number from 1 to 30 `count` muss eine ganze Zahl von 1 bis 30 sein Draw Dashed Lines as Solid Lines Gestrichelte Linien als durchgezogene Linien zeichnen Needs the desktop app Erfordert die Desktop-App Neutral Gradients Neutrale Verläufe @@ -2711,6 +2716,7 @@ diagnostics ui Oberfläche Save Actions… Aktionen speichern… Load Actions… Aktionen laden… Replace Actions… Aktionen ersetzen… + Clear Actions Aktionen löschen Reset Actions Aktionen zurücksetzen Replace the current actions with the default set? Aktuelle Aktionen durch den Standardsatz ersetzen? Append adds the default set after the current sets instead. Mit „Anhängen“ wird der Standardsatz stattdessen nach den aktuellen Sätzen hinzugefügt. @@ -3156,6 +3162,8 @@ digits Malayalam Malayalam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Mit gedrückter Befehls-/Strg-Taste scrollt das Mausrad die Arbeitsfläche seitwärts. Dragging sideways on a numeric field's label changes the field's value. Seitliches Ziehen auf der Beschriftung eines Zahlenfelds ändert den Wert des Felds. A two-finger rotate gesture on a trackpad rotates the canvas view. Eine Drehgeste mit zwei Fingern auf einem Trackpad dreht die Ansicht der Arbeitsfläche. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Halten Sie eine Taste, wird das Werkzeug oder der Befehl aus ihrer Spalte „Halten“ unter „Tastaturbefehle“ ausgeführt; ein kurzer Druck führt ihren üblichen Tastaturbefehl aus. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Wie viele Sekunden eine Taste gehalten werden muss, bevor statt ihres üblichen Tastaturbefehls ihr Halte-Tastaturbefehl ausgeführt wird. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Wenn Sie Ankerpunkte verschieben, behält jede Kurve mit einem verschobenen Ende ihre Form relativ zu ihren Enden. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Solange Sie das Tastaturkürzel eines Werkzeugs gedrückt halten, ist dieses Werkzeug gewählt; danach wird wieder das vorherige gewählt. Shows the bounding box while you move the selection or draw a shape. Zeigt den Begrenzungsrahmen an, während Sie die Auswahl verschieben oder eine Form zeichnen. @@ -5137,6 +5145,7 @@ liquify-list-end {0}, {1} {0} und {1} @msg no graphic style `{n}` kein Grafikstil `{n}` @msg no interaction in progress keine Interaktion im Gange @msg no key object kein Basisobjekt +@msg Align to Key Object isn't available with the Artboard tool „An Basisobjekt ausrichten“ ist mit dem Zeichenflächen-Werkzeug nicht verfügbar @msg no library `{key}` (see {list}) keine Bibliothek `{key}` (siehe {list}) @msg no native format kein natives Format @msg no pages keine Seiten @@ -5192,6 +5201,8 @@ liquify-list-end {0}, {1} {0} und {1} @msg no such spine point kein solcher Achsenpunkt @msg `with` must be a list of at most 10000 spine point indexes `with` muss eine Liste von höchstens 10000 Achsenpunkt-Indizes sein @msg `with` moves points, not a handle `with` verschiebt Punkte, keinen Griff +@msg `link` and `independent` cannot both be true `link` und `independent` können nicht beide true sein +@msg `link` places a handle: give `handle` `link` platziert einen Griff: geben Sie `handle` an @msg no such spine segment kein solches Achsensegment @msg no such subpath kein solcher Teilpfad @msg no such user library keine solche Benutzerbibliothek @@ -5281,6 +5292,7 @@ liquify-list-end {0}, {1} {0} und {1} @msg select a blend wählen Sie eine Angleichung aus @msg select a blend or give `id` wählen Sie eine Angleichung aus oder geben Sie `id` an @msg select a clip group wählen Sie eine Schnittgruppe aus +@msg select a flare wählen Sie einen Blendenfleck aus @msg select a gradient mesh wählen Sie ein Verlaufsgitter aus @msg select a linked image: an embedded one has no file wählen Sie ein verknüpftes Bild aus: Ein eingebettetes hat keine Datei @msg select a repeat wählen Sie eine Wiederholung aus @@ -5538,6 +5550,7 @@ variable-list-end {0}, {1} {0} und {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} verknüpftes Bild wurde auf dem Datenträger geändert: „Verknüpfungen aktualisieren“ zeigt die neue Version|{n} verknüpfte Bilder wurden auf dem Datenträger geändert: „Verknüpfungen aktualisieren“ zeigt die neuen Versionen @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk {n} auf dem Datenträger geänderte verknüpfte Datei aktualisiert|{n} auf dem Datenträger geänderte verknüpfte Dateien aktualisiert @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings das Dokument legt einen Anschnitt fest, den diese PDF/X-Datei auslässt: „Anschnitteinstellungen des Dokuments verwenden“ aktivieren +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} Objekt reicht bis zur Endformatkante, endet aber vor dem Anschnitt|{n} Objekte reichen bis zur Endformatkante, enden aber vor dem Anschnitt @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} mit {n} Hinweis exportiert: {first}|{what} mit {n} Hinweisen exportiert: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} Schriftdatei liegt jetzt in {folder}|{n} Schriftdateien liegen jetzt in {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} Schriftdatei liegt jetzt in {folder}; {failed} konnten nicht hinzugefügt werden: {reason}|{n} Schriftdateien liegen jetzt in {folder}; {failed} konnten nicht hinzugefügt werden: {reason} @@ -6446,6 +6459,9 @@ effect Soft Weich Continue in Background Im Hintergrund fortsetzen Cancel Export Export abbrechen @msg Export cancelled Export abgebrochen + Cancel Save Speichern abbrechen +@plural {n} more save waiting|{n} more saves waiting {n} weiterer Speichervorgang wartet|{n} weitere Speichervorgänge warten +@msg Save canceled Speichern abgebrochen # Paragraph panel menu › Justification… Desired Optimal Word Spacing: Wortabstand: @@ -6969,6 +6985,13 @@ axis Y Axis Y-Achse Bus Lines Busleitungen Terminal Nodes Anschlussknoten +# Original arrow art brushes. + Arrows Pfeile + Solid Arrow Gefüllter Pfeil + Open Arrow Offener Pfeil + Double Arrow Doppelpfeil + Chevron Arrow Winkelpfeil + Notched Ribbon Gekerbtes Band Double Line Doppellinie Wave Welle @@ -7664,10 +7687,18 @@ breakText Glyphs Glyphen Smooth Bridge… Weiche Brücke… Smooth Bridge Weiche Brücke Keep Originals Originale beibehalten -@msg select two circles to bridge wählen Sie zwei Kreise zum Verbinden aus +@msg select two or more circles to bridge wählen Sie zwei oder mehr Kreise zum Verbinden aus @msg one circle is inside the other ein Kreis liegt im anderen @msg the circles are too far apart for this radius: raise the radius die Kreise liegen für diesen Radius zu weit auseinander: vergrößern Sie den Radius @msg the circles are too far apart for this radius die Kreise liegen für diesen Radius zu weit auseinander + Constant Gap Konstanter Abstand + Reach: Reichweite: +@msg the circles are too far apart for this gap: raise the gap die Kreise liegen für diesen Abstand zu weit auseinander: vergrößern Sie den Abstand +@msg the circles are too far apart for this gap die Kreise liegen für diesen Abstand zu weit auseinander +@msg no two circles are within reach: raise the reach keine zwei Kreise liegen in Reichweite: vergrößern Sie die Reichweite +@msg select at most 2000 circles to bridge wählen Sie höchstens 2000 Kreise zum Verbinden aus +@msg that makes too many bridges (at most 8000): lower the reach das ergibt zu viele Brücken (höchstens 8000): verringern Sie die Reichweite +@msg the bridged circles are too complex to unite die verbundenen Kreise sind zu komplex zum Vereinen # Path Precision Tools add-on: Common Tangents. Common Tangents… Gemeinsame Tangenten… Common Tangents Gemeinsame Tangenten @@ -9988,6 +10019,16 @@ breakText Glyphs Glyphen No objects are selected. Es sind keine Objekte ausgewählt. Open a document to mark its fold lines. Öffnen Sie ein Dokument, um seine Faltlinien festzulegen. Remove Fold Line Role Linienart entfernen + Tap Kurz drücken + Clear Hold Halten löschen + Hold Shortcuts Halte-Tastaturbefehle + Hold Shortcut Delay Verzögerung für Halte-Tastaturbefehle + How hold shortcuts work So funktionieren Halte-Tastaturbefehle + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Klicken Sie und drücken Sie dann eine Taste, die hierfür gehalten werden soll (Esc bricht ab). Halten der Taste führt dies aus; kurzes Drücken führt den eigenen Tastaturbefehl der Taste aus. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Kurzes Drücken einer Taste führt ihren Tastaturbefehl aus. Halten der Taste für die Dauer der Verzögerung führt stattdessen das Werkzeug oder den Befehl in ihrer Spalte „Halten“ aus. Ein Halte-Tastaturbefehl ist eine Buchstaben-, Ziffern- oder Satzzeichentaste, allein oder mit Shift. +@msg Hold {_1} is already used by {_2} Halten {_1} wird bereits von {_2} verwendet +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) Ein Halte-Tastaturbefehl ist eine Taste, die ein Zeichen eingibt, allein oder mit Shift ({shown} enthält Cmd, Ctrl oder Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} kann kein Halte-Tastaturbefehl sein: Verwenden Sie einen Buchstaben, eine Ziffer oder eine Satzzeichentaste Check Prüfen Check Fold Lines Faltlinien prüfen @msg No cut lines are in the selection. Die Auswahl enthält keine Schnittlinien. @@ -10008,6 +10049,7 @@ breakText Glyphs Glyphen @msg A panel is not joined to the rest by a crease. Ein Feld ist durch keine Rilllinie mit den übrigen verbunden. @msg A fold line is on a non-printing layer. Eine Faltlinie liegt auf einer nicht druckbaren Ebene. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Felder: {panels}, Scharniere: {hinges}, Fehler: {errors}, Warnungen: {warnings} + Dashed Arrow Gestrichelter Pfeil Pressure Sensitive Druckempfindlich Flex Ribbon Flexibles Band Pulse Stroke Pulsierender Strich diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 9558cdd760..7d2e5b6363 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -827,6 +827,7 @@ font-technology Variable Μεταβλητές Duplicate Action or Action Set Δημιουργία αντιγράφου ενέργειας ή συνόλου ενεργειών Delete the action set “{name}” and its actions? Να διαγραφεί το σύνολο ενεργειών «{name}» και οι ενέργειές του; Delete the selected action sets and their actions? Να διαγραφούν τα επιλεγμένα σύνολα ενεργειών και οι ενέργειές τους; + Delete all action sets and their actions? Να διαγραφούν όλα τα σύνολα ενεργειών και οι ενέργειές τους; Delete Theme Διαγραφή θέματος Delete theme Διαγραφή θέματος Delete these {n} graphic styles? Να διαγραφούν αυτά τα {n} στυλ γραφικών; @@ -1295,6 +1296,7 @@ font-technology Variable Μεταβλητές Fit to Selected Art Προσαρμογή στο επιλεγμένο γραφικό Flag… Σημαία… Flare Λάμψη + Edit Flare Επεξεργασία λάμψης Flare Tool Λάμψη (Flare Tool) Flare Tool Options Επιλογές εργαλείου λάμψης Halo Άλως @@ -1959,6 +1961,9 @@ font-technology Variable Μεταβλητές Name: Όνομα: Navigator Πλοήγηση Navigator Panel Options Επιλογές πίνακα πλοήγησης + Attributes Panel Options Επιλογές πίνακα χαρακτηριστικών + Number of Recent URLs: Αριθμός πρόσφατων διευθύνσεων URL: +@msg `count` must be a whole number from 1 to 30 Το `count` πρέπει να είναι ακέραιος από 1 έως 30 Draw Dashed Lines as Solid Lines Σχεδίαση διακεκομμένων γραμμών ως συνεχών New Νέο Scatter: Διασπορά: @@ -3656,6 +3661,7 @@ theme Appearance Εμφάνιση Save Actions… Αποθήκευση ενεργειών… Load Actions… Φόρτωση ενεργειών… Replace Actions… Αντικατάσταση ενεργειών… + Clear Actions Απαλοιφή ενεργειών Reset Actions Επαναφορά ενεργειών Replace the current actions with the default set? Να αντικατασταθούν οι τρέχουσες ενέργειες με το προεπιλεγμένο σύνολο; Append adds the default set after the current sets instead. Η Προσάρτηση προσθέτει αντί γι’ αυτό το προεπιλεγμένο σύνολο μετά τα τρέχοντα σύνολα. @@ -4007,6 +4013,8 @@ digits Malayalam Μαλαγιάλαμ The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Ο τροχός του ποντικιού με πατημένο το Cmd/Ctrl κυλά τον καμβά οριζόντια. Dragging sideways on a numeric field's label changes the field's value. Η μεταφορά προς τα πλάγια πάνω στην ετικέτα ενός αριθμητικού πεδίου αλλάζει την τιμή του πεδίου. A two-finger rotate gesture on a trackpad rotates the canvas view. Μια κίνηση περιστροφής με δύο δάχτυλα σε επιφάνεια αφής περιστρέφει την προβολή του καμβά. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Το παρατεταμένο πάτημα ενός πλήκτρου εκτελεί το εργαλείο ή την εντολή της στήλης «Κρατήστε πατημένο» στις Συντομεύσεις πληκτρολογίου· ένα σύντομο πάτημα εκτελεί τη συνηθισμένη συντόμευσή του. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Πόσα δευτερόλεπτα πρέπει να μένει πατημένο ένα πλήκτρο πριν εκτελεστεί η συντόμευση παρατεταμένου πατήματος αντί για τη συνηθισμένη συντόμευσή του. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Όταν μετακινείτε σημεία αγκύρωσης, κάθε καμπύλη με ένα μετακινημένο άκρο διατηρεί το σχήμα της σε σχέση με τα άκρα της. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Όσο κρατάτε πατημένη τη συντόμευση ενός εργαλείου, το εργαλείο είναι επιλεγμένο, και μετά επιλέγεται ξανά το προηγούμενο εργαλείο. Shows the bounding box while you move the selection or draw a shape. Εμφανίζει το πλαίσιο οριοθέτησης όσο μετακινείτε την επιλογή ή σχεδιάζετε ένα σχήμα. @@ -5193,6 +5201,7 @@ digits Malayalam Μαλαγιάλαμ @msg no graphic style `{n}` δεν υπάρχει στυλ γραφικών `{n}` @msg no interaction in progress δεν υπάρχει αλληλεπίδραση σε εξέλιξη @msg no key object δεν υπάρχει βασικό αντικείμενο +@msg Align to Key Object isn't available with the Artboard tool η «Στοίχιση ως προς το βασικό αντικείμενο» δεν είναι διαθέσιμη με το εργαλείο πίνακα σχεδίασης @msg no library `{key}` (see {list}) δεν υπάρχει βιβλιοθήκη `{key}` (δείτε {list}) @msg no native format δεν υπάρχει εγγενής μορφή @msg no pages δεν υπάρχουν σελίδες @@ -5248,6 +5257,8 @@ digits Malayalam Μαλαγιάλαμ @msg no such spine point δεν υπάρχει τέτοιο σημείο κεντρικής καμπύλης @msg `with` must be a list of at most 10000 spine point indexes το `with` πρέπει να είναι λίστα με έως 10000 δείκτες σημείων κεντρικής καμπύλης @msg `with` moves points, not a handle το `with` μετακινεί σημεία, όχι λαβή +@msg `link` and `independent` cannot both be true Τα `link` και `independent` δεν μπορούν να είναι και τα δύο true +@msg `link` places a handle: give `handle` το `link` τοποθετεί μια λαβή: δώστε `handle` @msg no such spine segment δεν υπάρχει τέτοιο τμήμα κεντρικής καμπύλης @msg no such subpath δεν υπάρχει τέτοια υποδιαδρομή @msg no such user library δεν υπάρχει τέτοια βιβλιοθήκη χρήστη @@ -5341,6 +5352,7 @@ digits Malayalam Μαλαγιάλαμ @msg select a blend επιλέξτε ανάμειξη @msg select a blend or give `id` επιλέξτε ανάμειξη ή δώστε το `id` @msg select a clip group επιλέξτε ομάδα αποκοπής +@msg select a flare επιλέξτε λάμψη @msg select a gradient mesh επιλέξτε πλέγμα ντεγκραντέ @msg select a linked image: an embedded one has no file επιλέξτε συνδεδεμένη εικόνα: η ενσωματωμένη δεν έχει αρχείο @msg select a repeat επιλέξτε επανάληψη @@ -5591,6 +5603,7 @@ variable-list-end {0}, {1} {0} και {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} συνδεδεμένη εικόνα άλλαξε στον δίσκο: η Ενημέρωση συνδέσμων εμφανίζει τη νέα έκδοση|{n} συνδεδεμένες εικόνες άλλαξαν στον δίσκο: η Ενημέρωση συνδέσμων εμφανίζει τις νέες εκδόσεις @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Ενημερώθηκε {n} συνδεδεμένο αρχείο που άλλαξε στον δίσκο|Ενημερώθηκαν {n} συνδεδεμένα αρχεία που άλλαξαν στον δίσκο @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings το έγγραφο ορίζει ξάκρισμα που αυτό το αρχείο PDF/X παραλείπει: ενεργοποιήστε τη «Χρήση ρυθμίσεων ξακρίσματος εγγράφου» +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} αντικείμενο φτάνει στο άκρο κοπής αλλά σταματά πριν από το ξάκρισμα|{n} αντικείμενα φτάνουν στο άκρο κοπής αλλά σταματούν πριν από το ξάκρισμα @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Εξήχθη το {what} με {n} σημείωση: {first}|Εξήχθη το {what} με {n} σημειώσεις: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} αρχείο γραμματοσειράς βρίσκεται πλέον στον φάκελο {folder}|{n} αρχεία γραμματοσειρών βρίσκονται πλέον στον φάκελο {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} αρχείο γραμματοσειράς βρίσκεται πλέον στον φάκελο {folder}· δεν ήταν δυνατή η προσθήκη {failed}: {reason}|{n} αρχεία γραμματοσειρών βρίσκονται πλέον στον φάκελο {folder}· δεν ήταν δυνατή η προσθήκη {failed}: {reason} @@ -6853,6 +6866,9 @@ effect Points Σημεία Continue in Background Συνέχεια στο παρασκήνιο Cancel Export Ακύρωση εξαγωγής @msg Export cancelled Η εξαγωγή ακυρώθηκε + Cancel Save Ακύρωση αποθήκευσης +@plural {n} more save waiting|{n} more saves waiting {n} ακόμη αποθήκευση σε αναμονή|{n} ακόμη αποθηκεύσεις σε αναμονή +@msg Save canceled Η αποθήκευση ακυρώθηκε # Paragraph panel menu › Justification… Desired Επιθυμητό Word Spacing: Απόσταση λέξεων: @@ -7372,6 +7388,12 @@ axis Y Axis Άξονας Y Bus Lines Γραμμές διαύλου Terminal Nodes Τερματικοί κόμβοι +# Original arrow art brushes. + Arrows Βέλη + Solid Arrow Συμπαγές βέλος + Open Arrow Ανοιχτό βέλος + Chevron Arrow Βέλος με σεβρόν + Notched Ribbon Οδοντωτή κορδέλα Double Line Διπλή γραμμή Wave Κύμα @@ -8057,10 +8079,18 @@ breakText Glyphs Γλύφοι Smooth Bridge… Ομαλή γέφυρα… Smooth Bridge Ομαλή γέφυρα Keep Originals Διατήρηση πρωτοτύπων -@msg select two circles to bridge επιλέξτε δύο κύκλους για γεφύρωση +@msg select two or more circles to bridge επιλέξτε δύο ή περισσότερους κύκλους για γεφύρωση @msg one circle is inside the other ο ένας κύκλος βρίσκεται μέσα στον άλλο @msg the circles are too far apart for this radius: raise the radius οι κύκλοι απέχουν πολύ μεταξύ τους για αυτή την ακτίνα: αυξήστε την ακτίνα @msg the circles are too far apart for this radius οι κύκλοι απέχουν πολύ μεταξύ τους για αυτή την ακτίνα + Constant Gap Σταθερή απόσταση + Reach: Εμβέλεια: +@msg the circles are too far apart for this gap: raise the gap οι κύκλοι απέχουν πολύ μεταξύ τους για αυτή την απόσταση: αυξήστε την απόσταση +@msg the circles are too far apart for this gap οι κύκλοι απέχουν πολύ μεταξύ τους για αυτή την απόσταση +@msg no two circles are within reach: raise the reach δεν υπάρχουν δύο κύκλοι εντός εμβέλειας: αυξήστε την εμβέλεια +@msg select at most 2000 circles to bridge επιλέξτε έως 2000 κύκλους για γεφύρωση +@msg that makes too many bridges (at most 8000): lower the reach αυτό δημιουργεί πάρα πολλές γέφυρες (έως 8000): μειώστε την εμβέλεια +@msg the bridged circles are too complex to unite οι γεφυρωμένοι κύκλοι είναι πολύ σύνθετοι για ένωση # Path Precision Tools add-on: Common Tangents. Common Tangents… Κοινές εφαπτόμενες… Common Tangents Κοινές εφαπτόμενες @@ -8585,6 +8615,17 @@ breakText Glyphs Γλύφοι @msg A joint does not close by {gap} pt. Μια ένωση δεν κλείνει κατά {gap} pt. @msg Two panels pass through each other. Δύο πάνελ διαπερνούν το ένα το άλλο. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" το composer πρέπει να είναι "singleLine", "everyLine", "standardSingleLine" ή "standardEveryLine" + Tap Σύντομο πάτημα + Clear Hold Εκκαθάριση παρατεταμένου πατήματος + Hold Shortcuts Συντομεύσεις παρατεταμένου πατήματος + Hold Shortcut Delay Καθυστέρηση συντομεύσεων παρατεταμένου πατήματος + How hold shortcuts work Πώς λειτουργούν οι συντομεύσεις παρατεταμένου πατήματος + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Κάντε κλικ και πατήστε ένα πλήκτρο που θα κρατάτε πατημένο για αυτό (Esc για ακύρωση). Το παρατεταμένο πάτημα του πλήκτρου εκτελεί αυτό. Ένα σύντομο πάτημα εκτελεί τη συντόμευση του ίδιου του πλήκτρου. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Ένα σύντομο πάτημα πλήκτρου εκτελεί τη συντόμευσή του. Αν κρατήσετε πατημένο το πλήκτρο για τον χρόνο καθυστέρησης, εκτελείται αντί γι’ αυτό το εργαλείο ή η εντολή της στήλης «Κρατήστε πατημένο». Μια συντόμευση παρατεταμένου πατήματος είναι ένα πλήκτρο γράμματος, ψηφίου ή σημείου στίξης, μόνο του ή με Shift. +@msg Hold {_1} is already used by {_2} το παρατεταμένο πάτημα του {_1} χρησιμοποιείται ήδη από το {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) μια συντόμευση παρατεταμένου πατήματος είναι ένα πλήκτρο που πληκτρολογεί έναν χαρακτήρα, μόνο του ή με Shift (το {shown} έχει Cmd, Ctrl ή Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key το {shown} δεν μπορεί να είναι συντόμευση παρατεταμένου πατήματος: χρησιμοποιήστε γράμμα, ψηφίο ή πλήκτρο στίξης + Dashed Arrow Διακεκομμένο βέλος @msg a line or other open path that encloses no area contributes no area to the compound shape; to include it, apply Object › Path › Outline Stroke to it first μια γραμμή ή άλλη ανοιχτή διαδρομή που δεν περικλείει εμβαδόν δεν προσθέτει εμβαδόν στο σύνθετο σχήμα· για να τη συμπεριλάβετε, εφαρμόστε της πρώτα Αντικείμενο › Διαδρομή › Μετατροπή περιγράμματος σε διαδρομή Pressure Sensitive Ευαίσθητα στην πίεση Flex Ribbon Εύκαμπτη κορδέλα diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index f0d69e8b22..30678f8a13 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -873,6 +873,7 @@ font-technology Variable Variables Duplicate Action or Action Set Duplicar acción o conjunto de acciones Delete the action set “{name}” and its actions? ¿Eliminar el conjunto de acciones “{name}” y sus acciones? Delete the selected action sets and their actions? ¿Eliminar los conjuntos de acciones seleccionados y sus acciones? + Delete all action sets and their actions? ¿Eliminar todos los conjuntos de acciones y sus acciones? Delete Theme Eliminar tema Delete theme Eliminar tema Delete these {n} graphic styles? ¿Eliminar estos {n} estilos gráficos? @@ -1382,6 +1383,7 @@ font-technology Variable Variables Fit to Selected Art Encajar en la ilustración seleccionada Flag… Bandera… Flare Destello + Edit Flare Editar destello Flare Tool Herramienta Destello Flare Tool Options Opciones de la herramienta Destello Halo Halo @@ -2274,6 +2276,9 @@ font-technology Variable Variables Navigate Navegar Navigator Navegador Navigator Panel Options Opciones del panel Navegador + Attributes Panel Options Opciones del panel Atributos + Number of Recent URLs: Número de URL recientes: +@msg `count` must be a whole number from 1 to 30 `count` debe ser un número entero entre 1 y 30 Draw Dashed Lines as Solid Lines Dibujar líneas discontinuas como continuas Needs the desktop app Requiere la aplicación de escritorio Neutral Gradients Degradados neutros @@ -2751,6 +2756,7 @@ font-technology Variable Variables Save Actions… Guardar acciones… Load Actions… Cargar acciones… Replace Actions… Reemplazar acciones… + Clear Actions Borrar acciones Reset Actions Restablecer acciones Replace the current actions with the default set? ¿Reemplazar las acciones actuales por el conjunto predeterminado? Append adds the default set after the current sets instead. Añadir agrega en su lugar el conjunto predeterminado después de los conjuntos actuales. @@ -3193,6 +3199,8 @@ digits Malayalam Malayálam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La rueda del mouse con Cmd/Ctrl pulsado desplaza el lienzo en horizontal. Dragging sideways on a numeric field's label changes the field's value. Arrastrar en horizontal sobre la etiqueta de un campo numérico cambia el valor del campo. A two-finger rotate gesture on a trackpad rotates the canvas view. Un gesto de giro con dos dedos en un trackpad gira la vista del lienzo. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Mantener pulsada una tecla ejecuta la herramienta o el comando de su columna Mantener pulsado en Métodos abreviados de teclado; una pulsación breve ejecuta su método abreviado habitual. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Cuántos segundos hay que mantener pulsada una tecla para que se ejecute su método abreviado de pulsación larga en lugar del habitual. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Al mover puntos de ancla, cada curva con un extremo movido conserva su forma respecto a sus extremos. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Mantener pulsado el atajo de una herramienta la elige hasta que lo suelta, y después vuelve a elegirse la herramienta anterior. Shows the bounding box while you move the selection or draw a shape. Muestra el cuadro delimitador mientras mueve la selección o dibuja una forma. @@ -5248,6 +5256,7 @@ liquify-list-end {0}, {1} {0}, {1} @msg no graphic style `{n}` no existe el estilo gráfico `{n}` @msg no interaction in progress no hay ninguna interacción en curso @msg no key object no hay objeto clave +@msg Align to Key Object isn't available with the Artboard tool «Alinear con el objeto clave» no está disponible con la herramienta Mesa de trabajo @msg no library `{key}` (see {list}) no existe la biblioteca `{key}` (consulta {list}) @msg no native format no hay formato nativo @msg no pages no hay páginas @@ -5303,6 +5312,8 @@ liquify-list-end {0}, {1} {0}, {1} @msg no such spine point no existe ese punto del eje @msg `with` must be a list of at most 10000 spine point indexes `with` debe ser una lista de como máximo 10000 índices de puntos del eje @msg `with` moves points, not a handle `with` mueve puntos, no un manejador +@msg `link` and `independent` cannot both be true `link` y `independent` no pueden ser true a la vez +@msg `link` places a handle: give `handle` `link` coloca un manejador: indique `handle` @msg no such spine segment no existe ese segmento del eje @msg no such subpath no existe ese subtrazado @msg no such user library no existe esa biblioteca de usuario @@ -5396,6 +5407,7 @@ liquify-list-end {0}, {1} {0}, {1} @msg select a blend selecciona una fusión @msg select a blend or give `id` selecciona una fusión o indica su `id` @msg select a clip group selecciona un grupo de recorte +@msg select a flare selecciona un destello @msg select a gradient mesh selecciona una malla de degradado @msg select a linked image: an embedded one has no file selecciona una imagen vinculada: una incrustada no tiene archivo @msg select a repeat selecciona una repetición @@ -5653,6 +5665,7 @@ variable-list-end {0}, {1} {0} y {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} imagen vinculada cambió en el disco: Actualizar vínculos muestra la versión nueva|{n} imágenes vinculadas cambiaron en el disco: Actualizar vínculos muestra las versiones nuevas @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Se actualizó {n} archivo vinculado que cambió en el disco|Se actualizaron {n} archivos vinculados que cambiaron en el disco @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings el documento define un sangrado que este archivo PDF/X omite: activa «Usar los ajustes de sangrado del documento» +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objeto llega al borde de corte pero no alcanza el sangrado|{n} objetos llegan al borde de corte pero no alcanzan el sangrado @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Se exportó {what} con {n} nota: {first}|Se exportó {what} con {n} notas: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} archivo de fuentes ahora está en {folder}|{n} archivos de fuentes ahora están en {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} archivo de fuentes ahora está en {folder}; no se pudieron agregar {failed}: {reason}|{n} archivos de fuentes ahora están en {folder}; no se pudieron agregar {failed}: {reason} @@ -6841,6 +6854,9 @@ mark-style Japanese Japonesas Continue in Background Continuar en segundo plano Cancel Export Cancelar exportación @msg Export cancelled Exportación cancelada + Cancel Save Cancelar guardado +@plural {n} more save waiting|{n} more saves waiting {n} guardado más en espera|{n} guardados más en espera +@msg Save canceled Guardado cancelado # Paragraph panel menu › Justification… Desired Deseado Word Spacing: Espaciado entre palabras: @@ -7360,6 +7376,12 @@ axis Y Axis Eje Y Bus Lines Líneas de bus Terminal Nodes Nodos terminales +# Original arrow art brushes. + Arrows Flechas + Solid Arrow Flecha sólida + Open Arrow Flecha abierta + Chevron Arrow Flecha con cheurón + Notched Ribbon Cinta dentada Double Line Línea doble Wave Onda @@ -8045,10 +8067,18 @@ breakText Glyphs Glifos Smooth Bridge… Puente suave… Smooth Bridge Puente suave Keep Originals Conservar originales -@msg select two circles to bridge seleccione dos círculos para unir +@msg select two or more circles to bridge seleccione dos o más círculos para unir @msg one circle is inside the other un círculo está dentro del otro @msg the circles are too far apart for this radius: raise the radius los círculos están demasiado separados para este radio: aumente el radio @msg the circles are too far apart for this radius los círculos están demasiado separados para este radio + Constant Gap Separación constante + Reach: Alcance: +@msg the circles are too far apart for this gap: raise the gap los círculos están demasiado separados para esta separación: aumente la separación +@msg the circles are too far apart for this gap los círculos están demasiado separados para esta separación +@msg no two circles are within reach: raise the reach no hay dos círculos dentro del alcance: aumente el alcance +@msg select at most 2000 circles to bridge seleccione como máximo 2000 círculos para unir +@msg that makes too many bridges (at most 8000): lower the reach eso crea demasiados puentes (como máximo 8000): reduzca el alcance +@msg the bridged circles are too complex to unite los círculos unidos son demasiado complejos para combinarlos # Path Precision Tools add-on: Common Tangents. Common Tangents… Tangentes comunes… Common Tangents Tangentes comunes @@ -8515,6 +8545,1765 @@ breakText Glyphs Glifos Margin Margen Box Caja Swatch Muestra +@msg 'caller', 'callee' and 'arguments' cannot be used on strict mode functions 'caller', 'callee' y 'arguments' no se pueden usar en funciones en modo estricto +@msg Boolean.prototype.{name} was called on a value that is not a Boolean Se llamó a Boolean.prototype.{name} con un valor que no es un Boolean +@msg CMYK images whose samples couldn't be read in CMYK were imported in RGB Las imágenes CMYK cuyas muestras no se pudieron leer en CMYK se importaron en RGB +@msg Cannot write to the location of “{name}”; choose where to save it No se puede escribir en la ubicación de “{name}”; elige dónde guardarlo +@msg DCS files can only be placed linked: use File › Place with Link on Los archivos DCS solo se pueden colocar vinculados: usa Archivo › Colocar con Vincular activado +@msg Date.prototype method called on a value that is not a Date object Se llamó a un método de Date.prototype con un valor que no es un objeto Date +@msg Error.prototype.toString was called on a value that is not an object Se llamó a Error.prototype.toString con un valor que no es un objeto +@msg Function.prototype.toString was called on a value that is not a function Se llamó a Function.prototype.toString con un valor que no es una función +@msg Import SVG Filter reads SVG files, not SVGZ Importar filtro SVG lee archivos SVG, no SVGZ +@msg JSON.parse: {why} (at offset {at}) JSON.parse: {why} (en el desplazamiento {at}) +@msg JSON.stringify cannot write a structure that contains itself JSON.stringify no puede escribir una estructura que se contiene a sí misma +@msg Namespace.prototype.toString needs a Namespace Namespace.prototype.toString necesita un Namespace +@msg New Document profiles need the preferences folder, which this run doesn't have Los perfiles de Nuevo documento necesitan la carpeta de preferencias, que esta ejecución no tiene +@msg Number.prototype.{name} was called on a value that is not a number Se llamó a Number.prototype.{name} con un valor que no es un número +@msg Object.create's prototype must be an object or null El prototipo de Object.create debe ser un objeto o null +@msg Object.{function} was given a value that is not an object Object.{function} recibió un valor que no es un objeto +@msg QName.prototype.toString needs a QName QName.prototype.toString necesita un QName +@msg RegExp.prototype.{name} was called on a value that is not a RegExp object Se llamó a RegExp.prototype.{name} con un valor que no es un objeto RegExp +@msg Stencil Bridges: the selected art is too large or too detailed to bridge Puentes de plantilla: la ilustración seleccionada es demasiado grande o detallada para unirla con puentes +@msg String.prototype.toString was called on a value that is not a string Se llamó a String.prototype.toString con un valor que no es una cadena +@msg The {name} profile could not be read, so the new document has the default settings: {reason} No se pudo leer el perfil {name}, así que el nuevo documento tiene los ajustes predeterminados: {reason} +@msg Trap: more than {_1} pairs of objects lie close enough to trap, or too many objects share a horizontal range; trap fewer objects at a time Reventar: más de {_1} pares de objetos están lo bastante cerca para reventarse, o demasiados objetos comparten un intervalo horizontal; reventa menos objetos a la vez +@msg Weed Box and Lines: no weeding line fits outside the art, and the weed box is off Caja y líneas de pelado: ninguna línea de pelado cabe fuera de la ilustración y la caja de pelado está desactivada +@msg \\ at end of pattern \\ al final del patrón +@msg `alignOn` cannot be empty `alignOn` no puede estar vacío +@msg `alignOn` must be a string `alignOn` debe ser una cadena +@msg `align` must be a string `align` debe ser una cadena +@msg `answer` for this {kind} dialog must be one of: {_1} `answer` para este cuadro de diálogo {kind} debe ser uno de: {_1} +@msg `artboard` must be the index of an artboard of the document `artboard` debe ser el índice de una mesa de trabajo del documento +@msg `artboardsAt` must be [x, y] `artboardsAt` debe ser [x, y] +@msg `artboards` names an artboard the document does not have `artboards` nombra una mesa de trabajo que el documento no tiene +@msg `artboards` names an artboard twice `artboards` nombra dos veces la misma mesa de trabajo +@msg `at` must be [x, y] (got {at}) `at` debe ser [x, y] (se recibió {at}) +@msg `beside` needs `side` `beside` necesita `side` +@msg `code` must be a whole number `code` debe ser un número entero +@msg `colorMode` must be one of rgb, cmyk `colorMode` debe ser uno de rgb, cmyk +@msg `colors` does not apply to the {name} reduction `colors` no se aplica a la reducción {name} +@msg `colors` must be a whole number from 2 to 256 `colors` debe ser un número entero entre 2 y 256 +@msg `colors` must be at least 9 for the uniform reduction `colors` debe ser al menos 9 para la reducción uniforme +@msg `colors` must be between 1 and {MAX_THEME_COLORS} (got {n}) `colors` debe estar entre 1 y {MAX_THEME_COLORS} (se recibió {n}) +@msg `count` must be a whole number from 0 to {MAX_COUNT} `count` debe ser un número entero entre 0 y {MAX_COUNT} +@msg `ditherAmount` must be a number from 0 to 100 `ditherAmount` debe ser un número entre 0 y 100 +@msg `fidelity` must be from {lo} to {hi} pt `fidelity` debe estar entre {lo} y {hi} pt +@msg `focal` and `radius` cannot be used together `focal` y `radius` no se pueden usar juntos +@msg `focal` must be an array of [subpath, anchor] pairs `focal` debe ser una lista de pares [subpath, anchor] +@msg `focal` names [{si}, {ai}], which is not an anchor of the path `focal` nombra [{si}, {ai}], que no es un punto de ancla del trazado +@msg `glyphAlternate` takes only null, which takes a glyph choice away (text.setGlyphAlternate makes one) `glyphAlternate` solo acepta null, que quita una elección de glifo (text.setGlyphAlternate crea una) +@msg `group` must be one of {_1} `group` debe ser uno de {_1} +@msg `group` must be the Objects on Path group of `member` and `target` `group` debe ser el grupo de Objetos en trazado de `member` y `target` +@msg `id` is an object id, not {v} `id` es un id de objeto, no {v} +@msg `item` needs `index` `item` necesita `index` +@msg `kerningBefore` belongs to a line's first character, not to a character style (text.setRangeStyle sets it) `kerningBefore` corresponde al primer carácter de una línea, no a un estilo de carácter (lo establece text.setRangeStyle) +@msg `kinsokuType` must be "pushInFirst", "pushOutFirst" or "pushOutOnly" `kinsokuType` debe ser "pushInFirst", "pushOutFirst" o "pushOutOnly" +@msg `leader` must be a string `leader` debe ser una cadena +@msg `max` must be 1 to {MAX_SUGGESTIONS} `max` debe estar entre 1 y {MAX_SUGGESTIONS} +@msg `name` must be a name that is not empty `name` debe ser un nombre que no esté vacío +@msg `name` must not be empty `name` no debe estar vacío +@msg `origin` must be [x, y] in points `origin` debe ser [x, y] en puntos +@msg `picks` must be an array (got {v}) `picks` debe ser una lista (se recibió {v}) +@msg `picks` must hold 1 to {MAX_PICKS} picks (got {_1}) `picks` debe contener entre 1 y {MAX_PICKS} elecciones (se recibió {_1}) +@msg `radius` must be 0 or more `radius` debe ser 0 o más +@msg `rect` must be [x0, y0, x1, y1] (got {r}) `rect` debe ser [x0, y0, x1, y1] (se recibió {r}) +@msg `replace` must be a string `replace` debe ser una cadena +@msg `rows` must be lists of numbers or nulls, not {r} `rows` deben ser listas de números o valores null, no {r} +@msg `scale` must be a number from 0.001 to 1000 `scale` debe ser un número entre 0.001 y 1000 +@msg `scope.{key}` must be a non-empty array `scope.{key}` debe ser una lista que no esté vacía +@msg `side` must be "left", "right", "top" or "bottom" `side` debe ser "left", "right", "top" o "bottom" +@msg `side` places the artboard: leave out x, y, width and height `side` coloca la mesa de trabajo: omite x, y, width y height +@msg `source` is the only path in series group `target` `source` es el único trazado del grupo de serie `target` +@msg `spacing` makes more than {MAX_COUNT} lines across the box `spacing` genera más de {MAX_COUNT} líneas a lo ancho de la caja +@msg `spacing` must be more than 0 and at most {MAX_DISTANCE} pt `spacing` debe ser mayor que 0 y como máximo {MAX_DISTANCE} pt +@msg `target` must be an object of the same Objects on Path group as `member` `target` debe ser un objeto del mismo grupo de Objetos en trazado que `member` +@msg `version` must be 0 or {_1} `version` debe ser 0 o {_1} +@msg `version` must be 0 or {newest} `version` debe ser 0 o {newest} +@msg `weight` must be from 0.01 to 1000 pt `weight` debe estar entre 0.01 y 1000 pt +@msg `weights` must be a list of {_1} numbers, one per row (got {v}) `weights` debe ser una lista de {_1} números, uno por fila (se recibió {v}) +@msg `xml` must be a string `xml` debe ser una cadena +@msg `{KEY}` entry {n} gives the paragraph at byte {start} of {_1} other indents than an entry before it la entrada {n} de `{KEY}` da al párrafo del byte {start} de {_1} otras sangrías que una entrada anterior +@msg `{KEY}` entry {n} must be an object la entrada {n} de `{KEY}` debe ser un objeto +@msg `{KEY}` entry {n} sets neither `leftIndent` nor `firstLineIndent` la entrada {n} de `{KEY}` no establece ni `leftIndent` ni `firstLineIndent` +@msg `{KEY}` entry {n}: `id` must be an object id entrada {n} de `{KEY}`: `id` debe ser un id de objeto +@msg `{KEY}` entry {n}: `start` must be a byte offset entrada {n} de `{KEY}`: `start` debe ser un desplazamiento en bytes +@msg `{KEY}` entry {n}: `{k}` must be a number from -{MAX_PARA} to {MAX_PARA} pt entrada {n} de `{KEY}`: `{k}` debe ser un número entre -{MAX_PARA} y {MAX_PARA} pt +@msg `{KEY}` entry {n}: no paragraph of {_1} starts at byte {start} entrada {n} de `{KEY}`: ningún párrafo de {_1} empieza en el byte {start} +@msg `{KEY}` entry {n}: unknown key `{k}` entrada {n} de `{KEY}`: clave desconocida `{k}` +@msg `{KEY}` entry {n}: {_1} is not a type object entrada {n} de `{KEY}`: {_1} no es un objeto de texto +@msg `{KEY}` is empty `{KEY}` está vacío +@msg `{KEY}` must be a list `{KEY}` debe ser una lista +@msg `{KEY}` takes at most {MAX_PARAGRAPH_INDENTS} entries (got {_1}) `{KEY}` acepta como máximo {MAX_PARAGRAPH_INDENTS} entradas (se recibió {_1}) +@msg `{KEY}` takes no `{other}` beside it `{KEY}` no acepta `{other}` junto a él +@msg `{base}` is larger than {_1} MB `{base}` ocupa más de {_1} MB +@msg `{base}` is not in the DCS file's folder `{base}` no está en la carpeta del archivo DCS +@msg `{key}` holds more than {MAX_EDIT_WORDS} words `{key}` contiene más de {MAX_EDIT_WORDS} palabras +@msg `{key}` must be 0 or more `{key}` debe ser 0 o más +@msg `{key}` must be [x, y] numbers `{key}` debe ser [x, y] con números +@msg `{key}` must be a list of words `{key}` debe ser una lista de palabras +@msg `{key}` must be a list, not {v} `{key}` debe ser una lista, no {v} +@msg `{key}` must be a number or null, not {v} `{key}` debe ser un número o null, no {v} +@msg `{key}` must be a whole number of 0 or more `{key}` debe ser un número entero de 0 o más +@msg `{key}` must be from 0 to {MAX_DISTANCE} pt `{key}` debe estar entre 0 y {MAX_DISTANCE} pt +@msg `{key}` must be from {lo} to {hi}, not {v} `{key}` debe estar entre {lo} y {hi}, no {v} +@msg `{key}` must be one of auto, always, never `{key}` debe ser uno de auto, always, never +@msg `{key}` must be one of miter, round, bevel `{key}` debe ser uno de miter, round, bevel +@msg `{key}` must be one word of at most {_1} characters `{key}` debe ser una sola palabra de como máximo {_1} caracteres +@msg `{key}` must hold single words of at most {_1} characters `{key}` debe contener palabras sueltas de como máximo {_1} caracteres +@msg `{key}` must name an object attached to the path of an Objects on Path group `{key}` debe nombrar un objeto unido al trazado de un grupo de Objetos en trazado +@msg `{key}` names an object that is hidden or locked `{key}` nombra un objeto que está oculto o bloqueado +@msg `{name}` is a file of its own, which can only be found next to the DCS file's path `{name}` es un archivo independiente, que solo se puede encontrar junto a la ruta del archivo DCS +@msg `{name}`: {_1}: {e} `{name}`: {_1}: {e} +@msg `{u}` is no Unicode character `{u}` no es un carácter Unicode +@msg `{word}` isn't in the custom dictionary `{word}` no está en el diccionario personalizado +@msg a CMap has too many mappings un CMap tiene demasiadas asignaciones +@msg a \\u escape needs four hexadecimal digits un escape \\u necesita cuatro dígitos hexadecimales +@msg a comma in an XPath expression must separate function arguments una coma en una expresión XPath debe separar argumentos de función +@msg a document holds at most {_1} SVG filters un documento contiene como máximo {_1} filtros SVG +@msg a document with unsaved changes has no recovery copy un documento con cambios sin guardar no tiene copia de recuperación +@msg a font's data is too large los datos de una fuente son demasiado grandes +@msg a font's subroutines are too large las subrutinas de una fuente son demasiado grandes +@msg a function declaration without a name una declaración de función sin nombre +@msg a host value has too many entries un valor del host tiene demasiadas entradas +@msg a host value is nested too deep un valor del host está anidado a demasiada profundidad +@msg a namespace declaration uses a reserved prefix or URI una declaración de espacio de nombres usa un prefijo o URI reservado +@msg a namespace qualifier is undefined un calificador de espacio de nombres no está definido +@msg a namespace with an empty URI cannot have a prefix un espacio de nombres con un URI vacío no puede tener prefijo +@msg a number has no digits un número no tiene dígitos +@msg a number's exponent has no digits el exponente de un número no tiene dígitos +@msg a number's fraction has no digits la parte fraccionaria de un número no tiene dígitos +@msg a property descriptor cannot have both a value or writable and a get or set un descriptor de propiedad no puede tener a la vez value o writable y get o set +@msg a property descriptor must be an object un descriptor de propiedad debe ser un objeto +@msg a property's {name} must be a function or undefined el {name} de una propiedad debe ser una función o undefined +@msg a stream in it would decode to more than 256 MB, or its decode parameters can't be applied un flujo que contiene se descodificaría en más de 256 MB, o no se pueden aplicar sus parámetros de descodificación +@msg a string holds a control character una cadena contiene un carácter de control +@msg a string holds an escape sequence JSON does not have una cadena contiene una secuencia de escape que JSON no tiene +@msg a string is not closed una cadena no está cerrada +@msg an SVG filter is named by its id: give `xml` with `name` un filtro SVG se nombra por su id: indica `xml` con `name` +@msg an XML element has two attributes with the same name un elemento XML tiene dos atributos con el mismo nombre +@msg an XML value cannot be inserted into itself or its descendants un valor XML no se puede insertar en sí mismo ni en sus descendientes +@msg an XML value's children cannot be assigned by position los hijos de un valor XML no se pueden asignar por posición +@msg an XML value's children cannot be deleted by position los hijos de un valor XML no se pueden eliminar por posición +@msg an XMLList converts to XML only when it has one item un XMLList solo se convierte en XML cuando tiene un elemento +@msg an XPath node test is missing falta una prueba de nodo XPath +@msg an XPath operand is missing falta un operando XPath +@msg an XPath operator is missing falta un operador XPath +@msg an XPath predicate or step cannot follow here aquí no puede seguir un predicado ni un paso XPath +@msg an XPath predicate or step follows a value that is not a node-set un predicado o paso XPath sigue a un valor que no es un conjunto de nodos +@msg an XPath step is missing falta un paso XPath +@msg an image couldn't be decoded and is missing from the picture no se pudo descodificar una imagen y falta en la imagen resultante +@msg an image of {w} × {h} pixels is too large to convert (at most {_1} pixels) una imagen de {w} × {h} píxeles es demasiado grande para convertirla (como máximo {_1} píxeles) +@msg area type in a thread cannot use Dynamic Text: {frames} el texto de área en un enlace no puede usar Texto dinámico: {frames} +@msg at least one row that isn't excluded needs a weight above 0 al menos una fila que no esté excluida necesita un peso mayor que 0 +@msg blend must be a mode name blend debe ser el nombre de un modo +@msg both sides of an XPath | must select nodes ambos lados de un | de XPath deben seleccionar nodos +@msg canceled cancelado +@msg character dimensions cannot be represented with the source text transform las dimensiones de los caracteres no se pueden representar con la transformación del texto de origen +@msg character dimensions cannot be represented with the target text transform las dimensiones de los caracteres no se pueden representar con la transformación del texto de destino +@msg continuation must be an array of path chunks continuation debe ser una lista de fragmentos de trazado +@msg continuation requires points continuation requiere points +@msg each path chunk must contain 1 to 4096 points cada fragmento de trazado debe contener entre 1 y 4096 puntos +@msg each pick is {{at: [x, y]}} or {{rect: [x0, y0, x1, y1]}} (got {v}) cada elección es {{at: [x, y]}} o {{rect: [x0, y0, x1, y1]}} (se recibió {v}) +@msg each weight must be a number of 0 or more (got {v}) cada peso debe ser un número de 0 o más (se recibió {v}) +@msg finally table {t} out of range tabla finally {t} fuera de rango +@msg flags cannot be given with a RegExp object no se pueden indicar indicadores con un objeto RegExp +@msg function declaration index out of range índice de declaración de función fuera de rango +@msg give `char`, `text`, `code` or `unicode` indica `char`, `text`, `code` o `unicode` +@msg give `count` or `spacing`, not both indica `count` o `spacing`, no ambos +@msg give `name`, an SVG filter's name indica `name`, el nombre de un filtro SVG +@msg give `path`, an SVG file, or `svg`, SVG text indica `path`, un archivo SVG, o `svg`, texto SVG +@msg give `xml`, one SVG element indica `xml`, un elemento SVG +@msg give exactly one of `path`, `data` and `dataBase64` indica exactamente uno de `path`, `data` y `dataBase64` +@msg give index or indexes, not both indica index o indexes, no ambos +@msg give opacity or blend indica opacity o blend +@msg handler at {_1} expects {_2} values but its range starts with {d} el controlador en {_1} espera {_2} valores, pero su rango empieza con {d} +@msg handler depth too large profundidad de controlador demasiado grande +@msg handler range {_1}..{_2} out of range rango de controlador {_1}..{_2} fuera de rango +@msg hiddenLayers must be true or false hiddenLayers debe ser true o false +@msg hvcC hvcC +@msg images in a spot ink whose samples couldn't be read were imported in RGB las imágenes en una tinta plana cuyas muestras no se pudieron leer se importaron en RGB +@msg images past the most pixels one file may hold were left out se omitieron las imágenes que superaban el máximo de píxeles que puede contener un archivo +@msg images too large to read were left out se omitieron las imágenes demasiado grandes para leerlas +@msg indexes may hold at most {MAX_GUIDE_INDEXES} entries indexes puede contener como máximo {MAX_GUIDE_INDEXES} entradas +@msg indexes must be an array of guide indexes indexes debe ser una lista de índices de guías +@msg instruction out of range instrucción fuera de rango +@msg instruction {pc} ({op}) pops below the stack la instrucción {pc} ({op}) extrae por debajo de la pila +@msg instruction {pc} reached with stack depths {seen} and {d} se llegó a la instrucción {pc} con profundidades de pila {seen} y {d} +@msg invalid group grupo no válido +@msg invalid object id {v}: expected a non-negative integer id de objeto no válido {v}: se esperaba un entero no negativo +@msg invalid regular expression flag '{_1}' indicador de expresión regular no válido '{_1}' +@msg invalid regular expression: {m} expresión regular no válida: {m} +@msg invalid time value valor de tiempo no válido +@msg it draws its image through a clipping path dibuja su imagen a través de un trazado de recorte +@msg it draws no image no dibuja ninguna imagen +@msg it is larger than {MAX_DICTIONARY_FILE_BYTES} bytes ocupa más de {MAX_DICTIONARY_FILE_BYTES} bytes +@msg it isn't a file no es un archivo +@msg it names {_1} plates, and at most {MAX_PLATES} are read nombra {_1} planchas, y se leen como máximo {MAX_PLATES} +@msg its art is too long or too detailed for a head su ilustración es demasiado larga o detallada para una cabeza +@msg its art paints nothing su ilustración no pinta nada +@msg its image is too large to read su imagen es demasiado grande para leerla +@msg its plates are too large: more than {MAX_SAMPLES} pixels together sus planchas son demasiado grandes: más de {MAX_SAMPLES} píxeles en total +@msg its plates are too large: {_1} plates of {w} × {h} pixels sus planchas son demasiado grandes: {_1} planchas de {w} × {h} píxeles +@msg its plates can't be kept together sus planchas no se pueden mantener juntas +@msg its shapes could not be combined into one sus formas no se pudieron combinar en una +@msg jump to {pc}, past the end salto a {pc}, más allá del final +@msg legacyNameEncoding must be one of {_1} legacyNameEncoding debe ser uno de {_1} +@msg localize: the first argument must be a localization object or a string localize: el primer argumento debe ser un objeto de localización o una cadena +@msg missing `picks` falta `picks` +@msg missing `word` falta `word` +@msg needs a closing quote after the name necesita unas comillas de cierre después del nombre +@msg needs a name necesita un nombre +@msg needs a name of at most 64 bytes necesita un nombre de como máximo 64 bytes +@msg needs a name of letters, digits and _, or a quoted name necesita un nombre de letras, dígitos y _, o un nombre entre comillas +@msg needs a name without control characters necesita un nombre sin caracteres de control +@msg nesting too deep anidamiento demasiado profundo +@msg no HP-GL format no tiene formato HP-GL +@msg no New Document profile called `{shown}` ({_1}) no hay ningún perfil de Nuevo documento llamado `{shown}` ({_1}) +@msg no SVG filter at index {k} no hay ningún filtro SVG en el índice {k} +@msg no arrowheads file here aquí no hay ningún archivo de puntas de flecha +@msg no character has code {code} ningún carácter tiene el código {code} +@msg no custom arrowhead {name} (see stroke.arrowheads.list) no existe la punta de flecha personalizada {name} (consulta stroke.arrowheads.list) +@msg no file to open no hay ningún archivo que abrir +@msg no instructions sin instrucciones +@msg no layer to rename no hay ninguna capa que cambiar de nombre +@msg no random numbers ({e}) no hay números aleatorios ({e}) +@msg no selected or given object has a visible 3D effect ningún objeto seleccionado o indicado tiene un efecto 3D visible +@msg no such artboard {v} no existe la mesa de trabajo {v} +@msg no symbol named `{_1}` no hay ningún símbolo llamado `{_1}` +@msg node {_1} already has the text variable `{_2}` el nodo {_1} ya tiene la variable de texto `{_2}` +@msg not a DCS file no es un archivo DCS +@msg not a RegExp object no es un objeto RegExp +@msg not a regular expression no es una expresión regular +@msg not an action set: the text doesn't start with /version and a number no es un conjunto de acciones: el texto no empieza con /version y un número +@msg nothing to repeat nada que repetir +@msg object {_1} needs a 3D effect el objeto {_1} necesita un efecto 3D +@msg object {_1}: a hollow Extrude & Bevel has no caps: turn on Cap to map a graphic objeto {_1}: una Extrusión y biselado hueca no tiene extremos: activa Extremo para asignar un gráfico +@msg object {_1}: with a depth of 0 the object has one face: map its graphics onto the front objeto {_1}: con una profundidad de 0 el objeto tiene una sola cara: asigna sus gráficos a la parte frontal +@msg object {_1}: {_2} objeto {_1}: {_2} +@msg object {_1}: {e} objeto {_1}: {e} +@msg object {_1}: {name} at index {index} has no lighting presets; set its lights with effect.setParams objeto {_1}: {name} en el índice {index} no tiene preajustes de iluminación; define sus luces con effect.setParams +@msg opacity must be a number opacity debe ser un número +@msg operand too large operando demasiado grande +@msg path chunks must share their boundary point los fragmentos de trazado deben compartir su punto límite +@msg pdfCompatible: false needs the artboards to keep the editable artwork when useArtboards is false pdfCompatible: false necesita que las mesas de trabajo conserven la ilustración editable cuando useArtboards es false +@msg point x must be a number el punto x debe ser un número +@msg point y must be a number el punto y debe ser un número +@msg points must be [x,y] pairs points deben ser pares [x,y] +@msg points must be finite canvas points points deben ser puntos finitos del lienzo +@msg range out of order in character class rango desordenado en la clase de caracteres +@msg reduce of an empty array with no initial value reduce de una matriz vacía sin valor inicial +@msg regular expression flag '{_1}' given twice indicador de expresión regular '{_1}' indicado dos veces +@msg sampled text would exceed the canvas (coordinates out of range) el texto muestreado superaría el lienzo (coordenadas fuera de rango) +@msg select an SVG filter selecciona un filtro SVG +@msg select an object with a 3D effect selecciona un objeto con un efecto 3D +@msg select an object with a 3D effect, or give its id in ids selecciona un objeto con un efecto 3D o indica su id en ids +@msg select one layer, group or object to rename selecciona una capa, un grupo o un objeto para cambiarle el nombre +@msg select the art to weed selecciona la ilustración que quieres pelar +@msg select type on a path or area type selecciona texto en trazado o texto de área +@msg source text transform is collapsed or unrepresentable la transformación del texto de origen está colapsada o no se puede representar +@msg table must be true or false table debe ser true o false +@msg takes one name acepta un nombre +@msg target text transform is collapsed or unrepresentable la transformación del texto de destino está colapsada o no se puede representar +@msg that makes too many pieces (at most 100000) or dash steps: simplify the dash pattern or make the dashes longer eso genera demasiadas piezas (como máximo 100000) o pasos de guion: simplifica el patrón de guiones o alarga los guiones +@msg the Layers panel is not shown el panel Capas no se muestra +@msg the Layers panel's search, filter or Show Layers Only hides its row la búsqueda, el filtro o Mostrar solo capas del panel Capas ocultan su fila +@msg the Objects on Path group is hidden or locked el grupo de Objetos en trazado está oculto o bloqueado +@msg the SVG file is larger than {MAX_IMPORT_BYTES} bytes el archivo SVG ocupa más de {MAX_IMPORT_BYTES} bytes +@msg the XML operation needs an XML or XMLList value la operación XML necesita un valor XML o XMLList +@msg the XPath expression does not evaluate to a node-set la expresión XPath no se evalúa como un conjunto de nodos +@msg the XPath expression ends early la expresión XPath termina antes de tiempo +@msg the XPath expression has an unmatched ) la expresión XPath tiene un ) sin pareja +@msg the XPath expression has an unmatched ] la expresión XPath tiene un ] sin pareja +@msg the XPath expression has an unmatched closing bracket la expresión XPath tiene un corchete de cierre sin pareja +@msg the XPath expression selects a namespace node, which is not an XML value la expresión XPath selecciona un nodo de espacio de nombres, que no es un valor XML +@msg the XPath expression selects the root node, which is not an XML value la expresión XPath selecciona el nodo raíz, que no es un valor XML +@msg the XPath function {name} needs a node-set la función XPath {name} necesita un conjunto de nodos +@msg the XPath function {name} takes the wrong number of arguments la función XPath {name} recibe un número incorrecto de argumentos +@msg the XPath name functions need a node-set las funciones de nombre de XPath necesitan un conjunto de nodos +@msg the XPath prefix {shown} is not bound to a namespace el prefijo XPath {shown} no está vinculado a un espacio de nombres +@msg the XPath variable ${shown} is not bound la variable XPath ${shown} no está vinculada +@msg the artwork is too large for EPS: what follows 256 MB of PostScript was left out la ilustración es demasiado grande para EPS: se omitió lo que sigue a 256 MB de PostScript +@msg the bitmaps hold more pixels than one file may los mapas de bits contienen más píxeles de los que puede tener un archivo +@msg the code runs past its last instruction el código continúa más allá de su última instrucción +@msg the curve tolerance must be from 0.01 to 10 points la tolerancia de curva debe estar entre 0.01 y 10 puntos +@msg the custom dictionary couldn't be saved to {_1}: {e} no se pudo guardar el diccionario personalizado en {_1}: {e} +@msg the custom dictionary {_1} can't be read ({why}), so it is left as it is no se puede leer el diccionario personalizado {_1} ({why}), así que se deja como está +@msg the document already has an SVG filter named {name} el documento ya tiene un filtro SVG llamado {name} +@msg the document has another SVG filter named {name}: use svgFilter.apply, or svgFilter.define with `replace` to edit it el documento tiene otro filtro SVG llamado {name}: usa svgFilter.apply, o svgFilter.define con `replace` para editarlo +@msg the document has no SVG filter named {name} el documento no tiene ningún filtro SVG llamado {name} +@msg the document has no SVG filter named {r} el documento no tiene ningún filtro SVG llamado {r} +@msg the document has no color swatches el documento no tiene muestras de color +@msg the document's swatches hold {_1} colors; the document reduction takes at most 255 las muestras del documento contienen {_1} colores; la reducción del documento acepta como máximo 255 +@msg the file isn't valid SVG: {e} el archivo no es un SVG válido: {e} +@msg the file names no plate el archivo no nombra ninguna plancha +@msg the guide is hidden or locked la guía está oculta o bloqueada +@msg the library's file is outside the read roots el archivo de la biblioteca está fuera de las raíces de lectura +@msg the method needs an XML value el método necesita un valor XML +@msg the parameters or body do not form one function los parámetros o el cuerpo no forman una sola función +@msg the pasted SVG filter {name} draws differently from the document's filter of that name, and no free name fits it el filtro SVG pegado {name} dibuja de forma distinta al filtro del documento con ese nombre, y no hay ningún nombre libre para él +@msg the pen table holds more than 255 pens la tabla de plumillas contiene más de 255 plumillas +@msg the plates can't be kept no se pueden conservar las planchas +@msg the position table does not match the instructions la tabla de posiciones no coincide con las instrucciones +@msg the prompt's text is longer than {MAX_PROMPT_BYTES} bytes el texto del prompt ocupa más de {MAX_PROMPT_BYTES} bytes +@msg the radix must be between 2 and 36 la base debe estar entre 2 y 36 +@msg the selected art is nested more than {MAX_DEPTH} levels deep la ilustración seleccionada está anidada a más de {MAX_DEPTH} niveles de profundidad +@msg the selected art is too large to measure la ilustración seleccionada es demasiado grande para medirla +@msg the selection has no outlines to weed around la selección no tiene contornos alrededor de los que pelar +@msg the value bind was called on is not a function el valor con el que se llamó a bind no es una función +@msg the value is not a valid XML name el valor no es un nombre XML válido +@msg the value is not an XML attribute name el valor no es un nombre de atributo XML +@msg the value is not an XML name el valor no es un nombre XML +@msg the weeding lines cross the art's outlines too many times to measure; use fewer lines las líneas de pelado cruzan los contornos de la ilustración demasiadas veces para medirlas; usa menos líneas +@msg the weeding lines pass too close to too many outline segments to measure; use fewer lines or a smaller gap las líneas de pelado pasan demasiado cerca de demasiados segmentos de contorno para medirlas; usa menos líneas o un hueco más pequeño +@msg the weeding lines would be more than {max_pieces} pieces las líneas de pelado tendrían más de {max_pieces} piezas +@msg the {_1} plate lies outside the file la plancha {_1} está fuera del archivo +@msg this is a binary DXF file, which can't be read: save it from the CAD app as an ASCII DXF and open that este es un archivo DXF binario, que no se puede leer: guárdalo desde la aplicación CAD como DXF ASCII y abre ese +@msg this warp's points can't be edited: use Reset with Mesh first los puntos de esta deformación no se pueden editar: usa antes Restablecer con malla +@msg toExponential() digits must be between 0 and 20 los dígitos de toExponential() deben estar entre 0 y 20 +@msg toFixed() digits must be between 0 and 20 los dígitos de toFixed() deben estar entre 0 y 20 +@msg toISOString is not a function toISOString no es una función +@msg toPrecision() argument must be between 1 and 21 el argumento de toPrecision() debe estar entre 1 y 21 +@msg toSource: a getter cannot be written as source toSource: un getter no se puede escribir como código fuente +@msg toSource: an array with properties besides its elements, a property that is not enumerable or another prototype cannot be written as source toSource: una matriz con propiedades además de sus elementos, una propiedad que no es enumerable u otro prototipo no se puede escribir como código fuente +@msg toSource: an object with a property that is not enumerable, or whose prototype is not Object.prototype, cannot be written as source toSource: un objeto con una propiedad que no es enumerable, o cuyo prototipo no es Object.prototype, no se puede escribir como código fuente +@msg toSource: the source is too long toSource: el código fuente es demasiado largo +@msg toSource: the value contains itself toSource: el valor se contiene a sí mismo +@msg toSource: the value has too many entries toSource: el valor tiene demasiadas entradas +@msg toSource: the value is nested too deep toSource: el valor está anidado a demasiada profundidad +@msg toString is not a function toString no es una función +@msg too many quantifiers demasiados cuantificadores +@msg unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`) función OpenType desconocida `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; antepón - para desactivarla; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom y aalt aceptan el número de una alternativa como `tag=N` con N entre 0 y {_1}, como `salt=2`) +@msg unknown dither `{d}` (diffusion, pattern, noise or none) tramado desconocido `{d}` (diffusion, pattern, noise o none) +@msg unknown panel `{panel}` panel desconocido `{panel}` +@msg unknown parameter `{key}` parámetro desconocido `{key}` +@msg unknown parameter `{within}settings.{format}`; {why} parámetro desconocido `{within}settings.{format}`; {why} +@msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) reducción desconocida `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform o document) +@msg unmatched ')' ')' sin pareja +@msg unterminated character class clase de caracteres sin terminar +@msg unterminated group grupo sin terminar +@msg wordGap and lineGap need area type in the selection wordGap y lineGap necesitan texto de área en la selección +@msg xpath needs its variables as an object xpath necesita sus variables como un objeto +@msg xpath needs the expression as a string xpath necesita la expresión como una cadena +@msg {GRANT_NOT_REMOVED}, and its settings and cache can't be moved back from {_1} to {_2}: {e} {GRANT_NOT_REMOVED}, y sus ajustes y su caché no se pueden devolver de {_1} a {_2}: {e} +@msg {_1} is not a folder: {e} {_1} no es una carpeta: {e} +@msg {_1}: {_2} and {_3} are in the way {_1}: {_2} y {_3} estorban +@msg {code}: {0} {code}: {0} +@msg {dir}: {e} {dir}: {e} +@msg {file} names more than one linked JavaScript file {file} nombra más de un archivo JavaScript vinculado +@msg {k}: a custom arrowhead's path needs an area to fill and at most {most} anchors and {most} subpaths, each anchor within {far} head units of its tip {k}: el trazado de una punta de flecha personalizada necesita un área que rellenar y como máximo {most} puntos de ancla y {most} subtrazados, cada punto de ancla a no más de {far} unidades de cabeza de su punta +@msg {k}: bad custom arrowhead path: {e} {k}: trazado de punta de flecha personalizada incorrecto: {e} +@msg {k}: bad custom arrowhead: {e} {k}: punta de flecha personalizada incorrecta: {e} +@msg {k}: custom must be a name {k}: custom debe ser un nombre +@msg {path}: copy takes a DCS file only when its plates are inside it; relink to it where its plate files are {path}: copy solo acepta un archivo DCS cuando sus planchas están dentro de él; vuelve a vincularlo donde estén sus archivos de planchas +@msg {path}: larger than {_1} MB {path}: ocupa más de {_1} MB +@msg {shown} is not an XPath 1.0 function {shown} no es una función de XPath 1.0 +@msg {v} names no layer or sublayer {v} no nombra ninguna capa ni subcapa +@msg {what} is not a function {what} no es una función +@msg {what} would print more than {MAX_COPIES_PER_SHEET} copies on a sheet: scale it up {what} imprimiría más de {MAX_COPIES_PER_SHEET} copias en una hoja: amplíalo +@msg {what} {i} out of range {what} {i} fuera de rango +@msg A profile supports one Revolve effect. Edit the existing effect's options instead. Un perfil admite un solo efecto Revolución. Edita en su lugar las opciones del efecto existente. +@msg Add Points at Crossings: a path went missing Agregar puntos en los cruces: falta un trazado +@msg CSS options: {e} Opciones de CSS: {e} +@msg CSV has a header but no data rows El CSV tiene encabezado pero ninguna fila de datos +@msg CSV holds NUL bytes: save it as UTF-8, or as UTF-16 with a byte-order mark El CSV contiene bytes NUL: guárdalo como UTF-8, o como UTF-16 con marca de orden de bytes +@msg CSV is empty El CSV está vacío +@msg CSV is larger than {MAX_CSV_BYTES} bytes El CSV ocupa más de {MAX_CSV_BYTES} bytes +@msg CSV is not UTF-16 El CSV no está en UTF-16 +@msg CSV is not UTF-8 El CSV no está en UTF-8 +@msg CSV would be larger than {MAX_CSV_BYTES} bytes El CSV ocuparía más de {MAX_CSV_BYTES} bytes +@msg Choose original artwork, not a dimension's generated paths Elige la ilustración original, no los trazados generados de una cota +@msg Contour: select paths or shapes Contorno: selecciona trazados o formas +@msg Contour: the Offset Path effect is not available Contorno: el efecto Desplazar trazado no está disponible +@msg Create needs fills, strokes or both Crear necesita rellenos, trazos o ambos +@msg DXF options: {e} Opciones de DXF: {e} +@msg DXF scale must be a positive number up to {_1}, not {scale} La escala de DXF debe ser un número positivo de hasta {_1}, no {scale} +@msg DXF {field} `{s}`: {allowed} DXF {field} `{s}`: {allowed} +@msg Dimension is locked or hidden La cota está bloqueada u oculta +@msg Dimension mode does not match its source El modo de la cota no coincide con su origen +@msg Draw Inside needs exactly one selected path, compound path or text Dibujar dentro necesita exactamente un trazado, trazado compuesto o texto seleccionado +@msg EPS Save writes all artwork: use document.export for selected-only EPS Guardar EPS escribe toda la ilustración: usa document.export para un EPS solo con lo seleccionado +@msg EPS flattener: {e} Acoplador de EPS: {e} +@msg EPS options: {e} Opciones de EPS: {e} +@msg EPS {field} `{s}`: {allowed} EPS {field} `{s}`: {allowed} +@msg Export for Screens writes png, png8, jpg, webp, gif, tiff, bmp, tga, psd, svg, svgz, pdf, eps, ai or vectorcraft Exportar para pantallas escribe png, png8, jpg, webp, gif, tiff, bmp, tga, psd, svg, svgz, pdf, eps, ai o vectorcraft +@msg Flare click coordinates must be finite numbers Las coordenadas del clic de destello deben ser números finitos +@msg HTML Text applies to object slices of type only Texto HTML solo se aplica a sectores de objeto de texto +@msg Identify Objects By is XML ID: the name must be a valid XML ID (start with a letter, underscore or colon; no spaces) Identificar objetos por está en ID de XML: el nombre debe ser un ID de XML válido (empieza con una letra, un guion bajo o dos puntos; sin espacios) +@msg Image Trace failed: internal error: its thread stopped (please report this bug) Error de Calco de imagen: error interno: su hilo se detuvo (informa de este error) +@msg Image Trace failed: {e} Error de Calco de imagen: {e} +@msg Image Trace finished, but its document was closed Calco de imagen terminó, pero su documento se cerró +@msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Calco de imagen terminó, pero la imagen o sus ajustes cambiaron mientras tanto: cálcala de nuevo +@msg Invalid dimension offset Desplazamiento de cota no válido +@msg Invalid point Punto no válido +@msg Join: a subpath went missing Unir: falta un subtrazado +@msg Lock Workspace is not available in VectorCraft Bloquear espacio de trabajo no está disponible en VectorCraft +@msg Move Panel to New Window is not available: floating panels stay in the main window Mover panel a una ventana nueva no está disponible: los paneles flotantes permanecen en la ventana principal +@msg Offset Path: the path is too complex to offset Desplazar trazado: el trazado es demasiado complejo para desplazarlo +@msg Offset Path: {e} Desplazar trazado: {e} +@msg PDF content is incomplete or exceeds the reader's limits; no document was imported El contenido del PDF está incompleto o supera los límites del lector; no se importó ningún documento +@msg PDF flattener: {e} Acoplador de PDF: {e} +@msg PDF options: {e} Opciones de PDF: {e} +@msg Recolor Artwork is no longer open Volver a colorear ilustración ya no está abierto +@msg SVG is not UTF-8, UTF-16 or ISO 8859-1 El SVG no está en UTF-8, UTF-16 ni ISO 8859-1 +@msg Save writes one artboard: name one, or export several with document.export Guardar escribe una sola mesa de trabajo: nombra una o exporta varias con document.export +@msg Select a dimension first Selecciona primero una cota +@msg Select dimensions to update Selecciona las cotas que quieres actualizar +@msg Select only dimensions Selecciona solo cotas +@msg Select two or more objects, or a group Selecciona dos o más objetos, o un grupo +@msg Shaper needs 1–64 source paths Shaper necesita de 1 a 64 trazados de origen +@msg Switch x/y is for scatter graphs Cambiar x/y es para gráficos de dispersión +@msg Text options: {e} Opciones de texto: {e} +@msg `align` is start, center or end `align` es start, center o end +@msg `anchors` must be an array of [subpath, anchor] pairs `anchors` debe ser una lista de pares [subpath, anchor] +@msg `anchors` must list anchor indices (0, 1, 2…), not {k} `anchors` debe enumerar índices de puntos de ancla (0, 1, 2…), no {k} +@msg `anchors` must list anchor indices (0, 1, 2…), not {v} `anchors` debe enumerar índices de puntos de ancla (0, 1, 2…), no {v} +@msg `artboards` must be a list of artboard indices `artboards` debe ser una lista de índices de mesas de trabajo +@msg `asset` is the asset id (see assets.list) `asset` es el id del recurso (consulta assets.list) +@msg `at` must be a byte offset `at` debe ser un desplazamiento en bytes +@msg `autoLeading` must be a number `autoLeading` debe ser un número +@msg `background` must be "", "matte" or #rrggbb `background` debe ser "", "matte" o #rrggbb +@msg `burasagari` must be "none", "standard" or "forced" `burasagari` debe ser "none", "standard" o "forced" +@msg `center` must be [x, y] `center` debe ser [x, y] +@msg `charAlign` must be "romanBaseline", "emBoxTop", "emBoxCenter", "emBoxBottom", "icfTop" or "icfBottom" `charAlign` debe ser "romanBaseline", "emBoxTop", "emBoxCenter", "emBoxBottom", "icfTop" o "icfBottom" +@msg `charDirection` must be "default", "leftToRight" or "rightToLeft" `charDirection` debe ser "default", "leftToRight" o "rightToLeft" +@msg `clearStroke` requires `stroke: false`, `ids: []` and no `stop` `clearStroke` requiere `stroke: false`, `ids: []` y ningún `stop` +@msg `clear` must be a list of type object ids, not {v} `clear` debe ser una lista de ids de objetos de texto, no {v} +@msg `clear` must list type objects; {_1} is not one `clear` debe enumerar objetos de texto; {_1} no lo es +@msg `clear` must not list `id` `clear` no debe enumerar `id` +@msg `color` needs a `rule` to make the theme from `color` necesita una `rule` a partir de la que crear el tema +@msg `colors` is empty `colors` está vacío +@msg `columnType` is vertical, uniform, repeating or sliding `columnType` es vertical, uniform, repeating o sliding +@msg `columns` must be a whole number 1..50 `columns` debe ser un número entero 1..50 +@msg `commands` must not be empty `commands` no debe estar vacío +@msg `contents` goes with `to` `contents` va con `to` +@msg `corners` must be sharp, round or square, not `{other}` `corners` debe ser sharp, round o square, no `{other}` +@msg `corners` must list anchor indices (0, 1, 2…), not {v} `corners` debe enumerar índices de puntos de ancla (0, 1, 2…), no {v} +@msg `count` must be a whole number from 1 to 100 `count` debe ser un número entero entre 1 y 100 +@msg `dataBase64` is larger than the module limit `dataBase64` supera el límite de módulos +@msg `dataBase64` is not valid base64 `dataBase64` no es base64 válido +@msg `defaultsOnly` cannot be combined with `ids`, `reverse` or `append` `defaultsOnly` no se puede combinar con `ids`, `reverse` ni `append` +@msg `depth` and `childLimit` slice the summary: pass `summary: true` `depth` y `childLimit` recortan el resumen: pasa `summary: true` +@msg `design` is a design name, or null for plain columns `design` es el nombre de un diseño, o null para columnas simples +@msg `design` is a design name, or null for the default marker `design` es el nombre de un diseño, o null para el marcador predeterminado +@msg `destinationFolder` is required when destination is `folder` `destinationFolder` es obligatorio cuando el destino es `folder` +@msg `destination` must be `none`, `saveAndClose` or `folder` `destination` debe ser `none`, `saveAndClose` o `folder` +@msg `diameter` must be from 0.1 to 2500 pt `diameter` debe estar entre 0.1 y 2500 pt +@msg `digits` must be one of {_1} `digits` debe ser uno de {_1} +@msg `dimImages` is a percentage or false `dimImages` es un porcentaje o false +@msg `direction` must be "auto", "leftToRight" or "rightToLeft" `direction` debe ser "auto", "leftToRight" o "rightToLeft" +@msg `each` is the value one design stands for, more than 0 `each` es el valor que representa un diseño, mayor que 0 +@msg `end` must be "start" or "end" `end` debe ser "start" o "end" +@msg `ends` applies to joining exactly two paths `ends` se aplica al unir exactamente dos trazados +@msg `event` must be one of {_1} `event` debe ser uno de {_1} +@msg `every` must be "all", "odd" or "even", not {v} `every` debe ser "all", "odd" o "even", no {v} +@msg `expand` must be true or false `expand` debe ser true o false +@msg `files` must be 1 to 1000 paths of font files the last text.findFontFiles search found `files` debe ser de 1 a 1000 rutas de archivos de fuentes que encontró la última búsqueda de text.findFontFiles +@msg `folder` must be an absolute folder path `folder` debe ser una ruta de carpeta absoluta +@msg `fontAxes` must be an object of axis tags and values, such as {"wght"} `fontAxes` debe ser un objeto de etiquetas de eje y valores, como {"wght"} +@msg `format` must be a string `format` debe ser una cadena +@msg `format` must be one of {_1} `format` debe ser uno de {_1} +@msg `fractions` is chop or scale `fractions` es chop o scale +@msg `from` and `to` must differ `from` y `to` deben ser distintos +@msg `from` has an empty frame `from` tiene un marco vacío +@msg `from` must be a non-negative integer `from` debe ser un entero no negativo +@msg `from` must be area type or type on a path `from` debe ser texto de área o texto en trazado +@msg `gid` must be a glyph id, not {v} `gid` debe ser un id de glifo, no {v} +@msg `glyphAlternate` belongs to one character, not to a character style (text.setGlyphAlternate sets it) `glyphAlternate` corresponde a un solo carácter, no a un estilo de carácter (lo establece text.setGlyphAlternate) +@msg `guide` must be a guide index (guide.list) `guide` debe ser un índice de guía (guide.list) +@msg `hAlign` must be default, left, center or right `hAlign` debe ser default, left, center o right +@msg `id` must be a node id `id` debe ser un id de nodo +@msg `id` must be an object id, not {v} `id` debe ser un id de objeto, no {v} +@msg `ids` must name Objects on Path groups or objects in them `ids` debe nombrar grupos de Objetos en trazado u objetos que contengan +@msg `ids` takes at most {MAX_INSPECT_IDS} ids `ids` acepta como máximo {MAX_INSPECT_IDS} ids +@msg `imageMap` must be none, rectangle or polygon `imageMap` debe ser none, rectangle o polygon +@msg `includeArtboardFill` must be true or false `includeArtboardFill` debe ser true o false +@msg `includeSubdirs` must be true or false `includeSubdirs` debe ser true o false +@msg `index` must be a point index `index` debe ser un índice de punto +@msg `index` must be a whole number or null `index` debe ser un número entero o null +@msg `indices` must be a non-empty array of item indices `indices` debe ser una lista no vacía de índices de elementos +@msg `items` is a list of {kind, item} `items` es una lista de {kind, item} +@msg `items` is empty `items` está vacío +@msg `items` must be a list of {id, points} `items` debe ser una lista de {id, points} +@msg `items` must be a list of {{id, anchors?}}, not {v} `items` debe ser una lista de {{id, anchors?}}, no {v} +@msg `items` must be an array of {id, anchors} `items` debe ser una lista de {id, anchors} +@msg `items` must be an array of {{id, corners?}}, not {v} `items` debe ser una lista de {{id, corners?}}, no {v} +@msg `kashida` must be "none", "short", "medium", "long" or "stylistic" `kashida` debe ser "none", "short", "medium", "long" o "stylistic" +@msg `kind` is one of {_1} `kind` es uno de {_1} +@msg `kind` must be "round", "invertedRound" or "chamfer", not {v} `kind` debe ser "round", "invertedRound" o "chamfer", no {v} +@msg `kind` must be `text`, `visibility`, `image` or `graph` `kind` debe ser `text`, `visibility`, `image` o `graph` +@msg `kind` must be a string `kind` debe ser una cadena +@msg `kind` must be image, noImage or htmlText `kind` debe ser image, noImage o htmlText +@msg `kinsoku` must be "none", "hard" or "soft" `kinsoku` debe ser "none", "hard" o "soft" +@msg `label` must be a non-empty name of at most 200 characters `label` debe ser un nombre no vacío de como máximo 200 caracteres +@msg `language` must be a language name or tag, such as "Turkish" or "tr" `language` debe ser un nombre o una etiqueta de idioma, como "Turkish" o "tr" +@msg `leadingModel` must be "romanBaseline" or "emBoxTop" `leadingModel` debe ser "romanBaseline" o "emBoxTop" +@msg `leading` must be from 0.1 to 5000, or null for Auto `leading` debe estar entre 0.1 y 5000, o null para Automático +@msg `length` must be a number of at most 1000000 pt either way `length` debe ser un número de como máximo 1000000 pt en cualquier sentido +@msg `line` must be true or false `line` debe ser true o false +@msg `minAngle` ({min_angle}°) can't be more than `maxAngle` ({max_angle}°) `minAngle` ({min_angle}°) no puede ser mayor que `maxAngle` ({max_angle}°) +@msg `mode` must be "handles", "straight" or "smooth" `mode` debe ser "handles", "straight" o "smooth" +@msg `mode` must be "straight", "bezier" or "arc" `mode` debe ser "straight", "bezier" o "arc" +@msg `mode` must be one of {_1} `mode` debe ser uno de {_1} +@msg `mojikumi` must be "none", "yakumonoHankaku", "gyomatsuYakumonoHankaku", "gyomatsuYakumonoZenkaku", "yakumonoZenkaku" or "lineEndHalf" `mojikumi` debe ser "none", "yakumonoHankaku", "gyomatsuYakumonoHankaku", "gyomatsuYakumonoZenkaku", "yakumonoZenkaku" o "lineEndHalf" +@msg `names` is a list of preset names `names` es una lista de nombres de preajustes +@msg `names` lists preset names `names` enumera nombres de preajustes +@msg `names` must be a list of names `names` debe ser una lista de nombres +@msg `names` must be a list of swatch names `names` debe ser una lista de nombres de muestras +@msg `names` must be an array of style names `names` debe ser una lista de nombres de estilos +@msg `new` is a design name, or true `new` es el nombre de un diseño, o true +@msg `path` must be a folder `path` debe ser una carpeta +@msg `path` must be a path object `path` debe ser un objeto de trazado +@msg `pivot` must be a whole number from 0 to 8 `pivot` debe ser un número entero entre 0 y 8 +@msg `points` must be a list of [x, y] points `points` debe ser una lista de puntos [x, y] +@msg `points` must be a list of point indexes `points` debe ser una lista de índices de puntos +@msg `points` must be an array of point indices `points` debe ser una lista de índices de puntos +@msg `points` must be point indexes `points` deben ser índices de puntos +@msg `port` must be "in" or "out" `port` debe ser "in" u "out" +@msg `position` is above or below `position` es above o below +@msg `preset` must be a string `preset` debe ser una cadena +@msg `ratio` must be from 0.1 to 0.5 `ratio` debe estar entre 0.1 y 0.5 +@msg `rect` must be [x, y, width, height] with a positive size `rect` debe ser [x, y, width, height] con un tamaño positivo +@msg `relation` must be overlap, inside or outside `relation` debe ser overlap, inside u outside +@msg `reversed` must be true or false `reversed` debe ser true o false +@msg `rotate` must be a finite number `rotate` debe ser un número finito +@msg `rule` must be nonZero or evenOdd `rule` debe ser nonZero o evenOdd +@msg `scale` must be a number in (0, 100] `scale` debe ser un número en (0, 100] +@msg `scope` must be "selection" or "document", not {other} `scope` debe ser "selection" o "document", no {other} +@msg `script` must be a string `script` debe ser una cadena +@msg `seriesIndexes` is a non-empty list of series indexes `seriesIndexes` es una lista no vacía de índices de series +@msg `seriesIndexes` needs a `type` or a `valueAxis` `seriesIndexes` necesita un `type` o un `valueAxis` +@msg `shift` must be a number of points `shift` debe ser un número de puntos +@msg `showCenter` must be true or false `showCenter` debe ser true o false +@msg `singleWordJustification` must be "fullJustify", "alignLeft", "alignCenter" or "alignRight" `singleWordJustification` debe ser "fullJustify", "alignLeft", "alignCenter" o "alignRight" +@msg `size` is a percentage of the base text's size, 1 to 100 `size` es un porcentaje del tamaño del texto base, de 1 a 100 +@msg `source` and `target` are the same object `source` y `target` son el mismo objeto +@msg `source` must be `folder` or `datasets` `source` debe ser `folder` o `datasets` +@msg `spacing` must be a number `spacing` debe ser un número +@msg `spacing` must be a number of points, 0 or more, or "auto" `spacing` debe ser un número de puntos, 0 o más, o "auto" +@msg `start` must be a finite number `start` debe ser un número finito +@msg `starts` must be an array of anchor indices (or nulls) `starts` debe ser una lista de índices de puntos de ancla (o valores null) +@msg `status` must be linked, embedded, missing or modified, or a list of them `status` debe ser linked, embedded, missing o modified, o una lista de ellos +@msg `stop` must be a stop index `stop` debe ser un índice de parada +@msg `story` styles the whole story: give no `start` or `end` `story` aplica estilo a todo el artículo: no indiques `start` ni `end` +@msg `story` takes the whole story: give no `start` or `end` `story` abarca todo el artículo: no indiques `start` ni `end` +@msg `strokeMode` applies to strokes (stroke: true) `strokeMode` se aplica a los trazos (stroke: true) +@msg `style` must be roman or japanese `style` debe ser roman o japanese +@msg `subpaths` must be two integer indices `subpaths` deben ser dos índices enteros +@msg `symbol` must be a symbol name `symbol` debe ser el nombre de un símbolo +@msg `target` must be "object" or "contents", not {v} `target` debe ser "object" o "contents", no {v} +@msg `tint` applies to global and spot colours `tint` se aplica a colores globales y tintas planas +@msg `tint` goes with a global or spot `swatch` `tint` va con un `swatch` global o de tinta plana +@msg `tint` must be a number (%) `tint` debe ser un número (%) +@msg `tint` needs a global or spot colour `tint` necesita un color global o una tinta plana +@msg `to` is already threaded `to` ya está enlazado +@msg `to` is the design's new name `to` es el nuevo nombre del diseño +@msg `to` must be [x, y] `to` debe ser [x, y] +@msg `to` must be a closed path, area type or type on a path other than `from` `to` debe ser un trazado cerrado, texto de área o texto en trazado distinto de `from` +@msg `to` must be a whole number `to` debe ser un número entero +@msg `to` takes the rows of one object's stack, not aligned rows `to` acepta las filas de la pila de un objeto, no filas alineadas +@msg `useLab` must be true or false `useLab` debe ser true o false +@msg `vAlign` must be default, top, middle, baseline or bottom `vAlign` debe ser default, top, middle, baseline o bottom +@msg `values` must be a list `values` debe ser una lista +@msg `values` must be an object `values` debe ser un objeto +@msg `values` must name hex, rgb, cmyk, lab or gray `values` debe nombrar hex, rgb, cmyk, lab o gray +@msg `values` names a kind twice `values` nombra dos veces el mismo tipo +@msg `{_1}` can't be edited or removed `{_1}` no se puede editar ni eliminar +@msg `{_1}` is built in and always listed `{_1}` está integrado y siempre aparece en la lista +@msg `{_1}` is not a font file the last text.findFontFiles search found `{_1}` no es un archivo de fuente que haya encontrado la última búsqueda de text.findFontFiles +@msg `{_1}` would be overwritten by the package: choose a different folder or name el paquete sobrescribiría `{_1}`: elige otra carpeta u otro nombre +@msg `{file}` has no art to place `{file}` no tiene ilustración que colocar +@msg `{file}` is over {_1} MB `{file}` ocupa más de {_1} MB +@msg `{f}` belongs to a VectorCraft that is running `{f}` pertenece a un VectorCraft que se está ejecutando +@msg `{f}` is the copy of a document open now `{f}` es la copia de un documento abierto ahora +@msg `{id}` is no writable format (see document.formats) `{id}` no es un formato con escritura (consulta document.formats) +@msg `{id}` isn't a loaded library `{id}` no es una biblioteca cargada +@msg `{key}` has no colours `{key}` no tiene colores +@msg `{key}` is a design name `{key}` es el nombre de un diseño +@msg `{key}` is a design name or a list of them `{key}` es el nombre de un diseño o una lista de ellos +@msg `{key}` is longer than {MAX_NAME} characters `{key}` tiene más de {MAX_NAME} caracteres +@msg `{key}` is out of range `{key}` está fuera de rango +@msg `{key}` must be [min, desired, max] or {{min?, desired?, max?}}, in percent `{key}` debe ser [min, desired, max] o {{min?, desired?, max?}}, en porcentaje +@msg `{key}` must be a non-negative integer `{key}` debe ser un entero no negativo +@msg `{key}` must be a number {_1}..{_2} `{key}` debe ser un número {_1}..{_2} +@msg `{key}` must be a whole number of at least 0, not {n} `{key}` debe ser un número entero de al menos 0, no {n} +@msg `{key}` must be an appearance item index (paint order) or null `{key}` debe ser un índice de elemento de apariencia (orden de pintura) o null +@msg `{key}` must be an array of asset ids (see assets.list) `{key}` debe ser una lista de ids de recursos (consulta assets.list) +@msg `{key}` must be from 0 to 180 degrees, not {a} `{key}` debe estar entre 0 y 180 grados, no {a} +@msg `{key}` must be from {_1} to {shift_max} `{key}` debe estar entre {_1} y {shift_max} +@msg `{key}`: not a colour: {v} `{key}`: no es un color: {v} +@msg `{k}.family` is required `{k}.family` es obligatorio +@msg `{k}` is a number 0..1 `{k}` es un número 0..1 +@msg `{k}` is true or false `{k}` es true o false +@msg `{k}` isn't an export setting: {_1} `{k}` no es un ajuste de exportación: {_1} +@msg `{k}` must be a byte offset `{k}` debe ser un desplazamiento en bytes +@msg `{k}` must be a number `{k}` debe ser un número +@msg `{k}` must be a number of points `{k}` debe ser un número de puntos +@msg `{k}` must be a string `{k}` debe ser una cadena +@msg `{k}` must be a whole number `{k}` debe ser un número entero +@msg `{k}` must be from {lo} to {hi} for {key} `{k}` debe estar entre {lo} y {hi} para {key} +@msg `{k}` must be {what}, not {v} `{k}` debe ser {what}, no {v} +@msg `{l}` isn't a global or spot colour `{l}` no es un color global ni una tinta plana +@msg `{m}` isn't a bitmap: use clipboard.importSvg, importPdf or importText `{m}` no es un mapa de bits: usa clipboard.importSvg, importPdf o importText +@msg `{name}` can't be deleted `{name}` no se puede eliminar +@msg `{name}` can't be duplicated `{name}` no se puede duplicar +@msg `{name}` can't be edited `{name}` no se puede editar +@msg `{name}` can't be edited this way `{name}` no se puede editar de esta forma +@msg `{name}` can't be renamed `{name}` no se puede cambiar de nombre +@msg `{name}` can't name a folder `{name}` no puede nombrar una carpeta +@msg `{name}` has no art to place `{name}` no tiene ilustración que colocar +@msg `{name}` has no text to place `{name}` no tiene texto que colocar +@msg `{name}` in the Word document is not UTF-8 or UTF-16 text `{name}` en el documento de Word no es texto UTF-8 ni UTF-16 +@msg `{name}` in the Word document is not well-formed XML: {e} `{name}` en el documento de Word no es XML bien formado: {e} +@msg `{name}` in the Word document nests elements more than {MAX_NESTING} deep `{name}` en el documento de Word anida elementos a más de {MAX_NESTING} niveles +@msg `{name}` is a built-in preset and is read-only: save it under another name `{name}` es un preajuste integrado y es de solo lectura: guárdalo con otro nombre +@msg `{name}` is a built-in preset: save under another name `{name}` es un preajuste integrado: guarda con otro nombre +@msg `{name}` is a built-in profile and stays `{name}` es un perfil integrado y se conserva +@msg `{name}` is a tint of `{base}`: edit `{base}` (a tint swatch only takes a new name) `{name}` es un matiz de `{base}`: edita `{base}` (una muestra de matiz solo acepta un nombre nuevo) +@msg `{name}` is a working space: choose another with edit.colorSettings first `{name}` es un espacio de trabajo de color: elige antes otro con edit.colorSettings +@msg `{name}` is built in and stays `{name}` está integrado y se conserva +@msg `{name}` takes a paint of its own kind (colour, gradient or pattern) `{name}` acepta una pintura de su mismo tipo (color, degradado o motivo) +@msg `{n}` can't be deleted `{n}` no se puede eliminar +@msg `{n}` can't be merged `{n}` no se puede combinar +@msg `{n}` can't be moved `{n}` no se puede mover +@msg `{n}` is not a colour swatch `{n}` no es una muestra de color +@msg `{n}` isn't a solid colour `{n}` no es un color sólido +@msg `{n}`: colour groups hold solid colours only `{n}`: los grupos de colores solo contienen colores sólidos +@msg `{other}` doesn't trace an image `{other}` no calca una imagen +@msg `{s}`: the step's references copy in more than {_1} MB of values `{s}`: las referencias del paso copian más de {_1} MB de valores +@msg `{tag}` is not an axis tag: a tag is four characters, such as "wght" `{tag}` no es una etiqueta de eje: una etiqueta tiene cuatro caracteres, como "wght" +@msg `{to}` is empty or already used `{to}` está vacío o ya se usa +@msg `{what}` is longer than {MAX_TEXT} bytes `{what}` ocupa más de {MAX_TEXT} bytes +@msg `{what}` must be text `{what}` debe ser texto +@msg a DXF drawing has one origin: pass useArtboards: true for one drawing per artboard un dibujo DXF tiene un solo origen: pasa useArtboards: true para un dibujo por mesa de trabajo +@msg a PDF presets file with over {_1} presets un archivo de preajustes de PDF con más de {_1} preajustes +@msg a batch preview cannot switch documents una vista previa por lotes no puede cambiar de documento +@msg a brush named `{nn}` exists ya existe un pincel llamado `{nn}` +@msg a container of the listed objects is gone ya no existe un contenedor de los objetos enumerados +@msg a content stream can't be read no se puede leer un flujo de contenido +@msg a content stream isn't a stream un flujo de contenido no es un flujo +@msg a design holds at most {_1} objects un diseño contiene como máximo {_1} objetos +@msg a design needs a name un diseño necesita un nombre +@msg a dictionary grew too large un diccionario creció demasiado +@msg a document keeps at most {_1} graph designs un documento guarda como máximo {_1} diseños de gráfico +@msg a document keeps at most {_1} saved selections un documento guarda como máximo {_1} selecciones guardadas +@msg a document keeps at most {_1} views un documento guarda como máximo {_1} vistas +@msg a document links at most {MAX_SVG_SCRIPTS} JavaScript files un documento vincula como máximo {MAX_SVG_SCRIPTS} archivos JavaScript +@msg a feConvolveMatrix filter's order is {x}×{y}, which overflows the kernel-size multiply usvg makes el orden de un filtro feConvolveMatrix es {x}×{y}, lo que desborda la multiplicación del tamaño del núcleo que hace usvg +@msg a gradient preset is already called {n} ya hay un preajuste de degradado llamado {n} +@msg a graph has at most {_1} series, so it transposes with at most that many categories un gráfico tiene como máximo {_1} series, así que se transpone con como máximo esa cantidad de categorías +@msg a layer can't be merged into its own sublayer una capa no se puede combinar en su propia subcapa +@msg a layer's form box isn't an array el cuadro del formulario de una capa no es una matriz +@msg a layer's form can't be read no se puede leer el formulario de una capa +@msg a layer's form has no box el formulario de una capa no tiene cuadro +@msg a layer's form has no dictionary el formulario de una capa no tiene diccionario +@msg a legend draws at most {MAX_CHIPS} swatches una leyenda dibuja como máximo {MAX_CHIPS} muestras +@msg a name names one asset: give multiple: false, or one object un nombre nombra un solo recurso: indica multiple: false, o un solo objeto +@msg a page can't be read no se puede leer una página +@msg a page object is used by something else otro elemento usa un objeto de página +@msg a page thumbnail must be RGB pixels, 1 to {THUMBNAIL_SIZE} a side (got {w} × {h}) una miniatura de página debe ser de píxeles RGB, de 1 a {THUMBNAIL_SIZE} por lado (se recibió {w} × {h}) +@msg a pattern layer doesn't end what it starts una capa de motivo no termina lo que empieza +@msg a pattern layer's colors hold something else los colores de una capa de motivo contienen otra cosa +@msg a pattern named `{n}` exists ya existe un motivo llamado `{n}` +@msg a plug-in with id {_1} is already installed ya hay instalado un plugin con el id {_1} +@msg a preset named `{n}` exists ya existe un preajuste llamado `{n}` +@msg a print presets file with over {_1} presets un archivo de preajustes de impresión con más de {_1} preajustes +@msg a profile is already called {n} ya hay un perfil llamado {n} +@msg a row can't go into itself una fila no puede entrar en sí misma +@msg a series goes on the left or the right value axis una serie va en el eje de valores izquierdo o derecho +@msg a start must be an anchor index ≥ 0 or null un inicio debe ser un índice de punto de ancla ≥ 0 o null +@msg a style named `{name}` already exists ya existe un estilo llamado `{name}` +@msg a style named `{to}` already exists ya existe un estilo llamado `{to}` +@msg a swatch needs a colour, gradient or pattern una muestra necesita un color, un degradado o un motivo +@msg a symbol named `{n}` already exists ya existe un símbolo llamado `{n}` +@msg a theme has 1 to {THEME_SIZE} colours un tema tiene de 1 a {THEME_SIZE} colores +@msg a theme is already called {name} (replace: "{name}" overwrites it) ya hay un tema llamado {name} (replace: "{name}" lo sobrescribe) +@msg a view named `{_1}` exists ya existe una vista llamada `{_1}` +@msg a view named `{name}` exists ya existe una vista llamada `{name}` +@msg a {_1} series can't go in a {_2} graph una serie {_1} no puede ir en un gráfico {_2} +@msg aiVersion {v}: "pdf" (PDF-compatible, the default) or "7" (legacy .ai, version 7) aiVersion {v}: "pdf" (compatible con PDF, el predeterminado) o "7" (.ai heredado, versión 7) +@msg already editing an opacity mask ya se está editando una máscara de opacidad +@msg already editing another object's opacity mask ya se está editando la máscara de opacidad de otro objeto +@msg already in pattern editing mode ya está en el modo de edición de motivos +@msg an artboard is listed twice una mesa de trabajo aparece dos veces en la lista +@msg an empty artboard has no width or height to scale to una mesa de trabajo vacía no tiene anchura ni altura a la que escalar +@msg an image is too large for DXF and was left out una imagen es demasiado grande para DXF y se omitió +@msg an image of {_1} MB, at most {_2} MB una imagen de {_1} MB, como máximo {_2} MB +@msg an image of {declared_w} × {declared_h} pixels is too large to draw una imagen de {declared_w} × {declared_h} píxeles es demasiado grande para dibujarla +@msg an image of {width} × {height} pixels is too large to draw una imagen de {width} × {height} píxeles es demasiado grande para dibujarla +@msg an index must be a whole number un índice debe ser un número entero +@msg an inline graphic has no glyphs un gráfico en línea no tiene glifos +@msg an invisible text form can't be read no se puede leer un formulario de texto invisible +@msg an object is missing falta un objeto +@msg an object's header is missing falta el encabezado de un objeto +@msg an overprinting form can't be read no se puede leer un formulario con sobreimpresión +@msg an unread object has no readable bounds un objeto no leído no tiene límites legibles +@msg an unread object holds a frame of threaded type un objeto no leído contiene un marco de texto enlazado +@msg an unread object is missing from its layer falta un objeto no leído en su capa +@msg anchor `smooth` must be true or false `smooth` del punto de ancla debe ser true o false +@msg anchor `{key}` must be [x, y] `{key}` del punto de ancla debe ser [x, y] +@msg anchor `{key}` must be a number `{key}` del punto de ancla debe ser un número +@msg angle and roundness must be finite angle y roundness deben ser finitos +@msg angles must be a list as long as pins (degrees or null) angles debe ser una lista tan larga como pins (grados o null) +@msg appearance must be flat|center|edge appearance debe ser flat|center|edge +@msg apply is "fill" or "stroke", not `{other}` apply es "fill" o "stroke", no `{other}` +@msg area must be a closed polygon of 3 to 100000 [x, y] points area debe ser un polígono cerrado de 3 a 100000 puntos [x, y] +@msg area type needs a path that encloses an area el texto de área necesita un trazado que encierre un área +@msg area type {_1} is named twice el texto de área {_1} se nombra dos veces +@msg arrowAlign must be extend|tip, got {o} arrowAlign debe ser extend|tip, se recibió {o} +@msg arrowScale must be [start, end] arrowScale debe ser [start, end] +@msg artboard is a 0-based index artboard es un índice que empieza en 0 +@msg artboard must be a 0-based index artboard debe ser un índice que empieza en 0 +@msg artboard {i} doesn't print la mesa de trabajo {i} no se imprime +@msg artboardLayout must be {layout?, columns?, spacing?, rightToLeft?} artboardLayout debe ser {layout?, columns?, spacing?, rightToLeft?} +@msg artboardLayout.columns must be 1 or more artboardLayout.columns debe ser 1 o más +@msg artboardLayout.layout must be gridByRow, gridByColumn, row or column artboardLayout.layout debe ser gridByRow, gridByColumn, row o column +@msg artboardLayout.rightToLeft must be true or false artboardLayout.rightToLeft debe ser true o false +@msg artboardLayout.spacing must be 0–{MAX_SPACING} pt artboardLayout.spacing debe ser 0–{MAX_SPACING} pt +@msg artboards must be a non-empty list artboards debe ser una lista no vacía +@msg artboards must be a number artboards debe ser un número +@msg asset `{_1}` has no art to export el recurso `{_1}` no tiene ilustración que exportar +@msg at most {MAX_KEYWORDS} keywords como máximo {MAX_KEYWORDS} palabras clave +@msg at most {MAX_MATCHES} matches are kept se conservan como máximo {MAX_MATCHES} coincidencias +@msg at most {MAX_POINTS} points como máximo {MAX_POINTS} puntos +@msg at most {MAX_QUEUE} files como máximo {MAX_QUEUE} archivos +@msg at must be [x, y] at debe ser [x, y] +@msg at/rect lie outside the canvas at/rect quedan fuera del lienzo +@msg attribute must be size|leading|tracking|kerning|baselineShift attribute debe ser size|leading|tracking|kerning|baselineShift +@msg attrs must be an object attrs debe ser un objeto +@msg automation path rejected: the folder's name isn't valid text ruta de automatización rechazada: el nombre de la carpeta no es texto válido +@msg automation path rejected: {_1} isn't valid text ruta de automatización rechazada: {_1} no es texto válido +@msg automation path rejected: {why}: {path} ruta de automatización rechazada: {why}: {path} +@msg axis must be "vertical", "horizontal" or an angle in degrees, not `{given}` axis debe ser "vertical", "horizontal" o un ángulo en grados, no `{given}` +@msg backgroundContents must be transparent or white backgroundContents debe ser transparent o white +@msg bad AES key clave AES incorrecta +@msg bad `runs`: {e} `runs` incorrecto: {e} +@msg bad arrowScale arrowScale incorrecto +@msg bad base64 base64 incorrecto +@msg bad color {c} color incorrecto {c} +@msg bad colour color incorrecto +@msg bad colour in `colors` color incorrecto en `colors` +@msg bad colour {v} color incorrecto {v} +@msg bad colour {v} in groupColors color incorrecto {v} en groupColors +@msg bad cross-reference entry entrada de referencia cruzada incorrecta +@msg bad cross-reference table tabla de referencias cruzadas incorrecta +@msg bad current colour {v} color actual incorrecto {v} +@msg bad dataBase64 dataBase64 incorrecto +@msg bad edit edición incorrecta +@msg bad fill {v} relleno incorrecto {v} +@msg bad fit: {e} ajuste incorrecto: {e} +@msg bad model {other} (keep, new or document) modelo incorrecto {other} (keep, new o document) +@msg bad new colour {v} color nuevo incorrecto {v} +@msg bad object objeto incorrecto +@msg bad object number número de objeto incorrecto +@msg bad offset desplazamiento incorrecto +@msg bad path data: {e} datos de trazado incorrectos: {e} +@msg bad point {v}: expected [x, y] or [x, y, pressure] punto incorrecto {v}: se esperaba [x, y] o [x, y, pressure] +@msg bad reference referencia incorrecta +@msg bad trailer size tamaño de trailer incorrecto +@msg bad {k} colour color {k} incorrecto +@msg batches cannot nest los lotes no se pueden anidar +@msg bind something to a variable first vincula antes algo a una variable +@msg bleed must be 0–{MAX_BLEED} pt: a number, [top, bottom, left, right] or {{top, bottom, left, right}} bleed debe ser 0–{MAX_BLEED} pt: un número, [top, bottom, left, right] o {{top, bottom, left, right}} +@msg brush must be a name or null brush debe ser un nombre o null +@msg by must be a number by debe ser un número +@msg can't add page thumbnails: {why} no se pueden agregar miniaturas de página: {why} +@msg can't add the editing data for other apps: {why} no se pueden agregar los datos de edición para otras aplicaciones: {why} +@msg can't edit the written PDF: {why} no se puede editar el PDF escrito: {why} +@msg can't encrypt the PDF: {why} no se puede cifrar el PDF: {why} +@msg can't linearise the PDF: {why} no se puede linealizar el PDF: {why} +@msg can't open `{_1}`: {_2} no se puede abrir `{_1}`: {_2} +@msg can't open `{_1}`: {e} no se puede abrir `{_1}`: {e} +@msg can't open `{name}`: not a format VectorCraft reads (see document.formats) no se puede abrir `{name}`: no es un formato que VectorCraft lea (consulta document.formats) +@msg can't place `{name}`: not a format VectorCraft reads (see document.formats) no se puede colocar `{name}`: no es un formato que VectorCraft lea (consulta document.formats) +@msg can't read back the written PDF: {e} no se puede volver a leer el PDF escrito: {e} +@msg can't read this Word document: {why} no se puede leer este documento de Word: {why} +@msg can't write .{e} images: use .png, .jpg, .gif, .webp, .tif or .bmp no se pueden escribir imágenes .{e}: usa .png, .jpg, .gif, .webp, .tif o .bmp +@msg can't write PDF layers, overprint or invisible text: {why} no se pueden escribir capas PDF, sobreimpresión ni texto invisible: {why} +@msg can't write the file's copyright: {why} no se puede escribir el copyright del archivo: {why} +@msg can't write the file's modification date: {why} no se puede escribir la fecha de modificación del archivo: {why} +@msg can't write the pages' user units: {why} no se pueden escribir las unidades de usuario de las páginas: {why} +@msg cannot distort a zero-size or non-finite bounding box no se puede distorsionar un cuadro delimitador de tamaño cero o no finito +@msg cannot move an object into itself no se puede mover un objeto dentro de sí mismo +@msg case must be upper|lower|title|sentence case debe ser upper|lower|title|sentence +@msg category `{c}`: one of {_1} categoría `{c}`: una de {_1} +@msg center must be [x, y] center debe ser [x, y] +@msg choose at least one artboard elige al menos una mesa de trabajo +@msg choose at least one status elige al menos un estado +@msg clip must be true or false clip debe ser true o false +@msg clippingMask must be true or false clippingMask debe ser true o false +@msg closed must be a boolean closed debe ser un booleano +@msg collapsed must be true or false collapsed debe ser true o false +@msg color.profile: no RGB or CMYK profile is called “{profile}” color.profile: ningún perfil RGB ni CMYK se llama “{profile}” +@msg colorMode must be rgb or cmyk, not `{m}` colorMode debe ser rgb o cmyk, no `{m}` +@msg colorModel must be {own} (the document's mode), grayscale or bitmap colorModel debe ser {own} (el modo del documento), grayscale o bitmap +@msg colour groups can't go into colour groups los grupos de colores no pueden ir dentro de grupos de colores +@msg colour, mode and spot apply to solid-colour swatches only colour, mode y spot solo se aplican a muestras de color sólido +@msg column {column}: `{cell}` is a `%` column of graph data files, which are not read columna {column}: `{cell}` es una columna `%` de los archivos de datos de gráficos, que no se leen +@msg column {column}: `{cell}` names `{name}`, which is a {_1} variable columna {column}: `{cell}` nombra `{name}`, que es una variable {_1} +@msg column {column}: `{cell}` names no variable columna {column}: `{cell}` no nombra ninguna variable +@msg column {column}: the variable name is longer than {MAX_NAME} characters columna {column}: el nombre de la variable tiene más de {MAX_NAME} caracteres +@msg column: true floats the whole column and takes no onto, above or below column: true hace flotar toda la columna y no acepta onto, above ni below +@msg command must be a shape.* command command debe ser un comando shape.* +@msg commands[{i}]: missing `command` commands[{i}]: falta `command` +@msg composer must be "singleLine" or "everyLine" composer debe ser "singleLine" o "everyLine" +@msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes las formas compuestas aceptan trazados, trazados compuestos, grupos, formas compuestas, texto, fusiones y envolventes +@msg compound {_1} must contain exactly one open path to join el compuesto {_1} debe contener exactamente un trazado abierto para unir +@msg connect needs a path other than the one extended connect necesita un trazado distinto del que se extiende +@msg connect needs id connect necesita id +@msg connect path has no open end el trazado de connect no tiene ningún extremo abierto +@msg copy needs path: the file to copy into the document's folder copy necesita path: el archivo que se copia en la carpeta del documento +@msg copy takes images only: relink placed documents where their files are copy solo acepta imágenes: vuelve a vincular los documentos colocados donde estén sus archivos +@msg copying a file isn't available on the web copiar un archivo no está disponible en la web +@msg copyrightStatus must be unknown, copyrighted or publicDomain copyrightStatus debe ser unknown, copyrighted o publicDomain +@msg copyrightUrl must be a URL (no spaces, at most 2048 characters) copyrightUrl debe ser una URL (sin espacios, como máximo 2048 caracteres) +@msg corners must be 4 [x, y] points (TL, TR, BR, BL) corners debe ser 4 puntos [x, y] (TL, TR, BR, BL) +@msg counterPer `{c}`: item or file counterPer `{c}`: item o file +@msg crop `{_1}`: only PDF pages have art, trim, bleed and media boxes; use "crop" or "bounding" crop `{_1}`: solo las páginas PDF tienen cuadros de ilustración, recorte, sangrado y medios; usa "crop" o "bounding" +@msg crop rectangle doesn't overlap the image el rectángulo de recorte no se superpone a la imagen +@msg cross-reference and object streams aren't supported no se admiten los flujos de referencias cruzadas ni de objetos +@msg damaged compressed data: {e} datos comprimidos dañados: {e} +@msg dash lengths must be numbers, got {v} las longitudes de guion deben ser números, se recibió {v} +@msg dash must be a list of lengths or null, got {v} dash debe ser una lista de longitudes o null, se recibió {v} +@msg data key `{k}`: letters, digits, -, _ and . (not name or vc-…) clave de datos `{k}`: letras, dígitos, -, _ y . (no name ni vc-…) +@msg data must be an object of key: value, not {v} data debe ser un objeto de key: value, no {v} +@msg data set `{name}` holds a value for `{var}`, which the library doesn't declare el conjunto de datos `{name}` contiene un valor para `{var}`, que la biblioteca no declara +@msg data set `{name}` holds two values for `{var}` el conjunto de datos `{name}` contiene dos valores para `{var}` +@msg data set `{name}` is declared twice el conjunto de datos `{name}` se declara dos veces +@msg data takes at most {MAX_DATA} keys at once data acepta como máximo {MAX_DATA} claves a la vez +@msg dataset `{name}` already exists ya existe el conjunto de datos `{name}` +@msg dataset `{to}` already exists ya existe el conjunto de datos `{to}` +@msg date `{d}`: YYYY-MM-DD fecha `{d}`: YYYY-MM-DD +@msg decoded data is too large los datos descodificados son demasiado grandes +@msg define a variable first define antes una variable +@msg detect must be true or false detect debe ser true o false +@msg direct-select anchor points of a path selecciona con Selección directa los puntos de ancla de un trazado +@msg distance must be > 0 distance debe ser > 0 +@msg dx and dy give the arrow's direction dx y dy indican la dirección de la flecha +@msg dx and dy must be numbers dx y dy deben ser números +@msg dxf fitTo must be [width, height], positive fitTo de dxf debe ser [width, height], positivo +@msg dxf must be an object of DXF import options dxf debe ser un objeto de opciones de importación de DXF +@msg dxf scale must be a positive number up to {_1}, not {s} scale de dxf debe ser un número positivo de hasta {_1}, no {s} +@msg dxf unit `{u}`: a unit such as mm, cm, in or pt unidad de dxf `{u}`: una unidad como mm, cm, in o pt +@msg dxf: {e} dxf: {e} +@msg each format is an object {format, scale?, suffix?} cada formato es un objeto {format, scale?, suffix?} +@msg each item needs an id cada elemento necesita un id +@msg each match needs `kind` cada coincidencia necesita `kind` +@msg each match needs a `name` cada coincidencia necesita un `name` +@msg each of `fonts` is {family, style?}; 1 to 1000 of them cada elemento de `fonts` es {family, style?}; de 1 a 1000 +@msg each of `items` is {kind, item} cada elemento de `items` es {kind, item} +@msg each of `items` is {{id, corners?}} with an object id, not {it} cada elemento de `items` es {{id, corners?}} con un id de objeto, no {it} +@msg each row needs `from` cada fila necesita `from` +@msg each stop needs a position cada parada necesita una posición +@msg each subpath needs an anchors array cada subtrazado necesita una matriz anchors +@msg easingType must be easeIn, easeOut, easeInOut or easeOutIn easingType debe ser easeIn, easeOut, easeInOut o easeOutIn +@msg editingData must be true or false editingData debe ser true o false +@msg editingData must be true, false or "always" editingData debe ser true, false o "always" +@msg edits overlap las ediciones se superponen +@msg effects of objects whose appearances differ can't be moved together los efectos de objetos cuyas apariencias difieren no se pueden mover juntos +@msg empty header in column {_1} encabezado vacío en la columna {_1} +@msg encoding `{_1}`: utf8 or utf16 codificación `{_1}`: utf8 o utf16 +@msg ends must be two of "first" and "last" ends debe ser dos de "first" y "last" +@msg every numbered name for the result is taken todos los nombres numerados para el resultado están ocupados +@msg expanded SVG styles exceed the import size limit los estilos SVG expandidos superan el límite de tamaño de importación +@msg export presets file is larger than {MAX_PRESET_FILE_BYTES} bytes el archivo de preajustes de exportación ocupa más de {MAX_PRESET_FILE_BYTES} bytes +@msg exportText must be editable or appearance exportText debe ser editable o appearance +@msg exportType must be movieClip or graphic, not `{s}` exportType debe ser movieClip o graphic, no `{s}` +@msg extend needs id extend necesita id +@msg featureChanges lists at most {MAX_FEATURE_CHANGES} tags featureChanges enumera como máximo {MAX_FEATURE_CHANGES} etiquetas +@msg featureChanges must be a list of tags featureChanges debe ser una lista de etiquetas +@msg features must be a list of tags features debe ser una lista de etiquetas +@msg fidelity must be 0..100 fidelity debe ser 0..100 +@msg files must be {name, dataBase64} files debe ser {name, dataBase64} +@msg fit must be none|autoHeight|shrinkText|block, got {id} fit debe ser none|autoHeight|shrinkText|block, se recibió {id} +@msg flattener: {e} acoplador: {e} +@msg flattenerPreset `{name}`: high, medium, low or a saved one (see flattener.presets.list) flattenerPreset `{name}`: high, medium, low o uno guardado (consulta flattener.presets.list) +@msg flipProfile must be along|across, got {o} flipProfile debe ser along|across, se recibió {o} +@msg folders `{f}`: none, rows, format, item or itemFormat folders `{f}`: none, rows, format, item o itemFormat +@msg folders deeper than {MAX_BATCH_DEPTH} levels carpetas con más de {MAX_BATCH_DEPTH} niveles de profundidad +@msg folders deeper than {MAX_DEPTH} levels carpetas con más de {MAX_DEPTH} niveles de profundidad +@msg font family `{family}` is not available la familia de fuentes `{family}` no está disponible +@msg font family `{tf}` is not available la familia de fuentes `{tf}` no está disponible +@msg format `{f}`: pdf or postscript formato `{f}`: pdf o postscript +@msg format `{f}`: text or json formato `{f}`: text o json +@msg format is `{format}` el formato es `{format}` +@msg formats must be an array of rows, not {v} formats debe ser una lista de filas, no {v} +@msg frequency must be between 1 and 300 lines per inch frequency debe estar entre 1 y 300 líneas por pulgada +@msg from and to must be finite from y to deben ser finitos +@msg from must be [x0, y0, x1, y1] from debe ser [x0, y0, x1, y1] +@msg give `before` or `after`, not both indica `before` o `after`, no ambos +@msg give `colors`, or `color` and `rule` indica `colors`, o `color` y `rule` +@msg give `event`, such as onclick indica `event`, como onclick +@msg give `file`, the JavaScript file's path or URL indica `file`, la ruta o URL del archivo JavaScript +@msg give `fill` and/or `stroke` indica `fill` y/o `stroke` +@msg give `fill`, `stroke` or both indica `fill`, `stroke` o ambos +@msg give `folder` indica `folder` +@msg give `fonts`, or open a document indica `fonts` o abre un documento +@msg give `from` or `indices`, not both indica `from` o `indices`, no ambos +@msg give `id` (no text is being edited) indica `id` (no se está editando ningún texto) +@msg give `id` and `anchors`, or `items`, not both indica `id` y `anchors`, o `items`, no ambos +@msg give `id` or `guide`, not both indica `id` o `guide`, no ambos +@msg give `length` or `to` indica `length` o `to` +@msg give `matches`: [{kind, name, target}] indica `matches`: [{kind, name, target}] +@msg give `name` (or edit a pattern) indica `name` (o edita un motivo) +@msg give `name` or `names` indica `name` o `names` +@msg give `path` (a .wasm file) or `dataBase64` (the module) indica `path` (un archivo .wasm) o `dataBase64` (el módulo) +@msg give `path`, `data` or `dataBase64` indica `path`, `data` o `dataBase64` +@msg give `path`, `data`, `dataBase64` or `csv` indica `path`, `data`, `dataBase64` o `csv` +@msg give `path`, `xml` or `dataBase64` indica `path`, `xml` o `dataBase64` +@msg give `script`, the JavaScript the event runs ("" removes the event) indica `script`, el JavaScript que ejecuta el evento ("" elimina el evento) +@msg give `text` (the reading) or `remove` indica `text` (la lectura) o `remove` +@msg give `x` and `y` (and a `tolerance` of 0 or more) indica `x` e `y` (y una `tolerance` de 0 o más) +@msg give a mode or r/g/b, c/m/y/k, gray or tint adjustments indica un modo o ajustes de r/g/b, c/m/y/k, gray o tint +@msg give a name, or paint the active proxy with a saved preset indica un nombre o pinta el proxy activo con un preajuste guardado +@msg give a name, or select a stroke with a saved profile indica un nombre o selecciona un trazo con un perfil guardado +@msg give a pattern name or select an object painted with a pattern indica el nombre de un motivo o selecciona un objeto pintado con un motivo +@msg give at least one of clip, invert, disabled, linked indica al menos uno de clip, invert, disabled, linked +@msg give color, none, swatch or gradient indica color, none, swatch o gradient +@msg give dataBase64 indica dataBase64 +@msg give either at (a click) or area (a path drawn around the overlaps) indica at (un clic) o area (un trazado dibujado alrededor de las superposiciones) +@msg give formats or a preset, not both indica formats o un preajuste, no ambos +@msg give newName or delete indica newName o delete +@msg give offset or by indica offset o by +@msg give one of `to`, `rect` or `at` indica uno de `to`, `rect` o `at` +@msg give one of assets, layers, selection or fullDocument indica uno de assets, layers, selection o fullDocument +@msg give only one of onto, above, below, icon and a column place indica solo uno de onto, above, below, icon y una posición de columna +@msg give origin: [x, y], or reset: true indica origin: [x, y], o reset: true +@msg give overprintFill, overprintStroke, showCenter, imageMap, url or note indica overprintFill, overprintStroke, showCenter, imageMap, url o note +@msg give path (a file) or folder indica path (un archivo) o folder +@msg give path, or name and dataBase64 indica path, o name y dataBase64 +@msg give paths or files indica paths o files +@msg give rows, rowHeight, columns or columnWidth indica rows, rowHeight, columns o columnWidth +@msg give svg, or dataBase64 of an SVG or SVGZ file indica svg, o dataBase64 de un archivo SVG o SVGZ +@msg give text indica text +@msg give the asset a name ponle un nombre al recurso +@msg give the preset a `name` ponle un `name` al preajuste +@msg give the preset a name ponle un nombre al preajuste +@msg give the preset a name (1–64 characters) ponle un nombre al preajuste (de 1 a 64 caracteres) +@msg give the settings to change, e.g. {"formats"}]} indica los ajustes que quieres cambiar, p. ej. {"formats"}]} +@msg give the style a name ponle un nombre al estilo +@msg give two or more style `names` indica dos o más `names` de estilos +@msg give two or more swatches indica dos o más muestras +@msg give x, y, or a handle's length or angle indica x, y, o la longitud o el ángulo de un manejador +@msg give {key, value} or {values} indica {key, value} o {values} +@msg global must be true or false global debe ser true o false +@msg glyph {_1} is not drawn for {ch} with the character's style (such as All Caps, Small Caps or a numeral system) el glifo {_1} no se dibuja para {ch} con el estilo del carácter (como Todo mayúsculas, Versalitas o un sistema de numeración) +@msg glyph {g} is not an alternate of {ch} in {_1} {_2} el glifo {g} no es una alternativa de {ch} en {_1} {_2} +@msg gradient must be "objects" or "mesh" gradient debe ser "objects" o "mesh" +@msg grays must be "profile" or "black", not `{g}` grays debe ser "profile" o "black", no `{g}` +@msg gridColors must be a preset name or two colours gridColors debe ser el nombre de un preajuste o dos colores +@msg gridSize must be small, medium or large gridSize debe ser small, medium o large +@msg guide {g} is not selected la guía {g} no está seleccionada +@msg handle must be 0..3 handle debe ser 0..3 +@msg hiddenObjects {v}: "layer" (the default), "omit" or "visible" hiddenObjects {v}: "layer" (el predeterminado), "omit" o "visible" +@msg highlight a layer to merge into resalta una capa en la que combinar +@msg highlight two or more rows in one layer or group resalta dos o más filas en una misma capa o grupo +@msg highlight two or more rows to merge resalta dos o más filas para combinarlas +@msg icon docks a panel in the icon column: use window.panel.dock icon acopla un panel en la columna de iconos: usa window.panel.dock +@msg id must be a dimension id id debe ser el id de una cota +@msg image has no bounds la imagen no tiene límites +@msg image {_1} is linked already la imagen {_1} ya está vinculada +@msg imageMap `{m}`: none, client or server imageMap `{m}`: none, client o server +@msg index out of range índice fuera de rango +@msg instances must be 1..1000 instances debe ser 1..1000 +@msg invalid `color` `color` no válido +@msg invalid anchor index {v}: expected a non-negative integer índice de punto de ancla no válido {v}: se esperaba un entero no negativo +@msg invalid anchor reference {v}: expected [subpath, anchor] referencia de punto de ancla no válida {v}: se esperaba [subpath, anchor] +@msg invalid angle ángulo no válido +@msg invalid brush: {e} pincel no válido: {e} +@msg invalid color color no válido +@msg invalid colour {c} color no válido {c} +@msg invalid delta delta no válido +@msg invalid point punto no válido +@msg invalid size tamaño no válido +@msg invalid t t no válido +@msg invalid tolerance tolerancia no válida +@msg its artboards all lie beyond the canvas (more than {_1} pt from the origin) todas sus mesas de trabajo quedan fuera del lienzo (a más de {_1} pt del origen) +@msg its clipping masks are nested too deeply sus máscaras de recorte están anidadas a demasiada profundidad +@msg its metadata has no description sus metadatos no tienen descripción +@msg its metadata has no direct length sus metadatos no tienen longitud directa +@msg join two different paths une dos trazados distintos +@msg justify must be auto|left|center|right|justifyAll justify debe ser auto|left|center|right|justifyAll +@msg kbps must be a positive number, not {kbps} kbps debe ser un número positivo, no {kbps} +@msg keywords must be a list of words or a comma-separated string keywords debe ser una lista de palabras o una cadena separada por comas +@msg keywords must be at most {MAX_KEYWORD} characters, without control characters keywords debe tener como máximo {MAX_KEYWORD} caracteres, sin caracteres de control +@msg kind must be 1, 2 or 3, or give a preset `name` (see perspective.presets.list) kind debe ser 1, 2 o 3, o indica un `name` de preajuste (consulta perspective.presets.list) +@msg kind must be graphic, fillColor, strokeColor, fillGradient, strokeGradient, fillPattern, strokePattern, charStyle or paraStyle kind debe ser graphic, fillColor, strokeColor, fillGradient, strokeGradient, fillPattern, strokePattern, charStyle o paraStyle +@msg knockout must be "on", "off", "neutral" or a bool, not {v} knockout debe ser "on", "off", "neutral" o un bool, no {v} +@msg layer `{name}` has no art to export la capa `{name}` no tiene ilustración que exportar +@msg layer must name a layer or sublayer layer debe nombrar una capa o subcapa +@msg layers can't be intertwined: select the objects in them las capas no se pueden entrelazar: selecciona los objetos que contienen +@msg layers go only at the top level or in layers, objects in layers and groups las capas solo van en el nivel superior o dentro de capas, y los objetos en capas y grupos +@msg layers must be true or false layers debe ser true o false +@msg layout must be gridByRow, gridByColumn, row or column layout debe ser gridByRow, gridByColumn, row o column +@msg leading must be a number or "auto" leading debe ser un número o "auto" +@msg left/right must be non-negative widths left/right deben ser anchuras no negativas +@msg level `{t}`: 2 or 3 nivel `{t}`: 2 o 3 +@msg line {line}: more than {MAX_CSV_COLS} columns línea {line}: más de {MAX_CSV_COLS} columnas +@msg line {line}: unclosed quote línea {line}: comillas sin cerrar +@msg line {line}: value for `{var}` must match its variable kind línea {line}: el valor de `{var}` debe coincidir con el tipo de su variable +@msg lineEndings `{other}`: lf or crlf lineEndings `{other}`: lf o crlf +@msg loading profiles from disk isn't available in the browser cargar perfiles desde el disco no está disponible en el navegador +@msg margin: a {m} pt margin leaves no imageable area on the paper margin: un margen de {m} pt no deja área imprimible en el papel +@msg matrix must be finite and invertible, depth finite matrix debe ser finita e invertible, y depth finita +@msg matte: {e} matte: {e} +@msg member is for order front, forward, backward or back member es para order front, forward, backward o back +@msg missing `artboards` falta `artboards` +@msg missing `at` [x, y] falta `at` [x, y] +@msg missing `attrs` falta `attrs` +@msg missing `color` or `opacity` falta `color` u `opacity` +@msg missing `colors` falta `colors` +@msg missing `commands` falta `commands` +@msg missing `destinationFolder` falta `destinationFolder` +@msg missing `effect` id falta el id de `effect` +@msg missing `family` falta `family` +@msg missing `find` falta `find` +@msg missing `gid` (a glyph id, or null for the default glyph) falta `gid` (un id de glifo, o null para el glifo predeterminado) +@msg missing `group` falta `group` +@msg missing `id` falta `id` +@msg missing `id`: give one, or select one type object falta `id`: indica uno o selecciona un objeto de texto +@msg missing `index` (a point index, or null to clear) falta `index` (un índice de punto, o null para borrar) +@msg missing `index` (a stop index, or null to clear) falta `index` (un índice de parada, o null para borrar) +@msg missing `index` (an item index or null) falta `index` (un índice de elemento o null) +@msg missing `item` falta `item` +@msg missing `library` falta `library` +@msg missing `library` (see graphicStyle.libraries) falta `library` (consulta graphicStyle.libraries) +@msg missing `library` (see swatch.library.list) falta `library` (consulta swatch.library.list) +@msg missing `map` (rows [{from, to}] or {current}) falta `map` (filas [{from, to}] o {current}) +@msg missing `matrix` [a,b,c,d,e,f] falta `matrix` [a,b,c,d,e,f] +@msg missing `name` (see gradient.presets.list) falta `name` (consulta gradient.presets.list) +@msg missing `offset` (a distance in points) falta `offset` (una distancia en puntos) +@msg missing `path` falta `path` +@msg missing `path` (a path object id) falta `path` (un id de objeto de trazado) +@msg missing `rule` falta `rule` +@msg missing `source` id falta el id de `source` +@msg missing `start` (the byte offset of a character) falta `start` (el desplazamiento en bytes de un carácter) +@msg missing `status`: linked, embedded, missing or modified falta `status`: linked, embedded, missing o modified +@msg missing `target` id falta el id de `target` +@msg missing `text` falta `text` +@msg missing `to` falta `to` +@msg missing `to` (an index) falta `to` (un índice) +@msg missing `to`: a non-negative integer falta `to`: un entero no negativo +@msg missing `type` falta `type` +@msg missing `value` falta `value` +@msg missing `{key}` falta `{key}` +@msg missing `{k}` falta `{k}` +@msg missing anchor falta anchor +@msg missing anchors falta anchors +@msg missing anchors [[subpath, anchor]…] falta anchors [[subpath, anchor]…] +@msg missing array `{key}` falta la matriz `{key}` +@msg missing case falta case +@msg missing color falta color +@msg missing commands falta commands +@msg missing destination folder falta la carpeta de destino +@msg missing from falta from +@msg missing group falta group +@msg missing id or ids falta id o ids +@msg missing ids falta ids +@msg missing indexes falta indexes +@msg missing matrix [a,b,c,d,e,f] falta matrix [a,b,c,d,e,f] +@msg missing name falta name +@msg missing op falta op +@msg missing or invalid `color` `color` falta o no es válido +@msg missing or unknown `tool` `tool` falta o es desconocido +@msg missing point falta point +@msg missing point [x,y] falta point [x,y] +@msg missing point `{key}` ([x, y]) falta el punto `{key}` ([x, y]) +@msg missing points falta points +@msg missing points [[x,y]…] falta points [[x,y]…] +@msg missing segment falta segment +@msg missing stops falta stops +@msg missing subpaths falta subpaths +@msg missing target falta target +@msg missing to falta to +@msg missing x, y falta x, y +@msg mode is set, add or toggle, not `{other}` mode es set, add o toggle, no `{other}` +@msg mode must be "cmyk" or "rgb" mode debe ser "cmyk" o "rgb" +@msg mode must be area|onPath, got {o} mode debe ser area|onPath, se recibió {o} +@msg more than 10000 linked files: package dependencies in smaller parts más de 10000 archivos vinculados: empaqueta las dependencias en partes más pequeñas +@msg more than 256 commands más de 256 comandos +@msg more than {MAX_BATCH_FILES} data sets más de {MAX_BATCH_FILES} conjuntos de datos +@msg more than {MAX_BATCH_FILES} files más de {MAX_BATCH_FILES} archivos +@msg more than {MAX_CSV_ROWS} data rows más de {MAX_CSV_ROWS} filas de datos +@msg more than {MAX_FILES} images más de {MAX_FILES} imágenes +@msg more than {MAX_IMPORT} presets más de {MAX_IMPORT} preajustes +@msg moved must be [[x,y]…] moved debe ser [[x,y]…] +@msg names is empty names está vacío +@msg names must be an array of symbol names names debe ser una lista de nombres de símbolos +@msg need `anchor` or `segment` + `t` se necesita `anchor` o `segment` + `t` +@msg need at least one anchor se necesita al menos un punto de ancla +@msg need at least one point se necesita al menos un punto +@msg need at least two points se necesitan al menos dos puntos +@msg needs points necesita points +@msg nineSlice must be true or false nineSlice debe ser true o false +@msg nineSliceGuides must be [left, top, right, bottom], each -16..16, with left + right < 1 and top + bottom < 1 nineSliceGuides debe ser [left, top, right, bottom], cada uno -16..16, con left + right < 1 y top + bottom < 1 +@msg no PDF preset named `{n}` no hay ningún preajuste de PDF llamado `{n}` +@msg no action set is current no hay ningún conjunto de acciones actual +@msg no active data set no hay ningún conjunto de datos activo +@msg no appearance item {index} no existe el elemento de apariencia {index} +@msg no artboard {_1} no existe la mesa de trabajo {_1} +@msg no artboard {artboard} (0-based; the document has {_1}) no existe la mesa de trabajo {artboard} (empieza en 0; el documento tiene {_1}) +@msg no asset {id} no existe el recurso {id} +@msg no asset {id} (see assets.list) no existe el recurso {id} (consulta assets.list) +@msg no assets to export no hay recursos que exportar +@msg no assets yet: collect art for export first (assets.add) todavía no hay recursos: reúne antes ilustraciones para exportar (assets.add) +@msg no brush named `{n}` no hay ningún pincel llamado `{n}` +@msg no character at byte {start} no hay ningún carácter en el byte {start} +@msg no colour sin color +@msg no colour group `{group}` no existe el grupo de colores `{group}` +@msg no colour group `{name}` no existe el grupo de colores `{name}` +@msg no data sets no hay conjuntos de datos +@msg no dataset named `{from}` no hay ningún conjunto de datos llamado `{from}` +@msg no dataset named `{name}` no hay ningún conjunto de datos llamado `{name}` +@msg no datasets no hay conjuntos de datos +@msg no design named `{name}` no hay ningún diseño llamado `{name}` +@msg no design named `{n}` no hay ningún diseño llamado `{n}` +@msg no design named `{old}` no hay ningún diseño llamado `{old}` +@msg no encoder for {_1} yet todavía no hay codificador para {_1} +@msg no export preset `{name}` (see document.exportPresets.list) no existe el preajuste de exportación `{name}` (consulta document.exportPresets.list) +@msg no folder: pass `path` or set Preferences › Plug-ins & Scratch Disks › Additional Plug-ins Folder no hay carpeta: pasa `path` o define Preferencias › Plugins & Discos de memoria virtual › Carpeta de plugins adicionales +@msg no fonts to look for: they are all available no hay fuentes que buscar: todas están disponibles +@msg no formats to export no hay formatos que exportar +@msg no gradient preset `{name}` (see gradient.presets.list) no existe el preajuste de degradado `{name}` (consulta gradient.presets.list) +@msg no graphic style `{n}` in `{_1}` no existe el estilo gráfico `{n}` en `{_1}` +@msg no graphic style library `{key}` (see graphicStyle.libraries) no existe la biblioteca de estilos gráficos `{key}` (consulta graphicStyle.libraries) +@msg no guide selected no hay ninguna guía seleccionada +@msg no guide selected (or give an index) no hay ninguna guía seleccionada (o indica un índice) +@msg no guide {i} no existe la guía {i} +@msg no images in the folder no hay imágenes en la carpeta +@msg no item at index {_1} no hay ningún elemento en el índice {_1} +@msg no item at index {from} no hay ningún elemento en el índice {from} +@msg no item at one of the indices {idx} no hay ningún elemento en uno de los índices {idx} +@msg no layer no hay capa +@msg no layer {id} (see layer.list) no existe la capa {id} (consulta layer.list) +@msg no layers to export no hay capas que exportar +@msg no library `{key}` no existe la biblioteca `{key}` +@msg no metafile format no tiene formato de metarchivo +@msg no object {_1} no existe el objeto {_1} +@msg no objects no hay objetos +@msg no parent layer no hay capa principal +@msg no perspective grid preset named `{b}` (see perspective.presets.list) no hay ningún preajuste de cuadrícula de perspectiva llamado `{b}` (consulta perspective.presets.list) +@msg no perspective grid preset named `{n}` no hay ningún preajuste de cuadrícula de perspectiva llamado `{n}` +@msg no point selected (give `index`) no hay ningún punto seleccionado (indica `index`) +@msg no preset called `{from}` (see file.newPresets) no hay ningún preajuste llamado `{from}` (consulta file.newPresets) +@msg no preset called `{name}` (see file.newPresets) no hay ningún preajuste llamado `{name}` (consulta file.newPresets) +@msg no preset named `{n}` no hay ningún preajuste llamado `{n}` +@msg no print preset named `{b}` (see print.presets.list) no hay ningún preajuste de impresión llamado `{b}` (consulta print.presets.list) +@msg no print preset named `{name}` (presets: {_1}) no hay ningún preajuste de impresión llamado `{name}` (preajustes: {_1}) +@msg no print preset named `{n}` no hay ningún preajuste de impresión llamado `{n}` +@msg no profile named `{name}` no hay ningún perfil llamado `{name}` +@msg no readable files in the folder no hay archivos legibles en la carpeta +@msg no recovery copy `{f}` (see file.recovery.list) no existe la copia de recuperación `{f}` (consulta file.recovery.list) +@msg no rows no hay filas +@msg no saved PDF preset named `{name}` no hay ningún preajuste de PDF guardado llamado `{name}` +@msg no saved export preset `{name}` no existe el preajuste de exportación guardado `{name}` +@msg no saved gradient preset called {name} no hay ningún preajuste de degradado guardado llamado {name} +@msg no saved gradient presets no hay preajustes de degradado guardados +@msg no saved preset called `{name}` no hay ningún preajuste guardado llamado `{name}` +@msg no saved presets to export (name [Default] in `names` to export it) no hay preajustes guardados que exportar (nombra [Default] en `names` para exportarlo) +@msg no saved presets to export (name built-in ones in `names`) no hay preajustes guardados que exportar (nombra los integrados en `names`) +@msg no saved print preset named `{name}` no hay ningún preajuste de impresión guardado llamado `{name}` +@msg no saved profile called {name} no hay ningún perfil guardado llamado {name} +@msg no saved selection `{name}` no existe la selección guardada `{name}` +@msg no saved theme called {name} (see colorTheme.list) no hay ningún tema guardado llamado {name} (consulta colorTheme.list) +@msg no saved views no hay vistas guardadas +@msg no series {i} no existe la serie {i} +@msg no slice {n} in the image (see slice.list) no existe el sector {n} en la imagen (consulta slice.list) +@msg no source art no hay ilustración de origen +@msg no stop {i} (the gradient has {n}) no existe la parada {i} (el degradado tiene {n}) +@msg no style `{name}` no existe el estilo `{name}` +@msg no such assets (see assets.list) no existen esos recursos (consulta assets.list) +@msg no such frame anchor, or the frame would reach past the canvas no existe ese punto de ancla del marco, o el marco sobrepasaría el lienzo +@msg no such objects no existen esos objetos +@msg no such path anchor, or the path would reach past the canvas no existe ese punto de ancla del trazado, o el trazado sobrepasaría el lienzo +@msg no such rows no existen esas filas +@msg no swatch `{keep}` no existe la muestra `{keep}` +@msg no swatch `{n}` no existe la muestra `{n}` +@msg no swatch `{n}` (swatches and colour groups move separately) no existe la muestra `{n}` (las muestras y los grupos de colores se mueven por separado) +@msg no swatch library `{key}` (see swatch.library.list) no existe la biblioteca de muestras `{key}` (consulta swatch.library.list) +@msg no swatch library `{key}` (see swatch.library.list; "document": the document's swatches) no existe la biblioteca de muestras `{key}` (consulta swatch.library.list; "document": las muestras del documento) +@msg no swatch library `{key}` (see swatch.library.list; "{DOCUMENT_SWATCHES}": the document's swatches) no existe la biblioteca de muestras `{key}` (consulta swatch.library.list; "{DOCUMENT_SWATCHES}": las muestras del documento) +@msg no swatch named `{n}` no hay ninguna muestra llamada `{n}` +@msg no swatch or colour group `{n}` no existe la muestra ni el grupo de colores `{n}` +@msg no swatch or colour group `{n}` in `{_1}` no existe la muestra ni el grupo de colores `{n}` en `{_1}` +@msg no symbol named `{name}` no hay ningún símbolo llamado `{name}` +@msg no text objects selected no hay objetos de texto seleccionados +@msg no toolbar named `{_1}` no hay ninguna barra de herramientas llamada `{_1}` +@msg no tracing preset `{preset}` (see imageTrace.presets) no existe el preajuste de calco `{preset}` (consulta imageTrace.presets) +@msg no user library folder here (save with a path, or without one to get the data) aquí no hay carpeta de bibliotecas de usuario (guarda con una ruta, o sin ella para obtener los datos) +@msg no variable named `{from}` no hay ninguna variable llamada `{from}` +@msg no variable named `{name}` no hay ninguna variable llamada `{name}` +@msg no variable named `{var}` no hay ninguna variable llamada `{var}` +@msg no variable named `{v}` no hay ninguna variable llamada `{v}` +@msg no view named `{name}` no hay ninguna vista llamada `{name}` +@msg node {_1} is not a graph el nodo {_1} no es un gráfico +@msg node {_1} is not an image el nodo {_1} no es una imagen +@msg node {_1} is not type el nodo {_1} no es texto +@msg not a PDF presets file (format `{_1}`) no es un archivo de preajustes de PDF (formato `{_1}`) +@msg not a PDF presets file: {e} no es un archivo de preajustes de PDF: {e} +@msg not a Word document: its WordDocument stream doesn't start with a file information block no es un documento de Word: su flujo WordDocument no empieza con un bloque de información de archivo +@msg not a Word document: its compound file has no WordDocument stream no es un documento de Word: su archivo compuesto no tiene flujo WordDocument +@msg not a Word document: its main part is not a WordprocessingML document no es un documento de Word: su parte principal no es un documento WordprocessingML +@msg not a Word document: its package has no main document part no es un documento de Word: su paquete no tiene parte de documento principal +@msg not a closed path no es un trazado cerrado +@msg not a flattener presets file (format `{_1}`) no es un archivo de preajustes de acoplador (formato `{_1}`) +@msg not a flattener presets file: {e} no es un archivo de preajustes de acoplador: {e} +@msg not a layer or group no es una capa ni un grupo +@msg not a library file: {e} no es un archivo de biblioteca: {e} +@msg not a mesh envelope point no es un punto de envolvente de malla +@msg not a perspective grid presets file (format `{_1}`) no es un archivo de preajustes de cuadrícula de perspectiva (formato `{_1}`) +@msg not a perspective grid presets file: {e} no es un archivo de preajustes de cuadrícula de perspectiva: {e} +@msg not a print presets file (format `{_1}`) no es un archivo de preajustes de impresión (formato `{_1}`) +@msg not a print presets file: {e} no es un archivo de preajustes de impresión: {e} +@msg not a stored or deflated central record no es un registro central almacenado ni comprimido con deflate +@msg not a valid SVGZ file: {e} no es un archivo SVGZ válido: {e} +@msg not an RTF file: it doesn't start with {\\rtf no es un archivo RTF: no empieza con {\\rtf +@msg not an image VectorCraft reads (see document.formats) no es una imagen que VectorCraft lea (consulta document.formats) +@msg not area type (text in a frame) outside perspective no es texto de área (texto en un marco) fuera de la perspectiva +@msg not editing an opacity mask no se está editando una máscara de opacidad +@msg not type on a path outside perspective no es texto en trazado fuera de la perspectiva +@msg nothing prints no se imprime nada +@msg nothing to bind nada que vincular +@msg nothing to change nada que cambiar +@msg nothing to change: give dx, dy, hScale, vScale or rotation nada que cambiar: indica dx, dy, hScale, vScale o rotation +@msg nothing to crop nada que recortar +@msg nothing to export nada que exportar +@msg nothing to export: the document has no visible art nada que exportar: el documento no tiene ilustración visible +@msg nothing to mark nada que marcar +@msg nothing to print: every artboard picked is blank nada que imprimir: todas las mesas de trabajo elegidas están en blanco +@msg nothing to print: the document has no art that prints nada que imprimir: el documento no tiene ilustración que se imprima +@msg object is not a path el objeto no es un trazado +@msg object transparency cannot be sampled onto highlighted characters; disable Transparency in Eyedropper Options or select the whole object la transparencia del objeto no se puede muestrear en los caracteres resaltados; desactiva Transparencia en Opciones de cuentagotas o selecciona el objeto completo +@msg object {_1} can't be set as point type el objeto {_1} no se puede establecer como texto de punto +@msg object {_1} has lost its file's contents: relink it el objeto {_1} perdió el contenido de su archivo: vuelve a vincularlo +@msg object {_1} has no path el objeto {_1} no tiene trazado +@msg object {_1} has no size el objeto {_1} no tiene tamaño +@msg object {_1} is hidden or locked, or on a locked artboard el objeto {_1} está oculto o bloqueado, o en una mesa de trabajo bloqueada +@msg object {_1} is not a placed document el objeto {_1} no es un documento colocado +@msg object {_1} is not an Intertwine group el objeto {_1} no es un grupo de Entrelazar +@msg object {_1} is not an image el objeto {_1} no es una imagen +@msg object {_1} is not an image or a linked file el objeto {_1} no es una imagen ni un archivo vinculado +@msg object {_1} is not an image or a placed document el objeto {_1} no es una imagen ni un documento colocado +@msg object {_1} is not in this Intertwine group el objeto {_1} no está en este grupo de Entrelazar +@msg object {_1} needs a 3D effect at index {index} el objeto {_1} necesita un efecto 3D en el índice {index} +@msg object {id} has anchors 0–{_1} for `corners`, not {past} el objeto {id} tiene los puntos de ancla 0–{_1} para `corners`, no {past} +@msg object {id} has {n} anchors, so no anchor {past} el objeto {id} tiene {n} puntos de ancla, así que no existe el punto de ancla {past} +@msg objects must be none, move or copy objects debe ser none, move o copy +@msg objects were left out se omitieron objetos +@msg offset out of range desplazamiento fuera de rango +@msg on must be true or false on debe ser true o false +@msg only groups, layers, type and images have a Contents (Characters) row solo los grupos, las capas, el texto y las imágenes tienen una fila Contenido (Caracteres) +@msg only interior mesh lines can be deleted solo se pueden eliminar las líneas de malla interiores +@msg only solid colours can be added (not gradients or patterns) solo se pueden agregar colores sólidos (no degradados ni motivos) +@msg only solid-colour swatches can be spot colours solo las muestras de color sólido pueden ser tintas planas +@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 solo se pudo leer la vista previa incrustada de este archivo de Affinity: usa Archivo › Abrir para verla con su advertencia, o exporta antes SVG o PDF desde Affinity +@msg only this Affinity file's embedded preview could be read; use File › Open to see it with its warning solo se pudo leer la vista previa incrustada de este archivo de Affinity; usa Archivo › Abrir para verla con su advertencia +@msg onto, above, below, icon and a column place belong to window.panel.float and window.panel.dock onto, above, below, icon y una posición de columna corresponden a window.panel.float y window.panel.dock +@msg onto, above, below, icon and a column place take no anchor, side, zone or before onto, above, below, icon y una posición de columna no aceptan anchor, side, zone ni before +@msg onto, above, below, icon and a column place take no x, y, width or height onto, above, below, icon y una posición de columna no aceptan x, y, width ni height +@msg open a document to look for its linked files abre un documento para buscar sus archivos vinculados +@msg options must be an object (see file.formatOptions) options debe ser un objeto (consulta file.formatOptions) +@msg order must be leftToRight or rightToLeft order debe ser leftToRight o rightToLeft +@msg orientation must be portrait or landscape, not `{o}` orientation debe ser portrait o landscape, no `{o}` +@msg outlineText {v}: true or false outlineText {v}: true o false +@msg output intent profile: {e} perfil de calidad de salida: {e} +@msg output.destination: no RGB or CMYK profile is called “{name}” output.destination: ningún perfil RGB ni CMYK se llama “{name}” +@msg output.destination: {_1} files are CMYK, and “{name}” is an RGB profile output.destination: los archivos {_1} son CMYK, y “{name}” es un perfil RGB +@msg output.destination: {e} output.destination: {e} +@msg output.inks: no ink is set to print output.inks: ninguna tinta está configurada para imprimirse +@msg output.outputIntent: no profile is called “{name}”, and a {std} output intent embeds its profile output.outputIntent: ningún perfil se llama “{name}”, y una calidad de salida {std} incrusta su perfil +@msg output.outputIntent: no profile is called “{name}”: a {std} output intent embeds a profile, or names a registered printing condition (outputConditionId and registry) output.outputIntent: ningún perfil se llama “{name}”: una calidad de salida {std} incrusta un perfil o nombra una condición de impresión registrada (outputConditionId y registry) +@msg output.outputIntent: {std} files print in CMYK, and “{name}” is an RGB profile output.outputIntent: los archivos {std} se imprimen en CMYK, y “{name}” es un perfil RGB +@msg output.outputIntent: “{name}” is a grey profile, which can't be a {std} output intent output.outputIntent: “{name}” es un perfil de grises, que no puede ser una calidad de salida {std} +@msg overlap: {o} pt is half a tile or more overlap: {o} pt es medio mosaico o más +@msg overlapping Shaper paths must be in the same layer or group los trazados de Shaper superpuestos deben estar en la misma capa o el mismo grupo +@msg overlapping edits ediciones superpuestas +@msg page art conflicts with image data for {key} la ilustración de la página entra en conflicto con los datos de imagen de {key} +@msg page art conflicts with pattern {name} la ilustración de la página entra en conflicto con el motivo {name} +@msg page art conflicts with swatch {name} la ilustración de la página entra en conflicto con la muestra {name} +@msg page art is missing image data for {key} a la ilustración de la página le faltan los datos de imagen de {key} +@msg page art is missing pattern {name} a la ilustración de la página le falta el motivo {name} +@msg page art is missing swatch {name} a la ilustración de la página le falta la muestra {name} +@msg page must be a whole number from 1 page debe ser un número entero a partir de 1 +@msg page thumbnail: {e} miniatura de página: {e} +@msg page {page} of the PDF has no objects la página {page} del PDF no tiene objetos +@msg page {page}: `{file}` has {n} {artboards} página {page}: `{file}` tiene {n} {artboards} +@msg page {page}: `{name}` has {n} {pages} página {page}: `{name}` tiene {n} {pages} +@msg pages must be a range such as "2-3" or a page number, not {v} pages debe ser un intervalo como "2-3" o un número de página, no {v} +@msg pages: {e} pages: {e} +@msg panel position must be finite la posición del panel debe ser finita +@msg parameters must be an object los parámetros deben ser un objeto +@msg params must be an object params debe ser un objeto +@msg passwords can have up to {MAX_PASSWORD} bytes las contraseñas pueden tener hasta {MAX_PASSWORD} bytes +@msg path has no open end el trazado no tiene ningún extremo abierto +@msg paths must be strings paths deben ser cadenas +@msg pdfCompatible: false needs every artboard to keep the editable artwork pdfCompatible: false necesita que cada mesa de trabajo conserve la ilustración editable +@msg pdfs `{m}`: single or multiple pdfs `{m}`: single o multiple +@msg pickColorFrom is "artwork" or "swatches", not {v} pickColorFrom es "artwork" o "swatches", no {v} +@msg pins and moved must be non-empty lists of the same length pins y moved deben ser listas no vacías de la misma longitud +@msg pins must be [[x,y]…] pins debe ser [[x,y]…] +@msg pins must be finite pins deben ser finitos +@msg place is above, below or inside, not `{other}` place es above, below o inside, no `{other}` +@msg plane must be left|right|ground plane debe ser left|right|ground +@msg plane must be left|right|ground|none plane debe ser left|right|ground|none +@msg point is outside the mesh el punto está fuera de la malla +@msg points must be [t, left, right] with non-negative widths points debe ser [t, left, right] con anchuras no negativas +@msg points must be a non-empty [[x,y,pressure?]…] list points debe ser una lista [[x,y,pressure?]…] no vacía +@msg points must be a non-empty list of finite [x,y] points debe ser una lista no vacía de [x,y] finitos +@msg points must be an array or null points debe ser una matriz o null +@msg points must be finite points deben ser finitos +@msg points must be finite [x,y] pairs points deben ser pares [x,y] finitos +@msg points must contain 1–4096 coordinates points debe contener 1–4096 coordenadas +@msg position must be normal, superscript or subscript position debe ser normal, superscript o subscript +@msg position must be topLeft, topRight, bottomLeft or bottomRight position debe ser topLeft, topRight, bottomLeft o bottomRight +@msg positions must be between 0 and 100000 pt las posiciones deben estar entre 0 y 100000 pt +@msg ppi must be a positive number, not {ppi} ppi debe ser un número positivo, no {ppi} +@msg ppi must be between 1 and 2400 ppi debe estar entre 1 y 2400 +@msg preserve `{v}` is not transforms|bounds|fileDimensions|fit|fill preserve `{v}` no es transforms|bounds|fileDimensions|fit|fill +@msg preserveShape must be clippingMask|transparency preserveShape debe ser clippingMask|transparency +@msg preset `{id}`: mobile or density preajuste `{id}`: mobile o density +@msg preset must be standard, diffuse, topLeft or right preset debe ser standard, diffuse, topLeft o right +@msg preset must be the name of a print preset preset debe ser el nombre de un preajuste de impresión +@msg previewMode must be default, pixel or overprint previewMode debe ser default, pixel u overprint +@msg print settings: {e} ajustes de impresión: {e} +@msg procedures nest too deeply los procedimientos se anidan a demasiada profundidad +@msg procedures nested too deeply procedimientos anidados a demasiada profundidad +@msg quotes must be {double?, single?} quotes debe ser {double?, single?} +@msg quotes.{k} must be an opening and a closing quote, e.g. "“”" quotes.{k} debe ser unas comillas de apertura y de cierre, p. ej. "“”" +@msg rasterEffectsPpi must be 1–2400 (72 screen, 150 medium, 300 high) rasterEffectsPpi debe ser 1–2400 (72 pantalla, 150 media, 300 alta) +@msg rating must be a whole number from 0 to {MAX_RATING} rating debe ser un número entero entre 0 y {MAX_RATING} +@msg rect and {k} contradict each other: give the area or the artboards rect y {k} se contradicen: indica el área o las mesas de trabajo +@msg rect applies to raster formats, not {_1} rect se aplica a formatos rasterizados, no a {_1} +@msg rect is [x, y, width, height] in points rect es [x, y, width, height] en puntos +@msg rect must be [x, y, width, height] rect debe ser [x, y, width, height] +@msg rect must be [x, y, width, height] with a positive width and height rect debe ser [x, y, width, height] con anchura y altura positivas +@msg rect needs finite numbers and a positive width and height rect necesita números finitos y anchura y altura positivas +@msg redraw needs id redraw necesita id +@msg redraw within must be a finite distance of 0 or more within de redraw debe ser una distancia finita de 0 o más +@msg registration must be 0..8 registration debe ser 0..8 +@msg release a layer or a group suelta una capa o un grupo +@msg replace keeps the replaced object's place and transform: drop template, at and rect replace conserva la posición y la transformación del objeto sustituido: quita template, at y rect +@msg replace: select the one object to replace replace: selecciona el objeto que quieres sustituir +@msg resolution must be a number or screen|medium|high resolution debe ser un número o screen|medium|high +@msg resolution must be between 1 and 2400 ppi resolution debe estar entre 1 y 2400 ppi +@msg rotation must be a number of degrees rotation debe ser un número de grados +@msg rotation must be finite rotation debe ser finito +@msg rows and cols must be 1..50 rows y cols deben ser 1..50 +@msg rows and columns must be 1..500 rows y columns deben ser 1..500 +@msg rows of objects whose appearances differ can't be reordered together las filas de objetos cuyas apariencias difieren no se pueden reordenar juntas +@msg save the document first: Package collects a saved document guarda antes el documento: Empaquetar reúne un documento guardado +@msg save the document first: copy puts the file in its folder guarda antes el documento: copy pone el archivo en su carpeta +@msg savedPreset: {e} savedPreset: {e} +@msg scale `{s}`: a factor such as 2x, a width (100w), a height (100h) or a resolution (72ppi) scale `{s}`: un factor como 2x, una anchura (100w), una altura (100h) o una resolución (72ppi) +@msg scale must be a number above 0, at most 64 scale debe ser un número mayor que 0 y como máximo 64 +@msg scale must be non-zero scale no debe ser cero +@msg scope must be selection or all (got {other}) scope debe ser selection o all (se recibió {other}) +@msg scribble is too long el garabato es demasiado largo +@msg segment does not exist el segmento no existe +@msg select a Shaper group selecciona un grupo de Shaper +@msg select a blend to set easing or color shift selecciona una fusión para definir la aceleración o el cambio de color +@msg select a compound shape selecciona una forma compuesta +@msg select a graph selecciona un gráfico +@msg select a group or layer with visible, unlocked members selecciona un grupo o una capa con miembros visibles y desbloqueados +@msg select a layer selecciona una capa +@msg select a text object selecciona un objeto de texto +@msg select an image (or an Image Trace group) selecciona una imagen (o un grupo de Calco de imagen) +@msg select an image, or pass id selecciona una imagen o pasa id +@msg select an object (or pass `id`) selecciona un objeto (o pasa `id`) +@msg select an object with a freeform gradient selecciona un objeto con un degradado de forma libre +@msg select an object with an opacity mask selecciona un objeto con una máscara de opacidad +@msg select area type selecciona texto de área +@msg select area type (text in a frame) selecciona texto de área (texto en un marco) +@msg select area type and closed paths (at least one area type object) selecciona texto de área y trazados cerrados (al menos un objeto de texto de área) +@msg select area type whose first line can fit its frame selecciona texto de área cuya primera línea quepa en su marco +@msg select artwork to add its colours selecciona ilustraciones para agregar sus colores +@msg select artwork to make a group of its colours selecciona ilustraciones para crear un grupo con sus colores +@msg select artwork to recolour, or give a colour `group` selecciona ilustraciones para volver a colorear, o indica un `group` de colores +@msg select exactly two path ends to join selecciona exactamente dos extremos de trazado para unirlos +@msg select members of a compound shape selecciona miembros de una forma compuesta +@msg select objects or give ids selecciona objetos o indica ids +@msg select objects to align to the guide selecciona objetos para alinearlos con la guía +@msg select one Intertwine group selecciona un grupo de Entrelazar +@msg select one image or pass id selecciona una imagen o pasa id +@msg select paths selecciona trazados +@msg select paths or compound paths selecciona trazados o trazados compuestos +@msg select rows or objects to collect selecciona filas u objetos para reunirlos +@msg select something to export selecciona algo que exportar +@msg select something to export (or turn off selectedOnly) selecciona algo que exportar (o desactiva selectedOnly) +@msg select text to redefine the style from selecciona el texto a partir del que redefinir el estilo +@msg select the art and, on top of it, the mask object selecciona la ilustración y, encima de ella, el objeto de máscara +@msg select the art for the design selecciona la ilustración para el diseño +@msg select the art for the pattern tile selecciona la ilustración para el mosaico del motivo +@msg select the art to add first selecciona antes la ilustración que quieres agregar +@msg select the art to collect (or give its ids) selecciona la ilustración que quieres reunir (o indica sus ids) +@msg select the content and a path on top selecciona el contenido y un trazado encima +@msg select the images to relink, or pass ids selecciona las imágenes que quieres volver a vincular o pasa ids +@msg select the images, or pass ids selecciona las imágenes o pasa ids +@msg select the linked images or placed documents, or pass ids selecciona las imágenes vinculadas o los documentos colocados, o pasa ids +@msg select the object to copy from selecciona el objeto desde el que copiar +@msg select the objects (or give their ids) selecciona los objetos (o indica sus ids) +@msg select the objects to attach to the path selecciona los objetos que quieres unir al trazado +@msg select the objects to bind selecciona los objetos que quieres vincular +@msg select two or more objects to intertwine selecciona dos o más objetos para entrelazarlos +@msg select two or more slices to combine selecciona dos o más sectores para combinarlos +@msg select type on a path selecciona texto en trazado +@msg selection `{m}`: one or each selección `{m}`: one o each +@msg settings is an object of document.exportForScreens params settings es un objeto de parámetros de document.exportForScreens +@msg settings must be an object settings debe ser un objeto +@msg show `{show}`: all, missing, modified or embedded show `{show}`: all, missing, modified o embedded +@msg show must be true or false show debe ser true o false +@msg size must be "small", "medium", "large" or a number of points over 0 up to {_1} size debe ser "small", "medium", "large" o un número de puntos mayor que 0 y de hasta {_1} +@msg size must be positive size debe ser positivo +@msg sizeMode is "fixed" or "pressure", not `{other}` sizeMode es "fixed" o "pressure", no `{other}` +@msg sizeMode is "fixed" or "pressure", not {other} sizeMode es "fixed" o "pressure", no {other} +@msg sizeVariation must be 0 or more sizeVariation debe ser 0 o más +@msg smallCaps must be true or false smallCaps debe ser true o false +@msg sort `{x}`: name, kind or status sort `{x}`: name, kind o status +@msg source paths are too large for Shaper los trazados de origen son demasiado grandes para Shaper +@msg spot, mode and group apply to solid colours only spot, mode y group solo se aplican a colores sólidos +@msg status `{s}`: linked, embedded, missing or modified status `{s}`: linked, embedded, missing o modified +@msg steps must be 1..1000 steps debe ser 1..1000 +@msg steps must be 1..{MAX_STEPS} steps debe ser 1..{MAX_STEPS} +@msg stop {i}: `plates` must be four numbers from 0 to 1 (C, M, Y, K) parada {i}: `plates` debe ser cuatro números entre 0 y 1 (C, M, Y, K) +@msg stopped before the archive was finished se detuvo antes de terminar el archivo comprimido +@msg strokeMode must be within|along|across, got {m} strokeMode debe ser within|along|across, se recibió {m} +@msg strokeOptions must be an object of stroke.set options strokeOptions debe ser un objeto de opciones de stroke.set +@msg strokeWidth must be a positive number of pixels strokeWidth debe ser un número positivo de píxeles +@msg subpath {si} is not an open subpath el subtrazado {si} no es un subtrazado abierto +@msg subpaths required when joining the same path se requieren subpaths al unir el mismo trazado +@msg swatchConflict must be "merge" or "add", not {v} swatchConflict debe ser "merge" o "add", no {v} +@msg text must be {characterSet?, platform?, removeLineReturns?, removeParagraphReturns?, replaceSpaces?} text debe ser {characterSet?, platform?, removeLineReturns?, removeParagraphReturns?, replaceSpaces?} +@msg text transform is collapsed or unrepresentable la transformación del texto está colapsada o no se puede representar +@msg text.replaceSpaces must be a whole number from 2 to 100 text.replaceSpaces debe ser un número entero entre 2 y 100 +@msg textureImage: give {path} or {name, dataBase64} of an image file, or a texture as effect.list gives it textureImage: indica {path} o {name, dataBase64} de un archivo de imagen, o una textura tal como la da effect.list +@msg textureImage: {e} textureImage: {e} +@msg that makes more than {MAX_PIECES} slices eso genera más de {MAX_PIECES} sectores +@msg that object is not in the overlap ese objeto no está en la superposición +@msg the Affinity document has no page with a size el documento de Affinity no tiene ninguna página con tamaño +@msg the CMYK image couldn't be written no se pudo escribir la imagen CMYK +@msg the PDF security settings were saved without their passwords: give openPassword or permissionsPassword again, or security without passwordRequired to export unprotected los ajustes de seguridad del PDF se guardaron sin sus contraseñas: indica de nuevo openPassword o permissionsPassword, o security sin passwordRequired para exportar sin protección +@msg the RTF file has too many paragraphs or formatting changes to place as type (at most {MAX_PARAGRAPHS} paragraphs and {MAX_RUNS} runs) el archivo RTF tiene demasiados párrafos o cambios de formato para colocarlo como texto (como máximo {MAX_PARAGRAPHS} párrafos y {MAX_RUNS} tramos) +@msg the RTF file is too large to place as type (at most {_1} MB) el archivo RTF es demasiado grande para colocarlo como texto (como máximo {_1} MB) +@msg the SVG expands to more than {0} nested SVG images el SVG se expande en más de {0} imágenes SVG anidadas +@msg the SVG expands to more than {0} objects el SVG se expande en más de {0} objetos +@msg the SVG has no drawable objects el SVG no tiene objetos que se puedan dibujar +@msg the SVGZ file unpacks to more than {_1} MB el archivo SVGZ se descomprime en más de {_1} MB +@msg the Word document has more than {MAX_PAGES} pages of properties, too many to place el documento de Word tiene más de {MAX_PAGES} páginas de propiedades, demasiadas para colocarlo +@msg the Word document has more than {MAX_RUNS} runs of character or paragraph properties, too many to place el documento de Word tiene más de {MAX_RUNS} tramos de propiedades de carácter o de párrafo, demasiados para colocarlo +@msg the Word document has more than {_1} MB of formatting properties, too many to place el documento de Word tiene más de {_1} MB de propiedades de formato, demasiadas para colocarlo +@msg the Word document has too much text or formatting to place as type (at most {MAX_PARAGRAPHS} paragraphs, {MAX_RUNS} runs and {_1} MB of text) el documento de Word tiene demasiado texto o formato para colocarlo como texto (como máximo {MAX_PARAGRAPHS} párrafos, {MAX_RUNS} tramos y {_1} MB de texto) +@msg the Word document has too much text to place as type (at most {_1} MB) el documento de Word tiene demasiado texto para colocarlo como texto (como máximo {_1} MB) +@msg the Word document is encrypted or protected with a password; save it without one to place it el documento de Word está cifrado o protegido con contraseña; guárdalo sin ella para colocarlo +@msg the Word document is too large to place (its {name} stream holds more than {_1} MB) el documento de Word es demasiado grande para colocarlo (su flujo {name} contiene más de {_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 el documento de Word se guardó por última vez con guardado rápido, que VectorCraft no lee; guárdalo de nuevo con el guardado rápido desactivado +@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 el documento de Word se guardó con Word 6.0 o Word 95, que VectorCraft no lee; guárdalo como documento de Word 97-2003 +@msg the Word document's text is made of more than {MAX_PIECES} pieces, too many to place el texto del documento de Word consta de más de {MAX_PIECES} piezas, demasiadas para colocarlo +@msg the action set ids are not a list los ids de los conjuntos de acciones no son una lista +@msg the active paint is not a gradient la pintura activa no es un degradado +@msg the artboards don't fit on the canvas: fewer artboards, less spacing or a smaller size las mesas de trabajo no caben en el lienzo: usa menos mesas de trabajo, menos espaciado o un tamaño más pequeño +@msg the character's size can't be measured no se puede medir el tamaño del carácter +@msg the compound shape is too complex to expand la forma compuesta es demasiado compleja para expandirla +@msg the container of the listed objects is gone ya no existe el contenedor de los objetos enumerados +@msg the copy `{user_id}` can't be read as a library la copia `{user_id}` no se puede leer como biblioteca +@msg the copy would leave the canvas la copia saldría del lienzo +@msg the cut cannot be made on this art: {e} no se puede hacer el corte en esta ilustración: {e} +@msg the data isn't an EMF or WMF picture los datos no son una imagen EMF ni WMF +@msg the data isn't an EPS or PostScript picture los datos no son una imagen EPS ni PostScript +@msg the deferred paste is no longer available el pegado diferido ya no está disponible +@msg the design is too big to draw at every data point of this graph el diseño es demasiado grande para dibujarlo en cada punto de datos de este gráfico +@msg the design is too big to draw in every column of this graph el diseño es demasiado grande para dibujarlo en cada columna de este gráfico +@msg the dialog it was opened over is no longer open el cuadro de diálogo sobre el que se abrió ya no está abierto +@msg the dictionary stack overflowed la pila de diccionarios se desbordó +@msg the editing data's hash has no place el hash de los datos de edición no tiene lugar +@msg the entities the document declares expand to too much text las entidades que declara el documento se expanden en demasiado texto +@msg the envelope's content has no bounds el contenido de la envolvente no tiene límites +@msg the envelope's mesh is malformed la malla de la envolvente está mal formada +@msg the file holds no `variableSets` element el archivo no contiene ningún elemento `variableSets` +@msg the file is larger than {_1} MB el archivo ocupa más de {_1} MB +@msg the file is too large el archivo es demasiado grande +@msg the file was updated or encrypted already el archivo ya se actualizó o cifró +@msg the first character of a line has no character before it to kern: it moves only up and down (dy) el primer carácter de una línea no tiene ningún carácter delante con el que aplicar kerning: solo se mueve hacia arriba y hacia abajo (dy) +@msg the font {_1} is not available la fuente {_1} no está disponible +@msg the format has no file extension el formato no tiene extensión de archivo +@msg the graphic can't be read: {e} no se puede leer el gráfico: {e} +@msg the graphic is empty el gráfico está vacío +@msg the graphic's data is damaged los datos del gráfico están dañados +@msg the graphic's document has no artboard el documento del gráfico no tiene mesa de trabajo +@msg the header `{cell}` for `{name}` would read back as the variable `{other}`: rename one of them el encabezado `{cell}` de `{name}` se volvería a leer como la variable `{other}`: cambia el nombre de uno de ellos +@msg the image `{path}` isn't followed: {r} no se sigue la imagen `{path}`: {r} +@msg the image has no embedded pixels la imagen no tiene píxeles incrustados +@msg the image is empty la imagen está vacía +@msg the image is fully transparent la imagen es totalmente transparente +@msg the image is not on an artboard; pass rect la imagen no está en una mesa de trabajo; pasa rect +@msg the image's pixels are missing faltan los píxeles de la imagen +@msg the image's pixels aren't in the document los píxeles de la imagen no están en el documento +@msg the image's pixels can't be read: {e} no se pueden leer los píxeles de la imagen: {e} +@msg the image's transparency doesn't fit it la transparencia de la imagen no se ajusta a ella +@msg the job would print more than {MAX_PAGES} pages el trabajo imprimiría más de {MAX_PAGES} páginas +@msg the job would print more than {_1} pages el trabajo imprimiría más de {_1} páginas +@msg the layers hold no art to mask las capas no contienen ilustración que enmascarar +@msg the layout moved el diseño se movió +@msg the library has a group `{name}` already la biblioteca ya tiene un grupo `{name}` +@msg the library has no group `{name}` la biblioteca no tiene ningún grupo `{name}` +@msg the library has no item `{item}` la biblioteca no tiene ningún elemento `{item}` +@msg the library has no item `{other}` la biblioteca no tiene ningún elemento `{other}` +@msg the library holds {MAX_GROUPS} groups already la biblioteca ya contiene {MAX_GROUPS} grupos +@msg the library holds {MAX_ITEMS} items of this kind already la biblioteca ya contiene {MAX_ITEMS} elementos de este tipo +@msg the name is empty el nombre está vacío +@msg the object has no fill, stroke or effect el objeto no tiene relleno, trazo ni efecto +@msg the object has no graphic style (pass `name`) el objeto no tiene estilo gráfico (pasa `name`) +@msg the objects don't match the plan los objetos no coinciden con el plan +@msg the open and permissions passwords must differ las contraseñas de apertura y de permisos deben ser distintas +@msg the operand stack overflowed la pila de operandos se desbordó +@msg the page has no area la página no tiene área +@msg the page's type in an unread object's box isn't in its page art el texto de la página en el cuadro de un objeto no leído no está en la ilustración de su página +@msg the paint behind the proxy is not a gradient la pintura detrás del proxy no es un degradado +@msg the parent must be a layer or sublayer el elemento principal debe ser una capa o subcapa +@msg the path can't be extended el trazado no se puede extender +@msg the path can't be inside one of the objects to attach el trazado no puede estar dentro de uno de los objetos que se van a unir +@msg the path has no segments to measure el trazado no tiene segmentos que medir +@msg the path is empty el trazado está vacío +@msg the path is too short to shorten that much el trazado es demasiado corto para acortarlo tanto +@msg the picture has no objects la imagen no tiene objetos +@msg the program runs too long el programa se ejecuta durante demasiado tiempo +@msg the program uses too much memory el programa usa demasiada memoria +@msg the rectangle must have a width and a height el rectángulo debe tener anchura y altura +@msg the rectangle needs a size and must lie on the canvas el rectángulo necesita un tamaño y debe estar en el lienzo +@msg the selected art has no width la ilustración seleccionada no tiene anchura +@msg the selection draws nothing la selección no dibuja nada +@msg the selection has no area la selección no tiene área +@msg the selection has no art to export la selección no tiene ilustración que exportar +@msg the selection has no bounds la selección no tiene límites +@msg the selection has no graphic style la selección no tiene estilo gráfico +@msg the slice would leave the canvas el sector saldría del lienzo +@msg the spot colour couldn't be added no se pudo agregar la tinta plana +@msg the subpath has no ends to extend (it is closed or a single point) el subtrazado no tiene extremos que extender (está cerrado o es un solo punto) +@msg the symbols are nested too deeply to expand their instances los símbolos están anidados a demasiada profundidad para expandir sus instancias +@msg the text file is too large to place as type (at most {_1} MB) el archivo de texto es demasiado grande para colocarlo como texto (como máximo {_1} MB) +@msg the text is empty el texto está vacío +@msg the text is over {_1} MB el texto ocupa más de {_1} MB +@msg the top object must be a path el objeto superior debe ser un trazado +@msg the trace was cancelled se canceló el calco +@msg the trailer has no size el trailer no tiene tamaño +@msg the type object is flattened to nothing el objeto de texto se acopla en nada +@msg the value of axis `{tag}` must be a number or null el valor del eje `{tag}` debe ser un número o null +@msg the variable library declares more than {MAX_LIBRARY_DATASETS} data sets la biblioteca de variables declara más de {MAX_LIBRARY_DATASETS} conjuntos de datos +@msg the variable library declares more than {MAX_LIBRARY_ENTITIES} entities la biblioteca de variables declara más de {MAX_LIBRARY_ENTITIES} entidades +@msg the variable library declares more than {MAX_LIBRARY_VARIABLES} variables la biblioteca de variables declara más de {MAX_LIBRARY_VARIABLES} variables +@msg the variable library declares no variables la biblioteca de variables no declara variables +@msg the variable library is larger than {MAX_LIBRARY_BYTES} bytes la biblioteca de variables ocupa más de {MAX_LIBRARY_BYTES} bytes +@msg the variable library is not UTF-8 la biblioteca de variables no está en UTF-8 +@msg the variable library is not well-formed XML: {e} la biblioteca de variables no es XML bien formado: {e} +@msg the variable library nests elements more than {MAX_LIBRARY_NESTING} deep la biblioteca de variables anida elementos a más de {MAX_LIBRARY_NESTING} niveles +@msg the variable library's document type declaration holds something other than entities of plain text la declaración de tipo de documento de la biblioteca de variables contiene algo distinto de entidades de texto sin formato +@msg the variable library's entities expand to more than {MAX_LIBRARY_BYTES} bytes las entidades de la biblioteca de variables se expanden en más de {MAX_LIBRARY_BYTES} bytes +@msg the window has no dock la ventana no tiene acoplamiento +@msg the written PDF has no catalog el PDF escrito no tiene catálogo +@msg the written PDF has no cross-reference table el PDF escrito no tiene tabla de referencias cruzadas +@msg the written PDF's metadata can't be edited no se pueden editar los metadatos del PDF escrito +@msg there are no colour swatches to draw no hay muestras de color que dibujar +@msg there is already a design named `{name}` ya hay un diseño llamado `{name}` +@msg there is already a design named `{to}` ya hay un diseño llamado `{to}` +@msg there is no library: create one first no hay ninguna biblioteca: crea antes una +@msg these paths are too degenerate for Shaper estos trazados están demasiado degenerados para Shaper +@msg thumbnail: no page {v} (the {what} has {count}) miniatura: no existe la página {v} ({what} tiene {count}) +@msg tileRange of {what}: {e} tileRange de {what}: {e} +@msg title can't be empty title no puede estar vacío +@msg to must be fill or stroke to debe ser fill o stroke +@msg to must be smooth or corner to debe ser smooth o corner +@msg too large for a zip archive: package to a folder demasiado grande para un archivo zip: empaqueta en una carpeta +@msg too many Shaper edits demasiadas ediciones de Shaper +@msg too many `points` (at most 100000) demasiados `points` (como máximo 100000) +@msg too many characters: at most {MAX_CHARS} demasiados caracteres: como máximo {MAX_CHARS} +@msg too many dots for this size: lower the frequency demasiados puntos para este tamaño: reduce la frecuencia +@msg too many filters over one file demasiados filtros sobre un archivo +@msg too many overlapping paths for Shaper demasiados trazados superpuestos para Shaper +@msg too many saved clips demasiados recortes guardados +@msg too many saved graphics states demasiados estados gráficos guardados +@msg transparentImages {v}: "flatten" (the default) or "omit" transparentImages {v}: "flatten" (el predeterminado) u "omit" +@msg two saved selections would be named `{_1}` dos selecciones guardadas se llamarían `{_1}` +@msg type dimension cannot be represented with this text transform la dimensión del texto no se puede representar con esta transformación de texto +@msg type dimension must be finite la dimensión del texto debe ser finita +@msg unexpected resources recursos inesperados +@msg unknown CMYK profile `{name}` perfil CMYK desconocido `{name}` +@msg unknown File Info field `{k}` campo de Información de archivo desconocido `{k}` +@msg unknown OpenType feature `{t}` in featureChanges (the tags `features` takes) función OpenType desconocida `{t}` en featureChanges (las etiquetas que acepta `features`) +@msg unknown PDF preset `{name}` (presets: {_1}) preajuste de PDF desconocido `{name}` (preajustes: {_1}) +@msg unknown Warp style estilo de Deformación desconocido +@msg unknown alignToPath `{a}` alignToPath desconocido `{a}` +@msg unknown arrowhead {v} punta de flecha desconocida {v} +@msg unknown artboardLayout key `{k}` (layout, columns, spacing, rightToLeft) clave de artboardLayout desconocida `{k}` (layout, columns, spacing, rightToLeft) +@msg unknown attribute `{attribute}` atributo desconocido `{attribute}` +@msg unknown attribute `{k}` atributo desconocido `{k}` +@msg unknown axis `{other}` (vertical|horizontal|free) eje desconocido `{other}` (vertical|horizontal|free) +@msg unknown blend mode `{b}` modo de fusión desconocido `{b}` +@msg unknown blend mode {b} modo de fusión desconocido {b} +@msg unknown brush type `{o}` tipo de pincel desconocido `{o}` +@msg unknown category `{c}` categoría desconocida `{c}` +@msg unknown category `{c}` ({_1}) categoría desconocida `{c}` ({_1}) +@msg unknown character `{c}` carácter desconocido `{c}` +@msg unknown character style number field campo numérico de estilo de carácter desconocido +@msg unknown effect `{e}` efecto desconocido `{e}` +@msg unknown end {e} extremo desconocido {e} +@msg unknown flattenerPreset `{name}` (High Resolution, Medium Resolution, Low Resolution or a saved one: see flattener.presets.list) flattenerPreset desconocido `{name}` (High Resolution, Medium Resolution, Low Resolution o uno guardado: consulta flattener.presets.list) +@msg unknown format `{f}` (vcswatches, gpl, ase or css) formato desconocido `{f}` (vcswatches, gpl, ase o css) +@msg unknown from {f} from desconocido {f} +@msg unknown graph type `{t}` tipo de gráfico desconocido `{t}` +@msg unknown grid colours `{name}` (one of {_1}) colores de cuadrícula desconocidos `{name}` (uno de {_1}) +@msg unknown gridType `{t}` gridType desconocido `{t}` +@msg unknown highlight `{v}` resaltado desconocido `{v}` +@msg unknown intent `{i}` interpretación desconocida `{i}` +@msg unknown issue kind {id} tipo de problema desconocido {id} +@msg unknown issue kind {v} tipo de problema desconocido {v} +@msg unknown knockout state {k} estado de cobertura desconocido {k} +@msg unknown language `{language}` (one of {_1}) idioma desconocido `{language}` (uno de {_1}) +@msg unknown language `{l}` (one of {_1}) idioma desconocido `{l}` (uno de {_1}) +@msg unknown method `{m}` ({_1}) método desconocido `{m}` ({_1}) +@msg unknown mode `{other}` (gray, rgb, hsb, lab, cmyk or web) modo desconocido `{other}` (gray, rgb, hsb, lab, cmyk o web) +@msg unknown mode `{other}` (mono|cmyk) modo desconocido `{other}` (mono|cmyk) +@msg unknown mode `{other}` (rgb|cmyk|gray|global) modo desconocido `{other}` (rgb|cmyk|gray|global) +@msg unknown mode `{other}` (set, add, subtract) modo desconocido `{other}` (set, add, subtract) +@msg unknown mode `{o}` modo desconocido `{o}` +@msg unknown mode {m} modo desconocido {m} +@msg unknown model `{other}` modelo desconocido `{other}` +@msg unknown model `{other}` (keep, new or document) modelo desconocido `{other}` (keep, new o document) +@msg unknown op {o} op desconocido {o} +@msg unknown order `{o}`: toggle, front, forward, backward or back order desconocido `{o}`: toggle, front, forward, backward o back +@msg unknown overprints `{v}` (preserve, simulate or discard) overprints desconocido `{v}` (preserve, simulate o discard) +@msg unknown panel panel desconocido +@msg unknown pieLegend `{v}` (none, standard or wedges) pieLegend desconocido `{v}` (none, standard o wedges) +@msg unknown piePosition `{v}` (even, ratio or stacked) piePosition desconocido `{v}` (even, ratio o stacked) +@msg unknown pieSort `{v}` (none, all or first) pieSort desconocido `{v}` (none, all o first) +@msg unknown plate `{n}` plancha desconocida `{n}` +@msg unknown preference `{k}` preferencia desconocida `{k}` +@msg unknown profile {id} (see stroke.widthProfile.list) perfil desconocido {id} (consulta stroke.widthProfile.list) +@msg unknown proof target `{t}` destino de prueba desconocido `{t}` +@msg unknown quotes key `{k}` (double, single) clave de quotes desconocida `{k}` (double, single) +@msg unknown resolution `{v}` resolución desconocida `{v}` +@msg unknown rule `{rule}` ({_1}) regla desconocida `{rule}` ({_1}) +@msg unknown rule `{r}` (see color.harmony) regla desconocida `{r}` (consulta color.harmony) +@msg unknown setting `{k}` ajuste desconocido `{k}` +@msg unknown shape `{v}` (circle|ellipse|square|diamond|line) forma desconocida `{v}` (circle|ellipse|square|diamond|line) +@msg unknown spacing `{o}` (smooth|steps|distance) espaciado desconocido `{o}` (smooth|steps|distance) +@msg unknown tileType `{t}` ({_1}) tileType desconocido `{t}` ({_1}) +@msg unknown units unidades desconocidas +@msg unknown units `{u}` unidades desconocidas `{u}` +@msg unknown value axis `{v}` (left, right or both) eje de valores desconocido `{v}` (left, right o both) +@msg unknown variation `{v}` (tintsShades|warmCool|vividMuted) variación desconocida `{v}` (tintsShades|warmCool|vividMuted) +@msg unknown warp style `{s}` estilo de deformación desconocido `{s}` +@msg unknown {key} `{v}` (none, short or full) {key} desconocido `{v}` (none, short o full) +@msg unknown {key} profile `{n}` perfil {key} desconocido `{n}` +@msg unknown {k} key `{key}` (size, position) clave de {k} desconocida `{key}` (size, position) +@msg unreadable object objeto ilegible +@msg unsafe destination file name nombre de archivo de destino no seguro +@msg use paths or compound paths usa trazados o trazados compuestos +@msg useArtboards must be true or false, not {v} useArtboards debe ser true o false, no {v} +@msg value for `{var}` must match its variable kind el valor de `{var}` debe coincidir con el tipo de su variable +@msg variable `{_1}` is already defined la variable `{_1}` ya está definida +@msg variable `{name}` has no `trait` la variable `{name}` no tiene `trait` +@msg variable `{name}` is already defined la variable `{name}` ya está definida +@msg variable `{name}` is declared twice la variable `{name}` se declara dos veces +@msg variable `{to}` already exists ya existe la variable `{to}` +@msg view is required view es obligatorio +@msg view must be one of {_1} view debe ser uno de {_1} +@msg warpStyle can only edit an applied Warp effect warpStyle solo puede editar un efecto Deformación aplicado +@msg width and height must be more than 0 and at most {limit} width y height deben ser mayores que 0 y como máximo {limit} +@msg width factors must be finite los factores de anchura deben ser finitos +@msg width must be positive width debe ser positivo +@msg width out of range width fuera de rango +@msg width/height must be > 0 width/height deben ser > 0 +@msg x and y must be finite numbers x e y deben ser números finitos +@msg x and y must be given together x e y deben indicarse juntos +@msg zone needs an anchor: dock beside a panel with anchor, or in a new dock column with side (Start or End) zone necesita un anchor: acopla junto a un panel con anchor, o en una nueva columna de acoplamiento con side (Start o End) +@msg zoom must be positive zoom debe ser positivo +@msg {C}: no effect at index {list} {C}: no hay ningún efecto en el índice {list} +@msg {DEFAULT_PRESET} is protected and stays {DEFAULT_PRESET} está protegido y se conserva +@msg {DEFAULT_PRESET} is protected: save the settings under another name {DEFAULT_PRESET} está protegido: guarda los ajustes con otro nombre +@msg {LABEL} produced an empty result {LABEL} produjo un resultado vacío +@msg {_1} MB of document, at most {_2} MB {_1} MB de documento, como máximo {_2} MB +@msg {_1} MB of images, at most {_2} MB {_1} MB de imágenes, como máximo {_2} MB +@msg {_1} bytes of RGBA data for a {width} × {height} image {_1} bytes de datos RGBA para una imagen de {width} × {height} +@msg {_1} can't be read, or changed since it was read: relink or update it first {_1} no se puede leer o cambió desde que se leyó: vuelve a vincularlo o actualízalo antes +@msg {_1} can't go into {into} {_1} no puede ir dentro de {into} +@msg {_1} can't limit printing to low resolution: choose PDF 1.4 or later, or allow high-resolution printing {_1} no puede limitar la impresión a baja resolución: elige PDF 1.4 o posterior, o permite la impresión en alta resolución +@msg {_1} files can't be opened yet todavía no se pueden abrir archivos {_1} +@msg {_1} files can't be password-protected: remove the passwords or choose no standard los archivos {_1} no se pueden proteger con contraseña: quita las contraseñas o no elijas ningún estándar +@msg {_1} files can't be {_2} los archivos {_1} no pueden ser {_2} +@msg {_1} files can't carry editing data: turn off preserveEditing los archivos {_1} no pueden contener datos de edición: desactiva preserveEditing +@msg {_1} files can't have PDF layers: turn off createLayers los archivos {_1} no pueden tener capas PDF: desactiva createLayers +@msg {_1} files need a creation date, and this platform has no clock to give one los archivos {_1} necesitan una fecha de creación, y esta plataforma no tiene un reloj que la dé +@msg {_1} isn't a path {_1} no es un trazado +@msg {_1} options: {e} opciones de {_1}: {e} +@msg {_1} paints nothing to rasterize {_1} no pinta nada que rasterizar +@msg {_1} passwords can have up to {MAX_LEGACY_PASSWORD} ASCII characters (PDF 1.7 and later take any) las contraseñas de {_1} pueden tener hasta {MAX_LEGACY_PASSWORD} caracteres ASCII (PDF 1.7 y posteriores aceptan cualquiera) +@msg {_1} with linked images or an image map writes several files: use document.export {_1} con imágenes vinculadas o un mapa de imagen escribe varios archivos: usa document.export +@msg {_1} writes one file per artboard here: use document.export, or name one artboard {_1} escribe aquí un archivo por mesa de trabajo: usa document.export o nombra una mesa de trabajo +@msg {_1} × {_2} pixels is too large for {_3} (at most {max} pixels a side): lower the scale {_1} × {_2} píxeles es demasiado grande para {_3} (como máximo {max} píxeles por lado): reduce la escala +@msg {_1}: belongs to another account {_1}: pertenece a otra cuenta +@msg {_1}: not a folder of its own {_1}: no es una carpeta propia +@msg {_1}: not a plain file {_1}: no es un archivo normal +@msg {dest}: {e} {dest}: {e} +@msg {doc} has no folder {doc} no tiene carpeta +@msg {file} isn't linked {file} no está vinculado +@msg {folder} is not a package folder {folder} no es una carpeta de paquete +@msg {folder}: more than {max} files and folders {folder}: más de {max} archivos y carpetas +@msg {folder}: {e} {folder}: {e} +@msg {g} is not a Live Paint group {g} no es un grupo de Pintura interactiva +@msg {id} is not a slice {id} no es un sector +@msg {key} must be 0–{MAX_ADD_AROUND} pt {key} debe ser 0–{MAX_ADD_AROUND} pt +@msg {key} must be [x,y] {key} debe ser [x,y] +@msg {key} must be a percentage {min}..100 {key} debe ser un porcentaje {min}..100 +@msg {key} must be a positive number, not {n} {key} debe ser un número positivo, no {n} +@msg {key} must be a positive number, not {v} {key} debe ser un número positivo, no {v} +@msg {key} must be one of {_1} {key} debe ser uno de {_1} +@msg {key} must be {_1}, got {s} {key} debe ser {_1}, se recibió {s} +@msg {key} must name a floating panel {key} debe nombrar un panel flotante +@msg {key} must name a panel in another group {key} debe nombrar un panel de otro grupo +@msg {key} must name a panel that shows {key} debe nombrar un panel que se muestre +@msg {key} must name a registered panel {key} debe nombrar un panel registrado +@msg {kind} files have no transparency, and the file would have {what}: flatten it first (object.flattenTransparency) los archivos {kind} no tienen transparencia, y el archivo tendría {what}: acóplalo antes (object.flattenTransparency) +@msg {kind} images can't be opened (see document.formats) las imágenes {kind} no se pueden abrir (consulta document.formats) +@msg {k} `{v}` is not one of the choices {k} `{v}` no es una de las opciones +@msg {k} is too long (at most {MAX_TEXT} characters) {k} es demasiado largo (como máximo {MAX_TEXT} caracteres) +@msg {k} must be > 0 {k} debe ser > 0 +@msg {k} must be a number (pt) or a length such as "210 mm" {k} debe ser un número (pt) o una longitud como "210 mm" +@msg {k} must be a number from {min} to {max} {k} debe ser un número entre {min} y {max} +@msg {k} must be a number or "auto" {k} debe ser un número o "auto" +@msg {k} must be a string {k} debe ser una cadena +@msg {k} must be text {k} debe ser texto +@msg {k} must be true or false {k} debe ser true o false +@msg {k} must be {{size?, position?}} {k} debe ser {{size?, position?}} +@msg {k}: can't read `{s}` as a length {k}: no se puede leer `{s}` como una longitud +@msg {label} must be a number at most {max} {label} debe ser un número de como máximo {max} +@msg {label} must be a number from -1296 to 1296 {label} debe ser un número entre -1296 y 1296 +@msg {label} must be a number from 1 to 10000 {label} debe ser un número entre 1 y 10000 +@msg {name} `{s}`: {ids} {name} `{s}`: {ids} +@msg {name} is built in and can't be deleted {name} está integrado y no se puede eliminar +@msg {name}: CRC or size mismatch {name}: el CRC o el tamaño no coinciden +@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}: solo se pudo leer la vista previa incrustada de este archivo de Affinity; usa Archivo › Abrir para verla con su advertencia, o exporta SVG o PDF desde Affinity antes de colocarlo +@msg {name}: {e} {name}: {e} +@msg {native}; its embedded preview can't be read either ({e}) {native}; tampoco se puede leer su vista previa incrustada ({e}) +@msg {std} files are CMYK, and the file would have colours in {_1} los archivos {std} son CMYK, y el archivo tendría colores en {_1} +@msg {std} files embed their fonts, and the file would have one that isn't los archivos {std} incrustan sus fuentes, y el archivo tendría una que no lo está +@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} es el archivo desde el que se leyó este documento, y al leerlo se omitieron cosas ({what}): sobrescribirlo las perdería para siempre. Escribe otro archivo en su lugar o pasa acknowledgeLoss: true para sustituirlo de todos modos +@msg {ty} brushes need selected art (or params.{k}) los pinceles {ty} necesitan ilustración seleccionada (o params.{k}) +@msg {v} is not an asset id {v} no es un id de recurso +@msg {what} can't be intertwined {what} no se puede entrelazar +@msg {what} doesn't fit the paper with its bleed and marks {what} no cabe en el papel con su sangrado y sus marcas +@msg {what} would print on more than {MAX_TILES} tiles: scale it down {what} se imprimiría en más de {MAX_TILES} mosaicos: redúcelo +@msg Alignment must be one of the choices Alineación debe ser una de las opciones +@msg Line Gap must be a number Separación entre líneas debe ser un número +@msg `at` must be a point [x, y] `at` debe ser un punto [x, y] +@msg `points` must hold from 2 to 100000 points `points` debe contener entre 2 y 100000 puntos +@msg `rect` must be [x, y, width, height] `rect` debe ser [x, y, width, height] +@msg `tolerance` must be from 0 to 100 pt `tolerance` debe estar entre 0 y 100 pt +@msg `warichuAlign` must be one of {_1} `warichuAlign` debe ser uno de estos: {_1} +@msg `warichuLines` must be a whole number from {_1} to {_2} `warichuLines` debe ser un número entero entre {_1} y {_2} +@msg bad point {v}: expected [x, y] punto incorrecto {v}: se esperaba [x, y] +@msg give exactly one of `at`, `rect` and `points` indica exactamente uno de `at`, `rect` y `points` +@msg the line is too long, or the paths it passes too many, to check la línea es demasiado larga, o pasa por demasiados trazados, para comprobarla +@msg the paths are too many or too tangled to find where they cross hay demasiados trazados, o están demasiado enredados, para hallar sus cruces +@msg the rectangle or line reaches too many paths to check el rectángulo o la línea alcanza demasiados trazados para comprobarlos +@msg {name} must be a number {name} debe ser un número Banner Hems and Grommets… Dobladillos y ojales de pancarta… Banner Hems and Grommets Dobladillos y ojales de pancarta Hem Dobladillo @@ -8572,6 +10361,17 @@ breakText Glyphs Glifos @msg A joint does not close by {gap} pt. Una unión no cierra por {gap} pt. @msg Two panels pass through each other. Dos paneles se atraviesan entre sí. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer debe ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" + Tap Pulsación breve + Clear Hold Borrar pulsación larga + Hold Shortcuts Métodos abreviados de pulsación larga + Hold Shortcut Delay Retardo de pulsación larga + How hold shortcuts work Cómo funcionan los métodos abreviados de pulsación larga + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Haz clic y presiona una tecla que mantener pulsada para esto (Esc cancela). Mantener pulsada la tecla ejecuta esto; una pulsación breve ejecuta el método abreviado propio de la tecla. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Una pulsación breve de una tecla ejecuta su método abreviado. Mantener pulsada la tecla durante el retardo ejecuta en su lugar la herramienta o el comando de su columna Mantener pulsado. Un método abreviado de pulsación larga es una tecla de letra, dígito o puntuación, sola o con Shift. +@msg Hold {_1} is already used by {_2} La pulsación larga de {_1} ya la usa {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) un método abreviado de pulsación larga es una tecla que escribe un carácter, sola o con Shift ({shown} tiene Cmd, Ctrl o Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} no puede ser un método abreviado de pulsación larga: usa una letra, un dígito o una tecla de puntuación + Dashed Arrow Flecha discontinua @msg a line or other open path that encloses no area contributes no area to the compound shape; to include it, apply Object › Path › Outline Stroke to it first una línea u otro trazado abierto que no encierra ningún área no aporta ningún área a la forma compuesta; para incluirlo, aplícale primero Objeto › Trazado › Contornear trazo Pressure Sensitive Sensible a la presión Flex Ribbon Cinta flexible diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 3813cf936e..873d339833 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -810,6 +810,9 @@ Magic Wand Taikasauva Navigator Navigaattori Navigator Panel Options Navigaattori-paneelin asetukset + Attributes Panel Options Määritteet-paneelin asetukset + Number of Recent URLs: Viimeisimpien URL-osoitteiden määrä: +@msg `count` must be a whole number from 1 to 30 `count` on oltava kokonaisluku 1–30 Draw Dashed Lines as Solid Lines Piirrä katkoviivat yhtenäisinä viivoina Pattern Options Kuvion asetukset Properties Ominaisuudet @@ -1559,6 +1562,7 @@ lighting Light Valo Save Actions… Tallenna toiminnot… Load Actions… Lataa toiminnot… Replace Actions… Korvaa toiminnot… + Clear Actions Tyhjennä toiminnot Reset Actions Palauta toiminnot Replace the current actions with the default set? Korvataanko nykyiset toiminnot oletussarjalla? Append adds the default set after the current sets instead. Lisää-painike lisää sen sijaan oletussarjan nykyisten sarjojen perään. @@ -1908,6 +1912,7 @@ digits Malayalam Malajalam Duplicate Action or Action Set Monista toiminto tai toimintosarja Delete the action set “{name}” and its actions? Poistetaanko toimintosarja ”{name}” ja sen toiminnot? Delete the selected action sets and their actions? Poistetaanko valitut toimintosarjat ja niiden toiminnot? + Delete all action sets and their actions? Poistetaanko kaikki toimintosarjat ja niiden toiminnot? Delete these {n} graphic styles? Poistetaanko nämä {n} grafiikkatyyliä? Delete this {n} graphic style? Poistetaanko tämä {n} grafiikkatyyli? Graphic Style Libraries Menu Grafiikkatyylikirjastojen valikko @@ -4288,6 +4293,7 @@ theme Appearance Ulkoasu Set Tab Stops Aseta sarkainkohdat Tab Stops Sarkainkohdat Flare Häikäisy + Edit Flare Muokkaa häikäisyä Rays Säteet Rectangle Suorakulmio Paintbrush Maalaussivellin @@ -4572,6 +4578,8 @@ font-technology Variable Muuttuvat The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Hiiren rulla vierittää piirtopintaa sivuttain, kun Cmd/Ctrl on painettuna. Dragging sideways on a numeric field's label changes the field's value. Numerokentän nimiön vetäminen sivuttain muuttaa kentän arvoa. A two-finger rotate gesture on a trackpad rotates the canvas view. Kahden sormen kiertoele kosketuslevyllä kiertää piirtopinnan näkymää. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Näppäimen pitäminen painettuna suorittaa työkalun tai komennon sen Pidä pohjassa -sarakkeesta Pikanäppäimissä; lyhyt painallus suorittaa sen tavallisen pikanäppäimen. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Kuinka monta sekuntia näppäintä on pidettävä painettuna, ennen kuin tavallisen pikanäppäimen sijaan suoritetaan sen pitkän painalluksen pikanäppäin. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Kun siirrät ankkuripisteitä, jokainen käyrä, jonka toinen pää siirtyy, säilyttää muotonsa suhteessa päihinsä. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Työkalun pikanäppäimen pitäminen painettuna valitsee työkalun, kunnes päästät irti, ja sitten edellinen työkalu valitaan uudelleen. Shows the bounding box while you move the selection or draw a shape. Näyttää rajausruudun, kun siirrät valintaa tai piirrät muotoa. @@ -5459,6 +5467,7 @@ liquify-list-end {0}, {1} {0} ja {1} @msg no graphic style `{n}` ei grafiikkatyyliä `{n}` @msg no interaction in progress mikään vuorovaikutus ei ole käynnissä @msg no key object ei avainobjektia +@msg Align to Key Object isn't available with the Artboard tool ”Tasaa avainobjektiin” ei ole käytettävissä piirtoalustatyökalulla @msg no library `{key}` (see {list}) ei kirjastoa `{key}` (ks. {list}) @msg no native format ei omaa tiedostomuotoa @msg no pages ei sivuja @@ -5514,6 +5523,8 @@ liquify-list-end {0}, {1} {0} ja {1} @msg no such spine point selkärangan pistettä ei ole @msg `with` must be a list of at most 10000 spine point indexes `with`-arvon on oltava luettelo, jossa on enintään 10000 selkärangan pisteen indeksiä @msg `with` moves points, not a handle `with` siirtää pisteitä, ei kahvaa +@msg `link` and `independent` cannot both be true `link` ja `independent` eivät voi olla molemmat true +@msg `link` places a handle: give `handle` `link` sijoittaa kahvan: anna `handle` @msg no such spine segment selkärangan segmenttiä ei ole @msg no such subpath alipolkua ei ole @msg no such user library käyttäjäkirjastoa ei ole @@ -5606,6 +5617,7 @@ liquify-list-end {0}, {1} {0} ja {1} @msg select a blend valitse sulautus @msg select a blend or give `id` valitse sulautus tai anna sen `id` @msg select a clip group valitse leikkausryhmä +@msg select a flare valitse häikäisy @msg select a gradient mesh valitse liukuväriverkko @msg select a linked image: an embedded one has no file valitse linkitetty kuva: upotetulla kuvalla ei ole tiedostoa @msg select a repeat valitse toisto @@ -5856,6 +5868,7 @@ variable-list-end {0}, {1} {0} ja {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} linkitetty kuva muuttui levyllä: Päivitä linkit näyttää uuden version|{n} linkitettyä kuvaa muuttui levyllä: Päivitä linkit näyttää uudet versiot @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Päivitettiin {n} levyllä muuttunut linkitetty tiedosto|Päivitettiin {n} levyllä muuttunutta linkitettyä tiedostoa @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings asiakirjassa on leikkuuvara, jonka tämä PDF/X-tiedosto jättää pois: ota käyttöön ”Käytä asiakirjan leikkuuvara-asetuksia” +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objekti ulottuu leikkuureunaan mutta ei leikkuuvaraan|{n} objektia ulottuu leikkuureunaan mutta ei leikkuuvaraan @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Vietiin {what}, {n} huomautus: {first}|Vietiin {what}, {n} huomautusta: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} fonttitiedosto on nyt kansiossa {folder}|{n} fonttitiedostoa on nyt kansiossa {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} fonttitiedosto on nyt kansiossa {folder}; {failed} ei voitu lisätä: {reason}|{n} fonttitiedostoa on nyt kansiossa {folder}; {failed} ei voitu lisätä: {reason} @@ -6858,6 +6871,9 @@ mark-style Japanese Japanilainen Continue in Background Jatka taustalla Cancel Export Peruuta vienti @msg Export cancelled Vienti peruutettiin + Cancel Save Peruuta tallennus +@plural {n} more save waiting|{n} more saves waiting {n} tallennus odottaa|{n} tallennusta odottaa +@msg Save canceled Tallennus peruutettiin # Paragraph panel menu › Justification… Desired Haluttu Word Spacing: Sanaväli: @@ -7449,6 +7465,12 @@ axis Y Axis Y-akseli Bus Lines Väylälinjat Terminal Nodes Liitäntäpisteet +# Original arrow art brushes. + Arrows Nuolet + Solid Arrow Umpinainen nuoli + Open Arrow Avoin nuoli + Chevron Arrow Kulmanuoli + Notched Ribbon Lovettu nauha Double Line Kaksoisviiva Wave Aalto @@ -8133,10 +8155,18 @@ breakText Glyphs Merkit Smooth Bridge… Pehmeä silta… Smooth Bridge Pehmeä silta Keep Originals Säilytä alkuperäiset -@msg select two circles to bridge valitse kaksi yhdistettävää ympyrää +@msg select two or more circles to bridge valitse vähintään kaksi yhdistettävää ympyrää @msg one circle is inside the other toinen ympyrä on toisen sisällä @msg the circles are too far apart for this radius: raise the radius ympyrät ovat liian kaukana toisistaan tälle säteelle: suurenna sädettä @msg the circles are too far apart for this radius ympyrät ovat liian kaukana toisistaan tälle säteelle + Constant Gap Vakioväli + Reach: Ulottuvuus: +@msg the circles are too far apart for this gap: raise the gap ympyrät ovat liian kaukana toisistaan tälle välille: suurenna väliä +@msg the circles are too far apart for this gap ympyrät ovat liian kaukana toisistaan tälle välille +@msg no two circles are within reach: raise the reach mitkään kaksi ympyrää eivät ole ulottuvilla: suurenna ulottuvuutta +@msg select at most 2000 circles to bridge valitse enintään 2000 yhdistettävää ympyrää +@msg that makes too many bridges (at most 8000): lower the reach siitä tulee liikaa siltoja (enintään 8000): pienennä ulottuvuutta +@msg the bridged circles are too complex to unite yhdistetyt ympyrät ovat liian monimutkaisia koottaviksi yhdeksi muodoksi # Path Precision Tools add-on: Common Tangents. Common Tangents… Yhteiset tangentit… Common Tangents Yhteiset tangentit @@ -8668,6 +8698,17 @@ breakText Glyphs Merkit @msg A joint does not close by {gap} pt. Liitos ei sulkeudu, rako {gap} pt. @msg Two panels pass through each other. Kaksi paneelia kulkee toistensa läpi. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer on oltava "singleLine", "everyLine", "standardSingleLine" tai "standardEveryLine" + Tap Lyhyt painallus + Clear Hold Tyhjennä pitkä painallus + Hold Shortcuts Pitkän painalluksen pikanäppäimet + Hold Shortcut Delay Pitkän painalluksen viive + How hold shortcuts work Näin pitkän painalluksen pikanäppäimet toimivat + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Napsauta ja paina sitten näppäintä, jota pidetään pohjassa tätä varten (Esc peruuttaa). Näppäimen pitäminen pohjassa suorittaa tämän; lyhyt painallus suorittaa näppäimen oman pikanäppäimen. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Näppäimen lyhyt painallus suorittaa sen pikanäppäimen. Kun näppäintä pidetään pohjassa viiveen ajan, suoritetaan sen sijaan sen Pidä pohjassa -sarakkeen työkalu tai komento. Pitkän painalluksen pikanäppäin on kirjain-, numero- tai välimerkkinäppäin yksin tai Shiftin kanssa. +@msg Hold {_1} is already used by {_2} Pitkä painallus {_1} on jo käytössä kohteella {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) pitkän painalluksen pikanäppäin on merkin kirjoittava näppäin yksin tai Shiftin kanssa ({shown} sisältää Cmd-, Ctrl- tai Alt-näppäimen) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} ei voi olla pitkän painalluksen pikanäppäin: käytä kirjainta, numeroa tai välimerkkinäppäintä + Dashed Arrow Katkoviivanuoli @msg a line or other open path that encloses no area contributes no area to the compound shape; to include it, apply Object › Path › Outline Stroke to it first viiva tai muu avoin polku, joka ei rajaa aluetta, ei lisää yhdistelmämuotoon aluetta; jos haluat sisällyttää sen, käytä siihen ensin komentoa Objekti › Polku › Ääriviivaa viiva Pressure Sensitive Paineherkkä Flex Ribbon Joustava nauha diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 89b3c49978..68bcc455b2 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -859,6 +859,7 @@ font-technology Variable Variables Duplicate Action or Action Set Dupliquer le script ou le jeu de scripts Delete the action set “{name}” and its actions? Supprimer le jeu de scripts « {name} » et ses scripts ? Delete the selected action sets and their actions? Supprimer les jeux de scripts sélectionnés et leurs scripts ? + Delete all action sets and their actions? Supprimer tous les jeux de scripts et leurs scripts ? Delete Slices Supprimer les tranches Delete Spine Point Supprimer le point de la dorsale Delete Stop Supprimer l’étape de dégradé @@ -1372,6 +1373,7 @@ font-technology Variable Variables Fit to Selected Art Ajuster à l’illustration sélectionnée Flag… Drapeau… Flare Halo + Edit Flare Modifier le halo Flare Tool Outil Halo Flare Tool Options Options de l’outil Halo Halo Halo @@ -2264,6 +2266,9 @@ font-technology Variable Variables Navigate Naviguer Navigator Navigation Navigator Panel Options Options du panneau Navigation + Attributes Panel Options Options du panneau Options d’objet + Number of Recent URLs: Nombre d’URL récentes : +@msg `count` must be a whole number from 1 to 30 `count` doit être un nombre entier compris entre 1 et 30 Draw Dashed Lines as Solid Lines Dessiner les pointillés en traits pleins Needs the desktop app Nécessite l’application de bureau Neutral Gradients Dégradés neutres @@ -2739,6 +2744,7 @@ font-technology Variable Variables Save Actions… Enregistrer les scripts… Load Actions… Charger des scripts… Replace Actions… Remplacer les scripts… + Clear Actions Effacer les scripts Reset Actions Réinitialiser les scripts Replace the current actions with the default set? Remplacer les scripts actuels par le jeu par défaut ? Append adds the default set after the current sets instead. Le bouton Ajouter ajoute plutôt le jeu par défaut après les jeux actuels. @@ -3181,6 +3187,8 @@ digits Malayalam Malayalam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La molette de la souris avec Cmd/Ctrl enfoncée fait défiler la zone de travail latéralement. Dragging sideways on a numeric field's label changes the field's value. Faire glisser latéralement le libellé d’un champ numérique modifie la valeur du champ. A two-finger rotate gesture on a trackpad rotates the canvas view. Un geste de rotation à deux doigts sur un pavé tactile fait pivoter la vue de la zone de travail. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Maintenir une touche exécute l’outil ou la commande de sa colonne Maintenir dans Raccourcis clavier. Un appui bref exécute son raccourci habituel. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Durée, en secondes, pendant laquelle une touche doit être maintenue pour que son raccourci de maintien s’exécute à la place de son raccourci habituel. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Quand vous déplacez des points d’ancrage, chaque courbe dont une extrémité bouge garde sa forme par rapport à ses extrémités. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Maintenir le raccourci d’un outil choisit cet outil jusqu’à ce que vous le relâchiez, puis l’outil précédent est de nouveau choisi. Shows the bounding box while you move the selection or draw a shape. Affiche le cadre de sélection pendant que vous déplacez la sélection ou dessinez une forme. @@ -5207,6 +5215,7 @@ liquify-list-end {0}, {1} {0} et {1} @msg no graphic style `{n}` aucun style graphique `{n}` @msg no interaction in progress aucune interaction en cours @msg no key object aucun objet clé +@msg Align to Key Object isn't available with the Artboard tool L’alignement sur l’objet clé n’est pas disponible avec l’outil Plan de travail @msg no library `{key}` (see {list}) aucune bibliothèque `{key}` (voir {list}) @msg no native format aucun format natif @msg no pages aucune page @@ -5262,6 +5271,8 @@ liquify-list-end {0}, {1} {0} et {1} @msg no such spine point point de la dorsale inexistant @msg `with` must be a list of at most 10000 spine point indexes `with` doit être une liste d’au plus 10000 indices de points de la dorsale @msg `with` moves points, not a handle `with` déplace des points, pas une poignée +@msg `link` and `independent` cannot both be true `link` et `independent` ne peuvent pas valoir true tous les deux +@msg `link` places a handle: give `handle` `link` place une poignée : indiquez `handle` @msg no such spine segment segment de la dorsale inexistant @msg no such subpath sous-tracé inexistant @msg no such user library bibliothèque utilisateur inexistante @@ -5351,6 +5362,7 @@ liquify-list-end {0}, {1} {0} et {1} @msg select a blend sélectionnez un dégradé de formes @msg select a blend or give `id` sélectionnez un dégradé de formes ou indiquez son `id` @msg select a clip group sélectionnez un groupe d’écrêtage +@msg select a flare sélectionnez un halo @msg select a gradient mesh sélectionnez un filet de dégradé @msg select a linked image: an embedded one has no file sélectionnez une image liée : une image incorporée n’a pas de fichier @msg select a repeat sélectionnez une répétition @@ -5606,6 +5618,7 @@ variable-list-end {0}, {1} {0} et {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} image liée modifiée sur le disque : Mettre à jour les liens affiche la nouvelle version|{n} images liées modifiées sur le disque : Mettre à jour les liens affiche les nouvelles versions @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk {n} fichier lié modifié sur le disque mis à jour|{n} fichiers liés modifiés sur le disque mis à jour @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings le document définit un fond perdu que ce fichier PDF/X omet : activez « Utiliser les paramètres de fond perdu du document » +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objet atteint le bord de coupe mais s’arrête avant le fond perdu|{n} objets atteignent le bord de coupe mais s’arrêtent avant le fond perdu @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} exporté avec {n} remarque : {first}|{what} exporté avec {n} remarques : {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} fichier de polices se trouve maintenant dans {folder}|{n} fichiers de polices se trouvent maintenant dans {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} fichier de polices se trouve maintenant dans {folder} ; {failed} n’ont pas pu être ajoutés : {reason}|{n} fichiers de polices se trouvent maintenant dans {folder} ; {failed} n’ont pas pu être ajoutés : {reason} @@ -6863,6 +6876,9 @@ theme Appearance Apparence Continue in Background Continuer en arrière-plan Cancel Export Annuler l’exportation @msg Export cancelled Exportation annulée + Cancel Save Annuler l’enregistrement +@plural {n} more save waiting|{n} more saves waiting {n} autre enregistrement en attente|{n} autres enregistrements en attente +@msg Save canceled Enregistrement annulé # Paragraph panel menu › Justification… Desired Optimal Word Spacing: Espacement des mots : @@ -7381,6 +7397,12 @@ axis Y Axis Axe Y Bus Lines Lignes de bus Terminal Nodes Nœuds terminaux +# Original arrow art brushes. + Arrows Flèches + Solid Arrow Flèche pleine + Open Arrow Flèche ouverte + Chevron Arrow Flèche à chevron + Notched Ribbon Ruban cranté Double Line Double ligne Wave Vague @@ -8065,10 +8087,18 @@ breakText Glyphs Glyphes Smooth Bridge… Pont lissé… Smooth Bridge Pont lissé Keep Originals Conserver les originaux -@msg select two circles to bridge sélectionnez deux cercles à relier +@msg select two or more circles to bridge sélectionnez au moins deux cercles à relier @msg one circle is inside the other un cercle est à l’intérieur de l’autre @msg the circles are too far apart for this radius: raise the radius les cercles sont trop éloignés pour ce rayon : augmentez le rayon @msg the circles are too far apart for this radius les cercles sont trop éloignés pour ce rayon + Constant Gap Écart constant + Reach: Portée : +@msg the circles are too far apart for this gap: raise the gap les cercles sont trop éloignés pour cet écart : augmentez l’écart +@msg the circles are too far apart for this gap les cercles sont trop éloignés pour cet écart +@msg no two circles are within reach: raise the reach aucun couple de cercles n’est à portée : augmentez la portée +@msg select at most 2000 circles to bridge sélectionnez au plus 2000 cercles à relier +@msg that makes too many bridges (at most 8000): lower the reach cela crée trop de ponts (au plus 8000) : réduisez la portée +@msg the bridged circles are too complex to unite les cercles reliés sont trop complexes pour être réunis # Path Precision Tools add-on: Common Tangents. Common Tangents… Tangentes communes… Common Tangents Tangentes communes @@ -10361,6 +10391,16 @@ breakText Glyphs Glyphes No objects are selected. Aucun objet n’est sélectionné. Open a document to mark its fold lines. Ouvrez un document pour marquer ses lignes de pliage. Remove Fold Line Role Supprimer le type de ligne + Tap Appui bref + Clear Hold Effacer le maintien + Hold Shortcuts Raccourcis de maintien + Hold Shortcut Delay Délai des raccourcis de maintien + How hold shortcuts work Fonctionnement des raccourcis de maintien + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Cliquez, puis appuyez sur une touche à maintenir pour cet élément (Échap annule). Maintenir la touche exécute cet élément ; un appui bref exécute le raccourci propre à la touche. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Un appui bref sur une touche exécute son raccourci. Maintenir la touche pendant le délai exécute à la place l’outil ou la commande de sa colonne Maintenir. Un raccourci de maintien est une touche de lettre, de chiffre ou de ponctuation, seule ou avec Maj. +@msg Hold {_1} is already used by {_2} Le maintien de {_1} est déjà utilisé par {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) un raccourci de maintien est une touche qui saisit un caractère, seule ou avec Maj ({shown} comporte Cmd, Ctrl ou Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} ne peut pas être un raccourci de maintien : utilisez une lettre, un chiffre ou une touche de ponctuation Check Vérifier Check Fold Lines Vérifier les lignes de pliage @msg No cut lines are in the selection. La sélection ne contient aucune ligne de découpe. @@ -10392,6 +10432,7 @@ breakText Glyphs Glyphes @msg A joint does not close by {gap} pt. Un joint ne se ferme pas, avec un écart de {gap} pt. @msg Two panels pass through each other. Deux panneaux se traversent. @msg {_1} × {_2} pixels is too large for GIF (at most 65535 pixels a side): lower the resolution {_1} × {_2} pixels, c’est trop grand pour le GIF (65535 pixels par côté au plus) : réduisez la résolution + Dashed Arrow Flèche en pointillés Pressure Sensitive Sensible à la pression Flex Ribbon Ruban souple Pulse Stroke Trait pulsé diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index aa843b5791..d7bb081e02 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -502,6 +502,7 @@ Can't save “{name}”. “{name}” સાચવી શકાતી નથી. Cancel રદ કરો Cancel Export નિકાસ રદ કરો + Cancel Save સાચવવાનું રદ કરો Cancel Image Trace ઇમેજ ટ્રેસ રદ કરો Cancel Key Object કી ઑબ્જેક્ટ રદ કરો Cancel Opening ખોલવાનું રદ કરો @@ -735,6 +736,7 @@ Constrain મર્યાદિત કરો Constrain Angle ખૂણો મર્યાદિત કરો Constrain Width and Height Proportions પહોળાઈ અને ઊંચાઈનો પ્રમાણ મર્યાદિત કરો + Constant Gap સ્થિર ગેપ Copy Width to Height પહોળાઈને ઊંચાઈમાં નકલ કરો Construction Guides બાંધકામ ગાઇડ્સ Contextual Alternates સંદર્ભિત વૈકલ્પિક અક્ષરો @@ -1482,6 +1484,7 @@ Fix Selected પસંદ કરેલું ઠીક કરો Flag… ફ્લેગ… Flare ફ્લેર + Edit Flare ફ્લેર સંપાદિત કરો Flare Tool ફ્લેર ટૂલ Flare Tool Options ફ્લેર ટૂલ વિકલ્પો Flat Image ફ્લેટ છબી @@ -2117,6 +2120,8 @@ Live preview લાઇવ પૂર્વાવલોકન Load Actions… ઍક્શન લોડ કરો… Replace Actions… ઍક્શન બદલો… + Clear Actions ઍક્શન સાફ કરો + Delete all action sets and their actions? બધા ઍક્શન સેટ અને તેમની ઍક્શન કાઢી નાખવી છે? Reset Actions ઍક્શન રીસેટ કરો Replace the current actions with the default set? વર્તમાન ઍક્શનને ડિફૉલ્ટ સેટથી બદલવા છે? Append adds the default set after the current sets instead. ઉમેરો તેના બદલે ડિફૉલ્ટ સેટને વર્તમાન સેટ પછી ઉમેરે છે. @@ -2350,6 +2355,9 @@ Navigate નેવિગેટ કરો Navigator નેવિગેટર Navigator Panel Options નેવિગેટર પૅનલ વિકલ્પો + Attributes Panel Options ગુણધર્મો પૅનલ વિકલ્પો + Number of Recent URLs: તાજેતરના URLની સંખ્યા: +@msg `count` must be a whole number from 1 to 30 `count` 1 થી 30 સુધીની પૂર્ણ સંખ્યા હોવી જોઈએ Needs Attention Only માત્ર ધ્યાન માગતા Needs a choice પસંદગી જરૂરી Needs a key કીની જરૂર છે @@ -2966,6 +2974,7 @@ Rating: રેટિંગ: Ratio ગુણોત્તર Rays કિરણો + Reach: પહોંચ: Read Action Set File ક્રિયા સેટ ફાઇલ વાંચો Read Shortcut Set File શોર્ટકટ સેટ ફાઇલ વાંચો Read files you open in its format and make documents from them તમે ખોલો તે ફાઇલોને તેના ફોર્મેટમાં વાંચો અને તેમાંથી દસ્તાવેજ બનાવો @@ -3240,6 +3249,8 @@ The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl દબાવી રાખીને માઉસ વ્હીલ ફેરવવાથી કેનવાસ બાજુમાં સ્ક્રોલ થાય છે. Dragging sideways on a numeric field's label changes the field's value. સંખ્યાત્મક ફીલ્ડના લેબલ પર બાજુમાં ખેંચવાથી ફીલ્ડનું મૂલ્ય બદલાય છે. A two-finger rotate gesture on a trackpad rotates the canvas view. ટ્રેકપેડ પર બે આંગળીથી ફેરવવાનો હાવભાવ કેનવાસનું દૃશ્ય ફેરવે છે. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. કી દબાવી રાખવાથી કીબોર્ડ શૉર્ટકટમાં તેની હોલ્ડ કૉલમનું ટૂલ અથવા કમાન્ડ ચાલે છે; ટૂંકું દબાણ તેનો સામાન્ય શોર્ટકટ ચલાવે છે. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. કીનો હોલ્ડ શોર્ટકટ તેના સામાન્ય શોર્ટકટને બદલે ચાલે તે પહેલાં કીને કેટલી સેકન્ડ દબાવી રાખવી પડે. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. જ્યારે તમે એન્કર પોઇન્ટ ખસેડો છો, ત્યારે એક ખસેલા છેડાવાળો દરેક વળાંક તેના છેડાઓની સાપેક્ષે પોતાનો આકાર જાળવે છે. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. ટૂલની શોર્ટકટ કી દબાવી રાખવાથી છોડો ત્યાં સુધી તે ટૂલ પસંદ રહે છે, પછી અગાઉનું ટૂલ ફરી પસંદ થાય છે. Shows the bounding box while you move the selection or draw a shape. તમે પસંદગી ખસેડો કે આકાર દોરો ત્યારે બાઉન્ડિંગ બોક્સ બતાવે છે. @@ -4623,6 +4634,7 @@ antiAlias Sharp શાર્પ Gurmukhi ગુરમુખી @plural Result: {n}|Results: {n} પરિણામ: {n}|પરિણામો: {n} @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings દસ્તાવેજ એવી બ્લીડ સેટ કરે છે જે આ PDF/X ફાઇલ છોડી દે છે: "દસ્તાવેજની બ્લીડ સેટિંગ્સ વાપરો" ચાલુ કરો +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} ઑબ્જેક્ટ ટ્રિમ કિનારી સુધી પહોંચે છે પણ બ્લીડ પહેલાં અટકી જાય છે|{n} ઑબ્જેક્ટ ટ્રિમ કિનારી સુધી પહોંચે છે પણ બ્લીડ પહેલાં અટકી જાય છે @msgplural Saved {path} with {n} note: {first}|Saved {path} with {n} notes: {first} {path} સાચવ્યું, {n} નોંધ સાથે: {first}|{path} સાચવ્યું, {n} નોંધો સાથે: {first} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {folder} માં {n} ફાઇલ ({note}) પેકેજ થઈ|{folder} માં {n} ફાઇલો ({note}) પેકેજ થઈ @msgplural Packaged {n} file {note}|Packaged {n} files {note} {n} ફાઇલ પેકેજ થઈ {note}|{n} ફાઇલો પેકેજ થઈ {note} @@ -4872,6 +4884,13 @@ antiAlias Sharp શાર્પ Bus Lines બસ રેખાઓ Terminal Nodes ટર્મિનલ નોડ્સ +# Original arrow art brushes. + Arrows તીરો + Solid Arrow ભરેલું તીર + Open Arrow ખુલ્લું તીર + Double Arrow બેવડું તીર + Chevron Arrow શેવરોન તીર + Notched Ribbon ખાંચાવાળી રિબન Double Line બેવડી રેખા Wave તરંગ @@ -5341,7 +5360,6 @@ swatch [Registration] [રજિસ્ટ્રેશન] Gem રત્ન Hexagon ષટ્કોણ Key ચાવી - Panel પેનલ Pin પિન Potion ઔષધ Rounded Square ગોળ ખૂણાવાળો ચોરસ @@ -5413,6 +5431,17 @@ swatch [Registration] [રજિસ્ટ્રેશન] Standard Single-line Composer સ્ટાન્ડર્ડ સિંગલ-લાઇન કમ્પોઝર Standard Every-line Composer સ્ટાન્ડર્ડ એવરી-લાઇન કમ્પોઝર @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer આમાંથી એક હોવું જોઈએ: "singleLine", "everyLine", "standardSingleLine" અથવા "standardEveryLine" + Tap ટૂંકું દબાણ + Clear Hold હોલ્ડ સાફ કરો + Hold Shortcuts હોલ્ડ શોર્ટકટ + Hold Shortcut Delay હોલ્ડ શોર્ટકટ વિલંબ + How hold shortcuts work હોલ્ડ શોર્ટકટ કેવી રીતે કામ કરે છે + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. ક્લિક કરો, પછી આ માટે દબાવી રાખવાની કી દબાવો (Esc રદ કરે છે). કી દબાવી રાખવાથી આ ચાલે છે; ટૂંકું દબાણ કીનો પોતાનો શોર્ટકટ ચલાવે છે. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. કીને ટૂંકું દબાવવાથી તેનો શોર્ટકટ ચાલે છે. વિલંબ જેટલો સમય કી દબાવી રાખવાથી તેના બદલે તેની હોલ્ડ કૉલમમાંનું ટૂલ અથવા આદેશ ચાલે છે. હોલ્ડ શોર્ટકટ એ અક્ષર, અંક અથવા વિરામચિહ્નની કી છે, એકલી અથવા Shift સાથે. +@msg Hold {_1} is already used by {_2} હોલ્ડ {_1} પહેલેથી {_2} વાપરે છે +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) હોલ્ડ શોર્ટકટ એ અક્ષર લખતી કી છે, એકલી અથવા Shift સાથે ({shown} માં Cmd, Ctrl અથવા Alt છે) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} હોલ્ડ શોર્ટકટ ન હોઈ શકે: અક્ષર, અંક અથવા વિરામચિહ્નની કી વાપરો + Dashed Arrow તૂટક તીર Pressure Sensitive દબાણ સંવેદનશીલ Flex Ribbon લવચીક પટ્ટી Pulse Stroke ધબકતો ઘસારો diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 5adcb04aa9..2837a15b67 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -458,6 +458,12 @@ antiAlias Sharp शार्प Bus Lines बस रेखाएँ Terminal Nodes टर्मिनल नोड +# Original arrow art brushes. + Arrows तीर ब्रश + Solid Arrow ठोस तीर + Open Arrow खुला तीर + Chevron Arrow शेवरॉन तीर + Notched Ribbon नोकदार रिबन Double Line दोहरी लाइन Wave लहर @@ -1295,6 +1301,7 @@ antiAlias Sharp शार्प Connect Selected End Points सिलेक्टेड एंड पॉइंट्स कनेक्ट करें Consider Open Filled Paths as Closed बंद के रूप में ओपन भरा पाथ पर विचार करें Consolidate All Windows सभी विंडो एक साथ लाएँ + Constant Gap स्थिर गैप Constrain सीमित करें Constrain Angle कंस्ट्रेन एंगल Constrain Width and Height Proportions चौड़ाई और ऊंचाई का अनुपात बनाए रखें @@ -1628,6 +1635,7 @@ antiAlias Sharp शार्प Delete the graphic style “{name}”? ग्राफिक स्टाइल "{name}" को हटा दें? Delete the library “{name}”? लाइब्रेरी "{name}" को हटा दें? Delete the selected action sets and their actions? सिलेक्टेड कार्रवाई सेट और उनके कार्यों को हटा दें? + Delete all action sets and their actions? सभी कार्रवाई सेट और उनके कार्यों को हटा दें? Delete the selected brushes? सिलेक्टेड ब्रश को हटा दें? Delete the selected symbol? सिलेक्टेड सिंबल हटाएँ? Delete the selected symbols? सिलेक्टेड सिंबल्स हटाएँ? @@ -2281,6 +2289,7 @@ antiAlias Sharp शार्प Fixed निश्चित Flag… झंडा… Flare फ्लेयर + Edit Flare फ्लेयर संपादित करें Flare Tool फ्लेयर टूल Flare Tool Options फ़्लेयर टूल ऑप्शन्स Flat Angle फ्लैट कोण @@ -3085,6 +3094,7 @@ antiAlias Sharp शार्प Live Shape Properties लाइव शेप प्रॉपर्टीज़ Load Actions… एक्शन्स लोड करें… Replace Actions… एक्शन्स रिप्लेस करें… + Clear Actions एक्शन्स क्लियर करें Reset Actions एक्शन्स रीसेट करें Replace the current actions with the default set? मौजूदा एक्शन्स को डिफ़ॉल्ट सेट से बदलें? Append adds the default set after the current sets instead. जोड़ें इसके बजाय डिफ़ॉल्ट सेट को मौजूदा सेट के बाद जोड़ता है। @@ -3367,6 +3377,9 @@ antiAlias Sharp शार्प Navigate नेविगेट करें Navigator नेविगेटर Navigator Panel Options नेविगेटर पैनल ऑप्शन्स + Attributes Panel Options एट्रिब्यूट्स पैनल ऑप्शन्स + Number of Recent URLs: हाल के URL की संख्या: +@msg `count` must be a whole number from 1 to 30 `count` 1 से 30 तक पूरी संख्या होना चाहिए Nearly Closed Paths लगभग बंद पाथ Nearly Coincident Anchors लगभग Coincident एंकर Needless Clipping Groups अनावश्यक क्लिपिंग समूह @@ -4224,6 +4237,7 @@ antiAlias Sharp शार्प Rating: रेटिंग: Ratio अनुपात Rays रे + Reach: पहुँच: Read Action Set File एक्शन सेट फ़ाइल पढ़ें Read Shortcut Set File शॉर्टकट सेट फ़ाइल पढ़ें Reads or sets environment variables एनवायरनमेंट वेरिएबल्स पढ़ता है या सेट करता है @@ -4552,6 +4566,8 @@ antiAlias Sharp शार्प The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl दबाकर माउस व्हील घुमाने से कैनवास बगल की ओर स्क्रॉल होता है। Dragging sideways on a numeric field's label changes the field's value. किसी संख्या वाले फ़ील्ड के लेबल पर बगल की ओर ड्रैग करने से फ़ील्ड का मान बदलता है। A two-finger rotate gesture on a trackpad rotates the canvas view. ट्रैकपैड पर दो उंगलियों से घुमाने का जेस्चर कैनवास के व्यू को घुमाता है। + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. किसी कुंजी को दबाए रखने पर कीबोर्ड शॉर्टकट में उसके होल्ड कॉलम का टूल या कमांड चलता है; जल्दी दबाने पर उसका सामान्य शॉर्टकट चलता है। + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. किसी कुंजी को कितने सेकंड दबाए रखना होगा, ताकि उसके सामान्य शॉर्टकट के बजाय उसका होल्ड शॉर्टकट चले। When you move anchor points, each curve with one moved end keeps its shape relative to its ends. जब आप एंकर पॉइंट हिलाते हैं, तो एक हिले हुए सिरे वाला हर वक्र अपने सिरों के सापेक्ष अपना आकार बनाए रखता है। Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. किसी टूल की शॉर्टकट कुंजी दबाए रखने पर वह टूल छोड़ने तक चुना रहता है, फिर पिछला टूल दोबारा चुना जाता है। Shows the bounding box while you move the selection or draw a shape. सिलेक्शन खिसकाते या आकार ड्रॉ करते समय बाउंडिंग बॉक्स दिखाता है। @@ -6946,6 +6962,8 @@ antiAlias Sharp शार्प @msg `version`, `description` or `author` is too long `version`, `description` या `author` बहुत लंबा है @msg `warnings` must be a list of strings `warnings` स्ट्रिंग की एक सूची होना चाहिए @msg `with` moves points, not a handle `with` पॉइंट मूव करता है, हैंडल नहीं +@msg `link` and `independent` cannot both be true `link` और `independent` दोनों true नहीं हो सकते +@msg `link` places a handle: give `handle` `link` एक हैंडल रखता है: `handle` दें @msg `with` must be a list of at most 10000 spine point indexes `with` में अधिकतम 10000 स्पाइन पॉइंट इंडेक्स की लिस्ट होनी चाहिए @msg a {_1} series can't go in a {_2} graph एक {_1} श्रृंखला एक {_2} ग्राफ में नहीं जा सकती @msg a {width}×{height} screenshot's byte count overflows {width}×{height} स्क्रीनशॉट की बाइट संख्या सीमा से बाहर है @@ -7647,6 +7665,9 @@ liquify-list-end {0}, {1} {0} और {1} @msg expected {{"objects": [...]}} अपेक्षित: {{"objects": [...]}} @msg export `{name}`: {e} निर्यात `{name}`: {e} @msg Export cancelled निर्यात रद्द + Cancel Save सेव रद्द करना +@plural {n} more save waiting|{n} more saves waiting {n} और सेव प्रतीक्षा में|{n} और सेव प्रतीक्षा में +@msg Save canceled सेव रद्द @msg Export for Screens writes png, png8, jpg, webp, gif, tiff, bmp, tga, psd, svg, svgz, pdf, eps, ai or vectorcraft स्क्रीन के लिए एक्सपोर्ट png, png8, jpg, webp, gif, tiff, bmp, tga, psd, svg, svgz, pdf, eps, ai या vectorcraft लिखता है @msg export presets file is larger than {MAX_PRESET_FILE_BYTES} bytes निर्यात प्रीसेट फ़ाइल {MAX_PRESET_FILE_BYTES} bytes से बड़ा है @msg Exported {path} {path} एक्सपोर्ट किया गया @@ -8174,6 +8195,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg no item at index {from} इंडेक्स {from} पर कोई आइटम नहीं @msg no item at one of the indices {idx} indices {idx} में से एक पर कोई आइटम नहीं @msg no key object कोई कुंजी ऑब्जेक्ट नहीं +@msg Align to Key Object isn't available with the Artboard tool आर्टबोर्ड टूल के साथ "मुख्य ऑब्जेक्ट पर संरेखित करें" उपलब्ध नहीं है @msg no layer कोई लेयर नहीं @msg no layer {id} (see layer.list) कोई लेयर {id} (layer.list देखें) @msg no layers to export निर्यात करने के लिए कोई लेयरें नहीं @@ -8436,6 +8458,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg Offset Path: select paths ऑफसेट पाथ: सिलेक्शन पाथ @msg Offset Path: the offset leaves nothing of the selected paths (an inset larger than the shapes) ऑफसेट पाथ: ऑफ़सेट सिलेक्टेड पाथ की कुछ भी नहीं छोड़ता है (आकार की तुलना में एक निर्धारित बड़ा) @msg Offset Path: the path is too complex to offset ऑफसेट पाथ: पाथ ऑफसेट करने के लिए बहुत जटिल है +@msg no two circles are within reach: raise the reach कोई भी दो वृत्त पहुँच के भीतर नहीं हैं: पहुँच बढ़ाएँ @msg on must be true or false on को true या false होना चाहिए @msg one circle is inside the other एक वृत्त दूसरे के अंदर है @msg only a dock group above or below others collapses, not one beside another केवल दूसरों के ऊपर या नीचे एक डॉक समूह गिर जाता है, एक दूसरे के बगल में नहीं @@ -8651,6 +8674,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg select a blend or give `id` एक मिश्रण सिलेक्ट करें या `id` देना @msg select a blend to set easing or color shift Easing या रंग शिफ्ट सेट करने के लिए एक मिश्रण सिलेक्ट करें @msg select a clip group एक क्लिप समूह चुनें +@msg select a flare एक फ्लेयर चुनें @msg select a compound shape एक मिश्रित आकार चुनें @msg Select a dimension first पहले आयाम सिलेक्ट करें @msg select a gradient mesh एक ग्रेडिएंट जाल सिलेक्ट करें @@ -8705,6 +8729,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg select artwork to make a group of its colours अपने रंगों का एक समूह बनाने के लिए आर्टवर्क सिलेक्ट करें @msg select artwork to recolour, or give a colour `group` रंग बदलने के लिए आर्टवर्क चुनें या रंग `group` दें @msg select at least two objects कम से कम दो ऑब्जेक्ट चुनें +@msg select at most 2000 circles to bridge जोड़ने के लिए अधिकतम 2000 वृत्त चुनें @msg Select dimensions to update अद्यतन करने के लिए आयाम सिलेक्ट करें @msg select exactly two objects वास्तव में दो ऑब्जेक्ट चुनें @msg select exactly two path ends to join जोड़ने के लिए ठीक दो पाथ एंड पॉइंट्स सिलेक्ट करें @@ -8784,7 +8809,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg select the objects to attach to the path ऑब्जेक्ट्स का सिलेक्ट करने के लिए संलग्न करने के लिए पाथ @msg select the objects to bind ऑब्जेक्ट्स को बांधने के लिए चुनें @msg select the objects to transform in perspective ऑब्जेक्ट्स को पर्सपेक्टिव में बदलने के लिए चुनें -@msg select two circles to bridge जोड़ने के लिए दो वृत्त चुनें +@msg select two or more circles to bridge जोड़ने के लिए दो या अधिक वृत्त चुनें @msg select two open path ends, or two open paths, to average and join औसत निकालकर जोड़ने के लिए दो खुले पाथ एंड पॉइंट्स या दो खुले पाथ सिलेक्ट करें @msg select two or more graphic styles to merge दो या अधिक ग्राफिक स्टाइल्स का सिलेक्ट करने के लिए विलय @msg select two or more objects to distribute वितरित करने के लिए दो या दो से अधिक ऑब्जेक्ट चुनें @@ -8862,6 +8887,7 @@ liquify-list-end {0}, {1} {0} और {1} @msg the active document changed while the question was open; nothing was deleted प्रश्न खुला रहते हुए सक्रिय डॉक्यूमेंट बदल गया; कुछ भी नहीं हटाया गया @msg that document is no longer open यह डॉक्यूमेंट अब खुला नहीं है @msg that makes more than {MAX_PIECES} slices जो {MAX_PIECES} स्लाइस से अधिक बनाता है +@msg that makes too many bridges (at most 8000): lower the reach इससे बहुत अधिक ब्रिज बनते हैं (अधिकतम 8000): पहुँच घटाएँ @msg that makes too many pieces (at most 100000): make the dashes longer जो बहुत सारे टुकड़े बनाता है (अधिकांश 100000 में): डैश को लंबे समय तक बनाते हैं @msg that object is not in the overlap उस ऑब्जेक्ट को ओवरलैप में नहीं है @msg the {tool} tool has no options {tool} टूल में कोई ऑप्शन्स नहीं है @@ -8969,7 +8995,10 @@ liquify-list-end {0}, {1} {0} और {1} @msg the artboards don't fit on the canvas: fewer artboards, less spacing or a smaller size आर्टबोर्ड कैनवास पर फिट नहीं हैं: कम आर्टबोर्ड, कम रिक्ति या छोटे आकार @msg the background worker stopped पृष्ठभूमि कार्यकर्ता बंद कर दिया @msg the blend has no spine मिश्रण में कोई रीढ़ नहीं है +@msg the bridged circles are too complex to unite जोड़े गए वृत्त मिलाने के लिए बहुत जटिल हैं @msg the character's size can't be measured कैरेक्टर का आकार मापा नहीं जा सकता है +@msg the circles are too far apart for this gap इस गैप के लिए वृत्त एक-दूसरे से बहुत दूर हैं +@msg the circles are too far apart for this gap: raise the gap इस गैप के लिए वृत्त एक-दूसरे से बहुत दूर हैं: गैप बढ़ाएँ @msg the circles are too far apart for this radius इस त्रिज्या के लिए वृत्त एक-दूसरे से बहुत दूर हैं @msg the circles are too far apart for this radius: raise the radius इस त्रिज्या के लिए वृत्त एक-दूसरे से बहुत दूर हैं: त्रिज्या बढ़ाएँ @msg the CMYK image couldn't be written CMYK इमेज को नहीं लिखा जा सकता @@ -9527,6 +9556,7 @@ variable-list-end {0}, {1} {0} और {1} @msgplural Exported {n} document|Exported {n} documents {n} डॉक्यूमेंट एक्सपोर्ट हुआ|{n} डॉक्यूमेंट एक्सपोर्ट हुए @msgplural Exported {n} file to {folder}|Exported {n} files to {folder} {folder} में {n} फ़ाइल एक्सपोर्ट हुई|{folder} में {n} फ़ाइलें एक्सपोर्ट हुईं @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings डॉक्यूमेंट एक ब्लीड सेट करता है जिसे यह PDF/X फ़ाइल छोड़ देती है: "डॉक्यूमेंट की ब्लीड सेटिंग्स उपयोग करें" चालू करें +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} ऑब्जेक्ट ट्रिम किनारे तक पहुँचता है पर ब्लीड से पहले रुक जाता है|{n} ऑब्जेक्ट ट्रिम किनारे तक पहुँचते हैं पर ब्लीड से पहले रुक जाते हैं @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} एक्सपोर्ट हुआ, {n} नोट के साथ: {first}|{what} एक्सपोर्ट हुआ, {n} नोट्स के साथ: {first} @msgplural Opened with {n} note: {first}|Opened with {n} notes: {first} {n} नोट के साथ खुला: {first}|{n} नोट्स के साथ खुला: {first} @msgplural {notice}. Opened with {n} note: {first}|{notice}. Opened with {n} notes: {first} {notice}। {n} नोट के साथ खुला: {first}|{notice}। {n} नोट्स के साथ खुला: {first} @@ -9982,6 +10012,16 @@ theme Appearance अपीयरेंस No objects are selected. कोई ऑब्जेक्ट सिलेक्ट नहीं है। Open a document to mark its fold lines. फ़ोल्ड लाइनें मार्क करने के लिए कोई डॉक्यूमेंट ओपन करें। Remove Fold Line Role लाइन प्रकार हटाएँ + Tap जल्दी दबाना + Clear Hold होल्ड साफ़ करें + Hold Shortcuts होल्ड शॉर्टकट + Hold Shortcut Delay होल्ड शॉर्टकट विलंब + How hold shortcuts work होल्ड शॉर्टकट कैसे काम करते हैं + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. क्लिक करें, फिर इसके लिए दबाए रखने वाली कुंजी दबाएँ (Esc रद्द)। कुंजी दबाए रखने पर यह चलता है; जल्दी से दबाने पर कुंजी का अपना शॉर्टकट चलता है। + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. किसी कुंजी को जल्दी से दबाने पर उसका शॉर्टकट चलता है। कुंजी को विलंब जितनी देर दबाए रखने पर इसके बजाय उसके होल्ड कॉलम का टूल या कमांड चलता है। होल्ड शॉर्टकट कोई अक्षर, अंक या विराम चिह्न वाली कुंजी होती है, अकेले या Shift के साथ। +@msg Hold {_1} is already used by {_2} होल्ड {_1} का उपयोग पहले से ही {_2} द्वारा किया जाता है +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) होल्ड शॉर्टकट ऐसी कुंजी होती है जो अकेले या Shift के साथ कोई कैरेक्टर टाइप करती है ({shown} में Cmd, Ctrl या Alt है) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} होल्ड शॉर्टकट नहीं हो सकता: कोई अक्षर, अंक या विराम चिह्न वाली कुंजी उपयोग करें Check चेक करें Check Fold Lines फ़ोल्ड लाइनें चेक करें @msg No cut lines are in the selection. सिलेक्शन में कोई कट लाइन नहीं है। @@ -10002,6 +10042,7 @@ theme Appearance अपीयरेंस @msg A panel is not joined to the rest by a crease. कोई पैनल किसी क्रीज़ लाइन से बाकी से जुड़ा नहीं है। @msg A fold line is on a non-printing layer. एक फ़ोल्ड लाइन नॉन-प्रिंटिंग लेयर पर है। @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} पैनल: {panels}, हिंज: {hinges}, एरर: {errors}, वॉर्निंग: {warnings} + Dashed Arrow बिंदीदार तीर Pressure Sensitive दबाव संवेदनशील Flex Ribbon लचीला फीता Pulse Stroke स्पंदित रेखा diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index b42d8c0d3f..fbc2e30bd1 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -1107,6 +1107,7 @@ font-technology Variable Változó Duplicate Action or Action Set Művelet vagy műveletkészlet kettőzése Delete the action set “{name}” and its actions? Törlöd ezt a műveletkészletet és a műveleteit: „{name}”? Delete the selected action sets and their actions? Törlöd a kijelölt műveletkészleteket és a műveleteiket? + Delete all action sets and their actions? Törlöd az összes műveletkészletet és a műveleteiket? Delete the library “{name}”? Törlöd ezt a könyvtárat: „{name}”? Delete Theme Téma törlése Delete theme Téma törlése @@ -1699,6 +1700,7 @@ digits Malayalam Malajálam Fixed Rögzített Flag… Zászló… Flare Fényvillanás + Edit Flare Fényvillanás szerkesztése Flare Tool Fényvillanás Flare Tool Options Fényvillanás beállításai Flat Angle Lapos, ferde @@ -2818,6 +2820,9 @@ file-filter Templates Sablonok Navigate Navigálás Navigator Navigátor Navigator Panel Options Navigátor panel beállításai + Attributes Panel Options Attribútumok panel beállításai + Number of Recent URLs: Legutóbbi URL-ek száma: +@msg `count` must be a whole number from 1 to 30 `count`: 1 és 30 közötti egész szám kell Draw Dashed Lines as Solid Lines Szaggatott vonalak rajzolása folytonosként Needs the desktop app Az asztali alkalmazás kell hozzá Negative Negatív @@ -3296,6 +3301,7 @@ diagnostics ui felület Save Actions… Műveletek mentése… Load Actions… Műveletek betöltése… Replace Actions… Műveletek cseréje… + Clear Actions Műveletek törlése Reset Actions Műveletek visszaállítása Replace the current actions with the default set? Lecseréled az aktuális műveleteket az alapértelmezett készletre? Append adds the default set after the current sets instead. A Hozzáfűzés ehelyett az aktuális készletek után adja hozzá az alapértelmezett készletet. @@ -3774,6 +3780,8 @@ mark-style Japanese Japán The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Az egérgörgő lenyomott Cmd/Ctrl billentyűvel oldalirányban görgeti a vásznat. Dragging sideways on a numeric field's label changes the field's value. Egy számmező címkéjén oldalirányban húzva módosul a mező értéke. A two-finger rotate gesture on a trackpad rotates the canvas view. Az érintőpadon végzett kétujjas forgató kézmozdulat elforgatja a vászon nézetét. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Egy billentyű nyomva tartása a Billentyűparancsok Nyomva tartás oszlopában lévő eszközt vagy parancsot futtatja; egy rövid lenyomás a szokásos billentyűparancsát futtatja. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Hány másodpercig kell nyomva tartani egy billentyűt, hogy a szokásos billentyűparancsa helyett a nyomva tartásos billentyűparancsa fusson. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Horgonypontok mozgatásakor minden olyan görbe, amelynek egyik vége elmozdul, megtartja az alakját a végeihez képest. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Egy eszköz billentyűparancsát lenyomva tartva az eszköz a felengedésig ki van választva, utána ismét az előző eszköz lesz kiválasztva. Shows the bounding box while you move the selection or draw a shape. Megjeleníti a befoglaló keretet, miközben a kijelölést mozgatja vagy alakzatot rajzol. @@ -5914,6 +5922,7 @@ liquify-list-end {0}, {1} {0} és {1} @msg no graphic style `{n}` nincs ilyen grafikai stílus: `{n}` @msg no interaction in progress nincs folyamatban lévő művelet @msg no key object nincs kulcsobjektum +@msg Align to Key Object isn't available with the Artboard tool az „Igazítás a kulcsobjektumhoz” nem érhető el a Rajztábla eszközzel @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}) @@ -5976,6 +5985,8 @@ liquify-list-end {0}, {1} {0} és {1} @msg no such spine point nincs ilyen gerincpont @msg `with` must be a list of at most 10000 spine point indexes `with`: legfeljebb 10000 gerincpont-indexből álló lista kell @msg `with` moves points, not a handle `with` pontokat mozgat, nem fogantyút +@msg `link` and `independent` cannot both be true `link` és `independent` nem lehet egyszerre true +@msg `link` places a handle: give `handle` `link` fogantyút helyez el: adja meg a `handle` értéket @msg no such spine segment nincs ilyen gerincszakasz @msg no such subpath nincs ilyen részútvonal @msg no such user library nincs ilyen felhasználói könyvtár @@ -6106,6 +6117,7 @@ liquify-list-end {0}, {1} {0} és {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions A lemezen módosult csatolt képek: {n}; a Csatolások frissítése az új változatokat mutatja @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Frissített, a lemezen módosult csatolt fájlok: {n} @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings a dokumentum kifutót állít be, amelyet ez a PDF/X-fájl kihagy: kapcsolja be „A dokumentum kifutóbeállításainak használata” beállítást +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objektum eléri a vágási élt, de nem ér ki a kifutóig @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Exportálva: {what}; megjegyzések: {n}, az első: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} Betűtípusfájlok száma: {n}, mappa: {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} Betűtípusfájlok száma: {n}, mappa: {folder}; nem sikerült hozzáadni: {failed} ({reason}) @@ -6146,6 +6158,7 @@ liquify-list-end {0}, {1} {0} és {1} @msg select a blend jelölj ki egy összemosást @msg select a blend or give `id` jelölj ki egy összemosást, vagy add meg az `id` értékét @msg select a clip group jelölj ki egy vágócsoportot +@msg select a flare jelölj ki egy fényvillanást @msg select a gradient mesh jelölj ki egy színátmenetes hálót @msg select a linked image: an embedded one has no file jelölj ki egy csatolt képet: a beágyazottnak nincs fájlja @msg select a Live Paint group jelölj ki egy élőfestés-csoportot @@ -6851,6 +6864,9 @@ variable-list-end {0}, {1} {0} és {1} Continue in Background Folytatás a háttérben Cancel Export Exportálás megszakítása @msg Export cancelled Az exportálás megszakítva + Cancel Save Mentés megszakítása +@plural {n} more save waiting|{n} more saves waiting Még {n} mentés várakozik +@msg Save canceled A mentés megszakítva # Paragraph panel menu › Justification… Desired Kívánt Word Spacing: Szóköz: @@ -7369,6 +7385,12 @@ axis Y Axis Y tengely Bus Lines Buszvonalak Terminal Nodes Csatlakozási pontok +# Original arrow art brushes. + Arrows Nyilak + Solid Arrow Tömör nyíl + Open Arrow Nyitott nyíl + Chevron Arrow Ékmintás nyíl + Notched Ribbon Csipkézett szalag Double Line Dupla vonal Wave Hullám @@ -8054,10 +8076,18 @@ breakText Glyphs Glifák Smooth Bridge… Sima híd… Smooth Bridge Sima híd Keep Originals Eredetik megtartása -@msg select two circles to bridge jelöljön ki két kört az összekötéshez +@msg select two or more circles to bridge jelöljön ki legalább két kört az összekötéshez @msg one circle is inside the other az egyik kör a másikon belül van @msg the circles are too far apart for this radius: raise the radius a körök túl messze vannak egymástól ehhez a sugárhoz: növelje a sugarat @msg the circles are too far apart for this radius a körök túl messze vannak egymástól ehhez a sugárhoz + Constant Gap Állandó hézag + Reach: Hatótávolság: +@msg the circles are too far apart for this gap: raise the gap a körök túl messze vannak egymástól ehhez a hézaghoz: növelje a hézagot +@msg the circles are too far apart for this gap a körök túl messze vannak egymástól ehhez a hézaghoz +@msg no two circles are within reach: raise the reach nincs két kör hatótávolságon belül: növelje a hatótávolságot +@msg select at most 2000 circles to bridge legfeljebb 2000 kört jelöljön ki az összekötéshez +@msg that makes too many bridges (at most 8000): lower the reach ez túl sok hidat eredményez (legfeljebb 8000): csökkentse a hatótávolságot +@msg the bridged circles are too complex to unite az összekötött körök túl összetettek az egyesítéshez # Path Precision Tools add-on: Common Tangents. Common Tangents… Közös érintők… Common Tangents Közös érintők @@ -10364,6 +10394,16 @@ breakText Glyphs Glifák No objects are selected. Nincs kijelölt objektum. Open a document to mark its fold lines. Nyiss meg egy dokumentumot a hajtásvonalai megjelöléséhez. Remove Fold Line Role Vonaltípus eltávolítása + Tap Rövid lenyomás + Clear Hold Nyomva tartás törlése + Hold Shortcuts Nyomva tartásos billentyűparancsok + Hold Shortcut Delay Nyomva tartás késleltetése + How hold shortcuts work Így működnek a nyomva tartásos billentyűparancsok + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Kattints, majd nyomd le a billentyűt, amelyet ehhez nyomva kell tartani (Esc: mégse). A billentyű nyomva tartása ezt futtatja; a rövid lenyomás a billentyű saját billentyűparancsát futtatja. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Egy billentyű rövid lenyomása a billentyűparancsát futtatja. Ha a késleltetés idejéig nyomva tartod, helyette a Nyomva tartás oszlopában lévő eszköz vagy parancs fut. Nyomva tartásos billentyűparancs lehet egy betű-, szám- vagy írásjelbillentyű, önmagában vagy Shifttel. +@msg Hold {_1} is already used by {_2} már foglalt: nyomva tartás {_1} (használja: {_2}) +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) a nyomva tartásos billentyűparancs egy karaktert beíró billentyű, önmagában vagy Shifttel ({shown} Cmd, Ctrl vagy Alt billentyűt tartalmaz) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} nem lehet nyomva tartásos billentyűparancs: használj betű-, szám- vagy írásjelbillentyűt Check Ellenőrzés Check Fold Lines Hajtásvonalak ellenőrzése @msg No cut lines are in the selection. A kijelölésben nincs vágóvonal. @@ -10384,6 +10424,7 @@ breakText Glyphs Glifák @msg A panel is not joined to the rest by a crease. Egy panelt egyetlen bigvonal sem köt a többihez. @msg A fold line is on a non-printing layer. Egy hajtásvonal nem nyomtatható rétegen van. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelek: {panels}, zsanérok: {hinges}, hibák: {errors}, figyelmeztetések: {warnings} + Dashed Arrow Szaggatott nyíl Pressure Sensitive Nyomásérzékeny Flex Ribbon Rugalmas szalag Pulse Stroke Lüktető vonás diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index f1f56019aa..ab48475d3d 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -763,6 +763,9 @@ Magic Wand Tongkat ajaib Navigator Navigator Navigator Panel Options Opsi panel navigator + Attributes Panel Options Opsi panel atribut + Number of Recent URLs: Jumlah URL terbaru: +@msg `count` must be a whole number from 1 to 30 `count` harus bilangan bulat dari 1 sampai 30 Draw Dashed Lines as Solid Lines Gambar garis putus-putus sebagai garis utuh Pattern Options Opsi pola Properties Properti @@ -1483,6 +1486,7 @@ lighting Light Cahaya Save Actions… Simpan tindakan… Load Actions… Muat tindakan… Replace Actions… Ganti tindakan… + Clear Actions Bersihkan tindakan Reset Actions Atur ulang tindakan Replace the current actions with the default set? Ganti tindakan saat ini dengan set default? Append adds the default set after the current sets instead. Tambahkan justru menambahkan set default setelah set saat ini. @@ -1787,6 +1791,7 @@ digits Malayalam Malayalam Duplicate Action or Action Set Duplikatkan tindakan atau set tindakan Delete the action set “{name}” and its actions? Hapus set tindakan “{name}” beserta tindakannya? Delete the selected action sets and their actions? Hapus set tindakan yang dipilih beserta tindakannya? + Delete all action sets and their actions? Hapus semua set tindakan beserta tindakannya? Delete these {n} graphic styles? Hapus {n} gaya grafis ini? Delete this {n} graphic style? Hapus {n} gaya grafis ini? Graphic Style Libraries Menu Menu pustaka gaya grafis @@ -4014,6 +4019,7 @@ theme Appearance Tampilan Set Tab Stops Atur hentian tab Tab Stops Hentian tab Flare Flare + Edit Flare Edit flare Rays Sinar Rectangle Persegi panjang Paintbrush Kuas lukis @@ -4294,6 +4300,8 @@ font-technology Variable Variabel The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Roda mouse dengan Cmd/Ctrl ditahan menggulir kanvas ke samping. Dragging sideways on a numeric field's label changes the field's value. Menyeret ke samping pada label bidang angka mengubah nilai bidang itu. A two-finger rotate gesture on a trackpad rotates the canvas view. Gerakan putar dua jari pada trackpad memutar tampilan kanvas. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Menahan tombol menjalankan alat atau perintah di kolom Tahan pada Pintasan papan ketik; tekanan singkat menjalankan pintasan biasanya. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Berapa detik tombol harus ditahan sebelum pintasan tahannya berjalan sebagai ganti pintasan biasanya. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Saat Anda memindahkan titik jangkar, setiap kurva dengan satu ujung yang dipindahkan mempertahankan bentuknya terhadap ujung-ujungnya. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Menahan tombol pintasan alat memilih alat itu sampai Anda melepasnya, lalu alat sebelumnya dipilih lagi. Shows the bounding box while you move the selection or draw a shape. Menampilkan kotak pembatas saat Anda memindahkan seleksi atau menggambar bentuk. @@ -4917,6 +4925,7 @@ imageTrace Outline Kontur @msg no graphic style `{n}` tidak ada gaya grafis `{n}` @msg no interaction in progress tidak ada interaksi yang berlangsung @msg no key object tidak ada objek kunci +@msg Align to Key Object isn't available with the Artboard tool Ratakan ke objek kunci tidak tersedia dengan alat artboard @msg no library `{key}` (see {list}) tidak ada pustaka `{key}` (lihat {list}) @msg no native format tidak ada format asli @msg no pages tidak ada halaman @@ -5045,6 +5054,7 @@ imageTrace Outline Kontur @msg select a Live Paint group pilih grup Live Paint @msg select a blend pilih blend @msg select a clip group pilih grup klip +@msg select a flare pilih flare @msg select a gradient mesh pilih mesh gradien @msg select a linked image: an embedded one has no file pilih gambar tertaut: gambar yang tersemat tidak memiliki berkas @msg select a repeat pilih pengulangan @@ -5248,6 +5258,7 @@ imageTrace Outline Kontur @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} gambar tertaut di disk telah berubah: Perbarui Tautan menampilkan versi barunya @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Telah memperbarui {n} berkas tertaut yang berubah di disk @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings dokumen menetapkan bleed yang dihilangkan oleh file PDF/X ini: aktifkan "Gunakan pengaturan bleed dokumen" +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objek mencapai tepi potong tetapi berhenti sebelum bleed @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} diekspor dengan {n} catatan: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} berkas font kini berada di {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} berkas font kini berada di {folder}; {failed} tidak dapat ditambahkan: {reason} @@ -6335,6 +6346,9 @@ swatch Bright Violet Violet cerah Continue in Background Lanjutkan di latar belakang Cancel Export Batalkan ekspor @msg Export cancelled Ekspor dibatalkan + Cancel Save Batalkan penyimpanan +@plural {n} more save waiting|{n} more saves waiting {n} penyimpanan lagi menunggu +@msg Save canceled Penyimpanan dibatalkan # Paragraph panel menu › Justification… Desired Diinginkan Word Spacing: Spasi Kata: @@ -6655,6 +6669,12 @@ axis Y Axis Sumbu Y Bus Lines Jalur bus Terminal Nodes Simpul terminal +# Original arrow art brushes. + Arrows Kuas panah + Solid Arrow Panah solid + Open Arrow Panah terbuka + Chevron Arrow Panah chevron + Notched Ribbon Pita bertakik Double Line Garis ganda Wave Gelombang @@ -7308,10 +7328,18 @@ breakText Glyphs Glif Smooth Bridge… Jembatan Halus… Smooth Bridge Jembatan Halus Keep Originals Pertahankan Asli -@msg select two circles to bridge pilih dua lingkaran untuk dijembatani +@msg select two or more circles to bridge pilih dua lingkaran atau lebih untuk dijembatani @msg one circle is inside the other satu lingkaran berada di dalam lingkaran lainnya @msg the circles are too far apart for this radius: raise the radius lingkaran terlalu berjauhan untuk radius ini: perbesar radius @msg the circles are too far apart for this radius lingkaran terlalu berjauhan untuk radius ini + Constant Gap Celah Tetap + Reach: Jangkauan: +@msg the circles are too far apart for this gap: raise the gap lingkaran terlalu berjauhan untuk celah ini: perbesar celah +@msg the circles are too far apart for this gap lingkaran terlalu berjauhan untuk celah ini +@msg no two circles are within reach: raise the reach tidak ada dua lingkaran dalam jangkauan: perbesar jangkauan +@msg select at most 2000 circles to bridge pilih paling banyak 2000 lingkaran untuk dijembatani +@msg that makes too many bridges (at most 8000): lower the reach itu membuat terlalu banyak jembatan (paling banyak 8000): perkecil jangkauan +@msg the bridged circles are too complex to unite lingkaran yang dijembatani terlalu rumit untuk disatukan # Path Precision Tools add-on: Common Tangents. Common Tangents… Garis Singgung Persekutuan… Common Tangents Garis Singgung Persekutuan @@ -7671,6 +7699,17 @@ breakText Glyphs Glif @msg A joint does not close by {gap} pt. Sebuah sambungan tidak menutup sejauh {gap} pt. @msg Two panels pass through each other. Dua panel saling menembus. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer harus "singleLine", "everyLine", "standardSingleLine", atau "standardEveryLine" + Tap Tekan singkat + Clear Hold Hapus Tahan + Hold Shortcuts Pintasan tahan + Hold Shortcut Delay Jeda pintasan tahan + How hold shortcuts work Cara kerja pintasan tahan + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Klik, lalu tekan tombol yang ditahan untuk ini (Esc membatalkan). Menahan tombol menjalankan ini; tekan singkat menjalankan pintasan milik tombol itu sendiri. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Tekan singkat sebuah tombol menjalankan pintasannya. Menahan tombol selama jeda menjalankan alat atau perintah di kolom Tahan sebagai gantinya. Pintasan tahan adalah tombol huruf, angka, atau tanda baca, sendiri atau dengan Shift. +@msg Hold {_1} is already used by {_2} Tahan {_1} sudah digunakan oleh {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) pintasan tahan adalah tombol yang mengetik karakter, sendiri atau dengan Shift ({shown} memakai Cmd, Ctrl, atau Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} tidak bisa menjadi pintasan tahan: gunakan huruf, angka, atau tombol tanda baca + Dashed Arrow Panah Putus-putus Pressure Sensitive Peka Tekanan Flex Ribbon Pita Lentur Pulse Stroke Goresan Berdenyut diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 379bd8c2ee..a3b493cd1d 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -875,6 +875,7 @@ font-technology Variable Variabili Duplicate Action or Action Set Duplica azione o set di azioni Delete the action set “{name}” and its actions? Eliminare il set di azioni “{name}” e le sue azioni? Delete the selected action sets and their actions? Eliminare i set di azioni selezionati e le loro azioni? + Delete all action sets and their actions? Eliminare tutti i set di azioni e le loro azioni? Delete Theme Elimina tema Delete theme Elimina tema Delete these {n} graphic styles? Eliminare questi {n} stili grafici? @@ -1394,6 +1395,7 @@ font-technology Variable Variabili Fit to Selected Art Adatta alla grafica selezionata Flag… Bandiera… Flare Riflesso + Edit Flare Modifica riflesso Flare Tool Strumento Riflesso Flare Tool Options Opzioni strumento Riflesso Halo Alone @@ -2315,6 +2317,9 @@ file-filter Templates Modelli Navigate Naviga Navigator Navigatore Navigator Panel Options Opzioni pannello Navigatore + Attributes Panel Options Opzioni pannello Attributi + Number of Recent URLs: Numero di URL recenti: +@msg `count` must be a whole number from 1 to 30 `count` deve essere un numero intero compreso tra 1 e 30 Draw Dashed Lines as Solid Lines Disegna le linee tratteggiate come linee continue Needs the desktop app Richiede l'app desktop Neutral Gradients Sfumature neutre @@ -2796,6 +2801,7 @@ diagnostics ui interfaccia Save Actions… Salva azioni… Load Actions… Carica azioni… Replace Actions… Sostituisci azioni… + Clear Actions Cancella azioni Reset Actions Ripristina azioni Replace the current actions with the default set? Sostituire le azioni correnti con il set predefinito? Append adds the default set after the current sets instead. Aggiungi aggiunge invece il set predefinito dopo i set correnti. @@ -3241,6 +3247,8 @@ digits Malayalam Malayalam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. La rotellina del mouse con Cmd/Ctrl premuto scorre l'area di lavoro in orizzontale. Dragging sideways on a numeric field's label changes the field's value. Trascinare in orizzontale sull'etichetta di un campo numerico ne cambia il valore. A two-finger rotate gesture on a trackpad rotates the canvas view. Un gesto di rotazione con due dita sul trackpad ruota la vista dell'area di lavoro. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Tenere premuto un tasto esegue lo strumento o il comando della sua colonna Tieni premuto in Scelte rapide da tastiera; una pressione breve esegue la sua scorciatoia abituale. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Per quanti secondi va tenuto premuto un tasto prima che venga eseguita la sua scorciatoia a pressione prolungata invece di quella abituale. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Quando sposti i punti di ancoraggio, ogni curva con un’estremità spostata mantiene la propria forma rispetto alle sue estremità. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Tenere premuta la scorciatoia di uno strumento lo sceglie finché non la rilasci, poi viene scelto di nuovo lo strumento precedente. Shows the bounding box while you move the selection or draw a shape. Mostra il riquadro di delimitazione mentre sposti la selezione o disegni una forma. @@ -5274,6 +5282,7 @@ liquify-list-end {0}, {1} {0} e {1} @msg no graphic style `{n}` nessuno stile grafico `{n}` @msg no interaction in progress nessuna interazione in corso @msg no key object nessun oggetto chiave +@msg Align to Key Object isn't available with the Artboard tool «Allinea all'oggetto chiave» non è disponibile con lo strumento Tavola da disegno @msg no library `{key}` (see {list}) nessuna libreria `{key}` (vedi {list}) @msg no native format nessun formato nativo @msg no pages nessuna pagina @@ -5329,6 +5338,8 @@ liquify-list-end {0}, {1} {0} e {1} @msg no such spine point punto della dorsale inesistente @msg `with` must be a list of at most 10000 spine point indexes `with` deve essere un elenco di al massimo 10000 indici di punti della dorsale @msg `with` moves points, not a handle `with` sposta punti, non una maniglia +@msg `link` and `independent` cannot both be true `link` e `independent` non possono essere entrambi true +@msg `link` places a handle: give `handle` `link` posiziona una maniglia: indica `handle` @msg no such spine segment segmento della dorsale inesistente @msg no such subpath sottotracciato inesistente @msg no such user library libreria utente inesistente @@ -5418,6 +5429,7 @@ liquify-list-end {0}, {1} {0} e {1} @msg select a blend seleziona una fusione @msg select a blend or give `id` seleziona una fusione o specifica il suo `id` @msg select a clip group seleziona un gruppo di ritaglio +@msg select a flare seleziona un riflesso @msg select a gradient mesh seleziona una trama sfumatura @msg select a linked image: an embedded one has no file seleziona un'immagine collegata: un'immagine incorporata non ha un file @msg select a repeat seleziona una ripetizione @@ -5675,6 +5687,7 @@ variable-list-end {0}, {1} {0} e {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} immagine collegata modificata su disco: Aggiorna collegamenti mostra la nuova versione|{n} immagini collegate modificate su disco: Aggiorna collegamenti mostra le nuove versioni @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Aggiornato {n} file collegato modificato su disco|Aggiornati {n} file collegati modificati su disco @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings il documento imposta un'abbondanza che questo file PDF/X omette: attiva «Usa impostazioni abbondanza del documento» +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} oggetto raggiunge il bordo di rifilo ma si ferma prima dell'abbondanza|{n} oggetti raggiungono il bordo di rifilo ma si fermano prima dell'abbondanza @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Esportato {what} con {n} nota: {first}|Esportato {what} con {n} note: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} file di font ora in {folder}|{n} file di font ora in {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} file di font ora in {folder}; impossibile aggiungerne {failed}: {reason}|{n} file di font ora in {folder}; impossibile aggiungerne {failed}: {reason} @@ -6485,6 +6498,9 @@ lighting Light Luce Continue in Background Continua in background Cancel Export Annulla esportazione @msg Export cancelled Esportazione annullata + Cancel Save Annulla salvataggio +@plural {n} more save waiting|{n} more saves waiting {n} altro salvataggio in attesa|{n} altri salvataggi in attesa +@msg Save canceled Salvataggio annullato # Paragraph panel menu › Justification… Desired Desiderato Word Spacing: Spaziatura parole: @@ -7008,6 +7024,13 @@ axis Y Axis Asse Y Bus Lines Linee del bus Terminal Nodes Nodi terminali +# Original arrow art brushes. + Arrows Frecce + Solid Arrow Freccia piena + Open Arrow Freccia aperta + Double Arrow Doppia freccia + Chevron Arrow Freccia con gallone + Notched Ribbon Nastro dentellato Double Line Doppia linea Wave Onda @@ -7701,10 +7724,18 @@ breakText Glyphs Glifi Smooth Bridge… Ponte morbido… Smooth Bridge Ponte morbido Keep Originals Mantieni originali -@msg select two circles to bridge seleziona due cerchi da unire +@msg select two or more circles to bridge seleziona due o più cerchi da unire @msg one circle is inside the other un cerchio è dentro l’altro @msg the circles are too far apart for this radius: raise the radius i cerchi sono troppo distanti per questo raggio: aumenta il raggio @msg the circles are too far apart for this radius i cerchi sono troppo distanti per questo raggio + Constant Gap Distanza costante + Reach: Portata: +@msg the circles are too far apart for this gap: raise the gap i cerchi sono troppo lontani per questa distanza: aumenta la distanza +@msg the circles are too far apart for this gap i cerchi sono troppo lontani per questa distanza +@msg no two circles are within reach: raise the reach nessuna coppia di cerchi è entro la portata: aumenta la portata +@msg select at most 2000 circles to bridge seleziona al massimo 2000 cerchi da unire +@msg that makes too many bridges (at most 8000): lower the reach così si creano troppi ponti (al massimo 8000): riduci la portata +@msg the bridged circles are too complex to unite i cerchi uniti sono troppo complessi da fondere # Path Precision Tools add-on: Common Tangents. Common Tangents… Tangenti comuni… Common Tangents Tangenti comuni @@ -10021,6 +10052,16 @@ breakText Glyphs Glifi No objects are selected. Nessun oggetto selezionato. Open a document to mark its fold lines. Apri un documento per segnarne le linee di piega. Remove Fold Line Role Rimuovi tipo di linea + Tap Pressione breve + Clear Hold Cancella pressione prolungata + Hold Shortcuts Scorciatoie a pressione prolungata + Hold Shortcut Delay Ritardo delle scorciatoie a pressione prolungata + How hold shortcuts work Come funzionano le scorciatoie a pressione prolungata + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Fai clic, poi premi un tasto da tenere premuto per questo (Esc annulla). Tenere premuto il tasto esegue questo; una pressione breve esegue la scorciatoia del tasto stesso. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Una pressione breve di un tasto esegue la sua scorciatoia. Tenere premuto il tasto per la durata del ritardo esegue invece lo strumento o il comando della sua colonna Tieni premuto. Una scorciatoia a pressione prolungata è un tasto di lettera, cifra o punteggiatura, da solo o con Shift. +@msg Hold {_1} is already used by {_2} La pressione prolungata di {_1} è già usata da {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) una scorciatoia a pressione prolungata è un tasto che digita un carattere, da solo o con Shift ({shown} ha Cmd, Ctrl o Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} non può essere una scorciatoia a pressione prolungata: usa una lettera, una cifra o un tasto di punteggiatura Check Verifica Check Fold Lines Verifica linee di piega @msg No cut lines are in the selection. Nella selezione non ci sono linee di taglio. @@ -10041,6 +10082,7 @@ breakText Glyphs Glifi @msg A panel is not joined to the rest by a crease. Un pannello non è unito al resto da alcuna linea di cordonatura. @msg A fold line is on a non-printing layer. Una linea di piega si trova su un livello non stampabile. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Pannelli: {panels}, cerniere: {hinges}, errori: {errors}, avvisi: {warnings} + Dashed Arrow Freccia tratteggiata Pressure Sensitive Sensibile alla pressione Flex Ribbon Nastro flessibile Pulse Stroke Tratto pulsante diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 6d592860c8..5de0cae50c 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -848,6 +848,9 @@ digits Malayalam マラヤーラム数字 Magic Wand 自動選択 Navigator ナビゲーター Navigator Panel Options ナビゲーターパネルオプション + Attributes Panel Options 属性パネルオプション + Number of Recent URLs: 最近使った URL の数: +@msg `count` must be a whole number from 1 to 30 `count` には 1 から 30 までの整数を指定してください Draw Dashed Lines as Solid Lines 破線を実線で表示 Pattern Options パターンオプション Properties プロパティ @@ -1593,6 +1596,7 @@ antiAlias Sharp シャープ Duplicate Action or Action Set アクションまたはアクションセットを複製 Delete the action set “{name}” and its actions? アクションセット「{name}」とそのアクションを削除しますか? Delete the selected action sets and their actions? 選択したアクションセットとそのアクションを削除しますか? + Delete all action sets and their actions? すべてのアクションセットとそのアクションを削除しますか? Delete theme テーマを削除 Delete this saved preset この保存済みプリセットを削除 Delete {kind} Style {kind}スタイルを削除 @@ -1937,6 +1941,7 @@ antiAlias Sharp シャープ Fit in Window ウィンドウに合わせる Fit on Screen 画面にフィット Flare フレア + Edit Flare フレアを編集 Flare Tool フレアツール Flat Image 統合イメージ Flatness: フラットネス: @@ -2892,6 +2897,7 @@ diagnostics ui UI Save Actions… アクションを保存… Load Actions… アクションを読み込み… Replace Actions… アクションを置き換え… + Clear Actions アクションを消去 Reset Actions アクションをリセット Replace the current actions with the default set? 現在のアクションを初期設定のセットで置き換えますか? Append adds the default set after the current sets instead. 「追加」を選ぶと、初期設定のセットを現在のセットの後に追加します。 @@ -3225,6 +3231,8 @@ mark-style Japanese 日本式 The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl キーを押しながらマウスホイールを回すとカンバスを横にスクロールします。 Dragging sideways on a numeric field's label changes the field's value. 数値フィールドのラベルを横にドラッグすると、フィールドの値が変わります。 A two-finger rotate gesture on a trackpad rotates the canvas view. トラックパッドで 2 本指の回転ジェスチャーをすると、カンバスの表示が回転します。 + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. キーを長押しすると、キーボードショートカットの長押し列にあるツールまたはコマンドを実行します。短く押すと通常のショートカットを実行します。 + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. 通常のショートカットの代わりに長押しショートカットを実行するまで、キーを押し続ける秒数です。 When you move anchor points, each curve with one moved end keeps its shape relative to its ends. アンカーポイントを移動すると、一方の端が移動した各曲線は、両端に対する形状を保ちます。 Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. ツールのショートカットキーを押している間はそのツールを選び、離すと前のツールに戻ります。 Shows the bounding box while you move the selection or draw a shape. 選択範囲の移動中や図形の描画中にバウンディングボックスを表示します。 @@ -4880,6 +4888,8 @@ variable-list-end {0}, {1} {0}、{1} @msg no such spine point 指定されたスパインポイントが見つかりません @msg `with` must be a list of at most 10000 spine point indexes `with` には最大 10000 個のスパインポイントのインデックスのリストを指定してください @msg `with` moves points, not a handle `with` はポイントを移動します。ハンドルには使えません +@msg `link` and `independent` cannot both be true `link` と `independent` を同時に true にすることはできません +@msg `link` places a handle: give `handle` `link` はハンドルを配置します:`handle` を指定してください @msg no such spine segment 指定されたスパインセグメントが見つかりません @msg no such subpath 指定されたサブパスが見つかりません @msg object {id} is not a path オブジェクト {id} はパスではありません @@ -5002,9 +5012,11 @@ variable-list-end {0}, {1} {0}、{1} @msg no bounds 境界がありません @msg no current layer 現在のレイヤーがありません @msg no key object キーオブジェクトが設定されていません +@msg Align to Key Object isn't available with the Artboard tool アートボードツールでは「キーオブジェクトに整列」を使用できません @msg no previous transform 前回の変形がありません @msg nothing to align 整列するものがありません @msg select a clip group クリップグループを選択してください +@msg select a flare フレアを選択してください @msg select two or more objects to distribute 分布させるオブジェクトを 2 つ以上選択してください @msg axis must be "vertical", "horizontal" or an angle in degrees, not `{v}` axis には "vertical"、"horizontal"、度単位の角度のいずれかを指定してください (`{v}` は指定できません) @msg give horizontal or vertical horizontal または vertical を指定してください @@ -5747,6 +5759,7 @@ liquify-list-end {0}, {1} {0}、{1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} 個のリンク画像がディスク上で変更されました: 「リンクを更新」で新しいバージョンを表示できます @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk ディスク上で変更された {n} 個のリンクファイルを更新しました @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings ドキュメントに設定された裁ち落としがこの PDF/X ファイルには含まれません: 「ドキュメントの裁ち落とし設定を使用」をオンにしてください +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} 個のオブジェクトが仕上がり線に達していますが、裁ち落としまで届いていません @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} を書き出しましたが、注意事項が {n} 件あります: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} 個のフォントファイルが {folder} に入りました @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} 個のフォントファイルが {folder} に入りましたが、{failed} 個は追加できませんでした: {reason} @@ -6538,6 +6551,9 @@ lighting Light ライト Continue in Background バックグラウンドで続行 Cancel Export 書き出しをキャンセル @msg Export cancelled 書き出しをキャンセルしました + Cancel Save 保存をキャンセル +@plural {n} more save waiting|{n} more saves waiting 待機中の保存: あと {n} 件 +@msg Save canceled 保存をキャンセルしました # Paragraph panel menu › Justification… Desired 最適 Word Spacing: 単語間隔: @@ -8898,6 +8914,13 @@ axis Y Axis Y 軸 Bus Lines バス配線 Terminal Nodes 端子ノード +# Original arrow art brushes. + Arrows 矢印ブラシ + Solid Arrow 塗りつぶし矢印 + Open Arrow 中抜き矢印 + Double Arrow 両矢印 + Chevron Arrow 山形付き矢印 + Notched Ribbon ノッチリボン Double Line 二重線 Wave 波 @@ -9591,10 +9614,18 @@ breakText Glyphs 字形 Smooth Bridge… スムーズブリッジ… Smooth Bridge スムーズブリッジ Keep Originals オリジナルを保持 -@msg select two circles to bridge ブリッジでつなぐ円を 2 つ選択してください +@msg select two or more circles to bridge ブリッジでつなぐ円を 2 つ以上選択してください @msg one circle is inside the other 一方の円がもう一方の円の内側にあります @msg the circles are too far apart for this radius: raise the radius この半径では円が離れすぎています:半径を大きくしてください @msg the circles are too far apart for this radius この半径では円が離れすぎています + Constant Gap 一定の間隔 + Reach: 到達距離: +@msg the circles are too far apart for this gap: raise the gap この間隔では円が離れすぎています:間隔を大きくしてください +@msg the circles are too far apart for this gap この間隔では円が離れすぎています +@msg no two circles are within reach: raise the reach 到達距離内にある円の組がありません:到達距離を大きくしてください +@msg select at most 2000 circles to bridge ブリッジでつなぐ円は 2000 個以下で選択してください +@msg that makes too many bridges (at most 8000): lower the reach ブリッジが多すぎます(最大 8000):到達距離を小さくしてください +@msg the bridged circles are too complex to unite ブリッジでつないだ円が複雑すぎて合体できません # Path Precision Tools add-on: Common Tangents. Common Tangents… 共通接線… Common Tangents 共通接線 @@ -10085,6 +10116,16 @@ breakText Glyphs 字形 No objects are selected. オブジェクトが選択されていません。 Open a document to mark its fold lines. ドキュメントを開くと折り線を設定できます。 Remove Fold Line Role 線種を解除 + Tap 短押し + Clear Hold 長押しを消去 + Hold Shortcuts 長押しショートカット + Hold Shortcut Delay 長押しショートカットの遅延 + How hold shortcuts work 長押しショートカットのしくみ + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. クリックしてから、これに使う長押しのキーを押します (Esc でキャンセル)。キーを長押しするとこれを実行し、短く押すとキー自体のショートカットを実行します。 + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. キーを短く押すと、そのショートカットを実行します。遅延の時間だけキーを押し続けると、代わりに長押し列のツールまたはコマンドを実行します。長押しショートカットには、文字、数字、句読点のキーを単独で、または Shift と組み合わせて使用できます。 +@msg Hold {_1} is already used by {_2} 長押し {_1} はすでに {_2} で使用されています +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) 長押しショートカットは、文字を入力するキーを単独で、または Shift と組み合わせたものです ({shown} には Cmd、Ctrl、Alt のいずれかが含まれています) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} は長押しショートカットにできません: 文字、数字、句読点のいずれかのキーを使用してください Check チェック Check Fold Lines 折り線をチェック @msg No cut lines are in the selection. 選択範囲にカット線がありません。 @@ -10105,6 +10146,7 @@ breakText Glyphs 字形 @msg A panel is not joined to the rest by a crease. パネルがどの筋入れ線でも他とつながっていません。 @msg A fold line is on a non-printing layer. 折り線が印刷しないレイヤーにあります。 @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} パネル: {panels}、ヒンジ: {hinges}、エラー: {errors}、警告: {warnings} + Dashed Arrow 破線矢印 Pressure Sensitive 筆圧対応 Flex Ribbon しなやかなリボン Pulse Stroke 脈打つ線 diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index ec9bb08287..81fc06870d 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -2931,6 +2931,9 @@ Magic Wand ჯადოსნური ჯოხი Navigator ნავიგატორი Navigator Panel Options ნავიგატორის პანელის პარამეტრები + Attributes Panel Options ატრიბუტების პანელის პარამეტრები + Number of Recent URLs: ბოლოდროინდელი URL-ების რაოდენობა: +@msg `count` must be a whole number from 1 to 30 `count` უნდა იყოს მთელი რიცხვი 1-დან 30-მდე Draw Dashed Lines as Solid Lines ტირეებიანი ხაზების უწყვეტ ხაზებად დახატვა Pattern Options პატერნის პარამეტრები Properties თვისებები @@ -3626,6 +3629,7 @@ lighting Light სინათლე Save Actions… მოქმედებების შენახვა… Load Actions… მოქმედებების ჩატვირთვა… Replace Actions… მოქმედებების ჩანაცვლება… + Clear Actions მოქმედებების გასუფთავება Reset Actions მოქმედებების ჩამოყრა Replace the current actions with the default set? ჩანაცვლდეს მიმდინარე მოქმედებები ნაგულისხმევი ნაკრებით? Append adds the default set after the current sets instead. „დამატება“ ამის ნაცვლად ნაგულისხმევ ნაკრებს მიმდინარე ნაკრებების შემდეგ ამატებს. @@ -3976,6 +3980,7 @@ digits Malayalam მალაიალამური Duplicate Action or Action Set მოქმედების ან მოქმედებების ნაკრების დუბლირება Delete the action set “{name}” and its actions? წაიშალოს მოქმედებების ნაკრები „{name}“ და მისი მოქმედებები? Delete the selected action sets and their actions? წაიშალოს მონიშნული მოქმედებების ნაკრებები და მათი მოქმედებები? + Delete all action sets and their actions? წაიშალოს ყველა მოქმედებების ნაკრები და მათი მოქმედებები? Delete these {n} graphic styles? წაიშალოს ეს გრაფიკული სტილები ({n})? Delete this {n} graphic style? წაიშალოს ეს გრაფიკული სტილი ({n})? Graphic Style Libraries Menu გრაფიკული სტილების ბიბლიოთეკების მენიუ @@ -6108,6 +6113,7 @@ theme Appearance იერსახე Set Tab Stops ტაბულაციის გაჩერებების დაყენება Tab Stops ტაბულაციის გაჩერებები Flare ბლიკი + Edit Flare ბლიკის რედაქტირება Rays სხივები Rectangle მართკუთხედი Paintbrush ფუნჯი @@ -6369,6 +6375,8 @@ font-technology Variable ცვლადი The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. დაჭერილი Cmd/Ctrl-ით მაუსის ბორბალი ტილოს გვერდულად გადაახვევს. Dragging sideways on a numeric field's label changes the field's value. რიცხვითი ველის წარწერაზე გვერდულად გადათრევა ველის მნიშვნელობას ცვლის. A two-finger rotate gesture on a trackpad rotates the canvas view. ტრეკპადზე ორი თითით მობრუნების ჟესტი ტილოს ხედს აბრუნებს. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. კლავიშის ხანგრძლივი დაჭერა უშვებს ხელსაწყოს ან ბრძანებას კლავიატურის მალსახმობების დაჭერის სვეტიდან; მოკლე დაჭერა უშვებს მის ჩვეულ მალსახმობს. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. რამდენი წამი უნდა იყოს კლავიში დაჭერილი, სანამ ჩვეული მალსახმობის ნაცვლად მისი ხანგრძლივი დაჭერის მალსახმობი გაეშვება. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. როცა ღუზის წერტილებს გადაადგილებთ, ყოველი მრუდი, რომლის ერთი ბოლოც გადაადგილდა, ინარჩუნებს ფორმას თავის ბოლოებთან მიმართებით. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. სანამ ხელსაწყოს მალსახმობ კლავიშს დაჭერილს გიჭირავთ, ეს ხელსაწყოა არჩეული; კლავიშის აშვების შემდეგ ისევ წინა ხელსაწყო აირჩევა. Shows the bounding box while you move the selection or draw a shape. აჩვენებს შემომსაზღვრელ ჩარჩოს, სანამ მონიშნულს გადაადგილებთ ან ფიგურას ხატავთ. @@ -7001,6 +7009,7 @@ font-technology Variable ცვლადი @msg no graphic style `{n}` გრაფიკული სტილი `{n}` არ არის @msg no interaction in progress მიმდინარე ურთიერთქმედება არ არის @msg no key object საკვანძო ობიექტი არ არის +@msg Align to Key Object isn't available with the Artboard tool „საკვანძო ობიექტზე სწორება“ სამუშაო დაფის ხელსაწყოსთან მიუწვდომელია @msg no library `{key}` (see {list}) ბიბლიოთეკა `{key}` არ არის (იხ. {list}) @msg no native format საკუთარი ფორმატი არ არის @msg no pages გვერდები არ არის @@ -7132,6 +7141,7 @@ font-technology Variable ცვლადი @msg select a Live Paint group მონიშნეთ ცოცხალი შეღებვის ჯგუფი @msg select a blend მონიშნეთ გადასვლა @msg select a clip group მონიშნეთ მომჭრელი ჯგუფი +@msg select a flare მონიშნეთ ბლიკი @msg select a gradient mesh მონიშნეთ გრადიენტული ბადე @msg select a linked image: an embedded one has no file მონიშნეთ დაკავშირებული გამოსახულება: ჩაშენებულს ფაილი არ აქვს @msg select a repeat მონიშნეთ გამეორება @@ -7362,6 +7372,7 @@ font-technology Variable ცვლადი @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions დაკავშირებული გამოსახულებები შეიცვალა დისკზე ({n}): ბმულების განახლება აჩვენებს ახალ ვერსიებს @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk განახლდა დისკზე შეცვლილი დაკავშირებული ფაილები: {n} @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings დოკუმენტი ადგენს ჭრისპირა არეს, რომელსაც ეს PDF/X ფაილი გამოტოვებს: ჩართეთ „დოკუმენტის ჭრისპირა არის პარამეტრების გამოყენება“ +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed ობიექტები, რომლებიც ჭრის კიდეს აღწევს, მაგრამ ჭრისპირა არემდე ვერა: {n} @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} ექსპორტირებულია {what}, შენიშვნები: {n}: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} შრიფტის ფაილები ({n}) ახლა აქ არის: {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} შრიფტის ფაილები ({n}) ახლა აქ არის: {folder}; ვერ დაემატა {failed}: {reason} @@ -8905,6 +8916,8 @@ liquify-list-end {0}, {1} {0} და {1} @msg no such spine point ხერხემლის ასეთი წერტილი არ არსებობს @msg `with` must be a list of at most 10000 spine point indexes `with` უნდა იყოს ხერხემლის წერტილების არაუმეტეს 10000 ინდექსის სია @msg `with` moves points, not a handle `with` წერტილებს გადაადგილებს და არა სახელურს +@msg `link` and `independent` cannot both be true `link` და `independent` ერთდროულად ვერ იქნება true +@msg `link` places a handle: give `handle` `link` სახელურს ათავსებს: მიუთითეთ `handle` @msg no such spine segment ხერხემლის ასეთი სეგმენტი არ არსებობს @msg not a blend ეს გადასვლა არ არის @msg only http, https and mailto URLs open in the browser, not “{url}” ბრაუზერში მხოლოდ http, https და mailto URL-ები იხსნება და არა „{url}“ @@ -8936,6 +8949,9 @@ variable-list-end {0}, {1} {0} და {1} Cancel Export ექსპორტირების გაუქმება @plural {n} more export waiting|{n} more exports waiting რიგში მომლოდინე სხვა ექსპორტირება: {n} @msg Export cancelled ექსპორტირება გაუქმდა + Cancel Save შენახვის გაუქმება +@plural {n} more save waiting|{n} more saves waiting რიგში მომლოდინე სხვა შენახვა: {n} +@msg Save canceled შენახვა გაუქმდა Clear History ისტორიის გასუფთავება New Document from State ახალი დოკუმენტი მდგომარეობიდან Continue in Background ფონურ რეჟიმში გაგრძელება @@ -9508,6 +9524,12 @@ axis Y Axis Y ღერძი Bus Lines სალტის ხაზები Terminal Nodes ტერმინალური კვანძები +# Original arrow art brushes. + Arrows ისრები + Solid Arrow მყარი ისარი + Open Arrow ღია ისარი + Chevron Arrow შევრონიანი ისარი + Notched Ribbon დაკბილული ლენტი Double Line ორმაგი ხაზი Wave ტალღა @@ -10265,10 +10287,18 @@ breakText Glyphs გლიფები Smooth Bridge… გლუვი ხიდი… Smooth Bridge გლუვი ხიდი Keep Originals ორიგინალების შენარჩუნება -@msg select two circles to bridge აირჩიეთ ორი წრე დასაკავშირებლად +@msg select two or more circles to bridge აირჩიეთ ორი ან მეტი წრე დასაკავშირებლად @msg one circle is inside the other ერთი წრე მეორის შიგნითაა @msg the circles are too far apart for this radius: raise the radius ამ რადიუსისთვის წრეები ერთმანეთისგან ძალიან შორსაა: გაზარდეთ რადიუსი @msg the circles are too far apart for this radius ამ რადიუსისთვის წრეები ერთმანეთისგან ძალიან შორსაა + Constant Gap მუდმივი ღრეჩო + Reach: მიწვდომა: +@msg the circles are too far apart for this gap: raise the gap ამ ღრეჩოსთვის წრეები ერთმანეთისგან ძალიან შორსაა: გაზარდეთ ღრეჩო +@msg the circles are too far apart for this gap ამ ღრეჩოსთვის წრეები ერთმანეთისგან ძალიან შორსაა +@msg no two circles are within reach: raise the reach არცერთი ორი წრე არ არის მიწვდომის ფარგლებში: გაზარდეთ მიწვდომა +@msg select at most 2000 circles to bridge აირჩიეთ არაუმეტეს 2000 წრე დასაკავშირებლად +@msg that makes too many bridges (at most 8000): lower the reach ეს ძალიან ბევრ ხიდს ქმნის (არაუმეტეს 8000): შეამცირეთ მიწვდომა +@msg the bridged circles are too complex to unite დაკავშირებული წრეები ძალიან რთულია გასაერთიანებლად # Path Precision Tools add-on: Common Tangents. Common Tangents… საერთო მხებები… Common Tangents საერთო მხებები @@ -10747,6 +10777,17 @@ font-script Japanese იაპონური @msg A joint does not close by {gap} pt. შეერთება არ იხურება {gap} pt-ით. @msg Two panels pass through each other. ორი პანელი ერთმანეთში გადის. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer უნდა იყოს "singleLine", "everyLine", "standardSingleLine" ან "standardEveryLine" + Tap მოკლე დაჭერა + Clear Hold ხანგრძლივი დაჭერის გასუფთავება + Hold Shortcuts ხანგრძლივი დაჭერის მალსახმობები + Hold Shortcut Delay ხანგრძლივი დაჭერის დაყოვნება + How hold shortcuts work როგორ მუშაობს ხანგრძლივი დაჭერის მალსახმობები + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. დაწკაპეთ, შემდეგ დააჭირეთ კლავიშს, რომელიც ამისთვის უნდა დაიჭიროთ (Esc აუქმებს). კლავიშის ხანგრძლივი დაჭერა ამას უშვებს; მოკლე დაჭერა კლავიშის საკუთარ მალსახმობს უშვებს. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. კლავიშის მოკლე დაჭერა მის მალსახმობს უშვებს. თუ კლავიშს დაყოვნების ხანგრძლივობით დაიჭერთ, ამის ნაცვლად გაეშვება მისი „დაჭერა“ სვეტის ხელსაწყო ან ბრძანება. ხანგრძლივი დაჭერის მალსახმობი არის ასოს, ციფრის ან სასვენი ნიშნის კლავიში, ცალკე ან Shift კლავიშთან ერთად. +@msg Hold {_1} is already used by {_2} ხანგრძლივი დაჭერა {_1} უკვე გამოიყენება ამისთვის: {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) ხანგრძლივი დაჭერის მალსახმობი არის კლავიში, რომელიც სიმბოლოს წერს, ცალკე ან Shift კლავიშთან ერთად ({shown} შეიცავს Cmd, Ctrl ან Alt კლავიშს) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} ვერ იქნება ხანგრძლივი დაჭერის მალსახმობი: გამოიყენეთ ასო, ციფრი ან სასვენი ნიშნის კლავიში + Dashed Arrow წყვეტილი ისარი Pressure Sensitive წნევაზე მგრძნობიარე Flex Ribbon მოქნილი ლენტი Pulse Stroke პულსირებადი მონასმი diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 830014ba08..4a6963bbd2 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -841,6 +841,9 @@ digits Malayalam 말라얄람어 Magic Wand 마술봉 Navigator 내비게이터 Navigator Panel Options 내비게이터 패널 옵션 + Attributes Panel Options 속성 패널 옵션 + Number of Recent URLs: 최근 URL 수: +@msg `count` must be a whole number from 1 to 30 `count`은(는) 1에서 30 사이의 정수여야 합니다 Draw Dashed Lines as Solid Lines 점선을 실선으로 그리기 Pattern Options 패턴 옵션 Properties 속성 @@ -1583,6 +1586,7 @@ antiAlias Sharp 날카롭게 Duplicate Action or Action Set 액션 또는 액션 세트 복제 Delete the action set “{name}” and its actions? 액션 세트 “{name}”과(와) 해당 액션을 삭제하시겠습니까? Delete the selected action sets and their actions? 선택한 액션 세트와 해당 액션을 삭제하시겠습니까? + Delete all action sets and their actions? 모든 액션 세트와 해당 액션을 삭제하시겠습니까? Delete theme 테마 삭제 Delete this saved preset 저장된 이 프리셋 삭제 Delete {kind} Style {kind} 스타일 삭제 @@ -1927,6 +1931,7 @@ antiAlias Sharp 날카롭게 Fit in Window 창에 맞추기 Fit on Screen 화면에 맞추기 Flare 플레어 + Edit Flare 플레어 편집 Flare Tool 플레어 도구 Flat Image 단일 이미지 Flatness: 평탄도: @@ -2882,6 +2887,7 @@ diagnostics ui UI Save Actions… 액션 저장… Load Actions… 액션 불러오기… Replace Actions… 액션 바꾸기… + Clear Actions 액션 지우기 Reset Actions 액션 재설정 Replace the current actions with the default set? 현재 액션을 기본 세트로 바꾸시겠습니까? Append adds the default set after the current sets instead. 추가를 누르면 대신 기본 세트를 현재 세트 뒤에 추가합니다. @@ -3214,6 +3220,8 @@ mark-style Japanese 일본식 The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl 키를 누른 채 마우스 휠을 돌리면 캔버스가 가로로 스크롤됩니다. Dragging sideways on a numeric field's label changes the field's value. 숫자 필드의 레이블을 옆으로 드래그하면 필드 값이 바뀝니다. A two-finger rotate gesture on a trackpad rotates the canvas view. 트랙패드에서 두 손가락으로 회전하는 동작을 하면 캔버스 보기가 회전합니다. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. 키를 누르고 있으면 키보드 단축키의 누르고 있기 열에 있는 도구나 명령이 실행되고, 짧게 누르면 평소 단축키가 실행됩니다. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. 평소 단축키 대신 길게 누르기 단축키가 실행되기 전까지 키를 누르고 있어야 하는 시간(초)입니다. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. 고정점을 이동하면 한쪽 끝이 이동한 각 곡선은 양 끝을 기준으로 모양을 유지합니다. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. 도구의 바로 가기 키를 누르고 있는 동안 그 도구가 선택되고, 키를 놓으면 이전 도구가 다시 선택됩니다. Shows the bounding box while you move the selection or draw a shape. 선택 영역을 이동하거나 모양을 그리는 동안 테두리 상자를 표시합니다. @@ -4809,6 +4817,8 @@ variable-list-end {0}, {1} {0} 및 {1} @msg no such spine point 해당 스파인 포인트가 없습니다 @msg `with` must be a list of at most 10000 spine point indexes `with`는 스파인 포인트 인덱스 최대 10000개의 목록이어야 합니다 @msg `with` moves points, not a handle `with`는 포인트를 이동하며 핸들에는 쓸 수 없습니다 +@msg `link` and `independent` cannot both be true `link`와 `independent`를 동시에 true로 지정할 수 없습니다 +@msg `link` places a handle: give `handle` `link`는 핸들을 배치합니다. `handle`을 지정하십시오 @msg no such spine segment 해당 스파인 세그먼트가 없습니다 @msg no such subpath 해당 하위 패스가 없습니다 @msg object {id} is not a path 개체 {id}은(는) 패스가 아닙니다 @@ -4931,9 +4941,11 @@ variable-list-end {0}, {1} {0} 및 {1} @msg no bounds 경계가 없습니다 @msg no current layer 현재 레이어가 없습니다 @msg no key object 키 개체가 없습니다 +@msg Align to Key Object isn't available with the Artboard tool 아트보드 도구에서는 키 개체에 정렬을 사용할 수 없습니다 @msg no previous transform 이전 변형이 없습니다 @msg nothing to align 정렬할 항목이 없습니다 @msg select a clip group 클립 그룹을 선택하세요 +@msg select a flare 플레어를 선택하세요 @msg select two or more objects to distribute 분포할 개체를 두 개 이상 선택하세요 @msg axis must be "vertical", "horizontal" or an angle in degrees, not `{v}` axis는 "vertical", "horizontal" 또는 도 단위 각도여야 합니다: `{v}` @msg give horizontal or vertical horizontal 또는 vertical을 지정하세요 @@ -5676,6 +5688,7 @@ liquify-list-end {0}, {1} {0} 및 {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions 링크된 이미지 {n}개가 디스크에서 바뀌었습니다: 링크 업데이트를 하면 새 버전이 표시됩니다 @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk 디스크에서 바뀐 링크된 파일 {n}개를 업데이트했습니다 @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings 문서에 설정된 도련이 이 PDF/X 파일에서 빠집니다: "문서 도련 설정 사용"을 켜세요 +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed 객체 {n}개가 재단선에 닿지만 도련까지 이어지지 않습니다 @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} 참고 {n}건과 함께 {what}을(를) 내보냈습니다: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} 글꼴 파일 {n}개가 이제 {folder}에 있습니다 @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} 글꼴 파일 {n}개가 이제 {folder}에 있으며, {failed}개는 추가할 수 없었습니다: {reason} @@ -6457,6 +6470,9 @@ lighting Light 광원 Continue in Background 백그라운드에서 계속 Cancel Export 내보내기 취소 @msg Export cancelled 내보내기를 취소했습니다 + Cancel Save 저장 취소 +@plural {n} more save waiting|{n} more saves waiting 대기 중인 저장 {n}개 더 +@msg Save canceled 저장을 취소했습니다 # Paragraph panel menu › Justification… Desired 희망 Word Spacing: 단어 간격: @@ -6980,6 +6996,13 @@ axis Y Axis Y축 Bus Lines 버스 배선 Terminal Nodes 단자 노드 +# Original arrow art brushes. + Arrows 화살표 브러시 + Solid Arrow 채워진 화살표 + Open Arrow 속이 빈 화살표 + Double Arrow 양방향 화살표 + Chevron Arrow 갈매기형 화살표 + Notched Ribbon 노치 리본 Double Line 이중선 Wave 물결 @@ -7673,10 +7696,18 @@ breakText Glyphs 글리프 Smooth Bridge… 부드러운 브리지… Smooth Bridge 부드러운 브리지 Keep Originals 원본 유지 -@msg select two circles to bridge 연결할 원 두 개를 선택하십시오 +@msg select two or more circles to bridge 연결할 원을 두 개 이상 선택하십시오 @msg one circle is inside the other 한 원이 다른 원 안에 있습니다 @msg the circles are too far apart for this radius: raise the radius 이 반경에서는 원이 너무 멀리 떨어져 있습니다. 반경을 늘리십시오 @msg the circles are too far apart for this radius 이 반경에서는 원이 너무 멀리 떨어져 있습니다 + Constant Gap 일정한 간격 + Reach: 도달 거리: +@msg the circles are too far apart for this gap: raise the gap 이 간격에서는 원이 너무 멀리 떨어져 있습니다. 간격을 늘리십시오 +@msg the circles are too far apart for this gap 이 간격에서는 원이 너무 멀리 떨어져 있습니다 +@msg no two circles are within reach: raise the reach 도달 거리 안에 있는 두 원이 없습니다. 도달 거리를 늘리십시오 +@msg select at most 2000 circles to bridge 연결할 원을 2000개 이하로 선택하십시오 +@msg that makes too many bridges (at most 8000): lower the reach 브리지가 너무 많아집니다(최대 8000개). 도달 거리를 줄이십시오 +@msg the bridged circles are too complex to unite 연결된 원이 너무 복잡하여 합칠 수 없습니다 # Path Precision Tools add-on: Common Tangents. Common Tangents… 공통 접선… Common Tangents 공통 접선 @@ -9984,6 +10015,16 @@ breakText Glyphs 글리프 No objects are selected. 선택한 개체가 없습니다. Open a document to mark its fold lines. 접는 선을 지정하려면 문서를 여세요. Remove Fold Line Role 선 종류 제거 + Tap 짧게 누르기 + Clear Hold 길게 누르기 지우기 + Hold Shortcuts 길게 누르기 단축키 + Hold Shortcut Delay 길게 누르기 단축키 지연 시간 + How hold shortcuts work 길게 누르기 단축키 작동 방식 + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. 클릭한 다음 이 항목에 길게 누를 키를 누르세요 (Esc로 취소). 키를 길게 누르면 이 항목이 실행되고, 짧게 누르면 키 자체의 단축키가 실행됩니다. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. 키를 짧게 누르면 해당 단축키가 실행됩니다. 지연 시간 동안 키를 누르고 있으면 대신 누르고 있기 열의 도구나 명령이 실행됩니다. 길게 누르기 단축키는 문자, 숫자 또는 문장 부호 키이며, 단독으로 또는 Shift와 함께 사용합니다. +@msg Hold {_1} is already used by {_2} 길게 누르기 {_1}은(는) 이미 {_2}에서 사용 중입니다 +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) 길게 누르기 단축키는 문자를 입력하는 키를 단독으로 또는 Shift와 함께 사용해야 합니다 ({shown}에 Cmd, Ctrl 또는 Alt가 있음) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown}은(는) 길게 누르기 단축키가 될 수 없습니다: 문자, 숫자 또는 문장 부호 키를 사용하세요 Check 검사 Check Fold Lines 접는 선 검사 @msg No cut lines are in the selection. 선택 영역에 재단선이 없습니다. @@ -10004,6 +10045,7 @@ breakText Glyphs 글리프 @msg A panel is not joined to the rest by a crease. 패널이 어떤 오시선으로도 나머지와 연결되어 있지 않습니다. @msg A fold line is on a non-printing layer. 접는 선이 인쇄되지 않는 레이어에 있습니다. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 패널: {panels}, 힌지: {hinges}, 오류: {errors}, 경고: {warnings} + Dashed Arrow 점선 화살표 Pressure Sensitive 압력 감지 Flex Ribbon 유연한 리본 Pulse Stroke 맥동 획 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 61862d2da9..894c7096f6 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -1368,6 +1368,9 @@ liquify-list-end {0}, {1} {0} en {1} Magic Wand Magische toverstaf Navigator Navigator Navigator Panel Options Opties voor het paneel Navigator + Attributes Panel Options Opties voor het paneel Kenmerken + Number of Recent URLs: Aantal recente URL's: +@msg `count` must be a whole number from 1 to 30 `count` moet een geheel getal van 1 tot 30 zijn Draw Dashed Lines as Solid Lines Streepjeslijnen als doorgetrokken lijnen tekenen Pattern Options Patroonopties Properties Eigenschappen @@ -2088,6 +2091,7 @@ lighting Light Licht Save Actions… Acties opslaan… Load Actions… Acties laden… Replace Actions… Acties vervangen… + Clear Actions Acties wissen Reset Actions Acties opnieuw instellen Replace the current actions with the default set? De huidige acties vervangen door de standaardset? Append adds the default set after the current sets instead. Toevoegen voegt in plaats daarvan de standaardset toe na de huidige sets. @@ -2434,6 +2438,7 @@ digits Malayalam Malayalam Duplicate Action or Action Set Actie of actieset dupliceren Delete the action set “{name}” and its actions? De actieset „{name}” en de acties erin verwijderen? Delete the selected action sets and their actions? De geselecteerde actiesets en de acties erin verwijderen? + Delete all action sets and their actions? Alle actiesets en de acties erin verwijderen? Delete these {n} graphic styles? Deze {n} grafische stijlen verwijderen? Delete this {n} graphic style? Deze {n} grafische stijl verwijderen? Graphic Style Libraries Menu Menu grafische stijlbibliotheken @@ -4674,6 +4679,7 @@ theme Appearance Vormgeving Set Tab Stops Tabstops instellen Tab Stops Tabstops Flare Flare + Edit Flare Flare bewerken Rays Stralen Rectangle Rechthoek Paintbrush Penseel @@ -4954,6 +4960,8 @@ font-technology Variable Variabel The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Het muiswiel met Cmd/Ctrl ingedrukt schuift het canvas zijwaarts. Dragging sideways on a numeric field's label changes the field's value. Zijwaarts slepen over het label van een numeriek veld wijzigt de waarde van het veld. A two-finger rotate gesture on a trackpad rotates the canvas view. Een draaigebaar met twee vingers op een trackpad draait de weergave van het canvas. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Als u een toets vasthoudt, wordt het gereedschap of de opdracht uit de kolom Houd in Sneltoetsen uitgevoerd; kort drukken voert de gewone sneltoets uit. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Hoeveel seconden u een toets moet vasthouden voordat de vasthoudsneltoets wordt uitgevoerd in plaats van de gewone sneltoets. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Als u ankerpunten verplaatst, behoudt elke curve met één verplaatst uiteinde zijn vorm ten opzichte van zijn uiteinden. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Als u de sneltoets van een gereedschap ingedrukt houdt, is dat gereedschap gekozen tot u loslaat, en daarna wordt het vorige gereedschap weer gekozen. Shows the bounding box while you move the selection or draw a shape. Toont het begrenzingskader terwijl u de selectie verplaatst of een vorm tekent. @@ -5589,6 +5597,7 @@ imageTrace Outline Contour @msg no graphic style `{n}` geen grafische stijl `{n}` @msg no interaction in progress geen interactie gaande @msg no key object geen sleutelobject +@msg Align to Key Object isn't available with the Artboard tool Uitlijnen op sleutelobject is niet beschikbaar met het tekengebied-gereedschap @msg no library `{key}` (see {list}) geen bibliotheek `{key}` (zie {list}) @msg no native format geen eigen indeling @msg no pages geen pagina's @@ -5719,6 +5728,7 @@ imageTrace Outline Contour @msg select a Live Paint group selecteer een Live Paint-groep @msg select a blend selecteer een vermenging @msg select a clip group selecteer een knipgroep +@msg select a flare selecteer een flare @msg select a gradient mesh selecteer een verloopnet @msg select a linked image: an embedded one has no file selecteer een gekoppelde afbeelding: een ingesloten afbeelding heeft geen bestand @msg select a repeat selecteer een herhaling @@ -5927,6 +5937,7 @@ imageTrace Outline Contour @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} gekoppelde afbeelding is gewijzigd op de schijf: Koppelingen bijwerken toont de nieuwe versie|{n} gekoppelde afbeeldingen zijn gewijzigd op de schijf: Koppelingen bijwerken toont de nieuwe versies @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Bijgewerkt: {n} gekoppeld bestand gewijzigd op de schijf|Bijgewerkt: {n} gekoppelde bestanden gewijzigd op de schijf @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings het document stelt een afloop in die dit PDF/X-bestand weglaat: schakel 'Afloopinstellingen van document gebruiken' in +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} object reikt tot de snijrand maar stopt voor de afloop|{n} objecten reiken tot de snijrand maar stoppen voor de afloop @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} geëxporteerd met {n} opmerking: {first}|{what} geëxporteerd met {n} opmerkingen: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} er staat nu {n} lettertypebestand in {folder}|er staan nu {n} lettertypebestanden in {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} er staat nu {n} lettertypebestand in {folder}; {failed} konden niet worden toegevoegd: {reason}|er staan nu {n} lettertypebestanden in {folder}; {failed} konden niet worden toegevoegd: {reason} @@ -8946,6 +8957,8 @@ swatch Bright Violet Felviolet @msg no such spine point dat aspunt bestaat niet @msg `with` must be a list of at most 10000 spine point indexes `with` moet een lijst van hoogstens 10000 aspuntindexen zijn @msg `with` moves points, not a handle `with` verplaatst punten, geen handgreep +@msg `link` and `independent` cannot both be true `link` en `independent` kunnen niet allebei true zijn +@msg `link` places a handle: give `handle` `link` plaatst een handgreep: geef `handle` op @msg no such spine segment dat assegment bestaat niet @msg not a blend geen vermenging @msg select a blend or give `id` selecteer een vermenging of geef `id` op @@ -8987,6 +9000,9 @@ variable-list-end {0}, {1} {0} en {1} Continue in Background Doorgaan op achtergrond Cancel Export Export annuleren @msg Export cancelled Export geannuleerd + Cancel Save Opslaan annuleren +@plural {n} more save waiting|{n} more saves waiting Nog {n} opslagactie in de wachtrij|Nog {n} opslagacties in de wachtrij +@msg Save canceled Opslaan geannuleerd # Paragraph panel menu › Justification… Desired Gewenst Word Spacing: Woordafstand: @@ -9308,6 +9324,12 @@ axis Y Axis Y-as Bus Lines Buslijnen Terminal Nodes Aansluitpunten +# Original arrow art brushes. + Arrows Pijlen + Solid Arrow Massieve pijl + Open Arrow Open pijl + Chevron Arrow Chevronpijl + Notched Ribbon Gekerfd lint Double Line Dubbele lijn Wave Golf @@ -9961,10 +9983,18 @@ breakText Glyphs Glyphs Smooth Bridge… Vloeiende brug… Smooth Bridge Vloeiende brug Keep Originals Originelen behouden -@msg select two circles to bridge selecteer twee cirkels om te verbinden +@msg select two or more circles to bridge selecteer twee of meer cirkels om te verbinden @msg one circle is inside the other de ene cirkel ligt binnen de andere @msg the circles are too far apart for this radius: raise the radius de cirkels liggen te ver uit elkaar voor deze straal: vergroot de straal @msg the circles are too far apart for this radius de cirkels liggen te ver uit elkaar voor deze straal + Constant Gap Constante tussenruimte + Reach: Bereik: +@msg the circles are too far apart for this gap: raise the gap de cirkels liggen te ver uit elkaar voor deze tussenruimte: vergroot de tussenruimte +@msg the circles are too far apart for this gap de cirkels liggen te ver uit elkaar voor deze tussenruimte +@msg no two circles are within reach: raise the reach geen twee cirkels liggen binnen bereik: vergroot het bereik +@msg select at most 2000 circles to bridge selecteer hoogstens 2000 cirkels om te verbinden +@msg that makes too many bridges (at most 8000): lower the reach dat geeft te veel bruggen (hoogstens 8000): verklein het bereik +@msg the bridged circles are too complex to unite de verbonden cirkels zijn te complex om samen te voegen # Path Precision Tools add-on: Common Tangents. Common Tangents… Gemeenschappelijke raaklijnen… Common Tangents Gemeenschappelijke raaklijnen @@ -10413,6 +10443,16 @@ breakText Glyphs Glyphs No objects are selected. Er zijn geen objecten geselecteerd. Open a document to mark its fold lines. Open een document om de vouwlijnen te markeren. Remove Fold Line Role Lijnsoort verwijderen + Tap Kort drukken + Clear Hold Vasthouden wissen + Hold Shortcuts Vasthoudsneltoetsen + Hold Shortcut Delay Vertraging vasthoudsneltoetsen + How hold shortcuts work Zo werken vasthoudsneltoetsen + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Klik en druk vervolgens een toets in die hiervoor wordt vastgehouden (Esc annuleert). De toets vasthouden voert dit uit; kort drukken voert de eigen sneltoets van de toets uit. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Kort drukken op een toets voert de sneltoets ervan uit. De toets vasthouden gedurende de vertraging voert in plaats daarvan het gereedschap of de opdracht in de kolom Houd uit. Een vasthoudsneltoets is een letter-, cijfer- of leestekentoets, alleen of met Shift. +@msg Hold {_1} is already used by {_2} Vasthouden {_1} wordt al gebruikt door {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) een vasthoudsneltoets is een toets die een teken typt, alleen of met Shift ({shown} bevat Cmd, Ctrl of Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} kan geen vasthoudsneltoets zijn: gebruik een letter, een cijfer of een leestekentoets Check Controleren Check Fold Lines Vouwlijnen controleren @msg No cut lines are in the selection. De selectie bevat geen snijlijnen. @@ -10433,6 +10473,7 @@ breakText Glyphs Glyphs @msg A panel is not joined to the rest by a crease. Een paneel is door geen rillijn met de rest verbonden. @msg A fold line is on a non-printing layer. Een vouwlijn staat op een laag die niet wordt afgedrukt. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelen: {panels}, scharnieren: {hinges}, fouten: {errors}, waarschuwingen: {warnings} + Dashed Arrow Gestreepte pijl Pressure Sensitive Drukgevoelig Flex Ribbon Flexibel lint Pulse Stroke Pulserende streek diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index a5032e8ab7..c69ed2cf28 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -771,6 +771,9 @@ Magic Wand Różdżka Navigator Nawigator Navigator Panel Options Opcje panelu Nawigator + Attributes Panel Options Opcje panelu Atrybuty + Number of Recent URLs: Liczba ostatnich adresów URL: +@msg `count` must be a whole number from 1 to 30 `count` musi być liczbą całkowitą od 1 do 30 Draw Dashed Lines as Solid Lines Rysuj linie przerywane jako ciągłe Pattern Options Opcje wzorka Properties Właściwości @@ -1503,6 +1506,7 @@ lighting Light Światło Save Actions… Zapisz operacje… Load Actions… Wczytaj operacje… Replace Actions… Zastąp operacje… + Clear Actions Wyczyść operacje Reset Actions Resetuj operacje Replace the current actions with the default set? Zastąpić bieżące operacje zestawem domyślnym? Append adds the default set after the current sets instead. Dołącz dodaje zamiast tego zestaw domyślny po bieżących zestawach. @@ -1849,6 +1853,7 @@ digits Malayalam Malajalam Duplicate Action or Action Set Powiel operację lub zestaw operacji Delete the action set “{name}” and its actions? Usunąć zestaw operacji „{name}” i jego operacje? Delete the selected action sets and their actions? Usunąć zaznaczone zestawy operacji i ich operacje? + Delete all action sets and their actions? Usunąć wszystkie zestawy operacji i ich operacje? Delete these {n} graphic styles? Usunąć te style graficzne ({n})? Delete this {n} graphic style? Usunąć ten styl graficzny ({n})? Graphic Style Libraries Menu Menu bibliotek stylów graficznych @@ -4232,6 +4237,7 @@ theme Appearance Wygląd Set Tab Stops Ustaw tabulatory Tab Stops Tabulatory Flare Rozbłysk + Edit Flare Edytuj rozbłysk Rays Promienie Rectangle Prostokąt Paintbrush Pędzel @@ -4505,6 +4511,8 @@ font-technology Variable Zmienne The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Kółko myszy z wciśniętym Cmd/Ctrl przewija obszar roboczy w poziomie. Dragging sideways on a numeric field's label changes the field's value. Przeciąganie w bok po etykiecie pola liczbowego zmienia wartość pola. A two-finger rotate gesture on a trackpad rotates the canvas view. Gest obrotu dwoma palcami na gładziku obraca widok obszaru roboczego. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Przytrzymanie klawisza uruchamia narzędzie lub polecenie z jego kolumny Przytrzymaj w Skrótach klawiaturowych; krótkie naciśnięcie uruchamia jego zwykły skrót. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Ile sekund trzeba przytrzymać klawisz, zanim zamiast zwykłego skrótu zostanie uruchomiony jego skrót przytrzymania. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Podczas przesuwania punktów kontrolnych każda krzywa z jednym przesuniętym końcem zachowuje kształt względem swoich końców. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Przytrzymanie skrótu narzędzia wybiera je do momentu puszczenia klawisza, a potem ponownie wybierane jest poprzednie narzędzie. Shows the bounding box while you move the selection or draw a shape. Pokazuje obwiednię podczas przesuwania zaznaczenia lub rysowania kształtu. @@ -5358,6 +5366,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg no graphic style `{n}` brak stylu graficznego `{n}` @msg no interaction in progress brak trwającej interakcji @msg no key object brak obiektu kluczowego +@msg Align to Key Object isn't available with the Artboard tool „Wyrównaj do obiektu kluczowego” jest niedostępne z narzędziem Obszar kompozycji @msg no library `{key}` (see {list}) brak biblioteki `{key}` (patrz {list}) @msg no native format brak formatu natywnego @msg no pages brak stron @@ -5413,6 +5422,8 @@ liquify-list-end {0}, {1} {0} i {1} @msg no such spine point brak takiego punktu grzbietu @msg `with` must be a list of at most 10000 spine point indexes `with` musi być listą co najwyżej 10000 indeksów punktów grzbietu @msg `with` moves points, not a handle `with` przesuwa punkty, nie uchwyt +@msg `link` and `independent` cannot both be true `link` i `independent` nie mogą mieć jednocześnie wartości true +@msg `link` places a handle: give `handle` `link` umieszcza uchwyt: podaj `handle` @msg no such spine segment brak takiego segmentu grzbietu @msg no such subpath brak takiej ścieżki podrzędnej @msg no such user library brak takiej biblioteki użytkownika @@ -5503,6 +5514,7 @@ liquify-list-end {0}, {1} {0} i {1} @msg select a blend zaznacz przejście @msg select a blend or give `id` zaznacz przejście lub podaj `id` @msg select a clip group zaznacz grupę przycinającą +@msg select a flare zaznacz rozbłysk @msg select a gradient mesh zaznacz siatkę gradientową @msg select a linked image: an embedded one has no file zaznacz obraz połączony: osadzony nie ma pliku @msg select a repeat zaznacz powtórzenie @@ -5761,6 +5773,7 @@ variable-list-end {0}, {1} {0} i {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} połączony obraz zmienił się na dysku: Aktualizuj łącza pokaże nową wersję|{n} połączone obrazy zmieniły się na dysku: Aktualizuj łącza pokaże nowe wersje|{n} połączonych obrazów zmieniło się na dysku: Aktualizuj łącza pokaże nowe wersje @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Zaktualizowano {n} połączony plik zmieniony na dysku|Zaktualizowano {n} połączone pliki zmienione na dysku|Zaktualizowano {n} połączonych plików zmienionych na dysku @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings dokument ustawia spad, który ten plik PDF/X pomija: włącz „Użyj ustawień spadu dokumentu” +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed Obiekty sięgające linii cięcia, ale niedochodzące do spadu: {n}|Obiekty sięgające linii cięcia, ale niedochodzące do spadu: {n}|Obiekty sięgające linii cięcia, ale niedochodzące do spadu: {n} @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Wyeksportowano {what} z {n} uwagą: {first}|Wyeksportowano {what} z {n} uwagami: {first}|Wyeksportowano {what} z {n} uwagami: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} plik czcionki jest teraz w {folder}|{n} pliki czcionek są teraz w {folder}|{n} plików czcionek jest teraz w {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} plik czcionki jest teraz w {folder}; nie udało się dodać {failed}: {reason}|{n} pliki czcionek są teraz w {folder}; nie udało się dodać {failed}: {reason}|{n} plików czcionek jest teraz w {folder}; nie udało się dodać {failed}: {reason} @@ -6720,6 +6733,9 @@ mark-style Japanese Japońskie Continue in Background Kontynuuj w tle Cancel Export Anuluj eksport @msg Export cancelled Eksport anulowany + Cancel Save Anuluj zapisywanie +@plural {n} more save waiting|{n} more saves waiting Czeka jeszcze {n} zapis|Czekają jeszcze {n} zapisy|Czeka jeszcze {n} zapisów +@msg Save canceled Zapisywanie anulowane # Paragraph panel menu › Justification… Desired Optymalne Word Spacing: Odstępy między wyrazami: @@ -7238,6 +7254,12 @@ axis Y Axis Oś Y Bus Lines Linie magistrali Terminal Nodes Węzły końcowe +# Original arrow art brushes. + Arrows Strzałki + Solid Arrow Pełna strzałka + Open Arrow Otwarta strzałka + Chevron Arrow Strzałka z szewronem + Notched Ribbon Wstęga z nacięciami Double Line Podwójna linia Wave Fala @@ -7926,10 +7948,18 @@ breakText Glyphs Glify Smooth Bridge… Gładki most… Smooth Bridge Gładki most Keep Originals Zachowaj oryginały -@msg select two circles to bridge zaznacz dwa okręgi do połączenia +@msg select two or more circles to bridge zaznacz co najmniej dwa okręgi do połączenia @msg one circle is inside the other jeden okrąg jest wewnątrz drugiego @msg the circles are too far apart for this radius: raise the radius okręgi są zbyt daleko od siebie dla tego promienia: zwiększ promień @msg the circles are too far apart for this radius okręgi są zbyt daleko od siebie dla tego promienia + Constant Gap Stały odstęp + Reach: Zasięg: +@msg the circles are too far apart for this gap: raise the gap okręgi są zbyt daleko od siebie dla tego odstępu: zwiększ odstęp +@msg the circles are too far apart for this gap okręgi są zbyt daleko od siebie dla tego odstępu +@msg no two circles are within reach: raise the reach żadne dwa okręgi nie są w zasięgu: zwiększ zasięg +@msg select at most 2000 circles to bridge zaznacz najwyżej 2000 okręgów do połączenia +@msg that makes too many bridges (at most 8000): lower the reach to daje zbyt wiele mostów (najwyżej 8000): zmniejsz zasięg +@msg the bridged circles are too complex to unite połączone okręgi są zbyt złożone, aby je scalić # Path Precision Tools add-on: Common Tangents. Common Tangents… Wspólne styczne… Common Tangents Wspólne styczne @@ -10239,6 +10269,16 @@ breakText Glyphs Glify No objects are selected. Nie zaznaczono żadnych obiektów. Open a document to mark its fold lines. Otwórz dokument, aby oznaczyć jego linie zgięcia. Remove Fold Line Role Usuń rodzaj linii + Tap Krótkie naciśnięcie + Clear Hold Wyczyść przytrzymanie + Hold Shortcuts Skróty przytrzymania + Hold Shortcut Delay Opóźnienie skrótów przytrzymania + How hold shortcuts work Jak działają skróty przytrzymania + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Kliknij, a następnie naciśnij klawisz, który ma być przytrzymywany dla tego elementu (Esc anuluje). Przytrzymanie klawisza uruchamia ten element; krótkie naciśnięcie uruchamia własny skrót klawisza. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Krótkie naciśnięcie klawisza uruchamia jego skrót. Przytrzymanie klawisza przez czas opóźnienia uruchamia zamiast tego narzędzie lub polecenie z jego kolumny Przytrzymaj. Skrót przytrzymania to klawisz litery, cyfry lub znaku interpunkcyjnego, sam lub z Shift. +@msg Hold {_1} is already used by {_2} Przytrzymanie {_1} jest już używane przez {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) skrót przytrzymania to klawisz wpisujący znak, sam lub z Shift ({shown} zawiera Cmd, Ctrl lub Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} nie może być skrótem przytrzymania: użyj litery, cyfry lub klawisza interpunkcyjnego Check Sprawdź Check Fold Lines Sprawdź linie zgięcia @msg No cut lines are in the selection. W zaznaczeniu nie ma linii cięcia. @@ -10259,6 +10299,7 @@ breakText Glyphs Glify @msg A panel is not joined to the rest by a crease. Panel nie jest połączony z resztą żadną linią bigowania. @msg A fold line is on a non-printing layer. Linia zgięcia znajduje się na warstwie niedrukowanej. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panele: {panels}, zawiasy: {hinges}, błędy: {errors}, ostrzeżenia: {warnings} + Dashed Arrow Przerywana strzałka Pressure Sensitive Czułe na nacisk Flex Ribbon Elastyczna wstążka Pulse Stroke Pulsujące pociągnięcie diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index 1ef9d7c930..6bae5e26f1 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -790,6 +790,7 @@ antiAlias Sharp Nítido Duplicate Action or Action Set Duplicar Ação ou Conjunto de Ações Delete the action set “{name}” and its actions? Excluir o conjunto de ações “{name}” e suas ações? Delete the selected action sets and their actions? Excluir os conjuntos de ações selecionados e suas ações? + Delete all action sets and their actions? Excluir todos os conjuntos de ações e suas ações? Delete theme Excluir tema Delete this saved preset Excluir este predefinido salvo Delete {kind} Style Excluir Estilo de {kind} @@ -1261,6 +1262,7 @@ antiAlias Sharp Nítido Fit to Selected Art Ajustar à Arte Selecionada Flag… Bandeira… Flare Brilho de Lente + Edit Flare Editar Brilho de Lente Flare Tool Ferramenta Brilho de Lente Flat Image Imagem Plana Flatness: Achatamento: @@ -1910,6 +1912,9 @@ antiAlias Sharp Nítido Navigate Navegar Navigator Navegador Navigator Panel Options Opções do painel Navegador + Attributes Panel Options Opções do painel Atributos + Number of Recent URLs: Número de URLs Recentes: +@msg `count` must be a whole number from 1 to 30 `count` deve ser um número inteiro de 1 a 30 Draw Dashed Lines as Solid Lines Desenhar linhas tracejadas como linhas sólidas Needs the desktop app Requer o aplicativo de desktop Neutral Gradients Gradientes Neutros @@ -2279,6 +2284,7 @@ antiAlias Sharp Nítido Save Actions… Salvar Ações… Load Actions… Carregar Ações… Replace Actions… Substituir Ações… + Clear Actions Limpar Ações Reset Actions Redefinir Ações Replace the current actions with the default set? Substituir as ações atuais pelo conjunto padrão? Append adds the default set after the current sets instead. Anexar adiciona o conjunto padrão depois dos conjuntos atuais. @@ -2678,6 +2684,8 @@ digits Malayalam Malaiala The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. A roda do mouse com Cmd/Ctrl pressionado rola a tela para os lados. Dragging sideways on a numeric field's label changes the field's value. Arrastar para os lados sobre o rótulo de um campo numérico muda o valor do campo. A two-finger rotate gesture on a trackpad rotates the canvas view. Um gesto de rotação com dois dedos no trackpad gira a visualização da tela. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Manter uma tecla pressionada executa a ferramenta ou o comando da coluna Manter pressionado em Atalhos de Teclado; um toque rápido executa o atalho habitual. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Quantos segundos uma tecla precisa ficar pressionada até que seu atalho de pressionamento longo seja executado no lugar do atalho habitual. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Ao mover pontos de ancoragem, cada curva com uma extremidade movida mantém sua forma em relação às extremidades. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Manter pressionado o atalho de uma ferramenta a escolhe até você soltar, e então a ferramenta anterior é escolhida de novo. Shows the bounding box while you move the selection or draw a shape. Mostra a caixa delimitadora enquanto você move a seleção ou desenha uma forma. @@ -4504,6 +4512,7 @@ axis Both Ambos @msg no graphic style `{n}` nenhum estilo gráfico `{n}` @msg no interaction in progress nenhuma interação em andamento @msg no key object nenhum objeto-chave +@msg Align to Key Object isn't available with the Artboard tool Alinhar ao Objeto-Chave não está disponível com a Ferramenta Mesa de Trabalho @msg no library `{key}` (see {list}) nenhuma biblioteca `{key}` (veja {list}) @msg no native format sem formato nativo @msg no pages sem páginas @@ -4559,6 +4568,8 @@ axis Both Ambos @msg no such spine point ponto da coluna inexistente @msg `with` must be a list of at most 10000 spine point indexes `with` deve ser uma lista de no máximo 10000 índices de pontos da coluna @msg `with` moves points, not a handle `with` move pontos, não uma alça +@msg `link` and `independent` cannot both be true `link` e `independent` não podem ser true ao mesmo tempo +@msg `link` places a handle: give `handle` `link` posiciona uma alça: informe `handle` @msg no such spine segment segmento da coluna inexistente @msg no such subpath subtraçado inexistente @msg no such user library biblioteca do usuário inexistente @@ -4646,6 +4657,7 @@ axis Both Ambos @msg select a blend selecione uma mesclagem @msg select a blend or give `id` selecione uma mesclagem ou informe seu `id` @msg select a clip group selecione um grupo de recorte +@msg select a flare selecione um brilho de lente @msg select a gradient mesh selecione uma malha de gradiente @msg select a linked image: an embedded one has no file selecione uma imagem vinculada: uma incorporada não tem arquivo @msg select a repeat selecione uma repetição @@ -4902,6 +4914,7 @@ variable-list-end {0}, {1} {0} e {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} imagem vinculada mudou no disco: Atualizar links mostra a nova versão|{n} imagens vinculadas mudaram no disco: Atualizar links mostra as novas versões @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk {n} arquivo vinculado alterado no disco atualizado|{n} arquivos vinculados alterados no disco atualizados @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings o documento define uma sangria que este arquivo PDF/X omite: ative "Usar configurações de sangria do documento" +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objeto chega à borda de corte, mas para antes da sangria|{n} objetos chegam à borda de corte, mas param antes da sangria @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} exportado com {n} observação: {first}|{what} exportado com {n} observações: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} arquivo de fonte agora está em {folder}|{n} arquivos de fonte agora estão em {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} arquivo de fonte agora está em {folder}; não foi possível adicionar {failed}: {reason}|{n} arquivos de fonte agora estão em {folder}; não foi possível adicionar {failed}: {reason} @@ -6766,6 +6779,9 @@ mark-style Japanese Japonesas Continue in Background Continuar em Segundo Plano Cancel Export Cancelar Exportação @msg Export cancelled Exportação cancelada + Cancel Save Cancelar Salvamento +@plural {n} more save waiting|{n} more saves waiting Mais {n} salvamento aguardando|Mais {n} salvamentos aguardando +@msg Save canceled Salvamento cancelado # Paragraph panel menu › Justification… Desired Desejado Word Spacing: Espaçamento entre Palavras: @@ -7284,6 +7300,12 @@ axis Y Axis Eixo Y Bus Lines Linhas de barramento Terminal Nodes Nós terminais +# Original arrow art brushes. + Arrows Setas + Solid Arrow Seta Sólida + Open Arrow Seta Aberta + Chevron Arrow Seta com Divisa + Notched Ribbon Fita Entalhada Double Line Linha Dupla Wave Onda @@ -8088,10 +8110,18 @@ breakText Glyphs Glifos Smooth Bridge… Ponte suave… Smooth Bridge Ponte suave Keep Originals Manter originais -@msg select two circles to bridge selecione dois círculos para unir +@msg select two or more circles to bridge selecione dois ou mais círculos para unir @msg one circle is inside the other um círculo está dentro do outro @msg the circles are too far apart for this radius: raise the radius os círculos estão muito afastados para este raio: aumente o raio @msg the circles are too far apart for this radius os círculos estão muito afastados para este raio + Constant Gap Distância constante + Reach: Alcance: +@msg the circles are too far apart for this gap: raise the gap os círculos estão muito afastados para esta distância: aumente a distância +@msg the circles are too far apart for this gap os círculos estão muito afastados para esta distância +@msg no two circles are within reach: raise the reach nenhum par de círculos está dentro do alcance: aumente o alcance +@msg select at most 2000 circles to bridge selecione no máximo 2000 círculos para unir +@msg that makes too many bridges (at most 8000): lower the reach isso cria pontes demais (no máximo 8000): diminua o alcance +@msg the bridged circles are too complex to unite os círculos unidos são complexos demais para combinar # Path Precision Tools add-on: Common Tangents. Common Tangents… Tangentes comuns… Common Tangents Tangentes comuns @@ -10448,6 +10478,16 @@ swatch Yellow Green Verde-amarelado No objects are selected. Nenhum objeto selecionado. Open a document to mark its fold lines. Abra um documento para marcar suas linhas de dobra. Remove Fold Line Role Remover Tipo de Linha + Tap Toque Rápido + Clear Hold Limpar Pressionamento Longo + Hold Shortcuts Atalhos de Pressionamento Longo + Hold Shortcut Delay Atraso dos Atalhos de Pressionamento Longo + How hold shortcuts work Como funcionam os atalhos de pressionamento longo + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Clique e depois pressione uma tecla para manter pressionada para isto (Esc cancela). Manter a tecla pressionada executa isto; um toque rápido executa o atalho da própria tecla. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Um toque rápido em uma tecla executa o atalho dela. Manter a tecla pressionada pelo tempo do atraso executa, em vez disso, a ferramenta ou o comando da coluna Manter pressionado. Um atalho de pressionamento longo é uma tecla de letra, número ou pontuação, sozinha ou com Shift. +@msg Hold {_1} is already used by {_2} O pressionamento longo de {_1} já é usado por {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) um atalho de pressionamento longo é uma tecla que digita um caractere, sozinha ou com Shift ({shown} tem Cmd, Ctrl ou Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} não pode ser um atalho de pressionamento longo: use uma letra, um número ou uma tecla de pontuação Check Verificar Check Fold Lines Verificar Linhas de Dobra @msg No cut lines are in the selection. Não há linhas de corte na seleção. @@ -10468,6 +10508,7 @@ swatch Yellow Green Verde-amarelado @msg A panel is not joined to the rest by a crease. Um painel não está unido ao restante por nenhuma linha de vinco. @msg A fold line is on a non-printing layer. Uma linha de dobra está em uma camada não imprimível. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Painéis: {panels}, dobradiças: {hinges}, erros: {errors}, avisos: {warnings} + Dashed Arrow Seta tracejada Pressure Sensitive Sensível à pressão Flex Ribbon Fita flexível Pulse Stroke Traço pulsante diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 13e5037811..74156da429 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -871,6 +871,7 @@ font-technology Variable Вариативные Duplicate Action or Action Set Дублировать действие или набор действий Delete the action set “{name}” and its actions? Удалить набор действий «{name}» и его действия? Delete the selected action sets and their actions? Удалить выбранные наборы действий и их действия? + Delete all action sets and their actions? Удалить все наборы действий и их действия? Delete Theme Удалить тему Delete theme Удалить тему Delete these {n} graphic styles? Удалить эти графические стили ({n})? @@ -1380,6 +1381,7 @@ font-technology Variable Вариативные Fit to Selected Art Вписать в выделенный рисунок Flag… Флаг… Flare Блик + Edit Flare Редактировать блик Flare Tool Инструмент «Блик» Flare Tool Options Параметры инструмента «Блик» Halo Ореол @@ -2301,6 +2303,9 @@ file-filter Templates Шаблоны Navigate Навигация Navigator Навигатор Navigator Panel Options Параметры панели «Навигатор» + Attributes Panel Options Параметры панели «Атрибуты» + Number of Recent URLs: Число последних URL: +@msg `count` must be a whole number from 1 to 30 `count` должно быть целым числом от 1 до 30 Draw Dashed Lines as Solid Lines Рисовать штриховые линии сплошными Needs the desktop app Требуется настольное приложение Neutral Gradients Нейтральные градиенты @@ -2778,6 +2783,7 @@ diagnostics ui интерфейс Save Actions… Сохранить действия… Load Actions… Загрузить действия… Replace Actions… Заменить действия… + Clear Actions Очистить действия Reset Actions Сбросить действия Replace the current actions with the default set? Заменить текущие действия набором по умолчанию? Append adds the default set after the current sets instead. Кнопка «Добавить» вместо этого добавляет набор по умолчанию после текущих наборов. @@ -3223,6 +3229,8 @@ digits Malayalam Малаялам The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Колесо мыши с нажатой Cmd/Ctrl прокручивает холст по горизонтали. Dragging sideways on a numeric field's label changes the field's value. Перетаскивание по подписи числового поля в сторону меняет значение поля. A two-finger rotate gesture on a trackpad rotates the canvas view. Жест поворота двумя пальцами на трекпаде поворачивает вид холста. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Удержание клавиши запускает инструмент или команду из её столбца «Удерживать» в «Сочетаниях клавиш»; короткое нажатие запускает её обычное сочетание. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Сколько секунд нужно удерживать клавишу, прежде чем вместо её обычного сочетания сработает сочетание удержания. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. При перемещении опорных точек каждая кривая с одним перемещённым концом сохраняет форму относительно своих концов. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Пока вы удерживаете клавишу инструмента, он остаётся выбранным, а после отпускания снова выбирается предыдущий инструмент. Shows the bounding box while you move the selection or draw a shape. Показывает ограничивающую рамку, пока вы перемещаете выделение или рисуете фигуру. @@ -5269,6 +5277,7 @@ liquify-list-end {0}, {1} {0} и {1} @msg no graphic style `{n}` нет графического стиля `{n}` @msg no interaction in progress нет взаимодействия в процессе @msg no key object нет ключевого объекта +@msg Align to Key Object isn't available with the Artboard tool «Выровнять по ключевому объекту» недоступно с инструментом «Монтажная область» @msg no library `{key}` (see {list}) нет библиотеки `{key}` (см. {list}) @msg no native format нет собственного формата @msg no pages нет страниц @@ -5324,6 +5333,8 @@ liquify-list-end {0}, {1} {0} и {1} @msg no such spine point такой точки остова нет @msg `with` must be a list of at most 10000 spine point indexes `with` должен быть списком не более чем из 10000 индексов точек остова @msg `with` moves points, not a handle `with` перемещает точки, а не маркер +@msg `link` and `independent` cannot both be true `link` и `independent` не могут одновременно быть true +@msg `link` places a handle: give `handle` `link` размещает маркер: укажите `handle` @msg no such spine segment такого сегмента остова нет @msg no such subpath такого вложенного контура нет @msg no such user library такой пользовательской библиотеки нет @@ -5415,6 +5426,7 @@ liquify-list-end {0}, {1} {0} и {1} @msg select a blend выделите переход @msg select a blend or give `id` выделите переход или укажите `id` @msg select a clip group выделите группу обрезки +@msg select a flare выделите блик @msg select a gradient mesh выделите градиентную сетку @msg select a linked image: an embedded one has no file выделите связанное изображение: у внедрённого нет файла @msg select a repeat выделите повтор @@ -5672,6 +5684,7 @@ variable-list-end {0}, {1} {0} и {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} связанное изображение изменилось на диске: «Обновить связи» покажет новую версию|{n} связанных изображения изменились на диске: «Обновить связи» покажет новые версии|{n} связанных изображений изменились на диске: «Обновить связи» покажет новые версии @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Обновлён {n} связанный файл, изменённый на диске|Обновлено {n} связанных файла, изменённых на диске|Обновлено {n} связанных файлов, изменённых на диске @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings в документе задан вылет, который этот файл PDF/X не включает: включите «Использовать параметры вылета документа» +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed Объектов, доходящих до обрезного края, но не до вылета: {n}|Объектов, доходящих до обрезного края, но не до вылета: {n}|Объектов, доходящих до обрезного края, но не до вылета: {n} @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Экспортировано: {what} с {n} примечанием: {first}|Экспортировано: {what} с {n} примечаниями: {first}|Экспортировано: {what} с {n} примечаниями: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} файл шрифта теперь в {folder}|{n} файла шрифтов теперь в {folder}|{n} файлов шрифтов теперь в {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} файл шрифта теперь в {folder}; не удалось добавить {failed}: {reason}|{n} файла шрифтов теперь в {folder}; не удалось добавить {failed}: {reason}|{n} файлов шрифтов теперь в {folder}; не удалось добавить {failed}: {reason} @@ -6484,6 +6497,9 @@ lighting Light Свет Continue in Background Продолжить в фоне Cancel Export Отменить экспорт @msg Export cancelled Экспорт отменён + Cancel Save Отменить сохранение +@plural {n} more save waiting|{n} more saves waiting Ещё {n} сохранение в очереди|Ещё {n} сохранения в очереди|Ещё {n} сохранений в очереди +@msg Save canceled Сохранение отменено # Paragraph panel menu › Justification… Desired Желательно Word Spacing: Интервал между словами: @@ -7008,6 +7024,12 @@ axis Y Axis Ось Y Bus Lines Линии шины Terminal Nodes Контактные узлы +# Original arrow art brushes. + Arrows Кисти-стрелки + Solid Arrow Сплошная стрелка + Open Arrow Открытая стрелка + Chevron Arrow Стрелка с шевроном + Notched Ribbon Лента с насечками Double Line Двойная линия Wave Волна @@ -8059,10 +8081,18 @@ breakText Glyphs Глифы Smooth Bridge… Плавный мост… Smooth Bridge Плавный мост Keep Originals Сохранить оригиналы -@msg select two circles to bridge выделите две окружности для соединения +@msg select two or more circles to bridge выделите две или более окружностей для соединения @msg one circle is inside the other одна окружность находится внутри другой @msg the circles are too far apart for this radius: raise the radius окружности слишком далеко друг от друга для этого радиуса: увеличьте радиус @msg the circles are too far apart for this radius окружности слишком далеко друг от друга для этого радиуса + Constant Gap Постоянный зазор + Reach: Охват: +@msg the circles are too far apart for this gap: raise the gap окружности слишком далеко друг от друга для этого зазора: увеличьте зазор +@msg the circles are too far apart for this gap окружности слишком далеко друг от друга для этого зазора +@msg no two circles are within reach: raise the reach нет двух окружностей в пределах охвата: увеличьте охват +@msg select at most 2000 circles to bridge выделите не более 2000 окружностей для соединения +@msg that makes too many bridges (at most 8000): lower the reach получается слишком много мостов (не более 8000): уменьшите охват +@msg the bridged circles are too complex to unite соединяемые окружности слишком сложны для объединения # Path Precision Tools add-on: Common Tangents. Common Tangents… Общие касательные… Common Tangents Общие касательные @@ -10494,6 +10524,17 @@ shape Open Открытый @msg Two panels pass through each other. Две панели проходят друг сквозь друга. @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} пикселей — слишком большой размер для PSD (не более {MAX_SIDE} пикселей по стороне): уменьшите разрешение @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer должен быть "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" + Tap Короткое нажатие + Clear Hold Очистить удержание + Hold Shortcuts Клавиши удержания + Hold Shortcut Delay Задержка клавиш удержания + How hold shortcuts work Как работают клавиши удержания + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Щелкните, затем нажмите клавишу, которую нужно удерживать для этого (Esc отменяет). Удержание клавиши запускает это; короткое нажатие запускает собственное сочетание клавиши. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Короткое нажатие клавиши запускает ее сочетание. Удержание клавиши в течение задержки запускает вместо этого инструмент или команду из ее столбца «Удерживать». Клавиша удержания — это клавиша буквы, цифры или знака препинания, отдельно или с Shift. +@msg Hold {_1} is already used by {_2} Удержание {_1} уже используется для {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) клавиша удержания — это клавиша, которая вводит символ, отдельно или с Shift ({shown} содержит Cmd, Ctrl или Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} не может быть клавишей удержания: используйте букву, цифру или клавишу знака препинания + Dashed Arrow Пунктирная стрелка Pressure Sensitive Чувствительные к нажиму Flex Ribbon Гибкая лента Pulse Stroke Пульсирующий штрих diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index bf822109a7..4d683cb1ea 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -856,6 +856,7 @@ font-technology Variable Variabla Duplicate Action or Action Set Duplicera åtgärd eller åtgärdsuppsättning Delete the action set “{name}” and its actions? Radera åtgärdsuppsättningen ”{name}” och dess åtgärder? Delete the selected action sets and their actions? Radera de markerade åtgärdsuppsättningarna och deras åtgärder? + Delete all action sets and their actions? Radera alla åtgärdsuppsättningar och deras åtgärder? Delete Theme Radera tema Delete theme Radera tema Delete these {n} graphic styles? Radera dessa {n} grafikstilar? @@ -1329,6 +1330,7 @@ font-technology Variable Variabla Fit to Selected Art Anpassa till markerad grafik Flag… Flagga… Flare Ljusreflex + Edit Flare Redigera ljusreflex Flare Tool Ljusreflexverktyg Flare Tool Options Alternativ för ljusreflexverktyget Halo Halo @@ -2203,6 +2205,9 @@ font-technology Variable Variabla Navigate Navigera Navigator Navigator Navigator Panel Options Alternativ för panelen Navigator + Attributes Panel Options Alternativ för panelen Attribut + Number of Recent URLs: Antal senaste URL:er: +@msg `count` must be a whole number from 1 to 30 `count` måste vara ett heltal från 1 till 30 Draw Dashed Lines as Solid Lines Rita streckade linjer som heldragna linjer Needs the desktop app Kräver skrivbordsappen Neutral Gradients Neutrala gradienter @@ -2671,6 +2676,7 @@ font-technology Variable Variabla Save Actions… Spara åtgärder… Load Actions… Läs in åtgärder… Replace Actions… Ersätt åtgärder… + Clear Actions Rensa åtgärder Reset Actions Återställ åtgärder Replace the current actions with the default set? Vill du ersätta de aktuella åtgärderna med standarduppsättningen? Append adds the default set after the current sets instead. Lägg till lägger i stället till standarduppsättningen efter de aktuella uppsättningarna. @@ -3112,6 +3118,8 @@ digits Malayalam Malayalam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Mushjulet med Cmd/Ctrl nedtryckt rullar arbetsytan i sidled. Dragging sideways on a numeric field's label changes the field's value. Att dra i sidled på ett sifferfälts etikett ändrar fältets värde. A two-finger rotate gesture on a trackpad rotates the canvas view. En rotationsgest med två fingrar på en styrplatta roterar arbetsytans vy. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Om du håller ned en tangent körs verktyget eller kommandot i dess Håll-kolumn i Kortkommandon; ett kort tryck kör dess vanliga kortkommando. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Hur många sekunder en tangent måste hållas ned innan dess hållkortkommando körs i stället för dess vanliga kortkommando. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. När du flyttar ankarpunkter behåller varje kurva med en flyttad ände sin form i förhållande till sina ändar. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. När du håller ned ett verktygs kortkommando är verktyget valt tills du släpper, och sedan väljs det föregående verktyget igen. Shows the bounding box while you move the selection or draw a shape. Visar avgränsningsramen medan du flyttar markeringen eller ritar en form. @@ -5133,6 +5141,7 @@ liquify-list-end {0}, {1} {0} och {1} @msg no graphic style `{n}` ingen grafisk stil `{n}` @msg no interaction in progress ingen interaktion pågår @msg no key object inget nyckelobjekt +@msg Align to Key Object isn't available with the Artboard tool Justera mot nyckelobjekt är inte tillgängligt med ritytsverktyget @msg no library `{key}` (see {list}) inget bibliotek `{key}` (se {list}) @msg no native format inget eget format @msg no pages inga sidor @@ -5188,6 +5197,8 @@ liquify-list-end {0}, {1} {0} och {1} @msg no such spine point ryggradspunkten finns inte @msg `with` must be a list of at most 10000 spine point indexes `with` måste vara en lista med högst 10000 ryggradspunktsindex @msg `with` moves points, not a handle `with` flyttar punkter, inte ett handtag +@msg `link` and `independent` cannot both be true `link` och `independent` kan inte båda vara true +@msg `link` places a handle: give `handle` `link` placerar ett handtag: ange `handle` @msg no such spine segment ryggradssegmentet finns inte @msg no such subpath delbanan finns inte @msg no such user library användarbiblioteket finns inte @@ -5277,6 +5288,7 @@ liquify-list-end {0}, {1} {0} och {1} @msg select a blend markera en blandning @msg select a blend or give `id` markera en blandning eller ange dess `id` @msg select a clip group markera en urklippsgrupp +@msg select a flare markera en ljusreflex @msg select a gradient mesh markera ett gradientnät @msg select a linked image: an embedded one has no file markera en länkad bild: en inbäddad bild har ingen fil @msg select a repeat markera en upprepning @@ -5527,6 +5539,7 @@ variable-list-end {0}, {1} {0} och {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} länkad bild har ändrats på disken: Uppdatera länkar visar den nya versionen|{n} länkade bilder har ändrats på disken: Uppdatera länkar visar de nya versionerna @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Uppdaterade {n} länkad fil som ändrats på disken|Uppdaterade {n} länkade filer som ändrats på disken @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings dokumentet anger ett utfall som den här PDF/X-filen utelämnar: slå på ”Använd dokumentets inställningar för utfall” +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} objekt når skärkanten men slutar före utfallet|{n} objekt når skärkanten men slutar före utfallet @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Exporterade {what} med {n} anteckning: {first}|Exporterade {what} med {n} anteckningar: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} typsnittsfil finns nu i {folder}|{n} typsnittsfiler finns nu i {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} typsnittsfil finns nu i {folder}; {failed} kunde inte läggas till: {reason}|{n} typsnittsfiler finns nu i {folder}; {failed} kunde inte läggas till: {reason} @@ -6913,6 +6926,9 @@ swatch Yellow Green Gulgrön Continue in Background Fortsätt i bakgrunden Cancel Export Avbryt export @msg Export cancelled Exporten avbröts + Cancel Save Avbryt sparande +@plural {n} more save waiting|{n} more saves waiting {n} sparande till väntar|{n} sparanden till väntar +@msg Save canceled Sparandet avbröts # Paragraph panel menu › Justification… Desired Önskat Word Spacing: Ordavstånd: @@ -7391,6 +7407,12 @@ axis Y Axis Y-axel Bus Lines Bussledningar Terminal Nodes Anslutningspunkter +# Original arrow art brushes. + Arrows Pilar + Solid Arrow Massiv pil + Open Arrow Öppen pil + Chevron Arrow Chevronpil + Notched Ribbon Hackat band Double Line Dubbellinje Wave Våg @@ -8103,10 +8125,18 @@ breakText Glyphs Glyfer Smooth Bridge… Mjuk brygga… Smooth Bridge Mjuk brygga Keep Originals Behåll original -@msg select two circles to bridge markera två cirklar att förbinda +@msg select two or more circles to bridge markera två eller fler cirklar att förbinda @msg one circle is inside the other den ena cirkeln ligger inuti den andra @msg the circles are too far apart for this radius: raise the radius cirklarna ligger för långt ifrån varandra för den här radien: öka radien @msg the circles are too far apart for this radius cirklarna ligger för långt ifrån varandra för den här radien + Constant Gap Konstant mellanrum + Reach: Räckvidd: +@msg the circles are too far apart for this gap: raise the gap cirklarna ligger för långt ifrån varandra för det här mellanrummet: öka mellanrummet +@msg the circles are too far apart for this gap cirklarna ligger för långt ifrån varandra för det här mellanrummet +@msg no two circles are within reach: raise the reach inga två cirklar ligger inom räckvidd: öka räckvidden +@msg select at most 2000 circles to bridge markera högst 2000 cirklar att förbinda +@msg that makes too many bridges (at most 8000): lower the reach det ger för många bryggor (högst 8000): minska räckvidden +@msg the bridged circles are too complex to unite de förbundna cirklarna är för komplexa för att slås ihop # Path Precision Tools add-on: Common Tangents. Common Tangents… Gemensamma tangenter… Common Tangents Gemensamma tangenter @@ -10097,6 +10127,17 @@ digits Hindi Hindi @msg A joint does not close by {gap} pt. En fog sluter inte med {gap} pt. @msg Two panels pass through each other. Två paneler går igenom varandra. @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} pixlar är för stort för PSD (högst {MAX_SIDE} pixlar per sida): sänk upplösningen + Tap Kort tryck + Clear Hold Rensa håll + Hold Shortcuts Hållkortkommandon + Hold Shortcut Delay Fördröjning för hållkortkommandon + How hold shortcuts work Så fungerar hållkortkommandon + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Klicka och tryck sedan på en tangent som ska hållas ned för detta (Esc avbryter). Att hålla ned tangenten kör detta; ett kort tryck kör tangentens eget kortkommando. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Ett kort tryck på en tangent kör dess kortkommando. Att hålla ned tangenten under fördröjningen kör i stället verktyget eller kommandot i dess Håll-kolumn. Ett hållkortkommando är en bokstavs-, siffer- eller skiljeteckentangent, ensam eller med Shift. +@msg Hold {_1} is already used by {_2} Håll {_1} används redan av {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) ett hållkortkommando är en tangent som skriver ett tecken, ensam eller med Shift ({shown} har Cmd, Ctrl eller Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} kan inte vara ett hållkortkommando: använd en bokstav, en siffra eller en skiljeteckentangent + Dashed Arrow Streckad pil Pressure Sensitive Tryckkänslig Flex Ribbon Flexibelt band Pulse Stroke Pulserande drag diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index c21a6d6038..19e8f367c6 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -498,6 +498,22 @@ fn font_height_reference_labels_are_in_complete_catalogs() { } } +/// The Attributes Panel Options dialog's heading and field, and the error for a count out of range. +#[test] +fn attributes_panel_options_strings_are_in_complete_catalogs() { + for lang in LANGUAGES.iter().filter(|lang| lang.complete_menus) { + for label in ["Attributes Panel Options", "Number of Recent URLs:"] { + assert!(lang.catalog().plain(label).is_some(), "{} is missing {label}", lang.code); + } + } + let range = "`count` must be a whole number from 1 to 30"; + assert!(message_literals().contains(range)); + for code in COMPLETE_MESSAGES { + let lang = Lang::from_code(code).expect("registered"); + assert_ne!(message(lang, range), range, "{code}"); + } +} + /// Area Type Options › First Baseline's choices (the dropdown reads them in the "effect" context, /// falling back to the plain row). #[test] @@ -2685,6 +2701,31 @@ fn messages_translate_by_template_and_their_parts() { assert_eq!(message(Lang::EN, nested), nested); } +/// Spanish shows the status and error messages of the script engine, the parameter checks, the +/// importers and the 3D effects in Spanish, with the values, names and command ids they carry kept. +#[test] +fn spanish_translates_engine_import_and_parameter_messages() { + let es = Lang::from_code("es").expect("registered"); + for (english, spanish) in [ + ("`colors` must be a whole number from 2 to 256", "`colors` debe ser un número entero entre 2 y 256"), + ("JSON.parse: oops (at offset 12)", "JSON.parse: oops (en el desplazamiento 12)"), + ("unknown mode `foo` (set, add, subtract)", "modo desconocido `foo` (set, add, subtract)"), + ( + "the Word document is encrypted or protected with a password; save it without one to place it", + "el documento de Word está cifrado o protegido con contraseña; guárdalo sin ella para colocarlo", + ), + ( + "object 7: with a depth of 0 the object has one face: map its graphics onto the front", + "objeto 7: con una profundidad de 0 el objeto tiene una sola cara: asigna sus gráficos a la parte frontal", + ), + ("no custom arrowhead Fin (see stroke.arrowheads.list)", "no existe la punta de flecha personalizada Fin (consulta stroke.arrowheads.list)"), + ("`warichuLines` must be a whole number from 1 to 6", "`warichuLines` debe ser un número entero entre 1 y 6"), + ("the rectangle or line reaches too many paths to check", "el rectángulo o la línea alcanza demasiados trazados para comprobarlos"), + ] { + assert_eq!(message(es, english), spanish); + } +} + /// The note `recolor.apply` and the Edit Colors commands give when they leave out locked or hidden /// objects is translated whole, its counts included, in every complete-message language. #[test] @@ -5758,6 +5799,21 @@ fn pdfx_bleed_warning_is_translated() { } } +/// The warning about art that reaches the trim edge but stops short of the bleed is translated in +/// every complete-message catalog, for one object and for more, alone and in the status bar's note. +#[test] +fn short_of_bleed_warning_is_translated() { + for n in [1, 3, 5, 21] { + let w = vectorcraft_engine::cmd::fileio::pdf::short_of_bleed_warning(n).expect("a warning"); + let status = format!("Saved /tmp/a.pdf with 1 note: {w}"); + for code in COMPLETE_MESSAGES { + for shown in [message(Lang::from_code(code).expect("registered"), &w), message(Lang::from_code(code).expect("registered"), &status)] { + assert!(!shown.contains("trim edge") && !shown.contains("short of") && shown.contains(&n.to_string()), "{code}: {shown}"); + } + } + } +} + /// The Shape Mode commands' warning for a selected line that encloses no area, which the status bar /// shows and the message scan doesn't read, and Intersect's error when such a line leaves nothing, /// are translated in each language of [`COMPLETE_MESSAGES`]. diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index cc6d537415..d0e30b8fdc 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -852,6 +852,7 @@ font-technology Variable Değişken Duplicate Action or Action Set Eylemi veya Eylem Setini Çoğalt Delete the action set “{name}” and its actions? “{name}” eylem seti ve eylemleri silinsin mi? Delete the selected action sets and their actions? Seçili eylem setleri ve eylemleri silinsin mi? + Delete all action sets and their actions? Tüm eylem setleri ve eylemleri silinsin mi? Delete Theme Temayı Sil Delete theme Temayı sil Delete these {n} graphic styles? Bu {n} grafik stilleri silinsin mi? @@ -1331,6 +1332,7 @@ font-technology Variable Değişken Fit to Selected Art Seçilen Sanata Sığdır Flag… Bayrak… Flare parlama + Edit Flare Parlamayı Düzenle Flare Tool Mercek Parlaması Aracı Flare Tool Options Genişletme Aracı Seçenekleri Halo Hale @@ -2089,6 +2091,9 @@ font-technology Variable Değişken Navigate Gezin Navigator Gezgin Navigator Panel Options Gezgin Paneli Seçenekleri + Attributes Panel Options Nitelikler Paneli Seçenekleri + Number of Recent URLs: Son URL Sayısı: +@msg `count` must be a whole number from 1 to 30 `count` 1 ile 30 arasında bir tam sayı olmalıdır Draw Dashed Lines as Solid Lines Kesikli Çizgileri Düz Çizgi Olarak Çiz Needs the desktop app Masaüstü uygulaması gerekiyor Neutral Gradients Nötr Degradeler @@ -2523,6 +2528,7 @@ shape Open Açık Save Actions… Eylemleri Kaydet… Load Actions… Eylemleri Yükle… Replace Actions… Eylemleri Değiştir… + Clear Actions Eylemleri Temizle Reset Actions Eylemleri Sıfırla Replace the current actions with the default set? Geçerli eylemler varsayılan setle değiştirilsin mi? Append adds the default set after the current sets instead. Ekle bunun yerine varsayılan seti geçerli setlerin sonuna ekler. @@ -2960,6 +2966,8 @@ digits Malayalam Malayalam The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Cmd/Ctrl basılıyken fare tekerleği tuvali yana kaydırır. Dragging sideways on a numeric field's label changes the field's value. Sayısal bir alanın etiketi üzerinde yana sürüklemek alanın değerini değiştirir. A two-finger rotate gesture on a trackpad rotates the canvas view. İzleme dörtgeninde iki parmakla döndürme hareketi tuvalin görünümünü döndürür. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Bir tuşu basılı tutmak, Klavye Kısayolları'ndaki Basılı tutun sütununda bulunan aracı veya komutu çalıştırır; kısa basış olağan kısayolunu çalıştırır. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Olağan kısayolu yerine basılı tutma kısayolunun çalışması için bir tuşun kaç saniye basılı tutulması gerektiği. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Bağlantı noktalarını taşıdığınızda, bir ucu taşınan her eğri uçlarına göre şeklini korur. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Bir aracın kısayol tuşunu basılı tutmak, tuşu bırakana kadar o aracı seçer, ardından önceki araç yeniden seçilir. Shows the bounding box while you move the selection or draw a shape. Seçimi taşırken veya bir şekil çizerken sınırlayıcı kutuyu gösterir. @@ -3687,9 +3695,9 @@ digits Malayalam Malayalam Styling: Şekillendirme: Stylize Stilize Et Subdivisions Alt bölümler - Subscript Abonelik - Subscript (on the roadmap) Abonelik (yol haritasında) - Subscript: Abonelik: + Subscript Alt simge + Subscript (on the roadmap) Alt simge (yol haritasında) + Subscript: Alt simge: Subset fonts below: Aşağıdaki yazı tiplerinin alt kümesi: Subtract Çıkar Suffix son ek @@ -4960,6 +4968,7 @@ liquify-list-end {0}, {1} {0} ve {1} @msg no graphic style `{n}` grafik stili yok `{n}` @msg no interaction in progress herhangi bir etkileşim devam etmiyor @msg no key object anahtar nesne yok +@msg Align to Key Object isn't available with the Artboard tool Anahtar Nesneye Hizala, Çalışma Yüzeyi Aracı ile kullanılamaz @msg no library `{key}` (see {list}) `{key}` kitaplığı yok (bkz. {list}) @msg no native format yerel format yok @msg no pages sayfa yok @@ -5126,6 +5135,7 @@ liquify-list-end {0}, {1} {0} ve {1} @msg select a Live Paint group bir Canlı Boyama grubu seçin @msg select a blend bir karışım seç @msg select a clip group bir klip grubu seçin +@msg select a flare bir parlama seçin @msg select a gradient mesh bir degrade ağı seçin @msg select a linked image: an embedded one has no file bağlantılı bir görsel seçin: gömülü görselin dosyası yok @msg select a repeat bir tekrar seç @@ -5358,6 +5368,7 @@ liquify-list-end {0}, {1} {0} ve {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} bağlantılı görsel diskte değişti: Bağlantıları Güncelle yeni sürümleri gösterir @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Diskte değişen {n} bağlantılı dosya güncellendi @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings belge, bu PDF/X dosyasının dışarıda bıraktığı bir taşma payı ayarlıyor: "Belge taşma payı ayarlarını kullan" seçeneğini açın +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} nesne kesim kenarına ulaşıyor ancak taşma payından önce bitiyor @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} {what} {n} notla dışa aktarıldı: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} yazı tipi dosyası artık {folder} içinde @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} yazı tipi dosyası artık {folder} içinde; {failed} eklenemedi: {reason} @@ -6684,6 +6695,8 @@ theme Appearance Görünüm @msg no such spine point böyle bir omurga noktası yok @msg `with` must be a list of at most 10000 spine point indexes `with` en fazla 10000 omurga noktası dizininden oluşan bir liste olmalıdır @msg `with` moves points, not a handle `with` noktaları taşır, tutamacı değil +@msg `link` and `independent` cannot both be true `link` ve `independent` aynı anda true olamaz +@msg `link` places a handle: give `handle` `link` bir tutamaç yerleştirir: `handle` verin @msg no such spine segment böyle bir omurga segmenti yok @msg not a blend bir karışım değil @msg select a blend or give `id` bir karışım seçin veya `id` belirtin @@ -6975,6 +6988,9 @@ variable-list-end {0}, {1} {0} ve {1} @msg Flat Logo traced the image at {_1} × {_2} pixels, averaged down from {_3} × {_4}. Düz Logo modu görüntüyü {_3} × {_4} boyutundan ortalama alarak küçültüp {_1} × {_2} pikselde izledi. @plural {n} more export waiting|{n} more exports waiting {n} dışa aktarma daha bekliyor|{n} dışa aktarma daha bekliyor @msg Export cancelled Dışa aktarma iptal edildi + Cancel Save Kaydetmeyi İptal Et +@plural {n} more save waiting|{n} more saves waiting {n} kaydetme daha bekliyor|{n} kaydetme daha bekliyor +@msg Save canceled Kaydetme iptal edildi Add filters from the list above Yukarıdaki listeden filtre ekleyin Add to Stack Yığına Ekle Applied Filters Uygulanan Filtreler @@ -9275,6 +9291,12 @@ axis Y Axis Y ekseni Bus Lines Veriyolu hatları Terminal Nodes Bağlantı düğümleri +# Original arrow art brushes. + Arrows Oklar + Solid Arrow Dolu Ok + Open Arrow Açık Ok + Chevron Arrow Köşeli Ok + Notched Ribbon Çentikli Şerit Double Line Çift Çizgi Wave Dalga @@ -9959,10 +9981,18 @@ breakText Glyphs Glifler Smooth Bridge… Yumuşak Köprü… Smooth Bridge Yumuşak Köprü Keep Originals Orijinalleri Koru -@msg select two circles to bridge köprüyle birleştirilecek iki daire seçin +@msg select two or more circles to bridge köprüyle birleştirilecek iki veya daha fazla daire seçin @msg one circle is inside the other bir daire diğerinin içinde @msg the circles are too far apart for this radius: raise the radius daireler bu yarıçap için birbirinden çok uzak: yarıçapı artırın @msg the circles are too far apart for this radius daireler bu yarıçap için birbirinden çok uzak + Constant Gap Sabit Boşluk + Reach: Erişim: +@msg the circles are too far apart for this gap: raise the gap daireler bu boşluk için birbirinden çok uzak: boşluğu artırın +@msg the circles are too far apart for this gap daireler bu boşluk için birbirinden çok uzak +@msg no two circles are within reach: raise the reach erişim içinde hiçbir iki daire yok: erişimi artırın +@msg select at most 2000 circles to bridge köprüyle birleştirmek için en fazla 2000 daire seçin +@msg that makes too many bridges (at most 8000): lower the reach bu çok fazla köprü oluşturur (en fazla 8000): erişimi azaltın +@msg the bridged circles are too complex to unite köprülenen daireler birleştirilemeyecek kadar karmaşık # Path Precision Tools add-on: Common Tangents. Common Tangents… Ortak Teğetler… Common Tangents Ortak Teğetler @@ -10334,6 +10364,16 @@ breakText Glyphs Glifler No objects are selected. Hiçbir nesne seçili değil. Open a document to mark its fold lines. Katlama çizgilerini işaretlemek için bir belgeyi açın. Remove Fold Line Role Çizgi Türünü Kaldır + Tap Kısa Basma + Clear Hold Basılı Tutmayı Temizle + Hold Shortcuts Basılı Tutma Kısayolları + Hold Shortcut Delay Basılı Tutma Kısayolu Gecikmesi + How hold shortcuts work Basılı tutma kısayolları nasıl çalışır + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Tıklayın, ardından bunun için basılı tutulacak tuşa basın (Esc iptal edilir). Tuşu basılı tutmak bunu çalıştırır; kısa basmak tuşun kendi kısayolunu çalıştırır. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Bir tuşa kısa basmak onun kısayolunu çalıştırır. Tuşu gecikme süresi boyunca basılı tutmak bunun yerine Basılı tutun sütunundaki aracı veya komutu çalıştırır. Basılı tutma kısayolu, tek başına veya Shift ile bir harf, rakam ya da noktalama tuşudur. +@msg Hold {_1} is already used by {_2} Basılı tutma {_1} zaten {_2} tarafından kullanılıyor +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) basılı tutma kısayolu, tek başına veya Shift ile bir karakter yazan tuştur ({shown} Cmd, Ctrl veya Alt içeriyor) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} basılı tutma kısayolu olamaz: bir harf, rakam veya noktalama tuşu kullanın Check Denetle Check Fold Lines Katlama Çizgilerini Denetle @msg No cut lines are in the selection. Seçimde kesim çizgisi yok. @@ -10354,6 +10394,7 @@ breakText Glyphs Glifler @msg A panel is not joined to the rest by a crease. Bir panel geri kalanlara hiçbir pilyaj çizgisiyle bağlı değil. @msg A fold line is on a non-printing layer. Bir katlama çizgisi yazdırılmayan bir katmanda. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneller: {panels}, menteşeler: {hinges}, hatalar: {errors}, uyarılar: {warnings} + Dashed Arrow Kesikli Ok Pressure Sensitive Basınca Duyarlı Flex Ribbon Esnek Şerit Pulse Stroke Atımlı Çizgi diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index f671d853f3..82ba9af243 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -869,6 +869,7 @@ font-technology Variable Варіативні Duplicate Action or Action Set Дублювати дію або набір дій Delete the action set “{name}” and its actions? Видалити набір дій «{name}» і його дії? Delete the selected action sets and their actions? Видалити вибрані набори дій і їхні дії? + Delete all action sets and their actions? Видалити всі набори дій і їхні дії? Delete Theme Видалити тему Delete theme Видалити тему Delete these {n} graphic styles? Видалити ці графічні стилі ({n})? @@ -1388,6 +1389,7 @@ font-technology Variable Варіативні Fit to Selected Art Вписати у виділений малюнок Flag… Прапор… Flare Відблиск + Edit Flare Редагувати відблиск Flare Tool Інструмент «Відблиск» Flare Tool Options Параметри інструменту «Відблиск» Halo Ореол @@ -2309,6 +2311,9 @@ file-filter Templates Шаблони Navigate Навігація Navigator Навігатор Navigator Panel Options Параметри панелі «Навігатор» + Attributes Panel Options Параметри панелі «Атрибути» + Number of Recent URLs: Кількість останніх URL: +@msg `count` must be a whole number from 1 to 30 `count` має бути цілим числом від 1 до 30 Draw Dashed Lines as Solid Lines Малювати штрихові лінії суцільними Needs the desktop app Потрібен настільний додаток Neutral Gradients Нейтральні градієнти @@ -2788,6 +2793,7 @@ diagnostics ui інтерфейс Save Actions… Зберегти дії… Load Actions… Завантажити дії… Replace Actions… Замінити дії… + Clear Actions Очистити дії Reset Actions Скинути дії Replace the current actions with the default set? Замінити поточні дії набором за умовчанням? Append adds the default set after the current sets instead. Кнопка «Додати» натомість додає набір за умовчанням після поточних наборів. @@ -3233,6 +3239,8 @@ digits Malayalam Малаялам The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Колесо миші з натиснутою Cmd/Ctrl прокручує полотно по горизонталі. Dragging sideways on a numeric field's label changes the field's value. Перетягування вбік по підпису числового поля змінює значення поля. A two-finger rotate gesture on a trackpad rotates the canvas view. Жест обертання двома пальцями на трекпаді обертає вигляд полотна. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Утримання клавіші запускає інструмент або команду з її стовпця «Утримувати» в «Поєднаннях клавіш»; коротке натискання запускає її звичайне поєднання. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Скільки секунд потрібно утримувати клавішу, перш ніж замість її звичайного поєднання спрацює поєднання утримання. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Коли ви переміщуєте опорні точки, кожна крива з одним переміщеним кінцем зберігає форму відносно своїх кінців. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Поки ви утримуєте клавішу інструмента, його вибрано, а після відпускання знову вибирається попередній інструмент. Shows the bounding box while you move the selection or draw a shape. Показує обмежувальну рамку, поки ви переміщуєте виділення або малюєте фігуру. @@ -5258,6 +5266,7 @@ liquify-list-end {0}, {1} {0} і {1} @msg no graphic style `{n}` немає графічного стилю `{n}` @msg no interaction in progress немає взаємодії у процесі @msg no key object немає ключового об’єкта +@msg Align to Key Object isn't available with the Artboard tool «Вирівняти за ключовим об’єктом» недоступно з інструментом «Монтажна область» @msg no library `{key}` (see {list}) немає бібліотеки `{key}` (див. {list}) @msg no native format немає власного формату @msg no pages немає сторінок @@ -5313,6 +5322,8 @@ liquify-list-end {0}, {1} {0} і {1} @msg no such spine point такої точки осі немає @msg `with` must be a list of at most 10000 spine point indexes `with` має бути списком щонайбільше з 10000 індексів точок осі @msg `with` moves points, not a handle `with` переміщує точки, а не маркер +@msg `link` and `independent` cannot both be true `link` і `independent` не можуть одночасно бути true +@msg `link` places a handle: give `handle` `link` розміщує маркер: укажіть `handle` @msg no such spine segment такого сегмента осі немає @msg no such subpath такого вкладеного контуру немає @msg no such user library такої користувацької бібліотеки немає @@ -5402,6 +5413,7 @@ liquify-list-end {0}, {1} {0} і {1} @msg select a blend виділіть перехід @msg select a blend or give `id` виділіть перехід або вкажіть `id` @msg select a clip group виділіть відсічну групу +@msg select a flare виділіть відблиск @msg select a gradient mesh виділіть градієнтну сітку @msg select a linked image: an embedded one has no file виділіть пов’язане зображення: у вбудованого немає файлу @msg select a repeat виділіть повтор @@ -5659,6 +5671,7 @@ variable-list-end {0}, {1} {0} і {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} пов’язане зображення змінилося на диску: «Оновити зв’язки» покаже нову версію|{n} пов’язані зображення змінилися на диску: «Оновити зв’язки» покаже нові версії|{n} пов’язаних зображень змінилися на диску: «Оновити зв’язки» покаже нові версії @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Оновлено {n} пов’язаний файл, змінений на диску|Оновлено {n} пов’язані файли, змінені на диску|Оновлено {n} пов’язаних файлів, змінених на диску @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings у документі задано виліт, який цей файл PDF/X не містить: увімкніть «Використовувати параметри вильоту документа» +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed об’єктів, що доходять до краю обрізу, але не до вильоту: {n}|об’єктів, що доходять до краю обрізу, але не до вильоту: {n}|об’єктів, що доходять до краю обрізу, але не до вильоту: {n} @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Експортовано: {what} з {n} приміткою: {first}|Експортовано: {what} з {n} примітками: {first}|Експортовано: {what} з {n} примітками: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} файл шрифту тепер у {folder}|{n} файли шрифтів тепер у {folder}|{n} файлів шрифтів тепер у {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} файл шрифту тепер у {folder}; не вдалося додати {failed}: {reason}|{n} файли шрифтів тепер у {folder}; не вдалося додати {failed}: {reason}|{n} файлів шрифтів тепер у {folder}; не вдалося додати {failed}: {reason} @@ -6467,6 +6480,9 @@ lighting Light Світло Continue in Background Продовжити у фоні Cancel Export Скасувати експорт @msg Export cancelled Експорт скасовано + Cancel Save Скасувати збереження +@plural {n} more save waiting|{n} more saves waiting Ще {n} збереження в очікуванні|Ще {n} збереження в очікуванні|Ще {n} збережень в очікуванні +@msg Save canceled Збереження скасовано # Paragraph panel menu › Justification… Desired Бажане Word Spacing: Інтервал між словами: @@ -6990,6 +7006,13 @@ axis Y Axis Вісь Y Bus Lines Лінії шини Terminal Nodes Контактні вузли +# Original arrow art brushes. + Arrows Пензлі-стрілки + Solid Arrow Суцільна стрілка + Open Arrow Відкрита стрілка + Double Arrow Подвійна стрілка + Chevron Arrow Стрілка з шевроном + Notched Ribbon Стрічка з насічками Double Line Подвійна лінія Wave Хвиля @@ -7683,10 +7706,18 @@ breakText Glyphs Гліфи Smooth Bridge… Плавний міст… Smooth Bridge Плавний міст Keep Originals Зберегти оригінали -@msg select two circles to bridge виділіть два кола для з’єднання +@msg select two or more circles to bridge виділіть два або більше кіл для з’єднання @msg one circle is inside the other одне коло всередині іншого @msg the circles are too far apart for this radius: raise the radius кола надто далеко одне від одного для цього радіуса: збільште радіус @msg the circles are too far apart for this radius кола надто далеко одне від одного для цього радіуса + Constant Gap Сталий проміжок + Reach: Охоплення: +@msg the circles are too far apart for this gap: raise the gap кола надто далеко одне від одного для цього проміжку: збільште проміжок +@msg the circles are too far apart for this gap кола надто далеко одне від одного для цього проміжку +@msg no two circles are within reach: raise the reach жодні два кола не перебувають у межах охоплення: збільште охоплення +@msg select at most 2000 circles to bridge виділіть не більше 2000 кіл для з’єднання +@msg that makes too many bridges (at most 8000): lower the reach це дає забагато мостів (не більше 8000): зменште охоплення +@msg the bridged circles are too complex to unite з’єднані кола надто складні для об’єднання # Path Precision Tools add-on: Common Tangents. Common Tangents… Спільні дотичні… Common Tangents Спільні дотичні @@ -9997,6 +10028,16 @@ breakText Glyphs Гліфи No objects are selected. Об’єкти не виділено. Open a document to mark its fold lines. Відкрийте документ, щоб позначити його лінії згину. Remove Fold Line Role Прибрати тип лінії + Tap Коротке натискання + Clear Hold Очистити утримання + Hold Shortcuts Клавіші утримання + Hold Shortcut Delay Затримка клавіш утримання + How hold shortcuts work Як працюють клавіші утримання + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Клацніть, потім натисніть клавішу, яку слід утримувати для цього (Esc скасовує). Утримання клавіші запускає це; коротке натискання запускає власне сполучення клавіші. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Коротке натискання клавіші запускає її сполучення. Утримання клавіші протягом затримки запускає натомість інструмент або команду з її стовпця «Утримувати». Клавіша утримання — це клавіша літери, цифри або розділового знака, окремо або з Shift. +@msg Hold {_1} is already used by {_2} Утримання {_1} вже використовується для {_2} +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) клавіша утримання — це клавіша, що вводить символ, окремо або з Shift ({shown} містить Cmd, Ctrl або Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} не може бути клавішею утримання: використайте літеру, цифру або клавішу розділового знака Check Перевірити Check Fold Lines Перевірити лінії згину @msg No cut lines are in the selection. У виділенні немає ліній різу. @@ -10017,6 +10058,7 @@ breakText Glyphs Гліфи @msg A panel is not joined to the rest by a crease. Панель не з’єднана з рештою жодною лінією біговки. @msg A fold line is on a non-printing layer. Лінія згину лежить на шарі, що не друкується. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панелі: {panels}, шарніри: {hinges}, помилки: {errors}, попередження: {warnings} + Dashed Arrow Пунктирна стрілка Pressure Sensitive Чутливі до натиску Flex Ribbon Гнучка стрічка Pulse Stroke Пульсуючий штрих diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 1454216e33..04ebd9992d 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -1005,6 +1005,7 @@ font-technology Variable Biến thiên Duplicate Action or Action Set Nhân bản hành động hoặc bộ hành động Delete the action set “{name}” and its actions? Xóa bộ hành động “{name}” và các hành động của nó? Delete the selected action sets and their actions? Xóa các bộ hành động đã chọn và các hành động của chúng? + Delete all action sets and their actions? Xóa tất cả các bộ hành động và các hành động của chúng? Delete the library “{name}”? Xóa thư viện “{name}”? Delete Theme Xóa bộ màu Delete theme Xóa bộ màu @@ -1612,6 +1613,7 @@ digits Malayalam Malayalam Fixed Cố định Flag… Lá cờ… Flare Hào quang + Edit Flare Chỉnh sửa hào quang Flare Tool Công cụ Hào quang Flare Tool Options Tùy chọn Công cụ Hào quang Flat Angle Góc phẳng @@ -2642,6 +2644,9 @@ digits Hindi Hindi Navigate Dẫn hướng Navigator Bộ dẫn hướng Navigator Panel Options Tùy chọn bảng bộ dẫn hướng + Attributes Panel Options Tùy chọn bảng thuộc tính + Number of Recent URLs: Số URL gần đây: +@msg `count` must be a whole number from 1 to 30 `count` phải là số nguyên từ 1 đến 30 Draw Dashed Lines as Solid Lines Vẽ đường nét đứt thành đường liền Needs the desktop app Cần ứng dụng máy tính để bàn Neutral Gradients Chuyển sắc trung tính @@ -3104,6 +3109,7 @@ diagnostics ui giao diện Save Actions… Lưu hành động… Load Actions… Tải hành động… Replace Actions… Thay thế hành động… + Clear Actions Xóa hết hành động Reset Actions Đặt lại hành động Replace the current actions with the default set? Thay thế các hành động hiện tại bằng bộ mặc định? Append adds the default set after the current sets instead. Nối thêm sẽ thêm bộ mặc định vào sau các bộ hiện tại. @@ -3549,6 +3555,8 @@ mark-style Japanese Kiểu Nhật The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. Con lăn chuột kèm giữ Cmd/Ctrl cuộn khung vẽ sang ngang. Dragging sideways on a numeric field's label changes the field's value. Kéo sang ngang trên nhãn của một trường số sẽ thay đổi giá trị của trường. A two-finger rotate gesture on a trackpad rotates the canvas view. Cử chỉ xoay bằng hai ngón trên bàn di chuột sẽ xoay khung nhìn của khung vẽ. + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. Giữ một phím sẽ chạy công cụ hoặc lệnh trong cột Giữ của Phím tắt; nhấn nhanh sẽ chạy phím tắt thông thường của phím đó. + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. Số giây phải giữ một phím trước khi phím tắt nhấn giữ của nó chạy thay cho phím tắt thông thường. When you move anchor points, each curve with one moved end keeps its shape relative to its ends. Khi bạn di chuyển điểm neo, mỗi đường cong có một đầu bị di chuyển sẽ giữ hình dạng so với các đầu của nó. Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. Giữ phím tắt của một công cụ sẽ chọn công cụ đó cho đến khi bạn thả ra, rồi công cụ trước đó được chọn lại. Shows the bounding box while you move the selection or draw a shape. Hiển thị hộp giới hạn khi bạn di chuyển vùng chọn hoặc vẽ một hình. @@ -5607,6 +5615,7 @@ liquify-list-end {0}, {1} {0} và {1} @msg no graphic style `{n}` không có kiểu đồ họa `{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 Align to Key Object isn't available with the Artboard tool không thể dùng Căn theo đối tượng chính với Công cụ Bảng vẽ @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}) @@ -5672,6 +5681,8 @@ liquify-list-end {0}, {1} {0} và {1} @msg no such spine point không có điểm trục như vậy @msg `with` must be a list of at most 10000 spine point indexes `with` phải là danh sách tối đa 10000 chỉ số điểm trục @msg `with` moves points, not a handle `with` di chuyển các điểm, không phải tay nắm +@msg `link` and `independent` cannot both be true `link` và `independent` không thể cùng là true +@msg `link` places a handle: give `handle` `link` đặt một tay nắm: hãy cho `handle` @msg no such spine segment không có đoạn trục như vậy @msg no such subpath không có nhánh con như vậy @msg no such user library không có thư viện người dùng như vậy @@ -5806,6 +5817,7 @@ liquify-list-end {0}, {1} {0} và {1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions {n} ảnh liên kết đã thay đổi trên đĩa: Cập nhật liên kết hiển thị phiên bản mới @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk Đã cập nhật {n} tệp liên kết đã thay đổi trên đĩa @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings tài liệu đặt bleed mà tệp PDF/X này bỏ qua: hãy bật "Dùng cài đặt bleed của tài liệu" +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} đối tượng chạm mép xén nhưng dừng trước bleed @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} Đã xuất {what} với {n} ghi chú: {first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} tệp phông chữ hiện ở trong {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} tệp phông chữ hiện ở trong {folder}; {failed} không thể thêm: {reason} @@ -5848,6 +5860,7 @@ liquify-list-end {0}, {1} {0} và {1} @msg select a blend hãy chọn một đối tượng hòa trộn @msg select a blend or give `id` hãy chọn một đối tượng hòa trộn hoặc cung cấp `id` @msg select a clip group hãy chọn nhóm cắt +@msg select a flare hãy chọn một hào quang @msg select a gradient mesh hãy chọn lưới chuyển sắc @msg select a linked image: an embedded one has no file hãy chọn ảnh liên kết: ảnh nhúng không có tệp @msg select a Live Paint group hãy chọn nhóm tô trực tiếp @@ -6510,6 +6523,9 @@ variable-list-end {0}, {1} {0} và {1} Continue in Background Tiếp tục trong nền Cancel Export Hủy xuất @msg Export cancelled Đã hủy xuất + Cancel Save Hủy lưu +@plural {n} more save waiting|{n} more saves waiting Còn {n} lượt lưu đang chờ +@msg Save canceled Đã hủy lưu # Paragraph panel menu › Justification… Desired Mong muốn Word Spacing: Khoảng cách từ: @@ -7034,6 +7050,13 @@ axis Y Axis Trục Y Bus Lines Đường bus Terminal Nodes Nút đầu cuối +# Original arrow art brushes. + Arrows Cọ mũi tên + Solid Arrow Mũi tên đặc + Open Arrow Mũi tên rỗng + Double Arrow Mũi tên đôi + Chevron Arrow Mũi tên chữ V + Notched Ribbon Dải băng khía Double Line Đường đôi Wave Sóng @@ -7727,10 +7750,18 @@ breakText Glyphs Glyph Smooth Bridge… Cầu nối mượt… Smooth Bridge Cầu nối mượt Keep Originals Giữ bản gốc -@msg select two circles to bridge chọn hai hình tròn để nối +@msg select two or more circles to bridge chọn hai hình tròn trở lên để nối @msg one circle is inside the other một hình tròn nằm bên trong hình tròn kia @msg the circles are too far apart for this radius: raise the radius các hình tròn cách nhau quá xa so với bán kính này: hãy tăng bán kính @msg the circles are too far apart for this radius các hình tròn cách nhau quá xa so với bán kính này + Constant Gap Khoảng hở cố định + Reach: Tầm với: +@msg the circles are too far apart for this gap: raise the gap các hình tròn cách nhau quá xa so với khoảng hở này: hãy tăng khoảng hở +@msg the circles are too far apart for this gap các hình tròn cách nhau quá xa so với khoảng hở này +@msg no two circles are within reach: raise the reach không có hai hình tròn nào trong tầm với: hãy tăng tầm với +@msg select at most 2000 circles to bridge chọn tối đa 2000 hình tròn để nối +@msg that makes too many bridges (at most 8000): lower the reach thao tác này tạo quá nhiều cầu nối (tối đa 8000): hãy giảm tầm với +@msg the bridged circles are too complex to unite các hình tròn được nối quá phức tạp để hợp nhất # Path Precision Tools add-on: Common Tangents. Common Tangents… Tiếp tuyến chung… Common Tangents Tiếp tuyến chung @@ -8255,6 +8286,17 @@ breakText Glyphs Glyph @msg {width} × {height} pixels is too large for Targa (at most 65535 pixels a side): lower the resolution {width} × {height} điểm ảnh quá lớn cho Targa (tối đa 65535 điểm ảnh mỗi cạnh): hãy giảm độ phân giải @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} điểm ảnh quá lớn cho PSD (tối đa {MAX_SIDE} điểm ảnh mỗi cạnh): hãy giảm độ phân giải @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer phải là "singleLine", "everyLine", "standardSingleLine" hoặc "standardEveryLine" + Tap Nhấn nhanh + Clear Hold Xóa nhấn giữ + Hold Shortcuts Phím tắt nhấn giữ + Hold Shortcut Delay Độ trễ phím tắt nhấn giữ + How hold shortcuts work Cách phím tắt nhấn giữ hoạt động + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. Nhấp, rồi nhấn phím cần giữ cho mục này (Esc để hủy). Giữ phím sẽ chạy mục này; nhấn nhanh sẽ chạy phím tắt riêng của phím đó. + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. Nhấn nhanh một phím sẽ chạy phím tắt của phím đó. Giữ phím trong khoảng độ trễ sẽ chạy công cụ hoặc lệnh trong cột Giữ của phím thay vào đó. Phím tắt nhấn giữ là một phím chữ cái, chữ số hoặc dấu câu, dùng riêng hoặc cùng Shift. +@msg Hold {_1} is already used by {_2} Nhấn giữ {_1} đã được {_2} sử dụng +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) phím tắt nhấn giữ là một phím gõ ra ký tự, dùng riêng hoặc cùng Shift ({shown} có Cmd, Ctrl hoặc Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} không thể là phím tắt nhấn giữ: hãy dùng chữ cái, chữ số hoặc phím dấu câu + Dashed Arrow Mũi tên nét đứt @msg a line or other open path that encloses no area contributes no area to the compound shape; to include it, apply Object › Path › Outline Stroke to it first một đường thẳng hoặc đường dẫn mở khác không bao quanh vùng nào sẽ không thêm vùng nào vào hình phức hợp; để đưa nó vào, trước tiên hãy áp dụng Đối tượng › Đường dẫn › Đường bao nét cho nó Pressure Sensitive Nhạy áp lực Flex Ribbon Dải mềm diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index d63e0536fd..d20ae8d9e8 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -817,6 +817,7 @@ antiAlias Sharp 锐利 Duplicate Action or Action Set 复制动作或动作组 Delete the action set “{name}” and its actions? 要删除动作组“{name}”及其中的动作吗? Delete the selected action sets and their actions? 要删除所选动作组及其中的动作吗? + Delete all action sets and their actions? 要删除所有动作组及其中的动作吗? Delete Theme 删除主题 Delete theme 删除主题 Delete these {n} graphic styles? 要删除这 {n} 个图形样式吗? @@ -1325,6 +1326,7 @@ antiAlias Sharp 锐利 Fit to Selected Art 适合所选图稿 Flag… 旗形… Flare 光晕 + Edit Flare 编辑光晕 Flare Tool 光晕工具 Flare Tool Options 光晕工具选项 Halo 光晕 @@ -2156,6 +2158,8 @@ file-filter Templates 模板 @msg no such spine point 没有此脊线点 @msg `with` must be a list of at most 10000 spine point indexes `with` 必须是最多 10000 个脊线点索引的列表 @msg `with` moves points, not a handle `with` 移动的是点,不是手柄 +@msg `link` and `independent` cannot both be true `link` 和 `independent` 不能同时为 true +@msg `link` places a handle: give `handle` `link` 用于放置手柄:请提供 `handle` @msg no such spine segment 没有此脊线线段 @msg a key object sits on that point 该点上有关键对象 @msg a spine keeps at least two points 脊线至少保留两个点 @@ -2181,6 +2185,9 @@ file-filter Templates 模板 Navigate 导航 Navigator 导航器 Navigator Panel Options 导航器面板选项 + Attributes Panel Options 属性面板选项 + Number of Recent URLs: 最近使用的网址数量: +@msg `count` must be a whole number from 1 to 30 `count` 必须是 1 到 30 之间的整数 Draw Dashed Lines as Solid Lines 将虚线绘制为实线 Needs the desktop app 需要桌面应用 Neutral Gradients 中性渐变 @@ -2647,6 +2654,7 @@ diagnostics ui 界面 Save Actions… 存储动作… Load Actions… 载入动作… Replace Actions… 替换动作… + Clear Actions 清除动作 Reset Actions 重置动作 Replace the current actions with the default set? 要用默认动作组替换当前动作吗? Append adds the default set after the current sets instead. “追加”会改为将默认动作组添加到当前动作组之后。 @@ -3090,6 +3098,8 @@ digits Malayalam 马拉雅拉姆数字 The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. 按住 Cmd/Ctrl 滚动鼠标滚轮会横向滚动画布。 Dragging sideways on a numeric field's label changes the field's value. 在数值字段的标签上横向拖动可更改字段的值。 A two-finger rotate gesture on a trackpad rotates the canvas view. 在触控板上用双指旋转手势可旋转画布视图。 + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. 按住某个键会运行键盘快捷键中其按住列的工具或命令;快速按下则运行其常规快捷键。 + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. 按住某个键多少秒后,运行其按住快捷键而不是常规快捷键。 When you move anchor points, each curve with one moved end keeps its shape relative to its ends. 移动锚点时,只有一端移动的每条曲线都会保持其相对于两端的形状。 Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. 按住工具的快捷键时选择该工具,松开后重新选择之前的工具。 Shows the bounding box while you move the selection or draw a shape. 移动所选对象或绘制形状时显示定界框。 @@ -4697,9 +4707,11 @@ imageTrace Outline 轮廓 @msg no bounds 没有边界 @msg no current layer 没有当前图层 @msg no key object 没有关键对象 +@msg Align to Key Object isn't available with the Artboard tool 使用画板工具时无法对齐关键对象 @msg no previous transform 没有上一次变换 @msg nothing to align 没有可对齐的内容 @msg select a clip group 请选择一个剪切组 +@msg select a flare 请选择一个光晕 @msg select two or more objects to distribute 请选择两个或更多要分布的对象 @msg axis must be "vertical", "horizontal" or an angle in degrees, not `{v}` axis 必须是 "vertical"、"horizontal" 或以度为单位的角度,而不是 `{v}` @msg give horizontal or vertical 请给出 horizontal 或 vertical @@ -5413,6 +5425,7 @@ liquify-list-end {0}, {1} {0}和{1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions 有 {n} 个链接图像已在磁盘上更改:“更新链接”可显示新版本 @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk 已更新 {n} 个在磁盘上更改的链接文件 @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings 文档设置了出血,但此 PDF/X 文件未包含:请打开“使用文档的出血设置” +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} 个对象到达裁切线,但未延伸到出血区域 @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} 已导出 {what},有 {n} 条注释:{first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} 个字体文件现已位于 {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} 个字体文件现已位于 {folder};有 {failed} 个无法添加:{reason} @@ -6699,6 +6712,9 @@ lighting Light 光源 Continue in Background 在后台继续 Cancel Export 取消导出 @msg Export cancelled 已取消导出 + Cancel Save 取消保存 +@plural {n} more save waiting|{n} more saves waiting 另有 {n} 个保存等待中 +@msg Save canceled 已取消保存 # Paragraph panel menu › Justification… Desired 所需 Word Spacing: 字间距: @@ -7219,6 +7235,13 @@ axis Y Axis Y 轴 Bus Lines 总线 Terminal Nodes 端子节点 +# Original arrow art brushes. + Arrows 箭头画笔 + Solid Arrow 实心箭头 + Open Arrow 空心箭头 + Double Arrow 双向箭头 + Chevron Arrow 人字纹箭头 + Notched Ribbon 凹口丝带 Double Line 双线 Wave 波浪 @@ -7909,10 +7932,18 @@ breakText Glyphs 字形 Smooth Bridge… 平滑桥接… Smooth Bridge 平滑桥接 Keep Originals 保留原稿 -@msg select two circles to bridge 请选择两个要桥接的圆 +@msg select two or more circles to bridge 请选择两个或更多要桥接的圆 @msg one circle is inside the other 一个圆位于另一个圆内部 @msg the circles are too far apart for this radius: raise the radius 对于此半径,两个圆相距太远:请增大半径 @msg the circles are too far apart for this radius 对于此半径,两个圆相距太远 + Constant Gap 固定间隙 + Reach: 范围: +@msg the circles are too far apart for this gap: raise the gap 对于此间隙,两个圆相距太远:请增大间隙 +@msg the circles are too far apart for this gap 对于此间隙,两个圆相距太远 +@msg no two circles are within reach: raise the reach 范围内没有任何两个圆:请增大范围 +@msg select at most 2000 circles to bridge 最多选择 2000 个圆进行桥接 +@msg that makes too many bridges (at most 8000): lower the reach 这会产生过多桥接(最多 8000 个):请减小范围 +@msg the bridged circles are too complex to unite 桥接的圆过于复杂,无法合并 # Path Precision Tools add-on: Common Tangents. Common Tangents… 公切线… Common Tangents 公切线 @@ -10253,6 +10284,17 @@ breakText Glyphs 字形 @msg A joint does not close by {gap} pt. 有一处接缝相差 {gap} pt 未闭合。 @msg Two panels pass through each other. 两个面板相互穿插。 @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} 像素对 PSD 而言过大 (每边最多 {MAX_SIDE} 像素):请降低分辨率 + Tap 短按 + Clear Hold 清除按住 + Hold Shortcuts 按住快捷键 + Hold Shortcut Delay 按住快捷键延迟 + How hold shortcuts work 按住快捷键的工作方式 + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. 单击后按下要为此按住的键 (Esc 取消)。按住该键会运行此项;短按会运行该键自己的快捷键。 + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. 短按一个键会运行它的快捷键。按住该键达到延迟时间,则改为运行其“按住”列中的工具或命令。按住快捷键是字母、数字或标点键,可单独使用或与 Shift 组合。 +@msg Hold {_1} is already used by {_2} 按住 {_1} 已被 {_2} 使用 +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) 按住快捷键是可输入字符的键,单独使用或与 Shift 组合 ({shown} 含有 Cmd、Ctrl 或 Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} 不能作为按住快捷键:请使用字母、数字或标点键 + Dashed Arrow 虚线箭头 Pressure Sensitive 压感画笔 Flex Ribbon 柔韧色带 Pulse Stroke 脉动笔触 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index e6514960fb..d5fde762f9 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -837,6 +837,7 @@ font-technology Variable 可變 Duplicate Action or Action Set 製作動作或動作組複本 Delete the action set “{name}” and its actions? 要刪除動作組「{name}」及其中的動作嗎? Delete the selected action sets and their actions? 要刪除所選動作組及其中的動作嗎? + Delete all action sets and their actions? 要刪除所有動作組及其中的動作嗎? Delete Theme 刪除主題 Delete theme 刪除主題 Delete these {n} graphic styles? 要刪除這 {n} 個繪圖樣式嗎? @@ -1359,6 +1360,7 @@ font-technology Variable 可變 Fit to Selected Art 符合選取的圖稿 Flag… 旗形… Flare 光暈 + Edit Flare 編輯光暈 Flare Tool 光暈工具 Flare Tool Options 光暈工具選項 Halo 光暈 @@ -2156,9 +2158,11 @@ file-filter Templates 範本 @msg no bounds 沒有邊界 @msg no current layer 沒有目前圖層 @msg no key object 沒有關鍵物件 +@msg Align to Key Object isn't available with the Artboard tool 使用工作區域工具時無法對齊關鍵物件 @msg no previous transform 沒有上一次的變形 @msg nothing to align 沒有可對齊的內容 @msg select a clip group 請選取剪裁群組 +@msg select a flare 請選取光暈 @msg select two or more objects to distribute 請選取兩個以上要均分的物件 @msg axis must be "vertical", "horizontal" or an angle in degrees, not `{v}` axis 必須是 "vertical"、"horizontal" 或以度為單位的角度,而非 `{v}` @msg give horizontal or vertical 請提供 horizontal 或 vertical @@ -2884,6 +2888,7 @@ liquify-list-end {0}, {1} {0}和{1} @msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions 有 {n} 個連結影像已在磁碟上變更:「更新連結」可顯示新版本 @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk 已更新 {n} 個在磁碟上變更的連結檔案 @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings 文件設定了出血,但此 PDF/X 檔案未包含:請開啟「使用文件的出血設定」 +@msgplural {n} object reaches the trim edge but stops short of the bleed|{n} objects reach the trim edge but stop short of the bleed {n} 個物件到達裁切線,但未延伸到出血區域 @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} 已匯出 {what},附有 {n} 則註解:{first} @msgplural {n} font file is now in {folder}|{n} font files are now in {folder} {n} 個字體檔案現已位於 {folder} @msgplural {n} font file is now in {folder}; {failed} couldn't be added: {reason}|{n} font files are now in {folder}; {failed} couldn't be added: {reason} {n} 個字體檔案現已位於 {folder};有 {failed} 個無法加入:{reason} @@ -3485,6 +3490,8 @@ liquify-list-end {0}, {1} {0}和{1} @msg no such spine point 沒有這個脊線點 @msg `with` must be a list of at most 10000 spine point indexes `with` 必須是最多 10000 個脊線點索引的清單 @msg `with` moves points, not a handle `with` 移動的是點,不是控制把手 +@msg `link` and `independent` cannot both be true `link` 和 `independent` 不能同時為 true +@msg `link` places a handle: give `handle` `link` 用於放置控制把手:請提供 `handle` @msg no such spine segment 沒有這個脊線線段 @msg a key object sits on that point 該點上有關鍵物件 @msg a spine keeps at least two points 脊線至少要保留兩個點 @@ -3509,6 +3516,9 @@ liquify-list-end {0}, {1} {0}和{1} Navigate 導覽 Navigator 導覽器 Navigator Panel Options 導覽器面板選項 + Attributes Panel Options 屬性面板選項 + Number of Recent URLs: 最近使用的網址數量: +@msg `count` must be a whole number from 1 to 30 `count` 必須是 1 到 30 之間的整數 Draw Dashed Lines as Solid Lines 將虛線繪製為實線 Needs the desktop app 需要桌面版應用程式 Neutral Gradients 中性漸層 @@ -3992,6 +4002,7 @@ diagnostics ui 介面 Save Actions… 儲存動作… Load Actions… 載入動作… Replace Actions… 取代動作… + Clear Actions 清除動作 Reset Actions 重設動作 Replace the current actions with the default set? 要用預設動作組取代目前的動作嗎? Append adds the default set after the current sets instead. 「附加」會改為將預設動作組加到目前動作組之後。 @@ -4440,6 +4451,8 @@ digits Malayalam 馬來亞拉姆數字 The mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. 按住 Cmd/Ctrl 捲動滑鼠滾輪會橫向捲動畫布。 Dragging sideways on a numeric field's label changes the field's value. 在數值欄位的標籤上橫向拖曳可變更欄位的值。 A two-finger rotate gesture on a trackpad rotates the canvas view. 在觸控式軌跡板上以雙指旋轉手勢可旋轉畫布檢視。 + Holding a key runs the tool or command in its Hold column in Keyboard Shortcuts; a quick press runs its usual shortcut. 按住某個鍵會執行鍵盤快速鍵中其按住欄的工具或命令;快速按下則執行其一般快速鍵。 + How long, in seconds, a key must be held before its hold shortcut runs instead of its usual shortcut. 按住某個鍵多少秒後,執行其按住快速鍵而不是一般快速鍵。 When you move anchor points, each curve with one moved end keeps its shape relative to its ends. 移動錨點時,只有一端移動的每條曲線都會保持其相對於兩端的形狀。 Holding a tool's shortcut key chooses the tool until you let go, and then the previous tool is chosen again. 按住工具的快速鍵時選擇該工具,放開後重新選擇之前的工具。 Shows the bounding box while you move the selection or draw a shape. 移動選取範圍或繪製形狀時顯示邊框。 @@ -6509,6 +6522,9 @@ lighting Light 光源 Continue in Background 在背景繼續 Cancel Export 取消匯出 @msg Export cancelled 已取消匯出 + Cancel Save 取消儲存 +@plural {n} more save waiting|{n} more saves waiting 另有 {n} 個儲存等待中 +@msg Save canceled 已取消儲存 # Paragraph panel menu › Justification… Desired 所需 Word Spacing: 字間距: @@ -7039,6 +7055,13 @@ axis Y Axis Y 軸 Bus Lines 匯流排 Terminal Nodes 端子節點 +# Original arrow art brushes. + Arrows 箭頭筆刷 + Solid Arrow 實心箭頭 + Open Arrow 空心箭頭 + Double Arrow 雙向箭頭 + Chevron Arrow 人字紋箭頭 + Notched Ribbon 凹口緞帶 Double Line 雙線 Wave 波浪 @@ -7732,10 +7755,18 @@ breakText Glyphs 字符 Smooth Bridge… 平滑橋接… Smooth Bridge 平滑橋接 Keep Originals 保留原始物件 -@msg select two circles to bridge 請選取兩個要橋接的圓形 +@msg select two or more circles to bridge 請選取兩個或更多要橋接的圓形 @msg one circle is inside the other 一個圓形位於另一個圓形內 @msg the circles are too far apart for this radius: raise the radius 就此半徑而言,兩個圓形相距太遠:請增加半徑 @msg the circles are too far apart for this radius 就此半徑而言,兩個圓形相距太遠 + Constant Gap 固定間隙 + Reach: 範圍: +@msg the circles are too far apart for this gap: raise the gap 就此間隙而言,兩個圓形相距太遠:請增加間隙 +@msg the circles are too far apart for this gap 就此間隙而言,兩個圓形相距太遠 +@msg no two circles are within reach: raise the reach 範圍內沒有任何兩個圓形:請增加範圍 +@msg select at most 2000 circles to bridge 最多選取 2000 個圓形進行橋接 +@msg that makes too many bridges (at most 8000): lower the reach 這會產生過多橋接(最多 8000 個):請減少範圍 +@msg the bridged circles are too complex to unite 橋接的圓形過於複雜,無法合併 # Path Precision Tools add-on: Common Tangents. Common Tangents… 公切線… Common Tangents 公切線 @@ -10068,6 +10099,17 @@ breakText Glyphs 字符 @msg A joint does not close by {gap} pt. 有一處接縫相差 {gap} pt 未閉合。 @msg Two panels pass through each other. 兩個面板相互穿插。 @msg {what} would print on more than {MAX_TILES} tiles: scale it down {what} 會列印在超過 {MAX_TILES} 個拼貼上:請縮小 + Tap 短按 + Clear Hold 清除按住 + Hold Shortcuts 按住快速鍵 + Hold Shortcut Delay 按住快速鍵延遲 + How hold shortcuts work 按住快速鍵的運作方式 + Click, then press a key to hold for this (Esc cancels). Holding the key runs this; a quick press runs the key's own shortcut. 按一下後按下要為此按住的按鍵 (Esc 取消)。按住該按鍵會執行此項;短按會執行該按鍵本身的快速鍵。 + A quick press of a key runs its shortcut. Holding the key for the delay runs the tool or command in its Hold column instead. A hold shortcut is a letter, digit or punctuation key, alone or with Shift. 短按按鍵會執行它的快速鍵。按住按鍵達延遲時間,則改為執行其「按住」欄中的工具或命令。按住快速鍵是字母、數字或標點符號按鍵,可單獨使用或搭配 Shift。 +@msg Hold {_1} is already used by {_2} 按住 {_1} 已被 {_2} 使用 +@msg a hold shortcut is a key that types a character, alone or with Shift ({shown} has Cmd, Ctrl or Alt) 按住快速鍵是可輸入字元的按鍵,可單獨使用或搭配 Shift ({shown} 含有 Cmd、Ctrl 或 Alt) +@msg {shown} can't be a hold shortcut: use a letter, a digit or a punctuation key {shown} 不能作為按住快速鍵:請使用字母、數字或標點符號按鍵 + Dashed Arrow 虛線箭頭 Pressure Sensitive 壓感筆刷 Flex Ribbon 柔韌色帶 Pulse Stroke 脈動筆觸 diff --git a/crates/ui-egui/src/io.rs b/crates/ui-egui/src/io.rs index 3d1a2d807c..fb8d655feb 100644 --- a/crates/ui-egui/src/io.rs +++ b/crates/ui-egui/src/io.rs @@ -35,7 +35,9 @@ pub use open::{ #[cfg(test)] pub(crate) use open::{open_file, opened_with_notes}; pub(crate) use save::save_current; -pub use save::{ask_format_options, ask_pdf_options, remember_active_artboard, remember_view, save, save_pdf}; +pub use save::{ + SAVE_CANCELED, ask_format_options, ask_pdf_options, cancel_saves, hide_saves, remember_active_artboard, remember_view, save, save_pdf, +}; pub(crate) use save::{ clear_notes_left, export_path, is_web, notes_of, report_saved, show_with_notes, target_path, write_named, write_reporting, write_to, }; diff --git a/crates/ui-egui/src/io/save.rs b/crates/ui-egui/src/io/save.rs index 3f5f7f80ca..ff4eba30fb 100644 --- a/crates/ui-egui/src/io/save.rs +++ b/crates/ui-egui/src/io/save.rs @@ -1,10 +1,37 @@ use super::export::file_url; use super::open::{note_recent, open_options}; use super::{ - EngineError, FilePick, Format, SAVE_FORMATS, SaveMode, SavePlan, SavedView, Services, TEMPLATE_FORMATS, Value, VectorcraftApp, Writer, - background, dialogs, fileio, json, svg_options, + EngineError, FilePick, Format, Progress, SAVE_FORMATS, SaveMode, SavePlan, SavedView, Services, TEMPLATE_FORMATS, Value, VectorcraftApp, Writer, + background, dialogs, fileio, json, progress, svg_options, }; +/// The status once a save running in the background was canceled. +pub const SAVE_CANCELED: &str = "Save canceled"; + +/// File › Cancel Save (the progress window's Cancel): every save running in the background stops +/// before it replaces its file. The file stays as it was, and the document keeps its file, format +/// and modified state → `{cancelled: n}`. A save whose file was already written is reported as saved. +pub fn cancel_saves(app: &mut VectorcraftApp) -> Value { + let n = app.background.cancel_saves(); + if n > 0 { + app.status(SAVE_CANCELED); + app.background.save_cancel_line = Some(app.ui.status_sets); + } + json!({ "cancelled": n }) +} + +/// Does the status bar still show Cancel Save's line, or the line a save it reached set after it? +/// A line set since by another command or another job stays. +fn cancel_line_shown(app: &VectorcraftApp) -> bool { + app.background.save_cancel_line == Some(app.ui.status_sets) +} + +/// The progress window's Continue in Background for saves: they go on, shown in the status bar +/// only → `{hidden: n}`. +pub fn hide_saves(app: &mut VectorcraftApp) -> Value { + json!({ "hidden": app.background.hide_saves() }) +} + /// A save or an export that didn't write `path`: say so in a dialog that names the file and the /// reason and stays until it is closed, as an editor does (#1685). The status bar's line, which /// the caller's error becomes, is replaced by the next message, and a document that wasn't saved @@ -525,6 +552,18 @@ pub(crate) fn saved_status(path: &str, r: &Value) -> String { } } +/// A string writer's error during a save: [`EngineError::Cancelled`] when the save was canceled and +/// the writer stopped on that Cancel (its message is the Cancel's own, alone or after the path), so +/// the file was not put in place. Any other message, such as one naming the copies a failed +/// replacement kept, stays [`EngineError::Other`]. +fn writer_error(e: String) -> EngineError { + use vectorcraft_engine::cancel; + let stopped = [EngineError::Cancelled.to_string(), cancel::Cancelled.to_string()] + .iter() + .any(|c| e == *c || e.strip_suffix(c.as_str()).is_some_and(|rest| rest.ends_with(": "))); + if stopped && cancel::is_cancelled() { EngineError::Cancelled } else { EngineError::Other(e) } +} + /// Write a planned save through the services and report it in the status bar. /// With Background Save on, the file is encoded and written from a snapshot off the UI thread /// ([`background`]): this returns `{path, background: true, status, format, warnings}` at once @@ -576,7 +615,10 @@ fn write_plan( let stream = app.services.stream_shared.clone().filter(|_| job.streams() && !is_web(app)); let (exists, allowed) = checks_replaced(app); let known: Vec = allowed.iter().chain(app.picks.written_beside.get(&uid).into_iter().flatten()).cloned().collect(); - let work = move |write: Writer| { + // The progress window's Cancel: a save canceled before it replaces its file writes nothing. + let progress = Progress::new(); + let (reporting, asked) = (progress.clone(), progress.clone()); + let write_file = move |write: Writer| { let mut own_refused = false; let mut observed = |p: &str, r: vectorcraft_engine::Result<()>| { own_refused = own_path.as_deref() == Some(p) && matches!(&r, Err(EngineError::ReadOnlyLocation(_))); @@ -590,19 +632,24 @@ fn write_plan( let r = match (save_stream, save_write, stream) { (Some(stream), _, _) => job.write_streamed(&mut |p, fill| observed(p, stream(p, fill))), (_, Some(write), _) => job.write_unless(check, |p, b| observed(p, write(p, b))), - (_, _, Some(stream)) => job.write_streamed(&mut |p, fill| stream(p, fill).map_err(EngineError::Other)), - _ => job.write_unless(check, |p, b| write(p, b).map_err(EngineError::Other)), + (_, _, Some(stream)) => job.write_streamed(&mut |p, fill| stream(p, fill).map_err(writer_error)), + _ => job.write_unless(check, |p, b| write(p, b).map_err(writer_error)), }; - r.map_err(|e| { - if let EngineError::ReadOnlyLocation(reason) = &e { - refused_by_work.store(own_refused, std::sync::atomic::Ordering::Relaxed); - if !by_control { - return reason.clone(); + match r { + // Nothing written: the file is as it was. + Err(EngineError::Cancelled) => Ok(json!({ "cancelled": true })), + r => r.map_err(|e| { + if let EngineError::ReadOnlyLocation(reason) = &e { + refused_by_work.store(own_refused, std::sync::atomic::Ordering::Relaxed); + if !by_control { + return reason.clone(); + } } - } - e.to_string() - }) + e.to_string() + }), + } }; + let work = move |write: Writer| progress::scope(&reporting, || write_file(write)); let failed = target.clone().unwrap_or_default(); // The status line before the save starts: on the worker, the save sets one line ("