diff --git a/Cargo.lock b/Cargo.lock index d780911c11..8a06417e08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1227,7 +1227,7 @@ dependencies = [ [[package]] name = "craft-plotter" version = "0.1.0" -source = "git+https://github.com/storytold/craft-libs?rev=9101c4fc226f5f111b5a890a6c5c19bf3991fd76#9101c4fc226f5f111b5a890a6c5c19bf3991fd76" +source = "git+https://github.com/storytold/craft-libs?rev=a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57#a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57" dependencies = [ "thiserror 2.0.21", ] diff --git a/Cargo.toml b/Cargo.toml index 891cce208d..316200fcfb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ craft-mime = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9 # EPS container, previews, ASCII85 and DSC comments (craft-libs#778). craft-eps = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } # DXF tags, reader and writer (craft-libs#778, #926, #927). -craft-plotter = { git = "https://github.com/storytold/craft-libs", rev = "9101c4fc226f5f111b5a890a6c5c19bf3991fd76" } +craft-plotter = { git = "https://github.com/storytold/craft-libs", rev = "a7fb55eaf9a15c21e8ce0b13cf605dc54fd15f57" } craft-dxf = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } # WMF, EMF and EMF+ reader (craft-libs#778). craft-metafile = { git = "https://github.com/storytold/craft-libs", rev = "a499742a9389f47d10cdc61e4cdbf4e5f07f48cd" } diff --git a/apps/vectorcraft/src/main.rs b/apps/vectorcraft/src/main.rs index adc52f9d8c..4f8e326981 100644 --- a/apps/vectorcraft/src/main.rs +++ b/apps/vectorcraft/src/main.rs @@ -591,14 +591,15 @@ fn main() -> std::process::ExitCode { created.created(&cc.egui_ctx); if !gpu::skipped().is_empty() { // A processor chosen in Settings can be the one that can't show the window. - let hint = if chosen_gpu { - " (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)" + if chosen_gpu { + app.status(format!( + "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)" + )); } else { - "" - }; - app.status(format!( - "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}{hint}" - )); + app.status(format!( + "The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary}" + )); + } } else if let Some(crash) = &crash { app.status(match crash { gpu::Crash::Adapter { name, .. } => format!( diff --git a/apps/vectorcraft/src/presentation.rs b/apps/vectorcraft/src/presentation.rs index 3910984c93..7c2f1dc48a 100644 --- a/apps/vectorcraft/src/presentation.rs +++ b/apps/vectorcraft/src/presentation.rs @@ -54,6 +54,7 @@ fn flag_value(flag: &str, arg: &str, args: &mut impl Iterator) -> impl Overrides { /// Whether a flag or a variable set the present mode or the frame latency. + #[cfg_attr(target_os = "macos", allow(dead_code))] // its one caller, in `main`, is not built on macOS pub fn is_set(&self) -> bool { *self != Self::default() } diff --git a/apps/vectorcraft/src/printing.rs b/apps/vectorcraft/src/printing.rs index 74e05e698f..db3518c26e 100644 --- a/apps/vectorcraft/src/printing.rs +++ b/apps/vectorcraft/src/printing.rs @@ -9,9 +9,8 @@ impl PrintService for SystemPrint { system::printers() } fn print(&mut self, job: &PrintJob) -> Result { - let result = system::print(job); - let to = job.printer.unwrap_or("the default printer"); - result.map(|note| format!("Sent “{}” to {to}{note}", job.title)) + let note = system::print(job)?; + Ok(sent(job.title, job.printer, ¬e)) } fn shared_print(&self) -> Option { Some(std::sync::Arc::new(|job| SystemPrint.print(job))) @@ -29,6 +28,15 @@ impl PrintService for SystemPrint { } } +/// The status after the job `title` went to `printer` (the default one without a name), with the +/// spooler's `note` when it gave one. Each message has text between its values, so a catalog can +/// match it and translate it. The note follows as its own sentence: a printer name can end in +/// parentheses ("HP LaserJet (Copy 1)"), and a note in parentheses would match that name. +fn sent(title: &str, printer: Option<&str>, note: &str) -> String { + let to = printer.unwrap_or("the default printer"); + if note.is_empty() { format!("Sent “{title}” to {to}") } else { format!("Sent “{title}” to {to}. The spooler replied: {note}") } +} + mod system { use super::{Command, PrintJob, Printer}; pub fn printers() -> Vec { @@ -38,7 +46,7 @@ mod system { // Copies, layout, marks and colour management are already in the PDF. Preserve its // physical sheet size and the queue's duplex default without printing copies twice. let settings = craft_print::Job { printer: job.printer.map(str::to_string), title: job.title.into(), ..Default::default() }; - craft_print::submit(job.pdf, &settings).map(|note| if note.is_empty() { note } else { format!(" ({note})") }).map_err(|e| e.to_string()) + craft_print::submit(job.pdf, &settings).map_err(|e| e.to_string()) } #[cfg(windows)] pub(crate) fn setup_command(printer: Option<&str>, default_printer: Option<&str>) -> Command { @@ -127,9 +135,28 @@ mod tests { #[cfg(test)] mod turn_tests { - use super::SystemPrint; + use super::{SystemPrint, sent}; use vectorcraft_ui_egui::print::PrintService; + #[test] + fn the_sent_status_names_the_job_the_printer_and_the_note() { + assert_eq!(sent("Poster", None, ""), "Sent “Poster” to the default printer"); + assert_eq!(sent("Poster", Some("Office Laser"), ""), "Sent “Poster” to Office Laser"); + assert_eq!(sent("Poster", Some("Office Laser"), "job 12"), "Sent “Poster” to Office Laser. The spooler replied: job 12"); + } + + #[test] + fn a_printer_name_ending_in_parentheses_stays_whole_in_a_translation() { + use vectorcraft_ui_egui::i18n::{Lang, message}; + let Some(de) = Lang::from_code("de") else { panic!("no German catalog") }; + let printer = Some("HP LaserJet (Copy 1)"); + assert_eq!(message(de, &sent("Poster", printer, "")), "“Poster” an HP LaserJet (Copy 1) gesendet"); + assert_eq!( + message(de, &sent("Poster", printer, "job 12")), + "“Poster” an HP LaserJet (Copy 1) gesendet. Antwort der Druckwarteschlange: job 12" + ); + } + #[test] fn only_macos_queues_need_landscape_pages_turned() { assert_eq!(SystemPrint.turns_landscape(), !cfg!(target_os = "macos")); diff --git a/crates/doc/src/blend.rs b/crates/doc/src/blend.rs index c7c3e408b4..f8b62ac815 100644 --- a/crates/doc/src/blend.rs +++ b/crates/doc/src/blend.rs @@ -2174,6 +2174,70 @@ pub fn blend_steps(keys: &[Arc], spec: &BlendSpec) -> Vec { StepCount::default().blend(keys, spec, Rail::new(keys, spec).as_ref()).0 } +/// Does each pair of `keys` blended with `spec` ask for the same number of steps +/// ([`blend_step_count`]) when each coordinate it counts from moves by up to `length` points and, +/// for Smooth Color, the difference between keys of different colors by up to `color` (0 to 1)? +/// False when a count sits that close to where it changes, and for Smooth Color by distance when +/// the keys are at most `4 × length` wide or high. Specified Steps always asks for the same number. +pub fn blend_steps_settled(keys: &[Arc], spec: &BlendSpec, length: f64, color: f64) -> bool { + let rail = Rail::new(keys, spec); + keys.windows(2).enumerate().all(|(i, w)| { + let [a, b] = w else { return true }; + match spec.spacing { + BlendSpacing::Steps(_) => true, + // The count is `len / d` rounded, which grows with `len`. + BlendSpacing::Distance(d) => { + let len = rail.as_ref().map_or_else(|| center_of(a).distance(center_of(b)), |r| r.len(i)); + let count = |len: f64| blend_step_count(a, b, BlendSpacing::Distance(d), len); + count(len - length) == count(len + length) + } + BlendSpacing::SmoothColor => smooth_color_settled(a, b, length, color), + } + }) +} + +/// [`blend_steps_settled`] for one pair of Smooth Color keys. Each count [`blend_step_count`] +/// takes grows with what it counts from (the color difference, the keys' reach, the distance +/// between their edges in key sizes), so the pair is settled when the least and the most of +/// these ask for the same count. +fn smooth_color_settled(a: &Node, b: &Node, length: f64, color: f64) -> bool { + let bounds = a.visual_bounds().zip(b.visual_bounds()); + let by_level = |d: f64| level_steps(d.max(0.0)) as usize; + match (color_distance(a, b), bounds) { + // Colors that differ, but by too little to count, or by little more: moving them may cross + // where they stop counting as the same. (The same colors stay the same.) + (Some(d), _) if d > 0.0 && d * 255.0 <= 1e-3 + color * 255.0 => false, + (Some(d), Some((ba, bb))) if d * 255.0 > 1e-3 => { + let (ca, cb) = (ba.center(), bb.center()); + let reach = + [(ca.x - cb.x).abs(), (ca.y - cb.y).abs(), ba.width(), ba.height(), bb.width(), bb.height()].into_iter().fold(0.0f64, f64::max); + // The centers and sizes move by up to twice `length`. + let by_density = |r: f64| (8.0 * r.max(0.0) + 0.5).floor().clamp(1.0, 254.0) as usize; + let least = by_level(d - color).min(by_density(reach - 2.0 * length)); + let most = by_level(d + color).min(by_density(reach + 2.0 * length)); + reach.is_finite() && least == most + } + (Some(d), None) if d * 255.0 > 1e-3 => by_level(d - color) == by_level(d + color), + (_, Some((ba, bb))) => { + let (w, h) = ((ba.width() + bb.width()) / 2.0, (ba.height() + bb.height()) / 2.0); + if w <= 4.0 * length || h <= 4.0 * length { + return false; + } + let dx = (ba.x0 - bb.x0).abs().max((ba.x1 - bb.x1).abs()); + let dy = (ba.y0 - bb.y0).abs().max((ba.y1 - bb.y1).abs()); + // Each edge moves by up to `length`: the distances between them by up to twice that, + // and the mean sizes too. + let q = |dx: f64, dy: f64, w: f64, h: f64| (dx.max(0.0) / w).max(dy.max(0.0) / h); + let count = |q: f64| ((q + 0.5).floor() - 1.0).clamp(1.0, 1000.0) as usize; + let m = 2.0 * length; + let least = q(dx - m, dy - m, w + m, h + m); + let most = q(dx + m, dy + m, w - m, h - m); + least.is_finite() && most.is_finite() && count(least) == count(most) + } + (_, None) => true, + } +} + /// Evaluate a blend: the keys and generated steps in paint order. The steps keep to /// [`MAX_BLEND_STEPS`] in all ([`blend_steps`]). pub fn blend_expand(keys: &[Arc], spec: &BlendSpec) -> Vec { @@ -3535,4 +3599,46 @@ mod tests { let (keys, spec) = blend_parts(&outer).unwrap(); assert_eq!(blend_steps(keys, spec), vec![99]); } + + /// A count is settled when moving the lengths by 0.01 pt and the colors by 0.001 can't change + /// it: Specified Steps always; Specified Distance unless the spine's length is a half step from + /// where its count changes; Smooth Color unless the colors differ by too little to count, the + /// color difference or the keys' reach sits where its count changes, or keys of the same color + /// are at most four times 0.01 pt wide. + #[test] + fn steps_settle_unless_rounding_can_change_their_count() { + let (length, color) = (0.01, 0.001); + let settled = |a: Node, b: Node, spacing: BlendSpacing| { + let spec = BlendSpec { spacing, ..Default::default() }; + blend_steps_settled(&[Arc::new(a), Arc::new(b)], &spec, length, color) + }; + let filled = |x: f64, size: f64, c: Color| smooth_key((x, 0.0), (size, size), Paint::solid(c), Paint::None, 0.0); + let gray = |x: f64| filled(x, 10.0, Color::rgb(0.5, 0.5, 0.5)); + + // The keys' centers are 100 pt apart: 100 / 25 is 4, and 100 / (100 / 3.5) is 3.5. + assert!(settled(gray(0.0), gray(100.0), BlendSpacing::Steps(3))); + assert!(settled(gray(0.0), gray(100.0), BlendSpacing::Distance(25.0))); + assert!(!settled(gray(0.0), gray(100.0), BlendSpacing::Distance(100.0 / 3.5))); + + // Smooth Color between colors that differ: by a 2,000th of a step, by 51 steps of 255 + // (settled) and by 51.5 (where the count changes). + let red = |x: f64, r: f32| filled(x, 10.0, Color::rgb(r, 0.0, 0.0)); + assert!(!settled(red(0.0, 0.0), red(100.0, 0.0005), BlendSpacing::SmoothColor)); + assert!(settled(red(0.0, 0.0), red(100.0, 51.0 / 255.0), BlendSpacing::SmoothColor)); + assert!(!settled(red(0.0, 0.0), red(100.0, 51.5 / 255.0), BlendSpacing::SmoothColor)); + // Black to white is counted by the keys' reach, eight steps a point: 10 pt is settled, + // 10.0625 pt (80.5 steps) is not. + let near = |size: f64| settled(filled(0.0, size, Color::BLACK), filled(5.0, size, Color::WHITE), BlendSpacing::SmoothColor); + assert!(near(10.0)); + assert!(!near(10.0625)); + // Keys without bounds are counted by their colors alone. + let bare = |r: f32| Node::path(NodeId(1), PathData::default(), Appearance::basic(Paint::solid(Color::rgb(r, 0.0, 0.0)), Paint::None, 0.0)); + assert!(settled(bare(0.0), bare(51.0 / 255.0), BlendSpacing::SmoothColor)); + assert!(!settled(bare(0.0), bare(51.5 / 255.0), BlendSpacing::SmoothColor)); + // Keys of the same color are counted by distance in key sizes; keys 0.04 pt wide or less + // are never settled. + assert!(settled(gray(0.0), gray(100.0), BlendSpacing::SmoothColor)); + assert!(!settled(filled(0.0, 0.04, Color::rgb(0.5, 0.5, 0.5)), filled(100.0, 0.04, Color::rgb(0.5, 0.5, 0.5)), BlendSpacing::SmoothColor)); + assert!(settled(filled(0.0, 0.05, Color::rgb(0.5, 0.5, 0.5)), filled(100.0, 0.05, Color::rgb(0.5, 0.5, 0.5)), BlendSpacing::SmoothColor)); + } } diff --git a/crates/doc/src/live.rs b/crates/doc/src/live.rs index 6b16973cf1..28fd1dc632 100644 --- a/crates/doc/src/live.rs +++ b/crates/doc/src/live.rs @@ -65,7 +65,9 @@ pub use expand::{ #[cfg(test)] use mesh::grid_eval; pub use mesh::{Coons, GradientMesh, MeshAppearance, MeshPiece, MeshPoint, MeshQuad, default_fidelity, grid_points, nodes_bounds}; -pub use warp::{WARP_NET, WarpNet, WarpStyle, fit_piece, map_nonlinear, map_nonlinear_within, pieces, uses_net, warp_point, warp_version}; +pub use warp::{ + WARP_NET, WarpNet, WarpStyle, fit_piece, map_nonlinear, map_nonlinear_within, map_smooth_within, pieces, uses_net, warp_point, warp_version, +}; #[cfg(test)] mod tests { @@ -88,6 +90,30 @@ mod tests { } } + /// The smooth map takes each handle along the map's derivative, also far from the origin, + /// where a fixed sampling step would round away (#7069): the identity map keeps a curve's + /// handles there. + #[test] + fn map_smooth_within_keeps_handles_far_from_the_origin() { + for at in [0.0, 1e13] { + let o = Point::new(at, at); + let curve = PathData::single(vectorcraft_geom::SubPath::new( + vec![ + vectorcraft_geom::Anchor::with_handles(o, o, o + vectorcraft_geom::Vec2::new(0.2, 0.0)), + vectorcraft_geom::Anchor::with_handles( + o + vectorcraft_geom::Vec2::new(1.0, 0.5), + o + vectorcraft_geom::Vec2::new(0.8, 0.5), + o + vectorcraft_geom::Vec2::new(1.0, 0.5), + ), + ], + false, + )); + let out = map_smooth_within(&curve, 10.0, usize::MAX, |p| p); + let (a, b) = (&curve.subpaths[0].anchors, &out.subpaths[0].anchors); + assert!(a[0].h_out.distance(b[0].h_out) < 0.01 && a[1].h_in.distance(b[1].h_in) < 0.01, "at {at}: {:?} {:?}", b[0].h_out, b[1].h_in); + } + } + /// #3578: a non-linear map within an anchor budget splits its segments into longer pieces, /// down to one a segment, and matches the plain map where the budget leaves room. #[test] diff --git a/crates/doc/src/live/warp.rs b/crates/doc/src/live/warp.rs index 08bef91140..dd48e8ef65 100644 --- a/crates/doc/src/live/warp.rs +++ b/crates/doc/src/live/warp.rs @@ -497,6 +497,37 @@ pub fn map_nonlinear(path: &PathData, max_piece: f64, f: impl Fn(Point) -> Point /// where pieces of `max_piece` would make more, the pieces grow until they don't ([`fit_piece`]), /// a coarser approximation of the image curve. Geometry effects map within their anchor budget. pub fn map_nonlinear_within(path: &PathData, max_piece: f64, max: usize, f: impl Fn(Point) -> Point) -> PathData { + map_pieces_within(path, max_piece, max, &f, |_, h| f(h)) +} + +/// [`map_nonlinear_within`] with each handle mapped along `f`'s derivative at its point +/// ([`mapped_handle`]) rather than as a point of its own: where `f` turns quickly (Twist), handles +/// mapped as points point different ways on the two sides of a join and the curve kinks there +/// (#7069); along the derivative, the pieces on both sides leave each join in one direction. +pub fn map_smooth_within(path: &PathData, max_piece: f64, max: usize, f: impl Fn(Point) -> Point) -> PathData { + map_pieces_within(path, max_piece, max, &f, |p, h| mapped_handle(&f, p, h)) +} + +/// Handle `h` of point `p` mapped through `f`: `f(p)` plus `f`'s derivative at `p` along `h - p` +/// (a central difference), so the image curve leaves `f(p)` the way `f` takes the curve. +fn mapped_handle(f: &impl Fn(Point) -> Point, p: Point, h: Point) -> Point { + let v = h - p; + let len = v.hypot(); + // A retracted handle stays retracted, and a non-finite one has no direction to follow. + if len.is_nan() || len <= 0.0 || len.is_infinite() { + return f(p); + } + // A thousandth of the handle, or more where the coordinates are so large that so short a + // step would round away (#7069): the samples stay a billionth of the coordinates apart, and + // at most at the handle's own end. + let size = p.x.abs().max(p.y.abs()).max(1.0); + let step = (1e-3f64).max(size * 1e-9 / len).min(1.0); + let d = (f(p + v * step) - f(p - v * step)) / (2.0 * step); + f(p) + d +} + +/// [`map_nonlinear_within`]'s pieces, with `handle(point, handle)` giving each mapped handle. +fn map_pieces_within(path: &PathData, max_piece: f64, max: usize, f: &impl Fn(Point) -> Point, handle: impl Fn(Point, Point) -> Point) -> PathData { let mut max_piece = max_piece.max(1e-3); // Each segment adds one anchor per piece past its first. let room = max.saturating_sub(path.anchor_count()); @@ -516,20 +547,20 @@ pub fn map_nonlinear_within(path: &PathData, max_piece: f64, max: usize, f: impl let mut pending_in: Option = None; for i in 0..n { let a = &sp.anchors[i]; - let h_in = pending_in.take().unwrap_or_else(|| f(a.h_in)); - res.push(Anchor { p: f(a.p), h_in, h_out: f(a.h_out), kind: a.kind }); + let h_in = pending_in.take().unwrap_or_else(|| handle(a.p, a.h_in)); + res.push(Anchor { p: f(a.p), h_in, h_out: handle(a.p, a.h_out), kind: a.kind }); if i < segs { let c = seg_cubic(sp, i); let k = pieces(poly_len(&c), max_piece, MAX_PIECES); for j in 0..k { let sub = c.subsegment((j as f64 / k as f64)..((j + 1) as f64 / k as f64)); if let Some(last) = res.last_mut() { - last.h_out = f(sub.p1); + last.h_out = handle(sub.p0, sub.p1); } if j + 1 < k { - res.push(Anchor { p: f(sub.p3), h_in: f(sub.p2), h_out: f(sub.p3), kind: Default::default() }); + res.push(Anchor { p: f(sub.p3), h_in: handle(sub.p3, sub.p2), h_out: f(sub.p3), kind: Default::default() }); } else { - pending_in = Some(f(sub.p2)); + pending_in = Some(handle(sub.p3, sub.p2)); } } } diff --git a/crates/doc/src/text/object.rs b/crates/doc/src/text/object.rs index 5bd31f7699..c556f2f5b0 100644 --- a/crates/doc/src/text/object.rs +++ b/crates/doc/src/text/object.rs @@ -27,7 +27,11 @@ impl TextObject { /// Character attributes as presented by controls (stored runs stay local for layout /// and rich-text clipboard operations). Explicit vertical character scale stays separate. pub fn effective_char_style(&self, style: &CharStyle) -> Option { - let scale = self.style_scale()?; + Self::scaled_char_style(style, self.style_scale()?) + } + + /// `style` with `scale` taken into its attributes ([`Self::effective_char_style`]). + fn scaled_char_style(style: &CharStyle, scale: TextStyleScale) -> Option { let mut style = style.clone(); style.size *= scale.points; style.leading = style.leading.map(|v| v * scale.points); @@ -57,19 +61,27 @@ impl TextObject { /// scale from `xf`, so panels show document-point sizes without a separate transform factor. /// Returns `false` when there is nothing to bake (identity scale or an unrepresentable /// transform). + /// + /// Type on a path bakes only the uniform part of the scale (the vertical one) and keeps any + /// stretch in `xf`: its brackets and glyphs sit at fractions of the path's length, which a + /// non-uniform scale of the path would move, and a uniform one keeps. pub fn scale_text_attributes(&mut self) -> bool { - let Some(scale) = self.style_scale() else { return false }; - if (scale.points - 1.0).abs() <= 1e-12 && (scale.horizontal - 1.0).abs() <= 1e-12 { + let Some(mut scale) = self.style_scale() else { return false }; + let [a, b, c, d, _, _] = self.xf.as_coeffs(); + let (mut sx, sy) = (a.hypot(b), c.hypot(d)); + if sx <= 1e-12 || sy <= 1e-12 { return false; } - let [a, b, c, d, _, _] = self.xf.as_coeffs(); - let (sx, sy) = (a.hypot(b), c.hypot(d)); - if sx <= 1e-12 || sy <= 1e-12 { + if matches!(self.kind, TextKind::OnPath { .. }) { + scale.horizontal = 1.0; + sx = sy; + } + if (scale.points - 1.0).abs() <= 1e-12 && (scale.horizontal - 1.0).abs() <= 1e-12 { return false; } let mut baked = Vec::with_capacity(self.runs.len()); for run in &self.runs { - let Some(eff) = self.effective_char_style(&run.style) else { return false }; + let Some(eff) = Self::scaled_char_style(&run.style, scale) else { return false }; baked.push(eff); } for (run, style) in self.runs.iter_mut().zip(baked) { @@ -78,6 +90,14 @@ impl TextObject { // Character strokes are drawn in text space: widen them by the vertical scale we remove. self.scale_char_strokes(1.0 / sy); self.xf *= Affine::scale_non_uniform(1.0 / sx, 1.0 / sy); + // An area's frame and a path type's path are drawn through `xf` too: give them the scale + // `xf` loses, so the frame (and so the line breaks) and the path stay where they were. + let grow = Affine::scale_non_uniform(sx, sy); + match &mut self.kind { + TextKind::Area { frame } => frame.transform(grow), + TextKind::OnPath { path, .. } => path.transform(grow), + TextKind::Point => {} + } self.cached_bounds = None; self.cached_baselines.clear(); self.cached_ink = None; diff --git a/crates/effects/src/distort.rs b/crates/effects/src/distort.rs index a5bc941b16..7a03a2f3aa 100644 --- a/crates/effects/src/distort.rs +++ b/crates/effects/src/distort.rs @@ -5,7 +5,9 @@ use vectorcraft_geom::kurbo::ParamCurveArclen; use vectorcraft_geom::{Affine, Anchor, ParamCurve, PathData, Point, Rect, SubPath, Vec2}; use vectorcraft_pathops::addons::pathtools::insert_at; -use crate::util::{catmull_rom, fit_piece, flag, map_nonlinear_within, mean_size, noise, normal_at, num, pieces, seed, seg_cubic, smooth_points}; +use crate::util::{ + catmull_rom, fit_piece, flag, map_nonlinear_within, map_smooth_within, mean_size, noise, normal_at, num, pieces, seed, seg_cubic, smooth_points, +}; fn diag(b: Rect) -> f64 { b.width().hypot(b.height()).max(1e-6) @@ -325,8 +327,8 @@ pub fn tweak(path: &PathData, b: Rect, p: &Value) -> PathData { } /// Twist: rotation that is strongest at the centre and fades to zero at the bounding circle, -/// clockwise on the page for a positive `angle`, making at most `max` anchors -/// ([`map_nonlinear_within`]). +/// clockwise on the page for a positive `angle`, making at most `max` anchors. Its handles follow +/// the rotation's derivative ([`map_smooth_within`]), so the pieces join without kinks (#7069). pub fn twist(path: &PathData, b: Rect, angle: f64, max: usize) -> PathData { let ang = angle.clamp(-3600.0, 3600.0).to_radians(); if ang == 0.0 { @@ -343,7 +345,7 @@ pub fn twist(path: &PathData, b: Rect, angle: f64, max: usize) -> PathData { c + Vec2::new(d.x * co - d.y * s, d.x * s + d.y * co) }; let piece = (r / 8.0).min(r / (1.0 + ang.abs() * 2.0)); - map_nonlinear_within(path, piece, max, f) + map_smooth_within(path, piece, max, f) } const ZIGZAG_ARCLEN_ACCURACY: f64 = 1e-4; diff --git a/crates/effects/src/tests.rs b/crates/effects/src/tests.rs index ac340224c6..52b38f986d 100644 --- a/crates/effects/src/tests.rs +++ b/crates/effects/src/tests.rs @@ -1687,6 +1687,27 @@ fn twist_turns_clockwise_for_positive_angles() { assert!(turned(-45.0).y < 49.5, "{:?}", turned(-45.0)); } +/// Twist turns a line into a smooth spiral: the points it adds join their pieces without a kink, +/// however far it turns (#7069). +#[test] +fn twist_joins_its_pieces_smoothly() { + let line = PathData::single(SubPath::polyline(&[Point::new(40.0, 30.0), Point::new(60.0, 30.0)], false)); + let bounds = Rect::new(40.0, 30.0, 60.0, 30.0); + for angle in [90.0, 400.0, -720.0] { + let out = apply_geometry(&[fx("distort.twist", json!({"angle": angle}))], &line, bounds); + let anchors = &out.subpaths[0].anchors; + assert!(anchors.len() > 8, "{angle}°: {} anchors", anchors.len()); + for a in anchors.iter().skip(1).take(anchors.len() - 2) { + let (into, out) = (a.p - a.h_in, a.h_out - a.p); + if into.hypot() < 1e-9 || out.hypot() < 1e-9 { + continue; + } + let kink = (into.x * out.y - into.y * out.x).atan2(into.dot(out)).to_degrees().abs(); + assert!(kink < 1.0, "{angle}°: a kink of {kink:.1}° at {:?}", a.p); + } + } +} + #[test] fn twist_fixes_the_outer_circle_and_rotates_inside() { let out = run("distort.twist", json!({"angle": 0}), &square()); diff --git a/crates/effects/src/util.rs b/crates/effects/src/util.rs index ec8cb4cba8..de203b4955 100644 --- a/crates/effects/src/util.rs +++ b/crates/effects/src/util.rs @@ -71,7 +71,7 @@ pub fn seg_cubic(sp: &SubPath, i: usize) -> CubicBez { /// Non-linear path mapping (shared with live envelopes in `vectorcraft-doc`), and the split of /// segments into pieces within an anchor budget. -pub use vectorcraft_doc::live::{fit_piece, map_nonlinear_within, pieces}; +pub use vectorcraft_doc::live::{fit_piece, map_nonlinear_within, map_smooth_within, pieces}; /// About how many lines the renderer flattens `path` into at 1 px/pt: one for a straight /// segment, and for a curve the count Wang's formula gives at vello's tolerance of 0.25 px, diff --git a/crates/engine/src/cmd/create.rs b/crates/engine/src/cmd/create.rs index c5d3d70fd2..932527a397 100644 --- a/crates/engine/src/cmd/create.rs +++ b/crates/engine/src/cmd/create.rs @@ -53,7 +53,7 @@ pub fn specs() -> Vec { "Flare", [], 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: places the rings along the path anew, keeping their count and sizes)} → {id}", + "{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 ), @@ -565,7 +565,7 @@ fn flare(s: &mut Session, p: &Value) -> Result { 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}"))), }; - // The generator's state is odd (never 0). + // Xorshift64. Both streams start from a nonzero state. let random = |mut state: u64| { move || { state ^= state << 13; @@ -580,7 +580,13 @@ fn flare(s: &mut Session, p: &Value) -> Result { 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| random((r << 1) | 1)); + 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)); diff --git a/crates/engine/src/cmd/draw2/commands.rs b/crates/engine/src/cmd/draw2/commands.rs index b9015a4cc7..05dae578ce 100644 --- a/crates/engine/src/cmd/draw2/commands.rs +++ b/crates/engine/src/cmd/draw2/commands.rs @@ -11,7 +11,7 @@ pub fn specs() -> Vec { "Pencil", [], None, - "{points: [[x,y]…] or [[x,y,pressure]…] or [[x,y,pressure,tiltX,tiltY,rotation]…] (pen pressure 0..1: the stroke keeps it, for Calligraphic and Scatter brushes with Pressure variation; a point without one presses fully. Pen tilt in degrees, each −90..90, x positive leaning right and y leaning down the page, and barrel rotation in degrees clockwise, 0..360: the stroke keeps how far the pen leaned, which way and how far its barrel turned, for brushes with Tilt, Bearing and Rotation variation; null for what a point lacks. A pressure, tilt or rotation outside its range, or a point array of more than six numbers, is an error), fidelity?: pt (1.5; from 0.000015625 (0.01 / 640) to 100 / 0.0313 (about 3194.89), the Pencil's and the Paintbrush's 0.01 to 100 px Fidelity at the highest and the lowest zoom; a value outside that range is an error. The tools send their Fidelity in pixels divided by the zoom, kept within the range), fit?: bool (true; false: the points are joined by straight segments, as the Pencil previews a stroke with Live curve fitting off), closed?, style?: \"pencil\"|\"brush\", fill?: bool, keepSelected?: bool (true: the drawn or continued path is selected; false: a new path leaves nothing selected, and a continued or redrawn one is deselected while the rest of the selection stays), extend?: {id, end: \"start\"|\"end\"}, connect?: {id, end: \"start\"|\"end\"}, redraw?: {id, within?: pt (12)}} fit a freehand stroke → {id}. extend continues the path from that end, and closes it when `closed` is true (left out, when the stroke ends within four Fidelities of the path's other end, 6 to 400 pt); with connect, the stroke ends on that end of another path's last open subpath and joins it on, in one path with the extended path's appearance (the other path is removed when nothing of it is left); redraw (Edit Selected Paths) replaces the section of the path between where the stroke starts and ends, each within `within` of one subpath (the shorter way round a closed one), and draws a new path when the stroke doesn't end on it", + "{points: [[x,y]…] or [[x,y,pressure]…] or [[x,y,pressure,tiltX,tiltY,rotation]…] (pen pressure 0..1: the stroke keeps it, for Calligraphic and Scatter brushes with Pressure variation; a point without one presses fully. Pen tilt in degrees, each −90..90, x positive leaning right and y leaning down the page, and barrel rotation in degrees clockwise, 0..360: the stroke keeps how far the pen leaned, which way and how far its barrel turned, for brushes with Tilt, Bearing and Rotation variation; null for what a point lacks. A pressure, tilt or rotation outside its range, or a point array of more than six numbers, is an error), fidelity?: pt (1.5; from 0.000015625 (0.01 / 640) to 100 / 0.0313 (about 3194.89), the Pencil's and the Paintbrush's 0.01 to 100 px Fidelity at the highest and the lowest zoom; a value outside that range is an error. The tools send their Fidelity in pixels divided by the zoom, kept within the range), fit?: bool (true; false: the points are joined by straight segments, as the Pencil previews a stroke with Live curve fitting off), closed?, style?: \"pencil\" (default) | \"brush\", fill?: bool, keepSelected?: bool (true: the drawn or continued path is selected; false: a new path leaves nothing selected, and a continued or redrawn one is deselected while the rest of the selection stays), extend?: {id, end?: \"end\" (default) | \"start\"}, connect?: {id, end: \"start\"|\"end\"}, redraw?: {id, within?: pt (12)}} fit a freehand stroke → {id}. extend continues the path from that end, and closes it when `closed` is true (left out, when the stroke ends within four Fidelities of the path's other end, 6 to 400 pt); with connect, the stroke ends on that end of another path's last open subpath and joins it on, in one path with the extended path's appearance (the other path is removed when nothing of it is left); redraw (Edit Selected Paths) replaces the section of the path between where the stroke starts and ends, each within `within` of one subpath (the shorter way round a closed one), and draws a new path when the stroke doesn't end on it. Any other style, extend end or connect end is an error, and nothing changes", has_doc, freehand ), @@ -128,7 +128,7 @@ pub fn specs() -> Vec { "Blob Brush", [], None, - "{points: [[x,y]…] or [[x,y,pressure]…] (pen pressure 0..1; pen values are checked as path.freehand checks them), size?: pt (10; from 0.1 to 1000), sizeMode?: \"fixed\" (default) | \"pressure\" (Blob Brush Tool Options' Size set to Pressure: the brush is size − sizeVariation wide at the lightest pen pressure and size + sizeVariation at the heaviest, at least 0.1 pt; a stroke without pressure keeps the size), sizeVariation?: pt (0; from 0 to 1000, checked with Fixed too), angle?: ° (0, kept within −180–180: the tip's long axis counter-clockwise from horizontal, kept on the page along the stroke), roundness?: % (100, kept within 0–100: the tip's short axis in percent of its long one, 100 round; 0 is drawn as 0.1), fidelity?: pt (0.01–100; the brush follows the stroke fitted at this tolerance as path.freehand fits a Pencil stroke, and a higher value gives a smoother shape; without it the brush follows every point), merge?: true, mergeOnlySelection?: bool (false: merge with any touching same-color blob; true: only with selected ones), keepSelected?: bool (false: the drawn or merged path is not selected, and the rest of the selection stays; true: it is selected)} filled brush shape, merged with the topmost touching same-color blob and the touching ones next to it in stacking order in its group or layer → {id}", + "{points: [[x,y]…] or [[x,y,pressure]…] (pen pressure 0..1; pen values are checked as path.freehand checks them), size?: pt (10; from 0.1 to 1000), sizeMode?: \"fixed\" (default) | \"pressure\" (Blob Brush Tool Options' Size set to Pressure: the brush is size − sizeVariation wide at the lightest pen pressure and size + sizeVariation at the heaviest, at least 0.1 pt; a stroke without pressure keeps the size), sizeVariation?: pt (0; from 0 to 1000, checked with Fixed too), angle?: ° (0, −180–180: the tip's long axis counter-clockwise from horizontal, kept on the page along the stroke), roundness?: % (100, 0–100: the tip's short axis in percent of its long one, 100 round; 0 is drawn as 0.1), fidelity?: pt (0.01–100; the brush follows the stroke fitted at this tolerance as path.freehand fits a Pencil stroke, and a higher value gives a smoother shape; without it the brush follows every point), merge?: true, mergeOnlySelection?: bool (false: merge with any touching same-color blob; true: only with selected ones), keepSelected?: bool (false: the drawn or merged path is not selected, and the rest of the selection stays; true: it is selected)} filled brush shape, merged with the topmost touching same-color blob and the touching ones next to it in stacking order in its group or layer → {id}. An angle, roundness or fidelity outside its range is rejected with an error, and nothing changes", has_doc, blob ), diff --git a/crates/engine/src/cmd/draw2/freehand.rs b/crates/engine/src/cmd/draw2/freehand.rs index 9ca565667d..241d252816 100644 --- a/crates/engine/src/cmd/draw2/freehand.rs +++ b/crates/engine/src/cmd/draw2/freehand.rs @@ -200,14 +200,22 @@ pub(crate) fn freehand_brushed(s: &mut Session, p: &Value, brush_name: Option<&s // The tolerance the stroke is fitted at; with `fit: false` it is not fitted. let fit_tol = switch_or(p, "fit", true, C)?.then_some(tol); let closed = switch_or(p, "closed", false, C)?; - let brush = str_param(p, "style") == Some("brush"); + let brush = match p.get("style").filter(|v| !v.is_null()).map(Value::as_str) { + None | Some(Some("pencil")) => false, + Some(Some("brush")) => true, + Some(_) => return Err(bad(C, "style must be \"pencil\" or \"brush\"")), + }; // The undo step's name: a stroke painted with a brush is a Paintbrush stroke, whatever its style. let label = if brush || brush_name.is_some() { "Paintbrush" } else { "Pencil" }; let keep_selected = switch_or(p, "keepSelected", true, C)?; let filled = switch_or(p, "fill", false, C)?; if let Some(ext) = p.get("extend").filter(|v| !v.is_null()) { let id = object_param(ext, "id", C)?.ok_or_else(|| bad(C, "extend needs id"))?; - let at_start = str_param(ext, "end") == Some("start"); + let at_start = match ext.get("end").filter(|v| !v.is_null()).map(Value::as_str) { + None | Some(Some("end")) => false, + Some(Some("start")) => true, + Some(_) => return Err(bad(C, "extend end must be \"start\" or \"end\"")), + }; let (pd, _) = path_of(&s.doc()?.doc, id)?; let si = pd.subpaths.iter().rposition(|s| !s.closed && !s.anchors.is_empty()).ok_or_else(|| bad(C, "path has no open end"))?; let target = brush_target(&s.doc()?.doc, id); @@ -488,12 +496,23 @@ pub(super) fn blob(s: &mut Session, p: &Value) -> Result { let samples = samples_param(p, "points", C)?; let size = ranged(p, "size", 10.0, SIZES, C)?; let angle = number_or(p, "angle", 0.0, C)?; + if !(-180.0..=180.0).contains(&angle) { + return Err(bad(C, "`angle` must be from -180 to 180 degrees")); + } let roundness = number_or(p, "roundness", 100.0, C)?; - if !angle.is_finite() || !roundness.is_finite() { - return Err(bad(C, "angle and roundness must be finite")); + if !(0.0..=100.0).contains(&roundness) { + return Err(bad(C, "`roundness` must be from 0 to 100%")); + } + // With `fidelity` (pt), the brush follows the stroke fitted by [`fit_freehand`], as a Pencil + // stroke is fitted. Without it, or when the fitted stroke has no length (a short stroke back to + // its start), the brush follows every point. + let fidelity = match p.get("fidelity") { + None | Some(Value::Null) => None, + Some(_) => Some(number_or(p, "fidelity", 0.0, C)?), + }; + if fidelity.is_some_and(|f| !(vectorcraft_tools::draw2::MIN_FIDELITY..=100.0).contains(&f)) { + return Err(bad(C, "`fidelity` must be from 0.01 to 100 pt")); } - let angle = angle.clamp(-180.0, 180.0); - let roundness = roundness.clamp(0.0, 100.0); let tip = vectorcraft_tools::draw2::blob_tip(angle, roundness); let squash = tip.inverse(); // Width profiles use distance along the spine, so measure pressure on the same squashed @@ -515,13 +534,6 @@ pub(super) fn blob(s: &mut Session, p: &Value) -> Result { let mapped_pts: Vec = mapped_samples.into_iter().map(|s| s.pt).collect(); // The widest the brush gets: the area merges look in. let reach = pressure.as_ref().map_or(size, |(_, v)| size + v); - // With `fidelity` (pt), the brush follows the stroke fitted by [`fit_freehand`], as a Pencil - // stroke is fitted. Without it, or when the fitted stroke has no length (a short stroke back to - // its start), the brush follows every point. - let fidelity = match p.get("fidelity") { - None | Some(Value::Null) => None, - Some(_) => Some(number_or(p, "fidelity", 0.0, C)?.clamp(vectorcraft_tools::draw2::MIN_FIDELITY, 100.0)), - }; let spine = |tol: Option| { let path = match tol { Some(tol) => PathData::single(fit_freehand(&pts, tol, false)), diff --git a/crates/engine/src/cmd/fileio/pdf.rs b/crates/engine/src/cmd/fileio/pdf.rs index 75e2dba02b..36b0845aa1 100644 --- a/crates/engine/src/cmd/fileio/pdf.rs +++ b/crates/engine/src/cmd/fileio/pdf.rs @@ -417,9 +417,13 @@ fn encode_carrying_at( } let (flat, flattened) = flatten_for(cmd, doc, set, p)?; vectorcraft_doc::cancel::check()?; - if flattened { + if let Some(o) = flattened { let kind = if set.standard.flattens() { set.standard.label() } else { set.compatibility.label() }; - notes.push(Note::loss(format!("transparency is flattened into opaque art and images ({kind} files have none): see the flattener preset"))); + let line_ppi = o.line_art_ppi.round() as u32; + let grad_ppi = o.gradient_ppi.round() as u32; + notes.push(Note::loss(format!( + "transparency is flattened into opaque art and images ({kind} files have none) at {line_ppi} ppi line art and text, {grad_ppi} ppi gradients and meshes: see the flattener preset" + ))); } let r = super::super::rasterfx::export_pdf_with_report(flat.as_ref().unwrap_or(doc), &opts).map_err(|e| pdf_error(cmd, e))?; notes.extend(r.warnings.into_iter().map(Note::loss)); @@ -438,9 +442,9 @@ pub const DEFAULT_FLATTENER: &str = "High Resolution"; /// discarded overprints are dropped. Layers the pages leave out (non-printing ones, unless asked /// for) are left out of the flattening, hidden. → the document to write (`None`: `doc` as it is) /// and whether its transparency was flattened. -fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Result<(Option, bool)> { +fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Result<(Option, Option)> { if !set.pdf13() { - return Ok((None, false)); + return Ok((None, None)); } let printed = if set.include_non_printing || set.create_layers { None } else { without_non_printing(&doc.layers) }; let shown = printed.map(|layers| { @@ -456,8 +460,8 @@ fn flatten_for(cmd: &str, doc: &Document, set: &PdfSettings, p: &Value) -> Resul // its art: it is clipped to its regions (opaque inside them). o.clip_complex_regions = true; Ok(match flatten_document(shown.as_ref().unwrap_or(doc), &o)? { - Some(flat) => (Some(flat), true), - None => (shown, false), + Some(flat) => (Some(flat), Some(o)), + None => (shown, None), }) } diff --git a/crates/engine/src/cmd/params.rs b/crates/engine/src/cmd/params.rs index fdf7dd4b19..8dc29b9704 100644 --- a/crates/engine/src/cmd/params.rs +++ b/crates/engine/src/cmd/params.rs @@ -649,6 +649,7 @@ pub const UNCHECKED: &[&str] = &[ "transparency.setOpacityMask", "transparency.unlinkOpacityMask", "type.pathOptions", + "webExport.optimizeToFileSize", "webExport.presets.save", "webExport.settings", ]; @@ -663,18 +664,28 @@ fn pdf_option_tree() -> Value { tree } +/// The parameter error of command `id` for `key`, a key with the objects it is in (`marks.ofset`), +/// when a key those objects take is near it: `near`, written the same way (`marks.offset`). Each +/// is one value of the message, so a catalog can match the message and translate it. +fn misspelled(id: &str, key: &str, near: &str) -> crate::EngineError { + bad(id, format!("unknown parameter `{key}`; did you mean `{near}`?")) +} + /// `given`, the object at `within` (`marks.`), has only keys of `schema`, the objects inside it too. fn check_option_tree(id: &str, within: &str, given: &serde_json::Map, schema: &serde_json::Map) -> Result<()> { for (key, value) in given { match (schema.get(key), value) { (None, _) => { let keys: Vec<&str> = schema.keys().map(String::as_str).collect(); - let why = match nearest(key, &keys) { - Some(near) => format!("did you mean `{within}{near}`?"), - None => format!("`{}` takes: {}", within.trim_end_matches('.'), keys.join(", ")), - }; - let key = shown_key(key); - return Err(bad(id, format!("unknown parameter `{within}{key}`; {why}"))); + let near = nearest(key, &keys); + let key = format!("{within}{}", shown_key(key)); + return Err(match near { + Some(near) => misspelled(id, &key, &format!("{within}{near}")), + None => { + let (object, keys) = (within.trim_end_matches('.'), keys.join(", ")); + bad(id, format!("unknown parameter `{key}`; `{object}` takes: {keys}")) + } + }); } (Some(Value::Object(inner)), Value::Object(value)) => check_option_tree(id, &format!("{within}{key}."), value, inner)?, _ => {} @@ -691,14 +702,11 @@ fn check_option_keys(id: &str, within: &str, given: &serde_json::Map format!("unknown parameter `{within}{key}`; did you mean `{within}{near}`?"), - None => format!("unknown parameter `{within}{key}`; {why_not}"), - }, - )); + let key = format!("{within}{}", shown_key(key)); + return Err(match near { + Some(near) => misspelled(id, &key, &format!("{within}{near}")), + None => bad(id, format!("unknown parameter `{key}`; {why_not}")), + }); } if let (Some(Value::Object(schema)), Value::Object(value)) = (trees.get(key), value) { check_option_tree(id, &format!("{within}{key}."), value, schema)?; @@ -797,12 +805,15 @@ fn check_screen_rows(id: &str, within: &str, p: &serde_json::Map) let formats = screen_formats(); for (format, options) in settings { if !formats.contains(&format.as_str()) { - let why = match nearest(format, &formats) { - Some(near) => format!("did you mean `{within}settings.{near}`?"), - None => format!("`{within}settings` takes: {}", formats.join(", ")), - }; - let format = shown_key(format); - return Err(bad(id, format!("unknown parameter `{within}settings.{format}`; {why}"))); + let near = nearest(format, &formats); + let key = format!("{within}settings.{}", shown_key(format)); + return Err(match near { + Some(near) => misspelled(id, &key, &format!("{within}settings.{near}")), + None => { + let (object, keys) = (format!("{within}settings"), formats.join(", ")); + bad(id, format!("unknown parameter `{key}`; `{object}` takes: {keys}")) + } + }); } if let Value::Object(options) = options { check_option_keys(id, &format!("{within}settings.{format}."), options, &keys, NO_FORMAT, trees)?; diff --git a/crates/engine/src/cmd/print.rs b/crates/engine/src/cmd/print.rs index bc6d570c91..0826e848cf 100644 --- a/crates/engine/src/cmd/print.rs +++ b/crates/engine/src/cmd/print.rs @@ -23,7 +23,7 @@ pub fn specs() -> Vec { "Print Setup", [], None, - "{preset?: name ([Default] or a saved print preset, any case: print.presets.list; its settings replace the document's, as choosing it in the Print dialog does), settings?: {copies: 1 (1–999), collate: true, reverse, artboards: all|range|ignore (all the art as one page), range: \"1-3, 5\" (1-based, with artboards: range), skipBlank (leave out artboards with no art that prints), media: letter|legal|tabloid|a3|a4|a5|a6|b4|b5|b4 (jis)|b5 (jis)|b6 (jis)|japanese postcard|japanese double postcard|japanese envelope #3|japanese envelope #4|kaku #2|kaku #3|yonroku-ban|custom (a paper is named by its id or its dialog label, any case and spacing, so `B5 (JIS)` works; b4 and b5 stay the ISO 216 sizes, 250 × 353 and 176 × 250 mm, and the JIS sizes are b4 (jis) 257 × 364 mm, b5 (jis) 182 × 257 mm and b6 (jis) 128 × 182 mm), width, height (custom paper, 72–14400 pt), orientation: portrait|landscape|portraitFlipped|landscapeFlipped, autoRotate: true (turn the paper to each artboard; orientation ignored), transverse (the page a quarter turn on the paper), printLayers: visiblePrintable|visible|all (template layers never print), placement: {origin: topLeft|top|topRight|left|center|right|bottomLeft|bottom|bottomRight (the point of the printed area, the artboard with its bleed and marks, on the same point of the imageable area), x, y (pt, right and down)}, scaling: none|fit|custom|tileFull|tileImageable, scale: {width: 100, height: 100 (1–1000 % with custom and tiling), linked: true (width and height stay equal: give one and the other follows, and turning it on sets the height to the width; a different width and height without linked turn it off, and with linked: true, or linked: null over a linked scale, are an error; a saved scale without linked reads it as false)}, overlap: 0 (pt between tiles), tileRange: \"\" (1-based tiles across then down; empty: all), copiesPerSheet: false (not with tiling: as many copies of each artboard, with its bleed and marks, as fit the imageable area, across then down, not turned; the placement places the grid; an artboard that doesn't fit prints one copy per sheet, with a warning), gutter: 0 (pt between copies, 0–720), margin: 0 (pt the device can't print around the paper: the imageable area is inside it), marks: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25, offset: 6} (as document.exportPdf, at the paper's scale; page information adds the tile and the ink), bleed: {useDocument: true (the document's bleed, document.setup), top, bottom, left, right} (pt), output: {mode: composite|separations (one gray page per ink that prints), emulsion: up|down (down mirrors), image: positive|negative, spotsToProcess, overprintBlack: false (separations: solid 100% K or 100% gray fills, strokes and characters, to within half a percent, overprint in the printed copy, gradients when every stop is (every point of a freeform one); rich, RGB, spot-linked and lighter blacks are not marked, and paints already set to overprint keep it; composite ignores it), inks: [{name: \"Cyan\"|…|a spot swatch, print: true, frequency (lpi, default 60), angle (screen angle, degrees counter-clockwise as PostScript setscreen takes it; default C 15, M 75, Y 0, K 45, spots 45)}]}, graphics: {autoFlatness: true, flatness: 1 (0.2–100), fonts: none|subset|complete}, color: {intent: perceptual|relativeColorimetric|saturation|absoluteColorimetric, preserveNumbers: true (CMYK colors keep their values), profile: \"\" (the printer profile, an RGB or CMYK one: composite PDF colors are converted to it with the intent, separations separate with a CMYK one; empty: as they are)}, advanced: {printAsBitmap (composite pages print as one image each, at the document's raster effects resolution, or lower for a page larger than 64 Mpx or 32,768 px a side), overprints: preserve|discard|simulate (composite output; preserve writes them to overprint (/OP), simulate prints them as Overprint Preview shows them; separations always keep them), flattenerPreset: \"\" (a flattener preset, built-in or saved: transparency is flattened before printing; empty: it prints live; PostScript defaults to medium)}, tileOrigin: {placed: false, x, y} (where the Print Tiling tool put the pages: print.tiling.set)}} store the print settings with the document, over the ones it has or the preset's (null keeps a value), as one undo step; no settings or preset → {settings} (the current ones, defaults if never set up)", + "{preset?: name ([Default] or a saved print preset, any case: print.presets.list; its settings replace the document's, as choosing it in the Print dialog does), settings?: {copies: 1 (1–999), collate: true, reverse, artboards: all|range|ignore (all the art as one page), range: \"1-3, 5\" (1-based, with artboards: range), skipBlank (leave out artboards with no art that prints), media: letter|legal|tabloid|a3|a4|a5|a6|b4|b5|b4 (jis)|b5 (jis)|b6 (jis)|japanese postcard|japanese double postcard|japanese envelope #3|japanese envelope #4|kaku #2|kaku #3|yonroku-ban|custom (a paper is named by its id or its dialog label, any case and spacing, so `B5 (JIS)` works; b4 and b5 stay the ISO 216 sizes, 250 × 353 and 176 × 250 mm, and the JIS sizes are b4 (jis) 257 × 364 mm, b5 (jis) 182 × 257 mm and b6 (jis) 128 × 182 mm), width, height (custom paper, 72–14400 pt), orientation: portrait|landscape|portraitFlipped|landscapeFlipped, autoRotate: true (turn the paper to each artboard; orientation ignored), transverse (the page a quarter turn on the paper), printLayers: visiblePrintable|visible|all (template layers never print), placement: {origin: topLeft|top|topRight|left|center|right|bottomLeft|bottom|bottomRight (the point of the printed area, the artboard with its bleed and marks, on the same point of the imageable area), x, y (pt, right and down)}, scaling: none|fit|custom|tileFull|tileImageable, scale: {width: 100, height: 100 (1–1000 % with custom and tiling), linked: true (width and height stay equal: give one and the other follows, and turning it on sets the height to the width; a different width and height without linked turn it off, and with linked: true, or linked: null over a linked scale, are an error; a saved scale without linked reads it as false)}, overlap: 0 (pt between tiles), tileRange: \"\" (1-based tiles across then down; empty: all), copiesPerSheet: false (not with tiling: as many copies of each artboard, with its bleed and marks, as fit the imageable area, across then down, not turned; the placement places the grid; an artboard that doesn't fit prints one copy per sheet, with a warning), gutter: 0 (pt between copies, 0–720), margin: 0 (pt the device can't print around the paper: the imageable area is inside it), marks: {trim, registration, colorBars, pageInfo, kind: roman|japanese, weight: 0.25, offset: 6} (as document.exportPdf, at the paper's scale; page information adds the tile and the ink), bleed: {useDocument: true (the document's bleed, document.setup), top, bottom, left, right} (pt), output: {mode: composite|separations (one gray page per ink that prints), emulsion: up|down (down mirrors), image: positive|negative, spotsToProcess, overprintBlack: false (separations: solid 100% K or 100% gray fills, strokes and characters, to within half a percent, overprint in the printed copy, gradients when every stop is (every point of a freeform one); rich, RGB, spot-linked and lighter blacks are not marked, and paints already set to overprint keep it; composite ignores it), inks: [{name: \"Cyan\"|…|a spot swatch, print: true, frequency (lpi, default 60), angle (screen angle, degrees counter-clockwise as PostScript setscreen takes it; default C 15, M 75, Y 0, K 45, spots 45), convertToProcess: false (a spot ink only: it prints on the process plates, with no plate of its own, and its print, frequency and angle are kept for when it prints as a spot ink again; spotsToProcess converts every spot ink whatever it says)}]}, graphics: {autoFlatness: true, flatness: 1 (0.2–100), fonts: none|subset|complete}, color: {intent: perceptual|relativeColorimetric|saturation|absoluteColorimetric, preserveNumbers: true (CMYK colors keep their values), profile: \"\" (the printer profile, an RGB or CMYK one: composite PDF colors are converted to it with the intent, separations separate with a CMYK one; empty: as they are)}, advanced: {printAsBitmap (composite pages print as one image each, at the document's raster effects resolution, or lower for a page larger than 64 Mpx or 32,768 px a side), overprints: preserve|discard|simulate (composite output; preserve writes them to overprint (/OP), simulate prints them as Overprint Preview shows them; separations always keep them), flattenerPreset: \"\" (a flattener preset, built-in or saved: transparency is flattened before printing; empty: it prints live; PostScript defaults to medium)}, tileOrigin: {placed: false, x, y} (where the Print Tiling tool put the pages: print.tiling.set)}} store the print settings with the document, over the ones it has or the preset's (null keeps a value), as one undo step; no settings or preset → {settings} (the current ones, defaults if never set up)", has_doc, setup ), @@ -32,7 +32,7 @@ pub fn specs() -> Vec { "Print Preview", [], None, - "{preset?: name (as print.setup's: its settings instead of the document's), settings?: {…settings of print.setup} (over the document's or the preset's)} → {pages (copies included), sheets: [{artboard (0-based; null with artboards ignored), tile? (1-based), ink? (separations), width, height (pt, the page), orientation, scale: [width %, height %], transform: [a, b, c, d, e, f] (document space → the page, pt, y down), area: [x0, y0, x1, y1] (the document region the page prints), trim: [x0, y0, x1, y1] (the artboard on the page; with copies per sheet, the box around every copy's), copies?: [[x0, y0, x1, y1]…] (copies per sheet: each copy's artboard on the page, across then down)}] (one copy, in order), tiles: [{artboard, columns, rows, printed: [1-based tiles], tiles: [[x0, y0, x1, y1]…] (document space)}], inks: [{name, spot, print, frequency, angle}] (separations), warnings (art larger than the imageable area, type that prints in the fallback font, type that doesn't fit its frame, options not applied yet…), settings} without printing", + "{preset?: name (as print.setup's: its settings instead of the document's), settings?: {…settings of print.setup} (over the document's or the preset's)} → {pages (copies included), sheets: [{artboard (0-based; null with artboards ignored), tile? (1-based), ink? (separations), width, height (pt, the page), orientation, scale: [width %, height %], transform: [a, b, c, d, e, f] (document space → the page, pt, y down), area: [x0, y0, x1, y1] (the document region the page prints), trim: [x0, y0, x1, y1] (the artboard on the page; with copies per sheet, the box around every copy's), copies?: [[x0, y0, x1, y1]…] (copies per sheet: each copy's artboard on the page, across then down)}] (one copy, in order), tiles: [{artboard, columns, rows, printed: [1-based tiles], tiles: [[x0, y0, x1, y1]…] (document space)}], inks: [{name, spot, print, frequency, angle}] (separations: the plates), documentInks: [{name, spot, print, frequency, angle, convertToProcess?: true (a spot ink printing as process, with no plate)}] (separations: every ink of the document), warnings (art larger than the imageable area, type that prints in the fallback font, type that doesn't fit its frame, options not applied yet…), settings} without printing", has_doc, preview ), diff --git a/crates/engine/src/cmd/rasterfx/report.rs b/crates/engine/src/cmd/rasterfx/report.rs index f26db6db68..90f2ad2771 100644 --- a/crates/engine/src/cmd/rasterfx/report.rs +++ b/crates/engine/src/cmd/rasterfx/report.rs @@ -66,11 +66,13 @@ impl FlattenReport { lowest .into_iter() .map(|r| { - let name = r.name.map(|name| format!(" ({name})")).unwrap_or_default(); - format!( - "raster effects on object {}{name}: requested {:.1} ppi, achieved {:.1} ppi due to the 64 million pixel cap", - r.id.0, self.requested_ppi, r.achieved_ppi - ) + // The id and the name are one value of the message, so a catalog can match it. + let object = match r.name { + Some(name) => format!("{} ({name})", r.id.0), + None => r.id.0.to_string(), + }; + let (requested, achieved) = (self.requested_ppi, r.achieved_ppi); + format!("raster effects on object {object}: requested {requested:.1} ppi, achieved {achieved:.1} ppi due to the 64 million pixel cap") }) .collect() } @@ -127,4 +129,23 @@ mod tests { assert_eq!(warnings.len(), 1); assert!(warnings[0].contains(&format!("object {}", original.id.0)), "{:?}", warnings); } + + #[test] + fn a_warning_names_the_object_by_its_id_and_its_name() { + let mut doc = Document::new(100.0, 100.0); + doc.raster_effects_ppi = 300.0; + let mut named = Node::group(NodeId(7), vec![]); + named.name = Some("Logo".into()); + let unnamed = Node::group(NodeId(8), vec![]); + let mut report = FlattenReport::new(Which::All, &doc); + report.record(&named, &image(72.0)); + report.record(&unnamed, &image(150.0)); + assert_eq!( + report.warnings(), + [ + "raster effects on object 7 (Logo): requested 300.0 ppi, achieved 72.0 ppi due to the 64 million pixel cap", + "raster effects on object 8: requested 300.0 ppi, achieved 150.0 ppi due to the 64 million pixel cap", + ] + ); + } } diff --git a/crates/engine/src/cmd/webexport.rs b/crates/engine/src/cmd/webexport.rs index 078391d5b7..c6764cddb4 100644 --- a/crates/engine/src/cmd/webexport.rs +++ b/crates/engine/src/cmd/webexport.rs @@ -45,6 +45,15 @@ pub fn specs() -> Vec { has_doc, preview ), + cmd!( + query "webExport.optimizeToFileSize", + "Optimize to File Size", + [], + None, + "{desiredK: the desired file size in K (1024 bytes; above 0, at most 1048576), startWith?: current (default: the format given, its JPEG quality or GIF/PNG-8 colors lowered; GIF then takes lossy 100)|auto (GIF for art with transparency or at most 256 colors (blended over the matte without transparency), else JPEG; the other one when the first can't reach the size and the art is opaque), use?: allSlices (default: the image, or the image slices' files together)|eachSlice (every image slice's file)|currentSlice (the `slice` given, else the selected image slice, else the first), slice?: n (1-based, from slice.list), preset?, …the settings of document.exportForWeb} the settings whose files fit in the size, searched by encoding at most 32 trial settings (each one encodes every image it measures); slices share one setting, which every scope changes → {targetBytes, achieved (false: no setting tried fits, and settings are the smallest one found), bytes (as use measures them), format, settings, trials, images, warnings}; writes nothing and changes no remembered setting", + has_doc, + optimize_to_file_size + ), cmd!( query "webExport.settings", "Save for Web Settings", @@ -1054,6 +1063,297 @@ fn preview(s: &mut Session, p: &Value) -> Result { Ok(out) } +// ---------- Optimize to File Size ---------- + +/// The most trial settings `webExport.optimizeToFileSize` encodes. Each trial encodes every image +/// it measures once. +pub const OPTIMIZE_TRIALS: usize = 32; +/// The largest desired file size, in K (1 GiB). +pub const MAX_DESIRED_K: f64 = 1_048_576.0; + +/// Where Optimize to File Size starts. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub enum StartWith { + /// The current format, with its JPEG quality or palette colors lowered. + Current, + /// GIF or JPEG, by the image's content. + Auto, +} + +/// The pixels `px` (`[x0, y0, x1, y1]`) of `r` as an image: borrowed when `px` is the whole render, +/// else a copy. +fn file_pixels(r: &WebRender, px: [u32; 4]) -> std::borrow::Cow<'_, [u8]> { + if px == [0, 0, r.width, r.height] { std::borrow::Cow::Borrowed(r.rgba.as_slice()) } else { std::borrow::Cow::Owned(crop(r, px)) } +} + +/// The settings Optimize to File Size found. +#[derive(Clone, Debug)] +pub struct SizeFit { + pub settings: WebSettings, + /// The size the settings give the measured images. + pub bytes: usize, + /// Whether `bytes` is within the target. + pub achieved: bool, + /// The trial settings encoded. + pub trials: usize, +} + +/// The files a search measures and the trials it has left. +struct Trials<'a> { + doc: &'a Document, + r: &'a WebRender, + /// The pixels (`[x0, y0, x1, y1]`) of each file in `r`. + files: &'a [[u32; 4]], + /// Measure the largest file (else the files together). + each: bool, + left: usize, + used: usize, +} + +impl Trials<'_> { + /// The size `s` gives the files, encoded one at a time; `None` when no trial is left. + fn size(&mut self, s: &WebSettings) -> std::result::Result, String> { + if self.left == 0 { + return Ok(None); + } + self.left -= 1; + self.used += 1; + let mut out = 0usize; + for &px in self.files { + let n = optimize(self.doc, &file_pixels(self.r, px), px[2] - px[0], px[3] - px[1], s)?.bytes.len(); + out = if self.each { out.max(n) } else { out.saturating_add(n) }; + } + Ok(Some(out)) + } +} + +/// `(settings, bytes)` of a trial. +pub type Trial = (WebSettings, usize); + +/// Keep `(s, n)` in `smallest` when it is the smallest trial so far. +fn keep_smallest(smallest: &mut Option, s: WebSettings, n: usize) { + if smallest.as_ref().is_none_or(|(_, b)| n < *b) { + *smallest = Some((s, n)); + } +} + +/// The values [`highest_within`] measures spread over its range before it narrows a step. +pub const OPTIMIZE_SAMPLES: u16 = 6; + +/// Measures the size a setting gives; `None` when no trial is left. +pub type MeasureSize<'a> = dyn FnMut(&WebSettings) -> std::result::Result, String> + 'a; + +/// The highest value in `lo..hi` that `set` gives `start` whose size is within `target`, when the +/// value `hi` is over it. A lower value can give a larger file, so the search measures up to +/// [`OPTIMIZE_SAMPLES`] values spread over the range, from `hi - 1` down, stops at the first that +/// fits, and halves the step between it and the measured value above it, keeping the highest value +/// measured within `target`. `None` when no value measured fits or no trial is left; the trials over +/// the target go to `smallest`. +pub fn highest_within( + size: &mut MeasureSize, + start: &WebSettings, + (lo, hi): (u16, u16), + set: fn(&mut WebSettings, u16), + target: usize, + smallest: &mut Option, +) -> std::result::Result, String> { + let with = |v: u16| { + let mut s = start.clone(); + set(&mut s, v); + s + }; + if lo >= hi { + return Ok(None); + } + let span = u32::from(hi - lo); + let samples = u32::from(OPTIMIZE_SAMPLES).min(span); + let (mut above, mut found) = (hi, None); + for i in (0..samples).rev() { + let step = if samples == 1 { 0 } else { (span - 1) * i / (samples - 1) }; + let v = lo.saturating_add(u16::try_from(step).unwrap_or(0)); + let s = with(v); + let Some(n) = size(&s)? else { return Ok(None) }; + if n <= target { + found = Some((v, (s, n))); + break; + } + keep_smallest(smallest, s, n); + above = v; + } + let Some((mut lo, mut best)) = found else { return Ok(None) }; + let mut hi = above; + while hi - lo > 1 { + let mid = lo + (hi - lo) / 2; + let s = with(mid); + let Some(n) = size(&s)? else { break }; + if n <= target { + lo = mid; + best = (s, n); + } else { + keep_smallest(smallest, s, n); + hi = mid; + } + } + Ok(Some(best)) +} + +/// Sets the JPEG quality, for [`highest_within`]. +pub fn set_quality(s: &mut WebSettings, v: u16) { + s.quality = u8::try_from(v).unwrap_or(100); +} + +/// Sets the palette colors, for [`highest_within`]. +pub fn set_colors(s: &mut WebSettings, v: u16) { + s.colors = v; +} + +/// The best settings of `start`'s format within `target`: `start` when it fits, else the highest +/// JPEG quality or the most palette colors [`highest_within`] finds that fit, and for GIF, when none +/// is found, lossy 100 with the most colors that fit. When nothing tried fits, the smallest trial, not achieved. +/// `None` when no trial is left. +fn search_format(t: &mut Trials, start: &WebSettings, target: usize) -> std::result::Result, String> { + let fit = |(settings, bytes): Trial, achieved: bool| SizeFit { settings, bytes, achieved, trials: 0 }; + let Some(n) = t.size(start)? else { return Ok(None) }; + if n <= target { + return Ok(Some(fit((start.clone(), n), true))); + } + let mut smallest = Some((start.clone(), n)); + let found = match start.format { + WebFormat::Jpg => highest_within(&mut |s: &WebSettings| t.size(s), start, (1, u16::from(start.quality)), set_quality, target, &mut smallest)?, + WebFormat::Gif | WebFormat::Png8 => { + match highest_within(&mut |s: &WebSettings| t.size(s), start, (2, start.colors), set_colors, target, &mut smallest)? { + None if start.format == WebFormat::Gif && start.lossy < 100 => { + let lossy = WebSettings { lossy: 100, ..start.clone() }; + match t.size(&lossy)? { + Some(n) if n <= target => Some((lossy, n)), + Some(n) => { + keep_smallest(&mut smallest, lossy.clone(), n); + highest_within(&mut |s: &WebSettings| t.size(s), &lossy, (2, lossy.colors), set_colors, target, &mut smallest)? + } + None => None, + } + } + found => found, + } + } + WebFormat::Png24 => None, + }; + Ok(match (found, smallest) { + (Some(f), _) => Some(fit(f, true)), + (None, Some(s)) => Some(fit(s, false)), + (None, None) => None, + }) +} + +/// The format Auto Select GIF/JPEG starts with, and whether the files (`[x0, y0, x1, y1]` of `r`) +/// are opaque: GIF for files with transparent pixels (when `transparency` keeps them) or at most +/// 256 colors, else JPEG. The colors counted are the ones the files are written with: without +/// `transparency`, the pixels blended over `matte`. +fn auto_format(r: &WebRender, files: &[[u32; 4]], transparency: bool, matte: [u8; 3]) -> (WebFormat, bool) { + let stride = r.width as usize * 4; + let row = + move |y: u32, x0: u32, x1: u32| r.rgba.get(y as usize * stride + x0 as usize * 4..y as usize * stride + x1 as usize * 4).unwrap_or_default(); + let pixels = || files.iter().flat_map(move |&[x0, y0, x1, y1]| (y0..y1).flat_map(move |y| row(y, x0, x1).as_chunks::<4>().0.iter())); + let opaque = !transparency || pixels().all(|p| p[3] == 255); + if !opaque { + return (WebFormat::Gif, false); + } + let mut seen = HashSet::new(); + // An opaque pixel blends to itself. + let few = pixels().all(|p| { + seen.insert(flatten(p, matte).next().unwrap_or_default()); + seen.len() <= 256 + }); + (if few { WebFormat::Gif } else { WebFormat::Jpg }, true) +} + +/// Optimize to File Size: the settings, from `s`, whose files (the pixels `[x0, y0, x1, y1]` of +/// `r`) fit in `target` bytes, measured together, or with `each` the largest one. At most +/// [`OPTIMIZE_TRIALS`] trial settings are encoded, and a trial encodes the files one at a time. +pub fn optimize_to_size( + doc: &Document, + r: &WebRender, + files: &[[u32; 4]], + s: &WebSettings, + start: StartWith, + each: bool, + target: usize, +) -> std::result::Result { + let mut t = Trials { doc, r, files, each, left: OPTIMIZE_TRIALS, used: 0 }; + let with = |format: WebFormat| WebSettings { format, ..s.clone() }; + let found = match start { + _ if files.is_empty() => None, + StartWith::Current => search_format(&mut t, s, target)?, + StartWith::Auto => { + let (first, opaque) = auto_format(r, files, s.transparency, s.matte_rgb()?.unwrap_or([255; 3])); + let other = if first == WebFormat::Gif { WebFormat::Jpg } else { WebFormat::Gif }; + match search_format(&mut t, &with(first), target)? { + Some(a) if !a.achieved && opaque => match search_format(&mut t, &with(other), target)? { + Some(b) if b.achieved || b.bytes < a.bytes => Some(b), + _ => Some(a), + }, + a => a, + } + } + }; + let mut best = found.ok_or("Optimize to File Size: there is no image to measure")?; + best.trials = t.used; + Ok(best) +} + +fn optimize_to_file_size(s: &mut Session, p: &Value) -> Result { + const O: &str = "webExport.optimizeToFileSize"; + let k = p + .get("desiredK") + .and_then(Value::as_f64) + .filter(|k| k.is_finite() && *k > 0.0 && *k <= MAX_DESIRED_K) + .ok_or_else(|| bad(O, "give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576"))?; + let target = ((k * 1024.0).floor() as usize).max(1); + let start = match p.get("startWith").map(Value::as_str) { + None | Some(Some("current")) => StartWith::Current, + Some(Some("auto")) => StartWith::Auto, + Some(_) => return Err(bad(O, "`startWith` is `current` or `auto`")), + }; + let scope = match p.get("use").map(Value::as_str) { + None if p.get("slice").is_some() => "currentSlice", + None => "allSlices", + Some(Some(u @ ("allSlices" | "eachSlice" | "currentSlice"))) => u, + Some(_) => return Err(bad(O, "`use` is `allSlices`, `eachSlice` or `currentSlice`")), + }; + let slice = match p.get("slice").map(|v| v.as_u64().filter(|n| *n >= 1 && scope == "currentSlice")) { + None => None, + Some(Some(n)) => Some(n), + Some(None) => return Err(bad(O, "`slice` is a slice number from `slice.list`, with `use: currentSlice`")), + }; + let settings = s.web_settings(p).map_err(|e| bad(O, e))?; + let st = s.doc()?; + let doc = &st.doc; + let failed = vectorcraft_render::decode_failures(); + let r = render(doc, &settings).map_err(|e| bad(O, e))?; + let warnings = undecoded(failed); + let areas = doc.slice_layout(); + let selected = super::slices::selected_slices(doc, &st.selection); + let cells = cells(&areas, &selected, &settings, &r).map_err(|e| bad(O, e))?; + let image_cells: Vec<&Cell> = + cells.iter().filter(|c| c.area.id.and_then(|id| doc.slice_options(id)).is_none_or(|o| o.kind == SliceKind::Image)).collect(); + let picked: Vec<&Cell> = match (scope, slice) { + ("currentSlice", Some(n)) => { + let c = image_cells.iter().find(|c| c.area.number as u64 == n); + vec![*c.ok_or_else(|| bad(O, format!("no slice {n} in the image (see slice.list)")))?] + } + ("currentSlice", None) => { + image_cells.iter().find(|c| c.area.id.is_some_and(|id| selected.contains(&id))).or(image_cells.first()).copied().into_iter().collect() + } + _ => image_cells, + }; + let files: Vec<[u32; 4]> = if cells.is_empty() { vec![[0, 0, r.width, r.height]] } else { picked.iter().map(|c| c.px).collect() }; + let fit = optimize_to_size(doc, &r, &files, &settings, start, scope == "eachSlice", target).map_err(|e| bad(O, e))?; + Ok(json!({ + "targetBytes": target, "achieved": fit.achieved, "bytes": fit.bytes, "format": fit.settings.format.id(), + "settings": fit.settings.to_json(), "trials": fit.trials, "images": files.len(), "warnings": warnings, + })) +} + fn settings(s: &mut Session, p: &Value) -> Result { const S: &str = "webExport.settings"; let base = if bool_or(p, "reset", false) { WebSettings::default() } else { s.last_web_settings() }; diff --git a/crates/engine/src/tests.rs b/crates/engine/src/tests.rs index 2b711976ef..e6c622963a 100644 --- a/crates/engine/src/tests.rs +++ b/crates/engine/src/tests.rs @@ -3313,6 +3313,26 @@ fn flare_ring_seed_moves_only_the_rings() { assert_eq!(s.doc().unwrap().history.undo.len(), undo); } +#[test] +fn flare_small_ring_seeds_spread_the_first_ring_along_the_path() { + let mut s = session(); + let mut positions = Vec::new(); + for seed in [0, 1, 2, 5, 11, (1u64 << 53) - 1] { + 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 NodeKind::Group { children, .. } = &s.doc().unwrap().doc.node(id).unwrap().kind else { panic!("flare is a group") }; + let ring = children.iter().find(|n| n.name.as_deref() == Some("Ring")).unwrap(); + let center = ring.geometric_bounds().unwrap().center(); + assert!((20.0..=1020.0).contains(¢er.x), "seed {seed}: {center:?}"); + assert!((center.y - 30.0).abs() < 1e-9); + positions.push(center.x); + } + assert!((positions[0] - positions[1]).abs() > 1.0, "neighboring small seeds visibly move the first ring: {positions:?}"); + let lo = positions[..5].iter().copied().fold(f64::INFINITY, f64::min); + let hi = positions[..5].iter().copied().fold(f64::NEG_INFINITY, f64::max); + assert!(hi - lo > 250.0, "small seeds spread the first ring along the path: {positions:?}"); +} + /// `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/draw2.rs b/crates/engine/src/tests/draw2.rs index 6c823f8aeb..f4af510230 100644 --- a/crates/engine/src/tests/draw2.rs +++ b/crates/engine/src/tests/draw2.rs @@ -86,8 +86,57 @@ fn blob_tip_zero_and_invalid_values_are_safe() { p[key] = value; assert!(s.execute("path.blob", &p).is_err(), "{key}: {p}"); } - s.execute("path.blob", &json!({"points": [[100, 200], [300, 200]], "angle": 1e300, "roundness": -1e300, "merge": false})).unwrap(); - assert!(paths(&s)[1].1.control_bounds().unwrap().height().is_finite()); + let stroke = json!({"points": [[100, 200], [300, 200]], "merge": false}); + refuses_with(&mut s, "path.blob", &with(&stroke, json!({"angle": 1e300})), "`angle` must be from -180 to 180 degrees"); + refuses_with(&mut s, "path.blob", &with(&stroke, json!({"roundness": -1e300})), "`roundness` must be from 0 to 100%"); + assert_eq!(paths(&s).len(), 1); +} + +/// `path.blob` refuses an `angle`, `roundness` or `fidelity` outside its range and changes nothing; +/// each end of a range paints, and a key left out or null takes its default (0°, 100% and no fitting). +#[test] +fn blob_brush_rejects_out_of_range_tip_and_fidelity_without_edit() { + let mut s = session(); + let stroke = json!({"points": [[100, 100], [300, 100]], "size": 20, "merge": false}); + let angle = "`angle` must be from -180 to 180 degrees"; + let roundness = "`roundness` must be from 0 to 100%"; + let fidelity = "`fidelity` must be from 0.01 to 100 pt"; + for (extra, want) in [ + (json!({"angle": -180.5}), angle), + (json!({"angle": 181}), angle), + (json!({"angle": 1e300}), angle), + (json!({"roundness": -0.5}), roundness), + (json!({"roundness": 101}), roundness), + (json!({"fidelity": 0.005}), fidelity), + (json!({"fidelity": 0}), fidelity), + (json!({"fidelity": -1}), fidelity), + (json!({"fidelity": 101}), fidelity), + (json!({"fidelity": 1e300}), fidelity), + (json!({"angle": 45, "roundness": 50, "fidelity": 100.5}), fidelity), + ] { + refuses_with(&mut s, "path.blob", &with(&stroke, extra), want); + } + assert!(paths(&s).is_empty()); + let painted = |s: &mut Session, extra: serde_json::Value| { + let id = NodeId(s.execute("path.blob", &with(&stroke, extra)).unwrap()["id"].as_u64().unwrap()); + path(s, id) + }; + for extra in [ + json!({"angle": -180}), + json!({"angle": 180}), + json!({"roundness": 0}), + json!({"roundness": 100}), + json!({"fidelity": 0.01}), + json!({"fidelity": 100}), + ] { + let pd = painted(&mut s, extra.clone()); + assert!(pd.control_bounds().is_some_and(|b| b.height().is_finite() && b.height() > 0.0), "{extra}: {pd:?}"); + } + let defaults = painted(&mut s, json!({})); + let nulls = painted(&mut s, json!({"angle": null, "roundness": null, "fidelity": null})); + let given = painted(&mut s, json!({"angle": 0, "roundness": 100})); + assert_eq!(nulls, defaults); + assert_eq!(given, defaults); } #[test] @@ -330,6 +379,41 @@ fn pencil_connect_keeps_the_rest_of_a_compound_path_and_refuses_the_extended_pat assert!(s.execute("path.freehand", &json!({"points": points, "extend": {"id": a.0}, "connect": {"id": a.0}})).is_err()); } +/// `path.freehand` refuses a `style` other than "pencil" or "brush" and an `extend` end other than +/// "start" or "end" and changes nothing; left out or null, the style is "pencil" and the stroke +/// continues the path from its end. +#[test] +fn pencil_refuses_an_unknown_style_or_extend_end() { + let mut s = session(); + let a = line(&mut s, 100.0, 100.0, 200.0, 100.0); + let stroke = json!({"points": [[100, 300], [200, 320], [300, 300]]}); + for style in [json!("calligraphic"), json!("Brush"), json!(""), json!(1), json!(true)] { + refuses_with(&mut s, "path.freehand", &with(&stroke, json!({ "style": style })), "style must be \"pencil\" or \"brush\""); + } + let from_end = json!({"points": [[200, 100], [250, 150], [300, 100]]}); + for end in [json!("middle"), json!("START"), json!(""), json!(0), json!(false)] { + let p = with(&from_end, json!({"extend": {"id": a.0, "end": end}})); + refuses_with(&mut s, "path.freehand", &p, "extend end must be \"start\" or \"end\""); + } + assert_eq!((paths(&s).len(), path(&s, a).anchor_count()), (1, 2), "refused: nothing changed"); + for style in [json!("pencil"), json!("brush"), json!(null)] { + s.execute("path.freehand", &with(&stroke, json!({ "style": style }))).unwrap(); + } + assert_eq!(paths(&s).len(), 4); + for end in [json!(null), json!("end")] { + let mut s = session(); + let a = line(&mut s, 100.0, 100.0, 200.0, 100.0); + s.execute("path.freehand", &with(&from_end, json!({"extend": {"id": a.0, "end": end}}))).unwrap(); + let sp = &path(&s, a).subpaths[0]; + assert_eq!((sp.anchors[0].p, sp.anchors[sp.anchors.len() - 1].p), (Point::new(100.0, 100.0), Point::new(300.0, 100.0)), "{end}"); + } + let mut s = session(); + let a = line(&mut s, 100.0, 100.0, 200.0, 100.0); + s.execute("path.freehand", &json!({"points": [[100, 100], [50, 150], [0, 100]], "extend": {"id": a.0, "end": "start"}})).unwrap(); + let ends: Vec = path(&s, a).subpaths[0].anchors.iter().map(|x| x.p).collect(); + assert!(ends.contains(&Point::new(0.0, 100.0)) && ends.contains(&Point::new(200.0, 100.0)), "continued from its start: {ends:?}"); +} + /// With Keep selected off, a compound path whose direct-selected anchors all lie on the subpath /// that connect joins on is no longer selected, and Delete then has nothing to delete. #[test] diff --git a/crates/engine/src/tests/print.rs b/crates/engine/src/tests/print.rs index e2ea85d54f..140fb1aaa0 100644 --- a/crates/engine/src/tests/print.rs +++ b/crates/engine/src/tests/print.rs @@ -391,3 +391,21 @@ fn for_a_printer_a_landscape_page_is_written_upright() { assert_eq!(size(&spooled), [(612.0, 792.0)]); assert_eq!(v["pages"], 1); } + +#[test] +fn a_spot_ink_converted_to_process_is_saved_and_listed_without_a_plate() { + let (mut s, _) = session(); + s.execute("swatch.new", &json!({"name": "Gold", "color": {"model": "cmyk", "c": 0, "m": 0.2, "y": 0.8, "k": 0.1}, "spot": true})).unwrap(); + let ink = json!({"name": "Gold", "convertToProcess": true}); + let v = s.execute("print.setup", &json!({"settings": {"output": {"mode": "separations", "inks": [ink]}}})).unwrap(); + assert_eq!(v["settings"]["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": true}])); + let doc = &s.doc().unwrap().doc; + let back = vectorcraft_format::load(&vectorcraft_format::save(doc, false)).unwrap(); + assert_eq!(back.print_setup.as_ref().map(|p| p["output"]["inks"][0]["convertToProcess"].clone()), Some(json!(true)), "kept in the file"); + let pv = s.execute("print.preview", &json!({})).unwrap(); + let names = |list: &Value| list.as_array().unwrap().iter().map(|i| i["name"].as_str().unwrap().to_string()).collect::>(); + assert_eq!(names(&pv["inks"]), ["Cyan", "Magenta", "Yellow", "Black"], "no Gold plate"); + assert_eq!(names(&pv["documentInks"]), ["Cyan", "Magenta", "Yellow", "Black", "Gold"]); + assert_eq!(pv["documentInks"][4]["convertToProcess"], json!(true)); + assert_eq!(pv["documentInks"][0].get("convertToProcess"), None, "written only when on"); +} diff --git a/crates/engine/src/tests/typescale.rs b/crates/engine/src/tests/typescale.rs index f96193a6c4..9aa287f601 100644 --- a/crates/engine/src/tests/typescale.rs +++ b/crates/engine/src/tests/typescale.rs @@ -369,3 +369,129 @@ fn scale_text_attributes_keeps_tracked_type_where_it_was() { assert!((*a - *b).hypot() < 1e-6, "{before:?} {after:?}"); } } + +/// What Scale Text Attributes must leave as it was: the document-space bounds of an area's frame +/// or a path type's path, each line's text, whether the text overflows, and where each glyph +/// starts on the page. +struct Placed { + outline: Option, + lines: Vec<(usize, usize)>, + overflow: bool, + pens: Vec, +} + +fn placed(s: &Session, id: NodeId) -> Placed { + let t = text(s, id); + let lay = vectorcraft_text::layout(vectorcraft_text::FontDb::global(), &t); + let outline = match &t.kind { + vectorcraft_doc::TextKind::Area { frame } => Some(frame), + vectorcraft_doc::TextKind::OnPath { path, .. } => Some(path), + vectorcraft_doc::TextKind::Point => None, + }; + Placed { + outline: outline.and_then(|p| p.transformed(t.xf).bounds()), + lines: lay.lines.iter().map(|l| (l.start, l.end)).collect(), + overflow: lay.overflow, + pens: lay.glyphs.iter().map(|g| t.xf * (g.xf * Point::ZERO)).collect(), + } +} + +fn same_place(before: &Placed, after: &Placed) { + let (Some(b), Some(a)) = (before.outline, after.outline) else { panic!("no frame or path: {:?} {:?}", before.outline, after.outline) }; + for (x, y) in [(b.x0, a.x0), (b.y0, a.y0), (b.x1, a.x1), (b.y1, a.y1)] { + assert!((x - y).abs() < 1e-6, "frame {b:?} became {a:?}"); + } + assert_eq!(after.lines, before.lines, "line breaks"); + assert_eq!(after.overflow, before.overflow, "overflow"); + assert_eq!(before.pens.len(), after.pens.len()); + for (b, a) in before.pens.iter().zip(&after.pens) { + assert!((*a - *b).hypot() < 1e-6, "{:?} {:?}", before.pens, after.pens); + } +} + +/// #8297: Scale Text Attributes on scaled area type keeps the frame the scale gave it, so the +/// lines break where they did and no text becomes overset. It used to leave the frame at its +/// unscaled size, which then held two lines of the larger type and hid the rest. +#[test] +fn scale_text_attributes_keeps_an_area_frame_and_its_lines() { + for (sx, sy, size) in [(200, 200, 24.0), (200, 100, 12.0), (50, 50, 6.0)] { + let mut s = session(); + let id = NodeId( + s.execute( + "text.create", + &json!({"x": 40, "y": 60, "size": 12, "area": {"width": 120, "height": 80}, "text": "Bright river stones mark a gentle path past old trees."}), + ) + .unwrap()["id"] + .as_u64() + .unwrap(), + ); + s.execute("object.scale", &json!({"sx": sx, "sy": sy, "origin": [0, 0]})).unwrap(); + let before = placed(&s, id); + assert!(before.lines.len() >= 3 && !before.overflow, "{sx}x{sy}: {:?}", before.lines); + s.execute("type.scaleTextAttributes", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, size); + same_place(&before, &placed(&s, id)); + if (sx, sy) == (200, 200) { + let f = before.outline.unwrap(); + assert_eq!((f.x0.round(), f.y0.round(), f.x1.round(), f.y1.round()), (80.0, 120.0, 320.0, 280.0)); + } + s.execute("edit.undo", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, 12.0); + same_place(&before, &placed(&s, id)); + s.execute("edit.redo", &json!({})).unwrap(); + same_place(&before, &placed(&s, id)); + } +} + +/// Type on a path keeps its path: it used to shrink with the scale removed, so the type ran past +/// its end. +#[test] +fn scale_text_attributes_keeps_a_path_types_path() { + let mut s = session(); + let pid = s.execute("path.create", &json!({ "d": "M100 300 L300 300" })).unwrap()["id"].as_u64().unwrap(); + let id = NodeId( + s.execute("text.createInPath", &json!({"path": pid, "mode": "onPath", "text": "Along the way", "size": 12, "at": [100, 300]})).unwrap()["id"] + .as_u64() + .unwrap(), + ); + s.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + s.execute("object.scale", &json!({"sx": 200, "origin": [0, 0]})).unwrap(); + let before = placed(&s, id); + assert!(!before.overflow); + s.execute("type.scaleTextAttributes", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, 24.0); + same_place(&before, &placed(&s, id)); +} + +/// A non-uniform scale on type on a path: only the uniform part is baked and the stretch stays in +/// the transform, so the brackets, which sit at fractions of the path's length, stay where they +/// were. Baking the stretch into the path would move them: on this path, scaled 3 × 2, the length +/// grows from 200 to 500 and not in proportion, so the same fraction lands elsewhere. +#[test] +fn scale_text_attributes_keeps_path_type_on_a_stretched_path_where_it_was() { + let mut s = session(); + let pid = s.execute("path.create", &json!({ "d": "M0 0 L100 0 L100 100" })).unwrap()["id"].as_u64().unwrap(); + let id = NodeId( + s.execute("text.createInPath", &json!({"path": pid, "mode": "onPath", "text": "Corner", "size": 12, "at": [60, 0]})).unwrap()["id"] + .as_u64() + .unwrap(), + ); + s.execute("select.set", &json!({"ids": [id.0]})).unwrap(); + s.execute("object.scale", &json!({"sx": 300, "sy": 200, "origin": [0, 0]})).unwrap(); + let before = placed(&s, id); + let brackets = |s: &Session| match text(s, id).kind { + vectorcraft_doc::TextKind::OnPath { start, end, .. } => (start, end), + k => panic!("not path type: {k:?}"), + }; + let before_brackets = brackets(&s); + s.execute("type.scaleTextAttributes", &json!({})).unwrap(); + near(text(&s, id).runs[0].style.size, 24.0); + near(text(&s, id).runs[0].style.h_scale, 100.0); + let left = text(&s, id).style_scale().unwrap(); + near(left.points, 1.0); + near(left.horizontal, 1.5); + assert_eq!(brackets(&s), before_brackets); + same_place(&before, &placed(&s, id)); + // Only the stretch is left: there is nothing more to bake. + assert!(s.execute("type.scaleTextAttributes", &json!({})).is_err()); +} diff --git a/crates/engine/src/tests/webexport.rs b/crates/engine/src/tests/webexport.rs index ccd20e119c..a731e51aca 100644 --- a/crates/engine/src/tests/webexport.rs +++ b/crates/engine/src/tests/webexport.rs @@ -523,3 +523,215 @@ fn setting_keys_are_their_json_values() { .unwrap(); assert_eq!(serde_json::from_value::(custom.to_json()).unwrap(), custom); } + +fn optimize_to(s: &mut Session, p: Value) -> Value { + run(s, "webExport.optimizeToFileSize", p) +} + +/// The size of the file the settings `p` write (the whole image, or slice `slice`). +fn written(s: &mut Session, p: &Value) -> usize { + run(s, "document.exportForWeb.preview", p.clone())["bytes"].as_u64().unwrap() as usize +} + +/// 20×20: 400 one-point squares of different colors (more than a palette holds). +fn photo_like() -> Session { + let mut s = session(20.0, 20.0); + for i in 0..400 { + let (x, y) = ((i % 20) as f64, (i / 20) as f64); + rect(&mut s, [x, y, 1.0, 1.0], &format!("#{:02x}{:02x}{:02x}", (i % 20) * 12, (i / 20) * 12, (i * 7) % 256)); + } + s +} + +#[test] +fn optimize_to_file_size_takes_the_highest_jpeg_quality_that_fits() { + let mut s = many_colours(); + let start = json!({"format": "jpg", "quality": 90}); + let full = written(&mut s, &start); + let k = (full * 3 / 4) as f64 / 1024.0; + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": k}))); + let target = r["targetBytes"].as_u64().unwrap() as usize; + assert_eq!(target, (k * 1024.0).floor() as usize); + assert_eq!((r["achieved"].as_bool(), r["format"].as_str(), r["images"].as_u64()), (Some(true), Some("jpg"), Some(1)), "{r}"); + let q = r["settings"]["quality"].as_u64().unwrap(); + assert!(q < 90, "{r}"); + let bytes = r["bytes"].as_u64().unwrap() as usize; + assert!(bytes <= target, "{r}"); + // The size is the size of the file Save writes with the settings. + assert_eq!(written(&mut s, &r["settings"]), bytes); + assert_eq!(one(&mut s, r["settings"].clone()).len(), bytes); + // One quality step up is over the size. + assert!(written(&mut s, &merge(&r["settings"], json!({"quality": q + 1}))) > target); + assert!(r["trials"].as_u64().unwrap() as usize <= cmd::webexport::OPTIMIZE_TRIALS); + // The other settings stay. + assert_eq!(r["settings"]["matte"], json!("white")); + assert_eq!(r["settings"]["metadata"], json!("copyright")); +} + +#[test] +fn optimize_to_file_size_lowers_palette_colors() { + let mut s = many_colours(); + for format in ["gif", "png8"] { + let start = json!({"format": format, "dither": "none", "colors": 128}); + let full = written(&mut s, &start); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (full * 3 / 4) as f64 / 1024.0}))); + let target = r["targetBytes"].as_u64().unwrap() as usize; + assert_eq!((r["achieved"].as_bool(), r["format"].as_str()), (Some(true), Some(format)), "{r}"); + let colors = r["settings"]["colors"].as_u64().unwrap(); + assert!(colors < 64, "{format}: {r}"); + assert_eq!((r["settings"]["lossy"].as_u64(), r["settings"]["dither"].as_str()), (Some(0), Some("none")), "{format}: {r}"); + let bytes = r["bytes"].as_u64().unwrap() as usize; + assert!(bytes <= target && written(&mut s, &r["settings"]) == bytes, "{format}: {r}"); + assert!(written(&mut s, &merge(&r["settings"], json!({"colors": colors + 1}))) > target, "{format}: {r}"); + } +} + +#[test] +fn optimize_to_file_size_auto_selects_gif_or_jpeg_by_content() { + // Flat, opaque art: GIF, from a JPEG start. + let mut flat = two_colours(); + let r = optimize_to(&mut flat, json!({"format": "jpg", "desiredK": 100, "startWith": "auto"})); + assert_eq!((r["format"].as_str(), r["achieved"].as_bool()), (Some("gif"), Some(true)), "{r}"); + // More colors than a palette holds: JPEG, from a GIF start. + let mut photo = photo_like(); + let r = optimize_to(&mut photo, json!({"format": "gif", "desiredK": 100, "startWith": "auto"})); + assert_eq!((r["format"].as_str(), r["achieved"].as_bool()), (Some("jpg"), Some(true)), "{r}"); + // Transparent pixels: GIF, which keeps them. + let mut clear = session(40.0, 30.0); + rect(&mut clear, [0.0, 0.0, 10.0, 10.0], "#000000"); + for (k, transparency, format) in [(100.0, true, "gif"), (100.0, false, "gif"), (0.01, true, "gif")] { + let r = optimize_to(&mut clear, json!({"format": "jpg", "desiredK": k, "startWith": "auto", "transparency": transparency})); + assert_eq!(r["format"].as_str(), Some(format), "{k} {transparency}: {r}"); + } + // The current format stays without auto. + let r = optimize_to(&mut photo, json!({"format": "png8", "desiredK": 100})); + assert_eq!(r["format"].as_str(), Some("png8")); +} + +#[test] +fn optimize_to_file_size_auto_counts_the_colors_blended_over_the_matte() { + // Three colors at 100 opacities: without transparency, 300 colors once blended over the matte. + let mut s = session(20.0, 15.0); + for i in 0..300 { + let (x, y) = ((i % 20) as f64, (i / 20) as f64); + let id = rect(&mut s, [x, y, 1.0, 1.0], ["#000000", "#ff0000", "#0000ff"][i % 3]); + run(&mut s, "transparency.set", json!({"ids": [id], "opacity": i / 3 + 1})); + } + let r = optimize_to(&mut s, json!({"format": "gif", "desiredK": 100, "startWith": "auto", "transparency": false, "antiAlias": "none"})); + assert_eq!((r["format"].as_str(), r["achieved"].as_bool()), (Some("jpg"), Some(true)), "{r}"); + // With transparency the pixels stay transparent: GIF. + let r = optimize_to(&mut s, json!({"format": "jpg", "desiredK": 100, "startWith": "auto", "antiAlias": "none"})); + assert_eq!(r["format"].as_str(), Some("gif"), "{r}"); +} + +#[test] +fn optimize_to_file_size_says_when_no_setting_fits() { + let mut s = many_colours(); + for format in ["jpg", "gif", "png8"] { + let start = json!({"format": format}); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": 0.01}))); + assert_eq!((r["targetBytes"].as_u64(), r["achieved"].as_bool(), r["format"].as_str()), (Some(10), Some(false), Some(format)), "{r}"); + let bytes = r["bytes"].as_u64().unwrap() as usize; + assert!(bytes > 10 && bytes <= written(&mut s, &start), "{format}: the smallest setting tried: {r}"); + assert_eq!(written(&mut s, &r["settings"]), bytes); + assert!(r["trials"].as_u64().unwrap() as usize <= cmd::webexport::OPTIMIZE_TRIALS); + } + // GIF tries lossy when 2 colors are over. + let r = optimize_to(&mut s, json!({"format": "gif", "desiredK": 0.01})); + assert_eq!(r["settings"]["lossy"], json!(100), "{r}"); + // PNG-24 has nothing to lower. + let r = optimize_to(&mut s, json!({"format": "png24", "desiredK": 0.01})); + assert_eq!((r["achieved"].as_bool(), r["trials"].as_u64()), (Some(false), Some(1)), "{r}"); + assert_eq!(r["settings"], s.web_settings(&json!({"format": "png24"})).unwrap().to_json()); + // Settings that fit stay as they are. + let p = json!({"format": "jpg", "quality": 80, "desiredK": 1000}); + let r = optimize_to(&mut s, p.clone()); + assert_eq!((r["achieved"].as_bool(), r["trials"].as_u64()), (Some(true), Some(1)), "{r}"); + assert_eq!(r["settings"], s.web_settings(&p).unwrap().to_json()); +} + +#[test] +fn optimize_to_file_size_refuses_bad_params_and_changes_nothing() { + let mut s = many_colours(); + run(&mut s, "webExport.settings", json!({"format": "jpg", "quality": 77})); + let remembered = s.last_web_settings(); + for p in [ + json!({}), + json!({"desiredK": 0}), + json!({"desiredK": -5}), + json!({"desiredK": "10"}), + json!({"desiredK": null}), + json!({"desiredK": 2_000_000}), + json!({"desiredK": 10, "startWith": "gif"}), + json!({"desiredK": 10, "startWith": 1}), + json!({"desiredK": 10, "use": "all"}), + json!({"desiredK": 10, "slice": 0}), + json!({"desiredK": 10, "slice": "1"}), + json!({"desiredK": 10, "slice": 1, "use": "eachSlice"}), + json!({"desiredK": 10, "slice": 99}), + json!({"desiredK": 10, "percent": 0}), + ] { + assert!(s.execute("webExport.optimizeToFileSize", &p).is_err(), "{p}"); + } + optimize_to(&mut s, json!({"desiredK": 0.5, "format": "jpg"})); + assert_eq!(s.last_web_settings(), remembered, "the search changes no remembered setting"); +} + +#[test] +fn optimize_to_file_size_measures_the_slices_as_use_says() { + let mut s = session(300.0, 200.0); + rect(&mut s, [0.0, 0.0, 300.0, 200.0], "#336699"); + for i in 0..40 { + rect(&mut s, [f64::from(i) * 7.0, f64::from(i) * 4.0, 30.0, 20.0], &format!("#{:02x}{:02x}40", i * 6, 255 - i * 6)); + } + let a = rect(&mut s, [20.0, 20.0, 100.0, 60.0], "#ff8800"); + run(&mut s, "object.slice.make", json!({"ids": [a]})); + let layout = run(&mut s, "slice.list", json!({}))["slices"].as_array().unwrap().clone(); + let start = json!({"format": "jpg", "quality": 95}); + let sizes = |s: &mut Session, p: &Value| files(&run(s, "document.exportForWeb", p.clone())).iter().map(|(_, b)| b.len()).collect::>(); + let all = sizes(&mut s, &start); + assert_eq!(all.len(), layout.len()); + let total: usize = all.iter().sum(); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (total * 3 / 4) as f64 / 1024.0}))); + assert_eq!((r["achieved"].as_bool(), r["images"].as_u64()), (Some(true), Some(layout.len() as u64)), "{r}"); + let after = sizes(&mut s, &r["settings"]); + assert_eq!(after.iter().sum::(), r["bytes"].as_u64().unwrap() as usize, "the slice files together"); + let largest = *all.iter().max().unwrap(); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (largest * 3 / 4) as f64 / 1024.0, "use": "eachSlice"}))); + let after = sizes(&mut s, &r["settings"]); + assert_eq!(*after.iter().max().unwrap(), r["bytes"].as_u64().unwrap() as usize, "the largest slice file"); + assert!(r["achieved"].as_bool().unwrap() && after.iter().all(|n| *n <= r["targetBytes"].as_u64().unwrap() as usize), "{r}"); + let n = layout[0]["number"].as_u64().unwrap(); + let one_slice = written(&mut s, &merge(&start, json!({"slice": n}))); + let r = optimize_to(&mut s, merge(&start, json!({"desiredK": (one_slice / 2) as f64 / 1024.0, "slice": n}))); + assert_eq!(r["images"].as_u64(), Some(1)); + assert_eq!(written(&mut s, &merge(&r["settings"], json!({"slice": n}))), r["bytes"].as_u64().unwrap() as usize, "{r}"); +} + +#[test] +fn optimize_to_file_size_finds_a_fit_when_a_lower_setting_gives_a_larger_file() { + use cmd::webexport::{OPTIMIZE_SAMPLES, WebSettings, highest_within, set_quality}; + // Sizes that do not fall with the quality: 1 to 20 give 900 bytes, 21 to 70 give 400 to 449, + // and 71 and up give over 1000. + let size_of = |q: u8| match q { + ..=20 => 900, + 21..=70 => 400 + usize::from(q - 21), + _ => 1000 + usize::from(q), + }; + let start = WebSettings { quality: 90, ..WebSettings::default() }; + let mut measured = Vec::new(); + let mut smallest = None; + let mut size = |s: &WebSettings| { + measured.push(s.quality); + Ok(Some(size_of(s.quality))) + }; + let found = highest_within(&mut size, &start, (1, 90), set_quality, 500, &mut smallest).unwrap(); + let (settings, bytes) = found.expect("a quality within 500 bytes"); + assert_eq!((settings.quality, bytes), (70, 449), "measured {measured:?}"); + assert!(measured.len() <= usize::from(OPTIMIZE_SAMPLES) + 7, "measured {measured:?}"); + // Nothing fits: the smallest size measured is kept. + let mut smallest = None; + let mut size = |s: &WebSettings| Ok(Some(size_of(s.quality))); + assert!(highest_within(&mut size, &start, (1, 90), set_quality, 100, &mut smallest).unwrap().is_none()); + assert_eq!(smallest.map(|(s, n)| (s.quality, n)), Some((36, 415))); +} diff --git a/crates/engine/tests/import_fuzz.rs b/crates/engine/tests/import_fuzz.rs index 7fc7285dbb..ca766a64f4 100644 --- a/crates/engine/tests/import_fuzz.rs +++ b/crates/engine/tests/import_fuzz.rs @@ -3827,6 +3827,83 @@ fn editing_text() -> String { ) } +/// The range of [`ai_written_meshes_never_panic`]'s cuts and edits: past the end of [`meshes_text`]. +const MESHES_FUZZ_CHARS: usize = 24_000; + +/// The editing data VectorCraft writes for a document with two gradient meshes: 2 × 3 patches whose +/// rows of points are RGB, CMYK and gray, at half opacity and named; a 1 × 1 mesh with a point at +/// 40% opacity; and an instance of a symbol whose art is a 2 × 1 mesh. +fn meshes_text() -> &'static str { + static TEXT: std::sync::OnceLock = std::sync::OnceLock::new(); + TEXT.get_or_init(|| { + use vectorcraft_color::Color; + use vectorcraft_doc::live::{GradientMesh, MeshPoint, grid_points, smooth_handles}; + use vectorcraft_doc::{Node, NodeKind}; + use vectorcraft_geom::Rect; + let mesh = |r: Rect, rows: u32, cols: u32, color: &dyn Fn(usize) -> Color| { + let pts = grid_points(r, rows, cols); + let handles = smooth_handles(rows, cols, &pts); + let width = cols as usize + 1; + let points = pts + .iter() + .zip(handles) + .enumerate() + .map(|(i, (p, h))| MeshPoint { p: *p, color: color(i / width), opacity: 1.0, handles: h }) + .collect(); + GradientMesh { rows, cols, points } + }; + let mut doc = Document::new(300.0, 200.0); + let layer = doc.layers[0].id; + let sheet = mesh(Rect::new(20.0, 20.0, 200.0, 120.0), 2, 3, &|row| match row { + 0 => Color::rgb(1.0, 0.5, 0.0), + 1 => Color::cmyk(0.1, 0.6, 0.2, 0.05), + _ => Color::gray(0.4), + }); + let mut sheet = Node::new(doc.alloc_id(), NodeKind::Mesh(sheet)); + (sheet.name, sheet.opacity) = (Some("Sheet".into()), 0.5); + doc.insert(Some(layer), usize::MAX, sheet).unwrap(); + let mut small = mesh(Rect::new(220.0, 20.0, 280.0, 80.0), 1, 1, &|row| Color::rgb(0.0, 0.3, 0.3 + 0.5 * row as f32)); + small.points[1].opacity = 0.4; + let small = Node::new(doc.alloc_id(), NodeKind::Mesh(small)); + doc.insert(Some(layer), usize::MAX, small).unwrap(); + let patch = mesh(Rect::new(0.0, 0.0, 40.0, 30.0), 2, 1, &|row| Color::rgb(0.2 * row as f32, 0.6, 0.1)); + let patch = Node::new(doc.alloc_id(), NodeKind::Mesh(patch)); + doc.symbols.push(vectorcraft_doc::Symbol { dynamic: false, name: "Patch".into(), art: std::sync::Arc::new(patch) }); + let instance = + Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Patch".into(), xf: vectorcraft_geom::Affine::translate((20.0, 140.0)) }); + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let out = vectorcraft_eps::export_ai_editing(&doc, &vectorcraft_eps::AiEditingOptions::default()).unwrap(); + String::from_utf8(out.program).unwrap() + }) +} + +/// The data [`ai_written_meshes_never_panic`] damages, as it is, opens with both meshes, the symbol +/// with its mesh and its instance, and the property's cuts and edits reach all of it. +#[test] +fn the_written_meshes_fuzz_data_opens_as_meshes() { + use vectorcraft_doc::NodeKind; + let text = meshes_text(); + assert!(text.chars().count() < MESHES_FUZZ_CHARS, "{}", text.chars().count()); + for mark in ["%AI14_BeginSymbol", "%AI5_BeginLayer", "/Mesh X!", "%_[2 3] /Size X#", "%_/DeviceCMYK /CS X#", "/End X!", "/SymbolInstance :"] { + assert!(text.replace("\r\n", "\n").contains(mark), "{mark}"); + } + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(text)].concat(); + let (d, warnings, layered) = vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0); + assert!(layered, "{warnings:?}"); + let art = d.layers[0].children().unwrap(); + let kinds: Vec<&str> = art + .iter() + .map(|n| match n.kind { + NodeKind::Mesh(_) => "mesh", + NodeKind::SymbolInstance { .. } => "instance", + _ => "other", + }) + .collect(); + assert_eq!(kinds, ["mesh", "mesh", "instance"], "{warnings:?}"); + let patch = d.symbols.iter().find(|s| s.name == "Patch").map(|s| &s.art.kind); + assert!(matches!(patch, Some(NodeKind::Mesh(_))), "{patch:?}"); +} + fn zstd(text: &str) -> Vec { ruzstd::encoding::compress_to_vec(text.as_bytes(), ruzstd::encoding::CompressionLevel::Fastest) } @@ -4482,6 +4559,17 @@ proptest! { survive("mutated .ai editing data", || Some(vectorcraft_eps::layered_ai(&private, Document::new(100.0, 100.0), vec![], false, false, 1.0).0))?; } + /// A `.ai` whose gradient meshes, as the writer writes them, are damaged: the record's type, + /// size, places, color spaces and corners on `%_` lines, its `/Mesh X!` and `/End X!`, and the + /// mesh's transparency and name, cut short or edited. + #[test] + fn ai_written_meshes_never_panic(cut in 0usize..MESHES_FUZZ_CHARS, edits in prop::collection::vec((0usize..MESHES_FUZZ_CHARS, prop::sample::select(vec!['0', '1', '2', '9', '-', '.', 'e', ' ', '\n', '[', ']', '(', ')', '/', '%', '_', 'X', '!', '#', 'N', 'P', 'E'])), 0..12)) { + let text = mutate_text(meshes_text(), cut, &edits); + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(&text)].concat(); + survive("mutated .ai meshes", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, false, 1.0).0))?; + survive("mutated .ai meshes, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0).0))?; + } + /// The active artboard that a restored `.ai` opens on, read from damaged or hostile editing data. #[test] fn ai_active_artboard_never_panics(cut in 0usize..600, edits in prop::collection::vec((0usize..600, prop::sample::select(vec!['0', '9', '-', ' ', '\n', '/', ':', ';', ',', '%', '_'])), 0..12)) { @@ -5066,6 +5154,81 @@ proptest! { survive("mutated .ai brushes", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, false, 1.0).0))?; survive("mutated .ai brushes, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(200.0, 100.0), vec![], false, true, 1.0).0))?; } + + /// A `.ai` whose blends, as the writer writes them, are damaged: the keys and spine on `%_` + /// lines with their dictionaries, the drawn steps, the record's `XP` and its hex, and the + /// blend's transparency, cut short or edited. + #[test] + fn ai_written_blends_never_panic(cut in 0usize..BLENDS_FUZZ_CHARS, edits in prop::collection::vec((0usize..BLENDS_FUZZ_CHARS, prop::sample::select(vec!['0', '1', '2', '8', '9', 'A', 'F', '-', '.', ' ', '\n', '(', ')', '/', ',', ';', '%', '_', 'u', 'U', 'K', 'S', 'X', 'P'])), 0..12)) { + let text = mutate_text(blends_text(), cut, &edits); + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(&text)].concat(); + survive("mutated .ai blends", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, false, 1.0).0))?; + survive("mutated .ai blends, trusted", || Some(vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0).0))?; + } +} + +/// The range of [`ai_written_blends_never_panic`]'s cuts and edits: past the end of [`blends_text`]. +const BLENDS_FUZZ_CHARS: usize = 24_000; + +/// The editing data VectorCraft writes for a document with two blends: red to blue squares with +/// three steps and no spine of its own, at half opacity; and three squares 25 pt apart on a spine +/// edited on the canvas, aligned to the path. +fn blends_text() -> &'static str { + static TEXT: std::sync::OnceLock = std::sync::OnceLock::new(); + TEXT.get_or_init(|| { + use std::sync::Arc; + use vectorcraft_color::{Color, Paint}; + use vectorcraft_doc::live::{BlendOrientation, BlendSpacing, BlendSpec}; + use vectorcraft_doc::{Appearance, Node, NodeKind}; + use vectorcraft_geom::{PathData, Point, Rect, SubPath, shapes}; + let mut doc = Document::new(300.0, 200.0); + let layer = doc.layers[0].id; + let square = |doc: &mut Document, x: f64, y: f64, c: Color| { + Arc::new(Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(x, y, x + 20.0, y + 20.0)), + Appearance::basic(Paint::solid(c), Paint::None, 0.0), + )) + }; + let (red, blue, green) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0), Color::rgb(0.0, 1.0, 0.0)); + let keys = vec![square(&mut doc, 20.0, 20.0, red), square(&mut doc, 120.0, 20.0, blue)]; + let mut fade = Node::new( + doc.alloc_id(), + NodeKind::Blend { children: keys, spec: Box::new(BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }) }, + ); + fade.opacity = 0.5; + doc.insert(Some(layer), usize::MAX, fade).unwrap(); + let keys = vec![square(&mut doc, 20.0, 80.0, red), square(&mut doc, 120.0, 80.0, blue), square(&mut doc, 170.0, 80.0, green)]; + let centers: Vec = [30.0, 130.0, 180.0].iter().map(|x| Point::new(*x, 90.0)).collect(); + let spec = BlendSpec { + spacing: BlendSpacing::Distance(25.0), + orientation: BlendOrientation::AlignToPath, + spine: Some(PathData::single(SubPath::polyline(¢ers, false))), + key_anchors: vec![0, 1, 2], + ..BlendSpec::default() + }; + let path = Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }); + doc.insert(Some(layer), usize::MAX, path).unwrap(); + let out = vectorcraft_eps::export_ai_editing(&doc, &vectorcraft_eps::AiEditingOptions::default()).unwrap(); + String::from_utf8(out.program).unwrap() + }) +} + +/// The data [`ai_written_blends_never_panic`] damages, as it is, opens with both blends live, and +/// the property's cuts and edits reach all of it. +#[test] +fn the_written_blends_fuzz_data_opens_live() { + use vectorcraft_doc::NodeKind; + let text = blends_text(); + assert!(text.chars().count() < BLENDS_FUZZ_CHARS, "{}", text.chars().count()); + for mark in ["%AI5_BeginLayer", "%_(K) /String (ShapeBlendPathType) ,", "%_(S) /String (ShapeBlendPathType) ,", "1 0 92 XP", "1 0 116 XP"] { + assert!(text.replace("\r\n", "\n").contains(mark), "{mark}"); + } + let private = [b"%AI24_ZStandard_Data".as_slice(), &zstd(text)].concat(); + let (d, warnings, layered) = vectorcraft_eps::layered_ai(&private, Document::new(300.0, 200.0), vec![], false, true, 1.0); + assert!(layered, "{warnings:?}"); + let art = d.layers[0].children().unwrap(); + assert_eq!(art.iter().map(|n| matches!(n.kind, NodeKind::Blend { .. })).collect::>(), [true, true], "{warnings:?}"); } /// The range of [`ai_written_styles_never_panic`]'s cuts and edits: past the end of [`styles_text`]. diff --git a/crates/eps/src/ai_editing.rs b/crates/eps/src/ai_editing.rs index 5e63cfbc0c..17177671cf 100644 --- a/crates/eps/src/ai_editing.rs +++ b/crates/eps/src/ai_editing.rs @@ -120,7 +120,9 @@ //! and opacity mask and a state block as a group's with its opacity and blending mode (an //! instance with isolation, knockout or knockout shape of its own is written as its art). The //! definitions are at most the reader's 4,096. In a symbol's art, an instance's matrix and -//! a gradient's take the art to the canvas's space turned y up about art space's origin there. +//! a gradient's take the art to the canvas's space turned y up about art space's origin there, +//! and a gradient mesh's corners are in that space; an envelope's contents in its dictionary are +//! in the canvas's space with y down. //! - Art styles, as the reader reads them (`style.rs`, `read/ops.rs`): a path, compound path or //! group with live effects or linked to a graphic style is written as its drawn look (`u`, its //! vector art as its geometry effects leave it, without shadows, glows or feathers, `U`, its @@ -147,6 +149,19 @@ //! reader reads back as the same graph ([`crate::ai_graph`]) is written as its group between //! `%_Gs`, its functional records and `%_GS`, each series' group tagged `Go` right after its end; //! any other graph, and a graph with art left out, as its art, with a warning. +//! - Gradient meshes, as the reader reads them (`mesh.rs`): `/Mesh X!`, `2 /Version`, the grid's type +//! and size, `/Data` (the reader passes over the version and `/Data`), and each patch's place, color +//! space and four corners (color, opacity, point and handles) as `X#` entries on `%_` lines, +//! `/End X!`; the mesh's transparency before it, its name and opacity mask after it +//! (`writer::meshes`). A mesh is written as it is only when the reader reads it back so, when every +//! patch turns the same way (a reflected mesh's columns are written in reverse order), and outside +//! pattern tiles, art cut to a clipping object and a large canvas. +//! - Blends, as the reader reads them (`blend.rs`): the blend's key objects and spine as a group on +//! `%_` lines, each key's `/ArtDictionary` naming it a key and its id and the spine's naming it the +//! spine (written when the blend has a spine of its own); its steps drawn, a group; +//! the blend plugin's `1 0 n XP` line and the blend's record of its spacing, orientation and keys as hex +//! on `%` lines; its name and transparency as a group's after its end (`writer::blends`). A blend is +//! written live only when the reader reads it back with its settings. //! //! Lines end in CR LF. Strings are written in UTF-8. Art space is ruler space: y up, its origin at //! the first artboard's top-left corner. On the canvas ([`CANVAS_SIZE`] points square, y down) the @@ -176,7 +191,10 @@ //! and instances of //! symbols past 4,096 as their art (symbol art past [`vectorcraft_doc::MAX_SYMBOL_NODES`] objects //! in all left out), instances of symbols the document doesn't have as empty groups, symbols' 9-slice -//! guides, export types and dynamic type left out, live objects (placed documents included) as their art, +//! guides, export types and dynamic type left out, gradient meshes the reader wouldn't read back as +//! they are, folded meshes, meshes in pattern tiles and in art cut to a clipping object and every mesh +//! on a large canvas as their drawn look, blends the reader wouldn't read back live as +//! their steps, other live objects (placed documents included) as their art, //! strokes a plain line can't draw and the object's art style doesn't hold //! as their filled outlines, several fills or strokes as a group of a path for each, freeform //! gradient swatches, gradient swatches of more than 256 stops, swatches of patterns written as @@ -289,6 +307,8 @@ fn export_held(source: &Document, o: &AiEditingOptions, max_objects: usize, keep let links = writer::style_links(doc); // Before baking, which leaves the wrap objects that may be written as they are unchanged. let wraps_held = if keep_wraps { writer::wraps_held(doc, &styled) } else { HashSet::new() }; + // The blends baking leaves as they are, which may be written live. + let unbaked_blends = writer::unbaked_blends(doc); // Live geometry effects as their result, as the PDF part draws them. let baked = baked(doc); let doc = baked.as_ref().unwrap_or(doc); @@ -319,6 +339,9 @@ fn export_held(source: &Document, o: &AiEditingOptions, max_objects: usize, keep // On a large canvas the layers' symbol instances are written as their art. w.symbols_live = scale == 1.0; w.brushes_live = scale == 1.0; + w.meshes_live = scale == 1.0; + w.blends_live = scale == 1.0; + w.unbaked_blends = unbaked_blends; w.symbol_doc = symbol_doc; w.max_objects = max_objects; w.wraps_held = wraps_held; diff --git a/crates/eps/src/ai_editing/tests.rs b/crates/eps/src/ai_editing/tests.rs index 35d19be0eb..47c4b57f39 100644 --- a/crates/eps/src/ai_editing/tests.rs +++ b/crates/eps/src/ai_editing/tests.rs @@ -1087,8 +1087,10 @@ fn counted() -> Vec<(&'static str, Document)> { ("styles", styles_document()), ("painted clips", painted_clips()), ("blend", blend_doc()), + ("blends", blends_document()), ("brushes", brushes_document()), ("envelopes", envelopes_document()), + ("meshes", meshes_document()), ("wrap bounds", wrap_bounds_doc()), ] } @@ -1111,7 +1113,27 @@ fn wrap_bounds_doc() -> Document { doc } -/// A blend of two squares 20 pt apart with a step every 10 pt, written as its steps. +/// A blend whose own art and steps don't all fit within the object limit is written as its steps, +/// as many as fit, with the limit's warning and the blends warning; it writes no part of its own +/// art or its record. +#[test] +fn a_blend_past_the_object_limit_is_written_as_its_steps() { + let doc = blend_doc(); + let all = export_ai_editing(&doc, &opts()).unwrap(); + assert!(String::from_utf8_lossy(&all.program).contains("ShapeBlendPathType"), "written live with room"); + let read = crate::import::objects_read(&all.program).unwrap(); + for max in 1..read { + let out = export_within(&doc, &opts(), max).unwrap(); + let text = String::from_utf8_lossy(&out.program); + assert!(out.warnings.iter().any(|w| w == writer::OBJECT_LIMIT), "room for {max}: {:?}", out.warnings); + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "room for {max}: {:?}", out.warnings); + assert!(!text.contains("ShapeBlendPathType") && !text.contains("Path Blends)"), "room for {max}: {text}"); + let (back, _) = crate::ai_alone(&out.program).unwrap(); + assert!(!back.layers[0].children().unwrap().iter().any(|n| matches!(n.kind, NodeKind::Blend { .. })), "room for {max}"); + } +} + +/// A blend of two squares 20 pt apart with a step every 10 pt, written live. fn blend_doc() -> Document { let mut doc = Document::new(200.0, 100.0); let layer = doc.layers[0].id; @@ -9423,7 +9445,8 @@ fn brushes_document() -> Document { } /// Brush art `n` as a tree to compare with [`same_tree`]: each object's kind, its anchors and handles, -/// the fills and strokes that paint (a stroke with its width), and its members in order. +/// the fills and strokes that paint (a stroke with its width), its members in order, and its opacity +/// mask's art and options when it has one. fn art_tree(n: &Node) -> serde_json::Value { let kind = match &n.kind { NodeKind::Path { .. } => "path", @@ -9448,7 +9471,11 @@ fn art_tree(n: &Node) -> serde_json::Value { }) .collect(); let members: Vec = n.children().map(|c| c.iter().map(|m| art_tree(m)).collect()).unwrap_or_default(); - serde_json::json!({"kind": kind, "anchors": anchors, "paints": paints, "members": members}) + let mut tree = serde_json::json!({"kind": kind, "anchors": anchors, "paints": paints, "members": members}); + if let Some(m) = &n.extras().mask { + tree["mask"] = serde_json::json!({"art": art_tree(&m.art), "options": [m.clip, m.invert, m.disabled, m.linked]}); + } + tree } /// Are trees `a` and `b` ([`art_tree`]) the same but for numbers within the written numbers' @@ -9646,6 +9673,166 @@ fn an_art_brush_whose_art_doesnt_bend_keeps_its_paths_look() { assert!(same_tree(&art_tree(&got.art), &art_tree(&want.art)), "{:#?}", got.art); } +/// An opacity mask whose art is rectangle `r` filled in `paint`, with the options given. +fn rect_mask(id: u64, r: Rect, paint: Paint, clip: bool, invert: bool, linked: bool) -> OpacityMask { + let art = Node::path(vectorcraft_doc::NodeId(id), shapes::rectangle(r), Appearance::basic(paint, Paint::None, 0.0)); + OpacityMask { art: Arc::new(art), clip, invert, disabled: false, linked } +} + +/// `levels` white rectangle masks that clip, each but the last holding the next in its art. +fn mask_chain(levels: u32) -> Option> { + (0..levels).fold(None, |inner, i| { + let mut m = rect_mask(100 + u64::from(i), Rect::new(0.0, 0.0, 30.0 - f64::from(i), 8.0), solid(Color::WHITE), true, false, true); + Arc::make_mut(&mut m.art).extras_mut().mask = inner; + Some(Box::new(m)) + }) +} + +/// [`brush_art_node`] with opacity masks: on the group, a mid-gray rectangle that clips; on the wide +/// block, a white rectangle inverted without clipping. Both masks are `linked` or not. +fn masked_brush_art(linked: bool) -> Node { + let mut art = brush_art_node(); + if let Some(c) = art.children_mut() { + let wide = rect_mask(10, Rect::new(0.0, 0.0, 20.0, 4.0), solid(Color::WHITE), false, true, linked); + Arc::make_mut(&mut c[0]).extras_mut().mask = Some(Box::new(wide)); + } + art.extras_mut().mask = Some(Box::new(rect_mask(11, Rect::new(0.0, 0.0, 30.0, 8.0), solid(Color::rgb(0.5, 0.5, 0.5)), true, false, linked))); + art +} + +/// Scatter and Art brushes whose art holds opacity masks come back in the Brushes panel with their +/// settings, the masks' art in place with its paint, and the masks' options: masks on the art and on +/// a member, masks that don't move with their objects, and masks seven deep in one another's art. A +/// path with the masked Art brush comes back as its drawn look, with the stroke warning. +#[test] +fn scatter_and_art_brush_mask_art_round_trips() { + use vectorcraft_brush::{ArtBrush, Brush, BrushKind, Scatter}; + let mut deep = brush_art_node(); + deep.extras_mut().mask = mask_chain(7); + let lib = vec![ + Brush { name: "Masked spray".into(), kind: BrushKind::Scatter(Scatter { art: masked_brush_art(true), ..Scatter::default() }) }, + Brush { name: "Masked ribbon".into(), kind: BrushKind::Art(ArtBrush { art: masked_brush_art(true), ..ArtBrush::default() }) }, + Brush { name: "Unlinked spray".into(), kind: BrushKind::Scatter(Scatter { art: masked_brush_art(false), ..Scatter::default() }) }, + Brush { name: "Unlinked ribbon".into(), kind: BrushKind::Art(ArtBrush { art: masked_brush_art(false), ..ArtBrush::default() }) }, + Brush { name: "Deep spray".into(), kind: BrushKind::Scatter(Scatter { art: deep.clone(), ..Scatter::default() }) }, + Brush { name: "Deep ribbon".into(), kind: BrushKind::Art(ArtBrush { art: deep, ..ArtBrush::default() }) }, + ]; + let mut doc = Document::new(300.0, 200.0); + vectorcraft_brush::store(&mut doc, &lib); + brushed(&mut doc, "Masked ribbon", (20.0, 120.0), (280.0, 150.0), 1.0); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BRUSHES || w == writer::DEEP_MASKS), "{:?}", out.warnings); + assert!(out.warnings.iter().any(|w| w == writer::STROKES), "{:?}", out.warnings); + assert_eq!(program(&doc).matches("%AI8_BeginBrushPattern").count(), lib.len()); + let back = read_back(&doc); + assert!(matches!(back.layers[0].children().unwrap()[0].kind, NodeKind::Group { .. }), "the path's drawn look"); + let got = vectorcraft_brush::library(&back); + assert_eq!(got.iter().map(|b| b.name.as_str()).collect::>(), lib.iter().map(|b| b.name.as_str()).collect::>()); + let none = || Node::group(vectorcraft_doc::NodeId(0), vec![]); + for (g, w) in got.iter().zip(&lib) { + let name = &w.name; + let (ga, wa) = match (&g.kind, &w.kind) { + (BrushKind::Scatter(gs), BrushKind::Scatter(ws)) => { + let settings = |s: &Scatter| Scatter { art: none(), modes: Some(s.modes()), ..s.clone() }; + assert_eq!(settings(gs), settings(ws), "{name}"); + (&gs.art, &ws.art) + } + (BrushKind::Art(ga), BrushKind::Art(wa)) => { + assert_eq!(ArtBrushOptions::of(ga), ArtBrushOptions::of(wa), "{name}"); + (&ga.art, &wa.art) + } + _ => panic!("{name}: {g:?}"), + }; + let (gt, wt) = (art_tree(ga), art_tree(wa)); + assert!(same_tree(>, &wt), "{name}: {gt:#} for {wt:#}"); + } +} + +/// Brushes whose mask art the reader wouldn't read back as it is are left out with a warning, beside +/// a brush that comes back: a Scatter brush whose art's mask is a gradient, one whose art holds +/// masks eight deep in one another's art (deeper than the editing data writes masks), one whose +/// mask's art is a compound path of 26,500 members of two squares each, which the reader reads as +/// 53,000 paths, more art than it copies into one file's brushes, and one whose art is a compound +/// path with a mask on a member (a compound path is written as one path, without its members' masks). +#[test] +fn brushes_whose_mask_art_isnt_read_back_are_left_out() { + use vectorcraft_brush::{Brush, BrushKind, Scatter}; + let keep = Brush { name: "Masked spray".into(), kind: BrushKind::Scatter(Scatter { art: masked_brush_art(true), ..Scatter::default() }) }; + let mut gradient = brush_art_node(); + let ramp = gradient_paint(sunset(), None, None); + gradient.extras_mut().mask = Some(Box::new(rect_mask(11, Rect::new(0.0, 0.0, 30.0, 8.0), ramp, true, false, true))); + let mut deep = brush_art_node(); + deep.extras_mut().mask = mask_chain(8); + let square = |i: u32| { + let (x, y) = (f64::from(i % 400) * 2.0, f64::from(i / 400) * 2.0); + shapes::rectangle(Rect::new(x, y, x + 1.0, y + 1.0)).subpaths + }; + let members = (0..26_500) + .map(|m| { + let path = PathData::new((0..2).flat_map(|k| square(m * 2 + k)).collect()); + Arc::new(Node::path(vectorcraft_doc::NodeId(21), path, Appearance::basic(solid(Color::WHITE), Paint::None, 0.0))) + }) + .collect(); + let mut squares = Node::path(vectorcraft_doc::NodeId(20), PathData::default(), Appearance::basic(solid(Color::WHITE), Paint::None, 0.0)); + squares.kind = NodeKind::Compound { children: members, rule: FillRule::NonZero }; + let mut heavy = brush_art_node(); + heavy.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(squares), clip: true, invert: false, disabled: false, linked: true })); + let mut member = brush_art_node(); + member.kind = match member.kind { + NodeKind::Group { mut children, .. } => { + let mask = rect_mask(10, Rect::new(0.0, 0.0, 20.0, 4.0), solid(Color::WHITE), true, false, true); + Arc::make_mut(&mut children[0]).extras_mut().mask = Some(Box::new(mask)); + NodeKind::Compound { children, rule: FillRule::NonZero } + } + kind => kind, + }; + member.appearance = Appearance::basic(black_fill(), Paint::None, 0.0).into(); + let cases = [ + ("gradient mask", gradient), + ("masks eight deep", deep), + ("mask art past the reader's limit", heavy), + ("mask on a compound path's member", member), + ]; + for (why, art) in cases { + let mut doc = Document::new(300.0, 200.0); + let lib = vec![keep.clone(), Brush { name: why.into(), kind: BrushKind::Scatter(Scatter { art, ..Scatter::default() }) }]; + vectorcraft_brush::store(&mut doc, &lib); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::BRUSHES), "{why}: {:?}", out.warnings); + assert!(!out.warnings.iter().any(|w| w == writer::DEEP_MASKS), "{why}: {:?}", out.warnings); + let names: Vec = vectorcraft_brush::library(&read_back(&doc)).into_iter().map(|b| b.name).collect(); + assert_eq!(names, ["Masked spray"], "{why}"); + assert_eq!(program(&doc).matches("%AI8_BeginBrushPattern").count(), 1, "{why}"); + } +} + +/// A brush's mask art is written as the brush holds it when an object of the layers' mask art with +/// the same id keeps a live effect as an art style: the brush's mask comes back as its own plain +/// rectangle, without the layers' object's effect or geometry. +#[test] +fn a_brushs_mask_art_isnt_written_as_a_styled_object_with_its_id() { + use vectorcraft_brush::{Brush, BrushKind, Scatter}; + let offset = fx("path.offsetPath", serde_json::json!({"offset": 8.0, "joins": "miter", "miterLimit": 4.0})); + let mut id = None; + let mut doc = masked_image(|doc| { + let grown = styled_rect(doc, "Grown", Rect::new(60.0, 30.0, 110.0, 70.0), solid(Color::rgb(0.0, 0.0, 0.0)), Paint::None, vec![offset]); + id = Some(grown.id); + grown + }); + let id = id.expect("the mask's art"); + let mut art = brush_art_node(); + art.extras_mut().mask = Some(Box::new(rect_mask(id.0, Rect::new(0.0, 0.0, 30.0, 8.0), solid(Color::WHITE), true, false, true))); + let lib = vec![Brush { name: "Masked spray".into(), kind: BrushKind::Scatter(Scatter { art, ..Scatter::default() }) }]; + vectorcraft_brush::store(&mut doc, &lib); + let got = vectorcraft_brush::library(&read_back(&doc)); + let [Brush { kind: BrushKind::Scatter(s), .. }] = got.as_slice() else { panic!("{got:?}") }; + let BrushKind::Scatter(want) = &lib[0].kind else { panic!("a Scatter brush") }; + let m = s.art.extras().mask.as_deref().unwrap_or_else(|| panic!("the mask is read: {:#?}", s.art)); + assert!(m.art.appearance.effects.is_empty(), "{:?}", m.art.appearance.effects); + let (gt, wt) = (art_tree(&s.art), art_tree(&want.art)); + assert!(same_tree(>, &wt), "{gt:#} for {wt:#}"); +} + /// Settings the other tests don't use come back: a Calligraphic brush varying with tilt and bearing, /// a Scatter brush keeping its art's colors whose rotation doesn't follow the path, and brushes whose /// modes aren't given (the reader gives them, the same ones). @@ -10904,7 +11091,7 @@ fn envelopes_are_read_back_live() { } /// An envelope that is a symbol's art is written live in the symbol's definition, and the symbol -/// opens with it as a live envelope. +/// opens with it as a live envelope, its contents where they were. #[test] fn an_envelope_in_a_symbol_is_read_back_live() { use vectorcraft_doc::live::EnvelopeOptions; @@ -10921,15 +11108,103 @@ fn an_envelope_in_a_symbol_is_read_back_live() { let (back, notes) = crate::ai_alone(&p.data).unwrap(); let symbol = back.symbols.iter().find(|s| s.name == "Bent").unwrap_or_else(|| panic!("{name}: {:?}", back.symbols)); let mut envelopes = vec![]; + let mut boxes = vec![]; symbol.art.walk(&mut |n| { - if let NodeKind::Envelope { kind, .. } = &n.kind { + if let NodeKind::Envelope { kind, content, .. } = &n.kind { envelopes.push((**kind).clone()); + boxes.extend(content.iter().map(|c| c.geometric_bounds())); } }); assert!(matches!(envelopes.as_slice(), [k] if same_envelope_kind(&kind, k)), "{name}: {envelopes:?} {notes:?}"); + let near = |a: Option, b: Rect| { + a.is_some_and(|a| (a.x0 - b.x0).abs() + (a.y0 - b.y0).abs() + (a.x1 - b.x1).abs() + (a.y1 - b.y1).abs() < 1e-6) + }; + let want = [Rect::new(40.0, 20.0, 100.0, 80.0), Rect::new(100.0, 20.0, 160.0, 80.0)]; + assert!(boxes.len() == 2 && boxes.iter().zip(want).all(|(a, b)| near(*a, b)), "{name}: {boxes:?}"); } } +/// A gradient-filled path in the contents of an envelope in a symbol's art opens with its gradient +/// where it was on the path. +#[test] +fn a_gradient_in_an_envelopes_contents_in_a_symbol_keeps_its_place() { + use vectorcraft_color::gradient::GradientGeom; + use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; + let mut doc = Document::new(200.0, 100.0); + let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; + let mut art = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW); + let geom = GradientGeom { start: (50.0, 30.0).into(), end: (90.0, 70.0).into(), aspect: 1.0, focal: None }; + let fill = gradient_paint(sunset(), Some(geom), None); + let shaded = painted(&mut doc, shapes::rectangle(Rect::new(40.0, 20.0, 100.0, 80.0)), vec![AppearanceItem::Fill(FillLayer::new(fill))]); + if let NodeKind::Envelope { content, .. } = &mut art.kind { + content[0] = Arc::new(shaded); + } + doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) }); + let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let back = read_back(&doc); + let symbol = back.symbols.iter().find(|s| s.name == "Bent").unwrap_or_else(|| panic!("{:?}", back.symbols)); + let mut geoms = vec![]; + symbol.art.walk(&mut |n| { + if let NodeKind::Envelope { content, .. } = &n.kind { + for c in content { + if let Paint::Gradient(g) = c.appearance.fill_paint() { + geoms.push(g.geom); + } + } + } + }); + let near = |a: vectorcraft_geom::Point, b: vectorcraft_geom::Point| (a - b).hypot() < 1e-6; + assert!(matches!(geoms.as_slice(), [Some(g)] if near(g.start, geom.start) && near(g.end, geom.end)), "{geoms:?}, want {geom:?}"); +} + +/// The contents of an envelope in a symbol's art are written in the canvas's space with y down: +/// about the canvas point of art space's origin. +#[test] +fn an_envelopes_contents_in_a_symbol_are_written_in_the_canvas_space() { + use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; + let mut doc = Document::new(200.0, 100.0); + let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; + let art = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW); + doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) }); + let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let p = program(&doc); + let t: Vec = p.lines().find_map(|l| l.strip_prefix("%AI3_TemplateBox: ")).unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + let (ox, oy) = (f64::from(CANVAS_SIZE) / 2.0 - t[0], f64::from(CANVAS_SIZE) / 2.0 + t[1]); + let def = &p[p.find("%AI14_BeginSymbol\n(Bent)\n").unwrap()..]; + let block = &def[def.find("%_X=\n").unwrap()..]; + let moves: Vec<&str> = block.lines().filter_map(|l| l.trim_start_matches("%_").strip_suffix(" m")).collect(); + // The red square's points are the rectangle 40 20 to 100 80, in the symbol's space. + let xs: Vec = moves.first().unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + assert!([40.0, 100.0].iter().any(|x| (xs[0] - (x + ox)).abs() < 1e-6), "{xs:?}, origin {ox} {oy}"); + assert!([20.0, 80.0].iter().any(|y| (xs[1] - (y + oy)).abs() < 1e-6), "{xs:?}, origin {ox} {oy}"); +} + +/// The grid of an envelope in a symbol's art is written in the space a gradient mesh's corners are +/// written in there: about the canvas point of art space's origin, y up. +#[test] +fn an_envelopes_grid_in_a_symbol_is_written_about_the_canvas_point_of_the_origin() { + use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; + let mut doc = Document::new(200.0, 100.0); + let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; + let art = envelope_node(&mut doc, kind, 50.0, false, EnvelopeOptions::NEW); + doc.symbols.push(Symbol { dynamic: false, name: "Bent".into(), art: Arc::new(art) }); + let instance = Node::new(doc.alloc_id(), NodeKind::SymbolInstance { symbol: "Bent".into(), xf: Affine::translate((10.0, 5.0)) }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, instance).unwrap(); + let p = program(&doc); + let t: Vec = p.lines().find_map(|l| l.strip_prefix("%AI3_TemplateBox: ")).unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + let (ox, oy) = (f64::from(CANVAS_SIZE) / 2.0 - t[0], f64::from(CANVAS_SIZE) / 2.0 + t[1]); + let def = &p[p.find("%AI14_BeginSymbol\n(Bent)\n").unwrap()..]; + let first = def.lines().find(|l| l.ends_with(" /N X#")).unwrap(); + // The grid's top left point, at 30 10. + let want = format!("[0 1 {} {} ", ps::num(30.0 - ox), ps::num(oy - 10.0)); + assert!(first.trim_start_matches("%_").starts_with(&want), "{first}, want {want}"); +} + /// An envelope with an opacity mask comes back live with its mask, and the plugin's `XP` follows /// the envelope's dictionary rather than its mask's art. #[test] @@ -11391,8 +11666,13 @@ fn envelopes_the_reader_cannot_open_live_are_written_as_their_art() { assert!(!warnings.iter().any(|w| w == writer::LIVE), "{what}: {warnings:?}"); assert!(matches!(back.kind, NodeKind::Group { .. }), "{what}: {back:#?}"); } - let blend = export_ai_editing(&blend_doc(), &opts()).unwrap(); - assert!(blend.warnings.iter().any(|w| w == writer::LIVE) && !blend.warnings.iter().any(|w| w == writer::ENVELOPES), "{:?}", blend.warnings); + let mut doc = Document::new(200.0, 100.0); + let a = Arc::new(square(&mut doc, Rect::new(10.0, 10.0, 20.0, 20.0), Color::gray(0.5))); + let repeat = Node::new(doc.alloc_id(), NodeKind::Repeat(vectorcraft_doc::RepeatSpec::grid(vec![a], 8.0, 12.0))); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, repeat).unwrap(); + let repeat = export_ai_editing(&doc, &opts()).unwrap(); + assert!(repeat.warnings.iter().any(|w| w == writer::LIVE) && !repeat.warnings.iter().any(|w| w == writer::ENVELOPES), "{:?}", repeat.warnings); } /// `points`, a grid of `rows + 1` rows of `cols + 1` points, as `cols + 1` rows of `rows + 1`. @@ -11818,9 +12098,9 @@ fn text_wrap_options_are_written_and_read_back() { same_wraps(&wraps(read_back(&doc).layers[0].children().unwrap()), &[(None, 6.0, true), (None, 1000.0, false), (None, -1000.0, false)]); } -/// The art drawn for an object (a blend's steps, a stained symbol instance's art) is written -/// without the text wrap options of the objects it is made from, which wrap no type; the object -/// keeps its own. A symbol's art and a live instance keep theirs. +/// The art drawn for an object (the steps of a blend written as its steps, a stained symbol +/// instance's art) is written without the text wrap options of the objects it is made from, which +/// wrap no type; the object keeps its own. A symbol's art and a live instance keep theirs. #[test] fn drawn_art_keeps_only_its_objects_text_wrap() { let mut doc = Document::new(200.0, 100.0); @@ -11829,7 +12109,12 @@ fn drawn_art_keeps_only_its_objects_text_wrap() { Arc::new(wrapped(square(&mut doc, Rect::new(10.0, 10.0, 12.0, 12.0), Color::gray(0.5)), 2.0, true)), Arc::new(wrapped(square(&mut doc, Rect::new(30.0, 10.0, 32.0, 12.0), Color::gray(0.5)), 2.0, true)), ]; - let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(10.0), ..Default::default() }; + // With easing, written as its steps. + let spec = vectorcraft_doc::BlendSpec { + spacing: vectorcraft_doc::BlendSpacing::Distance(10.0), + ease: BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }, + ..Default::default() + }; let blend = wrapped(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), 8.0, false); let art = wrapped(square(&mut doc, Rect::new(0.0, 0.0, 10.0, 10.0), LEAF), 4.0, true); doc.symbols.push(Symbol { dynamic: false, name: "Leaf".into(), art: Arc::new(art) }); @@ -12426,8 +12711,8 @@ fn two_leaves(doc: &mut Document) { doc.symbols.push(Symbol { dynamic: false, name: "Leaf".into(), art: Arc::new(art) }); } -/// A symbol instance written as its art (its isolation is a group's), a blend and an intertwine, -/// each written as a group of its art, wrap area type below them by their bounds after reopening, +/// A symbol instance written as its art (its isolation is a group's), a blend with easing and an +/// intertwine, each written as a group of its art, wrap area type below them by their bounds after reopening, /// as they did before saving, not by the members of that art: the text wrap options go on an /// unpainted rectangle of the bounds, the group's first member, and the group, which keeps the /// object's name, isolation, lock and visibility, has none. A positive offset, a negative offset @@ -12448,7 +12733,11 @@ fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() { Arc::new(square(doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))), Arc::new(square(doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))), ]; - let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() }; + let spec = vectorcraft_doc::BlendSpec { + spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), + ease: BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }, + ..Default::default() + }; wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), 4.5, false) }; let intertwine = |doc: &mut Document| { @@ -12501,21 +12790,32 @@ fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() { assert!([b.x0 - want.x0, b.y0 - want.y0, b.x1 - want.x1, b.y1 - want.y1].iter().all(|d| d.abs() < 1e-3), "{name}: {b:?} {want:?}"); } - // An envelope written live opens live and wraps by its bounds, its options its own. - let live = |doc: &mut Document| { + // An envelope and a blend written live open live and wrap by their bounds, their options their + // own. + let envelope = |doc: &mut Document| { use vectorcraft_doc::live::{EnvelopeKind, EnvelopeOptions}; let kind = EnvelopeKind::Mesh { rows: 2, cols: 3, points: envelope_points(2, 3), handles: vec![] }; wrapped(named(envelope_node(doc, kind, 50.0, false, EnvelopeOptions::NEW), "Thing"), -3.0, true) }; - let doc = over_area_type(live); - let text_out = program(&doc); - let back = read_back(&doc); - let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back)); - assert_eq!(before.len(), 1); - assert!(same_region(&before, &after), "{before:?}\n{after:?}\n{text_out}"); - let top = back.layers[0].children().unwrap(); - assert!(matches!(top[1].kind, NodeKind::Envelope { .. }), "{text_out}"); - same_wraps(&wraps(top), &[(Some("Thing".into()), -3.0, true)]); + let blend = |doc: &mut Document| { + let keys = vec![ + Arc::new(square(doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))), + Arc::new(square(doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))), + ]; + let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() }; + wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), -3.0, true) + }; + for (name, doc) in [("envelope", over_area_type(envelope)), ("blend", over_area_type(blend))] { + let text_out = program(&doc); + let back = read_back(&doc); + let (before, after) = (area_wrap_region(&doc), area_wrap_region(&back)); + assert_eq!(before.len(), 1, "{name}"); + assert!(same_region(&before, &after), "{name}\n{before:?}\n{after:?}\n{text_out}"); + let top = back.layers[0].children().unwrap(); + assert!(matches!(top[1].kind, NodeKind::Envelope { .. } | NodeKind::Blend { .. }), "{name}: {text_out}"); + assert_eq!(std::mem::discriminant(&top[1].kind), std::mem::discriminant(&doc.layers[0].children().unwrap()[1].kind), "{name}"); + same_wraps(&wraps(top), &[(Some("Thing".into()), -3.0, true)]); + } } /// The rectangle that keeps a blend written as its art wrapping by its bounds counts toward the @@ -12529,13 +12829,17 @@ fn live_art_written_as_a_group_keeps_wrapping_by_its_bounds() { fn wrap_bounds_of_live_art_fit_the_object_limit_and_leave_area_type_in_the_art_unwrapped() { use vectorcraft_doc::{TextKind, TextObject, TextRun}; // A blend alone, without a symbol definition, so the objects are the group, the rectangle and - // the steps. + // the steps (with easing, written as its steps). let mut doc = Document::new(300.0, 200.0); let keys = vec![ Arc::new(square(&mut doc, Rect::new(60.0, 80.0, 70.0, 90.0), Color::gray(0.5))), Arc::new(square(&mut doc, Rect::new(220.0, 110.0, 230.0, 120.0), Color::gray(0.5))), ]; - let spec = vectorcraft_doc::BlendSpec { spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), ..Default::default() }; + let spec = vectorcraft_doc::BlendSpec { + spacing: vectorcraft_doc::BlendSpacing::Distance(60.0), + ease: BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }, + ..Default::default() + }; let thing = wrapped(named(Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }), "Thing"), 4.5, false); let layer = doc.layers[0].id; doc.insert(Some(layer), usize::MAX, thing).unwrap(); @@ -13128,3 +13432,1517 @@ fn a_cut_clipping_object_without_room_for_its_mask_gets_no_carrier() { } } } + +// ---------- blends ---------- + +use vectorcraft_doc::live::{BlendEase, BlendEaseType, BlendOrientation, BlendSpacing, BlendSpec}; + +/// A square `s` wide at (x, y) filled with `c`, as a blend's key. +fn key_square(doc: &mut Document, x: f64, y: f64, s: f64, c: Color) -> Arc { + Arc::new(Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(x, y, x + s, y + s)), Appearance::basic(solid(c), Paint::None, 0.0))) +} + +fn blend_of(doc: &mut Document, keys: Vec>, spec: BlendSpec) -> Node { + Node::new(doc.alloc_id(), NodeKind::Blend { children: keys, spec: Box::new(spec) }) +} + +/// The straight lines through the centers of 20 pt squares at `xs` on y 50 (a spine edited on the +/// canvas, its keys on its anchors). +fn spine_through(xs: &[f64], y: f64) -> PathData { + let points: Vec = xs.iter().map(|x| vectorcraft_geom::Point::new(x + 10.0, y + 10.0)).collect(); + PathData::single(vectorcraft_geom::SubPath::polyline(&points, false)) +} + +/// A 400 × 400 document with blends: `Fade`, red to blue squares, three steps, no spine of its own, +/// at half opacity in Multiply, followed by a path at 80%; `Path`, three keys (red, blue, green) on a +/// spine edited on the canvas, 25 pt apart, aligned to the path; `Smooth`, two close blues in Smooth +/// Color; `Curve` and `Bow`, two keys on a replaced curved spine with four steps; `Diagonal`, two +/// keys 45 degrees apart with no spine of their own, aligned to the path; and a hidden, locked blend +/// in a group `Box`. (Turning the steps along the spine leaves their centers in place, so the +/// orientation comes from the record.) +fn blends_document() -> Document { + let mut doc = Document::new(400.0, 400.0); + let (red, blue, green) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0), Color::rgb(0.0, 1.0, 0.0)); + let layer = doc.layers[0].id; + let keys = vec![key_square(&mut doc, 20.0, 20.0, 20.0, red), key_square(&mut doc, 120.0, 20.0, 20.0, blue)]; + let mut fade = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + (fade.name, fade.opacity, fade.blend) = (Some("Fade".into()), 0.5, BlendMode::Multiply); + doc.insert(Some(layer), usize::MAX, fade).unwrap(); + let mut after = (*key_square(&mut doc, 200.0, 20.0, 20.0, green)).clone(); + after.opacity = 0.8; + doc.insert(Some(layer), usize::MAX, after).unwrap(); + let keys = vec![ + key_square(&mut doc, 20.0, 80.0, 20.0, red), + key_square(&mut doc, 120.0, 80.0, 20.0, blue), + key_square(&mut doc, 170.0, 80.0, 20.0, green), + ]; + let spec = BlendSpec { + spacing: BlendSpacing::Distance(25.0), + orientation: BlendOrientation::AlignToPath, + spine: Some(spine_through(&[20.0, 120.0, 170.0], 80.0)), + key_anchors: vec![0, 1, 2], + ..BlendSpec::default() + }; + let mut path = blend_of(&mut doc, keys, spec); + path.name = Some("Path".into()); + doc.insert(Some(layer), usize::MAX, path).unwrap(); + let keys = + vec![key_square(&mut doc, 20.0, 140.0, 20.0, Color::rgb(0.0, 0.0, 0.8)), key_square(&mut doc, 140.0, 140.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let mut smooth = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::SmoothColor, ..BlendSpec::default() }); + smooth.name = Some("Smooth".into()); + doc.insert(Some(layer), usize::MAX, smooth).unwrap(); + let keys = vec![key_square(&mut doc, 20.0, 220.0, 20.0, red), key_square(&mut doc, 220.0, 220.0, 20.0, blue)]; + let curve = PathData::from_bezpath(&kurbo::BezPath::from_vec(vec![ + kurbo::PathEl::MoveTo((30.0, 230.0).into()), + kurbo::PathEl::CurveTo((80.0, 180.0).into(), (180.0, 180.0).into(), (230.0, 230.0).into()), + ])); + let mut curved = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(4), spine: Some(curve), ..BlendSpec::default() }); + curved.name = Some("Curve".into()); + doc.insert(Some(layer), usize::MAX, curved).unwrap(); + let keys = vec![key_square(&mut doc, 40.0, 260.0, 20.0, red), key_square(&mut doc, 340.0, 260.0, 20.0, blue)]; + let bow = PathData::from_bezpath(&kurbo::BezPath::from_vec(vec![ + kurbo::PathEl::MoveTo((50.0, 270.0).into()), + kurbo::PathEl::CurveTo((50.0, 270.0).into(), (250.0, 200.0).into(), (350.0, 270.0).into()), + ])); + let mut bowed = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(4), spine: Some(bow), ..BlendSpec::default() }); + bowed.name = Some("Bow".into()); + doc.insert(Some(layer), usize::MAX, bowed).unwrap(); + let keys = vec![key_square(&mut doc, 300.0, 20.0, 20.0, red), key_square(&mut doc, 380.0, 100.0, 20.0, blue)]; + let mut diagonal = + blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(2), orientation: BlendOrientation::AlignToPath, ..BlendSpec::default() }); + diagonal.name = Some("Diagonal".into()); + doc.insert(Some(layer), usize::MAX, diagonal).unwrap(); + let keys = vec![key_square(&mut doc, 20.0, 320.0, 20.0, red), key_square(&mut doc, 100.0, 320.0, 20.0, green)]; + let mut shy = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }); + (shy.visible, shy.locked) = (false, true); + let mut boxed = Node::group(doc.alloc_id(), vec![Arc::new(shy)]); + boxed.name = Some("Box".into()); + doc.insert(Some(layer), usize::MAX, boxed).unwrap(); + doc +} + +/// Every blend of `doc`, in paint order. +fn blends_in(doc: &Document) -> Vec> { + let mut out = vec![]; + fn walk(n: &Arc, out: &mut Vec>) { + if matches!(n.kind, NodeKind::Blend { .. }) { + out.push(n.clone()); + } else { + n.children().into_iter().flatten().for_each(|c| walk(c, out)); + } + } + doc.layers.iter().for_each(|l| walk(l, &mut out)); + out +} + +/// Do the objects `got` lay out as `want` do: as many, each one's bounds within 0.01 pt and its +/// first fill's color within 0.002 a channel, and a group's members the same way? +fn assert_same_objects(got: &[Node], want: &[Node], what: &str) { + assert_eq!(got.len(), want.len(), "{what}: how many"); + for (i, (g, w)) in got.iter().zip(want).enumerate() { + let bounds = |n: &Node| n.geometric_bounds().map(|b| [b.x0, b.y0, b.x1, b.y1]); + match (bounds(g), bounds(w)) { + (Some(a), Some(b)) => assert!(a.iter().zip(b).all(|(x, y)| (x - y).abs() <= 0.01), "{what}, object {i}: {a:?} for {b:?}"), + (a, b) => assert_eq!(a, b, "{what}, object {i}"), + } + let fill = |n: &Node| match n.appearance.fill_paint() { + Paint::Solid { color, .. } => Some(color.to_rgb()), + _ => None, + }; + match (fill(g), fill(w)) { + (Some(a), Some(b)) => assert!(a.iter().zip(b).all(|(x, y)| (x - y).abs() <= 0.002), "{what}, object {i}: {a:?} for {b:?}"), + (a, b) => assert_eq!(a, b, "{what}, object {i}"), + } + let members = |n: &Node| n.children().map(|c| c.iter().map(|m| (**m).clone()).collect::>()).unwrap_or_default(); + assert_same_objects(&members(g), &members(w), &format!("{what}, object {i}")); + } +} + +/// The blends of `doc` come back live: each with its keys (their points and paint), its spacing +/// and orientation, its name, opacity, blending mode, hidden and locked state, and laying out the +/// same steps (where they sit, how they turn, their colors). A blend with no spine of its own comes +/// back with none, one with a spine edited on the canvas with that spine and its keys' anchors, and +/// one with a replaced spine with a spine anchored at each key (anchors 0 and 1 for two keys). +fn assert_blends_read_back_live(doc: &Document) { + let back = read_back(doc); + let (ours, theirs) = (blends_in(doc), blends_in(&back)); + assert_eq!(theirs.len(), ours.len(), "{:#?}", back.layers[0]); + for (a, b) in ours.iter().zip(&theirs) { + let (NodeKind::Blend { children: ka, spec: sa }, NodeKind::Blend { children: kb, spec: sb }) = (&a.kind, &b.kind) else { panic!() }; + let what = format!("{:?}", a.name); + assert_eq!(kb.len(), ka.len(), "{what}"); + for (x, y) in ka.iter().zip(kb) { + let (g, w) = (art_tree(y), art_tree(x)); + assert!(same_tree(&g, &w), "{what}: {g:#} for {w:#}"); + } + assert_eq!( + (&sb.spacing, sb.orientation, &sb.ease, sb.color_shift, &sb.starts), + (&sa.spacing, sa.orientation, &sa.ease, sa.color_shift, &sa.starts), + "{what}" + ); + match (&sa.spine, sa.key_anchors.is_empty()) { + (None, _) => assert_eq!((&sb.spine, sb.key_anchors.len()), (&None, 0), "{what}: no spine of its own"), + (Some(_), false) => assert!(same_blend_spec(sb, sa), "{what}: {sb:#?} for {sa:#?}"), + (Some(_), true) => { + assert!(sb.spine.is_some(), "{what}"); + assert_eq!(sb.key_anchors, (0..ka.len() as u32).collect::>(), "{what}: an anchor at each key"); + } + } + assert_eq!((&b.name, b.opacity, b.blend, b.visible, b.locked), (&a.name, a.opacity, a.blend, a.visible, a.locked)); + let steps = |k: &[Arc], s: &BlendSpec| vectorcraft_doc::blend::blend_expand(k, s); + assert_same_objects(&steps(kb, sb), &steps(ka, sa), &what); + } +} + +/// Are two blends' settings the same, the spines' points within the written precision? +fn same_blend_spec(got: &BlendSpec, want: &BlendSpec) -> bool { + let points = |s: &Option| { + s.as_ref().map(|p| { + let a: Vec<[f64; 6]> = + p.subpaths.iter().flat_map(|sp| sp.anchors.iter().map(|a| [a.h_in.x, a.h_in.y, a.p.x, a.p.y, a.h_out.x, a.h_out.y])).collect(); + serde_json::json!(a) + }) + }; + let spines = match (points(&got.spine), points(&want.spine)) { + (Some(a), Some(b)) => same_tree(&a, &b), + (None, None) => true, + _ => false, + }; + spines + && (&got.spacing, got.orientation, &got.key_anchors, &got.ease, got.color_shift, &got.starts) + == (&want.spacing, want.orientation, &want.key_anchors, &want.ease, want.color_shift, &want.starts) +} + +/// Each blend comes back live ([`assert_blends_read_back_live`]): no spine of its own, a spine +/// edited on the canvas, replaced curved spines; Specified Steps, Specified Distance, Smooth Color; +/// aligned to the page or the path; named, at half opacity, hidden and locked. The path after the +/// first blend keeps its own opacity. +#[test] +fn blends_are_read_back_live() { + let doc = blends_document(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS || w == writer::LIVE), "{:?}", out.warnings); + let text = program(&doc); + assert_eq!(text.matches("(Adobe Path Blends) 1 0 ").count(), 7); // brand-ok: the plugin name the files use + assert_blends_read_back_live(&doc); + let back = read_back(&doc); + let art = back.layers[0].children().unwrap(); + assert_eq!((art[1].opacity, matches!(art[1].kind, NodeKind::Path { .. })), (0.8, true), "the path after the blend keeps its own opacity"); +} + +/// The record names the keys in their order with the anchors they sit on and the steps before each, +/// the spacing and distance, and the orientation (8 and the spine's starting angle for Align to +/// Path); a key's dictionary names it a key and its id, the spine's names it the spine, and a blend +/// with no spine of its own has no spine part; the blend's name follows its record, before its +/// transparency. +#[test] +fn blends_are_written_in_their_form() { + let doc = blends_document(); + let text = program(&doc); + let words = |at: usize| -> Vec { + let head = text.match_indices("(Adobe Path Blends) 1 0 ").nth(at).unwrap().0; // brand-ok: the plugin name the files use + let hex: String = text[head..].lines().skip(1).take_while(|l| l.starts_with('%') && !l.starts_with("%_")).map(|l| &l[1..]).collect(); + let bytes: Vec = (0..hex.len()).step_by(2).map(|i| u8::from_str_radix(&hex[i..i + 2], 16).unwrap()).collect(); + bytes.chunks(4).map(|c| u32::from_le_bytes([c[0], c[1], c[2], c[3]])).collect() + }; + let fade = words(0); + let magic = u32::from_le_bytes(*b"DCBA"); + let f = |x: f32| x.to_bits(); + let ff = u32::MAX; + assert_eq!(fade, [magic, 1, f(25.0), 0, 3, 0, 'C' as u32, 0, 0, 1, 2, 'A' as u32, 0, f(0.0), ff, ff, 0, 'B' as u32, 0, f(1.0), ff, ff, 3]); + let path = words(1); + assert_eq!(path.len(), 11 + 3 * 6); + assert_eq!(&path[..7], [magic, 2, f(25.0), 0, 3, f(8.0), 'D' as u32]); + assert_eq!((path[23], path[25], path[28]), ('C' as u32, f(2.0), 1)); + assert_eq!(words(2)[..3], [magic, 0, f(4.0)]); + // Diagonal runs down to the right on the canvas: 45 degrees below level in art space, whose y + // runs up, so its spine starts at 7π/4. + assert_eq!(words(5)[5], f((8.0 + 7.0 * std::f64::consts::FRAC_PI_4) as f32), "Diagonal's orientation"); + let fade_art = &text[..text.find("(Adobe Path Blends) 1 0 ").unwrap()]; // brand-ok: the plugin name the files use + assert!(fade_art.contains("%_(K) /String (ShapeBlendPathType) ,\n%_(A) /String (ShapeBlendPathID) ,"), "{fade_art}"); + assert!(!fade_art.contains("(S) /String (ShapeBlendPathType)"), "no spine part for a blend with no spine of its own"); + assert!(!fade_art.contains("(Fade)"), "the name follows the record"); + let after = &text[text.find("(Adobe Path Blends) 1 0 ").unwrap()..]; // brand-ok: the plugin name the files use + let state = after.find("\n0 0 Xd\n6 () XW").unwrap(); + assert!( + after[..state].contains("%_/ArtDictionary :\n%_/XMLUID : (Fade) ; (AI10_ArtUID) ,"), + "the name before the state block: {}", + &after[..state] + ); + assert_eq!(text.matches("%_(S) /String (ShapeBlendPathType) ,").count(), 3, "the edited spine and the two replaced ones"); +} + +/// Blends of compound paths, of groups, and of 62 keys (the most the ids name; the record's next +/// free id is then 0) come back live, laying out the same steps. +#[test] +fn blends_of_compound_paths_groups_and_62_keys_are_read_back_live() { + let mut doc = Document::new(400.0, 300.0); + let layer = doc.layers[0].id; + let (red, blue) = (Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0)); + // The members carry the compound path's paint, as the reader gives them. + let ring = |doc: &mut Document, x: f64, c: Color| { + let paint = || Appearance::basic(solid(c), Paint::None, 0.0); + let outer = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(x, 20.0, x + 20.0, 40.0)), paint()); + let inner = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(x + 5.0, 25.0, x + 15.0, 35.0)), paint()); + let mut ring = Node::new(doc.alloc_id(), NodeKind::Compound { children: vec![Arc::new(outer), Arc::new(inner)], rule: FillRule::EvenOdd }); + ring.appearance = paint().into(); + Arc::new(ring) + }; + let keys = vec![ring(&mut doc, 20.0, red), ring(&mut doc, 120.0, blue)]; + let mut rings = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + rings.name = Some("Rings".into()); + doc.insert(Some(layer), usize::MAX, rings).unwrap(); + let pair = |doc: &mut Document, x: f64, c: Color| { + let members = vec![key_square(doc, x, 80.0, 10.0, c), key_square(doc, x + 15.0, 80.0, 10.0, Color::gray(0.5))]; + Arc::new(Node::group(doc.alloc_id(), members)) + }; + let keys = vec![pair(&mut doc, 20.0, red), pair(&mut doc, 120.0, blue)]; + let mut pairs = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(2), ..BlendSpec::default() }); + pairs.name = Some("Pairs".into()); + doc.insert(Some(layer), usize::MAX, pairs).unwrap(); + let keys = (0..62).map(|i| key_square(&mut doc, f64::from(i) * 6.0, 150.0, 2.0, Color::gray(f32::from(i as u8) / 62.0))).collect(); + let mut many = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }); + many.name = Some("Many".into()); + doc.insert(Some(layer), usize::MAX, many).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let text = program(&doc); + let last = text.match_indices("(Adobe Path Blends) 1 0 ").nth(2).unwrap().0; // brand-ok: the plugin name the files use + let hex: String = text[last..].lines().skip(1).take_while(|l| l.starts_with('%') && !l.starts_with("%_")).map(|l| &l[1..]).collect(); + assert_eq!(&hex[6 * 8..7 * 8], "00000000", "the next free id after the 62nd"); + assert_blends_read_back_live(&doc); +} + +/// After a path at half opacity, a blend's steps set their own transparency and lock and hidden +/// state on plain lines: readers of the printed form skip the blend's keys on `%_` lines. +#[test] +fn a_blends_steps_set_their_own_state() { + let mut doc = Document::new(300.0, 100.0); + let layer = doc.layers[0].id; + let mut faint = (*key_square(&mut doc, 250.0, 20.0, 20.0, Color::gray(0.5))).clone(); + faint.opacity = 0.5; + doc.insert(Some(layer), usize::MAX, faint).unwrap(); + let keys = + vec![key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(&mut doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let text = program(&doc); + let hidden_end = text.find("%_U\n%_9 () XW\n").unwrap(); + let steps = &text[hidden_end..text.find("(Adobe Path Blends) 1 0 ").unwrap()]; // brand-ok: the plugin name the files use + for line in ["\n0 A\n", "\n0 Xw\n", "\n0 1 0 0 0 Xy\n"] { + assert!(steps.contains(line), "{line:?} in {steps}"); + } +} + +/// A live blend's key objects keep their text wrap options on the hidden lines and the blend keeps +/// its own after its record; the steps, drawn art, carry none. +#[test] +fn a_live_blends_steps_carry_no_text_wrap_options() { + let mut doc = Document::new(300.0, 100.0); + let layer = doc.layers[0].id; + let keys = vec![ + Arc::new(wrapped((*key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(), 2.0, true)), + Arc::new(wrapped((*key_square(&mut doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))).clone(), 3.0, false)), + ]; + let n = wrapped(blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }), 8.0, false); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let text = program(&doc); + let hidden_end = text.find("%_U\n%_9 () XW\n").unwrap(); + let record = text.find("(Adobe Path Blends) 1 0 ").unwrap(); // brand-ok: the plugin name the files use + assert_eq!(text[..hidden_end].matches("(AI11TextWrapOffset)").count(), 2, "the keys' own: {text}"); + assert!(!text[hidden_end..record].contains("AI11TextWrap"), "the steps: {}", &text[hidden_end..record]); + assert_eq!(text[record..].matches("(AI11TextWrapOffset)").count(), 1, "the blend's own: {text}"); + let back = read_back(&doc); + let [blend] = blends_in(&back).try_into().unwrap(); + assert_eq!(blend.extras().wrap, Some(vectorcraft_doc::TextWrap { offset: 8.0, invert: false })); + let NodeKind::Blend { children, .. } = &blend.kind else { panic!() }; + same_wraps(&wraps(children), &[(None, 2.0, true), (None, 3.0, false)]); +} + +/// A Specified Distance that a 32-bit float doesn't hold exactly (10 mm in points) is written +/// live, and comes back as the float's shortest decimal, laying out the same steps. +#[test] +fn a_blend_spaced_in_millimeters_is_written_live() { + let mut doc = Document::new(300.0, 100.0); + let layer = doc.layers[0].id; + let keys = + vec![key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(&mut doc, 220.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let mm = 72.0 / 25.4 * 10.0; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Distance(mm), ..BlendSpec::default() }); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let back = read_back(&doc); + let [blend] = blends_in(&back).try_into().unwrap(); + let NodeKind::Blend { children, spec } = &blend.kind else { panic!() }; + assert_eq!(spec.spacing, BlendSpacing::Distance((mm as f32).to_string().parse().unwrap())); + let [ours] = blends_in(&doc).try_into().unwrap(); + let NodeKind::Blend { children: keys, spec: want } = &ours.kind else { panic!() }; + let steps = |k: &[Arc], s: &BlendSpec| vectorcraft_doc::blend::blend_expand(k, s); + assert_same_objects(&steps(children, spec), &steps(keys, want), "10 mm"); +} + +/// The lines of the layers, `%AI5_BeginLayer` to the end. +fn layer_lines(program: &str) -> Vec<&str> { + program.lines().skip_while(|l| !l.starts_with("%AI5_BeginLayer")).collect() +} + +/// A document with blends is written as the same bytes again, and what the reader reads back is +/// written with the same layers, every blend live both times. +#[test] +fn blends_write_the_same_bytes_again() { + let doc = blends_document(); + let first = export_ai_editing(&doc, &opts()).unwrap(); + assert_eq!(first.program, export_ai_editing(&doc, &opts()).unwrap().program); + let again = String::from_utf8(export_ai_editing(&read_back(&doc), &opts()).unwrap().program).unwrap(); + let first = String::from_utf8(first.program).unwrap(); + // Every blend is written live both times. + for text in [&first, &again] { + assert_eq!(text.matches("(Adobe Path Blends) 1 0 ").count(), 7); // brand-ok: the plugin name the files use + } + let (again, first) = (layer_lines(&again), layer_lines(&first)); + let differ = again.iter().zip(&first).enumerate().find(|(_, (a, b))| a != b); + assert_eq!(differ, None, "the first line that differs"); + assert_eq!(again.len(), first.len()); +} + +/// Blends the reader wouldn't read back as they are are written as their steps with a warning, as +/// many as the PDF part draws, each where it draws it. Each is changed from a blend that comes back +/// live by one thing: easing, a color shift, start points, an opacity mask, an effect or a fill of +/// its own; more objects than the reader lays out for one blend (5,006); a key that is type; a key +/// with a width profile, two fills, a hidden stroke or a gradient stroke, a drop shadow, a Lab +/// color, an opacity mask, a fill at half opacity or in Multiply, or a stroke under its fill (which +/// the editing copy writes otherwise); a key with Offset Path or Roughen, a group key with a fill of its own, or a +/// compound shape key (which baking changes); a group key holding an empty path, path keys of two +/// subpaths, a compound path key with a member of two subpaths (which the editing copy writes +/// otherwise); a clipping group +/// key; a hidden key; a key holding a +/// blend; keys with gradient fills (whose steps the reader can't compare); more than 62 keys; a +/// spine of two parts; and step counts on the edge of rounding (Smooth Color of one color with +/// edges four and a half key widths apart, Specified Distance of two and a half steps, and 0.03 pt +/// past them on a spine of 200 segments). Smooth Color of one color with edges five key widths +/// apart comes back live, and so does that Specified Distance blend on a spine of two segments. +#[test] +fn blends_the_reader_cant_read_are_written_as_their_steps() { + let live = |doc: &mut Document| { + let keys = vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }) + }; + let with_spec = |change: fn(&mut BlendSpec)| { + move |doc: &mut Document| { + let mut n = live(doc); + if let NodeKind::Blend { spec, .. } = &mut n.kind { + change(spec); + } + n + } + }; + let with_keys = |make: fn(&mut Document) -> Vec>| { + move |doc: &mut Document| { + let keys = make(doc); + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }) + } + }; + type Make = Box Node>; + let cases: Vec<(&str, Make)> = vec![ + ("live", Box::new(live)), + ("easing", Box::new(with_spec(|s| s.ease = BlendEase { kind: BlendEaseType::InOut, ramp: 0.5 }))), + ("color shift", Box::new(with_spec(|s| s.color_shift = 30.0))), + ("start points", Box::new(with_spec(|s| s.starts = vec![Some(1), None]))), + ( + "opacity mask", + Box::new(move |doc: &mut Document| { + let mut n = live(doc); + let art = (*key_square(doc, 0.0, 0.0, 200.0, Color::gray(1.0))).clone(); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(art), clip: false, invert: false, disabled: false, linked: true })); + n + }), + ), + ( + "type key", + Box::new(with_keys(|doc| { + let t = vectorcraft_doc::TextObject::point(vectorcraft_geom::Point::new(150.0, 40.0), "A", vectorcraft_doc::CharStyle::default()); + let text = Node::new(doc.alloc_id(), NodeKind::Text(Box::new(t))); + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), Arc::new(text)] + })), + ), + ( + "more than 5,000 objects", + Box::new(move |doc: &mut Document| { + let keys = (0..6).map(|i| key_square(doc, f64::from(i) * 60.0, 20.0, 10.0, Color::gray(f32::from(i as u8) / 6.0))).collect(); + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1000), ..BlendSpec::default() }) + }), + ), + ( + "key with a width profile", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + let mut st = StrokeLayer::new(solid(Color::BLACK), 4.0); + st.profile = Some(vectorcraft_doc::WidthProfile { points: vec![(0.0, 1.0, 0.5), (1.0, 0.0, 1.0)] }); + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.push(AppearanceItem::Stroke(st)); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "key with two fills", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + a.appearance.items.push(AppearanceItem::Fill(FillLayer::new(solid(Color::rgb(0.0, 1.0, 0.0))))); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "key with a hidden stroke", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + let st = StrokeLayer { visible: false, ..StrokeLayer::new(solid(Color::BLACK), 2.0) }; + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.push(AppearanceItem::Stroke(st)); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "key with a gradient stroke", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + let stops = vec![GradientStop::new(0.0, Color::rgb(1.0, 1.0, 1.0)), GradientStop::new(1.0, Color::rgb(0.0, 0.0, 0.0))]; + let grad = Paint::Gradient(Box::new(GradientPaint::new(Gradient::new(GradientKind::Linear, stops)))); + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.push(AppearanceItem::Stroke(StrokeLayer::new(grad, 2.0))); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "hidden key", + Box::new(with_keys(|doc| { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + a.visible = false; + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "nested blend", + Box::new(with_keys(|doc| { + let inner = + vec![key_square(doc, 20.0, 20.0, 10.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 40.0, 20.0, 10.0, Color::rgb(0.0, 1.0, 0.0))]; + let inner = blend_of(doc, inner, BlendSpec { spacing: BlendSpacing::Steps(1), ..BlendSpec::default() }); + vec![Arc::new(inner), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "gradient keys", + Box::new(with_keys(|doc| { + let stops = vec![GradientStop::new(0.0, Color::rgb(1.0, 0.0, 0.0)), GradientStop::new(1.0, Color::rgb(0.0, 0.0, 1.0))]; + let grad = Paint::Gradient(Box::new(GradientPaint::new(Gradient::new(GradientKind::Linear, stops)))); + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::gray(0.0))).clone(); + a.appearance = Appearance::basic(grad, Paint::None, 0.0).into(); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "63 keys", + Box::new(with_keys(|doc| { + (0..63).map(|i| key_square(doc, f64::from(i) * 6.0, 20.0, 2.0, Color::gray(f32::from(i as u8) / 63.0))).collect() + })), + ), + ("an effect of its own", Box::new(move |doc: &mut Document| with_own(live(doc), |n| n.appearance.effects.push(drop_shadow())))), + ( + "a fill of its own", + Box::new(move |doc: &mut Document| { + with_own(live(doc), |n| n.appearance.items.push(AppearanceItem::Fill(FillLayer::new(solid(Color::rgb(0.0, 1.0, 0.0)))))) + }), + ), + ( + "key with Offset Path", + Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance.effects.push(fx("path.offsetPath", serde_json::json!({"offset": 3})))))), + ), + ( + "key with Roughen", + Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance.effects.push(fx("distort.roughen", serde_json::json!({})))))), + ), + ("key with a drop shadow", Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance.effects.push(drop_shadow()))))), + ( + "key in a Lab color", + Box::new(with_keys(|doc| { + changed_key(doc, |a| a.appearance = Appearance::basic(solid(Color::Lab { l: 50.0, a: 60.0, b: -40.0 }), Paint::None, 0.0).into()) + })), + ), + ( + // The other key's stroke of no paint is left out, so the steps' strokes would blend from + // none. + "stroked key against a key with a stroke left out", + Box::new(with_keys(|doc| { + changed_key(doc, |a| a.appearance = Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), solid(Color::BLACK), 10.0).into()) + })), + ), + ( + // The reader reads at most 64 dash lengths; with more the stroke opens solid. + "key with a dash of 65 lengths", + Box::new(with_keys(|doc| { + let stroked = |dash: Option| { + move |a: &mut Node| { + let mut look = Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), solid(Color::BLACK), 2.0); + if let Some(AppearanceItem::Stroke(s)) = look.items.get_mut(1) { + s.dash = dash; + } + a.appearance = look.into(); + } + }; + let mut keys = changed_key(doc, stroked(Some(Dash { pattern: vec![2.0; 65], offset: 0.0, align_corners: false }))); + let mut b = (*keys[1]).clone(); + stroked(None)(&mut b); + keys[1] = Arc::new(b); + keys + })), + ), + ( + "key with a fill of no paint against a filled key", + Box::new(with_keys(|doc| changed_key(doc, |a| a.appearance = Appearance::basic(Paint::None, Paint::None, 0.0).into()))), + ), + ( + "key with an opacity mask", + Box::new(with_keys(|doc| { + let art = (*key_square(doc, 0.0, 0.0, 200.0, Color::gray(1.0))).clone(); + changed_key(doc, move |a| { + a.extras_mut().mask = + Some(Box::new(OpacityMask { art: Arc::new(art), clip: false, invert: false, disabled: false, linked: true })) + }) + })), + ), + ( + "key fill at half opacity", + Box::new(with_keys(|doc| { + changed_key(doc, |a| { + if let Some(AppearanceItem::Fill(f)) = a.appearance.items.first_mut() { + f.opacity = 0.5; + } + }) + })), + ), + ( + "key fill in Multiply", + Box::new(with_keys(|doc| { + changed_key(doc, |a| { + if let Some(AppearanceItem::Fill(f)) = a.appearance.items.first_mut() { + f.blend = BlendMode::Multiply; + } + }) + })), + ), + ( + "key stroke under its fill", + Box::new(with_keys(|doc| { + changed_key(doc, |a| { + a.appearance.items.retain(|i| matches!(i, AppearanceItem::Fill(_))); + a.appearance.items.insert(0, AppearanceItem::Stroke(StrokeLayer::new(solid(Color::BLACK), 2.0))); + }) + })), + ), + ( + "group key with a fill of its own", + Box::new(with_keys(|doc| { + let mut g = Node::group(doc.alloc_id(), vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]); + g.appearance.items.push(AppearanceItem::Fill(FillLayer::new(solid(Color::rgb(0.0, 1.0, 0.0))))); + let h = Node::group(doc.alloc_id(), vec![key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]); + vec![Arc::new(g), Arc::new(h)] + })), + ), + ( + "compound shape key", + Box::new(with_keys(|doc| { + let members = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 30.0, 30.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]; + let mut g = Node::group(doc.alloc_id(), members); + g.extras_mut().compound_shape = true; + vec![Arc::new(g), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "group key holding an empty path", + Box::new(with_keys(|doc| { + let empty = Node::path(doc.alloc_id(), PathData::default(), Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), Paint::None, 0.0)); + let g = Node::group(doc.alloc_id(), vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), Arc::new(empty)]); + let h = Node::group( + doc.alloc_id(), + vec![ + key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0)), + key_square(doc, 150.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0)), + ], + ); + vec![Arc::new(g), Arc::new(h)] + })), + ), + ( + "path key of two subpaths", + Box::new(with_keys(|doc| { + let mut ring = shapes::rectangle(Rect::new(20.0, 20.0, 40.0, 40.0)); + ring.subpaths.extend(shapes::rectangle(Rect::new(25.0, 25.0, 35.0, 35.0)).subpaths); + let a = Node::path(doc.alloc_id(), ring, Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), Paint::None, 0.0)); + let mut ring = shapes::rectangle(Rect::new(120.0, 20.0, 140.0, 40.0)); + ring.subpaths.extend(shapes::rectangle(Rect::new(125.0, 25.0, 135.0, 35.0)).subpaths); + let b = Node::path(doc.alloc_id(), ring, Appearance::basic(solid(Color::rgb(0.0, 0.0, 1.0)), Paint::None, 0.0)); + vec![Arc::new(a), Arc::new(b)] + })), + ), + ( + "compound path key with a member of two subpaths", + Box::new(with_keys(|doc| { + let mut two = shapes::rectangle(Rect::new(20.0, 20.0, 40.0, 40.0)); + two.subpaths.extend(shapes::rectangle(Rect::new(25.0, 25.0, 35.0, 35.0)).subpaths); + let paint = || Appearance::basic(solid(Color::rgb(1.0, 0.0, 0.0)), Paint::None, 0.0); + let a = Node::path(doc.alloc_id(), two, paint()); + let b = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(45.0, 20.0, 50.0, 25.0)), paint()); + let mut c = Node::new(doc.alloc_id(), NodeKind::Compound { children: vec![Arc::new(a), Arc::new(b)], rule: FillRule::EvenOdd }); + c.appearance = paint().into(); + vec![Arc::new(c), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "clipping group key", + Box::new(with_keys(|doc| { + let clip = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 20.0, 40.0, 40.0)), Appearance::default()); + let inside = key_square(doc, 15.0, 15.0, 30.0, Color::rgb(1.0, 0.0, 0.0)); + let g = Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clip), inside], clip: true }); + vec![Arc::new(g), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] + })), + ), + ( + "a spine of two parts", + Box::new(move |doc: &mut Document| { + let mut n = live(doc); + if let NodeKind::Blend { spec, .. } = &mut n.kind { + let mut spine = spine_through(&[20.0, 120.0], 20.0); + let (p, q) = (vectorcraft_geom::Point::new(0.0, 100.0), vectorcraft_geom::Point::new(50.0, 150.0)); + spine.subpaths.push(vectorcraft_geom::SubPath::polyline(&[p, q], false)); + (spec.spine, spec.key_anchors) = (Some(spine), vec![0, 1]); + } + n + }), + ), + ( + "Smooth Color of one color, four and a half key widths apart", + Box::new(move |doc: &mut Document| { + let keys = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 110.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::SmoothColor, ..BlendSpec::default() }) + }), + ), + ( + "live", + Box::new(move |doc: &mut Document| { + let keys = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::SmoothColor, ..BlendSpec::default() }) + }), + ), + ( + "Specified Distance of two and a half steps", + Box::new(move |doc: &mut Document| { + let keys = + vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Distance(40.0), ..BlendSpec::default() }) + }), + ), + ( + "Specified Distance 0.03 pt past two and a half steps on a spine of 200 segments", + Box::new(move |doc: &mut Document| distance_on_segments(doc, 200)), + ), + ("live", Box::new(move |doc: &mut Document| distance_on_segments(doc, 2))), + ]; + /// Red to blue squares whose centers are 100.03 pt apart, on a straight spine of `segments` + /// equal segments between them, in Specified Distance of 40 pt. + fn distance_on_segments(doc: &mut Document, segments: u32) -> Node { + let keys = vec![key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, 120.03, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let points: Vec = + (0..=segments).map(|i| vectorcraft_geom::Point::new(30.0 + 100.03 * f64::from(i) / f64::from(segments), 30.0)).collect(); + let spine = PathData::single(vectorcraft_geom::SubPath::polyline(&points, false)); + let spec = BlendSpec { spacing: BlendSpacing::Distance(40.0), spine: Some(spine), key_anchors: vec![0, segments], ..BlendSpec::default() }; + blend_of(doc, keys, spec) + } + // Every case runs, and the cases that fail are listed together. + let failed: Vec<&str> = cases + .into_iter() + .filter(|(what, make)| std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| written_as_steps(what, make))).is_err()) + .map(|(what, _)| what) + .collect(); + assert!(failed.is_empty(), "failed: {failed:?}"); +} + +/// The blend `make` makes, alone on a layer: written live when `what` is "live", else written as its +/// steps with a warning, as many as the PDF part draws, each where it draws it. +fn written_as_steps(what: &str, make: &dyn Fn(&mut Document) -> Node) { + let mut doc = Document::new(400.0, 200.0); + let n = make(&mut doc); + let id = n.id; + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + let first = read_back(&doc).layers[0].children().unwrap()[0].clone(); + if what == "live" { + assert!(!out.warnings.iter().any(|w| w == writer::BLENDS), "{what}: {:?}", out.warnings); + assert!(matches!(first.kind, NodeKind::Blend { .. }), "{what}: {:?}", first.kind); + return; + } + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "{what}: {:?}", out.warnings); + assert!(matches!(first.kind, NodeKind::Group { .. }), "{what}: its steps, as a group: {:?}", first.kind); + assert!(!program(&doc).contains("ShapeBlendPathType"), "{what}"); + // The steps the PDF part draws: the blend as baking left it, laid out. + let baked = vectorcraft_effects::bake_document(&doc).unwrap_or_else(|| doc.clone()); + let blend = baked.layers[0].children().unwrap()[0].clone(); + assert_eq!(blend.id, id, "{what}"); + let steps = vectorcraft_effects::expand_live_deep(Some(&baked), &blend); + let want: Vec = steps.children().unwrap().iter().map(|s| (**s).clone()).collect(); + let got: Vec = first.children().unwrap().iter().map(|s| (**s).clone()).collect(); + // As many, each where the PDF part draws it (strokes written as outlines may move a step's + // bounds by up to half their width). + assert_eq!(got.len(), want.len(), "{what}: how many steps"); + let center = |n: &Node| n.geometric_bounds().map(|b| b.center()).unwrap(); + for (i, (g, w)) in got.iter().zip(&want).enumerate() { + assert!((center(g) - center(w)).hypot() <= 2.5, "{what}, step {i}: {:?} for {:?}", center(g), center(w)); + } +} + +/// `n` changed by `change`. +fn with_own(mut n: Node, change: impl FnOnce(&mut Node)) -> Node { + change(&mut n); + n +} + +/// Two keys, red and blue squares, the red one changed by `change`. +fn changed_key(doc: &mut Document, change: impl FnOnce(&mut Node)) -> Vec> { + let mut a = (*key_square(doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0))).clone(); + change(&mut a); + vec![Arc::new(a), key_square(doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))] +} + +/// A document with `blend` (two squares, three steps) in a context the reader doesn't read a blend +/// in, or one the writer writes as hidden lines. +fn blend_in_context(context: &str) -> Document { + let mut doc = Document::new(400.0, 200.0); + let layer = doc.layers[0].id; + let blend = |doc: &mut Document, x: f64| { + let keys = vec![key_square(doc, x, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(doc, x + 100.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + blend_of(doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }) + }; + let square_with = |doc: &mut Document, fill: Paint| { + Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 100.0, 180.0, 180.0)), Appearance::basic(fill, Paint::None, 0.0)) + }; + let n = match context { + "pattern tile" => { + let b = blend(&mut doc, 0.0); + doc.patterns.push(vectorcraft_doc::PatternDef { + tile: Rect::new(0.0, 0.0, 150.0, 60.0), + ..vectorcraft_doc::PatternDef::new("Fades", vec![Arc::new(b)]) + }); + square_with(&mut doc, Paint::Pattern { pattern: "Fades".into(), xf: Affine::IDENTITY }) + } + "opacity mask" => { + let b = blend(&mut doc, 20.0); + let mut n = square_with(&mut doc, solid(Color::BLACK)); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(b), clip: false, invert: false, disabled: false, linked: true })); + n + } + "symbol" => { + let b = blend(&mut doc, 0.0); + doc.symbols.push(Symbol { dynamic: false, name: "Fade".into(), art: Arc::new(b) }); + instance(&mut doc, "Fade", Affine::translate((20.0, 20.0))) + } + "art cut to a clipping object" => { + let clipper = Node::group(doc.alloc_id(), vec![Arc::new(square_with(&mut doc, Paint::None))]); + let b = blend(&mut doc, 20.0); + Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clipper), Arc::new(b)], clip: true }) + } + // Eight symbols' art inside each other, each instance written as its art (isolated): the + // blend is written eight levels down. + "eight levels down" => { + let b = blend(&mut doc, 0.0); + doc.symbols.push(Symbol { dynamic: false, name: "S0".into(), art: Arc::new(b) }); + for i in 1..8 { + let mut inner = instance(&mut doc, &format!("S{}", i - 1), Affine::IDENTITY); + inner.isolate = true; + doc.symbols.push(Symbol { dynamic: false, name: format!("S{i}"), art: Arc::new(inner) }); + } + let mut top = instance(&mut doc, "S7", Affine::translate((20.0, 20.0))); + top.isolate = true; + top + } + _ => panic!("{context}"), + }; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + doc +} + +/// Blends in pattern tiles, opacity masks and symbols (written as hidden lines or in a symbol's +/// definition), in art cut to a clipping object and eight levels down in art written in place of +/// symbol instances are written as their steps, with a warning. +#[test] +fn blends_in_other_art_are_written_as_their_steps() { + let live = |context: &str| { + let doc = blend_in_context(context); + let out = export_ai_editing(&doc, &opts()).unwrap(); + !out.warnings.iter().any(|w| w == writer::BLENDS) || program(&doc).contains("ShapeBlendPathType") + }; + let contexts = ["pattern tile", "opacity mask", "symbol", "art cut to a clipping object", "eight levels down"]; + let failed: Vec<&str> = contexts.into_iter().filter(|c| live(c)).collect(); + assert!(failed.is_empty(), "written live: {failed:?}"); +} + +/// Blends past what the reader lays out in one file (50,000 objects, each blend counted twice) are +/// written as their steps, with a warning; the blends before them are written live. +#[test] +fn blends_past_the_readers_budget_are_written_as_their_steps() { + let mut doc = Document::new(400.0, 400.0); + let layer = doc.layers[0].id; + // Three keys and 2,003 objects each: twelve take 48,072 and the thirteenth would pass 50,000. + for i in 0..13 { + let y = f64::from(i) * 25.0; + let keys = vec![ + key_square(&mut doc, 20.0, y, 10.0, Color::rgb(1.0, 0.0, 0.0)), + key_square(&mut doc, 120.0, y, 10.0, Color::rgb(0.0, 0.0, 1.0)), + key_square(&mut doc, 220.0, y, 10.0, Color::rgb(0.0, 1.0, 0.0)), + ]; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(1000), ..BlendSpec::default() }); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + } + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + let back = read_back(&doc); + let art = back.layers[0].children().unwrap(); + let live: Vec = art.iter().map(|n| matches!(n.kind, NodeKind::Blend { .. })).collect(); + assert_eq!(live, [vec![true; 12], vec![false]].concat()); +} + +/// On a large canvas every blend is written as its steps, with a warning. +#[test] +fn a_large_canvas_writes_blends_as_their_steps() { + let mut doc = Document::new(20000.0, 100.0); + let keys = + vec![key_square(&mut doc, 20.0, 20.0, 20.0, Color::rgb(1.0, 0.0, 0.0)), key_square(&mut doc, 120.0, 20.0, 20.0, Color::rgb(0.0, 0.0, 1.0))]; + let n = blend_of(&mut doc, keys, BlendSpec { spacing: BlendSpacing::Steps(3), ..BlendSpec::default() }); + let layer = doc.layers[0].id; + doc.insert(Some(layer), usize::MAX, n).unwrap(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::BLENDS), "{:?}", out.warnings); + assert!(matches!(read_back(&doc).layers[0].children().unwrap()[0].kind, NodeKind::Group { .. })); +} + +// ---------- gradient meshes ---------- + +use vectorcraft_doc::live::{GradientMesh, H_DOWN, H_RIGHT, MeshPoint, grid_points, smooth_handles}; + +/// A mesh over `r` of `rows` × `cols` patches: its points on a grid with smooth handles, each +/// colored `color(row, col)` and opaque. +fn grid_mesh(r: Rect, rows: u32, cols: u32, color: impl Fn(usize, usize) -> Color) -> GradientMesh { + let pts = grid_points(r, rows, cols); + let handles = smooth_handles(rows, cols, &pts); + let width = cols as usize + 1; + let points = pts + .iter() + .zip(handles) + .enumerate() + .map(|(i, (p, h))| MeshPoint { p: *p, color: color(i / width, i % width), opacity: 1.0, handles: h }) + .collect(); + GradientMesh { rows, cols, points } +} + +fn mesh_node(doc: &mut Document, m: GradientMesh) -> Node { + Node::new(doc.alloc_id(), NodeKind::Mesh(m)) +} + +/// The gradient meshes in `doc`'s layers, in order (groups and clipping groups included). +fn meshes_in(doc: &Document) -> Vec> { + fn walk(nodes: &[Arc], out: &mut Vec>) { + for n in nodes { + if matches!(n.kind, NodeKind::Mesh(_)) { + out.push(n.clone()); + } else if let Some(c) = n.children() { + walk(c, out); + } + } + } + let mut out = vec![]; + walk(&doc.layers, &mut out); + out +} + +fn mesh_of(n: &Node) -> &GradientMesh { + match &n.kind { + NodeKind::Mesh(m) => m, + _ => panic!("not a mesh: {n:?}"), + } +} + +/// A 400 × 400 document with gradient meshes: `Sheet`, 2 × 3 patches over 20 20 200 120, its top row +/// of points RGB, its middle row CMYK and its bottom row gray, its middle point moved with handles of +/// its own, its top left point's handle to the right bent up, two points part transparent, at 60% +/// in Multiply, followed by a path at 80%; a hidden, locked 1 × 1 gray mesh `Shy` in a group `Box`; +/// `Masked`, 1 × 2 with an inverted, unlinked opacity mask, knockout shape, isolation and knockout; +/// and a mesh in a clipping group. +fn meshes_document() -> Document { + let mut doc = Document::new(400.0, 400.0); + let layer = doc.layers[0].id; + let mut sheet = grid_mesh(Rect::new(20.0, 20.0, 200.0, 120.0), 2, 3, |r, c| match r { + 0 => Color::rgb(1.0, 0.5 * c as f32 / 3.0, 0.0), + 1 => Color::cmyk(0.1 * c as f32, 0.6, 0.2, 0.05), + _ => Color::gray(0.2 + 0.2 * c as f32), + }); + let middle = &mut sheet.points[5]; + middle.p += vectorcraft_geom::Vec2::new(7.0, -5.0); + middle.handles[H_RIGHT] = vectorcraft_geom::Vec2::new(20.0, 8.0); + middle.handles[H_DOWN] = vectorcraft_geom::Vec2::new(-4.0, 12.0); + sheet.points[0].handles[H_RIGHT] = vectorcraft_geom::Vec2::new(15.0, -10.0); + sheet.points[2].opacity = 0.4; + sheet.points[11].opacity = 0.0; + let mut sheet = mesh_node(&mut doc, sheet); + (sheet.name, sheet.opacity, sheet.blend) = (Some("Sheet".into()), 0.6, BlendMode::Multiply); + doc.insert(Some(layer), usize::MAX, sheet).unwrap(); + let mut after = Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(240.0, 20.0, 260.0, 40.0)), + Appearance::basic(solid(Color::rgb(0.0, 1.0, 0.0)), Paint::None, 0.0), + ); + after.opacity = 0.8; + doc.insert(Some(layer), usize::MAX, after).unwrap(); + let mut shy = mesh_node(&mut doc, grid_mesh(Rect::new(20.0, 150.0, 80.0, 190.0), 1, 1, |_, c| Color::gray(0.25 + 0.5 * c as f32))); + (shy.name, shy.visible, shy.locked) = (Some("Shy".into()), false, true); + let mut group = Node::group(doc.alloc_id(), vec![Arc::new(shy)]); + group.name = Some("Box".into()); + doc.insert(Some(layer), usize::MAX, group).unwrap(); + let mut masked = mesh_node(&mut doc, grid_mesh(Rect::new(120.0, 150.0, 220.0, 190.0), 1, 2, |r, _| Color::rgb(0.0, 0.3, 0.3 + 0.5 * r as f32))); + masked.name = Some("Masked".into()); + // Knockout shape is a mesh's own; isolation and knockout are a group's. + (masked.knockout_shape, masked.isolate, masked.knockout) = (true, true, vectorcraft_doc::Knockout::On); + let mask_art = Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(120.0, 150.0, 170.0, 190.0)), + Appearance::basic(solid(Color::WHITE), Paint::None, 0.0), + ); + masked.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(mask_art), clip: true, invert: true, disabled: false, linked: false })); + doc.insert(Some(layer), usize::MAX, masked).unwrap(); + let clip = Node::path(doc.alloc_id(), shapes::ellipse(Rect::new(250.0, 150.0, 350.0, 250.0)), Appearance::default()); + let inside = mesh_node(&mut doc, grid_mesh(Rect::new(250.0, 150.0, 350.0, 250.0), 2, 2, |r, c| Color::rgb(0.5 * r as f32, 0.5 * c as f32, 1.0))); + let clipped = Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clip), Arc::new(inside)], clip: true }); + doc.insert(Some(layer), usize::MAX, clipped).unwrap(); + doc +} + +/// How far a coordinate, color channel or opacity written to 4 decimals may move: half the last +/// decimal, and a little for the arithmetic. +const MESH_ROUNDING: f64 = 5e-5 + 1e-9; + +/// `read` is `want` as written, checked without the writer's own test: the same grid; each point +/// within [`MESH_ROUNDING`] of its place along each axis; each handle that points into the grid +/// ending within it of where `want`'s ends, and each handle on the mesh's outside edge read as +/// none (the reader gives those none, and they draw nothing); each color in the same model with +/// each channel within it of `want`'s clamped to 0 to 1; each opacity within it. +fn assert_mesh_exact(read: &GradientMesh, want: &GradientMesh, what: &str) { + use vectorcraft_doc::live::H_LEFT; + use vectorcraft_doc::live::H_UP; + assert_eq!((read.rows, read.cols, read.points.len()), (want.rows, want.cols, want.points.len()), "{what}: the grid"); + let (rows, cols) = (want.rows as usize, want.cols as usize); + let close = |a: f64, b: f64| (a - b).abs() <= MESH_ROUNDING; + let channels = |c: &Color| -> (u8, Vec) { + match *c { + Color::Gray { k } => (0, vec![f64::from(k)]), + Color::Rgb { r, g, b } => (1, vec![f64::from(r), f64::from(g), f64::from(b)]), + Color::Cmyk { c, m, y, k } => (2, vec![f64::from(c), f64::from(m), f64::from(y), f64::from(k)]), + Color::Lab { .. } => (3, vec![]), + } + }; + for (i, (a, b)) in read.points.iter().zip(&want.points).enumerate() { + let (r, c) = (i / (cols + 1), i % (cols + 1)); + assert!(close(a.p.x, b.p.x) && close(a.p.y, b.p.y), "{what}: point {i} at {:?}, want {:?}", a.p, b.p); + for (h, inside) in [(H_RIGHT, c < cols), (H_LEFT, c > 0), (H_DOWN, r < rows), (H_UP, r > 0)] { + if inside { + let (ea, eb) = (a.p + a.handles[h], b.p + b.handles[h]); + assert!(close(ea.x, eb.x) && close(ea.y, eb.y), "{what}: point {i}'s handle {h} ends at {ea:?}, want {eb:?}"); + } else { + assert_eq!(a.handles[h], vectorcraft_geom::Vec2::ZERO, "{what}: point {i}'s outside handle {h}"); + } + } + let ((ma, ca), (mb, cb)) = (channels(&a.color), channels(&b.color)); + assert_eq!(ma, mb, "{what}: point {i}'s color model: {:?}, want {:?}", a.color, b.color); + assert!(ca.iter().zip(&cb).all(|(x, y)| close(*x, y.clamp(0.0, 1.0))), "{what}: point {i}'s color {:?}, want {:?}", a.color, b.color); + assert!(close(f64::from(a.opacity), f64::from(b.opacity.clamp(0.0, 1.0))), "{what}: point {i}'s opacity {}, want {}", a.opacity, b.opacity); + } +} + +/// Each mesh of `doc` comes back from the editing data alone as a mesh: the same grid, points, +/// handles, colors in their own models and opacities ([`assert_mesh_exact`]), name, transparency +/// (opacity, blending mode and knockout shape; isolation and knockout are a group's and are written +/// off, as for a path), lock and hidden state, and opacity mask (its flags and its art's kind and +/// box). +fn assert_meshes_read_back(doc: &Document) { + let back = read_back(doc); + let (ours, theirs) = (meshes_in(doc), meshes_in(&back)); + assert_eq!(theirs.len(), ours.len(), "{:#?}", back.layers[0]); + for (a, b) in ours.iter().zip(&theirs) { + assert_mesh_exact(mesh_of(b), mesh_of(a), &format!("{:?}", a.name)); + assert_eq!((&b.name, b.opacity, b.blend, b.visible, b.locked), (&a.name, a.opacity, a.blend, a.visible, a.locked)); + // Isolation and knockout are written off (`Xy`); a mesh read keeps a new object's. + let fresh = Node::new(b.id, NodeKind::Mesh(mesh_of(b).clone())); + assert_eq!((b.knockout_shape, b.isolate, b.knockout), (a.knockout_shape, fresh.isolate, fresh.knockout), "{:?}'s knockout", a.name); + match (&a.extras().mask, &b.extras().mask) { + (None, None) => {} + (Some(ma), Some(mb)) => { + assert_eq!((mb.clip, mb.invert, mb.disabled, mb.linked), (ma.clip, ma.invert, ma.disabled, ma.linked), "{:?}'s mask flags", a.name); + assert_eq!(std::mem::discriminant(&mb.art.kind), std::mem::discriminant(&ma.art.kind), "{:?}'s mask art", a.name); + let (ba, bb) = (ma.art.geometric_bounds().unwrap(), mb.art.geometric_bounds().unwrap()); + assert!( + (ba.x0 - bb.x0).abs() < 1e-3 && (ba.y0 - bb.y0).abs() < 1e-3 && (ba.x1 - bb.x1).abs() < 1e-3 && (ba.y1 - bb.y1).abs() < 1e-3, + "{:?}'s mask art box {bb:?}, want {ba:?}", + a.name + ); + } + (want, got) => panic!("{:?}'s opacity mask: {} read back, want {}", a.name, got.is_some(), want.is_some()), + } + } +} + +#[test] +fn meshes_are_read_back_as_they_are() { + let doc = meshes_document(); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::MESHES || w == writer::LIVE), "{:?}", out.warnings); + assert_eq!(program(&doc).matches("/Mesh X!\n").count(), 4); + assert_meshes_read_back(&doc); + let back = read_back(&doc); + let art = back.layers[0].children().unwrap(); + assert_eq!((art[1].opacity, matches!(art[1].kind, NodeKind::Path { .. })), (0.8, true), "the path after the mesh keeps its own opacity"); + // The moved point keeps its place and handles exactly (to the 4 decimals written). + let sheet = mesh_of(&art[0]); + assert!((sheet.points[5].p - vectorcraft_geom::Point::new(87.0, 65.0)).hypot() < 1e-4, "{:?}", sheet.points[5].p); + assert!((sheet.points[5].handles[H_RIGHT] - vectorcraft_geom::Vec2::new(20.0, 8.0)).hypot() < 1e-4); +} + +/// A mesh is `/Mesh X!`, its version (2: corners with an opacity), type and size, `/Data`, each +/// patch row by row with its place, the color space where it changes and four corners (from the +/// top left point down, right and up: color, opacity, point, the handle towards the next corner and +/// the one before it, in art space), `/End X!`; its transparency before it, its name after it, then +/// `0 0 Xd` and `6 () XW`. Gray is written as lightness. +#[test] +fn meshes_are_written_in_their_form() { + let doc = meshes_document(); + let text = program(&doc); + let start = text.find("/Mesh X!\n").unwrap(); + let end = start + text[start..].find("/End X!\n").unwrap() + "/End X!\n".len(); + let sheet = &text[start..end]; + assert!( + sheet.starts_with("/Mesh X!\n%_2 /Version X#\n%_/Cartesian /Type X#\n%_[2 3] /Size X#\n%_/Data X#\n%_[0 0] /P X#\n%_/DeviceRGB /CS X#\n"), + "{sheet}" + ); + let places: Vec<&str> = sheet.lines().filter(|l| l.ends_with(" /P X#")).collect(); + assert_eq!(places, ["%_[0 0] /P X#", "%_[0 1] /P X#", "%_[0 2] /P X#", "%_[1 0] /P X#", "%_[1 1] /P X#", "%_[1 2] /P X#"]); + // The top left point, at 20 20 (art 20 -20): its handle down a third of the way to the next row, + // its handle to the right bent up. + let corners: Vec<&str> = sheet.lines().filter(|l| l.ends_with(" /N X#")).collect(); + assert_eq!(corners.len(), 24); + assert_eq!(corners[0], "%_[1 0 0 1 20 -20 20 -36.6667 1 35 -10 1] /N X#"); + // The color space only where it changes. + let spaces: Vec<&str> = sheet.lines().filter(|l| l.ends_with(" /CS X#")).collect(); + assert!(spaces.windows(2).all(|w| w[0] != w[1]), "{spaces:?}"); + assert!(spaces.contains(&"%_/DeviceCMYK /CS X#") && spaces.contains(&"%_/DeviceGray /CS X#"), "{spaces:?}"); + // Gray 0.2 of ink is 0.8 of lightness: the bottom left point, the second corner of the second row's first patch. + assert!(corners[13].starts_with("%_[0.8 1 20 -120 "), "{}", corners[13]); + // Only what the reader reads: no `/R` entries. + assert!(!sheet.contains("/R X#"), "{sheet}"); + // Its transparency before it; its name, then its state block, after it. + assert!(text[..start].ends_with("0 XR\n1 0.6 0 0 0 Xy\n"), "{}", &text[start.saturating_sub(80)..start]); + let rest = &text[end..]; + assert!(rest.starts_with("%_/ArtDictionary :\n%_/XMLUID : (Sheet) ; (AI10_ArtUID) ,\n%_;\n%_\n0 0 Xd\n6 () XW\n"), "{}", &rest[..200]); +} + +/// A document with meshes is written as the same bytes again, and what the reader reads back is +/// written with the same layers. +#[test] +fn meshes_write_the_same_bytes_again() { + let doc = meshes_document(); + let first = export_ai_editing(&doc, &opts()).unwrap(); + assert_eq!(first.program, export_ai_editing(&doc, &opts()).unwrap().program); + let again = String::from_utf8(export_ai_editing(&read_back(&doc), &opts()).unwrap().program).unwrap(); + let first = String::from_utf8(first.program).unwrap(); + let (again, first) = (mesh_layer_lines(&again), mesh_layer_lines(&first)); + let differ = again.iter().zip(&first).enumerate().find(|(_, (a, b))| a != b); + assert_eq!(differ, None, "the first line that differs"); + assert_eq!(again.len(), first.len()); +} + +/// The lines of the layers, `%AI5_BeginLayer` to the end. +fn mesh_layer_lines(program: &str) -> Vec<&str> { + program.lines().skip_while(|l| !l.starts_with("%AI5_BeginLayer")).collect() +} + +/// A document holding one mesh made by `make`, on a 400 × 400 page. +fn mesh_document(make: impl FnOnce(&mut Document) -> Node) -> Document { + let mut doc = Document::new(400.0, 400.0); + let layer = doc.layers[0].id; + let n = make(&mut doc); + doc.insert(Some(layer), usize::MAX, n).unwrap(); + doc +} + +/// Whether `doc` holds a gradient mesh anywhere: on its layers (opacity masks' art included), in a +/// symbol's art or in a pattern's tile. +fn holds_a_mesh(doc: &Document) -> bool { + fn any(n: &Node) -> bool { + matches!(n.kind, NodeKind::Mesh(_)) + || n.extras().mask.as_ref().is_some_and(|m| any(&m.art)) + || n.children().is_some_and(|c| c.iter().any(|c| any(c))) + } + doc.layers.iter().any(|n| any(n)) || doc.symbols.iter().any(|s| any(&s.art)) || doc.patterns.iter().any(|p| p.art.iter().any(|n| any(n))) +} + +/// The box and color of each path with a solid fill in `nodes` and what they hold. +fn filled_paths(nodes: &[Arc], out: &mut Vec<(Rect, Color)>) { + for n in nodes { + if let NodeKind::Path { .. } = n.kind { + for item in &n.appearance.items { + if let AppearanceItem::Fill(f) = item + && let Paint::Solid { color, .. } = &f.paint + && let Some(b) = n.geometric_bounds() + { + out.push((b, *color)); + } + } + } else if let Some(c) = n.children() { + filled_paths(c, out); + } + } +} + +/// Meshes the reader wouldn't read back as they are, and meshes in places where the writer doesn't +/// write them as meshes, are written as their drawn look, with a warning: a point in a Lab color; +/// more than 128 rows (129); more than 128 columns (129); a mesh whose points all lie in one place +/// (the reader takes its rows for columns); a folded mesh, whose patches turn different ways; a +/// patch folded at one corner, by a point dragged across it or by handles that cross; a mesh +/// in art cut to a clipping object; and a mesh on a large canvas. The drawn look reads back as +/// filled paths in more than one color covering the mesh's box, and no mesh. +#[test] +fn meshes_the_reader_cant_read_are_written_as_their_drawn_look() { + let r = Rect::new(20.0, 20.0, 120.0, 120.0); + let mut cases: Vec<(&str, Document)> = vec![ + ( + "Lab point", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 1, |_, _| Color::rgb(0.2, 0.4, 0.6)); + m.points[3].color = MINT; + mesh_node(doc, m) + }), + ), + ( + "129 rows", + mesh_document(|doc| mesh_node(doc, grid_mesh(Rect::new(20.0, 20.0, 120.0, 300.0), 129, 1, |r, _| Color::gray(r as f32 / 129.0)))), + ), + ( + "129 columns", + mesh_document(|doc| mesh_node(doc, grid_mesh(Rect::new(20.0, 20.0, 300.0, 120.0), 1, 129, |_, c| Color::gray(c as f32 / 129.0)))), + ), + ( + "folded", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 2, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + // The right column's points fold back over the left patch; the edges are straight. + for row in 0..2 { + m.points[row * 3 + 2].p = vectorcraft_geom::Point::new(40.0, m.points[row * 3 + 2].p.y); + } + for p in &mut m.points { + p.handles = [vectorcraft_geom::Vec2::ZERO; 4]; + } + mesh_node(doc, m) + }), + ), + ( + "folded at a corner", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 1, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + // The bottom right point is dragged across the patch's diagonal; its top left corner + // still turns as before. + m.points[3].p = vectorcraft_geom::Point::new(30.0, 30.0); + for p in &mut m.points { + p.handles = [vectorcraft_geom::Vec2::ZERO; 4]; + } + mesh_node(doc, m) + }), + ), + ( + "handles crossed", + mesh_document(|doc| { + let mut m = grid_mesh(r, 1, 1, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + // The top left point's handles cross inside the patch: the one towards the point + // below leans right of the one towards the point beside it. The corners stay put. + for p in &mut m.points { + p.handles = [vectorcraft_geom::Vec2::ZERO; 4]; + } + m.points[0].handles[vectorcraft_doc::live::H_DOWN] = vectorcraft_geom::Vec2::new(30.0, 10.0); + m.points[0].handles[vectorcraft_doc::live::H_RIGHT] = vectorcraft_geom::Vec2::new(10.0, 30.0); + mesh_node(doc, m) + }), + ), + ( + "collapsed", + mesh_document(|doc| { + let mut m = grid_mesh(r, 2, 2, |r, c| Color::rgb(0.5 * r as f32, 0.5 * c as f32, 0.0)); + for p in &mut m.points { + (p.p, p.handles) = (vectorcraft_geom::Point::new(50.0, 50.0), [vectorcraft_geom::Vec2::ZERO; 4]); + } + mesh_node(doc, m) + }), + ), + ( + "art cut to a clipping object", + mesh_document(|doc| { + let square = Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 20.0, 80.0, 80.0)), Appearance::default()); + let clipper = Node::group(doc.alloc_id(), vec![Arc::new(square)]); + let m = mesh_node(doc, grid_mesh(r, 1, 1, |_, c| Color::rgb(c as f32, 0.0, 0.0))); + Node::new(doc.alloc_id(), NodeKind::Group { children: vec![Arc::new(clipper), Arc::new(m)], clip: true }) + }), + ), + ]; + let mut large = Document::new(20000.0, 400.0); + let layer = large.layers[0].id; + let m = mesh_node(&mut large, grid_mesh(Rect::new(1000.0, 20.0, 1600.0, 320.0), 2, 2, |r, c| Color::rgb(0.5 * r as f32, 0.5 * c as f32, 0.5))); + large.insert(Some(layer), usize::MAX, m).unwrap(); + cases.push(("large canvas", large)); + let mut failed = vec![]; + for (name, doc) in &cases { + let out = export_ai_editing(doc, &opts()).unwrap(); + let warned = out.warnings.iter().any(|w| w == writer::MESHES); + let written = String::from_utf8(out.program).unwrap(); + let back = read_back(doc); + let mut paths = vec![]; + filled_paths(&back.layers, &mut paths); + let mut want = mesh_of(&meshes_in(doc)[0]).bounds().unwrap(); + if *name == "art cut to a clipping object" { + // Its drawn look is cut to the clipping object. + want = want.intersect(Rect::new(20.0, 20.0, 80.0, 80.0)); + } + let got = paths.iter().fold(None, |acc: Option, (b, _)| Some(acc.map_or(*b, |a| a.union(*b)))); + let colors = paths.iter().map(|(_, c)| format!("{c:?}")).collect::>().len(); + // The collapsed mesh has no area to cover. + let covers = *name == "collapsed" + || got.is_some_and(|g| { + (g.x0 - want.x0).abs() < 0.5 && (g.y0 - want.y0).abs() < 0.5 && (g.x1 - want.x1).abs() < 0.5 && (g.y1 - want.y1).abs() < 0.5 + }); + if !(warned && !written.contains("/Mesh X!") && !holds_a_mesh(&back) && covers && (*name == "collapsed" || colors > 1)) { + failed.push(format!("{name}: warned {warned}, box {got:?} want {want:?}, {colors} colors")); + } + } + assert!(failed.is_empty(), "written as meshes, without a warning or not as their drawn look: {failed:#?}"); +} + +/// A reflected mesh, mirrored across or along, is written as a mesh with its columns in reverse +/// order, without a warning, and reads back as that mesh: each row's points from the last to the +/// first, with their handles to the right and left swapped. +#[test] +fn a_reflected_mesh_is_written_with_its_columns_reversed() { + use vectorcraft_doc::live::{H_LEFT, H_RIGHT}; + let r = Rect::new(20.0, 20.0, 120.0, 120.0); + for (name, mirror) in [("across", Affine::new([-1.0, 0.0, 0.0, 1.0, 140.0, 0.0])), ("along", Affine::new([1.0, 0.0, 0.0, -1.0, 0.0, 140.0]))] { + let mut m = grid_mesh(r, 2, 3, |r, c| Color::rgb(0.5 * r as f32, c as f32 / 3.0, 0.2)); + m.points[5].p += vectorcraft_geom::Vec2::new(4.0, -3.0); + m.points[5].opacity = 0.5; + m.transform(mirror); + let doc = mesh_document(|doc| mesh_node(doc, m.clone())); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::MESHES), "{name}: {:?}", out.warnings); + let back = meshes_in(&read_back(&doc)); + assert_eq!(back.len(), 1, "{name}: {back:#?}"); + let width = m.cols as usize + 1; + let mut want = m.clone(); + want.points = m + .points + .chunks(width) + .flat_map(|row| { + row.iter().rev().map(|p| { + let mut p = p.clone(); + p.handles.swap(H_RIGHT, H_LEFT); + p + }) + }) + .collect(); + assert_mesh_exact(mesh_of(&back[0]), &want, name); + // It draws the same mesh: each patch's points and opacity, sampled across it, are where they + // were, in the patch at the other end of its row with u running the other way. + let got = mesh_of(&back[0]); + let cols = m.cols as usize; + let steps = [0.0, 0.25, 0.5, 0.75, 1.0]; + for r in 0..m.rows as usize { + for c in 0..cols { + for (u, v) in steps.iter().flat_map(|u| steps.iter().map(move |v| (*u, *v))) { + let (a, b) = (m.eval(r, c, u, v), got.eval(r, cols - 1 - c, 1.0 - u, v)); + assert!((a - b).hypot() < 1e-3, "{name}: patch ({r}, {c}) at ({u}, {v}): {a:?} read back as {b:?}"); + let (oa, ob) = (m.color_at(r, c, u, v).1, got.color_at(r, cols - 1 - c, 1.0 - u, v).1); + assert!((oa - ob).abs() < 1e-3, "{name}: patch ({r}, {c}) at ({u}, {v}): opacity {oa} read back as {ob}"); + } + } + } + } +} + +/// Meshes in pattern tiles, a symbol's pattern tile among them, are written as their drawn look with +/// a warning: the tile reads back with filled paths and no mesh. +#[test] +fn meshes_in_pattern_tiles_are_written_as_their_drawn_look() { + let tile = |doc: &mut Document| { + let m = mesh_node(doc, grid_mesh(Rect::new(0.0, 0.0, 60.0, 40.0), 1, 1, |_, c| Color::rgb(0.5 * c as f32, 0.2, 0.5))); + doc.patterns.push(vectorcraft_doc::PatternDef { + tile: Rect::new(0.0, 0.0, 60.0, 40.0), + ..vectorcraft_doc::PatternDef::new("Patches", vec![Arc::new(m)]) + }); + Node::path( + doc.alloc_id(), + shapes::rectangle(Rect::new(20.0, 100.0, 180.0, 180.0)), + Appearance::basic(Paint::Pattern { pattern: "Patches".into(), xf: Affine::IDENTITY }, Paint::None, 0.0), + ) + }; + let on_layer = mesh_document(tile); + let in_symbol = mesh_document(|doc| { + let art = tile(doc); + doc.symbols.push(Symbol { dynamic: false, name: "Tiled".into(), art: Arc::new(art) }); + instance(doc, "Tiled", Affine::translate((20.0, 20.0))) + }); + for (name, doc) in [("on a layer", &on_layer), ("in a symbol", &in_symbol)] { + let out = export_ai_editing(doc, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::MESHES), "{name}: {:?}", out.warnings); + let written = String::from_utf8(out.program).unwrap(); + assert!(!written.contains("/Mesh X!"), "{name}"); + // The reader doesn't read a symbol whose art has a pattern fill whole, whatever the tile + // holds: the drawn look is checked in the program there. + if name == "in a symbol" { + assert!(written.contains("%AI3_BeginPattern: (Patches)"), "{name}"); + continue; + } + let back = read_back(doc); + assert!(!holds_a_mesh(&back), "{name}"); + let tile = back.patterns.iter().find(|p| p.name == "Patches").unwrap(); + let mut paths = vec![]; + filled_paths(&tile.art, &mut paths); + assert!(!paths.is_empty(), "{name}: {:#?}", tile.art); + } +} + +/// Meshes in an opacity mask's art, a symbol's art, an opacity mask in a symbol's art, and a +/// symbol's art in a document of several artboards (which moves the canvas's center) are written +/// as meshes and come back as meshes. +#[test] +fn meshes_in_masks_and_symbols_are_read_back() { + let r = Rect::new(0.0, 0.0, 60.0, 40.0); + let colors = |r: usize, c: usize| Color::rgb(0.5 * c as f32, 0.2, 0.5 * r as f32); + let square_with = |doc: &mut Document, fill: Paint| { + Node::path(doc.alloc_id(), shapes::rectangle(Rect::new(20.0, 100.0, 180.0, 180.0)), Appearance::basic(fill, Paint::None, 0.0)) + }; + let mask_of = |n: &Node| n.extras().mask.as_ref().unwrap().art.clone(); + // Opacity mask. + let doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(Rect::new(20.0, 100.0, 180.0, 180.0), 1, 2, colors)); + let mut n = square_with(doc, solid(Color::BLACK)); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(m), clip: false, invert: false, disabled: false, linked: true })); + n + }); + assert!(!export_ai_editing(&doc, &opts()).unwrap().warnings.iter().any(|w| w == writer::MESHES)); + let back = read_back(&doc); + assert_mesh_exact(mesh_of(&mask_of(&back.layers[0].children().unwrap()[0])), mesh_of(&mask_of(&doc.layers[0].children().unwrap()[0])), "mask"); + // Symbol, on one artboard and with a second artboard far to the right and below. + for boards in [1, 2] { + let mut doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(r, 2, 1, colors)); + doc.symbols.push(Symbol { dynamic: false, name: "Patch".into(), art: Arc::new(m) }); + instance(doc, "Patch", Affine::translate((20.0, 20.0))) + }); + if boards == 2 { + let id = doc.artboards[0].id + 1; + doc.artboards.push(Artboard { id, rect: Rect::new(3000.0, 2000.0, 3400.0, 2600.0), ..doc.artboards[0].clone() }); + } + assert!(!export_ai_editing(&doc, &opts()).unwrap().warnings.iter().any(|w| w == writer::MESHES)); + let back = read_back(&doc); + let sym = back.symbols.iter().find(|s| s.name == "Patch").unwrap(); + assert_mesh_exact(mesh_of(&sym.art), mesh_of(&doc.symbols[0].art), &format!("symbol, {boards} artboards")); + } + // An opacity mask in a symbol's art. + let doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(r, 1, 2, colors)); + let mut n = square_with(doc, solid(Color::BLACK)); + n.extras_mut().mask = Some(Box::new(OpacityMask { art: Arc::new(m), clip: false, invert: false, disabled: false, linked: true })); + doc.symbols.push(Symbol { dynamic: false, name: "Masked".into(), art: Arc::new(n) }); + instance(doc, "Masked", Affine::translate((20.0, 20.0))) + }); + assert!(!export_ai_editing(&doc, &opts()).unwrap().warnings.iter().any(|w| w == writer::MESHES)); + let back = read_back(&doc); + let sym = back.symbols.iter().find(|s| s.name == "Masked").unwrap(); + assert_mesh_exact(mesh_of(&mask_of(&sym.art)), mesh_of(&mask_of(&doc.symbols[0].art)), "mask in a symbol"); +} + +/// In a symbol's art a mesh's corners are written about the canvas point of art space's origin, y +/// up, as an image's matrix there is (the template box's center is the canvas's). +#[test] +fn a_mesh_in_a_symbol_is_written_about_the_canvas_point_of_the_origin() { + let doc = mesh_document(|doc| { + let m = mesh_node(doc, grid_mesh(Rect::new(0.0, 0.0, 60.0, 40.0), 2, 1, |r, c| Color::rgb(0.5 * c as f32, 0.2, 0.5 * r as f32))); + doc.symbols.push(Symbol { dynamic: false, name: "Patch".into(), art: Arc::new(m) }); + instance(doc, "Patch", Affine::translate((20.0, 20.0))) + }); + let p = program(&doc); + let t: Vec = p.lines().find_map(|l| l.strip_prefix("%AI3_TemplateBox: ")).unwrap().split(' ').map(|v| v.parse().unwrap()).collect(); + let (ox, oy) = (f64::from(CANVAS_SIZE) / 2.0 - t[0], f64::from(CANVAS_SIZE) / 2.0 + t[1]); + let def = &p[p.find("%AI14_BeginSymbol\n(Patch)\n").unwrap()..]; + let first = def.lines().find(|l| l.ends_with(" /N X#")).unwrap(); + // The top left point, at 0 0: its handle down a third of the way to the next row, its handle + // to the right a third of the way to the next column. + let want = format!( + "%_[0 0.2 0 1 {} {} {} {} 1 {} {} 1] /N X#", + ps::num(-ox), + ps::num(oy), + ps::num(-ox), + ps::num(oy - 20.0 / 3.0), + ps::num(20.0 - ox), + ps::num(oy) + ); + assert_eq!(first, want); +} + +/// A mesh eight levels down in art written in place of symbol instances (where deeper art is left +/// out) is written as a mesh: it holds no objects of its own. A folded one there is written as its +/// drawn look, whose paths hold nothing either. +#[test] +fn a_mesh_eight_levels_down_is_written_as_a_mesh() { + let nested = |fold: bool| { + mesh_document(|doc| { + let mut m = grid_mesh(Rect::new(0.0, 0.0, 60.0, 40.0), 1, 2, |_, c| Color::rgb(0.5 * c as f32, 0.0, 0.0)); + if fold { + // The right column's points fold back over the left patch. + for row in 0..2 { + m.points[row * 3 + 2].p.x = 10.0; + } + } + let m = mesh_node(doc, m); + doc.symbols.push(Symbol { dynamic: false, name: "S0".into(), art: Arc::new(m) }); + for i in 1..8 { + let mut inner = instance(doc, &format!("S{}", i - 1), Affine::IDENTITY); + inner.isolate = true; + doc.symbols.push(Symbol { dynamic: false, name: format!("S{i}"), art: Arc::new(inner) }); + } + let mut top = instance(doc, "S7", Affine::translate((20.0, 20.0))); + top.isolate = true; + top + }) + }; + let folded = nested(true); + let out = export_ai_editing(&folded, &opts()).unwrap(); + assert!(out.warnings.iter().any(|w| w == writer::MESHES), "{:?}", out.warnings); + let back = read_back(&folded); + let mut paths = vec![]; + filled_paths(&back.layers, &mut paths); + assert!(!holds_a_mesh(&back) && paths.len() > 1, "{:#?}", back.layers); + let doc = nested(false); + let out = export_ai_editing(&doc, &opts()).unwrap(); + assert!(!out.warnings.iter().any(|w| w == writer::MESHES), "{:?}", out.warnings); + assert!(mesh_layer_lines(std::str::from_utf8(&out.program).unwrap()).contains(&"/Mesh X!")); + let back = meshes_in(&read_back(&doc)); + let mut want = mesh_of(&doc.symbols[0].art).clone(); + want.transform(Affine::translate((20.0, 20.0))); + assert_eq!(back.len(), 1, "{back:#?}"); + assert_mesh_exact(mesh_of(&back[0]), &want, "eight levels down"); +} diff --git a/crates/eps/src/ai_editing/writer.rs b/crates/eps/src/ai_editing/writer.rs index 38f5b0fe64..cc44503373 100644 --- a/crates/eps/src/ai_editing/writer.rs +++ b/crates/eps/src/ai_editing/writer.rs @@ -15,19 +15,26 @@ use vectorcraft_pathops::BoolOp; use crate::ai_ops::{self, unit}; use crate::ps; +mod blends; mod brushes; mod envelopes; mod images; +mod meshes; mod paints; mod styles; mod symbols; mod texts; mod variables; +#[cfg(test)] +pub(super) use blends::BLENDS; +pub(super) use blends::unbaked_blends; #[cfg(test)] pub(super) use brushes::BRUSHES; #[cfg(test)] pub(super) use envelopes::ENVELOPES; +#[cfg(test)] +pub(super) use meshes::MESHES; pub(super) use styles::{LARGE_CANVAS_STYLES, style_links, styled_definitions, styled_objects}; #[cfg(test)] pub(super) use styles::{PANEL_EMPTY, PANEL_STYLES, STYLE_LINKS, WARPED_IMAGES, same_appearance}; @@ -58,7 +65,7 @@ pub(super) const PATTERN_TILES: &str = "pattern fills with more tiles than a fil pub(super) const CLIPPING: &str = "clipping groups and clipping layers whose clipping object isn't a path, and the clipping groups inside them, are written as their art cut to that object in the editing data for other apps"; pub(super) const CLIP_PAINT: &str = "the fills and strokes of clipping paths that a plain fill and line can't draw are written as paths of their own inside the clipping (fills under the clipped art, strokes over it) in the editing data for other apps"; pub(super) const CLIP_PAINT_MASKS: &str = "the opacity masks of clipping paths whose fills and strokes are written as paths of their own stay on the clipping path, not on those paths, in the editing data for other apps"; -pub(super) const LIVE: &str = "blends, meshes, repeats, placed documents and intertwines are written as their art in the editing data for other apps"; +pub(super) const LIVE: &str = "repeats, placed documents and intertwines are written as their art in the editing data for other apps"; pub(super) const GRAPHS: &str = "graphs are written as their art, without their data or settings, in the editing data for other apps"; pub(super) const STROKES: &str = "strokes a plain line can't draw (inside or outside the path, variable width, dots, dashes fitted to corners, gradients, patterns, arrowheads) are written as filled outlines, and brushed strokes as their brush's art, in the editing data for other apps"; pub(super) const ITEM_TRANSPARENCY: &str = @@ -304,6 +311,9 @@ pub(super) struct Writer<'a> { brush_set: brushes::Brushes, /// Brushes may be written; false on a large canvas, where they are left out. pub(super) brushes_live: bool, + /// Gradient meshes may be written as meshes; false on a large canvas, where they are written as + /// their drawn look. + pub(super) meshes_live: bool, /// The object just written is an envelope's distorted art, which the plugin's `XP` follows /// ([`Self::envelope`]). deform: bool, @@ -328,6 +338,14 @@ pub(super) struct Writer<'a> { series_tag: Option, /// Where the `Go` lines of the graph being written start in [`Self::body`]. graph_tags: Vec, + /// Blends may be written live; false on a large canvas, where they are written as their steps. + pub(super) blends_live: bool, + /// How many more objects the reader's blends may lay out ([`crate::import::BLEND_BUDGET`]). + blend_budget: usize, + /// The entries naming a blend's key object in its dictionary, and the key's id. + blend_role: Option<(NodeId, String)>, + /// The blends baking left as they are ([`blends::unbaked_blends`]); only these are written live. + pub(super) unbaked_blends: HashSet, } impl<'a> Writer<'a> { @@ -395,6 +413,7 @@ impl<'a> Writer<'a> { wrap_moved: false, brush_set: brushes::Brushes::default(), brushes_live: true, + meshes_live: true, deform: false, checks_left: crate::import::ENVELOPE_CHECKS, objects: 0, @@ -410,6 +429,10 @@ impl<'a> Writer<'a> { in_graph: false, series_tag: None, graph_tags: vec![], + blends_live: true, + blend_budget: crate::import::BLEND_BUDGET, + blend_role: None, + unbaked_blends: HashSet::new(), } } @@ -723,6 +746,11 @@ impl<'a> Writer<'a> { return self.styled_object(n, &orig, &name); } self.effects(n); + // A gradient mesh the reader reads as it is; else it is written as its drawn look. + let mut mesh = match &n.kind { + NodeKind::Mesh(m) => self.mesh_record(m), + _ => None, + }; self.state(n.locked, !n.visible); let mut xy = Xy::of(n); if masked_warp_pieces(n) { @@ -738,6 +766,11 @@ impl<'a> Writer<'a> { let charged = self.charges(); match &n.kind { NodeKind::Layer { .. } => {} + NodeKind::Mesh(_) if mesh.is_some() => { + if let Some(record) = mesh.take() { + self.write_mesh(&record, xy); + } + } NodeKind::Group { children, clip: true } => self.clip_group(children, xy), NodeKind::Group { children, clip: false } => { if self.open_group("u") { @@ -840,7 +873,10 @@ impl<'a> Writer<'a> { } NodeKind::Envelope { .. } if self.envelope(n, xy) => {} NodeKind::Envelope { .. } => self.drawn_art(n, xy, Some(envelopes::ENVELOPES), true), - NodeKind::Blend { .. } | NodeKind::Mesh(_) | NodeKind::Repeat(_) | NodeKind::PlacedDocument(_) | NodeKind::Intertwine { .. } => { + NodeKind::Mesh(_) => self.drawn_art(n, xy, Some(meshes::MESHES), true), + NodeKind::Blend { .. } if self.blend(n, xy) => {} + NodeKind::Blend { .. } => self.drawn_art(n, xy, Some(blends::BLENDS), true), + NodeKind::Repeat(_) | NodeKind::PlacedDocument(_) | NodeKind::Intertwine { .. } => { self.drawn_art(n, xy, Some(LIVE), true); } // Ruler guides are kept in the document's native copy only. @@ -919,7 +955,8 @@ impl<'a> Writer<'a> { self.warn(w); } let moved = bounds && self.wrap_on_bounds(n, state); - if self.nest < MAX_NEST { + // A gradient mesh's drawn look is paths, which hold nothing: it is written at any depth. + if self.nest < MAX_NEST || matches!(n.kind, NodeKind::Mesh(_)) { let g = vectorcraft_effects::expand_live_deep(Some(self.doc), n); self.nest += 1; self.drawn += 1; @@ -955,9 +992,10 @@ impl<'a> Writer<'a> { /// `n`'s `/ArtDictionary`, after it, when it has a name (`AI10_ArtUID`, see [`Self::take_id`]), /// is bound to variables ([`Self::bound_variables`]; without a name, it gets an XML id and an /// empty `AIArtName`), has text wrap options ([`Self::text_wrap`]), has an opacity mask - /// (`AI9_Mask`, see [`Self::mask`]), or is a symbol's art (its symbol's entries first, see - /// [`Self::define_symbol`]). False when `n` has an opacity mask that is left out: nested too - /// deep, or its art doesn't fit. + /// (`AI9_Mask`, see [`Self::mask`]), is a symbol's art (its symbol's entries first, see + /// [`Self::define_symbol`]), or is a blend's key object (its part and id after the name, see + /// [`blends`]). False when `n` has an opacity mask that is left out: nested too deep, or its art + /// doesn't fit. fn dictionary(&mut self, n: &Node) -> bool { let name = n.name.as_deref().filter(|s| !s.is_empty()); let moved = std::mem::take(&mut self.wrap_moved); @@ -977,7 +1015,11 @@ impl<'a> Writer<'a> { Some((id, _)) if *id == n.id => self.root_entries.take().map(|(_, e)| e), _ => None, }; - if name.is_none() && mask.is_none() && bound.is_empty() && entries.is_none() && wrap.is_none() { + let role = match &self.blend_role { + Some((id, _)) if *id == n.id => self.blend_role.take().map(|(_, e)| e), + _ => None, + }; + if name.is_none() && mask.is_none() && bound.is_empty() && entries.is_none() && wrap.is_none() && role.is_none() { return mask_written; } let start = self.body.len(); @@ -998,6 +1040,10 @@ impl<'a> Writer<'a> { self.bound.push((n.id, id, bound)); } } + let has_role = role.is_some(); + if let Some(r) = role { + self.body.push_str(&r); + } if let Some(w) = wrap { self.text_wrap(w); } @@ -1005,7 +1051,7 @@ impl<'a> Writer<'a> { if let Some(m) = mask && !self.mask(m) { - if !has_id && !has_entries && wrap.is_none() { + if !has_id && !has_entries && wrap.is_none() && !has_role { self.body.truncate(start); return false; } diff --git a/crates/eps/src/ai_editing/writer/blends.rs b/crates/eps/src/ai_editing/writer/blends.rs new file mode 100644 index 0000000000..b73749b214 --- /dev/null +++ b/crates/eps/src/ai_editing/writer/blends.rs @@ -0,0 +1,372 @@ +//! Blends: a live blend as the `.ai` reader reads one ([`crate::import`]'s `.ai` reader, `blend.rs` +//! and `read/containers.rs`' `end_blend`). +//! +//! The blend's own art on `%_` lines: `0 Ae`, a group of its key objects, each with an +//! `/ArtDictionary` naming it a key (`ShapeBlendPathType` `K`) and its id (`ShapeBlendPathID`, a +//! letter or digit), and its spine as an unpainted path named the spine (`S`), written only when the +//! blend has a spine of its own; then its steps drawn, a group on plain lines; then `0 Ae`, +//! the `XP` line of the blend plugin ([`BLEND_PLUGIN`], `1 0 n XP`) and the blend's record, `n` bytes +//! as hex on `%` lines; then the blend's name in an `/ArtDictionary` and its transparency, as a +//! group's after its end. The record +//! is `DCBA` and little-endian 32-bit words: 1, the spacing (0 Smooth Color, 1 Specified Steps, 2 +//! Specified Distance); 2, the distance as a float (Specified Steps: the spine's length shared out +//! between the steps; Smooth Color: 4); 4, the steps between the first two keys; 5, the orientation +//! (0 Align to Page, a float of 8 and the spine's starting angle in radians for Align to Path); 6, +//! the next free id (0 after the 62nd); 9, 1; 10, the number of keys; then six words a key: its id, +//! 0, the anchor of the spine it sits on as a float, two words of all ones, and the steps between +//! it and the key before it. The reader reads words 1, 2 (for Specified Distance), 5 (0, or 8 or +//! more), 10 and the keys' ids; the others are written as the record's form has them. +//! +//! Each blend is checked with the reader's own reading ([`crate::import::blend_reads`]) before it is +//! written: one the reader would read with other settings is written as its steps. + +use std::collections::HashSet; +use std::fmt::Write; +use std::sync::Arc; + +use vectorcraft_color::{BlendMode, Color, Paint}; +use vectorcraft_doc::blend::{blend_spine, blend_steps, blend_steps_settled, pin_spine}; +use vectorcraft_doc::live::{BlendOrientation, BlendSpacing, BlendSpec}; +use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, StrokeLayer}; +use vectorcraft_geom::{FillRule, PathData}; + +use super::{MAX_NEST, Writer, Xy, hide}; +use crate::import::{BLEND_PLUGIN, MAX_BLEND_KEYS, MAX_BLEND_OBJECTS, blend_reads}; + +pub(in crate::ai_editing) const BLENDS: &str = "blends with easing, a color shift or start points of their own, blends with effects, an appearance or an opacity mask of their own, blends of objects other than paths, compound paths and groups, of clipping groups, of more than 62 key objects, of hidden key objects, of key objects that hold a blend, of key objects with geometry or Pathfinder effects or a group's own fills and strokes, or of key objects the editing copy would change (empty paths or subpaths, paths and compound path members of several subpaths, several fills or strokes, strokes a plain line can't draw, dashes of more than 64 lengths, hidden fills or strokes, fills or strokes other than a color, in a Lab color or with transparency or effects of their own, effects or opacity masks), blends where one key object has a fill or stroke of no paint or a stroke of no width and another has one that draws, blends inside objects with geometry or Pathfinder effects or a group's own fills and strokes, blends whose spine has more than one part, blends whose step count is close to where rounding changes it, blends that would open with other settings or not as they are drawn, blends in opacity masks, pattern tiles, symbols and art cut to a clipping object or nested eight levels deep in art written in place of other objects (symbol instances, live objects, brushed strokes), blends whose art would pass the most objects the reader reads, and every blend on a large canvas are written as their steps in the editing data for other apps"; + +/// How far (pt) the lengths a blend counts its steps from may move when written (coordinates are +/// written to 4 decimals and read back through art space) without changing a count. +const SETTLE_LENGTH: f64 = 0.01; +/// How far (pt) each segment of a spine may add to [`SETTLE_LENGTH`]: rounding moves each of its +/// points by up to 0.00005 √2 pt, which moves the segment's length by up to six times that. +const SETTLE_SEGMENT: f64 = 5e-4; +/// How far a key's color (each channel, 0 to 1) may move when written without changing a Smooth +/// Color count. +const SETTLE_COLOR: f64 = 0.001; + +/// The most dash lengths the reader reads; a stroke with more opens solid. +const MAX_DASH_LENGTHS: usize = 64; + +/// The ids the keys take, in their order (letters and digits, as the reader reads them). +const IDS: &[u8] = b"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + +/// Hex digits on one `%` line of a record. +const HEX_LINE: usize = 60; + +/// A blend to write live. +pub(super) struct LiveBlend { + keys: Vec>, + ids: Vec, + /// Its spine part; `None`: the blend has no spine of its own. + spine: Option, + record: Vec, + steps: Vec>, +} + +impl Writer<'_> { + /// Blend `n` as the reader reads it live, or `None` when it would read other settings or none + /// (the blend is then written as its steps). + pub(super) fn live_blend(&mut self, n: &Node) -> Option { + let NodeKind::Blend { children: keys, spec } = &n.kind else { return None }; + // Hidden lines (pattern tiles, opacity masks), symbols' definitions and art cut to a + // clipping object aren't read as live blends. (No blend is drawn in a look: styled objects + // hold only paths, compound paths and groups of them.) + if !self.blends_live || self.hidden > 0 || self.in_symbol || self.clip.is_some() || self.nest >= MAX_NEST { + return None; + } + // Baking changes its keys, or the art it sits in ([`unbaked_blends`]). + if !self.unbaked_blends.contains(&n.id) { + return None; + } + if !spec.ease.is_default() || spec.color_shift != 0.0 || !spec.starts.is_empty() { + return None; + } + let own = &n.appearance; + if !own.items.is_empty() || !own.effects.is_empty() || n.extras().mask.is_some() { + return None; + } + // The reader shows every key object it reads. + if keys.len() < 2 || keys.len() > IDS.len().min(MAX_BLEND_KEYS) || !keys.iter().all(|k| k.visible && plain_key(k)) { + return None; + } + // A fill or stroke the editing copy leaves out is read back as none at all, and the steps + // blend from it to another key's otherwise. + if left_out_against_drawn(keys) { + return None; + } + // The spine written: a replaced spine (no key anchors) with an anchor where each key sits, a + // spine edited on the canvas with its keys' anchors moved onto them. + let spec: &BlendSpec = spec; + // The blend lays out along the spine's first subpath, and only that part is written: a + // spine of more parts would open without the others. + if spec.spine.as_ref().is_some_and(|s| s.subpaths.len() > 1) { + return None; + } + let written = match &spec.spine { + None => BlendSpec { key_anchors: vec![], ..spec.clone() }, + Some(_) if spec.key_anchors.is_empty() => { + let (path, anchors) = pin_spine(keys, spec)?; + let anchors = anchors.into_iter().map(u32::try_from).collect::, _>>().ok()?; + BlendSpec { spine: Some(path), key_anchors: anchors, ..spec.clone() } + } + Some(_) => BlendSpec { spine: Some(blend_spine(keys, spec)?.0), ..spec.clone() }, + }; + // The record holds Specified Distance as a 32-bit float, which the reader reads back as its + // shortest decimal (10 mm comes back as 28.346457 pt): the blend is compared with that + // distance, and kept live only when it lays out as many steps with it. + let written = match written.spacing { + BlendSpacing::Distance(d) => { + let read: f64 = (d as f32).to_string().parse().ok().filter(|r: &f64| r.is_finite() && *r > 0.0)?; + let stored = BlendSpec { spacing: BlendSpacing::Distance(read), ..written.clone() }; + if blend_steps(keys, &stored) != blend_steps(keys, &written) { + return None; + } + stored + } + _ => written, + }; + // As many objects as the reader lays out for one blend, twice within what its budget has left, + // counted before the steps are drawn. + let objects = blend_steps(keys, &written).into_iter().fold(keys.len(), usize::saturating_add); + if objects > MAX_BLEND_OBJECTS || objects.saturating_mul(2) > self.blend_budget { + return None; + } + // The reader counts the steps from the keys as written, rounded: a count that rounding can + // change may come back other than drawn. Specified Distance counts from the spine's length, + // and every segment of the spine adds to how far that may move. + let segments = written.spine.as_ref().and_then(|s| s.subpaths.first()).map_or(0, |s| s.segment_count()); + let settle = match written.spacing { + BlendSpacing::Distance(_) => SETTLE_LENGTH + segments as f64 * SETTLE_SEGMENT, + _ => SETTLE_LENGTH, + }; + if !blend_steps_settled(keys, &written, settle, SETTLE_COLOR) { + return None; + } + let ids: Vec = IDS.iter().take(keys.len()).map(|c| char::from(*c).to_string()).collect(); + let record = self.record(keys, &written)?; + let steps: Vec> = vectorcraft_effects::expand_live_deep(Some(self.doc), n).children().cloned().unwrap_or_default(); + let drawn: Vec = steps.iter().map(|s| (**s).clone()).collect(); + // The spine part as written: the first subpath of the spine laid out. + let part = written.spine.as_ref().and_then(|s| s.subpaths.first()).map(|sp| PathData::single(sp.clone())); + let mut budget = self.blend_budget; + let read = blend_reads(keys, &ids, part.as_ref(), &record, &drawn, &mut budget)?; + if read != written { + return None; + } + self.blend_budget = budget; + Some(LiveBlend { keys: keys.clone(), ids, spine: part, record, steps }) + } + + /// The record of a blend of `keys` with the settings `spec` (its spine as written). + fn record(&self, keys: &[Arc], spec: &BlendSpec) -> Option> { + let (spine, anchors) = blend_spine(keys, spec)?; + let steps = blend_steps(keys, spec); + let first = u32::try_from(*steps.first()?).ok()?; + let (spacing, value) = match spec.spacing { + BlendSpacing::SmoothColor => (0, 4.0), + BlendSpacing::Steps(n) => (1, spine.length() / (f64::from(n) + 1.0)), + BlendSpacing::Distance(d) => (2, d), + }; + let orientation = match spec.orientation { + BlendOrientation::AlignToPage => 0.0, + BlendOrientation::AlignToPath => 8.0 + self.starting_angle(&spine)?, + }; + let count = u32::try_from(keys.len()).ok()?; + let next = IDS.get(keys.len()).copied().map_or(0, u32::from); + let mut words: Vec = vec![u32::from_le_bytes(*b"DCBA"), spacing, (value as f32).to_bits(), 0, first, (orientation as f32).to_bits()]; + words.extend([next, 0, 0, 1, count]); + for (i, id) in IDS.iter().take(keys.len()).enumerate() { + let anchor = anchors.as_ref().and_then(|a| a.get(i)).copied().unwrap_or(i); + let before = i.checked_sub(1).and_then(|j| steps.get(j)).copied().unwrap_or(0); + words.extend([u32::from(*id), 0, (anchor as f32).to_bits(), u32::MAX, u32::MAX, u32::try_from(before).ok()?]); + } + Some(words.iter().flat_map(|w| w.to_le_bytes()).collect()) + } + + /// The angle in art space (radians, from 0 to 2π) at which `spine` starts. + fn starting_angle(&self, spine: &PathData) -> Option { + let sp = spine.subpaths.first()?; + let first = sp.anchors.first()?; + let towards = if (first.h_out - first.p).hypot() > 1e-9 { first.h_out } else { sp.anchors.get(1)?.p }; + let (a, b) = (self.to_art * first.p, self.to_art * towards); + let angle = (b.y - a.y).atan2(b.x - a.x); + Some(if angle < 0.0 { angle + std::f64::consts::TAU } else { angle }) + } + + /// Blend `n`, of transparency `xy`, written live ([`Self::live_blend`]): its own art on `%_` + /// lines, its steps and its record, then the state block of its transparency, before which the + /// object's dictionary (its name, text wrap options and variables) goes. False, writing + /// nothing, when it is written as its steps: the reader would read it otherwise, or art in it + /// would be left out at the object limit ([`Self::take_objects`]). + pub(super) fn blend(&mut self, n: &Node, xy: Xy) -> bool { + let budget = self.blend_budget; + let Some(b) = self.live_blend(n) else { return false }; + let start = self.body.len(); + let (state, gs, charges, bound, warnings) = (self.state, self.gs, self.charges(), self.bound.len(), self.warnings.len()); + let outer = std::mem::take(&mut self.body); + self.hidden += 1; + self.line("0 Ae"); + let opened = self.open_group("u"); + if opened { + for (k, id) in b.keys.iter().zip(&b.ids) { + self.blend_role = Some((k.id, format!("%_(K) /String (ShapeBlendPathType) ,\n%_({id}) /String (ShapeBlendPathID) ,\n"))); + self.node(k); + self.blend_role = None; + } + if let Some(spine) = &b.spine { + self.plain_object(spine, FillRule::NonZero, None, None, Xy::OPAQUE); + self.body.push_str("%_/ArtDictionary :\n%_(S) /String (ShapeBlendPathType) ,\n%_;\n%_\n"); + } + self.line("U"); + self.line("9 () XW"); + } + self.hidden -= 1; + let part = std::mem::replace(&mut self.body, outer); + hide(&part, &mut self.body); + // Readers of the printed form skip the hidden lines: the steps set their own state. + (self.state, self.gs) = (None, None); + self.state(n.locked, !n.visible); + let steps = self.open_group("u"); + if steps { + // The steps are drawn art: copies of the keys carry no text wrap options of their own. + self.nest += 1; + self.drawn += 1; + for s in &b.steps { + self.node(s); + } + self.drawn -= 1; + self.nest -= 1; + self.state(n.locked, !n.visible); + self.line("U"); + self.line("9 () XW"); + } + if !opened || !steps || self.left_out_since(charges) { + let lines = self.body.split_off(start); + self.give_back(charges, &lines); + self.bound.truncate(bound); + // The warnings of art written as its steps again are those steps'. + if !self.left_out_since(charges) { + self.warnings.truncate(warnings); + } + (self.state, self.gs, self.block_end, self.blend_budget) = (state, gs, usize::MAX, budget); + return false; + } + self.line("0 Ae"); + let hex: String = b.record.iter().map(|x| format!("{x:02X}")).collect(); + let _ = writeln!(self.body, "({BLEND_PLUGIN}) 1 0 {} XP", b.record.len()); + for chunk in hex.as_bytes().chunks(HEX_LINE) { + self.body.push('%'); + self.body.push_str(&String::from_utf8_lossy(chunk)); + self.body.push('\n'); + } + // The blend's dictionary goes after the record and before this block ([`Self::node`]). + self.state_block(xy); + true + } +} + +/// The blends on `doc`'s layers that baking leaves as they are: blends with nothing in them that +/// [`vectorcraft_effects::needs_bake`] evaluates (geometry and Pathfinder effects, a group's own +/// fills and strokes), inside no object that has such things of its own. Baking changes the keys +/// of the others, so they are written as their steps. +pub(in crate::ai_editing) fn unbaked_blends(doc: &Document) -> HashSet { + fn walk(nodes: &[Arc], out: &mut HashSet) { + for n in nodes { + if matches!(n.kind, NodeKind::Blend { .. }) { + if !vectorcraft_effects::needs_bake(n) { + out.insert(n.id); + } + continue; + } + let Some(children) = n.children() else { continue }; + let mut own = (**n).clone(); + if let Some(c) = own.children_mut() { + c.clear(); + } + if !vectorcraft_effects::needs_bake(&own) { + walk(children, out); + } + } + } + let mut out = HashSet::new(); + walk(&doc.layers, &mut out); + out +} + +/// Does the reader read stroke `s`'s dashes back as they are (`read/ops.rs`' `d`): at most 64 +/// lengths, each finite and not negative, and a finite offset? It reads other dashes as a solid +/// line. +fn dash_read_back(s: &StrokeLayer) -> bool { + s.dash + .as_ref() + .is_none_or(|d| d.pattern.len() <= MAX_DASH_LENGTHS && d.pattern.iter().all(|v| v.is_finite() && *v >= 0.0) && d.offset.is_finite()) +} + +/// Do the keys hold a fill or stroke that the editing copy leaves out (a fill of no paint; a stroke +/// of no paint or of no width, as `visible_items` leaves them out) where another holds one of the +/// same kind that it writes? The steps blend the width, paint and settings of the one left out, and +/// the keys read back blend from no fill or stroke, so the steps would open otherwise. +fn left_out_against_drawn(keys: &[Arc]) -> bool { + // [fill, stroke]: is one left out somewhere, is one written somewhere. + let mut left_out = [false; 2]; + let mut drawn = [false; 2]; + for k in keys { + k.walk(&mut |n| { + for i in &n.appearance.items { + let (kind, out) = match i { + AppearanceItem::Fill(f) => (0, f.paint.is_none()), + AppearanceItem::Stroke(s) => (1, s.paint.is_none() || !(s.width > 0.0 && s.width.is_finite())), + }; + if out { + left_out[kind] = true; + } else { + drawn[kind] = true; + } + } + }); + } + (left_out[0] && drawn[0]) || (left_out[1] && drawn[1]) +} + +/// Can `k` be a key object written live, as the reader reads it back: paths, compound paths and +/// groups other than clipping groups (holding no blend), without effects or opacity masks, each with +/// at most one fill and one plain stroke over it (a line the data draws as it is), each fill and +/// stroke shown, in a color other than Lab or none, opaque in the normal blending mode? (A group's own fills and +/// strokes are baked into art of their own, and such blends aren't [`unbaked_blends`].) +fn plain_key(k: &Node) -> bool { + let mut plain = true; + k.walk(&mut |n| { + // A clipping group may be written as its art cut to the clipping object. + let kind = match &n.kind { + // The writer leaves out a path with nothing to draw and subpaths without anchors, and + // writes a path of several subpaths as a compound path. + NodeKind::Path { path, guide: false, .. } => matches!(path.subpaths.as_slice(), [one] if !one.anchors.is_empty()), + // A compound path is written as one path, and read back with a member for each + // subpath. + NodeKind::Compound { children, .. } => { + !children.is_empty() + && children.iter().all(|c| matches!(&c.kind, NodeKind::Path { path, guide: false, .. } if path.subpaths.len() == 1)) + } + NodeKind::Group { clip: false, .. } => true, + _ => false, + }; + let items = &n.appearance.items; + let fills = items.iter().filter(|i| matches!(i, AppearanceItem::Fill(_))).count(); + let strokes = items.iter().filter(|i| matches!(i, AppearanceItem::Stroke(_))).count(); + let order = !matches!(items.as_slice(), [AppearanceItem::Stroke(_), AppearanceItem::Fill(_)]); + let quiet = items.iter().all(|i| { + i.visible() + && matches!(i.paint(), Paint::Solid { .. } | Paint::None) + // A color that names no global or spot swatch is written in RGB, so a Lab color + // would come back as another. + && !matches!(i.paint(), Paint::Solid { color: Color::Lab { .. }, .. }) + && i.effects().is_empty() + && i.opacity() >= 1.0 + && i.blend() == BlendMode::Normal + && !matches!(i, AppearanceItem::Stroke(s) if !vectorcraft_effects::stroke::is_plain(s) || !dash_read_back(s)) + }); + plain &= kind && fills <= 1 && strokes <= 1 && order && quiet && n.appearance.effects.is_empty() && n.extras().mask.is_none(); + }); + plain +} diff --git a/crates/eps/src/ai_editing/writer/brushes.rs b/crates/eps/src/ai_editing/writer/brushes.rs index 029b37597f..986d60ef9c 100644 --- a/crates/eps/src/ai_editing/writer/brushes.rs +++ b/crates/eps/src/ai_editing/writer/brushes.rs @@ -23,7 +23,7 @@ use super::{Writer, Xy}; use crate::ai_ops; use crate::ps; -pub(in crate::ai_editing) const BRUSHES: &str = "Pattern and Bristle brushes, Art brushes that don't run their art from left to right, that overlap or whose width follows the pen, Scatter and Art brushes in Tints and Shades or Hue Shift, brushes whose art holds an empty path or group or more than paths, compound paths and groups with one solid fill and one plain stroke each, brushes whose names hold a slash or repeat an earlier brush's name, brushes that would open with other settings, brushes past the number or the amount of art one file's brushes can hold, and every brush on a large canvas are left out of the Brushes panel in the editing data for other apps"; +pub(in crate::ai_editing) const BRUSHES: &str = "Pattern and Bristle brushes, Art brushes that don't run their art from left to right, that overlap or whose width follows the pen, Scatter and Art brushes in Tints and Shades or Hue Shift, brushes whose art or its opacity masks' art holds an empty path or group or more than paths, compound paths and groups with one solid fill and one plain stroke each, or opacity masks on a compound path's members or more than seven deep in one another's art, brushes whose names hold a slash or repeat an earlier brush's name, brushes that would open with other settings, brushes past the number or the amount of art one file's brushes can hold, and every brush on a large canvas are left out of the Brushes panel in the editing data for other apps"; /// Most brushes written (the reader's limit). const MAX_BRUSHES: usize = 4096; @@ -213,17 +213,38 @@ fn art_params(a: &ArtBrush, art: &str) -> Option { Some(format!("2 / {art}/ / / / / 0 0/ 5 0 0 0 / {}", nums6(&numbers))) } +/// Most opacity masks in one another's art in a brush's art: a brush's art section writes its art +/// one level inside, and masks at [`super::MAX_NEST`] levels are left out ([`super::DEEP_MASKS`]). +const MAX_MASK_NEST: u32 = super::MAX_NEST - 1; + /// Is `art` written as the reader reads it back, within a brush: paths and compound paths with /// points and groups with members (not clipping, without paint of their own), each opaque in the -/// normal blending mode, without effects or opacity masks, with at most one fill and one plain -/// stroke (no brush, width profile, arrowheads, alignment off the path or dashes fitted to corners) -/// over it, each in a color or none? A path without points isn't written ([`Writer::plain_object`]). +/// normal blending mode, without effects, with at most one fill and one plain stroke (no brush, +/// width profile, arrowheads, alignment off the path or dashes fitted to corners) over it, each in a +/// color or none, and opacity masks whose art is such art too, at most [`MAX_MASK_NEST`] deep and +/// none on a compound path's members? A path without points isn't written +/// ([`Writer::plain_object`]). fn plain_art(art: &Node) -> bool { + plain_within(art, MAX_MASK_NEST) +} + +/// Does no object of `art` have an opacity mask? +fn unmasked(art: &Node) -> bool { + let mut unmasked = true; + art.walk(&mut |n| unmasked &= n.extras().mask.is_none()); + unmasked +} + +/// [`plain_art`] with at most `masks` opacity masks in one another's art. +fn plain_within(art: &Node, masks: u32) -> bool { let mut plain = true; art.walk(&mut |n| { let kind = match &n.kind { NodeKind::Path { path, guide: false, clipping: false, .. } => path.subpaths.iter().any(|sp| !sp.anchors.is_empty()), - NodeKind::Compound { .. } => super::compound_path(n).subpaths.iter().any(|sp| !sp.anchors.is_empty()), + // A compound path is written as one path of its members' subpaths, without their masks. + NodeKind::Compound { children, .. } => { + children.iter().all(|c| unmasked(c)) && super::compound_path(n).subpaths.iter().any(|sp| !sp.anchors.is_empty()) + } NodeKind::Group { children, clip: false } => !children.is_empty(), _ => false, }; @@ -247,7 +268,7 @@ fn plain_art(art: &Node) -> bool { && order && quiet && n.appearance.effects.is_empty() - && n.extras().mask.is_none() + && n.extras().mask.as_deref().is_none_or(|m| masks > 0 && plain_within(&m.art, masks - 1)) && n.opacity >= 1.0 && n.blend == BlendMode::Normal; }); @@ -258,8 +279,13 @@ fn plain_art(art: &Node) -> bool { /// compound path with the subpaths of all its members as one path ([`super::compound_path`]), is /// written as one path when it has one subpath with points and as a compound path when it has more /// ([`Writer::plain_object`]); the reader reads that compound path as one path for each subpath, -/// each with the object's paint. +/// each with the object's paint. An opacity mask's art is written shown ([`Writer::mask`]). fn as_read(art: &mut Node) { + if let Some(m) = art.extras_if_any().and_then(|e| e.mask.as_mut()) { + let mask_art = Arc::make_mut(&mut m.art); + mask_art.visible = true; + as_read(mask_art); + } let (subpaths, rule) = match &art.kind { NodeKind::Path { path, rule, .. } => (path.subpaths.clone(), *rule), NodeKind::Compound { rule, .. } => (super::compound_path(art).subpaths, *rule), @@ -390,7 +416,7 @@ impl Writer<'_> { } let mut read = a.clone(); if *to_section == Affine::IDENTITY { - read.transform(Affine::FLIP_Y, false); + crate::import::turn_brush_art_over(&mut read); } as_read(&mut read); Some(read) @@ -427,6 +453,9 @@ impl Writer<'_> { // The art is the brush's own: not on `%_` lines, in a drawn look or in a symbol that // first uses the brush. (std::mem::take(&mut self.hidden), std::mem::take(&mut self.in_look), std::mem::take(&mut self.in_symbol)), + // The layers' objects written with art styles, by id: none of them is the brush's art, + // which may hold objects with the same ids. + std::mem::take(&mut self.styled), ); (self.to_art, self.grad_space, self.canvas, self.block_end) = (to_section, to_section, to_section, usize::MAX); self.state(false, false); @@ -462,6 +491,7 @@ impl Writer<'_> { (self.clip, self.shown), (self.block_start, self.block_end), (self.hidden, self.in_look, self.in_symbol), + self.styled, ) = saved; let text = std::mem::replace(&mut self.body, body); if !std::mem::replace(&mut self.warnings, warnings).is_empty() { diff --git a/crates/eps/src/ai_editing/writer/envelopes.rs b/crates/eps/src/ai_editing/writer/envelopes.rs index 8b4ebc880d..72966faf81 100644 --- a/crates/eps/src/ai_editing/writer/envelopes.rs +++ b/crates/eps/src/ai_editing/writer/envelopes.rs @@ -5,7 +5,8 @@ //! Contents (`AIDeformEditModeKey`), a warp's style, bend, distortions and orientation //! (`DeformStyle`, `DeformValue`, `DeformHoriz`, `DeformVert`, `Rotate`), with Distort Appearance //! the size of the box the contents map from (`AIDeformArtWidthKey`, `AIDeformArtHeightKey`), the -//! contents in an `X=` … `X+` block (while they are edited, the grid) as `AIDeformArtKey`, and the +//! contents in an `X=` … `X+` block (in a symbol's art, in the canvas's space with y down; while +//! they are edited, the grid) as `AIDeformArtKey`, and the //! kind (`AIDeformStyle`: 1 a warp, 2 a mesh, 3 a top object); then the distorted art on plain //! lines, and the plugin's `XP` after it. A top object's outline is the edge of the grid written //! for it, one grid edge to each segment of its sides, a side with fewer segments than the side @@ -401,7 +402,13 @@ impl Writer<'_> { if *editing { self.grid(record.grid.as_ref()); } else if self.open_group("u") { + // In a symbol's art, the contents in the dictionary are in the canvas's space, y down. + let to_art = self.to_art; + if self.in_symbol { + self.to_art = Affine::translate(self.canvas_origin) * to_art; + } self.contents(content, true); + self.to_art = to_art; self.end_group("U", Xy::PLAIN); } let block = std::mem::replace(&mut self.body, outer); @@ -448,15 +455,17 @@ impl Writer<'_> { /// An envelope's grid, when it has one, as a gray gradient mesh (`/Mesh X!` … `/End X!`): its /// size (`[cols rows] /Size`), then each patch's place (`[col row] /P`), its four corners /// (`/N`: gray, opacity, the point, the handle towards the next corner and a weight, the handle - /// towards the previous one and a weight, in art space), from its top left one down, across and - /// up, and `/E`. One object. + /// towards the previous one and a weight, in art space; in a symbol's art, in the space a + /// gradient mesh's corners are written in there), from its top left one down, across and up, + /// and `/E`. One object. fn grid(&mut self, grid: Option<&(usize, usize, Vec)>) { let Some((rows, cols, pts)) = grid else { return }; if !self.take_objects(1) { return; } let (rows, cols, width) = (*rows, *cols, cols + 1); - let to_art = self.to_art; + // In a symbol's art, corners are written in the space a gradient mesh's are written in there. + let to_art = if self.in_symbol { self.instance_space } else { self.to_art }; let s = &mut self.body; let _ = writeln!(s, "/Mesh X!\n2 /Version X#\n/Cartesian /Type X#\n[{cols} {rows}] /Size X#\n/Data X#\n/DeviceGray /CS X#"); let num = |s: &mut String, v: f64| { diff --git a/crates/eps/src/ai_editing/writer/meshes.rs b/crates/eps/src/ai_editing/writer/meshes.rs new file mode 100644 index 0000000000..b0f3a8766c --- /dev/null +++ b/crates/eps/src/ai_editing/writer/meshes.rs @@ -0,0 +1,256 @@ +//! Gradient meshes: a mesh as the `.ai` reader reads one ([`crate::import`]'s `.ai` reader, +//! `mesh.rs` and `read/art.rs`' `end_mesh`). +//! +//! `/Mesh X!`, then on `%_` lines `value /key X#` entries: `2 /Version` (corners with an opacity), +//! `/Cartesian /Type`, `[rows cols] /Size`, `/Data` (the patches follow), and for each patch, row by +//! row, its place `[row col] /P`, the color space (`/DeviceGray`, +//! `/DeviceRGB` or `/DeviceCMYK`) with `/CS` where it changes, its four corners with `/N` and `/E`; +//! then `/End X!`. A corner is `[color… opacity x y nx ny 1 px py 1]` in art space (in a symbol's +//! art, in the canvas's space turned y up about art space's origin there, as an image's matrix in +//! it is): its color (gray as lightness), its opacity, the point, the +//! handle towards the next corner and the handle towards the one before it, each with a weight of 1. +//! The corners go from the patch's top left mesh point to the one below it, then to the right, then +//! up: the first index of `/P` runs along the first edge. The mesh's transparency is set before it +//! (`0 XR`, `Xy`), its name and opacity mask follow `/End X!` in an `/ArtDictionary`, then `0 0 Xd` +//! and `6 () XW`. +//! +//! Each record is read back with the reader's mesh reading ([`crate::import::mesh_reads`], the +//! patches and how they join; not the rest of the `.ai` reader) before it is written: a mesh it +//! would read otherwise is written as its drawn look, as are folded meshes (patches whose corners +//! turn different ways, along the handles there, or a corner with no angle), meshes in pattern +//! tiles and in art cut to a clipping object, and every mesh on a large canvas. A reflected mesh, +//! whose patches all turn the negative way, is written with its columns in reverse order: it draws +//! the same patches, and reads back with each row's points in reverse order. + +use std::fmt::Write; + +use vectorcraft_color::Color; +use vectorcraft_doc::live::{GradientMesh, H_DOWN, H_LEFT, H_RIGHT, H_UP, MeshPoint}; +use vectorcraft_geom::{Affine, Point, Vec2}; + +use super::{Writer, Xy}; +use crate::ai_ops::unit; +use crate::import::{MAX_MESH_SIDE, mesh_reads}; +use crate::ps; + +pub(in crate::ai_editing) const MESHES: &str = "gradient meshes with a point in a Lab color, with more than 128 rows or columns, folded meshes, meshes that would not open as they are drawn, meshes in pattern tiles and in art cut to a clipping object, and every gradient mesh on a large canvas are written as their drawn look in the editing data for other apps"; + +/// How far (in the document's units, at a scale of 1) a written point or handle's end may move: +/// coordinates are written to 4 decimals, which moves a point at most 0.00005 along each axis. +const SETTLE_POINT: f64 = 1e-4; +/// How far a written color channel or opacity may move: they are written to 4 decimals too. +const SETTLE_COLOR: f32 = 1e-4; + +/// The color space a corner's color is written in. +#[derive(Clone, Copy, PartialEq)] +enum Space { + Gray, + Rgb, + Cmyk, +} + +impl Space { + fn name(self) -> &'static str { + match self { + Space::Gray => "/DeviceGray", + Space::Rgb => "/DeviceRGB", + Space::Cmyk => "/DeviceCMYK", + } + } +} + +impl Writer<'_> { + /// Mesh `m`'s record as the reader reads it, or `None` when it would read it otherwise (the + /// mesh is then written as its drawn look). + pub(super) fn mesh_record(&self, m: &GradientMesh) -> Option { + // Art cut to a clipping object is written cut, which a mesh can't be. Meshes in pattern + // tiles and on a large canvas are written as their drawn look too. (A mesh holds no objects, + // so it is written as a mesh however deep it is nested.) A grid the reader doesn't read as + // one mesh is left before its record is built. + if !self.meshes_live + || self.clip.is_some() + || !self.defining.is_empty() + || !m.is_valid() + || m.rows as usize > MAX_MESH_SIDE + || m.cols as usize > MAX_MESH_SIDE + { + return None; + } + // In a symbol's art, corners are written in the space an image's matrix is written in there. + let to_art = if self.in_symbol { self.instance_space } else { self.to_art }; + // Every patch turns the positive way where it is written: from its first corner, the second + // (below it) then the fourth (beside it) go anticlockwise, y up. A reflected mesh, whose + // patches all turn the other way, is written with its columns in reverse order, which turns + // each of them the positive way and draws the same mesh; any other mesh with a patch that + // doesn't turn the positive way is written as its drawn look. + let reversed; + let m = match turns(m, to_art)? { + true => m, + false => { + reversed = columns_reversed(m); + &reversed + } + }; + let (rows, cols) = (m.rows as usize, m.cols as usize); + let at = |r: usize, c: usize| m.points.get(r * (cols + 1) + c); + // Version 2: each corner has an opacity. + let mut s = String::from("/Mesh X!\n%_2 /Version X#\n%_/Cartesian /Type X#\n"); + let _ = writeln!(s, "%_[{rows} {cols}] /Size X#\n%_/Data X#"); + let mut space = None; + for r in 0..rows { + for c in 0..cols { + let _ = writeln!(s, "%_[{r} {c}] /P X#"); + // From the top left point down, right and up; each with its handles towards the + // next corner and the one before it. + for (p, next, prev) in + [(at(r, c)?, H_DOWN, H_RIGHT), (at(r + 1, c)?, H_RIGHT, H_UP), (at(r + 1, c + 1)?, H_UP, H_LEFT), (at(r, c + 1)?, H_LEFT, H_DOWN)] + { + corner(&mut s, &mut space, to_art, p, next, prev)?; + } + s.push_str("%_/E X#\n"); + } + } + s.push_str("/End X!\n"); + let read = mesh_reads(s.as_bytes(), to_art.inverse())?; + same_mesh(&read, m, SETTLE_POINT * to_art.inverse().determinant().abs().sqrt().max(1.0)).then_some(s) + } + + /// Mesh `n` written as `record`: its transparency before it (`xy`), the record, and the block + /// its name and opacity mask go before ([`Self::node`]). The mesh is one object + /// ([`Self::take_objects`]); nothing is written when there is no room for it. + pub(super) fn write_mesh(&mut self, record: &str, xy: Xy) { + if !self.take_objects(1) { + return; + } + self.set_object_xy(xy.object()); + self.body.push_str(record); + self.block_start = self.body.len(); + self.line("0 0 Xd\n6 () XW"); + self.block_end = self.body.len(); + } +} + +/// Which way every patch of `m` turns where `to_art` takes it, at each of its four corners, from +/// its top left point to the one below it, then right and up, y up: `Some(true)` when all turn +/// anticlockwise, `Some(false)` when all turn clockwise, and `None` when they differ (a patch +/// folded across itself, or patches folded over each other) or a corner has no angle. Each corner +/// is measured twice: along the straight lines to the next corners, and along its handles (towards +/// the next corners where a handle is zero), where the patch's edges leave it. +fn turns(m: &GradientMesh, to_art: Affine) -> Option { + let (rows, cols) = (m.rows as usize, m.cols as usize); + let at = |r: usize, c: usize| m.points.get(r * (cols + 1) + c); + let mut way = None; + for r in 0..rows { + for c in 0..cols { + // Each corner with the slots of its handles towards the next corner and the one before it. + let corners = + [(at(r, c)?, H_DOWN, H_RIGHT), (at(r + 1, c)?, H_RIGHT, H_UP), (at(r + 1, c + 1)?, H_UP, H_LEFT), (at(r, c + 1)?, H_LEFT, H_DOWN)]; + for i in 0..4 { + let (before, (here, next, prev), after) = (corners[(i + 3) % 4].0, corners[i], corners[(i + 1) % 4].0); + let line = |to: &MeshPoint| to_art * to.p - to_art * here.p; + let along = |h: usize, to: &MeshPoint| -> Option { + let h = *here.handles.get(h)?; + Some(if h == Vec2::ZERO { line(to) } else { to_art * (here.p + h) - to_art * here.p }) + }; + for cross in [line(after).cross(line(before)), along(next, after)?.cross(along(prev, before)?)] { + let positive = match cross { + x if x > 0.0 => true, + x if x < 0.0 => false, + _ => return None, + }; + if *way.get_or_insert(positive) != positive { + return None; + } + } + } + } + } + way +} + +/// `m` with its columns in reverse order: each row's points from the last to the first, each +/// point's handles to the right and left swapped. It draws the same mesh. +fn columns_reversed(m: &GradientMesh) -> GradientMesh { + let width = m.cols as usize + 1; + let points = m + .points + .chunks(width) + .flat_map(|row| { + row.iter().rev().map(|p| { + let mut p = p.clone(); + p.handles.swap(H_RIGHT, H_LEFT); + p + }) + }) + .collect(); + GradientMesh { rows: m.rows, cols: m.cols, points } +} + +/// A corner `p` of a patch: its color space when it changes (in `space`), then `[color… opacity x y +/// nx ny 1 px py 1] /N X#` with its handles `next` and `prev`, `to_art` taking the document to the +/// space the corners are written in. +fn corner(s: &mut String, space: &mut Option, to_art: Affine, p: &MeshPoint, next: usize, prev: usize) -> Option<()> { + let (sp, values): (Space, Vec) = match p.color { + // The format's gray is lightness. + Color::Gray { k } => (Space::Gray, vec![1.0 - unit(k)]), + Color::Rgb { r, g, b } => (Space::Rgb, vec![unit(r), unit(g), unit(b)]), + Color::Cmyk { c, m, y, k } => (Space::Cmyk, vec![unit(c), unit(m), unit(y), unit(k)]), + // The reader reads no Lab mesh colors. + Color::Lab { .. } => return None, + }; + if *space != Some(sp) { + let _ = writeln!(s, "%_{} /CS X#", sp.name()); + *space = Some(sp); + } + let art = |q: Point| to_art * q; + let (at, n, b) = (art(p.p), art(p.p + *p.handles.get(next)?), art(p.p + *p.handles.get(prev)?)); + s.push_str("%_["); + for v in values { + ps::push_num(s, f64::from(v)); + s.push(' '); + } + ps::push_num(s, f64::from(unit(p.opacity))); + for v in [at.x, at.y, n.x, n.y] { + s.push(' '); + ps::push_num(s, v); + } + s.push_str(" 1"); + for v in [b.x, b.y] { + s.push(' '); + ps::push_num(s, v); + } + s.push_str(" 1] /N X#\n"); + Some(()) +} + +/// Whether `read` is `m` as written: the same grid, each point within `tol` of its place, each +/// handle that points into the grid within `tol` (the reader gives the others none, and they draw +/// nothing), each color in the same model and within [`SETTLE_COLOR`] a channel, and each opacity +/// within it. +fn same_mesh(read: &GradientMesh, m: &GradientMesh, tol: f64) -> bool { + if (read.rows, read.cols) != (m.rows, m.cols) || read.points.len() != m.points.len() { + return false; + } + let (rows, cols) = (m.rows as usize, m.cols as usize); + let near = |a: Point, b: Point| (a - b).hypot() <= tol * (1.0 + 1e-9 * a.to_vec2().hypot()); + read.points.iter().zip(&m.points).enumerate().all(|(i, (a, b))| { + let (r, c) = (i / (cols + 1), i % (cols + 1)); + let inside = [c < cols, c > 0, r < rows, r > 0]; + let handles = [H_RIGHT, H_LEFT, H_DOWN, H_UP].iter().zip(inside).all(|(&h, inside)| { + !inside || near(a.p + a.handles.get(h).copied().unwrap_or(Vec2::ZERO), b.p + b.handles.get(h).copied().unwrap_or(Vec2::ZERO)) + }); + near(a.p, b.p) && handles && same_color(&a.color, &b.color) && (a.opacity - unit(b.opacity)).abs() <= SETTLE_COLOR + }) +} + +/// Whether `a` is `b` as written: the same model, each channel within [`SETTLE_COLOR`] of `b`'s +/// clamped to 0 to 1. +fn same_color(a: &Color, b: &Color) -> bool { + let close = |x: &[f32], y: &[f32]| x.iter().zip(y).all(|(x, y)| (x - unit(*y)).abs() <= SETTLE_COLOR); + match (a, b) { + (Color::Gray { k }, Color::Gray { k: k2 }) => close(&[*k], &[*k2]), + (Color::Rgb { r, g, b }, Color::Rgb { r: r2, g: g2, b: b2 }) => close(&[*r, *g, *b], &[*r2, *g2, *b2]), + (Color::Cmyk { c, m, y, k }, Color::Cmyk { c: c2, m: m2, y: y2, k: k2 }) => close(&[*c, *m, *y, *k], &[*c2, *m2, *y2, *k2]), + _ => false, + } +} diff --git a/crates/eps/src/import.rs b/crates/eps/src/import.rs index 259be45eac..0d451ec9da 100644 --- a/crates/eps/src/import.rs +++ b/crates/eps/src/import.rs @@ -90,9 +90,10 @@ pub use ai::NameEncoding; #[cfg(test)] pub(crate) use ai::objects_read; pub(crate) use ai::{ - BRUSH_MANAGER, BrushesRead, DEFORM_PLUGIN, EnvelopeGridPoint, MAX_CHECKED as ENVELOPE_CHECKS, MAX_EDITING_OBJECTS, MAX_GRADIENT_STOPS, - MAX_LISTED, MAX_LISTED_NAME, MAX_SYMBOLS, brush_plugin_name, brushes_kept, envelope_outline, envelope_upright, read_art_style, read_brush_object, - read_style_list, style_moves_with, symbol_art_member, warp_number, + BLEND_BUDGET, BLEND_PLUGIN, BRUSH_MANAGER, BrushesRead, DEFORM_PLUGIN, EnvelopeGridPoint, MAX_BLEND_KEYS, MAX_BLEND_OBJECTS, + MAX_CHECKED as ENVELOPE_CHECKS, MAX_EDITING_OBJECTS, MAX_GRADIENT_STOPS, MAX_LISTED, MAX_LISTED_NAME, MAX_MESH_SIDE, MAX_SYMBOLS, blend_reads, + brush_plugin_name, brushes_kept, envelope_outline, envelope_upright, mesh_reads, read_art_style, read_brush_object, read_style_list, + style_moves_with, symbol_art_member, turn_brush_art_over, warp_number, }; #[cfg(test)] pub(crate) use ai::{ENVELOPE_DRAWN, ENVELOPE_TYPE_DRAWN}; diff --git a/crates/eps/src/import/ai.rs b/crates/eps/src/import/ai.rs index 6676428408..78990f9db7 100644 --- a/crates/eps/src/import/ai.rs +++ b/crates/eps/src/import/ai.rs @@ -34,7 +34,10 @@ use std::io::Read as _; use super::lex::find; use crate::ps; -pub(crate) use brush::{BrushesRead, MANAGER_NAME as BRUSH_MANAGER, brushes_kept, plugin_name as brush_plugin_name, read_brush_object}; +pub(crate) use blend::{MAX_BLEND_OBJECTS, MAX_KEYS as MAX_BLEND_KEYS, PLUGIN as BLEND_PLUGIN, blend_reads}; +pub(crate) use brush::{ + BrushesRead, MANAGER_NAME as BRUSH_MANAGER, brushes_kept, plugin_name as brush_plugin_name, read_brush_object, turn_over as turn_brush_art_over, +}; pub(crate) use envelope::DRAWN as ENVELOPE_DRAWN; pub(crate) use envelope::MAX_CHECKED; pub(crate) use envelope::TYPE_DRAWN as ENVELOPE_TYPE_DRAWN; @@ -44,6 +47,7 @@ pub(crate) use envelope::{WARPED_TYPE_DRAWN, WarpedType}; #[cfg(test)] pub(crate) use frames::TEXT_FRAME_SCANS; pub(crate) use frames::text_frames; +pub(crate) use mesh::{MAX_SIDE as MAX_MESH_SIDE, mesh_reads}; pub use obj::{NameEncoding, Names}; pub(crate) use paint::MAX_STOPS as MAX_GRADIENT_STOPS; #[cfg(test)] @@ -52,14 +56,14 @@ pub(crate) use read::objects_read; pub use read::read; #[cfg(test)] pub(crate) use read::with_image_limits; +pub(crate) use read::{ + BLEND_BUDGET, MAX_NODES as MAX_EDITING_OBJECTS, MAX_SYMBOLS, join_and, read_art_style, read_over_page, read_program, read_style_list, slot_frame, + slot_of, style_moves_with, symbol_art_member, +}; pub use read::{ BindingRef, Brushes, PaletteSwatches, PlacedPage, Structure, Symbols, active_artboard, artboards, bindings_note, brushes, graphic_styles, palette, read_beside, read_in, symbols, variables, }; -pub(crate) use read::{ - MAX_NODES as MAX_EDITING_OBJECTS, MAX_SYMBOLS, join_and, read_art_style, read_over_page, read_program, read_style_list, slot_frame, slot_of, - style_moves_with, symbol_art_member, -}; pub(crate) use read::is_look_slot; pub(crate) use style::{MAX_LISTED, MAX_LISTED_NAME, warp_number}; diff --git a/crates/eps/src/import/ai/blend.rs b/crates/eps/src/import/ai/blend.rs index 530be2647d..d317164d3a 100644 --- a/crates/eps/src/import/ai/blend.rs +++ b/crates/eps/src/import/ai/blend.rs @@ -34,16 +34,16 @@ use vectorcraft_doc::{AppearanceItem, Node, NodeId, NodeKind}; use vectorcraft_geom::{ParamCurve, PathData, Point, SubPath}; /// The plugin that writes blends. -pub(super) const PLUGIN: &str = "Adobe Path Blends"; // brand-ok: the plugin name the files use +pub(crate) const PLUGIN: &str = "Adobe Path Blends"; // brand-ok: the plugin name the files use /// The most bytes of a blend's record read. pub(super) const MAX_RECORD: usize = 4096; /// The most keys read from one blend. -const MAX_KEYS: usize = 64; +pub(crate) const MAX_KEYS: usize = 64; /// The most steps between two keys (Blend Options' limit). const MAX_STEPS: usize = 1000; /// The most objects (keys and steps) one blend may lay out to be read live; more keep their /// drawn steps. -pub(super) const MAX_BLEND_OBJECTS: usize = 5_000; +pub(crate) const MAX_BLEND_OBJECTS: usize = 5_000; /// How far (pt) a step laid out here may be from where the file draws it. const PLACE_TOLERANCE: f64 = 0.5; /// How far a step's colour (each channel, 0 to 1) may be from the drawn one. @@ -227,6 +227,38 @@ pub(super) fn live_blend(edit: &Node, drawn: &Node, record: &Record, roles: &Rol .map(|(_, spec, _)| NodeKind::Blend { children: keys, spec: Box::new(spec.clone()) }) } +/// What the reader makes of a blend written as the key objects `keys`, named by `ids` in their +/// order, the spine `spine` (`None`: no spine part), the record `bytes` and the drawn steps `drawn`: +/// the live blend's settings, or `None` where it keeps the drawn steps. Takes from `budget` as +/// [`live_blend`] does. +pub(crate) fn blend_reads( + keys: &[Arc], + ids: &[String], + spine: Option<&PathData>, + bytes: &[u8], + drawn: &[Node], + budget: &mut usize, +) -> Option { + let record = record(bytes)?; + let mut roles = Roles::new(); + let mut parts: Vec> = Vec::with_capacity(keys.len() + 1); + for (k, id) in keys.iter().zip(ids) { + roles.insert(k.id, ("K".to_string(), Some(id.clone()))); + parts.push(k.clone()); + } + if let Some(s) = spine { + let id = NodeId(u64::MAX); + roles.insert(id, ("S".to_string(), None)); + parts.push(Arc::new(Node::path(id, s.clone(), Default::default()))); + } + let edit = Node::new(NodeId(u64::MAX - 1), NodeKind::Group { children: parts, clip: false }); + let drawn = Node::new(NodeId(u64::MAX - 2), NodeKind::Group { children: drawn.iter().cloned().map(Arc::new).collect(), clip: false }); + match live_blend(&edit, &drawn, &record, &roles, budget)? { + NodeKind::Blend { spec, .. } => Some(*spec), + _ => None, + } +} + /// The anchor of `spine`'s first subpath each key's centre sits on (within a point), each a /// different one. fn on_spine(keys: &[Arc], spine: &PathData) -> Option> { diff --git a/crates/eps/src/import/ai/brush.rs b/crates/eps/src/import/ai/brush.rs index fd28e42e47..ef45364de5 100644 --- a/crates/eps/src/import/ai/brush.rs +++ b/crates/eps/src/import/ai/brush.rs @@ -58,6 +58,7 @@ //! at None so the art keeps its own colors. use std::collections::{HashMap, HashSet}; +use std::sync::Arc; use kurbo::Affine; use vectorcraft_brush::{ArtBrush, ArtScale, Bristle, Brush, BrushKind, Calligraphic, Colorization, Scatter, Variation}; @@ -474,6 +475,30 @@ pub(super) fn parse_tool_object(kind: Tool, name: &str, params: &str) -> Result< Ok(BrushDraft { name: name.to_string(), kind }) } +/// Turn `art` over (y for -y) with the art of all its opacity masks, those that don't move with +/// their objects too: the art changes the space it is in, and no object moves over its mask. +pub(crate) fn turn_over(art: &mut Node) { + art.transform(Affine::scale_non_uniform(1.0, -1.0), false); + turn_unlinked_masks(art); +} + +/// Turn over the art of the opacity masks in `n` that a transform of `n` leaves in place (the masks +/// that don't move with their objects), in members and in other masks' art too. +fn turn_unlinked_masks(n: &mut Node) { + if let Some(m) = n.extras_if_any().and_then(|e| e.mask.as_mut()) { + let linked = m.linked; + let art = Arc::make_mut(&mut m.art); + if linked { + turn_unlinked_masks(art); + } else { + turn_over(art); + } + } + for c in n.children_mut().into_iter().flatten() { + turn_unlinked_masks(Arc::make_mut(c)); + } +} + /// The brushes of `drafts`, their art from the sections `art` (by name), in the brush manager's /// `order` (brushes it doesn't list after those it does, in the order of their objects), each /// kept within its ranges → the brushes and how many were left out: those whose art isn't read, @@ -553,7 +578,7 @@ pub(super) fn finish_brushes_within( DraftKind::Art { mut brush, art: name, settings } => copy(&name).map(|mut a| { // The side of the section with y up draws on the right of the path, and a brush // draws art's y (down here) on the left of the path. - a.transform(Affine::scale_non_uniform(1.0, -1.0), false); + turn_over(&mut a); if let ArtScale::BetweenGuides { start, end } = &mut brush.scale { // Guides that leave no art between them stretch the whole art. let length = a.geometric_bounds().map_or(0.0, |b| b.width()); diff --git a/crates/eps/src/import/ai/mesh.rs b/crates/eps/src/import/ai/mesh.rs index 91e8975e90..9e8a77e5dc 100644 --- a/crates/eps/src/import/ai/mesh.rs +++ b/crates/eps/src/import/ai/mesh.rs @@ -25,7 +25,7 @@ const MAX_PATCHES: usize = 16_384; const MAX_POINTS: usize = MAX_PATCHES * 16; /// The largest grid `/Size` read as one mesh, a side. -const MAX_SIDE: usize = 128; +pub(crate) const MAX_SIDE: usize = 128; /// The most inks of an `/NChannel` colour space read. const MAX_INKS: usize = 32; /// The most rows or columns a mesh stitched from its patches may have once the lines through the @@ -556,6 +556,14 @@ impl Path { /// `a` towards `b` by `t`, in their own colour model where they share one. fn mix(a: &Color, b: &Color, t: f32) -> Color { + // At either end, that end's own color in its own model: a mesh point of a patch whose corners + // differ in model keeps its color. + if t <= 0.0 { + return *a; + } + if t >= 1.0 { + return *b; + } let l = |x: f32, y: f32| x + (y - x) * t; match (a, b) { (Color::Rgb { r, g, b: bl }, Color::Rgb { r: r2, g: g2, b: b2 }) => Color::rgb(l(*r, *r2), l(*g, *g2), l(*bl, *b2)), @@ -565,6 +573,51 @@ fn mix(a: &Color, b: &Color, t: f32) -> Color { } } +/// The most values one entry of [`mesh_reads`]' record holds (a corner of [`MAX_INKS`] inks has +/// 41). +const MAX_ENTRY: usize = 64; + +/// The gradient mesh the reader reads from `record`, a mesh's lines (`/Mesh X!` … `/End X!`, +/// entries on `%_` lines or not), with `to_doc` taking art space to the document: one mesh, or +/// `None` where the reader would read none or a group of its patches. +pub(crate) fn mesh_reads(record: &[u8], to_doc: Affine) -> Option { + use super::lex::{Lexer, Tok}; + let mut lex = Lexer::new(record); + let mut m: Option = None; + let mut stack: Vec = vec![]; + let mut marks: Vec = vec![]; + while let Some(t) = lex.next_token() { + match t.tok { + Tok::Num(v) => stack.push(V::Num(v)), + Tok::Name(n) => stack.push(V::Name(super::obj::text(n))), + Tok::Str(s) | Tok::Hex(s) => stack.push(V::Str(s)), + Tok::Word(b"[") => marks.push(stack.len()), + Tok::Word(b"]") => { + let at = marks.pop()?; + let items = stack.split_off(at.min(stack.len())); + stack.push(V::Arr(items)); + } + Tok::Word(b"X!") => match (stack.last().and_then(V::text).as_deref(), m.take()) { + (Some("Mesh"), None) => m = Some(MeshReader::default()), + (Some("End"), Some(read)) => { + if read.unread || read.patches.is_empty() { + return None; + } + return read.one_mesh().ok(); + } + _ => return None, + }, + Tok::Word(b"X#") => m.as_mut()?.entry(&std::mem::take(&mut stack), to_doc), + Tok::Comment(_) => {} + _ => return None, + } + if stack.len() > MAX_ENTRY { + return None; + } + } + None +} + #[cfg(test)] mod tests { use super::*; @@ -885,6 +938,51 @@ mod tests { assert!(!reader.unread && reader.patches[0].points[0].color == Color::gray(1.0)); } + /// `/Version` and `/Data` entries, before or after the patches, are passed over: corners with + /// and without an opacity are read by their count of values either way. + #[test] + fn version_and_data_entries_are_passed_over() { + for (with_opacity, data_first) in [(true, true), (false, true), (true, false), (false, false)] { + let mut reader = MeshReader::default(); + for (value, key) in [(V::Name("Cartesian".into()), "Type"), (nums(&[1.0, 1.0]), "Size")] { + reader.entry(&[value, V::Name(key.into())], Affine::IDENTITY); + } + if data_first { + reader.entry(&[V::Num(2.0), V::Name("Version".into())], Affine::IDENTITY); + reader.entry(&[V::Name("Data".into())], Affine::IDENTITY); + } + reader.entry(&[nums(&[0.0, 0.0]), V::Name("P".into())], Affine::IDENTITY); + let colors: [&[f64]; 4] = + if with_opacity { [&[0.5, 0.25], &[0.5, 0.25], &[0.5, 0.25], &[0.5, 0.25]] } else { [&[0.5], &[0.5], &[0.5], &[0.5]] }; + square(&mut reader, colors, Default::default()); + if !data_first { + reader.entry(&[V::Name("Data".into())], Affine::IDENTITY); + reader.entry(&[V::Num(1.0), V::Name("Version".into())], Affine::IDENTITY); + } + assert!(!reader.unread, "{with_opacity} {data_first}"); + let mesh = reader.one_mesh().unwrap(); + let want = if with_opacity { 0.25 } else { 1.0 }; + assert!(mesh.points.iter().all(|p| p.opacity == want), "{with_opacity} {data_first}: {mesh:?}"); + } + } + + /// A patch whose corners differ in color space keeps each corner's color in its own model when + /// the patches are stitched into one mesh. + #[test] + fn stitched_corners_keep_their_own_color_models() { + let cs = |n: &str| (V::Name(n.into()), "CS"); + let mut reader = MeshReader::default(); + let first = vec![(nums(&[1.0, 1.0]), "Size"), (nums(&[0.0, 0.0]), "P"), cs("DeviceRGB")]; + square( + &mut reader, + [&[1.0, 0.0, 0.0], &[0.25], &[0.0, 1.0, 0.0, 0.0], &[0.0, 0.0, 1.0]], + [first, vec![cs("DeviceGray")], vec![cs("DeviceCMYK")], vec![cs("DeviceRGB")]], + ); + let mesh = reader.one_mesh().unwrap(); + let colors: Vec = mesh.points.iter().map(|p| p.color).collect(); + assert_eq!(colors, [Color::rgb(1.0, 0.0, 0.0), Color::rgb(0.0, 0.0, 1.0), Color::gray(0.75), Color::cmyk(0.0, 1.0, 0.0, 0.0)]); + } + /// A named colour (`[c m y k /DeviceCMYK (name) /Process]`) paints at each corner's tint, 1 its /// full colour; `/NChannel` inks overprint at their tints. Ones that don't add up stay unread. #[test] diff --git a/crates/eps/src/import/ai/read.rs b/crates/eps/src/import/ai/read.rs index 67928785ad..27a10033db 100644 --- a/crates/eps/src/import/ai/read.rs +++ b/crates/eps/src/import/ai/read.rs @@ -97,7 +97,9 @@ //! have is the object's own appearance, not a link. //! //! - Symbols: `%AI14_BeginSymbol` (or `%AI10_`), `(name)`, `0 A 0 Xw 0 Ae`, the art (in the -//! symbol's space, y down), a dictionary whose `AI13PatternRegistrationType` is the registration +//! symbol's space, y down; an image's matrix and a gradient mesh's corners in the canvas's space +//! turned y up about art space's origin there, an envelope's contents in its dictionary in the +//! canvas's space, y down), a dictionary whose `AI13PatternRegistrationType` is the registration //! point (1 to 9, from the top left, row by row), `%AI10_EndSymbol`; each is read by a reader of //! its own into the document's symbols. `%AI24_BeginSymbolList` (or `%AI10_`) lists their names //! in the Symbols panel's order. An instance: `/SymbolInstance : (name) /SymbolRef , a b c d tx @@ -156,9 +158,10 @@ use graph::Graph; pub(crate) use ops::{read_art_style, read_style_list, style_moves_with}; #[cfg(test)] pub(crate) use raster::with_image_limits; +pub(crate) use types::BLEND_BUDGET; pub(crate) use types::MAX_NODES; pub use types::PlacedPage; -use types::{BLEND_BUDGET, BrushArtColors, FLIP, Frame, GState, Kind, PatternHead, PendingEnvelope, Place, PlacedTail, Raster, SymbolHead}; +use types::{BrushArtColors, FLIP, Frame, GState, Kind, PatternHead, PendingEnvelope, Place, PlacedTail, Raster, SymbolHead}; #[cfg(test)] pub use types::{GRAPH_PLAIN, GRAPH_UNENDED, LINKED_PLACEHOLDERS, NON_NATIVE_ART, NON_NATIVE_ART_UNREAD, VERSIONED_UNENDED}; pub(super) use types::{blend_mode, blend_name}; diff --git a/crates/eps/src/import/ai/read/art.rs b/crates/eps/src/import/ai/read/art.rs index a5e222b12f..4e7b5adc92 100644 --- a/crates/eps/src/import/ai/read/art.rs +++ b/crates/eps/src/import/ai/read/art.rs @@ -277,6 +277,18 @@ impl<'a> Reader<'a> { Ok(()) } + /// A gradient mesh's `X#` entry `vals`. In a symbol's art, corners are in the space an image's + /// matrix is in there; a mesh there in a file that doesn't say where the canvas is is unread. + pub(super) fn mesh_entry(&mut self, vals: &[V]) { + let to_doc = self.image_space(); + if let Some((m, _)) = self.mesh.as_mut() { + match to_doc { + Some(to_doc) => m.entry(vals, to_doc), + None => m.unread = true, + } + } + } + /// `/End X!`: the gradient mesh read, as one object. pub(super) fn end_mesh(&mut self) -> Result<(), String> { let Some((m, hidden)) = self.mesh.take() else { return Ok(()) }; @@ -351,11 +363,15 @@ impl<'a> Reader<'a> { pub(super) fn set_instance(&mut self, i: &Instance) { let mut to_doc = self.space(); // In a pattern's definition a gradient's `Xm` and `Bm` are written y down about the canvas point of art space's - // origin, as the file's PDF part draws them; in a symbol's, as the instances in its art are. + // origin, as the file's PDF part draws them; in a symbol's, as the instances in its art are, an envelope's + // contents' included (which `space` moves alone). if (self.pattern.is_some() || self.symbol.is_some()) && i.has_matrix() && let Some(t) = self.template { + if self.pattern.is_none() && !self.envelope_blocks.is_empty() { + to_doc = Affine::IDENTITY; + } let (cx, cy) = ((t[0] + t[2]) / 2.0, (t[1] + t[3]) / 2.0); to_doc *= Affine::new([1.0, 0.0, 0.0, -1.0, CANVAS_CENTRE - cx, CANVAS_CENTRE + cy]); } diff --git a/crates/eps/src/import/ai/read/document.rs b/crates/eps/src/import/ai/read/document.rs index 258d7d584b..f3684f3882 100644 --- a/crates/eps/src/import/ai/read/document.rs +++ b/crates/eps/src/import/ai/read/document.rs @@ -923,12 +923,17 @@ impl<'a> Reader<'a> { } /// Art space → where the art being read goes: the document, or while a pattern's definition is - /// read, the pattern's space (y down). A symbol's definition is written in the symbol's space. + /// read, the pattern's space (y down). A symbol's definition is written in the symbol's space, + /// except an envelope's contents in its dictionary (its `AIDeformArtKey` block), which are in the + /// canvas's space, y down (in the symbol's space in a file without a template box). pub(crate) fn space(&mut self) -> Affine { if self.pattern.is_some() { FLIP } else if self.symbol.is_some() { - Affine::IDENTITY + match self.canvas_origin() { + Some(o) if !self.envelope_blocks.is_empty() => Affine::translate(-o.to_vec2()), + _ => Affine::IDENTITY, + } } else { self.ensure_space() } diff --git a/crates/eps/src/import/ai/read/ops.rs b/crates/eps/src/import/ai/read/ops.rs index 721a6988ba..7369c9f938 100644 --- a/crates/eps/src/import/ai/read/ops.rs +++ b/crates/eps/src/import/ai/read/ops.rs @@ -226,10 +226,7 @@ impl<'a> Reader<'a> { } ("X!", Some("End")) if self.mesh.is_some() => return self.end_mesh(), ("X#", _) => { - let to_doc = self.space(); - if let Some((m, _)) = self.mesh.as_mut() { - m.entry(&vals, to_doc); - } + self.mesh_entry(&vals); return Ok(()); } _ if self.mesh.is_some() => return Ok(()), diff --git a/crates/eps/src/import/ai/read/types.rs b/crates/eps/src/import/ai/read/types.rs index b6e908c2e1..02d4a3354a 100644 --- a/crates/eps/src/import/ai/read/types.rs +++ b/crates/eps/src/import/ai/read/types.rs @@ -16,7 +16,7 @@ pub(crate) const MAX_NODES: usize = 4_000_000; /// The most objects all the blends of one import may lay out to be checked (each twice) and made /// live; past it, blends keep their drawn steps. -pub(super) const BLEND_BUDGET: usize = 50_000; +pub(crate) const BLEND_BUDGET: usize = 50_000; /// Most points in one path. pub(super) const MAX_POINTS: usize = 4_000_000; diff --git a/crates/eps/src/import/ai/tests.rs b/crates/eps/src/import/ai/tests.rs index 68ba060352..8174644020 100644 --- a/crates/eps/src/import/ai/tests.rs +++ b/crates/eps/src/import/ai/tests.rs @@ -5251,6 +5251,62 @@ fn an_image_in_a_symbols_art_is_placed_from_the_canvas() { assert_eq!(r.unread.len(), 1, "{:?}", r.warnings); } +#[test] +fn a_mesh_in_a_symbols_art_is_placed_from_the_canvas() { + // The template box's center is (100.5, 50.5): art space's origin is at canvas (8091, 8242). A + // mesh's corners in a symbol's art are in the canvas's space turned y up about that point, as an + // image's matrix there is: (-8096, 8244.5) is (-5, -2.5) in the symbol's art. + let corners: String = [(-8096.0, 8244.5), (-8096.0, 8239.5), (-8086.0, 8239.5), (-8086.0, 8244.5)] + .iter() + .map(|(x, y)| format!("%_[0.5 1 {x} {y} {x} {y} 1 {x} {y} 1] /N X#\n")) + .collect(); + let mesh = format!( + "/Mesh X!\n%_2 /Version X#\n%_/Cartesian /Type X#\n%_[1 1] /Size X#\n%_/Data X#\n%_[0 0] /P X#\n%_/DeviceGray /CS X#\n{corners}%_/E X#\n/End X!\n" + ); + let doc = read_ok(&format!("%AI3_TemplateBox: 100.5 50.5 100.5 50.5\n{}{}", symbols(&symbol("Patch", &mesh, 5)), layer(""))).doc; + assert_eq!(doc.symbols.len(), 1); + let mut found = vec![]; + let mut stack = vec![doc.symbols[0].art.clone()]; + while let Some(n) = stack.pop() { + match &n.kind { + NodeKind::Mesh(m) => found.push(m.points.iter().map(|p| p.p).collect::>()), + _ => stack.extend(n.children().into_iter().flatten().cloned()), + } + } + assert_eq!(found.len(), 1, "{:?}", doc.symbols[0].art); + let want = [Point::new(-5.0, -2.5), Point::new(5.0, -2.5), Point::new(-5.0, 2.5), Point::new(5.0, 2.5)]; + assert!(want.iter().all(|w| found[0].iter().any(|p| (*p - *w).hypot() < 1e-9)), "{:?}", found[0]); + // Without a template box the mesh can't be placed, as an image there can't: the symbol isn't read + // whole and its instance comes in as the page draws it. + let group = format!("0 Ae\nu\n{}{RED}{}f\nU\n", instance("Patch", [1.0, 0.0, 0.0, -1.0, 20.0, 50.0]), rect_path(10.0, 0.0, 14.0, 4.0)); + let r = read_ok(&(symbols(&symbol("Patch", &mesh, 5)) + &layer(&group))); + assert!(r.doc.symbols.is_empty(), "{:?}", r.doc.symbols.iter().map(|s| &s.name).collect::>()); + assert!(!r.unread.is_empty(), "{:?}", r.warnings); +} + +#[test] +fn an_envelope_in_a_symbols_art_is_read_from_the_canvas() { + // An envelope's grid in a symbol's art is read in the space a gradient mesh's corners are read + // in there. A grid and contents written in the symbol's own space, as earlier VectorCraft builds + // wrote them, don't meet there: the envelope opens as the art it draws. + let drawn = format!("{RED}{}f\n", rect_path(30.0, 10.0, 170.0, 90.0)); + let env = envelope_of(&straight_mesh(1, 1, (120.0, 60.0)), ENVELOPE_KEYS, &envelope_content(), 2, &drawn); + let doc = read_ok(&format!("%AI3_TemplateBox: 100.5 50.5 100.5 50.5\n{}{}", symbols(&symbol("Bent", &env, 5)), layer(""))).doc; + assert_eq!(doc.symbols.len(), 1); + let mut envelopes = 0; + doc.symbols[0].art.walk(&mut |n| envelopes += usize::from(matches!(n.kind, NodeKind::Envelope { .. }))); + assert_eq!(envelopes, 0, "{:?}", doc.symbols[0].art); + let mut paths = 0; + doc.symbols[0].art.walk(&mut |n| paths += usize::from(matches!(n.kind, NodeKind::Path { .. }))); + assert!(paths > 0, "{:?}", doc.symbols[0].art); + // Without a template box the grid can't be placed, as a gradient mesh there can't: the symbol + // isn't read whole and its instance comes in as the page draws it. + let group = format!("0 Ae\nu\n{}{RED}{}f\nU\n", instance("Bent", [1.0, 0.0, 0.0, -1.0, 20.0, 50.0]), rect_path(10.0, 0.0, 14.0, 4.0)); + let r = read_ok(&(symbols(&symbol("Bent", &env, 5)) + &layer(&group))); + assert!(r.doc.symbols.is_empty(), "{:?}", r.doc.symbols.iter().map(|s| &s.name).collect::>()); + assert!(!r.unread.is_empty(), "{:?}", r.warnings); +} + #[test] fn an_instance_keeps_its_hide_lock_transparency_and_clip() { let m = [1.0, 0.0, 0.0, -1.0, 20.0, 50.0]; @@ -6462,6 +6518,30 @@ fn a_brushs_opacity_mask_art_takes_ids_of_the_document() { assert_eq!(unique.len(), all.len(), "{all:?}"); } +/// An Art brush's art is turned over with the art of its opacity mask, whether the mask moves with +/// its object or not: the mask's art stays over the part of the object it is over in the section. +#[test] +fn an_art_brushs_opacity_mask_art_turns_over_with_its_object() { + let mut read = vec![]; + for linked in [true, false] { + let mask_art: String = format!("1 g\n{}f\n", rect_path(0.0, 0.0, 40.0, 3.0)).lines().map(|l| format!("%_{l}\n")).collect(); + let options = format!("%_1 /Bool (Clipping) ,\n%_{} /Bool (Linked) ,\n", u8::from(linked)); + let mask = format!("%_/ArtDictionary :\n%_/Mask :\n%_X=\n{mask_art}%_X+\n%_(Art) ,\n{options}%_; (AI9_Mask) ,\n%_;\n"); + let section = format!("%AI8_BeginBrushPattern\n(Ribbon art)\n0 A\n0 g\n{}f\n{mask}%AI8_EndBrushPattern\n", rect_path(0.0, 0.0, 40.0, 8.0)); + let shape = format!("{RED}{}f\n", rect_path(0.0, 0.0, 10.0, 10.0)); + let r = read_ok(&format!("{section}{}{}", plugin_object(ART_BRUSH, "Ribbon", RIBBON), layer(&shape))); + let lib = vectorcraft_brush::library(&r.doc); + let vectorcraft_brush::BrushKind::Art(brush) = brush_named(&lib, "Ribbon") else { panic!("art: {:?}", r.warnings) }; + let m = brush.art.extras().mask.as_deref().unwrap_or_else(|| panic!("the mask is read: {:#?}", brush.art)); + assert_eq!(m.linked, linked); + let (object, over) = (brush.art.geometric_bounds().unwrap(), m.art.geometric_bounds().unwrap()); + assert!((object.height() - 8.0).abs() < 1e-6 && (over.height() - 3.0).abs() < 1e-6, "linked {linked}: {over:?} over {object:?}"); + assert!(over.y0 > object.y0 - 1e-6 && over.y1 < object.y1 + 1e-6, "linked {linked}: {over:?} over {object:?}"); + read.push((object, over)); + } + assert_eq!(read[0], read[1], "a mask is in the same place whether it moves with its object or not"); +} + /// An art styles section inside a symbol's, a pattern's or a brush's art is skipped: the file's own /// art styles still style the layers' objects read after the definition. #[test] diff --git a/crates/eps/src/legacy_ai/tests.rs b/crates/eps/src/legacy_ai/tests.rs index d8a81461cb..f2ee896dc5 100644 --- a/crates/eps/src/legacy_ai/tests.rs +++ b/crates/eps/src/legacy_ai/tests.rs @@ -728,6 +728,51 @@ fn images_are_written_in_the_form_the_specification_shows() { assert!(rgb.iter().zip([247.0, 148.0, 29.0]).all(|(c, want)| (c * 255.0 - want).abs() < 0.1), "{rgb:?}"); } +/// An image's samples are written as upper-case hex on `%` comment lines (§8.1, §8.4) of 60 +/// digits, the last line shorter, each line ending with a newline: no samples write no line, and +/// samples that fill their last line exactly write no empty `%` line after it. +#[test] +fn image_samples_are_written_as_hex_lines() { + let hex = |samples: &[u8]| { + let mut s = String::new(); + super::writer::Writer::push_hex(&mut s, samples); + s + }; + let mut samples = vec![0x00, 0x09, 0x0A, 0xAF, 0xFF]; + samples.extend(0x10..=0x29); + assert_eq!(hex(&samples), "%00090AAFFF101112131415161718191A1B1C1D1E1F202122232425262728\n%29\n"); + assert_eq!(hex(&samples[..30]), "%00090AAFFF101112131415161718191A1B1C1D1E1F202122232425262728\n"); + assert_eq!(hex(&samples[..29]), "%00090AAFFF101112131415161718191A1B1C1D1E1F2021222324252627\n"); + assert_eq!(hex(&[0xAB]), "%AB\n"); + assert_eq!(hex(&[]), ""); + // Appended after what is already written. + let mut s = String::from("0 0 1 1 1 1 8 3 0 0 0 0 XI\n"); + super::writer::Writer::push_hex(&mut s, &[0xC0, 0xFF, 0xEE]); + assert_eq!(s, "0 0 1 1 1 1 8 3 0 0 0 0 XI\n%C0FFEE\n"); +} + +/// The hex lines are the same as formatting each sample with `{:02X}` and breaking the digits +/// into lines of [`HEX_LINE`], for every length up to three lines and one more sample, and for +/// every byte value. +#[test] +fn image_hex_matches_formatted_samples() { + let formatted = |samples: &[u8]| { + let digits: String = samples.iter().map(|c| format!("{c:02X}")).collect(); + let lines: Vec = digits.as_bytes().chunks(HEX_LINE).map(|l| format!("%{}\n", std::str::from_utf8(l).unwrap())).collect(); + lines.concat() + }; + let all: Vec = (0..=255u8).cycle().skip(7).take(3 * HEX_LINE / 2 + 1).collect(); + for n in 0..=all.len() { + let mut s = String::new(); + super::writer::Writer::push_hex(&mut s, &all[..n]); + assert_eq!(s, formatted(&all[..n]), "{n} samples"); + } + let every: Vec = (0..=255u8).collect(); + let mut s = String::new(); + super::writer::Writer::push_hex(&mut s, &every); + assert_eq!(s, formatted(&every)); +} + /// The pieces of an image cut into a raster mesh warp (as Object › Expand leaves a Warp on an /// image) are written as the image whole once, then each as the part of it that its triangle shows, /// and the file draws as the document does ([`write`] runs it). diff --git a/crates/eps/src/legacy_ai/writer.rs b/crates/eps/src/legacy_ai/writer.rs index 536940b9f6..e6653bfcd3 100644 --- a/crates/eps/src/legacy_ai/writer.rs +++ b/crates/eps/src/legacy_ai/writer.rs @@ -1213,32 +1213,35 @@ impl<'a> Writer<'a> { coverage } + /// Appends `samples` to `s` as upper-case hex digits on comment lines: each line starts with `%`, + /// holds [`HEX_LINE`] digits (the last line may hold fewer) and ends with a newline. An empty + /// `samples` appends no line. + pub(super) fn push_hex(s: &mut String, samples: &[u8]) { + const DIGITS: &[u8; 16] = b"0123456789ABCDEF"; + const PER_LINE: usize = HEX_LINE / 2; + const _: () = assert!(HEX_LINE > 0 && HEX_LINE.is_multiple_of(2)); + let lines = samples.len().div_ceil(PER_LINE); + s.reserve(samples.len().saturating_mul(2).saturating_add(lines.saturating_mul(2))); + for line in samples.chunks(PER_LINE) { + s.push('%'); + for &c in line { + s.push(char::from(DIGITS[usize::from(c >> 4)])); + s.push(char::from(DIGITS[usize::from(c & 0x0F)])); + } + s.push('\n'); + } + } + /// An image's lines (§8.4): `%AI5_File:`, `%AI5_BeginRaster`, matrix `m` as `[ a b c d tx ty ]` /// and the numbers `operands` with `XI`, `samples` in hex on comment lines of [`HEX_LINE`] /// digits, `%AI5_EndRaster`, then `F`. fn raster(&mut self, m: Affine, operands: &str, samples: &[u8]) { - let mut hex = String::with_capacity(samples.len() * 2 + samples.len() / HEX_LINE * 2 + 2); - hex.push('%'); - let mut on_line = 0; - for c in samples { - let _ = write!(hex, "{c:02X}"); - on_line += 2; - if on_line >= HEX_LINE { - hex.push_str("\n%"); - on_line = 0; - } - } - if hex.ends_with('%') { - hex.pop(); - } else { - hex.push('\n'); - } let [a, b, c, d, e, f] = m.as_coeffs(); let s = &mut self.body; s.push_str("%AI5_File:\n%AI5_BeginRaster\n[ "); ps::push_nums(s, &[a, b, c, d, e, f]); let _ = writeln!(s, "] {operands} XI"); - s.push_str(&hex); + Self::push_hex(s, samples); s.push_str("%AI5_EndRaster\nF\n"); } } diff --git a/crates/pathops/src/addons/pathtools/crossings.rs b/crates/pathops/src/addons/pathtools/crossings.rs index bcc254aa82..90a0d266ea 100644 --- a/crates/pathops/src/addons/pathtools/crossings.rs +++ b/crates/pathops/src/addons/pathtools/crossings.rs @@ -48,6 +48,42 @@ fn chords_cross(a: &CubicBez, b: &CubicBez) -> Option<(f64, f64)> { (within(s) && within(u)).then(|| (s.clamp(0.0, 1.0), u.clamp(0.0, 1.0))) } +/// `(s, t)` moved to where `a` and `b` cross exactly, by Newton's method on a(s) = b(t), or as it +/// was when that doesn't settle within both segments, closer than it started, and within the +/// distance a piece bent by [`FLAT`] can shift a crossing at their angle there. +fn refined(a: &CubicBez, b: &CubicBez, (s0, t0): (f64, f64)) -> (f64, f64) { + let gap = |s: f64, t: f64| a.eval(s).distance(b.eval(t)); + let start = gap(s0, t0); + if start <= 1e-12 || !start.is_finite() { + return (s0, t0); + } + let (da, db) = (a.deriv(), b.deriv()); + let (mut s, mut t) = (s0, t0); + for _ in 0..8 { + let f = a.eval(s) - b.eval(t); + let (u, v) = (da.eval(s).to_vec2(), db.eval(t).to_vec2()); + // a(s + ds) - b(t + dt) ≈ f + u ds - v dt, which is zero for these steps. + let den = u.cross(v); + let (ds, dt) = (-f.cross(v) / den, u.cross(f) / den); + if !(ds.is_finite() && dt.is_finite()) { + return (s0, t0); + } + (s, t) = (s + ds, t + dt); + if !(-1e-12..=1.0 + 1e-12).contains(&s) || !(-1e-12..=1.0 + 1e-12).contains(&t) { + return (s0, t0); + } + if gap(s, t) <= 1e-12 { + break; + } + } + let (s, t) = (s.clamp(0.0, 1.0), t.clamp(0.0, 1.0)); + let (u, v) = (da.eval(s).to_vec2(), db.eval(t).to_vec2()); + let sin = u.cross(v).abs() / (u.hypot() * v.hypot()); + let reach = 4.0 * FLAT / sin + SAME; + let moved = a.eval(s).distance(a.eval(s0)).max(b.eval(t).distance(b.eval(t0))); + if gap(s, t) < start.min(1e-9) && moved <= reach { (s, t) } else { (s0, t0) } +} + /// Where segments `a` and `b` cross: (t on `a`, t on `b`) pairs, halving both while their control /// boxes meet until each piece is straight. `None` once `budget` steps are spent. fn segment_crossings(a: &CubicBez, b: &CubicBez, budget: &mut usize) -> Option> { @@ -80,6 +116,11 @@ fn segment_crossings(a: &CubicBez, b: &CubicBez, budget: &mut usize) -> Option = kurbo::PathSeg::Cubic(arc.subpaths[0].segment(0)) + .intersect_line(kurbo::Line::new(from, to)) + .iter() + .map(|x| from.lerp(to, x.line_t)) + .collect(); + assert_eq!(exact.len(), 2, "{gap}"); + let on = |p: &PathData, other: &PathData| -> Vec { + crossings_on(p, &[other]).unwrap().iter().map(|q| p.subpaths[0].segment(q.1).eval(q.2)).collect() + }; + let both = crossings(&[&arc, &across], false).unwrap(); + let found = [ + on(&arc, &across), + on(&across, &arc), + both[0].iter().map(|q| arc.subpaths[0].segment(q.1).eval(q.2)).collect(), + both[1].iter().map(|q| across.subpaths[0].segment(q.1).eval(q.2)).collect(), + ]; + for places in found { + assert_eq!(places.len(), 2, "{gap}: {places:?}"); + for x in &exact { + let off = places.iter().map(|p| p.distance(*x)).fold(f64::INFINITY, f64::min); + assert!(off < 1e-6, "{gap}: {off} pt from {x:?}"); + } + } + } +} + #[test] fn insert_at_keeps_the_shape_and_names_the_new_anchors() { let sp = line(&[(0.0, 0.0), (100.0, 0.0), (100.0, 100.0)], false); diff --git a/crates/pdf/src/import/builder.rs b/crates/pdf/src/import/builder.rs index e6e34ae429..a9cd9ada7c 100644 --- a/crates/pdf/src/import/builder.rs +++ b/crates/pdf/src/import/builder.rs @@ -991,7 +991,7 @@ impl<'p> Builder<'p> { self.flush_type3(); if let (Some(s), Some(line)) = (&look.stroke, &mut self.text) && look.fill.is_none() - && line.stroke_last(font_key, at, s.clone(), overprint) + && line.stroke_filled(font_key, at, opacity, &text, s.clone(), overprint) { return true; } @@ -1153,9 +1153,13 @@ impl<'p> Builder<'p> { // A stroke over the glyph just filled (fill and stroke rendering). if let (Some(s), Some(line)) = (&look.stroke, &mut self.text) && look.fill.is_none() - && line.stroke_last(key, at, s.clone(), overprint) + && line.stroke_filled(key, at, opacity, &text, s.clone(), overprint) { - self.keep_glyph(o, m, drawn, opacity, scale, overprint); + // Upright glyphs aren't kept as outlines (nor, below, are those filled only): a + // vertical line that came in as its outlines would lose the ones filled only. + if top.is_none() { + self.keep_glyph(o, m, drawn, opacity, scale, overprint); + } return true; } if !self.text.as_mut().is_some_and(place) { diff --git a/crates/pdf/src/import_text.rs b/crates/pdf/src/import_text.rs index ec4fff092a..a6b128e042 100644 --- a/crates/pdf/src/import_text.rs +++ b/crates/pdf/src/import_text.rs @@ -61,6 +61,17 @@ impl Placement { fn up(&self) -> Vec2 { Vec2::new(self.dir.y, -self.dir.x) } + + /// Is a glyph placed with `other` drawn where this one is, the same size, width, slant and + /// direction (a stroke the reader draws over a glyph it filled has the very same placement; + /// the tolerances only allow for rounding)? + fn same_as(&self, other: &Placement) -> bool { + (self.origin - other.origin).hypot() < self.size * 1e-3 + && (self.size - other.size).abs() <= self.size * 1e-3 + && (self.h_scale - other.h_scale).abs() < 0.05 + && (self.slant - other.slant).abs() < 1e-3 + && self.dir.dot(other.dir) > 1.0 - 1e-6 + } } /// A glyph set vertically (WMode 1: no horizontal advance) and the top centre of its em box: a @@ -100,16 +111,21 @@ pub(crate) struct Look { } impl Look { - /// Can a glyph drawn with `other` join a run drawn with this? A fill joins a run whose - /// glyphs were also stroked over (fill and stroke rendering draws each glyph twice); invisible - /// text (neither fill nor stroke) joins only invisible text. + /// Can a glyph drawn with `other` join a run drawn with this? Only a run drawn alike: fill, + /// stroke and overprints. A glyph filled only never joins a run whose glyphs were also stroked + /// over: it takes a stroke only when one is drawn over it later + /// ([`TextLine::stroke_filled`]), which then joins it to the run before if that is stroked + /// alike (fill and stroke rendering draws each glyph twice), and a glyph filled only after + /// one filled and stroked stays unstroked (#8300). Invisible text (neither fill nor stroke) + /// joins only invisible text. fn takes(&self, other: &Look) -> bool { self.font == other.font && (self.size - other.size).abs() <= self.size * 0.01 && (self.h_scale - other.h_scale).abs() < 0.5 && self.fill == other.fill && self.overprint_fill == other.overprint_fill - && ((other.stroke.is_none() && other.fill.is_some()) || (self.stroke == other.stroke && self.overprint_stroke == other.overprint_stroke)) + && self.stroke == other.stroke + && self.overprint_stroke == other.overprint_stroke } fn style(&self) -> CharStyle { @@ -219,6 +235,17 @@ pub(crate) struct TextLine { authored: Vec, /// Fill callbacks in an authored span, for the reader's later stroke pass. actual_fills: HashMap<(u128, u64, u64), Option>, + /// The glyphs filled without a stroke, in drawing order, for a stroke drawn over them later + /// ([`stroke_filled`](Self::stroke_filled)). + filled: Vec, + /// The first of [`filled`](Self::filled) a stroke may still be drawn over: a stroke matches + /// glyphs in the order they were filled, and each at most once. + stroked: usize, + /// Glyphs stroked so far that are still to be restyled: a stroke pass over a word restyles it + /// once, as a whole ([`flush_stroke`](Self::flush_stroke)). + pending: Option, + /// The last glyph's placement. + last_at: Placement, /// The first glyph was set vertically ([`Upright`]). upright: Option, /// The glyphs make a column (vertical type), each below the last. @@ -251,6 +278,28 @@ struct Slot { advance: Option, } +/// A glyph filled without a stroke: its font and placement, and where its text is in the line's +/// runs (the run's index, the text's byte offset in it and its length). +#[derive(Clone, Copy, Debug)] +struct Filled { + font: u128, + at: Placement, + run: usize, + start: usize, + len: usize, +} + +/// Glyphs next to each other in one run that a stroke is drawn over, not yet restyled +/// ([`TextLine::stroke_filled`]): the run's index, the text's byte range in it, and the stroke. +#[derive(Clone, Debug)] +struct PendingStroke { + run: usize, + start: usize, + end: usize, + stroke: TypeStroke, + overprint: bool, +} + /// What a finished line of type tells beyond its text object (see [`crate::import_lines`]). #[derive(Clone, Debug, Default)] pub(crate) struct LineFacts { @@ -283,6 +332,10 @@ impl TextLine { slots: vec![], authored: vec![], actual_fills: HashMap::new(), + filled: vec![], + stroked: 0, + pending: None, + last_at: at, upright: None, column: false, ink: vec![], @@ -313,12 +366,15 @@ impl TextLine { } pub fn push_upright_content(&mut self, look: &Look, at: Placement, opacity: f32, upright: Upright, content: TextContent<'_>) -> bool { + self.flush_stroke(); let text = content.text(); if !text.is_empty() && self.authored.is_empty() && self.upright.is_some() { // Suppressed vertical glyphs likewise provide no text anchor. self.at = at; self.opacity = opacity; self.runs.clear(); + self.filled.clear(); + self.stroked = 0; self.column = false; } let down = -self.at.up(); @@ -327,8 +383,9 @@ impl TextLine { self.runs.push((look.clone(), 0.0, text.to_string())); self.last_start = 0; self.record_actual_fill(look, at, content); + self.record_filled(look, at, content); self.authored.extend(text.chars().map(|_| content.authored())); - (self.upright, self.next, self.last) = (Some(upright), at.origin + down * at.size, at.origin); + (self.upright, self.next, self.last, self.last_at) = (Some(upright), at.origin + down * at.size, at.origin, at); return true; }; let across = (at.origin - self.at.origin).dot(self.at.dir); @@ -364,9 +421,11 @@ impl TextLine { self.last_start = 0; } self.record_actual_fill(look, at, content); + self.record_filled(look, at, content); self.authored.extend(text.chars().map(|_| content.authored())); self.next = at.origin + down * at.size; self.last = at.origin; + self.last_at = at; true } @@ -377,6 +436,7 @@ impl TextLine { } pub fn push_content(&mut self, look: &Look, at: Placement, opacity: f32, advance: f64, content: TextContent<'_>) -> bool { + self.flush_stroke(); let text = content.text(); let pen = matches!(content, TextContent::Pen); // A vertical line (even a single upright glyph) takes no horizontal glyphs. @@ -394,6 +454,8 @@ impl TextLine { self.last_size = at.size; self.baseline.clear(); self.runs.clear(); + self.filled.clear(); + self.stroked = 0; } let bytes = self.text_bytes; let glyph = self.baseline.len(); @@ -461,6 +523,7 @@ impl TextLine { self.last_start = 0; } self.record_actual_fill(look, at, content); + self.record_filled(look, at, content); self.text_bytes = self.text_bytes.saturating_add(text.len()); if !pen { let one = text.chars().count() == 1 && !content.authored(); @@ -475,6 +538,7 @@ impl TextLine { self.visible = self.next; } self.last = at.origin; + self.last_at = at; self.last_dir = at.dir; self.last_size = at.size; self.baseline.push(at.origin); @@ -488,10 +552,22 @@ impl TextLine { } } + /// Note glyph `content` just added to the last run, filled without a stroke, for a stroke + /// drawn over it later. + fn record_filled(&mut self, look: &Look, at: Placement, content: TextContent<'_>) { + let len = content.text().len(); + if content.authored() || len == 0 || look.fill.is_none() || look.stroke.is_some() { + return; + } + let run = self.runs.len().saturating_sub(1); + self.filled.push(Filled { font: look.font, at, run, start: self.last_start, len }); + } + /// The reader fills a whole Tj/TJ before replaying its glyphs as strokes. A replay /// must neither consume the replacement nor rewind the pen. Only the first glyph's /// style belongs to the replacement; suppressed glyphs have no text to restyle. pub fn stroke_actual(&mut self, font: u128, at: Placement, stroke: TypeStroke, overprint: bool) -> bool { + self.flush_stroke(); let key = (font, at.origin.x.to_bits(), at.origin.y.to_bits()); let Some(run) = self.actual_fills.remove(&key) else { return false }; if let Some((look, ..)) = run.and_then(|i| self.runs.get_mut(i)) { @@ -529,19 +605,152 @@ impl TextLine { Some(bp) } - /// A stroke (`stroke`: paint, width, cap, join and miter limit) over the glyph just drawn at - /// `at` in `font` (fill and stroke rendering), which `overprint`s or not: that glyph is - /// stroked. `false`: it isn't that glyph. + /// A stroke (`stroke`: paint, width, cap, join and miter limit) over glyph `text` drawn at + /// `at` in `font` at `opacity`, which `overprint`s or not, after the glyph was filled (fill + /// and stroke rendering): that glyph is stroked. `false`: no glyph on the line was filled so. /// - /// A filled glyph joins a run of the same fill whatever its stroke ([`Look::takes`]), so the - /// run can hold glyphs before it that are stroked otherwise or not at all: then the glyph's - /// text becomes a run of its own with this stroke, and the glyphs before it keep theirs - /// (#7741). The line's text is the same either way, so the characters' slots, gaps and - /// authored flags, kept along the whole line, still line up. - pub fn stroke_last(&mut self, font: u128, at: Placement, stroke: TypeStroke, overprint: bool) -> bool { + /// The reader fills all the glyphs a text-showing operator (`Tj`, `TJ`, `'`, `"`) draws + /// before it strokes them (#8015), or fills and strokes glyph by glyph: either way each + /// stroke is matched to the next glyph filled with the same placement (where, how large, how + /// wide, slanted and turned), in the same font with the same text, in order. Only that + /// glyph's text takes the stroke; strokes over glyphs next to each other in a run gather and + /// restyle their text as one run, so a word filled whole and stroked whole stays one run. The + /// glyphs around them keep their own stroke or none (#7741). + /// + /// Only opaque type takes its stroke: the file composites a translucent fill and stroke + /// apiece, darker where they overlap, while one object's opacity applies to its fill and + /// stroke together. Translucent fill and stroke stay type objects of their own, as do a fill + /// and stroke at different opacities. + pub fn stroke_filled(&mut self, font: u128, at: Placement, opacity: f32, text: &str, stroke: TypeStroke, overprint: bool) -> bool { + // A stroke at another opacity than the fill's (`CA` and `ca` differ), or over a + // translucent fill, is type of its own. + let opaque = opacity >= 0.999 && self.opacity >= 0.999; + let rest = if opaque { self.filled.get(self.stroked..) } else { None }; + let found = rest.and_then(|rest| { + rest.iter().position(|g| { + g.font == font + && g.at.same_as(&at) + && self.runs.get(g.run).and_then(|(.., t)| t.get(g.start..g.start.saturating_add(g.len))) == Some(text) + }) + }); + let Some(index) = found.map(|i| self.stroked.saturating_add(i)) else { + // Stroked text of its own (stroke rendering): no later stroke goes back over the + // glyphs filled before it, so no stroke looks through them again. + self.stroked = self.filled.len(); + // Nor does a translucent stroke join the glyph just filled. + return opaque && self.stroke_last(font, at, text, stroke, overprint); + }; + let continues = self + .pending + .as_ref() + .zip(self.filled.get(index)) + .is_some_and(|(p, g)| p.run == g.run && p.end == g.start && p.stroke == stroke && p.overprint == overprint); + if continues { + let end = self.filled.get(index).map(|g| g.start.saturating_add(g.len)); + if let (Some(p), Some(end)) = (&mut self.pending, end) { + p.end = end; + } + } else { + // Restyling what was gathered can move this glyph's text to another run: look it up after. + self.flush_stroke(); + if let Some(g) = self.filled.get(index) { + self.pending = Some(PendingStroke { run: g.run, start: g.start, end: g.start.saturating_add(g.len), stroke, overprint }); + } + } + self.stroked = index.saturating_add(1); + true + } + + /// Restyle the glyphs gathered for a stroke ([`stroke_filled`](Self::stroke_filled)): their + /// text becomes a run of its own with the stroke, unless the run is stroked so already, and the + /// text before and after it in the run keeps its stroke. Text that comes right after a run + /// drawn alike joins it, a run made up of it whole too: fill and stroke rendering glyph by + /// glyph fills each glyph as a run of its own ([`Look::takes`]) before its stroke (#8300). + fn flush_stroke(&mut self) { + let Some(PendingStroke { run, start, end, stroke, overprint }) = self.pending.take() else { return }; + let last = run.saturating_add(1) == self.runs.len(); + let previous = run.checked_sub(1).and_then(|i| self.runs.get(i)).map(|(l, sh, t)| (l.clone(), *sh, t.len())); + let Some((look, shift, text)) = self.runs.get_mut(run) else { return }; + if look.stroke.as_ref() == Some(&stroke) && look.overprint_stroke == overprint { + return; + } + if !(start < end && end <= text.len() && text.is_char_boundary(start) && text.is_char_boundary(end)) { + return; + } + let tail = text.split_off(end); + let glyphs = text.split_off(start); + let head = std::mem::take(text); + let mut own = look.clone(); + (own.stroke, own.overprint_stroke) = (Some(stroke), overprint); + let (old, shift) = (look.clone(), *shift); + // The stroked text joins the run before when nothing is left before it in its own run and + // that run is drawn alike. + let joins = match &previous { + Some((l, sh, _)) => head.is_empty() && *l == own && (sh - shift).abs() < 1e-3, + None => false, + }; + let joined_at = previous.as_ref().map_or(0, |(.., len)| *len); + let mut pieces = vec![]; + if !head.is_empty() { + pieces.push((old.clone(), shift, head.clone())); + } + // Where each part of the run's text goes: its run and how far its new run's text starts + // before it (bytes), for the head, the stroked glyphs and the tail. + let head_at = (run, 0usize); + let glyphs_at = if joins { + (run.saturating_sub(1), joined_at) + } else { + pieces.push((own, shift, glyphs.clone())); + (run.saturating_add(pieces.len()).saturating_sub(1), 0) + }; + if !tail.is_empty() { + pieces.push((old, shift, tail)); + } + let tail_at = run.saturating_add(pieces.len()).saturating_sub(1); + let count = pieces.len(); + if joins && let Some((.., t)) = run.checked_sub(1).and_then(|i| self.runs.get_mut(i)) { + t.push_str(&glyphs); + } + self.runs.splice(run..run.saturating_add(1), pieces); + let moved = |r: usize, at: usize| -> (usize, usize) { + if r > run { + (r.saturating_add(count).saturating_sub(1), at) + } else if r < run { + (r, at) + } else if at < start { + (head_at.0, at) + } else if at < end { + (glyphs_at.0, at.saturating_sub(start).saturating_add(glyphs_at.1)) + } else { + (tail_at, at.saturating_sub(end)) + } + }; + let from = self.stroked.min(self.filled.len()); + for g in self.filled.iter_mut().skip(from) { + (g.run, g.start) = moved(g.run, g.start); + } + for i in self.actual_fills.values_mut().flatten() { + *i = moved(*i, 0).0; + } + if last { + self.last_start = moved(run, self.last_start).1; + } + } + + /// A stroke over glyph `glyph` just drawn at `at` in `font`, which `overprint`s or not: that + /// glyph is stroked. `false`: it isn't that glyph (another place, font or text). + /// + /// The glyph's run can hold glyphs before it, filled alike and not stroked + /// ([`Look::takes`]): then the glyph's text becomes a run of its own with this stroke, and + /// the glyphs before it stay unstroked (#7741). The line's text is the same either way, so + /// the characters' slots, gaps and authored flags, kept along the whole line, still line up. + fn stroke_last(&mut self, font: u128, at: Placement, glyph: &str, stroke: TypeStroke, overprint: bool) -> bool { + self.flush_stroke(); let start = self.last_start; + let last_at = self.last_at; + // The glyph just filled, in the same font and placement, with the same text. let Some((look, shift, text)) = - self.runs.last_mut().filter(|(l, ..)| l.font == font && (at.origin - self.last).hypot() < self.at.size * 1e-3) + self.runs.last_mut().filter(|(l, _, t)| l.font == font && last_at.same_as(&at) && t.get(start..) == Some(glyph)) else { return false; }; @@ -563,6 +772,7 @@ impl TextLine { /// The point type object, its opacity and what else the line tells. pub fn finish(mut self) -> Option<(TextObject, f32, LineFacts)> { + self.flush_stroke(); let mut facts = LineFacts { ink: std::mem::take(&mut self.ink), ..LineFacts::default() }; // Turned along a curve: type on a path through the glyphs. let path = if self.curved() { self.baseline_path() } else { None }; diff --git a/crates/pdf/src/pdfx.rs b/crates/pdf/src/pdfx.rs index e367221d59..2313d62129 100644 --- a/crates/pdf/src/pdfx.rs +++ b/crates/pdf/src/pdfx.rs @@ -6,7 +6,7 @@ //! transparency (the app flattens it before writing), no layers, PDF 1.3. //! - PDF/X-3:2002: colours are ICC-based (always tagged), no transparency, no layers, PDF 1.3. //! - PDF/X-4:2010: transparency and layers are kept, colours are tagged, PDF 1.6 at most, and the -//! XMP metadata names the standard too. +//! XMP metadata names the standard too and carries `xmp:MetadataDate`. //! - All of them: a `/GTS_PDFX` output intent (blank, the CMYK profile in effect, embedded), a //! TrimBox on every page (the artboard), `/Trapped` True or False, `/GTS_PDFXVersion` in the //! document information, a title and dates, embedded fonts (or text as outlines), no editing @@ -120,8 +120,9 @@ pub(crate) fn info_entries(standard: Standard) -> String { } /// Edit the XMP metadata of a PDF/X file (the catalog's `/Metadata` stream; `root` is the -/// catalog dictionary's contents) into `patch`: PDF/X-4 adds the standard, Trapped and a version -/// id (PDF 1.3 files say so in [`finish`]). Files without metadata are left as they are. +/// catalog dictionary's contents) into `patch`: PDF/X-4 adds the standard, Trapped, a version id +/// and the metadata date (PDF 1.3 files say so in [`finish`]). Files without metadata are left as +/// they are. pub(crate) fn xmp(pdf: &[u8], xref: &Xref, root: (usize, usize), patch: &mut Patch, standard: Standard, trapped: bool) -> Result<(), PdfError> { if !standard.is_pdfx() { return Ok(()); @@ -145,6 +146,22 @@ pub(crate) fn xmp(pdf: &[u8], xref: &Xref, root: (usize, usize), patch: &mut Pat "{version}{trapped}1" ); edits.push((close, close, props.into_bytes())); + // When the packet has no `` element, this adds one after the writer's + // `` element with the same value. The search expects the writer's form: + // properties written as elements with the `xmp` prefix, and `<` in text written as `<`. + // The writer's description declares the `xmp` prefix there, and + // [`crate::post::modification_date`] keeps the two dates equal. + if find(xml, b"", 0).is_none() + && let Some(at) = find(xml, b"", 0).map(|i| i + b"".len()) + && let Some(to) = find(xml, b"", at) + { + let date = xml.get(at..to).ok_or_else(bad)?; + let mut prop = b"".to_vec(); + prop.extend_from_slice(date); + prop.extend_from_slice(b""); + let after = to + b"".len(); + edits.push((after, after, prop)); + } } // Every edit grows the stream (or keeps its length). let grown: usize = edits.iter().map(|(s, e, new)| new.len().saturating_sub(e - s)).sum(); diff --git a/crates/pdf/src/post.rs b/crates/pdf/src/post.rs index 79e872e59b..81d0d5aa0a 100644 --- a/crates/pdf/src/post.rs +++ b/crates/pdf/src/post.rs @@ -84,8 +84,9 @@ pub(crate) fn user_units(pdf: Vec, units: &[f64]) -> Result, PdfErro /// `pdf` dated as modified at `modified` (Unix seconds, UTC), its creation dates kept: the /// document information's `/ModDate` (a PDF date, ISO 32000-1 §7.9.4) and every `xmp:ModifyDate`, /// `xmp:MetadataDate` and `stEvt:when` of the catalog's XMP metadata (ISO 8601 dates), in UTC as -/// the PDF writer writes the creation date. The writer gives `/ModDate`, `xmp:ModifyDate` and -/// `stEvt:when` the creation date. +/// the PDF writer writes the creation date. The writer gives `/ModDate`, `xmp:ModifyDate`, +/// `stEvt:when` and, in a PDF/X-4 file, `xmp:MetadataDate` ([`crate::pdfx::xmp`]) the creation +/// date. pub(crate) fn modification_date(pdf: Vec, modified: i64) -> Result, PdfError> { let failed = |why: &str| PdfError::Write(format!("can't write the file's modification date: {why}")); let Parsed { xref, objects, trailer, root, .. } = linearize::parse(&pdf).map_err(failed)?; diff --git a/crates/pdf/src/print.rs b/crates/pdf/src/print.rs index ba4fc5589f..6c619b3165 100644 --- a/crates/pdf/src/print.rs +++ b/crates/pdf/src/print.rs @@ -12,7 +12,8 @@ //! - Marks and bleed as PDF export draws them ([`crate::MarkSettings`], [`crate::BleedSettings`]), //! around the artboard on the paper, at the paper's scale. //! - Output: composite, or separations, one page per ink that prints ([`print_inks`]) in the -//! grey of its coverage (overprints honoured, spot colours as process if asked), emulsion down +//! gray of its coverage (overprints honored, every spot color or chosen ones as process if +//! asked), emulsion down //! (mirrored), negative (inverted). //! - Colour management: the printer profile composite colours are converted to (and //! separations separate with), the rendering intent, and whether CMYK colours keep their @@ -43,7 +44,7 @@ use vectorcraft_doc::overprint::{OverprintBlack, clear_overprints, darken_overpr use vectorcraft_doc::{ColorMode, Document, Node, NodeKind}; pub use layout::{MAX_COPIES_PER_SHEET, MAX_TILES, TileGrid}; -pub use plates::print_inks; +pub use plates::{document_inks, print_inks}; pub use settings::*; pub use tiling::{TilingPage, tiling}; @@ -132,6 +133,9 @@ pub struct PrintPreview { pub tiles: Vec, /// The inks of a separation (empty for composite output). pub inks: Vec, + /// Every ink of the document as a separation lists it, the spot inks printing as process + /// (which `inks` leaves out) included ([`document_inks`]); empty for composite output. + pub document_inks: Vec, /// What the job leaves out of the document or prints differently. pub warnings: Vec, /// Notes on the options: one the job doesn't apply or applies another way. They aren't @@ -148,6 +152,8 @@ struct Job<'a> { tiles: Vec, /// The inks of a separation (every one, printed or not). inks: Vec, + /// Every ink of the document, the spot inks printing as process included. + document_inks: Vec, /// The inks that print (indices into `inks`): each a plate. plates: Vec, /// One copy's pages: (layout, plate). @@ -444,8 +450,9 @@ impl<'a> Job<'a> { let (mut warnings, mut setting_notes) = (vec![], vec![]); let (layouts, tiles) = layout::layout(&doc, set, &mut warnings, &mut setting_notes)?; let separations = set.output.mode == OutputMode::Separations; - let (inks, more) = if separations { print_inks(&doc, set) } else { Default::default() }; + let (document_inks, more) = if separations { document_inks(&doc, set) } else { Default::default() }; setting_notes.extend(more); + let inks: Vec = document_inks.iter().filter(|i| !i.convert_to_process).cloned().collect(); let plates: Vec = (0..inks.len()).filter(|i| inks[*i].print).collect(); let printed: Vec> = if separations { (0..plates.len()).map(Some).collect() } else { vec![None] }; if printed.is_empty() { @@ -474,7 +481,7 @@ impl<'a> Job<'a> { if !postscript && !set.graphics.auto_flatness { setting_notes.push("a fixed flatness is not written yet: the output device flattens curves".into()); } - Ok(Self { doc, layouts, tiles, inks, plates, sheets, warnings, setting_notes }) + Ok(Self { doc, layouts, tiles, inks, document_inks, plates, sheets, warnings, setting_notes }) } /// The ink of plate `plate` (`None`: composite). @@ -526,6 +533,7 @@ pub fn preview(doc: &Document, set: &PrintSettings) -> Result (Vec, Vec) { - let out = &set.output; - // Options by ink name, the first for a name winning: looked up, not searched for each ink. - let mut options = std::collections::HashMap::new(); - for o in &out.inks { +/// The options of [`super::PrintOutput::inks`] by ink name, the first for a name winning: looked +/// up, not searched for each ink. +fn ink_options(set: &PrintSettings) -> HashMap<&str, &InkSettings> { + let mut options = HashMap::new(); + for o in &set.output.inks { options.entry(o.name.as_str()).or_insert(o); } + options +} + +/// The inks of a separation of `doc`: the process inks, then one per spot swatch (none for a spot +/// ink that prints as process, [`document_inks`]), with the options of +/// [`super::PrintOutput::inks`]; and the notes of [`document_inks`]. +pub fn print_inks(doc: &Document, set: &PrintSettings) -> (Vec, Vec) { + let (mut list, notes) = document_inks(doc, set); + list.retain(|p| !p.convert_to_process); + (list, notes) +} + +/// Every ink of `doc` as a separation lists it: the process inks, then one per spot swatch, with +/// the options of [`super::PrintOutput::inks`]. A spot ink prints as process inks +/// ([`PrintInk::convert_to_process`]) with Convert All Spot Colors to Process or its own +/// `convertToProcess`; its other options are kept for when it prints as a spot ink again. Notes: +/// one warning naming the options that name no ink, and one naming the process inks whose +/// options ask for a conversion they don't take. +pub fn document_inks(doc: &Document, set: &PrintSettings) -> (Vec, Vec) { + let out = &set.output; + let options = ink_options(set); let list: Vec = plates(doc) .into_iter() - .filter(|p| !(p.spot && out.spots_to_process)) .map(|p| { let o = options.get(p.name.as_str()).copied(); PrintInk { print: o.is_none_or(|o| o.print), frequency: o.and_then(|o| o.frequency).unwrap_or(DEFAULT_FREQUENCY), angle: o.and_then(|o| o.angle).unwrap_or_else(|| PrintInk::default_angle(&p.name)), + convert_to_process: p.spot && (out.spots_to_process || o.is_some_and(|o| o.convert_to_process)), spot: p.spot, name: p.name, } }) .collect(); + let few = |all: Vec<&str>| { + let more = all.len().saturating_sub(MAX_NAMED); + let shown = all.into_iter().take(MAX_NAMED).map(|n| format!("`{n}`")).collect::>().join(", "); + if more > 0 { format!("{shown} and {more} more") } else { shown } + }; // One warning for all the options naming no ink, each list cut short: the options and the - // inks both come from the file. + // inks both come from the file. A spot ink printing as process is still an ink of the job. let names: BTreeSet<&str> = list.iter().map(|p| p.name.as_str()).collect(); let unknown: Vec<&str> = out.inks.iter().map(|i| i.name.as_str()).filter(|n| !names.contains(n)).collect(); - let warnings = if unknown.is_empty() { - vec![] - } else { - let few = |all: Vec<&str>| { - let more = all.len().saturating_sub(MAX_NAMED); - let shown = all.into_iter().take(MAX_NAMED).map(|n| format!("`{n}`")).collect::>().join(", "); - if more > 0 { format!("{shown} and {more} more") } else { shown } - }; + let mut notes = vec![]; + if !unknown.is_empty() { let inks = few(list.iter().map(|p| p.name.as_str()).collect()); - vec![format!("there is no ink named {} to print (inks: {inks})", few(unknown))] - }; - (list, warnings) + notes.push(format!("there is no ink named {} to print (inks: {inks})", few(unknown))); + } + let process: Vec<&str> = + list.iter().filter(|p| !p.spot && options.get(p.name.as_str()).is_some_and(|o| o.convert_to_process)).map(|p| p.name.as_str()).collect(); + if !process.is_empty() { + notes.push(format!("{} print as process inks already: only spot inks convert to process", few(process))); + } + (list, notes) } /// The most names a warning of [`print_inks`] lists. @@ -78,20 +100,30 @@ pub(crate) struct Separator<'a> { pub doc: &'a Document, cms: Arc, set: &'a PrintSettings, + /// The inks whose own options convert them to process ([`InkSettings::convert_to_process`]). + converted: HashSet<&'a str>, /// The plates are written as PostScript, which has no blending modes. postscript: bool, } impl<'a> Separator<'a> { pub fn new(doc: &'a Document, set: &'a PrintSettings, postscript: bool) -> Self { - Self { doc, cms: separation_cms(doc, set), set, postscript } + let converted = ink_options(set).into_iter().filter(|(_, o)| o.convert_to_process).map(|(name, _)| name).collect(); + Self { doc, cms: separation_cms(doc, set), set, converted, postscript } + } + + /// Whether colors linked to swatch `name` print as process inks: every swatch but + /// Registration with Convert All Spot Colors to Process, else the inks converted one by one. + /// A link to a process swatch separates as its color either way. + fn converts(&self, name: &str) -> bool { + name != REGISTRATION && (self.set.output.spots_to_process || self.converted.contains(name)) } /// How much of ink `plate` colour `c` (with swatch link `link`) prints, 0..1. fn ink(&self, plate: &str, c: &Color, link: Link) -> f32 { let color = &self.set.color; - // Spot colours as process: only Registration keeps its link. - let link = link.filter(|(name, _)| !self.set.output.spots_to_process || *name == REGISTRATION); + // Spot colors as process lose their link; Registration always keeps its. + let link = link.filter(|(name, _)| !self.converts(name)); // Without Preserve Numbers, CMYK colours are separated again from their appearance. let lab; let c = if !color.preserve_numbers && matches!(c, Color::Cmyk { .. }) { @@ -104,15 +136,16 @@ impl<'a> Separator<'a> { } /// [`Self::ink`] of a colour that prints process plates `plates` with its spot tint - /// ([`stop_inks`]): the spot plate prints the tint and the process plates print `plates`. With - /// spots as process, each process plate prints `plates` layered with the spot tint's process - /// equivalent, as a separated image's plates layer ([`vectorcraft_doc::separated::Separated::coverage_as`]). + /// ([`stop_inks`]): the spot plate prints the tint and the process plates print `plates`. When + /// its spot ink prints as process, each process plate prints `plates` layered with the spot + /// tint's process equivalent, as a separated image's plates layer + /// ([`vectorcraft_doc::separated::Separated::coverage_as`]). fn stop_ink(&self, plate: &str, c: &Color, link: Link, plates: StopPlates) -> f32 { let own = stop_inks(self.doc, &self.cms, c, link, plates, self.set.color.intent); let (Some(_), Some((name, tint))) = (plates, own.spot.as_ref()) else { return self.ink(plate, c, link); }; - if !self.set.output.spots_to_process { + if !self.converts(name) { return own.on_plate(plate); } let Some(i) = cms::PROCESS_PLATES.iter().position(|p| *p == plate) else { @@ -218,12 +251,8 @@ impl<'a> Separator<'a> { } } // A DCS file's image prints its own plates: a spot plate on its ink when the job prints - // that ink, else as its process equivalent. - let spots: BTreeSet = if self.set.output.spots_to_process { - BTreeSet::new() - } else { - plates(self.doc).into_iter().filter(|p| p.spot).map(|p| p.name).collect() - }; + // that ink as a spot ink, else as its process equivalent. + let spots: BTreeSet = plates(self.doc).into_iter().filter(|p| p.spot && !self.converts(&p.name)).map(|p| p.name).collect(); let own = |name: &str| spots.contains(name); // A spot plate printing as process prints as the document's swatch of its ink does, when // there is one; else as the process equivalent its file gives. diff --git a/crates/pdf/src/print/settings.rs b/crates/pdf/src/print/settings.rs index 15e029a13a..f6f3e5c563 100644 --- a/crates/pdf/src/print/settings.rs +++ b/crates/pdf/src/print/settings.rs @@ -462,15 +462,21 @@ pub struct InkSettings { /// Halftone screen angle (degrees); `None`: the ink's default. #[serde(skip_serializing_if = "Option::is_none")] pub angle: Option, + /// A spot ink prints as process inks: no plate of its own, its color on the process plates. + /// Off by default. [`PrintOutput::spots_to_process`] converts every spot ink whatever this + /// says; process inks and Registration ignore it. + #[serde(skip_serializing_if = "std::ops::Not::not")] + pub convert_to_process: bool, } impl Default for InkSettings { fn default() -> Self { - Self { name: String::new(), print: true, frequency: None, angle: None } + Self { name: String::new(), print: true, frequency: None, angle: None, convert_to_process: false } } } -/// An ink of a separation, with its options resolved ([`super::inks`]). +/// An ink of a separation, with its options resolved ([`super::print_inks`], +/// [`super::document_inks`]). #[derive(Clone, Debug, PartialEq, Serialize)] #[serde(rename_all = "camelCase")] pub struct PrintInk { @@ -479,6 +485,10 @@ pub struct PrintInk { pub print: bool, pub frequency: f64, pub angle: f64, + /// A spot ink printing as process inks (its own option or Convert All Spot Colors to + /// Process): it has no plate. + #[serde(skip_serializing_if = "std::ops::Not::not")] + pub convert_to_process: bool, } /// The default halftone screen ruling (lpi). diff --git a/crates/pdf/src/settings.rs b/crates/pdf/src/settings.rs index c2f5487cbb..e1dca94b3d 100644 --- a/crates/pdf/src/settings.rs +++ b/crates/pdf/src/settings.rs @@ -465,9 +465,14 @@ impl Default for SecuritySettings { } } -/// `v` lies in `lo..=hi` (and is a number). +/// `v` lies in `lo..=hi` (and is a number). The error names the range with its unit as one value +/// (`72–2400 ppi`), so a catalog can match the message and translate it. pub(crate) fn within(name: &str, v: f64, lo: f64, hi: f64, unit: &str) -> Result<(), PdfError> { - if (lo..=hi).contains(&v) { Ok(()) } else { Err(PdfError::BadSetting(format!("{name} must be {lo}–{hi}{unit} (got {v})"))) } + if (lo..=hi).contains(&v) { + return Ok(()); + } + let range = format!("{lo}–{hi}{unit}"); + Err(PdfError::BadSetting(format!("{name} must be {range} (got {v})"))) } impl PdfSettings { diff --git a/crates/pdf/src/tests/cmykimages.rs b/crates/pdf/src/tests/cmykimages.rs index deb98b1fea..4d22a10ee6 100644 --- a/crates/pdf/src/tests/cmykimages.rs +++ b/crates/pdf/src/tests/cmykimages.rs @@ -423,6 +423,43 @@ fn a_dcs_spot_plate_printing_as_process_takes_the_documents_swatch() { assert_eq!(get(&own, "Yellow"), Some(vec![0, 0])); } +/// A DCS image's spot plate converted to process on its own prints as the document's swatch of +/// its ink, while its other spot plate keeps printing on its ink. +#[test] +fn a_dcs_image_converts_only_the_spot_ink_chosen() { + use vectorcraft_doc::separated::{InkPlate, Separated}; + let plate = |name: &str, cmyk: [f32; 4], data: [u8; 2]| InkPlate { name: name.into(), cmyk, data: data.to_vec() }; + let s = Separated::new( + 2, + 1, + vec![ + plate("Cyan", [0.0; 4], [0, 0]), + plate("Spot Orange", [0.0, 0.6, 1.0, 0.0], [128, 0]), + plate("Spot Green", [0.0, 0.0, 1.0, 0.0], [0, 128]), + ], + ) + .unwrap(); + let mut d = image_doc(ImageBlob::separated_tiff(&s, None, &[]).unwrap(), 2, 1); + d.swatches.push(Swatch { name: "Spot Orange".into(), paint: Paint::solid(Color::cmyk(0.0, 0.6, 1.0, 0.0)), global: true, spot: true }); + // The document's Spot Green is cyan, where its file says yellow. + d.swatches.push(Swatch { name: "Spot Green".into(), paint: Paint::solid(Color::cmyk(1.0, 0.0, 0.0, 0.0)), global: true, spot: true }); + let settings: PrintSettings = + serde_json::from_value(json!({"output": {"mode": "separations", "inks": [{"name": "Spot Green", "convertToProcess": true}]}})).unwrap(); + let names: Vec = print_inks(&d, &settings).0.into_iter().map(|i| i.name).collect(); + assert_eq!(names, ["Cyan", "Magenta", "Yellow", "Black", "Spot Orange"]); + let job = plan(&d, &PrintOptions { settings, ..Default::default() }).unwrap(); + let coverage = job.plates.iter().map(|p| { + let NodeKind::Image(im) = &p.layers[0].children().unwrap()[0].kind else { panic!("an image") }; + p.image_blob(im).and_then(|b| b.coverage()).unwrap().2 + }); + let all: Vec<(String, Vec)> = names.into_iter().zip(coverage).collect(); + let get = |name: &str| all.iter().find(|(n, _)| n == name).map(|(_, c)| c.clone()); + assert_eq!(get("Cyan"), Some(vec![0, 128]), "the swatch's cyan"); + assert_eq!(get("Yellow"), Some(vec![0, 0]), "not the file's yellow"); + assert_eq!(get("Magenta"), Some(vec![0, 0]), "Spot Orange stays on its own plate"); + assert_eq!(get("Spot Orange"), Some(vec![128, 0])); +} + #[test] fn the_output_settings_convert_cmyk_images_and_compression_recompresses_them_in_cmyk() { let ink = [0u8, 102, 255, 0]; diff --git a/crates/pdf/src/tests/pdfx.rs b/crates/pdf/src/tests/pdfx.rs index 2003a6b7c6..1c12b9586f 100644 --- a/crates/pdf/src/tests/pdfx.rs +++ b/crates/pdf/src/tests/pdfx.rs @@ -42,6 +42,51 @@ fn text(pdf: &[u8]) -> String { String::from_utf8_lossy(pdf).into_owned() } +/// The XMP packet of `pdf`, read as its stream's `/Length` says: the packet's end must be inside +/// those bytes and nothing but the end of line may follow them before `endstream`. +fn xmp_packet(pdf: &[u8]) -> String { + use crate::lab_spot::{find, rfind}; + let begin = find(pdf, b" = dict[at..].iter().copied().take_while(u8::is_ascii_digit).collect(); + let length: usize = String::from_utf8(digits).unwrap().parse().unwrap(); + let mut data = obj + rfind(dict, b"stream").unwrap() + b"stream".len(); + data += pdf[data..].iter().take(2).take_while(|b| matches!(b, b'\r' | b'\n')).count(); + let stream = &pdf[data..data + length]; + let close = find(stream, b"", close).is_some(), "the packet ends inside the stream's length"); + let rest = String::from_utf8_lossy(&pdf[data + length..]); + assert!(rest.trim_start_matches(['\r', '\n']).starts_with("endstream"), "the stream ends at its length"); + String::from_utf8(stream.to_vec()).unwrap() +} + +/// The value of the XMP element `tag` in `xmp`. +fn xmp_value<'a>(xmp: &'a str, tag: &str) -> Option<&'a str> { + let open = format!("<{tag}>"); + let rest = &xmp[xmp.find(&open)? + open.len()..]; + Some(&rest[..rest.find(&format!(""))?]) +} + +#[test] +fn pdfx4_metadata_has_a_metadata_date_equal_to_the_modification_date() { + let d = doc(&[Color::cmyk(0.0, 1.0, 1.0, 0.0)]); + // Dated by the writer (created), then dated again after writing (modified later). + for modified in [None, Some(1_800_000_000)] { + let mut o = opts(Standard::PdfX4, |_| {}); + o.modified = modified; + let xmp = xmp_packet(&export(&d, &o).unwrap()); + let modify = xmp_value(&xmp, "xmp:ModifyDate").expect("xmp:ModifyDate"); + assert_eq!(xmp_value(&xmp, "xmp:MetadataDate"), Some(modify), "{modified:?}: {xmp}"); + assert_eq!(xmp.matches("").count(), 1, "{modified:?}"); + if modified.is_some() { + assert!(modify.starts_with("2027-01-15T"), "the later date: {modify}"); + } + } +} + #[test] fn each_standard_writes_its_header_output_intent_boxes_and_identification() { let mut d = doc(&[Color::cmyk(0.0, 1.0, 1.0, 0.0), Color::rgb(0.2, 0.4, 0.9)]); diff --git a/crates/pdf/src/tests/print.rs b/crates/pdf/src/tests/print.rs index 3748ec5106..49a34ff428 100644 --- a/crates/pdf/src/tests/print.rs +++ b/crates/pdf/src/tests/print.rs @@ -637,6 +637,91 @@ fn cmyk_and_a_spot_separate_into_five_plates() { assert_eq!(inks(&p[2]), [0.0, 40.0], "the gold's yellow"); } +/// A CMYK document with spot swatches Gold and Pine, and three 50 pt squares left to right: Gold +/// at 50%, Pine at 100% and Registration. +fn gold_and_pine() -> Document { + let mut d = doc(200.0, 100.0, &[]); + d.color_mode = vectorcraft_doc::ColorMode::Cmyk; + d.swatches.push(Swatch { name: "Gold".into(), paint: Paint::solid(Color::cmyk(0.0, 0.2, 0.8, 0.1)), global: true, spot: true }); + d.swatches.push(Swatch { name: "Pine".into(), paint: Paint::solid(Color::cmyk(0.8, 0.0, 0.3, 0.0)), global: true, spot: true }); + let layer = d.default_layer().unwrap(); + let linked = |color: Color, swatch: &str, tint: f32| Paint::Solid { color, swatch: Some(swatch.into()), tint }; + let squares = [ + (0.0, linked(Color::cmyk(0.0, 0.1, 0.4, 0.05), "Gold", 0.5)), + (60.0, linked(Color::cmyk(0.8, 0.0, 0.3, 0.0), "Pine", 1.0)), + (120.0, linked(Color::cmyk(1.0, 1.0, 1.0, 1.0), vectorcraft_color::swatch::REGISTRATION, 1.0)), + ]; + for (x, p) in squares { + let id = d.alloc_id(); + d.insert(Some(layer), 0, Node::path(id, shapes::rectangle(Rect::new(x, 0.0, x + 50.0, 50.0)), Appearance::basic(p, Paint::None, 0.0))) + .unwrap(); + } + d +} + +/// The ink of each 50 pt square on a plate, left to right, in percent. +fn square_inks(page: &Page) -> Vec { + page.1 + .iter() + .filter(|(b, _)| (b.width() - 50.0).abs() < 1.0 && (b.height() - 50.0).abs() < 1.0) + .map(|(_, p)| match p.color() { + Some(Color::Gray { k }) => (k * 100.0).round(), + c => panic!("{c:?}"), + }) + .collect() +} + +#[test] +fn one_spot_ink_converts_to_process_and_the_others_keep_their_plates() { + let d = gold_and_pine(); + // Gold prints as process even with its plate turned off: converting is not leaving it out. + let set = json!({"output": {"mode": "separations", "inks": [{"name": "Gold", "convertToProcess": true, "print": false, "frequency": 100}]}}); + let pv = preview(&d, &settings(set.clone())).unwrap(); + assert_eq!(pv.inks.iter().map(|i| i.name.as_str()).collect::>(), ["Cyan", "Magenta", "Yellow", "Black", "Pine"]); + let all: Vec<(&str, bool)> = pv.document_inks.iter().map(|i| (i.name.as_str(), i.convert_to_process)).collect(); + assert_eq!(all, [("Cyan", false), ("Magenta", false), ("Yellow", false), ("Black", false), ("Gold", true), ("Pine", false)]); + let gold = &pv.document_inks[4]; + assert_eq!((gold.print, gold.frequency), (false, 100.0), "its plate options are kept"); + assert!(pv.setting_notes.iter().all(|n| !n.contains("no ink named") && !n.contains("only spot inks")), "{:?}", pv.setting_notes); + let p = pages(&job(&d, set).bytes); + assert_eq!(p.len(), 5); + // (Gold, Pine, Registration) on Cyan, Magenta, Yellow, Black and Pine. + assert_eq!( + p.iter().map(square_inks).collect::>(), + [[0.0, 0.0, 100.0], [10.0, 0.0, 100.0], [40.0, 0.0, 100.0], [5.0, 0.0, 100.0], [0.0, 100.0, 100.0]] + ); +} + +#[test] +fn converting_every_spot_ink_overrides_and_keeps_each_inks_own_choice() { + let d = gold_and_pine(); + let inks = json!([{"name": "Gold", "convertToProcess": false, "angle": 30}, {"name": "Pine", "convertToProcess": true}]); + let pv = preview(&d, &settings(json!({"output": {"mode": "separations", "spotsToProcess": true, "inks": inks}}))).unwrap(); + assert_eq!(pv.inks.iter().map(|i| i.name.as_str()).collect::>(), ["Cyan", "Magenta", "Yellow", "Black"]); + let spots: Vec<(&str, bool, f64)> = pv.document_inks[4..].iter().map(|i| (i.name.as_str(), i.convert_to_process, i.angle)).collect(); + assert_eq!(spots, [("Gold", true, 30.0), ("Pine", true, 45.0)]); + // The options of the converted inks still name inks of the document. + assert!(pv.setting_notes.iter().all(|n| !n.contains("no ink named")), "{:?}", pv.setting_notes); + // Without the option, each ink's own choice applies again. + let pv = preview(&d, &settings(json!({"output": {"mode": "separations", "inks": inks}}))).unwrap(); + assert_eq!(pv.inks.iter().map(|i| i.name.as_str()).collect::>(), ["Cyan", "Magenta", "Yellow", "Black", "Gold"]); + // A process ink doesn't convert: it keeps its plate, and a note says so. + let pv = preview(&d, &settings(json!({"output": {"mode": "separations", "inks": [{"name": "Cyan", "convertToProcess": true}]}}))).unwrap(); + assert_eq!(pv.inks.len(), 6); + assert!(pv.document_inks.iter().all(|i| !i.convert_to_process)); + assert_eq!(pv.setting_notes, ["`Cyan` print as process inks already: only spot inks convert to process"]); +} + +#[test] +fn an_ink_option_without_convert_to_process_keeps_its_spot_plate() { + let set = settings(json!({"output": {"inks": [{"name": "Gold", "angle": 30}]}})); + assert!(!set.output.inks[0].convert_to_process); + let back = serde_json::to_value(&set.output.inks[0]).unwrap(); + assert_eq!(back, json!({"name": "Gold", "print": true, "angle": 30.0}), "off is not written"); + let on = InkSettings { convert_to_process: true, ..set.output.inks[0].clone() }; + assert_eq!(serde_json::to_value(&on).unwrap()["convertToProcess"], json!(true)); +} + /// A 200 × 100 pt CMYK document filled with cyan, with spot swatch `Ink` (100% K) and the objects /// `art` over the cyan. fn over_cyan(art: Vec) -> Document { @@ -988,6 +1073,8 @@ fn a_spot_gradient_stop_prints_its_process_plates() { assert_eq!(first(json!({"output": {"mode": "separations"}})), [25.0, 0.0, 40.0, 0.0, 50.0], "Cyan, Magenta, Yellow, Black, Gold"); // Spots as process: the plates layered with the gold tint's process inks (0, 10, 40, 5). assert_eq!(first(json!({"output": {"mode": "separations", "spotsToProcess": true}})), [25.0, 10.0, 64.0, 5.0]); + // Gold converted on its own: the same. + assert_eq!(first(json!({"output": {"mode": "separations", "inks": [{"name": "Gold", "convertToProcess": true}]}})), [25.0, 10.0, 64.0, 5.0]); } #[test] diff --git a/crates/pdf/src/tests/reader_compat.rs b/crates/pdf/src/tests/reader_compat.rs index d292a03192..1c9ba71d7f 100644 --- a/crates/pdf/src/tests/reader_compat.rs +++ b/crates/pdf/src/tests/reader_compat.rs @@ -81,8 +81,13 @@ fn form_resource_scopes_keep_scanned_overprint_in_step_with_interpretation() { } pub(crate) fn text_pdf(content: &str) -> Vec { + text_pdf_with("/ca 0.25 /CA 0.75", content) +} + +/// [`text_pdf`] with graphics state `/G` set by `state` (its entries, such as `/ca 0.5 /CA 0.5`). +pub(crate) fn text_pdf_with(state: &str, content: &str) -> Vec { page( - "/Font << /F1 5 0 R >> /ExtGState << /G << /ca 0.25 /CA 0.75 >> >>", + &format!("/Font << /F1 5 0 R >> /ExtGState << /G << {state} >> >>"), content.as_bytes(), &[ b"<< /Type /Font /Subtype /TrueType /BaseFont /Inter-Regular /Encoding /WinAnsiEncoding /FirstChar 65 /LastChar 67 /Widths [600 600 600] /FontDescriptor 6 0 R >>".to_vec(), diff --git a/crates/pdf/src/tests/reshaped.rs b/crates/pdf/src/tests/reshaped.rs index af173fa55b..f73450b380 100644 --- a/crates/pdf/src/tests/reshaped.rs +++ b/crates/pdf/src/tests/reshaped.rs @@ -38,6 +38,11 @@ fn page(drawn: &[char], sign_width: Option) -> Vec { /// graphics state, to set between glyphs or before them, with `objects` it refers to (the first /// is object `first_extra(1) + 4`). fn page_with(ops: impl Fn(&dyn Fn(char) -> String) -> String, extra: &str, objects: &[String], sign_width: Option) -> Vec { + page_in("Identity-H", ops, extra, objects, sign_width) +} + +/// [`page_with`] with the Type 0 font's encoding `encoding` (`Identity-V`: vertical writing). +fn page_in(encoding: &str, ops: impl Fn(&dyn Fn(char) -> String) -> String, extra: &str, objects: &[String], sign_width: Option) -> Vec { FontDb::global().add_font(matra_font().expect("the test font builds")); let program = matra_font().unwrap(); let hex: String = program.iter().map(|b| format!("{b:02X}")).collect::() + ">"; @@ -66,7 +71,7 @@ fn page_with(ops: impl Fn(&dyn Fn(char) -> String) -> String, extra: &str, objec ]; let refs: Vec<&str> = objs.iter().chain(objects).map(String::as_str).collect(); let resources = format!( - "/Font << /F1 << /Type /Font /Subtype /Type0 /BaseFont /MatratestSans-Regular /Encoding /Identity-H /DescendantFonts [{} 0 R] /ToUnicode {} 0 R >> >> {extra}", + "/Font << /F1 << /Type /Font /Subtype /Type0 /BaseFont /MatratestSans-Regular /Encoding /{encoding} /DescendantFonts [{} 0 R] /ToUnicode {} 0 R >> >> {extra}", n + 2, n + 3 ); @@ -218,3 +223,22 @@ fn outlined_glyphs_under_a_varying_soft_mask_are_masked_one_by_one() { assert_eq!(outlines(&report.document), 3, "a path each"); assert_eq!(masked_outlines(&report.document), 3, "each path has its own mask"); } + +/// A vertical line (upright glyphs) with one glyph filled and stroked: its glyphs aren't kept as +/// outlines, so it can't come in as the outlines of that glyph alone, losing the glyph filled +/// only. Every glyph comes in filled (#8015). +#[test] +fn a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled() { + let bytes = page_in("Identity-V", |id| format!("1 0 0 rg 0 0 1 RG 2 w {} Tj 2 Tr {} Tj 0 Tr", id(KA), id(SIGN_I)), "", &[], None); + let report = open(&bytes); + let mut runs = vec![]; + report.document.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + runs.extend(t.runs.iter().map(|r| (r.text.clone(), !r.style.fill.is_none(), !r.style.stroke.is_none()))); + } + }); + let filled: String = runs.iter().filter(|r| r.1).map(|r| r.0.as_str()).collect(); + assert_eq!(filled, format!("{KA}{SIGN_I}"), "every glyph filled: {runs:?}"); + let stroked: String = runs.iter().filter(|r| r.2).map(|r| r.0.as_str()).collect(); + assert_eq!(stroked, SIGN_I.to_string(), "{runs:?}"); +} diff --git a/crates/pdf/src/tests/text_placement.rs b/crates/pdf/src/tests/text_placement.rs index 417a88e5b9..8bdde71eba 100644 --- a/crates/pdf/src/tests/text_placement.rs +++ b/crates/pdf/src/tests/text_placement.rs @@ -758,3 +758,19 @@ fn perf_text_heavy_open() { println!("4000 lines: {n} text objects in {took:?} (as outlines: {:?})", start.elapsed()); } } + +/// Vertical type filled, then stroked (fill and stroke rendering draws a whole operator's glyphs +/// filled before it strokes them): one column, each glyph filled and stroked (#8015). +#[test] +fn a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type() { + for mode in ["2", "6"] { + let content = format!("0 0 1 RG 1 0 0 rg 2 w BT {mode} Tr /F6 24 Tf 150 180 Td {} Tj 0 Tr ET", gids("§±×")); + let t = texts(&open_as(&page(&content, ""), TextAs::Text)); + assert_eq!(t.len(), 1, "{content}: {t:#?}"); + assert_eq!(t[0].plain_text(), "§±×"); + for r in &t[0].runs { + assert!(!r.style.fill.is_none() && !r.style.stroke.is_none(), "{content}: {:?}", t[0].runs); + assert!((r.style.stroke_width - 2.0).abs() < 1e-6, "{content}"); + } + } +} diff --git a/crates/pdf/src/tests/textstroke.rs b/crates/pdf/src/tests/textstroke.rs index f28e525f27..1cc1edf5ba 100644 --- a/crates/pdf/src/tests/textstroke.rs +++ b/crates/pdf/src/tests/textstroke.rs @@ -122,3 +122,227 @@ fn imported_stroked_type_keeps_the_files_cap_join_and_miter_limit() { assert_eq!(joins, [Some(LineJoin::Round), Some(LineJoin::Miter)], "{content}: {runs:?}"); } } + +/// Fill and stroke rendering (mode 2, or 6 with a clip) draws a text-showing operator's glyphs +/// filled, then the same glyphs stroked: the type comes in once, filled and stroked, whether the +/// operator shows one glyph or a word, or a TJ array of strings with kerning between them, in an +/// outline font, with or without replacement text (`ActualText`). Stroke rendering (modes 1 and 5) stays stroke only. A Type 3 glyph is filled in +/// every one of those modes, once (#8015). +#[test] +fn a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type() { + use vectorcraft_testkit::pdf::{PdfPage, first_extra, pdf_with}; + // `/T3`: a Type 3 font whose glyphs take the text's paint (`d1`), `W A V E` mapped by ToUnicode. + let t3 = first_extra(1); + let glyph = crate::tests_import_fidelity::stream("", "600 0 0 0 600 700 d1 0 0 m 600 0 l 300 700 l h f"); + let to_unicode = crate::tests_import_fidelity::stream( + "", + "/CIDInit /ProcSet findresource begin 12 dict begin begincmap /CIDSystemInfo << /Registry (Adobe) /Ordering (UCS) /Supplement 0 >> def /CMapName /T3-UCS def /CMapType 2 def 1 begincodespacerange <00> endcodespacerange 4 beginbfchar\n<41> <0041>\n<45> <0045>\n<56> <0056>\n<57> <0057>\nendbfchar endcmap CMapName currentdict /CMap defineresource pop end end", + ); + let font = format!( + "<< /Type /Font /Subtype /Type3 /FontBBox [0 0 600 700] /FontMatrix [0.001 0 0 0.001 0 0] /CharProcs << /g {} 0 R >> /Encoding << /Type /Encoding /Differences [65 /g 69 /g 86 /g 87 /g] >> /FirstChar 65 /LastChar 87 /Widths [600 0 0 0 600 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 600 600] /ToUnicode {} 0 R /Resources << >> >>", + t3 + 1, + t3 + 2 + ); + let page = |content: &str| { + let resources = format!("/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> /T3 {t3} 0 R >>"); + pdf_with(&[PdfPage { resources, ..PdfPage::new(300.0, 200.0, content) }], &[&font, &glyph, &to_unicode], None) + }; + let objects = |content: &str| { + let d = import(&page(content)).unwrap(); + let mut types = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + types.push((**t).clone()); + } + }); + types + }; + let cream = Paint::solid(Color::rgb8(0xff, 0xff, 0xcc)); + let black = Paint::solid(Color::BLACK); + let shows = + ["(WAVE) Tj", "[(WA) -50 (VE)] TJ", "(WA) Tj (VE) Tj", "(W) Tj (A) Tj (V) Tj (E) Tj", "/Span << /ActualText (WAVE) >> BDC (WAVE) Tj EMC"]; + for font in ["F1", "T3"] { + for show in shows { + for mode in ["0", "1", "2", "4", "5", "6"] { + let content = format!("0 0 0 RG 1 1 0.8 rg 3 w 1 J 1 j BT {mode} Tr /{font} 60 Tf 40 110 Td {show} 0 Tr ET"); + let types = objects(&content); + assert_eq!(types.len(), 1, "{content}: one type object: {types:#?}"); + let t = &types[0]; + assert_eq!(t.plain_text(), "WAVE", "{content}"); + // A Type 3 glyph paints itself: the reader fills it whatever the mode. + let (fill, stroke) = match mode { + _ if font == "T3" => (true, false), + "0" | "4" => (true, false), + "1" | "5" => (false, true), + _ => (true, true), + }; + for r in &t.runs { + let s = &r.style; + assert_eq!(s.fill, if fill { cream.clone() } else { Paint::None }, "{content}: fill: {:?}", t.runs); + if stroke { + assert_eq!(s.stroke, black, "{content}: stroke: {:?}", t.runs); + assert!((s.stroke_width - 3.0).abs() < 1e-6, "{content}: width {}", s.stroke_width); + assert_eq!((s.stroke_cap, s.stroke_join), (LineCap::Round, LineJoin::Round), "{content}"); + } else { + assert!(s.stroke.is_none(), "{content}: no stroke: {:?}", t.runs); + } + } + } + } + } + // A word filled, then stroked with another join part way through (one operator each): + // each part keeps its own join, all of it filled. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT 2 Tr /F1 60 Tf 40 110 Td 1 j (WA) Tj 0 j (VE) Tj 0 Tr ET"; + let types = objects(content); + assert_eq!(types.len(), 1, "{content}: {types:#?}"); + let joins: Vec<_> = types[0].runs.iter().map(|r| (r.text.as_str(), r.style.fill == cream, r.style.stroke_join)).collect(); + assert_eq!(joins, [("WA", true, LineJoin::Round), ("VE", true, LineJoin::Miter)], "{content}"); + // Filled type, then stroked type of its own elsewhere: a stroke over no filled glyph. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT 0 Tr /F1 60 Tf 40 110 Td (WAVE) Tj 1 Tr 0 -70 Td (WAVE) Tj 0 Tr ET"; + let types = objects(content); + assert_eq!(types.len(), 2, "{content}: {types:#?}"); + let looks: Vec<_> = types.iter().flat_map(|t| &t.runs).map(|r| (r.style.fill == cream, !r.style.stroke.is_none())).collect(); + assert_eq!(looks, [(true, false), (false, true)], "{content}"); +} + +/// Helvetica PDF page drawing `content`, imported: each run of type as its text, size, and +/// whether it is filled and stroked, in text order. +fn word_runs(content: &str) -> Vec<(String, f64, bool, bool)> { + use vectorcraft_testkit::pdf::{PdfPage, pdf}; + let resources = "/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >>"; + let bytes = pdf(&[PdfPage { resources: resources.into(), ..PdfPage::new(300.0, 200.0, content) }], None); + let d = import(&bytes).unwrap(); + let mut runs = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + runs.extend(t.runs.iter().map(|r| (r.text.clone(), r.style.size, !r.style.fill.is_none(), !r.style.stroke.is_none()))); + } + }); + runs.sort_by(|a, b| a.0.cmp(&b.0).then(a.1.total_cmp(&b.1))); + runs +} + +/// A stroke goes only over a glyph filled with the very same placement: a word filled, then its +/// first glyph stroked at another size from the same origin, is two pieces of type, the word +/// unstroked and the glyph at its own size (#8015). +#[test] +fn a_stroke_at_another_size_does_not_go_over_the_filled_glyph() { + for mode in ["1", "2"] { + let content = format!("0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 40 110 Td (WAVE) Tj ET BT {mode} Tr /F1 30 Tf 40 110 Td (W) Tj 0 Tr ET"); + let filled = mode == "2"; + assert_eq!(word_runs(&content), [("W".to_string(), 30.0, filled, true), ("WAVE".to_string(), 60.0, true, false)], "{content}"); + } +} + +/// A stroke over one glyph of a filled word strokes that glyph alone, not the rest of the word +/// (#8015). +#[test] +fn a_stroke_over_one_glyph_of_a_filled_word_strokes_only_that_glyph() { + // W alone stroked at the same size from the same origin: W is stroked, AVE not. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 40 110 Td (WAVE) Tj ET BT 1 Tr /F1 60 Tf 40 110 Td (W) Tj 0 Tr ET"; + assert_eq!(word_runs(content), [("AVE".to_string(), 60.0, true, false), ("W".to_string(), 60.0, true, true)], "{content}"); + // Filled and stroked there instead: that W is drawn again, over the word, as type of its own. + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 40 110 Td (WAVE) Tj ET BT 2 Tr /F1 60 Tf 40 110 Td (W) Tj 0 Tr ET"; + assert_eq!(word_runs(content), [("W".to_string(), 60.0, true, true), ("WAVE".to_string(), 60.0, true, false)], "{content}"); +} + +/// A glyph filled at one opacity and stroked at another (`ca` and `CA` differ) stays two pieces +/// of type, each at its own opacity, also when it is shown on its own, so the stroke is drawn +/// right after its fill (#8015). Two such operators are four pieces in the order they are drawn, +/// the second glyph's fill over the first one's stroke. +#[test] +fn a_glyph_stroked_at_another_opacity_than_its_fill_stays_its_own_type() { + let (fill, stroke) = ((64.0 / 255.0, true, false), (191.0 / 255.0, false, true)); + for (show, want) in [("(A) Tj", vec![fill, stroke]), ("(A) Tj (B) Tj", vec![fill, stroke, fill, stroke])] { + let content = format!("/G gs 1 0 0 rg 0 0 1 RG 2 w BT /F1 20 Tf 2 Tr 1 0 0 1 10 20 Tm {show} 0 Tr ET"); + let d = import(&crate::tests::reader_compat::text_pdf(&content)).unwrap(); + let mut texts = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + let st = t.first_style(); + texts.push((n.opacity, !st.fill.is_none(), !st.stroke.is_none())); + } + }); + assert_eq!(texts, want, "{content}"); + } +} + +/// Type filled and stroked at the same opacity below 1 stays a filled object and a stroked one: +/// the file composites the fill and the stroke apiece (darker where they overlap), while an +/// object's opacity applies to its fill and stroke together. Opaque, it is one object (#8015). +#[test] +fn translucent_fill_and_stroke_text_stays_two_objects() { + let half = |fill, stroke| (128.0 / 255.0, fill, stroke); + for show in ["(A) Tj", "(AB) Tj"] { + let content = format!("/G gs 1 0 0 rg 0 0 1 RG 2 w BT /F1 20 Tf 2 Tr 1 0 0 1 10 20 Tm {show} 0 Tr ET"); + for (state, want) in [("/ca 0.5 /CA 0.5", vec![half(true, false), half(false, true)]), ("/ca 1 /CA 1", vec![(1.0, true, true)])] { + let d = import(&crate::tests::reader_compat::text_pdf_with(state, &content)).unwrap(); + let mut texts = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + let st = t.first_style(); + texts.push((n.opacity, !st.fill.is_none(), !st.stroke.is_none())); + } + }); + assert_eq!(texts, want, "{state}: {content}"); + } + } +} + +/// A stroke goes only over a glyph filled with the same text: "AB" filled, its "A" stroked, then +/// an "X" stroked where the "B" stands is type of its own, and the "B" stays unstroked (#8015). +#[test] +fn a_stroke_of_another_glyph_where_one_was_filled_stays_its_own_type() { + let content = "0 0 0 RG 1 1 0.8 rg 3 w BT /F1 60 Tf 1 0 0 1 40 110 Tm (AB) Tj 1 Tr 1 0 0 1 40 110 Tm (A) Tj (X) Tj 0 Tr ET"; + let want = [("A".to_string(), 60.0, true, true), ("B".to_string(), 60.0, true, false), ("X".to_string(), 60.0, false, true)]; + assert_eq!(word_runs(content), want, "{content}"); +} + +/// Helvetica PDF page drawing `content` (fill cream, stroke black, 3 points wide), imported: each +/// type object's runs in drawing order, as their text and whether they are filled and stroked. +fn type_runs(content: &str) -> Vec> { + use vectorcraft_testkit::pdf::{PdfPage, pdf}; + let resources = "/Font << /F1 << /Type /Font /Subtype /Type1 /BaseFont /Helvetica >> >>"; + let content = format!("0 0 0 RG 1 1 0.8 rg 3 w {content}"); + let bytes = pdf(&[PdfPage { resources: resources.into(), ..PdfPage::new(300.0, 200.0, &content) }], None); + let d = import(&bytes).unwrap(); + let mut types = vec![]; + d.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + types.push(t.runs.iter().map(|r| (r.text.clone(), !r.style.fill.is_none(), !r.style.stroke.is_none())).collect()); + } + }); + types +} + +/// A glyph filled only (mode 0) right after one filled and stroked (mode 2) is filled only: it +/// joins the same type object, but not the stroked run, whether the glyphs before were filled +/// only, filled and stroked, or both, and a glyph filled and stroked after it is stroked again +/// (#8300). +#[test] +fn a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked() { + let run = |text: &str, stroked: bool| (text.to_string(), true, stroked); + let cases = [ + ("2 Tr (B) Tj 0 Tr (C) Tj", vec![run("B", true), run("C", false)]), + ("0 Tr (A) Tj 2 Tr (B) Tj 0 Tr (C) Tj", vec![run("A", false), run("B", true), run("C", false)]), + ("2 Tr (B) Tj 0 Tr (C) Tj 2 Tr (D) Tj", vec![run("B", true), run("C", false), run("D", true)]), + ("2 Tr (AB) Tj 0 Tr (CD) Tj", vec![run("AB", true), run("CD", false)]), + ("0 Tr (A) Tj 2 Tr (BC) Tj", vec![run("A", false), run("BC", true)]), + ]; + for (show, want) in cases { + let content = format!("BT /F1 48 Tf 20 80 Td {show} 0 Tr ET"); + assert_eq!(type_runs(&content), [want], "{content}"); + } +} + +/// Fill and stroke rendering glyph by glyph, and a word filled whole then stroked whole at the +/// same place, still come in as one run filled and stroked (#8300). +#[test] +fn glyphs_filled_and_stroked_one_by_one_stay_one_run() { + for content in [ + "BT /F1 48 Tf 20 80 Td 2 Tr (A) Tj (B) Tj (C) Tj 0 Tr ET", + "BT /F1 48 Tf 1 0 0 1 20 80 Tm 0 Tr (ABC) Tj 1 Tr 1 0 0 1 20 80 Tm (ABC) Tj 0 Tr ET", + ] { + assert_eq!(type_runs(content), [vec![("ABC".to_string(), true, true)]], "{content}"); + } +} diff --git a/crates/text/src/tests/harakat.rs b/crates/text/src/tests/harakat.rs index 4e11921a6f..4281cf9a5d 100644 --- a/crates/text/src/tests/harakat.rs +++ b/crates/text/src/tests/harakat.rs @@ -454,18 +454,23 @@ fn check_spaced_harakat(db: &FontDb, family: &str) { } /// Right to left, with harakat coloured apart, Optical kerning keeps the Tsume of each letter's -/// cluster as it does in "HOH": the glyphs move as far with Optical kerning as without it. +/// cluster as it does in "HOH": the glyphs move as far with Optical kerning as without it. The test +/// font leaves blank space beside both letters' ink, so its Tsume must move something; an installed +/// face may not (#7821: Arial's initial beh and its fatha fill its cell), and there the Tsume takes +/// nothing, with or without Optical kerning. #[test] fn optical_kerning_keeps_the_tsume_of_a_letter_with_coloured_harakat() { let db = FontDb::with_font_dirs(vec![]); assert_eq!(db.add_font(crate::test_fonts::lam_alef_font(b"rlig").unwrap()), 1); - check_optical_tsume(&db, crate::test_fonts::lam_alef_family(b"rlig")); + check_optical_tsume(&db, crate::test_fonts::lam_alef_family(b"rlig"), true); if let Some(face) = arabic_face("optical_kerning_keeps_the_tsume_of_a_letter_with_coloured_harakat") { - check_optical_tsume(FontDb::global(), &face.family); + check_optical_tsume(FontDb::global(), &face.family, false); } } -fn check_optical_tsume(db: &FontDb, family: &str) { +/// `strict`: every letter's cluster must leave blank space beside its ink, so its Tsume must move +/// or narrow something. +fn check_optical_tsume(db: &FontDb, family: &str, strict: bool) { const WORD: &str = "بَبَ"; // ب 0, fatha 2, ب 4, fatha 6 let set = |optical: bool, letter: Option| { let mut t = text_with_harakat(WORD, family, Some(red())); @@ -479,11 +484,27 @@ fn check_optical_tsume(db: &FontDb, family: &str) { // Tsume of the line's first cluster only narrows its advance and moves no glyph. let xs = |t: &TextObject| layout(db, t).glyphs.iter().flat_map(|g| [g.xf.as_coeffs()[4], g.advance]).collect::>(); assert!(xs(&set(true, None)).iter().zip(xs(&set(false, None))).any(|(a, b)| (a - b).abs() > 1e-6), "{family}: Optical moves the pair"); + // The blank space Tsume shares out: between the letter's cluster's cell (from its glyphs' + // shared origin, as long as their advances) and its glyphs' ink, on each side, without Tsume. + let plain = layout(db, &set(false, None)); + let blank = |letter: usize| { + let cluster: Vec<_> = plain.glyphs.iter().filter(|g| g.byte == letter).collect(); + let start = cluster.iter().map(|g| g.origin.x).fold(f64::INFINITY, f64::min); + let end = start + cluster.iter().map(|g| g.advance).sum::(); + let ink = cluster.iter().filter(|g| !g.outline.elements().is_empty()).map(|g| g.outline.bounding_box()); + let (lo, hi) = ink.fold((f64::INFINITY, f64::NEG_INFINITY), |(lo, hi), b| (lo.min(b.x0), hi.max(b.x1))); + (lo - start).clamp(0.0, end - start) + (end - hi).clamp(0.0, end - start) + }; // Each letter in turn: the first one's cluster ends the pair, the second one's starts it. for letter in [0, 4] { let moved = |optical: bool| xs(&set(optical, Some(letter))).iter().zip(xs(&set(optical, None))).map(|(a, b)| a - b).collect::>(); let (without, with_optical) = (moved(false), moved(true)); - assert!(without.iter().any(|m| m.abs() > 1e-3), "{family} {letter}: Tsume moves or narrows the glyphs: {without:?}"); + let blank = blank(letter); + if strict || blank > 1e-6 { + assert!(without.iter().any(|m| m.abs() > 1e-6), "{family} {letter}: Tsume moves or narrows the glyphs ({blank} blank): {without:?}"); + } else { + assert!(without.iter().all(|m| m.abs() < 1e-6), "{family} {letter}: no blank space ({blank}), Tsume takes nothing: {without:?}"); + } assert!( without.len() == with_optical.len() && without.iter().zip(&with_optical).all(|(a, b)| (a - b).abs() < 1e-6), "{family} {letter}: {without:?} {with_optical:?}" diff --git a/crates/tools/src/cursors.toml b/crates/tools/src/cursors.toml index 07023d390d..e8687a9fae 100644 --- a/crates/tools/src/cursors.toml +++ b/crates/tools/src/cursors.toml @@ -75,6 +75,7 @@ group = "Selection" shown_when = [ "The Group Selection tool: each click selects the next enclosing group.", "Direct Selection with Alt held (Alt makes it Group Selection for the next click).", + "Over a panel where a click or a drop adds something, such as the strip under the Gradient panel's ramp, where a click adds a stop, or the Layers panel's list while rows are Alt-dragged, where the drop adds copies (where the system has no copy cursor the app can show).", ] hotspot = "The arrow's tip." look = "ArrowHollow with a plus badge." diff --git a/crates/trace/src/quantize/cut_edge.rs b/crates/trace/src/quantize/cut_edge.rs index 61a9db4c8e..4e32856ef1 100644 --- a/crates/trace/src/quantize/cut_edge.rs +++ b/crates/trace/src/quantize/cut_edge.rs @@ -607,7 +607,7 @@ pub(crate) fn settle_cut_edges(q: &mut Quantized, img: &Raster, gray: bool) -> V let edge = cut_edge(img); let mut changed = false; let mut stack: Vec<(usize, usize)> = Vec::new(); - for i in 0..w * h { + for (i, blend) in blended.iter_mut().enumerate() { let mine = q.labels[i]; if mine == TRANSPARENT || !edge.get(i).copied().unwrap_or(false) { continue; @@ -630,7 +630,7 @@ pub(crate) fn settle_cut_edges(q: &mut Quantized, img: &Raster, gray: bool) -> V } } }); - blended[i] = !near.is_empty(); + *blend = !near.is_empty(); if keep || near.is_empty() { continue; } diff --git a/crates/ui-egui/src/app/commands.rs b/crates/ui-egui/src/app/commands.rs index d663419acb..6c31668533 100644 --- a/crates/ui-egui/src/app/commands.rs +++ b/crates/ui-egui/src/app/commands.rs @@ -236,6 +236,7 @@ impl VectorcraftApp { let ime_target = crate::ime::target(&mut self.session, ime_view); let ime_before = crate::ime::stamp(&mut self.session, ime_view); let cursor_settings = (self.session.caps_lock, self.session.prefs.use_precise_cursors); + let spot_base = panels::color_guide::before_command(self); let r = self.session.execute(id, ¶ms).map_err(|e| e.to_string()); let r = panels::actions::after_recorded_command(self, r); if r.is_ok() && cursor_settings != (self.session.caps_lock, self.session.prefs.use_precise_cursors) { @@ -267,12 +268,8 @@ impl VectorcraftApp { { self.ui.status = w.to_string(); } - // A renamed spot color swatch stays the Color Guide's base. - if id == "swatch.edit" - && let (Some(from), Some(to)) = (params["name"].as_str(), v["name"].as_str()) - { - crate::panels::color_guide::swatch_renamed(self, from, to); - } + // A renamed spot color swatch stays the Color Guide's base; a deleted one ends the link. + panels::color_guide::after_command(self, id, ¶ms, v, spot_base); if id == "file.new" { self.ui.status.clear(); // New Document's Pixel preview mode (Overprint Preview is the engine's). diff --git a/crates/ui-egui/src/cursors.rs b/crates/ui-egui/src/cursors.rs index bcb6744c12..e6d3fc1298 100644 --- a/crates/ui-egui/src/cursors.rs +++ b/crates/ui-egui/src/cursors.rs @@ -789,6 +789,27 @@ pub fn os_cursors(build: bool, wayland: bool) -> bool { build && !wayland } +/// The cursor a panel shows where a click or a drop adds something, such as a stop under the +/// Gradient panel's ramp or a copy of rows Alt-dragged in the Layers panel (#8217): the white arrow +/// with a plus that Group Selection shows for a click that adds the next group. Windows has no system copy cursor (winit shows the plain arrow for +/// `CursorIcon::Copy`), so where the window shows glyphs as OS cursors ([`os_cursors`]) the panel +/// hands it this glyph; elsewhere (macOS, Wayland, the web, `VECTORCRAFT_SYSTEM_CURSORS`) the +/// system's copy cursor shows (#8241). Set every frame it shows: the canvas and egui reset it. +pub(crate) fn set_add_cursor(app: &mut crate::VectorcraftApp, ctx: &egui::Context) { + ctx.set_cursor_icon(egui::CursorIcon::Copy); + if add_cursor_is_a_glyph(app) { + // As the canvas sizes its glyphs (User Interface › Scale Cursor Proportional to UI). + let ui_scale = if app.session.prefs.scale_cursor_with_ui { 1.0 } else { ctx.zoom_factor() }; + ctx.set_cursor_image(app.canvas.cursors.get(Cursor::GroupSelection, ctx.pixels_per_point() / ui_scale)); + } +} + +/// Does [`set_add_cursor`] hand the OS its glyph (rather than ask for the system copy cursor)? +/// Where the window shows glyphs as OS cursors, unless `VECTORCRAFT_SYSTEM_CURSORS` opts out. +pub(crate) fn add_cursor_is_a_glyph(app: &crate::VectorcraftApp) -> bool { + std::env::var_os("VECTORCRAFT_SYSTEM_CURSORS").is_none() && os_cursors(OS_CURSORS, app.services.wayland) +} + /// Does the window hide the pointer only while it is the key window? macOS does: winit hides it with /// a cursor rect holding a transparent cursor, and macOS applies the rect only in the key window. /// Over a window behind another app or under a sheet, the system pointer shows (#2020). diff --git a/crates/ui-egui/src/dialogs/command.rs b/crates/ui-egui/src/dialogs/command.rs index 9cd92b5428..9cb59853a6 100644 --- a/crates/ui-egui/src/dialogs/command.rs +++ b/crates/ui-egui/src/dialogs/command.rs @@ -201,10 +201,35 @@ fn choices(command: &str, key: &str) -> Option { (crate::addons::pathtools::COMMON_TANGENTS, "tangents") => Some(crate::addons::pathtools::TANGENT_KINDS), (crate::addons::image::REMOVE_BACKGROUND | crate::addons::image::COLOR_MASK, "background") => Some(crate::addons::image::BACKGROUNDS), (crate::addons::image::REMOVE_BACKGROUND | crate::addons::image::COLOR_MASK, "match") => Some(crate::addons::image::MATCHES), + ("object.rasterize", "antiAlias") => Some(RASTERIZE_ANTI_ALIAS), + ("object.rasterize", "background") => Some(RASTERIZE_BACKGROUNDS), + ("object.mesh.create", "appearance") => Some(MESH_APPEARANCES), + ("object.repeat.options", "gridType") => Some(REPEAT_GRID_TYPES), _ => None, } } +/// Object › Rasterize › Anti-aliasing: the modes `vectorcraft_render::AntiAlias` names, with its +/// labels, as the Rasterize effect's dialog lists them (`effect.rs`, `own_choices`). +const RASTERIZE_ANTI_ALIAS: form::Choices = &[("None", "none"), ("Art Optimized", "art"), ("Type Optimized", "type")]; + +/// Object › Rasterize › Background, as Document Raster Effects Settings and the Rasterize effect +/// list it. A color the command was given another way (black, a hex color) shows as it is. +const RASTERIZE_BACKGROUNDS: form::Choices = &[("White", "white"), ("Transparent", "transparent")]; + +/// Object › Create Gradient Mesh › Appearance: the values `object.mesh.create` takes. +const MESH_APPEARANCES: form::Choices = &[("Flat", "flat"), ("To Center", "center"), ("To Edge", "edge")]; + +/// Repeat Options › Grid Type of a grid repeat: the tile types, labeled as the Pattern Options +/// panel labels them (`panels/pattern_options.rs`, `TILE_LABELS`). +const REPEAT_GRID_TYPES: form::Choices = &[ + ("Grid", "grid"), + ("Brick by Row", "brickByRow"), + ("Brick by Column", "brickByColumn"), + ("Hex by Column", "hexByColumn"), + ("Hex by Row", "hexByRow"), +]; + /// Object › Rasterize › Color Model: the values `object.rasterize` takes, the document's own /// colour model first (#5660). fn rasterize_color_models(command: &str, key: &str, cmyk: bool) -> Option { @@ -688,4 +713,147 @@ mod tests { h.event(egui::Event::PointerButton { pos: ok, button, pressed: false, modifiers }); h.run_steps(3); } + + /// The dialog that is open in `app`, drawn by a kittest harness (the first frame installs the + /// fonts). + fn dialog_harness(app: VectorcraftApp) -> egui_kittest::Harness<'static, VectorcraftApp> { + let mut fonts = false; + let mut h = egui_kittest::Harness::builder().with_size(egui::vec2(1100.0, 900.0)).build_ui_state( + move |ui, app: &mut VectorcraftApp| { + if !std::mem::replace(&mut fonts, true) { + crate::theme::install_fonts(ui.ctx()); + return; + } + crate::dialogs::show(app, ui.ctx()); + }, + app, + ); + h.run_steps(5); + h + } + + /// Opens the dropdown labeled `label` and picks `choice` in it: the field must be a dropdown, + /// not a text field. + fn pick(h: &mut egui_kittest::Harness<'_, VectorcraftApp>, label: &str, choice: &str) { + use egui::accesskit::Role; + use egui_kittest::kittest::Queryable; + assert!(h.query_by_role_and_label(Role::TextInput, label).is_none(), "{label} is not a text field"); + h.get_by_role_and_label(Role::ComboBox, label).click(); + h.run_steps(3); + h.get_by_label(choice).click(); + h.run_steps(3); + } + + /// The choices this dialog lists for Rasterize, Create Gradient Mesh and Repeat Options are the + /// values their commands take (#8020, #7991): each one runs, and every language with complete + /// menus has a row for each label. + #[test] + fn choice_fields_list_the_values_their_commands_take() { + use vectorcraft_doc::pattern::TileType; + use vectorcraft_render::AntiAlias; + let listed = |command: &str, key: &str| choices(command, key).unwrap_or_else(|| panic!("{command} {key}: a choice")); + let aa: Vec<(&str, &str)> = AntiAlias::ALL.iter().map(|a| (a.label(), a.id())).collect(); + assert_eq!(listed("object.rasterize", "antiAlias"), aa.as_slice()); + for (_, value) in listed("object.rasterize", "background") { + assert!(vectorcraft_doc::Background::parse(value).is_some(), "{value}"); + } + for (label, value) in listed("object.repeat.options", "gridType") { + let tile = TileType::parse(value, None).unwrap_or_else(|| panic!("{value}")); + assert_eq!((tile.id(), tile.label()), (*value, *label)); + } + let run = |command: &str, key: &str, value: &str| { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let id = s.execute("shape.rectangle", &json!({"x": 10, "y": 10, "width": 20, "height": 20})).unwrap()["id"].clone(); + if command == "object.repeat.options" { + s.execute("object.repeat.grid", &json!({"ids": [id], "rows": 2, "cols": 2})).unwrap(); + } + s.execute(command, &json!({ key: value })).unwrap_or_else(|e| panic!("{command} {key} {value}: {e}")); + }; + let fields = [ + ("object.rasterize", "antiAlias"), + ("object.rasterize", "background"), + ("object.mesh.create", "appearance"), + ("object.repeat.options", "gridType"), + ]; + for (command, key) in fields { + for (label, value) in listed(command, key) { + run(command, key, value); + for lang in crate::i18n::Lang::all().filter(|l| l.complete_menus()) { + assert!(crate::i18n::has(lang, label), "{}: {label}", lang.code()); + } + } + } + } + + /// Object › Rasterize… shows Anti Alias and Background as dropdowns of the values + /// `object.rasterize` takes. OK rasterizes with the picked ones as one undo step, and a value + /// the dialog doesn't list (black) shows as it is and is sent unchanged. + #[test] + fn rasterize_anti_alias_and_background_are_dropdowns() { + let corner = |app: &VectorcraftApp| { + let st = app.session.active().unwrap(); + let key = st.selection.objects.iter().find_map(|id| match st.doc.node(*id).map(|n| &n.kind) { + Some(NodeKind::Image(i)) => Some(i.key.clone()), + _ => None, + }); + let decoded = craft_image_codecs::decode(&st.doc.images[&key.expect("the ellipse became an image")].bytes).unwrap(); + image::RgbaImage::from_raw(decoded.width(), decoded.height(), decoded.to_rgba8()).unwrap().get_pixel(0, 0).0 + }; + let mut app = VectorcraftApp::new(Session::new(), Default::default()); + app.run("file.new", json!({"width": 200, "height": 200})).unwrap(); + let id = app.run("shape.ellipse", json!({"x": 10, "y": 10, "width": 40, "height": 40})).unwrap()["id"].as_u64().unwrap(); + app.run("paint.setFill", json!({"color": "#ff0000", "ids": [id]})).unwrap(); + app.run("select.set", json!({"ids": [id]})).unwrap(); + let steps = app.session.active().unwrap().history.undo.len(); + crate::menus::invoke(&mut app, "object.rasterize", json!({})); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.str("antiAlias"), d.str("background")), ("art".into(), "transparent".into())); + let mut h = dialog_harness(app); + pick(&mut h, "Anti Alias:", "Type Optimized"); + pick(&mut h, "Background:", "White"); + let d = h.state().ui.dialog.as_ref().unwrap(); + assert_eq!((d.str("antiAlias"), d.str("background")), ("type".into(), "white".into())); + let app = h.state_mut(); + crate::dialogs::confirm(app).unwrap(); + assert_eq!(app.session.active().unwrap().history.undo.len(), steps + 1, "one undo step"); + assert_eq!(corner(app), [255, 255, 255, 255], "a white background"); + // A background the dialog doesn't list stays as it is. + app.run("edit.undo", json!({})).unwrap(); + app.run("select.set", json!({"ids": [id]})).unwrap(); + crate::menus::invoke(app, "object.rasterize", json!({})); + app.ui.dialog.as_mut().unwrap().fields.insert("background".into(), json!("black")); + frame(app); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("background"), "black", "drawing the dropdown keeps it"); + crate::dialogs::confirm(app).unwrap(); + assert_eq!(corner(app), [0, 0, 0, 255], "a black background"); + } + + /// Create Gradient Mesh… shows Appearance, and Repeat Options for a grid repeat its Grid Type, + /// as dropdowns of the values their commands take; OK applies the picked one. + #[test] + fn mesh_appearance_and_repeat_grid_type_are_dropdowns() { + 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(); + let entries = crate::menus::menu_entries(&app); + let item = entries.iter().find(|e| e.path == ["Object"] && e.label == "Create Gradient Mesh…").expect("listed"); + let (cmd, p) = crate::menus::click_target(&item.label, item.command.as_deref().unwrap(), &item.params); + crate::menus::invoke(&mut app, &cmd, p); + let mut h = dialog_harness(app); + pick(&mut h, "Appearance:", "To Center"); + let app = h.state_mut(); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("appearance"), "center"); + crate::dialogs::confirm(app).unwrap(); + let st = app.session.active().unwrap(); + assert!(st.selection.objects.iter().any(|id| matches!(st.doc.node(*id).map(|n| &n.kind), Some(NodeKind::Mesh(_)))), "a mesh"); + + let mut h = dialog_harness(grid_options_app()); + pick(&mut h, "Grid Type:", "Brick by Row"); + let app = h.state_mut(); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("gridType"), "brickByRow"); + crate::dialogs::confirm(app).unwrap(); + let fields = crate::panels::pattern_options::repeat_fields(app).unwrap(); + assert_eq!(fields["gridType"], json!("brickByRow")); + } } diff --git a/crates/ui-egui/src/dialogs/print.rs b/crates/ui-egui/src/dialogs/print.rs index 017e669d9c..ebaad1749a 100644 --- a/crates/ui-egui/src/dialogs/print.rs +++ b/crates/ui-egui/src/dialogs/print.rs @@ -746,13 +746,19 @@ fn general(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { let on = scaling == PrintScaling::Custom || tiles; let linked = get(d, SCALE_LINKED).as_bool() == Some(true); ui.label(tl!("W:")); - if let Some(w) = percent(ui, d, "scale.width", on).filter(|_| linked) { + let w = percent(ui, d, "scale.width", on); + if let Some(w) = w.filter(|_| linked) { set(d, "scale.height", json!(w)); } ui.label(tl!("H:")); - if let Some(h) = percent(ui, d, "scale.height", on).filter(|_| linked) { + let h = percent(ui, d, "scale.height", on); + if let Some(h) = h.filter(|_| linked) { set(d, "scale.width", json!(h)); } + // A typed W or H is what the next `ui.dialog.set` changes from. + if w.is_some() || h.is_some() { + see_scale(&mut d.fields); + } ui.add_enabled_ui(on, |ui| scale_link(ui, d, linked)); }); row(ui, tl!("Overlap:"), |ui| length(ui, d, "overlap", unit, tiles)); @@ -779,11 +785,13 @@ fn output(ui: &mut egui::Ui, d: &mut Dialog, pv: &Result) { flag(ui, d, "output.spotsToProcess", tl!("Convert All Spot Colors to Process"), separations); flag(ui, d, "output.overprintBlack", tl!("Overprint Black"), separations); heading(ui, tl!("Document Ink Options")); - let inks = pv.as_ref().ok().and_then(|v| v["inks"].as_array()).map(Vec::as_slice).unwrap_or_default(); + // Every ink of the document, the spot inks printing as process (no plate) included. + let inks = pv.as_ref().ok().and_then(|v| v["documentInks"].as_array()).map(Vec::as_slice).unwrap_or_default(); if !separations || inks.is_empty() { note(ui, tl!("Separations list the document's inks here: one page per ink that prints.")); return; } + let all_spots = get(d, "output.spotsToProcess").as_bool() == Some(true); let t = Tokens::get(ui.ctx()); egui::Grid::new("print-inks").num_columns(4).spacing([12.0, 4.0]).show(ui, |ui| { for h in [tl!("Print"), tl!("Ink"), tl!("Frequency"), tl!("Angle")] { @@ -792,17 +800,31 @@ fn output(ui: &mut egui::Ui, d: &mut Dialog, pv: &Result) { ui.end_row(); for ink in inks { let name = ink["name"].as_str().unwrap_or_default(); + // A spot ink printing as process has no plate: its plate options wait, dimmed, for it + // to print as a spot ink again. + let process = ink["convertToProcess"] == true; let on = ink["print"].as_bool().unwrap_or(true); - if widgets::check_box(ui, name, on, true) { + if widgets::check_box(ui, name, on, !process) { set_ink(d, name, "print", json!(!on)); } - let spot = if ink["spot"] == true { format!(" ({})", tl!("spot")) } else { String::new() }; - ui.label(egui::RichText::new(format!("{name}{spot}")).color(t.text)); + ui.horizontal(|ui| { + if ink["spot"] == true { + if ink_kind_button(ui, name, process, !all_spots) { + set_ink(d, name, "convertToProcess", json!(!process)); + } + } else { + ui.add_space(INK_KIND); + } + let spot = if ink["spot"] == true { format!(" ({})", tl!("spot")) } else { String::new() }; + ui.label(egui::RichText::new(format!("{name}{spot}")).color(t.text)); + }); for (k, suffix) in [("frequency", " lpi"), ("angle", "°")] { let v = ink[k].as_f64().unwrap_or(0.0); let heading = if k == "frequency" { tl!("Frequency") } else { tl!("Angle") }; let field_name = format!("{heading} {name}"); - if let Some(x) = widgets::plain_field_named(ui, ("print-ink", name, k), Some(&field_name), v, suffix, 2, 72.0) { + let typed = + ui.add_enabled_ui(!process, |ui| widgets::plain_field_named(ui, ("print-ink", name, k), Some(&field_name), v, suffix, 2, 72.0)); + if let Some(x) = typed.inner { set_ink(d, name, k, json!(x)); } } @@ -812,6 +834,42 @@ fn output(ui: &mut egui::Ui, d: &mut Dialog, pv: &Result) { note(ui, tl!("Frequencies and angles are the output device's to apply.")); } +/// The size of the spot or process icon before a spot ink's name. +const INK_KIND: f32 = 18.0; + +/// The icon before spot ink `name`'s name: a spot icon while it prints as a spot ink, the four +/// process inks while it prints as process (`process`). A click switches it; dimmed (`enabled` +/// off) while Convert All Spot Colors to Process converts every spot ink. Whether it was clicked. +fn ink_kind_button(ui: &mut egui::Ui, name: &str, process: bool, enabled: bool) -> bool { + let label = if process { + crate::i18n::fmt(tl!("Keep {name} as spot"), &[("name", name)]) + } else { + crate::i18n::fmt(tl!("Convert {name} to process"), &[("name", name)]) + }; + let sense = if enabled { egui::Sense::click() } else { egui::Sense::hover() }; + let (rect, resp) = ui.allocate_exact_size(egui::Vec2::splat(INK_KIND), sense); + let t = Tokens::get(ui.ctx()); + if enabled && resp.hovered() { + ui.painter().rect_filled(rect, 3.0, t.hover); + } + let icon = rect.shrink(4.0); + if process { + let q = icon.size() / 2.0; + for (i, c) in crate::panels::swatches::CMYK_INKS.into_iter().enumerate() { + let c = if enabled { c } else { c.gamma_multiply(0.4) }; + let at = icon.min + egui::vec2((i % 2) as f32 * q.x, (i / 2) as f32 * q.y); + ui.painter().rect_filled(egui::Rect::from_min_size(at, q), 0.0, c); + } + } else { + let color = if enabled { t.icon } else { t.text_disabled }; + ui.painter().circle_stroke(icon.center(), icon.width() / 2.0, egui::Stroke::new(1.0, color)); + ui.painter().circle_filled(icon.center(), icon.width() / 5.0, color); + } + resp.widget_info(|| widgets::icon_button_info(enabled, false, &label)); + let resp = resp.on_hover_text(label); + enabled && resp.clicked() +} + /// Set option `key` of ink `name` in `output.inks` (the ink gets its own entry the first time). fn set_ink(d: &mut Dialog, name: &str, key: &str, value: Value) { let mut inks = get(d, "output.inks").as_array().cloned().unwrap_or_default(); diff --git a/crates/ui-egui/src/dialogs/save_for_web.rs b/crates/ui-egui/src/dialogs/save_for_web.rs index d6b5681cef..589d1dfdce 100644 --- a/crates/ui-egui/src/dialogs/save_for_web.rs +++ b/crates/ui-egui/src/dialogs/save_for_web.rs @@ -9,7 +9,10 @@ //! `ui.dialog.set`, or `preset` to load a preset), plus the dialog's own: `__view` (`original`, //! `optimized`, `2up`, `4up`), `__zoom` (`fit` or a percentage), `__kbps` (connection speed), //! `__color` (the colour table's selected colour, by source), `__presetName` (shown while saving a -//! preset) and `__hasSlices`. Save… remembers +//! preset) and `__hasSlices`. Optimize to File Size… (`__optimizeOpen: true`) shows `__optimizeK` (the desired size in K), +//! `__optimizeStart` (`current`, `auto`) and with slices `__optimizeUse` (`allSlices`, +//! `eachSlice`, `currentSlice`); `__optimizeGo: true` runs `webExport.optimizeToFileSize` and +//! takes the settings it finds, and `__optimized` holds its result. Save… remembers //! the settings and writes the files (`file.saveForWeb`); Done only remembers them; Preview in //! Browser opens the HTML page (`file.saveForWeb.browser`). While Alt (Option on macOS) is held, //! Cancel reads Reset, which puts the remembered settings back and leaves the dialog open @@ -71,6 +74,11 @@ const MATTES: [&str; 3] = ["none", "white", "black"]; const MATTE_LABELS: [&str; 4] = ["None", "White", "Black", "Other"]; /// JPEG quality steps: (label, quality). const QUALITIES: [(&str, u8); 5] = [("Low", 10), ("Medium", 30), ("High", 60), ("Very High", 80), ("Maximum", 100)]; +/// Optimize to File Size's Start With (`__optimizeStart`) and Use (`__optimizeUse`) choices. +const START_WITH: [(&str, &str); 2] = [("current", "Current Settings"), ("auto", "Auto Select GIF/JPEG")]; +const SIZE_USE: [(&str, &str); 3] = [("allSlices", "Total of All Slices"), ("eachSlice", "Each Slice"), ("currentSlice", "Current Slice")]; +/// The fields of Optimize to File Size's rows. +const OPTIMIZE_FIELDS: [&str; 3] = ["__optimizeK", "__optimizeStart", "__optimizeUse"]; /// Open on the document's active artboard, keeping the other remembered settings. pub fn open(app: &mut VectorcraftApp) -> Result { @@ -412,13 +420,11 @@ fn texture(ctx: &egui::Context, name: &str, px: &[u8], [w, h]: [u32; 2]) -> egui ctx.load_texture(name, img, opts) } -/// The rendering for `s` and the optimised image for each of `panes`, from the cache when nothing -/// they depend on changed. -fn previews(app: &VectorcraftApp, ctx: &egui::Context, s: &WebSettings, panes: &[WebSettings]) -> (Result, Vec>) { - let Some(st) = app.session.active() else { return (Err("no document".into()), vec![]) }; - let doc = &st.doc; - let mut cache: Cache = ctx.data(|m| m.get_temp(cache_id())).unwrap_or_default(); - let render_key = format!( +/// What the rendering for `s` depends on: the active document, its revision and the settings that +/// change the image's pixels. +fn render_key(app: &VectorcraftApp, s: &WebSettings) -> Option { + let st = app.session.active()?; + Some(format!( "{}:{}:{:?}:{:?}:{:?}:{}:{}:{:?}:{:?}", st.uid, st.revision, @@ -429,7 +435,15 @@ fn previews(app: &VectorcraftApp, ctx: &egui::Context, s: &WebSettings, panes: & s.clip_to_artboard, s.artboard, (!s.clip_to_artboard).then_some(s.slices) - ); + )) +} + +/// The rendering for `s` and the optimised image for each of `panes`, from the cache when nothing +/// they depend on changed. +fn previews(app: &VectorcraftApp, ctx: &egui::Context, s: &WebSettings, panes: &[WebSettings]) -> (Result, Vec>) { + let (Some(st), Some(render_key)) = (app.session.active(), render_key(app, s)) else { return (Err("no document".into()), vec![]) }; + let doc = &st.doc; + let mut cache: Cache = ctx.data(|m| m.get_temp(cache_id())).unwrap_or_default(); if cache.render_key != render_key || cache.render.is_none() { let r = webexport::render(doc, s).map(Arc::new); cache.original = r.as_ref().ok().map(|r| Shot { @@ -508,6 +522,14 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { if let Err(e) = apply_preset(app, d) { app.status(e); } + if d.fields.remove("__optimizeOpen").is_some_and(|v| v == json!(true)) { + open_optimize_rows(app, ui, d); + } + if d.fields.remove("__optimizeGo").is_some_and(|v| v == json!(true)) + && let Err(e) = optimize_to_size(app, d) + { + app.status(e); + } let settings = settings_of(app, d); let mut browser = false; ui.horizontal_top(|ui| { @@ -521,6 +543,7 @@ fn body(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { side(app, ui, d, settings.as_ref().ok()); }); }); + optimize_on_enter(ui.ctx(), d); if browser && let Err(e) = app.run("file.saveForWeb.browser", params(d)) { app.status(e); } @@ -704,6 +727,7 @@ fn pairs(all: &[T], key: fn(T) -> &'static str, label: fn(T) -> &'stati fn side(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, s: Option<&WebSettings>) { presets_row(app, ui, d, s); + optimize_rows(ui, d, s, &art_key(app)); widgets::divider(ui); egui::ScrollArea::vertical().id_salt("sfw-settings").max_height(PREVIEW_H - 40.0).auto_shrink([false, true]).show(ui, |ui| { let choice = |ui: &mut egui::Ui, d: &mut Dialog, key: &str, label: &str, options: &[(&str, &str)]| { @@ -805,6 +829,157 @@ fn presets_row(app: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog, s: O } } +/// The optimized file size of the settings `s` on the active document as it is now: from the preview +/// cache when the cache holds that document at its current revision, else made through [`previews`], +/// which keeps the image for the preview drawn later in the same frame. +fn previewed_bytes(app: &VectorcraftApp, ui: &egui::Ui, s: &WebSettings) -> Option { + let key = s.to_json().to_string(); + let cache: Option = ui.ctx().data(|m| m.get_temp(cache_id())); + let cached = cache + .filter(|c| Some(&c.render_key) == render_key(app, s).as_ref()) + .and_then(|c| c.shots.into_iter().find(|(k, _)| *k == key)) + .and_then(|(_, shot)| shot.ok()) + .and_then(|shot| shot.bytes); + cached.or_else(|| previews(app, ui.ctx(), s, std::slice::from_ref(s)).1.into_iter().next()?.ok()?.bytes) +} + +/// Optimize to File Size…: the button opens rows ([`open_optimize_rows`]) for the desired size in +/// K, Start With and, with slices, Use; OK or Enter runs [`optimize_to_size`] and Cancel +/// closes the rows. A line gives the size it found and whether that is within the desired size +/// ([`optimized_result`]). +fn optimize_rows(ui: &mut egui::Ui, d: &mut Dialog, s: Option<&WebSettings>, art: &str) { + if d.fields.contains_key("__optimizeK") { + widgets::label_row(ui, tl!("Desired File Size:"), LABEL_W, |ui| { + let k = d.f64("__optimizeK", 32.0); + if let Some(v) = widgets::range_field(ui, "sfw-optimize-k", k, 0.001..=webexport::MAX_DESIRED_K, "K", 3, 100.0) { + d.fields.insert("__optimizeK".into(), json!(v)); + } + }); + form::choice(ui, d, "__optimizeStart", tl!("Start With:"), (LABEL_W, FIELD_W), &START_WITH); + if d.bool("__hasSlices") { + form::choice(ui, d, "__optimizeUse", tl!("Use:"), (LABEL_W, FIELD_W), &SIZE_USE); + } + widgets::label_row(ui, "", LABEL_W, |ui| { + if widgets::flat_button(ui, tl!("OK"), 64.0).clicked() { + d.fields.insert("__optimizeGo".into(), json!(true)); + } + if widgets::flat_button(ui, tl!("Cancel"), 64.0).clicked() { + for k in OPTIMIZE_FIELDS { + d.fields.remove(k); + } + } + }); + } else { + widgets::label_row(ui, "", LABEL_W, |ui| { + if widgets::flat_button(ui, tl!("Optimize to File Size…"), FIELD_W).clicked() { + d.fields.insert("__optimizeOpen".into(), json!(true)); + } + }); + } + if let Some(r) = optimized_result(d, s, art) { + let size = size_label(r["bytes"].as_u64().unwrap_or(0) as usize); + let target = size_label(r["targetBytes"].as_u64().unwrap_or(0) as usize); + let text = if r["achieved"] == json!(true) { + crate::i18n::fmt(tl!("{size}, within {target}"), &[("size", &size), ("target", &target)]) + } else { + crate::i18n::fmt(tl!("No setting tried fits in {target}; the smallest is {size}"), &[("size", &size), ("target", &target)]) + }; + widgets::label_row(ui, "", LABEL_W, |ui| { + widgets::dim_label(ui, &text); + }); + } +} + +/// An Enter while the Optimize to File Size rows ([`optimize_rows`]) are open is their OK: it does +/// not save. Run after every control of the dialog has drawn, it runs the search unless a control +/// took the press (an open dropdown), a field refused the value typed in it, or Ctrl, Cmd or Alt was +/// held, which the size field does not commit. +pub(super) fn optimize_on_enter(ctx: &egui::Context, d: &mut Dialog) { + if !d.fields.contains_key("__optimizeK") || !crate::shortcuts::pressed_anew(ctx, egui::Key::Enter) { + return; + } + let held = ctx.input(|i| { + i.events.iter().any(|e| matches!(e, egui::Event::Key { key: egui::Key::Enter, pressed: true, modifiers, .. } if modifiers.ctrl || modifiers.command || modifiers.alt)) + }); + let refused = ctx.data(|m| m.get_temp::(widgets::dialog_reject_commit_flag())).unwrap_or(false); + widgets::reject_dialog_commit(ctx); + if !held && !refused { + d.fields.insert("__optimizeGo".into(), json!(true)); + ctx.request_repaint(); + } +} + +/// The last Optimize to File Size result (`__optimized`) while it still holds: the settings are the +/// ones it found and the art (`art`, from [`art_key`]) is the art it measured. +pub(super) fn optimized_result<'a>(d: &'a Dialog, s: Option<&WebSettings>, art: &str) -> Option<&'a Value> { + d.fields.get("__optimized").filter(|r| r["art"] == json!(art) && s.is_some_and(|s| r["settings"] == s.to_json())) +} + +/// The active document, its revision and its selected objects and slices, which an Optimize to File +/// Size result was measured on. The selection decides the slices Save writes with `slices: selected` +/// and the slice Current Slice measures, and a selection made on the canvas or with the Slice +/// Selection tool leaves the revision as it is. +pub(super) fn art_key(app: &VectorcraftApp) -> String { + app.session.active().map_or_else(String::new, |st| format!("{}:{}:{:?}:{:?}", st.uid, st.revision, st.selection.objects, st.selection.slices)) +} + +/// `bytes` in K, rounded up to the Desired File Size field's 0.001 K so the size it asks for holds +/// them. The product is taken in `u128`, which holds any `usize` times 1000 on every target. +pub(super) fn size_k(bytes: usize) -> f64 { + (bytes as u128 * 1000).div_ceil(1024).max(1) as f64 / 1000.0 +} + +/// Optimize to File Size… (`__optimizeOpen`): opens the rows with Current Settings and Total of All +/// Slices, the desired size starting at the size the current settings give what that Use measures: +/// the image slices' files together when there are slices, else the preview's file (32 K when it +/// cannot be measured). +fn open_optimize_rows(app: &mut VectorcraftApp, ui: &egui::Ui, d: &mut Dialog) { + let bytes = if d.bool("__hasSlices") { + let mut p = params(d); + if let Some(o) = p.as_object_mut() { + o.insert("desiredK".into(), json!(webexport::MAX_DESIRED_K)); + o.insert("use".into(), json!("allSlices")); + } + let r = app.run("webExport.optimizeToFileSize", p).ok(); + r.filter(|r| r["achieved"] == json!(true)).and_then(|r| r["bytes"].as_u64()).map(|b| b as usize) + } else { + settings_of(app, d).ok().and_then(|s| previewed_bytes(app, ui, &s)) + }; + let k = bytes.map_or(32.0, size_k); + d.fields.insert("__optimizeK".into(), json!(k)); + d.fields.insert("__optimizeStart".into(), json!("current")); + d.fields.insert("__optimizeUse".into(), json!("allSlices")); +} + +/// Optimize to File Size's OK: `webExport.optimizeToFileSize` with the dialog's settings and the +/// rows' values; the settings it finds replace the dialog's, the rows close and `__optimized` +/// keeps the result. An error leaves the settings and the rows as they are. +pub(super) fn optimize_to_size(app: &mut VectorcraftApp, d: &mut Dialog) -> Result { + let mut p = params(d); + if let Some(o) = p.as_object_mut() { + o.insert("desiredK".into(), d.fields.get("__optimizeK").cloned().unwrap_or(Value::Null)); + let start = d.str("__optimizeStart"); + if !start.is_empty() { + o.insert("startWith".into(), json!(start)); + } + let scope = d.str("__optimizeUse"); + if d.bool("__hasSlices") && !scope.is_empty() { + o.insert("use".into(), json!(scope)); + } + } + let r = app.run("webExport.optimizeToFileSize", p)?; + if let Some(found) = r["settings"].as_object() { + d.fields.extend(found.clone()); + } + for k in OPTIMIZE_FIELDS { + d.fields.remove(k); + } + let result = + json!({ "settings": r["settings"], "bytes": r["bytes"], "targetBytes": r["targetBytes"], "achieved": r["achieved"], "art": art_key(app) }); + d.fields.insert("__optimized".into(), result); + Ok(r) +} + /// Two checkboxes side by side. fn check_pair(ui: &mut egui::Ui, d: &mut Dialog, (a, a_label): (&str, &str), (b, b_label): (&str, &str)) { widgets::label_row(ui, "", LABEL_W, |ui| { diff --git a/crates/ui-egui/src/dialogs/save_pdf.rs b/crates/ui-egui/src/dialogs/save_pdf.rs index 9a4cbfa364..af047a4cc2 100644 --- a/crates/ui-egui/src/dialogs/save_pdf.rs +++ b/crates/ui-egui/src/dialogs/save_pdf.rs @@ -761,7 +761,18 @@ fn advanced(app: &VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) { } }); }); - if !flat { + if flat { + let name = get(d, "flattenerPreset").as_str().map(str::trim).filter(|n| !n.is_empty()).unwrap_or(pdf::DEFAULT_FLATTENER); + let preset_opts = FlattenOptions::for_export(Some(name), d.fields.get("flattener"), &app.session.prefs.flattener_presets).unwrap_or_default(); + let line_ppi = preset_opts.line_art_ppi.round() as u32; + let grad_ppi = preset_opts.gradient_ppi.round() as u32; + note( + ui, + &crate::i18n::fmt( + tl!("Raster resolution: {line_ppi} ppi line art and text, {grad_ppi} ppi gradient and mesh"), + &[("line_ppi", &line_ppi.to_string()), ("grad_ppi", &grad_ppi.to_string())], + ), + ); note(ui, tl!("PDF 1.3 files have no transparency: the preset flattens it.")); } } diff --git a/crates/ui-egui/src/dialogs/save_pdf/tests.rs b/crates/ui-egui/src/dialogs/save_pdf/tests.rs index 656d88b870..91442f111c 100644 --- a/crates/ui-egui/src/dialogs/save_pdf/tests.rs +++ b/crates/ui-egui/src/dialogs/save_pdf/tests.rs @@ -607,3 +607,63 @@ fn pdf_1_3_takes_a_flattener_preset_in_advanced() { let saved = app.session.prefs.pdf_presets.iter().find(|p| p.name == "Old").unwrap(); assert_eq!((saved.settings.compatibility, saved.settings.flattener_preset.as_str()), (Compatibility::Pdf13, "Low Resolution")); } + +#[test] +fn save_pdf_flattens_transparent_document_without_modal_prompt() { + let (mut app, written, _) = app(); + // Add transparent artwork to the document + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/transparent.pdf", "compatibility": "1.3"})).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().kind, KIND); + + // Clicking Save PDF goes ahead without stopping at a confirmation prompt + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none(), "Save PDF closes without a modal prompt"); + assert_eq!(written.borrow().len(), 1); + assert!(written.borrow()[0].1.starts_with(b"%PDF-1.3")); +} + +#[test] +fn summary_warnings_include_flattener_resolutions_when_flattening_transparency() { + let (mut app, _, _) = app(); + app.run("transparency.set", json!({"opacity": 50})).unwrap(); + + app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf", "compatibility": "1.3"})).unwrap(); + let p = params(app.ui.dialog.as_ref().unwrap()); + let v = summary_of(&mut app, &egui::Context::default(), &p).unwrap(); + let warnings = v["warnings"].as_array().unwrap(); + assert!( + warnings.iter().any(|w| { + let s = w.as_str().unwrap(); + s.contains("transparency is flattened into opaque art and images") + && s.contains("at 1200 ppi line art and text, 300 ppi gradients and meshes") + }), + "{warnings:?}" + ); + + // With a custom flattener override, the resolution in the warning reflects the options + set_field(&mut app, "flattener.lineArtPpi", json!(600)); + set_field(&mut app, "flattener.gradientPpi", json!(200)); + let p2 = params(app.ui.dialog.as_ref().unwrap()); + let v2 = summary_of(&mut app, &egui::Context::default(), &p2).unwrap(); + let warnings2 = v2["warnings"].as_array().unwrap(); + assert!( + warnings2.iter().any(|w| { + let s = w.as_str().unwrap(); + s.contains("at 600 ppi line art and text, 200 ppi gradients and meshes") + }), + "{warnings2:?}" + ); +} + +#[test] +fn advanced_section_shows_raster_resolution_note() { + let (mut app, _, _) = app(); + app.run("ui.savePdfDialog", json!({"path": "/tmp/out.pdf", "compatibility": "1.3"})).unwrap(); + set_field(&mut app, "__section", json!("Advanced")); + set_field(&mut app, "flattener.lineArtPpi", json!(600)); + set_field(&mut app, "flattener.gradientPpi", json!(200)); + frame(&mut app); + assert!(app.ui.dialog.is_some()); +} diff --git a/crates/ui-egui/src/dialogs/tests_print.rs b/crates/ui-egui/src/dialogs/tests_print.rs index f1baabc1b9..cad38bb984 100644 --- a/crates/ui-egui/src/dialogs/tests_print.rs +++ b/crates/ui-egui/src/dialogs/tests_print.rs @@ -422,6 +422,54 @@ fn a_scale_set_through_the_dialog_keeps_the_percentage_it_changes() { assert_eq!(saved["scale"], json!({"width": 250.0, "height": 250.0, "linked": true})); } +/// An accessibility action on the node `target_node`. +fn request(action: egui::accesskit::Action, target_node: egui::accesskit::NodeId) -> egui::Event { + use egui::accesskit::{ActionRequest, TreeId}; + egui::Event::AccessKitActionRequest(ActionRequest { action, target_node, target_tree: TreeId::ROOT, data: None }) +} + +/// Type `typed` into Scale W, which shows `shown` (the first field that does, before H), and Tab out. +fn type_w(screen: &mut Screen, app: &mut VectorcraftApp, shown: &str, typed: &str) { + let key = |key, modifiers| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers }; + screen.run(app, vec![]); + let out = screen.run(app, vec![]); + let nodes = &out.platform_output.accesskit_update.as_ref().expect("an accessibility tree").nodes; + let w = nodes.iter().find(|(_, n)| n.role() == egui::accesskit::Role::TextInput && n.value().is_some_and(|v| v.starts_with(shown))); + screen.run(app, vec![request(egui::accesskit::Action::Focus, w.expect("the Scale W field").0)]); + screen.run(app, vec![key(egui::Key::A, egui::Modifiers::COMMAND), egui::Event::Text(typed.into())]); + screen.run(app, vec![key(egui::Key::Tab, egui::Modifiers::NONE)]); +} + +#[test] +fn a_scale_set_after_a_typed_percentage_follows_the_link() { + let (mut app, _) = app(); + app.run("file.print", json!({})).unwrap(); + let mut screen = Screen::new(); + set(&mut app, "scaling", json!("custom")); + dialog(&mut app).fields["scale"]["width"] = json!(40); + screen.run(&mut app, vec![]); + assert_eq!(scale(&mut app), (40.0, 40.0, true)); + // W typed with the link on sets H as well. + type_w(&mut screen, &mut app, "40", "60"); + assert_eq!(scale(&mut app), (60.0, 60.0, true)); + // A new H set before the next frame: W follows it, and Done saves both. + dialog(&mut app).fields["scale"]["height"] = json!(50); + set(&mut app, "discard", json!(true)); + super::confirm(&mut app).unwrap(); + let saved = app.session.active().unwrap().doc.print_setup.clone().unwrap(); + assert_eq!(saved["scale"], json!({"width": 50.0, "height": 50.0, "linked": true})); + // W typed with the link off changes W alone; turning the link on then sets H to W. + app.run("file.print", json!({})).unwrap(); + let (link, _, _) = screen.link(&mut app); + screen.run(&mut app, vec![request(egui::accesskit::Action::Click, link)]); + assert_eq!(scale(&mut app), (50.0, 50.0, false)); + type_w(&mut screen, &mut app, "50", "70"); + assert_eq!(scale(&mut app), (70.0, 50.0, false)); + screen.run(&mut app, vec![request(egui::accesskit::Action::Click, link)]); + screen.run(&mut app, vec![]); + assert_eq!(scale(&mut app), (70.0, 70.0, true)); +} + #[test] fn the_dimmed_scale_link_ignores_the_keyboard() { use egui::accesskit::{Action, ActionRequest, TreeId}; @@ -440,3 +488,43 @@ fn the_dimmed_scale_link_ignores_the_keyboard() { screen.run(&mut app, vec![]); assert_eq!(scale(&mut app), (100.0, 100.0, true)); } + +/// The node screen readers call `label` with role `role`, and whether it is dimmed. +fn node(screen: &mut Screen, app: &mut VectorcraftApp, label: &str, role: egui::accesskit::Role) -> Option<(egui::accesskit::NodeId, bool)> { + screen.run(app, vec![]); + let out = screen.run(app, vec![]); + let nodes = &out.platform_output.accesskit_update.as_ref().expect("an accessibility tree").nodes; + nodes.iter().find(|(_, n)| n.label() == Some(label) && n.role() == role).map(|(id, n)| (*id, n.is_disabled())) +} + +#[test] +fn a_spot_inks_icon_converts_it_to_process_and_back() { + use egui::accesskit::{Action, ActionRequest, Role, TreeId}; + let (mut app, _) = app(); + app.run("swatch.new", json!({"name": "Gold", "color": {"model": "cmyk", "c": 0, "m": 0.2, "y": 0.8, "k": 0.1}, "spot": true})).unwrap(); + app.run("file.print", json!({})).unwrap(); + set(&mut app, "__section", json!("Output")); + set(&mut app, "output", json!({"mode": "separations"})); + let mut screen = Screen::new(); + let click = |target_node| { + egui::Event::AccessKitActionRequest(ActionRequest { action: Action::Click, target_node, target_tree: TreeId::ROOT, data: None }) + }; + // Only the spot ink has the icon. + assert!(node(&mut screen, &mut app, "Convert Cyan to process", Role::Button).is_none()); + let (convert, dimmed) = node(&mut screen, &mut app, "Convert Gold to process", Role::Button).expect("Gold's icon"); + assert!(!dimmed); + assert_eq!(node(&mut screen, &mut app, "Gold", Role::CheckBox).map(|n| n.1), Some(false)); + screen.run(&mut app, vec![click(convert)]); + assert_eq!(dialog(&mut app).fields["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": true}])); + // Converted, it has no plate: its Print box is dimmed, and the icon turns it back. + assert_eq!(node(&mut screen, &mut app, "Gold", Role::CheckBox).map(|n| n.1), Some(true)); + let (keep, _) = node(&mut screen, &mut app, "Keep Gold as spot", Role::Button).expect("the process icon"); + screen.run(&mut app, vec![click(keep)]); + assert_eq!(dialog(&mut app).fields["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": false}])); + // Convert All Spot Colors to Process converts it and dims the icon, keeping its own choice. + dialog(&mut app).fields["output"]["spotsToProcess"] = json!(true); + let (keep, dimmed) = node(&mut screen, &mut app, "Keep Gold as spot", Role::Button).expect("the process icon"); + assert!(dimmed); + screen.run(&mut app, vec![click(keep)]); + assert_eq!(dialog(&mut app).fields["output"]["inks"], json!([{"name": "Gold", "print": true, "convertToProcess": false}])); +} diff --git a/crates/ui-egui/src/dialogs/tests_save_for_web.rs b/crates/ui-egui/src/dialogs/tests_save_for_web.rs index 9e92f57cdc..17c565e454 100644 --- a/crates/ui-egui/src/dialogs/tests_save_for_web.rs +++ b/crates/ui-egui/src/dialogs/tests_save_for_web.rs @@ -726,3 +726,192 @@ fn colour_table_buttons_edit_the_lists() { save_for_web::set_table(&mut d, "sort", json!("hue")); assert_eq!(d.fields["colorTable"], json!({"locked": [], "webShift": ["#123456"], "sort": "hue"})); } + +#[test] +fn optimize_to_file_size_takes_the_settings_that_fit() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize"); + let (mut app, _) = app(&dir, false); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("jpg")); + set(&mut app, "quality", json!(100)); + frame(&mut app); + let full = app.session.execute("document.exportForWeb.preview", &json!({"format": "jpg", "quality": 100})).unwrap()["bytes"].as_u64().unwrap(); + let field = |app: &VectorcraftApp, k: &str| app.ui.dialog.as_ref().unwrap().fields.get(k).cloned(); + // A size of 0 is refused: the settings and the rows stay. + set(&mut app, "__optimizeK", json!(0)); + set(&mut app, "__optimizeStart", json!("current")); + set(&mut app, "__optimizeGo", json!(true)); + frame(&mut app); + assert_eq!(field(&app, "quality"), Some(json!(100))); + assert_eq!(field(&app, "__optimizeK"), Some(json!(0))); + assert_eq!((field(&app, "__optimized"), field(&app, "__optimizeGo")), (None, None)); + // OK takes the settings found and closes the rows. + set(&mut app, "__optimizeK", json!(full as f64 * 0.8 / 1024.0)); + set(&mut app, "__optimizeGo", json!(true)); + frame(&mut app); + let found = field(&app, "__optimized").unwrap(); + assert_eq!(found["achieved"], json!(true), "{found}"); + let quality = field(&app, "quality").unwrap().as_u64().unwrap(); + assert!(quality < 100, "{found}"); + assert_eq!(field(&app, "__optimizeK"), None); + // The result holds for the settings found on the art it measured. + let settings = app.session.web_settings(&found["settings"]).unwrap(); + let shown = |app: &VectorcraftApp| { + save_for_web::optimized_result(app.ui.dialog.as_ref().unwrap(), Some(&settings), &save_for_web::art_key(app)).is_some() + }; + assert!(shown(&app)); + // The result line draws, and Save writes the size found. + frame(&mut app); + let r = confirm(&mut app).unwrap(); + let written = std::fs::read(r["path"].as_str().unwrap()).unwrap(); + assert_eq!(written.len() as u64, found["bytes"].as_u64().unwrap()); + assert!(written.len() as u64 <= found["targetBytes"].as_u64().unwrap()); + assert_eq!(app.session.last_web_settings().quality as u64, quality); + // A change to the art drops the result. + app.run("file.saveForWeb", json!({})).unwrap(); + app.ui.dialog.as_mut().unwrap().fields.insert("__optimized".into(), found.clone()); + assert!(shown(&app)); + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 5, "height": 5})).unwrap(); + assert!(!shown(&app)); + // So does a change to the selection, which decides the slices Save writes with `slices: selected`, + // also one that leaves the revision as it is (a click on the canvas). + let mut current = found.clone(); + current["art"] = json!(save_for_web::art_key(&app)); + app.ui.dialog.as_mut().unwrap().fields.insert("__optimized".into(), current); + assert!(shown(&app)); + let st = app.session.active_mut().unwrap(); + assert!(!st.selection.objects.is_empty()); + st.selection.objects.clear(); + assert!(!shown(&app)); + // And a change to the selected slices alone (the Slice Selection tool). + let mut current = found.clone(); + current["art"] = json!(save_for_web::art_key(&app)); + app.ui.dialog.as_mut().unwrap().fields.insert("__optimized".into(), current); + assert!(shown(&app)); + let st = app.session.active_mut().unwrap(); + let any = st.doc.layers[0].id; + st.selection.slices.push(any); + assert!(!shown(&app)); +} + +/// Enter while the Optimize to File Size rows are open runs the search and writes nothing; once the +/// search has closed the rows, Enter saves with the settings it found. +#[test] +fn enter_in_the_optimize_rows_runs_the_search_and_saves_nothing() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize-enter"); + let (mut app, _) = app(&dir, false); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("jpg")); + set(&mut app, "quality", json!(100)); + frame(&mut app); + let full = app.session.execute("document.exportForWeb.preview", &json!({"format": "jpg", "quality": 100})).unwrap()["bytes"].as_u64().unwrap(); + set(&mut app, "__optimizeK", json!(full as f64 * 0.8 / 1024.0)); + set(&mut app, "__optimizeStart", json!("current")); + let files = |dir: &std::path::Path| std::fs::read_dir(dir).map_or(0, |r| r.count()); + let enter_with = |app: &mut VectorcraftApp, modifiers: egui::Modifiers| { + let key = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers }; + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let mut out = ctx.run_ui(egui::RawInput { events: vec![key], ..Default::default() }, |ui| show(app, ui.ctx())); + out.textures_delta.clear(); + }; + let enter = |app: &mut VectorcraftApp| enter_with(app, egui::Modifiers::NONE); + // Ctrl+Enter, which the size field does not commit, neither searches nor saves. + enter_with(&mut app, egui::Modifiers::CTRL); + frame(&mut app); + assert_eq!(kind(&app), Some(save_for_web::KIND), "Ctrl+Enter in the rows does not save"); + assert!(app.ui.dialog.as_ref().unwrap().fields.contains_key("__optimizeK"), "the rows stay open"); + assert!(!app.ui.dialog.as_ref().unwrap().fields.contains_key("__optimized")); + assert_eq!(files(&dir), 0); + enter(&mut app); + assert_eq!(kind(&app), Some(save_for_web::KIND), "Enter in the rows does not save"); + assert_eq!(files(&dir), 0); + frame(&mut app); + let d = app.ui.dialog.as_ref().unwrap(); + let found = d.fields.get("__optimized").cloned().unwrap(); + assert_eq!(found["achieved"], json!(true), "{found}"); + assert!(!d.fields.contains_key("__optimizeK"), "the search closed the rows"); + enter(&mut app); + assert!(app.ui.dialog.is_none()); + assert_eq!(files(&dir), 1); +} + +/// An Enter in the Optimize to File Size rows runs no search when a field of the dialog, one drawn +/// after the rows included, refused the value typed in it on that press, or when a control drawn +/// after the rows (an open dropdown) took the press. +#[test] +fn enter_in_the_optimize_rows_runs_nothing_when_a_later_control_refused_or_took_it() { + // `before` stands for the controls drawn after the rows, which act on the press first. + let go = |before: fn(&egui::Context)| { + let mut d = Dialog::new(save_for_web::KIND, json!({"__optimizeK": 10})); + let key = egui::Event::Key { key: egui::Key::Enter, physical_key: None, pressed: true, repeat: false, modifiers: Default::default() }; + let ctx = egui::Context::default(); + let mut out = ctx.run_ui(egui::RawInput { events: vec![key], ..Default::default() }, |ui| { + before(ui.ctx()); + save_for_web::optimize_on_enter(ui.ctx(), &mut d); + }); + out.textures_delta.clear(); + assert!(d.fields.contains_key("__optimizeK"), "the rows stay open"); + d.fields.contains_key("__optimizeGo") + }; + assert!(go(|_| {}), "a plain Enter runs the search"); + assert!(!go(crate::widgets::reject_dialog_commit), "a refused value runs nothing"); + assert!(!go(|ctx| ctx.input_mut(|i| _ = i.consume_key(egui::Modifiers::NONE, egui::Key::Enter))), "a taken press runs nothing"); +} + +#[test] +fn optimize_to_file_size_starts_at_the_size_of_the_slices_files() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize-slices"); + let (mut app, _) = app(&dir, false); + app.run("object.slice.create", json!({"x": 0, "y": 0, "width": 30, "height": 20})).unwrap(); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("png24")); + frame(&mut app); + let slices = app.session.execute("webExport.optimizeToFileSize", &json!({"format": "png24", "desiredK": 1048576})).unwrap(); + let whole = app.session.execute("document.exportForWeb.preview", &json!({"format": "png24"})).unwrap()["bytes"].as_u64().unwrap(); + let k = |b: u64| json!(save_for_web::size_k(b as usize)); + assert_ne!(k(slices["bytes"].as_u64().unwrap()), k(whole), "{slices}"); + // The size asked for holds the files measured. + let b = slices["bytes"].as_u64().unwrap(); + assert!((save_for_web::size_k(b as usize) * 1024.0).floor() as u64 >= b); + set(&mut app, "__optimizeOpen", json!(true)); + frame(&mut app); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!(d.fields.get("__optimizeK"), Some(&k(slices["bytes"].as_u64().unwrap()))); + assert_eq!((d.fields.get("__optimizeUse"), d.fields.get("__optimizeOpen")), (Some(&json!("allSlices")), None)); +} + +#[test] +fn optimize_to_file_size_starts_at_the_size_of_the_art_as_it_is_now() { + let dir = vectorcraft_testkit::temp_dir("sfw-optimize-revision"); + let (mut app, _) = app(&dir, false); + // One context for every frame, so the preview cache of the first frame is still there. + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + let frame = |app: &mut VectorcraftApp| ctx.run_ui(Default::default(), |ui| show(app, ui.ctx())).textures_delta.clear(); + app.run("file.saveForWeb", json!({})).unwrap(); + set(&mut app, "format", json!("png24")); + frame(&mut app); + let bytes = |app: &mut VectorcraftApp| { + app.session.execute("document.exportForWeb.preview", &json!({"format": "png24"})).unwrap()["bytes"].as_u64().unwrap() + }; + let before = bytes(&mut app); + // The art changes after the preview drew and before the button's click is handled. + app.run("shape.rectangle", json!({"x": 0, "y": 0, "width": 60, "height": 40})).unwrap(); + app.run("paint.setFill", json!({"color": "#3366ff"})).unwrap(); + let after = bytes(&mut app); + assert_ne!(save_for_web::size_k(before as usize), save_for_web::size_k(after as usize)); + set(&mut app, "__optimizeOpen", json!(true)); + frame(&mut app); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!(d.fields.get("__optimizeK"), Some(&json!(save_for_web::size_k(after as usize)))); +} + +#[test] +fn size_in_k_holds_sizes_past_4_mib_on_every_target() { + assert_eq!(save_for_web::size_k(5 * 1024 * 1024), 5120.0); + assert_eq!(save_for_web::size_k(0), 0.001); + assert_eq!(save_for_web::size_k(1), 0.001); + // The largest size a target can hold still rounds up to a size that holds it. + assert!(save_for_web::size_k(usize::MAX) * 1024.0 >= usize::MAX as f64 * 0.999); +} diff --git a/crates/ui-egui/src/i18n.rs b/crates/ui-egui/src/i18n.rs index d54ea0178a..24578b18b2 100644 --- a/crates/ui-egui/src/i18n.rs +++ b/crates/ui-egui/src/i18n.rs @@ -683,8 +683,10 @@ const MESSAGE_DEPTH: usize = 5; /// parts of them (file names, numbers, a reason with no entry, a JSON object or array such as /// `{"objects": [...]}`, a value the message quotes in `"…"`, `“…”`, `'…'` or backticks, such as a /// symbol's or a script property's name, and an `{ident}` placeholder's value, a script identifier), -/// stay as they are. A part that starts with `{` is translated only when it is a whole message with -/// an exact entry. A part that starts with `[` is translated when it has an exact entry, such as +/// stay as they are. A `{to}` placeholder's value that is not quoted, a printer's name such as +/// `Office Laser (Floor 2)`, is translated only when it has an exact entry, such as +/// `the default printer`. A part that starts with `{` is translated only when it is a whole message +/// with an exact entry. A part that starts with `[` is translated when it has an exact entry, such as /// `[x, y] (two numbers)`, or when it fits a template that starts with `[` and an index of digits, /// such as an effect's refusal ``[0] `id`: {why}``. pub fn message(lang: Lang, s: &str) -> String { @@ -727,6 +729,7 @@ fn fill_message(lang: Lang, s: &str, found: Option<(&[String], catalog::Captures (Some((tool, _)), "_1") => (k, tool.clone()), (Some((_, kinds)), "_2") => (k, kinds.clone()), (_, "ident") => (k, v.to_string()), + (_, "to") if !quoted(v) => (k, exact_translation(lang.catalog(), v).unwrap_or_else(|| v.to_string())), _ => (k, nested(v)), }) .collect(); diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index f5c3d81538..bb039bb08e 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -603,6 +603,8 @@ font-technology Variable Променливи Control Контрол Convert Конвертиране Convert All Spot Colors to Process Конвертиране на всички спот цветове в трихромни + Convert {name} to process Конвертиране на {name} в трихромен + Keep {name} as spot Запазване на {name} като спот Convert All Strokes to Outlines Конвертиране на всички щрихове в контури Convert All Text to Outlines Конвертиране на целия текст в контури Convert Anchor Point Преобразуване на опорна точка @@ -671,6 +673,9 @@ font-technology Variable Променливи Create from Selection Създаване от селекцията Create From: Създаване от: Create Gradient Mesh… Създаване на градиентна мрежа… + Flat Плоско + To Center Към центъра + To Edge Към ръба Create Graph Създаване на диаграма Create New Layer Създаване на нов слой Create New Sublayer Създаване на нов подслой @@ -2632,6 +2637,18 @@ font-technology Variable Променливи Preview: Преглед: Preview All Layers Преглед на всички слоеве Preview in Browser Преглед в браузър + Optimize to File Size… Оптимизиране до размер на файла… + Optimize to File Size Оптимизиране до размер на файла + Desired File Size: Желан размер на файла: + Start With: Начало с: + Use: Използване: + Current Settings Текущи настройки + Auto Select GIF/JPEG Автоматичен избор на GIF/JPEG + Total of All Slices Общо за всички откъси + Each Slice Всеки откъс + Current Slice Текущ откъс + {size}, within {target} {size}, в рамките на {target} + No setting tried fits in {target}; the smallest is {size} Никоя изпробвана настройка не се побира в {target}; най-малкият размер е {size} Preview in Browser needs the desktop app (the web downloads files instead) Прегледът в браузър изисква настолното приложение (уеб версията изтегля файловете вместо това) Preview Mode Режим на преглед Preview the document as it is now Преглед на документа в текущия му вид @@ -3008,12 +3025,53 @@ digits Malayalam Малаялам With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Когато е избран един екземпляр на символ, панелът „Трансформиране“ използва регистрационната точка на символа като опорна точка. Darkens the canvas outside the artboards while the Artboard tool is active. Затъмнява платното извън работните области, докато инструментът „Работна област“ е активен. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Когато „Затъмняване на областта извън работната област“ е включено, областта извън работните области остава тъмна, докато влачите с инструмента „Работна област“. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Колко близо в пиксели трябва да е показалецът до обект, опорна точка или дръжка, за да го избере щракване. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Дали рамката на инструмента „Селекция“ избира докоснатите обекти или само изцяло обхванатите; „Посока на плъзгане“ избира обхванатите при плъзгане надясно. E обръща правилото по време на плъзгане. + A click selects a filled object only on its path, not inside its fill. Щракване избира запълнен обект само по контура му, а не в запълването. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Колко близо в пиксели трябва да стигне точка до опорна точка или водач от линийката, за да я прилепи „Прилепване към точка“; при включени интелигентни водачи важи техният толеранс на прилепване. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. С инструмента „Селекция“ Cmd/Ctrl-щракване избира обекта под избрания при показалеца; всяко следващо щракване слиза с един обект по-надолу. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. „Увеличаване“ и „Намаляване“ поставят центъра на селекцията в средата на изгледа. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Заключените и скритите обекти в работна област се местят, мащабират и копират с нея като останалите обекти. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Размерът на опорните точки и краищата на дръжките за посока върху платното; по-големите опорни точки се хващат и от по-далеч. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Рисува краищата на дръжките за посока като плътни точки, кухи точки или по-големи плътни точки. + With the Direct Selection tool, the anchor under the pointer is highlighted. С инструмента „Директен избор“ опорната точка под показалеца се осветява. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Показва дръжките за посока, когато са избрани повече от една опорна точка; ако е изключено, те се виждат само при една избрана опорна точка. + Corner widgets hide on corners whose angle is greater than this many degrees. Приспособленията за ъгли се скриват при ъгли, по-големи от толкова градуса. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Инструментът „Перо“ показва следващия сегмент от последната опорна точка до показалеца, преди да щракнете. + The Curvature tool previews the curve to the pointer before you place the next point. Инструментът „Кривина“ показва кривата до показалеца, преди да поставите следващата точка. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Единицата за новите документи от вградените размери, освен тези в пиксели, и за отворените файлове без записана единица; ако я изберете тук и натиснете ОК, тя става и единица на активния документ. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Дебелините на щрихите, тиретата и междините се показват в тази единица и въведените за тях числа се четат в нея. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Размерите на текста, междуредието и отстъпът на базовата линия се показват в тази единица и въведените за тях числа се четат в нея. The unit for East Asian type measurements, which no field uses yet. Единицата за мерките на източноазиатски текст, която засега не се използва от нито едно поле. When on, a number typed without a unit into a field in picas is read in points. Когато е включено, число, въведено без единица в поле в пики, се чете в точки. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. При XML ID имената на обектите се показват като XML ID в Слоеве, Променливи и Опции за слоя. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Прилепва рисуването, преместването и мащабирането към подразделенията на мрежата, дори когато мрежата е скрита; докато е включено, „Прилепване към пиксел“ не действа. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Цветът на водачите, които не са избрани; работна област с „Етикет на водачите“ рисува своите водачи в цвета на етикета. + Draws guides as solid lines or as dots, including the guides already in the document. Рисува водачите като плътни линии или като точки, включително водачите, които вече са в документа. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Когато е включено, водачите са заключени при стартиране на VectorCraft; промяната на опцията веднага ги заключва или отключва, а „Изглед › Водачи › Заключване на водачите“ продължава да променя заключването. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Когато е включено, задържането на Cmd/Ctrl в началото на плъзгане от линийка създава водач само в активната работна област, а с инструмента „Работна област“ създава водач за цялото платно. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Цветът на мрежата; линиите между основните линии на мрежата се рисуват в по-блед нюанс на този цвят. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Рисува мрежата като линии или като точки по основните линии на мрежата при всяко подразделение. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Разстоянието между основните линии на мрежата във всеки отворен документ и в новите; документ на VectorCraft се отваря с мрежата, с която е записан. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. На колко части се дели всеки основен квадрат на мрежата; „Прилепване към мрежа“ прилепва към тези части, дори когато мащабът скрива линиите им. + Draws the grid behind the artwork; off, the grid is drawn over it. Рисува мрежата зад графиката; когато е изключено, мрежата се рисува върху нея. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. В „Пикселен преглед“ при увеличение 600% или повече активният изглед показва линия по ръба на всеки пиксел на документа върху графиката. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Цветът на ръба на плочката и на пунктирните граници на образеца, които се показват, докато редактирате мостра. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Прилепва рисуването, преместването и трансформирането към близки обекти и показва водачи и етикети; „Пикселен преглед“ ги изключва, а „Прилепване към мрежа“ прилепва към мрежата вместо тях. + The color of Smart Guide lines and labels. Цветът на линиите и етикетите на интелигентните водачи. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Показва линия по ръба или центъра, с който обектите се подравняват; когато е изключено, те пак се подравняват без линията, а „Прилепване към глиф“ не действа. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. С инструмент за селекция очертава неселектирания обект под показалеца в цвета на неговия слой, докато не влачите. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Показва размера или ъгъла до показалеца, докато мащабирате, завъртате, срязвате или отразявате обекти. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Докато рисувате, точките прилепват към линии под избраните ъгли през точката, от която започва сегментът или фигурата. + The set of angles the construction guides follow while Construction Guides is on. Наборът ъгли, които конструкционните водачи следват, докато „Конструкционни водачи“ е включено. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Назовава към какво прилепва точката, например опорна точка, път или подравняване; когато е изключено, точките прилепват по същия начин без имената. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Показва до показалеца разстояния, ъгли и колко е преместен обектът, докато рисувате или премествате. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Прилепва преместени или преоразмерени обекти към същата междина като между близките обекти и отбелязва равните междини. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. При избран обект задържането на Alt/Option над друг обект или работна област показва разстоянията между него и селекцията. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Селекция, върната с влачене в рамките на толеранса на прилепване от мястото, където е започнало влаченето, се връща точно там; копие не се връща. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Колко близо на екрана показалецът или влачена точка трябва да стигне до обект, за да прилепнат интелигентните водачи; разстоянието е еднакво при всеки мащаб. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Прилепва края на линеен сегмент или окръжност, начертана от центъра си, така че да докосва близка крива. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Прилепва края на линеен сегмент така, че да среща близък прав сегмент под прав ъгъл. Reset all preferences to their defaults? Да се нулират ли всички настройки до стойностите по подразбиране? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Стойностите по подразбиране се прилагат, когато щракнете върху ОК в Настройки. Отказ там запазва текущите ви настройки. Restore Recovered Documents Възстановяване на възстановените документи @@ -4373,6 +4431,11 @@ axis Both И двете @msg PDF writer error: {0} Грешка на PDF записа: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Пакетиран е {n} файл в {folder} ({note})|Пакетирани са {n} файла в {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Прегледът в браузър изисква настолното приложение (уеб версията изтегля файловете вместо това) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 задайте `desiredK`, желания размер на файла в K (1024 байта): число над 0 и най-много 1048576 +@msg `startWith` is `current` or `auto` `startWith` е `current` или `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` е `allSlices`, `eachSlice` или `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` е номер на откъс от `slice.list`, заедно с `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Оптимизиране до размер на файла: няма изображение за измерване @msg Release Guides: no guides Освобождаване на водачи: няма водачи @msg Release: no layer to put the rectangle in Освобождаване: няма слой, в който да се постави правоъгълникът @msg Replace Spine: select a blend and a path Замяна на оста: изберете плавно преливане и път @@ -5407,6 +5470,19 @@ lighting Light Светлина Transform Objects Трансформиране на обекти @msg unknown parameter `{key}`; did you mean `{near}`? неизвестен параметър `{key}`; имахте ли предвид `{near}`? @msg unknown parameter `{key}`; the command takes no parameters неизвестен параметър `{key}`; командата не приема параметри +@msg unknown parameter `{key}`; `{object}` takes: {keys} неизвестен параметър `{key}`; `{object}` приема: {keys} +@msg unknown parameter `{key}`; {why_not} неизвестен параметър `{key}`; {why_not} +@msg no format takes it (see document.formats) никой формат не го приема (вижте document.formats) +@msg no save format takes it (see file.formatOptions) никой формат за записване не го приема (вижте file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF не го приема (вижте document.formats) +@msg EPS doesn't take it (see document.formats) EPS не го приема (вижте document.formats) +@msg DXF doesn't take it (see document.formats) DXF не го приема (вижте document.formats) +@msg {name} must be {range} (got {v}) {name} трябва да бъде {range} (получено {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Първият опит на графичния процесор да покаже прозореца не успя, затова VectorCraft стартира отново на {summary} (Настройки › Производителност › Графичен процесор › Автоматично използва този, който управлява вашия дисплей) +@msg Sent “{title}” to {to} “{title}” е изпратено към {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” е изпратено към {to}. Отговор на опашката за печат: {note} +@msg the default printer принтера по подразбиране +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap растерни ефекти върху обект {object}: поискани {requested} ppi, постигнати {achieved} ppi заради ограничението от 64 милиона пиксела @msg unknown parameter `{key}`; the command takes: {keys} неизвестен параметър `{key}`; командата приема: {keys} 1 Layer 1 слой 1 bit 1 бит diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 3eb20cef41..99f23d313c 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -218,6 +218,9 @@ Mask Maska Rasterize… Rasteriziraj… Create Gradient Mesh… Kreiraj gradijentnu mrežu… + Flat Ravno + To Center Prema sredini + To Edge Prema ivici Create Object Mosaic… Kreiraj mozaik objekata… Vector Halftone… Vektorski polutonovi… Create Trim Marks Kreiraj oznake za obrezivanje @@ -1167,6 +1170,18 @@ lighting Light Svjetlo Placement Options… Opcije postavljanja… Plug-in… Dodatak… Preview in Browser Pregledaj u pregledniku + Optimize to File Size… Optimiziraj na veličinu datoteke… + Optimize to File Size Optimiziraj na veličinu datoteke + Desired File Size: Željena veličina datoteke: + Start With: Počni sa: + Use: Koristi: + Current Settings Trenutne postavke + Auto Select GIF/JPEG Automatski odaberi GIF/JPEG + Total of All Slices Ukupno svih isječaka + Each Slice Svaki isječak + Current Slice Trenutni isječak + {size}, within {target} {size}, unutar {target} + No setting tried fits in {target}; the smallest is {size} Nijedna isprobana postavka ne stane u {target}; najmanja je {size} Printer Setup… Podešavanje štampača… Printers Štampači Recent File Nedavna datoteka @@ -2841,6 +2856,8 @@ digits Malayalam Malajalam Collate Složi po kopijama Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kompozitne boje se pretvaraju u njega; separacije se razdvajaju njime kad je CMYK profil. Convert All Spot Colors to Process Pretvori sve spot boje u procesne + Convert {name} to process Pretvori {name} u procesnu + Keep {name} as spot Zadrži {name} kao spot Overprint Black Pretisak crne Default Printer Zadani štampač Document Ink Options Opcije tinti dokumenta @@ -4445,12 +4462,53 @@ font-technology Variable Varijabilni With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Kada je odabrana jedna instanca simbola, panel Transformiši koristi tačku registracije simbola kao referentnu tačku. Darkens the canvas outside the artboards while the Artboard tool is active. Zatamnjuje platno izvan radnih ploča dok je alat Radna ploča aktivan. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Kada je uključeno Zatamni područje izvan radne ploče, područje izvan radnih ploča ostaje tamno dok prevlačite alatom Radna ploča. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Koliko blizu, u pikselima, pokazivač mora biti objektu, sidrenoj tački ili ručki da bi ga klik odabrao. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Da li okvir alata za odabir bira objekte koje dodiruje ili samo one potpuno unutar njega; Smjer povlačenja bira one unutra pri povlačenju udesno. E obrće pravilo tokom povlačenja. + A click selects a filled object only on its path, not inside its fill. Klik bira popunjen objekat samo na njegovoj putanji, ne unutar ispune. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Koliko blizu, u pikselima, tačka mora doći sidrenoj tački ili vodilici lenjira da bi je Prilijepi uz tačku prilijepio; uz uključene pametne vodilice važi njihova tolerancija hvatanja. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Uz alat za odabir, Cmd/Ctrl-klik bira objekat ispod odabranog na mjestu pokazivača; svaki sljedeći klik ide jedan objekat dublje. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Uvećaj i Umanji dovode središte odabira u sredinu prikaza. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Zaključana i skrivena grafika unutar radne ploče pomjera se, skalira i kopira s radnom pločom kao i ostala grafika. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Veličina sidrenih tačaka i krajeva ručki smjera na platnu; veće sidrene tačke mogu se uhvatiti i s veće udaljenosti. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Crta krajeve ručki smjera kao pune tačke, šuplje tačke ili veće pune tačke. + With the Direct Selection tool, the anchor under the pointer is highlighted. Uz alat za direktni odabir, sidrena tačka ispod pokazivača se ističe. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Prikazuje ručke smjera kada je odabrano više od jedne sidrene tačke; kad je isključeno, vide se samo dok je odabrana jedna sidrena tačka. + Corner widgets hide on corners whose angle is greater than this many degrees. Widgeti uglova se skrivaju na uglovima čiji je ugao veći od ovoliko stepeni. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Alat pero prikazuje sljedeći segment od posljednje sidrene tačke do pokazivača prije nego kliknete. + The Curvature tool previews the curve to the pointer before you place the next point. Alat zakrivljenost prikazuje krivulju do pokazivača prije nego postavite sljedeću tačku. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Jedinica za nove dokumente ugrađenih veličina, osim onih u pikselima, i za otvorene datoteke bez zapisane jedinice; ako je odaberete ovdje i kliknete U redu, postaje i jedinica aktivnog dokumenta. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Debljine poteza, crtice i razmaci prikazuju se u ovoj jedinici, a brojevi uneseni za njih čitaju se u njoj. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Veličine teksta, prored i pomak osnovne linije prikazuju se u ovoj jedinici, a brojevi uneseni za njih čitaju se u njoj. The unit for East Asian type measurements, which no field uses yet. Jedinica za mjere istočnoazijskog teksta, koju još nijedno polje ne koristi. When on, a number typed without a unit into a field in picas is read in points. Kad je uključeno, broj unesen bez jedinice u polje u picama čita se u tačkama. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Uz XML ID nazivi objekata prikazuju se kao XML ID u Slojevima, Varijablama i Opcijama sloja. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Priljepljuje crtanje, pomicanje i skaliranje uz podjele mreže, čak i dok je mreža skrivena; dok je uključeno, „Prilijepi uz piksel“ se ne primjenjuje. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Boja vodilica koje nisu odabrane; radna ploča s „Oznakom vodilica“ crta svoje vodilice u boji oznake. + Draws guides as solid lines or as dots, including the guides already in the document. Crta vodilice kao pune linije ili kao tačke, uključujući vodilice koje su već u dokumentu. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Kad je uključeno, vodilice su zaključane pri pokretanju VectorCrafta; promjena ove opcije ih odmah zaključava ili otključava, a Prikaz › Vodilice › Zaključaj vodilice i dalje mijenja zaključavanje. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Kad je uključeno, držanje tipke Cmd/Ctrl na početku povlačenja s ravnala pravi vodilicu samo na aktivnoj radnoj ploči, a s alatom radna ploča vodilicu cijelog platna. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Boja mreže; linije između glavnih linija mreže crtaju se u blijeđoj nijansi te boje. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Crta mrežu kao linije ili kao tačke duž glavnih linija mreže na svakoj podjeli. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Razmak između glavnih linija mreže u svakom otvorenom dokumentu i u novim; dokument VectorCrafta otvara se s mrežom s kojom je sačuvan. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Na koliko dijelova se dijeli svaki glavni kvadrat mreže; „Priljepi uz mrežu“ priljepljuje uz te dijelove, čak i kad zum skriva njihove linije. + Draws the grid behind the artwork; off, the grid is drawn over it. Crta mrežu iza crteža; kad je isključeno, mreža se crta preko njega. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. U pregledu piksela pri zumu od 600% ili više aktivni prikaz pokazuje liniju na rubu svakog piksela dokumenta preko crteža. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Boja ivice pločice i isprekidanih granica uzorka boje koje se prikazuju dok uređujete uzorak. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Hvata crtanje, pomjeranje i transformisanje uz obližnje objekte i prikazuje vodilice i oznake; Pregled piksela ih isključuje, a Priljepi uz mrežu umjesto toga hvata uz mrežu. + The color of Smart Guide lines and labels. Boja linija i oznaka pametnih vodilica. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Prikazuje liniju duž ivice ili centra s kojim se objekti poravnavaju; kad je isključeno, objekti se i dalje poravnavaju bez linije, a Prilijepi uz glif ne djeluje. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. S alatom za odabir ocrtava neodabrani objekat ispod pokazivača bojom njegovog sloja dok ne prevlačite. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Prikazuje veličinu ili ugao pored pokazivača dok skalirate, rotirate, smičete ili odražavate objekte. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Dok crtate, tačke se hvataju uz linije pod odabranim uglovima kroz tačku od koje počinje segment ili oblik. + The set of angles the construction guides follow while Construction Guides is on. Skup uglova koje prate konstrukcijske vodilice dok su Konstrukcijske vodilice uključene. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Imenuje za šta se tačka hvata, npr. sidrenu tačku, putanju ili poravnanje; kad je isključeno, tačke se hvataju isto, bez naziva. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Prikazuje pored pokazivača udaljenosti, uglove i koliko je objekat pomjeren dok crtate ili pomjerate. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Hvata pomjerene objekte ili objekte promijenjene veličine uz isti razmak kao između obližnjih objekata i označava jednake razmake. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Kad je nešto odabrano, držanje tipke Alt/Option iznad drugog objekta ili radne ploče prikazuje udaljenosti između njega i odabira. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Odabir vraćen prevlačenjem unutar tolerancije hvatanja od mjesta gdje je prevlačenje počelo vraća se tačno na to mjesto; kopija ne. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Koliko blizu na ekranu pokazivač ili prevučena tačka mora doći do objekta da bi ga pametne vodilice uhvatile; udaljenost je ista pri svakom zumu. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Hvata kraj segmenta linije ili krug nacrtan iz središta tako da dodiruje obližnju krivu. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Hvata kraj segmenta linije tako da pod pravim uglom susreće obližnji ravni segment. Reset all preferences to their defaults? Vratiti sve postavke na zadane vrijednosti? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Zadane vrijednosti primjenjuju se kada kliknete U redu u Postavkama. Otkaži tamo zadržava vaše trenutne postavke. Smaller ↔ Larger Manje ↔ veće @@ -4751,6 +4809,11 @@ imageTrace Outline Obris @msg PDF writer error: {0} greška PDF zapisivača: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Upakovano datoteka u {folder}: {n} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Pregledaj u pregledniku zahtijeva desktop aplikaciju (web umjesto toga preuzima datoteke) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 navedite `desiredK`, željenu veličinu datoteke u K (1024 bajta): broj veći od 0 i najviše 1048576 +@msg `startWith` is `current` or `auto` `startWith` je `current` ili `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` je `allSlices`, `eachSlice` ili `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` je broj isječka iz `slice.list`, uz `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimiziraj na veličinu datoteke: nema slike za mjerenje @msg Release Guides: no guides Oslobodi vodilice: nema vodilica @msg Release: no layer to put the rectangle in Oslobodi: nema sloja u koji bi se stavio pravougaonik @msg Replace Spine: select a blend and a path Zamijeni kičmu: odaberite stapanje i putanju @@ -5922,6 +5985,19 @@ mark-style Japanese Japanski Transform Objects Transformiši objekte @msg unknown parameter `{key}`; did you mean `{near}`? nepoznat parametar `{key}`; da li ste mislili `{near}`? @msg unknown parameter `{key}`; the command takes no parameters nepoznat parametar `{key}`; naredba ne prima parametre +@msg unknown parameter `{key}`; `{object}` takes: {keys} nepoznat parametar `{key}`; `{object}` prima: {keys} +@msg unknown parameter `{key}`; {why_not} nepoznat parametar `{key}`; {why_not} +@msg no format takes it (see document.formats) nijedan format ga ne prima (pogledajte document.formats) +@msg no save format takes it (see file.formatOptions) nijedan format za spremanje ga ne prima (pogledajte file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF ga ne prima (pogledajte document.formats) +@msg EPS doesn't take it (see document.formats) EPS ga ne prima (pogledajte document.formats) +@msg DXF doesn't take it (see document.formats) DXF ga ne prima (pogledajte document.formats) +@msg {name} must be {range} (got {v}) {name} mora biti {range} (dobiveno {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Grafički procesor koji je prvi pokušan nije mogao prikazati prozor, pa se VectorCraft ponovo pokrenuo na {summary} (Postavke › Performanse › Grafički procesor › Automatski koristi onaj koji pokreće vaš ekran) +@msg Sent “{title}” to {to} “{title}” je poslano na {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” je poslano na {to}. Odgovor reda za štampanje: {note} +@msg the default printer zadani štampač +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rasterski efekti na objektu {object}: traženo {requested} ppi, postignuto {achieved} ppi zbog ograničenja od 64 miliona piksela @msg unknown parameter `{key}`; the command takes: {keys} nepoznat parametar `{key}`; naredba prima: {keys} Load EPS into Clipboard Učitaj EPS u međuspremnik @msg an image of {w} × {h} pixels is too large to draw slika od {w} × {h} piksela prevelika je za crtanje diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index cf2b3aa96b..c54311799d 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -897,6 +897,8 @@ antiAlias Sharp Nítid Conté Crayon… Llapis Conté… Convert Converteix Convert All Spot Colors to Process Converteix tots els colors directes a quadricromia + Convert {name} to process Converteix {name} a quadricromia + Keep {name} as spot Mantén {name} com a color directe Convert All Strokes to Outlines Converteix tots els traços en contorns Convert All Text to Outlines Converteix tot el text en contorns Convert Anchor Point Converteix el punt d’ancoratge @@ -990,6 +992,9 @@ antiAlias Sharp Nítid Create from Selection Crea a partir de la selecció Create From: Crea a partir de: Create Gradient Mesh… Crea una malla de degradat… + Flat Pla + To Center Cap al centre + To Edge Cap a la vora Create Graph Crea un gràfic Create New Fields by Crea camps nous mitjançant Create New Layer Crea una capa nova @@ -3420,6 +3425,18 @@ digits Malayalam Malaiàlam Preview (1 inch on the page) Previsualització (1 polzada a la pàgina) Preview All Layers Previsualitza totes les capes Preview in Browser Previsualitza al navegador + Optimize to File Size… Optimitza segons la mida del fitxer… + Optimize to File Size Optimitza segons la mida del fitxer + Desired File Size: Mida de fitxer desitjada: + Start With: Comença amb: + Use: Utilitza: + Current Settings Configuració actual + Auto Select GIF/JPEG Selecció automàtica GIF/JPEG + Total of All Slices Total de tots els talls + Each Slice Cada tall + Current Slice Tall actual + {size}, within {target} {size}, dins de {target} + No setting tried fits in {target}; the smallest is {size} Cap configuració provada no cap a {target}; la més petita és {size} Preview in Browser needs the desktop app (the web downloads files instead) La previsualització al navegador necessita l’aplicació d’escriptori (al web, en canvi, es descarreguen els fitxers) Preview Mode Mode de previsualització Preview the document as it is now Previsualitza el document tal com és ara @@ -3838,12 +3855,53 @@ digits Malayalam Malaiàlam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Amb una instància de símbol seleccionada, el panell Transforma fa servir el punt de registre del símbol com a punt de referència. Darkens the canvas outside the artboards while the Artboard tool is active. Enfosqueix el llenç fora dels taulers mentre l’eina Tauler està activa. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Amb Enfosqueix la regió fora del tauler activat, l’àrea fora dels taulers continua fosca mentre arrossegueu amb l’eina Tauler. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. A quina distància, en píxels, ha d’estar el punter d’un objecte, punt d’ancoratge o tirador perquè un clic el seleccioni. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Si el requadre de l’eina de selecció tria els objectes que toca o només els que hi queden del tot dins; Direcció de l’arrossegament tria els de dins en arrossegar cap a la dreta. E ho inverteix en arrossegar. + A click selects a filled object only on its path, not inside its fill. Un clic selecciona un objecte emplenat només pel seu traçat, no dins de l’emplenament. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. A quina distància, en píxels, ha d’arribar un punt d’un punt d’ancoratge o d’una guia de regle perquè Ajusta al punt l’hi ajusti; amb les guies intel·ligents activades s’aplica la seva tolerància d’ajust. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Amb l’eina de selecció, Cmd/Ctrl+clic selecciona l’objecte de sota del seleccionat al punter; cada clic següent baixa un objecte més. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Amplia i Redueix porten el centre de la selecció al mig de la vista. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. L’art bloquejat i ocult dins d’un tauler es mou, s’escala i es copia amb el tauler, com la resta de l’art. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. La mida dels punts d’ancoratge i dels extrems dels tiradors de direcció al llenç; els punts d’ancoratge més grans també es poden agafar des de més lluny. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Dibuixa els extrems dels tiradors de direcció com a punts plens, punts buits o punts plens més grans. + With the Direct Selection tool, the anchor under the pointer is highlighted. Amb l’eina de selecció directa, el punt d’ancoratge sota el punter es ressalta. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Mostra els tiradors de direcció quan hi ha més d’un punt d’ancoratge seleccionat; desactivat, només es mostren amb un sol punt d’ancoratge seleccionat. + Corner widgets hide on corners whose angle is greater than this many degrees. Els ginys d’angles s’amaguen en els angles més grans que aquests graus. + The Pen tool previews the next segment from the last anchor to the pointer before you click. L’eina de ploma mostra el segment següent des de l’últim punt d’ancoratge fins al punter abans de fer clic. + The Curvature tool previews the curve to the pointer before you place the next point. L’eina de curvatura mostra la corba fins al punter abans de col·locar el punt següent. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. La unitat dels documents nous de mides predefinides, excepte les mides en píxels, i dels fitxers oberts que no registren cap unitat; si la trieu aquí i feu clic a D’acord, també passa a ser la unitat del document actiu. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Els gruixos de traç, els guions i els espais es mostren en aquesta unitat, i els nombres que s’hi escriuen es llegeixen en aquesta unitat. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Les mides del text, l’interlineat i el desplaçament de la línia de base es mostren en aquesta unitat, i els nombres que s’hi escriuen es llegeixen en aquesta unitat. The unit for East Asian type measurements, which no field uses yet. La unitat per a les mesures del text d’Àsia oriental, que encara no fa servir cap camp. When on, a number typed without a unit into a field in picas is read in points. Quan està activat, un nombre escrit sense unitat en un camp en piques es llegeix en punts. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Amb ID XML, els noms dels objectes es mostren com a ID XML a Capes, Variables i Opcions de la capa. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Ajusta el dibuix, el desplaçament i l’escalat a les subdivisions de la quadrícula, fins i tot quan la quadrícula està amagada; mentre està activat, Ajusta al píxel no s’aplica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. El color de les guies no seleccionades; un tauler amb una Etiqueta de les guies dibuixa les seves guies amb el color de l’etiqueta. + Draws guides as solid lines or as dots, including the guides already in the document. Dibuixa les guies com a línies contínues o com a punts, incloses les guies que ja són al document. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Amb aquesta opció activada, les guies queden bloquejades quan s’inicia VectorCraft; canviar l’opció les bloca o desbloca a l’instant, i Visualitza › Guies › Bloca les guies continua canviant el bloqueig. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Amb aquesta opció activada, mantenir premuda Cmd/Ctrl en començar a arrossegar des d’un regle crea una guia només al tauler actiu, o una guia de tot el llenç amb l’eina de tauler. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. El color de la quadrícula; les línies entre les línies principals es dibuixen amb un to més suau d’aquest color. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Dibuixa la quadrícula com a línies, o com a punts al llarg de les línies principals a cada subdivisió. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distància entre les línies principals de la quadrícula, a tots els documents oberts i als nous; un document de VectorCraft s’obre amb la quadrícula amb què es va desar. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. En quantes parts es divideix cada quadrat principal de la quadrícula; Ajusta a la quadrícula s’ajusta a aquestes parts, fins i tot quan el zoom n’amaga les línies. + Draws the grid behind the artwork; off, the grid is drawn over it. Dibuixa la quadrícula darrere de l’obra; desactivat, la quadrícula es dibuixa a sobre. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. A la previsualització de píxels, amb un zoom del 600% o més, la vista activa mostra una línia a la vora de cada píxel del document sobre l’obra. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. El color de la vora del mosaic i dels límits discontinus de la mostra que es mostren mentre editeu un motiu. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Ajusta el dibuix, el desplaçament i la transformació a l’art proper i mostra guies i etiquetes; la previsualització de píxels les desactiva, i Ajusta a la quadrícula ajusta a la quadrícula en el seu lloc. + The color of Smart Guide lines and labels. El color de les línies i les etiquetes de les guies intel·ligents. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Mostra una línia al llarg de la vora o el centre amb què s’alinea l’art; desactivada, l’art continua alineant-se sense la línia, i Ajusta al glif no s’aplica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Amb una eina de selecció, contorneja l’objecte no seleccionat sota el punter amb el color de la seva capa mentre no arrossegueu. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Mostra la mida o l’angle al costat del punter mentre escaleu, gireu, inclineu o reflectiu l’art. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mentre dibuixeu, els punts s’ajusten a línies amb els angles triats que passen pel punt on comença el segment o la forma. + The set of angles the construction guides follow while Construction Guides is on. El conjunt d’angles que segueixen les guies de construcció mentre Guies de construcció està activat. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Indica a què s’ajusta un punt, com un punt d’ancoratge, un traçat o una alineació; desactivat, els punts s’ajusten igual sense els noms. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Mostra al costat del punter distàncies, angles i quant s’ha mogut l’art mentre dibuixeu o moveu. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Ajusta l’art moguda o redimensionada a la mateixa separació que hi ha entre objectes propers i marca les separacions iguals. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Amb alguna cosa seleccionada, mantenir premuda Alt/Option sobre un altre objecte o un tauler mostra les distàncies entre aquest i la selecció. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Una selecció arrossegada de tornada fins a la tolerància d’ajust del lloc on va començar l’arrossegament torna exactament a aquell lloc; una còpia no. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Com d’a prop a la pantalla han d’arribar el punter o un punt arrossegat a l’art perquè les guies intel·ligents s’hi ajustin; la distància és la mateixa a qualsevol zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Ajusta l’extrem d’un segment de línia, o un cercle dibuixat des del centre, perquè toqui una corba propera. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Ajusta l’extrem d’un segment de línia perquè trobi un segment recte proper en angle recte. Reset all preferences to their defaults? Voleu restablir totes les preferències als valors predeterminats? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Els valors predeterminats s’apliquen quan feu clic a D’acord a Preferències. Cancel·la allà conserva les preferències actuals. Restore Recovered Documents Restaura els documents recuperats @@ -6323,6 +6381,11 @@ liquify-list-end {0}, {1} {0} i {1} @msg plug-in trapped: {0} el complement ha quedat atrapat: {0} @msg precision must be from 0.001 to 10 pt precision ha de ser d’entre 0,001 i 10 pt @msg Preview in Browser needs the desktop app (the web downloads files instead) La previsualització al navegador necessita l’aplicació d’escriptori (a la web es baixen els fitxers) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indica `desiredK`, la mida de fitxer desitjada en K (1024 bytes): un nombre més gran que 0 i com a màxim 1048576 +@msg `startWith` is `current` or `auto` `startWith` és `current` o `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` és `allSlices`, `eachSlice` o `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` és un número de tall de `slice.list`, amb `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimitza segons la mida del fitxer: no hi ha cap imatge per mesurar @msg print settings are not an object la configuració d’impressió no és un objecte @msg printing isn't available here la impressió no està disponible aquí @msg range `{s}` is empty el rang `{s}` és buit @@ -6722,6 +6785,19 @@ liquify-list-end {0}, {1} {0} i {1} @msg panels can't be shown in Presentation Mode els panells no es poden mostrar en el mode de presentació @msg unknown parameter `{key}`; did you mean `{near}`? paràmetre desconegut `{key}`; volies dir `{near}`? @msg unknown parameter `{key}`; the command takes no parameters paràmetre desconegut `{key}`; l’ordre no admet cap paràmetre +@msg unknown parameter `{key}`; `{object}` takes: {keys} paràmetre desconegut `{key}`; `{object}` admet: {keys} +@msg unknown parameter `{key}`; {why_not} paràmetre desconegut `{key}`; {why_not} +@msg no format takes it (see document.formats) cap format no l’admet (vegeu document.formats) +@msg no save format takes it (see file.formatOptions) cap format de desament no l’admet (vegeu file.formatOptions) +@msg PDF doesn't take it (see document.formats) el PDF no l’admet (vegeu document.formats) +@msg EPS doesn't take it (see document.formats) l’EPS no l’admet (vegeu document.formats) +@msg DXF doesn't take it (see document.formats) el DXF no l’admet (vegeu document.formats) +@msg {name} must be {range} (got {v}) {name} ha de ser {range} (rebut {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) El processador gràfic provat primer no ha pogut mostrar la finestra, així que VectorCraft s’ha iniciat de nou amb {summary} (Configuració › Rendiment › Processador gràfic › Automàtic fa servir el que controla la pantalla) +@msg Sent “{title}” to {to} S’ha enviat “{title}” a {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} S’ha enviat “{title}” a {to}. Resposta de la cua d’impressió: {note} +@msg the default printer la impressora per defecte +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efectes de ràster a l’objecte {object}: s’han demanat {requested} ppi i s’han obtingut {achieved} ppi a causa del límit de 64 milions de píxels @msg unknown parameter `{key}`; the command takes: {keys} paràmetre desconegut `{key}`; l’ordre admet: {keys} @msg the params must be an object, not {got} els paràmetres han de ser un objecte, no {got} @msg unknown parameter `{path}`; the object takes no keys paràmetre desconegut `{path}`; l’objecte no admet claus @@ -7874,6 +7950,11 @@ breakText Glyphs Glifs @msg Some islands could not be joined to the area around the art Algunes illes no s’han pogut unir a l’àrea que envolta la il·lustració @msg `width` must be from {lo} to {hi} pt `width` ha d’estar entre {lo} i {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` ha d’estar entre -180 i 180 graus +@msg `roundness` must be from 0 to 100% `roundness` ha d’estar entre 0 i 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` ha d’estar entre 0.01 i 100 pt +@msg style must be "pencil" or "brush" style ha de ser "pencil" o "brush" +@msg extend end must be "start" or "end" l’extrem d’extend ha de ser "start" o "end" +@msg connect end must be "start" or "end" l’extrem de connect ha de ser "start" o "end" @msg `roundness` must be from 1 to 100% `roundness` ha d’estar entre 1 i 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` ha de ser un nombre enter d’1 a {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Caixa i línies de pelat… diff --git a/crates/ui-egui/src/i18n/catalog.rs b/crates/ui-egui/src/i18n/catalog.rs index 01d88af108..6f2176be3e 100644 --- a/crates/ui-egui/src/i18n/catalog.rs +++ b/crates/ui-egui/src/i18n/catalog.rs @@ -194,6 +194,26 @@ pub fn parse_entries(text: &str) -> (Vec, Vec) { (entries, errors) } +/// Whether a message can be matched against the template `source`: it has literal text and no two +/// placeholders in a row. +#[cfg(test)] +pub fn matchable(source: &str) -> bool { + Template::parse(source, Vec::new(), false).is_some() +} + +/// The sources of the `@msg` and `@msgplural` rows of a catalog file that [`Catalog::parse`] leaves +/// out, because no message can be matched against them. The interface shows the messages of such a +/// row in English. +#[cfg(test)] +pub fn unmatchable_rows(text: &str) -> Vec { + let left_out = |(ctx, src, _): &Entry| match ctx.as_str() { + "@msg" => src.contains(['{', '}']) && !matchable(src), + "@msgplural" => src.split('|').any(|english| !matchable(english)), + _ => false, + }; + parse_entries(text).0.into_iter().filter(left_out).map(|(_, src, _)| src).collect() +} + impl Catalog { pub fn parse(text: &str) -> Catalog { let mut c = Catalog::default(); diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 0f55ec62b5..a5d7bb948a 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -224,6 +224,9 @@ Mask Maska Rasterize… Rastrovat… Create Gradient Mesh… Vytvořit přechodovou síť… + Flat Ploché + To Center Ke středu + To Edge K okraji Create Object Mosaic… Vytvořit mozaiku objektů… Vector Halftone… Vektorový polotón… Create Trim Marks Vytvořit značky ořezu @@ -1191,6 +1194,18 @@ lighting Light Světlo Placement Options… Možnosti umístění… Plug-in… Zásuvný modul… Preview in Browser Náhled v prohlížeči + Optimize to File Size… Optimalizovat na velikost souboru… + Optimize to File Size Optimalizovat na velikost souboru + Desired File Size: Požadovaná velikost souboru: + Start With: Začít s: + Use: Použít: + Current Settings Aktuální nastavení + Auto Select GIF/JPEG Automaticky vybrat GIF/JPEG + Total of All Slices Součet všech řezů + Each Slice Každý řez + Current Slice Aktuální řez + {size}, within {target} {size}, v rámci {target} + No setting tried fits in {target}; the smallest is {size} Žádné vyzkoušené nastavení se nevejde do {target}; nejmenší má {size} Printer Setup… Nastavení tiskárny… Printers Tiskárny Recent File Nedávný soubor @@ -2925,6 +2940,8 @@ digits Malayalam Malajálamské Collate Kompletovat Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kompozitní barvy se na něj převádějí; separace podle něj separují, pokud je to profil CMYK. Convert All Spot Colors to Process Převést všechny přímé barvy na procesní + Convert {name} to process Převést {name} na procesní + Keep {name} as spot Ponechat {name} jako přímou barvu Default Printer Výchozí tiskárna Document Ink Options Možnosti inkoustů dokumentu Download: Stahování: @@ -4549,12 +4566,53 @@ font-technology Variable Variabilní With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Když je vybraná jedna instance symbolu, panel Transformace použije registrační bod symbolu jako referenční bod. Darkens the canvas outside the artboards while the Artboard tool is active. Ztmaví plátno mimo pracovní plochy, dokud je aktivní nástroj Pracovní plocha. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Když je zapnuto Ztmavit oblast mimo pracovní plochu, zůstane oblast mimo pracovní plochy tmavá i při tažení nástrojem Pracovní plocha. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Jak blízko v obrazových bodech musí být ukazatel k objektu, kotevnímu bodu nebo úchytu, aby jej kliknutí vybralo. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Zda rámeček nástroje Výběr vybírá objekty, kterých se dotkne, nebo jen ty zcela uvnitř; Směr tažení vybírá ty uvnitř při tažení doprava. E pravidlo během tažení obrátí. + A click selects a filled object only on its path, not inside its fill. Kliknutí vybere vyplněný objekt jen na jeho cestě, ne uvnitř výplně. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Jak blízko v obrazových bodech se musí bod dostat ke kotevnímu bodu nebo vodítku pravítka, aby jej Přichytávat k bodům přichytilo; se zapnutými chytrými vodítky platí jejich tolerance přichytávání. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. S nástrojem Výběr vybere Cmd/Ctrl+kliknutí objekt pod vybraným v místě ukazatele; každé další kliknutí jde o objekt hlouběji. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zvětšit a Zmenšit přesunou střed výběru doprostřed zobrazení. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Zamknutá a skrytá kresba uvnitř pracovní plochy se s ní přesouvá, mění velikost a kopíruje jako ostatní kresba. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Velikost kotevních bodů a konců směrových úchytů na plátně; větší kotevní body lze zachytit i z větší vzdálenosti. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Kreslí konce směrových úchytů jako plné tečky, duté tečky nebo větší plné tečky. + With the Direct Selection tool, the anchor under the pointer is highlighted. S nástrojem Přímý výběr se kotevní bod pod ukazatelem zvýrazní. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Zobrazuje směrové úchyty, když je vybráno více kotevních bodů; vypnuto, zobrazí se jen při jednom vybraném kotevním bodu. + Corner widgets hide on corners whose angle is greater than this many degrees. Ovladače rohů se skryjí u rohů, jejichž úhel je větší než tento počet stupňů. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Nástroj Pero ukazuje náhled dalšího segmentu od posledního kotevního bodu k ukazateli, než kliknete. + The Curvature tool previews the curve to the pointer before you place the next point. Nástroj Zakřivení ukazuje náhled křivky k ukazateli, než umístíte další bod. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Jednotka nových dokumentů z vestavěných velikostí kromě velikostí v obrazových bodech a otevřených souborů bez uložené jednotky; když ji zde zvolíte a kliknete na OK, nastaví se i jako jednotka aktivního dokumentu. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Tloušťky tahů, čárky a mezery se zobrazují v této jednotce a čísla pro ně zadaná se v ní čtou. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Velikosti písma, proklad a posun účaří se zobrazují v této jednotce a čísla pro ně zadaná se v ní čtou. The unit for East Asian type measurements, which no field uses yet. Jednotka pro míry východoasijského písma, kterou zatím žádné pole nepoužívá. When on, a number typed without a unit into a field in picas is read in points. Když je zapnuto, číslo zadané bez jednotky do pole v pica se čte v bodech. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. S volbou XML ID se názvy objektů zobrazují jako XML ID ve Vrstvách, Proměnných a Možnostech vrstvy. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Přichytává kreslení, přesouvání a změnu velikosti k dělení mřížky, i když je mřížka skrytá; dokud je zapnuto, Přichytávat k obrazovým bodům se neuplatní. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Barva vodítek, která nejsou vybraná; pracovní plocha se Štítkem vodítek kreslí svá vodítka v barvě štítku. + Draws guides as solid lines or as dots, including the guides already in the document. Kreslí vodítka jako plné čáry nebo jako tečky, včetně vodítek, která už v dokumentu jsou. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Je-li zapnuto, vodítka jsou při spuštění VectorCraftu zamknutá; změna této volby je hned zamkne nebo odemkne a Zobrazení › Vodítka › Zamknout vodítka zámek dál mění. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Je-li zapnuto, podržení Cmd/Ctrl na začátku tažení z pravítka vytvoří vodítko jen na aktivní pracovní ploše, nebo s nástrojem Pracovní plocha vodítko celého plátna. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Barva mřížky; čáry mezi hlavními čarami mřížky se kreslí ve slabším odstínu této barvy. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Kreslí mřížku jako čáry, nebo jako tečky podél hlavních čar mřížky v každém dělení. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Vzdálenost mezi hlavními čarami mřížky ve všech otevřených dokumentech i v nových; dokument VectorCraftu se otevře s mřížkou, se kterou byl uložen. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Na kolik dílů se dělí každý hlavní čtverec mřížky; Přichytávat k mřížce přichytává k těmto dílům, i když jejich čáry při daném zvětšení nejsou vidět. + Draws the grid behind the artwork; off, the grid is drawn over it. Kreslí mřížku za kresbou; je-li vypnuto, kreslí se mřížka přes ni. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. V náhledu obrazových bodů při zvětšení 600 % a více ukazuje aktivní zobrazení přes kresbu čáru na okraji každého obrazového bodu dokumentu. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Barva okraje dlaždice a přerušovaných hranic položky vzorníku, které se ukazují při úpravě vzorku. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Přichytává kreslení, přesouvání a transformace k blízké kresbě a ukazuje vodítka a popisky; Náhled obrazových bodů je vypíná a Přichytávat k mřížce místo nich přichytává k mřížce. + The color of Smart Guide lines and labels. Barva čar a popisků chytrých vodítek. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Ukazuje čáru podél okraje nebo středu, ke kterému se kresba zarovnává; když je vypnuto, kresba se zarovnává i bez čáry a Přichytávat ke glyfům neplatí. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. S nástrojem pro výběr obtáhne nevybraný objekt pod ukazatelem barvou jeho vrstvy, dokud netáhnete. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Ukazuje u ukazatele velikost nebo úhel, když měníte velikost kresby nebo ji otáčíte, zkosujete či zrcadlíte. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Při kreslení se body přichytávají k čarám ve zvolených úhlech procházejícím bodem, kde začíná segment nebo tvar. + The set of angles the construction guides follow while Construction Guides is on. Sada úhlů, které konstrukční vodítka sledují, když jsou Konstrukční vodítka zapnutá. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Pojmenuje, k čemu se bod přichytí, například kotevní bod, cestu nebo zarovnání; když je vypnuto, body se přichytávají stejně, jen bez názvů. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Ukazuje u ukazatele vzdálenosti, úhly a o kolik se kresba posunula, když kreslíte nebo přesouváte. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Přichytí přesunutou kresbu nebo kresbu se změněnou velikostí na stejnou mezeru jako mezi blízkými objekty a vyznačí stejné mezery. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Když je něco vybráno, podržení Alt/Option nad jiným objektem nebo pracovní plochou ukáže vzdálenosti mezi ním a výběrem. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Výběr přetažený zpět do tolerance přichytávání od místa, kde tažení začalo, se vrátí přesně na to místo; kopie ne. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Jak blízko na obrazovce musí ukazatel nebo tažený bod přijít ke kresbě, aby se chytrá vodítka přichytila; vzdálenost je stejná při každém zvětšení. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Přichytí konec úsečky nebo kružnici kreslenou od středu tak, aby se dotýkala blízké křivky. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Přichytí konec úsečky tak, aby se s blízkým rovným segmentem setkal v pravém úhlu. Reset all preferences to their defaults? Obnovit všechny předvolby na výchozí hodnoty? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Výchozí hodnoty se použijí po klepnutí na OK v Předvolbách. Zrušit tam zachová vaše současné předvolby. Smaller ↔ Larger Menší ↔ Větší @@ -5007,6 +5065,11 @@ liquify-list-end {0}, {1} {0} a {1} @msg PDF writer error: {0} chyba zápisu PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Zabalen {n} soubor do {folder} ({note})|Zabaleny {n} soubory do {folder} ({note})|Zabaleno {n} souborů do {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Náhled v prohlížeči vyžaduje desktopovou aplikaci (webová verze místo toho stahuje soubory) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 zadejte `desiredK`, požadovanou velikost souboru v K (1024 bajtů): číslo větší než 0 a nejvýše 1048576 +@msg `startWith` is `current` or `auto` `startWith` je `current` nebo `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` je `allSlices`, `eachSlice` nebo `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` je číslo řezu ze `slice.list`, s `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimalizovat na velikost souboru: není žádný obraz k měření @msg Release Guides: no guides Uvolnit vodítka: žádná vodítka @msg Release: no layer to put the rectangle in Uvolnit: chybí vrstva, do které by šel obdélník umístit @msg Replace Spine: select a blend and a path Nahradit páteř: vyberte prolnutí a cestu @@ -6335,6 +6398,19 @@ mark-style Japanese Japonské Transform Objects Transformovat objekty @msg unknown parameter `{key}`; did you mean `{near}`? neznámý parametr `{key}`; mysleli jste `{near}`? @msg unknown parameter `{key}`; the command takes no parameters neznámý parametr `{key}`; příkaz nemá žádné parametry +@msg unknown parameter `{key}`; `{object}` takes: {keys} neznámý parametr `{key}`; `{object}` přijímá: {keys} +@msg unknown parameter `{key}`; {why_not} neznámý parametr `{key}`; {why_not} +@msg no format takes it (see document.formats) žádný formát jej nepřijímá (viz document.formats) +@msg no save format takes it (see file.formatOptions) žádný formát pro ukládání jej nepřijímá (viz file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF jej nepřijímá (viz document.formats) +@msg EPS doesn't take it (see document.formats) EPS jej nepřijímá (viz document.formats) +@msg DXF doesn't take it (see document.formats) DXF jej nepřijímá (viz document.formats) +@msg {name} must be {range} (got {v}) {name} musí být {range} (zadáno {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Grafický procesor zkoušený jako první nedokázal zobrazit okno, proto se VectorCraft znovu spustil na {summary} (Nastavení › Výkon › Grafický procesor › Automaticky použije ten, který obsluhuje váš displej) +@msg Sent “{title}” to {to} “{title}” odesláno do {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” odesláno do {to}. Odpověď tiskové fronty: {note} +@msg the default printer výchozí tiskárny +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastrové efekty na objektu {object}: požadováno {requested} ppi, dosaženo {achieved} ppi kvůli limitu 64 milionů pixelů @msg unknown parameter `{key}`; the command takes: {keys} neznámý parametr `{key}`; příkaz přijímá: {keys} @msg the params must be an object, not {got} parametry musí být objekt, nikoli {got} @msg unknown parameter `{path}`; the object takes no keys neznámý parametr `{path}`; objekt nepřijímá žádné klíče @@ -7968,6 +8044,11 @@ breakText Glyphs Glyfy @msg Some islands could not be joined to the area around the art Některé ostrůvky nebylo možné připojit k oblasti kolem kresby @msg `width` must be from {lo} to {hi} pt `width` musí být od {lo} do {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` musí být od -180 do 180 stupňů +@msg `roundness` must be from 0 to 100% `roundness` musí být od 0 do 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` musí být od 0.01 do 100 pt +@msg style must be "pencil" or "brush" style musí být "pencil" nebo "brush" +@msg extend end must be "start" or "end" konec extend musí být "start" nebo "end" +@msg connect end must be "start" or "end" konec connect musí být "start" nebo "end" @msg `roundness` must be from 1 to 100% `roundness` musí být od 1 do 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` musí být celé číslo od 1 do {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Rámeček a linie pro vybírání… @@ -8489,7 +8570,6 @@ breakText Glyphs Glyfy @msg anchor `smooth` must be true or false `smooth` kotevního bodu musí být true nebo false @msg anchor `{key}` must be [x, y] `{key}` kotevního bodu musí být [x, y] @msg anchor `{key}` must be a number `{key}` kotevního bodu musí být číslo -@msg angle and roundness must be finite úhel a zaoblení musí být konečné @msg angles must be a list as long as pins (degrees or null) angles musí být seznam stejně dlouhý jako pins (stupně nebo null) @msg appearance must be flat|center|edge appearance musí být flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply je "fill" nebo "stroke", ne `{other}` @@ -9644,8 +9724,6 @@ breakText Glyphs Glyfy @msg unknown panel neznámý panel @msg unknown panel `{panel}` neznámý panel `{panel}` @msg unknown parameter `{key}` neznámý parametr `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} neznámý parametr `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} neznámý parametr `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) neznámé pieLegend `{v}` (none, standard nebo wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) neznámé piePosition `{v}` (even, ratio nebo stacked) @msg unknown pieSort `{v}` (none, all or first) neznámé pieSort `{v}` (none, all nebo first) @@ -9773,7 +9851,6 @@ breakText Glyphs Glyfy @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} je vestavěné a nelze ho odstranit @msg {name} must be a number {name} musí být číslo -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} musí být {lo}–{hi}{unit} (zadáno {v}) @msg {name}: CRC or size mismatch {name}: nesouhlasí CRC nebo velikost @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}: z tohoto souboru Affinity šlo přečíst jen vložený náhled; pomocí Soubor › Otevřít ho zobrazíte s varováním, nebo před umístěním exportujte SVG či PDF z Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 2ef968f154..08100f593f 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -726,6 +726,11 @@ liquify-list-end {0}, {1} {0} og {1} @msg Some islands could not be joined to the area around the art Nogle øer kunne ikke forbindes med området omkring grafikken @msg `width` must be from {lo} to {hi} pt `width` skal være fra {lo} til {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` skal være fra -180 til 180 grader +@msg `roundness` must be from 0 to 100% `roundness` skal være fra 0 til 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` skal være fra 0.01 til 100 pt +@msg style must be "pencil" or "brush" style skal være "pencil" eller "brush" +@msg extend end must be "start" or "end" enden for extend skal være "start" eller "end" +@msg connect end must be "start" or "end" enden for connect skal være "start" eller "end" @msg `roundness` must be from 1 to 100% `roundness` skal være fra 1 til 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` skal være et heltal fra 1 til {MAX_BRIDGES_PER_ISLAND} @@ -2905,6 +2910,9 @@ liquify-list-end {0}, {1} {0} og {1} Mask Maskér Rasterize… Rasterisér… Create Gradient Mesh… Opret gradientnet… + Flat Flad + To Center Mod midten + To Edge Mod kanten Create Object Mosaic… Opret objektmosaik… Vector Halftone… Vektorhalvtone… Create Trim Marks Opret beskæringsmærker @@ -3788,6 +3796,18 @@ lighting Light Lys Placement Options… Placeringsindstillinger… Plug-in… Plug-in… Preview in Browser Forhåndsvis i browser + Optimize to File Size… Optimer til filstørrelse… + Optimize to File Size Optimer til filstørrelse + Desired File Size: Ønsket filstørrelse: + Start With: Start med: + Use: Brug: + Current Settings Aktuelle indstillinger + Auto Select GIF/JPEG Vælg GIF/JPEG automatisk + Total of All Slices Alle udsnit i alt + Each Slice Hvert udsnit + Current Slice Aktuelt udsnit + {size}, within {target} {size}, inden for {target} + No setting tried fits in {target}; the smallest is {size} Ingen afprøvet indstilling passer i {target}; den mindste er {size} Printer Setup… Printeropsætning… Printers Printere Recent File Seneste fil @@ -5393,6 +5413,8 @@ digits Malayalam Malayalam Collate Sortér Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kompositfarver konverteres til den; separationer separeres med den, når det er en CMYK-profil. Convert All Spot Colors to Process Konvertér alle spotfarver til procesfarver + Convert {name} to process Konvertér {name} til procesfarve + Keep {name} as spot Behold {name} som spotfarve Default Printer Standardprinter Document Ink Options Indstillinger for dokumentblæk Download: Download: @@ -6943,12 +6965,53 @@ font-technology Variable Variable With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Når én symbolforekomst er markeret, bruger panelet Transformér symbolets registreringspunkt som referencepunkt. Darkens the canvas outside the artboards while the Artboard tool is active. Gør lærredet uden for kunstpladerne mørkere, mens værktøjet Kunstplade er aktivt. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Når Ton området uden for kunstpladen ned er slået til, forbliver området uden for kunstpladerne mørkt, mens du trækker med værktøjet Kunstplade. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hvor tæt markøren i pixels skal være på et objekt, ankerpunkt eller håndtag, for at et klik markerer det. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Om markeringsværktøjets felt markerer objekter, det rører, eller kun dem helt indenfor; Trækretning markerer dem indenfor, når du trækker mod højre. E vender reglen under trækket. + A click selects a filled object only on its path, not inside its fill. Et klik markerer et udfyldt objekt kun på dets sti, ikke inde i udfyldningen. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hvor tæt et punkt i pixels skal komme på et ankerpunkt eller en linealhjælpelinje, for at Fastgør til punkt fastgør det; med smarte hjælpelinjer slået til gælder deres snap-tolerance i stedet. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Med markeringsværktøjet markerer Cmd/Ctrl-klik objektet under det markerede ved markøren; hvert nyt klik går et objekt dybere. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zoom ind og Zoom ud flytter markeringens midte til midten af visningen. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Låst og skjult grafik inde i en kunstplade flyttes, skaleres og kopieres med kunstpladen ligesom den øvrige grafik. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Størrelsen af ankerpunkter og retningshåndtagenes ender på lærredet; større ankerpunkter kan også gribes længere fra. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Tegner retningshåndtagenes ender som fyldte prikker, hule prikker eller større fyldte prikker. + With the Direct Selection tool, the anchor under the pointer is highlighted. Med det direkte markeringsværktøj fremhæves ankerpunktet under markøren. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Viser retningshåndtag, når mere end ét ankerpunkt er markeret; slået fra vises de kun, mens ét ankerpunkt er markeret. + Corner widgets hide on corners whose angle is greater than this many degrees. Hjørnehåndtag skjules på hjørner, hvis vinkel er større end dette antal grader. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Pen-værktøjet viser det næste segment fra det sidste ankerpunkt til markøren, før du klikker. + The Curvature tool previews the curve to the pointer before you place the next point. Krumningsværktøjet viser kurven til markøren, før du placerer det næste punkt. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Enheden for nye dokumenter i de indbyggede størrelser, bortset fra størrelser i pixels, og for åbnede filer, der ikke angiver en enhed; vælger du den her og klikker på OK, får det aktive dokument også denne enhed. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Stregtykkelser, streger og mellemrum vises i denne enhed, og tal, der skrives til dem, læses i den. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tekststørrelser, linjeafstand og grundlinjeforskydning vises i denne enhed, og tal, der skrives til dem, læses i den. The unit for East Asian type measurements, which no field uses yet. Enheden for mål i østasiatisk tekst, som intet felt bruger endnu. When on, a number typed without a unit into a field in picas is read in points. Når den er slået til, læses et tal, der skrives uden enhed i et felt i pica, i punkter. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Med XML-id vises objektnavne som XML-id'er i Lag, Variabler og Lagindstillinger. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Fastgør tegning, flytning og skalering til gitterets underinddelinger, også mens gitteret er skjult; mens den er slået til, gælder Fastgør til pixel ikke. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Farven på hjælpelinjer, der ikke er markeret; en kunstplade med en hjælpelinjeetiket tegner sine egne hjælpelinjer i etikettens farve. + Draws guides as solid lines or as dots, including the guides already in the document. Tegner hjælpelinjer som hele linjer eller som prikker, også de hjælpelinjer, der allerede er i dokumentet. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Når den er slået til, er hjælpelinjerne låst, når VectorCraft starter; når indstillingen ændres, låses de eller låses op med det samme, og Vis › Hjælpelinjer › Lås hjælpelinjer ændrer stadig låsen. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Når den er slået til, laver Cmd/Ctrl holdt nede i starten af et træk fra en lineal en hjælpelinje kun på den aktive kunstplade, eller med tegnebrætværktøjet en hjælpelinje over hele lærredet. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Gitterets farve; linjerne mellem hovedgitterlinjerne tegnes i en svagere nuance af den. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Tegner gitteret som linjer eller som prikker langs hovedgitterlinjerne ved hver underinddeling. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Afstanden mellem hovedgitterlinjer i alle åbne dokumenter og i nye; et VectorCraft-dokument åbnes med det gitter, det blev gemt med. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Hvor mange dele hvert hovedgitterfelt deles i; Fastgør til gitter fastgør til disse dele, også når zoomniveauet skjuler deres linjer. + Draws the grid behind the artwork; off, the grid is drawn over it. Tegner gitteret bag illustrationen; slået fra tegnes gitteret oven på den. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. I pixel-forhåndsvisning ved 600 % zoom eller mere viser den aktive visning en linje ved kanten af hver dokumentpixel oven på illustrationen. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Farven på flisekanten og de stiplede farveprøvegrænser, der vises, mens du redigerer et mønster. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Fastgør tegning, flytning og transformering til nærliggende grafik og viser hjælpelinjer og etiketter; Pixel-forhåndsvisning slår dem fra, og Fastgør til gitter fastgør i stedet til gitteret. + The color of Smart Guide lines and labels. Farven på de smarte hjælpelinjers linjer og etiketter. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Viser en linje langs den kant eller midte, som grafikken flugter med; når den er slået fra, flugter grafikken stadig uden linjen, og Fastgør til tegn gælder ikke. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Med et markeringsværktøj får det ikke-markerede objekt under markøren en kontur i lagets farve, mens du ikke trækker. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Viser størrelsen eller vinklen ved markøren, mens du skalerer, roterer, vrider eller spejler grafik. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mens du tegner, fastgøres punkter til linjer i de valgte vinkler gennem det punkt, segmentet eller formen starter fra. + The set of angles the construction guides follow while Construction Guides is on. Det sæt vinkler, som konstruktionshjælpelinjerne følger, mens Konstruktionshjælpelinjer er slået til. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Navngiver det, et punkt fastgøres til, f.eks. et ankerpunkt, en kurve eller en justering; når den er slået fra, fastgøres punkter på samme måde uden navnene. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Viser afstande, vinkler og hvor langt grafikken er flyttet ved markøren, mens du tegner eller flytter. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Fastgør flyttet grafik eller grafik med ændret størrelse til samme mellemrum som mellem nærliggende objekter og markerer de ens mellemrum. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Når noget er markeret, viser Alt/Option holdt over et andet objekt eller en kunstplade afstandene mellem det og markeringen. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. En markering, der trækkes tilbage til inden for snap-tolerancen af stedet, hvor trækket begyndte, vender præcis tilbage dertil; en kopi gør ikke. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Hvor tæt på skærmen markøren eller et trukket punkt skal komme på grafik, for at de smarte hjælpelinjer fastgør til den; afstanden er den samme ved alle zoomniveauer. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Fastgør enden af et linjesegment eller en cirkel tegnet fra midten, så den rører en nærliggende kurve. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Fastgør enden af et linjesegment, så det møder et nærliggende lige segment i en ret vinkel. Reset all preferences to their defaults? Nulstil alle præferencer til standard? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Standardværdierne anvendes, når du klikker på OK i Præferencer. Annullér der beholder dine nuværende præferencer. Smaller ↔ Larger Mindre ↔ Større @@ -7238,6 +7301,11 @@ imageTrace Outline Kontur @msg PDF writer error: {0} PDF-skriverfejl: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Pakkede {n} fil i {folder} ({note})|Pakkede {n} filer i {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Forhåndsvisning i browser kræver skrivebordsappen (webversionen downloader filer i stedet) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 angiv `desiredK`, den ønskede filstørrelse i K (1024 byte): et tal over 0 og højst 1048576 +@msg `startWith` is `current` or `auto` `startWith` er `current` eller `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` er `allSlices`, `eachSlice` eller `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` er et udsnitsnummer fra `slice.list`, med `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimer til filstørrelse: der er intet billede at måle @msg Release Guides: no guides Frigiv hjælpelinjer: ingen hjælpelinjer @msg Release: no layer to put the rectangle in Frigiv: intet lag at lægge rektanglet i @msg Replace Spine: select a blend and a path Erstat rygrad: markér en blanding og en kurve @@ -8312,6 +8380,19 @@ mark-style Japanese Japansk Transform Objects Transformér objekter @msg unknown parameter `{key}`; did you mean `{near}`? ukendt parameter `{key}`; mente du `{near}`? @msg unknown parameter `{key}`; the command takes no parameters ukendt parameter `{key}`; kommandoen tager ingen parametre +@msg unknown parameter `{key}`; `{object}` takes: {keys} ukendt parameter `{key}`; `{object}` tager: {keys} +@msg unknown parameter `{key}`; {why_not} ukendt parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) intet format tager den (se document.formats) +@msg no save format takes it (see file.formatOptions) intet arkivformat tager den (se file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF tager den ikke (se document.formats) +@msg EPS doesn't take it (see document.formats) EPS tager den ikke (se document.formats) +@msg DXF doesn't take it (see document.formats) DXF tager den ikke (se document.formats) +@msg {name} must be {range} (got {v}) {name} skal være {range} (fik {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Den grafikprocessor, der blev prøvet først, kunne ikke vise vinduet, så VectorCraft startede igen med {summary} (Indstillinger › Ydeevne › Grafikprocessor › Automatisk bruger den, der driver din skærm) +@msg Sent “{title}” to {to} Sendte “{title}” til {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Sendte “{title}” til {to}. Svar fra udskriftskøen: {note} +@msg the default printer standardprinteren +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastereffekter på objekt {object}: anmodet om {requested} ppi, opnåede {achieved} ppi på grund af grænsen på 64 millioner pixel @msg unknown parameter `{key}`; the command takes: {keys} ukendt parameter `{key}`; kommandoen tager: {keys} Load EPS into Clipboard Indlæs EPS i udklipsholderen @msg an image of {w} × {h} pixels is too large to draw et billede på {w} × {h} pixels er for stort til at tegne diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index ccedd8def5..10147b2d45 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -180,6 +180,8 @@ antiAlias Sharp Scharf Crisp Klar Strong Stark Anti-aliasing: Glättung: + Art Optimized Für Grafik optimiert + Type Optimized Für Text optimiert Any Kind Beliebige Art Font Technology Schrifttechnologie font-technology Variable Variabel @@ -596,6 +598,8 @@ font-technology Variable Variabel Control Steuerung Convert Konvertieren Convert All Spot Colors to Process Alle Volltonfarben in Prozessfarben konvertieren + Convert {name} to process {name} in Prozessfarbe konvertieren + Keep {name} as spot {name} als Volltonfarbe beibehalten Convert All Strokes to Outlines Alle Konturen in Pfade umwandeln Convert All Text to Outlines Gesamten Text in Pfade umwandeln Convert Anchor Point Ankerpunkt umwandeln @@ -671,6 +675,9 @@ font-technology Variable Variabel Create from Selection Aus Auswahl erstellen Create From: Erstellen aus: Create Gradient Mesh… Verlaufsgitter erstellen… + Flat Flach + To Center Zur Mitte + To Edge Zum Rand Create Graph Diagramm erstellen Create New Layer Neue Ebene erstellen Create New Sublayer Neue Unterebene erstellen @@ -2678,6 +2685,18 @@ diagnostics ui Oberfläche Preview: Vorschau: Preview All Layers Vorschau aller Ebenen Preview in Browser Vorschau im Browser + Optimize to File Size… Auf Dateigröße optimieren… + Optimize to File Size Auf Dateigröße optimieren + Desired File Size: Gewünschte Dateigröße: + Start With: Beginnen mit: + Use: Verwenden: + Current Settings Aktuelle Einstellungen + Auto Select GIF/JPEG GIF/JPEG automatisch wählen + Total of All Slices Summe aller Slices + Each Slice Jedes Slice + Current Slice Aktuelles Slice + {size}, within {target} {size}, innerhalb von {target} + No setting tried fits in {target}; the smallest is {size} Keine getestete Einstellung passt in {target}; die kleinste ist {size} Preview in Browser needs the desktop app (the web downloads files instead) „Vorschau im Browser“ erfordert die Desktop-App (im Web werden stattdessen Dateien heruntergeladen) Preview Mode Vorschaumodus Preview the document as it is now Vorschau des Dokuments im aktuellen Zustand @@ -3058,12 +3077,53 @@ digits Malayalam Malayalam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Ist eine Symbolinstanz ausgewählt, verwendet das Bedienfeld „Transformieren“ den Registrierungspunkt des Symbols als Referenzpunkt. Darkens the canvas outside the artboards while the Artboard tool is active. Dunkelt die Arbeitsfläche außerhalb der Zeichenflächen ab, solange das Zeichenflächen-Werkzeug aktiv ist. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Ist „Bereich außerhalb der Zeichenfläche abblenden“ an, bleibt der Bereich außerhalb der Zeichenflächen dunkel, während Sie mit dem Zeichenflächen-Werkzeug ziehen. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Wie nah der Zeiger in Pixeln an einem Objekt, Ankerpunkt oder Griff sein muss, damit ein Klick es auswählt. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Ob das Rechteck des Auswahl-Werkzeugs berührte Objekte auswählt oder nur vollständig umschlossene; „Ziehrichtung“ wählt beim Ziehen nach rechts die umschlossenen. E kehrt die Regel beim Ziehen um. + A click selects a filled object only on its path, not inside its fill. Ein Klick wählt ein gefülltes Objekt nur auf seinem Pfad aus, nicht innerhalb seiner Fläche. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Wie nah ein Punkt in Pixeln einem Ankerpunkt oder einer Linealhilfslinie kommen muss, damit „An Punkt ausrichten“ ihn einrastet; bei eingeschalteten intelligenten Hilfslinien gilt stattdessen deren Einrasttoleranz. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Mit dem Auswahl-Werkzeug wählt Cmd/Ctrl-Klick das Objekt unter dem ausgewählten am Zeiger aus; jeder weitere Klick geht ein Objekt tiefer. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. „Einzoomen“ und „Auszoomen“ rücken die Mitte der Auswahl in die Mitte der Ansicht. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Gesperrtes und ausgeblendetes Bildmaterial in einer Zeichenfläche wird wie das übrige Bildmaterial mit der Zeichenfläche verschoben, skaliert und kopiert. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Die Größe von Ankerpunkten und Griffenden auf der Arbeitsfläche; größere Ankerpunkte lassen sich auch aus größerer Entfernung greifen. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Zeichnet die Enden der Richtungsgriffe als gefüllte Punkte, hohle Punkte oder größere gefüllte Punkte. + With the Direct Selection tool, the anchor under the pointer is highlighted. Mit dem Direktauswahl-Werkzeug wird der Ankerpunkt unter dem Zeiger hervorgehoben. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Zeigt Richtungsgriffe, wenn mehr als ein Ankerpunkt ausgewählt ist; ist die Option aus, erscheinen sie nur bei einem ausgewählten Ankerpunkt. + Corner widgets hide on corners whose angle is greater than this many degrees. Ecken-Widgets werden an Ecken ausgeblendet, deren Winkel größer als diese Gradzahl ist. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Der Zeichenstift zeigt das nächste Segment vom letzten Ankerpunkt bis zum Zeiger, bevor Sie klicken. + The Curvature tool previews the curve to the pointer before you place the next point. Der Kurvenzeichner zeigt die Kurve bis zum Zeiger, bevor Sie den nächsten Punkt setzen. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Die Einheit für neue Dokumente in den integrierten Größen außer Pixelgrößen und für geöffnete Dateien ohne gespeicherte Einheit; wenn Sie sie hier wählen und auf OK klicken, erhält auch das aktive Dokument diese Einheit. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Konturstärken, Striche und Lücken werden in dieser Einheit angezeigt, und dafür eingegebene Zahlen werden in ihr gelesen. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Schriftgrade, Zeilenabstand und Grundlinienversatz werden in dieser Einheit angezeigt, und dafür eingegebene Zahlen werden in ihr gelesen. The unit for East Asian type measurements, which no field uses yet. Die Einheit für Maße in ostasiatischem Text, die noch kein Feld verwendet. When on, a number typed without a unit into a field in picas is read in points. Wenn aktiviert, wird eine ohne Einheit eingegebene Zahl in einem Feld in Pica als Punkt gelesen. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Mit XML-ID werden Objektnamen in „Ebenen“, „Variablen“ und „Ebenenoptionen“ als XML-IDs angezeigt. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Richtet Zeichnen, Verschieben und Skalieren an den Unterteilungen des Rasters aus, auch wenn das Raster ausgeblendet ist; solange die Option an ist, wirkt „An Pixel ausrichten“ nicht. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Die Farbe nicht ausgewählter Hilfslinien; eine Zeichenfläche mit einer „Farbmarkierung der Hilfslinien“ zeichnet ihre eigenen Hilfslinien stattdessen in dieser Farbe. + Draws guides as solid lines or as dots, including the guides already in the document. Zeichnet Hilfslinien als durchgezogene Linien oder als Punkte, auch die Hilfslinien, die bereits im Dokument sind. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Ist die Option an, sind Hilfslinien beim Start von VectorCraft gesperrt; eine Änderung der Option sperrt oder entsperrt sie sofort, und „Ansicht › Hilfslinien › Hilfslinien sperren“ ändert die Sperre weiterhin. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Ist die Option an, erstellt Cmd/Ctrl zu Beginn eines Ziehens aus einem Lineal eine Hilfslinie nur auf der aktiven Zeichenfläche, mit dem Zeichenflächen-Werkzeug eine Hilfslinie für die ganze Arbeitsfläche. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Die Farbe des Rasters; die Linien zwischen den Hauptrasterlinien werden in einem blasseren Ton davon gezeichnet. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Zeichnet das Raster als Linien oder als Punkte entlang der Hauptrasterlinien an jeder Unterteilung. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Der Abstand zwischen den Hauptrasterlinien in jedem geöffneten Dokument und in neuen; ein VectorCraft-Dokument öffnet sich mit dem Raster, mit dem es gespeichert wurde. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. In wie viele Teile jedes Hauptrasterquadrat geteilt wird; „Am Raster ausrichten“ richtet an diesen Teilen aus, auch wenn der Zoom ihre Linien ausblendet. + Draws the grid behind the artwork; off, the grid is drawn over it. Zeichnet das Raster hinter dem Bildmaterial; ist die Option aus, wird das Raster darüber gezeichnet. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. In der Pixelvorschau ab 600 % Zoom zeigt die aktive Ansicht über dem Bildmaterial eine Linie am Rand jedes Dokumentpixels. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Die Farbe der Kachelkante und der gestrichelten Farbfeldbegrenzung, die beim Bearbeiten eines Musters angezeigt werden. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Richtet Zeichnen, Verschieben und Transformieren an nahem Bildmaterial aus und zeigt Hilfslinien und Beschriftungen; die Pixelvorschau schaltet sie aus, und „Am Raster ausrichten“ richtet stattdessen am Raster aus. + The color of Smart Guide lines and labels. Die Farbe der Linien und Beschriftungen intelligenter Hilfslinien. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Zeigt eine Linie an der Kante oder Mitte, an der Bildmaterial ausgerichtet ist; ist die Option aus, wird es ohne Linie ausgerichtet, und „An Glyphe ausrichten“ wirkt nicht. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Umrandet mit einem Auswahlwerkzeug das nicht ausgewählte Objekt unter dem Zeiger in seiner Ebenenfarbe, solange Sie nicht ziehen. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Zeigt beim Skalieren, Drehen, Verbiegen oder Spiegeln von Bildmaterial die Größe oder den Winkel neben dem Zeiger an. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Beim Zeichnen rasten Punkte an Linien in den gewählten Winkeln ein, die durch den Anfangspunkt des Segments oder der Form gehen. + The set of angles the construction guides follow while Construction Guides is on. Die Winkel, denen die Konstruktionslinien folgen, solange „Konstruktionslinien“ an ist. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Benennt, woran ein Punkt einrastet, etwa einen Ankerpunkt, einen Pfad oder eine Ausrichtung; ist die Option aus, rasten Punkte gleich ein, nur ohne Namen. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Zeigt beim Zeichnen oder Verschieben neben dem Zeiger Abstände, Winkel und wie weit das Bildmaterial bewegt wurde. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Richtet verschobenes oder in der Größe geändertes Bildmaterial am gleichen Abstand wie zwischen nahen Objekten aus und markiert die gleichen Abstände. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Ist etwas ausgewählt, zeigt Alt/Option über einem anderen Objekt oder einer Zeichenfläche die Abstände zwischen diesem und der Auswahl. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Eine Auswahl, die bis auf die Einrasttoleranz an den Beginn des Ziehens zurückgezogen wird, kehrt genau dorthin zurück; eine Kopie nicht. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Wie nah der Zeiger oder ein gezogener Punkt auf dem Bildschirm an Bildmaterial kommen muss, damit intelligente Hilfslinien einrasten; der Abstand ist bei jedem Zoom gleich. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Richtet das Ende eines Liniensegments oder einen von der Mitte aus gezeichneten Kreis so aus, dass er eine nahe Kurve berührt. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Richtet das Ende eines Liniensegments so aus, dass es ein nahes gerades Segment im rechten Winkel trifft. Reset all preferences to their defaults? Alle Voreinstellungen auf ihre Standardwerte zurücksetzen? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Die Standardwerte werden angewendet, wenn Sie in den Voreinstellungen auf OK klicken. Abbrechen dort behält Ihre aktuellen Voreinstellungen. Restore Recovered Documents Wiederhergestellte Dokumente öffnen @@ -4605,6 +4665,11 @@ liquify-list-end {0}, {1} {0} und {1} @msg PDF writer error: {0} Fehler beim Schreiben der PDF-Datei: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} Datei in {folder} verpackt ({note})|{n} Dateien in {folder} verpackt ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) „Vorschau im Browser“ erfordert die Desktop-App (im Web werden stattdessen Dateien heruntergeladen) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 Geben Sie `desiredK` an, die gewünschte Dateigröße in K (1024 Byte): eine Zahl über 0 und höchstens 1048576 +@msg `startWith` is `current` or `auto` `startWith` ist `current` oder `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` ist `allSlices`, `eachSlice` oder `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` ist eine Slice-Nummer aus `slice.list`, mit `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Auf Dateigröße optimieren: Es gibt kein Bild zum Messen @msg Release Guides: no guides Hilfslinien zurückwandeln: keine Hilfslinien @msg Release: no layer to put the rectangle in Zurückwandeln: keine Ebene, die das Rechteck aufnehmen könnte @msg Replace Spine: select a blend and a path Achse ersetzen: Wählen Sie eine Angleichung und einen Pfad aus @@ -5906,6 +5971,19 @@ lighting Light Licht Transform Objects Objekte transformieren @msg unknown parameter `{key}`; did you mean `{near}`? unbekannter Parameter `{key}`; meinten Sie `{near}`? @msg unknown parameter `{key}`; the command takes no parameters unbekannter Parameter `{key}`; der Befehl hat keine Parameter +@msg unknown parameter `{key}`; `{object}` takes: {keys} unbekannter Parameter `{key}`; `{object}` akzeptiert: {keys} +@msg unknown parameter `{key}`; {why_not} unbekannter Parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) kein Format akzeptiert ihn (siehe document.formats) +@msg no save format takes it (see file.formatOptions) kein Speicherformat akzeptiert ihn (siehe file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF akzeptiert ihn nicht (siehe document.formats) +@msg EPS doesn't take it (see document.formats) EPS akzeptiert ihn nicht (siehe document.formats) +@msg DXF doesn't take it (see document.formats) DXF akzeptiert ihn nicht (siehe document.formats) +@msg {name} must be {range} (got {v}) {name} muss {range} sein (erhalten: {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Der zuerst verwendete Grafikprozessor konnte das Fenster nicht anzeigen, daher wurde VectorCraft auf {summary} neu gestartet (Einstellungen › Leistung › Grafikprozessor › Automatisch verwendet den, der Ihren Bildschirm ansteuert) +@msg Sent “{title}” to {to} “{title}” an {to} gesendet +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” an {to} gesendet. Antwort der Druckwarteschlange: {note} +@msg the default printer den Standarddrucker +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap Rastereffekte auf Objekt {object}: {requested} ppi angefordert, {achieved} ppi erreicht wegen der Obergrenze von 64 Millionen Pixeln @msg unknown parameter `{key}`; the command takes: {keys} unbekannter Parameter `{key}`; der Befehl akzeptiert: {keys} @msg the params must be an object, not {got} die Parameter müssen ein Objekt sein, nicht {got} @msg unknown parameter `{path}`; the object takes no keys unbekannter Parameter `{path}`; das Objekt akzeptiert keine Schlüssel @@ -7442,6 +7520,10 @@ breakText Glyphs Glyphen @msg Some islands could not be joined to the area around the art Einige Inseln konnten nicht mit der Fläche um das Bildmaterial verbunden werden @msg `width` must be from {lo} to {hi} pt `width` muss zwischen {lo} und {hi} pt liegen @msg `angle` must be from -180 to 180 degrees `angle` muss zwischen -180 und 180 Grad liegen +@msg `roundness` must be from 0 to 100% `roundness` muss zwischen 0 und 100 % liegen +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` muss zwischen 0.01 und 100 pt liegen +@msg style must be "pencil" or "brush" style muss "pencil" oder "brush" sein +@msg extend end must be "start" or "end" Das Ende von extend muss "start" oder "end" sein @msg `roundness` must be from 1 to 100% `roundness` muss zwischen 1 und 100 % liegen @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` muss eine ganze Zahl von 1 bis {MAX_BRIDGES_PER_ISLAND} sein Weed Box and Lines… Entgitterrahmen und -linien… @@ -7812,8 +7894,6 @@ breakText Glyphs Glyphen @msg unknown dither `{d}` (diffusion, pattern, noise or none) unbekanntes Dithering `{d}` (diffusion, pattern, noise oder none) @msg unknown panel `{panel}` unbekanntes Bedienfeld `{panel}` @msg unknown parameter `{key}` unbekannter Parameter `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} unbekannter Parameter `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} unbekannter Parameter `{within}{key}`; {why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) unbekannte Reduzierung `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform oder document) @msg unmatched ')' ')' ohne Gegenstück @msg unterminated character class nicht abgeschlossene Zeichenklasse @@ -8182,7 +8262,6 @@ breakText Glyphs Glyphen @msg anchor `smooth` must be true or false Ankerpunkt-`smooth` muss true oder false sein @msg anchor `{key}` must be [x, y] Ankerpunkt-`{key}` muss [x, y] sein @msg anchor `{key}` must be a number Ankerpunkt-`{key}` muss eine Zahl sein -@msg angle and roundness must be finite angle und roundness müssen endlich sein @msg angles must be a list as long as pins (degrees or null) angles muss eine Liste so lang wie pins sein (Grad oder null) @msg appearance must be flat|center|edge appearance muss flat|center|edge sein @msg apply is "fill" or "stroke", not `{other}` apply ist „fill“ oder „stroke“, nicht `{other}` @@ -9235,7 +9314,6 @@ breakText Glyphs Glyphen @msg {label} must be a number from 1 to 10000 {label} muss eine Zahl von 1 bis 10000 sein @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} ist integriert und kann nicht gelöscht werden -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} muss {lo}–{hi}{unit} sein (erhalten: {v}) @msg {name}: CRC or size mismatch {name}: CRC oder Größe stimmt nicht überein @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}: nur die eingebettete Vorschau dieser Affinity-Datei konnte gelesen werden; verwenden Sie Datei › Öffnen, um sie mit ihrer Warnung zu sehen, oder exportieren Sie vor dem Platzieren SVG oder PDF aus Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index af13a82f93..1ebf6e5684 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -577,6 +577,8 @@ font-technology Variable Μεταβλητές Control Έλεγχος Convert Μετατροπή Convert All Spot Colors to Process Μετατροπή όλων των πλακάτων χρωμάτων σε χρώματα τετραχρωμίας + Convert {name} to process Μετατροπή του {name} σε χρώμα τετραχρωμίας + Keep {name} as spot Διατήρηση του {name} ως πλακάτου χρώματος Convert All Strokes to Outlines Μετατροπή όλων των περιγραμμάτων σε διαδρομές Convert All Text to Outlines Μετατροπή όλου του κειμένου σε περιγράμματα Convert Anchor Point Μετατροπή σημείου αγκύρωσης @@ -652,6 +654,9 @@ font-technology Variable Μεταβλητές Create from Selection Δημιουργία από επιλογή Create From: Δημιουργία από: Create Gradient Mesh… Δημιουργία πλέγματος ντεγκραντέ… + Flat Επίπεδο + To Center Προς το κέντρο + To Edge Προς την ακμή Create Graph Δημιουργία γραφήματος Create New Layer Δημιουργία νέου επιπέδου Create New Sublayer Δημιουργία νέου υποεπιπέδου @@ -2659,6 +2664,11 @@ liquify-list-end {0}, {1} {0} και {1} @msg PDF writer error: {0} Σφάλμα εγγραφής PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Συσκευάστηκε {n} αρχείο στον φάκελο {folder} ({note})|Συσκευάστηκαν {n} αρχεία στον φάκελο {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Η προεπισκόπηση σε πρόγραμμα περιήγησης απαιτεί την εφαρμογή υπολογιστή (η έκδοση ιστού πραγματοποιεί λήψη αρχείων) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 δώστε `desiredK`, το επιθυμητό μέγεθος αρχείου σε K (1024 byte): αριθμό πάνω από 0 και το πολύ 1048576 +@msg `startWith` is `current` or `auto` το `startWith` είναι `current` ή `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` το `use` είναι `allSlices`, `eachSlice` ή `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` το `slice` είναι αριθμός τομής από το `slice.list`, με `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Βελτιστοποίηση σε μέγεθος αρχείου: δεν υπάρχει εικόνα για μέτρηση @msg Release Guides: no guides Αποδέσμευση οδηγών: δεν υπάρχουν οδηγοί @msg Release: no layer to put the rectangle in Αποδέσμευση: δεν υπάρχει επίπεδο για να τοποθετηθεί το ορθογώνιο @msg Replace Spine: select a blend and a path Αντικατάσταση κεντρικής καμπύλης: επιλέξτε ανάμειξη και διαδρομή @@ -3568,6 +3578,18 @@ theme Appearance Εμφάνιση Presets you save with the Save Preset button appear here. Οι προεπιλογές που αποθηκεύετε με το κουμπί Αποθήκευση προεπιλογής εμφανίζονται εδώ. Preview All Layers Προεπισκόπηση όλων των επιπέδων Preview in Browser Προεπισκόπηση στο πρόγραμμα περιήγησης + Optimize to File Size… Βελτιστοποίηση σε μέγεθος αρχείου… + Optimize to File Size Βελτιστοποίηση σε μέγεθος αρχείου + Desired File Size: Επιθυμητό μέγεθος αρχείου: + Start With: Έναρξη με: + Use: Χρήση: + Current Settings Τρέχουσες ρυθμίσεις + Auto Select GIF/JPEG Αυτόματη επιλογή GIF/JPEG + Total of All Slices Σύνολο όλων των τομών + Each Slice Κάθε τομή + Current Slice Τρέχουσα τομή + {size}, within {target} {size}, εντός {target} + No setting tried fits in {target}; the smallest is {size} Καμία ρύθμιση που δοκιμάστηκε δεν χωρά σε {target}· η μικρότερη είναι {size} Preview in Browser needs the desktop app (the web downloads files instead) Η προεπισκόπηση στο πρόγραμμα περιήγησης απαιτεί την εφαρμογή υπολογιστή (στο web πραγματοποιείται λήψη αρχείων) Preview Mode Λειτουργία προεπισκόπησης Preview the document as it is now Προεπισκόπηση του εγγράφου στην τρέχουσα κατάστασή του @@ -3873,12 +3895,53 @@ digits Malayalam Μαλαγιάλαμ With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Όταν είναι επιλεγμένη μία παρουσία συμβόλου, το πλαίσιο Μετασχηματισμός χρησιμοποιεί το σημείο καταχώρισης του συμβόλου ως σημείο αναφοράς. Darkens the canvas outside the artboards while the Artboard tool is active. Σκουραίνει τον καμβά έξω από τους πίνακες σχεδίασης όσο είναι ενεργό το εργαλείο Πίνακας σχεδίασης. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Όταν είναι ενεργή η Σκίαση περιοχής εκτός πίνακα σχεδίασης, η περιοχή έξω από τους πίνακες σχεδίασης μένει σκοτεινή όσο σύρετε με το εργαλείο Πίνακας σχεδίασης. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Πόσο κοντά, σε εικονοστοιχεία, πρέπει να είναι ο δείκτης σε αντικείμενο, σημείο αγκύρωσης ή λαβή για να το επιλέξει ένα κλικ. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Αν το πλαίσιο του εργαλείου Επιλογή επιλέγει τα αντικείμενα που αγγίζει ή μόνο όσα είναι πλήρως μέσα· η Κατεύθυνση σύρσης επιλέγει όσα είναι μέσα όταν σύρετε δεξιά. Το E αντιστρέφει τον κανόνα κατά τη σύρση. + A click selects a filled object only on its path, not inside its fill. Ένα κλικ επιλέγει ένα γεμάτο αντικείμενο μόνο πάνω στη διαδρομή του, όχι μέσα στο γέμισμα. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Πόσο κοντά, σε εικονοστοιχεία, πρέπει να φτάσει ένα σημείο σε σημείο αγκύρωσης ή οδηγό χάρακα για να το προσκολλήσει η Προσκόλληση σε σημείο· με τους έξυπνους οδηγούς ενεργούς ισχύει η δική τους ανοχή προσκόλλησης. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Με το εργαλείο Επιλογή, το Cmd/Ctrl-κλικ επιλέγει το αντικείμενο κάτω από το επιλεγμένο στο σημείο του δείκτη· κάθε επόμενο κλικ πηγαίνει ένα αντικείμενο βαθύτερα. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Η Μεγέθυνση και η Σμίκρυνση φέρνουν το κέντρο της επιλογής στη μέση της προβολής. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Τα κλειδωμένα και κρυφά γραφικά μέσα σε έναν πίνακα σχεδίασης μετακινούνται, κλιμακώνονται και αντιγράφονται μαζί του, όπως τα υπόλοιπα γραφικά. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Το μέγεθος των σημείων αγκύρωσης και των άκρων των λαβών κατεύθυνσης στον καμβά· μεγαλύτερα σημεία αγκύρωσης πιάνονται και από πιο μακριά. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Σχεδιάζει τα άκρα των λαβών κατεύθυνσης ως γεμάτες κουκκίδες, κούφιες κουκκίδες ή μεγαλύτερες γεμάτες κουκκίδες. + With the Direct Selection tool, the anchor under the pointer is highlighted. Με το εργαλείο Άμεση επιλογή, το σημείο αγκύρωσης κάτω από τον δείκτη επισημαίνεται. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Εμφανίζει τις λαβές κατεύθυνσης όταν είναι επιλεγμένα περισσότερα από ένα σημεία αγκύρωσης· όταν είναι ανενεργό, εμφανίζονται μόνο με ένα επιλεγμένο σημείο αγκύρωσης. + Corner widgets hide on corners whose angle is greater than this many degrees. Τα χειριστήρια γωνιών κρύβονται σε γωνίες μεγαλύτερες από αυτές τις μοίρες. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Το εργαλείο Πένα δείχνει το επόμενο τμήμα από το τελευταίο σημείο αγκύρωσης ως τον δείκτη πριν κάνετε κλικ. + The Curvature tool previews the curve to the pointer before you place the next point. Το εργαλείο Καμπυλότητα δείχνει την καμπύλη ως τον δείκτη πριν τοποθετήσετε το επόμενο σημείο. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Η μονάδα για τα νέα έγγραφα από ενσωματωμένα μεγέθη, εκτός από μεγέθη σε εικονοστοιχεία, και για τα ανοιγμένα αρχεία χωρίς καταγεγραμμένη μονάδα· αν την επιλέξετε εδώ και πατήσετε Εντάξει, γίνεται και μονάδα του ενεργού εγγράφου. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Τα πάχη περιγράμματος, οι παύλες και τα διάκενα εμφανίζονται σε αυτή τη μονάδα και οι αριθμοί που πληκτρολογούνται γι’ αυτά διαβάζονται σε αυτή. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Τα μεγέθη κειμένου, το διάστιχο και η μετατόπιση γραμμής βάσης εμφανίζονται σε αυτή τη μονάδα και οι αριθμοί που πληκτρολογούνται γι’ αυτά διαβάζονται σε αυτή. The unit for East Asian type measurements, which no field uses yet. Η μονάδα για τις μετρήσεις κειμένου Ανατολικής Ασίας, την οποία δεν χρησιμοποιεί ακόμη κανένα πεδίο. When on, a number typed without a unit into a field in picas is read in points. Όταν είναι ενεργό, ένας αριθμός που πληκτρολογείται χωρίς μονάδα σε πεδίο σε πίκες διαβάζεται σε σημεία. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Με το Αναγνωριστικό XML, τα ονόματα αντικειμένων εμφανίζονται ως αναγνωριστικά XML στα Επίπεδα, στις Μεταβλητές και στις Επιλογές επιπέδου. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Προσκολλά τη σχεδίαση, τη μετακίνηση και την κλιμάκωση στις υποδιαιρέσεις του πλέγματος, ακόμη και όταν το πλέγμα είναι κρυφό· όσο είναι ενεργό, η Προσκόλληση σε εικονοστοιχείο δεν ισχύει. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Το χρώμα των οδηγών που δεν είναι επιλεγμένοι· ένας πίνακας σχεδίασης με Ετικέτα οδηγών σχεδιάζει τους δικούς του οδηγούς στο χρώμα της ετικέτας. + Draws guides as solid lines or as dots, including the guides already in the document. Σχεδιάζει τους οδηγούς ως συνεχείς γραμμές ή ως κουκκίδες, μαζί με τους οδηγούς που υπάρχουν ήδη στο έγγραφο. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Όταν είναι ενεργό, οι οδηγοί κλειδώνονται κατά την εκκίνηση του VectorCraft· η αλλαγή της επιλογής τους κλειδώνει ή τους ξεκλειδώνει αμέσως, και το Προβολή › Οδηγοί › Κλείδωμα οδηγών αλλάζει ακόμη το κλείδωμα. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Όταν είναι ενεργό, το Cmd/Ctrl πατημένο στην αρχή μιας μεταφοράς από χάρακα δημιουργεί οδηγό μόνο στον ενεργό πίνακα σχεδίασης, ή οδηγό σε όλο τον καμβά με το εργαλείο πίνακα σχεδίασης. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Το χρώμα του πλέγματος· οι γραμμές ανάμεσα στις κύριες γραμμές πλέγματος σχεδιάζονται σε πιο αχνή απόχρωσή του. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Σχεδιάζει το πλέγμα ως γραμμές ή ως κουκκίδες κατά μήκος των κύριων γραμμών πλέγματος σε κάθε υποδιαίρεση. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Η απόσταση ανάμεσα στις κύριες γραμμές πλέγματος σε κάθε ανοιχτό έγγραφο και στα νέα· ένα έγγραφο VectorCraft ανοίγει με το πλέγμα με το οποίο αποθηκεύτηκε. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Σε πόσα μέρη χωρίζεται κάθε κύριο τετράγωνο του πλέγματος· η Προσκόλληση στο πλέγμα προσκολλά σε αυτά τα μέρη, ακόμη κι όταν το ζουμ κρύβει τις γραμμές τους. + Draws the grid behind the artwork; off, the grid is drawn over it. Σχεδιάζει το πλέγμα πίσω από το έργο· όταν είναι ανενεργό, το πλέγμα σχεδιάζεται από πάνω του. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Στην Προεπισκόπηση εικονοστοιχείων με ζουμ 600% ή περισσότερο, η ενεργή προβολή δείχνει πάνω από το έργο μια γραμμή στην άκρη κάθε εικονοστοιχείου του εγγράφου. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Το χρώμα της ακμής του πλακιδίου και των διακεκομμένων ορίων του δείγματος χρώματος που εμφανίζονται όσο επεξεργάζεστε ένα μοτίβο. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Προσκολλά τη σχεδίαση, τη μετακίνηση και τον μετασχηματισμό σε κοντινά γραφικά και εμφανίζει οδηγούς και ετικέτες· η Προεπισκόπηση εικονοστοιχείων τούς απενεργοποιεί, και η Προσκόλληση στο πλέγμα προσκολλά στο πλέγμα αντί γι’ αυτούς. + The color of Smart Guide lines and labels. Το χρώμα των γραμμών και των ετικετών των έξυπνων οδηγών. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Εμφανίζει μια γραμμή κατά μήκος της ακμής ή του κέντρου με το οποίο ευθυγραμμίζονται τα γραφικά· όταν είναι ανενεργό, ευθυγραμμίζονται χωρίς τη γραμμή, και η Προσκόλληση σε γλυφή δεν ισχύει. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Με ένα εργαλείο επιλογής, περιγράφει το μη επιλεγμένο αντικείμενο κάτω από τον δείκτη με το χρώμα του επιπέδου του, όσο δεν σύρετε. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Εμφανίζει το μέγεθος ή τη γωνία δίπλα στον δείκτη όσο αλλάζετε κλίμακα, περιστρέφετε, εφαρμόζετε διάτμηση ή κατοπτρίζετε γραφικά. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Όσο σχεδιάζετε, τα σημεία προσκολλώνται σε γραμμές στις επιλεγμένες γωνίες μέσω του σημείου από το οποίο ξεκινά το τμήμα ή το σχήμα. + The set of angles the construction guides follow while Construction Guides is on. Το σύνολο γωνιών που ακολουθούν οι οδηγοί κατασκευής όσο οι Οδηγοί κατασκευής είναι ενεργοί. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Ονομάζει σε τι προσκολλάται ένα σημείο, όπως σημείο αγκύρωσης, διαδρομή ή στοίχιση· όταν είναι ανενεργό, τα σημεία προσκολλώνται με τον ίδιο τρόπο χωρίς τα ονόματα. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Εμφανίζει δίπλα στον δείκτη αποστάσεις, γωνίες και πόσο μετακινήθηκαν τα γραφικά όσο σχεδιάζετε ή μετακινείτε. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Προσκολλά γραφικά που μετακινούνται ή αλλάζουν μέγεθος στο ίδιο κενό με αυτό ανάμεσα σε κοντινά αντικείμενα και σημειώνει τα ίσα κενά. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Με κάτι επιλεγμένο, κρατώντας πατημένο το Alt/Option πάνω από άλλο αντικείμενο ή πίνακα σχεδίασης εμφανίζονται οι αποστάσεις ανάμεσα σε αυτό και την επιλογή. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Μια επιλογή που σύρεται πίσω εντός της ανοχής προσκόλλησης από το σημείο όπου ξεκίνησε η μεταφορά επιστρέφει ακριβώς εκεί· ένα αντίγραφο όχι. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Πόσο κοντά στην οθόνη πρέπει να φτάσει ο δείκτης ή ένα σημείο που σύρεται σε γραφικά για να προσκολληθούν οι έξυπνοι οδηγοί· η απόσταση είναι ίδια σε κάθε ζουμ. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Προσκολλά το άκρο ενός ευθύγραμμου τμήματος ή έναν κύκλο που σχεδιάζεται από το κέντρο του ώστε να αγγίζει μια κοντινή καμπύλη. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Προσκολλά το άκρο ενός ευθύγραμμου τμήματος ώστε να συναντά ένα κοντινό ευθύ τμήμα σε ορθή γωνία. Reset all preferences to their defaults? Επαναφορά όλων των προτιμήσεων στις προεπιλογές τους; The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Οι προεπιλογές εφαρμόζονται όταν κάνετε κλικ στο Εντάξει στις Προτιμήσεις. Το Ακύρωση εκεί διατηρεί τις τρέχουσες προτιμήσεις σας. Restore Recovered Documents Επαναφορά ανακτημένων εγγράφων @@ -5723,6 +5786,19 @@ digits Malayalam Μαλαγιάλαμ Transform Objects Μετασχηματισμός αντικειμένων @msg unknown parameter `{key}`; did you mean `{near}`? άγνωστη παράμετρος `{key}`· μήπως εννοείτε `{near}`; @msg unknown parameter `{key}`; the command takes no parameters άγνωστη παράμετρος `{key}`· η εντολή δεν δέχεται παραμέτρους +@msg unknown parameter `{key}`; `{object}` takes: {keys} άγνωστη παράμετρος `{key}`· το `{object}` δέχεται: {keys} +@msg unknown parameter `{key}`; {why_not} άγνωστη παράμετρος `{key}`· {why_not} +@msg no format takes it (see document.formats) καμία μορφή δεν τη δέχεται (δείτε document.formats) +@msg no save format takes it (see file.formatOptions) καμία μορφή αποθήκευσης δεν τη δέχεται (δείτε file.formatOptions) +@msg PDF doesn't take it (see document.formats) το PDF δεν τη δέχεται (δείτε document.formats) +@msg EPS doesn't take it (see document.formats) το EPS δεν τη δέχεται (δείτε document.formats) +@msg DXF doesn't take it (see document.formats) το DXF δεν τη δέχεται (δείτε document.formats) +@msg {name} must be {range} (got {v}) το {name} πρέπει να είναι {range} (δόθηκε {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Ο αρχικός επεξεργαστής γραφικών δεν μπόρεσε να εμφανίσει το παράθυρο και το VectorCraft επανεκκίνησε στον {summary} (Ρυθμίσεις › Επιδόσεις › Επεξεργαστής γραφικών › Αυτόματο: χρησιμοποιεί αυτόν που οδηγεί την οθόνη σας) +@msg Sent “{title}” to {to} Το “{title}” στάλθηκε: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Το “{title}” στάλθηκε: {to}. Απάντηση της ουράς εκτύπωσης: {note} +@msg the default printer προεπιλεγμένος εκτυπωτής +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap εφέ ράστερ στο αντικείμενο {object}: ζητήθηκαν {requested} ppi, επιτεύχθηκαν {achieved} ppi λόγω του ορίου των 64 εκατομμυρίων pixel @msg unknown parameter `{key}`; the command takes: {keys} άγνωστη παράμετρος `{key}`· η εντολή δέχεται: {keys} @msg the params must be an object, not {got} οι παράμετροι πρέπει να είναι αντικείμενο, όχι {got} @msg unknown parameter `{path}`; the object takes no keys άγνωστη παράμετρος `{path}`· το αντικείμενο δεν δέχεται κλειδιά @@ -7847,6 +7923,11 @@ breakText Glyphs Γλύφοι @msg Some islands could not be joined to the area around the art Ορισμένες νησίδες δεν ήταν δυνατό να συνδεθούν με την περιοχή γύρω από το γραφικό @msg `width` must be from {lo} to {hi} pt Το `width` πρέπει να είναι από {lo} έως {hi} pt @msg `angle` must be from -180 to 180 degrees Το `angle` πρέπει να είναι από -180 έως 180 μοίρες +@msg `roundness` must be from 0 to 100% Το `roundness` πρέπει να είναι από 0 έως 100% +@msg `fidelity` must be from 0.01 to 100 pt Το `fidelity` πρέπει να είναι από 0.01 έως 100 pt +@msg style must be "pencil" or "brush" Το style πρέπει να είναι "pencil" ή "brush" +@msg extend end must be "start" or "end" Το άκρο του extend πρέπει να είναι "start" ή "end" +@msg connect end must be "start" or "end" Το άκρο του connect πρέπει να είναι "start" ή "end" @msg `roundness` must be from 1 to 100% Το `roundness` πρέπει να είναι από 1 έως 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} Το `count` πρέπει να είναι ακέραιος από 1 έως {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Πλαίσιο και γραμμές αφαίρεσης περισσευμάτων… diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 42018b5f2c..a456910a16 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -618,6 +618,8 @@ font-technology Variable Variables Control Control Convert Convertir Convert All Spot Colors to Process Convertir todas las tintas planas en cuatricromía + Convert {name} to process Convertir {name} en cuatricromía + Keep {name} as spot Mantener {name} como tinta plana Convert All Strokes to Outlines Convertir todos los trazos en contornos Convert All Text to Outlines Convertir todo el texto en contornos Convert Anchor Point Convertir punto de ancla @@ -693,6 +695,9 @@ font-technology Variable Variables Create from Selection Crear a partir de la selección Create From: Crear a partir de: Create Gradient Mesh… Crear malla de degradado… + Flat Plano + To Center Hacia el centro + To Edge Hacia el borde Create Graph Crear gráfico Create New Layer Crear capa nueva Create New Sublayer Crear subcapa nueva @@ -2721,6 +2726,18 @@ font-technology Variable Variables Preview: Vista previa: Preview All Layers Previsualizar todas las capas Preview in Browser Previsualizar en el navegador + Optimize to File Size… Optimizar según tamaño de archivo… + Optimize to File Size Optimizar según tamaño de archivo + Desired File Size: Tamaño de archivo deseado: + Start With: Empezar con: + Use: Usar: + Current Settings Ajustes actuales + Auto Select GIF/JPEG Selección automática GIF/JPEG + Total of All Slices Total de todos los sectores + Each Slice Cada sector + Current Slice Sector actual + {size}, within {target} {size}, dentro de {target} + No setting tried fits in {target}; the smallest is {size} Ningún ajuste probado cabe en {target}; el menor es {size} Preview in Browser needs the desktop app (the web downloads files instead) Previsualizar en el navegador requiere la aplicación de escritorio (la versión web descarga los archivos) Preview Mode Modo de vista previa Preview the document as it is now Previsualizar el documento tal como está ahora @@ -3098,12 +3115,53 @@ digits Malayalam Malayálam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Con una instancia de símbolo seleccionada, el panel Transformar usa el punto de registro del símbolo como punto de referencia. Darkens the canvas outside the artboards while the Artboard tool is active. Oscurece el lienzo fuera de las mesas de trabajo mientras la herramienta Mesa de trabajo está activa. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Con Atenuar región fuera de la mesa de trabajo activado, el área fuera de las mesas de trabajo sigue oscura mientras arrastra con la herramienta Mesa de trabajo. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Qué tan cerca, en píxeles, debe estar el puntero de un objeto, ancla o manejador para que un clic lo seleccione. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Si el recuadro de la herramienta Selección selecciona los objetos que toca o solo los que quedan totalmente dentro; Dirección de arrastre selecciona los de dentro al arrastrar a la derecha. E invierte la regla al arrastrar. + A click selects a filled object only on its path, not inside its fill. Un clic selecciona un objeto relleno solo en su trazado, no dentro de su relleno. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Qué tan cerca, en píxeles, debe llegar un punto a un ancla o guía de regla para que Ajustar a punto lo ajuste; con las guías inteligentes activadas se aplica su tolerancia de ajuste. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Con la herramienta Selección, Cmd/Ctrl+clic selecciona el objeto que está debajo del seleccionado en el puntero; cada clic siguiente baja un objeto más. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Acercar y Alejar llevan el centro de la selección al medio de la vista. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. La ilustración bloqueada y oculta dentro de una mesa de trabajo se mueve, se escala y se copia con ella, como el resto de la ilustración. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. El tamaño de los puntos de ancla y de los extremos de los manejadores de dirección en el lienzo; las anclas más grandes también se pueden tomar desde más lejos. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Dibuja los extremos de los manejadores de dirección como puntos rellenos, puntos huecos o puntos rellenos más grandes. + With the Direct Selection tool, the anchor under the pointer is highlighted. Con la herramienta Selección directa, el ancla bajo el puntero se resalta. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Muestra los manejadores de dirección cuando hay más de un ancla seleccionada; desactivado, solo se muestran con una sola ancla seleccionada. + Corner widgets hide on corners whose angle is greater than this many degrees. Los widgets de esquina se ocultan en las esquinas cuyo ángulo supera estos grados. + The Pen tool previews the next segment from the last anchor to the pointer before you click. La herramienta Pluma muestra el siguiente segmento desde la última ancla hasta el puntero antes de hacer clic. + The Curvature tool previews the curve to the pointer before you place the next point. La herramienta Curvatura muestra la curva hasta el puntero antes de colocar el siguiente punto. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. La unidad de los documentos nuevos de tamaños predefinidos, salvo los tamaños en píxeles, y de los archivos abiertos que no registran ninguna unidad; si la elige aquí y hace clic en Aceptar, también pasa a ser la unidad del documento activo. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Los grosores de trazo, los guiones y los huecos se muestran en esta unidad, y los números que se escriben para ellos se leen en ella. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Los tamaños de texto, el interlineado y el desplazamiento de línea de base se muestran en esta unidad, y los números que se escriben para ellos se leen en ella. The unit for East Asian type measurements, which no field uses yet. La unidad para las medidas del texto de Asia oriental, que todavía no usa ningún campo. When on, a number typed without a unit into a field in picas is read in points. Si está activado, un número escrito sin unidad en un campo en picas se lee en puntos. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Con ID XML, los nombres de los objetos se muestran como ID XML en Capas, Variables y Opciones de capa. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Ajusta el dibujo, el desplazamiento y el escalado a las subdivisiones de la cuadrícula, aunque la cuadrícula esté oculta; mientras está activado, Ajustar a píxel no se aplica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. El color de las guías no seleccionadas; una mesa de trabajo con una Etiqueta de las guías dibuja sus propias guías en el color de la etiqueta. + Draws guides as solid lines or as dots, including the guides already in the document. Dibuja las guías como líneas continuas o como puntos, incluidas las guías que ya están en el documento. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Con esta opción activada, las guías quedan bloqueadas al iniciar VectorCraft; cambiar la opción las bloquea o desbloquea al momento, y Ver › Guías › Bloquear guías sigue cambiando el bloqueo. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Con esta opción activada, mantener pulsada Cmd/Ctrl al empezar a arrastrar desde una regla crea una guía solo en la mesa de trabajo activa, o una guía de todo el lienzo con la herramienta Mesa de trabajo. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. El color de la cuadrícula; las líneas entre las líneas principales se dibujan en un tono más tenue de ese color. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Dibuja la cuadrícula como líneas, o como puntos a lo largo de las líneas principales en cada subdivisión. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distancia entre las líneas principales de la cuadrícula, en todos los documentos abiertos y en los nuevos; un documento de VectorCraft se abre con la cuadrícula con la que se guardó. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. En cuántas partes se divide cada cuadrado principal de la cuadrícula; Ajustar a cuadrícula se ajusta a esas partes, aunque el zoom oculte sus líneas. + Draws the grid behind the artwork; off, the grid is drawn over it. Dibuja la cuadrícula detrás de la ilustración; desactivada, la cuadrícula se dibuja encima. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. En la vista previa de píxeles, con un zoom del 600% o más, la vista activa muestra sobre la ilustración una línea en el borde de cada píxel del documento. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. El color del borde del mosaico y de los límites discontinuos de la muestra que se ven mientras edita un motivo. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Ajusta el dibujo, el desplazamiento y la transformación a la ilustración cercana y muestra guías y etiquetas; la vista previa de píxeles las desactiva, y Ajustar a cuadrícula ajusta a la cuadrícula en su lugar. + The color of Smart Guide lines and labels. El color de las líneas y etiquetas de las guías inteligentes. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Muestra una línea a lo largo del borde o el centro con el que se alinea la ilustración; desactivada, la ilustración se sigue alineando sin la línea, y Ajustar a glifo no se aplica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Con una herramienta de selección, contornea el objeto no seleccionado bajo el puntero con el color de su capa mientras no arrastra. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Muestra el tamaño o el ángulo junto al puntero mientras escala, gira, inclina o refleja la ilustración. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mientras dibuja, los puntos se ajustan a líneas con los ángulos elegidos que pasan por el punto donde empieza el segmento o la forma. + The set of angles the construction guides follow while Construction Guides is on. El conjunto de ángulos que siguen las guías de construcción mientras Guías de construcción está activado. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nombra a qué se ajusta un punto, como un punto de ancla, un trazado o una alineación; desactivado, los puntos se ajustan igual, sin los nombres. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Muestra junto al puntero distancias, ángulos y cuánto se ha movido la ilustración mientras dibuja o mueve. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Ajusta la ilustración movida o redimensionada a la misma separación que hay entre objetos cercanos y marca las separaciones iguales. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Con algo seleccionado, mantener pulsada Alt/Option sobre otro objeto o una mesa de trabajo muestra las distancias entre este y la selección. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Una selección arrastrada de vuelta hasta la tolerancia de ajuste del lugar donde empezó el arrastre vuelve exactamente a ese lugar; una copia no. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Cuánto debe acercarse en pantalla el puntero o un punto arrastrado a la ilustración para que las guías inteligentes se ajusten a ella; la distancia es la misma con cualquier zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Ajusta el extremo de un segmento de línea, o un círculo dibujado desde su centro, para que toque una curva cercana. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Ajusta el extremo de un segmento de línea para que encuentre un segmento recto cercano en ángulo recto. Reset all preferences to their defaults? ¿Restablecer todas las preferencias a sus valores predeterminados? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Los valores predeterminados se aplican al hacer clic en Aceptar en Preferencias. Cancelar ahí conserva sus preferencias actuales. Restore Recovered Documents Restaurar documentos recuperados @@ -4711,6 +4769,11 @@ liquify-list-end {0}, {1} {0}, {1} @msg PDF writer error: {0} error del escritor de PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Se empaquetó {n} archivo en {folder} ({note})|Se empaquetaron {n} archivos en {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Previsualizar en el navegador requiere la aplicación de escritorio (la versión web descarga los archivos) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indica `desiredK`, el tamaño de archivo deseado en K (1024 bytes): un número mayor que 0 y como máximo 1048576 +@msg `startWith` is `current` or `auto` `startWith` es `current` o `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` es `allSlices`, `eachSlice` o `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` es un número de sector de `slice.list`, con `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimizar según tamaño de archivo: no hay ninguna imagen que medir @msg Release Guides: no guides Soltar guías: no hay guías @msg Release: no layer to put the rectangle in Soltar: no hay ninguna capa donde poner el rectángulo @msg Replace Spine: select a blend and a path Reemplazar eje: selecciona una fusión y un trazado @@ -6303,6 +6366,19 @@ mark-style Japanese Japonesas Transform Objects Transformar objetos @msg unknown parameter `{key}`; did you mean `{near}`? parámetro desconocido `{key}`; ¿quiso decir `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parámetro desconocido `{key}`; el comando no tiene parámetros +@msg unknown parameter `{key}`; `{object}` takes: {keys} parámetro desconocido `{key}`; `{object}` acepta: {keys} +@msg unknown parameter `{key}`; {why_not} parámetro desconocido `{key}`; {why_not} +@msg no format takes it (see document.formats) ningún formato lo acepta (consulte document.formats) +@msg no save format takes it (see file.formatOptions) ningún formato de guardado lo acepta (consulte file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF no lo acepta (consulte document.formats) +@msg EPS doesn't take it (see document.formats) EPS no lo acepta (consulte document.formats) +@msg DXF doesn't take it (see document.formats) DXF no lo acepta (consulte document.formats) +@msg {name} must be {range} (got {v}) {name} debe ser {range} (se recibió {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) El procesador gráfico probado primero no pudo mostrar la ventana, así que VectorCraft se inició de nuevo con {summary} (Ajustes › Rendimiento › Procesador gráfico › Automático usa el que controla su pantalla) +@msg Sent “{title}” to {to} Se envió “{title}” a {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Se envió “{title}” a {to}. Respuesta de la cola de impresión: {note} +@msg the default printer la impresora predeterminada +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efectos de rasterizado en el objeto {object}: se solicitaron {requested} ppi y se alcanzaron {achieved} ppi debido al límite de 64 millones de píxeles @msg unknown parameter `{key}`; the command takes: {keys} parámetro desconocido `{key}`; el comando acepta: {keys} @msg the params must be an object, not {got} los parámetros deben ser un objeto, no {got} @msg unknown parameter `{path}`; the object takes no keys parámetro desconocido `{path}`; el objeto no acepta claves @@ -7952,6 +8028,11 @@ breakText Glyphs Glifos @msg Some islands could not be joined to the area around the art Algunas islas no se pudieron unir al área que rodea la ilustración @msg `width` must be from {lo} to {hi} pt `width` debe estar entre {lo} y {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` debe estar entre -180 y 180 grados +@msg `roundness` must be from 0 to 100% `roundness` debe estar entre 0 y 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` debe estar entre 0.01 y 100 pt +@msg style must be "pencil" or "brush" style debe ser "pencil" o "brush" +@msg extend end must be "start" or "end" el extremo de extend debe ser "start" o "end" +@msg connect end must be "start" or "end" el extremo de connect debe ser "start" o "end" @msg `roundness` must be from 1 to 100% `roundness` debe estar entre 1 y 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` debe ser un número entero entre 1 y {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Caja y líneas de pelado… diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 39fc4744fb..bff46fc0d7 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -231,6 +231,9 @@ Mask Maski Rasterize… Rasteroi… Create Gradient Mesh… Luo liukuväriverkko… + Flat Tasainen + To Center Keskustaa kohti + To Edge Reunaa kohti Create Object Mosaic… Luo objektimosaiikki… Vector Halftone… Vektorirasterointi… Create Trim Marks Luo leikkuumerkit @@ -1169,6 +1172,18 @@ lighting Light Valo Placement Options… Sijoitusasetukset… Plug-in… Laajennus… Preview in Browser Esikatsele selaimessa + Optimize to File Size… Optimoi tiedostokokoon… + Optimize to File Size Optimoi tiedostokokoon + Desired File Size: Haluttu tiedostokoko: + Start With: Aloita: + Use: Käytä: + Current Settings Nykyiset asetukset + Auto Select GIF/JPEG Valitse GIF/JPEG automaattisesti + Total of All Slices Kaikki siivut yhteensä + Each Slice Jokainen siivu + Current Slice Nykyinen siivu + {size}, within {target} {size}, enintään {target} + No setting tried fits in {target}; the smallest is {size} Mikään kokeiltu asetus ei mahdu kokoon {target}; pienin on {size} Printer Setup… Tulostimen asetukset… Printers Tulostimet Recent File Viimeisin tiedosto @@ -2869,6 +2884,8 @@ digits Malayalam Malajalam Collate Lajittele Composite colours are converted to it; separations separate with it when it is a CMYK profile. Yhdistelmävärit muunnetaan siihen; erottelut tehdään sen mukaan, kun se on CMYK-profiili. Convert All Spot Colors to Process Muunna kaikki spottivärit prosessiväreiksi + Convert {name} to process Muunna {name} prosessiväriksi + Keep {name} as spot Säilytä {name} spottivärinä Default Printer Oletustulostin Document Ink Options Asiakirjan musteasetukset Download: Lataus: @@ -4468,12 +4485,53 @@ font-technology Variable Muuttuvat With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Kun yksi symbolin esiintymä on valittuna, Muunna-paneeli käyttää symbolin kohdistuspistettä viitepisteenä. Darkens the canvas outside the artboards while the Artboard tool is active. Tummentaa piirtopinnan piirtoalustojen ulkopuolelta, kun Piirtoalusta-työkalu on käytössä. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Kun Himmennä piirtoalustan ulkopuolinen alue on käytössä, piirtoalustojen ulkopuolinen alue pysyy tummana, kun vedät Piirtoalusta-työkalulla. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Kuinka lähellä, pikseleinä, osoittimen on oltava objektia, ankkuripistettä tai kahvaa, jotta napsautus valitsee sen. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Valitseeko valintatyökalun kehys objektit, joita se koskettaa, vai vain kokonaan sisällä olevat; Vetosuunta valitsee sisällä olevat, kun vedät oikealle. E kääntää säännön vedon aikana. + A click selects a filled object only on its path, not inside its fill. Napsautus valitsee täytetyn objektin vain sen polulta, ei täytön sisältä. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Kuinka lähelle, pikseleinä, pisteen on tultava ankkuripistettä tai viivaimen apuviivaa, jotta Kohdista pisteeseen kohdistaa sen; kun älykkäät apuviivat ovat käytössä, käytetään niiden tartuntatoleranssia. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Valintatyökalulla Cmd/Ctrl-napsautus valitsee valitun alla olevan objektin osoittimen kohdalta; jokainen seuraava napsautus menee yhden objektin syvemmälle. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Lähennä ja Loitonna tuovat valinnan keskipisteen näkymän keskelle. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Lukittu ja piilotettu kuvitus piirtoalustan sisällä siirtyy, skaalautuu ja kopioituu piirtoalustan mukana kuten muukin kuvitus. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Ankkuripisteiden ja suuntakahvojen päiden koko piirtoalueella; suurempiin ankkuripisteisiin voi tarttua myös kauempaa. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Piirtää suuntakahvojen päät täytettyinä pisteinä, onttoina pisteinä tai suurempina täytettyinä pisteinä. + With the Direct Selection tool, the anchor under the pointer is highlighted. Suoravalintatyökalulla osoittimen alla oleva ankkuripiste korostetaan. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Näyttää suuntakahvat, kun valittuna on useampi kuin yksi ankkuripiste; pois päältä ne näkyvät vain, kun valittuna on yksi ankkuripiste. + Corner widgets hide on corners whose angle is greater than this many degrees. Kulmasäätimet piilotetaan kulmista, joiden kulma on suurempi kuin tämä astemäärä. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Kynätyökalu esikatselee seuraavan segmentin viimeisestä ankkuripisteestä osoittimeen ennen napsautusta. + The Curvature tool previews the curve to the pointer before you place the next point. Kaarevuustyökalu esikatselee käyrän osoittimeen asti ennen kuin sijoitat seuraavan pisteen. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Yksikkö uusille asiakirjoille valmiissa kooissa pikselikokoja lukuun ottamatta ja avatuille tiedostoille, joihin ei ole tallennettu yksikköä; kun valitset sen tässä ja napsautat OK, siitä tulee myös aktiivisen asiakirjan yksikkö. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Viivan paksuudet, katkoviivat ja välit näytetään tässä yksikössä, ja niille kirjoitetut luvut luetaan siinä. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tekstin koot, riviväli ja perusviivan siirto näytetään tässä yksikössä, ja niille kirjoitetut luvut luetaan siinä. The unit for East Asian type measurements, which no field uses yet. Itä-Aasian tekstin mittojen yksikkö, jota mikään kenttä ei vielä käytä. When on, a number typed without a unit into a field in picas is read in points. Kun asetus on käytössä, picoina näytettävään kenttään ilman yksikköä kirjoitettu luku luetaan pisteinä. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML-tunnus-asetuksella objektien nimet näytetään XML-tunnuksina kohteissa Tasot, Muuttujat ja Tason asetukset. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Kohdistaa piirtämisen, siirtämisen ja skaalaamisen ruudukon jakoihin myös silloin, kun ruudukko on piilossa; kun asetus on päällä, Kohdista pikseliin ei ole käytössä. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Valitsemattomien apuviivojen väri; piirtoalusta, jolla on apuviivojen tunniste, piirtää omat apuviivansa tunnisteen värillä. + Draws guides as solid lines or as dots, including the guides already in the document. Piirtää apuviivat yhtenäisinä viivoina tai pisteinä, myös asiakirjassa jo olevat apuviivat. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Kun asetus on päällä, apuviivat ovat lukittuina VectorCraftin käynnistyessä; asetuksen muuttaminen lukitsee tai avaa ne heti, ja Näytä › Apuviivat › Lukitse apuviivat muuttaa lukitusta edelleen. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Kun asetus on päällä, Cmd/Ctrl pohjassa viivaimesta vetämisen alussa tekee apuviivan vain aktiiviselle piirtoalustalle, tai piirtoalustatyökalulla koko piirtopohjan apuviivan. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Ruudukon väri; pääruudukkoviivojen väliset viivat piirretään sen vaaleammalla sävyllä. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Piirtää ruudukon viivoina tai pisteinä pääruudukkoviivoja pitkin jokaisen jaon kohdalla. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Pääruudukkoviivojen etäisyys kaikissa avoimissa asiakirjoissa ja uusissa; VectorCraft-asiakirja avautuu ruudukolla, jonka kanssa se tallennettiin. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Moneenko osaan kukin pääruudukon ruutu jaetaan; Kohdista ruudukkoon kohdistaa näihin osiin myös silloin, kun zoomaus piilottaa niiden viivat. + Draws the grid behind the artwork; off, the grid is drawn over it. Piirtää ruudukon kuvituksen taakse; pois päältä ruudukko piirretään sen päälle. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Pikseliesikatselussa 600 %:n tai suuremmalla zoomauksella aktiivinen näkymä näyttää kuvituksen päällä viivan jokaisen asiakirjan pikselin reunassa. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Ruudun reunan ja katkoviivaisten värimallin rajojen väri, jotka näkyvät kuviota muokattaessa. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Kohdistaa piirtämisen, siirtämisen ja muuntamisen lähellä olevaan grafiikkaan ja näyttää apuviivat ja selitteet; pikseliesikatselu poistaa ne käytöstä, ja Kohdista ruudukkoon kohdistaa niiden sijaan ruudukkoon. + The color of Smart Guide lines and labels. Älykkäiden apuviivojen viivojen ja selitteiden väri. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Näyttää viivan sitä reunaa tai keskikohtaa pitkin, johon grafiikka tasautuu; pois päältä grafiikka tasautuu yhä ilman viivaa, eikä Kohdista merkkiin ole käytössä. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Valintatyökalulla osoittimen alla oleva valitsematon objekti saa ääriviivan tasonsa värillä, kun et vedä. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Näyttää koon tai kulman osoittimen vieressä, kun skaalaat, kierrät, vinoutat tai peilaat grafiikkaa. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Piirtäessä pisteet kohdistuvat valituissa kulmissa kulkeviin viivoihin, jotka kulkevat segmentin tai muodon alkupisteen kautta. + The set of angles the construction guides follow while Construction Guides is on. Kulmat, joita rakenneapuviivat seuraavat, kun Rakenneapuviivat on käytössä. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nimeää, mihin piste kohdistuu, esimerkiksi ankkuripisteen, polun tai tasauksen; pois päältä pisteet kohdistuvat samoin ilman nimiä. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Näyttää osoittimen vieressä etäisyydet, kulmat ja kuinka paljon grafiikka on siirtynyt, kun piirrät tai siirrät. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Kohdistaa siirretyn tai koon muuttaneen grafiikan samaan väliin kuin lähellä olevien objektien välillä ja merkitsee yhtä suuret välit. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Kun jotain on valittuna, Alt/Option-näppäimen pitäminen toisen objektin tai piirtoalustan päällä näyttää etäisyydet sen ja valinnan välillä. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Valinta, joka vedetään takaisin tartuntatoleranssin sisään vedon alkukohdasta, palaa täsmälleen siihen kohtaan; kopio ei palaa. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Kuinka lähelle grafiikkaa osoittimen tai vedettävän pisteen on tultava näytöllä, jotta älykkäät apuviivat kohdistavat siihen; etäisyys on sama kaikilla zoomauksilla. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Kohdistaa janan pään tai keskipisteestä piirretyn ympyrän niin, että se koskettaa lähellä olevaa käyrää. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Kohdistaa janan pään niin, että se kohtaa lähellä olevan suoran segmentin suorassa kulmassa. Reset all preferences to their defaults? Palautetaanko kaikki asetukset oletuksiin? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Oletukset otetaan käyttöön, kun valitset Asetuksissa OK. Peruuta siellä säilyttää nykyiset asetuksesi. Smaller ↔ Larger Pienempi ↔ Suurempi @@ -4944,6 +5002,11 @@ liquify-list-end {0}, {1} {0} ja {1} @msg PDF writer error: {0} PDF-kirjoittimen virhe: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Paketoitiin {n} tiedosto kansioon {folder} ({note})|Paketoitiin {n} tiedostoa kansioon {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Esikatselu selaimessa vaatii työpöytäsovelluksen (verkkoversio lataa tiedostot sen sijaan) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 anna `desiredK`, haluttu tiedostokoko yksikössä K (1024 tavua): luku, joka on yli 0 ja enintään 1048576 +@msg `startWith` is `current` or `auto` `startWith` on `current` tai `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` on `allSlices`, `eachSlice` tai `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` on siivun numero luettelosta `slice.list`, kun `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimoi tiedostokokoon: mitattavaa kuvaa ei ole @msg Release Guides: no guides Vapauta apuviivat: ei apuviivoja @msg Release: no layer to put the rectangle in Vapauta: ei tasoa, johon suorakulmion voisi sijoittaa @msg Replace Spine: select a blend and a path Korvaa selkäranka: valitse sulautus ja polku @@ -6244,6 +6307,19 @@ mark-style Japanese Japanilainen Transform Objects Muunna objekteja @msg unknown parameter `{key}`; did you mean `{near}`? tuntematon parametri `{key}`; tarkoititko `{near}`? @msg unknown parameter `{key}`; the command takes no parameters tuntematon parametri `{key}`; komento ei ota parametreja +@msg unknown parameter `{key}`; `{object}` takes: {keys} tuntematon parametri `{key}`; kohteen `{object}` avaimet: {keys} +@msg unknown parameter `{key}`; {why_not} tuntematon parametri `{key}`; {why_not} +@msg no format takes it (see document.formats) mikään muoto ei käytä sitä (katso document.formats) +@msg no save format takes it (see file.formatOptions) mikään tallennusmuoto ei käytä sitä (katso file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF ei käytä sitä (katso document.formats) +@msg EPS doesn't take it (see document.formats) EPS ei käytä sitä (katso document.formats) +@msg DXF doesn't take it (see document.formats) DXF ei käytä sitä (katso document.formats) +@msg {name} must be {range} (got {v}) arvon {name} on oltava {range} (saatiin {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Ensin kokeiltu grafiikkasuoritin ei pystynyt näyttämään ikkunaa, joten VectorCraft käynnistyi uudelleen: {summary} (Asetukset › Suorituskyky › Grafiikkasuoritin › Automaattinen käyttää näyttöäsi ohjaavaa suoritinta) +@msg Sent “{title}” to {to} “{title}” lähetettiin kohteeseen {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” lähetettiin kohteeseen {to}. Tulostusjonon vastaus: {note} +@msg the default printer oletustulostin +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rasteritehosteet objektissa {object}: pyydettiin {requested} ppi, saatiin {achieved} ppi 64 miljoonan pikselin rajan vuoksi @msg unknown parameter `{key}`; the command takes: {keys} tuntematon parametri `{key}`; komennon parametrit: {keys} @msg the params must be an object, not {got} parametrien on oltava objekti, ei {got} @msg unknown parameter `{path}`; the object takes no keys tuntematon parametri `{path}`; objekti ei ota avaimia @@ -7928,6 +8004,11 @@ breakText Glyphs Merkit @msg Some islands could not be joined to the area around the art Joitakin saarekkeita ei voitu yhdistää grafiikkaa ympäröivään alueeseen @msg `width` must be from {lo} to {hi} pt `width`-arvon on oltava {lo}–{hi} pt @msg `angle` must be from -180 to 180 degrees `angle`-arvon on oltava -180–180 astetta +@msg `roundness` must be from 0 to 100% `roundness`-arvon on oltava 0–100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity`-arvon on oltava 0.01–100 pt +@msg style must be "pencil" or "brush" style-arvon on oltava "pencil" tai "brush" +@msg extend end must be "start" or "end" extend-pään on oltava "start" tai "end" +@msg connect end must be "start" or "end" connect-pään on oltava "start" tai "end" @msg `roundness` must be from 1 to 100% `roundness`-arvon on oltava 1–100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` on oltava kokonaisluku 1–{MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Karsintakehys ja -viivat… diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 07208d40e8..3be3497f97 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -619,6 +619,8 @@ font-technology Variable Variables Control Contrôle Convert Convertir Convert All Spot Colors to Process Convertir tous les tons directs en couleurs quadrichromiques + Convert {name} to process Convertir {name} en couleur quadrichromique + Keep {name} as spot Conserver {name} en ton direct Convert All Strokes to Outlines Vectoriser tous les contours Convert All Text to Outlines Vectoriser tout le texte Convert Anchor Point Convertir le point d’ancrage @@ -694,6 +696,9 @@ font-technology Variable Variables Create from Selection Créer à partir de la sélection Create From: Créer à partir de : Create Gradient Mesh… Créer un filet de dégradé… + Flat Plat + To Center Vers le centre + To Edge Vers le bord Create Graph Créer un graphe Create New Layer Créer un calque Create New Sublayer Créer un sous-calque @@ -2709,6 +2714,18 @@ font-technology Variable Variables Preview: Aperçu : Preview All Layers Aperçu de tous les calques Preview in Browser Aperçu dans le navigateur + Optimize to File Size… Optimiser selon la taille du fichier… + Optimize to File Size Optimiser selon la taille du fichier + Desired File Size: Taille de fichier souhaitée : + Start With: Commencer par : + Use: Utiliser : + Current Settings Réglages actuels + Auto Select GIF/JPEG Sélection automatique GIF/JPEG + Total of All Slices Total de toutes les tranches + Each Slice Chaque tranche + Current Slice Tranche active + {size}, within {target} {size}, dans la limite de {target} + No setting tried fits in {target}; the smallest is {size} Aucun réglage essayé ne tient dans {target}, le plus petit fait {size} Preview in Browser needs the desktop app (the web downloads files instead) L’aperçu dans le navigateur nécessite l’application de bureau (la version web télécharge les fichiers à la place) Preview Mode Mode Aperçu Preview the document as it is now Afficher un aperçu du document dans son état actuel @@ -3086,12 +3103,53 @@ digits Malayalam Malayalam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Quand une occurrence de symbole est sélectionnée, le panneau Transformation utilise le point d’alignement du symbole comme point de référence. Darkens the canvas outside the artboards while the Artboard tool is active. Assombrit la zone de travail hors des plans de travail tant que l’outil Plan de travail est actif. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Avec Assombrir la zone hors du plan de travail activé, la zone hors des plans de travail reste sombre pendant que vous faites glisser avec l’outil Plan de travail. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Distance en pixels à laquelle le pointeur doit se trouver d’un objet, d’un point d’ancrage ou d’une poignée pour qu’un clic le sélectionne. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Le rectangle de l’outil Sélection retient les objets qu’il touche ou seulement ceux entièrement inclus. Sens du glissement retient les objets inclus en glissant vers la droite. E inverse la règle en cours de glissement. + A click selects a filled object only on its path, not inside its fill. Un clic sélectionne un objet rempli uniquement sur son tracé, pas à l’intérieur de son fond. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Distance en pixels à laquelle un point doit approcher un point d’ancrage ou un repère de règle pour que Magnétisme du point l’y aimante. Avec les repères commentés activés, leur tolérance du magnétisme s’applique à la place. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Avec l’outil Sélection, Cmd/Ctrl + clic sélectionne l’objet situé sous l’objet sélectionné à l’emplacement du pointeur. Chaque clic suivant descend d’un objet. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zoom avant et Zoom arrière amènent le centre de la sélection au milieu de la vue. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Les illustrations verrouillées et masquées d’un plan de travail sont déplacées, mises à l’échelle et copiées avec lui, comme les autres illustrations. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Taille des points d’ancrage et des extrémités des poignées de direction sur la zone de travail. Les points d’ancrage plus grands se saisissent aussi de plus loin. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Dessine les extrémités des poignées de direction en points pleins, en points creux ou en points pleins plus grands. + With the Direct Selection tool, the anchor under the pointer is highlighted. Avec l’outil Sélection directe, le point d’ancrage sous le pointeur est mis en évidence. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Affiche les poignées de direction quand plusieurs points d’ancrage sont sélectionnés. Désactivée, elles ne s’affichent que pour un seul point d’ancrage sélectionné. + Corner widgets hide on corners whose angle is greater than this many degrees. Les widgets d’angle se masquent sur les angles supérieurs à ce nombre de degrés. + The Pen tool previews the next segment from the last anchor to the pointer before you click. L’outil Plume affiche un aperçu du segment suivant, du dernier point d’ancrage jusqu’au pointeur, avant que vous cliquiez. + The Curvature tool previews the curve to the pointer before you place the next point. L’outil Courbure affiche un aperçu de la courbe jusqu’au pointeur avant que vous placiez le point suivant. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. L’unité des nouveaux documents de tailles prédéfinies, sauf les tailles en pixels, et des fichiers ouverts qui n’enregistrent aucune unité, et si vous la choisissez ici puis cliquez sur OK, elle devient aussi l’unité du document actif. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Les épaisseurs de contour, les tirets et les espaces s’affichent dans cette unité, et les nombres saisis pour eux sont lus dans cette unité. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Les tailles de texte, l’interlignage et le décalage de la ligne de base s’affichent dans cette unité, et les nombres saisis pour eux sont lus dans cette unité. The unit for East Asian type measurements, which no field uses yet. L’unité des mesures du texte d’Asie orientale, qu’aucun champ n’utilise encore. When on, a number typed without a unit into a field in picas is read in points. Si cette option est activée, un nombre saisi sans unité dans un champ en picas est lu en points. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Avec ID XML, les noms des objets s’affichent sous forme d’ID XML dans Calques, Variables et Options de calque. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Aligne le dessin, le déplacement et la mise à l’échelle sur les subdivisions de la grille, même quand la grille est masquée. Tant que l’option est activée, Magnétisme du pixel ne s’applique pas. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. La couleur des repères non sélectionnés. Un plan de travail doté d’une Étiquette des repères trace ses propres repères dans la couleur de l’étiquette. + Draws guides as solid lines or as dots, including the guides already in the document. Trace les repères en lignes continues ou en points, y compris les repères déjà présents dans le document. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Option activée, les repères sont verrouillés au démarrage de VectorCraft. Modifier l’option les verrouille ou les déverrouille aussitôt, et Affichage › Repères › Verrouiller les repères modifie toujours le verrouillage. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Option activée, maintenir Cmd/Ctrl au début d’un glissement depuis une règle crée un repère sur le seul plan de travail actif, ou un repère sur toute la zone de travail avec l’outil Plan de travail. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. La couleur de la grille. Les lignes entre les lignes principales sont tracées dans une teinte plus pâle de cette couleur. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Trace la grille en lignes, ou en points le long des lignes principales à chaque subdivision. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distance entre les lignes principales de la grille, dans chaque document ouvert et dans les nouveaux. Un document VectorCraft s’ouvre avec la grille avec laquelle il a été enregistré. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Le nombre de parts de chaque carré principal de la grille. Magnétisme de la grille aligne sur ces parts, même quand le zoom en masque les lignes. + Draws the grid behind the artwork; off, the grid is drawn over it. Trace la grille derrière l’illustration. Désactivée, la grille est tracée par-dessus. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. En Aperçu en pixels, à partir d’un zoom de 600 %, la vue active affiche par-dessus l’illustration une ligne au bord de chaque pixel du document. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. La couleur du bord du carreau et des limites en pointillé de la nuance affichés pendant la modification d’un motif. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Aimante le dessin, le déplacement et la transformation aux illustrations proches et affiche repères et étiquettes. L’aperçu en pixels les désactive, et Magnétisme de la grille aimante à la grille à leur place. + The color of Smart Guide lines and labels. La couleur des lignes et des étiquettes des repères commentés. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Affiche une ligne le long du bord ou du centre avec lequel l’illustration s’aligne. Si l’option est désactivée, l’illustration s’aligne toujours sans la ligne, et Magnétisme du glyphe ne s’applique pas. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Avec un outil de sélection, entoure l’objet non sélectionné sous le pointeur de la couleur de son calque tant que vous ne faites pas glisser. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Affiche la taille ou l’angle près du pointeur pendant la mise à l’échelle, la rotation, la déformation ou la symétrie d’une illustration. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Pendant le dessin, les points s’aimantent à des lignes aux angles choisis passant par le point de départ du segment ou de la forme. + The set of angles the construction guides follow while Construction Guides is on. L’ensemble des angles que suivent les repères de construction lorsque Repères de construction est activé. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nomme ce sur quoi un point s’aimante, comme un point d’ancrage, un tracé ou un alignement. Si l’option est désactivée, les points s’aimantent de la même façon, sans les noms. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Affiche près du pointeur les distances, les angles et le déplacement de l’illustration pendant le dessin ou le déplacement. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Aimante une illustration déplacée ou redimensionnée au même écart qu’entre les objets proches et marque les écarts égaux. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Avec une sélection, maintenir Alt/Option au-dessus d’un autre objet ou d’un plan de travail affiche les distances entre celui-ci et la sélection. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Une sélection ramenée à moins de la tolérance du magnétisme de son point de départ revient exactement à cet endroit. Une copie n’y revient pas. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. La distance à l’écran à laquelle le pointeur ou un point déplacé doit approcher une illustration pour que les repères commentés s’y aimantent. Elle est la même à tous les zooms. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Aimante l’extrémité d’un segment de droite, ou un cercle tracé depuis son centre, pour qu’il touche une courbe proche. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Aimante l’extrémité d’un segment de droite pour qu’il rencontre un segment droit proche à angle droit. Reset all preferences to their defaults? Rétablir toutes les préférences à leur valeur par défaut ? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Les valeurs par défaut sont appliquées lorsque vous cliquez sur OK dans Préférences. Annuler y conserve vos préférences actuelles. Restore Recovered Documents Restaurer les documents récupérés @@ -4673,6 +4731,11 @@ liquify-list-end {0}, {1} {0} et {1} @msg PDF writer error: {0} Erreur du générateur PDF : {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} fichier assemblé dans {folder} ({note})|{n} fichiers assemblés dans {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Aperçu dans le navigateur nécessite l’application de bureau (la version web télécharge les fichiers à la place) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indiquez `desiredK`, la taille de fichier souhaitée en K (1024 octets), un nombre supérieur à 0 et au plus 1048576 +@msg `startWith` is `current` or `auto` `startWith` vaut `current` ou `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` vaut `allSlices`, `eachSlice` ou `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` est un numéro de tranche de `slice.list`, avec `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimiser selon la taille du fichier, aucune image à mesurer @msg Release Guides: no guides Annuler les repères : aucun repère @msg Release: no layer to put the rectangle in Annuler : aucun calque où placer le rectangle @msg Replace Spine: select a blend and a path Remplacer la dorsale : sélectionnez un dégradé de formes et un tracé @@ -5903,6 +5966,19 @@ lighting Light Lumière Transform Objects Transformer les objets @msg unknown parameter `{key}`; did you mean `{near}`? paramètre inconnu `{key}` ; vouliez-vous dire `{near}` ? @msg unknown parameter `{key}`; the command takes no parameters paramètre inconnu `{key}` ; la commande n’a aucun paramètre +@msg unknown parameter `{key}`; `{object}` takes: {keys} paramètre inconnu `{key}` ; `{object}` accepte : {keys} +@msg unknown parameter `{key}`; {why_not} paramètre inconnu `{key}` ; {why_not} +@msg no format takes it (see document.formats) aucun format ne l’accepte (voir document.formats) +@msg no save format takes it (see file.formatOptions) aucun format d’enregistrement ne l’accepte (voir file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF ne l’accepte pas (voir document.formats) +@msg EPS doesn't take it (see document.formats) EPS ne l’accepte pas (voir document.formats) +@msg DXF doesn't take it (see document.formats) DXF ne l’accepte pas (voir document.formats) +@msg {name} must be {range} (got {v}) {name} doit valoir {range} (reçu : {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Le processeur graphique essayé en premier n’a pas pu afficher la fenêtre : VectorCraft a redémarré sur {summary} (Réglages › Performances › Processeur graphique › Automatique utilise celui qui pilote votre écran) +@msg Sent “{title}” to {to} “{title}” envoyé vers {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” envoyé vers {to}. Réponse de la file d’impression : {note} +@msg the default printer l’imprimante par défaut +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap effets de pixellisation sur l’objet {object} : {requested} ppi demandés, {achieved} ppi obtenus en raison de la limite de 64 millions de pixels @msg unknown parameter `{key}`; the command takes: {keys} paramètre inconnu `{key}` ; la commande accepte : {keys} @msg the params must be an object, not {got} les paramètres doivent être un objet, pas {got} @msg unknown parameter `{path}`; the object takes no keys paramètre inconnu `{path}` ; l’objet n’accepte aucune clé @@ -7846,6 +7922,10 @@ breakText Glyphs Glyphes @msg Some islands could not be joined to the area around the art Certains îlots n’ont pas pu être reliés à la zone autour de l’illustration @msg `width` must be from {lo} to {hi} pt `width` doit être compris entre {lo} et {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` doit être compris entre -180 et 180 degrés +@msg `roundness` must be from 0 to 100% `roundness` doit être compris entre 0 et 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` doit être compris entre 0.01 et 100 pt +@msg style must be "pencil" or "brush" style doit être "pencil" ou "brush" +@msg extend end must be "start" or "end" l’extrémité de extend doit être "start" ou "end" @msg `roundness` must be from 1 to 100% `roundness` doit être compris entre 1 et 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` doit être un nombre entier compris entre 1 et {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Cadre et lignes d’échenillage… @@ -8350,7 +8430,6 @@ breakText Glyphs Glyphes @msg anchor `smooth` must be true or false `smooth` d’un point d’ancrage doit valoir true ou false @msg anchor `{key}` must be [x, y] `{key}` d’un point d’ancrage doit être [x, y] @msg anchor `{key}` must be a number `{key}` d’un point d’ancrage doit être un nombre -@msg angle and roundness must be finite l’angle et l’arrondi doivent être finis @msg angles must be a list as long as pins (degrees or null) angles doit être une liste aussi longue que pins (degrés ou null) @msg appearance must be flat|center|edge appearance doit valoir flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply vaut "fill" ou "stroke", pas `{other}` @@ -9501,8 +9580,6 @@ breakText Glyphs Glyphes @msg unknown panel panneau inconnu @msg unknown panel `{panel}` panneau inconnu `{panel}` @msg unknown parameter `{key}` paramètre inconnu `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} paramètre inconnu `{within}settings.{format}` ; {why} -@msg unknown parameter `{within}{key}`; {why} paramètre inconnu `{within}{key}` ; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) pieLegend inconnu `{v}` (none, standard ou wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) piePosition inconnu `{v}` (even, ratio ou stacked) @msg unknown pieSort `{v}` (none, all or first) pieSort inconnu `{v}` (none, all ou first) @@ -9629,7 +9706,6 @@ breakText Glyphs Glyphes @msg {label} must be a number from 1 to 10000 {label} doit être un nombre compris entre 1 et 10000 @msg {name} `{s}`: {ids} {name} `{s}` : {ids} @msg {name} is built in and can't be deleted {name} est intégré et ne peut pas être supprimé -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} doit être compris entre {lo} et {hi}{unit} (reçu : {v}) @msg {name}: CRC or size mismatch {name} : CRC ou taille incohérents @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} : seul l’aperçu incorporé de ce fichier Affinity a pu être lu ; utilisez Fichier › Ouvrir pour l’afficher avec son avertissement, ou exportez en SVG ou PDF depuis Affinity avant de l’importer @msg {name}: {e} {name} : {e} diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index 0529faf266..c427fc527c 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -236,6 +236,8 @@ Anti-aliased Artwork એન્ટિ-એલિયાસ્ડ આર્ટવર્ક Anti-aliasing Method એન્ટિ-એલિયાસિંગ પદ્ધતિ Anti-aliasing: એન્ટિ-એલિયાસિંગ: + Art Optimized આર્ટ માટે ઑપ્ટિમાઇઝ કરેલું + Type Optimized ટેક્સ્ટ માટે ઑપ્ટિમાઇઝ કરેલું Appearance દેખાવ Appearance Attribute દેખાવ ગુણધર્મ Appearance Item દેખાવ આઇટમ @@ -429,6 +431,10 @@ Break Text into Words ટેક્સ્ટને શબ્દોમાં તોડો Break Thread થ્રેડ તોડો Brick Offset: ઈંટ ઑફસેટ: + Brick by Row પંક્તિ પ્રમાણે ઈંટ + Brick by Column કૉલમ પ્રમાણે ઈંટ + Hex by Column કૉલમ પ્રમાણે ષટ્કોણ + Hex by Row પંક્તિ પ્રમાણે ષટ્કોણ Brightness તેજ Brightness/Contrast… તેજ/કૉન્ટ્રાસ્ટ… Brightness: તેજ: @@ -718,6 +724,8 @@ Conté Crayon… કોન્ટે ક્રેયોન… Convert રૂપાંતર કરો Convert All Spot Colors to Process બધા સ્પોટ રંગોને પ્રોસેસમાં રૂપાંતર કરો + Convert {name} to process {name} ને પ્રોસેસમાં રૂપાંતર કરો + Keep {name} as spot {name} ને સ્પોટ તરીકે રાખો Convert All Strokes to Outlines બધા સ્ટ્રોકને આઉટલાઇનમાં રૂપાંતર કરો Convert All Text to Outlines બધા ટેક્સ્ટને આઉટલાઇનમાં રૂપાંતર કરો Convert Anchor Point એન્કર પોઇન્ટ રૂપાંતર કરો @@ -792,6 +800,9 @@ Create From: આમાંથી બનાવો: Create Gradient Mesh ગ્રેડિયન્ટ મેશ બનાવો Create Gradient Mesh… ગ્રેડિયન્ટ મેશ બનાવો… + Flat સપાટ + To Center કેન્દ્ર તરફ + To Edge કિનારી તરફ Create Graph ગ્રાફ બનાવો Create New Layer નવો લેયર બનાવો Create New Library નવી લાઇબ્રેરી બનાવો @@ -2790,6 +2801,18 @@ Preview All Layers બધા લેયરનું પૂર્વાવલોકન Preview Mode પૂર્વાવલોકન મોડ Preview in Browser બ્રાઉઝરમાં પૂર્વાવલોકન + Optimize to File Size… ફાઇલ કદ મુજબ ઑપ્ટિમાઇઝ કરો… + Optimize to File Size ફાઇલ કદ મુજબ ઑપ્ટિમાઇઝ કરો + Desired File Size: ઇચ્છિત ફાઇલ કદ: + Start With: શરૂઆત: + Use: ઉપયોગ: + Current Settings વર્તમાન સેટિંગ્સ + Auto Select GIF/JPEG GIF/JPEG આપમેળે પસંદ કરો + Total of All Slices બધી સ્લાઇસનો કુલ + Each Slice દરેક સ્લાઇસ + Current Slice વર્તમાન સ્લાઇસ + {size}, within {target} {size}, {target} ની અંદર + No setting tried fits in {target}; the smallest is {size} અજમાવેલી કોઈ સેટિંગ {target} માં સમાતી નથી; સૌથી નાની {size} છે Preview the document as it is now અત્યારે જેમ છે તેમ દસ્તાવેજનું પૂર્વાવલોકન કરો Previous પાછલું Previous Artboard પાછલું આર્ટબોર્ડ @@ -3166,12 +3189,53 @@ With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. એક સિમ્બોલ ઇન્સ્ટન્સ પસંદ હોય ત્યારે ટ્રાન્સફોર્મ પેનલ સિમ્બોલના રજિસ્ટ્રેશન પોઇન્ટને સંદર્ભ પોઇન્ટ તરીકે વાપરે છે. Darkens the canvas outside the artboards while the Artboard tool is active. આર્ટબોર્ડ ટૂલ સક્રિય હોય ત્યારે આર્ટબોર્ડ બહારનો કેનવાસ ઘાટો કરે છે. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. આર્ટબોર્ડ બહારનો વિસ્તાર ઝાંખો કરો ચાલુ હોય ત્યારે, આર્ટબોર્ડ ટૂલથી ખેંચતી વખતે આર્ટબોર્ડ બહારનો વિસ્તાર ઘાટો રહે છે. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. ક્લિક કોઈ ઑબ્જેક્ટ, એન્કર પોઇન્ટ કે હૅન્ડલને પસંદ કરે તે માટે પોઇન્ટર તેનાથી કેટલા પિક્સેલ નજીક હોવો જોઈએ. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. પસંદગી ટૂલનું બૉક્સ સ્પર્શેલા ઑબ્જેક્ટ પસંદ કરે છે કે ફક્ત સંપૂર્ણ અંદરના; ખેંચવાની દિશા જમણી તરફ ખેંચતાં અંદરના પસંદ કરે છે. ખેંચતી વખતે E નિયમ ઊલટાવે છે. + A click selects a filled object only on its path, not inside its fill. ક્લિક ભરેલા ઑબ્જેક્ટને ફક્ત તેના પાથ પર પસંદ કરે છે, ભરણની અંદર નહીં. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. પોઇન્ટ પર સ્નેપ તેને સ્નેપ કરે તે માટે કોઈ બિંદુએ એન્કર પોઇન્ટ કે રૂલર ગાઇડથી કેટલા પિક્સેલ નજીક આવવું જોઈએ; સ્માર્ટ ગાઇડ ચાલુ હોય ત્યારે તેમની સ્નેપિંગ સહનશીલતા લાગુ થાય છે. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. પસંદગી ટૂલ સાથે, Cmd/Ctrl-ક્લિક પોઇન્ટર પાસે પસંદ કરેલા ઑબ્જેક્ટની નીચેનો ઑબ્જેક્ટ પસંદ કરે છે; દરેક આગળની ક્લિક એક ઑબ્જેક્ટ વધુ ઊંડે જાય છે. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. ઝૂમ ઇન અને ઝૂમ આઉટ પસંદગીના કેન્દ્રને વ્યૂની મધ્યમાં લાવે છે. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. આર્ટબોર્ડની અંદરનું લૉક અને છુપાયેલું આર્ટવર્ક બાકીના આર્ટવર્કની જેમ આર્ટબોર્ડ સાથે ખસે છે, માપ બદલે છે અને કૉપિ થાય છે. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. કેનવાસ પર એન્કર પોઇન્ટ અને દિશા હૅન્ડલના છેડાનું કદ; મોટા એન્કર પોઇન્ટ વધુ દૂરથી પણ પકડી શકાય છે. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. દિશા હૅન્ડલના છેડા ભરેલા ટપકાં, પોલા ટપકાં કે મોટા ભરેલા ટપકાં તરીકે દોરે છે. + With the Direct Selection tool, the anchor under the pointer is highlighted. ડાયરેક્ટ સિલેક્શન ટૂલ સાથે, પોઇન્ટર નીચેનો એન્કર પોઇન્ટ હાઇલાઇટ થાય છે. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. એકથી વધુ એન્કર પોઇન્ટ પસંદ હોય ત્યારે દિશા હૅન્ડલ બતાવે છે; બંધ હોય તો ફક્ત એક એન્કર પોઇન્ટ પસંદ હોય ત્યારે જ દેખાય છે. + Corner widgets hide on corners whose angle is greater than this many degrees. જે ખૂણાનો કોણ આટલા ડિગ્રીથી વધુ હોય ત્યાં કૉર્નર વિજેટ છુપાય છે. + The Pen tool previews the next segment from the last anchor to the pointer before you click. ક્લિક કરતાં પહેલાં પેન ટૂલ છેલ્લા એન્કર પોઇન્ટથી પોઇન્ટર સુધીના આગલા સેગમેન્ટનું પૂર્વાવલોકન બતાવે છે. + The Curvature tool previews the curve to the pointer before you place the next point. આગલું બિંદુ મૂકતાં પહેલાં વક્રતા ટૂલ પોઇન્ટર સુધીના વળાંકનું પૂર્વાવલોકન બતાવે છે. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. પિક્સેલ સિવાયના બિલ્ટ-ઇન કદના નવા દસ્તાવેજો અને કોઈ એકમ ન નોંધતી ખોલેલી ફાઇલો માટેનો એકમ; અહીં તેને પસંદ કરીને ઠીક ક્લિક કરવાથી સક્રિય દસ્તાવેજનો એકમ પણ તે બને છે. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. સ્ટ્રોકની જાડાઈ, ડૅશ અને અંતર આ એકમમાં દેખાય છે, અને તેમના માટે ટાઇપ કરેલી સંખ્યાઓ આ એકમમાં વંચાય છે. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. ટાઇપના કદ, લીડિંગ અને બેઝલાઇન શિફ્ટ આ એકમમાં દેખાય છે, અને તેમના માટે ટાઇપ કરેલી સંખ્યાઓ આ એકમમાં વંચાય છે. The unit for East Asian type measurements, which no field uses yet. પૂર્વ એશિયાઈ ટાઇપના માપ માટેનો એકમ, જેનો હજી કોઈ ફીલ્ડ ઉપયોગ કરતું નથી. When on, a number typed without a unit into a field in picas is read in points. ચાલુ હોય ત્યારે, પાઇકામાં હોય તેવા ફીલ્ડમાં એકમ વિના ટાઇપ કરેલી સંખ્યા પોઇન્ટ્સમાં વંચાય છે. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID પસંદ હોય ત્યારે ઑબ્જેક્ટનાં નામ લેયર્સ, વેરિએબલ્સ અને લેયર વિકલ્પોમાં XML ID તરીકે દેખાય છે. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. ગ્રિડ છુપાયેલી હોય ત્યારે પણ દોરવું, ખસેડવું અને સ્કેલ કરવું ગ્રિડના ઉપવિભાગો પર સ્નેપ કરે છે; આ ચાલુ હોય ત્યાં સુધી પિક્સેલ પર સ્નેપ લાગુ પડતું નથી. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. પસંદ ન કરેલી ગાઇડ્સનો રંગ; ગાઇડ લેબલવાળું આર્ટબોર્ડ પોતાની ગાઇડ્સ લેબલના રંગમાં દોરે છે. + Draws guides as solid lines or as dots, including the guides already in the document. દસ્તાવેજમાં પહેલેથી રહેલી ગાઇડ્સ સહિત, ગાઇડ્સને ઘન રેખાઓ અથવા બિંદુઓ તરીકે દોરે છે. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. આ ચાલુ હોય ત્યારે VectorCraft શરૂ થાય ત્યારે ગાઇડ્સ લૉક હોય છે; આ વિકલ્પ બદલવાથી તે તરત લૉક કે અનલૉક થાય છે, અને વ્યૂ › ગાઇડ્સ › ગાઇડ લૉક કરો હજી પણ લૉક બદલે છે. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. આ ચાલુ હોય ત્યારે રૂલરમાંથી ખેંચવાનું શરૂ કરતી વખતે Cmd/Ctrl દબાવી રાખવાથી ફક્ત સક્રિય આર્ટબોર્ડ પર ગાઇડ બને છે, અથવા આર્ટબોર્ડ ટૂલ સાથે આખા કૅનવાસની ગાઇડ બને છે. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. ગ્રિડનો રંગ; મુખ્ય ગ્રિડલાઇન્સ વચ્ચેની રેખાઓ તેના વધુ ઝાંખા શેડમાં દોરાય છે. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. ગ્રિડને રેખાઓ તરીકે, અથવા દરેક ઉપવિભાગ પર મુખ્ય ગ્રિડલાઇન્સ સાથે બિંદુઓ તરીકે દોરે છે. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. દરેક ખુલ્લા દસ્તાવેજમાં અને નવા દસ્તાવેજોમાં મુખ્ય ગ્રિડલાઇન્સ વચ્ચેનું અંતર; VectorCraft દસ્તાવેજ જે ગ્રિડ સાથે સાચવાયો હતો તેની સાથે ખૂલે છે. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. દરેક મુખ્ય ગ્રિડ ચોરસના કેટલા ભાગ થાય છે; ઝૂમ તેમની રેખાઓ છુપાવે ત્યારે પણ ગ્રિડ પર સ્નેપ આ ભાગો પર સ્નેપ કરે છે. + Draws the grid behind the artwork; off, the grid is drawn over it. ગ્રિડને આર્ટવર્કની પાછળ દોરે છે; બંધ હોય ત્યારે ગ્રિડ તેની ઉપર દોરાય છે. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. પિક્સેલ પૂર્વાવલોકનમાં 600% કે વધુ ઝૂમ પર, સક્રિય વ્યૂ આર્ટવર્ક પર દસ્તાવેજના દરેક પિક્સેલની કિનારીએ રેખા બતાવે છે. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. પેટર્ન સંપાદિત કરતી વખતે દેખાતી ટાઇલ કિનારી અને ડૅશવાળી સ્વેચ બાઉન્ડ્સનો રંગ. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. દોરવું, ખસેડવું અને ટ્રાન્સફોર્મ કરવું નજીકના આર્ટ પર સ્નેપ કરે છે અને ગાઇડ અને લેબલ બતાવે છે; પિક્સેલ પૂર્વાવલોકન તેમને બંધ કરે છે, અને ગ્રિડ પર સ્નેપ તેના બદલે ગ્રિડ પર સ્નેપ કરે છે. + The color of Smart Guide lines and labels. સ્માર્ટ ગાઇડની રેખાઓ અને લેબલનો રંગ. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. આર્ટ જે કિનારી અથવા કેન્દ્ર સાથે સંરેખિત થાય તેની સાથે રેખા બતાવે છે; બંધ હોય ત્યારે આર્ટ રેખા વિના પણ સંરેખિત થાય છે, અને ગ્લિફ પર સ્નેપ લાગુ પડતું નથી. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. પસંદગી ટૂલ સાથે, તમે ખેંચતા ન હો ત્યારે પોઇન્ટર નીચેના પસંદ ન કરેલા ઑબ્જેક્ટની રૂપરેખા તેના લેયરના રંગમાં બતાવે છે. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. તમે આર્ટને સ્કેલ કરો, ફેરવો, શિયર કરો કે પ્રતિબિંબિત કરો ત્યારે પોઇન્ટર પાસે કદ અથવા ખૂણો બતાવે છે. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. તમે દોરો ત્યારે, બિંદુઓ સેગમેન્ટ કે આકાર જ્યાંથી શરૂ થાય તે બિંદુમાંથી પસાર થતી પસંદ કરેલા ખૂણાની રેખાઓ પર સ્નેપ થાય છે. + The set of angles the construction guides follow while Construction Guides is on. બાંધકામ ગાઇડ્સ ચાલુ હોય ત્યારે બાંધકામ ગાઇડ્સ જે ખૂણાઓને અનુસરે છે તેનો સમૂહ. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. બિંદુ શેના પર સ્નેપ થાય છે તેનું નામ બતાવે છે, જેમ કે એન્કર, પાથ અથવા સંરેખણ; બંધ હોય ત્યારે બિંદુઓ નામ વિના એ જ રીતે સ્નેપ થાય છે. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. તમે દોરો કે ખસેડો ત્યારે પોઇન્ટર પાસે અંતર, ખૂણા અને આર્ટ કેટલું ખસ્યું તે બતાવે છે. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. ખસેડેલા કે કદ બદલેલા આર્ટને નજીકના ઑબ્જેક્ટ્સ વચ્ચેના જેટલા જ અંતર પર સ્નેપ કરે છે અને સમાન અંતર દર્શાવે છે. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. કંઈક પસંદ કરેલું હોય ત્યારે, બીજા ઑબ્જેક્ટ કે આર્ટબોર્ડ પર Alt/Option દબાવી રાખવાથી તેની અને પસંદગી વચ્ચેનું અંતર દેખાય છે. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. ખેંચાણ જ્યાંથી શરૂ થયું ત્યાંથી સ્નેપિંગ સહનશીલતાની અંદર પાછી ખેંચેલી પસંદગી બરાબર એ જ જગ્યાએ પાછી જાય છે; નકલ જતી નથી. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. સ્માર્ટ ગાઇડ સ્નેપ કરે તે માટે પોઇન્ટર અથવા ખેંચેલું બિંદુ સ્ક્રીન પર આર્ટની કેટલું નજીક આવવું જોઈએ; આ અંતર દરેક ઝૂમ પર સમાન રહે છે. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. લાઇન સેગમેન્ટના છેડાને, અથવા કેન્દ્રથી દોરેલા વર્તુળને, એ રીતે સ્નેપ કરે છે કે તે નજીકના વળાંકને સ્પર્શે. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. લાઇન સેગમેન્ટના છેડાને એ રીતે સ્નેપ કરે છે કે તે નજીકના સીધા સેગમેન્ટને કાટખૂણે મળે. Restored documents open unsaved: save them to keep them. પુનઃસ્થાપિત દસ્તાવેજો અસાચવેલા ખુલશે: તેમને રાખવા માટે સાચવો. Restrict printing, editing and other tasks છાપકામ, સંપાદન અને અન્ય કાર્યો પર પ્રતિબંધ મૂકો Reticulation… રેટિક્યુલેશન… diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 725d5147c1..cbfb4f51d1 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -1034,6 +1034,8 @@ antiAlias Sharp शार्प Control नियंत्रण Convert कन्वर्ट करें Convert All Spot Colors to Process सभी स्पॉट कलर्स को प्रोसेस में कनवर्ट करें + Convert {name} to process {name} को प्रोसेस में कनवर्ट करें + Keep {name} as spot {name} को स्पॉट के रूप में रखें Convert All Strokes to Outlines सभी स्ट्रोक को आउटलाइन में कनवर्ट करें Convert All Text to Outlines सभी टेक्स्ट को आउटलाइन में कनवर्ट करें Convert Anchor Point एंकर पॉइंट कनवर्ट करें @@ -1134,6 +1136,9 @@ antiAlias Sharp शार्प Create From: से बनाएँ: Create Gradient Mesh ग्रेडिएंट मेश बनाएँ Create Gradient Mesh… ग्रेडिएंट मेश बनाएँ… + Flat समतल + To Center केंद्र की ओर + To Edge किनारे की ओर Create Graph ग्राफ़ बनाएँ Create New {kind} Style नई {kind} स्टाइल बनाएँ Create New Action नया एक्शन बनाएँ @@ -3756,6 +3761,18 @@ antiAlias Sharp शार्प Preview (1 inch on the page) प्रीव्यू (1 इंच पृष्ठ पर) Preview All Layers सभी लेयर्स का प्रीव्यू करें Preview in Browser ब्राउज़र में प्रीव्यू + Optimize to File Size… फ़ाइल आकार के अनुसार ऑप्टिमाइज़ करें… + Optimize to File Size फ़ाइल आकार के अनुसार ऑप्टिमाइज़ करें + Desired File Size: वांछित फ़ाइल आकार: + Start With: शुरुआत: + Use: उपयोग: + Current Settings वर्तमान सेटिंग्स + Auto Select GIF/JPEG GIF/JPEG स्वचालित रूप से चुनें + Total of All Slices सभी स्लाइस का कुल + Each Slice प्रत्येक स्लाइस + Current Slice वर्तमान स्लाइस + {size}, within {target} {size}, {target} के भीतर + No setting tried fits in {target}; the smallest is {size} आज़माई गई कोई भी सेटिंग {target} में नहीं समाती; सबसे छोटा {size} है Preview in Browser needs the desktop app (the web downloads files instead) ब्राउज़र में प्रीव्यू डेस्कटॉप ऐप (वेब डाउनलोड फ़ाइलों के बजाय) की जरूरत है Preview Mode प्रीव्यू मोड Preview the document as it is now डॉक्यूमेंट का प्रीव्यू करें क्योंकि यह अब है @@ -4208,12 +4225,53 @@ antiAlias Sharp शार्प With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. एक सिंबल इंस्टेंस चुना होने पर रूपांतरण पैनल सिंबल के रजिस्ट्रेशन पॉइंट को संदर्भ पॉइंट के रूप में इस्तेमाल करता है। Darkens the canvas outside the artboards while the Artboard tool is active. आर्टबोर्ड टूल सक्रिय रहने पर आर्टबोर्ड के बाहर का कैनवास गहरा करता है। With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. आर्टबोर्ड के बाहर का क्षेत्र धुंधला करें चालू होने पर आर्टबोर्ड टूल से ड्रैग करते समय आर्टबोर्ड के बाहर का क्षेत्र गहरा बना रहता है। + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. किसी क्लिक से ऑब्जेक्ट, एंकर पॉइंट या हैंडल चुनने के लिए पॉइंटर को उससे कितने पिक्सेल पास होना चाहिए। + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. सिलेक्शन टूल का बॉक्स छुए गए ऑब्जेक्ट चुनता है या केवल पूरी तरह अंदर वाले; खींचने की दिशा दाईं ओर खींचने पर अंदर वाले चुनती है। खींचते समय E नियम उलट देता है। + A click selects a filled object only on its path, not inside its fill. क्लिक भरे हुए ऑब्जेक्ट को केवल उसके पाथ पर चुनता है, भराव के अंदर नहीं। + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. पॉइंट पर स्नैप करें द्वारा स्नैप होने के लिए किसी बिंदु को एंकर पॉइंट या रूलर गाइड से कितने पिक्सेल पास आना चाहिए; स्मार्ट गाइड्स चालू होने पर उनकी स्नैपिंग सहिष्णुता लागू होती है। + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. सिलेक्शन टूल के साथ, Cmd/Ctrl-क्लिक पॉइंटर पर चुने गए ऑब्जेक्ट के नीचे वाला ऑब्जेक्ट चुनता है; हर अगला क्लिक एक ऑब्जेक्ट और नीचे जाता है। + Zoom In and Zoom Out bring the center of the selection to the middle of the view. ज़ूम इन और ज़ूम आउट चयन के केंद्र को व्यू के बीच में लाते हैं। + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. आर्टबोर्ड के अंदर का लॉक और छिपा आर्टवर्क बाकी आर्टवर्क की तरह आर्टबोर्ड के साथ खिसकता, स्केल होता और कॉपी होता है। + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. कैनवास पर एंकर पॉइंट और दिशा हैंडल के सिरों का आकार; बड़े एंकर पॉइंट अधिक दूर से भी पकड़े जा सकते हैं। + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. दिशा हैंडल के सिरों को भरे बिंदु, खोखले बिंदु या बड़े भरे बिंदु के रूप में बनाता है। + With the Direct Selection tool, the anchor under the pointer is highlighted. डायरेक्ट सिलेक्शन टूल के साथ, पॉइंटर के नीचे वाला एंकर पॉइंट हाइलाइट होता है। + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. एक से अधिक एंकर पॉइंट चुने होने पर दिशा हैंडल दिखाता है; बंद होने पर वे केवल एक एंकर पॉइंट चुने होने पर दिखते हैं। + Corner widgets hide on corners whose angle is greater than this many degrees. जिन कोनों का कोण इतने डिग्री से अधिक है, उन पर कॉर्नर विजेट छिप जाते हैं। + The Pen tool previews the next segment from the last anchor to the pointer before you click. क्लिक करने से पहले पेन टूल अंतिम एंकर पॉइंट से पॉइंटर तक अगले सेगमेंट का पूर्वावलोकन दिखाता है। + The Curvature tool previews the curve to the pointer before you place the next point. अगला बिंदु रखने से पहले वक्रता टूल पॉइंटर तक वक्र का पूर्वावलोकन दिखाता है। The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. पिक्सेल को छोड़कर बिल्ट-इन साइज़ वाले नए डॉक्यूमेंट और कोई इकाई दर्ज न करने वाली खोली गई फ़ाइलों की इकाई; इसे यहाँ चुनकर ठीक है पर क्लिक करने से यह सक्रिय डॉक्यूमेंट की इकाई भी बन जाती है। Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. स्ट्रोक की मोटाई, डैश और गैप इस इकाई में दिखते हैं, और उनके लिए टाइप की गई संख्याएँ इसी इकाई में पढ़ी जाती हैं। Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. टाइप साइज़, लीडिंग और बेसलाइन शिफ़्ट इस इकाई में दिखते हैं, और उनके लिए टाइप की गई संख्याएँ इसी इकाई में पढ़ी जाती हैं। The unit for East Asian type measurements, which no field uses yet. पूर्वी एशियाई टाइप के माप की इकाई, जिसका अभी कोई फ़ील्ड उपयोग नहीं करता। When on, a number typed without a unit into a field in picas is read in points. चालू होने पर, पाइका वाले फ़ील्ड में बिना इकाई के टाइप की गई संख्या पॉइंट्स में पढ़ी जाती है। With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID चुनने पर ऑब्जेक्ट के नाम लेयर्स, वेरिएबल्स और लेयर ऑप्शन्स में XML ID के रूप में दिखते हैं। + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. ग्रिड छिपी होने पर भी ड्रॉ करना, खिसकाना और स्केल करना ग्रिड के उप-विभाजनों पर स्नैप करता है; इसके चालू रहने तक पिक्सेल के लिए स्नैप लागू नहीं होता। + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. उन गाइड्स का रंग जो चयनित नहीं हैं; गाइड लेबल वाला आर्टबोर्ड अपनी गाइड्स लेबल के रंग में बनाता है। + Draws guides as solid lines or as dots, including the guides already in the document. दस्तावेज़ में पहले से मौजूद गाइड्स सहित, गाइड्स को ठोस रेखाओं या बिंदुओं के रूप में बनाता है। + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. इसके चालू होने पर VectorCraft शुरू होते समय गाइड्स लॉक रहती हैं; यह विकल्प बदलने से वे तुरंत लॉक या अनलॉक होती हैं, और व्यू › गाइड्स › गाइड्स लॉक करें अब भी लॉक बदलता है। + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. इसके चालू होने पर रूलर से खींचना शुरू करते समय Cmd/Ctrl दबाए रखने से केवल सक्रिय आर्टबोर्ड पर गाइड बनती है, या आर्टबोर्ड टूल के साथ पूरे कैनवस की गाइड बनती है। + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. ग्रिड का रंग; मुख्य ग्रिडलाइनों के बीच की रेखाएँ उसके हल्के शेड में बनती हैं। + Draws the grid as lines, or as dots along the major gridlines at each subdivision. ग्रिड को रेखाओं के रूप में, या हर उप-विभाजन पर मुख्य ग्रिडलाइनों के साथ बिंदुओं के रूप में बनाता है। + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. हर खुले दस्तावेज़ और नए दस्तावेज़ों में मुख्य ग्रिडलाइनों के बीच की दूरी; VectorCraft दस्तावेज़ उसी ग्रिड के साथ खुलता है जिसके साथ वह सेव किया गया था। + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. हर मुख्य ग्रिड वर्ग कितने भागों में बँटता है; ज़ूम से उनकी रेखाएँ छिपने पर भी ग्रिड पर स्नैप करें इन भागों पर स्नैप करता है। + Draws the grid behind the artwork; off, the grid is drawn over it. ग्रिड को आर्टवर्क के पीछे बनाता है; बंद होने पर ग्रिड उसके ऊपर बनती है। + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. पिक्सेल प्रीव्यू में 600% या अधिक ज़ूम पर, सक्रिय व्यू आर्टवर्क के ऊपर दस्तावेज़ के हर पिक्सेल के किनारे पर रेखा दिखाता है। + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. पैटर्न संपादित करते समय दिखने वाले टाइल एज और डैश वाली स्वॉच सीमाओं का रंग। + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. ड्रॉ करने, खिसकाने और ट्रांसफ़ॉर्म करने को पास के आर्ट पर स्नैप करता है और गाइड्स व लेबल दिखाता है; पिक्सेल प्रीव्यू इन्हें बंद करता है, और ग्रिड पर स्नैप करें इनकी जगह ग्रिड पर स्नैप करता है। + The color of Smart Guide lines and labels. स्मार्ट गाइड्स की रेखाओं और लेबल का रंग। + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. उस किनारे या केंद्र के साथ रेखा दिखाता है जिससे आर्ट संरेखित होता है; बंद होने पर आर्ट रेखा के बिना भी संरेखित होता है, और ग्लिफ़ पर स्नैप करें लागू नहीं होता। + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. सिलेक्शन टूल के साथ, जब आप ड्रैग नहीं कर रहे हों, पॉइंटर के नीचे के असिलेक्टेड ऑब्जेक्ट की रूपरेखा उसकी लेयर के रंग में दिखाता है। + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. आर्ट को स्केल करते, घुमाते, शियर करते या परावर्तित करते समय पॉइंटर के पास आकार या कोण दिखाता है। + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. ड्रॉ करते समय पॉइंट उन रेखाओं पर स्नैप होते हैं जो चुने गए कोणों पर उस पॉइंट से गुज़रती हैं जहाँ से सेगमेंट या आकृति शुरू होती है। + The set of angles the construction guides follow while Construction Guides is on. निर्माण गाइड चालू होने पर निर्माण गाइड जिन कोणों का पालन करते हैं, उनका समूह। + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. बताता है कि पॉइंट किस पर स्नैप होता है, जैसे एंकर, पाथ या संरेखण; बंद होने पर पॉइंट नामों के बिना उसी तरह स्नैप होते हैं। + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. ड्रॉ करते या खिसकाते समय पॉइंटर के पास दूरियाँ, कोण और आर्ट कितना खिसका यह दिखाता है। + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. खिसकाए गए या आकार बदले गए आर्ट को पास के ऑब्जेक्ट्स के बीच जितने ही अंतर पर स्नैप करता है और बराबर अंतर चिह्नित करता है। + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. कुछ सिलेक्ट होने पर, किसी दूसरे ऑब्जेक्ट या आर्टबोर्ड के ऊपर Alt/Option दबाए रखने से उसके और सिलेक्शन के बीच की दूरियाँ दिखती हैं। + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. ड्रैग जहाँ से शुरू हुआ था, वहाँ से स्नैपिंग सहिष्णुता के भीतर वापस ड्रैग किया गया सिलेक्शन ठीक उसी जगह लौट जाता है; कॉपी नहीं लौटती। + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. स्मार्ट गाइड्स के स्नैप करने के लिए पॉइंटर या ड्रैग किया गया पॉइंट स्क्रीन पर आर्ट के कितने पास आना चाहिए; यह दूरी हर ज़ूम पर समान रहती है। + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. लाइन सेगमेंट के सिरे को, या केंद्र से ड्रॉ किए गए वृत्त को, इस तरह स्नैप करता है कि वह पास के वक्र को छुए। + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. लाइन सेगमेंट के सिरे को इस तरह स्नैप करता है कि वह पास के सीधे सेगमेंट से समकोण पर मिले। Reset all preferences to their defaults? सभी प्रेफ़रेंसेज़ को उनके डिफ़ॉल्ट पर रीसेट करें? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. डिफ़ॉल्ट तब लागू होते हैं जब आप प्रेफ़रेंसेज़ में ठीक है पर क्लिक करते हैं। वहाँ रद्द करें आपकी मौजूदा प्रेफ़रेंसेज़ बनाए रखता है। Restore Recovered Documents पुनर्स्थापना डॉक्यूमेंट @@ -6107,7 +6165,7 @@ antiAlias Sharp शार्प @msg {label}… {label}... @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} बनाया गया है और इसे हटाया नहीं जा सकता है। -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} को {lo}-{hi}{unit} ({v}) होना चाहिए। +@msg {name} must be {range} (got {v}) {name} को {range} होना चाहिए ({v} मिला) @msg {name}: {e} {name}: {e} @msg {name}: CRC mismatch {name}: CRC mismatch @msg {name}: CRC or size mismatch {name}: CRC या आकार मेल नहीं खाता @@ -6638,7 +6696,6 @@ antiAlias Sharp शार्प @msg anchor `{key}` must be a number एंकर `{key}` को एक नंबर होना चाहिए @msg anchor `smooth` must be true or false एंकर का `smooth` true या false होना चाहिए @msg anchor must name a registered panel anchor किसी पंजीकृत पैनल का नाम होना चाहिए -@msg angle and roundness must be finite कोण और गोलाई परिमित होना चाहिए @msg angles must be a list as long as pins (degrees or null) angles पिन जितनी लंबी सूची होनी चाहिए (डिग्री या null) @msg Angles require two straight segments कोणों को दो सीधे खंडों की आवश्यकता होती है @msg antiAlias `{id}`: none, art or type antiAlias `{id}`: none, art या type @@ -8047,6 +8104,11 @@ liquify-list-end {0}, {1} {0} और {1} @msg preset must be standard, diffuse, topLeft or right preset को standard, diffuse, topLeft या right होना चाहिए @msg preset must be the name of a print preset preset किसी प्रिंट प्रीसेट का नाम होना चाहिए @msg Preview in Browser needs the desktop app (the web downloads files instead) ब्राउज़र में प्रीव्यू डेस्कटॉप ऐप (वेब डाउनलोड फ़ाइलों के बजाय) की जरूरत है +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK` दें, K (1024 बाइट) में वांछित फ़ाइल आकार: 0 से बड़ी और अधिकतम 1048576 संख्या +@msg `startWith` is `current` or `auto` `startWith` का मान `current` या `auto` होना चाहिए +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` का मान `allSlices`, `eachSlice` या `currentSlice` होना चाहिए +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice`, `slice.list` से स्लाइस संख्या है, `use: currentSlice` के साथ +@msg Optimize to File Size: there is no image to measure फ़ाइल आकार के अनुसार ऑप्टिमाइज़ करें: मापने के लिए कोई इमेज नहीं है @msg previewMode must be default, pixel or overprint previewMode को default, pixel या overprint होना चाहिए @msg Print Ink Fixes works on CMYK documents: choose File › Document Color Mode › CMYK Color first प्रिंट इंक फिक्स CMYK डॉक्यूमेंट्स पर काम करता है: फ़ाइल चुनें › डॉक्यूमेंट रंग मोड › CMYK कलर फर्स्ट @msg print settings are not an object प्रिंट सेटिंग एक ऑब्जेक्ट नहीं है @@ -8844,6 +8906,18 @@ liquify-list-end {0}, {1} {0} और {1} @msg panels can't be shown in Presentation Mode प्रस्तुति मोड में पैनल्स नहीं दिखाए जा सकते @msg unknown parameter `{key}`; did you mean `{near}`? अज्ञात पैरामीटर `{key}`; क्या आपको `{near}` का मतलब है? @msg unknown parameter `{key}`; the command takes no parameters अज्ञात पैरामीटर `{key}`; कमांड कोई पैरामीटर नहीं लेता है +@msg unknown parameter `{key}`; `{object}` takes: {keys} अज्ञात पैरामीटर `{key}`; `{object}` लेता है: {keys} +@msg unknown parameter `{key}`; {why_not} अज्ञात पैरामीटर `{key}`; {why_not} +@msg no format takes it (see document.formats) कोई फ़ॉर्मैट इसे नहीं लेता (document.formats देखें) +@msg no save format takes it (see file.formatOptions) कोई सेव फ़ॉर्मैट इसे नहीं लेता (file.formatOptions देखें) +@msg PDF doesn't take it (see document.formats) PDF इसे नहीं लेता (document.formats देखें) +@msg EPS doesn't take it (see document.formats) EPS इसे नहीं लेता (document.formats देखें) +@msg DXF doesn't take it (see document.formats) DXF इसे नहीं लेता (document.formats देखें) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) पहले आज़माया गया ग्राफिक्स प्रोसेसर विंडो नहीं दिखा सका, इसलिए VectorCraft फिर से {summary} पर शुरू हुआ (सेटिंग्स › प्रदर्शन › ग्राफिक्स प्रोसेसर › स्वचालित उस प्रोसेसर का उपयोग करता है जो आपका डिस्प्ले चलाता है) +@msg Sent “{title}” to {to} “{title}” को {to} पर भेजा गया +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” को {to} पर भेजा गया। प्रिंट कतार का उत्तर: {note} +@msg the default printer डिफ़ॉल्ट प्रिंटर +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap ऑब्जेक्ट {object} पर रास्टर इफ़ेक्ट: {requested} ppi माँगा गया, 64 मिलियन पिक्सेल की सीमा के कारण {achieved} ppi मिला @msg unknown parameter `{key}`; the command takes: {keys} अज्ञात पैरामीटर `{key}`; कमांड लेता है: {keys} @msg the params must be an object, not {got} पैरामीटर एक ऑब्जेक्ट होने चाहिए, {got} नहीं @msg unknown parameter `{path}`; the object takes no keys अज्ञात पैरामीटर `{path}`; ऑब्जेक्ट कोई कुंजी नहीं लेता @@ -9274,6 +9348,10 @@ theme Appearance अपीयरेंस @msg Some islands could not be joined to the area around the art कुछ आइलैंड आर्टवर्क के आसपास के क्षेत्र से नहीं जोड़े जा सके @msg `width` must be from {lo} to {hi} pt `width` {lo} से {hi} pt तक होना चाहिए @msg `angle` must be from -180 to 180 degrees `angle` -180 से 180 डिग्री तक होना चाहिए +@msg `roundness` must be from 0 to 100% `roundness` 0 से 100% तक होना चाहिए +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 0.01 से 100 pt तक होना चाहिए +@msg style must be "pencil" or "brush" style "pencil" या "brush" होना चाहिए +@msg extend end must be "start" or "end" extend अंत "start" या "end" होना चाहिए @msg `roundness` must be from 1 to 100% `roundness` 1 से 100% तक होना चाहिए @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 1 से {MAX_BRIDGES_PER_ISLAND} तक पूरी संख्या होना चाहिए Weed Box and Lines… वीड बॉक्स और लाइनें… diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 8cd65be0ab..0f81a72036 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -811,6 +811,8 @@ font-technology Variable Változó Control Vezérlősáv Convert Átalakítás Convert All Spot Colors to Process Minden direktszín átalakítása skálaszínné + Convert {name} to process {name} átalakítása skálaszínné + Keep {name} as spot {name} megtartása direktszínként Convert All Strokes to Outlines Minden körvonal útvonallá alakítása Convert All Text to Outlines Minden szöveg útvonallá alakítása Convert Anchor Point Horgonypont átalakítása @@ -893,6 +895,9 @@ font-technology Variable Változó Create from Selection Létrehozás a kijelölésből Create From: Létrehozás ebből: Create Gradient Mesh… Színátmenetes háló létrehozása… + Flat Sík + To Center A közép felé + To Edge Az él felé Create Graph Diagram létrehozása Create New Fields by Új félképek létrehozása Create New Layer Új réteg létrehozása @@ -3282,6 +3287,18 @@ diagnostics ui felület Preview: Előnézet: Preview All Layers Összes réteg előnézetben Preview in Browser Előnézet böngészőben + Optimize to File Size… Optimalizálás fájlméretre… + Optimize to File Size Optimalizálás fájlméretre + Desired File Size: Kívánt fájlméret: + Start With: Kiindulás: + Use: Használat: + Current Settings Jelenlegi beállítások + Auto Select GIF/JPEG GIF/JPEG automatikus kiválasztása + Total of All Slices Az összes szelet együtt + Each Slice Minden szelet + Current Slice Aktuális szelet + {size}, within {target} {size}, belefér ebbe: {target} + No setting tried fits in {target}; the smallest is {size} Egyik kipróbált beállítás sem fér bele ebbe: {target}; a legkisebb {size} Preview in Browser needs the desktop app (the web downloads files instead) Az Előnézet böngészőben az asztali alkalmazásban érhető el (a webes változat helyette letölti a fájlokat) Preview Mode Előnézeti mód Preview the document as it is now A dokumentum jelenlegi állapotának előnézete @@ -3679,12 +3696,53 @@ mark-style Japanese Japán With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Ha egy szimbólumpéldány van kijelölve, az Átalakítás panel a szimbólum regisztrációs pontját használja referenciapontként. Darkens the canvas outside the artboards while the Artboard tool is active. Elsötétíti a vásznat a rajztáblákon kívül, amíg a Rajztábla eszköz aktív. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Ha A rajztáblán kívüli terület elhalványítása be van kapcsolva, a rajztáblákon kívüli terület sötét marad, miközben a Rajztábla eszközzel húz. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hány pixelnyire kell a mutatónak egy objektumhoz, horgonyponthoz vagy fogantyúhoz lennie, hogy egy kattintás kijelölje. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. A Kijelölés eszköz kerete az érintett objektumokat jelöli ki, vagy csak a teljesen benne lévőket; a Húzás iránya jobbra húzáskor a benne lévőket jelöli ki. Az E húzás közben megfordítja a szabályt. + A click selects a filled object only on its path, not inside its fill. Egy kattintás a kitöltött objektumot csak az útvonalán jelöli ki, a kitöltésén belül nem. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hány pixelnyire kell egy pontnak egy horgonyponthoz vagy vonalzó-segédvonalhoz kerülnie, hogy az Illesztés pontra odaillessze; bekapcsolt intelligens segédvonalaknál azok illesztési tűrése érvényes. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. A Kijelölés eszközzel a Cmd/Ctrl+kattintás a mutatónál a kijelölt alatti objektumot jelöli ki; minden további kattintás egy objektummal mélyebbre megy. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. A Nagyítás és a Kicsinyítés a kijelölés közepét a nézet közepére hozza. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. A rajztáblán belüli zárolt és rejtett grafika a többi grafikához hasonlóan a rajztáblával együtt mozog, méreteződik és másolódik. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. A horgonypontok és az irányfogantyúk végeinek mérete a vásznon; a nagyobb horgonypontok távolabbról is megfoghatók. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Az irányfogantyúk végeit teli pöttyökként, üres pöttyökként vagy nagyobb teli pöttyökként rajzolja. + With the Direct Selection tool, the anchor under the pointer is highlighted. A Közvetlen kijelölés eszközzel a mutató alatti horgonypont kiemelve látszik. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Megjeleníti az irányfogantyúkat, ha egynél több horgonypont van kijelölve; kikapcsolva csak egyetlen kijelölt horgonypontnál látszanak. + Corner widgets hide on corners whose angle is greater than this many degrees. A sarokfogantyúk elrejtőznek azokon a sarkokon, amelyek szöge nagyobb ennyi foknál. + The Pen tool previews the next segment from the last anchor to the pointer before you click. A Toll eszköz kattintás előtt mutatja a következő szakaszt az utolsó horgonyponttól a mutatóig. + The Curvature tool previews the curve to the pointer before you place the next point. A Görbület eszköz a következő pont elhelyezése előtt mutatja a görbét a mutatóig. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. A beépített, nem pixelben megadott méretű új dokumentumok és a mértékegységet nem rögzítő megnyitott fájlok mértékegysége; ha itt kiválasztja, és az OK gombra kattint, az aktív dokumentum mértékegysége is ez lesz. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. A körvonalvastagságok, a vonalak és a hézagok ebben a mértékegységben jelennek meg, és a hozzájuk beírt számokat is ebben értelmezi a program. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. A betűméretek, a sorköz és az alapvonal-eltolás ebben a mértékegységben jelennek meg, és a hozzájuk beírt számokat is ebben értelmezi a program. The unit for East Asian type measurements, which no field uses yet. A kelet-ázsiai szöveg méreteinek mértékegysége, amelyet egyelőre egyetlen mező sem használ. When on, a number typed without a unit into a field in picas is read in points. Bekapcsolva egy pica mértékegységű mezőbe mértékegység nélkül beírt számot pontként értelmez a program. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML-azonosító esetén az objektumnevek XML-azonosítóként jelennek meg a Rétegek, a Változók és a Rétegbeállítások ablakban. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. A rajzolást, mozgatást és méretezést a rács osztásaihoz illeszti, akkor is, ha a rács rejtve van; amíg be van kapcsolva, az Illesztés pixelhez nem érvényes. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. A nem kijelölt segédvonalak színe; a Segédvonalak címkéjével rendelkező rajztábla a saját segédvonalait a címke színével rajzolja. + Draws guides as solid lines or as dots, including the guides already in the document. A segédvonalakat folytonos vonalként vagy pontokként rajzolja, a dokumentumban már meglévőket is. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Bekapcsolva a segédvonalak a VectorCraft indulásakor zárolva vannak; a beállítás módosítása azonnal zárolja vagy feloldja őket, és a Nézet › Segédvonalak › Segédvonalak zárolása továbbra is módosítja a zárolást. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Bekapcsolva a vonalzóból való húzás kezdetén lenyomva tartott Cmd/Ctrl csak az aktív rajztáblán hoz létre segédvonalat, a Rajztábla eszközzel pedig a teljes vászonra kiterjedőt. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. A rács színe; a fő rácsvonalak közötti vonalak ennek halványabb árnyalatával jelennek meg. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. A rácsot vonalakként, vagy a fő rácsvonalak mentén minden osztásnál pontokként rajzolja. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. A fő rácsvonalak távolsága minden megnyitott dokumentumban és az újakban; a VectorCraft-dokumentum azzal a ráccsal nyílik meg, amellyel mentették. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Hány részre oszlik a rács minden fő négyzete; az Illesztés a rácshoz ezekhez a részekhez illeszt, akkor is, ha a nagyítás elrejti a vonalaikat. + Draws the grid behind the artwork; off, the grid is drawn over it. A rácsot a grafika mögé rajzolja; kikapcsolva a rács a grafika fölé kerül. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Pixeles előnézetben 600% vagy nagyobb nagyításnál az aktív nézet a grafika fölött vonalat mutat a dokumentum minden pixelének szélén. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. A csempeszél és a szaggatott színmintahatárok színe, amelyek a mintázat szerkesztése közben látszanak. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. A rajzolást, mozgatást és átalakítást a közeli grafikához illeszti, és segédvonalakat és címkéket mutat; a pixeles előnézet kikapcsolja őket, az Illesztés a rácshoz pedig helyettük a rácshoz illeszt. + The color of Smart Guide lines and labels. Az intelligens segédvonalak vonalainak és címkéinek színe. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Vonalat mutat azon a szélen vagy középen, amelyhez a grafika igazodik; kikapcsolva a grafika vonal nélkül is igazodik, és az Illesztés glifához nem érvényes. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Kijelölőeszközzel a mutató alatti, ki nem jelölt objektumot a rétege színével körvonalazza, amíg nem húz. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. A mutató mellett mutatja a méretet vagy a szöget, miközben a grafikát méretezi, forgatja, nyírja vagy tükrözi. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Rajzolás közben a pontok a kiválasztott szögű vonalakhoz illeszkednek, amelyek a szakasz vagy alakzat kezdőpontján haladnak át. + The set of angles the construction guides follow while Construction Guides is on. A szögek készlete, amelyeket a szerkesztési segédvonalak követnek, amíg a Szerkesztési segédvonalak be van kapcsolva. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Megnevezi, mihez illeszkedik egy pont, például horgonyponthoz, útvonalhoz vagy igazításhoz; kikapcsolva a pontok ugyanúgy illeszkednek, csak a nevek nélkül. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. A mutató mellett mutatja a távolságokat, a szögeket és a grafika elmozdulását rajzolás vagy mozgatás közben. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. A mozgatott vagy átméretezett grafikát a közeli objektumok közötti térközzel azonos térközhöz illeszti, és megjelöli az egyenlő térközöket. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Ha valami ki van jelölve, az Alt/Option nyomva tartása egy másik objektum vagy rajztábla fölött megmutatja a távolságokat közte és a kijelölés között. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Az a kijelölés, amelyet a húzás kezdőhelyétől az illesztési tűrésen belülre húznak vissza, pontosan oda tér vissza; a másolat nem. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Milyen közel kell a mutatónak vagy egy húzott pontnak a képernyőn a grafikához érnie, hogy az intelligens segédvonalak illesszenek; a távolság minden nagyításnál azonos. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Egy szakasz végét vagy a középpontjából rajzolt kört úgy illeszti, hogy érintse a közeli görbét. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Egy szakasz végét úgy illeszti, hogy derékszögben találkozzon egy közeli egyenes szakasszal. Reset all preferences to their defaults? Visszaállítja az összes beállítást az alapértékre? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Az alapértékek akkor lépnek életbe, amikor a Beállításokban az OK gombra kattint. Az ottani Mégse megtartja a jelenlegi beállításokat. Restore Recovered Documents Helyreállított dokumentumok visszaállítása @@ -5830,6 +5888,11 @@ liquify-list-end {0}, {1} {0} és {1} @msg plug-in parameters: {0} bővítmény paraméterei: {0} @msg plug-in trapped: {0} a bővítmény futása megszakadt: {0} @msg Preview in Browser needs the desktop app (the web downloads files instead) Az Előnézet böngészőben az asztali alkalmazásban érhető el (a webes változat helyette letölti a fájlokat) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 adja meg a `desiredK` értéket, a kívánt fájlméretet K-ban (1024 bájt): 0-nál nagyobb, legfeljebb 1048576 szám +@msg `startWith` is `current` or `auto` a `startWith` értéke `current` vagy `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` a `use` értéke `allSlices`, `eachSlice` vagy `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` a `slice` egy szeletszám a `slice.list` listából, `use: currentSlice` mellett +@msg Optimize to File Size: there is no image to measure Optimalizálás fájlméretre: nincs mérhető kép @msg print settings are not an object a nyomtatási beállítások nem objektumot alkotnak @msg printing isn't available here itt nem lehet nyomtatni @msg range `{s}` is empty a tartomány üres: `{s}` @@ -6319,6 +6382,19 @@ liquify-list-end {0}, {1} {0} és {1} Transform Objects Objektumok transzformálása @msg unknown parameter `{key}`; did you mean `{near}`? ismeretlen paraméter: `{key}`; erre gondolt: `{near}`? @msg unknown parameter `{key}`; the command takes no parameters ismeretlen paraméter: `{key}`; a parancsnak nincs paramétere +@msg unknown parameter `{key}`; `{object}` takes: {keys} ismeretlen paraméter: `{key}`; a(z) `{object}` ezeket fogadja el: {keys} +@msg unknown parameter `{key}`; {why_not} ismeretlen paraméter: `{key}`; {why_not} +@msg no format takes it (see document.formats) egyik formátum sem fogadja el (lásd: document.formats) +@msg no save format takes it (see file.formatOptions) egyik mentési formátum sem fogadja el (lásd: file.formatOptions) +@msg PDF doesn't take it (see document.formats) a PDF nem fogadja el (lásd: document.formats) +@msg EPS doesn't take it (see document.formats) az EPS nem fogadja el (lásd: document.formats) +@msg DXF doesn't take it (see document.formats) a DXF nem fogadja el (lásd: document.formats) +@msg {name} must be {range} (got {v}) a(z) {name} értéke {range} lehet (kapott érték: {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Az először kipróbált grafikus processzor nem tudta megjeleníteni az ablakot, ezért a VectorCraft újraindult ezen: {summary} (Beállítások › Teljesítmény › Grafikus processzor › Automatikus: azt használja, amelyik a kijelzőt hajtja) +@msg Sent “{title}” to {to} “{title}” elküldve ide: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” elküldve ide: {to}. A nyomtatási sor válasza: {note} +@msg the default printer alapértelmezett nyomtató +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap raszteres effektusok a(z) {object} objektumon: kért felbontás {requested} ppi, elért felbontás {achieved} ppi a 64 millió képpontos korlát miatt @msg unknown parameter `{key}`; the command takes: {keys} ismeretlen paraméter: `{key}`; a parancs ezeket fogadja el: {keys} @msg the params must be an object, not {got} a paramétereknek objektumnak kell lenniük, nem ez: {got} @msg unknown parameter `{path}`; the object takes no keys ismeretlen paraméter: `{path}`; az objektum nem fogad el kulcsokat @@ -7836,6 +7912,11 @@ breakText Glyphs Glifák @msg Some islands could not be joined to the area around the art Egyes szigeteket nem sikerült összekötni a grafikát körülvevő területtel @msg `width` must be from {lo} to {hi} pt A `width` értéke {lo} és {hi} pt között lehet @msg `angle` must be from -180 to 180 degrees Az `angle` értéke -180 és 180 fok között lehet +@msg `roundness` must be from 0 to 100% A `roundness` értéke 0 és 100% között lehet +@msg `fidelity` must be from 0.01 to 100 pt A `fidelity` értéke 0.01 és 100 pt között lehet +@msg style must be "pencil" or "brush" A style értéke "pencil" vagy "brush" lehet +@msg extend end must be "start" or "end" Az extend vége "start" vagy "end" lehet +@msg connect end must be "start" or "end" A connect vége "start" vagy "end" lehet @msg `roundness` must be from 1 to 100% A `roundness` értéke 1 és 100% között lehet @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count`: 1 és {MAX_BRIDGES_PER_ISLAND} közötti egész szám kell Weed Box and Lines… Gyomláló keret és vonalak… @@ -8359,7 +8440,6 @@ breakText Glyphs Glifák @msg anchor `smooth` must be true or false horgonypont, `smooth`: true vagy false kell @msg anchor `{key}` must be [x, y] horgonypont, `{key}`: [x, y] kell @msg anchor `{key}` must be a number horgonypont, `{key}`: szám kell -@msg angle and roundness must be finite angle és roundness: véges érték kell @msg angles must be a list as long as pins (degrees or null) angles: a pins listával azonos hosszúságú lista kell (fok vagy null) @msg appearance must be flat|center|edge appearance: flat|center|edge kell @msg apply is "fill" or "stroke", not `{other}` apply: "fill" vagy "stroke", ez nem az: `{other}` @@ -9514,8 +9594,6 @@ breakText Glyphs Glifák @msg unknown panel ismeretlen panel @msg unknown panel `{panel}` ismeretlen panel: `{panel}` @msg unknown parameter `{key}` ismeretlen paraméter: `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} ismeretlen paraméter: `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} ismeretlen paraméter: `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) ismeretlen pieLegend: `{v}` (none, standard vagy wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) ismeretlen piePosition: `{v}` (even, ratio vagy stacked) @msg unknown pieSort `{v}` (none, all or first) ismeretlen pieSort: `{v}` (none, all vagy first) @@ -9643,7 +9721,6 @@ breakText Glyphs Glifák @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name}: beépített elem, nem törölhető @msg {name} must be a number {name}: szám kell -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name}: {lo}–{hi}{unit} kell (kapott érték: {v}) @msg {name}: CRC or size mismatch {name}: a CRC vagy a méret nem egyezik @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}: ennek az Affinity-fájlnak csak a beágyazott előnézete volt olvasható; a Fájl › Megnyitás paranccsal megnézheted a figyelmeztetésével együtt, vagy az elhelyezés előtt exportálj SVG-t vagy PDF-et az Affinityből @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index c6b98ebc8a..28ea2b5ab3 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -211,6 +211,9 @@ Mask Masker Rasterize… Rasterisasi… Create Gradient Mesh… Buat mesh gradien… + Flat Datar + To Center Ke tengah + To Edge Ke tepi Create Object Mosaic… Buat mozaik objek… Vector Halftone… Halftone vektor… Create Trim Marks Buat tanda potong @@ -1094,6 +1097,18 @@ lighting Light Cahaya Placement Options… Opsi penempatan… Plug-in… Plug-in… Preview in Browser Pratinjau di browser + Optimize to File Size… Optimalkan ke Ukuran File… + Optimize to File Size Optimalkan ke Ukuran File + Desired File Size: Ukuran File yang Diinginkan: + Start With: Mulai Dengan: + Use: Gunakan: + Current Settings Pengaturan Saat Ini + Auto Select GIF/JPEG Pilih Otomatis GIF/JPEG + Total of All Slices Total Semua Slice + Each Slice Setiap Slice + Current Slice Slice Saat Ini + {size}, within {target} {size}, dalam batas {target} + No setting tried fits in {target}; the smallest is {size} Tidak ada pengaturan yang dicoba yang muat dalam {target}; yang terkecil {size} Printer Setup… Pengaturan printer… Printers Printer Recent File File terbaru @@ -2650,6 +2665,8 @@ digits Malayalam Malayalam Collate Susun Composite colours are converted to it; separations separate with it when it is a CMYK profile. Warna komposit dikonversi ke profil ini; separasi memisah dengannya bila merupakan profil CMYK. Convert All Spot Colors to Process Konversi semua warna spot menjadi proses + Convert {name} to process Konversi {name} menjadi proses + Keep {name} as spot Pertahankan {name} sebagai spot Default Printer Printer default Document Ink Options Opsi tinta dokumen Download: Unduh: @@ -4200,12 +4217,53 @@ font-technology Variable Variabel With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Saat satu instans simbol dipilih, panel Transformasi memakai titik registrasi simbol sebagai titik referensi. Darkens the canvas outside the artboards while the Artboard tool is active. Menggelapkan kanvas di luar artboard selama alat Artboard aktif. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Saat Redupkan wilayah di luar artboard aktif, area di luar artboard tetap gelap selama Anda menyeret dengan alat Artboard. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Seberapa dekat, dalam piksel, penunjuk harus berada dari objek, titik jangkar, atau pegangan agar klik memilihnya. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Apakah kotak alat seleksi memilih objek yang disentuhnya atau hanya yang sepenuhnya di dalam; Arah seret memilih yang di dalam saat diseret ke kanan. E membalik aturan saat menyeret. + A click selects a filled object only on its path, not inside its fill. Klik memilih objek berisi hanya pada jalurnya, bukan di dalam isiannya. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Seberapa dekat, dalam piksel, sebuah titik harus mendekati titik jangkar atau panduan penggaris agar Snap ke titik menempelkannya; saat panduan cerdas aktif, toleransi kancingnya yang berlaku. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Dengan alat seleksi, Cmd/Ctrl-klik memilih objek di bawah objek terpilih pada penunjuk; setiap klik berikutnya turun satu objek lebih dalam. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Perbesar dan Perkecil membawa pusat seleksi ke tengah tampilan. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Karya seni terkunci dan tersembunyi di dalam artboard ikut dipindah, diskalakan, dan disalin bersama artboard seperti karya seni lainnya. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Ukuran titik jangkar dan ujung pegangan arah di kanvas; titik jangkar yang lebih besar juga dapat diambil dari jarak lebih jauh. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Menggambar ujung pegangan arah sebagai titik penuh, titik berongga, atau titik penuh yang lebih besar. + With the Direct Selection tool, the anchor under the pointer is highlighted. Dengan alat seleksi langsung, titik jangkar di bawah penunjuk disorot. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Menampilkan pegangan arah saat lebih dari satu titik jangkar dipilih; jika nonaktif, pegangan hanya tampil saat satu titik jangkar dipilih. + Corner widgets hide on corners whose angle is greater than this many degrees. Widget sudut disembunyikan pada sudut yang besarnya melebihi derajat ini. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Alat pena menampilkan pratinjau segmen berikutnya dari titik jangkar terakhir ke penunjuk sebelum Anda mengklik. + The Curvature tool previews the curve to the pointer before you place the next point. Alat kelengkungan menampilkan pratinjau kurva ke penunjuk sebelum Anda menempatkan titik berikutnya. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Satuan untuk dokumen baru dari ukuran bawaan selain ukuran piksel dan untuk file yang dibuka tanpa satuan tercatat; jika Anda memilihnya di sini lalu mengklik OK, satuan dokumen aktif juga menjadi satuan ini. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Ketebalan stroke, putus-putus, dan jarak ditampilkan dalam satuan ini, dan angka yang diketik untuknya dibaca dalam satuan ini. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Ukuran teks, leading, dan pergeseran garis dasar ditampilkan dalam satuan ini, dan angka yang diketik untuknya dibaca dalam satuan ini. The unit for East Asian type measurements, which no field uses yet. Satuan untuk ukuran teks Asia Timur, yang belum digunakan bidang mana pun. When on, a number typed without a unit into a field in picas is read in points. Jika aktif, angka yang diketik tanpa satuan di bidang dalam pica dibaca dalam titik. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Dengan ID XML, nama objek ditampilkan sebagai ID XML di Lapisan, Variabel, dan Opsi lapisan. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Menempelkan penggambaran, pemindahan, dan penskalaan ke subdivisi kisi, bahkan saat kisi disembunyikan; selama opsi ini aktif, Snap ke piksel tidak berlaku. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Warna panduan yang tidak dipilih; artboard yang memiliki Label panduan menggambar panduannya sendiri dengan warna label tersebut. + Draws guides as solid lines or as dots, including the guides already in the document. Menggambar panduan sebagai garis utuh atau sebagai titik, termasuk panduan yang sudah ada di dokumen. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Jika aktif, panduan terkunci saat VectorCraft dimulai; mengubah opsi ini langsung mengunci atau membuka kuncinya, dan Tampilan › Panduan › Kunci panduan tetap dapat mengubah kunci. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Jika aktif, menahan Cmd/Ctrl saat mulai menyeret dari penggaris membuat panduan hanya di artboard aktif, atau panduan seluruh kanvas dengan alat artboard. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Warna kisi; garis di antara garis kisi utama digambar dengan nuansa yang lebih pudar dari warna itu. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Menggambar kisi sebagai garis, atau sebagai titik di sepanjang garis kisi utama pada setiap subdivisi. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Jarak antara garis kisi utama di setiap dokumen yang terbuka dan di dokumen baru; dokumen VectorCraft dibuka dengan kisi yang disimpan bersamanya. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Berapa bagian setiap kotak kisi utama dibagi; Snap ke kisi menempel ke bagian-bagian ini, bahkan saat zoom menyembunyikan garisnya. + Draws the grid behind the artwork; off, the grid is drawn over it. Menggambar kisi di belakang karya seni; jika nonaktif, kisi digambar di atasnya. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Di Pratinjau piksel dengan zoom 600% atau lebih, tampilan aktif menunjukkan garis di tepi setiap piksel dokumen di atas karya seni. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Warna tepi ubin dan batas swatch putus-putus yang ditampilkan saat Anda mengedit pola. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Menjepretkan penggambaran, pemindahan, dan transformasi ke karya di dekatnya serta menampilkan panduan dan label; Pratinjau piksel mematikannya, dan Snap ke kisi menjepretkan ke kisi sebagai gantinya. + The color of Smart Guide lines and labels. Warna garis dan label panduan cerdas. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Menampilkan garis di sepanjang tepi atau pusat yang sejajar dengan karya; saat mati, karya tetap sejajar tanpa garis, dan Snap ke glif tidak berlaku. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Dengan alat seleksi, menggaris tepi objek yang tidak dipilih di bawah penunjuk dengan warna lapisannya selama Anda tidak menyeret. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Menampilkan ukuran atau sudut di samping penunjuk saat Anda menskalakan, memutar, memiringkan atau memantulkan karya. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Saat Anda menggambar, titik menjepret ke garis pada sudut yang dipilih melalui titik awal segmen atau bentuk. + The set of angles the construction guides follow while Construction Guides is on. Kumpulan sudut yang diikuti panduan konstruksi selama Panduan konstruksi aktif. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Menamai tempat titik menjepret, misalnya jangkar, jalur, atau perataan; saat mati, titik menjepret dengan cara yang sama tanpa nama. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Menampilkan jarak, sudut, dan seberapa jauh karya berpindah di samping penunjuk saat Anda menggambar atau memindahkan. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Menjepretkan karya yang dipindahkan atau diubah ukurannya ke celah yang sama dengan celah antarobjek di dekatnya, dan menandai celah yang sama. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Dengan sesuatu yang dipilih, menahan Alt/Option di atas objek lain atau artboard menampilkan jarak antara objek itu dan seleksi. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Seleksi yang diseret kembali hingga dalam toleransi kancing dari tempat seretan dimulai kembali tepat ke tempat itu; salinan tidak. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Seberapa dekat penunjuk atau titik yang diseret harus mendekati karya di layar agar panduan cerdas menjepret; jaraknya sama pada setiap zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Menjepretkan ujung segmen garis, atau lingkaran yang digambar dari pusatnya, agar menyentuh kurva di dekatnya. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Menjepretkan ujung segmen garis agar bertemu segmen lurus di dekatnya pada sudut siku-siku. Reset all preferences to their defaults? Atur ulang semua preferensi ke defaultnya? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Nilai default diterapkan saat Anda mengklik OK di Preferensi. Batal di sana mempertahankan preferensi Anda saat ini. Smaller ↔ Larger Lebih kecil ↔ Lebih besar @@ -4494,6 +4552,11 @@ imageTrace Outline Kontur @msg PDF writer error: {0} Kesalahan penulis PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Berhasil mengemas {n} file di {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Pratinjau di Peramban memerlukan aplikasi desktop (versi web mengunduh file sebagai gantinya) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 berikan `desiredK`, ukuran file yang diinginkan dalam K (1024 byte): angka di atas 0 dan paling banyak 1048576 +@msg `startWith` is `current` or `auto` `startWith` adalah `current` atau `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` adalah `allSlices`, `eachSlice` atau `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` adalah nomor slice dari `slice.list`, dengan `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimalkan ke Ukuran File: tidak ada gambar untuk diukur @msg Release Guides: no guides Lepaskan panduan: tidak ada panduan @msg Release: no layer to put the rectangle in Lepaskan: tidak ada lapisan untuk menaruh persegi panjangnya @msg Replace Spine: select a blend and a path Ganti rangka: pilih satu blend dan satu jalur @@ -5561,6 +5624,19 @@ mark-style Japanese Jepang Transform Objects Transformasikan objek @msg unknown parameter `{key}`; did you mean `{near}`? parameter `{key}` tidak dikenal; apakah maksud Anda `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parameter `{key}` tidak dikenal; perintah tidak menerima parameter +@msg unknown parameter `{key}`; `{object}` takes: {keys} parameter `{key}` tidak dikenal; `{object}` menerima: {keys} +@msg unknown parameter `{key}`; {why_not} parameter `{key}` tidak dikenal; {why_not} +@msg no format takes it (see document.formats) tidak ada format yang menerimanya (lihat document.formats) +@msg no save format takes it (see file.formatOptions) tidak ada format penyimpanan yang menerimanya (lihat file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF tidak menerimanya (lihat document.formats) +@msg EPS doesn't take it (see document.formats) EPS tidak menerimanya (lihat document.formats) +@msg DXF doesn't take it (see document.formats) DXF tidak menerimanya (lihat document.formats) +@msg {name} must be {range} (got {v}) {name} harus {range} (diperoleh {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Prosesor grafis yang dicoba pertama kali tidak dapat menampilkan jendela, jadi VectorCraft memulai ulang dengan {summary} (Pengaturan › Kinerja › Prosesor grafis › Otomatis menggunakan prosesor yang menjalankan layar Anda) +@msg Sent “{title}” to {to} “{title}” dikirim ke {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” dikirim ke {to}. Balasan antrean cetak: {note} +@msg the default printer printer bawaan +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efek raster pada objek {object}: diminta {requested} ppi, tercapai {achieved} ppi karena batas 64 juta piksel @msg unknown parameter `{key}`; the command takes: {keys} parameter `{key}` tidak dikenal; perintah menerima: {keys} Load EPS into Clipboard Muat EPS ke papan klip @msg an image of {w} × {h} pixels is too large to draw gambar {w} × {h} piksel terlalu besar untuk digambar diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 415aa31ca5..8f2ed3216c 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -205,6 +205,8 @@ antiAlias Sharp Nitido Crisp Definito Strong Forte Anti-aliasing: Anti-aliasing: + Art Optimized Ottimizzato per la grafica + Type Optimized Ottimizzato per il testo Any Kind Qualsiasi tipo Font Technology Tecnologia font font-technology Variable Variabili @@ -618,6 +620,8 @@ font-technology Variable Variabili Control Controllo Convert Converti Convert All Spot Colors to Process Converti tutti i colori spot in quadricromia + Convert {name} to process Converti {name} in quadricromia + Keep {name} as spot Mantieni {name} come colore spot Convert All Strokes to Outlines Converti tutte le tracce in contorni Convert All Text to Outlines Converti tutto il testo in contorni Convert Anchor Point Converti punto di ancoraggio @@ -693,6 +697,9 @@ font-technology Variable Variabili Create from Selection Crea dalla selezione Create From: Crea da: Create Gradient Mesh… Crea trama sfumatura… + Flat Piatto + To Center Verso il centro + To Edge Verso il bordo Create Graph Crea grafico Create New Layer Crea nuovo livello Create New Sublayer Crea nuovo sottolivello @@ -2759,6 +2766,18 @@ diagnostics ui interfaccia Preview: Anteprima: Preview All Layers Anteprima di tutti i livelli Preview in Browser Anteprima nel browser + Optimize to File Size… Ottimizza in base alle dimensioni del file… + Optimize to File Size Ottimizza in base alle dimensioni del file + Desired File Size: Dimensione file desiderata: + Start With: Inizia con: + Use: Usa: + Current Settings Impostazioni correnti + Auto Select GIF/JPEG Selezione automatica GIF/JPEG + Total of All Slices Totale di tutte le sezioni + Each Slice Ogni sezione + Current Slice Sezione corrente + {size}, within {target} {size}, entro {target} + No setting tried fits in {target}; the smallest is {size} Nessuna impostazione provata rientra in {target}; la più piccola è {size} Preview in Browser needs the desktop app (the web downloads files instead) Anteprima nel browser richiede l'app desktop (la versione web scarica invece i file) Preview Mode Modalità anteprima Preview the document as it is now Visualizza l'anteprima del documento nello stato attuale @@ -3139,12 +3158,53 @@ digits Malayalam Malayalam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Con un'istanza di simbolo selezionata, il pannello Trasforma usa il punto di registrazione del simbolo come punto di riferimento. Darkens the canvas outside the artboards while the Artboard tool is active. Scurisce l'area di lavoro fuori dalle tavole da disegno mentre lo strumento Tavola da disegno è attivo. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Con Attenua area esterna alla tavola da disegno attivo, l'area fuori dalle tavole da disegno resta scura mentre trascini con lo strumento Tavola da disegno. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Quanto vicino, in pixel, deve trovarsi il puntatore a un oggetto, punto di ancoraggio o maniglia perché un clic lo selezioni. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Se il riquadro dello strumento Selezione seleziona gli oggetti che tocca o solo quelli interamente all'interno; Direzione di trascinamento seleziona quelli interni trascinando verso destra. E inverte la regola durante il trascinamento. + A click selects a filled object only on its path, not inside its fill. Un clic seleziona un oggetto con riempimento solo sul suo tracciato, non all'interno del riempimento. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Quanto vicino, in pixel, un punto deve arrivare a un punto di ancoraggio o a una guida del righello perché Aggancia al punto lo agganci; con le guide sensibili attive vale invece la loro tolleranza di aggancio. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Con lo strumento Selezione, Cmd/Ctrl+clic seleziona l'oggetto sotto quello selezionato nel punto del puntatore; ogni clic successivo scende di un oggetto. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Ingrandisci e Riduci portano il centro della selezione al centro della vista. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. La grafica bloccata e nascosta all'interno di una tavola da disegno viene spostata, ridimensionata e copiata con essa, come il resto della grafica. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. La dimensione dei punti di ancoraggio e delle estremità delle maniglie di direzione sull'area di lavoro; i punti di ancoraggio più grandi si possono afferrare anche da più lontano. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Disegna le estremità delle maniglie di direzione come punti pieni, punti vuoti o punti pieni più grandi. + With the Direct Selection tool, the anchor under the pointer is highlighted. Con lo strumento Selezione diretta, il punto di ancoraggio sotto il puntatore viene evidenziato. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Mostra le maniglie di direzione quando è selezionato più di un punto di ancoraggio; se disattivato, compaiono solo con un singolo punto di ancoraggio selezionato. + Corner widgets hide on corners whose angle is greater than this many degrees. I widget angolo si nascondono sugli angoli la cui ampiezza supera questo numero di gradi. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Lo strumento Penna mostra l'anteprima del segmento successivo dall'ultimo punto di ancoraggio al puntatore prima del clic. + The Curvature tool previews the curve to the pointer before you place the next point. Lo strumento Curvatura mostra l'anteprima della curva fino al puntatore prima di posizionare il punto successivo. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. L'unità dei nuovi documenti nelle dimensioni predefinite, tranne quelle in pixel, e dei file aperti che non registrano alcuna unità; sceglierla qui e fare clic su OK la imposta anche per il documento attivo. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Gli spessori della traccia, i trattini e gli spazi sono mostrati in questa unità, e i numeri digitati per essi sono letti in questa unità. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Dimensioni del testo, interlinea e spostamento della linea di base sono mostrati in questa unità, e i numeri digitati per essi sono letti in questa unità. The unit for East Asian type measurements, which no field uses yet. L'unità per le misure del testo dell'Asia orientale, che nessun campo usa ancora. When on, a number typed without a unit into a field in picas is read in points. Se attiva, un numero digitato senza unità in un campo in pica viene letto in punti. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Con ID XML, i nomi degli oggetti sono mostrati come ID XML in Livelli, Variabili e Opzioni livello. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Aggancia il disegno, lo spostamento e il ridimensionamento alle suddivisioni della griglia, anche quando la griglia è nascosta; finché è attivo, Aggancia ai pixel non si applica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Il colore delle guide non selezionate; una tavola da disegno con un'Etichetta delle guide disegna le proprie guide nel colore dell'etichetta. + Draws guides as solid lines or as dots, including the guides already in the document. Disegna le guide come linee continue o come punti, comprese le guide già presenti nel documento. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Se attivo, le guide sono bloccate all'avvio di VectorCraft; cambiare l'opzione le blocca o sblocca subito, e Visualizza › Guide › Blocca guide continua a cambiare il blocco. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Se attivo, tenere premuto Cmd/Ctrl all'inizio di un trascinamento da un righello crea una guida solo sulla tavola da disegno attiva, oppure una guida su tutta l'area di lavoro con lo strumento Tavola da disegno. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Il colore della griglia; le linee tra le linee principali sono disegnate in una tonalità più tenue di quel colore. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Disegna la griglia come linee, oppure come punti lungo le linee principali a ogni suddivisione. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. La distanza tra le linee principali della griglia, in ogni documento aperto e in quelli nuovi; un documento VectorCraft si apre con la griglia con cui è stato salvato. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. In quante parti è diviso ogni quadrato principale della griglia; Aggancia alla griglia aggancia a queste parti, anche quando lo zoom ne nasconde le linee. + Draws the grid behind the artwork; off, the grid is drawn over it. Disegna la griglia dietro la grafica; se disattivato, la griglia è disegnata sopra. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. In Anteprima pixel con zoom del 600% o più, la vista attiva mostra sopra la grafica una linea sul bordo di ogni pixel del documento. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Il colore del bordo del tassello e dei limiti tratteggiati del campione mostrati mentre modifichi un motivo. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Aggancia disegno, spostamento e trasformazione alla grafica vicina e mostra guide ed etichette; l’anteprima pixel le disattiva, e Aggancia alla griglia aggancia invece alla griglia. + The color of Smart Guide lines and labels. Il colore delle linee e delle etichette delle guide sensibili. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Mostra una linea lungo il bordo o il centro con cui la grafica si allinea; se disattivata, la grafica si allinea comunque senza la linea, e Aggancia a glifo non si applica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Con uno strumento di selezione, contorna l’oggetto non selezionato sotto il puntatore con il colore del suo livello finché non trascini. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Mostra la dimensione o l’angolo accanto al puntatore mentre ridimensioni, ruoti, inclini o rifletti la grafica. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Mentre disegni, i punti si agganciano a linee con gli angoli scelti che passano per il punto da cui parte il segmento o la forma. + The set of angles the construction guides follow while Construction Guides is on. L’insieme di angoli che seguono le guide di costruzione mentre Guide di costruzione è attivo. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Indica a cosa si aggancia un punto, come un punto di ancoraggio, un tracciato o un allineamento; se disattivato, i punti si agganciano allo stesso modo, senza i nomi. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Mostra accanto al puntatore distanze, angoli e di quanto si è spostata la grafica mentre disegni o sposti. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Aggancia la grafica spostata o ridimensionata alla stessa distanza che separa gli oggetti vicini e segna le distanze uguali. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Con qualcosa di selezionato, tenere premuto Alt/Option su un altro oggetto o una tavola da disegno mostra le distanze tra questo e la selezione. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Una selezione trascinata indietro entro la tolleranza di aggancio dal punto in cui è iniziato il trascinamento torna esattamente lì; una copia no. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Quanto vicino sullo schermo il puntatore o un punto trascinato deve arrivare alla grafica perché le guide sensibili vi si aggancino; la distanza è la stessa a ogni zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Aggancia l’estremità di un segmento di linea, o un cerchio disegnato dal centro, in modo che tocchi una curva vicina. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Aggancia l’estremità di un segmento di linea in modo che incontri un segmento rettilineo vicino ad angolo retto. Reset all preferences to their defaults? Ripristinare tutte le preferenze ai valori predefiniti? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. I valori predefiniti vengono applicati quando fai clic su OK in Preferenze. Annulla lì mantiene le preferenze attuali. Restore Recovered Documents Ripristina documenti recuperati @@ -4739,6 +4799,11 @@ liquify-list-end {0}, {1} {0} e {1} @msg PDF writer error: {0} Errore del generatore PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Pacchetto creato con {n} file in {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Anteprima nel browser richiede l'app desktop (sul web i file vengono invece scaricati) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 indica `desiredK`, la dimensione del file desiderata in K (1024 byte): un numero maggiore di 0 e al massimo 1048576 +@msg `startWith` is `current` or `auto` `startWith` è `current` o `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` è `allSlices`, `eachSlice` o `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` è un numero di sezione da `slice.list`, con `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Ottimizza in base alle dimensioni del file: non c'è nessuna immagine da misurare @msg Release Guides: no guides Rilascia guide: nessuna guida @msg Release: no layer to put the rectangle in Rilascia: nessun livello in cui inserire il rettangolo @msg Replace Spine: select a blend and a path Sostituisci dorsale: seleziona una fusione e un tracciato @@ -5950,6 +6015,19 @@ lighting Light Luce Transform Objects Trasforma oggetti @msg unknown parameter `{key}`; did you mean `{near}`? parametro sconosciuto `{key}`; forse intendevate `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parametro sconosciuto `{key}`; il comando non ha parametri +@msg unknown parameter `{key}`; `{object}` takes: {keys} parametro sconosciuto `{key}`; `{object}` accetta: {keys} +@msg unknown parameter `{key}`; {why_not} parametro sconosciuto `{key}`; {why_not} +@msg no format takes it (see document.formats) nessun formato lo accetta (vedere document.formats) +@msg no save format takes it (see file.formatOptions) nessun formato di salvataggio lo accetta (vedere file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF non lo accetta (vedere document.formats) +@msg EPS doesn't take it (see document.formats) EPS non lo accetta (vedere document.formats) +@msg DXF doesn't take it (see document.formats) DXF non lo accetta (vedere document.formats) +@msg {name} must be {range} (got {v}) {name} deve essere {range} (ricevuto {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Il processore grafico provato per primo non è riuscito a mostrare la finestra, quindi VectorCraft è stato riavviato con {summary} (Impostazioni › Prestazioni › Processore grafico › Automatico usa quello che gestisce lo schermo) +@msg Sent “{title}” to {to} “{title}” inviato a: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” inviato a: {to}. Risposta della coda di stampa: {note} +@msg the default printer stampante predefinita +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap effetti raster sull'oggetto {object}: richiesti {requested} ppi, ottenuti {achieved} ppi a causa del limite di 64 milioni di pixel @msg unknown parameter `{key}`; the command takes: {keys} parametro sconosciuto `{key}`; il comando accetta: {keys} @msg the params must be an object, not {got} i parametri devono essere un oggetto, non {got} @msg unknown parameter `{path}`; the object takes no keys parametro sconosciuto `{path}`; l'oggetto non accetta chiavi @@ -7478,6 +7556,10 @@ breakText Glyphs Glifi @msg Some islands could not be joined to the area around the art Non è stato possibile collegare alcune isole all’area intorno alla grafica @msg `width` must be from {lo} to {hi} pt `width` deve essere compreso tra {lo} e {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` deve essere compreso tra -180 e 180 gradi +@msg `roundness` must be from 0 to 100% `roundness` deve essere compreso tra 0 e 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` deve essere compreso tra 0.01 e 100 pt +@msg style must be "pencil" or "brush" style deve essere "pencil" o "brush" +@msg extend end must be "start" or "end" l’estremità di extend deve essere "start" o "end" @msg `roundness` must be from 1 to 100% `roundness` deve essere compreso tra 1 e 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` deve essere un numero intero compreso tra 1 e {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Riquadro e linee di spellicolatura… @@ -7862,7 +7944,6 @@ breakText Glyphs Glifi @msg unknown dither `{d}` (diffusion, pattern, noise or none) dithering sconosciuto `{d}` (diffusion, pattern, noise o none) @msg unknown panel `{panel}` pannello sconosciuto `{panel}` @msg unknown parameter `{key}` parametro sconosciuto `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} parametro sconosciuto `{within}settings.{format}`; {why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) riduzione sconosciuta `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform o document) @msg unmatched ')' ')' senza corrispondenza @msg unterminated character class classe di caratteri non terminata @@ -8232,7 +8313,6 @@ breakText Glyphs Glifi @msg anchor `smooth` must be true or false `smooth` del punto di ancoraggio deve essere true o false @msg anchor `{key}` must be [x, y] `{key}` del punto di ancoraggio deve essere [x, y] @msg anchor `{key}` must be a number `{key}` del punto di ancoraggio deve essere un numero -@msg angle and roundness must be finite angle e roundness devono essere finiti @msg angles must be a list as long as pins (degrees or null) angles deve essere un elenco lungo quanto pins (gradi o null) @msg appearance must be flat|center|edge appearance deve essere flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply è "fill" o "stroke", non `{other}` @@ -9422,9 +9502,7 @@ breakText Glyphs Glifi @msg the spacing makes more than {MAX_GROMMETS} grommets la spaziatura produce più di {MAX_GROMMETS} occhielli @msg there is no banner to mark non c'è nessuno striscione da contrassegnare @msg turn on at least one side attiva almeno un lato -@msg unknown parameter `{within}{key}`; {why} parametro sconosciuto `{within}{key}`; {why} @msg with no hem and no grommets there is nothing to mark senza orlo e senza occhielli non c'è nulla da contrassegnare -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} deve essere {lo}–{hi}{unit} (ricevuto {v}) @msg {saving} failed: {e} {saving} non riuscito: {e} Banner Hems and Grommets… Orli e occhielli per striscioni… Banner Hems and Grommets Orli e occhielli per striscioni diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 751572fc02..c429f204a1 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -268,6 +268,9 @@ digits Malayalam マラヤーラム数字 Mask マスク Rasterize… ラスタライズ… Create Gradient Mesh… グラデーションメッシュを作成… + Flat フラット + To Center 中心へ + To Edge エッジへ Create Object Mosaic… モザイクオブジェクトを作成… Vector Halftone… ベクターハーフトーン… Create Trim Marks トリムマークを作成 @@ -1120,6 +1123,8 @@ antiAlias Sharp シャープ Crisp くっきり Strong 太め Anti-aliasing: アンチエイリアス: + Art Optimized アートに最適化 + Type Optimized 文字に最適化 Appearance Item アピアランス項目 Appearance Panel アピアランスパネル Appearance of Black ブラックのアピアランス @@ -1374,6 +1379,8 @@ antiAlias Sharp シャープ Contextual Alternates 前後関係に依存する字形 Convert 変換 Convert All Spot Colors to Process すべての特色をプロセスカラーに変換 + Convert {name} to process {name} をプロセスカラーに変換 + Keep {name} as spot {name} を特色のままにする Convert All Strokes to Outlines すべての線をアウトラインに変換 Convert All Text to Outlines すべてのテキストをアウトラインに変換 Convert Anchor Point アンカーポイントの切り替え @@ -2833,6 +2840,18 @@ diagnostics ui UI Preview All Layers すべてのレイヤーをプレビュー Preview Mode プレビューモード Preview in Browser ブラウザーでプレビュー + Optimize to File Size… ファイルサイズに合わせて最適化… + Optimize to File Size ファイルサイズに合わせて最適化 + Desired File Size: 目標ファイルサイズ: + Start With: 開始設定: + Use: 対象: + Current Settings 現在の設定 + Auto Select GIF/JPEG GIF/JPEG を自動選択 + Total of All Slices すべてのスライスの合計 + Each Slice 各スライス + Current Slice 現在のスライス + {size}, within {target} {size} ({target} 以内) + No setting tried fits in {target}; the smallest is {size} 試したどの設定も {target} に収まりません。最小は {size} Preview the document as it is now 現在のドキュメントをプレビュー Previous 前へ Previous Library 前のライブラリ @@ -3116,12 +3135,53 @@ mark-style Japanese 日本式 With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. シンボルインスタンスを 1 つ選択したとき、変形パネルはシンボルの基準点を基準点として使います。 Darkens the canvas outside the artboards while the Artboard tool is active. アートボードツールを使っている間、アートボードの外側のカンバスを暗く表示します。 With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. アートボードの外側を暗く表示がオンのとき、アートボードツールでドラッグしている間もアートボードの外側を暗いままにします。 + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. クリックでオブジェクト、アンカーポイント、ハンドルを選択できる、ポインターからの距離(ピクセル)です。 + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 選択ツールのボックスが、触れたオブジェクトを選択するか、完全に内側のものだけを選択するかです。ドラッグ方向では右へドラッグすると内側のものを選択します。ドラッグ中に E を押すとルールが反転します。 + A click selects a filled object only on its path, not inside its fill. 塗りのあるオブジェクトを、塗りの内側ではなくパス上のクリックでのみ選択します。 + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. ポイントにスナップでポイントがスナップされる、アンカーポイントや定規ガイドまでの距離(ピクセル)です。スマートガイドがオンのときは、代わりにスマートガイドのスナップ許容値を使います。 + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 選択ツールで Cmd/Ctrl キーを押しながらクリックすると、ポインター位置で選択中のオブジェクトの下にあるオブジェクトを選択します。クリックするたびに 1 つ下へ進みます。 + Zoom In and Zoom Out bring the center of the selection to the middle of the view. ズームインとズームアウトで、選択範囲の中心をビューの中央に移動します。 + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. アートボード内のロックされたアートワークと非表示のアートワークも、ほかのアートワークと同じくアートボードと一緒に移動、拡大・縮小、複製されます。 + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. カンバス上のアンカーポイントと方向ハンドルの先端のサイズです。大きいアンカーポイントは、より離れた位置からもつかめます。 + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 方向ハンドルの先端を、塗りつぶしの点、中空の点、大きい塗りつぶしの点のいずれかで描きます。 + With the Direct Selection tool, the anchor under the pointer is highlighted. ダイレクト選択ツールで、ポインターの下にあるアンカーポイントを強調表示します。 + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 複数のアンカーポイントを選択したときに方向ハンドルを表示します。オフのときは、アンカーポイントを 1 つだけ選択したときにのみ表示します。 + Corner widgets hide on corners whose angle is greater than this many degrees. 角度がこの値(度)より大きいコーナーでは、コーナーウィジェットを隠します。 + The Pen tool previews the next segment from the last anchor to the pointer before you click. クリックする前に、ペンツールで最後のアンカーポイントからポインターまでの次のセグメントをプレビューします。 + The Curvature tool previews the curve to the pointer before you place the next point. 次のポイントを置く前に、カーブツールでポインターまでのカーブをプレビューします。 The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. ピクセル以外の組み込みサイズの新規ドキュメントと、単位を記録していない開いたファイルに使う単位で、ここで選んで OK をクリックすると作業中のドキュメントの単位も変わります。 Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 線幅、線分、間隔はこの単位で表示され、入力した数値もこの単位で読み取られます。 Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. フォントサイズ、行送り、ベースラインシフトはこの単位で表示され、入力した数値もこの単位で読み取られます。 The unit for East Asian type measurements, which no field uses yet. 東アジア言語の文字の測定に使う単位で、まだどのフィールドも使っていません。 When on, a number typed without a unit into a field in picas is read in points. オンのとき、パイカのフィールドに単位なしで入力した数値はポイントとして読み取られます。 With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID を選ぶと、レイヤー、変数、レイヤーオプションでオブジェクト名が XML ID として表示されます。 + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. グリッドが非表示でも、描画、移動、拡大・縮小をグリッドの分割位置にスナップします。オンの間は「ピクセルにスナップ」は働きません。 + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 選択されていないガイドの色です。ガイドのラベルを設定したアートボードは、自身のガイドをラベルの色で描きます。 + Draws guides as solid lines or as dots, including the guides already in the document. ドキュメントにすでにあるガイドも含め、ガイドを実線または点線で描きます。 + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. オンにすると、VectorCraft の起動時にガイドがロックされます。このオプションを変更するとすぐにロックまたはロック解除され、表示 › ガイド › ガイドをロックでも引き続きロックを切り替えられます。 + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. オンにすると、定規からドラッグを始めるときに Cmd/Ctrl を押していると、アクティブなアートボードだけのガイドを作成し、アートボードツールではカンバス全体のガイドを作成します。 + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. グリッドの色です。主グリッド線の間の線は、この色の薄い色合いで描かれます。 + Draws the grid as lines, or as dots along the major gridlines at each subdivision. グリッドを線で描くか、主グリッド線に沿って各分割位置に点で描きます。 + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 開いているすべてのドキュメントと新規ドキュメントでの主グリッド線の間隔です。VectorCraft ドキュメントは保存時のグリッドで開きます。 + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 主グリッドの各マスを分割する数です。ズームで線が隠れていても、「グリッドにスナップ」はこの分割位置にスナップします。 + Draws the grid behind the artwork; off, the grid is drawn over it. グリッドをアートワークの背面に描きます。オフのときは前面に描きます。 + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. ピクセルプレビューで 600% 以上にズームすると、アクティブな表示でアートワークの上に、ドキュメントの各ピクセルの境界に線が表示されます。 + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. パターンの編集中に表示されるタイルの境界線と、破線のスウォッチの境界の色です。 + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 描画、移動、変形を近くのアートにスナップし、ガイドとラベルを表示します。ピクセルプレビューではオフになり、グリッドにスナップがオンのときは代わりにグリッドにスナップします。 + The color of Smart Guide lines and labels. スマートガイドの線とラベルの色です。 + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. アートが揃う端または中心に沿って線を表示します。オフでも線なしで揃い、グリフにスナップは適用されません。 + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 選択ツールでドラッグしていないとき、ポインターの下にある未選択のオブジェクトをレイヤーの色で囲みます。 + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. アートを拡大・縮小、回転、シアー、またはリフレクトしている間、ポインターの横にサイズまたは角度を表示します。 + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 描画中、セグメントまたはシェイプの始点を通る、選択した角度の線にポイントがスナップします。 + The set of angles the construction guides follow while Construction Guides is on. 作図ガイドがオンのときに作図ガイドが従う角度のセットです。 + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. アンカー、パス、整列など、ポイントのスナップ先の名前を表示します。オフでも名前なしで同じようにスナップします。 + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 描画中または移動中に、距離、角度、アートの移動量をポインターの横に表示します。 + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 移動またはサイズ変更したアートを近くのオブジェクト間と同じ間隔にスナップし、等しい間隔を示します。 + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 何かを選択した状態で、別のオブジェクトまたはアートボードの上で Alt/Option キーを押し続けると、それと選択範囲の間の距離を表示します。 + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. ドラッグの開始位置からスナップ許容値の範囲内までドラッグして戻した選択範囲は、正確にその位置に戻ります。コピーは戻りません。 + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. スマートガイドがスナップするために、ポインターやドラッグしたポイントが画面上でアートにどこまで近づく必要があるかです。この距離はどのズームでも同じです。 + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 直線セグメントの端、または中心から描いた円を、近くの曲線に接するようにスナップします。 + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 直線セグメントの端を、近くの直線セグメントと直角に交わるようにスナップします。 Reset all preferences to their defaults? すべての環境設定を初期値に戻しますか? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 初期値は環境設定で OK をクリックすると適用されます。そこでキャンセルすると現在の環境設定が保たれます。 Restored documents open unsaved: save them to keep them. 復元したドキュメントは未保存の状態で開きます。保存して残してください。 @@ -5180,6 +5240,11 @@ swatch Bright Violet ビビッドバイオレット @msg 1 hidden object 非表示のオブジェクト 1 個 @msg {n} hidden objects 非表示のオブジェクト {n} 個 @msg Preview in Browser needs the desktop app (the web downloads files instead) 「ブラウザーでプレビュー」にはデスクトップアプリが必要です (Web 版では代わりにファイルをダウンロードします) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK` に目標ファイルサイズを K (1024 バイト) 単位で指定してください: 0 より大きく 1048576 以下の数値 +@msg `startWith` is `current` or `auto` `startWith` は `current` または `auto` です +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` は `allSlices`、`eachSlice` または `currentSlice` です +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` は `slice.list` のスライス番号で、`use: currentSlice` と一緒に使います +@msg Optimize to File Size: there is no image to measure ファイルサイズに合わせて最適化: 測定する画像がありません @msg no file system here この環境にはファイルシステムがありません @msg nothing to preview プレビューするものがありません @msg Saved {n} files beside {path} {path} と同じ場所にファイルを {n} 個保存しました @@ -5994,6 +6059,19 @@ lighting Light ライト Transform Objects オブジェクトの変形 @msg unknown parameter `{key}`; did you mean `{near}`? `{key}` は不明なパラメーターです。`{near}` のことですか? @msg unknown parameter `{key}`; the command takes no parameters `{key}` は不明なパラメーターです。このコマンドにパラメーターはありません +@msg unknown parameter `{key}`; `{object}` takes: {keys} `{key}` は不明なパラメーターです。`{object}` で使えるキー: {keys} +@msg unknown parameter `{key}`; {why_not} `{key}` は不明なパラメーターです。{why_not} +@msg no format takes it (see document.formats) このオプションを使う形式はありません (document.formats を参照) +@msg no save format takes it (see file.formatOptions) このオプションを使う保存形式はありません (file.formatOptions を参照) +@msg PDF doesn't take it (see document.formats) PDF では使えません (document.formats を参照) +@msg EPS doesn't take it (see document.formats) EPS では使えません (document.formats を参照) +@msg DXF doesn't take it (see document.formats) DXF では使えません (document.formats を参照) +@msg {name} must be {range} (got {v}) {name} は {range} にしてください (指定値: {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 最初に試したグラフィックスプロセッサーではウィンドウを表示できなかったため、{summary} で VectorCraft を再起動しました (環境設定 › パフォーマンス › グラフィックプロセッサー › 自動 では、ディスプレイを駆動しているプロセッサーを使います) +@msg Sent “{title}” to {to} “{title}” を {to} に送信しました +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” を {to} に送信しました。印刷キューの応答: {note} +@msg the default printer デフォルトのプリンター +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap オブジェクト {object} のラスター効果: 要求は {requested} ppi ですが、6400 万ピクセルの上限により {achieved} ppi になりました @msg unknown parameter `{key}`; the command takes: {keys} `{key}` は不明なパラメーターです。このコマンドで使えるパラメーター: {keys} @msg the params must be an object, not {got} パラメーターはオブジェクトにしてください ({got} は使えません) @msg unknown parameter `{path}`; the object takes no keys `{path}` は不明なパラメーターです。このオブジェクトにはキーを指定できません @@ -7020,8 +7098,6 @@ axis Y Axis Y 軸 @msg unknown dither `{d}` (diffusion, pattern, noise or none) `{d}` は不明なディザの指定です (diffusion、pattern、noise、none のいずれか) @msg unknown panel `{panel}` `{panel}` は不明なパネルです @msg unknown parameter `{key}` `{key}` は不明なパラメーターです -@msg unknown parameter `{within}settings.{format}`; {why} `{within}settings.{format}` は不明なパラメーターです。{why} -@msg unknown parameter `{within}{key}`; {why} `{within}{key}` は不明なパラメーターです。{why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) `{reduction}` は不明な減色の指定です (selective、perceptual、adaptive、web、gray、blackWhite、uniform、document のいずれか) @msg unmatched ')' 対応していない ')' があります @msg unterminated character class 文字クラスが閉じられていません @@ -7391,7 +7467,6 @@ axis Y Axis Y 軸 @msg anchor `smooth` must be true or false アンカーの `smooth` には true または false を指定してください @msg anchor `{key}` must be [x, y] アンカーの `{key}` には [x, y] を指定してください @msg anchor `{key}` must be a number アンカーの `{key}` には数値を指定してください -@msg angle and roundness must be finite angle と roundness には有限の値を指定してください @msg angles must be a list as long as pins (degrees or null) angles には pins と同じ長さのリスト (度数または null) を指定してください @msg appearance must be flat|center|edge appearance には flat|center|edge のいずれかを指定してください @msg apply is "fill" or "stroke", not `{other}` apply には "fill" または "stroke" を指定してください (`{other}` は指定できません) @@ -8443,7 +8518,6 @@ axis Y Axis Y 軸 @msg {label} must be a number from 1 to 10000 {label} には 1 から 10000 までの数値を指定してください @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} は組み込みのため、削除できません -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} には {lo}–{hi}{unit} を指定してください (指定値: {v}) @msg {name}: CRC or size mismatch {name}: CRC またはサイズが一致しません @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: この Affinity ファイルは埋め込みプレビューしか読み込めませんでした。「ファイル › 開く」で警告とともに表示するか、配置する前に Affinity から SVG または PDF を書き出してください @msg {name}: {e} {name}: {e} @@ -9357,6 +9431,10 @@ breakText Glyphs 字形 @msg Some islands could not be joined to the area around the art 一部のアイランドをアートワークの周囲の領域につなげられませんでした @msg `width` must be from {lo} to {hi} pt `width` は {lo}~{hi} pt の範囲で指定してください @msg `angle` must be from -180 to 180 degrees `angle` は -180~180 度の範囲で指定してください +@msg `roundness` must be from 0 to 100% `roundness` は 0~100% の範囲で指定してください +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` は 0.01~100 pt の範囲で指定してください +@msg style must be "pencil" or "brush" style は "pencil" または "brush" を指定してください +@msg extend end must be "start" or "end" extend の端は "start" または "end" を指定してください @msg `roundness` must be from 1 to 100% `roundness` は 1~100% の範囲で指定してください @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` には 1 から {MAX_BRIDGES_PER_ISLAND} の整数を指定してください Weed Box and Lines… カス取り枠とライン… diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 97ea30797e..414f45171c 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -1807,8 +1807,6 @@ @msg unknown panel უცნობი პანელი @msg unknown panel `{panel}` უცნობი პანელი `{panel}` @msg unknown parameter `{key}` უცნობი პარამეტრი `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} უცნობი პარამეტრი `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} უცნობი პარამეტრი `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) უცნობი pieLegend `{v}` (none, standard ან wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) უცნობი piePosition `{v}` (even, ratio ან stacked) @msg unknown pieSort `{v}` (none, all or first) უცნობი pieSort `{v}` (none, all ან first) @@ -1941,7 +1939,6 @@ @msg {name} is not a CMYK profile {name} CMYK პროფილი არ არის @msg {name} is not an RGB profile {name} RGB პროფილი არ არის @msg {name} must be a number {name} რიცხვი უნდა იყოს -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} უნდა იყოს {lo}–{hi}{unit} (მიღებულია {v}) @msg {name}: CRC or size mismatch {name}: CRC ან ზომა არ ემთხვევა @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: Affinity-ის ამ ფაილიდან მხოლოდ ჩაშენებული წინასწარი ხედის წაკითხვა მოხერხდა; გაფრთხილებასთან ერთად მის სანახავად გამოიყენეთ ფაილი › გახსნა, ან განთავსებამდე Affinity-დან გააკეთეთ SVG-ის ან PDF-ის ექსპორტი @msg {name}: {e} {name}: {e} @@ -2383,6 +2380,9 @@ Mask ნიღაბი Rasterize… რასტრირება… Create Gradient Mesh… გრადიენტული ბადის შექმნა… + Flat ბრტყელი + To Center ცენტრისკენ + To Edge კიდისკენ Create Object Mosaic… ობიექტების მოზაიკის შექმნა… Vector Halftone… ვექტორული ნახევარტონი… Create Trim Marks ჭრის ნიშნების შექმნა @@ -3259,6 +3259,18 @@ lighting Light სინათლე Placement Options… განთავსების პარამეტრები… Plug-in… პლაგინი… Preview in Browser ბრაუზერში ნახვა + Optimize to File Size… ფაილის ზომაზე ოპტიმიზაცია… + Optimize to File Size ფაილის ზომაზე ოპტიმიზაცია + Desired File Size: სასურველი ფაილის ზომა: + Start With: დაწყება: + Use: გამოყენება: + Current Settings მიმდინარე პარამეტრები + Auto Select GIF/JPEG GIF/JPEG-ის ავტომატური არჩევა + Total of All Slices ყველა ნაჭრის ჯამი + Each Slice თითოეული ნაჭერი + Current Slice მიმდინარე ნაჭერი + {size}, within {target} {size}, {target}-ის ფარგლებში + No setting tried fits in {target}; the smallest is {size} არცერთი ნაცადი პარამეტრი არ ეტევა {target}-ში; უმცირესია {size} Printer Setup… პრინტერის დაყენება… Printers პრინტერები Recent File ბოლოს გახსნილი ფაილი @@ -4822,6 +4834,8 @@ digits Malayalam მალაიალამური Collate დაკომპლექტება Composite colours are converted to it; separations separate with it when it is a CMYK profile. შედგენილი ფერები მასში გარდაიქმნება; სეპარაცია მისით ხდება, როცა ის CMYK პროფილია. Convert All Spot Colors to Process ყველა სპოტ-ფერის პროცესულად გარდაქმნა + Convert {name} to process {name}-ის პროცესულად გარდაქმნა + Keep {name} as spot {name}-ის სპოტ-ფერად დატოვება Default Printer ნაგულისხმევი პრინტერი Document Ink Options დოკუმენტის საღებავების პარამეტრები Download: ჩამოტვირთვა: @@ -6255,6 +6269,7 @@ font-technology Variable ცვლადი Live corner radii scale with the art, unless the scale chooses otherwise. დინამიკური კუთხეების რადიუსები ნახატთან ერთად მასშტაბირდება, თუ მასშტაბირება სხვას არ აირჩევს. Stroke weights, dashes and effect distances scale with the art, unless the scale chooses otherwise. კონტურის სისქე, შტრიხები და ეფექტების მანძილები ნახატთან ერთად მასშტაბირდება, თუ მასშტაბირება სხვას არ აირჩევს. The mouse wheel zooms the canvas instead of scrolling it. მაუსის ბორბალი ტილოს გადახვევის ნაცვლად მასშტაბს ცვლის. + While Zoom with Mouse Wheel is off, the mouse wheel with Cmd/Ctrl held scrolls the canvas sideways. სანამ მაუსის ბორბლით მასშტაბირება გამორთულია, დაჭერილი Cmd/Ctrl-ით მაუსის ბორბალი ტილოს გვერდულად გადაახვევს. 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. ტრეკპადზე ორი თითით მობრუნების ჟესტი ტილოს ხედს აბრუნებს. @@ -6268,12 +6283,53 @@ font-technology Variable ცვლადი With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. როცა სიმბოლოს ერთი ეგზემპლარია მონიშნული, გარდაქმნის პანელი სიმბოლოს რეგისტრაციის წერტილს საყრდენ წერტილად იყენებს. Darkens the canvas outside the artboards while the Artboard tool is active. სანამ სამუშაო დაფის ხელსაწყო აქტიურია, სამუშაო დაფების გარეთ ტილოს აბნელებს. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. როცა სამუშაო დაფის გარეთ არის დაბნელება ჩართულია, სამუშაო დაფის ხელსაწყოთი გადათრევისას სამუშაო დაფების გარეთ არე ბნელი რჩება. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. რამდენად ახლოს, პიქსელებში, უნდა იყოს მაჩვენებელი ობიექტთან, საყრდენ წერტილთან ან სახელურთან, რომ დაწკაპუნებამ ის მონიშნოს. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. მონიშვნის ხელსაწყოს ჩარჩო მონიშნავს შეხებულ ობიექტებს თუ მხოლოდ სრულად შიგნით მყოფებს; გადათრევის მიმართულება მარჯვნივ გადათრევისას შიგნით მყოფებს მონიშნავს. E გადათრევისას წესს აბრუნებს. + A click selects a filled object only on its path, not inside its fill. დაწკაპუნება შევსებულ ობიექტს მხოლოდ მის კონტურზე მონიშნავს და არა შევსების შიგნით. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. რამდენად ახლოს, პიქსელებში, უნდა მივიდეს წერტილი საყრდენ წერტილთან ან სახაზავის დამხმარე ხაზთან, რომ წერტილზე მიბმამ ის მიაბას; ჩართული ჭკვიანი დამხმარე ხაზებისას მათი მიბმის დაშვება მოქმედებს. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. მონიშვნის ხელსაწყოთი Cmd/Ctrl-დაწკაპუნება მაჩვენებელთან მონიშნული ობიექტის ქვეშ მყოფ ობიექტს მონიშნავს; ყოველი შემდეგი დაწკაპუნება ერთი ობიექტით ღრმად ჩადის. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. გადიდება და დაპატარავება მონიშვნის ცენტრს ხედის შუაში გადაიტანს. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. სამუშაო დაფის შიგნით არსებული დაბლოკილი და დამალული ნამუშევარი სხვა ნამუშევრის მსგავსად სამუშაო დაფასთან ერთად გადაადგილდება, მასშტაბირდება და კოპირდება. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. საყრდენი წერტილებისა და მიმართულების სახელურების ბოლოების ზომა ტილოზე; უფრო დიდი საყრდენი წერტილების აღება უფრო შორიდანაც შეიძლება. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. მიმართულების სახელურების ბოლოებს ხატავს სავსე წერტილებად, ღრუ წერტილებად ან უფრო დიდ სავსე წერტილებად. + With the Direct Selection tool, the anchor under the pointer is highlighted. პირდაპირი მონიშვნის ხელსაწყოთი მაჩვენებლის ქვეშ მყოფი საყრდენი წერტილი გამოიკვეთება. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. აჩვენებს მიმართულების სახელურებს, როცა ერთზე მეტი საყრდენი წერტილია მონიშნული; გამორთულისას ისინი მხოლოდ ერთი მონიშნული საყრდენი წერტილისას ჩანს. + Corner widgets hide on corners whose angle is greater than this many degrees. კუთხის ვიჯეტები იმალება იმ კუთხეებზე, რომელთა კუთხე ამდენ გრადუსზე მეტია. + The Pen tool previews the next segment from the last anchor to the pointer before you click. კალმის ხელსაწყო დაწკაპუნებამდე აჩვენებს შემდეგ სეგმენტს ბოლო საყრდენი წერტილიდან მაჩვენებლამდე. + The Curvature tool previews the curve to the pointer before you place the next point. მრუდის ხელსაწყო შემდეგი წერტილის დასმამდე აჩვენებს მრუდს მაჩვენებლამდე. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. ერთეული ახალი დოკუმენტებისთვის (ჩაშენებული ზომებით, პიქსელურის გარდა) და იმ გახსნილი ფაილებისთვის, რომლებშიც ერთეული არ წერია; OK-ზე დაწკაპებისას აქტიური დოკუმენტიც ამ ერთეულს მიიღებს. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. კონტურის სისქე, ტირეები და შუალედები ამ ერთეულში ჩანს, და მათთვის აკრეფილი რიცხვები ამ ერთეულში იკითხება. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. ტექსტის ზომა, სტრიქონთა დაშორება და საბაზისო ხაზის წანაცვლება ამ ერთეულში ჩანს, და მათთვის აკრეფილი რიცხვები ამ ერთეულში იკითხება. The unit for East Asian type measurements, which no field uses yet. აღმოსავლეთაზიური ტექსტის ზომების ერთეული, რომელსაც ჯერჯერობით არცერთი ველი არ იყენებს. When on, a number typed without a unit into a field in picas is read in points. ჩართვისას პიკებში მოცემულ ველში ერთეულის გარეშე აკრეფილი რიცხვი პუნქტებში იკითხება. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID-ის არჩევისას ობიექტების სახელები შრეების პანელში, ცვლადების პანელსა და შრის პარამეტრებში XML ID-ებად ჩანს. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. ხატვას, გადაადგილებასა და მასშტაბირებას ბადის დაყოფებზე მიაბამს, მაშინაც კი, როცა ბადე დამალულია; სანამ ჩართულია, პიქსელზე მიბმა არ მოქმედებს. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. არჩეული არ მყოფი დამხმარე ხაზების ფერი; იარლიყიანი სამუშაო დაფა საკუთარ დამხმარე ხაზებს იარლიყის ფერით ხატავს. + Draws guides as solid lines or as dots, including the guides already in the document. დამხმარე ხაზებს უწყვეტი ხაზებით ან წერტილებით ხატავს, დოკუმენტში უკვე არსებულების ჩათვლით. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. ჩართვისას დამხმარე ხაზები VectorCraft-ის გაშვებისას ჩაკეტილია; პარამეტრის შეცვლა მათ მაშინვე კეტავს ან ხსნის, ხოლო ხედი › დამხმარე ხაზები › დამხმარე ხაზების ჩაკეტვა კვლავ ცვლის ჩაკეტვას. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. ჩართვისას სახაზავიდან გადათრევის დაწყებისას დაჭერილი Cmd/Ctrl დამხმარე ხაზს მხოლოდ აქტიურ სამუშაო დაფაზე ქმნის, სამუშაო დაფის ხელსაწყოთი კი მთელი ტილოს ხაზს. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. ბადის ფერი; მთავარ ხაზებს შორის ხაზები მისი უფრო მკრთალი ელფერით იხატება. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. ბადეს ხაზებით ხატავს, ან წერტილებით მთავარი ხაზების გასწვრივ ყოველ დაყოფაზე. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. მთავარ ხაზებს შორის მანძილი ყველა ღია და ახალ დოკუმენტში; VectorCraft-ის დოკუმენტი იმ ბადით იხსნება, რომლითაც შეინახა. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. რამდენ ნაწილად იყოფა ბადის თითოეული მთავარი კვადრატი; ბადეზე მიბმა ამ ნაწილებზე მიაბამს, მაშინაც კი, როცა მასშტაბი მათ ხაზებს მალავს. + Draws the grid behind the artwork; off, the grid is drawn over it. ბადეს ნამუშევრის უკან ხატავს; გამორთვისას ბადე მის ზემოთ იხატება. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. პიქსელების წინასწარ ნახვაში 600%-იან ან მეტ მასშტაბზე აქტიური ხედი ნამუშევრის ზემოთ დოკუმენტის თითოეული პიქსელის კიდეზე ხაზს აჩვენებს. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. ფილის კიდისა და ფერის ნიმუშის წყვეტილი საზღვრების ფერი, რომლებიც პატერნის რედაქტირებისას ჩანს. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. ხატვას, გადატანასა და გარდაქმნას ახლომდებარე გრაფიკაზე აბამს და აჩვენებს დამხმარე ხაზებსა და წარწერებს; პიქსელების წინასწარი ნახვა მათ თიშავს, ბადეზე მიბმა კი მათ ნაცვლად ბადეზე აბამს. + The color of Smart Guide lines and labels. ჭკვიანი დამხმარე ხაზების ხაზებისა და წარწერების ფერი. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. აჩვენებს ხაზს იმ კიდის ან ცენტრის გასწვრივ, რომელსაც გრაფიკა უსწორდება; გამორთვისას გრაფიკა მაინც სწორდება ხაზის გარეშე, გლიფზე მიბმა კი არ მოქმედებს. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. მონიშვნის ხელსაწყოთი, სანამ არ ათრევთ, მაჩვენებლის ქვეშ მყოფ მოუნიშნავ ობიექტს მისი შრის ფერით შემოხაზავს. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. გრაფიკის მასშტაბირების, მობრუნების, დახრის ან არეკვლისას მაჩვენებლის გვერდით აჩვენებს ზომას ან კუთხეს. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. ხატვისას წერტილები ებმის არჩეული კუთხის ხაზებს, რომლებიც სეგმენტის ან ფიგურის საწყის წერტილზე გადის. + The set of angles the construction guides follow while Construction Guides is on. კუთხეების ნაკრები, რომელსაც სამშენებლო დამხმარე ხაზები მიჰყვება, სანამ სამშენებლო დამხმარე ხაზები ჩართულია. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. ასახელებს, რას ებმის წერტილი, მაგალითად, საყრდენ წერტილს, ტრაექტორიას ან გასწორებას; გამორთვისას წერტილები ისევე ებმის, სახელების გარეშე. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. ხატვის ან გადატანისას მაჩვენებლის გვერდით აჩვენებს მანძილებს, კუთხეებს და რამდენით გადაადგილდა გრაფიკა. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. გადატანილ ან ზომაშეცვლილ გრაფიკას აბამს იმავე შუალედზე, რაც ახლომდებარე ობიექტებს შორისაა, და ნიშნავს თანაბარ შუალედებს. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. როცა რაიმე მონიშნულია, Alt/Option-ის დაჭერა სხვა ობიექტზე ან სამუშაო დაფაზე აჩვენებს მანძილებს მასა და მონიშნულს შორის. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. მონიშნული, რომელიც თრევის დაწყების ადგილიდან მიბმის დაშვების ფარგლებში დააბრუნეთ, ზუსტად იმ ადგილზე ბრუნდება; ასლი არა. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. რამდენად ახლოს უნდა მივიდეს ეკრანზე მაჩვენებელი ან გადათრეული წერტილი გრაფიკასთან, რომ ჭკვიანმა დამხმარე ხაზებმა მიაბან; მანძილი ყველა მასშტაბზე ერთნაირია. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. ხაზის სეგმენტის ბოლოს, ან ცენტრიდან დახატულ წრეწირს, ისე აბამს, რომ ახლომდებარე მრუდს შეეხოს. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. ხაზის სეგმენტის ბოლოს ისე აბამს, რომ ახლომდებარე სწორ სეგმენტს მართი კუთხით შეხვდეს. Reset all preferences to their defaults? დავაბრუნოთ ყველა პარამეტრი ნაგულისხმევ მნიშვნელობებზე? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. ნაგულისხმევი მნიშვნელობები გამოიყენება, როცა პარამეტრებში OK-ს დააჭერთ. იქ გაუქმება ინარჩუნებს თქვენს მიმდინარე პარამეტრებს. Smaller ↔ Larger უფრო პატარა ↔ უფრო დიდი @@ -6545,6 +6601,11 @@ font-technology Variable ცვლადი @msg PDF writer error: {0} PDF-ის ჩამწერის შეცდომა: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} შეფუთულია ფაილი ({n}) საქაღალდეში {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) ბრაუზერში წინასწარ ნახვას დესკტოპის აპი სჭირდება (ვებში ფაილები ჩამოიტვირთება) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 მიუთითეთ `desiredK`, სასურველი ფაილის ზომა K-ში (1024 ბაიტი): 0-ზე მეტი და არაუმეტეს 1048576 რიცხვი +@msg `startWith` is `current` or `auto` `startWith` არის `current` ან `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` არის `allSlices`, `eachSlice` ან `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` არის ნაჭრის ნომერი `slice.list`-დან, `use: currentSlice`-თან ერთად +@msg Optimize to File Size: there is no image to measure ფაილის ზომაზე ოპტიმიზაცია: გასაზომი გამოსახულება არ არის @msg Release Guides: no guides დამხმარე ხაზების მოხსნა: დამხმარე ხაზები არ არის @msg Release: no layer to put the rectangle in მოხსნა: მართკუთხედის ჩასასმელი შრე არ არის @msg Replace Spine: select a blend and a path ხერხემლის ჩანაცვლება: მონიშნეთ გადასვლა და ტრაექტორია @@ -7749,6 +7810,19 @@ font-technology Variable ცვლადი Transform Objects ობიექტების გარდაქმნა @msg unknown parameter `{key}`; did you mean `{near}`? უცნობი პარამეტრი `{key}`; იქნებ `{near}` იგულისხმეთ? @msg unknown parameter `{key}`; the command takes no parameters უცნობი პარამეტრი `{key}`; ბრძანება პარამეტრებს არ იღებს +@msg unknown parameter `{key}`; `{object}` takes: {keys} უცნობი პარამეტრი `{key}`; `{object}` იღებს: {keys} +@msg unknown parameter `{key}`; {why_not} უცნობი პარამეტრი `{key}`; {why_not} +@msg no format takes it (see document.formats) არცერთი ფორმატი არ იღებს მას (იხილეთ document.formats) +@msg no save format takes it (see file.formatOptions) არცერთი შენახვის ფორმატი არ იღებს მას (იხილეთ file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF არ იღებს მას (იხილეთ document.formats) +@msg EPS doesn't take it (see document.formats) EPS არ იღებს მას (იხილეთ document.formats) +@msg DXF doesn't take it (see document.formats) DXF არ იღებს მას (იხილეთ document.formats) +@msg {name} must be {range} (got {v}) {name} უნდა იყოს {range} (მიღებულია {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) პირველად ნაცდმა გრაფიკულმა პროცესორმა ფანჯარა ვერ აჩვენა, ამიტომ VectorCraft ხელახლა გაეშვა: {summary} (პარამეტრები › წარმადობა › გრაფიკული პროცესორი › ავტომატური იყენებს იმას, რომელიც თქვენს ეკრანს მართავს) +@msg Sent “{title}” to {to} “{title}” გაგზავნილია: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” გაგზავნილია: {to}. ბეჭდვის რიგის პასუხი: {note} +@msg the default printer ნაგულისხმევი პრინტერი +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap რასტრული ეფექტები ობიექტზე {object}: მოთხოვნილია {requested} ppi, მიღწეულია {achieved} ppi 64 მილიონი პიქსელის ლიმიტის გამო @msg unknown parameter `{key}`; the command takes: {keys} უცნობი პარამეტრი `{key}`; ბრძანება იღებს: {keys} @msg the params must be an object, not {got} პარამეტრები უნდა იყოს ობიექტი და არა {got} @msg unknown parameter `{path}`; the object takes no keys უცნობი პარამეტრი `{path}`; ობიექტი გასაღებებს არ იღებს @@ -10153,6 +10227,10 @@ font-script Japanese იაპონური @msg Some islands could not be joined to the area around the art ზოგიერთი კუნძული ვერ დაუკავშირდა ნახატის გარშემო არეს @msg `width` must be from {lo} to {hi} pt `width` უნდა იყოს {lo}-დან {hi} pt-მდე @msg `angle` must be from -180 to 180 degrees `angle` უნდა იყოს -180-დან 180 გრადუსამდე +@msg `roundness` must be from 0 to 100% `roundness` უნდა იყოს 0-დან 100%-მდე +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` უნდა იყოს 0.01-დან 100 pt-მდე +@msg style must be "pencil" or "brush" style უნდა იყოს "pencil" ან "brush" +@msg extend end must be "start" or "end" extend-ის ბოლო უნდა იყოს "start" ან "end" @msg `roundness` must be from 1 to 100% `roundness` უნდა იყოს 1-დან 100%-მდე @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` უნდა იყოს მთელი რიცხვი 1-დან {MAX_BRIDGES_PER_ISLAND}-მდე Weed Box and Lines… ნარჩენის მოსაცილებელი ჩარჩო და ხაზები… diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index d80bd672b8..dbda53243f 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -261,6 +261,9 @@ digits Malayalam 말라얄람어 Mask 마스크 Rasterize… 래스터화… Create Gradient Mesh… 그레이디언트 메시 만들기… + Flat 평면 + To Center 가운데로 + To Edge 가장자리로 Create Object Mosaic… 개체 모자이크 만들기… Vector Halftone… 벡터 하프톤… Create Trim Marks 트림 마크 만들기 @@ -1110,6 +1113,8 @@ antiAlias Sharp 날카롭게 Crisp 또렷하게 Strong 강하게 Anti-aliasing: 안티 앨리어싱: + Art Optimized 아트에 최적화 + Type Optimized 문자에 최적화 Appearance Item 모양새 항목 Appearance Panel 모양새 패널 Appearance of Black 검정 표시 방식 @@ -1364,6 +1369,8 @@ antiAlias Sharp 날카롭게 Contextual Alternates 문맥 대체 글자 Convert 변환 Convert All Spot Colors to Process 모든 별색을 프로세스 색상으로 변환 + Convert {name} to process {name}을(를) 프로세스 색상으로 변환 + Keep {name} as spot {name}을(를) 별색으로 유지 Convert All Strokes to Outlines 모든 선을 윤곽선으로 변환 Convert All Text to Outlines 모든 문자를 윤곽선으로 변환 Convert Anchor Point 앵커 포인트 변환 @@ -2823,6 +2830,18 @@ diagnostics ui UI Preview All Layers 모든 레이어 미리 보기 Preview Mode 미리 보기 모드 Preview in Browser 브라우저에서 미리 보기 + Optimize to File Size… 파일 크기에 맞게 최적화… + Optimize to File Size 파일 크기에 맞게 최적화 + Desired File Size: 원하는 파일 크기: + Start With: 시작 설정: + Use: 사용: + Current Settings 현재 설정 + Auto Select GIF/JPEG GIF/JPEG 자동 선택 + Total of All Slices 모든 분할 합계 + Each Slice 각 분할 + Current Slice 현재 분할 + {size}, within {target} {size}, {target} 이내 + No setting tried fits in {target}; the smallest is {size} 시도한 설정 중 {target}에 맞는 것이 없습니다. 가장 작은 크기는 {size} Preview the document as it is now 문서를 현재 상태로 미리 보기 Previous 이전 Previous Library 이전 라이브러리 @@ -3105,12 +3124,53 @@ mark-style Japanese 일본식 With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. 심볼 인스턴스 하나를 선택하면 변형 패널은 심볼의 등록 지점을 참조점으로 사용합니다. Darkens the canvas outside the artboards while the Artboard tool is active. 아트보드 도구를 사용하는 동안 아트보드 바깥의 캔버스를 어둡게 표시합니다. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. 아트보드 외부 영역 어둡게 표시가 켜져 있으면 아트보드 도구로 드래그하는 동안에도 아트보드 바깥 영역이 어둡게 유지됩니다. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. 클릭으로 개체, 고정점 또는 핸들을 선택하려면 포인터가 얼마나 가까이(픽셀) 있어야 하는지입니다. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 선택 도구의 상자가 닿은 개체를 선택할지, 완전히 안에 있는 개체만 선택할지입니다. 드래그 방향은 오른쪽으로 드래그하면 안쪽 개체를 선택합니다. 드래그 중 E를 누르면 규칙이 반대로 바뀝니다. + A click selects a filled object only on its path, not inside its fill. 칠이 있는 개체를 칠 안쪽이 아니라 패스를 클릭할 때만 선택합니다. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. 포인트에 스냅이 점을 스냅하려면 점이 고정점이나 눈금자 안내선에 얼마나 가까이(픽셀) 와야 하는지입니다. 스마트 안내선이 켜져 있으면 대신 스마트 안내선의 스냅 허용 오차를 씁니다. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 선택 도구에서 Cmd/Ctrl-클릭하면 포인터 위치에서 선택한 개체 아래의 개체를 선택하며, 클릭할 때마다 한 개체씩 더 아래로 내려갑니다. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. 확대와 축소가 선택 영역의 중심을 보기의 가운데로 가져옵니다. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. 아트보드 안의 잠긴 아트워크와 숨겨진 아트워크도 다른 아트워크처럼 아트보드와 함께 이동, 크기 조정, 복사됩니다. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. 캔버스에 표시되는 고정점과 방향 핸들 끝의 크기입니다. 고정점이 클수록 더 먼 곳에서도 잡을 수 있습니다. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 방향 핸들 끝을 채워진 점, 속이 빈 점 또는 더 큰 채워진 점으로 그립니다. + With the Direct Selection tool, the anchor under the pointer is highlighted. 직접 선택 도구에서 포인터 아래의 고정점을 강조 표시합니다. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 고정점을 둘 이상 선택했을 때 방향 핸들을 표시합니다. 끄면 고정점을 하나만 선택했을 때만 표시됩니다. + Corner widgets hide on corners whose angle is greater than this many degrees. 각도가 이 값(도)보다 큰 모퉁이에서는 모퉁이 위젯을 숨깁니다. + The Pen tool previews the next segment from the last anchor to the pointer before you click. 펜 도구가 클릭하기 전에 마지막 고정점에서 포인터까지 다음 세그먼트를 미리 보여 줍니다. + The Curvature tool previews the curve to the pointer before you place the next point. 곡률 도구가 다음 점을 놓기 전에 포인터까지 곡선을 미리 보여 줍니다. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. 픽셀 크기가 아닌 기본 제공 크기의 새 문서와 단위가 기록되지 않은 열린 파일에 쓰는 단위이며, 여기서 고르고 확인을 누르면 활성 문서의 단위도 바뀝니다. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 선 두께, 대시, 간격이 이 단위로 표시되며, 입력한 숫자도 이 단위로 읽습니다. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. 글자 크기, 행간, 기준선 이동이 이 단위로 표시되며, 입력한 숫자도 이 단위로 읽습니다. The unit for East Asian type measurements, which no field uses yet. 동아시아 문자 측정에 쓰는 단위로, 아직 이 단위를 쓰는 필드는 없습니다. When on, a number typed without a unit into a field in picas is read in points. 켜면 파이카 필드에 단위 없이 입력한 숫자를 포인트로 읽습니다. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML ID를 고르면 레이어, 변수, 레이어 옵션에서 개체 이름이 XML ID로 표시됩니다. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. 격자가 숨겨져 있어도 그리기, 이동, 크기 조절을 격자의 세분 위치에 스냅합니다. 켜져 있는 동안에는 픽셀에 스냅이 적용되지 않습니다. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 선택되지 않은 안내선의 색상입니다. 안내선 레이블이 있는 아트보드는 자신의 안내선을 레이블 색상으로 그립니다. + Draws guides as solid lines or as dots, including the guides already in the document. 문서에 이미 있는 안내선을 포함해 안내선을 실선 또는 점으로 그립니다. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. 켜면 VectorCraft가 시작될 때 안내선이 잠깁니다. 이 옵션을 바꾸면 즉시 잠기거나 잠금이 풀리며, 보기 › 안내선 › 안내선 잠그기로도 계속 잠금을 바꿀 수 있습니다. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. 켜면 눈금자에서 드래그를 시작할 때 Cmd/Ctrl을 누르고 있으면 활성 아트보드에만 안내선을 만들고, 아트보드 도구에서는 캔버스 전체의 안내선을 만듭니다. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. 격자의 색상입니다. 주 격자선 사이의 선은 이 색상의 더 옅은 색조로 그려집니다. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. 격자를 선으로, 또는 주 격자선을 따라 각 세분 위치에 점으로 그립니다. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 열려 있는 모든 문서와 새 문서의 주 격자선 간격입니다. VectorCraft 문서는 저장할 때의 격자로 열립니다. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 각 주 격자 칸을 나누는 수입니다. 확대/축소로 선이 숨겨져도 격자에 스냅은 이 위치에 스냅합니다. + Draws the grid behind the artwork; off, the grid is drawn over it. 격자를 아트워크 뒤에 그립니다. 끄면 격자를 아트워크 위에 그립니다. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. 픽셀 미리 보기에서 600% 이상으로 확대하면 활성 보기에서 아트워크 위에 문서의 각 픽셀 경계마다 선이 표시됩니다. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. 패턴을 편집하는 동안 표시되는 타일 가장자리와 점선 견본 경계의 색상입니다. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 그리기, 이동, 변형을 가까운 아트에 스냅하고 안내선과 레이블을 표시합니다. 픽셀 미리 보기에서는 꺼지며, 격자에 스냅이 켜져 있으면 대신 격자에 스냅합니다. + The color of Smart Guide lines and labels. 스마트 안내선의 선과 레이블 색상입니다. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. 아트가 맞춰지는 가장자리나 중심을 따라 선을 표시합니다. 끄면 선 없이도 맞춰지며, 글리프에 스냅은 적용되지 않습니다. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 선택 도구로 드래그하지 않는 동안 포인터 아래의 선택되지 않은 개체 윤곽을 레이어 색상으로 표시합니다. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. 아트의 크기를 조절하거나 회전하거나 기울이거나 반사하는 동안 포인터 옆에 크기나 각도를 표시합니다. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 그리는 동안 점이 세그먼트나 모양의 시작점을 지나는 선택한 각도의 선에 스냅됩니다. + The set of angles the construction guides follow while Construction Guides is on. 작도 안내선이 켜져 있을 때 작도 안내선이 따르는 각도 세트입니다. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. 앵커, 패스, 정렬처럼 점이 스냅되는 대상의 이름을 표시합니다. 끄면 이름 없이 같은 방식으로 스냅됩니다. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 그리거나 이동하는 동안 포인터 옆에 거리, 각도, 아트가 이동한 거리를 표시합니다. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 이동하거나 크기를 조절한 아트를 가까운 개체 사이와 같은 간격에 스냅하고 같은 간격을 표시합니다. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 무언가를 선택한 상태에서 다른 개체나 아트보드 위에서 Alt/Option 키를 누르고 있으면 그것과 선택 영역 사이의 거리를 표시합니다. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. 드래그를 시작한 위치에서 스냅 허용 오차 이내로 다시 드래그한 선택 영역은 정확히 그 위치로 돌아갑니다. 복사본은 돌아가지 않습니다. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. 스마트 안내선이 스냅하려면 포인터나 드래그한 점이 화면에서 아트에 얼마나 가까이 와야 하는지입니다. 이 거리는 모든 확대/축소에서 같습니다. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 선 세그먼트의 끝이나 중심에서 그린 원을 가까운 곡선에 닿도록 스냅합니다. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 선 세그먼트의 끝을 가까운 직선 세그먼트와 직각으로 만나도록 스냅합니다. Reset all preferences to their defaults? 모든 환경 설정을 기본값으로 재설정하시겠습니까? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 기본값은 환경 설정에서 확인을 클릭하면 적용됩니다. 그곳에서 취소를 누르면 현재 환경 설정이 유지됩니다. Restored documents open unsaved: save them to keep them. 복원된 문서는 저장되지 않은 상태로 열립니다. 보존하려면 저장하세요. @@ -5107,6 +5167,11 @@ theme Appearance 외관 @msg 1 hidden object 숨겨진 개체 1개 @msg {n} hidden objects 숨겨진 개체 {n}개 @msg Preview in Browser needs the desktop app (the web downloads files instead) 브라우저에서 미리 보기는 데스크톱 앱이 필요합니다(웹에서는 파일을 다운로드합니다) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK`에 원하는 파일 크기를 K(1024바이트) 단위로 지정하세요: 0보다 크고 1048576 이하인 숫자 +@msg `startWith` is `current` or `auto` `startWith`는 `current` 또는 `auto`입니다 +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use`는 `allSlices`, `eachSlice` 또는 `currentSlice`입니다 +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice`는 `slice.list`의 분할 번호이며 `use: currentSlice`와 함께 씁니다 +@msg Optimize to File Size: there is no image to measure 파일 크기에 맞게 최적화: 측정할 이미지가 없습니다 @msg no file system here 여기에는 파일 시스템이 없습니다 @msg nothing to preview 미리 볼 항목이 없습니다 @msg Saved {n} files beside {path} {path} 옆에 파일 {n}개를 저장했습니다 @@ -5912,6 +5977,19 @@ lighting Light 광원 Transform Objects 개체 변형 @msg unknown parameter `{key}`; did you mean `{near}`? 알 수 없는 매개변수 `{key}`: `{near}`을(를) 의미하셨습니까? @msg unknown parameter `{key}`; the command takes no parameters 알 수 없는 매개변수 `{key}`: 이 명령에는 매개변수가 없습니다 +@msg unknown parameter `{key}`; `{object}` takes: {keys} 알 수 없는 매개변수 `{key}`: `{object}`이(가) 받는 키: {keys} +@msg unknown parameter `{key}`; {why_not} 알 수 없는 매개변수 `{key}`: {why_not} +@msg no format takes it (see document.formats) 이 옵션을 받는 형식이 없습니다(document.formats 참조) +@msg no save format takes it (see file.formatOptions) 이 옵션을 받는 저장 형식이 없습니다(file.formatOptions 참조) +@msg PDF doesn't take it (see document.formats) PDF는 이 옵션을 받지 않습니다(document.formats 참조) +@msg EPS doesn't take it (see document.formats) EPS는 이 옵션을 받지 않습니다(document.formats 참조) +@msg DXF doesn't take it (see document.formats) DXF는 이 옵션을 받지 않습니다(document.formats 참조) +@msg {name} must be {range} (got {v}) {name}은(는) {range}이어야 합니다({v} 입력됨) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 처음 시도한 그래픽 프로세서가 창을 표시하지 못해 {summary}에서 VectorCraft를 다시 시작했습니다(설정 › 성능 › 그래픽 프로세서 › 자동은 디스플레이를 구동하는 프로세서를 사용합니다) +@msg Sent “{title}” to {to} “{title}”을(를) {to}(으)로 보냈습니다 +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}”을(를) {to}(으)로 보냈습니다. 인쇄 대기열 응답: {note} +@msg the default printer 기본 프린터 +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap 개체 {object}의 래스터 효과: {requested} ppi를 요청했지만 6,400만 픽셀 한도 때문에 {achieved} ppi가 되었습니다 @msg unknown parameter `{key}`; the command takes: {keys} 알 수 없는 매개변수 `{key}`: 이 명령이 받는 매개변수: {keys} @msg the params must be an object, not {got} 매개변수는 객체여야 합니다({got} 사용 불가) @msg unknown parameter `{path}`; the object takes no keys 알 수 없는 매개변수 `{path}`: 이 객체는 키를 받지 않습니다 @@ -7442,6 +7520,11 @@ breakText Glyphs 글리프 @msg Some islands could not be joined to the area around the art 일부 섬을 아트워크 주변 영역에 연결할 수 없습니다 @msg `width` must be from {lo} to {hi} pt `width`는 {lo}에서 {hi}pt 사이여야 합니다 @msg `angle` must be from -180 to 180 degrees `angle`는 -180도에서 180도 사이여야 합니다 +@msg `roundness` must be from 0 to 100% `roundness`는 0%에서 100% 사이여야 합니다 +@msg `fidelity` must be from 0.01 to 100 pt `fidelity`는 0.01에서 100pt 사이여야 합니다 +@msg style must be "pencil" or "brush" style은 "pencil" 또는 "brush"여야 합니다 +@msg extend end must be "start" or "end" extend 끝은 "start" 또는 "end"여야 합니다 +@msg connect end must be "start" or "end" connect 끝은 "start" 또는 "end"여야 합니다 @msg `roundness` must be from 1 to 100% `roundness`는 1%에서 100% 사이여야 합니다 @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count`는 1에서 {MAX_BRIDGES_PER_ISLAND} 사이의 정수여야 합니다 Weed Box and Lines… 위딩 상자 및 선… @@ -8085,7 +8168,6 @@ breakText Glyphs 글리프 @msg anchor `smooth` must be true or false 앵커의 `smooth`은(는) true 또는 false여야 합니다 @msg anchor `{key}` must be [x, y] 앵커의 `{key}`은(는) [x, y]여야 합니다 @msg anchor `{key}` must be a number 앵커의 `{key}`은(는) 숫자여야 합니다 -@msg angle and roundness must be finite 각도와 원형률은 유한해야 합니다 @msg angles must be a list as long as pins (degrees or null) angles는 pins와 길이가 같은 목록이어야 합니다(도 또는 null) @msg appearance must be flat|center|edge appearance는 flat|center|edge여야 합니다 @msg apply is "fill" or "stroke", not `{other}` apply는 "fill" 또는 "stroke"입니다: `{other}` @@ -9247,8 +9329,6 @@ breakText Glyphs 글리프 @msg unknown panel 알 수 없는 패널 @msg unknown panel `{panel}` 알 수 없는 패널 `{panel}` @msg unknown parameter `{key}` 알 수 없는 매개변수 `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} 알 수 없는 매개변수 `{within}settings.{format}`: {why} -@msg unknown parameter `{within}{key}`; {why} 알 수 없는 매개변수 `{within}{key}`: {why} @msg unknown pieLegend `{v}` (none, standard or wedges) 알 수 없는 pieLegend `{v}`(none, standard 또는 wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) 알 수 없는 piePosition `{v}`(even, ratio 또는 stacked) @msg unknown pieSort `{v}` (none, all or first) 알 수 없는 pieSort `{v}`(none, all 또는 first) @@ -9377,7 +9457,6 @@ breakText Glyphs 글리프 @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name}은(는) 기본 제공 항목이라 삭제할 수 없습니다 @msg {name} must be a number {name}은(는) 숫자여야 합니다 -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name}은(는) {lo}–{hi}{unit}여야 합니다({v} 입력됨) @msg {name}: CRC or size mismatch {name}: CRC 또는 크기가 일치하지 않습니다 @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: 이 Affinity 파일은 포함된 미리 보기만 읽을 수 있었습니다. 경고와 함께 보려면 파일 › 열기를 사용하거나, 가져오기 전에 Affinity에서 SVG 또는 PDF로 내보내세요 @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 46d76fdcbb..69aef91cfc 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -576,6 +576,11 @@ liquify-list-end {0}, {1} {0} en {1} @msg Some islands could not be joined to the area around the art Sommige eilanden konden niet worden verbonden met het gebied rond de illustratie @msg `width` must be from {lo} to {hi} pt `width` moet van {lo} tot {hi} pt zijn @msg `angle` must be from -180 to 180 degrees `angle` moet van -180 tot 180 graden zijn +@msg `roundness` must be from 0 to 100% `roundness` moet van 0 tot 100% zijn +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` moet van 0.01 tot 100 pt zijn +@msg style must be "pencil" or "brush" style moet "pencil" of "brush" zijn +@msg extend end must be "start" or "end" het einde van extend moet "start" of "end" zijn +@msg connect end must be "start" or "end" het einde van connect moet "start" of "end" zijn @msg `roundness` must be from 1 to 100% `roundness` moet van 1 tot 100% zijn @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` moet een geheel getal van 1 tot {MAX_BRIDGES_PER_ISLAND} zijn @@ -779,6 +784,9 @@ liquify-list-end {0}, {1} {0} en {1} Mask Masker Rasterize… Rasteriseren… Create Gradient Mesh… Verloopmesh maken… + Flat Vlak + To Center Naar het midden + To Edge Naar de rand Create Object Mosaic… Objectmozaïek maken… Vector Halftone… Vectorhalftoon… Create Trim Marks Afsnijtekens maken @@ -1662,6 +1670,18 @@ lighting Light Licht Placement Options… Plaatsingsopties… Plug-in… Plug-in… Preview in Browser Voorbeeld in browser + Optimize to File Size… Optimaliseren naar bestandsgrootte… + Optimize to File Size Optimaliseren naar bestandsgrootte + Desired File Size: Gewenste bestandsgrootte: + Start With: Beginnen met: + Use: Gebruiken: + Current Settings Huidige instellingen + Auto Select GIF/JPEG GIF/JPEG automatisch kiezen + Total of All Slices Totaal van alle slices + Each Slice Elke slice + Current Slice Huidige slice + {size}, within {target} {size}, binnen {target} + No setting tried fits in {target}; the smallest is {size} Geen geprobeerde instelling past in {target}; de kleinste is {size} Printer Setup… Printerinstellingen… Printers Printers Recent File Recent bestand @@ -3267,6 +3287,8 @@ digits Malayalam Malayalam Collate Sorteren Composite colours are converted to it; separations separate with it when it is a CMYK profile. Composietkleuren worden ernaar geconverteerd; separaties worden ermee gescheiden als het een CMYK-profiel is. Convert All Spot Colors to Process Alle spotkleuren omzetten naar proceskleuren + Convert {name} to process {name} omzetten naar proceskleur + Keep {name} as spot {name} als spotkleur behouden Default Printer Standaardprinter Document Ink Options Inktopties voor document Download: Downloaden: @@ -4817,12 +4839,53 @@ font-technology Variable Variabel With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Met één symboolinstantie geselecteerd gebruikt het deelvenster Transformeren het registratiepunt van het symbool als referentiepunt. Darkens the canvas outside the artboards while the Artboard tool is active. Maakt het canvas buiten de tekenborden donkerder zolang het gereedschap Tekenbord actief is. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Met Gebied buiten tekenbord dimmen aan blijft het gebied buiten de tekenborden donker terwijl u sleept met het gereedschap Tekenbord. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hoe dicht, in pixels, de aanwijzer bij een object, ankerpunt of greep moet zijn om het met een klik te selecteren. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Of het kader van het Selectie-gereedschap objecten selecteert die het raakt of alleen die volledig erbinnen; Sleeprichting selecteert die erbinnen bij slepen naar rechts. E keert de regel om tijdens het slepen. + A click selects a filled object only on its path, not inside its fill. Een klik selecteert een gevuld object alleen op zijn pad, niet binnen de vulling. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hoe dicht, in pixels, een punt bij een ankerpunt of linealhulplijn moet komen om er met Uitlijnen op punt op te snappen; met slimme hulplijnen aan geldt in plaats daarvan hun snapping-tolerantie. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Met het Selectie-gereedschap selecteert Cmd/Ctrl-klikken het object onder het geselecteerde bij de aanwijzer; elke volgende klik gaat één object dieper. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Inzoomen en Uitzoomen brengen het midden van de selectie naar het midden van de weergave. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Vergrendelde en verborgen illustraties binnen een tekenbord worden net als de andere illustraties met het tekenbord verplaatst, geschaald en gekopieerd. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. De grootte van ankerpunten en de uiteinden van richtingsgrepen op het canvas; grotere ankerpunten zijn ook van verder weg te pakken. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Tekent de uiteinden van richtingsgrepen als volle stippen, holle stippen of grotere volle stippen. + With the Direct Selection tool, the anchor under the pointer is highlighted. Met het Direct selecteren-gereedschap wordt het ankerpunt onder de aanwijzer gemarkeerd. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Toont richtingsgrepen wanneer meer dan één ankerpunt is geselecteerd; staat dit uit, dan verschijnen ze alleen bij één geselecteerd ankerpunt. + Corner widgets hide on corners whose angle is greater than this many degrees. Hoekwidgets worden verborgen op hoeken met een hoek groter dan dit aantal graden. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Het Pen-gereedschap toont het volgende segment van het laatste ankerpunt naar de aanwijzer voordat u klikt. + The Curvature tool previews the curve to the pointer before you place the next point. Het Krommingsgereedschap toont de curve naar de aanwijzer voordat u het volgende punt plaatst. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. De eenheid voor nieuwe documenten in de ingebouwde formaten, behalve formaten in pixels, en voor geopende bestanden die geen eenheid vastleggen; kiest u die hier en klikt u op OK, dan krijgt ook het actieve document deze eenheid. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Contourdiktes, streepjes en tussenruimtes worden in deze eenheid getoond, en getallen die ervoor worden getypt, worden erin gelezen. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tekstgroottes, regelafstand en basislijnverschuiving worden in deze eenheid getoond, en getallen die ervoor worden getypt, worden erin gelezen. The unit for East Asian type measurements, which no field uses yet. De eenheid voor maten van Oost-Aziatische tekst, die nog geen enkel veld gebruikt. When on, a number typed without a unit into a field in picas is read in points. Wanneer dit aan staat, wordt een getal dat zonder eenheid in een veld in pica's wordt getypt, in punten gelezen. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Met XML-id worden objectnamen als XML-id's getoond in Lagen, Variabelen en Laagopties. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Lijnt tekenen, verplaatsen en schalen uit op de onderverdelingen van het raster, ook als het raster verborgen is; zolang dit aan staat, geldt Uitlijnen op pixel niet. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. De kleur van hulplijnen die niet geselecteerd zijn; een tekenbord met een hulplijnlabel tekent zijn eigen hulplijnen in de kleur van het label. + Draws guides as solid lines or as dots, including the guides already in the document. Tekent hulplijnen als doorgetrokken lijnen of als stippen, ook de hulplijnen die al in het document staan. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Als dit aan staat, zijn hulplijnen vergrendeld wanneer VectorCraft start; het wijzigen van deze optie vergrendelt of ontgrendelt ze meteen, en Beeld › Hulplijnen › Hulplijnen vergrendelen wijzigt de vergrendeling nog steeds. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Als dit aan staat, maakt Cmd/Ctrl ingedrukt aan het begin van een sleep vanuit een liniaal een hulplijn op alleen het actieve tekenbord, of met het tekengebied-gereedschap een hulplijn over het hele canvas. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. De kleur van het raster; de lijnen tussen de hoofdrasterlijnen worden in een vagere tint ervan getekend. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Tekent het raster als lijnen, of als stippen langs de hoofdrasterlijnen bij elke onderverdeling. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. De afstand tussen hoofdrasterlijnen in elk open document en in nieuwe; een VectorCraft-document opent met het raster waarmee het is opgeslagen. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. In hoeveel delen elk hoofdrastervak wordt verdeeld; Uitlijnen op raster lijnt uit op deze delen, ook als de zoom hun lijnen verbergt. + Draws the grid behind the artwork; off, the grid is drawn over it. Tekent het raster achter de illustratie; uit wordt het raster eroverheen getekend. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. In Pixelvoorbeeld bij 600% zoom of meer toont de actieve weergave over de illustratie een lijn langs de rand van elke documentpixel. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. De kleur van de tegelrand en de gestippelde staalgrenzen die worden getoond terwijl u een patroon bewerkt. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Lijnt tekenen, verplaatsen en transformeren uit op illustraties in de buurt en toont hulplijnen en labels; Pixelvoorbeeld zet ze uit, en Uitlijnen op raster lijnt in plaats daarvan uit op het raster. + The color of Smart Guide lines and labels. De kleur van de lijnen en labels van slimme hulplijnen. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Toont een lijn langs de rand of het midden waarmee de illustratie uitlijnt; uit lijnt de illustratie nog steeds uit zonder de lijn, en Uitlijnen op glyph geldt niet. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Met een selectiegereedschap krijgt het niet-geselecteerde object onder de aanwijzer een omtrek in de kleur van zijn laag, zolang u niet sleept. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Toont de grootte of hoek naast de aanwijzer terwijl u een illustratie schaalt, draait, schuintrekt of spiegelt. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Tijdens het tekenen worden punten uitgelijnd op lijnen in de gekozen hoeken door het punt waar het segment of de vorm begint. + The set of angles the construction guides follow while Construction Guides is on. De set hoeken die de bouwhulplijnen volgen terwijl Bouwhulplijnen aan staat. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Noemt waarop een punt uitlijnt, zoals een ankerpunt, een pad of een uitlijning; uit worden punten op dezelfde manier uitgelijnd, zonder de namen. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Toont naast de aanwijzer afstanden, hoeken en hoe ver de illustratie is verplaatst terwijl u tekent of verplaatst. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Lijnt verplaatste of vergrote of verkleinde illustraties uit op dezelfde tussenruimte als tussen objecten in de buurt en markeert de gelijke tussenruimten. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Met iets geselecteerd toont Alt/Option ingedrukt boven een ander object of een tekenbord de afstanden tussen dat object en de selectie. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Een selectie die tot binnen de snapping-tolerantie van het beginpunt van het slepen wordt teruggesleept, keert precies naar die plek terug; een kopie niet. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Hoe dicht de aanwijzer of een gesleept punt op het scherm bij een illustratie moet komen voordat slimme hulplijnen erop uitlijnen; de afstand is bij elke zoom gelijk. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Lijnt het einde van een lijnsegment, of een cirkel getekend vanuit het middelpunt, zo uit dat het een curve in de buurt raakt. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Lijnt het einde van een lijnsegment zo uit dat het een recht segment in de buurt onder een rechte hoek raakt. Reset all preferences to their defaults? Alle voorkeuren terugzetten naar de standaardwaarden? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. De standaardwaarden worden toegepast wanneer u in Voorkeuren op OK klikt. Annuleren daar behoudt uw huidige voorkeuren. Smaller ↔ Larger Kleiner ↔ Groter @@ -5113,6 +5176,11 @@ imageTrace Outline Contour @msg PDF writer error: {0} PDF-schrijffout: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} bestand verpakt in {folder} ({note})|{n} bestanden verpakt in {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Voorvertoning in browser heeft de desktop-app nodig (het web downloadt in plaats daarvan bestanden) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 geef `desiredK`, de gewenste bestandsgrootte in K (1024 bytes): een getal boven 0 en hoogstens 1048576 +@msg `startWith` is `current` or `auto` `startWith` is `current` of `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` is `allSlices`, `eachSlice` of `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` is een slicenummer uit `slice.list`, met `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimaliseren naar bestandsgrootte: er is geen afbeelding om te meten @msg Release Guides: no guides Hulplijnen vrijgeven: geen hulplijnen @msg Release: no layer to put the rectangle in Vrijgeven: geen laag om de rechthoek in te plaatsen @msg Replace Spine: select a blend and a path Ruggengraat vervangen: selecteer een mengsel en een pad @@ -6346,7 +6414,6 @@ imageTrace Outline Contour @msg anchor `smooth` must be true or false `smooth` van het anker moet true of false zijn @msg anchor `{key}` must be [x, y] `{key}` van het anker moet [x, y] zijn @msg anchor `{key}` must be a number `{key}` van het anker moet een getal zijn -@msg angle and roundness must be finite hoek en ronding moeten eindig zijn @msg angles must be a list as long as pins (degrees or null) angles moet een lijst zijn die even lang is als pins (graden of null) @msg appearance must be flat|center|edge appearance moet flat|center|edge zijn @msg apply is "fill" or "stroke", not `{other}` apply is "fill" of "stroke", niet `{other}` @@ -8093,6 +8160,19 @@ mark-style Japanese Japans Transform Objects Objecten transformeren @msg unknown parameter `{key}`; did you mean `{near}`? onbekende parameter `{key}`; bedoelde je `{near}`? @msg unknown parameter `{key}`; the command takes no parameters onbekende parameter `{key}`; de opdracht accepteert geen parameters +@msg unknown parameter `{key}`; `{object}` takes: {keys} onbekende parameter `{key}`; `{object}` accepteert: {keys} +@msg unknown parameter `{key}`; {why_not} onbekende parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) geen enkele indeling accepteert deze (zie document.formats) +@msg no save format takes it (see file.formatOptions) geen enkele opslagindeling accepteert deze (zie file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF accepteert deze niet (zie document.formats) +@msg EPS doesn't take it (see document.formats) EPS accepteert deze niet (zie document.formats) +@msg DXF doesn't take it (see document.formats) DXF accepteert deze niet (zie document.formats) +@msg {name} must be {range} (got {v}) {name} moet {range} zijn (kreeg {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) De grafische processor die eerst werd geprobeerd, kon het venster niet weergeven, dus VectorCraft is opnieuw gestart met {summary} (Instellingen › Prestaties › Grafische processor › Automatisch gebruikt de processor die je beeldscherm aanstuurt) +@msg Sent “{title}” to {to} “{title}” verzonden naar {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” verzonden naar {to}. Antwoord van de afdrukwachtrij: {note} +@msg the default printer de standaardprinter +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastereffecten op object {object}: {requested} ppi gevraagd, {achieved} ppi bereikt vanwege de limiet van 64 miljoen pixels @msg unknown parameter `{key}`; the command takes: {keys} onbekende parameter `{key}`; de opdracht accepteert: {keys} Load EPS into Clipboard EPS in het klembord laden @msg an image of {w} × {h} pixels is too large to draw een afbeelding van {w} × {h} pixels is te groot om te tekenen diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 4e59903186..0147515ffe 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -188,6 +188,9 @@ Mask Maska Rasterize… Rasteryzuj… Create Gradient Mesh… Utwórz siatkę gradientową… + Flat Płaski + To Center Do środka + To Edge Do krawędzi Create Object Mosaic… Utwórz mozaikę obiektów… Vector Halftone… Półton wektorowy… Create Trim Marks Utwórz znaczniki przycięcia @@ -1127,6 +1130,18 @@ lighting Light Światło Placement Options… Opcje umieszczania… Plug-in… Wtyczka… Preview in Browser Podgląd w przeglądarce + Optimize to File Size… Optymalizuj do rozmiaru pliku… + Optimize to File Size Optymalizuj do rozmiaru pliku + Desired File Size: Żądany rozmiar pliku: + Start With: Zacznij od: + Use: Użyj: + Current Settings Bieżące ustawienia + Auto Select GIF/JPEG Automatyczny wybór GIF/JPEG + Total of All Slices Suma wszystkich plasterków + Each Slice Każdy plasterek + Current Slice Bieżący plasterek + {size}, within {target} {size}, w granicach {target} + No setting tried fits in {target}; the smallest is {size} Żadne wypróbowane ustawienie nie mieści się w {target}; najmniejsze ma {size} Printer Setup… Ustawienia drukarki… Printers Drukarki Recent File Ostatni plik @@ -2838,6 +2853,8 @@ digits Malayalam Malajalam Collate Sortuj Composite colours are converted to it; separations separate with it when it is a CMYK profile. Kolory kompozytowe są do niego konwertowane; rozbarwienia korzystają z niego, gdy jest profilem CMYK. Convert All Spot Colors to Process Konwertuj wszystkie kolory dodatkowe na triadowe + Convert {name} to process Konwertuj {name} na kolor triadowy + Keep {name} as spot Zachowaj {name} jako kolor dodatkowy Default Printer Drukarka domyślna Document Ink Options Opcje farb dokumentu Download: Pobieranie: @@ -4390,12 +4407,53 @@ font-technology Variable Zmienne With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Gdy zaznaczone jest jedno wystąpienie symbolu, panel Przekształć używa punktu rejestracji symbolu jako punktu odniesienia. Darkens the canvas outside the artboards while the Artboard tool is active. Przyciemnia obszar roboczy poza obszarami kompozycji, gdy aktywne jest narzędzie Obszar kompozycji. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Gdy włączone jest Przyciemnij obszar poza obszarem kompozycji, obszar poza obszarami kompozycji pozostaje ciemny podczas przeciągania narzędziem Obszar kompozycji. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Jak blisko, w pikselach, wskaźnik musi być od obiektu, punktu kontrolnego lub uchwytu, aby kliknięcie go zaznaczyło. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Czy ramka narzędzia Zaznaczanie zaznacza dotknięte obiekty, czy tylko te całkowicie wewnątrz; Kierunek przeciągania zaznacza te wewnątrz przy przeciąganiu w prawo. E odwraca regułę podczas przeciągania. + A click selects a filled object only on its path, not inside its fill. Kliknięcie zaznacza wypełniony obiekt tylko na jego ścieżce, nie wewnątrz wypełnienia. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Jak blisko, w pikselach, punkt musi podejść do punktu kontrolnego lub linii pomocniczej linijki, aby Przyciągaj do punktów go przyciągnęło; przy włączonych inteligentnych liniach pomocniczych obowiązuje ich tolerancja przyciągania. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Z narzędziem Zaznaczanie Cmd/Ctrl+kliknięcie zaznacza obiekt pod zaznaczonym w miejscu wskaźnika; każde kolejne kliknięcie schodzi o jeden obiekt głębiej. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Powiększ i Pomniejsz przenoszą środek zaznaczenia na środek widoku. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Zablokowana i ukryta grafika wewnątrz obszaru kompozycji jest przesuwana, skalowana i kopiowana razem z nim, tak jak pozostała grafika. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Rozmiar punktów kontrolnych i końców uchwytów kierunkowych na obszarze roboczym; większe punkty kontrolne można chwycić także z większej odległości. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Rysuje końce uchwytów kierunkowych jako pełne kropki, puste kropki lub większe pełne kropki. + With the Direct Selection tool, the anchor under the pointer is highlighted. Z narzędziem Zaznaczanie bezpośrednie punkt kontrolny pod wskaźnikiem jest wyróżniany. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Pokazuje uchwyty kierunkowe, gdy zaznaczono więcej niż jeden punkt kontrolny; po wyłączeniu są widoczne tylko przy jednym zaznaczonym punkcie. + Corner widgets hide on corners whose angle is greater than this many degrees. Widżety narożników są ukrywane na narożnikach o kącie większym niż ta liczba stopni. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Narzędzie Pióro pokazuje podgląd następnego segmentu od ostatniego punktu kontrolnego do wskaźnika przed kliknięciem. + The Curvature tool previews the curve to the pointer before you place the next point. Narzędzie Krzywizna pokazuje podgląd krzywej do wskaźnika przed umieszczeniem następnego punktu. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Jednostka nowych dokumentów o wbudowanych rozmiarach, z wyjątkiem rozmiarów w pikselach, oraz otwartych plików bez zapisanej jednostki; wybranie jej tutaj i kliknięcie OK ustawia ją też w aktywnym dokumencie. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Grubości obrysu, kreski i odstępy są wyświetlane w tej jednostce, a liczby wpisane dla nich są w niej odczytywane. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Rozmiary tekstu, interlinia i przesunięcie linii bazowej są wyświetlane w tej jednostce, a liczby wpisane dla nich są w niej odczytywane. The unit for East Asian type measurements, which no field uses yet. Jednostka miar tekstu wschodnioazjatyckiego, której żadne pole jeszcze nie używa. When on, a number typed without a unit into a field in picas is read in points. Gdy opcja jest włączona, liczba wpisana bez jednostki w polu w pica jest odczytywana w punktach. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Przy ID XML nazwy obiektów są wyświetlane jako ID XML w Warstwach, Zmiennych i Opcjach warstwy. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Przyciąga rysowanie, przesuwanie i skalowanie do podpodziałów siatki, nawet gdy siatka jest ukryta; dopóki jest włączone, Przyciągaj do pikseli nie działa. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Kolor niezaznaczonych linii pomocniczych; obszar kompozycji z Etykietą linii pomocniczych rysuje własne linie pomocnicze w kolorze etykiety. + Draws guides as solid lines or as dots, including the guides already in the document. Rysuje linie pomocnicze jako linie ciągłe lub kropki, także te, które już są w dokumencie. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Po włączeniu linie pomocnicze są zablokowane przy uruchomieniu VectorCraft; zmiana tej opcji od razu je blokuje lub odblokowuje, a Widok › Linie pomocnicze › Zablokuj linie pomocnicze nadal zmienia blokadę. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Po włączeniu przytrzymanie Cmd/Ctrl na początku przeciągania z linijki tworzy linię pomocniczą tylko na aktywnym obszarze kompozycji, a z narzędziem Obszar kompozycji linię na całym płótnie. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Kolor siatki; linie między głównymi liniami siatki są rysowane w jaśniejszym odcieniu tego koloru. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Rysuje siatkę jako linie albo jako kropki wzdłuż głównych linii siatki przy każdym podpodziale. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Odstęp między głównymi liniami siatki w każdym otwartym dokumencie i w nowych; dokument VectorCraft otwiera się z siatką, z którą został zapisany. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Na ile części dzieli się każdy główny kwadrat siatki; Przyciągaj do siatki przyciąga do tych części, nawet gdy powiększenie ukrywa ich linie. + Draws the grid behind the artwork; off, the grid is drawn over it. Rysuje siatkę za grafiką; po wyłączeniu siatka jest rysowana na niej. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. W Podglądzie pikseli przy powiększeniu 600% lub większym aktywny widok pokazuje nad grafiką linię na krawędzi każdego piksela dokumentu. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Kolor krawędzi kafelka i przerywanych granic próbki widocznych podczas edycji wzorka. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Przyciąga rysowanie, przesuwanie i przekształcanie do pobliskiej grafiki oraz pokazuje linie pomocnicze i etykiety; Podgląd pikseli je wyłącza, a Przyciągaj do siatki przyciąga zamiast nich do siatki. + The color of Smart Guide lines and labels. Kolor linii i etykiet inteligentnych linii pomocniczych. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Pokazuje linię wzdłuż krawędzi lub środka, do których wyrównuje się grafika; po wyłączeniu grafika nadal się wyrównuje bez linii, a Przyciągaj do glifów nie działa. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Przy narzędziu zaznaczania obrysowuje niezaznaczony obiekt pod wskaźnikiem kolorem jego warstwy, dopóki nie przeciągasz. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Pokazuje rozmiar lub kąt obok wskaźnika podczas skalowania, obracania, pochylania lub odbijania grafiki. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Podczas rysowania punkty przyciągają się do linii pod wybranymi kątami przechodzących przez punkt, od którego zaczyna się segment lub kształt. + The set of angles the construction guides follow while Construction Guides is on. Zestaw kątów, wzdłuż których biegną linie konstrukcyjne, gdy Linie konstrukcyjne są włączone. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nazywa to, do czego przyciąga się punkt, np. punkt kontrolny, ścieżkę lub wyrównanie; po wyłączeniu punkty przyciągają się tak samo, bez nazw. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Pokazuje obok wskaźnika odległości, kąty i to, o ile przesunęła się grafika, podczas rysowania lub przesuwania. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Przyciąga przesuniętą grafikę lub grafikę o zmienionym rozmiarze do takiego samego odstępu jak między pobliskimi obiektami i zaznacza równe odstępy. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Gdy coś jest zaznaczone, przytrzymanie Alt/Option nad innym obiektem lub obszarem kompozycji pokazuje odległości między nim a zaznaczeniem. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Zaznaczenie przeciągnięte z powrotem na odległość tolerancji przyciągania od miejsca, w którym zaczęło się przeciąganie, wraca dokładnie w to miejsce; kopia nie. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Jak blisko na ekranie wskaźnik lub przeciągany punkt musi znaleźć się przy grafice, aby inteligentne linie pomocnicze go przyciągnęły; odległość jest taka sama przy każdym powiększeniu. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Przyciąga koniec odcinka lub okrąg rysowany od środka tak, aby dotykał pobliskiej krzywej. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Przyciąga koniec odcinka tak, aby spotykał pobliski prosty segment pod kątem prostym. Reset all preferences to their defaults? Przywrócić domyślne wartości wszystkich preferencji? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Wartości domyślne zostaną zastosowane po kliknięciu OK w Preferencjach. Anuluj w tym oknie zachowuje bieżące preferencje. Smaller ↔ Larger Mniejszy ↔ większy @@ -4830,6 +4888,11 @@ liquify-list-end {0}, {1} {0} i {1} @msg PDF writer error: {0} Błąd zapisu PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Spakowane pliki: {n} w {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Podgląd w przeglądarce wymaga aplikacji desktopowej (wersja webowa zamiast tego pobiera pliki) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 podaj `desiredK`, żądany rozmiar pliku w K (1024 bajty): liczbę większą od 0 i najwyżej 1048576 +@msg `startWith` is `current` or `auto` `startWith` to `current` lub `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` to `allSlices`, `eachSlice` lub `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` to numer plasterka z `slice.list`, z `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optymalizuj do rozmiaru pliku: brak obrazu do zmierzenia @msg Release Guides: no guides Uwolnij linie pomocnicze: brak linii pomocniczych @msg Release: no layer to put the rectangle in Uwolnij: brak warstwy, na której można umieścić prostokąt @msg Replace Spine: select a blend and a path Zastąp grzbiet: zaznacz przejście i ścieżkę @@ -6174,6 +6237,19 @@ mark-style Japanese Japońskie Transform Objects Przekształć obiekty @msg unknown parameter `{key}`; did you mean `{near}`? nieznany parametr `{key}`; czy chodziło o `{near}`? @msg unknown parameter `{key}`; the command takes no parameters nieznany parametr `{key}`; polecenie nie przyjmuje parametrów +@msg unknown parameter `{key}`; `{object}` takes: {keys} nieznany parametr `{key}`; `{object}` przyjmuje: {keys} +@msg unknown parameter `{key}`; {why_not} nieznany parametr `{key}`; {why_not} +@msg no format takes it (see document.formats) żaden format go nie przyjmuje (zobacz document.formats) +@msg no save format takes it (see file.formatOptions) żaden format zapisu go nie przyjmuje (zobacz file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF go nie przyjmuje (zobacz document.formats) +@msg EPS doesn't take it (see document.formats) EPS go nie przyjmuje (zobacz document.formats) +@msg DXF doesn't take it (see document.formats) DXF go nie przyjmuje (zobacz document.formats) +@msg {name} must be {range} (got {v}) {name} musi wynosić {range} (podano {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Pierwszy wypróbowany procesor graficzny nie mógł wyświetlić okna, więc VectorCraft uruchomił się ponownie na {summary} (Ustawienia › Wydajność › Procesor graficzny › Automatycznie używa tego, który obsługuje ekran) +@msg Sent “{title}” to {to} Wysłano “{title}” do: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Wysłano “{title}” do: {to}. Odpowiedź kolejki wydruku: {note} +@msg the default printer drukarka domyślna +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efekty rastrowe na obiekcie {object}: żądano {requested} ppi, uzyskano {achieved} ppi z powodu limitu 64 milionów pikseli @msg unknown parameter `{key}`; the command takes: {keys} nieznany parametr `{key}`; polecenie przyjmuje: {keys} @msg the params must be an object, not {got} parametry muszą być obiektem, a nie {got} @msg unknown parameter `{path}`; the object takes no keys nieznany parametr `{path}`; obiekt nie przyjmuje kluczy @@ -7707,6 +7783,11 @@ breakText Glyphs Glify @msg Some islands could not be joined to the area around the art Niektórych wysp nie udało się połączyć z obszarem wokół grafiki @msg `width` must be from {lo} to {hi} pt `width` musi mieścić się w zakresie od {lo} do {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` musi mieścić się w zakresie od -180 do 180 stopni +@msg `roundness` must be from 0 to 100% `roundness` musi mieścić się w zakresie od 0 do 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` musi mieścić się w zakresie od 0.01 do 100 pt +@msg style must be "pencil" or "brush" style musi mieć wartość "pencil" lub "brush" +@msg extend end must be "start" or "end" koniec extend musi mieć wartość "start" lub "end" +@msg connect end must be "start" or "end" koniec connect musi mieć wartość "start" lub "end" @msg `roundness` must be from 1 to 100% `roundness` musi mieścić się w zakresie od 1 do 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` musi być liczbą całkowitą od 1 do {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Ramka i linie do wybierania… @@ -8105,8 +8186,6 @@ breakText Glyphs Glify @msg unknown dither `{d}` (diffusion, pattern, noise or none) nieznane rozpraszanie `{d}` (diffusion, pattern, noise lub none) @msg unknown panel `{panel}` nieznany panel `{panel}` @msg unknown parameter `{key}` nieznany parametr `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} nieznany parametr `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} nieznany parametr `{within}{key}`; {why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) nieznana redukcja `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform lub document) @msg unmatched ')' niesparowany znak ')' @msg unterminated character class niezakończona klasa znaków @@ -8473,7 +8552,6 @@ breakText Glyphs Glify @msg anchor `smooth` must be true or false `smooth` punktu kontrolnego musi mieć wartość true lub false @msg anchor `{key}` must be [x, y] `{key}` punktu kontrolnego musi mieć postać [x, y] @msg anchor `{key}` must be a number `{key}` punktu kontrolnego musi być liczbą -@msg angle and roundness must be finite kąt i okrągłość muszą być skończone @msg angles must be a list as long as pins (degrees or null) angles musi być listą tej samej długości co pins (stopnie lub null) @msg appearance must be flat|center|edge appearance musi mieć wartość flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply ma wartość "fill" lub "stroke", a nie `{other}` @@ -9523,7 +9601,6 @@ breakText Glyphs Glify @msg {label} must be a number from 1 to 10000 {label} musi być liczbą od 1 do 10000 @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} jest wbudowane i nie można go usunąć -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} musi wynosić {lo}–{hi}{unit} (podano {v}) @msg {name}: CRC or size mismatch {name}: niezgodność CRC lub rozmiaru @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}: udało się odczytać tylko osadzony podgląd tego pliku Affinity; użyj polecenia Plik › Otwórz, aby zobaczyć go wraz z ostrzeżeniem, albo przed umieszczeniem wyeksportuj SVG lub PDF z programu Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index ac559a9266..8201db7ab6 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -562,6 +562,8 @@ antiAlias Sharp Nítido Control Controle Convert Converter Convert All Spot Colors to Process Converter Todas as Cores Spot em Processo + Convert {name} to process Converter {name} em Processo + Keep {name} as spot Manter {name} como Spot Convert All Strokes to Outlines Converter Todos os Traçados em Contornos Convert All Text to Outlines Converter Todo o Texto em Contornos Convert Anchor Point Converter Ponto de Ancoragem @@ -616,6 +618,9 @@ antiAlias Sharp Nítido Create Clipping Mask Criar Máscara de Recorte Create From: Criar De: Create Gradient Mesh… Criar Malha de Gradiente… + Flat Plano + To Center Para o Centro + To Edge Para a Borda Create Graph Criar Gráfico Create New Layer Criar Nova Camada Create New Sublayer Criar Nova Subcamada @@ -2250,6 +2255,18 @@ antiAlias Sharp Nítido Preview: Visualização: Preview Mode Modo de Visualização Preview in Browser Visualizar no Navegador + Optimize to File Size… Otimizar para tamanho de arquivo… + Optimize to File Size Otimizar para tamanho de arquivo + Desired File Size: Tamanho de arquivo desejado: + Start With: Começar com: + Use: Usar: + Current Settings Configurações atuais + Auto Select GIF/JPEG Seleção automática GIF/JPEG + Total of All Slices Total de todas as fatias + Each Slice Cada fatia + Current Slice Fatia atual + {size}, within {target} {size}, dentro de {target} + No setting tried fits in {target}; the smallest is {size} Nenhuma configuração testada cabe em {target}; a menor tem {size} Preview the document as it is now Visualizar o documento como está agora Previous Anterior Previous Library Biblioteca Anterior @@ -2590,12 +2607,53 @@ digits Malayalam Malaiala With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Com uma instância de símbolo selecionada, o painel Transformar usa o ponto de registro do símbolo como ponto de referência. Darkens the canvas outside the artboards while the Artboard tool is active. Escurece a tela fora das pranchetas enquanto a ferramenta Prancheta está ativa. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Com Escurecer Região Fora da Prancheta ativado, a área fora das pranchetas continua escura enquanto você arrasta com a ferramenta Prancheta. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Quão perto, em pixels, o ponteiro precisa estar de um objeto, ponto de ancoragem ou alça para que um clique o selecione. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Se a caixa da ferramenta Seleção seleciona os objetos que toca ou só os totalmente dentro; Direção do arrasto seleciona os de dentro ao arrastar para a direita. E inverte a regra durante o arrasto. + A click selects a filled object only on its path, not inside its fill. Um clique seleciona um objeto preenchido só no demarcador, não dentro do preenchimento. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Quão perto, em pixels, um ponto precisa chegar de um ponto de ancoragem ou guia de régua para que Ajustar ao Ponto o ajuste; com as Guias Inteligentes ativadas, vale a Tolerância de Ajuste delas. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Com a ferramenta Seleção, Cmd/Ctrl+clique seleciona o objeto abaixo do selecionado no ponteiro; cada clique seguinte desce mais um objeto. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Ampliar e Reduzir levam o centro da seleção ao meio da visualização. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. A arte bloqueada e oculta dentro de uma prancheta é movida, dimensionada e copiada com ela, como o restante da arte. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. O tamanho dos pontos de ancoragem e das pontas das alças de direção na tela; pontos de ancoragem maiores também podem ser pegos de mais longe. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Desenha as pontas das alças de direção como pontos cheios, pontos vazados ou pontos cheios maiores. + With the Direct Selection tool, the anchor under the pointer is highlighted. Com a ferramenta Seleção Direta, o ponto de ancoragem sob o ponteiro é realçado. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Mostra as alças de direção quando mais de um ponto de ancoragem está selecionado; desativado, elas só aparecem com um único ponto de ancoragem selecionado. + Corner widgets hide on corners whose angle is greater than this many degrees. Os widgets de canto se ocultam em cantos cujo ângulo é maior que estes graus. + The Pen tool previews the next segment from the last anchor to the pointer before you click. A ferramenta Caneta mostra uma prévia do próximo segmento, do último ponto de ancoragem até o ponteiro, antes do clique. + The Curvature tool previews the curve to the pointer before you place the next point. A ferramenta Curvatura mostra uma prévia da curva até o ponteiro antes de você posicionar o próximo ponto. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. A unidade dos novos documentos de tamanhos predefinidos, exceto os tamanhos em pixels, e dos arquivos abertos que não registram nenhuma unidade; escolhê-la aqui e clicar em OK também a define no documento ativo. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. As espessuras de traçado, os traços e as lacunas aparecem nesta unidade, e os números digitados para eles são lidos nela. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Tamanhos de texto, entrelinhamento e deslocamento da linha de base aparecem nesta unidade, e os números digitados para eles são lidos nela. The unit for East Asian type measurements, which no field uses yet. A unidade das medidas de texto do Leste Asiático, que nenhum campo usa ainda. When on, a number typed without a unit into a field in picas is read in points. Quando ativado, um número digitado sem unidade em um campo em picas é lido em pontos. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Com ID XML, os nomes dos objetos aparecem como IDs XML em Camadas, Variáveis e Opções de Camada. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Ajusta o desenho, o movimento e a escala às subdivisões da grade, mesmo com a grade oculta; enquanto está ativado, Ajustar ao Pixel não se aplica. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. A cor das guias não selecionadas; uma prancheta com Rótulo das Guias desenha as próprias guias na cor do rótulo. + Draws guides as solid lines or as dots, including the guides already in the document. Desenha as guias como linhas contínuas ou como pontos, inclusive as guias que já estão no documento. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Com esta opção ativada, as guias ficam bloqueadas quando o VectorCraft inicia; mudar a opção as bloqueia ou desbloqueia na hora, e Exibir › Guias › Bloquear Guias continua mudando o bloqueio. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Com esta opção ativada, manter Cmd/Ctrl pressionado ao começar a arrastar de uma régua cria uma guia só na prancheta ativa, ou uma guia de toda a tela de pintura com a ferramenta Mesa de Trabalho. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. A cor da grade; as linhas entre as linhas principais são desenhadas em um tom mais claro dessa cor. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Desenha a grade como linhas, ou como pontos ao longo das linhas principais em cada subdivisão. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. A distância entre as linhas principais da grade, em todos os documentos abertos e nos novos; um documento do VectorCraft abre com a grade com que foi salvo. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Em quantas partes cada quadrado principal da grade é dividido; Ajustar à Grade ajusta a essas partes, mesmo quando o zoom esconde as linhas delas. + Draws the grid behind the artwork; off, the grid is drawn over it. Desenha a grade atrás da arte; desativada, a grade é desenhada sobre ela. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Na Visualização de Pixels com zoom de 600% ou mais, a exibição ativa mostra sobre a arte uma linha na borda de cada pixel do documento. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. A cor da borda do bloco e dos limites tracejados da amostra mostrados enquanto você edita um padrão. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Ajusta o desenho, a movimentação e a transformação à arte próxima e mostra guias e rótulos; a Visualização de Pixels os desativa, e Ajustar à Grade ajusta à grade no lugar deles. + The color of Smart Guide lines and labels. A cor das linhas e dos rótulos das guias inteligentes. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Mostra uma linha ao longo da borda ou do centro com que a arte se alinha; desativada, a arte continua se alinhando sem a linha, e Ajustar ao Glifo não se aplica. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Com uma ferramenta de seleção, contorna o objeto não selecionado sob o ponteiro com a cor da camada dele enquanto você não arrasta. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Mostra o tamanho ou o ângulo ao lado do ponteiro enquanto você dimensiona, gira, cisalha ou espelha a arte. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Enquanto você desenha, os pontos se ajustam a linhas nos ângulos escolhidos que passam pelo ponto onde o segmento ou a forma começa. + The set of angles the construction guides follow while Construction Guides is on. O conjunto de ângulos que as guias de construção seguem enquanto Guias de Construção está ativado. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Nomeia aquilo a que um ponto se ajusta, como uma âncora, um caminho ou um alinhamento; desativado, os pontos se ajustam da mesma forma, sem os nomes. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Mostra ao lado do ponteiro distâncias, ângulos e quanto a arte se moveu enquanto você desenha ou move. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Ajusta a arte movida ou redimensionada ao mesmo espaço que há entre objetos próximos e marca os espaços iguais. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Com algo selecionado, manter Alt/Option pressionado sobre outro objeto ou uma prancheta mostra as distâncias entre ele e a seleção. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Uma seleção arrastada de volta até a tolerância de ajuste do lugar onde o arrasto começou volta exatamente para aquele lugar; uma cópia não. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Quão perto na tela o ponteiro ou um ponto arrastado precisa chegar da arte para que as guias inteligentes se ajustem a ela; a distância é a mesma em qualquer zoom. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Ajusta a extremidade de um segmento de linha, ou um círculo desenhado a partir do centro, para que toque uma curva próxima. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Ajusta a extremidade de um segmento de linha para que encontre um segmento reto próximo em ângulo reto. Reset all preferences to their defaults? Redefinir todas as preferências para o padrão? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Os padrões são aplicados quando você clica em OK em Preferências. Cancelar ali mantém suas preferências atuais. Restored documents open unsaved: save them to keep them. Os documentos restaurados abrem sem salvar: salve-os para mantê-los. @@ -4026,6 +4084,11 @@ axis Both Ambos @msg PDF writer error: {0} Erro do gravador de PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} arquivo empacotado em {folder} ({note})|{n} arquivos empacotados em {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Visualizar no navegador exige o aplicativo para desktop (na web, os arquivos são baixados) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 informe `desiredK`, o tamanho de arquivo desejado em K (1024 bytes): um número acima de 0 e no máximo 1048576 +@msg `startWith` is `current` or `auto` `startWith` é `current` ou `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` é `allSlices`, `eachSlice` ou `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` é um número de fatia de `slice.list`, com `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Otimizar para tamanho de arquivo: não há imagem para medir @msg Release Guides: no guides Liberar guias: não há guias @msg Release: no layer to put the rectangle in Liberar: não há camada para colocar o retângulo @msg Replace Spine: select a blend and a path Substituir coluna: selecione uma mesclagem e um traçado @@ -4903,6 +4966,19 @@ axis Both Ambos Transform Objects Transformar objetos @msg unknown parameter `{key}`; did you mean `{near}`? parâmetro desconhecido `{key}`; você quis dizer `{near}`? @msg unknown parameter `{key}`; the command takes no parameters parâmetro desconhecido `{key}`; o comando não tem parâmetros +@msg unknown parameter `{key}`; `{object}` takes: {keys} parâmetro desconhecido `{key}`; `{object}` aceita: {keys} +@msg unknown parameter `{key}`; {why_not} parâmetro desconhecido `{key}`; {why_not} +@msg no format takes it (see document.formats) nenhum formato o aceita (consulte document.formats) +@msg no save format takes it (see file.formatOptions) nenhum formato de salvamento o aceita (consulte file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF não o aceita (consulte document.formats) +@msg EPS doesn't take it (see document.formats) EPS não o aceita (consulte document.formats) +@msg DXF doesn't take it (see document.formats) DXF não o aceita (consulte document.formats) +@msg {name} must be {range} (got {v}) {name} deve ser {range} (recebido {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) O processador gráfico tentado primeiro não conseguiu exibir a janela, então o VectorCraft reiniciou em {summary} (Configurações › Desempenho › Processador Gráfico › Automático usa o que controla sua tela) +@msg Sent “{title}” to {to} “{title}” enviado para {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” enviado para {to}. Resposta da fila de impressão: {note} +@msg the default printer a impressora padrão +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap efeitos de rasterização no objeto {object}: solicitados {requested} ppi, obtidos {achieved} ppi devido ao limite de 64 milhões de pixels @msg unknown parameter `{key}`; the command takes: {keys} parâmetro desconhecido `{key}`; o comando aceita: {keys} @msg the params must be an object, not {got} os parâmetros devem ser um objeto, não {got} @msg unknown parameter `{path}`; the object takes no keys parâmetro desconhecido `{path}`; o objeto não aceita chaves @@ -8038,6 +8114,11 @@ swatch Yellow Green Verde-amarelado @msg Some islands could not be joined to the area around the art Algumas ilhas não puderam ser unidas à área ao redor da arte @msg `width` must be from {lo} to {hi} pt `width` deve estar entre {lo} e {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` deve estar entre -180 e 180 graus +@msg `roundness` must be from 0 to 100% `roundness` deve estar entre 0 e 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` deve estar entre 0.01 e 100 pt +@msg style must be "pencil" or "brush" style deve ser "pencil" ou "brush" +@msg extend end must be "start" or "end" a extremidade de extend deve ser "start" ou "end" +@msg connect end must be "start" or "end" a extremidade de connect deve ser "start" ou "end" @msg `roundness` must be from 1 to 100% `roundness` deve estar entre 1 e 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` deve ser um número inteiro de 1 a {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Caixa e Linhas de Descasque… @@ -8551,7 +8632,6 @@ swatch Yellow Green Verde-amarelado @msg anchor `smooth` must be true or false `smooth` do ponto de ancoragem deve ser true ou false @msg anchor `{key}` must be [x, y] `{key}` do ponto de ancoragem deve ser [x, y] @msg anchor `{key}` must be a number `{key}` do ponto de ancoragem deve ser um número -@msg angle and roundness must be finite angle e roundness devem ser finitos @msg angles must be a list as long as pins (degrees or null) angles deve ser uma lista do mesmo tamanho que pins (graus ou null) @msg appearance must be flat|center|edge appearance deve ser flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply é "fill" ou "stroke", não `{other}` @@ -9705,8 +9785,6 @@ swatch Yellow Green Verde-amarelado @msg unknown panel painel desconhecido @msg unknown panel `{panel}` painel desconhecido `{panel}` @msg unknown parameter `{key}` parâmetro desconhecido `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} parâmetro desconhecido `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} parâmetro desconhecido `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) pieLegend desconhecido `{v}` (none, standard ou wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) piePosition desconhecido `{v}` (even, ratio ou stacked) @msg unknown pieSort `{v}` (none, all or first) pieSort desconhecido `{v}` (none, all ou first) @@ -9835,7 +9913,6 @@ swatch Yellow Green Verde-amarelado @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} é integrado e não pode ser excluído @msg {name} must be a number {name} deve ser um número -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} deve ser {lo}–{hi}{unit} (recebido {v}) @msg {name}: CRC or size mismatch {name}: CRC ou tamanho não confere @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}: só foi possível ler a prévia incorporada deste arquivo do Affinity; use Arquivo › Abrir para vê-la com o aviso, ou exporte SVG ou PDF pelo Affinity antes de colocar @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 1bcbfbb578..d1593508d3 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -616,6 +616,8 @@ font-technology Variable Вариативные Control Control Convert Преобразовать Convert All Spot Colors to Process Преобразовать все плашечные цвета в составные + Convert {name} to process Преобразовать {name} в составной цвет + Keep {name} as spot Оставить {name} плашечным цветом Convert All Strokes to Outlines Преобразовать все обводки в контуры Convert All Text to Outlines Преобразовать весь текст в контуры Convert Anchor Point Преобразовать опорную точку @@ -691,6 +693,9 @@ font-technology Variable Вариативные Create from Selection Создать из выделения Create From: Создать из: Create Gradient Mesh… Создать градиентную сетку… + Flat Плоский + To Center К центру + To Edge К краю Create Graph Создать диаграмму Create New Layer Создать новый слой Create New Sublayer Создать новый подслой @@ -2748,6 +2753,18 @@ diagnostics ui интерфейс Preview: Просмотр: Preview All Layers Просмотреть все слои Preview in Browser Просмотреть в браузере + Optimize to File Size… Оптимизировать по размеру файла… + Optimize to File Size Оптимизировать по размеру файла + Desired File Size: Желаемый размер файла: + Start With: Начать с: + Use: Использовать: + Current Settings Текущие настройки + Auto Select GIF/JPEG Автовыбор GIF/JPEG + Total of All Slices Сумма всех фрагментов + Each Slice Каждый фрагмент + Current Slice Текущий фрагмент + {size}, within {target} {size}, в пределах {target} + No setting tried fits in {target}; the smallest is {size} Ни одна опробованная настройка не укладывается в {target}; наименьший размер {size} Preview in Browser needs the desktop app (the web downloads files instead) Просмотр в браузере требует настольного приложения (web-версия скачивает файлы) Preview Mode Режим просмотра Preview the document as it is now Просмотреть документ в текущем виде @@ -3128,12 +3145,53 @@ digits Malayalam Малаялам With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Когда выделен один экземпляр символа, панель «Трансформировать» использует точку регистрации символа как опорную точку. Darkens the canvas outside the artboards while the Artboard tool is active. Затемняет холст вне монтажных областей, пока активен инструмент «Монтажная область». With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Когда включено «Затемнять область вне монтажной области», область вне монтажных областей остаётся тёмной, пока вы перетаскиваете инструментом «Монтажная область». + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Насколько близко, в пикселях, указатель должен быть к объекту, опорной точке или маркеру, чтобы щелчок выделил его. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Выделяет ли рамка инструмента «Выделение» затронутые объекты или только целиком попавшие внутрь; «Направление перетаскивания» выделяет попавшие внутрь при перетаскивании вправо. E меняет правило во время перетаскивания. + A click selects a filled object only on its path, not inside its fill. Щелчок выделяет объект с заливкой только по его контуру, а не внутри заливки. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Насколько близко, в пикселях, точка должна подойти к опорной точке или направляющей линейки, чтобы «Привязать к точке» привязало её; при включённых умных направляющих действует их допуск привязки. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. С инструментом «Выделение» Cmd/Ctrl+щелчок выделяет объект под выделенным в точке указателя; каждый следующий щелчок уходит на один объект глубже. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. «Увеличить» и «Уменьшить» переносят центр выделения в середину вида. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Заблокированные и скрытые объекты внутри монтажной области перемещаются, масштабируются и копируются вместе с ней, как и остальные объекты. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Размер опорных точек и концов маркеров направления на холсте; более крупные опорные точки можно захватить и с большего расстояния. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Рисует концы маркеров направления сплошными точками, полыми точками или более крупными сплошными точками. + With the Direct Selection tool, the anchor under the pointer is highlighted. С инструментом «Прямое выделение» опорная точка под указателем подсвечивается. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Показывает маркеры направления, когда выделено больше одной опорной точки; если выключено, они видны только при одной выделенной опорной точке. + Corner widgets hide on corners whose angle is greater than this many degrees. Угловые виджеты скрываются на углах больше этого числа градусов. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Инструмент «Перо» показывает, прежде чем вы щёлкнете, следующий сегмент от последней опорной точки до указателя. + The Curvature tool previews the curve to the pointer before you place the next point. Инструмент «Кривизна» показывает кривую до указателя, прежде чем вы поставите следующую точку. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Единица новых документов встроенных размеров, кроме размеров в пикселях, и открытых файлов без записанной единицы; если выбрать её здесь и нажать ОК, она станет и единицей активного документа. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Толщина обводки, штрихи и зазоры показываются в этой единице, и введённые для них числа читаются в ней. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Размеры текста, интерлиньяж и смещение базовой линии показываются в этой единице, и введённые для них числа читаются в ней. The unit for East Asian type measurements, which no field uses yet. Единица для размеров восточноазиатского текста, которую пока не использует ни одно поле. When on, a number typed without a unit into a field in picas is read in points. Если включено, число, введённое без единицы в поле в пиках, читается в пунктах. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. При XML ID имена объектов показываются как XML ID в «Слоях», «Переменных» и «Параметрах слоя». + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Привязывает рисование, перемещение и масштабирование к делениям сетки, даже когда сетка скрыта; пока параметр включен, «Привязать к пикселю» не действует. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Цвет невыделенных направляющих; монтажная область с «Меткой направляющих» рисует свои направляющие цветом метки. + Draws guides as solid lines or as dots, including the guides already in the document. Рисует направляющие сплошными линиями или точками, включая направляющие, которые уже есть в документе. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Если параметр включен, направляющие заблокированы при запуске VectorCraft; изменение параметра сразу блокирует или разблокирует их, а «Просмотр › Направляющие › Заблокировать направляющие» по-прежнему меняет блокировку. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Если параметр включен, Cmd/Ctrl, удерживаемая в начале перетаскивания с линейки, создает направляющую только на активной монтажной области, а с инструментом «Монтажная область» направляющую на весь холст. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Цвет сетки; линии между основными линиями сетки рисуются более бледным оттенком этого цвета. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Рисует сетку линиями или точками вдоль основных линий сетки на каждом делении. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Расстояние между основными линиями сетки во всех открытых документах и в новых; документ VectorCraft открывается с сеткой, с которой он был сохранен. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. На сколько частей делится каждый основной квадрат сетки; «Привязать к сетке» привязывает к этим частям, даже когда масштаб скрывает их линии. + Draws the grid behind the artwork; off, the grid is drawn over it. Рисует сетку за графикой; если параметр выключен, сетка рисуется поверх нее. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. В «Просмотре пикселей» при масштабе 600 % и больше активный вид показывает поверх графики линию по краю каждого пикселя документа. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Цвет края плитки и пунктирных границ образца, которые видны во время редактирования узора. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Привязывает рисование, перемещение и трансформирование к ближайшим объектам и показывает направляющие и метки; просмотр пикселей их отключает, а «Привязать к сетке» вместо них привязывает к сетке. + The color of Smart Guide lines and labels. Цвет линий и меток умных направляющих. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Показывает линию вдоль края или центра, с которым выравниваются объекты; когда параметр выключен, они выравниваются без линии, а «Привязать к глифу» не действует. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. При инструменте выделения обводит невыделенный объект под указателем цветом его слоя, пока вы не перетаскиваете. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Показывает размер или угол рядом с указателем, пока вы масштабируете, поворачиваете, наклоняете или отражаете объекты. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Во время рисования точки привязываются к линиям под выбранными углами, проходящим через точку начала сегмента или фигуры. + The set of angles the construction guides follow while Construction Guides is on. Набор углов, по которым идут направляющие построения, пока включены «Направляющие построения». + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Называет то, к чему привязывается точка: опорную точку, контур или выравнивание; когда параметр выключен, точки привязываются так же, но без названий. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Показывает рядом с указателем расстояния, углы и смещение объектов во время рисования или перемещения. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Привязывает перемещённые или изменённые в размере объекты к такому же промежутку, как между ближайшими объектами, и отмечает равные промежутки. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Когда что-то выделено, удержание Alt/Option над другим объектом или монтажной областью показывает расстояния между ним и выделением. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Выделение, перетащенное обратно в пределы допуска привязки от места начала перетаскивания, возвращается точно туда; копия не возвращается. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Насколько близко на экране указатель или перетаскиваемая точка должны подойти к объекту, чтобы умные направляющие привязали их; расстояние одинаково при любом масштабе. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Привязывает конец отрезка или окружность, нарисованную от центра, так, чтобы она касалась ближайшей кривой. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Привязывает конец отрезка так, чтобы он встречал ближайший прямой сегмент под прямым углом. Reset all preferences to their defaults? Сбросить все настройки до значений по умолчанию? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Значения по умолчанию применяются, когда вы нажимаете ОК в окне «Настройки». Отмена там сохраняет текущие настройки. Restore Recovered Documents Восстановить восстановленные документы @@ -4735,6 +4793,11 @@ liquify-list-end {0}, {1} {0} и {1} @msg PDF writer error: {0} ошибка записи PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Упаковано файлов: {n} в {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Просмотр в браузере требует настольного приложения (web-версия скачивает файлы) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 укажите `desiredK`, желаемый размер файла в K (1024 байта): число больше 0 и не больше 1048576 +@msg `startWith` is `current` or `auto` `startWith` принимает значения `current` или `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` принимает значения `allSlices`, `eachSlice` или `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` задаёт номер фрагмента из `slice.list`, вместе с `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Оптимизировать по размеру файла: нет изображения для измерения @msg Release Guides: no guides Освобождение направляющих: нет направляющих @msg Release: no layer to put the rectangle in Освобождение: нет слоя для помещения прямоугольника @msg Replace Spine: select a blend and a path Замена остова: выделите переход и контур @@ -5948,6 +6011,19 @@ lighting Light Свет Transform Objects Трансформировать объекты @msg unknown parameter `{key}`; did you mean `{near}`? неизвестный параметр `{key}`; возможно, имелся в виду `{near}`? @msg unknown parameter `{key}`; the command takes no parameters неизвестный параметр `{key}`; у команды нет параметров +@msg unknown parameter `{key}`; `{object}` takes: {keys} неизвестный параметр `{key}`; `{object}` принимает: {keys} +@msg unknown parameter `{key}`; {why_not} неизвестный параметр `{key}`; {why_not} +@msg no format takes it (see document.formats) ни один формат его не принимает (см. document.formats) +@msg no save format takes it (see file.formatOptions) ни один формат сохранения его не принимает (см. file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF его не принимает (см. document.formats) +@msg EPS doesn't take it (see document.formats) EPS его не принимает (см. document.formats) +@msg DXF doesn't take it (see document.formats) DXF его не принимает (см. document.formats) +@msg {name} must be {range} (got {v}) {name} должен быть {range} (получено {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Графический процессор, выбранный первым, не смог показать окно, поэтому VectorCraft запустился снова на {summary} (Настройки › Производительность › Графический процессор › Автоматически использует тот, к которому подключён дисплей) +@msg Sent “{title}” to {to} “{title}” отправлено: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” отправлено: {to}. Ответ очереди печати: {note} +@msg the default printer принтер по умолчанию +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap растровые эффекты объекта {object}: запрошено {requested} ppi, получено {achieved} ppi из-за ограничения в 64 миллиона пикселей @msg unknown parameter `{key}`; the command takes: {keys} неизвестный параметр `{key}`; команда принимает: {keys} @msg the params must be an object, not {got} параметры должны быть объектом, а не {got} @msg unknown parameter `{path}`; the object takes no keys неизвестный параметр `{path}`; объект не принимает ключей @@ -7953,6 +8029,10 @@ shape Open Открытый @msg Some islands could not be joined to the area around the art Некоторые островки не удалось соединить с областью вокруг графики @msg `width` must be from {lo} to {hi} pt `width` должно быть от {lo} до {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` должно быть от -180 до 180 градусов +@msg `roundness` must be from 0 to 100% `roundness` должно быть от 0 до 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` должно быть от 0.01 до 100 pt +@msg style must be "pencil" or "brush" style должен быть "pencil" или "brush" +@msg extend end must be "start" or "end" конец extend должен быть "start" или "end" @msg `roundness` must be from 1 to 100% `roundness` должно быть от 1 до 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` должно быть целым числом от 1 до {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Рамка и линии выборки… @@ -9627,8 +9707,6 @@ shape Open Открытый @msg unknown panel неизвестная панель @msg unknown panel `{panel}` неизвестная панель `{panel}` @msg unknown parameter `{key}` неизвестный параметр `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} неизвестный параметр `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} неизвестный параметр `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) неизвестное значение pieLegend `{v}` (none, standard или wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) неизвестное значение piePosition `{v}` (even, ratio или stacked) @msg unknown pieSort `{v}` (none, all or first) неизвестное значение pieSort `{v}` (none, all или first) @@ -9758,7 +9836,6 @@ shape Open Открытый @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} встроен, его нельзя удалить @msg {name} must be a number {name} должно быть числом -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} должно быть {lo}–{hi}{unit} (получено {v}) @msg {name}: CRC or size mismatch {name}: несовпадение CRC или размера @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: удалось прочитать только встроенный предпросмотр этого файла Affinity; используйте «Файл › Открыть», чтобы увидеть его с предупреждением, или перед помещением экспортируйте SVG или PDF из Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 89ea62fb01..5c0420fcd3 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -605,6 +605,8 @@ font-technology Variable Variabla Control Kontroll Convert Konvertera Convert All Spot Colors to Process Konvertera alla dekorfärger till process + Convert {name} to process Konvertera {name} till process + Keep {name} as spot Behåll {name} som dekorfärg Convert All Strokes to Outlines Konvertera alla konturer till konturbanor Convert All Text to Outlines Konvertera all text till konturbanor Convert Anchor Point Konvertera ankarpunkt @@ -680,6 +682,9 @@ font-technology Variable Variabla Create from Selection Skapa från markering Create From: Skapa från: Create Gradient Mesh… Skapa gradientnät… + Flat Platt + To Center Mot mitten + To Edge Mot kanten Create Graph Skapa diagram Create New Layer Skapa nytt lager Create New Sublayer Skapa nytt underlager @@ -2652,6 +2657,18 @@ font-technology Variable Variabla Preview: Förhandsgranskning: Preview All Layers Förhandsgranska alla lager Preview in Browser Förhandsgranska i webbläsare + Optimize to File Size… Optimera till filstorlek… + Optimize to File Size Optimera till filstorlek + Desired File Size: Önskad filstorlek: + Start With: Börja med: + Use: Använd: + Current Settings Aktuella inställningar + Auto Select GIF/JPEG Välj GIF/JPEG automatiskt + Total of All Slices Alla skivor totalt + Each Slice Varje skiva + Current Slice Aktuell skiva + {size}, within {target} {size}, inom {target} + No setting tried fits in {target}; the smallest is {size} Ingen provad inställning ryms i {target}; den minsta är {size} Preview in Browser needs the desktop app (the web downloads files instead) Förhandsgranska i webbläsare kräver skrivbordsappen (webbversionen hämtar filerna i stället) Preview Mode Förhandsgranskningsläge Preview the document as it is now Förhandsgranska dokumentet som det ser ut nu @@ -3028,12 +3045,53 @@ digits Malayalam Malayalam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. När en symbolinstans är markerad använder panelen Transformera symbolens registreringspunkt som referenspunkt. Darkens the canvas outside the artboards while the Artboard tool is active. Gör arbetsytan utanför ritytorna mörkare medan verktyget Rityta är aktivt. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. När Tona ned området utanför ritytan är på förblir området utanför ritytorna mörkt medan du drar med verktyget Rityta. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Hur nära, i pixlar, pekaren måste vara ett objekt, en ankarpunkt eller ett handtag för att ett klick ska markera det. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Om markeringsverktygets ram markerar objekt den rör vid eller bara de som ligger helt inuti; Dragriktning markerar de inuti när du drar åt höger. E vänder regeln medan du drar. + A click selects a filled object only on its path, not inside its fill. Ett klick markerar ett fyllt objekt bara på dess bana, inte inuti fyllningen. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Hur nära, i pixlar, en punkt måste komma en ankarpunkt eller en linjalstödlinje för att Fäst mot punkt ska fästa den; med smarta stödlinjer på gäller deras fästtolerans i stället. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Med markeringsverktyget markerar Cmd/Ctrl-klick objektet under det markerade vid pekaren; varje nytt klick går ett objekt djupare. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Zooma in och Zooma ut flyttar markeringens mitt till mitten av vyn. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Låst och dold grafik inuti en rityta flyttas, skalas och kopieras med ritytan, precis som övrig grafik. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Storleken på ankarpunkter och riktningshandtagens ändar på arbetsytan; större ankarpunkter kan också fångas längre ifrån. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Ritar riktningshandtagens ändar som fyllda prickar, ihåliga prickar eller större fyllda prickar. + With the Direct Selection tool, the anchor under the pointer is highlighted. Med direktmarkeringsverktyget framhävs ankarpunkten under pekaren. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Visar riktningshandtag när mer än en ankarpunkt är markerad; avstängt visas de bara när en enda ankarpunkt är markerad. + Corner widgets hide on corners whose angle is greater than this many degrees. Hörnwidgetar döljs på hörn vars vinkel är större än så här många grader. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Pennverktyget förhandsvisar nästa segment från den sista ankarpunkten till pekaren innan du klickar. + The Curvature tool previews the curve to the pointer before you place the next point. Krökningsverktyget förhandsvisar kurvan till pekaren innan du placerar nästa punkt. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Enheten för nya dokument i de inbyggda storlekarna, utom storlekar i pixlar, och för öppnade filer som inte anger någon enhet; om du väljer den här och klickar på OK får även det aktiva dokumentet den enheten. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Konturtjocklekar, streck och mellanrum visas i den här enheten, och tal som skrivs för dem läses i den. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Teckenstorlekar, radavstånd och baslinjeförskjutning visas i den här enheten, och tal som skrivs för dem läses i den. The unit for East Asian type measurements, which no field uses yet. Enheten för mått i östasiatisk text, som inget fält använder ännu. When on, a number typed without a unit into a field in picas is read in points. När det är på läses ett tal som skrivs utan enhet i ett fält i pica i punkter. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Med XML-id visas objektnamn som XML-id:n i Lager, Variabler och Lageralternativ. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Fäster ritande, flyttning och skalning mot rutnätets underindelningar, även när rutnätet är dolt; medan det är på gäller inte Fäst mot pixel. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Färgen på stödlinjer som inte är markerade; en rityta med en stödlinjeetikett ritar sina egna stödlinjer i etikettens färg. + Draws guides as solid lines or as dots, including the guides already in the document. Ritar stödlinjer som heldragna linjer eller som punkter, även stödlinjer som redan finns i dokumentet. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. När det är på är stödlinjerna låsta när VectorCraft startar; att ändra alternativet låser eller låser upp dem direkt, och Visa › Stödlinjer › Lås stödlinjer ändrar fortfarande låsningen. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. När det är på skapar Cmd/Ctrl, nedtryckt i början av en dragning från en linjal, en stödlinje bara på den aktiva ritytan, eller med ritytsverktyget en stödlinje över hela arbetsytan. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Rutnätets färg; linjerna mellan huvudlinjerna ritas i en blekare nyans av den. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Ritar rutnätet som linjer, eller som punkter längs huvudlinjerna vid varje underindelning. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Avståndet mellan rutnätets huvudlinjer i varje öppet dokument och i nya; ett VectorCraft-dokument öppnas med det rutnät det sparades med. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Hur många delar varje huvudruta i rutnätet delas i; Fäst mot rutnät fäster mot dessa delar, även när zoomen döljer deras linjer. + Draws the grid behind the artwork; off, the grid is drawn over it. Ritar rutnätet bakom grafiken; av ritas rutnätet ovanpå den. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. I pixelförhandsgranskning vid 600 % zoom eller mer visar den aktiva vyn en linje vid kanten av varje dokumentpixel ovanpå grafiken. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Färgen på rutkanten och de streckade provrutegränserna som visas medan du redigerar ett mönster. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Fäster ritande, flyttning och transformering mot närliggande teckningar och visar stödlinjer och etiketter; Pixelförhandsgranskning stänger av dem, och Fäst mot rutnät fäster mot rutnätet i stället. + The color of Smart Guide lines and labels. Färgen på de smarta stödlinjernas linjer och etiketter. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Visar en linje längs den kant eller mitt som teckningen linjerar med; avstängd linjerar teckningen ändå utan linjen, och Fäst mot glyf gäller inte. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Med ett markeringsverktyg får det omarkerade objektet under pekaren en kontur i lagrets färg medan du inte drar. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Visar storleken eller vinkeln bredvid pekaren medan du skalar, roterar, skjuvar eller speglar teckningar. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Medan du ritar fästs punkter mot linjer i de valda vinklarna genom punkten där segmentet eller formen börjar. + The set of angles the construction guides follow while Construction Guides is on. Uppsättningen vinklar som konstruktionsstödlinjerna följer medan Konstruktionsstödlinjer är på. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Namnger det som en punkt fäster mot, till exempel en ankarpunkt, en bana eller en justering; avstängd fäster punkterna på samma sätt utan namnen. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Visar avstånd, vinklar och hur långt teckningen har flyttats bredvid pekaren medan du ritar eller flyttar. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Fäster flyttade teckningar eller teckningar med ändrad storlek mot samma mellanrum som mellan närliggande objekt och markerar de lika mellanrummen. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. När något är markerat visar Alt/Option nedhållen över ett annat objekt eller en rityta avstånden mellan det och markeringen. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. En markering som dras tillbaka till inom fästtoleransen från där dragningen började återgår exakt dit; en kopia gör det inte. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Hur nära på skärmen pekaren eller en dragen punkt måste komma teckningen för att de smarta stödlinjerna ska fästa mot den; avståndet är detsamma vid alla zoomnivåer. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Fäster änden av ett linjesegment, eller en cirkel ritad från sin mitt, så att den rör en närliggande kurva. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Fäster änden av ett linjesegment så att det möter ett närliggande rakt segment i rät vinkel. Reset all preferences to their defaults? Återställa alla inställningar till standard? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Standardvärdena verkställs när du klickar på OK i Inställningar. Avbryt där behåller dina nuvarande inställningar. Restore Recovered Documents Återställ återskapade dokument @@ -4617,6 +4675,11 @@ liquify-list-end {0}, {1} {0} och {1} @msg PDF writer error: {0} fel i PDF-skrivaren: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Paketerade {n} fil i {folder} ({note})|Paketerade {n} filer i {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Förhandsgranska i webbläsare kräver skrivbordsappen (webbversionen hämtar filer i stället) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 ange `desiredK`, önskad filstorlek i K (1024 byte): ett tal över 0 och högst 1048576 +@msg `startWith` is `current` or `auto` `startWith` är `current` eller `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` är `allSlices`, `eachSlice` eller `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` är ett skivnummer från `slice.list`, med `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Optimera till filstorlek: det finns ingen bild att mäta @msg Release Guides: no guides Släpp stödlinjer: inga stödlinjer @msg Release: no layer to put the rectangle in Släpp: inget lager att placera rektangeln i @msg Replace Spine: select a blend and a path Ersätt ryggrad: markera en blandning och en bana @@ -5825,6 +5888,18 @@ lighting Light Ljus Transform Objects Transformera objekt @msg unknown parameter `{key}`; did you mean `{near}`? okänd parameter `{key}`; menade du `{near}`? @msg unknown parameter `{key}`; the command takes no parameters okänd parameter `{key}`; kommandot tar inga parametrar +@msg unknown parameter `{key}`; `{object}` takes: {keys} okänd parameter `{key}`; `{object}` tar: {keys} +@msg unknown parameter `{key}`; {why_not} okänd parameter `{key}`; {why_not} +@msg no format takes it (see document.formats) inget format tar den (se document.formats) +@msg no save format takes it (see file.formatOptions) inget sparformat tar den (se file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF tar den inte (se document.formats) +@msg EPS doesn't take it (see document.formats) EPS tar den inte (se document.formats) +@msg DXF doesn't take it (see document.formats) DXF tar den inte (se document.formats) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Grafikprocessorn som prövades först kunde inte visa fönstret, så VectorCraft startade om med {summary} (Inställningar › Prestanda › Grafikprocessor › Automatisk använder den som driver din skärm) +@msg Sent “{title}” to {to} Skickade “{title}” till {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Skickade “{title}” till {to}. Svar från utskriftskön: {note} +@msg the default printer standardskrivaren +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap rastereffekter på objekt {object}: begärde {requested} ppi, uppnådde {achieved} ppi på grund av gränsen på 64 miljoner pixlar @msg unknown parameter `{key}`; the command takes: {keys} okänd parameter `{key}`; kommandot tar: {keys} @msg the params must be an object, not {got} parametrarna måste vara ett objekt, inte {got} @msg unknown parameter `{path}`; the object takes no keys okänd parameter `{path}`; objektet tar inga nycklar @@ -7842,7 +7917,7 @@ digits Hindi Hindi @msg {LABEL} produced an empty result {LABEL} gav ett tomt resultat @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} är inbyggd och kan inte tas bort -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} måste vara {lo}–{hi}{unit} (fick {v}) +@msg {name} must be {range} (got {v}) {name} måste vara {range} (fick {v}) @msg {name}: {e} {name}: {e} @msg {name}: CRC or size mismatch {name}: CRC eller storlek stämmer inte @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}: endast den inbäddade förhandsgranskningen i den här Affinity-filen kunde läsas; använd Arkiv › Öppna för att se den med dess varning, eller exportera SVG eller PDF från Affinity innan du placerar den @@ -8150,7 +8225,6 @@ digits Hindi Hindi @msg anchor `{key}` must be [x, y] ankarpunktens `{key}` måste vara [x, y] @msg anchor `{key}` must be a number ankarpunktens `{key}` måste vara ett tal @msg anchor `smooth` must be true or false ankarpunktens `smooth` måste vara true eller false -@msg angle and roundness must be finite vinkel och rundhet måste vara ändliga @msg angles must be a list as long as pins (degrees or null) angles måste vara en lista lika lång som pins (grader eller null) @msg appearance must be flat|center|edge appearance måste vara flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply är "fill" eller "stroke", inte `{other}` @@ -9316,6 +9390,10 @@ digits Hindi Hindi @msg Some islands could not be joined to the area around the art Vissa öar kunde inte förbindas med området runt teckningen @msg `width` must be from {lo} to {hi} pt `width` måste vara från {lo} till {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` måste vara från -180 till 180 grader +@msg `roundness` must be from 0 to 100% `roundness` måste vara från 0 till 100 % +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` måste vara från 0.01 till 100 pt +@msg style must be "pencil" or "brush" style måste vara "pencil" eller "brush" +@msg extend end must be "start" or "end" extend end måste vara "start" eller "end" @msg `roundness` must be from 1 to 100% `roundness` måste vara från 1 till 100 % @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` måste vara ett heltal från 1 till {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Rensningsram och rensningslinjer… diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index ed4b44b0da..97fccd9167 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -1,4 +1,4 @@ -use super::catalog::{Catalog, parse_entries, placeholders}; +use super::catalog::{Catalog, matchable, parse_entries, placeholders, unmatchable_rows}; use super::*; const ZH: fn() -> Lang = || Lang::from_code("zh-hant").expect("zh-hant registered"); @@ -1944,8 +1944,7 @@ fn untranslated_report() { for code in COMPLETE_MESSAGES { let lang = Lang::from_code(code).expect("registered"); - let (entries, _) = parse_entries(lang.0.source); - let rows: BTreeSet<&str> = entries.iter().filter(|(ctx, _, _)| ctx == "@msg").map(|(_, src, _)| src.as_str()).collect(); + let rows = message_rows(lang.0.source); add(code, "messages", messages.iter().filter(|m| !rows.contains(m.as_str())).cloned().collect::>()); let meanings = vectorcraft_eps::POSTSCRIPT_ERRORS.iter().filter(|(_, m)| message(lang, m) == *m).map(|(_, m)| m.to_string()); add(code, "PostScript error meanings", meanings.collect()); @@ -2652,6 +2651,145 @@ fn package_status_message_templates_parse() { assert!(Catalog::parse("@msg\tPackaged {n} file(s) in {folder}{note}\tbad\n").message("Packaged 1 file(s) in /a b").is_none()); } +/// The sources of the `@msg` rows of the catalog file `text` that its catalog shows. A row the +/// catalog leaves out ([`unmatchable_rows`]) is not one: its messages are shown in English. +fn message_rows(text: &str) -> std::collections::BTreeSet { + let left_out = unmatchable_rows(text); + let (entries, _) = parse_entries(text); + entries.into_iter().filter(|(ctx, src, _)| ctx == "@msg" && !left_out.contains(src)).map(|(_, src, _)| src).collect() +} + +/// [`untranslated_report`] lists a message as missing when the catalog leaves its row out. +#[test] +fn a_row_the_catalog_leaves_out_does_not_count_as_translated() { + let text = concat!( + "@msg\t{name} must be {lo}–{hi}{unit} (got {v})\t{name}: {lo}–{hi}{unit}, {v}\n", + "@msg\t{name} must be {range} (got {v})\t{name}: {range}, {v}\n", + "@msg\t{e}\t{e}\n", + "@msg\tnothing selected\tnada seleccionado\n", + "@msgplural\t{n}{what} left|{n} {what} left\t{n} {what}|{n} {what}\n", + ); + assert_eq!(unmatchable_rows(text), ["{name} must be {lo}–{hi}{unit} (got {v})", "{e}", "{n}{what} left|{n} {what} left"]); + assert_eq!(message_rows(text).into_iter().collect::>(), ["nothing selected", "{name} must be {range} (got {v})"]); +} + +/// Every `@msg` and `@msgplural` row of the bundled catalogs has a source that messages can be +/// matched against: text, and no two placeholders in a row. +#[test] +fn bundled_catalogs_have_no_message_row_they_leave_out() { + for l in &LANGUAGES { + let left_out = unmatchable_rows(l.source); + assert!(left_out.is_empty(), "{}: no message matches these rows (two placeholders in a row, or no text): {left_out:?}", l.code); + } +} + +/// The status messages the desktop app makes (`apps/vectorcraft/src`, test modules aside), read as +/// [`message_literals`] reads the crates'. [`untranslated_report`] does not list them. +fn desktop_app_messages() -> std::collections::BTreeSet { + let mut out = std::collections::BTreeSet::new(); + let mut stack = vec![std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../../apps/vectorcraft/src")]; + while let Some(d) = stack.pop() { + for entry in std::fs::read_dir(&d).into_iter().flatten().flatten() { + let path = entry.path(); + let name = path.file_name().and_then(|n| n.to_str()).unwrap_or(""); + if path.is_dir() { + if name != "tests" { + stack.push(path); + } + } else if name.ends_with(".rs") && !name.starts_with("tests") && !name.ends_with("_tests.rs") { + let text = std::fs::read_to_string(&path).unwrap_or_default(); + out.extend(source_messages(without_test_module(&text), &[], &std::collections::BTreeMap::new())); + } + } + } + out +} + +/// Every status and error message is made with text between its placeholders, so a catalog row +/// can match it: values that stand side by side (a key and the object it is in, a range and its +/// unit) are joined into one value before the message is made. +#[test] +fn message_templates_have_text_between_their_placeholders() { + let app = desktop_app_messages(); + assert!(app.iter().any(|m| m.starts_with("The graphics processor tried first")), "the desktop app scan found {} messages", app.len()); + let mut messages = message_literals(); + messages.extend(app); + // A message that is one value alone (`{e}`) passes another message on. + let passes_on = |m: &str| m.starts_with('{') && m.ends_with('}') && m.matches('{').count() == 1; + let unmatchable: Vec<&String> = messages.iter().filter(|m| m.contains('{') && !passes_on(m) && !matchable(m)).collect(); + assert!(unmatchable.is_empty(), "no catalog row can match these messages; join the values that stand side by side first: {unmatchable:#?}"); +} + +/// Messages whose side-by-side values are joined before the message is made (a key with the +/// objects it is in, a range with its unit, an object's id with its name) are translated whole in +/// every complete-message language, the reason a key is refused for included. +#[test] +fn messages_with_joined_values_translate_whole() { + use serde_json::json; + let refusal = |id: &str, params: serde_json::Value| vectorcraft_engine::cmd::params::check_params(id, ¶ms).expect_err("refused").to_string(); + let setting = |checked: Result<(), vectorcraft_pdf::PdfError>| checked.expect_err("refused").to_string(); + let mut marks = vectorcraft_pdf::PdfSettings::default(); + marks.marks.weight = 9.0; + let gpu = "The graphics processor tried first couldn't show the window, so VectorCraft started again on Fast GPU"; + // Each message with the values it keeps and English words its translations do not. + let messages: Vec<(String, Vec<&str>, Vec<&str>)> = vec![ + (refusal("document.exportPdf", json!({"marks": {"ofset": 1}})), vec!["`marks.ofset`", "`marks.offset`"], vec!["unknown", "mean"]), + (refusal("document.exportPdf", json!({"marks": {"zz": 1}})), vec!["`marks.zz`", "`marks`", "weight"], vec!["unknown", "takes"]), + (refusal("document.exportForScreens", json!({"settings": {"zz": {}}})), vec!["`settings.zz`", "`settings`"], vec!["unknown", "takes"]), + (refusal("document.export", json!({"noSuchOption": 1})), vec!["`noSuchOption`", "document.formats"], vec!["unknown", "takes"]), + ( + refusal("document.save", json!({"path": "a.pdf", "options": {"noSuchOption": 1}})), + vec!["`options.noSuchOption`", "file.formatOptions"], + vec!["unknown", "takes"], + ), + ( + refusal("document.exportPdf", json!({"noSuchOption": 1})), + vec!["`noSuchOption`", "PDF", "document.formats"], + vec!["unknown", "doesn", "take"], + ), + ( + refusal("document.exportEps", json!({"noSuchOption": 1})), + vec!["`noSuchOption`", "EPS", "document.formats"], + vec!["unknown", "doesn", "take"], + ), + ( + refusal("document.exportDxf", json!({"noSuchOption": 1})), + vec!["`noSuchOption`", "DXF", "document.formats"], + vec!["unknown", "doesn", "take"], + ), + (setting(vectorcraft_pdf::PrintSettings { copies: 0, ..Default::default() }.check()), vec!["copies", "1–999", "0"], vec!["must", "got"]), + (setting(marks.check_values()), vec!["marks.weight", "0.05–2 pt", "9"], vec!["must", "got"]), + (gpu.to_string(), vec!["Fast GPU"], vec!["tried", "started"]), + ( + format!("{gpu} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display)"), + vec!["Fast GPU"], + vec!["tried", "started", "uses", "drives"], + ), + ("Sent “Poster” to the default printer".to_string(), vec!["“Poster”"], vec!["Sent", "default"]), + ("Sent “Poster” to Office Laser".to_string(), vec!["“Poster”", "Office Laser"], vec!["Sent"]), + ( + "Sent “Poster” to Office Laser (Floor 2). The spooler replied: job 12".to_string(), + vec!["“Poster”", "Office Laser (Floor 2)", "job 12"], + vec!["Sent", "spooler", "replied"], + ), + ("`canceled` is not an available name".to_string(), vec!["`canceled`"], vec![]), + ("a graphic style named `canceled` already exists".to_string(), vec!["`canceled`"], vec![]), + ( + "raster effects on object 7 (Logo): requested 300.0 ppi, achieved 72.0 ppi due to the 64 million pixel cap".to_string(), + vec!["7", "Logo", "300.0", "72.0"], + vec!["requested", "achieved"], + ), + ]; + for code in COMPLETE_MESSAGES { + let lang = Lang::from_code(code).expect("registered"); + for (english, kept, words) in &messages { + let shown = message(lang, english); + assert!(kept.iter().all(|value| shown.contains(value)), "{code}: {english} -> {shown}"); + assert!(shown.split(|c: char| !c.is_alphabetic()).all(|w| !words.contains(&w)), "{code}: {english} -> {shown}"); + } + } +} + /// A placeholder that occurs twice in a template matches the same text both times, so a template /// that ends with the name it starts with does not swallow a line that wraps its message. #[test] @@ -3090,6 +3228,67 @@ fn three_d_refusals_translate_with_their_values() { assert_eq!(message(de(), &errors[1].0), "ungültige Parameter für `effect.apply`: Licht: intensity muss eine Zahl von 0 bis 100 sein"); } +/// The Blob Brush's range refusals (`path.blob` `angle`, `roundness` and `fidelity`) show in every +/// complete-message language with the key and the range numbers as given; the error the command +/// returns stays English. +#[test] +fn blob_brush_range_refusals_translate_with_their_values() { + use serde_json::json; + let mut s = vectorcraft_engine::Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let refusals = [ + (json!({"angle": 200}), "`angle`", ["-180", "180"]), + (json!({"roundness": 101}), "`roundness`", ["0", "100"]), + (json!({"fidelity": 0}), "`fidelity`", ["0.01", "100"]), + ]; + for (extra, key, numbers) in &refusals { + let mut p = json!({"points": [[10, 10], [60, 10]]}); + p.as_object_mut().unwrap().extend(extra.as_object().unwrap().clone()); + let e = s.execute("path.blob", &p).unwrap_err().to_string(); + assert!(e.starts_with("invalid parameters for `path.blob`: ") && e.contains(key) && e.contains(" must be from "), "{e}"); + assert_eq!(message(Lang::EN, &e), e); + for code in COMPLETE_MESSAGES { + let shown = message(Lang::from_code(code).expect("registered"), &e); + assert!(!shown.contains(" must be from ") && shown.contains("`path.blob`") && shown.contains(key), "{code}: {e} -> {shown}"); + assert!(numbers.iter().all(|n| shown.contains(n)), "{code}: {e} -> {shown}"); + } + } + assert_eq!( + message(de(), &s.execute("path.blob", &json!({"points": [[10, 10], [60, 10]], "angle": -181})).unwrap_err().to_string()), + "ungültige Parameter für `path.blob`: `angle` muss zwischen -180 und 180 Grad liegen" + ); +} + +/// `path.freehand`'s refusals of an unknown `style`, `extend` end or `connect` end show in every +/// complete-message language with the accepted values as given. +#[test] +fn freehand_choice_refusals_translate_with_their_values() { + use serde_json::json; + let mut s = vectorcraft_engine::Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let a = s.execute("path.create", &json!({"d": "M10 10 L20 10"})).unwrap()["id"].clone(); + let b = s.execute("path.create", &json!({"d": "M10 50 L20 50"})).unwrap()["id"].clone(); + let points = json!([[20, 10], [30, 30], [20, 50]]); + let refusals = [ + (json!({"points": points, "style": "ink"}), ["pencil", "brush"]), + (json!({"points": points, "extend": {"id": a, "end": "middle"}}), ["start", "end"]), + (json!({"points": points, "extend": {"id": a}, "connect": {"id": b, "end": "middle"}}), ["start", "end"]), + ]; + // A catalog may translate the parameter's name (Hindi कनेक्ट) and put the accepted values in its + // own quotation marks (German „start“); the values themselves stay as written. + let quotes = [("\"", "\""), ("„", "“"), ("“", "”"), ("«", "»"), ("« ", " »"), ("「", "」"), ("‘", "’")]; + for (p, values) in &refusals { + let e = s.execute("path.freehand", p).unwrap_err().to_string(); + assert!(e.starts_with("invalid parameters for `path.freehand`: ") && e.contains(" must be "), "{e}"); + for code in COMPLETE_MESSAGES { + let shown = message(Lang::from_code(code).expect("registered"), &e); + assert!(!shown.contains(" must be ") && shown.contains("`path.freehand`"), "{code}: {e} -> {shown}"); + let quoted = |v: &str| quotes.iter().any(|(open, close)| shown.contains(&format!("{open}{v}{close}"))); + assert!(values.iter().all(|v| quoted(v)), "{code}: {e} -> {shown}"); + } + } +} + /// The values SVG filter refusals put in `{what}` that are messages of their own: the attributes /// over their limit, named with their element. `kernelUnitLength` is an attribute's name as written. const SVG_FILTER_PARTS: &[&str] = &["feConvolveMatrix's order", "feMorphology's radius", "a blur's stdDeviation"]; diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index e232187cad..910a7fc5b1 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -597,6 +597,8 @@ font-technology Variable Değişken Control Kontrol Convert Dönüştür Convert All Spot Colors to Process Tüm Spot Renkleri Proses Renklere Dönüştür + Convert {name} to process {name} Rengini Prosese Dönüştür + Keep {name} as spot {name} Rengini Spot Olarak Koru Convert All Strokes to Outlines Tüm Konturları Anahatlara Dönüştür Convert All Text to Outlines Tüm Metni Ana Hatlara Dönüştür Convert Anchor Point Bağlantı Noktasını Dönüştür @@ -672,6 +674,9 @@ font-technology Variable Değişken Create from Selection Seçimden Oluştur Create From: Şuradan Oluştur: Create Gradient Mesh… Degrade Kafes Oluştur… + Flat Düz + To Center Merkeze Doğru + To Edge Kenara Doğru Create Graph Grafik Oluştur Create New Layer Yeni Katman Oluştur Create New Sublayer Yeni Alt Katman Oluştur @@ -2493,6 +2498,18 @@ shape Open Açık Preview: Önizleme: Preview All Layers Tüm Katmanları Önizle Preview in Browser Tarayıcıda Önizleme + Optimize to File Size… Dosya Boyutuna Göre Optimize Et… + Optimize to File Size Dosya Boyutuna Göre Optimize Et + Desired File Size: İstenen Dosya Boyutu: + Start With: Başlangıç: + Use: Kullan: + Current Settings Geçerli Ayarlar + Auto Select GIF/JPEG GIF/JPEG Otomatik Seç + Total of All Slices Tüm Dilimlerin Toplamı + Each Slice Her Dilim + Current Slice Geçerli Dilim + {size}, within {target} {size}, {target} sınırında + No setting tried fits in {target}; the smallest is {size} Denenen hiçbir ayar {target} içine sığmıyor; en küçüğü {size} Preview in Browser needs the desktop app (the web downloads files instead) Tarayıcıdaki önizleme için masaüstü uygulaması gerekir (bunun yerine web, dosyaları indirir) Preview Mode Önizleme Modu Preview the document as it is now Belgeyi şu anki haliyle önizleyin @@ -2865,12 +2882,53 @@ digits Malayalam Malayalam With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Bir sembol örneği seçiliyken Dönüştür paneli, sembolün kayıt noktasını referans noktası olarak kullanır. Darkens the canvas outside the artboards while the Artboard tool is active. Çalışma Yüzeyi aracı etkinken çalışma yüzeylerinin dışındaki tuvali karartır. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Çalışma Yüzeyi Dışındaki Bölgeyi Karart açıkken, Çalışma Yüzeyi aracıyla sürüklerken çalışma yüzeylerinin dışındaki alan karanlık kalır. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Bir tıklamanın nesneyi, bağlantı noktasını veya tutamacı seçmesi için işaretçinin ona piksel cinsinden ne kadar yakın olması gerektiği. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Seçim Aracı kutusunun dokunduğu nesneleri mi yoksa yalnızca tamamen içindekileri mi seçtiği; Sürükleme yönü sağa sürüklerken içindekileri seçer. Sürüklerken E kuralı tersine çevirir. + A click selects a filled object only on its path, not inside its fill. Tıklama, dolgulu bir nesneyi dolgusunun içinden değil, yalnızca yolundan seçer. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Noktaya Yasla'nın bir noktayı yaslaması için noktanın bir bağlantı noktasına veya cetvel kılavuzuna piksel cinsinden ne kadar yaklaşması gerektiği; Akıllı Kılavuzlar açıkken onların Yapışma Toleransı geçerlidir. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Seçim Aracı ile Cmd/Ctrl-tıklama, işaretçideki seçili nesnenin altındaki nesneyi seçer; sonraki her tıklama bir nesne daha derine iner. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Yakınlaştır ve Uzaklaştır, seçimin merkezini görünümün ortasına getirir. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Bir çalışma yüzeyinin içindeki kilitli ve gizli resimler, diğer resimler gibi çalışma yüzeyiyle birlikte taşınır, ölçeklenir ve kopyalanır. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Tuvaldeki bağlantı noktalarının ve yön tutamacı uçlarının boyutu; daha büyük bağlantı noktaları daha uzaktan da tutulabilir. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Yön tutamaçlarının uçlarını dolu noktalar, içi boş noktalar veya daha büyük dolu noktalar olarak çizer. + With the Direct Selection tool, the anchor under the pointer is highlighted. Doğrudan Seçim Aracı ile işaretçinin altındaki bağlantı noktası vurgulanır. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Birden fazla bağlantı noktası seçildiğinde yön tutamaçlarını gösterir; kapalıyken yalnızca tek bir bağlantı noktası seçiliyken görünürler. + Corner widgets hide on corners whose angle is greater than this many degrees. Açısı bu dereceden büyük olan köşelerde köşe widget'ları gizlenir. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Kalem Aracı, tıklamadan önce son bağlantı noktasından işaretçiye kadar sonraki parçanın önizlemesini gösterir. + The Curvature tool previews the curve to the pointer before you place the next point. Kavis Aracı, sonraki noktayı yerleştirmeden önce işaretçiye kadar eğrinin önizlemesini gösterir. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Piksel boyutları dışındaki yerleşik boyutlardaki yeni belgelerin ve birim kaydetmeyen açılan dosyaların birimi; burada seçip Tamam'a tıkladığınızda etkin belgenin birimi de bu olur. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Kontur kalınlıkları, kısa çizgiler ve boşluklar bu birimde gösterilir ve bunlar için yazılan sayılar bu birimde okunur. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Yazı boyutları, satır aralığı ve taban çizgisi kayması bu birimde gösterilir ve bunlar için yazılan sayılar bu birimde okunur. The unit for East Asian type measurements, which no field uses yet. Doğu Asya metni ölçüleri için henüz hiçbir alanın kullanmadığı birim. When on, a number typed without a unit into a field in picas is read in points. Açıkken, pika cinsinden bir alana birimsiz yazılan sayı punto olarak okunur. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. XML kimliği seçiliyken nesne adları Katmanlar, Değişkenler ve Katman Seçenekleri'nde XML kimliği olarak gösterilir. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Izgara gizliyken bile çizmeyi, taşımayı ve ölçeklemeyi ızgaranın alt bölümlerine yaslar; açık olduğu sürece Piksel'e Yapış uygulanmaz. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Seçili olmayan kılavuzların rengi; Kılavuz Etiketi olan bir çalışma yüzeyi kendi kılavuzlarını etiketin renginde çizer. + Draws guides as solid lines or as dots, including the guides already in the document. Belgede zaten bulunan kılavuzlar da dahil olmak üzere kılavuzları düz çizgi ya da nokta olarak çizer. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Açıkken VectorCraft başladığında kılavuzlar kilitlidir; bu seçeneği değiştirmek onları hemen kilitler ya da kilidini açar, Görünüm › Kılavuzlar › Kilit Kılavuzları ise kilidi değiştirmeye devam eder. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Açıkken bir cetvelden sürüklemeye başlarken Cmd/Ctrl basılı tutulursa yalnızca etkin çalışma yüzeyinde bir kılavuz, Çalışma Yüzeyi Aracı ile ise tüm tuvali kaplayan bir kılavuz oluşturulur. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Izgaranın rengi; ana ızgara çizgileri arasındaki çizgiler bu rengin daha soluk bir tonuyla çizilir. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Izgarayı çizgi olarak ya da her alt bölümde ana ızgara çizgileri boyunca nokta olarak çizer. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Her açık belgede ve yeni belgelerde ana ızgara çizgileri arasındaki uzaklık; bir VectorCraft belgesi kaydedildiği ızgarayla açılır. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Her ana ızgara karesinin kaç parçaya bölündüğü; Izgaraya Yasla, yakınlaştırma çizgilerini gizlese bile bu parçalara yaslar. + Draws the grid behind the artwork; off, the grid is drawn over it. Izgarayı resmin arkasına çizer; kapalıyken ızgara resmin üstüne çizilir. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Piksel Önizlemesi'nde %600 veya daha fazla yakınlaştırmada etkin görünüm, resmin üstünde belgenin her pikselinin kenarında bir çizgi gösterir. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Bir deseni düzenlerken gösterilen döşeme kenarının ve kesik çizgili renk örneği sınırlarının rengi. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Çizmeyi, taşımayı ve dönüştürmeyi yakındaki çizime yaslar, kılavuzları ve etiketleri gösterir; Piksel Önizlemesi bunları kapatır, Izgaraya Yasla ise onların yerine ızgaraya yaslar. + The color of Smart Guide lines and labels. Akıllı Kılavuz çizgilerinin ve etiketlerinin rengi. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Çizimin hizalandığı kenar veya merkez boyunca bir çizgi gösterir; kapalıyken çizim çizgi olmadan da hizalanır ve Glif'e Yapış uygulanmaz. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Bir seçim aracıyla, siz sürüklemezken işaretçinin altındaki seçili olmayan nesnenin çevresini katmanının rengiyle çizer. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Çizimi ölçeklerken, döndürürken, eğerken veya yansıtırken işaretçinin yanında boyutu veya açıyı gösterir. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Siz çizerken noktalar, parçanın veya şeklin başladığı noktadan geçen seçili açılardaki çizgilere yaslanır. + The set of angles the construction guides follow while Construction Guides is on. İnşaat Kılavuzları açıkken inşaat kılavuzlarının izlediği açı kümesi. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Bir noktanın neye yaslandığını adlandırır, örneğin bir bağlantı noktası, bir yol veya bir hizalama; kapalıyken noktalar adlar olmadan aynı şekilde yaslanır. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Siz çizerken veya taşırken işaretçinin yanında mesafeleri, açıları ve çizimin ne kadar taşındığını gösterir. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Taşınan veya yeniden boyutlandırılan çizimi yakındaki nesneler arasındakiyle aynı boşluğa yaslar ve eşit boşlukları işaretler. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Bir şey seçiliyken, başka bir nesnenin veya çalışma yüzeyinin üzerinde Alt/Option tuşunu basılı tutmak onunla seçim arasındaki mesafeleri gösterir. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Sürüklemenin başladığı yere yapışma toleransı içinde geri sürüklenen seçim tam olarak o yere döner; kopya dönmez. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Akıllı Kılavuzların yaslaması için işaretçinin veya sürüklenen noktanın ekranda çizime ne kadar yaklaşması gerektiği; mesafe her yakınlaştırmada aynıdır. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Bir çizgi parçasının ucunu veya merkezinden çizilen bir daireyi yakındaki bir eğriye değecek şekilde yaslar. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Bir çizgi parçasının ucunu yakındaki düz bir parçayla dik açıyla buluşacak şekilde yaslar. Reset all preferences to their defaults? Tüm tercihler varsayılanlarına sıfırlansın mı? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Varsayılanlar, Tercihler'de Tamam'a tıkladığınızda uygulanır. Oradaki İptal, mevcut tercihlerinizi korur. Restore Recovered Documents Kurtarılan Belgeleri Geri Yükle @@ -4450,6 +4508,11 @@ liquify-list-end {0}, {1} {0} ve {1} @msg PDF writer error: {0} PDF yazıcı hatası: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} {n} dosya {folder} klasörüne paketlendi ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Tarayıcıdaki önizleme için masaüstü uygulaması gerekir (bunun yerine web, dosyaları indirir) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 `desiredK` değerini verin, K cinsinden istenen dosya boyutu (1024 bayt): 0'dan büyük ve en çok 1048576 olan bir sayı +@msg `startWith` is `current` or `auto` `startWith` değeri `current` veya `auto` olmalıdır +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` değeri `allSlices`, `eachSlice` veya `currentSlice` olmalıdır +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice`, `slice.list` içindeki bir dilim numarasıdır ve `use: currentSlice` ile kullanılır +@msg Optimize to File Size: there is no image to measure Dosya Boyutuna Göre Optimize Et: ölçülecek görüntü yok @msg Release Guides: no guides Sürüm Kılavuzları: kılavuz yok @msg Release: no layer to put the rectangle in Serbest bırakma: dikdörtgeni yerleştirecek katman yok @msg Replace Spine: select a blend and a path Omurgayı Değiştir: bir karışım ve yol seçin @@ -5681,6 +5744,19 @@ lighting Light Işık Transform Objects Nesneleri Dönüştür @msg unknown parameter `{key}`; did you mean `{near}`? bilinmeyen parametre `{key}`; `{near}` mi demek istediniz? @msg unknown parameter `{key}`; the command takes no parameters bilinmeyen parametre `{key}`; komut hiçbir parametre almaz +@msg unknown parameter `{key}`; `{object}` takes: {keys} bilinmeyen parametre `{key}`; `{object}` şunları alır: {keys} +@msg unknown parameter `{key}`; {why_not} bilinmeyen parametre `{key}`; {why_not} +@msg no format takes it (see document.formats) hiçbir biçim bunu almaz (bkz. document.formats) +@msg no save format takes it (see file.formatOptions) hiçbir kaydetme biçimi bunu almaz (bkz. file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF bunu almaz (bkz. document.formats) +@msg EPS doesn't take it (see document.formats) EPS bunu almaz (bkz. document.formats) +@msg DXF doesn't take it (see document.formats) DXF bunu almaz (bkz. document.formats) +@msg {name} must be {range} (got {v}) {name} {range} olmalıdır ({v} verildi) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) İlk önce denenen grafik işlemcisi pencereyi gösteremedi, bu yüzden VectorCraft {summary} üzerinde yeniden başladı (Ayarlar › Performans › Grafik İşlemcisi › Otomatik, ekranınızı süren işlemciyi kullanır) +@msg Sent “{title}” to {to} “{title}” şuraya gönderildi: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” şuraya gönderildi: {to}. Yazdırma kuyruğunun yanıtı: {note} +@msg the default printer varsayılan yazıcı +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap {object} nesnesindeki raster efektleri: {requested} ppi istendi, 64 milyon piksel sınırı nedeniyle {achieved} ppi elde edildi @msg unknown parameter `{key}`; the command takes: {keys} bilinmeyen parametre `{key}`; komut şunları alır: {keys} @msg the params must be an object, not {got} parametreler bir nesne olmalıdır, {got} değil @msg unknown parameter `{path}`; the object takes no keys bilinmeyen parametre `{path}`; nesne anahtar almaz @@ -9732,6 +9808,11 @@ breakText Glyphs Glifler @msg Some islands could not be joined to the area around the art Bazı adalar çizimin çevresindeki alana bağlanamadı @msg `width` must be from {lo} to {hi} pt `width` {lo} ile {hi} pt arasında olmalıdır @msg `angle` must be from -180 to 180 degrees `angle` -180 ile 180 derece arasında olmalıdır +@msg `roundness` must be from 0 to 100% `roundness` %0 ile %100 arasında olmalıdır +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 0.01 ile 100 pt arasında olmalıdır +@msg style must be "pencil" or "brush" style "pencil" veya "brush" olmalıdır +@msg extend end must be "start" or "end" extend ucu "start" veya "end" olmalıdır +@msg connect end must be "start" or "end" connect ucu "start" veya "end" olmalıdır @msg `roundness` must be from 1 to 100% `roundness` %1 ile %100 arasında olmalıdır @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 1 ile {MAX_BRIDGES_PER_ISLAND} arasında bir tam sayı olmalıdır Weed Box and Lines… Ayıklama Kutusu ve Çizgileri… diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index d7815a42ed..dbd6d2609e 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -199,6 +199,8 @@ antiAlias Sharp Різке Crisp Чітке Strong Сильне Anti-aliasing: Згладжування: + Art Optimized Оптимізовано для графіки + Type Optimized Оптимізовано для тексту Any Kind Будь-який тип Font Technology Технологія шрифту font-technology Variable Варіативні @@ -612,6 +614,8 @@ font-technology Variable Варіативні Control Панель керування Convert Перетворити Convert All Spot Colors to Process Перетворити всі плашкові кольори на складові + Convert {name} to process Перетворити {name} на складовий колір + Keep {name} as spot Залишити {name} плашковим кольором Convert All Strokes to Outlines Перетворити всі обведення на контури Convert All Text to Outlines Перетворити весь текст на контури Convert Anchor Point Перетворити опорну точку @@ -687,6 +691,9 @@ font-technology Variable Варіативні Create from Selection Створити із виділення Create From: Створити з: Create Gradient Mesh… Створити градієнтну сітку… + Flat Плаский + To Center До центру + To Edge До краю Create Graph Створити діаграму Create New Layer Створити новий шар Create New Sublayer Створити новий підшар @@ -2751,6 +2758,18 @@ diagnostics ui інтерфейс Preview: Перегляд: Preview All Layers Переглянути всі шари Preview in Browser Переглянути у браузері + Optimize to File Size… Оптимізувати за розміром файлу… + Optimize to File Size Оптимізувати за розміром файлу + Desired File Size: Бажаний розмір файлу: + Start With: Почати з: + Use: Використати: + Current Settings Поточні налаштування + Auto Select GIF/JPEG Автовибір GIF/JPEG + Total of All Slices Сума всіх фрагментів + Each Slice Кожен фрагмент + Current Slice Поточний фрагмент + {size}, within {target} {size}, у межах {target} + No setting tried fits in {target}; the smallest is {size} Жодне випробуване налаштування не вміщується в {target}; найменший розмір {size} Preview in Browser needs the desktop app (the web downloads files instead) Перегляд у браузері вимагає настільної програми (web-версія завантажує файли) Preview Mode Режим перегляду Preview the document as it is now Переглянути документ у поточному вигляді @@ -3131,12 +3150,53 @@ digits Malayalam Малаялам With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Коли виділено один екземпляр символу, панель «Трансформувати» використовує точку реєстрації символу як опорну точку. Darkens the canvas outside the artboards while the Artboard tool is active. Затемнює полотно поза монтажними областями, поки активний інструмент «Монтажна область». With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Коли ввімкнено «Затемнювати ділянку поза монтажною областю», ділянка поза монтажними областями лишається темною, поки ви перетягуєте інструментом «Монтажна область». + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Наскільки близько, у пікселях, вказівник має бути до об’єкта, опорної точки або маркера, щоб клацання виділило його. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Чи виділяє рамка інструмента «Виділення» зачеплені об’єкти, чи лише ті, що цілком усередині; «Напрямок перетягування» виділяє ті, що всередині, під час перетягування праворуч. E змінює правило під час перетягування. + A click selects a filled object only on its path, not inside its fill. Клацання виділяє об’єкт із заливкою лише на його контурі, а не всередині заливки. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Наскільки близько, у пікселях, точка має підійти до опорної точки або напрямної лінійки, щоб «Прив’язати до точки» прив’язало її; з увімкненими розумними напрямними діє їхній допуск прив’язки. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. З інструментом «Виділення» Cmd/Ctrl+клацання виділяє об’єкт під виділеним у місці вказівника; кожне наступне клацання йде на один об’єкт глибше. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. «Збільшити» і «Зменшити» переносять центр виділення в середину вигляду. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Заблоковані й приховані об’єкти всередині монтажної області переміщуються, масштабуються й копіюються разом із нею, як і решта об’єктів. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Розмір опорних точок і кінців маркерів напрямку на полотні; більші опорні точки можна захопити й з більшої відстані. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Малює кінці маркерів напрямку суцільними точками, порожнистими точками або більшими суцільними точками. + With the Direct Selection tool, the anchor under the pointer is highlighted. З інструментом «Пряме виділення» опорна точка під вказівником підсвічується. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Показує маркери напрямку, коли виділено більше однієї опорної точки; якщо вимкнено, вони видні лише при одній виділеній опорній точці. + Corner widgets hide on corners whose angle is greater than this many degrees. Кутові віджети приховуються на кутах, більших за це число градусів. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Інструмент «Перо» показує, перш ніж ви клацнете, наступний сегмент від останньої опорної точки до вказівника. + The Curvature tool previews the curve to the pointer before you place the next point. Інструмент «Кривизна» показує криву до вказівника, перш ніж ви поставите наступну точку. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Одиниця нових документів вбудованих розмірів, крім розмірів у пікселях, і відкритих файлів без записаної одиниці; якщо вибрати її тут і натиснути ОК, вона стане й одиницею активного документа. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Товщина обведення, штрихи й зазори показуються в цій одиниці, і введені для них числа читаються в ній. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Розміри тексту, інтерліньяж і зміщення базової лінії показуються в цій одиниці, і введені для них числа читаються в ній. The unit for East Asian type measurements, which no field uses yet. Одиниця для розмірів східноазіатського тексту, якої поки не використовує жодне поле. When on, a number typed without a unit into a field in picas is read in points. Якщо ввімкнено, число, введене без одиниці в поле в піках, читається в пунктах. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. З XML ID назви об’єктів показуються як XML ID у «Шарах», «Змінних» і «Параметрах шару». + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Прив’язує малювання, переміщення й масштабування до поділок сітки, навіть коли сітку приховано; поки параметр увімкнено, «Прив’язати до пікселя» не діє. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Колір невиділених напрямних; монтажна область із «Міткою напрямних» малює свої напрямні кольором мітки. + Draws guides as solid lines or as dots, including the guides already in the document. Малює напрямні суцільними лініями або крапками, включно з напрямними, які вже є в документі. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Якщо параметр увімкнено, напрямні заблоковані під час запуску VectorCraft; зміна параметра одразу блокує або розблоковує їх, а «Перегляд › Напрямні › Заблокувати напрямні» і далі змінює блокування. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Якщо параметр увімкнено, Cmd/Ctrl, утримувана на початку перетягування з лінійки, створює напрямну лише на активній монтажній області, а з інструментом «Монтажна область» напрямну на все полотно. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Колір сітки; лінії між основними лініями сітки малюються блідішим відтінком цього кольору. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Малює сітку лініями або крапками вздовж основних ліній сітки на кожній поділці. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Відстань між основними лініями сітки в усіх відкритих документах і в нових; документ VectorCraft відкривається із сіткою, з якою його збережено. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. На скільки частин ділиться кожен основний квадрат сітки; «Прив’язати до сітки» прив’язує до цих частин, навіть коли масштаб приховує їхні лінії. + Draws the grid behind the artwork; off, the grid is drawn over it. Малює сітку за графікою; якщо параметр вимкнено, сітка малюється поверх неї. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. У «Перегляді пікселів» за масштабу 600% і більше активний вигляд показує поверх графіки лінію по краю кожного пікселя документа. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Колір краю плитки та пунктирних меж зразка, які видно під час редагування візерунка. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Прив’язує малювання, переміщення й трансформування до найближчих об’єктів і показує напрямні та мітки; перегляд пікселів їх вимикає, а «Прив’язати до сітки» замість них прив’язує до сітки. + The color of Smart Guide lines and labels. Колір ліній і міток розумних напрямних. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Показує лінію вздовж краю або центру, з яким вирівнюються об’єкти; коли параметр вимкнено, вони вирівнюються без лінії, а «Прив’язати до гліфу» не діє. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. З інструментом виділення обводить невиділений об’єкт під вказівником кольором його шару, поки ви не перетягуєте. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Показує розмір або кут поруч із вказівником, поки ви масштабуєте, обертаєте, нахиляєте або відображаєте об’єкти. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Під час малювання точки прив’язуються до ліній під вибраними кутами, що проходять через точку початку сегмента або фігури. + The set of angles the construction guides follow while Construction Guides is on. Набір кутів, за якими йдуть напрямні побудови, поки ввімкнено «Напрямні побудови». + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Називає те, до чого прив’язується точка: опорну точку, контур або вирівнювання; коли параметр вимкнено, точки прив’язуються так само, але без назв. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Показує поруч із вказівником відстані, кути й зміщення об’єктів під час малювання або переміщення. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Прив’язує переміщені об’єкти або об’єкти зі зміненим розміром до такого самого проміжку, як між найближчими об’єктами, і позначає рівні проміжки. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Коли щось виділено, утримання Alt/Option над іншим об’єктом або монтажною областю показує відстані між ним і виділенням. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Виділення, перетягнуте назад у межі допуску прив’язки від місця початку перетягування, повертається точно туди; копія не повертається. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Наскільки близько на екрані вказівник або перетягувана точка мають підійти до об’єкта, щоб розумні напрямні їх прив’язали; відстань однакова за будь-якого масштабу. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Прив’язує кінець відрізка або коло, намальоване від центру, так, щоб воно торкалося найближчої кривої. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Прив’язує кінець відрізка так, щоб він зустрічав найближчий прямий сегмент під прямим кутом. Reset all preferences to their defaults? Скинути всі налаштування до значень за промовчанням? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Значення за промовчанням застосовуються, коли ви натискаєте ОК у вікні «Налаштування». Скасувати там зберігає поточні налаштування. Restore Recovered Documents Відновити відновлені документи @@ -4723,6 +4783,11 @@ liquify-list-end {0}, {1} {0} і {1} @msg PDF writer error: {0} Помилка запису PDF: {0} @msgplural Packaged {n} file ({note}) in {folder}|Packaged {n} files ({note}) in {folder} Упаковано файли: {n} {folder} ({note}) @msg Preview in Browser needs the desktop app (the web downloads files instead) Перегляд у браузері вимагає настільної програми (web-версія завантажує файли) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 укажіть `desiredK`, бажаний розмір файлу в K (1024 байти): число більше за 0 і не більше 1048576 +@msg `startWith` is `current` or `auto` `startWith` має значення `current` або `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` має значення `allSlices`, `eachSlice` або `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` задає номер фрагмента зі `slice.list`, разом з `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Оптимізувати за розміром файлу: немає зображення для вимірювання @msg Release Guides: no guides Звільнення напрямних: немає напрямних @msg Release: no layer to put the rectangle in Звільнення: немає шару для приміщення прямокутника @msg Replace Spine: select a blend and a path Заміна осі: виділіть перехід і контур @@ -5930,6 +5995,19 @@ lighting Light Світло Transform Objects Трансформувати об’єкти @msg unknown parameter `{key}`; did you mean `{near}`? невідомий параметр `{key}`; можливо, ви мали на увазі `{near}`? @msg unknown parameter `{key}`; the command takes no parameters невідомий параметр `{key}`; команда не має параметрів +@msg unknown parameter `{key}`; `{object}` takes: {keys} невідомий параметр `{key}`; `{object}` приймає: {keys} +@msg unknown parameter `{key}`; {why_not} невідомий параметр `{key}`; {why_not} +@msg no format takes it (see document.formats) жоден формат його не приймає (див. document.formats) +@msg no save format takes it (see file.formatOptions) жоден формат збереження його не приймає (див. file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF його не приймає (див. document.formats) +@msg EPS doesn't take it (see document.formats) EPS його не приймає (див. document.formats) +@msg DXF doesn't take it (see document.formats) DXF його не приймає (див. document.formats) +@msg {name} must be {range} (got {v}) {name} має бути {range} (отримано {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Графічний процесор, обраний першим, не зміг показати вікно, тому VectorCraft запустився знову на {summary} (Налаштування › Продуктивність › Графічний процесор › Автоматично використовує той, до якого під’єднано дисплей) +@msg Sent “{title}” to {to} “{title}” відправлено: {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} “{title}” відправлено: {to}. Відповідь черги друку: {note} +@msg the default printer принтер за замовчуванням +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap растрові ефекти об’єкта {object}: запитано {requested} ppi, отримано {achieved} ppi через обмеження у 64 мільйони пікселів @msg unknown parameter `{key}`; the command takes: {keys} невідомий параметр `{key}`; команда приймає: {keys} @msg the params must be an object, not {got} параметри мають бути об'єктом, а не {got} @msg unknown parameter `{path}`; the object takes no keys невідомий параметр `{path}`; об'єкт не приймає ключів @@ -7577,6 +7655,11 @@ breakText Glyphs Гліфи @msg Some islands could not be joined to the area around the art Деякі острівці не вдалося з’єднати з областю навколо графіки @msg `width` must be from {lo} to {hi} pt `width` має бути від {lo} до {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` має бути від -180 до 180 градусів +@msg `roundness` must be from 0 to 100% `roundness` має бути від 0 до 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` має бути від 0.01 до 100 pt +@msg style must be "pencil" or "brush" style має бути "pencil" або "brush" +@msg extend end must be "start" or "end" кінець extend має бути "start" або "end" +@msg connect end must be "start" or "end" кінець connect має бути "start" або "end" @msg `roundness` must be from 1 to 100% `roundness` має бути від 1 до 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` має бути цілим числом від 1 до {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Рамка й лінії вибірки… @@ -8088,7 +8171,6 @@ breakText Glyphs Гліфи @msg anchor `smooth` must be true or false `smooth` опорної точки має бути true або false @msg anchor `{key}` must be [x, y] `{key}` опорної точки має бути [x, y] @msg anchor `{key}` must be a number `{key}` опорної точки має бути числом -@msg angle and roundness must be finite angle і roundness мають бути скінченними @msg angles must be a list as long as pins (degrees or null) angles має бути списком такої самої довжини, як pins (градуси або null) @msg appearance must be flat|center|edge appearance має бути flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply — це "fill" або "stroke", а не `{other}` @@ -9236,8 +9318,6 @@ breakText Glyphs Гліфи @msg unknown panel невідома панель @msg unknown panel `{panel}` невідома панель `{panel}` @msg unknown parameter `{key}` невідомий параметр `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} невідомий параметр `{within}settings.{format}`; {why} -@msg unknown parameter `{within}{key}`; {why} невідомий параметр `{within}{key}`; {why} @msg unknown pieLegend `{v}` (none, standard or wedges) невідомий pieLegend `{v}` (none, standard або wedges) @msg unknown piePosition `{v}` (even, ratio or stacked) невідомий piePosition `{v}` (even, ratio або stacked) @msg unknown pieSort `{v}` (none, all or first) невідомий pieSort `{v}` (none, all або first) @@ -9363,7 +9443,6 @@ breakText Glyphs Гліфи @msg {label} must be a number from 1 to 10000 {label} має бути числом від 1 до 10000 @msg {name} `{s}`: {ids} {name} `{s}`: {ids} @msg {name} is built in and can't be deleted {name} є вбудованим, його не можна видалити -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} має бути {lo}–{hi}{unit} (отримано {v}) @msg {name}: CRC or size mismatch {name}: невідповідність CRC або розміру @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}: вдалося прочитати лише вбудований попередній перегляд цього файлу Affinity; скористайтеся командою Файл › Відкрити, щоб побачити його з попередженням, або перед розміщенням експортуйте SVG чи PDF з Affinity @msg {name}: {e} {name}: {e} diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index d288931824..519c5d8f0d 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -222,6 +222,8 @@ antiAlias Sharp Sắc nét Crisp Rõ nét Strong Đậm Anti-aliasing: Khử răng cưa: + Art Optimized Tối ưu cho hình vẽ + Type Optimized Tối ưu cho chữ Any Kind Bất kỳ loại Font Technology Công nghệ phông chữ font-technology Variable Biến thiên @@ -715,6 +717,8 @@ font-technology Variable Biến thiên Control Điều khiển Convert Chuyển đổi Convert All Spot Colors to Process Chuyển tất cả màu đặc thành màu lai + Convert {name} to process Chuyển {name} thành màu lai + Keep {name} as spot Giữ {name} là màu đặc Convert All Strokes to Outlines Chuyển tất cả nét thành đường bao Convert All Text to Outlines Chuyển tất cả văn bản thành đường bao Convert Anchor Point Chuyển đổi điểm neo @@ -794,6 +798,9 @@ font-technology Variable Biến thiên Create from Selection Tạo từ vùng chọn Create From: Tạo từ: Create Gradient Mesh… Tạo lưới chuyển sắc… + Flat Phẳng + To Center Về tâm + To Edge Về cạnh Create Graph Tạo biểu đồ Create New Fields by Tạo trường mới bằng Create New Layer Tạo lớp mới @@ -3073,6 +3080,18 @@ diagnostics ui giao diện Preview: Xem trước: Preview All Layers Xem trước tất cả lớp Preview in Browser Xem trước trong trình duyệt + Optimize to File Size… Tối ưu theo kích thước tệp… + Optimize to File Size Tối ưu theo kích thước tệp + Desired File Size: Kích thước tệp mong muốn: + Start With: Bắt đầu với: + Use: Dùng: + Current Settings Cài đặt hiện tại + Auto Select GIF/JPEG Tự chọn GIF/JPEG + Total of All Slices Tổng tất cả lát cắt + Each Slice Mỗi lát cắt + Current Slice Lát cắt hiện tại + {size}, within {target} {size}, trong giới hạn {target} + No setting tried fits in {target}; the smallest is {size} Không cài đặt nào đã thử vừa với {target}; nhỏ nhất là {size} Preview in Browser needs the desktop app (the web downloads files instead) Xem trước trong trình duyệt cần ứng dụng máy tính để bàn (web sẽ tải tệp xuống thay thế) Preview Mode Chế độ xem trước Preview the document as it is now Xem trước tài liệu như hiện tại @@ -3446,12 +3465,53 @@ mark-style Japanese Kiểu Nhật With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. Khi chọn một thể hiện biểu tượng, bảng Biến đổi dùng điểm đăng ký của biểu tượng làm điểm tham chiếu. Darkens the canvas outside the artboards while the Artboard tool is active. Làm tối khung vẽ bên ngoài các bảng vẽ khi công cụ Bảng vẽ đang hoạt động. With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. Khi Làm tối vùng bên ngoài bảng vẽ đang bật, vùng bên ngoài các bảng vẽ vẫn tối trong khi bạn kéo bằng công cụ Bảng vẽ. + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. Con trỏ phải cách đối tượng, điểm neo hoặc tay nắm bao nhiêu pixel để một cú nhấp chọn được nó. + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. Khung của công cụ Chọn chọn các đối tượng nó chạm vào hay chỉ những đối tượng nằm hẳn bên trong; Hướng kéo chọn đối tượng bên trong khi kéo sang phải. E đảo quy tắc trong khi kéo. + A click selects a filled object only on its path, not inside its fill. Cú nhấp chỉ chọn đối tượng có tô màu trên đường dẫn của nó, không phải bên trong phần tô. + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. Một điểm phải đến gần điểm neo hoặc đường căn thước bao nhiêu pixel để Hút vào điểm hút nó; khi bật Đường căn thông minh, dung sai hút của chúng được dùng thay thế. + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. Với công cụ Chọn, Cmd/Ctrl-nhấp chọn đối tượng nằm dưới đối tượng đã chọn tại con trỏ; mỗi lần nhấp tiếp theo xuống sâu thêm một đối tượng. + Zoom In and Zoom Out bring the center of the selection to the middle of the view. Phóng to và Thu nhỏ đưa tâm vùng chọn vào giữa khung nhìn. + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. Hình minh họa bị khóa và bị ẩn bên trong một bảng vẽ được di chuyển, co giãn và sao chép cùng bảng vẽ như các hình minh họa khác. + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. Kích thước điểm neo và đầu tay nắm hướng trên canvas; điểm neo lớn hơn cũng có thể được nắm từ xa hơn. + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. Vẽ đầu tay nắm hướng thành chấm đặc, chấm rỗng hoặc chấm đặc lớn hơn. + With the Direct Selection tool, the anchor under the pointer is highlighted. Với công cụ Chọn trực tiếp, điểm neo dưới con trỏ được làm nổi bật. + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. Hiện tay nắm hướng khi chọn nhiều hơn một điểm neo; khi tắt, chúng chỉ hiện khi chọn đúng một điểm neo. + Corner widgets hide on corners whose angle is greater than this many degrees. Tiện ích góc ẩn ở những góc có số đo lớn hơn số độ này. + The Pen tool previews the next segment from the last anchor to the pointer before you click. Công cụ Bút xem trước đoạn tiếp theo từ điểm neo cuối đến con trỏ trước khi bạn nhấp. + The Curvature tool previews the curve to the pointer before you place the next point. Công cụ Độ cong xem trước đường cong đến con trỏ trước khi bạn đặt điểm tiếp theo. The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. Đơn vị cho tài liệu mới theo kích thước dựng sẵn, trừ kích thước bằng pixel, và cho tệp đã mở không ghi đơn vị; chọn đơn vị ở đây rồi bấm OK cũng đặt nó cho tài liệu đang hoạt động. Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. Độ dày nét, nét đứt và khoảng cách hiển thị theo đơn vị này, và số nhập cho chúng được đọc theo đơn vị này. Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. Cỡ chữ, giãn dòng và dịch chuyển đường cơ sở hiển thị theo đơn vị này, và số nhập cho chúng được đọc theo đơn vị này. The unit for East Asian type measurements, which no field uses yet. Đơn vị cho số đo chữ Đông Á, hiện chưa có trường nào dùng. When on, a number typed without a unit into a field in picas is read in points. Khi bật, số nhập không có đơn vị vào trường tính bằng pica được đọc theo điểm. With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. Với XML ID, tên đối tượng hiển thị dưới dạng XML ID trong Các lớp, Biến số và Tùy chọn lớp. + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. Hút thao tác vẽ, di chuyển và co giãn vào các phân chia của lưới, kể cả khi lưới đang ẩn; khi tùy chọn này bật, Hút vào pixel không có tác dụng. + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. Màu của các đường căn không được chọn; bảng vẽ có Nhãn đường căn vẽ các đường căn của riêng nó bằng màu của nhãn. + Draws guides as solid lines or as dots, including the guides already in the document. Vẽ đường căn dưới dạng đường liền hoặc chấm, kể cả các đường căn đã có trong tài liệu. + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. Khi bật, các đường căn bị khóa lúc VectorCraft khởi động; đổi tùy chọn này sẽ khóa hoặc mở khóa chúng ngay, và Hiển thị › Đường căn › Khóa đường căn vẫn đổi được trạng thái khóa. + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. Khi bật, giữ Cmd/Ctrl lúc bắt đầu kéo từ thước sẽ tạo đường căn chỉ trên bảng vẽ đang hoạt động, hoặc đường căn cho toàn bộ khung vẽ khi dùng công cụ Bảng vẽ. + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. Màu của lưới; các đường nằm giữa những đường lưới chính được vẽ bằng sắc nhạt hơn của màu đó. + Draws the grid as lines, or as dots along the major gridlines at each subdivision. Vẽ lưới dưới dạng đường, hoặc dưới dạng chấm dọc theo các đường lưới chính tại mỗi phân chia. + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. Khoảng cách giữa các đường lưới chính trong mọi tài liệu đang mở và trong tài liệu mới; tài liệu VectorCraft mở ra với lưới đã lưu cùng nó. + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. Số phần mà mỗi ô lưới chính được chia thành; Hút vào lưới hút vào các phần này, kể cả khi mức thu phóng ẩn các đường của chúng. + Draws the grid behind the artwork; off, the grid is drawn over it. Vẽ lưới phía sau tác phẩm; khi tắt, lưới được vẽ đè lên tác phẩm. + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. Trong Xem trước pixel ở mức thu phóng 600% trở lên, chế độ xem đang hoạt động hiện một đường tại cạnh của mỗi pixel tài liệu, đè lên tác phẩm. + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. Màu của cạnh ô và đường giới hạn mẫu màu nét đứt hiện ra khi bạn chỉnh sửa họa tiết. + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. Hút thao tác vẽ, di chuyển và biến đổi vào hình vẽ ở gần, đồng thời hiện đường căn và nhãn; Xem trước pixel tắt chúng, còn Hút vào lưới sẽ hút vào lưới thay cho chúng. + The color of Smart Guide lines and labels. Màu của đường và nhãn của đường căn thông minh. + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. Hiện một đường dọc theo cạnh hoặc tâm mà hình vẽ thẳng hàng với; khi tắt, hình vẽ vẫn thẳng hàng mà không có đường, và Hút vào glyph không áp dụng. + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. Với công cụ chọn, viền đối tượng chưa chọn dưới con trỏ bằng màu lớp của nó khi bạn không kéo. + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. Hiện kích thước hoặc góc bên cạnh con trỏ khi bạn co giãn, xoay, làm nghiêng hoặc phản chiếu hình vẽ. + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. Khi bạn vẽ, các điểm hút vào những đường theo các góc đã chọn đi qua điểm bắt đầu của đoạn hoặc hình. + The set of angles the construction guides follow while Construction Guides is on. Tập hợp các góc mà đường căn xây dựng đi theo khi Đường căn xây dựng đang bật. + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. Gọi tên thứ mà điểm hút vào, như điểm neo, đường dẫn hoặc căn chỉnh; khi tắt, các điểm vẫn hút như vậy nhưng không có tên. + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. Hiện khoảng cách, góc và mức hình vẽ đã di chuyển bên cạnh con trỏ khi bạn vẽ hoặc di chuyển. + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. Hút hình vẽ được di chuyển hoặc đổi kích thước vào khoảng cách bằng khoảng cách giữa các đối tượng ở gần, và đánh dấu các khoảng bằng nhau. + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. Khi đã chọn thứ gì đó, giữ Alt/Option trên một đối tượng khác hoặc một bảng vẽ sẽ hiện khoảng cách giữa nó và vùng chọn. + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. Vùng chọn được kéo trở lại trong phạm vi dung sai hút tính từ chỗ bắt đầu kéo sẽ trở về đúng chỗ đó; bản sao thì không. + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. Con trỏ hoặc điểm đang kéo phải đến gần hình vẽ trên màn hình bao nhiêu để đường căn thông minh hút vào; khoảng cách này như nhau ở mọi mức thu phóng. + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. Hút đầu mút của đoạn thẳng, hoặc hình tròn vẽ từ tâm, để nó chạm vào một đường cong ở gần. + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. Hút đầu mút của đoạn thẳng để nó gặp một đoạn thẳng ở gần theo góc vuông. Reset all preferences to their defaults? Đặt lại tất cả tùy chọn về mặc định? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. Giá trị mặc định được áp dụng khi bạn nhấn OK trong Tùy chọn. Hủy ở đó giữ nguyên các tùy chọn hiện tại của bạn. Restore Recovered Documents Khôi phục tài liệu đã phục hồi @@ -5516,6 +5576,11 @@ liquify-list-end {0}, {1} {0} và {1} @msg plug-in parameters: {0} tham số plug-in: {0} @msg plug-in trapped: {0} plug-in bị kẹt: {0} @msg Preview in Browser needs the desktop app (the web downloads files instead) Xem trước trên trình duyệt cần ứng dụng máy tính (web sẽ tải xuống tệp thay thế) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 hãy cho `desiredK`, kích thước tệp mong muốn tính bằng K (1024 byte): một số lớn hơn 0 và tối đa 1048576 +@msg `startWith` is `current` or `auto` `startWith` là `current` hoặc `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` là `allSlices`, `eachSlice` hoặc `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` là số lát cắt từ `slice.list`, đi cùng `use: currentSlice` +@msg Optimize to File Size: there is no image to measure Tối ưu theo kích thước tệp: không có ảnh để đo @msg print settings are not an object cài đặt in không phải là đối tượng @msg printing isn't available here in không khả dụng ở đây @msg range `{s}` is empty phạm vi `{s}` trống @@ -5873,6 +5938,19 @@ liquify-list-end {0}, {1} {0} và {1} @msg panels can't be shown in Presentation Mode không thể hiển thị bảng trong chế độ trình bày @msg unknown parameter `{key}`; did you mean `{near}`? tham số không xác định `{key}`; ý bạn là `{near}`? @msg unknown parameter `{key}`; the command takes no parameters tham số không xác định `{key}`; lệnh này không nhận tham số +@msg unknown parameter `{key}`; `{object}` takes: {keys} tham số không xác định `{key}`; `{object}` nhận: {keys} +@msg unknown parameter `{key}`; {why_not} tham số không xác định `{key}`; {why_not} +@msg no format takes it (see document.formats) không định dạng nào nhận tham số này (xem document.formats) +@msg no save format takes it (see file.formatOptions) không định dạng lưu nào nhận tham số này (xem file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF không nhận tham số này (xem document.formats) +@msg EPS doesn't take it (see document.formats) EPS không nhận tham số này (xem document.formats) +@msg DXF doesn't take it (see document.formats) DXF không nhận tham số này (xem document.formats) +@msg {name} must be {range} (got {v}) {name} phải là {range} (nhận được {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) Bộ xử lý đồ họa thử trước không hiển thị được cửa sổ, VectorCraft đã khởi động lại trên {summary} (Cài đặt › Hiệu suất › Bộ xử lý đồ họa › Tự động dùng bộ xử lý đang điều khiển màn hình của bạn) +@msg Sent “{title}” to {to} Đã gửi “{title}” đến {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} Đã gửi “{title}” đến {to}. Phản hồi của hàng đợi in: {note} +@msg the default printer máy in mặc định +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap hiệu ứng raster trên đối tượng {object}: yêu cầu {requested} ppi, đạt {achieved} ppi do giới hạn 64 triệu điểm ảnh @msg unknown parameter `{key}`; the command takes: {keys} tham số không xác định `{key}`; lệnh nhận: {keys} @msg the params must be an object, not {got} các tham số phải là một đối tượng, không phải {got} @msg unknown parameter `{path}`; the object takes no keys tham số không xác định `{path}`; đối tượng không nhận khóa nào @@ -7504,6 +7582,11 @@ breakText Glyphs Glyph @msg Some islands could not be joined to the area around the art Không thể nối một số đảo với vùng xung quanh hình vẽ @msg `width` must be from {lo} to {hi} pt `width` phải từ {lo} đến {hi} pt @msg `angle` must be from -180 to 180 degrees `angle` phải từ -180 đến 180 độ +@msg `roundness` must be from 0 to 100% `roundness` phải từ 0 đến 100% +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` phải từ 0.01 đến 100 pt +@msg style must be "pencil" or "brush" style phải là "pencil" hoặc "brush" +@msg extend end must be "start" or "end" đầu extend phải là "start" hoặc "end" +@msg connect end must be "start" or "end" đầu connect phải là "start" hoặc "end" @msg `roundness` must be from 1 to 100% `roundness` phải từ 1 đến 100% @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` phải là số nguyên từ 1 đến {MAX_BRIDGES_PER_ISLAND} Weed Box and Lines… Khung và đường bóc phần thừa… diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index bf7a1bcc7c..c6696a9ec6 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -153,6 +153,8 @@ antiAlias Sharp 锐利 Crisp 清晰 Strong 强 Anti-aliasing: 消除锯齿: + Art Optimized 图稿优化 + Type Optimized 文字优化 Appearance 外观 Appearance Attribute 外观属性 Appearance Item 外观项目 @@ -563,6 +565,8 @@ antiAlias Sharp 锐利 Control 控制栏 Convert 转换 Convert All Spot Colors to Process 将所有专色转换为印刷色 + Convert {name} to process 将 {name} 转换为印刷色 + Keep {name} as spot 将 {name} 保留为专色 Convert All Strokes to Outlines 将所有描边转换为轮廓 Convert All Text to Outlines 将所有文字转换为轮廓 Convert Anchor Point 转换锚点 @@ -637,6 +641,9 @@ antiAlias Sharp 锐利 Create from Selection 从选区创建 Create From: 创建自: Create Gradient Mesh… 创建渐变网格… + Flat 平面 + To Center 向中心 + To Edge 向边缘 Create Graph 创建图表 Create New Layer 创建新图层 Create New Sublayer 创建新子图层 @@ -2610,6 +2617,18 @@ diagnostics ui 界面 Preview 预览 Preview: 预览: Preview in Browser 在浏览器中预览 + Optimize to File Size… 优化到文件大小… + Optimize to File Size 优化到文件大小 + Desired File Size: 所需文件大小: + Start With: 起始设置: + Use: 使用: + Current Settings 当前设置 + Auto Select GIF/JPEG 自动选择 GIF/JPEG + Total of All Slices 所有切片总计 + Each Slice 每个切片 + Current Slice 当前切片 + {size}, within {target} {size},不超过 {target} + No setting tried fits in {target}; the smallest is {size} 尝试过的设置都无法小于 {target};最小为 {size} Preview in Browser needs the desktop app (the web downloads files instead) 在浏览器中预览需要桌面版应用程序 (网页版会改为下载文件) Preview Mode 预览模式 Preview the document as it is now 按当前状态预览文档 @@ -2990,12 +3009,53 @@ digits Malayalam 马拉雅拉姆数字 With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. 选中一个符号实例时,变换面板使用符号的注册点作为参考点。 Darkens the canvas outside the artboards while the Artboard tool is active. 使用画板工具时调暗画板以外的画布。 With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. 调暗画板外的区域打开时,用画板工具拖动期间画板以外的区域保持变暗。 + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. 点击时指针需距离对象、锚点或手柄多少像素以内才能选中它。 + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 选择工具的框选择它接触到的对象,还是只选择完全在框内的对象;拖动方向在向右拖动时选择框内的对象。拖动时按 E 可反转规则。 + A click selects a filled object only on its path, not inside its fill. 点击只在填充对象的路径上选中它,而不是在填充内部。 + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. 点需距离锚点或标尺参考线多少像素以内,对齐点才会将其对齐;打开智能参考线时改用智能参考线的吸附容差。 + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 使用选择工具时,按住 Cmd/Ctrl 点击会选中指针处所选对象下方的对象;每再点击一次就再往下一个对象。 + Zoom In and Zoom Out bring the center of the selection to the middle of the view. 放大和缩小会将所选内容的中心移到视图中央。 + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. 画板内锁定和隐藏的图稿会像其他图稿一样随画板移动、缩放和复制。 + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. 画布上锚点和方向手柄端点的大小;锚点越大,也能从越远处抓取。 + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 将方向手柄的端点绘制为实心点、空心点或更大的实心点。 + With the Direct Selection tool, the anchor under the pointer is highlighted. 使用直接选择工具时,指针下方的锚点会高亮显示。 + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 选中多个锚点时显示方向手柄;关闭时,仅在只选中一个锚点时显示。 + Corner widgets hide on corners whose angle is greater than this many degrees. 角度大于此度数的转角上隐藏角控件。 + The Pen tool previews the next segment from the last anchor to the pointer before you click. 点击之前,钢笔工具会预览从最后一个锚点到指针的下一段。 + The Curvature tool previews the curve to the pointer before you place the next point. 放置下一个点之前,曲率工具会预览到指针的曲线。 The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. 除像素尺寸外,以内置尺寸新建的文档和未记录单位的已打开文件使用此单位;在此选择并点击确定,也会更改当前文档的单位。 Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 描边粗细、虚线和间隔以此单位显示,为其输入的数字也按此单位读取。 Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. 字号、行距和基线偏移以此单位显示,为其输入的数字也按此单位读取。 The unit for East Asian type measurements, which no field uses yet. 用于东亚文字度量的单位,目前还没有字段使用。 When on, a number typed without a unit into a field in picas is read in points. 开启后,在以派卡为单位的字段中输入的不带单位的数字按点读取。 With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. 选择 XML ID 时,图层、变量和图层选项中的对象名称显示为 XML ID。 + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. 即使网格已隐藏,绘制、移动和缩放也会对齐到网格的细分;开启期间,“对齐像素”不起作用。 + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 未选中参考线的颜色;设置了参考线标签的画板会用标签颜色绘制自己的参考线。 + Draws guides as solid lines or as dots, including the guides already in the document. 将参考线绘制为实线或点,包括文档中已有的参考线。 + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. 开启后,VectorCraft 启动时参考线处于锁定状态;更改此选项会立即锁定或解锁参考线,“视图 › 参考线 › 锁定参考线”仍可更改锁定状态。 + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. 开启后,从标尺开始拖动时按住 Cmd/Ctrl,会只在当前画板上创建参考线;使用画板工具时则创建贯穿整个画布的参考线。 + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. 网格的颜色;主网格线之间的线条以该颜色较淡的色调绘制。 + Draws the grid as lines, or as dots along the major gridlines at each subdivision. 将网格绘制为线条,或在每个细分处沿主网格线绘制为点。 + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 所有已打开文档和新文档中主网格线之间的距离;VectorCraft 文档打开时使用保存时的网格。 + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 每个主网格方格分成多少份;即使缩放使这些线条不显示,“对齐网格”仍对齐到这些分格。 + Draws the grid behind the artwork; off, the grid is drawn over it. 将网格绘制在图稿后面;关闭时网格绘制在图稿上面。 + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. 在像素预览中缩放到 600% 或以上时,当前视图会在图稿上方沿文档每个像素的边缘显示线条。 + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. 编辑图案时显示的拼贴边缘和虚线色板边界的颜色。 + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 将绘制、移动和变换吸附到附近的图稿,并显示参考线和标签;像素预览会将其关闭,开启对齐网格时则改为对齐网格。 + The color of Smart Guide lines and labels. 智能参考线的线条和标签颜色。 + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. 沿图稿对齐的边缘或中心显示一条线;关闭时图稿仍会对齐,只是不显示线条,且靠齐字符不起作用。 + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 使用选择工具且未拖动时,用图层颜色勾勒指针下未选中的对象。 + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. 缩放、旋转、倾斜或镜像图稿时,在指针旁显示尺寸或角度。 + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 绘制时,点会吸附到经过线段或形状起点、按所选角度延伸的线上。 + The set of angles the construction guides follow while Construction Guides is on. 构造参考线开启时,构造参考线所遵循的角度组合。 + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. 显示点吸附到的对象名称,如锚点、路径或对齐;关闭时点仍以相同方式吸附,只是不显示名称。 + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 绘制或移动时,在指针旁显示距离、角度和图稿移动的距离。 + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 将移动或调整大小的图稿吸附到与附近对象之间相同的间距,并标出相等的间距。 + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 选中对象后,在另一个对象或画板上按住 Alt/Option 会显示它与所选对象之间的距离。 + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. 拖回到距拖动起点吸附容差以内的所选对象会精确回到原处;副本不会。 + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. 指针或拖动的点在屏幕上需离图稿多近,智能参考线才会吸附;该距离在任何缩放比例下都相同。 + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 吸附线段的端点或从中心绘制的圆,使其与附近的曲线相切。 + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 吸附线段的端点,使其与附近的直线段成直角相交。 Reset all preferences to their defaults? 将所有首选项重置为默认值? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 在首选项中点击确定后才会应用默认值。在那里点击取消会保留当前首选项。 Restore Recovered Documents 恢复已恢复的文档 @@ -4861,6 +4921,11 @@ imageTrace Outline 轮廓 @msg 1 hidden object 1 个隐藏的对象 @msg {n} hidden objects {n} 个隐藏的对象 @msg Preview in Browser needs the desktop app (the web downloads files instead) “在浏览器中预览”需要桌面应用 (网页版会改为下载文件) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 请给出 `desiredK`,即以 K (1024 字节) 为单位的所需文件大小:大于 0 且不超过 1048576 的数字 +@msg `startWith` is `current` or `auto` `startWith` 为 `current` 或 `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` 为 `allSlices`、`eachSlice` 或 `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` 是 `slice.list` 中的切片编号,需配合 `use: currentSlice` +@msg Optimize to File Size: there is no image to measure 优化到文件大小:没有可测量的图像 @msg no file system here 此处没有文件系统 @msg nothing to preview 没有可预览的内容 @msg Saved {n} files beside {path} 已在 {path} 旁保存 {n} 个文件 @@ -6205,6 +6270,19 @@ lighting Light 光源 Transform Objects 变换对象 @msg unknown parameter `{key}`; did you mean `{near}`? 未知参数 `{key}`;您是否想输入 `{near}`? @msg unknown parameter `{key}`; the command takes no parameters 未知参数 `{key}`;该命令没有参数 +@msg unknown parameter `{key}`; `{object}` takes: {keys} 未知参数 `{key}`;`{object}` 接受:{keys} +@msg unknown parameter `{key}`; {why_not} 未知参数 `{key}`;{why_not} +@msg no format takes it (see document.formats) 没有格式接受它 (参见 document.formats) +@msg no save format takes it (see file.formatOptions) 没有存储格式接受它 (参见 file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF 不接受它 (参见 document.formats) +@msg EPS doesn't take it (see document.formats) EPS 不接受它 (参见 document.formats) +@msg DXF doesn't take it (see document.formats) DXF 不接受它 (参见 document.formats) +@msg {name} must be {range} (got {v}) {name} 必须为 {range} (实际为 {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 首先尝试的图形处理器无法显示窗口,因此 VectorCraft 已在 {summary} 上重新启动 (设置 › 性能 › 图形处理器 › 自动 会使用驱动显示器的处理器) +@msg Sent “{title}” to {to} 已将 “{title}” 发送到 {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} 已将 “{title}” 发送到 {to}。打印队列的回复:{note} +@msg the default printer 默认打印机 +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap 对象 {object} 上的栅格效果:请求 {requested} ppi,受 6400 万像素上限限制,实际为 {achieved} ppi @msg unknown parameter `{key}`; the command takes: {keys} 未知参数 `{key}`;该命令接受:{keys} @msg the params must be an object, not {got} 参数必须是对象,而不是 {got} @msg unknown parameter `{path}`; the object takes no keys 未知参数 `{path}`;该对象不接受任何键 @@ -7689,6 +7767,11 @@ breakText Glyphs 字形 @msg Some islands could not be joined to the area around the art 部分孤岛无法连接到图稿周围的区域 @msg `width` must be from {lo} to {hi} pt `width` 必须介于 {lo} 到 {hi} pt 之间 @msg `angle` must be from -180 to 180 degrees `angle` 必须介于 -180 到 180 度之间 +@msg `roundness` must be from 0 to 100% `roundness` 必须介于 0 到 100% 之间 +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 必须介于 0.01 到 100 pt 之间 +@msg style must be "pencil" or "brush" style 必须为 "pencil" 或 "brush" +@msg extend end must be "start" or "end" extend 的端点必须为 "start" 或 "end" +@msg connect end must be "start" or "end" connect 的端点必须为 "start" 或 "end" @msg `roundness` must be from 1 to 100% `roundness` 必须介于 1 到 100% 之间 @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 必须是 1 到 {MAX_BRIDGES_PER_ISLAND} 之间的整数 Weed Box and Lines… 除废框和除废线… @@ -8086,8 +8169,6 @@ breakText Glyphs 字形 @msg unknown dither `{d}` (diffusion, pattern, noise or none) 未知的仿色 `{d}` (diffusion、pattern、noise 或 none) @msg unknown panel `{panel}` 未知的面板 `{panel}` @msg unknown parameter `{key}` 未知的参数 `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} 未知的参数 `{within}settings.{format}`;{why} -@msg unknown parameter `{within}{key}`; {why} 未知的参数 `{within}{key}`;{why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) 未知的减色方式 `{reduction}` (selective、perceptual、adaptive、web、gray、blackWhite、uniform 或 document) @msg unmatched ')' 不匹配的 ')' @msg unterminated character class 字符类没有结束 @@ -8459,7 +8540,6 @@ breakText Glyphs 字形 @msg anchor `smooth` must be true or false 锚点的 `smooth` 必须为 true 或 false @msg anchor `{key}` must be [x, y] 锚点的 `{key}` 必须是 [x, y] @msg anchor `{key}` must be a number 锚点的 `{key}` 必须是数字 -@msg angle and roundness must be finite angle 和 roundness 必须是有限值 @msg angles must be a list as long as pins (degrees or null) angles 必须是与 pins 等长的列表 (度数或 null) @msg appearance must be flat|center|edge appearance 必须是 flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply 为 "fill" 或 "stroke",不能是 `{other}` @@ -9509,7 +9589,6 @@ breakText Glyphs 字形 @msg {label} must be a number from 1 to 10000 {label} 必须是 1 到 10000 之间的数字 @msg {name} `{s}`: {ids} {name} `{s}`:{ids} @msg {name} is built in and can't be deleted {name} 是内置项,不能删除 -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} 必须为 {lo}–{hi}{unit} (实际为 {v}) @msg {name}: CRC or size mismatch {name}:CRC 或大小不匹配 @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}:只能读取此 Affinity 文件的嵌入预览;请使用 文件 › 打开 查看预览及其警告,或在置入前先从 Affinity 导出 SVG 或 PDF @msg {name}: {e} {name}:{e} diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 87e1bde68b..1480422931 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -163,6 +163,8 @@ antiAlias Sharp 銳利 Crisp 清晰 Strong 強 Anti-aliasing: 消除鋸齒: + Art Optimized 圖稿最佳化 + Type Optimized 文字最佳化 Any Kind 所有類型 Font Technology 字體技術 font-technology Variable 可變 @@ -580,6 +582,8 @@ font-technology Variable 可變 Control 控制 Convert 轉換 Convert All Spot Colors to Process 將所有特別色轉換為印刷色 + Convert {name} to process 將 {name} 轉換為印刷色 + Keep {name} as spot 將 {name} 保留為特別色 Convert All Strokes to Outlines 將所有筆畫轉換為外框 Convert All Text to Outlines 將所有文字轉換為外框 Convert Anchor Point 轉換錨點 @@ -655,6 +659,9 @@ font-technology Variable 可變 Create from Selection 從選取範圍建立 Create From: 建立來源: Create Gradient Mesh… 建立漸層網格… + Flat 平面 + To Center 向中心 + To Edge 向邊緣 Create Graph 建立圖表 Create New Layer 建立新圖層 Create New Sublayer 建立新子圖層 @@ -2450,6 +2457,11 @@ file-filter Templates 範本 @msg 1 hidden object 1 個隱藏的物件 @msg {n} hidden objects {n} 個隱藏的物件 @msg Preview in Browser needs the desktop app (the web downloads files instead) 「在瀏覽器中預覽」需要桌面應用程式 (網頁版會改為下載檔案) +@msg give `desiredK`, the desired file size in K (1024 bytes): a number above 0 and at most 1048576 請提供 `desiredK`,即以 K (1024 位元組) 為單位的所需檔案大小:大於 0 且不超過 1048576 的數字 +@msg `startWith` is `current` or `auto` `startWith` 為 `current` 或 `auto` +@msg `use` is `allSlices`, `eachSlice` or `currentSlice` `use` 為 `allSlices`、`eachSlice` 或 `currentSlice` +@msg `slice` is a slice number from `slice.list`, with `use: currentSlice` `slice` 是 `slice.list` 中的切片編號,需搭配 `use: currentSlice` +@msg Optimize to File Size: there is no image to measure 最佳化至檔案大小:沒有可測量的影像 @msg no file system here 此處沒有檔案系統 @msg nothing to preview 沒有可預覽的內容 @msg Saved {n} files beside {path} 已在 {path} 旁儲存 {n} 個檔案 @@ -3886,6 +3898,18 @@ diagnostics ui 介面 Preview: 預覽: Preview All Layers 預覽所有圖層 Preview in Browser 在瀏覽器中預覽 + Optimize to File Size… 最佳化至檔案大小… + Optimize to File Size 最佳化至檔案大小 + Desired File Size: 所需檔案大小: + Start With: 起始設定: + Use: 使用: + Current Settings 目前設定 + Auto Select GIF/JPEG 自動選取 GIF/JPEG + Total of All Slices 所有切片總計 + Each Slice 每個切片 + Current Slice 目前切片 + {size}, within {target} {size},不超過 {target} + No setting tried fits in {target}; the smallest is {size} 嘗試過的設定都無法小於 {target};最小為 {size} Preview in Browser needs the desktop app (the web downloads files instead) 在瀏覽器中預覽需要桌面版應用程式 (網頁版會改為下載檔案) Preview Mode 預覽模式 Preview the document as it is now 以目前狀態預覽文件 @@ -4269,12 +4293,53 @@ digits Malayalam 馬來亞拉姆數字 With one symbol instance selected, the Transform panel uses the symbol's registration point as its reference point. 選取一個符號實體時,變形面板使用符號的註冊點作為參考點。 Darkens the canvas outside the artboards while the Artboard tool is active. 使用工作區域工具時調暗工作區域以外的畫布。 With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool. 調暗工作區域外的區域開啟時,用工作區域工具拖曳期間工作區域以外的區域保持變暗。 + How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it. 按一下時,指標需距離物件、錨點或控制把手多少像素以內才能選取它。 + Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag. 選取工具的框選取它接觸到的物件,還是只選取完全在框內的物件;拖曳方向在向右拖曳時選取框內的物件。拖曳時按 E 可反轉規則。 + A click selects a filled object only on its path, not inside its fill. 按一下只在填色物件的路徑上選取它,而不是在填色內部。 + How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead. 點需距離錨點或尺標參考線多少像素以內,靠齊控制點才會讓它靠齊;開啟智慧型參考線時改用智慧型參考線的靠齊容許度。 + With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper. 使用選取工具時,按住 Cmd/Ctrl 並按一下會選取指標處所選物件下方的物件;每再按一下就再往下一個物件。 + Zoom In and Zoom Out bring the center of the selection to the middle of the view. 放大顯示和縮小顯示會將選取範圍的中心移到檢視中央。 + Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does. 工作區域內鎖定和隱藏的圖稿會像其他圖稿一樣隨工作區域移動、縮放和複製。 + The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away. 畫布上錨點和方向控制把手端點的大小;錨點越大,也能從越遠處抓取。 + Draws the ends of direction handles as solid dots, hollow dots or larger solid dots. 將方向控制把手的端點繪製為實心點、空心點或較大的實心點。 + With the Direct Selection tool, the anchor under the pointer is highlighted. 使用直接選取工具時,指標下方的錨點會醒目提示。 + Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected. 選取多個錨點時顯示方向控制把手;關閉時,僅在只選取一個錨點時顯示。 + Corner widgets hide on corners whose angle is greater than this many degrees. 角度大於此度數的轉角上隱藏轉角 Widget。 + The Pen tool previews the next segment from the last anchor to the pointer before you click. 按一下之前,筆型工具會預覽從最後一個錨點到指標的下一個區段。 + The Curvature tool previews the curve to the pointer before you place the next point. 放置下一個點之前,曲線工具會預覽到指標的曲線。 The unit for new documents from built-in sizes other than pixel sizes and for opened files that record no unit; choosing one here and clicking OK also sets the active document's units. 除像素尺寸外,以內建尺寸新增的文件及未記錄單位的已開啟檔案使用此單位;在此選擇並按下確定,也會變更目前文件的單位。 Stroke weights, dashes and gaps show in this unit, and numbers typed for them are read in it. 筆畫寬度、虛線和間隙以此單位顯示,為其輸入的數字也以此單位讀取。 Type sizes, leading and baseline shift show in this unit, and numbers typed for them are read in it. 字體大小、行距和基線位移以此單位顯示,為其輸入的數字也以此單位讀取。 The unit for East Asian type measurements, which no field uses yet. 用於東亞文字度量的單位,目前還沒有欄位使用。 When on, a number typed without a unit into a field in picas is read in points. 開啟後,在以派卡為單位的欄位中輸入的不含單位數字以點讀取。 With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options. 選擇 XML ID 時,圖層、變數和圖層選項中的物件名稱會顯示為 XML ID。 + Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply. 即使格點已隱藏,繪製、移動和縮放仍會靠齊格點的細分;開啟期間,「靠齊像素」不會作用。 + The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead. 未選取參考線的顏色;設定了參考線標籤的工作區域會以標籤顏色繪製自己的參考線。 + Draws guides as solid lines or as dots, including the guides already in the document. 將參考線繪製為實線或點,包括文件中已有的參考線。 + With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock. 開啟後,VectorCraft 啟動時參考線為鎖定狀態;變更此選項會立即鎖定或解除鎖定參考線,「檢視 › 參考線 › 鎖定參考線」仍可變更鎖定狀態。 + With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool. 開啟後,從尺標開始拖曳時按住 Cmd/Ctrl,只會在作用中的工作區域上建立參考線;使用工作區域工具時則建立貫穿整個畫布的參考線。 + The color of the grid; the lines between major gridlines are drawn in a fainter shade of it. 格點的顏色;主要格線之間的線條會以該顏色較淡的色調繪製。 + Draws the grid as lines, or as dots along the major gridlines at each subdivision. 將格點繪製為線條,或在每個細分處沿主要格線繪製為點。 + The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with. 所有已開啟文件和新文件中主要格線之間的距離;VectorCraft 文件開啟時會使用儲存時的格點。 + How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines. 每個主要格點方格分成幾份;即使縮放使這些線條不顯示,「靠齊格點」仍會靠齊這些分格。 + Draws the grid behind the artwork; off, the grid is drawn over it. 將格點繪製在圖稿後方;關閉時格點繪製在圖稿上方。 + In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork. 在像素預視中縮放至 600% 以上時,作用中的檢視會在圖稿上方沿文件每個像素的邊緣顯示線條。 + The color of the tile edge and the dashed swatch bounds shown while you edit a pattern. 編輯圖樣時顯示的拼貼邊緣和虛線色票邊界的顏色。 + Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead. 將繪製、移動和變形靠齊到附近的圖稿,並顯示參考線和標籤;像素預視會將其關閉,開啟靠齊格點時則改為靠齊格點。 + The color of Smart Guide lines and labels. 智慧型參考線的線條和標籤顏色。 + Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply. 沿著圖稿對齊的邊緣或中心顯示一條線;關閉時圖稿仍會對齊,只是不顯示線條,且靠齊字符不會作用。 + With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging. 使用選取工具且未拖曳時,以圖層顏色描出指標下未選取物件的外框。 + Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art. 縮放、旋轉、傾斜或鏡射圖稿時,在指標旁顯示尺寸或角度。 + While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from. 繪製時,點會靠齊到通過線段或形狀起點、依所選角度延伸的線上。 + The set of angles the construction guides follow while Construction Guides is on. 建構參考線開啟時,建構參考線所依循的角度組合。 + Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names. 顯示點靠齊的對象名稱,例如錨點、路徑或對齊;關閉時點仍以相同方式靠齊,只是不顯示名稱。 + Shows distances, angles and how far art has moved next to the pointer while you draw or move it. 繪製或移動時,在指標旁顯示距離、角度和圖稿移動的距離。 + Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps. 將移動或調整大小的圖稿靠齊到與附近物件之間相同的間距,並標示相等的間距。 + With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection. 選取物件後,在另一個物件或工作區域上按住 Alt/Option 會顯示它與選取範圍之間的距離。 + A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not. 拖回到距拖曳起點靠齊容許度以內的選取範圍會精確回到原處;複製的物件不會。 + How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom. 指標或拖曳的點在螢幕上需離圖稿多近,智慧型參考線才會靠齊;此距離在任何縮放比例下都相同。 + Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve. 靠齊線段的端點或從中心繪製的圓,使其與附近的曲線相切。 + Snaps the end of a line segment so that it meets a nearby straight segment at a right angle. 靠齊線段的端點,使其與附近的直線段成直角相交。 Reset all preferences to their defaults? 要將所有偏好設定重設為預設值嗎? The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. 在偏好設定中按下確定後才會套用預設值。在那裡按下取消會保留目前的偏好設定。 Restore Recovered Documents 還原找回的文件 @@ -6041,6 +6106,19 @@ lighting Light 光源 Transform Objects 變形物件 @msg unknown parameter `{key}`; did you mean `{near}`? 未知的參數 `{key}`;您是指 `{near}` 嗎? @msg unknown parameter `{key}`; the command takes no parameters 未知的參數 `{key}`;此指令沒有參數 +@msg unknown parameter `{key}`; `{object}` takes: {keys} 未知的參數 `{key}`;`{object}` 接受:{keys} +@msg unknown parameter `{key}`; {why_not} 未知的參數 `{key}`;{why_not} +@msg no format takes it (see document.formats) 沒有格式接受它 (請參閱 document.formats) +@msg no save format takes it (see file.formatOptions) 沒有儲存格式接受它 (請參閱 file.formatOptions) +@msg PDF doesn't take it (see document.formats) PDF 不接受它 (請參閱 document.formats) +@msg EPS doesn't take it (see document.formats) EPS 不接受它 (請參閱 document.formats) +@msg DXF doesn't take it (see document.formats) DXF 不接受它 (請參閱 document.formats) +@msg {name} must be {range} (got {v}) {name} 必須為 {range} (收到 {v}) +@msg The graphics processor tried first couldn't show the window, so VectorCraft started again on {summary} (Settings › Performance › Graphics Processor › Automatic uses the one that drives your display) 最先嘗試的圖形處理器無法顯示視窗,因此 VectorCraft 已改在 {summary} 上重新啟動 (設定 › 效能 › 圖形處理器 › 自動 會使用驅動顯示器的處理器) +@msg Sent “{title}” to {to} 已將 “{title}” 傳送至 {to} +@msg Sent “{title}” to {to}. The spooler replied: {note} 已將 “{title}” 傳送至 {to}。列印佇列的回覆:{note} +@msg the default printer 預設印表機 +@msg raster effects on object {object}: requested {requested} ppi, achieved {achieved} ppi due to the 64 million pixel cap 物件 {object} 上的點陣效果:要求 {requested} ppi,受 6400 萬像素上限限制,實際為 {achieved} ppi @msg unknown parameter `{key}`; the command takes: {keys} 未知的參數 `{key}`;此指令接受:{keys} @msg the params must be an object, not {got} 參數必須是物件,而不是 {got} @msg unknown parameter `{path}`; the object takes no keys 未知的參數 `{path}`;此物件不接受任何鍵 @@ -7498,6 +7576,11 @@ breakText Glyphs 字符 @msg Some islands could not be joined to the area around the art 部分孤島無法連接到圖稿周圍的區域 @msg `width` must be from {lo} to {hi} pt `width` 必須介於 {lo} 到 {hi} pt 之間 @msg `angle` must be from -180 to 180 degrees `angle` 必須介於 -180 到 180 度之間 +@msg `roundness` must be from 0 to 100% `roundness` 必須介於 0 到 100% 之間 +@msg `fidelity` must be from 0.01 to 100 pt `fidelity` 必須介於 0.01 到 100 pt 之間 +@msg style must be "pencil" or "brush" style 必須為 "pencil" 或 "brush" +@msg extend end must be "start" or "end" extend 的端點必須為 "start" 或 "end" +@msg connect end must be "start" or "end" connect 的端點必須為 "start" 或 "end" @msg `roundness` must be from 1 to 100% `roundness` 必須介於 1 到 100% 之間 @msg `count` must be a whole number from 1 to {MAX_BRIDGES_PER_ISLAND} `count` 必須是介於 1 到 {MAX_BRIDGES_PER_ISLAND} 的整數 Weed Box and Lines… 除廢框與除廢線… @@ -8015,8 +8098,6 @@ breakText Glyphs 字符 @msg unknown dither `{d}` (diffusion, pattern, noise or none) 未知的仿色 `{d}` (diffusion、pattern、noise 或 none) @msg unknown panel `{panel}` 未知的面板 `{panel}` @msg unknown parameter `{key}` 未知的參數 `{key}` -@msg unknown parameter `{within}settings.{format}`; {why} 未知的參數 `{within}settings.{format}`;{why} -@msg unknown parameter `{within}{key}`; {why} 未知的參數 `{within}{key}`;{why} @msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) 未知的縮減 `{reduction}` (selective、perceptual、adaptive、web、gray、blackWhite、uniform 或 document) @msg unmatched ')' 不成對的 ')' @msg unterminated character class 字元類別未結束 @@ -8388,7 +8469,6 @@ breakText Glyphs 字符 @msg anchor `smooth` must be true or false 錨點的 `smooth` 必須是 true 或 false @msg anchor `{key}` must be [x, y] 錨點的 `{key}` 必須是 [x, y] @msg anchor `{key}` must be a number 錨點的 `{key}` 必須是數字 -@msg angle and roundness must be finite angle 和 roundness 必須是有限值 @msg angles must be a list as long as pins (degrees or null) angles 必須是與 pins 等長的清單 (度數或 null) @msg appearance must be flat|center|edge appearance 必須是 flat|center|edge @msg apply is "fill" or "stroke", not `{other}` apply 是 "fill" 或 "stroke",而非 `{other}` @@ -9439,7 +9519,6 @@ breakText Glyphs 字符 @msg {label} must be a number from 1 to 10000 {label} 必須是 1 到 10000 之間的數字 @msg {name} `{s}`: {ids} {name} `{s}`:{ids} @msg {name} is built in and can't be deleted {name} 是內建項目,無法刪除 -@msg {name} must be {lo}–{hi}{unit} (got {v}) {name} 必須是 {lo}–{hi}{unit} (收到 {v}) @msg {name}: CRC or size mismatch {name}:CRC 或大小不相符 @msg {name}: only this Affinity file's embedded preview could be read; use File › Open to see it with its warning, or export SVG or PDF from Affinity before placing {name}:只能讀取此 Affinity 檔案的內嵌預視;請使用「檔案 › 開啟」查看它及其警告,或在置入前先從 Affinity 匯出 SVG 或 PDF @msg {name}: {e} {name}:{e} diff --git a/crates/ui-egui/src/panels/color_guide.rs b/crates/ui-egui/src/panels/color_guide.rs index b53bb36a08..28b0726920 100644 --- a/crates/ui-egui/src/panels/color_guide.rs +++ b/crates/ui-egui/src/panels/color_guide.rs @@ -41,6 +41,17 @@ pub struct SpotBase { pub swatch: String, /// The base's tint of it, 0..1. pub tint: f32, + /// The names it had before renames, oldest first (at most as many as the History panel keeps + /// states), for an Undo or Redo that gives it one of them back. + pub earlier: Vec, + /// Its swatch went without a command the panel followed: the link waits for an Undo or Redo + /// ([`check_spot`]). + pub resting: bool, +} + +/// Whether `name` is a spot color of `doc`. +fn is_spot(doc: &vectorcraft_doc::Document, name: &str) -> bool { + doc.swatch(name).is_some_and(|w| w.spot) && doc.global_color(name).is_some() } /// The spot color the base is a tint of, while its swatch is still a spot color of the active @@ -48,8 +59,7 @@ pub struct SpotBase { fn live_spot(app: &VectorcraftApp) -> Option<&SpotBase> { let s = app.ui.color_guide_spot.as_ref()?; let st = app.session.active()?; - let spot = st.doc.swatch(&s.swatch).is_some_and(|w| w.spot) && st.doc.global_color(&s.swatch).is_some(); - (st.uid == s.doc && spot).then_some(s) + (st.uid == s.doc && !s.resting && is_spot(&st.doc, &s.swatch)).then_some(s) } /// The color of tint `tint` (0..1) of global swatch `name` in the active document. @@ -79,20 +89,324 @@ pub(crate) fn choose_linked_base(app: &mut VectorcraftApp, c: Color, link: Optio app.ui.color_guide_spot = link.and_then(|(swatch, tint)| { let st = app.session.active()?; st.doc.swatch(&swatch).filter(|w| w.spot)?; - Some(SpotBase { doc: st.uid, swatch, tint: tint.clamp(0.0, 1.0) }) + Some(SpotBase { doc: st.uid, swatch, tint: tint.clamp(0.0, 1.0), earlier: Vec::new(), resting: false }) }); } -/// `swatch.edit` renamed swatch `from` of the active document to `to`: a spot color base linked to -/// it links to `to`. -pub(crate) fn swatch_renamed(app: &mut VectorcraftApp, from: &str, to: &str) { - let uid = app.session.active().map(|st| st.uid); - if let Some(s) = app.ui.color_guide_spot.as_mut() - && Some(s.doc) == uid - && s.swatch == from - { - s.swatch = to.to_string(); +/// The spot color base before a command runs ([`before_command`]). +pub(crate) struct LinkBefore { + /// Its document is the active one. + active: bool, + /// The color group that holds its swatch. + group: Option, + /// The color the guide shows as the base. + color: Option, + /// The open documents' `uid`s in order, while there is a spot color base. + docs: Vec, + /// The active document's index. + active_index: Option, +} + +/// The spot color base before a command runs, for [`after_command`]. +pub(crate) fn before_command(app: &VectorcraftApp) -> LinkBefore { + let s = app.ui.color_guide_spot.as_ref(); + let active = app.session.active().is_some_and(|st| s.is_some_and(|s| s.doc == st.uid)); + // Its document, active or not. + let st = s.and_then(|s| app.session.documents().iter().find(|d| d.uid == s.doc)); + let group = + st.zip(s).and_then(|(st, s)| st.doc.swatch_groups.iter().find(|g| g.swatches.iter().any(|w| w.name == s.swatch)).map(|g| g.name.clone())); + let docs = if s.is_some() { app.session.documents().iter().map(|d| d.uid).collect() } else { Vec::new() }; + // The color it shows: its swatch's tint in its document, while that is a spot color there. + let shown = st + .zip(s) + .filter(|(st, s)| st.doc.swatch(&s.swatch).is_some_and(|w| w.spot)) + .and_then(|(st, s)| st.doc.tint_paint(&s.swatch, s.tint)?.color()); + let color = s.map(|_| shown.unwrap_or_else(|| base_color(app))); + LinkBefore { active, group, color, docs, active_index: app.session.active_index() } +} + +/// Where the steps of a `command.batch` run, as far as the steps before each one show: new +/// documents open after the others and become the active one, and Close and Move Document shift +/// the documents after them. +struct BatchDocs { + /// The tab index of the base's document, when known. + base: Option, + /// The base's document was closed. + closed: bool, + /// The tab index of the active document, when known. + active: Option, + /// The number of open documents, when known. + len: Option, +} + +impl BatchDocs { + /// Whether the next step runs in the base's document, when that is known. + fn in_base(&self) -> Option { + if self.closed { + return Some(false); + } + Some(self.active? == self.base?) } + + /// Follow step `id`, which ran with params `p` and replied `r`. + fn step(&mut self, id: &str, p: &Value, r: &Value) { + let index = |key: &str| p[key].as_u64().and_then(|i| usize::try_from(i).ok()); + // The tab index a step that opens a document replies with: a new one after the others, or + // one already open made active. + let opened = r["index"].as_u64().and_then(|i| usize::try_from(i).ok()); + match id { + "document.activate" => self.active = index("index"), + "file.new" | "file.newFromTemplate" | "edit.newDocumentFromState" => { + self.len = self.len.map(|n| n + 1); + self.active = opened.or(self.len.map(|n| n - 1)); + } + "file.close" | "document.close" => { + let i = index("index").or(self.active); + let len = self.len.map(|n| n.saturating_sub(1)); + match (i, self.base) { + (Some(i), Some(b)) if i == b => (self.closed, self.base) = (true, None), + (Some(i), Some(b)) if i < b => self.base = Some(b - 1), + (Some(_), Some(_)) => {} + _ => self.base = None, + } + // Closing another document keeps the active one; closing the active one makes the + // one at its index active (the last one when it was last). + self.active = match (i, self.active) { + (Some(i), Some(a)) if i != a => Some(if i < a { a - 1 } else { a }), + (Some(i), Some(_)) => len.and_then(|n| n.checked_sub(1)).map(|last| i.min(last)), + _ => None, + }; + self.len = len; + } + "file.closeAll" => self.closed = true, + "document.move" => { + let moved = |x: usize, from: usize, to: usize| { + if x == from { + return to; + } + let x = if from < x { x - 1 } else { x }; + if to <= x { x + 1 } else { x } + }; + match (index("from").or(self.active), index("to"), self.len) { + (Some(from), Some(to), Some(n)) if n > 0 => { + let to = to.min(n - 1); + self.base = self.base.map(|b| moved(b, from, to)); + self.active = self.active.map(|a| moved(a, from, to)); + } + _ => (self.base, self.active) = (None, None), + } + } + _ if id.starts_with("file.open") + || id.starts_with("recovery.") + || matches!(id, "document.open" | "document.compare" | "stroke.arrowheads.edit") => + { + match (opened, self.len) { + (Some(i), Some(n)) if i <= n => (self.active, self.len) = (Some(i), Some(n.max(i + 1))), + _ => (self.active, self.len) = (None, None), + } + } + _ => {} + } + } +} + +/// The name the spot color base's swatch `name` of document `base` has after a `command.batch` +/// ran `steps` and replied `results`, or `None` when a step may have +/// removed it or made it a process color ([`follow_step`]). Steps in the base's document are +/// followed and steps in another document are skipped. A step in a document that is not known +/// keeps the name, and a rename there adds a second name to choose from once the batch is done: +/// the one that is a spot color of the base's document. Scripts and plug-ins may do anything, so +/// they end the link. +fn follow_batch(app: &VectorcraftApp, base: u64, name: String, steps: &[Value], results: &[Value], before: &LinkBefore) -> Option { + let mut group = before.group.clone(); + let at = before.docs.iter().position(|&u| u == base); + let mut docs = BatchDocs { base: at, closed: at.is_none(), active: before.active_index, len: Some(before.docs.len()) }; + let mut names = vec![name]; + for (i, step) in steps.iter().enumerate() { + let sid = step["command"].as_str().unwrap_or_default(); + let (p, r) = (&step["params"], results.get(i).unwrap_or(&Value::Null)); + if sid.starts_with("script.") || sid.starts_with("plugin.") { + return None; + } + match docs.in_base() { + Some(true) => { + let one = names.len() == 1; + let mut next = Vec::with_capacity(names.len()); + for n in names { + let mut scratch = group.clone(); + next.push(follow_step(sid, p, r, n, if one { &mut group } else { &mut scratch })?); + } + names = next; + } + Some(false) => {} + None => { + // The step may have run elsewhere, so the name stays a candidate whatever the step + // did; a rename adds the new name. + let mut next = Vec::with_capacity(names.len() + 1); + for n in names { + if let Some(m) = follow_step(sid, p, r, n.clone(), &mut group.clone()) + && m != n + { + next.push(m); + } + next.push(n); + } + next.sort(); + next.dedup(); + names = next; + } + } + docs.step(sid, p, r); + } + if names.len() == 1 { + return names.pop(); + } + // The one name that is a spot color of the base's document. + let st = app.session.documents().iter().find(|d| d.uid == base)?; + let mut spots = names.into_iter().filter(|n| is_spot(&st.doc, n)); + let first = spots.next()?; + spots.next().is_none().then_some(first) +} + +/// Command `id` ran with `params` and replied `reply`: a spot color base linked to a swatch that +/// Swatch Options renamed links to the new name, and one whose swatch a command deleted or made a +/// process color is no longer linked to it, so a later spot color of the same name does not +/// become the base; the base keeps the color it showed. A `command.batch`'s steps are followed in +/// order ([`follow_batch`]). +pub(crate) fn after_command(app: &mut VectorcraftApp, id: &str, params: &Value, reply: &Value, before: LinkBefore) { + let Some(s) = app.ui.color_guide_spot.as_ref() else { return }; + let (base, n) = (s.doc, s.swatch.clone()); + let name = if id == "command.batch" { + let steps = params["commands"].as_array().map(Vec::as_slice).unwrap_or_default(); + let results = reply["results"].as_array().map(Vec::as_slice).unwrap_or_default(); + follow_batch(app, base, n, steps, results, &before) + } else if before.active { + follow_step(id, params, reply, n, &mut before.group.clone()) + } else { + Some(n) + }; + let keep = usize::try_from(app.session.prefs.history_states).unwrap_or(usize::MAX).max(1); + let Some(s) = app.ui.color_guide_spot.as_mut() else { return }; + match name { + Some(n) => { + if n != s.swatch { + let old = std::mem::replace(&mut s.swatch, n); + s.earlier.retain(|e| *e != old && *e != s.swatch); + s.earlier.push(old); + if s.earlier.len() > keep { + s.earlier.drain(..s.earlier.len() - keep); + } + } + } + None => app.ui.color_guide_spot = None, + } + let undo = |id: &str| matches!(id, "edit.undo" | "edit.redo"); + let undone = undo(id) + || (id == "command.batch" + && params["commands"].as_array().is_some_and(|a| a.iter().any(|st| undo(st["command"].as_str().unwrap_or_default())))); + check_spot(app, if undone { Ran::UndoRedo } else { Ran::Command }); + if app.ui.color_guide_spot.is_none() + && let Some(c) = before.color + { + app.ui.color_guide_base = Some(c); + } +} + +/// The name swatch `name` (in color group `group`) has after command `id` ran with `params` and +/// replied `reply` in its document, or `None` when the command may have removed it or made it a +/// process color: Swatch Options making it a process color, Delete Swatch naming it or its group, +/// Merge Swatches merging it into another and Edit Color Group leaving it out of its group. +/// `group` follows the step: New Color Group, Move Swatch, Edit Color Group and Ungroup Color +/// Group. +fn follow_step(id: &str, p: &Value, reply: &Value, name: String, group: &mut Option) -> Option { + let ours = |v: &Value| v == name.as_str(); + let in_group = |key: &str| group.as_deref().is_some_and(|g| p[key] == g); + let named = |key: &str| p[key].as_array().is_some_and(|a| a.iter().any(|n| ours(n) || group.as_deref().is_some_and(|g| n == g))); + let members = |key: &str| reply[key].as_array().is_some_and(|a| a.iter().any(ours)); + let removed = match id { + "swatch.edit" => ours(&p["name"]) && p["spot"] == false, + "swatch.delete" => ours(&p["name"]) || in_group("name") || named("names"), + "swatch.merge" => named("names") && !ours(&p["names"][0]), + "swatch.editGroup" => in_group("group") && !members("swatches"), + _ => false, + }; + if removed { + return None; + } + // The color group that holds it after the step. + let moved = match id { + "swatch.newGroup" | "swatch.editGroup" if members("swatches") => Some(reply["name"].as_str().map(str::to_string)), + "swatch.ungroup" if in_group("name") => Some(None), + "swatch.move" if ours(&p["name"]) || p["names"].as_array().is_some_and(|a| a.iter().any(ours)) => { + Some(p["group"].as_str().map(str::to_string)) + } + _ => None, + }; + if let Some(m) = moved { + *group = m; + } + // A rename by Swatch Options, or of the swatch Merge Swatches keeps. + let renamed = match id { + "swatch.edit" if p["name"] == name.as_str() => reply["name"].as_str(), + "swatch.merge" if p["names"][0] == name.as_str() => reply["name"].as_str(), + _ => None, + }; + Some(renamed.map_or(name, str::to_string)) +} + +/// What ran before the spot color base's link is checked ([`check_spot`]). +#[derive(Clone, Copy, PartialEq)] +pub(crate) enum Ran { + /// Nothing the panel followed: a frame of the panel (a script's commands, for example). + Frame, + /// A command other than Undo and Redo. + Command, + /// Undo or Redo, or a batch with one of them. + UndoRedo, +} + +/// Check the spot color base's link after `ran`. A closed document ends it. When its swatch is no +/// longer a spot color of its document (deleted, renamed or made a process color by something the +/// panel did not follow), after an Undo or Redo a name it had before that is one again takes its +/// place (an Undo or Redo of a rename); otherwise the link rests until an Undo or Redo makes it a spot color again, and +/// the next other command ends it. The base keeps the color it last showed. +pub(crate) fn check_spot(app: &mut VectorcraftApp, ran: Ran) { + let Some(s) = app.ui.color_guide_spot.as_mut() else { return }; + if !app.session.documents().iter().any(|d| d.uid == s.doc) { + app.ui.color_guide_spot = None; + return; + } + let Some(st) = app.session.active().filter(|st| st.uid == s.doc) else { return }; + if s.resting && ran != Ran::UndoRedo { + if ran == Ran::Command { + app.ui.color_guide_spot = None; + } + return; + } + if ran == Ran::UndoRedo && !is_spot(&st.doc, &s.swatch) { + // An Undo or Redo of a rename gave it a name it had before. + if let Some(i) = s.earlier.iter().rposition(|n| is_spot(&st.doc, n)) { + let name = s.earlier.remove(i); + let gone = std::mem::replace(&mut s.swatch, name); + s.earlier.push(gone); + } + } + if is_spot(&st.doc, &s.swatch) { + s.resting = false; + // Kept for when the link ends where the color can no longer be read (a closed document). + if let Some(c) = st.doc.tint_paint(&s.swatch, s.tint).and_then(|p| p.color()) { + app.ui.color_guide_base = Some(c); + } + return; + } + if ran != Ran::Command { + s.resting = true; + return; + } + if let Some(c) = st.doc.tint_paint(&s.swatch, s.tint).and_then(|p| p.color()) { + app.ui.color_guide_base = Some(c); + } + app.ui.color_guide_spot = None; } /// The global swatch and tint (0..1) a solid paint links to. @@ -295,6 +609,7 @@ fn save_group(app: &mut VectorcraftApp, ctx: &egui::Context) { pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { let t = crate::theme::Tokens::get(ui.ctx()); let ctx = ui.ctx().clone(); + check_spot(app, Ran::Frame); // The current color becomes the base when the panel first shows; selecting artwork later // leaves it as it is. if app.ui.color_guide_base.is_none() { @@ -938,6 +1253,315 @@ mod tests { app.run("swatch.edit", json!({"name": "Deep Ink", "color": "#cc0000"})).unwrap(); let red = app.session.active().unwrap().doc.global_color("Deep Ink").unwrap(); assert_eq!(base_color(&app), red, "the base follows the renamed spot color"); + // Renames in a batch, in step order. + let steps = json!([ + {"command": "swatch.edit", "params": {"name": "Deep Ink", "newName": "Ink A"}}, + {"command": "swatch.edit", "params": {"name": "Ink A", "newName": "Ink B"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + let Paint::Solid { swatch, .. } = cell_paint(&app, &guide(&app, &ctx), 0, c + 1).unwrap() else { panic!("a solid") }; + assert_eq!(swatch.as_deref(), Some("Ink B"), "renamed in a batch"); + } + + /// Deleting the spot color, or making it a process color, ends the base's link: a new spot color + /// of the same name, or the swatch made a spot color again, gives process colors until it is + /// chosen again. + #[test] + fn a_deleted_spot_color_ends_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + assert!(linked(&app, &ctx)); + app.run("swatch.delete", json!({"name": "Ink"})).unwrap(); + app.run("swatch.new", json!({"name": "Ink", "color": "#00cc66", "spot": true})).unwrap(); + assert!(!linked(&app, &ctx), "a new spot color of the same name"); + assert!(app.ui.color_guide_spot.is_none()); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(&mut app, ink, Some(("Ink".to_string(), 1.0))); + assert!(linked(&app, &ctx)); + app.run("swatch.edit", json!({"name": "Ink", "spot": false, "global": false})).unwrap(); + app.run("swatch.edit", json!({"name": "Ink", "spot": true})).unwrap(); + assert!(!linked(&app, &ctx), "a spot color again"); + // The same in a batch: a step that deletes the swatch, or one that makes it a process color. + let relink = |app: &mut VectorcraftApp| { + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(app, ink, Some(("Ink".to_string(), 1.0))); + }; + for steps in [ + json!([ + {"command": "swatch.edit", "params": {"name": "Ink", "newName": "Ink 2"}}, + {"command": "swatch.delete", "params": {"name": "Ink 2"}}, + {"command": "swatch.new", "params": {"name": "Ink 2", "color": "#cc6600", "spot": true}}, + {"command": "swatch.edit", "params": {"name": "Ink 2", "newName": "Ink"}}, + ]), + json!([ + {"command": "swatch.edit", "params": {"name": "Ink", "spot": false, "global": false}}, + {"command": "swatch.edit", "params": {"name": "Ink", "spot": true}}, + ]), + ] { + relink(&mut app); + assert!(linked(&app, &ctx)); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "{steps}"); + } + // A batch that edits the spot color's values and deletes another swatch keeps the link. + relink(&mut app); + app.run("swatch.new", json!({"name": "Spare", "color": "#999999"})).unwrap(); + let steps = json!([ + {"command": "swatch.edit", "params": {"name": "Ink", "color": "#cc0000"}}, + {"command": "swatch.delete", "params": {"name": "Spare"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "an unrelated batch"); + // `global: false` leaves a spot color global, so the link stays. + let steps = json!([{"command": "swatch.edit", "params": {"name": "Ink", "global": false}}, {"command": "swatch.sortByName"}]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "global: false on a spot color"); + // Closing its document ends the link, and the base keeps the color it showed. + app.run("swatch.edit", json!({"name": "Ink", "color": "#00aa00"})).unwrap(); + let shown = base_color(&app); + // Closed the way the tab's close button closes it, outside `app.run`. + app.session.execute("file.new", &json!({})).unwrap(); + app.session.execute("file.close", &json!({"index": 0})).unwrap(); + frame(&mut app, &ctx); + assert_eq!(app.session.documents().len(), 1); + assert!(app.ui.color_guide_spot.is_none(), "its document closed"); + assert_eq!(base_color(&app), shown, "the color it showed before the close"); + } + + /// An Undo or a Redo of a rename keeps the spot color base's link under the name the swatch has + /// again, also after more renames than a short list would hold and after a rename the panel did + /// not follow (a script's); another command after such a rename ends the link. + #[test] + fn an_undone_rename_keeps_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + let spot_name = |app: &VectorcraftApp| app.ui.color_guide_spot.as_ref().map(|s| s.swatch.clone()); + app.run("swatch.edit", json!({"name": "Ink", "newName": "Ink U"})).unwrap(); + app.run("edit.undo", json!({})).unwrap(); + assert!(linked(&app, &ctx), "a rename undone"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink")); + app.run("edit.redo", json!({})).unwrap(); + assert!(linked(&app, &ctx), "a rename redone"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink U")); + app.run("edit.undo", json!({})).unwrap(); + // Forty renames undone one by one. + for i in 0..40 { + let from = if i == 0 { "Ink".to_string() } else { format!("Ink {i}") }; + app.run("swatch.edit", json!({"name": from, "newName": format!("Ink {}", i + 1)})).unwrap(); + } + for _ in 0..40 { + app.run("edit.undo", json!({})).unwrap(); + } + assert_eq!(spot_name(&app).as_deref(), Some("Ink"), "forty renames undone"); + assert!(linked(&app, &ctx)); + // A rename the panel did not follow: the link rests, and the Undo brings it back. + app.session.execute("swatch.edit", &json!({"name": "Ink", "newName": "Ink S"})).unwrap(); + frame(&mut app, &ctx); + assert!(!linked(&app, &ctx), "resting"); + app.run("edit.undo", json!({})).unwrap(); + assert!(linked(&app, &ctx), "an unfollowed rename undone"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink")); + // Another command while it rests ends it. + app.session.execute("swatch.edit", &json!({"name": "Ink", "newName": "Ink S"})).unwrap(); + frame(&mut app, &ctx); + app.run("swatch.new", json!({"name": "Spare", "color": "#999999"})).unwrap(); + assert!(app.ui.color_guide_spot.is_none(), "another command while it rests"); + // Outside an Undo or Redo, a new spot color with an earlier name does not take its place. + app.run("swatch.edit", json!({"name": "Ink S", "newName": "Ink"})).unwrap(); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(&mut app, ink, Some(("Ink".to_string(), 1.0))); + app.run("swatch.edit", json!({"name": "Ink", "newName": "Ink U"})).unwrap(); + app.run("swatch.new", json!({"name": "Ink", "color": "#00cc66", "spot": true})).unwrap(); + app.session.execute("swatch.edit", &json!({"name": "Ink U", "newName": "Ink V"})).unwrap(); + frame(&mut app, &ctx); + assert!(!linked(&app, &ctx), "a new spot color with an earlier name"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink U")); + } + + /// A `command.batch` that switches, opens, closes or moves documents follows the spot color + /// base's swatch in its own document and leaves the link alone for steps in the others. + #[test] + fn a_batch_follows_the_spot_color_across_documents() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + let relink = |app: &mut VectorcraftApp| { + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(app, ink, Some(("Ink".to_string(), 1.0))); + }; + assert!(linked(&app, &ctx)); + // Undo, Activate Document and New in a batch keep the link while the swatch is a spot color, + // and the steps in the base's document are still followed. + app.run("swatch.new", json!({"name": "Spare 2", "color": "#777777"})).unwrap(); + let steps = json!([ + {"command": "edit.undo"}, + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.sortByName"}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "an undo, an activate and a sort"); + let steps = json!([ + {"command": "file.new"}, + {"command": "swatch.new", "params": {"name": "Other", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Other"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "steps in a new document"); + let spot_name = |app: &VectorcraftApp| app.ui.color_guide_spot.as_ref().map(|s| s.swatch.clone()); + let steps = json!([ + {"command": "file.new"}, + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.edit", "params": {"name": "Ink", "newName": "Ink C"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "renamed after a new document"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink C")); + // Moves and closes shift the tabs: [base, 1, 2] becomes [1, 2, base], then [2, base], then + // [base, 2]; the steps in tab 2 leave the link alone. + let steps = json!([ + {"command": "document.move", "params": {"from": 0, "to": 2}}, + {"command": "document.activate", "params": {"index": 2}}, + {"command": "swatch.edit", "params": {"name": "Ink C", "newName": "Ink M"}}, + {"command": "file.close", "params": {"index": 0}}, + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.new", "params": {"name": "Ink M", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Ink M"}}, + {"command": "document.activate", "params": {"index": 1}}, + {"command": "document.move", "params": {"from": 1, "to": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert_eq!(app.session.active_index(), Some(0)); + assert!(linked(&app, &ctx), "moved and closed tabs"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink M")); + app.run("swatch.edit", json!({"name": "Ink M", "newName": "Ink"})).unwrap(); + assert!(linked(&app, &ctx), "renamed back"); + // A batch that starts in another document follows the base's color group too. + app.run("swatch.newGroup", json!({"name": "Held", "swatches": ["Ink"]})).unwrap(); + app.run("document.activate", json!({"index": 1})).unwrap(); + let steps = json!([ + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.delete", "params": {"names": ["Held"]}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#cc6600", "spot": true}}, + {"command": "document.activate", "params": {"index": 1}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + app.run("document.activate", json!({"index": 0})).unwrap(); + assert!(!linked(&app, &ctx), "its group deleted in a batch that started elsewhere"); + relink(&mut app); + // Where an opened document's steps run is not known: deleting a swatch of the same name + // there keeps the link. + let svg = r#""#; + let steps = json!([ + {"command": "document.open", "params": {"name": "a.svg", "dataBase64": vectorcraft_format::base64_encode(svg.as_bytes())}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "deleted in an opened document"); + // The opened document's tab is known from its reply: a rename there is not the base's, + // even when the base's document has spot colors of both names. + app.run("swatch.new", json!({"name": "Ink Alt", "color": "#654321", "spot": true})).unwrap(); + let steps = json!([ + {"command": "document.open", "params": {"name": "b.svg", "dataBase64": vectorcraft_format::base64_encode(svg.as_bytes())}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + {"command": "swatch.edit", "params": {"name": "Ink", "newName": "Ink Alt"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "renamed in an opened document"); + assert_eq!(spot_name(&app).as_deref(), Some("Ink")); + // Deleted by a batch that starts in another tab: the base keeps the color it showed. + app.run("swatch.edit", json!({"name": "Ink", "color": "#00aa00"})).unwrap(); + let shown = base_color(&app); + app.run("document.activate", json!({"index": 1})).unwrap(); + let steps = json!([ + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(app.ui.color_guide_spot.is_none()); + assert_eq!(base_color(&app), shown, "the edited color"); + app.run("swatch.new", json!({"name": "Ink", "color": "#cc0000", "spot": true})).unwrap(); + relink(&mut app); + let steps = json!([ + {"command": "document.activate", "params": {"index": 1}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + {"command": "document.activate", "params": {"index": 0}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(linked(&app, &ctx), "a swatch of the same name deleted in another document"); + let steps = json!([ + {"command": "document.activate", "params": {"index": 0}}, + {"command": "swatch.delete", "params": {"name": "Ink"}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#123456", "spot": true}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "deleted after an activate"); + relink(&mut app); + assert!(linked(&app, &ctx)); + } + + /// Deleting the color group that holds the spot color base's swatch ends the link; an Edit + /// Color Group that keeps it does not. + #[test] + fn a_deleted_color_group_ends_the_link() { + let mut app = spot_app(1.0); + let ctx = egui::Context::default(); + frame(&mut app, &ctx); + let c = guide(&app, &ctx).centre(); + let linked = |app: &VectorcraftApp, ctx: &egui::Context| { + matches!(cell_paint(app, &guide(app, ctx), 0, c + 1).unwrap(), Paint::Solid { swatch: Some(_), .. }) + }; + let relink = |app: &mut VectorcraftApp| { + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + choose_linked_base(app, ink, Some(("Ink".to_string(), 1.0))); + }; + // Deleting the color group that holds it, then a new spot color of the same name. + app.run("swatch.newGroup", json!({"name": "Inks", "swatches": ["Ink"]})).unwrap(); + assert!(linked(&app, &ctx), "moved into a group"); + let steps = json!([ + {"command": "swatch.delete", "params": {"names": ["Inks"]}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#cc6600", "spot": true}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "its group deleted"); + // Moved into a group and the group deleted in the same batch. + relink(&mut app); + let steps = json!([ + {"command": "swatch.newGroup", "params": {"name": "Spots", "swatches": ["Ink"]}}, + {"command": "swatch.delete", "params": {"names": ["Spots"]}}, + {"command": "swatch.new", "params": {"name": "Ink", "color": "#336699", "spot": true}}, + ]); + app.run("command.batch", json!({"commands": steps})).unwrap(); + assert!(!linked(&app, &ctx), "moved into a group that was deleted"); + // Edit Color Group that keeps it, with a new group name, keeps the link. + relink(&mut app); + app.run("swatch.newGroup", json!({"name": "Spots", "swatches": ["Ink"]})).unwrap(); + let ink = app.session.active().unwrap().doc.global_color("Ink").unwrap(); + app.run("swatch.editGroup", json!({"group": "Spots", "colors": [ink.to_hex()], "rename": "Spot Inks"})).unwrap(); + assert!(linked(&app, &ctx), "a group edit that keeps it"); + // A deleted base keeps the color it showed after an edit. + app.run("swatch.edit", json!({"name": "Ink", "color": "#cc0000"})).unwrap(); + let shown = base_color(&app); + app.run("swatch.delete", json!({"name": "Ink"})).unwrap(); + assert_eq!(base_color(&app), shown, "the color it showed"); } /// Save Colors as Swatches and Save Color Group save a spot color base's tints as tint swatches diff --git a/crates/ui-egui/src/panels/gradient.rs b/crates/ui-egui/src/panels/gradient.rs index e0e032c086..7baaa062ab 100644 --- a/crates/ui-egui/src/panels/gradient.rs +++ b/crates/ui-egui/src/panels/gradient.rs @@ -815,7 +815,7 @@ fn ramp(app: &mut VectorcraftApp, ui: &mut Ui, g: &Gradient, is_grad: bool, w: f let add_resp = ui.interact(below, ui.scope_id().with("grad-add"), Sense::click()); let bar_resp = ui.interact(bar, ui.scope_id().with("grad-bar"), Sense::click()); if add_resp.hovered() && is_grad { - ui.ctx().set_cursor_icon(egui::CursorIcon::Copy); + crate::cursors::set_add_cursor(app, ui.ctx()); } if !is_grad && (bar_resp.clicked() || add_resp.clicked()) { edit(app, json!({}), Live::Released); diff --git a/crates/ui-egui/src/panels/gradient/tests.rs b/crates/ui-egui/src/panels/gradient/tests.rs index 14a711bf57..bbf833b1aa 100644 --- a/crates/ui-egui/src/panels/gradient/tests.rs +++ b/crates/ui-egui/src/panels/gradient/tests.rs @@ -915,3 +915,43 @@ fn a_stop_dragged_off_the_ramp_or_deleted_with_the_button_beside_it_goes() { p.click(&mut app, del.center()); assert_eq!(hexes(&app), ["#ffffff", "#000000"]); } + +/// #8241: over the strip under the ramp, where a click adds a stop, the panel shows the white arrow +/// with a plus. Where the window shows glyphs as OS cursors (Windows, X11), it hands the glyph to +/// the OS, since winit shows the plain arrow for the system copy cursor there; elsewhere the +/// system copy cursor. Over the ramp itself, which adds nothing, neither. +#[test] +fn the_strip_under_the_ramp_shows_the_add_cursor() { + let stops = json!([{"offset": 0, "color": "#ffffff"}, {"offset": 1, "color": "#000000"}]); + let mut app = app(json!({"gradient": {"stops": stops}})); + let mut p = Panel::new(); + p.frame(&mut app, vec![], Modifiers::NONE); + let bar = p.widget("grad-bar"); + let output = |p: &mut Panel, app: &mut VectorcraftApp, at: Pos2| { + p.time += 0.1; + let events = vec![Event::PointerMoved(at)]; + let input = egui::RawInput { + time: Some(p.time), + events, + screen_rect: Some(Rect::from_min_size(Pos2::ZERO, vec2(260.0, 600.0))), + ..Default::default() + }; + let mut out = p.ctx.run_ui(input, |ui| show(app, ui)); + out.textures_delta.clear(); + out.platform_output + }; + // Between the two stops, just under the ramp. + let under = output(&mut p, &mut app, pos2(bar.center().x, bar.bottom() + 10.0)); + assert_eq!(under.cursor_icon, egui::CursorIcon::Copy); + // The same condition the panel uses (the build, Wayland, VECTORCRAFT_SYSTEM_CURSORS). + if crate::cursors::add_cursor_is_a_glyph(&app) { + let glyph = app.canvas.cursors.get(vectorcraft_tools::Cursor::GroupSelection, 1.0); + assert!(glyph.is_some()); + assert_eq!(under.cursor_image, glyph, "the white arrow with a plus, as an OS cursor"); + } else { + assert!(under.cursor_image.is_none(), "the system copy cursor alone"); + } + let over = output(&mut p, &mut app, bar.center()); + assert_ne!(over.cursor_icon, egui::CursorIcon::Copy); + assert!(over.cursor_image.is_none(), "over the ramp, no add cursor"); +} diff --git a/crates/ui-egui/src/panels/layers.rs b/crates/ui-egui/src/panels/layers.rs index 48f7a5f624..a2494a8a18 100644 --- a/crates/ui-egui/src/panels/layers.rs +++ b/crates/ui-egui/src/panels/layers.rs @@ -380,6 +380,19 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { { drag_ghost(ui, &view, widgets::ghost_row(ids, grabbed), pos); } + let alt = ui.input(|i| i.modifiers.alt); + let over_list = ui.input(|i| i.pointer.hover_pos()).is_some_and(|p| list_rect.contains(p)); + if !released + && let Some(drag) = egui::DragAndDrop::payload::(ui.ctx()) + && let Some(cursor) = drag_cursor(&drag, alt, over_list) + { + // The copy cursor is the panels' add cursor, which Windows can show (#8217, #8241). + if cursor == egui::CursorIcon::Copy { + crate::cursors::set_add_cursor(app, ui.ctx()); + } else { + ui.ctx().set_cursor_icon(cursor); + } + } // Keyboard: Delete removes the highlighted rows while the panel has the keyboard (a row was // clicked last, not the canvas). // The panel keeps it while it is drawn ([`super::has_row_keys`]); the app's shortcuts leave @@ -411,6 +424,19 @@ pub fn show(app: &mut VectorcraftApp, ui: &mut Ui) { see_selection(app, ui, selected); } +/// The cursor while `drag` is held (`alt` down, `over_list`: the pointer is over the rows): the +/// copy cursor where a drop copies, as a drop in the list with Alt does, else the grabbing hand. +/// The trash and New Layer ignore Alt, so outside the list the hand stays. Read every frame, as +/// the drop reads Alt when it lands (#8217). None for guide rows, which never copy and set their +/// own cursor. +fn drag_cursor(drag: &LayersDrag, alt: bool, over_list: bool) -> Option { + match drag { + LayersDrag::Rows(_) | LayersDrag::Art if alt && over_list => Some(egui::CursorIcon::Copy), + LayersDrag::Rows(_) | LayersDrag::Art => Some(egui::CursorIcon::Grabbing), + LayersDrag::Guides(_) => None, + } +} + /// The search typed into the Layers panel's Search All field, as the panel matches it. fn search_query(ctx: &egui::Context) -> String { ctx.data(|d| d.get_temp::(egui::Id::unique("layers-search"))).unwrap_or_default().trim().to_lowercase() diff --git a/crates/ui-egui/src/panels/layers/rows.rs b/crates/ui-egui/src/panels/layers/rows.rs index f019611857..f113329e4c 100644 --- a/crates/ui-egui/src/panels/layers/rows.rs +++ b/crates/ui-egui/src/panels/layers/rows.rs @@ -446,9 +446,7 @@ pub(super) fn row(ui: &mut Ui, view: &View, item: &Row, out: &mut Out) { d.insert_temp(key("grabbed"), n.id); }); } - if resp.dragged_by(egui::PointerButton::Primary) { - ui.ctx().set_cursor_icon(egui::CursorIcon::Grabbing); - } + // The cursor of a row drag is the panel's ([`super::drag_cursor`]): Alt can change it on any frame. drop_target(ui, view, n, r, x - 16.0, open, &resp, out); } diff --git a/crates/ui-egui/src/panels/layers/tests.rs b/crates/ui-egui/src/panels/layers/tests.rs index 4de9a85317..a29551c170 100644 --- a/crates/ui-egui/src/panels/layers/tests.rs +++ b/crates/ui-egui/src/panels/layers/tests.rs @@ -1544,6 +1544,57 @@ fn dragging_rows_moves_them_into_other_layers_and_alt_copies() { let _ = (layer, c); } +/// One headless frame of the panel with `events` (Alt held when `alt`) → the cursor it asks for, +/// and the cursor bitmap it hands the OS, if any. +fn cursor_frame( + app: &mut VectorcraftApp, + ctx: &egui::Context, + events: Vec, + alt: bool, +) -> (egui::CursorIcon, Option) { + let mut events = events; + events.insert(0, egui::Event::ModifiersChanged(egui::Modifiers { alt, ..Default::default() })); + let mut out = ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| show(app, ui)); + out.textures_delta.clear(); + (out.platform_output.cursor_icon, out.platform_output.cursor_image) +} + +/// #8217: a row dragged over the list shows the copy cursor while Alt is held, as the drop then +/// copies, and the grabbing hand otherwise, following Alt as it goes down and up mid-drag. The copy +/// cursor is the panels' add cursor (#8241): where the window shows glyphs as OS cursors (Windows, +/// X11, which have no system copy cursor winit can show), the white arrow with a plus. +#[test] +fn alt_shows_the_copy_cursor_while_rows_are_dragged() { + let (mut app, _) = nested(); + let ctx = egui::Context::default(); + // Rows: Layer 1, Sub, g, b, a, c. + let (circles, _) = frame(&mut app, &ctx, vec![], false); + assert_eq!(circles.len(), 6); + let (from, to) = (egui::pos2(150.0, circles[2].y), egui::pos2(150.0, circles[5].y)); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from)], false); + frame(&mut app, &ctx, vec![button(from, true)], false); + frame(&mut app, &ctx, vec![egui::Event::PointerMoved(from + vec2(0.0, 6.0))], false); + let glyph = crate::cursors::add_cursor_is_a_glyph(&app).then(|| app.canvas.cursors.get(vectorcraft_tools::Cursor::GroupSelection, 1.0)).flatten(); + assert_eq!(cursor_frame(&mut app, &ctx, vec![egui::Event::PointerMoved(to)], false), (egui::CursorIcon::Grabbing, None), "a move"); + assert_eq!(cursor_frame(&mut app, &ctx, vec![], true), (egui::CursorIcon::Copy, glyph), "Alt held: the drop copies"); + assert_eq!(cursor_frame(&mut app, &ctx, vec![], false), (egui::CursorIcon::Grabbing, None), "Alt let go: a move again"); + cursor_frame(&mut app, &ctx, vec![button(to, false)], false); + assert_ne!(cursor_frame(&mut app, &ctx, vec![], true).0, egui::CursorIcon::Copy, "no drag, no copy cursor"); +} + +/// The selected-art square copies with Alt as rows do; off the list (the trash, New Layer) Alt +/// copies nothing, and guide rows keep their own cursor. +#[test] +fn drag_cursor_shows_a_copy_only_where_the_drop_copies() { + let (copy, grabbing) = (Some(egui::CursorIcon::Copy), Some(egui::CursorIcon::Grabbing)); + for drag in [LayersDrag::Rows(vec![NodeId(1)]), LayersDrag::Art] { + assert_eq!(super::drag_cursor(&drag, true, true), copy); + assert_eq!(super::drag_cursor(&drag, false, true), grabbing); + assert_eq!(super::drag_cursor(&drag, true, false), grabbing, "off the list"); + } + assert_eq!(super::drag_cursor(&LayersDrag::Guides(vec![0]), true, true), None); +} + /// An Intertwine group's row takes a dragged row inside it, as a group's does, and the object /// becomes a member; a row that can't be intertwined gets no inside box and goes beside it. #[test] diff --git a/crates/ui-egui/src/panels/swatches.rs b/crates/ui-egui/src/panels/swatches.rs index ed122d35de..7b70844dcc 100644 --- a/crates/ui-egui/src/panels/swatches.rs +++ b/crates/ui-egui/src/panels/swatches.rs @@ -46,7 +46,7 @@ pub(crate) use libraries::{ }; #[cfg(test)] pub(crate) use tiles::describe; -pub(crate) use tiles::{draw_folder, folder_tile, global_mark, list_row, list_row_name, tile_grid}; +pub(crate) use tiles::{CMYK_INKS, draw_folder, folder_tile, global_mark, list_row, list_row_name, tile_grid}; /// View modes of the swatch list (and of the library panels: `ui.libraryPanel {view}`). #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, serde::Serialize, serde::Deserialize)] diff --git a/crates/ui-egui/src/panels/swatches/tiles.rs b/crates/ui-egui/src/panels/swatches/tiles.rs index 42ff8b381c..7e92615c17 100644 --- a/crates/ui-egui/src/panels/swatches/tiles.rs +++ b/crates/ui-egui/src/panels/swatches/tiles.rs @@ -64,7 +64,8 @@ pub(crate) fn draw_folder(ui: &Ui, r: Rect) { } /// The ink colours of the CMYK glyph (cyan, magenta, yellow, black) and the RGB glyph's bars. -const CMYK_INKS: [Color32; 4] = [Color32::from_rgb(0, 174, 239), Color32::from_rgb(236, 0, 140), Color32::from_rgb(255, 242, 0), Color32::BLACK]; +pub(crate) const CMYK_INKS: [Color32; 4] = + [Color32::from_rgb(0, 174, 239), Color32::from_rgb(236, 0, 140), Color32::from_rgb(255, 242, 0), Color32::BLACK]; const RGB_BARS: [Color32; 3] = [Color32::from_rgb(255, 0, 0), Color32::from_rgb(0, 200, 0), Color32::from_rgb(0, 0, 255)]; diff --git a/crates/ui-egui/src/prefs_dialog/descriptions.rs b/crates/ui-egui/src/prefs_dialog/descriptions.rs index 08ec5b6087..eb8156f8dd 100644 --- a/crates/ui-egui/src/prefs_dialog/descriptions.rs +++ b/crates/ui-egui/src/prefs_dialog/descriptions.rs @@ -61,6 +61,36 @@ pub(crate) const DESCRIPTIONS: &[(&str, &str)] = &[ "artboardUpdateWhileDragging", "With Fade Region Outside Artboard on, the area outside the artboards stays dark while you drag with the Artboard tool.", ), + // Selection & Anchor Display + ("selectionTolerance", "How near, in pixels, the pointer must be to an object, anchor or handle for a click to select it."), + ( + "marqueeSelection", + "Whether the Selection tool's box selects objects it touches or only those fully inside; Drag Direction selects those inside on a drag to the right. E reverses it mid-drag.", + ), + ("objectSelectionByPathOnly", "A click selects a filled object only on its path, not inside its fill."), + ( + "snapToPointTolerance", + "How near, in pixels, a point must come to an anchor or ruler guide for Snap to Point to snap it; with Smart Guides on, Smart Guides' Snapping Tolerance applies instead.", + ), + ( + "ctrlClickSelectsBehind", + "With the Selection tool, Cmd/Ctrl-click selects the object under the selected one at the pointer; each further click goes one object deeper.", + ), + ("zoomToSelection", "Zoom In and Zoom Out bring the center of the selection to the middle of the view."), + ( + "moveLockedWithArtboard", + "Locked and hidden artwork inside an artboard moves, scales and is copied with the artboard, as the other artwork does.", + ), + ("anchorSize", "The size of anchor points and direction handle ends on the canvas; larger anchors can also be picked from farther away."), + ("handleStyle", "Draws the ends of direction handles as solid dots, hollow dots or larger solid dots."), + ("highlightAnchorsOnHover", "With the Direct Selection tool, the anchor under the pointer is highlighted."), + ( + "showHandlesMultipleAnchors", + "Shows direction handles when more than one anchor is selected; off, they show only while a single anchor is selected.", + ), + ("hideCornerWidgetAbove", "Corner widgets hide on corners whose angle is greater than this many degrees."), + ("penRubberBand", "The Pen tool previews the next segment from the last anchor to the pointer before you click."), + ("curvatureRubberBand", "The Curvature tool previews the curve to the pointer before you place the next point."), // Units ( "unitsGeneral", @@ -71,6 +101,65 @@ pub(crate) const DESCRIPTIONS: &[(&str, &str)] = &[ ("unitsAsianType", "The unit for East Asian type measurements, which no field uses yet."), ("numbersWithoutUnitsArePoints", "When on, a number typed without a unit into a field in picas is read in points."), ("identifyObjectsBy", "With XML ID, object names show as XML IDs in the Layers panel, the Variables panel and Layer Options."), + // Guides & Grid + ( + "__snapToGrid", + "Snaps drawing, moving and scaling to the grid's subdivisions, even while the grid is hidden; while it is on, Snap to Pixel does not apply.", + ), + ("guideColor", "The color of guides that are not selected; an artboard with a Guide Label draws its own guides in the label's color instead."), + ("guideStyle", "Draws guides as solid lines or as dots, including the guides already in the document."), + ( + "lockGuidesByDefault", + "With this on, guides are locked when VectorCraft starts; changing this option locks or unlocks them at once, and View › Guides › Lock Guides still changes the lock.", + ), + ( + "cmdRulerDragArtboardGuides", + "With this on, holding Cmd/Ctrl as you start dragging from a ruler makes a guide on the active artboard only, or a canvas guide with the Artboard tool.", + ), + ("gridColor", "The color of the grid; the lines between major gridlines are drawn in a fainter shade of it."), + ("gridStyle", "Draws the grid as lines, or as dots along the major gridlines at each subdivision."), + ( + "gridlineEvery", + "The distance between major gridlines, in every open document and in new ones; a VectorCraft document opens with the grid it was saved with.", + ), + ( + "gridSubdivisions", + "How many parts each major grid square is divided into; Snap to Grid snaps to these parts, even when the zoom hides their lines.", + ), + ("gridsInBack", "Draws the grid behind the artwork; off, the grid is drawn over it."), + ("showPixelGrid", "In Pixel Preview at 600% zoom or more, the active view shows a line at the edge of every document pixel over the artwork."), + ("patternTileEdgeColor", "The color of the tile edge and the dashed swatch bounds shown while you edit a pattern."), + // Smart Guides + ( + "__smartGuides", + "Snaps drawing, moving and transforming to nearby art and shows guides and labels; Pixel Preview turns them off, and Snap to Grid snaps to the grid instead.", + ), + ("smartGuideColor", "The color of Smart Guide lines and labels."), + ( + "alignmentGuides", + "Shows a line along the edge or center that art lines up with; off, art still lines up without the line, and Snap to Glyph does not apply.", + ), + ("objectHighlighting", "With a selection tool, outlines the unselected object under the pointer in its layer color while you are not dragging."), + ("transformToolsGuides", "Shows the size or angle next to the pointer while you scale, rotate, shear or reflect art."), + ("constructionGuides", "While you draw, points snap to lines at the chosen Angles through the point the segment or shape starts from."), + ("constructionAngles", "The set of angles the construction guides follow while Construction Guides is on."), + ("anchorPathLabels", "Names what a point snaps to, such as an anchor, a path or an alignment; off, points snap the same way without the names."), + ("measurementLabels", "Shows distances, angles and how far art has moved next to the pointer while you draw or move it."), + ("spacingGuides", "Snaps moved or resized art to the same gap as between nearby objects, and marks the equal gaps."), + ( + "distanceGuides", + "With something selected, holding Alt/Option over another object or an artboard shows the distances between it and the selection.", + ), + ( + "snapToLastLocation", + "A selection dragged back to within the Snapping Tolerance of where the drag began goes back to exactly that place; a copy does not.", + ), + ( + "snappingTolerance", + "How near on screen the pointer or a dragged point must come to art for Smart Guides to snap to it; the distance is the same at every zoom.", + ), + ("snapTangent", "Snaps the end of a line segment, or a circle drawn from its center, so that it touches a nearby curve."), + ("snapPerpendicular", "Snaps the end of a line segment so that it meets a nearby straight segment at a right angle."), ]; /// The sentence that describes the setting `key`, in English, or `None` when it has none yet. diff --git a/crates/ui-egui/src/prefs_dialog/tests.rs b/crates/ui-egui/src/prefs_dialog/tests.rs index 4b53a52a51..f7c676d441 100644 --- a/crates/ui-egui/src/prefs_dialog/tests.rs +++ b/crates/ui-egui/src/prefs_dialog/tests.rs @@ -1798,11 +1798,12 @@ fn a_row_without_a_description_leaves_the_line_empty() { assert_eq!(preferences_window(&ctx).size(), size); } -/// Every setting the General category shows has exactly one sentence, and no key has two. +/// Every setting the General, Selection & Anchor Display, Guides & Grid and Smart Guides categories +/// show, the Smart Guides box included, has exactly one sentence, and no key has two. #[test] -fn every_general_setting_has_one_description() { +fn every_general_selection_guides_and_smart_guides_setting_has_one_description() { let mut bad = vec![]; - for s in settings().filter(|s| s.category == "General") { + for s in settings().filter(|s| ["General", "Selection & Anchor Display", "Guides & Grid", "Smart Guides"].contains(&s.category)) { match descriptions::DESCRIPTIONS.iter().filter(|(k, _)| *k == s.key).count() { 1 => {} n => bad.push(format!("`{}` ({}) has {n} sentences", s.key, s.label)), @@ -1877,6 +1878,147 @@ fn keyboard_focus_on_a_general_row_shows_its_description() { assert!(described.iter().any(|d| d == task_bar), "the focused control carries the sentence: {described:?}"); } +/// The pointer over Selection & Anchor Display's Tolerance row and over its Highlight anchors on +/// mouse over row shows each row's sentence. +#[test] +fn hovering_a_selection_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Selection & Anchor Display")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let tolerance = descriptions::description("selectionTolerance").expect("Tolerance has a sentence"); + let highlight = descriptions::description("highlightAnchorsOnHover").expect("Highlight anchors on mouse over has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Tolerance:"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, tolerance) && !painted(&after, highlight), "the Tolerance row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Highlight anchors on mouse over"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, highlight) && !painted(&after, tolerance), "the Highlight anchors row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches Selection & Anchor Display's first control, the Tolerance +/// field: the line shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_selection_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Selection & Anchor Display")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let tolerance = descriptions::description("selectionTolerance").expect("Tolerance has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, tolerance) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Tolerance row and its sentence shows"); + assert!(described.iter().any(|d| d == tolerance), "the focused control carries the sentence: {described:?}"); +} + +/// The pointer over Guides & Grid's Snap to Grid row and over its Gridline every row shows each +/// row's sentence. +#[test] +fn hovering_a_guides_and_grid_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Guides & Grid")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let snap = descriptions::description("__snapToGrid").expect("Snap to Grid has a sentence"); + let every = descriptions::description("gridlineEvery").expect("Gridline every has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Snap to Grid"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, snap) && !painted(&after, every), "the Snap to Grid row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Gridline every:"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, every) && !painted(&after, snap), "the Gridline every row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches Guides & Grid's first control, the Snap to Grid box: the line +/// shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_guides_and_grid_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Guides & Grid")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let snap = descriptions::description("__snapToGrid").expect("Snap to Grid has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, snap) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Snap to Grid row and its sentence shows"); + assert!(described.iter().any(|d| d == snap), "the focused control carries the sentence: {described:?}"); +} + +/// The pointer over Smart Guides' own Smart Guides row and over its Alignment Guides row shows each +/// row's sentence. +#[test] +fn hovering_a_smart_guides_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Smart Guides")); + let ctx = egui::Context::default(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + let (texts, _) = description_frame(&mut a, &ctx, vec![]); + let row = |texts: &[(String, egui::Rect)], label: &str| { + texts.iter().find(|(t, _)| t == label).map(|(_, r)| r.center()).unwrap_or_else(|| panic!("no `{label}` in {texts:?}")) + }; + let smart = descriptions::description("__smartGuides").expect("Smart Guides has a sentence"); + let alignment = descriptions::description("alignmentGuides").expect("Alignment Guides has a sentence"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Smart Guides (View → Smart Guides)"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, smart) && !painted(&after, alignment), "the Smart Guides row's sentence shows: {after:?}"); + description_frame(&mut a, &ctx, vec![egui::Event::PointerMoved(row(&texts, "Alignment Guides"))]); + let (after, _) = description_frame(&mut a, &ctx, vec![]); + assert!(painted(&after, alignment) && !painted(&after, smart), "the Alignment Guides row's sentence shows: {after:?}"); +} + +/// Tab from the search field reaches Smart Guides' first control, the Smart Guides box: the line +/// shows its sentence and a screen reader gets it as the control's description. +#[test] +fn keyboard_focus_on_a_smart_guides_row_shows_its_description() { + let mut a = app(); + open(&mut a, Some("Smart Guides")); + let ctx = egui::Context::default(); + ctx.enable_accesskit(); + crate::theme::install_fonts(&ctx); + description_frame(&mut a, &ctx, vec![]); + description_frame(&mut a, &ctx, vec![]); + let smart = descriptions::description("__smartGuides").expect("Smart Guides has a sentence"); + let mut shown = None; + for _ in 0..40 { + let (texts, described) = description_frame(&mut a, &ctx, key_press(egui::Key::Tab, egui::Modifiers::NONE)); + if painted(&texts, smart) { + shown = Some(described); + break; + } + } + let described = shown.expect("Tab reaches the Smart Guides row and its sentence shows"); + assert!(described.iter().any(|d| d == smart), "the focused control carries the sentence: {described:?}"); +} + /// A sentence shown when the dialog closed does not come back when it opens again with the /// pointer away from the rows. #[test] diff --git a/crates/ui-egui/src/tests/font_menu.rs b/crates/ui-egui/src/tests/font_menu.rs index 3873868af2..52df50fd2c 100644 --- a/crates/ui-egui/src/tests/font_menu.rs +++ b/crates/ui-egui/src/tests/font_menu.rs @@ -1045,17 +1045,20 @@ fn open_menu_with(id: &str, left: f32, width: f32, screen: egui::Vec2, look: Men } // egui places the menu by the size it had the frame before. When a name measured late (a face // added for its script, a font found in the background) widens it on that frame, the menu sits - // where the narrower one fit until the next: draw until it stays put. - let filter_at = |shapes: &[egui::epaint::ClippedShape]| { - shapes.iter().find_map(|s| match &s.shape { + // where the narrower one fit until the next: draw until it stays put. The filter alone can stay + // put on the frame that widens the menu, so the menu's own rect must stay put too. + let placed = |shapes: &[egui::epaint::ClippedShape]| { + let filter = shapes.iter().find_map(|s| match &s.shape { egui::Shape::Text(t) if t.galley.text() == crate::i18n::t("Any Kind") => Some(t.pos), _ => None, - }) + }); + let menu = filter.and_then(|p| ctx.layer_id_at(p)).and_then(|l| ctx.memory(|m| m.area_rect(l.id))); + (filter, menu) }; for _ in 0..100 { - let before = filter_at(&shapes); + let before = placed(&shapes); shapes = frame(vec![]); - if filter_at(&shapes) == before && !crate::font_menu::wait_for_samples(&ctx) { + if placed(&shapes) == before && !crate::font_menu::wait_for_samples(&ctx) { break; } } diff --git a/docs/control-protocol.md b/docs/control-protocol.md index b68a79b4af..adac088a13 100644 --- a/docs/control-protocol.md +++ b/docs/control-protocol.md @@ -669,7 +669,9 @@ agents) opens the `rasterEffectsSettings` dialog. Its fields are what `document. (`resolution`, `colorModel`, `background`, `antiAlias`, `clippingMask`, `addAround` in pt, `preserveSpotColors`); `ui.dialog.confirm` runs it with them as one undo step; a bad value keeps the dialog open. Object → Rasterize… opens a `command` dialog for `object.rasterize` whose fields (`ppi`, `colorModel`, `background`, `antiAlias`, `clippingMask`, -`addAround`) start from these settings. +`addAround`) start from these settings. `colorModel`, `antiAlias` (`none`, `art`, `type`) and `background` (`white`, +`transparent`) are dropdowns; `ui.dialog.set` also takes any other value the command takes, and the dialog sends it +unchanged. Missing linked files: `app.open` of a document whose linked images' files can't be found (`document.open`'s `missingLinks`) opens the `missingLinks` dialog for the first (fields `missing`: `[{name, path, ids}]`, `modified`, diff --git a/docs/development.md b/docs/development.md index d12c22bb17..508c0aea06 100644 --- a/docs/development.md +++ b/docs/development.md @@ -297,7 +297,11 @@ other `sv-*` locale resolve to it), Georgian (`ka`, complete; `ka-GE` and `ka_GE control channel, MCP and tests read them) and are translated only where the status bar draws them (`i18n::msg`). `@msg` catalog rows hold a whole message or a template such as `Couldn't open {name}: {e}`; `{_1}`, `{_2}` … stand for the format string's `{}`, and the values in the - placeholders are translated in turn (the reason after `: {e}` is often a message too). A value that starts with + placeholders are translated in turn (the reason after `: {e}` is often a message too). A template needs text + between any two placeholders, since the catalog cannot tell where `{a}{b}` splits: make the message with the + side-by-side values joined into one (`unknown parameter `{key}``, where `key` is `marks.ofset`). The catalog + leaves out a row whose template has two placeholders in a row or no text; `i18n::tests` fails on such a row + and on such a message, and the untranslated report counts it as missing. A value that starts with `{` is translated only when it has an exact row, so a JSON object stays as it is; a value that starts with `[` is also matched against a template that starts with `[` and an index of digits, such as an effect's refusal ``[{j}] `{_1}`: {why}``, so its reason is translated while a JSON array stays as it is. A literal brace in a diff --git a/docs/effects-parity.md b/docs/effects-parity.md index 4bc558341f..cb857e15cd 100644 --- a/docs/effects-parity.md +++ b/docs/effects-parity.md @@ -1,6 +1,6 @@ # Effects parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-12 · **Change:** minor (Extrude & Bevel, Inflate and Rotate seams have round joins under a white light and in the 3D (Classic) effects too, no longer reaching past the solid as thorns; previously: Effect Gallery: a thumbnail for each filter and an in-dialog preview on an original drawing; the 1–2 h for those is done; Extrude & Bevel, Inflate and Rotate merge contours that cross, touch or overlap, as type often draws a glyph, before building a solid; previously: Extrude & Bevel, Inflate and Rotate apply to groups and layers, their objects turning about one shared axis (#4506); the Transform effect's copies of a path with a fill and a stroke (or several fills and strokes, an even-odd fill, or a partly transparent one) are drawn each above the one before, as Expand Appearance makes them (#5920); Expand Appearance makes each copy of a path's Transform effect an object of its own (#5612); previously: Pixelate › Color Halftone: Max Radius in pixels of the Document Raster Effects resolution, 4–127 px, with older documents converted on opening and radii written back in points for older app versions (#3260); Effect dialogs clamp bounded length inputs immediately on commit and flash rejection on invalid input (#4638); previously: Drop Shadow Darkness uses fixed RGB subtraction and CMYK black addition; scores unchanged; Pathfinder › Trap: the Pathfinder panel's Trap… and Effect › Pathfinder › Trap… add an overprinting strip of the lighter colour where two solid colours meet; recounted with Hard Mix (#3061) and Soft Mix already in the catalogue: Pathfinder 13/13, Illustrator effects 49/50) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Twist: a strongly twisted path joins its pieces without kinks, #7069; scores and estimates unchanged; previously: Extrude & Bevel, Inflate and Rotate seams have round joins under a white light and in the 3D (Classic) effects too, no longer reaching past the solid as thorns; previously: Effect Gallery: a thumbnail for each filter and an in-dialog preview on an original drawing; the 1–2 h for those is done; Extrude & Bevel, Inflate and Rotate merge contours that cross, touch or overlap, as type often draws a glyph, before building a solid; previously: Extrude & Bevel, Inflate and Rotate apply to groups and layers, their objects turning about one shared axis (#4506); the Transform effect's copies of a path with a fill and a stroke (or several fills and strokes, an even-odd fill, or a partly transparent one) are drawn each above the one before, as Expand Appearance makes them (#5920); Expand Appearance makes each copy of a path's Transform effect an object of its own (#5612); previously: Pixelate › Color Halftone: Max Radius in pixels of the Document Raster Effects resolution, 4–127 px, with older documents converted on opening and radii written back in points for older app versions (#3260); Effect dialogs clamp bounded length inputs immediately on commit and flash rejection on invalid input (#4638); previously: Drop Shadow Darkness uses fixed RGB subtraction and CMYK black addition; scores unchanged; Pathfinder › Trap: the Pathfinder panel's Trap… and Effect › Pathfinder › Trap… add an overprinting strip of the lighter colour where two solid colours meet; recounted with Hard Mix (#3061) and Soft Mix already in the catalogue: Pathfinder 13/13, Illustrator effects 49/50) · **Target:** Adobe Illustrator 2026 (30.x) Every entry of Illustrator's Effect menu, by its public feature name, against VectorCraft's effects catalogue (`effect_catalog()` in `crates/effects/src/lib.rs`) and the Effect menu built from it @@ -22,7 +22,7 @@ Part of [target-app-parity.md](target-app-parity.md); open work is in [gaps.md]( |---|---|---:|---| | Convert to Shape | Rectangle, Rounded Rectangle, Ellipse | 3/3 | — | | Crop Marks | Crop Marks | 1/1 | — | -| Distort & Transform | Free Distort, Pucker & Bloat, Roughen, Transform, Tweak, Twist, Zig Zag | 7/7 | Free Distort's dialog has a handle on each corner of the object's bounds, moved by dragging or with the arrow keys; Zig Zag's ridges are evenly spaced along each segment (#1558), and Smooth points make a continuous wave whose peaks and valleys have handles along the path (#2343); Roughen with Smooth keeps turn-backs smooth instead of cusps that draw as spikes (#1646); Expand Appearance of a path whose Transform effect makes copies gives a group of one object per copy, each painted as the path, and a second Transform effect's copies nest in a group per copy of the first (#5612); drawn, each copy of a path with a fill and a stroke (or several, an even-odd fill or a partly transparent one) paints below the one before, the fills above covering the strokes of the copies below, instead of one path of every copy (#5920), and a group's copies each hold all its members except guides, the original group on top (#6316); a clipping group, a group with a fill or stroke of its own, a group whose type is kept as type, and a group with a member that carries a geometry, Pathfinder or 3D effect copy each member in its place | +| Distort & Transform | Free Distort, Pucker & Bloat, Roughen, Transform, Tweak, Twist, Zig Zag | 7/7 | Free Distort's dialog has a handle on each corner of the object's bounds, moved by dragging or with the arrow keys; Zig Zag's ridges are evenly spaced along each segment (#1558), and Smooth points make a continuous wave whose peaks and valleys have handles along the path (#2343); Roughen with Smooth keeps turn-backs smooth instead of cusps that draw as spikes (#1646); Expand Appearance of a path whose Transform effect makes copies gives a group of one object per copy, each painted as the path, and a second Transform effect's copies nest in a group per copy of the first (#5612); drawn, each copy of a path with a fill and a stroke (or several, an even-odd fill or a partly transparent one) paints below the one before, the fills above covering the strokes of the copies below, instead of one path of every copy (#5920), and a group's copies each hold all its members except guides, the original group on top (#6316); a clipping group, a group with a fill or stroke of its own, a group whose type is kept as type, and a group with a member that carries a geometry, Pathfinder or 3D effect copy each member in its place; Twist's handles follow the rotation's derivative, so a strongly twisted path is a smooth spiral without kinks where its pieces join (#7069, `twist_joins_its_pieces_smoothly`). | | Path | Offset Path, Outline Object, Outline Stroke | 3/3 | With Use Preview Bounds on, Align, Distribute and the Transform panel still measure type that carries Outline Object by its layout box (preview bounds leave out effects) | | Pathfinder | Add, Intersect, Exclude, Subtract, Minus Back, Divide, Trim, Merge, Crop, Outline, Hard Mix, Soft Mix, Trap | 13/13 | Trap traps only solid fills (gradients and patterns hide what is below them but don't trap) and spreads each colour's visible area as a whole; the public page gives no default values, so Trap's 0.25 pt, 100% and 40% are VectorCraft's own | | Rasterize | Rasterize… (as a live effect) | 1/1 | — | @@ -193,6 +193,7 @@ angular cut caps, exact visibility, the rest of 3D Classic (Map Art), Turntable) | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Distort & Transform › Twist: handles follow the rotation's derivative, so a strongly twisted path is a smooth spiral instead of pieces meeting at kinks (#7069; `twist_joins_its_pieces_smoothly` in `crates/effects/src/tests.rs`). Scores and estimates unchanged. | | 2026-11-12 | minor | The seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins (the seams of Revolve and of colored lights, and 3D (Classic) Wireframe edges, were already round): no thorns on edge-on facets, and facets with no neighbor now have rounded convex corners ([three-d.md](three-d.md#seams)); scores and estimates unchanged | | 2026-11-10 | minor | Effect Gallery: each filter has a thumbnail, and the dialog has a preview of the visible stack (or the browsed filter when the stack is empty). Both are an original landscape drawing passed through the filter ([Filter Gallery overview](https://helpx.adobe.com/photoshop/desktop/effects-filters/get-started-with-filters/filter-gallery.html)). The canvas preview and one-undo OK are unchanged. Remaining hours for the gallery's thumbnails and in-dialog preview: 1–2 → none. Counts unchanged (57/57). | | 2026-11-08 | minor | Extrude & Bevel, Inflate and Rotate merge contours that cross, touch or overlap (a glyph's arm across its stem) before building a solid, so the solid follows the shape as it is filled; others are built as drawn ([three-d.md](three-d.md)); scores and estimates unchanged | diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 4512ca7927..198f36f3f2 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -1,6 +1,6 @@ # File format parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-15 · **Change:** minor (PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, not butt caps and miter joins, #7741; `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; `.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; scores and estimates unchanged; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, not butt caps and miter joins, #7741; `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; `.ai` and EPS import: a top-object envelope whose mesh saves its sides' curves in pieces draws its contents along each whole curve, as its drawn art does, #7097; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: `.ai` and EPS import: type from the text document, type a PostScript program sets and legacy `.ai` type are set in an installed face of their font's PostScript name, exact name first, in the version a text document's record keeps; the `.ai` save writes a static font's version when its name alone gives another copy, #6983; `.ai` and EPS import: type keeps the manual kerning of its text document, #6899; `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, its strokes' miter tips and strokes a Transform effect moves included, after its glyphs grown by half its strokes' weight, #6824; `.ai` and EPS import: type filled or stroked with a pattern swatch keeps its pattern, from the art style its text document paint names, #6856; #6865: explicitly requested oversized editing artboard; PDF import: Indic type keeps its marks on their line, and a line whose type would not draw as the file does keeps the file's glyphs as outlines, #5235; previously: newly imported SVG/SVGZ titles are filtered and bounded without changing restored titles, #3626; `.ai` and EPS import, and what every export and `.ai` save draw: type's strokes in an envelope paint at their own weight along its bent outlines, Distort Appearance on or off, #6644; `.ai` and EPS import: centred and right-aligned lines of tracked type are aligned without the tracking after their last character, as the file's page aligns them, #6610; `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art, #6570; `.ai` save and open: layer colour presets Yellow, Magenta and Cyan keep their colour, as the `Lb` colour index now follows the file's numbering, #6502; `.ai` save: stroked type keeps its stroke's cap, join and miter limit in the text document, #6472; `.ai` and EPS import, PDF import: tracking and manual kerning in horizontally scaled type take the Horizontal Scale, as the file's page spaces such type; `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke, #3179; `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid, #3179; `.ai` and EPS import: stroked type keeps its stroke's cap, join and miter limit from the text document, #6472; `.ai` save: type in a variable font's named instance names its design-space setting, #6388; `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page, #3179; `.ai` and EPS import: a note for type in an envelope, #3179; `.ai` and EPS import: the live envelope and warped type check sees white art; PDF import: DeviceN images of one ink or of process plates keep their inks, #6348; `.ai` import: images in a spot ink's Separation space keep their ink, #6350; PDF import: Separation images keep their ink, #6314; PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; PDF import: image masks open colorized by the color they are painted in, #6313; EPS and `.ai` editing data: a ligature the page names by a private-use glyph matches its text object; EPS import: CIDFonts only named, over a Unicode CMap, set as live type; EPS import: CMap mappings to base-font codes and glyph names; EPS import: CID-keyed fonts in FontSets (CFF) draw their glyphs; EPS import: `kshow` procedures kern live type; EPS import: embedded Type 1 fonts' glyphs and widths; EPS import: CID-keyed fonts draw their glyphs; EPS import: Type 42 fonts' characters and widths from the font they carry, show operators' spacing kept as tracking; EPS import: an image decoder's own buffers stop counting against the memory budget once it is decoded; EPS import: sampled functions interpolate between their samples; `.ai` and EPS type from the text document keeps its tab stops; it keeps auto leading and hyphenation options, and may show more of the file's last lines in an area frame; `.ai` and EPS import: Art brushes in the older form of their objects come into the Brushes panel; EPS import: gradients drawn as abutting strips come in as one gradient, without seams; EPS import: composite fonts draw their Type 42 glyphs; SVG import: filter and mask regions clip, #5876, #5875; SVG import: Gaussian blurs keep `color-interpolation-filters`, #5877; PDF and `.ai` export: objects' URLs as links, #5785; SVG import: `color-interpolation="linearRGB"` gradients, #5878; `.ai` import: paths with a Calligraphic brush open brushed, #372) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). @@ -120,14 +120,39 @@ private editing data. VectorCraft: Scatter and Art brushes with their art, are written in its order: Scatter and Art brushes in Tints or keeping their art's colors, Art brushes that run their art from left to right without overlap at a fixed width, with their width, flips and scale (Stretch Between Guides with guides that leave art between them), and art of paths and - compound paths with points and groups with members, with one solid fill and one plain stroke each. Other brushes, + compound paths with points and groups with members, with one solid fill and one plain stroke each. Such art may + hold opacity masks whose art is of the same kinds, up to seven deep in one another's art; the masks are written + with their options, and an Art brush whose art holds one is written with its strokes as their drawn look. Other + brushes, Pattern and Bristle brushes among them, and brushes past the number or the art VectorCraft's reader reads are left out with a warning; no brush is written on a large canvas. A path or compound path with a Calligraphic brush, or with an Art brush whose art bends along the path and that doesn't scale its art proportionately, keeps the brush on its stroke; other brushed strokes are written as their brush's art. A document that uses a new document's brushes writes none until a path keeps one on its stroke; then the brushes are written, and the file opens without the new document's Pattern and Bristle - brushes. + brushes. Blends are written live: their key objects, their spine when they have one of their own, their steps + drawn, and their spacing (Smooth Color, Specified Steps, Specified Distance) and orientation (Align to Page, Align to + Path); a replaced spine is written with an anchor where each key object sits, so it opens with those anchors and + lays out the same steps. Blends with easing, a color shift or start points, with effects, an appearance or an + opacity mask of their own, of objects other than paths, compound paths and groups, of clipping groups, of more than + 62 key objects, with a hidden key object, holding another blend, of key objects with geometry or Pathfinder effects + or a group's own fills and strokes, of key objects the editing copy would change (empty paths or subpaths, paths and + compound path members of several subpaths, several fills or strokes, strokes a plain line can't draw, dashes of + more than 64 lengths, hidden fills or strokes, fills or strokes other than a color, in a Lab color or with + transparency or effects of their own, effects, opacity masks), where one key object has a fill or stroke of no paint + or a stroke of no width and another has one that draws, whose spine has more than one part, whose step count is + close to where rounding changes it, or that VectorCraft's reader wouldn't open with their settings or as they + are drawn, are written as their steps with a warning, as are blends inside objects with geometry or Pathfinder + effects or a group's own fills and strokes, blends in opacity masks, pattern tiles, symbols and art cut to a + clipping object or nested eight levels deep in art written in place of other objects (symbol instances, live + objects, brushed strokes), blends whose art would pass the most objects VectorCraft's reader reads, and every blend + on a large canvas. Gradient meshes are written as meshes: each mesh point's place, color, opacity and handles, patch by + patch; a reflected mesh is written with its columns in reverse order, and opens with each row's points in reverse + order. Meshes with a point in a Lab color, with + more than 128 rows or columns, folded meshes (patches whose corners turn different ways), meshes VectorCraft's reader + wouldn't open as they are drawn, meshes in pattern tiles and in art cut to a clipping object, and every mesh on a + large canvas are written as their drawn look with a warning. In a symbol's art, an envelope's contents are written in + the canvas's space with y down. Point type, area type (with its rows, columns, gutters and first baseline, threaded frames included) and type on a path are written as text: a text object for each, naming its story in the text document, with the characters, fonts, sizes, leading, tracking, baseline shift, @@ -142,7 +167,7 @@ private editing data. VectorCraft: clipping object, mirrored type, turned or unevenly scaled area type and type on a path, area type in an open frame, type on an open path whose ends meet, area type whose wrap cannot be reconstructed from plain saved paths, compound paths or groups, type of only white space, threads of type on a path, threads whose frames differ in orientation, type and stories past the sizes VectorCraft's reader reads, and - type with inline graphics, ruby, gradient or pattern paint or an appearance or opacity mask of its own, other patterns, other clipping objects and live + type with inline graphics, ruby, gradient or pattern paint or an appearance or opacity mask of its own, other patterns, other clipping objects and other live objects (placed documents included) are written as plain filled and stroked paths, and freeform gradients, gradients along or across a stroke and gradients without stops, with more than 256 stops or without extent as their average color, each with a warning. Gradients that dither are written without dither's noise, Perceptual gradients and @@ -281,6 +306,8 @@ An object in a pattern's art or in a brush's art takes the file's art styles in Names in the editing data that aren't UTF-8 (layers, objects, artboards, colors, gradients, patterns, graphic styles, swatches, brushes, symbols, variables and data sets) are read as Windows-1252 unless `legacyNameEncoding` (`convert --legacy-name-encoding`) picks `macintosh`, `windows-949`, `shift_jis`, `gbk` or `big5`; the open result's warnings list the first three such names as read and count the rest. The text values of data sets are read in the same encoding. +Gradient meshes in the editing data keep each point's own color where a patch's corners differ in color model. In a symbol's art, a gradient mesh's corners and an envelope's grid are read in the space an image's matrix is read in there, and an envelope's contents in its dictionary in the canvas's space with y down. In a file without a template box such a mesh or grid is not read, and its symbol's instances open as the page draws them, as with an image there. An envelope in a symbol's art whose grid and contents are in the symbol's own space, as earlier VectorCraft builds wrote them, opens as the art it draws. + ## Format by format | Format | Illustrator | Ours: open/place | Ours: save/export | Fidelity and tests | @@ -334,6 +361,8 @@ Stop opacity on translated artboards remains outside this regression coverage. - [ ] Exact redistribution of one replacement over several lines/styles, and general mixed-direction paragraph layout. Replacement uses the first placed glyph's line/style. Tags deeper than 128 and replacements over 64 KiB encoded (at most 192 KiB decoded) fall back to glyph mappings with a warning; an outer accepted owner survives deeper tags. - [x] Stroked type (text rendering modes 1, 2, 5 and 6, with or without `ActualText`) keeps the line cap, line join and miter limit of the graphics state it is stroked with, as paths do; glyphs stroked with another cap, join or miter limit are a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`). The dash array is not carried to the characters yet. +- [x] Type filled and stroked by one text-showing operator (text rendering modes 2 and 6: the reader fills all of a `Tj` or `TJ`, every string of the array, before it strokes the same glyphs) comes in as one type object, filled and stroked, as it does glyph by glyph; a stroke over no filled glyph (modes 1 and 5, or stroked type of its own) stays stroke only (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Translucent type filled and stroked stays a filled object and a stroked one, as the file composites them apiece (`translucent_fill_and_stroke_text_stays_two_objects`). A glyph filled only right after one filled and stroked (`2 Tr (B) Tj 0 Tr (C) Tj`) joins the same type object filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`). +- [ ] PDF type filled and stroked at less than full opacity as one type object, and a `TJ` whose kerning starts a new line part way through, filled and stroked: both still come in as a filled object and a stroked one (#8015). - [x] Place from bytes or unlinked paths, and PDF clipboard paste, keep the selected page's live text. Synthetic two-page regressions in `crates/engine/src/cmd/fileio/tests_pdffidelity.rs` cover both sources, page selection and explicit outlines. The single-page importer honors the same text choice as Open; existing PDF fallback rules are unchanged. @@ -345,6 +374,9 @@ Stop opacity on translated artboards remains outside this regression coverage. | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | +| 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) came in with butt caps, miter joins and a miter limit of 10 whatever the file stroked it with, while paths kept the graphics state's. The characters' stroke now takes the line cap (`J`), line join (`j`) and miter limit (`M`) of the graphics state, as a path's stroke does, and glyphs stroked with other ones start a run of their own, also a glyph filled and then stroked otherwise than the run its fill joined, so the glyphs before it keep their stroke (#7741). Test `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`. Scores and estimates unchanged. | | 2026-11-13 | minor | `.ai` and EPS import: layers that don't draw as the page, even with the drawn art of every live envelope put back, no longer put back the drawn art of every envelope of type. Each live envelope of type is weighed in the page check's own drawing of the pages it lies on, on the pixels that it and its drawn art ink there (the two drawn together on a layer of their own, without the rest of the layers; a pixel inks with an alpha above 8 of 255): it keeps its drawn art and its type, hidden, with the note, where the layers with it differ from the page in more of those pixels than its own check allows against its drawn art (10% of them, or 3% differing with all their neighbours, away from type), or where the envelopes of type that stay live, in the order they were read, would together differ there in more of a page than half of what the page check allows (a budget of the same size as the one their own checks share, kept apart from it). Art that differs elsewhere on the page no longer costs them their editable type; art that differs on their pixels still does. An envelope of type that a clip group or a clipping sublayer clips, an opacity mask masks, or a group with an appearance of its own, another envelope, a repeat or a blend holds keeps its drawn art as before, wherever it lies: drawn on its own it would be weighed elsewhere than it draws, and what holds it can draw it onto the page from off it. An envelope on no page stays live, as the page check doesn't see it, unless the page holds all the art that prints (an EPS's page that is its art's box, where art past the page is compared too): there one reaching past the page keeps its drawn art. Past 12 of them on the pages, all keep it. This holds where the editing data is trusted, where the objects that differ come in as the page's art (the placed files' other placement weighed on its own, as it draws them elsewhere under or over the envelopes; layers that draw as the page with only the envelopes the page holds put back are used as they are; where none of the objects that differ can then come in as the page's art, because an object holds type, the drawn art of every envelope of type is put back and that is tried again, as before), and for a `.ai` whose layers would open alone, which still opens alone: its envelopes of type are all settled again as they were with the page, in the same order and with the same checks, so each that opens live draws as it was weighed, and those the page held get their drawn art back. Where putting the drawn art of every live envelope back makes the layers draw as the page, it is still put back (#5065). In 224 users' files (used locally, never committed): envelopes of type that open live go from 174 to 186, in 8 files, none fewer in any file; no file changes between its layers and its PDF part; 7 renders change, by at most 0.7% of their pixels at 40 ppi (1 closer to the page, 1 alike, 5 further, by at most 0.7 of a percentage point, where VectorCraft's own envelope draws a little apart from the drawn art, within its check); the note for type in an envelope goes from 6 files. Of the 14 envelopes of type that had opened live and lost it to the page check, 2 keep their drawn art: one where the page draws something else where it is, and one in a file that comes in as its PDF part (#7141). Tests `build::candidate_tests::the_page_holds_back_only_envelopes_of_type_where_it_differs_from_them`, `envelopes_of_type_stay_live_within_half_of_what_the_page_check_allows`, `an_envelope_of_type_differing_in_more_of_its_pixels_than_its_check_allows_is_held_back`, `envelopes_of_type_the_layers_dont_draw_in_place_are_held_back`, `on_a_page_that_holds_all_the_art_an_envelope_of_type_past_it_is_held_back`, `objects_come_in_as_the_page_art_with_every_envelope_of_type_put_back_where_a_live_one_holds_a_difference`, `tests_native::layers_that_would_open_alone_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `layers_that_would_open_alone_keep_live_only_the_envelopes_of_type_the_page_doesnt_hold`, `trusted_layers_that_would_open_alone_open_alone_with_an_envelope_of_type_the_page_doesnt_hold_live`, `layers_with_objects_that_come_in_as_the_page_art_keep_an_envelope_of_type_that_draws_as_the_page_live`, `trusted_layers_keep_an_envelope_of_type_live_where_other_art_differs_from_the_page`, `trusted_layers_leave_an_envelope_of_type_the_page_draws_otherwise_its_drawn_art`, `build::candidate_tests::the_other_placement_of_placed_files_is_weighed_on_its_own`, `layers_that_draw_as_the_page_with_the_held_envelopes_of_type_put_back_are_used_so` | | 2026-11-13 | minor | PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke instead of being left out, adding no text (#6971; `empty_actual_text_keeps_the_glyphs_art` in `crates/pdf/src/tests/actual_text.rs`). Scores and estimates unchanged. | diff --git a/docs/mcp.md b/docs/mcp.md index 45e76bfe14..0db522ba42 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -3618,7 +3618,10 @@ already walks Image Trace. Short agent entry points: a straight Pencil line too, or with Alt held at the release. The stroke's end then joins the other end when it is within four times the Fidelity of it (at least 6 pt and at most 400 pt), and a straight segment closes the path from farther away. Without `closed`, the stroke closes the path when it ends within that four-times-Fidelity distance. The - Blob Brush's `path.blob` Fidelity stays in points, 0.01 to 100 pt. + Blob Brush's `path.blob` Fidelity stays in points, 0.01 to 100 pt, and is + not used when left out or null. `path.blob` rejects a `fidelity` outside 0.01 to 100 pt, an `angle` outside -180° to + 180° and a `roundness` outside 0% to 100% with an error such as `` `angle` must be from -180 to 180 degrees ``; the + document does not change and no undo step is recorded. These ranges are VectorCraft's own values. - Variables: `variable.list`, `variable.define {name, kind: text|visibility|image|graph}`, `variable.bind {variable, ids?}`, `variable.makeTextDynamic`, `variable.makeVisibilityDynamic`, `variable.makeImageDynamic`, `variable.makeGraphDynamic` (`variable.bind` and `variable.makeTextDynamic` refuse type that already has another text variable and name it), @@ -6059,6 +6062,11 @@ These commands refuse a string, a number or another value that is not true or fa in `path.curvatureEdit`; `perpendicular` in `path.reshapeSegment`; and `keepSelected`, `mergeOnlySelection` and `merge` in `path.blob`. A null is read as a key left out. +`path.freehand` (and `brush.freehand`, which runs it) refuses a `style` other than "pencil" or "brush" with +`style must be "pencil" or "brush"`, and an `end` of `extend` other than "start" or "end" with +`extend end must be "start" or "end"`; the document does not change and no undo step is recorded. Left out or null, +`style` is "pencil" and the `end` of `extend` is "end". + A `pointer_gesture` with `mods: {cmd: true}` held at the press, with any tool but the selection tools (Command on macOS, Ctrl elsewhere), drags with the selection tool chosen last (`select_tool`), or Direct Selection with the Pen, Curvature and anchor tools until one is chosen; the release gives the tool back as it was, so the Pen goes on drawing @@ -7562,7 +7570,7 @@ nothing. Opening a document reads a DCS file and its plates again even with the keeps the saved preview of other linked EPS files. These rules are VectorCraft's own: the screen, composite print and exports show the image as its plates mixed into CMYK (each ink amount times the ink's CMYK values, plates combined as `1 − (1 − a)(1 − b)`); Separations Preview and `file.print` separations show each plate on its own ink, and a spot plate prints as the document's swatch -of its ink (else its CMYK values) with `spotsToProcess`. Separations Preview shows a reduced image's plates as the +of its ink (else its CMYK values) with `spotsToProcess` or that ink's own `convertToProcess`. Separations Preview shows a reduced image's plates as the mean of the plate pixels each shown pixel covers. A file may name 64 plates, a plate file may be 1 GB, and the plates together may hold 512 MB of ink amounts; a plate that can't be read is an error naming the plate, and nothing is placed. The plates go on the first plate's pixel grid, grown to hold every plate where it prints; a plate of another size or position is resampled onto @@ -8648,7 +8656,9 @@ picked as the printer, File → Print saves the PDF instead (see Printing). Head `{pages, path | dataBase64, bytes, warnings}`; `print.preview {settings?}` answers what it would print without writing it: `{pages (copies included), sheets: [{artboard, tile?, ink?, width, height, orientation, scale}] (one copy, in order), tiles: [{artboard, columns, rows, printed, tiles}] (document -space), inks: [{name, spot, print, frequency, angle}], warnings, settings}`. `print.setup {settings?}` saves the +space), inks: [{name, spot, print, frequency, angle}] (the plates), documentInks: [{name, spot, print, frequency, +angle, convertToProcess?}] (every ink of the document, the spot inks printing as process included), warnings, +settings}`. `print.setup {settings?}` saves the settings with the document (one undo step, kept in the native file as `print_setup`); both other commands start from the saved settings, or from a print preset's with `preset` (see Print presets), with `settings` over them (`null` keeps a value). `list_commands` with filter `print.setup` @@ -8678,9 +8688,19 @@ documents every field: - `marks` and `bleed` as `document.exportPdf` takes them (the bleed is the document's unless `useDocument: false`), drawn around the artboard at the paper's scale; the page information adds the tile and the ink with its screen. - `output: {mode: composite|separations, emulsion: up|down, image: positive|negative, spotsToProcess, overprintBlack, - inks: [{name, print, frequency, angle}]}`: separations print one page per ink in the gray of its coverage (images - too; overprinting fills, strokes and characters don't knock out), Registration on every plate; emulsion down mirrors - the page and a negative inverts it. + inks: [{name, print, frequency, angle, convertToProcess}]}`: separations print one page per ink in the gray of its + coverage (images too; overprinting fills, strokes and characters don't knock out), Registration on every plate; + emulsion down mirrors the page and a negative inverts it. +- `output.inks[].convertToProcess` (default false) prints one spot ink as process inks: it gets no plate of its own, + and its color prints on the Cyan, Magenta, Yellow and Black plates, while other spot inks keep their plates. The + Print dialog's Document Ink Options list shows an icon before each spot ink's name, and a click on it switches that + ink between spot and process output, as + [the help page](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) describes for single + spot colors. The rest is VectorCraft's own rule. `spotsToProcess` converts every spot ink whatever each one's + own setting says, and the dialog then dims the icons; turning it off again applies each ink's own setting. A + converted ink's `print`, `frequency` and `angle` are kept for when it prints as a spot ink again, and its Print + checkbox and fields are dimmed: `print: false` does not leave its color out of the process plates. Process inks and + Registration have no icon, and `convertToProcess` on a process ink is ignored with a setting note. - `output.overprintBlack` (default false) makes black ink overprint in separations, as the Output step of [Print color separations](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) describes: black art leaves the inks under it on the other plates. Which paints count as black is VectorCraft's own rule: a @@ -8979,6 +8999,25 @@ file size), `seconds` to download at `kbps` (default 56.6), the size, and for pa `source` (the colour the reduction made), so a colour keeps its edits when it is web-shifted or snapped. `slice: n` previews one slice; `image: true` adds the file; `warnings` holds the export's warnings. +Optimize to File Size (the dialog's button under Preset) is `webExport.optimizeToFileSize {desiredK, startWith?, +use?, slice?, …settings}`. It searches for settings whose files fit in `desiredK` K (1 K is 1024 bytes; above 0, at +most 1048576) and returns them without writing a file or changing the remembered settings: `{targetBytes, achieved, +bytes, format, settings, trials, images, warnings}`. `startWith: current` (the default) keeps the format and takes the +highest JPEG quality (1 to the current quality) or the most GIF/PNG-8 colors (2 to the current count) that fit, +measured by encoding. A lower value can give a larger file, so the search measures up to 6 values spread over the +range, from the top down, and then narrows the step above the first one that fits. When no value measured fits, GIF +tries lossy 100 with the most colors that fit. PNG-24 has no +setting to lower. `startWith: auto` takes GIF for art with transparent pixels or at most 256 colors and JPEG +otherwise. With `transparency: false` it counts the colors the pixels have once blended over the matte, as the file +is written. For opaque art it tries the other format when the first one cannot reach the size. `use: allSlices` (the +default) measures the image, or the image slices' files together; `eachSlice` measures the largest slice file; +`currentSlice` measures `slice` (a number from `slice.list`), else the selected image slice, else the first. The +slices share one setting, so every `use` changes the setting of all of them. The search encodes at most 32 trial +settings. When none fits, `achieved` is false and `settings` are the smallest trial. A `desiredK` that is missing, +not a number, 0 or less or above 1048576 is an error, as are an unknown `startWith` or `use` and a `slice` that is +not a slice number or comes with another `use`. In the dialog, the desired size starts at the size of what Total of All +Slices measures with the current settings, rounded up to 0.001 K. + Presets: `webExport.presets.list` (built-in ones, then saved ones), `webExport.presets.save {name, newName?, …settings}`, `webExport.presets.delete {name}`; any name works as `preset` in the other commands (its settings, then the keys given). `webExport.settings {…}` remembers the settings the dialog opens on (`{}` reads them, `reset: true` restores the @@ -9364,7 +9403,7 @@ layers are refused. destination or output intent is refused. Transparency is flattened before writing. - **pdfX3** (PDF/X-3:2002, written as PDF 1.3): colours are tagged with ICC profiles; transparency is flattened. - **pdfX4** (PDF/X-4:2010, PDF 1.6 at most): transparency and layers are kept, colours are tagged, and the XMP metadata - names the standard. + names the standard and has an `xmp:MetadataDate` equal to its `xmp:ModifyDate`. Flattening uses `flattenerPreset` (default High Resolution, see PDF 1.3 above) on a copy (the document is untouched; a warning says so), and images with see-through pixels count as transparency. The written file is checked against @@ -11471,7 +11510,9 @@ it while the drag sizes the halo: the halo's radius keeps the ratio to the point went down, through `growth` within 0 to 300 %. Letting the key go sizes the center with the drag again, and the flare keeps the new `growth`. While the rings' end point is placed, Up and Down Arrow add and remove rings (0 to 50; with Rings off they do nothing), and each press of backquote (the ~ key; a pointer event's `backquote` turning true) sends a -new `ringSeed`, which moves the rings along the path and keeps their count and sizes. Each new flare starts from the +new `ringSeed`, which moves the rings along the path and keeps their count and sizes. In VectorCraft, small seed +values, including 0, distribute the first ring along the path; the same seed and parameters reproduce the same +positions. Each new flare starts from the options' counts and growth, without a `ringSeed`. The Artboard tool's are the active artboard's Artboard Options (dialog `artboardOptions`; the Artboard tool's active artboard while it is in use, else the window's; its `x` and `y` are the artboard's top-left corner in document points, while the dialog shows X and Y at the reference point the diff --git a/docs/roadmap.md b/docs/roadmap.md index 8cbe973719..308eb0ddaf 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -1,6 +1,6 @@ # Roadmap: milestones and what's next -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (M1: an Alt-drag in the Layers panel copies a row above or below its own place, #8237; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (M1: an Alt-drag in the Layers panel copies a row above or below its own place, #8237; scores and estimates unchanged; previously: PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; M1: Layers panel Alt-drag shows the copy cursor, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: M7: Check Spelling modal dialog (Edit › Spelling › Check Spelling…), #4936; spell check complete; previously: PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; M10/G5: Neon & Glow built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); previously: Tech Circuit brush library, G5; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: M10/G5: Energy Beams brush library; MCP docs list Energy Beams; previously minor: M10/G5: Skill Icons symbol library; MCP docs list Skill Icons; previously minor: M10/G5: Status Effects graphic style library; MCP docs catch-up for symbol libraries; previously minor: M10/G5: Inventory Icons built-in symbol library; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: M10/G5: Game HUD graphic style library; previously minor: resizable icon-strip flyouts and bottom-aligned panel footers, #5713; previously minor: M10/G5: Map Markers built-in symbol library; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: G2: Effect Gallery thumbnails and in-dialog preview are in; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; M4/M7: `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; M4/M7: `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Indian-language hyphenation review and license allowlist, #4947; Hindi catalog and contributor loanword preferences; full wording review in progress; Effect dialogs: a colour swatch beside a hex colour opens the Color Picker, #5365; shape tools move the selection from its centre point and turn it from the zone outside a box corner, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). > @@ -160,7 +160,7 @@ Gujarati interface follow-up (2026-11-14): the catalog and zero/one plural rule | M1 | Selection, transform, layers, MCP (common command tools, strict keys, session resources and version-aware result hints) | ✅ mostly done (document-tab artwork drag with lossless resource transfer and one target Undo; malformed MCP app replies discard the connection without replay, #1761; bounded control socket waits and connection-slot recovery, #1726; bounded synthetic control input, #1709; no-op anchor Align keeps Undo, Redo and saved state (#1180 follow-up); transform reference point snaps to anchors/centres; rotated objects keep a rotated bounding box and their angle; Free Transform, Scale and Reflect along a rotated box pending; the Transform fields take one Tab each, the W/H link after them) | 4–6 | | M2 | Drawing tools + smart guides | ✅ mostly done (#3380 deletion creates independent selected path pieces and keeps bounds-fitted gradients in place; endpoint highlighting remains open; Polygon/Star exact-size count persistence, with repeated-drag, tool-switch and Cancel regression coverage; Curvature point markers without direction handles (#1236, in part); Direct Selection segment click/Delete preserves neighboring edges, #1278; Flare, Reshape, Live Corners widget dragging and per-corner radii and kinds landed, on any path's corners; Shaper rough-shape recognition and orientation steps, the remaining Pen modifier nuances; Shaper Groups with editable sources and separate fill/stroke edits landed; custom ruler origin with drag preview, active-artboard reset, relative X/Y fields and native round-trip (#1212); construction widget/refinements pending); a shape just drawn moves by its centre point and turns from the zone outside a corner with its tool still active (#5477); Tangent and straight-segment perpendicular snapping use saved Smart Guides Geometric Guides preferences and Control bar quick access (#2537), including the existing Snap to Glyph and Alignment Guides toggles (#6164); no View submenu; Copy and Cut with the Pen or Curvature tool take the anchors a Cmd/Ctrl-lent Direct Selection picked (#6123) | 12–18 | | M3 | Paint & appearance (swatches, color, gradient, stroke, appearance, transparency, styles) | ✅ done (M3.7–M3.98): swatches, groups, libraries, tints, Lab spots and Registration; Eyedropper copies transformed character dimensions (#6404) and styles highlighted text only (atomic transparency rejection); Eyedropper reads visible locked and outside-isolation sources (#1251); Color Picker, Color panel (its spectrum grows with a resized panel, #8005), Color Guide, Color Themes, Edit Colors and Recolor Artwork (screen-bounded Edit chip list, #3416; native Lab entry and swatch libraries in the picker, Assign-row menus, #8031/#4028); gradients that follow every transform, the annotator, linked stops, freeform gradients, focal points, gradients on strokes and Expand; visible strokes when paint is added to inherited None/zero-width art (#1253); stroke geometry, arrowheads, dashes fitted to corners, stroke on type, width profiles and the Width tool (Shift-double-click enables adjoining adjustment in Width Point Edit; finite-arithmetic follow-up regressions and full CI passed ([Validation evidence](target-app-parity.md#evidence-what-ships-today-by-area))), Scale Strokes and preview bounds; Appearance targeting, container appearance, target circles, Expand Appearance; knockout, isolation, blend accuracy, CMYK blending, overprint, Attributes, masks and clipping, Flatten Transparency; graphic styles, links and libraries; CSS library export preserves fractional linear and radial gradient stop positions. Left: freeform gradients in SVG/PDF, mixed spot/process gradients in SVG and PDF gradients mixing a spot color with RGB or Lab stops export as stops or process colors; PDF export writes dithered gradient fills with spot stops, and Perceptual spot gradients with RGB or Lab stops other than white or more than 4,096 stops on their curve, as images in process colors; confirm the Scale Strokes & Effects default; Recolor model selection is available through the engine and MCP only (#2520); the dialog retains its existing controls; Library panels' lists (swatch, Color Book, brush, symbol and graphic style libraries) fill a taller panel above its footer (#2992; scores and estimates unchanged); Graphic Styles list fills a taller panel above its footer (#2992; scores and estimates unchanged); Swatches list fills a taller panel above its footer (#1638; `the_list_fills_a_tall_panel_above_its_footer`; scores and estimates unchanged); | 4–8 | -| M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; estimates unchanged); Rename artboards in Export for Screens (#7275); Explicit editing-data import keeps oversized capped-page artboards (#6865; estimates unchanged); Save refusal continuation (#6146): ordinary Save offers Save As; unchanged format keeps options, changed format opens its Save options; cancellation/automation isolation; focused UI regressions passed, native acceptance pending; PDF authored ActualText preserved once in editable import (#6165; first-glyph line/style, bounded input; estimates unchanged); PDF export keeps harakat and zero-advance Noto Arabic dot glyphs in one compatible batch per layout line, with per-glyph vertical offsets (#6309). `crates/pdf/src/tests/realtext.rs` (`mark_text_*`) checks decoded cluster mappings, mixed Arabic/Latin/digits, contour placement against outline export, vertical columns, differing path rotations and PDF/X-1a/3/4. Editable-text import preserves authored ActualText separately (#6165), with cross-line/style layout limits; separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. `.ai`/EPS type from the text document keeps its paragraphs' tab stops (#6147); `.ai`/EPS type from the text document keeps auto leading per line, its hyphenation options, and may show more of the last lines the file sets in an area frame of its own, when growing the frame by its lines' deepest descent plus 0.05 pt shows them (#6137); ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), shared guarded PDF writer and windowed reader ([pdf-backend.md](pdf-backend.md)), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out (EPS legacy mesh corners, vector opacity masks and raster page comparison verified; closed SPLINE flags round-trip and circular paths export as native CIRCLE/ARC, #1299), EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, TIFF in Export for Screens and Asset Export, clipboard flavours, File Info; AF.1–AF.4 add Affinity import (native layers, artboards, vectors, text and images from Affinity 1–3 files; the embedded preview only as a warned fallback; AF.4 expands current `.af` fixtures and every-board round-trip validation); EPS Save and Save As keep an opened EPS as EPS with its page frame and complete editable VectorCraft document (2026-10-26; G9 import fidelity unchanged). Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, Affinity export, polish; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); | 3–6 (existing scope; Affinity export unestimated) | +| M4 | Files (native, SVG, PDF, raster, Export for Screens, clipboard interop) | PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300; estimates unchanged); PDF import: type filled and stroked by one text-showing operator comes in as one filled and stroked type object (#8015; not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one; estimates unchanged); PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; estimates unchanged); Rename artboards in Export for Screens (#7275); Explicit editing-data import keeps oversized capped-page artboards (#6865; estimates unchanged); Save refusal continuation (#6146): ordinary Save offers Save As; unchanged format keeps options, changed format opens its Save options; cancellation/automation isolation; focused UI regressions passed, native acceptance pending; PDF authored ActualText preserved once in editable import (#6165; first-glyph line/style, bounded input; estimates unchanged); PDF export keeps harakat and zero-advance Noto Arabic dot glyphs in one compatible batch per layout line, with per-glyph vertical offsets (#6309). `crates/pdf/src/tests/realtext.rs` (`mark_text_*`) checks decoded cluster mappings, mixed Arabic/Latin/digits, contour placement against outline export, vertical columns, differing path rotations and PDF/X-1a/3/4. Editable-text import preserves authored ActualText separately (#6165), with cross-line/style layout limits; separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. `.ai`/EPS type from the text document keeps its paragraphs' tab stops (#6147); `.ai`/EPS type from the text document keeps auto leading per line, its hyphenation options, and may show more of the last lines the file sets in an area frame of its own, when growing the frame by its lines' deepest descent plus 0.05 pt shows them (#6137); ✅ done (M4.14–M4.98 on 2026-10-05): Save As/Save a Copy/Revert/templates, Data Recovery and background save, SVG import and export fidelity (units, text, symbols, filters, SVGZ, Preserve Editing, SVG Options), shared guarded PDF writer and windowed reader ([pdf-backend.md](pdf-backend.md)), PDF import (colours, layers, masks, editable text, security) and export (presets, marks, bleed, ICC and output intent, raster effects, subset fonts, PDF/X-1a, X-3 and X-4, PDF layers, overprint, page thumbnails, fast web view, PDF 1.3), Place and Links, Package, EPS and DXF in and out (EPS legacy mesh corners, vector opacity masks and raster page comparison verified; closed SPLINE flags round-trip and circular paths export as native CIRCLE/ARC, #1299), EMF/WMF, TIFF/BMP/Targa/PSD/GIF/PNG-8 export, Print and print presets, slices, Save for Web, TIFF in Export for Screens and Asset Export, clipboard flavours, File Info; AF.1–AF.4 add Affinity import (native layers, artboards, vectors, text and images from Affinity 1–3 files; the embedded preview only as a warned fallback; AF.4 expands current `.af` fixtures and every-board round-trip validation); EPS Save and Save As keep an opened EPS as EPS with its page frame and complete editable VectorCraft document (2026-10-26; G9 import fidelity unchanged). Left: DWG (use DXF), PSD placement as layers, overprint read back from PDF, Affinity export, polish; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); | 3–6 (existing scope; Affinity export unestimated) | | M5 | Performance | 🟡 background render + caches + MT done; `vectorcraft-cli bench` and `vectorcraft-cli perf` (budget suite); opaque solid-fill knockout paths draw once in hard-edge/supersampled raster export, with analytical-AA compositing unchanged; file format v2 opens 3× faster (50k paths: 722 → 244 ms); raster effects (glows, shadows, blur, feather) no longer force the whole frame single-threaded (filtered offscreen per effect, verified equal to the single-threaded reference); Craquelure/Mosaic Tiles/Stained Glass distance searches optimized with pixel-invariance checks and the `texture_drag_perf` probe (#1257); effect-heavy demos need a clean-machine benchmark; dirty-region rendering, GPU backend spike pending | 15–25 | | M6 | Path operations (Pathfinder, Shape Builder, offset…) | ✅ mostly done (live compound shapes: Make, Alt-click a Shape Mode, member modes, Release, Expand (#4522); single-result Pathfinder names and SVG IDs retained (#1293); Divide open-cutting-path geometry, appearance and history verified (#1307; existing segment cap remains); Simplify preview/counts and rewritten-path component selection verified (#1272; the slider opens at the Auto-Simplify level; a Direct Selection part of a path simplifies on its own); Compound appearance and member fill-rule edits verified (#1197); Boolean precision on almost-horizontal edges fixed and the property tests made deterministic; Shape Builder gap detection, large-offset bug open); Shape Builder Gap Detection shares Live Paint’s spatial gap finder and temporary merge bridges (#2526); Custom is capped at 72 pt in the existing options dialog | 3–6 | | M7 | Type (point/area/path, editing, styles, OpenType, threading, glyphs) | Spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, the custom dictionary and Ignore All commands, Auto Spell Check with its right-click suggestions, Ignore All and Add to Dictionary, Spelling › Auto Spell Check in the context menu of type, the Edit Custom Dictionary dialog, and the modal Check Spelling dialog (Edit › Spelling › Check Spelling…, `Cmd+I`, `ui.checkSpelling`, #4936); Right-aligned area type sets the text after a line's last tab against the right edge, the text before it at its stops (#6147); A line a soft return ends is justified as a wrapped line is (#6137); Indian-language pattern hyphenation preserves syllables in both composers (#4947); 🟡 Hanging punctuation keeps its published amounts under Glyph Scaling, and Standard burasagari counts a hung line start as room; Fullwidth `!` / `?` keep an upright fallback in vertical type; Hyphenation… and Justification… per paragraph (#2310, #2755), Auto Leading also driving the Character panel's Leading, the Alt+↑/↓ leading nudge and Fill with Placeholder Text; Document-point character controls after object/group scaling (#1034; optional font-size preservation remains separate), Character/Paragraph Styles (explicit Auto-leading resets and local leading overrides), per-paragraph paragraph attributes, mixed paragraph alignment indication (headless regressions, full integration CI and visual review pass), Area Type Options (with Width/Height, Auto Size and Shrink Text to Fit; overflow reported to agents and vertical Align), type areas resized by their handles and reshaped with Direct Selection, threaded text, Fit Headline, Glyphs (feature-valued alternates and unencoded glyphs applied in one Undo step while keeping Arabic joining, #5514), OpenType panel (including font-defined Stylistic Sets), Find Font (Document, Recent and System replacement sources, #5217), installed system fonts in every font menu (fonts registered with Windows outside its font folders, the XDG and Flatpak host font folders on Linux, and fonts installed while the app runs, listed when it comes back to the front; searchable; the Character and Properties menus show each family's sample of the selected text, preview it live under the pointer or ↑/↓, show recently applied families first (#3515), filter by script and kind, list a family's styles, and star favourites; the Glyphs panel and Find Font's Replace With use the same menu without the live preview) and found by name on open/import (full-name aliases and Missing Fonts searches verified, #1258; Windows font-service QA pending), variable fonts' named instances as styles, CJK names in the UI, input methods (marked text in place, candidate window at the caret; Japanese IME), Text Wrap (offset, invert, both sides of an object; follows edits), Type on a Path effects and Options with draggable start/centre/end brackets (slide, flip), tab stops + Tabs panel (Above Text floats it over the selected text, its ruler at the canvas zoom so stops line up with the columns, #729), inline symbols in text (beyond parity), Hebrew/Arabic bidirectional text, Paragraph Direction, Every-line/Single-line Composer per object (ragged text too) done; paint-only Arabic harakat keep joining with GDEF-mark ownership and Insert Kashidas tatweels on the base letter's paint (`tests::harakat`); tab leaders, vertical type pending | 45–60 | @@ -212,7 +212,12 @@ not take the artwork yet. Overflow-menu drag remains separate. Scores and hours | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | | 2026-11-16 | minor | M1: an Alt-drag in the Layers panel copies a row above or below its own place (`layer.move` with `copy` and that row as the target), so the top layer dragged up, the bottom layer dragged down and a document's only layer are copied (#8237). Scores and estimates unchanged. | +| 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | +| 2026-11-16 | minor | M1: rows or the selected-art square dragged over the Layers panel's list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | +| 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged. | | 2026-11-16 | minor | Color panel: the spectrum fills the vertical space of a resized panel, with options shown or hidden (#8005). Compact auto-fit flyouts and embedded mixers keep their existing size. Evidence: panels::color::tests::the_spectrum_grows_with_the_color_panel. Scores and estimates unchanged. | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) keeps the line cap, line join and miter limit of the graphics state it is stroked with, as paths do, instead of butt caps, miter joins and a miter limit of 10; a glyph filled and then stroked otherwise than the run its fill joined comes in as a run of its own, so the glyphs before it keep their stroke (#7741; `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`). Scores and estimates unchanged. | diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 624a0a6c7b..2fc0125af8 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1,6 +1,6 @@ # Parity with Adobe Illustrator -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Layers panel: an Alt-drag copies a row above or below itself, so the top layer dragged up, the bottom layer dragged down and a lone layer are copied, #8237; scores and estimates unchanged; previously: Properties panel: the Character section shows the font of the Type tool's selection, not the first run's (#8189); scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Paragraph composers (#4935): the Paragraph panel menu and paragraph styles offer four composers, the Middle Eastern & South Asian Single-line and Every-line (how all type is set, and the default) and a Standard Single-line and Every-line that set Indic, Arabic and Hebrew type glyph by glyph as the font maps it, for legacy fonts that keep a script on Latin character codes; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; G5: Neon & Glow joins built-in graphic style libraries (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); scores and estimates unchanged; previously: Pencil ignores Smart Guides and Snap to Point and shows no Smart Guides, #7252; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: G5: Weather Icons joins built-in symbol libraries (Sun, Moon, Cloud, Rain, Thunder, Snow); scores and estimates unchanged; previously: a closed Pencil stroke closes with a straight segment; previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; previously: 3D: the seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins, so white-light 3D output is expected to differ from the 2026-10-17 comparison at facet corners (not measured: the scenes were not exported again); previously: `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; Character panel: the Set Font Height Reference dropdown shows an icon before each reference, #6304; scores and estimates unchanged; previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-17 · **Change:** minor (Layers panel: an Alt-drag copies a row above or below itself, so the top layer dragged up, the bottom layer dragged down and a lone layer are copied, #8237; scores and estimates unchanged; previously: Twist: a strongly twisted path joins its pieces without kinks, #7069; scores and estimates unchanged; previously: PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked, #8300; PDF import: translucent type filled and stroked comes in as a filled type object and a stroked one, as the file composites them, and an upright glyph is never kept as the outline of its glyph alone, #8015; PDF import: type filled and stroked by one text-showing operator comes in as one type object, filled and stroked, not a stroked copy over a filled one, #8015; Layers panel: Alt over the list shows the copy cursor while rows or the selection square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Properties panel: the Character section shows the font of the Type tool's selection, not the first run's (#8189); scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Paragraph composers (#4935): the Paragraph panel menu and paragraph styles offer four composers, the Middle Eastern & South Asian Single-line and Every-line (how all type is set, and the default) and a Standard Single-line and Every-line that set Indic, Arabic and Hebrew type glyph by glyph as the font maps it, for legacy fonts that keep a script on Latin character codes; PDF import: stroked type keeps the line cap, line join and miter limit the file strokes it with, a glyph stroked otherwise than the run it joins coming in as a run of its own, #7741; G5: Neon & Glow joins built-in graphic style libraries (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor); scores and estimates unchanged; previously: Pencil ignores Smart Guides and Snap to Point and shows no Smart Guides, #7252; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: G5: Weather Icons joins built-in symbol libraries (Sun, Moon, Cloud, Rain, Thunder, Snow); scores and estimates unchanged; previously: a closed Pencil stroke closes with a straight segment; previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; previously: 3D: the seams of Extrude & Bevel, Inflate and Rotate under a white light, and of the faces of Extrude & Bevel (Classic), Revolve (Classic) and Rotate (Classic), went from miter to round joins, so white-light 3D output is expected to differ from the 2026-10-17 comparison at facet corners (not measured: the scenes were not exported again); previously: `.ai` and EPS import: in layers that don't draw as the page, art that differs away from an envelope of type no longer costs it its editable type; it keeps its drawn art where, in the pixels it and its drawn art ink, the layers with it differ from the page more than its own check allows, or past the envelopes' share of the page check, #7141; Character panel: the Set Font Height Reference dropdown shows an icon before each reference, #6304; scores and estimates unchanged; previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter, so a top object saved with its sides' curves in pieces draws as its `.ai` drawn art, #7097; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: PDF import: glyphs in a span with an empty ActualText come in as outlines, #6971; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously minor: Object › Rasterize with the Grayscale or Bitmap colour model makes a grayscale image, #6969; scores and estimates unchanged; previously minor: `.ai` and EPS import: type in an envelope with Distort Appearance is also tried mapped from the box of what it paints, miter tips and moved strokes included, after its glyphs grown by half its strokes' weight (#6824; #6617: Swatches panel menu: Show Recent Colors; scores unchanged; previously minor: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: #6865: explicitly requested oversized editing artboard; macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Type tool: kerning at a caret at the start of a line moves the character after it, #5111; scores and estimates unchanged; previously minor: Rulers: the zero point dragged out of the rulers' corner snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Envelopes: with Distort Appearance, type's strokes paint along the bent glyph outlines at their own weight, as users' `.ai` files draw them, which changes how VectorCraft's own envelopes of stroked type draw (#6644; scores and estimates unchanged); previously minor: G5: Energy Beams brush library; bundled content ~44% → ~46%; previously minor: G5: Skill Icons symbol library; bundled content ~42% → ~44%; previously minor: `.ai` and EPS import: an envelope saved in Edit Contents whose mesh lies away from its drawn art by a move opens live on that art (#6570; scores and estimates unchanged); previously minor: ruler double-click adds a guide at the pointer, #5239; G5: Status Effects graphic style library; bundled content ~40% → ~42%; MCP symbol libraries list UI Frames and Map Markers; previously minor: G5: Inventory Icons built-in symbol library; bundled content ~38% → ~40%; previously minor: `.ai` and EPS import: stroked type in an envelope maps from its glyphs grown by half its stroke (#3179; scores and estimates unchanged); previously minor: `.ai` and EPS import: warps of type open as mesh envelopes on their saved grid where VectorCraft's warp doesn't draw as their drawn art (#3179; scores and estimates unchanged); G5: Game Trails brush library; bundled content ~36% → ~38%; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: `.ai` and EPS import: envelopes of type open live where they draw as their drawn art and the layers with them draw as the page (#3179; scores and estimates unchanged); G5: Game HUD graphic style library; bundled content ~34% → ~36%; previously minor: Line Arrow arrowhead (#5421; scores and estimates unchanged); G5: Map Markers built-in symbol library; bundled content ~32% → ~34%; previously minor: right-click on type: Spelling › Auto Spell Check, with its check mark, #4936; previously minor: right-click on a word Auto Spell Check underlined: its suggestions, Ignore All and Add to Dictionary, #4936; previously minor: Canvas: a 3D effect changed on type or a group redraws where its solid was; Fit to Artwork Bounds and per-artboard SVG export build each solid once for all artboards; previously minor: Effect Gallery: a thumbnail for each filter and a preview area inside the dialog, on an original drawing; Raster effects 52% → 55%, hours 1–2 → none; headline numbers unchanged; Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF editable import preserves authored ActualText once, including empty/nested spans and authored ordering (#6165); cross-line/style layout remains approximate; scores and estimates unchanged; PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; G5: UI Frames built-in symbol library with default 9-slice; bundled content ~32%; previously minor: G5: dynamic symbol part on-canvas opacity/blend/gradient/pattern; strokes remaining no longer lists Overlap/auto corners; symbols ~88%; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; previously minor: harakat paint fallback clarified; previously minor: current Guides feature-area rows consolidated using existing ruler evidence; scores and estimates unchanged; previously minor: Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; previously minor: G5 docs: Art brush Overlap and Pattern brush auto corners removed from strokes remaining; symbols remaining lists dynamic on-canvas beyond solid and guides outside the art; previously minor: custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: EPS import: embedded fonts (composite, Type 42, CID-keyed, Type 1, CFF FontSet) draw their glyphs; spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; `.ai`/EPS type keeps its tab stops, and right-aligned lines with tabs lay out as the file's page, #6147; `.ai`/EPS type from the text document lays its lines out closer to the file's page, within limits, #6137; `.ai` and EPS import: older Art brush objects read; numeric fields step on wheel hover without taking keyboard focus, and a panel wheel turn cannot seed a canvas zoom glide, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; Selection QoL: marquee modes and visible feedback, #5313; SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; the canvas keeps selection outlines and anchors between frames; Indian-language hyphenation review and license allowlist, #4947; Stroke gradients: an arrowhead aligned to the tip is painted to the corners of its base, #5964; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Hindi catalog and contributor loanword preferences; full wording review in progress; Properties in Edit Artboards: a Transform section with the reference point above the Artboards section, #5219; the Control bar's Stroke: and Opacity: links scrub their fields, #4088; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window, #4155; Control bar Paragraph section with type selected, #5372; translating unchanged type reuses its glyph and character-stroke outlines; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; public release notes through 30.7, August 2026; Units › East Asian Type acts, with Q and Ha units; scores unchanged) > > Tech Circuit update (2026-11-14): three original procedural brushes; ten built-in brush libraries (G5). > @@ -61,6 +61,10 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | Date | Change | Summary | |---|---|---| +| 2026-11-17 | minor | Distort & Transform › Twist: handles follow the rotation's derivative, so a strongly twisted path is a smooth spiral instead of pieces meeting at kinks (#7069; `twist_joins_its_pieces_smoothly` in `crates/effects/src/tests.rs`). Scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8300): a glyph filled only (text rendering mode 0) right after one filled and stroked (mode 2) joined the stroked run and came in stroked too: `2 Tr (B) Tj 0 Tr (C) Tj` came in as `BC` stroked throughout. A glyph filled only now joins only a run drawn alike, so it starts a run of its own, filled only, in the same type object, and takes a stroke only when the file draws one over it (the #8015 matching); a word filled whole then stroked whole, and fill and stroke rendering glyph by glyph, still come in as one run filled and stroked. Tests: `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked`, `glyphs_filled_and_stroked_one_by_one_stay_one_run`; scores and estimates unchanged. | +| 2026-11-17 | minor | PDF import (#8015 follow-up): type filled and stroked at less than full opacity is no longer joined into one type object, since the file composites the fill and the stroke apiece, darker where they overlap, while one object's opacity applies to both together; it stays a filled object and a stroked one, as a fill and stroke at different opacities already did. An upright glyph (vertical type) filled and stroked is no longer kept as an outline for a line that comes in as its outlines, as glyphs filled only weren't, so such a line can't lose them. The #8015 entries now say what is left: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Tests: `translucent_fill_and_stroke_text_stays_two_objects`, `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled`; scores and estimates unchanged. | +| 2026-11-16 | minor | PDF import: fill and stroke rendering (text rendering modes 2 and 6) draws all the glyphs of a text-showing operator (`Tj`, `TJ`, `'`, `"`) filled, then the same glyphs stroked, so a word shown at once came in as two type objects: a stroke-only copy over a fill-only one. Each stroke is now matched, in order, to the glyph filled with the same placement (where, how large, how wide, slanted and turned) in the same font with the same text on the line, and only that glyph takes the stroke, so the word comes in as one type object, filled and stroked; glyphs stroked with another join part way through still split into runs of their own, and stroked type over no filled glyph (modes 1 and 5) stays stroke only (#8015; `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`, `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs`). Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork › Assign: native Lab entry in the Color Picker, swatch libraries access in the picker, and row context menu options (Pick from Swatches, Limit to Library) (#4028); scores and estimates unchanged. | | 2026-11-15 | minor | PDF import: stroked type (text rendering modes 1, 2, 5 and 6, and glyphs under `ActualText`) keeps the line cap, line join and miter limit of the graphics state it is stroked with, as paths do, instead of butt caps, miter joins and a miter limit of 10; a glyph filled and then stroked otherwise than the run its fill joined comes in as a run of its own, so the glyphs before it keep their stroke (#7741; `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`). Scores and estimates unchanged. | | 2026-11-15 | minor | G5: Neon & Glow joins Shadows and Glows, Outlines and Rules, Hand-Drawn, Textures, Painted and Sketched, Gradient Finishes, Shape Effects, Blends and Transparency, Game HUD and Status Effects as an eleventh built-in graphic style library (Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet, Cobalt Phosphor; original procedural styles generated in code); area score and estimate unchanged. | @@ -269,16 +273,16 @@ dominate; 3D, graphs and automation are specialist). They sum to 105. Feature de | Image Trace, graphs, image tools | 3 | 75% | graph Column designs, Image Trace Create Strokes depth (Create Object Mosaic is done; junction-returning piece survival has source-generated regressions in `image-trace-quality.md`; large images trace with a warning; Auto Color keeps rare distinct colours) | 5–8 | estimated (raised from 72%); quick presets reveal adjustment controls, Properties reopens them | | Layers, artboards, document setup | 5 | 78% | Selected-artboard deletion is consistent across panel actions (all-selected retains artboard 1); history prunes removed indices while preserving valid multiselection; remaining: 30.0's artboard locking and colours and managing artboards from the canvas, Layers row menu commands beyond Collect for Export and menus on guide and blend spine rows (click-to-fit objects is done, #1227) | 5–8 | estimated (lowered from 82%: target moved); Artboard deletion keys keep artwork and the first of an all-selected set; Artboard Options' Show Center Mark and Show Cross Hairs draw on the canvas only (exports and print leave them out), regression-tested; Artboard Options' Show Video Safe Areas and Video Ruler Pixel Aspect Ratio (per artboard, native format) are done ([video display options](#evidence-what-ships-today-by-area)), score unchanged | | View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged); document-tab artwork hover/copy and lossless transfer tested (2026-10-22; score/hours unchanged); cached canvas reprojection preserves scale during resize, rotation and DPI changes (regression and contributor original-file evidence below; scores/hours unchanged); cached canvas dimensions match the renderer limit before cache-key creation, view construction and worker submission (regression evidence below) | -| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), no writing of Illustrator's editing data (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.| 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); DXF export's Include Placed Images and Include Fill Hatches options, off in CNC / CAM (`images_and_hatches_are_left_out_independently_and_the_cnc_preset_leaves_out_both`; score, gaps and hours unchanged); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`; the distance from the path under Align to Path is measured from the top of each character's em box, half the height of the top of its H or the bottom of its font's bounding box (`tests_native::aligned_type_lies_as_far_from_its_path_as_the_file_lays_it_out`), and the fit under Gravity does not reproduce the file's layout), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. | -| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, textures, map art and shading in 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.| 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. | -| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.| 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Save refusal continuation (#6146): `READ_ONLY_LOCATION`, Save As on ordinary UI Save only; regression execution pending; score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. | +| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), no writing of Illustrator's editing data (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.; PDF type filled and stroked at less than full opacity, or by a `TJ` whose kerning starts a new line part way through, comes in as a filled object and a stroked one (#8015) | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); DXF export's Include Placed Images and Include Fill Hatches options, off in CNC / CAM (`images_and_hatches_are_left_out_independently_and_the_cnc_preset_leaves_out_both`; score, gaps and hours unchanged); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`; the distance from the path under Align to Path is measured from the top of each character's em box, half the height of the top of its H or the bottom of its font's bounding box (`tests_native::aligned_type_lies_as_far_from_its_path_as_the_file_lays_it_out`), and the fit under Gravity does not reproduce the file's layout), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. PDF import: type filled and stroked by one text-showing operator (rendering modes 2 and 6) comes in as one type object, filled and stroked, not a stroked copy over a filled one (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`); not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one (`translucent_fill_and_stroke_text_stays_two_objects`); score and hours unchanged. PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` in `crates/pdf/src/tests/textstroke.rs`); score and hours unchanged. | +| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, textures, map art and shading in 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.; PDF type filled and stroked at less than full opacity, or by a `TJ` whose kerning starts a new line part way through, comes in as a filled object and a stroked one (#8015) | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. PDF import: type filled and stroked by one text-showing operator (rendering modes 2 and 6) comes in as one type object, filled and stroked, not a stroked copy over a filled one (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`); not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one (`translucent_fill_and_stroke_text_stays_two_objects`); score and hours unchanged. PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` in `crates/pdf/src/tests/textstroke.rs`); score and hours unchanged. | +| File formats | 6 | 75% | `.ai` files open with a flattened or wrong layer structure in real cases (#951), a saved `.ai`'s editing copy without live effects on objects other than paths, compound paths and groups that qualify (at most a fill and a stroke, a non-zero fill rule when filled, no large canvas) and whose appearance and effects the art-style writer supports, and with live objects other than grouped column, stacked column, line and area graphs the `.ai` reader reads back whole as their art (#868), FreeHand/CorelDRAW/DWG/HEIC import, 3D export; see [file-format-parity.md](file-format-parity.md); EPS legacy mesh/opacity-mask and raster comparison follow-up verified PDF marked-text batching covered by M4 evidence (#6309); cross-line/style ActualText layout (#6165) and styled-cluster limits remain.; PDF type filled and stroked at less than full opacity, or by a `TJ` whose kerning starts a new line part way through, comes in as a filled object and a stroked one (#8015) | 10–20 | estimated (lowered from 85%: open issues); DXF control-point SPLINE import closure regression-tested (#1299 follow-up after #1320); PDF writer metadata, reader streaming and immutable backend checks in `crates/pdf/src/tests.rs`, `crates/pdf/src/tests/reader_streaming.rs` and `xtask/src/pdf_deps.rs`; PDF Place and clipboard paste retain live text (synthetic regressions); SVG CSS classes survive export and repeated import in all four styling modes (#2480); current-main integration retains event attributes and scripts; EPS ordinary Save retains the page frame and editable document (2026-10-26); `.ai`/EPS editing data checked against a user's files (2026-10-30): case setting (`ate::tests`, `tests_native::type_from_the_text_document_keeps_its_case_setting`), placed-file placements (`tests_native::a_small_placed_file_goes_where_it_draws_closer_to_the_page`), pages cropped to the art (`tests_native::type_on_the_copies_of_a_page_cropped_to_the_art_is_read_once`), mesh corner weights and state (`ai::mesh::tests::corners_with_handle_weights_of_zero_are_read`, `ai::tests::a_gradient_mesh_takes_the_transparency_written_after_it`), type on a path spacing (`tests_native::type_round_a_circle_is_spaced_as_the_file_lays_it_out`), blend state (`ai::tests::a_blends_transparency_follows_its_record`); scores and estimates unchanged. Graphs saved to `.ai` in either form open again as live graphs (`ai_editing::tests::graphs_are_written_with_their_records_and_open_live`, `legacy_ai::tests::graphs_are_written_with_their_records_and_open_live`, `cmd::graph::tests::a_drawn_graph_saved_as_ai_opens_as_a_graph_unless_the_save_warns`); other graphs are still written as their art (`graphs_the_records_cant_keep_are_written_as_their_art`); score and hours unchanged. PDF ActualText preserved in editable import (#6165; bounded synthetic coverage below); score/hours unchanged. Save refusal continuation (#6146): `READ_ONLY_LOCATION`, Save As on ordinary UI Save only; regression execution pending; score/hours unchanged. Legacy `.ai` type keeps its manual kerning pairs (`Tk`, `TK`), discretionary hyphens (`T+`, `T-`) and hyphenation language (`XL`) when it opens, and legacy `.ai` saves write manual kerning as `Tk` and soft hyphens as `T+` (`import::ai::tests::legacy_manual_pair_kerning_is_kept`, `legacy_ai::tests::manual_kerning_and_soft_hyphens_are_written_and_read_back`); score, gaps and hours unchanged. PDF import: stroked type (text rendering modes 1, 2, 5 and 6) keeps the file's line cap, line join and miter limit, as paths do (#7741, `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs`); score, gaps and hours unchanged. PDF import: type filled and stroked by one text-showing operator (rendering modes 2 and 6) comes in as one type object, filled and stroked, not a stroked copy over a filled one (#8015, `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs`); not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one (`translucent_fill_and_stroke_text_stays_two_objects`); score and hours unchanged. PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300, `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` in `crates/pdf/src/tests/textstroke.rs`); score and hours unchanged. | | View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged); document-tab artwork hover/copy and lossless transfer tested (2026-10-22; score/hours unchanged); cached canvas reprojection preserves scale during resize, rotation and DPI changes (regression and contributor original-file evidence below; scores/hours unchanged) | | View & navigation | 3 | 70% | multiple windows and the rest of Arrange (Cascade, Float in Window, Float All in Windows) | 9–14 | estimated; Window › Arrange › Tile and Consolidate All Windows done (score/hours unchanged) | | Guides, grids, smart guides, snapping, rulers | 3 | 80% | "intersect" smart guides for a moved selection's anchors (drawn points and dragged anchors snap to intersections, #1658) | 4–7 | estimated (lowered from 85%: target moved); Control bar snapping quick access includes Snap to Glyph and Alignment Guides (#6164); new ruler-guide Alt orientation implemented; global/artboard ruler modes (`view.globalRulers`) and video rulers (View › Rulers › Show Video Rulers, #2849) done; status-bar X/Y uses the active ruler origin and General units; score unchanged | | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | anti-aliasing ghost borders (#983); TIFF choices and settings are implemented | 2–4 | estimated | | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity | 2–4 | estimated | | Automation (Actions, Variables, scripting, batch) | 3 | 60% | a scripting surface (Illustrator: JavaScript/ExtendScript), Batch, image and graph variables, dataset import/export | 8–14 | estimated; MCP `add_text` exposes existing vertical type; score and hours unchanged | -| UI chrome (panels, Properties, workspaces, preferences) | 6 | 80% | Properties per context, 2 Preferences options stored but unused (#394, audited 2026-10-30: Scratch Disks, legacy vector clipboard), context menus in the panels that have none, accessibility | 13–20 | estimated; floating panels in OS windows of their own on the desktop (#4135), score and hours unchanged; macOS save Format menu implemented (#866), score and hours unchanged; Eyedropper cursor and precise setting checked (#1269), OS visual QA unverified; numeric-field focus and normal text drags regression-tested (#1326); a focus click released more than 1 pt from its press keeps the caret and a tap within 1 pt selects all (#6659); artboard navigation synchronizes the tool selection before destructive actions; status messages and readouts use stable responsive allocations sized for localized labels and ordinary coordinates (sample widths cached by language/unit/DPI; regression and contributor original-file evidence below; scores/hours unchanged); effect dialogs' colour fields show a swatch that opens the Color Picker (#5365), score and hours unchanged; icon-strip flyouts retain user sizes (#5713); floating tab groups collapse into the side icon rail and opened rail panels fold back into it (#5925, in part), scores and hours unchanged ; interim macOS cursor delivery (#2292), headless coverage only; native validation pending, score and hours unchanged; Swatches item context menus have focused regressions and rendered-layout evidence below; scores and estimates unchanged | +| UI chrome (panels, Properties, workspaces, preferences) | 6 | 80% | Properties per context, 2 Preferences options stored but unused (#394, audited 2026-10-30: Scratch Disks, legacy vector clipboard), context menus in the panels that have none, accessibility | 13–20 | estimated; floating panels in OS windows of their own on the desktop (#4135), score and hours unchanged; macOS save Format menu implemented (#866), score and hours unchanged; Eyedropper cursor and precise setting checked (#1269), OS visual QA unverified; the line under the Preferences fields describes each General, Selection & Anchor Display, Guides & Grid and Smart Guides setting on hover and keyboard focus (#8199, #8223, #8248), score and hours unchanged; numeric-field focus and normal text drags regression-tested (#1326); a focus click released more than 1 pt from its press keeps the caret and a tap within 1 pt selects all (#6659); artboard navigation synchronizes the tool selection before destructive actions; status messages and readouts use stable responsive allocations sized for localized labels and ordinary coordinates (sample widths cached by language/unit/DPI; regression and contributor original-file evidence below; scores/hours unchanged); effect dialogs' colour fields show a swatch that opens the Color Picker (#5365), score and hours unchanged; icon-strip flyouts retain user sizes (#5713); floating tab groups collapse into the side icon rail and opened rail panels fold back into it (#5925, in part), scores and hours unchanged ; interim macOS cursor delivery (#2292), headless coverage only; native validation pending, score and hours unchanged; Swatches item context menus have focused regressions and rendered-layout evidence below; scores and estimates unchanged | | Libraries, Links, Package | 2 | 82% | shared libraries, linked graphics, gradients and patterns as library items (no cloud by design) | 2–3 | estimated | | Generative AI (Text to Vector, Generative Recolor, Shape Fill, Concept to Vector, Prompt to Edit, Rewrite Text) | 2 | 0% | a pluggable provider and the panels; needs an owner decision on models | 30–60 | measured (absent) | | **Feature depth** | **105** | **~75%** | | **~250–420** | | @@ -534,7 +538,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale) | Layers, artboards, document setup | 5 | 82% | Layers panel: a confirmation before deleting layers that hold art, row menu commands beyond Collect for Export (now on every layer, sublayer, group and object row), menus on guide and blend spine rows, the Layer Options dialog for several rows with mixed values, Paste Remembers Layers for sublayers; artboard preset polish (artboard escape routing and document setup modal handoff done; Move Artwork for artboard X/Y edits, Rearrange All Artboards, Document Setup, New Document and the rest of the Layers panel are done) | 4–7 | | View & navigation | 3 | 70% | New View/Edit Views, multiple windows/arrange, Snap to Pixel/Glyph (print tiling is done) | 9–14 | | Guides, grids, smart guides, snapping, rulers | 3 | 85% | global/video rulers, Spacing Guides' distance readouts and spacing for resized or drawn art, Alt swapping a ruler guide's orientation, ruler guides selected together with art (marquee, Shift-click), ruler guides as Layers rows with their own lock and hide (#451: Lock Guides locks them all; Make Guides paths are Layers rows already) (dragging existing guides is done, #414; new guides snapping to side midpoints and artboards, and artboard guides, #451; the drawing tools snapping, with Construction Guides, #506; Spacing Guides for moves, #394; moves snapping to the grid, #740; ruler guides pulling drawn points with Smart Guides on, and "center" and "anchor" labels while hovering with the Selection tool, #812; distance and angle labels while drawing, #2983) | 2–4; status-bar X/Y uses the active ruler origin and General units | -| File formats | 6 | 85% | PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; scores and estimates unchanged); PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); Explicit editing-data oversized single-artboard import fixed (#6865); scores and estimates unchanged. Legacy `.ai` files that name but omit their prolog open with their layers, or with their art on one layer when the format has no layers; graph data and settings in these files still come in only as drawn art. Affinity export, and the rest of Affinity import (adjustments, blur and bevel effects, brushes, live symbol instances, text threading), DWG (no open spec: DXF instead), PSD placement as layers (Photoshop Import Options; the merged image is done), EPS checked against more real files users send (Inkscape files open as vectors; other generators' constructs are tested with programs written from the PostScript Language Reference only; CID-keyed CJK type and `CCITTFaxDecode` images not read), the rest of Illustrator's editing data (appearances and live effects, symbols, pattern fills, brushes, placed files: #637), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers, presets and Affinity import are done | 6–10 (existing scope; Affinity export unestimated) | +| File formats | 6 | 85% | PDF import: a glyph filled only after a glyph filled and stroked comes in filled only, not stroked (#8300; scores and estimates unchanged); PDF import: type filled and stroked by one text-showing operator comes in as one filled and stroked type object (#8015; not yet for type filled and stroked at less than full opacity, or a `TJ` whose kerning starts a new line part way through, which still come in as a filled object and a stroked one; scores and estimates unchanged); PDF import: stroked type keeps the file's line cap, line join and miter limit (#7741; scores and estimates unchanged); PDF import: glyphs inside a marked-content span with an empty `ActualText` come in as outlines in their fill and stroke, adding no text (#6971; scores and estimates unchanged); Explicit editing-data oversized single-artboard import fixed (#6865); scores and estimates unchanged. Legacy `.ai` files that name but omit their prolog open with their layers, or with their art on one layer when the format has no layers; graph data and settings in these files still come in only as drawn art. Affinity export, and the rest of Affinity import (adjustments, blur and bevel effects, brushes, live symbol instances, text threading), DWG (no open spec: DXF instead), PSD placement as layers (Photoshop Import Options; the merged image is done), EPS checked against more real files users send (Inkscape files open as vectors; other generators' constructs are tested with programs written from the PostScript Language Reference only; CID-keyed CJK type and `CCITTFaxDecode` images not read), the rest of Illustrator's editing data (appearances and live effects, symbols, pattern fills, brushes, placed files: #637), the remaining fidelity polish; EPS, DXF, EMF/WMF, TIFF, BMP, Targa, PSD export, SVGZ, PDF security, PDF/X, PDF layers, presets and Affinity import are done | 6–10 (existing scope; Affinity export unestimated) | | Export for Screens, Asset Export, slices, Save for Web | 3 | 85% | polish only (all four are done) | 2–4 | | Print, colour management, separations, flattener | 3 | 80% | print preview fidelity (flattener presets in PDF and print, overprint in PDF and composite print, Print dialog, presets, PostScript, marks, separations, Print Tiling, print overprint/flattener/bitmap options and printer profile are done, as are the Japanese papers in its Media list: JIS B4/B5/B6, はがき, 往復はがき, 封筒 長形3号/長形4号/角形2号/角形3号 and 四六判, beside the ISO B4/B5 that settings saved before them keep) | 1–2 | | Automation | 3 | 65% | scripting surface, batch (MCP drops malformed app replies without replay; Variables: text/visibility variables bound to objects, an object may carry several, dataset rows applied in one undo step, panel and Window › Variables with dialogs; image/graph kinds and dataset import/export open) | 6–10 | @@ -590,6 +594,8 @@ since 2026-10-01. - **PDF authored replacement text (#6165):** `crates/pdf/src/tests/actual_text.rs` covers replacement once with suffix placement, PDF text-string decoding, empty and nested owners, sibling spans, page reset, multiple text-show operations, style/line changes, fill-and-stroke, reader windows and bounded input. Authored logical-order stretches are protected while adjacent ordinary text still undergoes reconstruction. The replacement takes its first placed glyph's style and line; its characters are not redistributed over later lines/styles. Exact mixed-direction paragraph layout is not claimed. No export changes; scores and hours stay at 75% / 10–20 h. - **PDF stroked type (#7741):** `imported_stroked_type_keeps_the_files_cap_join_and_miter_limit` in `crates/pdf/src/tests/textstroke.rs` covers round, projecting and butt caps, round, bevel and miter joins and a miter limit of 3 on type stroked in rendering modes 1, 2, 5 and 6, shown as a word, a glyph at a time and under `ActualText`; glyphs stroked with another join as runs of their own; and a glyph filled and stroked after one stroked otherwise, which keeps the join of the glyph before it. Synthetic PDFs written in the test (standard Helvetica, not embedded); no fonts or fixtures added. The dash array is not yet carried to the characters. + +- **PDF type filled then stroked (#8015):** `a_word_filled_then_stroked_imports_as_one_filled_and_stroked_type` in `crates/pdf/src/tests/textstroke.rs` covers a word shown at once, a `TJ` array of two strings with kerning between them, a line over two `Tj` and a glyph at a time, also under `ActualText`, in text rendering modes 0, 1, 2, 4, 5 and 6: modes 2 and 6 come in as one type object `WAVE` filled #ffffcc with a 3 pt black stroke, round cap and join, modes 1 and 5 stroke only, 0 and 4 fill only; a Type 3 font is filled once in every mode (the reader paints Type 3 glyphs as their procedures draw them); a stroke join that changes between two operators keeps a run each; and filled type with stroked type of its own below it stays two objects. `a_vertical_column_filled_then_stroked_is_one_filled_and_stroked_type` in `crates/pdf/src/tests/text_placement.rs` covers a vertical column in modes 2 and 6. `a_stroke_at_another_size_does_not_go_over_the_filled_glyph` and `a_stroke_over_one_glyph_of_a_filled_word_strokes_only_that_glyph` (also in `textstroke.rs`) cover a word filled and then its first glyph stroked from the same origin: at another size it stays type of its own, and at the same size only that glyph is stroked. `translucent_fill_and_stroke_text_stays_two_objects` (in `textstroke.rs`) covers type filled and stroked at the same opacity: at 0.5 it stays a filled object and a stroked one, as the file composites them apiece, and opaque it is one. `a_vertical_line_with_one_glyph_filled_and_stroked_keeps_every_glyph_filled` in `crates/pdf/src/tests/reshaped.rs` covers a vertical line of Devanagari with one glyph filled and stroked: every glyph comes in filled. `a_glyph_filled_only_after_one_filled_and_stroked_is_not_stroked` (#8300, in `textstroke.rs`) covers a glyph filled only right after one filled and stroked, also after a glyph filled only and before another filled and stroked: it joins the same type object filled only, not stroked; `glyphs_filled_and_stroked_one_by_one_stay_one_run` covers fill and stroke rendering glyph by glyph and a word filled whole then stroked whole at the same place: one run, filled and stroked. Not covered: translucent type filled and stroked, and a `TJ` whose kerning starts a new line part way through, still come in as two objects. Synthetic PDFs written in the tests; no fonts or fixtures added. - **PDF Indic type (#5235, #6906):** `crates/pdf/src/tests/reshaped.rs` covers a vowel sign the file draws before its consonant (the line keeps the file's glyphs as outlines, with a note), text in reading order (stays type), a mark with no advance (stays on its line, not vertical type of its own), outlined glyphs stroked with different dashes and translucent outlined glyphs (each keeps its own path). Synthetic font only; one real Gujarati file checked by eye on page 1. Indic type in an uninstalled font keeps the file's glyphs as outlines; reordering signs so more lines stay editable is not done. Scores and hours stay at 75% / 10-20 h. @@ -792,7 +798,10 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Preferences › User Interface › Open Documents As Tabs (G7, #394):** checked by default, documents open under tabs in one document window ([public source](https://helpx.adobe.com/illustrator/desktop/get-started/learn-the-basics/workspace-overview.html)). With the box cleared, each document opened or created afterwards opens in a floating window of its own, at the next cascade place, as Float in Window floats it; documents already open stay where they are, and checking the box again leaves floating documents in their windows. Tests: `crates/ui-egui/src/doc_windows/tests.rs`. - **Preferences search:** a Search Preferences field above the category list has the keyboard focus when the dialog opens, and Cmd/Ctrl+F gives it back; typing lists the settings it finds, and choosing one shows its category, as the [help page](https://helpx.adobe.com/illustrator/desktop/get-started/preferences-and-settings/set-app-preferences.html) describes. VectorCraft's own rules: the field matches a setting's label, section or category, ignoring case, in the interface language or in English; the list replaces the categories while the field has text and shows every match, or "No settings found"; the chosen setting's row is highlighted and scrolled into view; Escape in the field with text clears it, and Escape in the empty field closes the dialog. The dialog's `__search` field (`ui.dialog.set`) holds the text. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. - **Reset Preferences asks first (#6435):** the Preferences dialog's Reset Preferences button opens a question over the dialog (`resetPreferences`). Cancel or Escape goes back to Preferences unchanged, with its category, search and edits kept; OK goes back with every preference at its default value, which OK in Preferences applies and Cancel there discards. The question and its wording are VectorCraft's own. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. -- **Preferences › General describes its settings:** the line under the Preferences fields shows a sentence for each of the 32 General settings, Enable Contextual Task Bar included, when the pointer is over the setting's row or its control has the keyboard focus, and a screen reader gets the same sentence. The sentences are VectorCraft's own and state what the app does with each setting; Units and General have sentences, and the other categories leave the line empty. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › General describes its settings:** the line under the Preferences fields shows a sentence for each of the 32 General settings, Enable Contextual Task Bar included, when the pointer is over the setting's row or its control has the keyboard focus, and a screen reader gets the same sentence. The sentences are VectorCraft's own and state what the app does with each setting. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › Selection & Anchor Display describes its settings:** the line under the Preferences fields shows a sentence for each of the 14 Selection & Anchor Display settings, from Tolerance to the Curvature Tool rubber band, on hover and on keyboard focus, and a screen reader gets the same sentence. The Snap to Point sentence states that the Smart Guides Snapping Tolerance applies while Smart Guides is on. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › Guides & Grid describes its settings:** the line under the Preferences fields shows a sentence for each of the 12 Guides & Grid settings, from Snap to Grid to Pattern Editing's Tile Edge Color, on hover and on keyboard focus, and a screen reader gets the same sentence. The Show Pixel Grid sentence states that the pixel grid shows from 600% zoom. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. +- **Preferences › Smart Guides describes its settings:** the line under the Preferences fields shows a sentence for the Smart Guides box and for each of the 14 Smart Guides settings, from Color to Snap to Perpendicular, on hover and on keyboard focus, and a screen reader gets the same sentence. The sentences state VectorCraft's own behavior: Pixel Preview turns Smart Guides off and Snap to Grid snaps instead; with Alignment Guides off, art still lines up without the line; Object Highlighting outlines only an unselected object while a selection tool is not dragging; Snapping Tolerance is a distance on screen at every zoom; Snap to Last Location does not return a copy. Units, General, Selection & Anchor Display, Guides & Grid and Smart Guides have sentences, and the other categories leave the line empty. Sentences: `crates/ui-egui/src/prefs_dialog/descriptions.rs`. Tests: `crates/ui-egui/src/prefs_dialog/tests.rs`. - **Window › New Window (G7, #4116):** New Window (`window.newWindow`) opens another view of the current document ([public source](https://helpx.adobe.com/illustrator/using/viewing-artwork.html) describes showing one document in several windows at once), with its own zoom, center, rotation, artboard and Outline or Preview, as a tab of its own; an edit in one view shows in every view. Tile, Cascade, Float in Window, Float All in Windows and Consolidate All Windows arrange each view as they arrange a document, and Next and Previous Document step through the views. Closing a view leaves the document open; closing its last view closes the document, asking to save it first. The view's number after the name in its tab ("Name:2", while the document has more than one view) is VectorCraft's own. Tests: `crates/ui-egui/src/doc_windows/tests.rs`. - **Document Setup modal handoff:** Document Setup → Edit Artboards applies valid settings, closes the dialog and activates the Artboard tool. Pointer-click tests cover successful handoff, invalid settings, OK, Cancel and Undo in `dialogs/document_setup.rs`. @@ -877,6 +886,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Export for Screens with Include Bleed: a PDF row's page keeps the artboard as its TrimBox and puts the bleed around it once as the BleedBox (a 100 pt artboard with a 9 pt document bleed gives a 100 pt TrimBox in a 118 pt BleedBox, in one file per artboard, a single file and the Full Document), so printer's marks line up with the artboard's edge. The bleed is the row's own (zero included, which a PDF/X row warns about), else the document's when the row sets none and its PDF preset gives none or a bleed of 0; raster, SVG and EPS rows still write the grown artboard. Tests: `fileio::tests_screens::include_bleed_pdf_pages_trim_at_the_artboard` and `include_bleed_pdfx_rows_do_not_warn_about_the_bleed`. - Export for Screens refuses `pdfs: "single"` with `assets`, `layers` or `selection: "each"`, whose files each hold one item's art, instead of writing the first item alone as one PDF named after the document; `pdfs: "multiple"` writes a PDF of each item, and the selection as one file writes one PDF either way. The rule is VectorCraft's own. Tests: `fileio::tests_screens::single_file_pdfs_are_refused_for_assets_layers_and_each_object`. - Save for Web: Preview in Browser writes each preview's page and images to a folder of its own inside `VectorCraft Save for Web` in the system's temporary folder. A later preview, from the same app or another one running, does not overwrite an earlier one. Each preview first removes the preview folders there that are an hour old or older and, on Linux, macOS and FreeBSD, belong to the current user; it leaves other files and folders alone. The folders a preview makes there are open to their owner only on those systems. When `VectorCraft Save for Web` is a link or is not a folder, or on those systems belongs to another user or can be written by other users, the preview goes to a new folder of its own in the temporary folder, which a later preview removes once it is an hour old (`file.saveForWeb.browser`). + - Save for Web: Optimize to File Size… opens rows for a desired file size in K, Start With (Current Settings, Auto Select GIF/JPEG) and, with slices, Use (Total of All Slices, Each Slice, Current Slice); OK takes the settings whose files fit and shows the size found, or says that no setting tried fits ([the help page](https://help.adobe.com/archive/en_US/illustrator/cs4/illustrator_cs4_help.pdf#page=395)). The search lowers JPEG quality or palette colors (GIF then lossy) and encodes at most 32 trial settings; Auto Select chooses GIF for transparent art or art of at most 256 colors and JPEG otherwise. The slices share one setting, so every Use choice changes all of them (`webExport.optimizeToFileSize`). Scores and estimates are unchanged. - Save for Web: while Alt (Option on macOS) is held, the dialog's Cancel button reads Reset, which puts the remembered settings back on the document's active artboard and leaves the dialog open (`ui.dialogReset`). - Export for Screens, Save for Web (slice images, and files named after the document's title) and the Libraries panel name files with the characters Windows does not allow written as `-` and with a `-` after a Windows device name such as `CON`, on every platform (`document.exportForScreens`, `document.exportForWeb`, `library.create`). - Variables (data merge): text, visibility and image variables bound to objects (an object may carry several), dataset rows applied in one undo step (`variable.*`, `dataset.*`) from a Variables panel and Window › Variables, with dialogs to define, bind and edit, Make Text/Visibility/Image Dynamic, Capture/Update Data Set, CSV import/export (`dataset.import` / `dataset.export`), and a row in italics when an edit leaves the art not matching it; an image dataset value is a file path and apply keeps the object's bounds; bindings let go of deleted art and locked art is left alone except by visibility values; every command, like the rest, is drivable over MCP and the CLI. @@ -972,6 +982,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Screen readers get the value of the color and channel sliders that panels and dialogs draw (the Color panel, the Color Picker, Swatch Options, the Navigator's Zoom, the Character panel's variable font axes, the Perspective Grid and flattener options, and the sliders of the effect, tool option and transform dialogs): the number and text of the field beside each one, such as 128 for G or 50% for an opacity, with the slider's range, which extends to include a number past the slider's end. The harmony wheel's Brightness slider, which has no field, reports its brightness in percent. - A layer whose Layer Options › Print is off shows its name italic in the Layers panel, and while its row is dragged, as the reference application shows non-printing layers (#5739); a printing layer stays upright and ticking Print again restores the upright name (`panels::layers` test `a_layer_that_does_not_print_has_its_name_italic`). - In the Layers panel only the primary mouse button drags. A drag with the right or middle button on a row, a guide row, the selection square, the eye or lock column or a target circle moves, copies, hides, locks and transfers nothing and records no undo step, and a right-click still opens the row's menu (`panels::layers` test `only_the_primary_button_drags_rows_guides_art_columns_and_appearances`). + - Rows or the selection square dragged over the Layers panel's list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise; the cursor follows Alt pressed or released mid-drag. The copy cursor is the panels' add cursor (#8241): on Windows and X11, which have no system copy cursor winit can show, the white arrow with a plus. Over the trash and New Layer, which delete or duplicate with or without Alt, the hand stays, and guide rows keep their own cursor (#8217; `panels::layers` tests `alt_shows_the_copy_cursor_while_rows_are_dragged` and `drag_cursor_shows_a_copy_only_where_the_drop_copies`). - An Alt-drag in the Layers panel copies rows above or below one of their own rows (`layer.move` with `copy` and that row as the target), and the bottom layer Alt-dragged into the empty space under the list is copied below itself. So the top layer dragged up, the bottom layer dragged down and a document's only layer are copied, as any other row is. A move onto its own place, and a copy inside itself, still change nothing (#8237; `panels::layers` tests `alt_dragging_the_top_layer_up_or_the_bottom_layer_down_copies_it` and `a_lone_layer_alt_dragged_up_or_down_is_copied`; engine test `a_copy_goes_above_or_below_a_row_it_copies`). - Rows dragged in the Layers panel and held within 28 points of the list's top or bottom edge scroll a long list that way, faster nearer the edge (60 points a second at the band's inner side, 340 at the edge, at every frame rate), and keep scrolling while the pointer stays still, so a row out of view can take the drop (a move, or a copy with Alt); the Libraries panel's list scrolls by the same rule. In a list view shorter than 56 points each band is half the view, so a pointer in the top half scrolls up, one in the bottom half scrolls down, and a pointer just outside the view does not scroll it toward the far edge. A pointer beside the list, a drag of the eye or lock column and a release stop the scrolling, and scrolling changes nothing in the document. The band and speeds are VectorCraft's own (`panels::layers` tests `rows_held_near_the_bottom_or_top_edge_scroll_the_list_to_a_row_out_of_view`, `a_held_row_scrolls_the_list_as_far_in_the_same_time_at_any_frame_rate` and `the_list_scrolls_only_for_rows_held_over_it`; `panels` test `drag_scrolling_in_a_short_list_goes_toward_the_nearer_edge`). - The other panels' item drags start only with the primary mouse button too: swatches and color groups, brushes, symbols, graphic styles, library items and groups, character and paragraph styles, Appearance rows and its thumbnail, the Fill and Stroke squares, Recent Colors and the Gradient panel's thumbnail. A right or middle drag on one carries nothing, moves, copies, deletes and applies nothing and records no undo step; right-click menus and the Graphic Styles panel's held right-button preview stay as they were (`panels::swatches` test `only_a_primary_drag_moves_swatches_and_groups`, `panels::text_styles` test `only_a_primary_drag_carries_a_style_row`, `panels::tests_symbol_libraries` test `only_a_primary_drag_carries_a_library_symbol_out`, `panels::tests_effectedit` test `only_a_primary_drag_carries_the_thumbnail_or_a_row`). @@ -1055,6 +1066,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - The errors of the parameter checks that many commands share show in the status bar in the interface language: a value that is not a number where a number goes (`object.move` with `"dx": "60 mm"`, and `object.rotate`, `object.setBounds` and the other commands that call `check_numbers`), a missing number or index, `ids` that are not a list of object ids, an object id that is not a non-negative integer or names no object, and a date that is not Unix seconds. Each has a row in every catalog that translates all status and error messages, and in Bulgarian, Danish, Indonesian and Dutch (`shared_param_check_errors_are_translated`). - File Info's (`file.info`) error for a value with control characters shows in the status bar in the interface language for every field: "description has control characters" for Description and Copyright Notice, which take line breaks and tabs, and "title has control characters or line breaks" for the other text fields and each keyword in a list. Each is its own message with a row in every catalog that translates all status and error messages, and the field's key stays as written (`file_info_control_character_refusals_translate_in_every_complete_catalog`, `control_characters_are_refused_with_the_field_rule`). - A parameter schema's errors show in the status bar with what the value must be in the interface language, for every type a schema has (a number with each kind of range and with a unit, an integer and its range, true or false, a string, a list of names, an object id, a list of object ids, a color, a point, an object and a list), in every catalog that translates all status and error messages; the path, the refused value, the bounds, the unit and the names stay as the English gives them. The error for a value that is not one of its names is also translated in Bulgarian, Bosnian, Danish, Indonesian and Dutch (`parameter_schema_expected_phrases_are_translated`, `bracketed_message_parts_translate_only_as_exact_messages`). + - The error for an unknown key inside an options object (`marks.ofset` in `document.exportPdf`, a format under `settings` in `document.exportForScreens`), a PDF or print setting outside its range (`marks.weight must be 0.05–2 pt (got 9)`), the raster effect resolution warning for a named object, the note that VectorCraft started again on another graphics processor and the status after a print job is sent show in the status bar in the interface language, in every catalog: each message is made with one value for the key path, the range with its unit or the object with its name, so a catalog row can match it, and the English stays as before (`messages_with_joined_values_translate_whole`). A message or catalog row with two placeholders in a row fails `message_templates_have_text_between_their_placeholders` or `bundled_catalogs_have_no_message_row_they_leave_out`, and the untranslated report counts a row the catalog cannot use as missing. - A script's error about answers in `answers` that it did not use, and Liquify's warning about the objects under the brush that it left as they were, show in the status bar in the interface language for one answer or object as well as for several, with the count's own form in each catalog that translates all status and error messages; the English the commands return stays as it was (`messages_with_one_or_several_items_translate_in_every_complete_catalog`, `unused_answers_are_counted_in_the_singular_and_the_plural`, `liquify_warns_about_one_or_several_skipped_objects`). - In that Liquify warning, the tool's name and each kind of object it left (graphs, type, symbols, images, meshes, envelopes, repeats, placed documents, blends) are shown in the interface language too, in the order the command lists them and joined as the language joins a list, in each catalog that translates all status and error messages (`liquify-tool`, `liquify-kind` and `liquify-list-*` rows); a kind that Liquify does not list leaves the tool and the list in English (`liquify_warning_translates_its_tool_and_kinds_in_every_complete_catalog`). - An effect a plug-in's output or an importer plug-in's objects carry that VectorCraft refuses (``[0] `id`: reason``) shows in the status bar with its reason in the interface language inside `plug-in output: …` and `can't open …`, in every catalog that translates all status and error messages; the index and the effect id stay as they are, and a JSON array in a message stays as it is (`nested_effect_refusals_translate_with_their_reason`, `bracketed_message_parts_translate_only_as_exact_messages`). @@ -1121,6 +1133,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - While Alt (Option on macOS) is held, the Flare Tool Options' Cancel button reads Reset, which puts every option back to the Flare tool's default and leaves the dialog open (`ui.dialogReset`). - An Alt-click (Option-click on macOS) with the Flare tool draws a flare centered at the click at once, without opening the Flare Tool Options, as [the help page](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf) describes for a default flare. As VectorCraft's own rules, the flare takes the tool's current options (the defaults until they are changed), Alt counts when it is held as the button goes down, a drag with Alt still draws the flare in two stages, and on the active perspective plane the flare is the one the click dialog's OK draws there (`alt_click_draws_a_flare_with_the_options_at_once`, `alt_click_draws_on_the_active_perspective_plane`, `an_alt_click_with_the_flare_tool_draws_the_flare_the_click_dialog_draws`). - While a flare's center is dragged out, Ctrl (Command on macOS) keeps the center's size and the drag sizes the halo; while its rings' end point is placed, Up/Down Arrow add and remove rings and ~ places them anew (`shape.flare`'s `ringSeed`) ([Draw and edit flares](https://helpx.adobe.com/illustrator/desktop/draw-shapes-and-paths/draw-shapes/draw-and-edit-flares.html); `flare_arrows_change_the_rays_then_the_rings`, `flare_tilde_places_the_rings_anew`, `flare_ctrl_keeps_the_center_and_the_drag_sizes_the_halo`). + - Flare ring placement accepts small `ringSeed` values, including 0, without concentrating the first ring at the center; the same seed and parameters reproduce the same positions. This seed mapping is VectorCraft's own (`flare_small_ring_seeds_spread_the_first_ring_along_the_path`, `flare_ring_seed_moves_only_the_rings`). - A plain step of a number field (Up/Down or a wheel notch) goes to the next whole unit in its direction and a Ctrl/Cmd step goes to the next tenth, so 5.1 mm steps up to 6 mm and down to 5 mm (#2881). A Shift step adds or takes ten and keeps the fraction. - In the number, text and color fields of the panels and the Control bar, Shift+Enter (Shift+Return) applies the value and keeps the field active with its value selected; a text box of several lines takes it as a line break. In a dialog, Shift+Enter applies the value and confirms the dialog, as Enter does. - The Pattern Options panel's Name field and the name fields that a double-click opens in the Layers, Artboards and Asset Export panels take Shift+Enter (Shift+Return) the same way: it applies the name and keeps the field active with the name selected. @@ -1349,6 +1362,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur The Blob Brush Tool Options also have Angle and Roundness, as the reference app's [Blob Brush options](https://web.archive.org/web/20261012042029/https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/blob-brush-options-and-best-practices.html) list them: Angle from −180° to 180° (0° by default) and Roundness from 0% to 100% (100%, a round tip, by default). The elliptical tip keeps its angle on the page along a stroke, a 0% tip is drawn 0.1% as wide as it is long, and the dialog shows the tip and three dabs of it. The values are kept with the tool's options (`path.blob` `angle` and `roundness`). Not done: the Random and pen-driven variations of Angle and Roundness. The Blob Brush Tool Options' tip preview is the Angle slider for screen readers, with the Angle in degrees as its value: a click or a drag in it points the Angle at the pointer and gives it the keyboard focus, Tab reaches it after the Roundness field, and the arrow keys step the Angle by 1° (10° with Shift, Home and End to −180° and 180°). The Blob Brush Tool Options also have Fidelity, which the reference app's [Blob Brush options](https://web.archive.org/web/20261012042029/https://helpx.adobe.com/illustrator/desktop/paint-and-fill/learn-painting-basics/blob-brush-options-and-best-practices.html) list as setting how far the pointer moves before the path gets a new anchor point. The range and default are VectorCraft's own values: the Pencil's logarithmic slider from Accurate (0.01 pt) to Smooth (20 pt) and its field (up to 100 pt), 1.5 pt by default and kept with the tool's options. The brush follows the stroke fitted at the Fidelity, as a Pencil stroke is fitted: a low value follows the drag closely, jitter included, and a higher one gives smoother curves (`path.blob` `fidelity`). + `path.blob` rejects an Angle outside −180° to 180°, a Roundness outside 0% to 100% and a Fidelity outside 0.01 to 100 pt with an error and leaves the document unchanged; a key left out or null takes its default (0°, 100% and no fitting). A Blob Brush stroke merges with the topmost path of its fill color and no stroke that it touches, and with the other such paths it touches in the same group or layer that are next to that path in stacking order with no other kind of object between them; matching paths in other groups or layers are left alone, as the Blob Brush tool guidelines in [Paint with fills and strokes](https://web.archive.org/web/20241219085603/https://helpx.adobe.com/illustrator/using/painting-fills-strokes.html) describe (`path.blob`). - **Ruler guides as layer objects:** a guide goes on the current layer, shows, hides, locks and is deleted with it, is listed in the Layers panel (its row selects it) and moves to another layer (`guide.setLayer`, or its row dragged onto that layer's rows); guides on a hidden or locked layer can't be selected, moved or deleted, Duplicate copies a layer's guides and Merge Selected and Flatten Artwork keep them on the merged layer; guides from files saved before guides had layers go on the top visible, unlocked layer when the document opens. A guide's row has its own eye and lock, which hide or lock that guide alone in one undo step and take part in a drag down either column ([help page](https://helpx.adobe.com/in_hi/tutorial-builder/user-guide/illustrator-tutorial-builder/-ai--examples-of-common-coach-marks.html) lists a Guide among the Layers panel's items); a hidden guide is not drawn and does not snap, a locked one is drawn and snaps but can't be selected, moved or deleted, and its own state is kept through save and reopen and while its layer is hidden or locked (`layer.setProps` on its `guide.list` id). Object › Lock › Selection and Object › Hide › Selection lock or hide a selected guide with the selected art, and Unlock All and Show All unlock or show such guides and select them ([help page](https://help.adobe.com/archive/en_US/illustrator/cs3/illustrator_cs3_help.pdf) for Lock and Hide Selection). A guide row dropped on the panel's trash deletes its guide, the trash deletes a guide its row selected, and after a click on a guide row Delete deletes the guide rather than the rows highlighted before ([help page](https://helpx.adobe.com/illustrator/desktop/measure-and-align/grids-and-guides/align-graphic-objects-with-guides.html) for deleting a selected guide). A plain click on another row lets go of a guide its row selected, keeping the selected art, as a plain click on a row picks that row alone; a Ctrl/Cmd or Shift click keeps it (#7340, `panels::layers` test `a_plain_row_click_lets_go_of_the_selected_guide`). Not done: guides stacked among the art of their layer (they are listed above it). Lock Guides also locks the objects made into guides: they can't be selected, moved or deleted (#1543); they are drawn in the guide colour and style of Preferences, and a dragged selection snaps to ruler guides with Smart Guides on (#1583, fixes #1534). Preferences › Guides & Grid › Lock Guides by Default locks guides when the app starts; it is off by default, and new guides can still be dragged out of a ruler while guides are locked. The Transform panel shows a selected ruler guide's X or Y, and typing a value moves it (#1659, part of #1597). This is not established by the documentation we could find: the public help pages on guides, rulers and the Transform, Control and Properties panels (read again on 2026-10-14) describe selecting and dragging unlocked guides and the panels' X and Y for a selection, not a guide's position in a panel, and the one public statement of it is a user's [community answer](https://community.adobe.com/questions-652/adding-a-new-custom-guide-785586), which is not documentation. It is kept as a convenience pending the owner's decision, with no parity claim and nothing counted towards a score. - **Releasing ruler guides:** View › Guides › Release Guides turns the selected ruler guides into paths with no fill or stroke. An artboard guide becomes a line across its artboard, and a canvas guide becomes a line across the artboards (`view.guides.release {index?, ids?}`). A Cmd/Ctrl+Shift double-click with the Selection, Direct Selection or Group Selection tool releases the ruler guide or guide path under the pointer. @@ -1754,12 +1768,13 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Sample Color from Screen:** an eyedropper button in the Color Picker and `ui.sampleScreenColor` (which can be given a key in Keyboard Shortcuts) pick a color anywhere on the screen with the system's sampler: `NSColorSampler` on macOS, the XDG desktop portal's [PickColor](https://flatpak.github.io/xdg-desktop-portal/docs/doc-org.freedesktop.portal.Screenshot.html) on Linux, a still copy of every monitor under a crosshair on Windows, and the EyeDropper API in browsers that have it. The color becomes the fill or the stroke as one undo step, or the Color Picker's color, converted from display sRGB into the working RGB space. On Linux, a session without a portal that has PickColor, a portal that does not return from the call within 25 seconds (VectorCraft's own limit) or leaves the bus before it answers, and a portal that ends the request another way each show a status message and end the wait. On Windows, the copy is read as sRGB, so the colors of HDR and wide-gamut displays are not converted; Escape, a click of another mouse button or switching to another window cancels (VectorCraft's own rules). The BSDs and other browsers have no sampler yet; the button is gray there. - **Color Guide color groups:** with variation cells selected, the Color Guide's Save Color Group to Swatches button saves those cells as one swatch group, and with none selected it saves the harmony colors, as the [help page](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf) describes saving several selected variations together (printed page 135). The group takes the cells in grid order (row by row, left to right, each cell once), is named after the harmony rule and is one undo step; these are VectorCraft's own rules. A selection lasts until the base, the Color Guide Options, the variation mode, the harmony rule, the library limit or the colors the grid shows (for example after a new swatch while the guide is limited to the document's swatches) change. - **Color Guide colors dragged to Swatches:** a variation cell dragged from the Color Guide onto the Swatches panel's list becomes a swatch of that color, as the [help page](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf) describes for saving variations as individual swatches (printed page 135). In VectorCraft a harmony strip color drags the same way, a drag carries only the grabbed color (the selected cells stay selected and the selection is not saved), it carries the color the cell shows (snapped to the Limit to Library colors), keeps the color's model and does not paint the selected art; the swatch follows the panel's rules for a dropped color (`swatch.new`, one undo step, a color that is already a swatch is added again under another name, a drop on a color group joins it). These are VectorCraft's own rules. Tests: `a_dragged_guide_color_carries_its_color_and_applies_nothing` and `a_guide_color_dragged_onto_the_swatches_panel_becomes_a_swatch` in `crates/ui-egui/src/panels/color_guide.rs`. - - **Color Guide tints of a spot color:** when the Color Guide's base is a spot color, or a tint of one, chosen in the Swatches panel, with the Color panel's tint slider or with the base chip, the cells right of the center in the base row of Tints/Shades are tints of that spot color: a click paints the art with the tint, a drag carries it, and Save Colors as Swatches and Save Color Group to Swatches make tint swatches ("Ink 60%") linked to the spot color, so they follow an edit of it. The [help page](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/color-guide-panel-overview.html) says spot colors are kept only on the right side of Tints/Shades and every other variation gives process colors. The tint percentages (the base's tint reduced by the share each cell goes toward white), the shades on the left staying process colors, a Limit to Library giving process colors, and a global process base keeping plain colors are VectorCraft's own rules. `swatch.new {colors}` and `swatch.newGroup {colors}` take `{swatch, tint}` entries. Tests: `a_spot_color_base_gives_tints_of_that_spot_color`, `a_tinted_spot_base_gives_lighter_tints_and_a_lost_link_gives_process_colors`, `a_renamed_spot_color_stays_the_base`, `saved_spot_tints_are_tint_swatches_of_the_spot_color`, `a_dragged_spot_tint_becomes_a_tint_swatch`, `a_clicked_spot_color_swatch_becomes_a_linked_color_guide_base`, `colors_entries_naming_a_spot_color_save_tint_swatches`. + - **Color Guide tints of a spot color:** when the Color Guide's base is a spot color, or a tint of one, chosen in the Swatches panel, with the Color panel's tint slider or with the base chip, the cells right of the center in the base row of Tints/Shades are tints of that spot color: a click paints the art with the tint, a drag carries it, and Save Colors as Swatches and Save Color Group to Swatches make tint swatches ("Ink 60%") linked to the spot color, so they follow an edit of it. The [help page](https://helpx.adobe.com/illustrator/desktop/manage-colors/learn-color-basics/color-guide-panel-overview.html) says spot colors are kept only on the right side of Tints/Shades and every other variation gives process colors. The tint percentages (the base's tint reduced by the share each cell goes toward white), the shades on the left staying process colors, a Limit to Library giving process colors, and a global process base keeping plain colors are VectorCraft's own rules. So are these: renaming the spot color in Swatch Options, also as a `command.batch` step, keeps it the base, and so do an Undo and a Redo of the rename; deleting it (or its color group), making it a process color or closing its document ends the link, so a later spot color of the same name does not become the base until it is chosen, and the base keeps the color it showed. A batch's steps in other documents leave the link alone. `swatch.new {colors}` and `swatch.newGroup {colors}` take `{swatch, tint}` entries. Tests: `a_spot_color_base_gives_tints_of_that_spot_color`, `a_tinted_spot_base_gives_lighter_tints_and_a_lost_link_gives_process_colors`, `a_renamed_spot_color_stays_the_base`, `a_deleted_spot_color_ends_the_link`, `an_undone_rename_keeps_the_link`, `a_batch_follows_the_spot_color_across_documents`, `a_deleted_color_group_ends_the_link`, `saved_spot_tints_are_tint_swatches_of_the_spot_color`, `a_dragged_spot_tint_becomes_a_tint_swatch`, `a_clicked_spot_color_swatch_becomes_a_linked_color_guide_base`, `colors_entries_naming_a_spot_color_save_tint_swatches`. - **Stroke visibility (#1253):** adding paint to a previously unpainted zero-width stroke restores the existing 1 pt default (`PaintDefaults::default`, `Appearance::set_stroke`), for the selected appearance item, the new-art defaults and Swap Fill/Stroke. Positive widths are kept; recoloring a painted zero-width stroke keeps its explicit zero. A real Eyedropper-to-new-shape sequence reproduces the zero-width inheritance. Five engine regressions cover creation, defaults, targeted items, preserved widths and one-step Undo/Redo (`crates/engine/tests/it/stroke_visibility.rs`). - **Gradients:** lossless, validated gradient params; gradients follow rotate, reflect, shear, non-uniform scale and distortions; the Gradient tool edits the fill or stroke of the active proxy, type included; an interactive on-canvas annotator (move, length/angle, rotate, add/move/delete/duplicate stops, midpoints, a stop popover, Delete and arrow keys). The Gradient panel has the Fill/Stroke proxy, a gradient-swatch dropdown with Save to Swatches, midpoint locations, Alt-drag to copy or swap stops, swatch drops on the ramp and a stop eyedropper; copied appearances and graphic styles place gradients on each target's own bounds; gradient handles, both ends of a vector drawn on the art and the start of a clicked one snap as other drawn points do (path segments, construction guides and View › Snap to Glyph's guides included) and honour Constrain Angle. Gradient stops stay linked to global and spot swatches. Freeform gradients (points and lines) are edited on the canvas; radial gradients have an extent ellipse, an aspect handle and an off-centre focal point (SVG `fx`/`fy`, PDF two-point radials). A stroke's gradient runs within, along or across it. Object ▸ Expand turns gradients into N objects or a gradient mesh. A gradient stop that loses its link to a spot swatch (the swatch deleted, a recolor or adjustment that unlinks it, a library gradient, or a library character style linked to a swatch the document lacks) keeps the color it shows at full tint and drops the process plates it printed with that ink, as a stop given a plain color does; this is VectorCraft's own rule. Evidence: `tests::mapping_links_drops_the_process_plates_of_unlinked_stops` in `crates/color`, `tests::linked_stops::deleting_a_spot_swatch_takes_the_process_plates_of_the_stops_it_unlinks` and `tests::library::library_stops_unlinked_from_their_swatch_keep_no_process_plates` in `crates/engine`. Merge Swatches (`swatch.merge`) also drops the process plates of the gradient stops linked to a swatch it merges, whether the kept swatch is spot, global process or process that isn't global, in the art, gradient swatches, graphic styles, the art of brushes and the fill and stroke for new art; a stop linked to another swatch keeps its plates, and Undo puts the links and plates back. This is VectorCraft's own rule. Evidence: `tests::linked_stops::merging_swatches_takes_the_process_plates_of_the_stops_it_relinks` in `crates/engine`. - The Gradient panel's Delete Stop sits at the right end of the ramp, level with it, so a panel too short to show the stop fields still shows it; it deletes the selected stop (never below two), as dragging a stop down off the ramp does (#5403). + - Over the strip under the Gradient panel's ramp, where a click adds a stop, the pointer is the white arrow with a plus that Group Selection shows for a click that adds. Windows has no system copy cursor (winit shows the plain arrow for it), so on Windows and X11 the panel hands the glyph to the OS as the canvas hands its tool cursors; macOS, Wayland and the web show the system copy cursor. Over the ramp itself, which adds nothing, the pointer stays the arrow (#8241; `panels::gradient` test `the_strip_under_the_ramp_shows_the_add_cursor`). - Conic gradients, VectorCraft's own gradient type: the stops sweep once around the center from the vector, clockwise on the page (a negative aspect, or a reflection, turns the sweep the other way), with a Conic button in the Gradient panel's Type row and the Gradient tool's extent ellipse and aspect handle; they follow transforms, Expand into wedges or a mesh, open from `.af` files, and export to PDF as a function-based shading that PDF import reads back as a conic gradient; SVG, EPS and legacy `.ai` files get solid wedges, and CSS a `conic-gradient`. - Diamond gradients, VectorCraft's own gradient type: the stops run from the center out to a square with a corner at the end of the vector (the aspect stretches it into a rhombus), with a Diamond button in the Gradient panel's Type row and the Gradient tool's square and aspect handle; they follow transforms, Expand into nested squares or a mesh, and export to PDF, SVG, EPS and legacy `.ai` as four linear gradients, one for each quarter of the square (an image in PDF and SVG for translucent stops, a dithered fill, the Perceptual method other than spot color shadings in PDF, or a square with no area), and on type characters in SVG as a radial gradient; PDF import reads a function-based shading whose color is the same along each square about its origin as a diamond gradient. - Hue Clockwise and Hue Counterclockwise, VectorCraft's own gradient methods, in the Gradient panel's Method menu and on `paint.editGradient` and `paint.setFill` (`method`: `hue-clockwise`, `hue-counterclockwise`): a linear, radial, conic or diamond gradient's colors mix around the hue wheel, with hue, saturation and brightness each changing evenly from one stop to the next and the hue angle keeping one direction, as the fixed-direction rules of [CSS Color 4](https://www.w3.org/TR/css-color-4/#hue-interpolation) do: falling with Hue Clockwise (red, magenta, blue), which is clockwise on the color wheels, and rising with Hue Counterclockwise (red, yellow, green). Hues less than half a color level apart count as one hue, so a color and its tint do not turn the wheel. A gray stop takes the hue of the stop it mixes with, and black its saturation too. The canvas and raster exports draw it through stops on that curve, within half a color level; Reverse Gradient turns the method the other way with the stops, so the ramp keeps its colors. SVG and PDF write it as an RGB image, EPS as a shading in process colors, and a legacy `.ai` file and the `.ai` editing data with the colors between its stops as stops of their own, with a warning. @@ -1923,7 +1938,9 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps envelopes made with a warp, a mesh or a top object editable: its editing copy holds each envelope's contents, shape, Fidelity, Envelope Options and Edit Contents state in the form VectorCraft's `.ai` envelope reader reads, beside its distorted art, so the file opens with the same live envelope, Edit Contents still switching between the contents and the envelope ([Edit the contents of envelopes](https://helpx.adobe.com/illustrator/desktop/manage-objects/reshape-transform-objects/edit-the-contents-of-envelopes.html)). Envelopes whose type is threaded, has text wrap options or is written as its outlines, envelopes in opacity masks, pattern tiles or another envelope's contents, and envelopes the reader would open with another shape or other settings (a Fidelity that isn't a whole number, bounds margins kept with Distort Appearance off), and envelopes after the first 256 envelopes and images with a Warp in a file are written as their distorted art, with a warning (`envelopes_are_read_back_live` and `envelopes_the_reader_cannot_open_live_are_written_as_their_art` in `crates/eps/src/ai_editing/tests.rs`). On a large canvas ([the help page](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/start-a-new-file/large-canvas-faq.html); VectorCraft writes one when the artboards together are wider or taller than 16,381 points, its own limit), that `.ai` keeps warp, mesh and top object envelopes editable too: the editing copy writes them live at 1/10 of their size with the rest of the art, and VectorCraft's `.ai` reader opens them at their size, from the editing data alone or beside the PDF part. Read from the editing data alone, an envelope's saved box size is compared with its contents at the same scale, so a bounds margin kept with Distort Appearance comes back, and every path's stroke weight, dashes and dash offset come back at their size, not at 1/10 (`large_canvas_envelope_kinds_round_trip_on_both_ai_routes`, `large_canvas_envelope_stroke_margin_round_trips_on_both_ai_routes` and `a_large_canvas_path_keeps_its_stroke_weight_and_dashes_read_alone` in `crates/eps/src/ai_editing/tests.rs`). An envelope whose contents hold type keeps the type editable in that `.ai`: the editing copy writes the type as type in the envelope's contents, in the form the `.ai` reader opens as a live envelope of type (`TypedEnvelope` in `crates/eps/src/import/ai/envelope.rs`), so the file opens with the type shown and editable in the envelope's contents, with Edit Contents off or on. An envelope of type in a symbol's art, and one whose type is threaded, has text wrap options or is written as its outlines (mirrored type, for example), is written as its distorted art, as before (`an_envelope_of_type_is_read_back_live_with_its_type`, `an_envelope_of_type_written_as_its_art_leaves_no_story` and `an_envelope_of_type_in_a_symbol_or_a_thread_is_written_as_its_art` in `crates/eps/src/ai_editing/tests.rs`). + A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps blends live: its editing copy holds each blend's key objects, its spine when it has one of its own, its drawn steps, and its spacing (Smooth Color, Specified Steps, Specified Distance) and orientation (Align to Page, Align to Path) ([Blend Options](https://helpx.adobe.com/illustrator/desktop/manage-colors/apply-transparency-and-blending/blend-options-overview.html), [blends and their spine](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=260)), in the form VectorCraft's `.ai` blend reader reads (`crates/eps/src/import/ai/blend.rs`), so the file opens with the same live blend laying out the same steps. Each blend is checked with that reader before it is written; blends it wouldn't open with their settings or as they are drawn are written as their steps with a warning ([file-format-parity.md](file-format-parity.md) lists them) (`blends_are_read_back_live`, `blends_of_compound_paths_groups_and_62_keys_are_read_back_live` and `blends_the_reader_cant_read_are_written_as_their_steps` in `crates/eps/src/ai_editing/tests.rs`). A top object whose top and bottom sides, or left and right sides, have different numbers of segments is also saved live: the side with fewer segments is split into as many as the side across from it has (each segment into equal spans of its curve, a straight one at even steps), up to the 50 a side the grid holds, so the file opens with the same corners and the same mapping of the contents, its outline holding the added anchors. Where the split side would share out the contents another way, as a side of two curves that aren't one curve can, or a side has more than 50 segments, the envelope is written as its distorted art, with the warning (`a_top_object_with_uneven_sides_is_read_back_live`, `a_top_object_split_to_the_grids_limit_is_read_back_live` and `a_top_object_whose_split_side_would_map_another_way_is_written_as_its_art` in `crates/eps/src/ai_editing/tests.rs`). + A PDF-compatible `.ai` saved with Include Editing Data for Other Apps keeps gradient meshes editable ([gradient meshes](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=200), [opacity of mesh points](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=203)): its editing copy writes each mesh point's place, color (gray, RGB or CMYK), opacity and handles patch by patch, with the mesh's transparency, name and opacity mask, in the form VectorCraft's `.ai` mesh reader reads (`crates/eps/src/import/ai/mesh.rs`), so the file opens with the same mesh. A reflected mesh is written with its columns in reverse order. Meshes with a point in a Lab color, with more than 128 rows or columns, folded meshes, meshes the reader would open otherwise, meshes in pattern tiles and in art cut to a clipping object, and every mesh on a large canvas are written as their drawn look, with a warning (`meshes_are_read_back_as_they_are`, `meshes_in_masks_and_symbols_are_read_back`, `a_reflected_mesh_is_written_with_its_columns_reversed` and `meshes_the_reader_cant_read_are_written_as_their_drawn_look` in `crates/eps/src/ai_editing/tests.rs`). A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes eligible paths, compound paths and groups with live effects with an art style when the writer supports their appearance and effects (not a filled path that uses the even-odd rule, and none on a large canvas), which VectorCraft's `.ai` reader opens as the same appearance with its effects live (`objects_with_live_effects_are_read_back` and `every_effect_setting_written_on_an_object_is_read_back` in `crates/eps/src/ai_editing/tests.rs`; [file-format-parity.md](file-format-parity.md) lists the objects written without one and the effects they lose). The same holds for the objects of an opacity mask's art, a mask inside another mask's art and a hidden art root included, so a mask whose art has Offset Path opens drawing the image it masks as it did, with the effect live; geometry effects that no art style holds on a mask's art, such as Roughen, are written applied to the art, which opens drawing what it drew (`a_masked_image_with_live_offset_path_round_trips`, `hidden_and_nested_mask_art_keep_live_offset_path` and `a_masks_art_with_an_effect_no_style_holds_is_written_as_it_draws` in `crates/eps/src/ai_editing/tests.rs`). Opacity masks in a symbol's art and in a pattern's tile are written the same way, so a symbol or pattern whose mask art has Offset Path opens with the effect live in its definition, and its instances and pattern fills draw as they did; each definition's mask art keeps its own style, and mask art linked to a graphic style opens still linked to it (`a_symbols_mask_art_keeps_live_offset_path`, `a_pattern_tiles_mask_art_keeps_live_offset_path`, `mask_art_styles_stay_with_their_own_art` and `opacity_mask_art_keeps_its_graphic_style_link` in `crates/eps/src/ai_editing/tests.rs`). @@ -1963,6 +1980,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur A `.ai` or EPS whose editing data has brushes opens with the file's Calligraphic, Scatter, Art and Bristle brushes in the Brushes panel in place of the default ones, in the file's order: the Calligraphic size, roundness and angle with their variation, the Scatter size, spacing, scatter and rotation, the Bristle settings, and the Scatter and Art brushes' art (Art brushes in the older and newer forms of their objects). A brush library `.ai` (brushes and no layers) opens from its PDF part with its brushes, so Other Library lists them. An Art brush in None or Tints keeps that colorization, and one in the newer form also keeps its fixed width, Flip Along and Flip Across, and Scale Proportionately, Stretch to Fit Stroke Length or Stretch Between Guides with its guides ([Art brush options](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf), printed page 193). Pattern brushes and brushes that can't be read are left out with a note. Paths with a Calligraphic brush, and paths with an Art brush in the newer form that bends art of solid-filled paths with those options, open as the path with the brush on its stroke, except paths whose brush scales its art proportionately. Paths with an Art brush in the older form, and other brushed paths, still come in as their drawn look (part of #372 and #637; `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/tests_native.rs`). In a `.ai` opened from its editing data, a path or type object with Offset Path, Outline Object or Outline Stroke on the whole object opens as itself with those effects live, in their order and shown or hidden; on a fill or stroke of type they stay on that fill or stroke. Offset Path keeps its Offset, Joins and Miter Limit, and Outline Stroke takes its width from the stroke. An Offset Path with a setting missing, out of range or not read keeps the drawn art, as does a path with a Path effect on one fill or stroke (`crates/eps/src/import/ai/style/tests.rs`, `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/tests_native.rs`). In a `.ai` or EPS opened from its editing data, a Scatter brush whose last 15 numbers start with 1 comes into the Brushes panel in Tints, and each brush art section is read without its frame, an unnamed, unpainted rectangle with no settings of its own at the art's bounds (within 1/1000 pt). A wider frame stays in the art, and an art group with a state or look of its own (hidden, locked, isolated, knockout, an opacity, a blend mode, a name, a mask, a note or an appearance) stays a group (`crates/eps/src/import/ai/tests.rs`). + A PDF-compatible `.ai` saved with Include Editing Data for Other Apps writes a Scatter or Art brush whose art holds opacity masks to the Brushes panel of its editing copy. This is VectorCraft's own rule for brushes a document already holds. Each mask's art is written in the brush's art section in the form VectorCraft's `.ai` reader reads (`define_brush_art` in `crates/eps/src/import/ai/read/directives.rs`), with the mask's Clip and Invert Mask options, whether it is disabled and whether it moves with its object, for masks up to seven deep in one another's art. A brush whose mask art holds more than paths, compound paths and groups with one solid fill and one plain stroke each is left out with a warning, and a path with an Art brush whose art holds a mask is written as its drawn look. When the reader turns an Art brush's art over, it turns the art of a mask that doesn't move with its object over too (`scatter_and_art_brush_mask_art_round_trips` and `brushes_whose_mask_art_isnt_read_back_are_left_out` in `crates/eps/src/ai_editing/tests.rs`, `an_art_brushs_opacity_mask_art_turns_over_with_its_object` in `crates/eps/src/import/ai/tests.rs`). In a `.ai` opened from its editing data, type with Warp on the object or on one of its fills or strokes opens as type with the effect live when the live warp draws as the art saved with it. When it draws differently, or when the file's limit of checks has no check left for it, it opens as that art, and one note says how many did. Type stays live without a comparison when the saved art paints nothing or draws type of its own, in frames of threaded type, when a text variable binds it, and when its text object doesn't come in as one text object (`crates/eps/src/import/ai/envelope.rs`, `crates/eps/src/import/tests_native.rs`). In a `.ai` opened from its editing data, an object with a Tweak that moves nothing or Pucker & Bloat at 0 opens as itself with the effect live. A path, compound path or group whose only effect is Transform without copies, or a Free Distort whose corners make a parallelogram, opens as itself with it live, and so does an object with nothing stroked whose only effect is Twist: a path or compound path with straight segments at up to 180° either way, unless it is a compound path with a guide member that reaches past its other members and the angle is not 0°, and another path, compound path or group with no guide in it at up to 90° either way (limits VectorCraft sets); one twisted further keeps the drawn art. A gradient or pattern, an image, type, a clipping group, an opacity mask or effects inside the object, or a stroke with a Transform that scales, rotates or reflects, keep the drawn art (`crates/eps/src/import/ai/style/tests.rs`, `crates/eps/src/import/ai/tests.rs`, `crates/eps/src/import/ai/read/ops.rs`). A PDF page whose `UserUnit` (PDF 1.6) is above 1 opens at its size in points, its numbers times the `UserUnit` (one above 75,000 counts as 75,000), and `document.pdfInfo` gives its size and boxes in points too. A `.ai` whose editing data has its artboards in the units of such a page opens from that data at the page's size, with its layers, and when the layers can't be read its pages still take the artboard layout of the data, scaled the same way (part of #1482). @@ -2048,6 +2066,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - A Shift-click with the loaded place cursor opens the current file's import options (text, DXF, PDF page or embedded PSD) and OK places it at the click, with Show Import Options on or off and for a cursor loaded by `file.place.queue` ([Place multiple files](https://web.archive.org/web/20210601162814/https://helpx.adobe.com/pdf/illustrator_reference.pdf)). VectorCraft's own rules: a file without such a dialog places as a click does, Cancel leaves the file unplaced, a Shift-drag places at the dragged size, and headless the Shift-click places as a click (`crates/tools/src/place.rs`, `crates/engine/src/tests/place.rs`, `crates/ui-egui/src/tests/place.rs`). - Separations Preview shows placed and embedded raster images on the visible plates, as it shows vector art (#4153): an RGB image's pixels are separated into process inks with the proof setup's intent, a CMYK image shows its own inks, a hidden plate's ink leaves the image, and with one plate visible the image shows that plate's ink as a grey. Raster images carry no spot ink, so a spot plate shown alone shows them as paper; a colorized image shows its color's plates. Emoji and other bitmap glyphs follow the same rule. The plate-filtered pixels and their reduced-size copies are kept apart from the image's own pixels, for each set of visible plates, proof setup and color settings, and with the preview off nothing changes. Evidence: `tests::colorize::separations_preview_shows_an_rgb_images_process_inks`, `separations_preview_shows_a_cmyk_images_own_inks`, `separations_preview_keeps_an_images_pixels_per_plate_set`. Print preview fidelity remains the open gap, so scores and hours are unchanged. - Desktop print transport uses `craft-print` for CUPS and modern Windows. Sheet composition, copies, separations and colour management remain in VectorCraft. The Print dialog's Media list also carries the Japanese papers — JIS B4 257 × 364 mm, JIS B5 182 × 257 mm and JIS B6 128 × 182 mm beside the ISO B4/B5 (250 × 353 and 176 × 250 mm, kept so settings and presets saved before them keep their paper), and はがき 100 × 148 mm, 往復はがき 148 × 200 mm, 封筒 長形3号 120 × 235 mm, 長形4号 90 × 225 mm, 角形2号 240 × 332 mm, 角形3号 216 × 277 mm and 四六判 127 × 188 mm; the JSON id or the dialog label names a paper, any case and spacing (`B5 (JIS)` or `b5jis`) (`crates/pdf/src/print/settings.rs`, `crates/pdf/src/tests/print.rs`). The print-preview and physical-device fidelity gaps remain, so print scores and hours are unchanged. + - The Print dialog's Document Ink Options list shows an icon before each spot ink's name, and a click on it prints that one ink as process inks (on the Cyan, Magenta, Yellow and Black plates, with no plate of its own) or as a spot ink again, as [the help page](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) describes for single spot colors. Other spot inks keep their plates, and spot gradient stops and DCS images' spot plates follow each ink's choice (`print.setup {settings: {output: {inks: [{name, convertToProcess: true}]}}}`, kept with the document and in print presets; `print.preview` lists every ink as `documentInks`). These are VectorCraft's own rules: Convert All Spot Colors to Process converts every spot ink and dims the icons while keeping each ink's own choice, a converted ink's Print, Frequency and Angle are dimmed and kept, and process inks and Registration have no icon. Evidence: `print::one_spot_ink_converts_to_process_and_the_others_keep_their_plates`, `print::converting_every_spot_ink_overrides_and_keeps_each_inks_own_choice`, `print::a_spot_gradient_stop_prints_its_process_plates`, `cmykimages::a_dcs_image_converts_only_the_spot_ink_chosen`, `tests::print::a_spot_ink_converted_to_process_is_saved_and_listed_without_a_plate`, `dialogs::tests_print::a_spot_inks_icon_converts_it_to_process_and_back`. Print scores and hours are unchanged. - The Print dialog's Output section has Overprint Black under Convert All Spot Colors to Process, off by default and available with Separations ([Print color separations](https://helpx.adobe.com/illustrator/using/printing-color-separations.html) lists it among the separation options): black art then leaves the inks under it on the other plates (`print.setup {settings: {output: {overprintBlack: true}}}`, kept with the document and in print presets). Solid 100% K or 100% gray fills, strokes and characters (to within half a percent, as Edit › Edit Colors › Overprint Black counts them), and gradients whose every stop (every color point of a freeform gradient) is, overprint; rich, RGB, Lab, spot-linked and lighter blacks are not marked, paints already set to overprint keep that setting, and only the printed copy is marked. These limits are VectorCraft's own rules. Characters set to overprint now also leave the inks below them on printed PDF plates, a type object's own fill in a PDF is drawn with its blending mode, and Edit › Edit Colors › Overprint Black counts a gradient with a stop linked to a spot swatch as a spot black, as it counts a solid one, and a freeform gradient by the color points it draws from. On a plate, an overprinting paint that puts none of that plate's ink down is drawn as nothing; on PostScript plates so is up to half a percent of another ink in a color that counts as black, and any other faint ink stays on the plate. Evidence: `print::overprint_black_keeps_the_inks_under_solid_black_on_separations`, `print::overprint_black_keeps_the_cyan_under_near_and_freeform_blacks_on_postscript_plates`, `print::overprinting_paints_keep_their_faint_ink_on_postscript_plates`, `print::overprinting_type_leaves_the_inks_below_on_separations`, `print::a_type_objects_own_black_fill_overprints_on_separations`, `tests::print::overprint_black_is_saved_with_the_setup_and_in_presets`, `overprint::tests::a_gradient_with_a_spot_linked_stop_is_black_only_with_spot`, `overprint::tests::a_freeform_gradient_is_black_when_every_point_is`. Print scores and hours are unchanged. - The Print dialog's General section (and the print preset editor) has a link button after Scale W and H, as the Custom scale has one on [the help page](https://helpx.adobe.com/illustrator/desktop/save-and-export/export-files-to-different-formats/print-documents-in-illustrator.html), where turning it off scales the width and height apart. While it is on, typing either percentage sets the other, and turning it on sets H to W. It is on for new settings, dimmed with the fields unless Scaling is Custom or a tiling choice, toggled with a click, Space or Enter, and named with its on or off state for screen readers. W and H take 1–1000% in the fields. The link is kept with the document's print settings and in print presets (`print.setup {settings: {scale: {linked}}}`); settings saved without it read it as off, so they print as before. Its default, the tiling choices and the agent rules are VectorCraft's own. Evidence: `print::the_scale_link_is_on_for_new_settings_and_off_for_a_saved_scale_without_it`, `tests::print::the_scale_link_keeps_width_and_height_equal`, `tests::print::a_scale_saved_without_the_link_keeps_its_width_and_height`, `dialogs::tests_print::the_scale_link_keeps_scale_width_and_height_equal`, `dialogs::tests_print::a_print_preset_keeps_the_scale_link`. Print scores and hours are unchanged. - A PDF, PDF-compatible `.ai` or `.ait` opened from its pages or its editing copy opens with the File Info that its XMP packet and its document information dictionary give: the title (`dc:title`, its `x-default` item first, else Info `Title`), the author, description, keywords, copyright status, notice and URL, and the created and modified dates, the XMP packet's value where both give one (`crates/pdf/src/tests/file_info.rs`, `crates/engine/src/tests/fileinfo.rs`). An SVG opens with the title of its root ``. The title is File Info's alone (`DocMetadata::title`): the document's name stays the file's name with its extension, a file that gives no title leaves File Info with that name, and exports (PDF, SVG, PNG, EPS, `.ai`) and native saves carry it; changing the title in File Info sets the document's name as before (#3626). @@ -2198,6 +2217,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Raster-effect resolution in PDF:** when the 64 million pixel cap on an effect image renders an object's raster effects below the document's raster effects resolution, PDF export warns once per object with the requested and the lowest achieved ppi (`crates/engine/src/tests/pdfraster.rs`). - **Rasterize effect:** Effect › Rasterize… (`rasterize`) draws an object as an image of square pixels at its own resolution or the document's raster effects resolution, with Object › Rasterize's color model, background, anti-aliasing, clipping mask and room around the object, while its paths stay editable. Expand Appearance and PDF and SVG export of an object whose only raster effect is Rasterize give the image Object › Rasterize gives (`crates/engine/src/tests/rastersettings.rs`, `crates/render/src/tests/rasterize.rs`). Behavior reference: [How to save artwork in Illustrator](https://helpx.adobe.com/illustrator/using/saving-artwork.html), [Work with effects](https://helpx.adobe.com/illustrator/using/effects.html). - **Rasterize colour models:** Object › Rasterize with the Grayscale colour model makes a grayscale image (a gray PNG, with alpha over a transparent background), and with Bitmap a 1-bit image (a TIFF), or a black-and-white gray PNG with alpha over a transparent background; `image.info` and the Control bar say Grayscale, and a fill color colorizes the image, in RGB and CMYK documents (#6969). Expand Appearance and PDF export of a Rasterize effect make the same images. Regression coverage: `rasterize_to_grayscale_or_bitmap_makes_a_grayscale_image` (`crates/engine/src/tests/rastersettings.rs`) and `gray_and_bilevel_images_store_gray` (`crates/render/src/encode/tests.rs`). Scores and estimates unchanged. +- **Rasterize dialog choices:** Object › Rasterize… shows Anti Alias (None, Art Optimized, Type Optimized) and Background (White, Transparent) as dropdowns, where they were text fields holding the command's values. Object › Create Gradient Mesh… shows its Appearance (Flat, To Center, To Edge) and Repeat Options for a grid repeat its Grid Type the same way (#8020, #7991). A value the dialog does not list, such as a black background set through `ui.dialog.set`, shows as it is and is sent unchanged. Regression coverage: `rasterize_anti_alias_and_background_are_dropdowns`, `mesh_appearance_and_repeat_grid_type_are_dropdowns` and `choice_fields_list_the_values_their_commands_take` (`crates/ui-egui/src/dialogs/command.rs`). Scores and estimates unchanged. - **SVG filters:** Effect › SVG Filters lists 14 default SVG filters and then the document's own below Apply SVG Filter… and Import SVG Filter…, and choosing one applies it to the selection as a live effect in one undo step (`svgFilter.apply`). Apply SVG Filter applies the selected filter, New and Edit open its code, and Delete and Import… remove filters or add those of an SVG file (`svgFilter.define`, `svgFilter.delete`, `svgFilter.import`). The public page names no default set: the defaults (Soft Blur to Hue Shift, `crates/effects/src/svg_filter/defaults.rs`) are VectorCraft's own, written with SVG 1.1 primitives. A default is copied into the document when it is applied or edited, and Delete does not remove a default. The canvas, raster export and PDF draw the filter at the Document Raster Effects resolution; SVG export writes it as a `<filter>` element when it is the object's last effect and otherwise draws the object as an image; SVG import keeps filters the other live effects can't express as this effect instead of leaving them out; the native format keeps the filters (`crates/engine/src/tests/svgfilter.rs`, `crates/effects/src/svg_filter/tests.rs`). Behavior reference: [Apply SVG filter effects](https://helpx.adobe.com/illustrator/desktop/special-effects-styles/apply-filter-effects/apply-svg-filter-effects.html), [CS5 help, Apply SVG effects](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=402), [SVG 1.1 Filter Effects](https://www.w3.org/TR/SVG11/filters.html). - **Pattern tiles:** the renderer keeps a tile of each pattern for each scale it rasterizes the pattern at, until the tiles fill the tile cache's budget, and then drops the least recently used tiles first. Objects that show one pattern at different scales, such as a pattern scaled to 25% with Transform Pattern Tiles next to the same pattern at 100%, draw from tiles kept between frames. @@ -2765,6 +2785,8 @@ Edit › Copy and Cut put the selected ruler guides on the clipboard, with the s | Date | Change | Summary | |---|---|---| | 2026-11-16 | minor | Layers panel: an Alt-drag copies a row above or below its own place (`layer.move` with `copy` and that row as the target), so the top layer dragged up, the bottom layer dragged down and a document's only layer are copied (#8237). Scores and estimates unchanged. | +| 2026-11-16 | minor | Layers panel: rows or the selected-art square dragged over the list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | +| 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-16 | minor | Properties panel: while the Type tool edits text, the Character section shows the font family and style and the Variable Font button of the first selected character (or of the character before the caret), not those of the text object's first run (#8189). Evidence: `panels::properties::tests::character_section_shows_the_type_tool_selections_style`. Scores and estimates unchanged. | | 2026-11-16 | minor | Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged. | | 2026-11-16 | minor | Color panel: the spectrum fills the vertical space of a resized panel, with options shown or hidden (#8005). Compact auto-fit flyouts and embedded mixers keep their existing size. Evidence: panels::color::tests::the_spectrum_grows_with_the_color_panel. Scores and estimates unchanged. | diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 1c0e96ceed..2424c92e7c 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -1,6 +1,6 @@ # UI and interaction parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Layers panel: an Alt-drag copies a row above or below itself, so the top layer dragged up, the bottom layer dragged down and a lone layer are copied, #8237; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Remove Background in the Contextual Task Bar, Properties › Quick Actions and the Control bar; previously minor: Ruler origin: the corner drag snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Outline view: images and gradient meshes are picked on what Outline draws, so a click inside them reaches the path behind, #6437; previously minor: a middle-click on a document tab closes it, #6506; previously minor: Blob Brush: a round tip's preview is the outline of the area it adds, round at both ends, as the stroke it commits (#4343); scores and estimates unchanged; previously:; ruler double-click adds a guide at the pointer, #5239; G5: Inventory Icons built-in symbol library (four built-ins); previously minor: files that record no units open in Preferences › Units › General, #5820; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Layers: Rename (`ui.rename`) opens the name field of the selected layer, group or object, #5324; Properties in Edit Artboards: Transform section above the Artboards section, #5219; scrubby labels: the Control bar's Stroke: and Opacity: links and the Properties panel's Stroke link scrub their fields, #4088; Properties: Quick Actions has Repeat Options for one selected repeat, #5181; Direct Selection: Shift-click picks several blend spine points, which drag together, #5285; Direct Selection: Cmd/Ctrl held lends the Selection tool and shows its bounding box, #3901; Join tool trims two crossing open paths and joins them at the crossing, #5844; Control bar: Paragraph: link and Align left/center/right while type is selected, #5372; shape tools: a press on the selection's centre point moves it and one in the rotate zone outside a box corner turns it, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; Units › East Asian Type acts, with Q and Ha units; scores unchanged) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-16 · **Change:** minor (Layers panel: an Alt-drag copies a row above or below itself, so the top layer dragged up, the bottom layer dragged down and a lone layer are copied, #8237; scores and estimates unchanged; previously: Layers panel: Alt over the list shows the copy cursor while rows or the selected-art square are dragged, #8217; scores and estimates unchanged; previously: Gradient panel: the add-stop strip under the ramp shows the white arrow with a plus on Windows and X11, #8241; scores and estimates unchanged; previously: Recolor Artwork follow-up (#8031, remaining #4028): native Lab input, picker swatch libraries and Assign-row menus; UI interaction regression coverage; scores and estimates unchanged; previously: #8005: the Color spectrum fills a resized panel; scores and estimates unchanged; previously: Pencil continuation, straight-line and closing cursors; scores and estimates unchanged; previously: Graphic Styles list fills a taller panel, #2992; scores and estimates unchanged; previously: library panels' lists fill a taller panel, #2992; scores and estimates unchanged; previously: Swatches list fills a taller panel, #1638; scores and estimates unchanged; previously: icon-strip flyouts also resize from the top edge and the canvas-side top corner, keeping the moved top in workspaces (storytold/craft-libs#1094); scores and estimates unchanged; previously: macOS: the canvas cursor stays after the pointer moves, #6362; scores and estimates unchanged; previously minor: Remove Background in the Contextual Task Bar, Properties › Quick Actions and the Control bar; previously minor: Ruler origin: the corner drag snaps as a drawn point does; previously minor: Live Paint Bucket fills faces crossed in one drag (#6373); previously: #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: Outline view: images and gradient meshes are picked on what Outline draws, so a click inside them reaches the path behind, #6437; previously minor: a middle-click on a document tab closes it, #6506; previously minor: Blob Brush: a round tip's preview is the outline of the area it adds, round at both ends, as the stroke it commits (#4343); scores and estimates unchanged; previously:; ruler double-click adds a guide at the pointer, #5239; G5: Inventory Icons built-in symbol library (four built-ins); previously minor: files that record no units open in Preferences › Units › General, #5820; previously minor: interim macOS cursor delivery, #2292; native validation pending; scores and estimates unchanged; Control bar › Snapping includes the existing Snap to Glyph and Alignment Guides toggles (#6164); scores and estimates unchanged; floating tab groups collapse into the side icon rail and opened rail panels fold back into it, #5925 in part; numeric fields step on wheel hover without taking keyboard focus, #5949; Character Styles panel: a double-click on a style's row opens its Character Style Options; the dialog keeps a fixed width and scrolls its sections, so its buttons stay on screen; Selection QoL: marquee modes and visible feedback, #5313; #3380 deletion-only review follow-up: independent survivors keep gradient placement, owned subpaths avoid discarded copies, and contracts/status/evidence are clarified; endpoint highlighting remains open; scores and estimates unchanged; Drop Shadow and glow dialogs: spinner arrows, #5367, #5368; Stroke Weight Up and Down shortcuts, #5797; Layers: Rename (`ui.rename`) opens the name field of the selected layer, group or object, #5324; Properties in Edit Artboards: Transform section above the Artboards section, #5219; scrubby labels: the Control bar's Stroke: and Opacity: links and the Properties panel's Stroke link scrub their fields, #4088; Properties: Quick Actions has Repeat Options for one selected repeat, #5181; Direct Selection: Shift-click picks several blend spine points, which drag together, #5285; Direct Selection: Cmd/Ctrl held lends the Selection tool and shows its bounding box, #3901; Join tool trims two crossing open paths and joins them at the crossing, #5844; Control bar: Paragraph: link and Align left/center/right while type is selected, #5372; shape tools: a press on the selection's centre point moves it and one in the rotate zone outside a box corner turns it, #5477; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x; Units › East Asian Type acts, with Q and Ha units; scores unchanged) > > Tech Circuit update (2026-11-14): three original procedural brushes; ten built-in brush libraries (G5). > @@ -57,6 +57,8 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | 2026-11-14 | minor | G5: Tech Circuit adds three original procedural brushes (Circuit Trace, Bus Lines, Terminal Nodes); ten built-in brush libraries. G5 remaining estimate 3–13 h (estimated); parity scores and headline totals unchanged. | | 2026-11-14 | minor | Layers panel: right-clicking a layer/group/object row shows a context menu with Options…, Duplicate, Delete, Lock/Hide Others, Locate Object, and Collect for Export — matching standard desktop layer panel conventions. Scores unchanged. | | 2026-11-16 | minor | Layers panel: an Alt-drag copies a row above or below its own place, so the top layer dragged up, the bottom layer dragged down and a document's only layer are copied (#8237). Scores and estimates unchanged. | +| 2026-11-16 | minor | Layers panel: rows or the selected-art square dragged over the list show the copy cursor while Alt is held, as the drop then copies, and the grabbing hand otherwise (#8217). Scores and estimates unchanged. | +| 2026-11-16 | minor | Gradient panel: the strip under the ramp, where a click adds a stop, shows the white arrow with a plus on Windows and X11, where the system copy cursor showed as the plain arrow (#8241). Scores and estimates unchanged. | | 2026-11-13 | minor | Pencil cursors: the continuation cursor (a short rising line) shows over an open end of a selected path before any press, freehand too, and while a continuing stroke nears another selected path's open end it connects to; the straight-line cursor is a short level line; a continued path, a straight line too, shows the closing cursor and closes within Close Paths When Ends Are Within of its other end, and with Alt at the release. Scores and estimates unchanged. | | 2026-11-15 | minor | G12: Swatches item menus validated in all five views: 39 focused tests passed, regression fails without the menu hooks, rendered list/thumbnail layouts inspected, and fresh local deep CodeRabbit review found zero issues. Full workspace CI passed on Linux/WSL on the merged branch (all 13 gates), including the test-helper correction for the upstream compile error tracked in #7727; native Windows full CI has two unchanged engine-test failures. Scores and estimates unchanged. | | 2026-11-13 | minor | Graphic Styles: in a panel made taller the list fills the space above the footer instead of stopping at 220 pt (#2992; `the_list_fills_a_tall_panel_above_its_footer` in `crates/ui-egui/src/panels/graphic_styles.rs`). Scores and estimates unchanged. | @@ -184,6 +186,8 @@ tools, never checked side by side) isn't captured row by row. | Swatches list fills a taller panel (#1638) | done | Docked, floating or in a resized flyout, the swatch list takes the height above the panel's footer, as the Artboards list does; outside a sized panel it stays 150 pt (200 pt for large thumbnails); `the_list_fills_a_tall_panel_above_its_footer` in `panels/swatches/tests.rs` | | Layers panel lists a blend's spine (#4820) | done | an open blend shows a `<Path>` row below its key objects, where Release leaves the spine; a click selects the blend (Shift/Cmd toggles it) so Direct Selection edits the spine; a locked blend's row selects nothing; no row while searching or filtering (`a_blends_spine_is_a_row_below_its_keys_that_selects_the_blend`) | | Layers panel: a layer whose Layer Options › Print is off shows its name italic (#5739) | done | the panel row and its drag ghost; a printing layer stays upright, and Print on again restores it; `panels::layers` test `a_layer_that_does_not_print_has_its_name_italic` | +| Layers panel: Alt-drag shows the copy cursor (#8217) | done | rows and the selected-art square dragged over the list show the copy cursor while Alt is held and the grabbing hand otherwise, following Alt mid-drag; on Windows and X11 the copy cursor is the white arrow with a plus (the panels' add cursor, #8241); over the trash and New Layer, which ignore Alt, the hand stays; guide rows keep theirs; `alt_shows_the_copy_cursor_while_rows_are_dragged`, `drag_cursor_shows_a_copy_only_where_the_drop_copies` | +| Gradient panel: add-stop cursor under the ramp (#8241) | done | the white arrow with a plus (the Group Selection glyph) over the strip under the ramp, handed to the OS on Windows and X11 (winit shows the plain arrow for the system copy cursor there), the system copy cursor elsewhere; over the ramp itself the arrow stays; `panels::gradient` test `the_strip_under_the_ramp_shows_the_add_cursor` | | Layers panel: Alt-drag copies a row beside itself (#8237) | done | with Alt, rows held over one of their own rows copy above or below it, and the bottom layer dropped in the empty space under the list copies below itself, so the top layer dragged up, the bottom one dragged down and a document's only layer are copied; a move onto its own place, or a copy inside itself, still does nothing; `panels::layers` tests `alt_dragging_the_top_layer_up_or_the_bottom_layer_down_copies_it`, `a_lone_layer_alt_dragged_up_or_down_is_copied`; engine test `a_copy_goes_above_or_below_a_row_it_copies` | | Blend spine Anchor Point conversion and handle editing (#2544) | implemented | symmetric handles, independent drag/retraction, visible-handle policy and selection/stacking covered by tool and engine regressions; Windows native canvas checks and screenshots reviewed in PR #2643 | | Several blend spine points picked and dragged together (#5285) | done | with Direct Selection, Shift-click picks more points of a selected blend's spine or takes one away, as on a path; dragging any picked point moves them all, and the key objects on them, in one undo step (`object.blend.spine.moveAnchor {with}`); a marquee picks the spine points inside it on the topmost selected blend, and with Shift adds or takes them away |