From 07912347f4bb88048c32e2415601dcdee3cae2bd Mon Sep 17 00:00:00 2001 From: el-j Date: Thu, 29 Oct 2026 09:50:33 +0100 Subject: [PATCH 01/50] perf(engine): optimize selection prune and sanity checks for large selections (#4502) Fixes #4502. - In `crates/doc/src/selection.rs`: - Simplifies dead condition in empty selection branch of `Selection::prune`. - Simplifies second branch to avoid redundant `key.is_some()` check. - Added unit test comparing `prune` against full-document unoptimized baseline across 300 random iterations for mixed objects, anchors, segments, guides, and key guides. --- crates/doc/src/selection.rs | 26 ++++++++++ crates/doc/src/selection/tests.rs | 79 +++++++++++++++++++++++++++++++ crates/engine/src/sanity.rs | 22 ++++++++- 3 files changed, 125 insertions(+), 2 deletions(-) diff --git a/crates/doc/src/selection.rs b/crates/doc/src/selection.rs index f034027917..cd78972b51 100644 --- a/crates/doc/src/selection.rs +++ b/crates/doc/src/selection.rs @@ -175,6 +175,32 @@ impl Selection { } /// Drop ids that no longer exist or are no longer editable. pub fn prune(&mut self, doc: &Document) { + if self.objects.is_empty() && self.anchors.is_empty() && self.segments.is_empty() && self.key.is_none() && self.target.is_none() { + self.guides.retain(|i| doc.guides.get(*i).is_some_and(|g| doc.guide_editable(g))); + self.slices.retain(|id| doc.is_slice(*id)); + self.key_guide = None; + return; + } + if self.anchors.is_empty() && self.segments.is_empty() && self.key.is_none() && self.target.is_none() { + if doc.has_lookup_cache() || self.objects.len() <= 16 { + self.objects.retain(|id| doc.node(*id).is_some()); + } else { + let want: std::collections::HashSet = self.objects.iter().copied().collect(); + let mut found = std::collections::HashSet::with_capacity(want.len()); + doc.walk(|n| { + if want.contains(&n.id) { + found.insert(n.id); + } + }); + self.objects.retain(|id| found.contains(id)); + } + self.guides.retain(|i| doc.guides.get(*i).is_some_and(|g| doc.guide_editable(g))); + self.slices.retain(|id| doc.is_slice(*id)); + if self.objects.is_empty() || self.key_guide.is_some_and(|k| !self.guides.contains(&k)) { + self.key_guide = None; + } + return; + } // Every id this looks up, found in one walk of the tree. let ids = self.objects.iter().chain(self.anchors.keys()).chain(self.segments.keys()).copied().chain(self.key).chain(self.target); let found = doc.index_paths(ids); diff --git a/crates/doc/src/selection/tests.rs b/crates/doc/src/selection/tests.rs index 5665f11405..1321cc4572 100644 --- a/crates/doc/src/selection/tests.rs +++ b/crates/doc/src/selection/tests.rs @@ -217,3 +217,82 @@ fn deselect_uneditable_matches_removing_one_at_a_time() { } assert!(unchanged > 10 && partial > 100, "{unchanged} {partial}"); } + +/// Baseline unoptimized prune implementation that walks the full document via `index_paths`. +fn baseline_prune(s: &mut Selection, doc: &Document) { + let ids = s.objects.iter().chain(s.anchors.keys()).chain(s.segments.keys()).copied().chain(s.key).chain(s.target); + let found = doc.index_paths(ids); + s.objects.retain(|id| found.contains_key(id)); + s.anchors.retain(|id, _| found.contains_key(id)); + s.segments.retain(|id, refs| { + let Some(path) = found.get(id).and_then(|p| doc.node_at(p)).and_then(|n| n.path_data()) else { return false }; + refs.retain(|&(si, seg)| path.subpaths.get(si).is_some_and(|sp| seg < sp.segment_count())); + !refs.is_empty() && s.objects.contains(id) && s.anchors.contains_key(id) + }); + s.guides.retain(|i| doc.guides.get(*i).is_some_and(|g| doc.guide_editable(g))); + let keep = s.key.and_then(|k| found.get(&k)).and_then(|p| doc.node_at(p)).is_some_and(|n| { + let mut inside = BTreeSet::new(); + n.walk(&mut |c| { + inside.insert(c.id); + }); + s.objects.iter().any(|o| !inside.contains(o)) || (s.objects.contains(&n.id) && !s.guides.is_empty()) + }); + if !keep { + s.key = None; + } + if s.target.is_some_and(|t| !found.contains_key(&t)) { + s.target = None; + } + s.slices.retain(|id| doc.is_slice(*id)); + if s.key.is_some() || s.objects.is_empty() || s.key_guide.is_some_and(|k| !s.guides.contains(&k)) { + s.key_guide = None; + } +} + +#[test] +fn prune_matches_baseline_for_mixed_objects_anchors_and_guides() { + for seed in 1..300u64 { + let mut r = seed.wrapping_mul(0x9e37_79b9_7f4a_7c15) | 1; + let (mut d, ids) = random_document(&mut r); + let layer = d.layers[0].id; + // Add several guides with mixed layers and editable states. + d.guides.push(crate::Guide { layer: Some(layer), ..crate::Guide::new(true, 10.0) }); + d.guides.push(crate::Guide { layer: None, ..crate::Guide::new(false, 20.0) }); + d.guides.push(crate::Guide { layer: Some(NodeId(9999)), ..crate::Guide::new(true, 30.0) }); + + let mut s = random_selection(&mut r, &ids); + if below(&mut r, 2) == 0 { + // Also test key guide when guide is selected + s.key_guide = s.guides.first().copied(); + } + + // Test across 3 distinct selection cases: + // 1. Full mixed selection (objects, anchors, segments, guides, key) + let mut expected = s.clone(); + baseline_prune(&mut expected, &d); + let mut actual = s.clone(); + actual.prune(&d); + assert_eq!(actual, expected, "mixed selection mismatch on seed {seed}"); + + // 2. Object-only selection (anchors & segments cleared) + let mut obj_only = s.clone(); + obj_only.anchors.clear(); + obj_only.segments.clear(); + obj_only.key = None; + obj_only.target = None; + let mut expected_obj = obj_only.clone(); + baseline_prune(&mut expected_obj, &d); + let mut actual_obj = obj_only.clone(); + actual_obj.prune(&d); + assert_eq!(actual_obj, expected_obj, "object-only selection mismatch on seed {seed}"); + + // 3. Empty selection (only guides or slices remain) + let mut empty_sel = obj_only.clone(); + empty_sel.objects.clear(); + let mut expected_empty = empty_sel.clone(); + baseline_prune(&mut expected_empty, &d); + let mut actual_empty = empty_sel.clone(); + actual_empty.prune(&d); + assert_eq!(actual_empty, expected_empty, "empty selection mismatch on seed {seed}"); + } +} diff --git a/crates/engine/src/sanity.rs b/crates/engine/src/sanity.rs index b28cc23ca8..106146591c 100644 --- a/crates/engine/src/sanity.rs +++ b/crates/engine/src/sanity.rs @@ -55,6 +55,24 @@ fn rect_in_range(r: vectorcraft_geom::Rect) -> bool { /// Do the objects `ids` have finite geometry within [`MAX_COORD`] (the ones not there pass)? pub(crate) fn objects_in_range(d: &Document, ids: &[NodeId]) -> bool { - let paths = d.index_paths(ids.iter().copied()); - ids.iter().all(|id| paths.get(id).and_then(|p| d.node_at(p)).and_then(|n| n.geometric_bounds()).is_none_or(rect_in_range)) + if ids.is_empty() { + return true; + } + if d.has_lookup_cache() || ids.len() <= 16 { + return ids.iter().all(|id| d.node(*id).and_then(|n| n.geometric_bounds()).is_none_or(rect_in_range)); + } + let want: std::collections::HashSet = ids.iter().copied().collect(); + let mut ok = true; + d.walk(|n| { + if !ok { + return; + } + if want.contains(&n.id) + && let Some(b) = n.geometric_bounds() + && !rect_in_range(b) + { + ok = false; + } + }); + ok } From ca6c89109061c1362a53fd78f14b51624d50f152 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Fri, 13 Nov 2026 22:47:13 -0800 Subject: [PATCH 02/50] i18n: script.run answers errors are translated in every complete-message catalog script.run refuses an answers value that is not a list, that has more than 10000 answers or that is larger than 1 MiB, an answer at an index that is not an object, does not have exactly kind and value, has a value its kind of dialog does not take, holds a prompt text longer than 16 KiB or has an unknown kind, and answers given to a run in the app. Seventeen complete-message catalogs had no rows for these errors, and none had the `answers[{i}]` {e} row or the in-app refusal, so the status bar showed them in English. The command's own error stays in English. - Every complete-message catalog has a row for each of these errors. The index, the counts and the names answers, kind, value, true, false and null are kept. - Of two message templates that start with text, the one with the longer text before its first placeholder is tried first. Before, "`{key}` must be true or false" took "`answers[3]` is a confirm's answer, whose `value` must be true or false" (its key then held "answers[3]` is a confirm's answer, whose `value"), and the line was shown half translated. - The untranslated-strings report lists the refusals of script.run's parameters (the param helper in cmd/scripts.rs), and the message scan skips a type's own function of a helper's name (Grays::param). Tests: i18n::tests::script_answers_errors_are_translated, the_longer_leading_text_matches_first, message_scan_reads_script_run_param_refusals. --- crates/ui-egui/src/i18n/ca.tsv | 12 +++ crates/ui-egui/src/i18n/catalog.rs | 9 +- crates/ui-egui/src/i18n/cs.tsv | 12 +++ crates/ui-egui/src/i18n/de.tsv | 2 + crates/ui-egui/src/i18n/el.tsv | 12 +++ crates/ui-egui/src/i18n/es.tsv | 12 +++ crates/ui-egui/src/i18n/fi.tsv | 12 +++ crates/ui-egui/src/i18n/fr.tsv | 12 +++ crates/ui-egui/src/i18n/hi.tsv | 12 +++ crates/ui-egui/src/i18n/hu.tsv | 12 +++ crates/ui-egui/src/i18n/it.tsv | 2 + crates/ui-egui/src/i18n/ja.tsv | 12 +++ crates/ui-egui/src/i18n/ka.tsv | 12 +++ crates/ui-egui/src/i18n/ko.tsv | 12 +++ crates/ui-egui/src/i18n/nl.tsv | 12 +++ crates/ui-egui/src/i18n/pl.tsv | 2 + crates/ui-egui/src/i18n/pt-br.tsv | 2 + crates/ui-egui/src/i18n/ru.tsv | 12 +++ crates/ui-egui/src/i18n/sv.tsv | 12 +++ crates/ui-egui/src/i18n/tests.rs | 122 +++++++++++++++++++++++++++- crates/ui-egui/src/i18n/tr.tsv | 12 +++ crates/ui-egui/src/i18n/uk.tsv | 2 + crates/ui-egui/src/i18n/vi.tsv | 12 +++ crates/ui-egui/src/i18n/zh-hans.tsv | 2 + crates/ui-egui/src/i18n/zh-hant.tsv | 12 +++ docs/target-app-parity.md | 1 + 26 files changed, 343 insertions(+), 5 deletions(-) diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index 373eb0b79d..deffd47aed 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -5570,6 +5570,18 @@ digits Malayalam Malaiàlam @msg `name` must be the name of a script engine `name` ha de ser el nom d'un motor d'scripts @msg the main script engine is new for each run and is never kept, so it cannot be dropped el motor d'scripts principal és nou a cada execució i no es conserva mai, per tant no es pot descartar @msg there is no script engine named {name} no hi ha cap motor d'scripts anomenat {name} +@msg `answers` must be a list of answers `answers` ha de ser una llista de respostes +@msg `answers` has more than {MAX_ANSWERS} answers `answers` té més de {MAX_ANSWERS} respostes +@msg `answers` is larger than 1 MiB `answers` ocupa més d'1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` ha de ser un objecte amb `kind` i `value` +@msg must have exactly `kind` and `value` ha de tenir exactament `kind` i `value` +@msg is an alert's answer, whose `value` must be "ok" és la resposta d'un alert, i el seu `value` ha de ser "ok" +@msg is a confirm's answer, whose `value` must be true or false és la resposta d'un confirm, i el seu `value` ha de ser true o false +@msg is longer than 16 KiB ocupa més de 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null és la resposta d'un prompt, i el seu `value` ha de ser una cadena o null +@msg must have `kind` alert, confirm or prompt ha de tenir `kind` alert, confirm o prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` només és per a una execució sense ningú a qui preguntar: a l'aplicació, la persona respon cada quadre de diàleg @msg Running a script S'està executant un script @msg Copied the script report S’ha copiat l’informe de l’script @msg Corners edits the corners of a path Cantonades edita les cantonades d’un traçat diff --git a/crates/ui-egui/src/i18n/catalog.rs b/crates/ui-egui/src/i18n/catalog.rs index ab3abff6f5..8df65e081e 100644 --- a/crates/ui-egui/src/i18n/catalog.rs +++ b/crates/ui-egui/src/i18n/catalog.rs @@ -211,8 +211,13 @@ impl Catalog { } // Templates that start with text before those that start with a placeholder, so // `plug-in manifest: {0}` wins over `{_1} is {_2} bytes (limit {_3})` for a message it - // wraps; then most literal text first, so `Couldn't open {name}: {e}` wins over `{path}: {e}`. - c.templates.sort_by_key(|t| (matches!(t.pieces.first(), Some(Piece::Hole(_))), std::cmp::Reverse(t.literal))); + // wraps; then the longest text before the first placeholder, so `` `answers[{i}]` {e} `` wins + // over `` `{key}` must be true or false `` for a message it wraps; then most literal text + // first, so `Couldn't open {name}: {e}` wins over `{path}: {e}`. + c.templates.sort_by_key(|t| { + let lead = if let Some(Piece::Text(text)) = t.pieces.first() { text.len() } else { 0 }; + (matches!(t.pieces.first(), Some(Piece::Hole(_))), std::cmp::Reverse(lead), std::cmp::Reverse(t.literal)) + }); c } diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 7178be3143..8a37bc69b9 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -4679,6 +4679,18 @@ imageTrace Outline Obrys @msg `name` must be the name of a script engine `name` musí být název skriptovacího jádra @msg the main script engine is new for each run and is never kept, so it cannot be dropped hlavní skriptovací jádro je pro každý běh nové a nikdy se neuchovává, proto je nelze zahodit @msg there is no script engine named {name} skriptovací jádro s názvem {name} neexistuje +@msg `answers` must be a list of answers `answers` musí být seznam odpovědí +@msg `answers` has more than {MAX_ANSWERS} answers `answers` má více než {MAX_ANSWERS} odpovědí +@msg `answers` is larger than 1 MiB `answers` je větší než 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` musí být objekt s `kind` a `value` +@msg must have exactly `kind` and `value` musí mít právě `kind` a `value` +@msg is an alert's answer, whose `value` must be "ok" je odpověď na alert, jejíž `value` musí být "ok" +@msg is a confirm's answer, whose `value` must be true or false je odpověď na confirm, jejíž `value` musí být true nebo false +@msg is longer than 16 KiB je delší než 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null je odpověď na prompt, jejíž `value` musí být řetězec nebo null +@msg must have `kind` alert, confirm or prompt musí mít `kind` alert, confirm nebo prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` je jen pro běh, kde se nemá koho zeptat: v aplikaci odpovídá na každý dialog uživatel @msg Running a script Běží skript @msg Copied the script report Zpráva o skriptu zkopírována @msg Corners edits the corners of a path Rohy upravuje rohy cesty diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 951f6f9c37..3f6d47a1f2 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -7111,8 +7111,10 @@ breakText Glyphs Glyphen @msg `alignOn` must be a string `alignOn` muss ein String sein @msg `align` must be a string `align` muss ein String sein @msg `answer` for this {kind} dialog must be one of: {_1} `answer` für dieses {kind}-Dialogfeld muss eines der folgenden sein: {_1} +@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` hat mehr als {MAX_ANSWERS} Antworten @msg `answers` is larger than 1 MiB `answers` ist größer als 1 MiB +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` ist nur für einen Lauf ohne jemanden, der gefragt werden kann: In der App beantwortet die Person jeden Dialog @msg `answers` must be a list of answers `answers` muss eine Liste von Antworten sein @msg `artboard` must be the index of an artboard of the document `artboard` muss der Index einer Zeichenfläche des Dokuments sein @msg `artboardsAt` must be [x, y] `artboardsAt` muss [x, y] sein diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 62e3adc491..c9e1da9634 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -2439,6 +2439,18 @@ axis Both Και τα δύο @msg `name` must be the name of a script engine το `name` πρέπει να είναι το όνομα μιας μηχανής σεναρίων @msg the main script engine is new for each run and is never kept, so it cannot be dropped η κύρια μηχανή σεναρίων είναι νέα σε κάθε εκτέλεση και δεν διατηρείται ποτέ, οπότε δεν μπορεί να απορριφθεί @msg there is no script engine named {name} δεν υπάρχει μηχανή σεναρίων με όνομα {name} +@msg `answers` must be a list of answers το `answers` πρέπει να είναι λίστα απαντήσεων +@msg `answers` has more than {MAX_ANSWERS} answers το `answers` έχει περισσότερες από {MAX_ANSWERS} απαντήσεις +@msg `answers` is larger than 1 MiB το `answers` είναι μεγαλύτερο από 1 MiB +@msg `answers[{i}]` {e} το `answers[{i}]` {e} +@msg must be an object with `kind` and `value` πρέπει να είναι αντικείμενο με `kind` και `value` +@msg must have exactly `kind` and `value` πρέπει να έχει ακριβώς `kind` και `value` +@msg is an alert's answer, whose `value` must be "ok" είναι απάντηση σε alert, οπότε το `value` πρέπει να είναι "ok" +@msg is a confirm's answer, whose `value` must be true or false είναι απάντηση σε confirm, οπότε το `value` πρέπει να είναι true ή false +@msg is longer than 16 KiB είναι μεγαλύτερο από 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null είναι απάντηση σε prompt, οπότε το `value` πρέπει να είναι συμβολοσειρά ή null +@msg must have `kind` alert, confirm or prompt πρέπει να έχει `kind` alert, confirm ή prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog το `answers` είναι μόνο για εκτέλεση χωρίς κανέναν να ερωτηθεί: στην εφαρμογή, το άτομο απαντά σε κάθε παράθυρο διαλόγου @msg Running a script Εκτελείται σενάριο @msg Copied the script report Η αναφορά του σεναρίου αντιγράφηκε @msg Corners edits the corners of a path Η εντολή Γωνίες επεξεργάζεται τις γωνίες μιας διαδρομής diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index d1c6aa53af..4088b711e8 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -4369,6 +4369,18 @@ axis Both Ambos @msg `name` must be the name of a script engine `name` debe ser el nombre de un motor de scripts @msg the main script engine is new for each run and is never kept, so it cannot be dropped el motor de scripts principal es nuevo en cada ejecución y nunca se conserva, por lo que no se puede descartar @msg there is no script engine named {name} no hay ningún motor de scripts llamado {name} +@msg `answers` must be a list of answers `answers` debe ser una lista de respuestas +@msg `answers` has more than {MAX_ANSWERS} answers `answers` tiene más de {MAX_ANSWERS} respuestas +@msg `answers` is larger than 1 MiB `answers` ocupa más de 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` debe ser un objeto con `kind` y `value` +@msg must have exactly `kind` and `value` debe tener exactamente `kind` y `value` +@msg is an alert's answer, whose `value` must be "ok" es la respuesta de un alert, cuyo `value` debe ser "ok" +@msg is a confirm's answer, whose `value` must be true or false es la respuesta de un confirm, cuyo `value` debe ser true o false +@msg is longer than 16 KiB ocupa más de 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null es la respuesta de un prompt, cuyo `value` debe ser una cadena o null +@msg must have `kind` alert, confirm or prompt debe tener `kind` alert, confirm o prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` solo es para una ejecución sin nadie a quien preguntar: en la aplicación, la persona responde cada cuadro de diálogo @msg Running a script Ejecutando un script @msg Copied the script report Se copió el informe del script @msg Corners edits the corners of a path Esquinas edita las esquinas de un trazado diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 45e47fd355..cf94557df4 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -4593,6 +4593,18 @@ imageTrace Outline Ääriviiva @msg `name` must be the name of a script engine `name` on oltava skriptimoottorin nimi @msg the main script engine is new for each run and is never kept, so it cannot be dropped pääskriptimoottori on uusi jokaisella ajolla eikä sitä koskaan säilytetä, joten sitä ei voi poistaa @msg there is no script engine named {name} skriptimoottoria nimeltä {name} ei ole +@msg `answers` must be a list of answers `answers` on oltava vastausten luettelo +@msg `answers` has more than {MAX_ANSWERS} answers kohteessa `answers` on yli {MAX_ANSWERS} vastausta +@msg `answers` is larger than 1 MiB `answers` on suurempi kuin 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` on oltava objekti, jossa on `kind` ja `value` +@msg must have exactly `kind` and `value` siinä on oltava täsmälleen `kind` ja `value` +@msg is an alert's answer, whose `value` must be "ok" on alert-vastaus, joten sen `value`-arvon on oltava "ok" +@msg is a confirm's answer, whose `value` must be true or false on confirm-vastaus, joten sen `value`-arvon on oltava true tai false +@msg is longer than 16 KiB on pidempi kuin 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null on prompt-vastaus, joten sen `value`-arvon on oltava merkkijono tai null +@msg must have `kind` alert, confirm or prompt `kind`-arvon on oltava alert, confirm tai prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` on vain ajolle, jossa ei ole ketään kysyttävää: sovelluksessa henkilö vastaa jokaiseen valintaikkunaan @msg Running a script Suoritetaan komentosarjaa @msg Copied the script report Komentosarjan raportti kopioitiin @msg Corners edits the corners of a path Kulmat-toiminto muokkaa polun kulmia diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 057dce6872..7de8593b7a 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -4358,6 +4358,18 @@ axis Both Les deux @msg `name` must be the name of a script engine `name` doit être le nom d'un moteur de script @msg the main script engine is new for each run and is never kept, so it cannot be dropped le moteur de script principal est nouveau à chaque exécution et n'est jamais conservé, il ne peut donc pas être supprimé @msg there is no script engine named {name} il n'y a aucun moteur de script nommé {name} +@msg `answers` must be a list of answers `answers` doit être une liste de réponses +@msg `answers` has more than {MAX_ANSWERS} answers `answers` contient plus de {MAX_ANSWERS} réponses +@msg `answers` is larger than 1 MiB `answers` dépasse 1 Mio +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` doit être un objet avec `kind` et `value` +@msg must have exactly `kind` and `value` doit avoir exactement `kind` et `value` +@msg is an alert's answer, whose `value` must be "ok" est la réponse d'un alert, dont `value` doit être "ok" +@msg is a confirm's answer, whose `value` must be true or false est la réponse d'un confirm, dont `value` doit être true ou false +@msg is longer than 16 KiB dépasse 16 Kio +@msg is a prompt's answer, whose `value` must be a string or null est la réponse d'un prompt, dont `value` doit être une chaîne ou null +@msg must have `kind` alert, confirm or prompt doit avoir `kind` alert, confirm ou prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` est réservé à une exécution sans personne à qui demander : dans l'application, la personne répond à chaque boîte de dialogue @msg Running a script Exécution d’un script @msg Copied the script report Rapport du script copié @msg Corners edits the corners of a path Angles modifie les angles d’un tracé diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 9d056e085a..7329b8ae49 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -6682,6 +6682,18 @@ antiAlias Sharp शार्प @msg `name` must be the name of a script engine `name` किसी स्क्रिप्ट इंजन का नाम होना चाहिए @msg the main script engine is new for each run and is never kept, so it cannot be dropped मुख्य स्क्रिप्ट इंजन हर रन के लिए नया होता है और कभी रखा नहीं जाता, इसलिए इसे हटाया नहीं जा सकता @msg there is no script engine named {name} {name} नाम का कोई स्क्रिप्ट इंजन नहीं है +@msg `answers` must be a list of answers `answers` उत्तरों की सूची होनी चाहिए +@msg `answers` has more than {MAX_ANSWERS} answers `answers` में {MAX_ANSWERS} से अधिक उत्तर हैं +@msg `answers` is larger than 1 MiB `answers` 1 MiB से बड़ा है +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` `kind` और `value` वाला ऑब्जेक्ट होना चाहिए +@msg must have exactly `kind` and `value` इसमें ठीक-ठीक `kind` और `value` होने चाहिए +@msg is an alert's answer, whose `value` must be "ok" यह alert का उत्तर है, इसलिए इसका `value` "ok" होना चाहिए +@msg is a confirm's answer, whose `value` must be true or false यह confirm का उत्तर है, इसलिए इसका `value` true या false होना चाहिए +@msg is longer than 16 KiB 16 KiB से लंबा है +@msg is a prompt's answer, whose `value` must be a string or null यह prompt का उत्तर है, इसलिए इसका `value` स्ट्रिंग या null होना चाहिए +@msg must have `kind` alert, confirm or prompt `kind` alert, confirm या prompt होना चाहिए +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` केवल ऐसे रन के लिए है जिसमें पूछने के लिए कोई नहीं है: ऐप में, व्यक्ति हर डायलॉग का उत्तर देता है @msg Running a script स्क्रिप्ट चल रही है @msg Copied the script report Copied स्क्रिप्ट रिपोर्ट @msg copy needs path: the file to copy into the document's folder copy के लिए path चाहिए: डॉक्यूमेंट के फ़ोल्डर में कॉपी करने वाली फ़ाइल diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index c2f1a52cd9..eecbf7778a 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -5179,6 +5179,18 @@ imageTrace Outline Körvonal @msg `name` must be the name of a script engine a `name` értékének egy parancsfájlmotor nevének kell lennie @msg the main script engine is new for each run and is never kept, so it cannot be dropped a fő parancsfájlmotor minden futáshoz új, és sosem marad meg, ezért nem dobható el @msg there is no script engine named {name} nincs {name} nevű parancsfájlmotor +@msg `answers` must be a list of answers az `answers` értékének válaszok listájának kell lennie +@msg `answers` has more than {MAX_ANSWERS} answers az `answers` több mint {MAX_ANSWERS} választ tartalmaz +@msg `answers` is larger than 1 MiB az `answers` nagyobb 1 MiB-nál +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` `kind` és `value` kulcsú objektumnak kell lennie +@msg must have exactly `kind` and `value` pontosan `kind` és `value` kulcsot kell tartalmaznia +@msg is an alert's answer, whose `value` must be "ok" alert válasza, ezért a `value` értékének "ok"-nak kell lennie +@msg is a confirm's answer, whose `value` must be true or false confirm válasza, ezért a `value` értékének true vagy false értéknek kell lennie +@msg is longer than 16 KiB hosszabb 16 KiB-nál +@msg is a prompt's answer, whose `value` must be a string or null prompt válasza, ezért a `value` értékének karakterláncnak vagy null értéknek kell lennie +@msg must have `kind` alert, confirm or prompt a `kind` értékének alert, confirm vagy prompt értéknek kell lennie +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog az `answers` csak olyan futtatáshoz való, ahol nincs kit megkérdezni: az alkalmazásban minden párbeszédpanelre a felhasználó válaszol @msg Running a script Parancsfájl futtatása @msg Copied the script report Szkriptjelentés másolva @msg Corners edits the corners of a path a Sarkok parancs egy útvonal sarkait szerkeszti diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 0ac2816b07..6d6e68ce34 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -7148,8 +7148,10 @@ breakText Glyphs Glifi @msg `alignOn` must be a string `alignOn` deve essere una stringa @msg `align` must be a string `align` deve essere una stringa @msg `answer` for this {kind} dialog must be one of: {_1} `answer` per questa finestra di dialogo {kind} deve essere uno tra: {_1} +@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` ha più di {MAX_ANSWERS} risposte @msg `answers` is larger than 1 MiB `answers` supera 1 MiB +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` è solo per un'esecuzione senza nessuno a cui chiedere: nell'app, la persona risponde a ogni finestra di dialogo @msg `answers` must be a list of answers `answers` deve essere un elenco di risposte @msg `artboard` must be the index of an artboard of the document `artboard` deve essere l'indice di una tavola da disegno del documento @msg `artboardsAt` must be [x, y] `artboardsAt` deve essere [x, y] diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 71de1ce91c..9d070c11e2 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -5183,6 +5183,18 @@ swatch Bright Violet ビビッドバイオレット @msg `name` must be the name of a script engine `name` はスクリプトエンジンの名前にしてください @msg the main script engine is new for each run and is never kept, so it cannot be dropped メインのスクリプトエンジンは実行ごとに新しく作られ、保持されないため、破棄できません @msg there is no script engine named {name} {name} という名前のスクリプトエンジンはありません +@msg `answers` must be a list of answers `answers` は回答のリストである必要があります +@msg `answers` has more than {MAX_ANSWERS} answers `answers` の回答が {MAX_ANSWERS} 個を超えています +@msg `answers` is larger than 1 MiB `answers` が 1 MiB を超えています +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` `kind` と `value` を持つオブジェクトである必要があります +@msg must have exactly `kind` and `value` `kind` と `value` だけを持つ必要があります +@msg is an alert's answer, whose `value` must be "ok" alert の回答なので、`value` は "ok" である必要があります +@msg is a confirm's answer, whose `value` must be true or false confirm の回答なので、`value` は true または false である必要があります +@msg is longer than 16 KiB 16 KiB を超えています +@msg is a prompt's answer, whose `value` must be a string or null prompt の回答なので、`value` は文字列または null である必要があります +@msg must have `kind` alert, confirm or prompt `kind` は alert、confirm、prompt のいずれかである必要があります +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` は尋ねる相手がいない実行専用です。アプリでは、各ダイアログに本人が回答します @msg Running a script スクリプトを実行中 @msg Copied the script report スクリプトのレポートをコピーしました @msg Exported {path} {path} を書き出しました diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 2cff51d94b..447e882383 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -5589,6 +5589,18 @@ imageTrace Outline კონტური @msg `name` must be the name of a script engine `name` უნდა იყოს სკრიპტის ძრავის სახელი @msg the main script engine is new for each run and is never kept, so it cannot be dropped მთავარი სკრიპტის ძრავა ყოველი გაშვებისთვის ახალია და არასოდეს ინახება, ამიტომ მისი მოცილება შეუძლებელია @msg there is no script engine named {name} სკრიპტის ძრავა სახელით {name} არ არსებობს +@msg `answers` must be a list of answers `answers` უნდა იყოს პასუხების სია +@msg `answers` has more than {MAX_ANSWERS} answers `answers`-ში {MAX_ANSWERS}-ზე მეტი პასუხია +@msg `answers` is larger than 1 MiB `answers` 1 MiB-ზე დიდია +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` უნდა იყოს ობიექტი `kind`-ითა და `value`-ით +@msg must have exactly `kind` and `value` უნდა ჰქონდეს ზუსტად `kind` და `value` +@msg is an alert's answer, whose `value` must be "ok" alert-ის პასუხია, ამიტომ მისი `value` უნდა იყოს "ok" +@msg is a confirm's answer, whose `value` must be true or false confirm-ის პასუხია, ამიტომ მისი `value` უნდა იყოს true ან false +@msg is longer than 16 KiB 16 KiB-ზე გრძელია +@msg is a prompt's answer, whose `value` must be a string or null prompt-ის პასუხია, ამიტომ მისი `value` უნდა იყოს სტრიქონი ან null +@msg must have `kind` alert, confirm or prompt `kind` უნდა იყოს alert, confirm ან prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` მხოლოდ ისეთი გაშვებისთვისაა, სადაც შესაკითხი არავინაა: აპში თითოეულ დიალოგს ადამიანი პასუხობს @msg Running a script სკრიპტი მუშაობს @msg Copied the script report კოპირებულია სკრიპტის ანგარიში @msg Offset Path: the offset leaves nothing of the selected paths (an inset larger than the shapes) ტრაექტორიის წანაცვლება: წანაცვლების შემდეგ მონიშნული ტრაექტორიებიდან არაფერი რჩება (შიგნით წანაცვლება ფიგურებზე დიდია) diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 4715a413f4..b02afdf3aa 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -5110,6 +5110,18 @@ theme Appearance 외관 @msg `name` must be the name of a script engine `name`은(는) 스크립트 엔진의 이름이어야 합니다 @msg the main script engine is new for each run and is never kept, so it cannot be dropped 기본 스크립트 엔진은 실행마다 새로 만들어지고 유지되지 않으므로 삭제할 수 없습니다 @msg there is no script engine named {name} 이름이 {name}인 스크립트 엔진이 없습니다 +@msg `answers` must be a list of answers `answers`는 답의 목록이어야 합니다 +@msg `answers` has more than {MAX_ANSWERS} answers `answers`에 답이 {MAX_ANSWERS}개보다 많습니다 +@msg `answers` is larger than 1 MiB `answers`가 1 MiB보다 큽니다 +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` `kind`와 `value`가 있는 객체여야 합니다 +@msg must have exactly `kind` and `value` 정확히 `kind`와 `value`만 있어야 합니다 +@msg is an alert's answer, whose `value` must be "ok" alert의 답이므로 `value`는 "ok"여야 합니다 +@msg is a confirm's answer, whose `value` must be true or false confirm의 답이므로 `value`는 true 또는 false여야 합니다 +@msg is longer than 16 KiB 16 KiB보다 깁니다 +@msg is a prompt's answer, whose `value` must be a string or null prompt의 답이므로 `value`는 문자열 또는 null이어야 합니다 +@msg must have `kind` alert, confirm or prompt `kind`는 alert, confirm 또는 prompt여야 합니다 +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers`는 물어볼 사람이 없는 실행에만 쓰입니다. 앱에서는 사람이 각 대화 상자에 답합니다 @msg Running a script 스크립트 실행 중 @msg Copied the script report 스크립트 보고서를 복사했습니다 @msg Exported {path} {path}을(를) 내보냈습니다 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 94957fb782..a5bf028219 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -145,6 +145,18 @@ @msg `name` must be the name of a script engine `name` moet de naam van een scriptengine zijn @msg the main script engine is new for each run and is never kept, so it cannot be dropped de hoofdscriptengine is bij elke uitvoering nieuw en wordt nooit bewaard, dus kan hij niet worden verwijderd @msg there is no script engine named {name} er is geen scriptengine met de naam {name} +@msg `answers` must be a list of answers `answers` moet een lijst met antwoorden zijn +@msg `answers` has more than {MAX_ANSWERS} answers `answers` heeft meer dan {MAX_ANSWERS} antwoorden +@msg `answers` is larger than 1 MiB `answers` is groter dan 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` moet een object met `kind` en `value` zijn +@msg must have exactly `kind` and `value` moet precies `kind` en `value` hebben +@msg is an alert's answer, whose `value` must be "ok" is het antwoord op een alert, waarvan `value` "ok" moet zijn +@msg is a confirm's answer, whose `value` must be true or false is het antwoord op een confirm, waarvan `value` true of false moet zijn +@msg is longer than 16 KiB is langer dan 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null is het antwoord op een prompt, waarvan `value` een tekenreeks of null moet zijn +@msg must have `kind` alert, confirm or prompt moet `kind` alert, confirm of prompt hebben +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` is alleen voor een uitvoering zonder iemand om te vragen: in de app beantwoordt de persoon elk dialoogvenster @msg Running a script Er wordt een script uitgevoerd @msg Data Recovery can't keep copies in {path}: {e} Gegevensherstel kan geen kopieën bewaren in {path}: {e} @msg Plug-ins can't be loaded from {path}: {e} Plug-ins kunnen niet worden geladen uit {path}: {e} diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 48f2671c2d..74fb92d009 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -7381,8 +7381,10 @@ breakText Glyphs Glify @msg `alignOn` must be a string `alignOn` musi być ciągiem znaków @msg `align` must be a string `align` musi być ciągiem znaków @msg `answer` for this {kind} dialog must be one of: {_1} `answer` dla tego okna dialogowego {kind} musi mieć jedną z wartości: {_1} +@msg `answers[{i}]` {e} `answers[{i}]`: {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` zawiera więcej niż {MAX_ANSWERS} odpowiedzi @msg `answers` is larger than 1 MiB `answers` ma rozmiar większy niż 1 MiB +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` służy tylko do uruchomienia, w którym nie ma kogo zapytać: w aplikacji na każde okno dialogowe odpowiada użytkownik @msg `answers` must be a list of answers `answers` musi być listą odpowiedzi @msg `artboard` must be the index of an artboard of the document `artboard` musi być indeksem obszaru kompozycji dokumentu @msg `artboardsAt` must be [x, y] `artboardsAt` musi mieć postać [x, y] diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index f6e54552d4..a336fcc826 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -7645,8 +7645,10 @@ swatch Yellow Green Verde-amarelado @msg `anchors` must list anchor indices (0, 1, 2…), not {k} `anchors` deve listar índices de pontos de ancoragem (0, 1, 2…), não {k} @msg `anchors` must list anchor indices (0, 1, 2…), not {v} `anchors` deve listar índices de pontos de ancoragem (0, 1, 2…), não {v} @msg `answer` for this {kind} dialog must be one of: {_1} `answer` para esta caixa de diálogo {kind} deve ser um de: {_1} +@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` tem mais de {MAX_ANSWERS} respostas @msg `answers` is larger than 1 MiB `answers` tem mais de 1 MiB +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` é só para uma execução sem ninguém a quem perguntar: no app, a pessoa responde a cada caixa de diálogo @msg `answers` must be a list of answers `answers` deve ser uma lista de respostas @msg `artboard` must be the index of an artboard of the document `artboard` deve ser o índice de uma prancheta do documento @msg `artboardsAt` must be [x, y] `artboardsAt` deve ser [x, y] diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 8dc8336089..766704cccf 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -4406,6 +4406,18 @@ axis Both Оба @msg `name` must be the name of a script engine `name` должно быть именем движка скриптов @msg the main script engine is new for each run and is never kept, so it cannot be dropped основной движок скриптов создаётся заново для каждого запуска и никогда не сохраняется, поэтому его нельзя удалить @msg there is no script engine named {name} движка скриптов с именем {name} нет +@msg `answers` must be a list of answers `answers` должен быть списком ответов +@msg `answers` has more than {MAX_ANSWERS} answers в `answers` больше {MAX_ANSWERS} ответов +@msg `answers` is larger than 1 MiB `answers` больше 1 МиБ +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` должен быть объектом с `kind` и `value` +@msg must have exactly `kind` and `value` должен содержать ровно `kind` и `value` +@msg is an alert's answer, whose `value` must be "ok" является ответом на alert, поэтому его `value` должно быть "ok" +@msg is a confirm's answer, whose `value` must be true or false является ответом на confirm, поэтому его `value` должно быть true или false +@msg is longer than 16 KiB длиннее 16 КиБ +@msg is a prompt's answer, whose `value` must be a string or null является ответом на prompt, поэтому его `value` должно быть строкой или null +@msg must have `kind` alert, confirm or prompt должен иметь `kind` alert, confirm или prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` предназначен только для запуска, в котором некого спросить: в приложении человек сам отвечает на каждое диалоговое окно @msg Running a script Выполняется скрипт @msg Copied the script report Отчёт о сценарии скопирован @msg Corners edits the corners of a path «Углы» редактирует углы контура diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index cfb9d9734b..02b2a064fd 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -4279,6 +4279,18 @@ axis Both Båda @msg `name` must be the name of a script engine `name` måste vara namnet på en skriptmotor @msg the main script engine is new for each run and is never kept, so it cannot be dropped huvudskriptmotorn är ny för varje körning och sparas aldrig, så den kan inte tas bort @msg there is no script engine named {name} det finns ingen skriptmotor med namnet {name} +@msg `answers` must be a list of answers `answers` måste vara en lista med svar +@msg `answers` has more than {MAX_ANSWERS} answers `answers` har fler än {MAX_ANSWERS} svar +@msg `answers` is larger than 1 MiB `answers` är större än 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` måste vara ett objekt med `kind` och `value` +@msg must have exactly `kind` and `value` måste ha exakt `kind` och `value` +@msg is an alert's answer, whose `value` must be "ok" är svaret på en alert, vars `value` måste vara "ok" +@msg is a confirm's answer, whose `value` must be true or false är svaret på en confirm, vars `value` måste vara true eller false +@msg is longer than 16 KiB är längre än 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null är svaret på en prompt, vars `value` måste vara en sträng eller null +@msg must have `kind` alert, confirm or prompt måste ha `kind` alert, confirm eller prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` är bara för en körning utan någon att fråga: i appen svarar personen på varje dialogruta @msg Running a script Kör ett skript @msg Copied the script report Kopierade skriptrapporten @msg Corners edits the corners of a path Hörn redigerar hörnen på en bana diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 705fc68db2..bbcbfcf1e0 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -2061,6 +2061,26 @@ fn a_repeated_placeholder_matches_the_same_text() { assert!(c.message("alert: the next answer is for prompt, not confirm").is_none()); } +/// Of two templates that start with text, the one with the longer text before its first +/// placeholder matches first, so a row that wraps a message takes it before a row with more text +/// in all whose placeholder would take part of it; a quoted name may still hold a backtick. +#[test] +fn the_longer_leading_text_matches_first() { + let c = Catalog::parse(concat!( + "@msg\t`{key}` must be true or false\tkey {key}\n", + "@msg\t`answers[{i}]` {e}\tanswer {i} {e}\n", + "@msg\tno brush named `{name}`\tbrush {name}\n", + )); + let (form, caps) = c.message("`select` must be true or false").expect("matches"); + assert_eq!((form, caps), ("key {key}", vec![("key", "select")])); + let (form, caps) = c.message("`answers[3]` is a confirm's answer, whose `value` must be true or false").expect("matches"); + assert_eq!((form, caps), ("answer {i} {e}", vec![("i", "3"), ("e", "is a confirm's answer, whose `value` must be true or false")])); + let (form, caps) = c.message("`a`b` must be true or false").expect("matches"); + assert_eq!((form, caps), ("key {key}", vec![("key", "a`b")])); + let (form, caps) = c.message("no brush named `a`b`").expect("matches"); + assert_eq!((form, caps), ("brush {name}", vec![("name", "a`b")])); +} + /// A template that starts with text matches a message it wraps before a template that starts /// with a placeholder, even one with more literal text, so the wrapped reason is translated by /// its own row. @@ -3312,6 +3332,96 @@ fn dataset_import_repeated_column_error_is_translated() { } } +/// The scan reads the refusals `script.run`'s `param(msg)` gives, and not the arguments of a type's +/// own function of that name. +#[test] +fn message_scan_reads_script_run_param_refusals() { + let code = r#" +fn f(p: &Value) -> Result<()> { + let grays = Grays::param(C, p)?; + let pick = Pick::param(p, C)?; + let _ = cmd::bad(C, "the name is too long"); + Err(param("`path` is empty")) +} +"#; + let engine: Vec<_> = ERROR_HELPERS.iter().filter(|(c, _, _)| *c == "engine").map(|&(_, call, before)| (call, before)).collect(); + let consts = [("C".to_string(), vec!["view.proofSetup".to_string()])].into(); + assert_eq!(source_messages(code, &engine, &consts), ["the name is too long", "`path` is empty"]); +} + +/// `script.run`'s refusals of `answers`, the list's own, an answer's at its index and the refusal +/// of `answers` in the app, are translated in every language that translates every message, with +/// the index, the counts and the code names kept. The command's error stays in English. +#[test] +fn script_answers_errors_are_translated() { + use serde_json::{Value, json}; + use vectorcraft_engine::{EngineError, Session}; + let reasons = [ + "must be an object with `kind` and `value`", + "must have exactly `kind` and `value`", + "is an alert's answer, whose `value` must be \"ok\"", + "is a confirm's answer, whose `value` must be true or false", + "is longer than 16 KiB", + "is a prompt's answer, whose `value` must be a string or null", + "must have `kind` alert, confirm or prompt", + ]; + let in_app = "`answers` is only for a run with nobody to ask: in the app, the person answers each dialog"; + let lists = ["`answers` must be a list of answers", "`answers` has more than {MAX_ANSWERS} answers", "`answers` is larger than 1 MiB"]; + let scanned = message_literals(); + for template in reasons.into_iter().chain(lists).chain(["`answers[{i}]` {e}", in_app]) { + assert!(scanned.contains(template), "{template}"); + } + let ok = json!({"kind": "alert", "value": "ok"}); + let wrong = [ + json!(1), + json!({"kind": "alert"}), + json!({"kind": "alert", "value": "yes"}), + json!({"kind": "confirm", "value": "yes"}), + json!({"kind": "prompt", "value": "x".repeat(16 * 1024 + 1)}), + json!({"kind": "prompt", "value": 1}), + json!({"kind": "beep", "value": 1}), + ]; + let run = |s: &mut Session, answers: Value| s.execute("script.run", &json!({"source": "1", "answers": answers})).unwrap_err(); + let mut s = Session::new(); + // Each error, with the English message the command gives and the reason an answer's holds. + let mut errors = vec![]; + for (reason, answer) in reasons.into_iter().zip(wrong) { + for at in [3, 9_999] { + let mut list = vec![ok.clone(); at]; + list.push(answer.clone()); + errors.push((run(&mut s, json!(list)), format!("`answers[{at}]` {reason}"), Some(reason))); + } + } + errors.push((run(&mut s, json!("ok")), lists[0].to_string(), None)); + errors.push((run(&mut s, json!(vec![ok.clone(); 10_001])), "`answers` has more than 10000 answers".to_string(), None)); + let long = json!({"kind": "prompt", "value": "x".repeat(16 * 1024)}); + errors.push((run(&mut s, json!(vec![long; 70])), lists[2].to_string(), None)); + s.script_frames = true; + errors.push((run(&mut s, json!([ok])), in_app.to_string(), None)); + for (e, want, reason) in &errors { + assert!(matches!(e, EngineError::BadParams { cmd, msg } if cmd == "script.run" && msg == want), "{e}"); + let line = e.to_string(); + for code in COMPLETE_MESSAGES { + let lang = Lang::from_code(code).expect("registered"); + let shown = message(lang, &line); + let inner = message(lang, want); + assert_ne!(inner, *want, "{code}"); + assert!(shown.contains(&inner) && !shown.contains("invalid parameters"), "{code}: {shown}"); + if let Some(reason) = reason { + let translated = message(lang, reason); + assert_ne!(translated, *reason, "{code}"); + assert!(inner.contains(&translated), "{code}: {inner}"); + } + let numbers: Vec<&str> = want.split(|c: char| !c.is_ascii_digit()).filter(|n| !n.is_empty()).collect(); + let names = ["`answers", "`kind`", "`value`", "true", "false", "null"]; + assert!(numbers.iter().chain(&names).all(|n| !want.contains(n) || shown.contains(n)), "{code}: {shown}"); + if want.ends_with("alert, confirm or prompt") { + assert!(["alert", "confirm", "prompt"].iter().all(|k| shown.contains(k)), "{code}: {shown}"); + } + } + } +} + /// The errors of a command's parameter schema are translated in every language that translates /// every message, with the parameter's path and the refused value kept. #[test] @@ -4052,14 +4162,15 @@ const MESSAGE_MARKERS: &[&str] = &[".status(", "ui.status = ", "status = ", "Oth /// message: the engine's `bad(cmd, msg)` (`EngineError::BadParams`), `err(msg)` (`cmd/fileio`) /// and `error(msg)` (`cmd/dimension.rs`), the script host's `fail(msg)` (`script/files.rs`, /// `script/dollar.rs`) and `value(msg)`, which gives the messages the script `File` object's own -/// code throws (`script/files.rs`), and `.over(limit)` for a limit a run passes (`script/mod.rs`), -/// the PDF writer's `bad(why)` (`forms.rs`) and `failed(why)` (`encrypt.rs`, `linearize.rs`), the +/// code throws (`script/files.rs`), `.over(limit)` for a limit a run passes (`script/mod.rs`) and +/// `param(msg)` for `script.run`'s parameters (`cmd/scripts.rs`), the PDF writer's `bad(why)` (`forms.rs`) and `failed(why)` (`encrypt.rs`, `linearize.rs`), the /// plug-in host's `bad(what)` (a parameter's spec and dialog keys), `wrong(what)` (a parameter's /// value), `out_err(at, msg)` (plug-in output), `in_range(x, lo, hi, at, what)` and /// `unit(x, at, what)` (a painted effect's numbers) and `.read_packed(packed, what, max)` (the block /// a plug-in returned), and the script interpreter's methods that throw an error at a script: /// `.type_error(msg)`, `.throw(kind, msg)` and the XPath evaluator's `.error(msg)`. A helper that -/// starts with `.` is a method of any receiver. +/// starts with `.` is a method of any receiver; any other is a function, not a type's own function +/// of the same name (`Grays::param(C, p)`). const ERROR_HELPERS: &[(&str, &str, usize)] = &[ ("engine", "bad(", 1), ("engine", "err(", 0), @@ -4067,6 +4178,7 @@ const ERROR_HELPERS: &[(&str, &str, usize)] = &[ ("engine", "fail(", 0), ("engine", "value(", 0), ("engine", ".over(", 0), + ("engine", "param(", 0), ("pdf", "bad(", 0), ("pdf", "failed(", 0), ("plugins", "bad(", 0), @@ -4245,6 +4357,10 @@ fn source_messages(code: &str, helpers: &[(&str, usize)], consts: &std::collecti let in_helpers = helpers.iter().flat_map(|&(call, before)| { code.match_indices(call) .filter(|&(at, _)| call.starts_with('.') || !code[..at].ends_with(|c: char| c.is_alphanumeric() || c == '_' || c == '.')) + .filter(|&(at, _)| { + let owner = code[..at].strip_suffix("::").map(|p| p.rsplit(|c: char| !c.is_alphanumeric() && c != '_').next().unwrap_or("")); + !owner.is_some_and(|o| o.starts_with(|c: char| c.is_ascii_uppercase())) + }) .filter_map(move |(at, _)| skip_args(&code[at + call.len()..], before)) }); let mut out = vec![]; diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 2b3e843ba3..ed576ac189 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -4134,6 +4134,18 @@ axis Both Her İkisi @msg `name` must be the name of a script engine `name` bir betik motorunun adı olmalıdır @msg the main script engine is new for each run and is never kept, so it cannot be dropped ana betik motoru her çalıştırmada yenidir ve hiç saklanmaz, bu yüzden bırakılamaz @msg there is no script engine named {name} {name} adlı bir betik motoru yok +@msg `answers` must be a list of answers `answers` bir yanıt listesi olmalıdır +@msg `answers` has more than {MAX_ANSWERS} answers `answers` içinde {MAX_ANSWERS} taneden fazla yanıt var +@msg `answers` is larger than 1 MiB `answers` 1 MiB'den büyük +@msg `answers[{i}]` {e} `answers[{i}]`: {e} +@msg must be an object with `kind` and `value` `kind` ve `value` içeren bir nesne olmalıdır +@msg must have exactly `kind` and `value` tam olarak `kind` ve `value` içermelidir +@msg is an alert's answer, whose `value` must be "ok" bir alert yanıtıdır, bu yüzden `value` değeri "ok" olmalıdır +@msg is a confirm's answer, whose `value` must be true or false bir confirm yanıtıdır, bu yüzden `value` değeri true veya false olmalıdır +@msg is longer than 16 KiB 16 KiB'den uzun +@msg is a prompt's answer, whose `value` must be a string or null bir prompt yanıtıdır, bu yüzden `value` değeri bir dize veya null olmalıdır +@msg must have `kind` alert, confirm or prompt `kind` değeri alert, confirm veya prompt olmalıdır +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` yalnızca sorulacak kimsenin olmadığı bir çalıştırma içindir: uygulamada her iletişim kutusunu kişi yanıtlar @msg Running a script Betik çalıştırılıyor @msg Copied the script report Komut dosyası raporu kopyalandı @msg Corners edits the corners of a path Köşeler bir yolun köşelerini düzenler diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 50690fa0c7..7004cc1639 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7186,8 +7186,10 @@ breakText Glyphs Гліфи @msg `anchors` must list anchor indices (0, 1, 2…), not {k} `anchors` має містити індекси опорних точок (0, 1, 2…), а не {k} @msg `anchors` must list anchor indices (0, 1, 2…), not {v} `anchors` має містити індекси опорних точок (0, 1, 2…), а не {v} @msg `answer` for this {kind} dialog must be one of: {_1} `answer` для цього діалогового вікна ({kind}) має бути одним з: {_1} +@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` містить понад {MAX_ANSWERS} відповідей @msg `answers` is larger than 1 MiB `answers` більший за 1 МіБ +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` призначений лише для запуску, у якому немає кого запитати: у застосунку людина сама відповідає на кожне діалогове вікно @msg `answers` must be a list of answers `answers` має бути списком відповідей @msg `artboard` must be the index of an artboard of the document `artboard` має бути індексом монтажної області документа @msg `artboardsAt` must be [x, y] `artboardsAt` має бути [x, y] diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index d8469bce53..1c145acfc6 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -4833,6 +4833,18 @@ theme Appearance Giao diện @msg `name` must be the name of a script engine `name` phải là tên của một bộ máy tập lệnh @msg the main script engine is new for each run and is never kept, so it cannot be dropped bộ máy tập lệnh chính được tạo mới cho mỗi lần chạy và không bao giờ được giữ lại, nên không thể loại bỏ nó @msg there is no script engine named {name} không có bộ máy tập lệnh nào tên {name} +@msg `answers` must be a list of answers `answers` phải là một danh sách câu trả lời +@msg `answers` has more than {MAX_ANSWERS} answers `answers` có hơn {MAX_ANSWERS} câu trả lời +@msg `answers` is larger than 1 MiB `answers` lớn hơn 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` phải là một đối tượng có `kind` và `value` +@msg must have exactly `kind` and `value` phải có đúng `kind` và `value` +@msg is an alert's answer, whose `value` must be "ok" là câu trả lời cho alert, nên `value` phải là "ok" +@msg is a confirm's answer, whose `value` must be true or false là câu trả lời cho confirm, nên `value` phải là true hoặc false +@msg is longer than 16 KiB dài hơn 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null là câu trả lời cho prompt, nên `value` phải là chuỗi hoặc null +@msg must have `kind` alert, confirm or prompt phải có `kind` là alert, confirm hoặc prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` chỉ dành cho lần chạy không có ai để hỏi: trong ứng dụng, người dùng trả lời từng hộp thoại @msg Running a script Đang chạy tập lệnh @msg Copied the script report Đã sao chép báo cáo script @msg Corners edits the corners of a path Corners chỉnh sửa các góc của đường dẫn diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index d9d9110276..a0ad859280 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -7362,8 +7362,10 @@ breakText Glyphs 字形 @msg `alignOn` must be a string `alignOn` 必须是字符串 @msg `align` must be a string `align` 必须是字符串 @msg `answer` for this {kind} dialog must be one of: {_1} 此 {kind} 对话框的 `answer` 必须是以下之一:{_1} +@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` 中的回答超过 {MAX_ANSWERS} 个 @msg `answers` is larger than 1 MiB `answers` 大于 1 MiB +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` 仅用于无人可问的运行:在应用中,由用户回答每个对话框 @msg `answers` must be a list of answers `answers` 必须是回答的列表 @msg `artboard` must be the index of an artboard of the document `artboard` 必须是文档中某个画板的索引 @msg `artboardsAt` must be [x, y] `artboardsAt` 必须是 [x, y] diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index a0d987fe69..a9086db234 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -2577,6 +2577,18 @@ file-filter Templates 範本 @msg `name` must be the name of a script engine `name` 必須是指令碼引擎的名稱 @msg the main script engine is new for each run and is never kept, so it cannot be dropped 主指令碼引擎在每次執行時都是新的,從不保留,因此無法捨棄 @msg there is no script engine named {name} 沒有名為 {name} 的指令碼引擎 +@msg `answers` must be a list of answers `answers` 必須是回答的清單 +@msg `answers` has more than {MAX_ANSWERS} answers `answers` 中的回答超過 {MAX_ANSWERS} 個 +@msg `answers` is larger than 1 MiB `answers` 大於 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` 必須是包含 `kind` 和 `value` 的物件 +@msg must have exactly `kind` and `value` 必須只包含 `kind` 和 `value` +@msg is an alert's answer, whose `value` must be "ok" 是 alert 的回答,其 `value` 必須是 "ok" +@msg is a confirm's answer, whose `value` must be true or false 是 confirm 的回答,其 `value` 必須為 true 或 false +@msg is longer than 16 KiB 長度超過 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null 是 prompt 的回答,其 `value` 必須是字串或 null +@msg must have `kind` alert, confirm or prompt `kind` 必須是 alert、confirm 或 prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` 僅適用於沒有人可詢問的執行:在應用程式中,由使用者回答每個對話框 @msg Running a script 正在執行指令碼 @msg Copied the script report 已複製指令碼報告 @msg Exported {path} 已匯出 {path} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 296bd84b2b..e5131639ee 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -894,6 +894,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - The Polish catalog (`crates/ui-egui/src/i18n/pl.tsv`) has an `@msg` row for the status and error messages the untranslated report (`untranslated_report`) finds in the sources, 3,439 `@msg` rows in all: the errors of commands, scripts, file import and export and plug-ins. The report lists 46 Polish messages: 44 that open #7211, #7214, #7116, #7330 and #1931 translate, and 2 that no language has a row for. A message with two placeholders in a row (`Template::parse` in `crates/ui-egui/src/i18n/catalog.rs`) is still shown in English. - The status bar translates the limits a plug-in run can exceed (its instruction, time and memory budgets and its output size) and the error of a plug-in removal that leaves the plug-in's grant in the plug-in store, in every language that translates every message. The untranslated-strings report also lists messages that an error or a status takes from a `&str` constant (`plugin_limit_errors_are_translated`, `message_scan_reads_messages_held_in_constants`). - The status bar translates the plug-in host's other errors (manifest, module and run checks, the output an importer, exporter or effect returns, and the approval a plug-in's permissions need) in every language that translates every message. A JSON object or array inside a message stays as written, and a message that wraps another one, such as `plug-in manifest: {0}`, is matched by its own row before a row that starts with a placeholder. The reasons inside these errors (what is wrong with a parameter's spec or dialog keys, the value a parameter needs, what is wrong with an object, stroke, paint or effect in a plug-in's output) are translated with them, and the untranslated-strings report lists the reasons the plug-in host's error helpers take (`plugin_messages_are_translated_in_every_complete_catalog`, `plugin_errors_translate_with_their_values`, `plugin_error_reasons_are_translated_with_the_error`, `message_scan_reads_plugin_helpers`, `templates_that_start_with_text_match_first`). + - The status bar translates `script.run`'s refusals of `answers` in every language that translates every message: a value that is not a list, more than 10,000 answers, more than 1 MiB, an answer at an index that is not an object, does not have exactly `kind` and `value`, has a `value` its kind of dialog does not take, holds a prompt's text longer than 16 KiB or has an unknown `kind`, and `answers` given to a run in the app. The index, the counts and the code names are shown as they are, and the command's error stays in English. The untranslated-strings report also lists the refusals of `script.run`'s parameters (`script_answers_errors_are_translated`, `message_scan_reads_script_run_param_refusals`). - The status bar translates the errors a script's `File` and `Folder` objects, `vc.run`, `$.evalFile`, the `$` object's properties and functions, `alert`, `confirm` and `prompt`, `vc.document` and `vc.log` raise, the limits a run can pass, and the errors of Drop Script Engine, and the line for a run that fails (a syntax error, a thrown error, a limit, a stop or an internal error, with the script's name, the line and column, the included file it is in and the files left written), in every language that translates every message. The script's name, paths, numbers, command ids and the text a script throws itself are shown as they are. A failure with no line and column, such as an error in code `eval` compiled, is shown with one colon after the script's name (`an_error_without_a_place_names_the_script_and_kind`). A message template that names a value twice matches only when both places hold the same text, so the line for a failed run is not taken for the message inside it (`a_repeated_placeholder_matches_the_same_text`). The untranslated-strings report also lists the messages the script host's `fail`, `value` and `over` helpers take and the errors the script interpreter throws, and a constant's text comes from the file or crate that declares it, so the Scripts menu's headers are not listed as messages (`script_errors_are_translated`, `script_host_errors_are_translated`, `message_scan_reads_script_interpreter_errors`, `message_scan_reads_constants_of_the_file_and_its_crate`, `message_scan_skips_test_modules_with_any_test_cfg`). - Localised UI: menus (in-window and native), panels, dialogs, toolbar and Preferences read from per-language catalogs (`crates/ui-egui/src/i18n`, see `docs/development.md`); Traditional Chinese (Taiwan), Simplified Chinese (mainland), Japanese, Korean, Vietnamese, German, Spanish, French, Italian, Polish, Brazilian Portuguese, Russian, Ukrainian, Georgian and Catalan ship complete, and Czech covers every menu label (and more), with system-locale detection on macOS, Windows, Linux and the web (the browser's languages, or `?lang=`), a Language preference and, on macOS, a VectorCraft ▸ Language menu. Names are never translated (fonts and their styles, layers, artboards, saved presets, user libraries, custom workspaces, recent files, plug-ins). The counts that Package's status and question, the folder search of Missing Fonts and Find Linked Files, the modified and missing linked file prompts and the CSS Properties panel's notes show use the interface language's plural forms instead of a fixed "(s)" form. Evidence: `the_missing_links_note_uses_each_count_form` in `crates/ui-egui/src/dialogs/tests_package.rs`, `the_modified_links_question_uses_each_count_form` in `crates/ui-egui/src/dialogs/missing_links.rs`, `search_counts_use_each_count_form` in `crates/ui-egui/src/dialogs/missing_fonts/tests.rs` and `the_unnamed_objects_note_uses_each_count_form` in `crates/ui-egui/src/panels/tests_css_properties.rs`. From 1437e95a045a8b5399a5db90962baca445e1eb30 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Fri, 13 Nov 2026 23:07:27 -0800 Subject: [PATCH 03/50] i18n: Czech and Traditional Chinese keep main's answers rows Main now has Czech and Traditional Chinese rows for the answers list and reason messages. The duplicates this branch added are removed; the indexed wrapper and the app refusal rows stay. --- crates/ui-egui/src/i18n/cs.tsv | 10 ---------- crates/ui-egui/src/i18n/zh-hant.tsv | 10 ---------- 2 files changed, 20 deletions(-) diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 34e1ed0a7a..54e5d59b17 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -4680,17 +4680,7 @@ imageTrace Outline Obrys @msg `name` must be the name of a script engine `name` musí být název skriptovacího jádra @msg the main script engine is new for each run and is never kept, so it cannot be dropped hlavní skriptovací jádro je pro každý běh nové a nikdy se neuchovává, proto je nelze zahodit @msg there is no script engine named {name} skriptovací jádro s názvem {name} neexistuje -@msg `answers` must be a list of answers `answers` musí být seznam odpovědí -@msg `answers` has more than {MAX_ANSWERS} answers `answers` má více než {MAX_ANSWERS} odpovědí -@msg `answers` is larger than 1 MiB `answers` je větší než 1 MiB @msg `answers[{i}]` {e} `answers[{i}]` {e} -@msg must be an object with `kind` and `value` musí být objekt s `kind` a `value` -@msg must have exactly `kind` and `value` musí mít právě `kind` a `value` -@msg is an alert's answer, whose `value` must be "ok" je odpověď na alert, jejíž `value` musí být "ok" -@msg is a confirm's answer, whose `value` must be true or false je odpověď na confirm, jejíž `value` musí být true nebo false -@msg is longer than 16 KiB je delší než 16 KiB -@msg is a prompt's answer, whose `value` must be a string or null je odpověď na prompt, jejíž `value` musí být řetězec nebo null -@msg must have `kind` alert, confirm or prompt musí mít `kind` alert, confirm nebo prompt @msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` je jen pro běh, kde se nemá koho zeptat: v aplikaci odpovídá na každý dialog uživatel @msg Running a script Běží skript @msg Copied the script report Zpráva o skriptu zkopírována diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index fd9a4ee632..b57943652d 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -2577,17 +2577,7 @@ file-filter Templates 範本 @msg `name` must be the name of a script engine `name` 必須是指令碼引擎的名稱 @msg the main script engine is new for each run and is never kept, so it cannot be dropped 主指令碼引擎在每次執行時都是新的,從不保留,因此無法捨棄 @msg there is no script engine named {name} 沒有名為 {name} 的指令碼引擎 -@msg `answers` must be a list of answers `answers` 必須是回答的清單 -@msg `answers` has more than {MAX_ANSWERS} answers `answers` 中的回答超過 {MAX_ANSWERS} 個 -@msg `answers` is larger than 1 MiB `answers` 大於 1 MiB @msg `answers[{i}]` {e} `answers[{i}]` {e} -@msg must be an object with `kind` and `value` 必須是包含 `kind` 和 `value` 的物件 -@msg must have exactly `kind` and `value` 必須只包含 `kind` 和 `value` -@msg is an alert's answer, whose `value` must be "ok" 是 alert 的回答,其 `value` 必須是 "ok" -@msg is a confirm's answer, whose `value` must be true or false 是 confirm 的回答,其 `value` 必須為 true 或 false -@msg is longer than 16 KiB 長度超過 16 KiB -@msg is a prompt's answer, whose `value` must be a string or null 是 prompt 的回答,其 `value` 必須是字串或 null -@msg must have `kind` alert, confirm or prompt `kind` 必須是 alert、confirm 或 prompt @msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` 僅適用於沒有人可詢問的執行:在應用程式中,由使用者回答每個對話框 @msg Running a script 正在執行指令碼 @msg Copied the script report 已複製指令碼報告 From 61833a3205980710a8d70334eec7373e668b16f2 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Fri, 13 Nov 2026 23:15:38 -0800 Subject: [PATCH 04/50] i18n: French rows keep the no-break space before punctuation --- crates/ui-egui/src/i18n/fr.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index e4611d1cc5..a933fe3beb 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -4369,7 +4369,7 @@ axis Both Les deux @msg is longer than 16 KiB dépasse 16 Kio @msg is a prompt's answer, whose `value` must be a string or null est la réponse d'un prompt, dont `value` doit être une chaîne ou null @msg must have `kind` alert, confirm or prompt doit avoir `kind` alert, confirm ou prompt -@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` est réservé à une exécution sans personne à qui demander : dans l'application, la personne répond à chaque boîte de dialogue +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` est réservé à une exécution sans personne à qui demander : dans l'application, la personne répond à chaque boîte de dialogue @msg Running a script Exécution d’un script @msg Copied the script report Rapport du script copié @msg Corners edits the corners of a path Angles modifie les angles d’un tracé From 9798beef98a4506b7557ba3f16bc0cdf5d323934 Mon Sep 17 00:00:00 2001 From: Taha-Mahmoodi <85902429+Taha-Mahmoodi@users.noreply.github.com> Date: Sat, 14 Nov 2026 13:15:38 +0430 Subject: [PATCH 05/50] feat(text): Middle Eastern & South Asian and Standard composers per paragraph (#4935) Four paragraph composers: the existing Single-line and Every-line (Middle Eastern & South Asian, complex scripts shaped, the default) and Standard Single-line and Every-line, which break lines the same way and set Indic, Arabic and Hebrew type glyph by glyph as the font maps it. Paragraph panel menu, Paragraph Style Options, text.setFormat, native file and paragraph styles. .ai, EPS and PDF files carry no composer. --- crates/doc/src/text/para_style.rs | 38 +++++++- crates/engine/src/cmd/panelcmds.rs | 6 +- crates/engine/src/cmd/textstyles/tests.rs | 24 +++++ crates/engine/src/tests/panelcmds.rs | 29 ++++++ crates/format/tests/it/native_v3.rs | 38 ++++++++ crates/mcp/src/ui_catalog.rs | 2 +- crates/text/src/features.rs | 5 + crates/text/src/layout.rs | 9 +- crates/text/src/layout/flow.rs | 6 +- crates/text/src/layout/on_path.rs | 2 +- crates/text/src/shape.rs | 36 ++++++- crates/text/src/test_fonts.rs | 8 +- crates/text/src/tests.rs | 1 + crates/text/src/tests/composers.rs | 96 +++++++++++++++++++ .../ui-egui/src/dialogs/para_style_options.rs | 22 ++++- crates/ui-egui/src/i18n/bg.tsv | 7 +- crates/ui-egui/src/i18n/bs.tsv | 7 +- crates/ui-egui/src/i18n/ca.tsv | 7 +- crates/ui-egui/src/i18n/cs.tsv | 8 +- crates/ui-egui/src/i18n/da.tsv | 7 +- crates/ui-egui/src/i18n/de.tsv | 8 +- crates/ui-egui/src/i18n/el.tsv | 7 +- crates/ui-egui/src/i18n/es.tsv | 7 +- crates/ui-egui/src/i18n/fi.tsv | 7 +- crates/ui-egui/src/i18n/fr.tsv | 7 +- crates/ui-egui/src/i18n/hi.tsv | 8 +- crates/ui-egui/src/i18n/hu.tsv | 7 +- crates/ui-egui/src/i18n/id.tsv | 7 +- crates/ui-egui/src/i18n/it.tsv | 8 +- crates/ui-egui/src/i18n/ja.tsv | 7 +- crates/ui-egui/src/i18n/ka.tsv | 7 +- crates/ui-egui/src/i18n/ko.tsv | 7 +- crates/ui-egui/src/i18n/nl.tsv | 7 +- crates/ui-egui/src/i18n/pl.tsv | 8 +- crates/ui-egui/src/i18n/pt-br.tsv | 8 +- crates/ui-egui/src/i18n/ru.tsv | 7 +- crates/ui-egui/src/i18n/sv.tsv | 8 +- crates/ui-egui/src/i18n/tr.tsv | 7 +- crates/ui-egui/src/i18n/uk.tsv | 8 +- crates/ui-egui/src/i18n/vi.tsv | 7 +- crates/ui-egui/src/i18n/zh-hans.tsv | 8 +- crates/ui-egui/src/i18n/zh-hant.tsv | 8 +- crates/ui-egui/src/menus/ui_commands.rs | 2 +- crates/ui-egui/src/panels/paragraph.rs | 29 ++++-- crates/ui-egui/src/panels/paragraph/tests.rs | 63 ++++++++++++ docs/mcp.md | 22 +++-- docs/target-app-parity.md | 5 +- docs/type-parity.md | 8 +- 48 files changed, 541 insertions(+), 109 deletions(-) create mode 100644 crates/text/src/tests/composers.rs diff --git a/crates/doc/src/text/para_style.rs b/crates/doc/src/text/para_style.rs index 45cf181f18..c3db242ed0 100644 --- a/crates/doc/src/text/para_style.rs +++ b/crates/doc/src/text/para_style.rs @@ -17,22 +17,52 @@ pub enum Justify { JustifyAll, } -/// Paragraph composer (Paragraph panel menu): how lines are broken. +/// Paragraph composer (Paragraph panel menu): how lines are broken, and whether complex scripts +/// (Indic, Arabic, Hebrew) are shaped. `SingleLine` and `EveryLine` are the Middle Eastern & South +/// Asian composers: they shape complex scripts with the font's layout tables, as all type is set +/// here, and are what documents saved before the four composers existed use. The `Standard` +/// composers break lines the same way but set a complex script glyph by glyph as the font maps its +/// characters, with no conjuncts, marks placed or joining forms: what fonts that keep a script's +/// glyphs on Latin character codes (legacy ANSI Indic fonts) need. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] #[serde(rename_all = "camelCase")] pub enum Composer { - /// Break each line as soon as it is full. + /// Middle Eastern & South Asian Single-line Composer: break each line as soon as it is full. SingleLine, - /// Total fit over the whole paragraph (Illustrator's default): justified lines get even word - /// spacing, ragged lines an even rag. + /// Middle Eastern & South Asian Every-line Composer: total fit over the whole paragraph + /// (Illustrator's default): justified lines get even word spacing, ragged lines an even rag. #[default] EveryLine, + /// Standard Single-line Composer: [`Composer::SingleLine`]'s breaks, complex scripts not shaped. + StandardSingleLine, + /// Standard Every-line Composer: [`Composer::EveryLine`]'s breaks, complex scripts not shaped. + StandardEveryLine, } impl Composer { fn is_default(&self) -> bool { *self == Self::default() } + + /// Does this composer break lines one at a time (as opposed to a total fit)? + pub fn is_single_line(self) -> bool { + matches!(self, Self::SingleLine | Self::StandardSingleLine) + } + + /// Does this composer shape complex scripts ([`Composer::SingleLine`], [`Composer::EveryLine`])? + pub fn shapes_complex_scripts(self) -> bool { + matches!(self, Self::SingleLine | Self::EveryLine) + } + + /// The same shaping with the other line breaking (`single_line`: one line at a time). + pub fn with_breaking(self, single_line: bool) -> Self { + match (single_line, self.shapes_complex_scripts()) { + (true, true) => Self::SingleLine, + (true, false) => Self::StandardSingleLine, + (false, true) => Self::EveryLine, + (false, false) => Self::StandardEveryLine, + } + } } /// A paragraph's hyphenation options (Paragraph panel menu › Hyphenation…): which words automatic diff --git a/crates/engine/src/cmd/panelcmds.rs b/crates/engine/src/cmd/panelcmds.rs index f9c4b10049..10310e8206 100644 --- a/crates/engine/src/cmd/panelcmds.rs +++ b/crates/engine/src/cmd/panelcmds.rs @@ -67,7 +67,7 @@ pub fn specs() -> Vec { "Character / Paragraph", [], None, - "{ids?|id?, kerning?: 1/1000 em|\"auto\"|\"optical\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg counter-clockwise (0: upright), underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), antiAlias?: \"none\"|\"sharp\"|\"crisp\"|\"strong\" (Character panel › Anti-aliasing Method, how the type's edges are drawn as pixels; it sets each targeted type object, with or without a range; each frame of a thread keeps its own method; graph labels keep it for every label of their kind when the graph is drawn again; new type: \"sharp\"), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt (±1296), list?: \"none\"|\"bullet\"|\"number\", bullet?: \"none\"|\"dot\"|\"dash\"|\"circle\"|\"square\", number?: \"none\"|\"arabic\"|\"upperLetters\"|\"lowerLetters\"|\"upperRoman\"|\"lowerRoman\"|\"twoDigits\"|\"threeDigits\", listAlign?: \"left\"|\"right\", listLevel?: 1..9 (Paragraph panel › Bullets and Numbered List: each paragraph of a list starts with its marker, drawn in the font, size and color of the paragraph's first character, and its text starts at the next tab stop after the marker, the left indent counting as a stop; a bulleted list's marker is its bullet, and a numbered list's is the paragraph's number and a period: 1, 2, 3; A to Z, then AA, BB; a to z, then aa, bb; I, II, III; i, ii, iii; 01 to 99, then 100; 001 to 999, then 1000; letters and roman numerals past 3999 in Arabic digits; the numbers count the story's numbered paragraphs, its threaded frames included, from 1 after a paragraph in no list, and an empty or bulleted paragraph is not counted; list \"bullet\" keeps a list's bullet, else a dot, and list \"number\" keeps a numbered list's style, else arabic; without list, a number style makes a numbered list and a bullet makes a bulleted one; \"none\" in any of the three turns the list off; a paragraph that joins a list with left and first-line indents of 0 gets 18 and -18 unless the call sets an indent; a horizontal right-to-left list paragraph has its indents mirrored, measured from the right; listAlign \"right\" (Bullets and Numbering…'s Alignment) puts the marker against the text, and \"left\" (the default) puts it at the first line's start, the text starting at the same place with either; it sets the paragraphs that are in a list or that the call puts in one, and a list keeps it when it changes between bullets and numbers; listLevel (Tab and Shift+Tab at the start of a list paragraph, Bullets and Numbering…'s Level) is a whole number from 1 to 9 that sets the paragraphs in a list or that the call puts in one, a list keeping it when it changes between bullets and numbers, and a list turned on without listLevel starting at level 1; each level past the first sets the paragraph 18 pt further in than its left indent, and each level counts its own numbers: a list paragraph with text sets the counts of the levels deeper than its own back to 0, so a deeper numbered paragraph after it counts from 1, and a paragraph back at a shallower level goes on with that level's count), hyphenate?: bool, wordsLongerThan?: letters 1..25 (5), afterFirst?, beforeLast?: letters 1..15 (3), hyphenLimit?: lines 0..25 (0: no limit), hyphenationZone?: pt 0..1296 (0; Single-line Composer only), hyphenateCapitalized?: bool (true) (Paragraph panel menu › Hyphenation…: only words longer than wordsLongerThan break, keeping afterFirst letters before the hyphen and beforeLast after it; at most hyphenLimit lines in a row end with a hyphen; a line whose text already ends within hyphenationZone of its right edge breaks before the next word instead of hyphenating it; the counts are rounded, and every value is clamped to its range), wordSpacing?: % 0..1000 (80, 100, 133), letterSpacing?: % of a word space -100..500 (0, 0, 0), glyphScaling?: % 50..200 (100, 100, 100): each [min, desired, max] or {min?, desired?, max?} (Paragraph panel menu › Justification…: Desired applies to every line, Minimum and Maximum bound what justified lines may use; values are clamped to their range, and Minimum ≤ Desired ≤ Maximum must hold afterwards or nothing changes), autoLeading?: % of the size 0..500 (120; the leading of characters whose leading is Auto), singleWordJustification?: \"fullJustify\"|\"alignLeft\"|\"alignCenter\"|\"alignRight\" (a justified line holding one word), mojikumi?: \"none\"|\"yakumonoHankaku\"|\"gyomatsuYakumonoHankaku\"|\"gyomatsuYakumonoZenkaku\"|\"yakumonoZenkaku\"|\"lineEndHalf\" (Mojikumi Set: Japanese punctuation spacing), kinsoku?: \"none\"|\"hard\"|\"soft\" (Kinsoku Set: Soft lets 々, ー and small kana start a line), kinsokuType?: \"pushInFirst\"|\"pushOutFirst\"|\"pushOutOnly\" (Paragraph panel menu › Kinsoku Shori Type: how area type keeps those characters off a line's ends; pushInFirst sets them on the line when its gaps next to CJK characters can close up enough, by at most a tenth of an em each, pushOutFirst does so only when moving the character before them to the next line would leave the line more than an em short, and pushOutOnly, the default, moves it unless Burasagari hangs an overflowing comma or full stop; no effect with kinsoku \"none\"), bunriKinshi?: bool (Paragraph panel menu › Bunri-Kinshi: a line never breaks inside an inseparable pair, two em dashes, two horizontal ellipses, two two-dot leaders or the two halves of a vertical kana repeat mark, and justification adds no space inside one; kept but without effect with kinsoku \"none\"; off by default), direction?: \"auto\"|\"leftToRight\"|\"rightToLeft\" (paragraph direction; auto: from each paragraph's first strong character), leadingModel?: \"romanBaseline\"|\"emBoxTop\" (leading measured baseline to baseline, or em box top to top), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\"|\"icfTop\"|\"icfBottom\" (where characters smaller than the largest on their line line up with it), proportionalMetrics?: bool (full-width glyphs on the font's proportional widths: `palt` in horizontal type, `vpal` in vertical type), tateChuYoko?: bool (Character panel menu › Tate-chu-yoko, with Show East Asian Options: in vertical type those characters stand side by side across one em of the column; kept on the characters and ignored in horizontal type), tcyUpDown?, tcyLeftRight?: pt -1296..1296 (Character panel menu › Tate-chu-yoko Settings, as text.setRangeStyle: a tate-chu-yoko block moves up or down, right or left, and on a vertical path toward or away from the path's start, to its left or right), warichu?: bool, warichuLines?: 1..6, warichuGap?: pt 0..100, warichuScale?: % 10..100, warichuAlign?: \"auto\"|\"left\"|\"center\"|\"right\"|\"justifyLeft\"|\"justifyCenter\"|\"justifyRight\"|\"justifyAll\" (Character panel menu › Warichu and Warichu Settings, as text.setRangeStyle: the characters set smaller and stacked on lines inside their line), akiLeft?, akiRight?: 1/1000 em 0..1000 (Character panel › Insert Aki Left and Right, with Show East Asian Options, as text.setRangeStyle: space before and after each character in reading order), standardVerticalRoman?: bool (Character panel menu › Standard Vertical Roman Alignment, as text.setRangeStyle), noBreak?: bool (Character panel menu › No Break: these characters stay on one line, including across a space inside the run), kashidas?: bool (Character panel menu › Kashidas: selected characters allow insertion only when both joined neighbors have it on; on by default), charDirection?: \"default\"|\"leftToRight\"|\"rightToLeft\" (Character panel menu › Character Direction: the characters are set left to right or right to left inside their paragraph, as a Unicode bidi embedding; default: as the bidi algorithm sets them), digits?: \"default\"|\"arabic\"|\"hindi\"|\"farsi\"|\"devanagari\"|\"bengali\"|\"gurmukhi\"|\"gujarati\"|\"odia\"|\"tamil\"|\"telugu\"|\"kannada\"|\"malayalam\" (Character panel menu › Digits: the numeral system every digit is drawn in, whatever was typed: Western, Arabic-Indic (hindi), Eastern Arabic-Indic (farsi) or an Indic script's own digits), fontHeightReference?: \"emBox\"|\"capHeight\"|\"xHeight\"|\"icfBox\" (Character panel › Set Font Height Reference, as text.setRangeStyle: the height of the font that the size measures), language?: name|tag (Character panel › Language, as text.setRangeStyle), fontAxes?: {\"wght\": 650, …} (Character panel › Variable Font, as text.setRangeStyle: each axis named set in its units and clamped to its range, null back to the style's own setting), burasagari?: \"none\"|\"standard\"|\"forced\" (Paragraph panel menu › Burasagari None/Regular/Force: an East Asian comma or full stop ending an area type line hangs outside it: when it doesn't fit, or always; new type: \"standard\"), romanHangingPunctuation?: bool (Paragraph panel menu › Roman Hanging Punctuation: quotation marks, hyphens, full stops and commas starting or ending a line hang outside the margin, asterisks, tildes, ellipses, dashes, colons and semicolons by half; off by default), koreanLineBreakAnywhere?: bool (Paragraph panel menu › Korean Line Break Anywhere: a line may break between any two Hangul syllables; off, a word with Hangul in it breaks only at its spaces and punctuation, or where it is wider than the line; new type: false, paragraphs saved before the option: true), kashida?: \"none\"|\"short\"|\"medium\"|\"long\"|\"stylistic\" (Paragraph panel › Insert Kashidas: justified lines of horizontal area type lengthen each Arabic word with a kashida between its last pair of joined letters, at most a quarter, half or whole em long, or whole tatweels up to an em for stylistic, before they widen their word spaces; none by default), composer?: \"singleLine\"|\"everyLine\" (line breaking, Every-line by default), start?: byte, end?: byte} (baselineShift is in document points and hScale includes the object transform; groups include their text descendants; with a range: the character attributes style that range and the paragraph attributes apply to the paragraphs it touches; without: all the text, and graph labels keep the character and paragraph attributes for every label of their kind when the graph is drawn again, the graph still setting each label's alignment; a number or switch given as another type fails the call, and a null value leaves its attribute as it is, so a call with only null values fails with nothing to change; a call that gives the values the text already has records no undo step). Or {paragraphIndents: [{id, start: byte where the paragraph starts, leftIndent?, firstLineIndent?: pt -1296..1296}…]} alone (Tabs panel indent markers over paragraphs with indents of their own): each entry sets one paragraph of a type object, at least one indent each, at most 100000 entries; every entry is checked before anything changes, and an unknown key, a value out of range, an object that is not type, a byte where no paragraph starts or two entries for one paragraph with other values fail the call; all of it is one edit, a threaded story flowing again once, and when no paragraph's indents change nothing is recorded → {ids}", + "{ids?|id?, kerning?: 1/1000 em|\"auto\"|\"optical\", baselineShift?: pt, hScale?: %, vScale?: %, rotation?: deg counter-clockwise (0: upright), underline?, strikethrough?, allCaps?, smallCaps?: bool, position?: \"normal\"|\"superscript\"|\"subscript\" (sizes from Document Setup), antiAlias?: \"none\"|\"sharp\"|\"crisp\"|\"strong\" (Character panel › Anti-aliasing Method, how the type's edges are drawn as pixels; it sets each targeted type object, with or without a range; each frame of a thread keeps its own method; graph labels keep it for every label of their kind when the graph is drawn again; new type: \"sharp\"), leftIndent?, rightIndent?, firstLineIndent?, spaceBefore?, spaceAfter?: pt (±1296), list?: \"none\"|\"bullet\"|\"number\", bullet?: \"none\"|\"dot\"|\"dash\"|\"circle\"|\"square\", number?: \"none\"|\"arabic\"|\"upperLetters\"|\"lowerLetters\"|\"upperRoman\"|\"lowerRoman\"|\"twoDigits\"|\"threeDigits\", listAlign?: \"left\"|\"right\", listLevel?: 1..9 (Paragraph panel › Bullets and Numbered List: each paragraph of a list starts with its marker, drawn in the font, size and color of the paragraph's first character, and its text starts at the next tab stop after the marker, the left indent counting as a stop; a bulleted list's marker is its bullet, and a numbered list's is the paragraph's number and a period: 1, 2, 3; A to Z, then AA, BB; a to z, then aa, bb; I, II, III; i, ii, iii; 01 to 99, then 100; 001 to 999, then 1000; letters and roman numerals past 3999 in Arabic digits; the numbers count the story's numbered paragraphs, its threaded frames included, from 1 after a paragraph in no list, and an empty or bulleted paragraph is not counted; list \"bullet\" keeps a list's bullet, else a dot, and list \"number\" keeps a numbered list's style, else arabic; without list, a number style makes a numbered list and a bullet makes a bulleted one; \"none\" in any of the three turns the list off; a paragraph that joins a list with left and first-line indents of 0 gets 18 and -18 unless the call sets an indent; a horizontal right-to-left list paragraph has its indents mirrored, measured from the right; listAlign \"right\" (Bullets and Numbering…'s Alignment) puts the marker against the text, and \"left\" (the default) puts it at the first line's start, the text starting at the same place with either; it sets the paragraphs that are in a list or that the call puts in one, and a list keeps it when it changes between bullets and numbers; listLevel (Tab and Shift+Tab at the start of a list paragraph, Bullets and Numbering…'s Level) is a whole number from 1 to 9 that sets the paragraphs in a list or that the call puts in one, a list keeping it when it changes between bullets and numbers, and a list turned on without listLevel starting at level 1; each level past the first sets the paragraph 18 pt further in than its left indent, and each level counts its own numbers: a list paragraph with text sets the counts of the levels deeper than its own back to 0, so a deeper numbered paragraph after it counts from 1, and a paragraph back at a shallower level goes on with that level's count), hyphenate?: bool, wordsLongerThan?: letters 1..25 (5), afterFirst?, beforeLast?: letters 1..15 (3), hyphenLimit?: lines 0..25 (0: no limit), hyphenationZone?: pt 0..1296 (0; Single-line Composer only), hyphenateCapitalized?: bool (true) (Paragraph panel menu › Hyphenation…: only words longer than wordsLongerThan break, keeping afterFirst letters before the hyphen and beforeLast after it; at most hyphenLimit lines in a row end with a hyphen; a line whose text already ends within hyphenationZone of its right edge breaks before the next word instead of hyphenating it; the counts are rounded, and every value is clamped to its range), wordSpacing?: % 0..1000 (80, 100, 133), letterSpacing?: % of a word space -100..500 (0, 0, 0), glyphScaling?: % 50..200 (100, 100, 100): each [min, desired, max] or {min?, desired?, max?} (Paragraph panel menu › Justification…: Desired applies to every line, Minimum and Maximum bound what justified lines may use; values are clamped to their range, and Minimum ≤ Desired ≤ Maximum must hold afterwards or nothing changes), autoLeading?: % of the size 0..500 (120; the leading of characters whose leading is Auto), singleWordJustification?: \"fullJustify\"|\"alignLeft\"|\"alignCenter\"|\"alignRight\" (a justified line holding one word), mojikumi?: \"none\"|\"yakumonoHankaku\"|\"gyomatsuYakumonoHankaku\"|\"gyomatsuYakumonoZenkaku\"|\"yakumonoZenkaku\"|\"lineEndHalf\" (Mojikumi Set: Japanese punctuation spacing), kinsoku?: \"none\"|\"hard\"|\"soft\" (Kinsoku Set: Soft lets 々, ー and small kana start a line), kinsokuType?: \"pushInFirst\"|\"pushOutFirst\"|\"pushOutOnly\" (Paragraph panel menu › Kinsoku Shori Type: how area type keeps those characters off a line's ends; pushInFirst sets them on the line when its gaps next to CJK characters can close up enough, by at most a tenth of an em each, pushOutFirst does so only when moving the character before them to the next line would leave the line more than an em short, and pushOutOnly, the default, moves it unless Burasagari hangs an overflowing comma or full stop; no effect with kinsoku \"none\"), bunriKinshi?: bool (Paragraph panel menu › Bunri-Kinshi: a line never breaks inside an inseparable pair, two em dashes, two horizontal ellipses, two two-dot leaders or the two halves of a vertical kana repeat mark, and justification adds no space inside one; kept but without effect with kinsoku \"none\"; off by default), direction?: \"auto\"|\"leftToRight\"|\"rightToLeft\" (paragraph direction; auto: from each paragraph's first strong character), leadingModel?: \"romanBaseline\"|\"emBoxTop\" (leading measured baseline to baseline, or em box top to top), charAlign?: \"romanBaseline\"|\"emBoxTop\"|\"emBoxCenter\"|\"emBoxBottom\"|\"icfTop\"|\"icfBottom\" (where characters smaller than the largest on their line line up with it), proportionalMetrics?: bool (full-width glyphs on the font's proportional widths: `palt` in horizontal type, `vpal` in vertical type), tateChuYoko?: bool (Character panel menu › Tate-chu-yoko, with Show East Asian Options: in vertical type those characters stand side by side across one em of the column; kept on the characters and ignored in horizontal type), tcyUpDown?, tcyLeftRight?: pt -1296..1296 (Character panel menu › Tate-chu-yoko Settings, as text.setRangeStyle: a tate-chu-yoko block moves up or down, right or left, and on a vertical path toward or away from the path's start, to its left or right), warichu?: bool, warichuLines?: 1..6, warichuGap?: pt 0..100, warichuScale?: % 10..100, warichuAlign?: \"auto\"|\"left\"|\"center\"|\"right\"|\"justifyLeft\"|\"justifyCenter\"|\"justifyRight\"|\"justifyAll\" (Character panel menu › Warichu and Warichu Settings, as text.setRangeStyle: the characters set smaller and stacked on lines inside their line), akiLeft?, akiRight?: 1/1000 em 0..1000 (Character panel › Insert Aki Left and Right, with Show East Asian Options, as text.setRangeStyle: space before and after each character in reading order), standardVerticalRoman?: bool (Character panel menu › Standard Vertical Roman Alignment, as text.setRangeStyle), noBreak?: bool (Character panel menu › No Break: these characters stay on one line, including across a space inside the run), kashidas?: bool (Character panel menu › Kashidas: selected characters allow insertion only when both joined neighbors have it on; on by default), charDirection?: \"default\"|\"leftToRight\"|\"rightToLeft\" (Character panel menu › Character Direction: the characters are set left to right or right to left inside their paragraph, as a Unicode bidi embedding; default: as the bidi algorithm sets them), digits?: \"default\"|\"arabic\"|\"hindi\"|\"farsi\"|\"devanagari\"|\"bengali\"|\"gurmukhi\"|\"gujarati\"|\"odia\"|\"tamil\"|\"telugu\"|\"kannada\"|\"malayalam\" (Character panel menu › Digits: the numeral system every digit is drawn in, whatever was typed: Western, Arabic-Indic (hindi), Eastern Arabic-Indic (farsi) or an Indic script's own digits), fontHeightReference?: \"emBox\"|\"capHeight\"|\"xHeight\"|\"icfBox\" (Character panel › Set Font Height Reference, as text.setRangeStyle: the height of the font that the size measures), language?: name|tag (Character panel › Language, as text.setRangeStyle), fontAxes?: {\"wght\": 650, …} (Character panel › Variable Font, as text.setRangeStyle: each axis named set in its units and clamped to its range, null back to the style's own setting), burasagari?: \"none\"|\"standard\"|\"forced\" (Paragraph panel menu › Burasagari None/Regular/Force: an East Asian comma or full stop ending an area type line hangs outside it: when it doesn't fit, or always; new type: \"standard\"), romanHangingPunctuation?: bool (Paragraph panel menu › Roman Hanging Punctuation: quotation marks, hyphens, full stops and commas starting or ending a line hang outside the margin, asterisks, tildes, ellipses, dashes, colons and semicolons by half; off by default), koreanLineBreakAnywhere?: bool (Paragraph panel menu › Korean Line Break Anywhere: a line may break between any two Hangul syllables; off, a word with Hangul in it breaks only at its spaces and punctuation, or where it is wider than the line; new type: false, paragraphs saved before the option: true), kashida?: \"none\"|\"short\"|\"medium\"|\"long\"|\"stylistic\" (Paragraph panel › Insert Kashidas: justified lines of horizontal area type lengthen each Arabic word with a kashida between its last pair of joined letters, at most a quarter, half or whole em long, or whole tatweels up to an em for stylistic, before they widen their word spaces; none by default), composer?: \"singleLine\"|\"everyLine\"|\"standardSingleLine\"|\"standardEveryLine\" (line breaking, Every-line by default; singleLine and everyLine are the Middle Eastern & South Asian composers, which shape Indic, Arabic and Hebrew type; the standard ones set it glyph by glyph as the font maps its characters, for legacy fonts that keep a script on Latin character codes), start?: byte, end?: byte} (baselineShift is in document points and hScale includes the object transform; groups include their text descendants; with a range: the character attributes style that range and the paragraph attributes apply to the paragraphs it touches; without: all the text, and graph labels keep the character and paragraph attributes for every label of their kind when the graph is drawn again, the graph still setting each label's alignment; a number or switch given as another type fails the call, and a null value leaves its attribute as it is, so a call with only null values fails with nothing to change; a call that gives the values the text already has records no undo step). Or {paragraphIndents: [{id, start: byte where the paragraph starts, leftIndent?, firstLineIndent?: pt -1296..1296}…]} alone (Tabs panel indent markers over paragraphs with indents of their own): each entry sets one paragraph of a type object, at least one indent each, at most 100000 entries; every entry is checked before anything changes, and an unknown key, a value out of range, an object that is not type, a byte where no paragraph starts or two entries for one paragraph with other values fail the call; all of it is one edit, a threaded story flowing again once, and when no paragraph's indents change nothing is recorded → {ids}", has_doc, set_format ), @@ -618,7 +618,9 @@ fn set_format(s: &mut Session, p: &Value) -> Result { Some(v) => Some(match v.as_str() { Some("singleLine") => Composer::SingleLine, Some("everyLine") => Composer::EveryLine, - _ => return Err(bad(C, "composer must be \"singleLine\" or \"everyLine\"")), + Some("standardSingleLine") => Composer::StandardSingleLine, + Some("standardEveryLine") => Composer::StandardEveryLine, + _ => return Err(bad(C, "composer must be \"singleLine\", \"everyLine\", \"standardSingleLine\" or \"standardEveryLine\"")), }), }; let (position, small_caps) = super::docsetup::script_params(p, &s.doc()?.doc.setup, C)?; diff --git a/crates/engine/src/cmd/textstyles/tests.rs b/crates/engine/src/cmd/textstyles/tests.rs index 3e0727ce4a..ee13522073 100644 --- a/crates/engine/src/cmd/textstyles/tests.rs +++ b/crates/engine/src/cmd/textstyles/tests.rs @@ -1649,6 +1649,30 @@ fn paragraph_style_options_edit_applies_to_users_and_is_one_saved_undo_step() { } } +/// A paragraph style can hold a Standard composer: it applies to its paragraphs, redefining and +/// resetting treat it like any attribute, and the style and the paragraphs keep it through a save. +#[test] +fn paragraph_styles_keep_a_standard_composer_through_a_save() { + use vectorcraft_doc::Composer; + let (mut s, id) = session_with_text("One\nTwo"); + s.execute("paraStyle.new", &json!({"name": "Legacy", "attrs": {"composer": "standardSingleLine"}})).unwrap(); + s.execute("paraStyle.apply", &json!({"name": "Legacy", "id": id, "start": 0, "end": 0})).unwrap(); + assert_eq!(paras(&s, id).iter().map(|p| p.composer).collect::>(), [Composer::StandardSingleLine, Composer::EveryLine]); + let doc = s.doc().unwrap().doc.clone(); + let saved = vectorcraft_format::load(&vectorcraft_format::save(&doc, false)).unwrap(); + let style = saved.para_styles.iter().find(|d| d.name == "Legacy").unwrap(); + assert_eq!(style.attrs["composer"], json!("standardSingleLine")); + let mut composers = vec![]; + saved.walk(|n| { + if let vectorcraft_doc::NodeKind::Text(t) = &n.kind { + composers.extend(t.paragraph_styles().iter().map(|p| p.composer)); + } + }); + assert_eq!(composers, [Composer::StandardSingleLine, Composer::EveryLine]); + s.execute("paraStyle.setAttrs", &json!({"name": "Legacy", "attrs": {"composer": "standardEveryLine"}})).unwrap(); + assert_eq!(paras(&s, id)[0].composer, Composer::StandardEveryLine, "an edited style reaches its paragraphs"); +} + /// A changed paragraph attribute outside the range `text.setFormat` keeps it to is an error for /// `paraStyle.edit`, `paraStyle.setAttrs` and `paraStyle.new`, with no change to the document; the /// ends of each range are accepted, and an out-of-range value the style already has can be kept. diff --git a/crates/engine/src/tests/panelcmds.rs b/crates/engine/src/tests/panelcmds.rs index 8174cf36d1..383c1f7db1 100644 --- a/crates/engine/src/tests/panelcmds.rs +++ b/crates/engine/src/tests/panelcmds.rs @@ -1624,6 +1624,35 @@ fn text_set_format() { assert_eq!(t.para.composer, vectorcraft_doc::Composer::EveryLine); } +/// `text.setFormat {composer}` takes the two Middle Eastern & South Asian and the two Standard +/// composers, each per paragraph and one undo step; any other value is refused and names them all. +#[test] +fn text_set_format_takes_the_four_composers() { + use vectorcraft_doc::Composer; + let mut s = session(); + let r = s.execute("text.create", &json!({"x": 10, "y": 100, "text": "One\nTwo"})).unwrap(); + let id = NodeId(r["id"].as_u64().unwrap()); + let composers = |s: &Session| { + let NodeKind::Text(t) = node(s, id).kind else { panic!() }; + [t.para_at(0).composer, t.para_at(1).composer] + }; + assert_eq!(composers(&s), [Composer::EveryLine; 2], "new type is ME&SA Every-line"); + for (value, want) in [ + ("singleLine", Composer::SingleLine), + ("standardSingleLine", Composer::StandardSingleLine), + ("standardEveryLine", Composer::StandardEveryLine), + ("everyLine", Composer::EveryLine), + ] { + s.execute("text.setFormat", &json!({"ids": [id.0], "composer": value, "start": 4, "end": 4})).unwrap(); + assert_eq!(composers(&s), [Composer::EveryLine, want], "{value}: only the second paragraph"); + } + s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "standardEveryLine"})).unwrap(); + s.execute("edit.undo", &json!({})).unwrap(); + assert_eq!(composers(&s), [Composer::EveryLine; 2], "one undo step"); + let e = s.execute("text.setFormat", &json!({"ids": [id.0], "composer": "standard"})).unwrap_err().to_string(); + assert!(e.contains("standardSingleLine") && e.contains("standardEveryLine"), "{e}"); +} + #[test] fn stroke_advanced_scale_swap_flip() { let mut s = session(); diff --git a/crates/format/tests/it/native_v3.rs b/crates/format/tests/it/native_v3.rs index 512025375e..4dbd33c196 100644 --- a/crates/format/tests/it/native_v3.rs +++ b/crates/format/tests/it/native_v3.rs @@ -212,6 +212,44 @@ fn text_composer_round_trips() { assert!(!String::from_utf8_lossy(&save(&d2, false)).contains("composer")); } +/// Every composer reads back as it was saved (the two Standard ones as their own values), and the +/// ME&SA names are the ones files have always used: `everyLine` stays the unwritten default and +/// `singleLine` keeps its spelling, so a document that never picks a Standard composer is unchanged. +#[test] +fn all_four_composers_round_trip() { + use vectorcraft_doc::{TextKind, TextObject}; + let one = |c: Composer| { + let mut d = Document::new(200.0, 200.0); + let mut t = TextObject::point(kurbo::Point::ZERO, "ક\u{ACD}ક", Default::default()); + t.para.composer = c; + t.kind = TextKind::Point; + let id = d.alloc_id(); + d.insert(None, usize::MAX, Node::new(id, NodeKind::Text(Box::new(t)))).unwrap(); + d + }; + for (c, written) in [ + (Composer::SingleLine, Some("singleLine")), + (Composer::EveryLine, None), + (Composer::StandardSingleLine, Some("standardSingleLine")), + (Composer::StandardEveryLine, Some("standardEveryLine")), + ] { + let bytes = save(&one(c), false); + let text = String::from_utf8_lossy(&bytes); + match written { + Some(w) => assert!(text.contains(&format!("\"composer\":\"{w}\"")), "{c:?}"), + None => assert!(!text.contains("\"composer\""), "{c:?}"), + } + let back = load(&bytes).unwrap(); + let mut got = None; + back.walk(|n| { + if let NodeKind::Text(t) = &n.kind { + got = Some(t.para.composer); + } + }); + assert_eq!(got, Some(c)); + } +} + /// A document as the first version wrote it (format name `drawcraft`, anchors as maps). const V1_FILE: &str = r#"{"format":"drawcraft","version":1,"generator":"DrawCraft 0.1.0","document":{"version":1,"title":"Old","artboards":[{"id":1,"name":"Artboard 1","rect":{"x0":0.0,"y0":0.0,"x1":100.0,"y1":80.0}}], "layers":[{"id":1,"name":"Layer 1","visible":true,"locked":false,"opacity":1.0,"kind":{"type":"layer","children":[ diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs index f22b9dfd41..deb43ae968 100644 --- a/crates/mcp/src/ui_catalog.rs +++ b/crates/mcp/src/ui_catalog.rs @@ -392,7 +392,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "type.lineComposer", "Toggle Line Composer", "Cmd+Alt+Shift+C", - "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer (text.setFormat {composer}) → \"singleLine\" | \"everyLine\"", + "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer, each keeping its shaping: Middle Eastern & South Asian or Standard (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"", ), ( "type.hyphenate", diff --git a/crates/text/src/features.rs b/crates/text/src/features.rs index 9f2b555e23..e25d225dc1 100644 --- a/crates/text/src/features.rs +++ b/crates/text/src/features.rs @@ -52,6 +52,10 @@ pub struct OtFeatures { pub extra_values: [u16; EXTRA_FEATURES.len()], /// The value `swsh=N` gives swashes ([`Self::swash`]), as [`Self::extra_values`] for `salt`. pub swash_value: u16, + /// Set a complex script (Indic, Arabic, Hebrew) glyph by glyph as the font maps its + /// characters, with none of its layout tables: the Standard composers. Set per paragraph by + /// layout from the paragraph's composer, not by a style. + pub unshaped_complex: bool, } /// The largest value a `tag=N` feature takes: a font's glyph ids are 16 bits, so is an alternate's @@ -87,6 +91,7 @@ impl Default for OtFeatures { extra: 0, extra_values: [0; EXTRA_FEATURES.len()], swash_value: 0, + unshaped_complex: false, } } } diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs index a7d7d1d3f3..5ff18b4076 100644 --- a/crates/text/src/layout.rs +++ b/crates/text/src/layout.rs @@ -229,11 +229,14 @@ impl Ctx<'_> { out } - /// Shape paragraph `r` (its bidi resolution `bidi`). - fn shape_para(&self, r: Range, bidi: Option<&BidiInfo<'_>>) -> Vec { + /// Shape paragraph `r` (its bidi resolution `bidi`, its attributes `para`). A Standard composer + /// sets a complex script glyph by glyph ([`OtFeatures::unshaped_complex`]). + fn shape_para(&self, r: Range, bidi: Option<&BidiInfo<'_>>, para: &ParaStyle) -> Vec { let mut v = Vec::with_capacity(r.len()); let levels = bidi.map_or(&[][..], |b| &b.levels); - shape_runs(self.db, self.text, r, &self.runs, &self.inlines, &self.faces, &self.opts.features, levels, &mut v); + let standard = !self.opts.composer.unwrap_or(para.composer).shapes_complex_scripts(); + let feats = OtFeatures { unshaped_complex: standard, ..self.opts.features }; + shape_runs(self.db, self.text, r, &self.runs, &self.inlines, &self.faces, &feats, levels, &mut v); self.finish_shaping(&mut v, |g| self.style_at(g.byte)); v } diff --git a/crates/text/src/layout/flow.rs b/crates/text/src/layout/flow.rs index 1ee9a3fe50..38df882e07 100644 --- a/crates/text/src/layout/flow.rs +++ b/crates/text/src/layout/flow.rs @@ -58,7 +58,7 @@ fn compose_para( // The tab of a list marker is on the first line, with the marker, and has a fixed width. let has_tab = sg.iter().any(|g| g.ch == '\t' && g.len > 0); let has_soft_break = sg.iter().any(|g| g.ch == '\u{2028}'); - if composer != Composer::EveryLine + if composer.is_single_line() || pen.regions.is_none() || sg.len() < 2 || sg.len() > MAX_COMPOSE_GLYPHS @@ -242,7 +242,7 @@ fn prepare_paragraph<'a, 'text>( let text = cx.text; let bidi = para_bidi_with(text.get(pr.clone()).unwrap_or_default(), para.direction, &cx.char_directions(&pr)); let rtl = is_rtl(bidi.as_ref()); - let mut sg = cx.shape_para(pr.clone(), bidi.as_ref()); + let mut sg = cx.shape_para(pr.clone(), bidi.as_ref(), para); // Thai, Lao, Khmer and Myanmar break lines between words, not at spaces. mark_word_ends(text.get(pr.clone()).unwrap_or_default(), pr.start, &mut sg); // Korean breaks between words, unless Korean Line Break Anywhere lets it break between syllables. @@ -316,7 +316,7 @@ fn prepare_paragraph<'a, 'text>( let composed = compose_para(cx, &sg, &flex, &line_end, para, pen, rtl, continued); // Hyphenation options: the Hyphenation Zone applies with the Single-line Composer, and the // Hyphen Limit counts the lines in a row that end with a hyphen. - let zone = if cx.opts.composer.unwrap_or(para.composer) == Composer::SingleLine { para.hyphenation.zone } else { 0.0 }; + let zone = if cx.opts.composer.unwrap_or(para.composer).is_single_line() { para.hyphenation.zone } else { 0.0 }; let hyphen_limit = usize::try_from(para.hyphenation.hyphen_limit).unwrap_or(usize::MAX); let mirror = mirrors_indents(para, rtl, cx.vertical); ParagraphData { diff --git a/crates/text/src/layout/on_path.rs b/crates/text/src/layout/on_path.rs index d119f5d780..e0b8980358 100644 --- a/crates/text/src/layout/on_path.rs +++ b/crates/text/src/layout/on_path.rs @@ -393,7 +393,7 @@ pub(super) fn on_path(cx: &mut Ctx<'_>, paras: &[Range], t: &TextObject, let text = cx.text; let bidi = para_bidi_with(text.get(pr.clone()).unwrap_or_default(), para.direction, &cx.char_directions(pr)); rtl.get_or_insert(is_rtl(bidi.as_ref()) && !cx.vertical); - let mut glyphs = cx.shape_para(pr.clone(), bidi.as_ref()); + let mut glyphs = cx.shape_para(pr.clone(), bidi.as_ref(), t.para_at(pi)); // Bullets and numbers: a list paragraph's text starts after its marker here too, unless // the paragraph continues from the frame before in its thread. if pi > 0 || !t.first_para_continues { diff --git a/crates/text/src/shape.rs b/crates/text/src/shape.rs index ff79ce9a4c..16809291bc 100644 --- a/crates/text/src/shape.rs +++ b/crates/text/src/shape.rs @@ -122,6 +122,26 @@ pub(crate) fn joins(script: Script) -> bool { ) } +/// Is `script` one a Standard composer leaves unshaped: Indic (conjuncts, half forms, marks placed +/// by the font's layout tables), Arabic-like ([`joins`]) and Hebrew? +fn is_complex_script(script: Script) -> bool { + joins(script) + || matches!( + script, + Script::Hebrew + | Script::Devanagari + | Script::Bengali + | Script::Gurmukhi + | Script::Gujarati + | Script::Oriya + | Script::Tamil + | Script::Telugu + | Script::Kannada + | Script::Malayalam + | Script::Sinhala + ) +} + /// How `vpal` and the vertical kerning with it move an upright glyph in vertical type and change /// its length down the column, in points: `advance` down the column, `dx` and `dy` in glyph space /// (y down; `dy` is down the column once the glyph stands upright). `proportional`: `vpal` itself @@ -1374,7 +1394,12 @@ fn shape_segment(text: &str, context: &Range, seg: &Segment, feats: &OtFe let source_runs = &(source_runs.start + first..source_runs.start + last); let text_seg = &text[range.clone()]; // The segment's script: that of its first character of a script of its own. - let cursive = text_seg.chars().map(|c| c.script()).find(|s| !matches!(s, Script::Common | Script::Inherited)).is_some_and(joins); + let first_script = text_seg.chars().map(|c| c.script()).find(|s| !matches!(s, Script::Common | Script::Inherited)); + let cursive = first_script.is_some_and(joins); + // A Standard composer sets a complex script glyph by glyph (no layout tables, nominal glyphs). + // shortcut: decided for the whole segment by its first strong script, as `cursive` is; segments + // already split where the script changes. + let unshaped = feats.unshaped_complex && first_script.is_some_and(is_complex_script); let full = st.size.max(0.0); // Superscript/subscript and small capitals shrink the glyphs; line metrics keep the full size. let (_, pos_shift) = st.position.scale_shift(full); @@ -1453,7 +1478,7 @@ fn shape_segment(text: &str, context: &Range, seg: &Segment, feats: &OtFe .and_then(|l| l.parse::().ok()); let mut shaped = Shaped::default(); let Shaped { raw, proportional, vpal, chars } = &mut shaped; - let hb_shaped = face.hb().map(|hb| { + let hb_shaped = face.hb().filter(|_| !unshaped).map(|hb| { let shaper = face.shaper.shaper(&hb).instance(face.instance.as_ref()).build(); // The baseline and character-level pass use exactly the same resolved features. // Alternate positioning passes still resolve their own features, with `more` last. @@ -1558,7 +1583,8 @@ fn shape_segment(text: &str, context: &Range, seg: &Segment, feats: &OtFe } }); if hb_shaped.is_none() { - // Fallback: nominal glyphs and hmtx advances, no shaping. + // Fallback: nominal glyphs and hmtx advances, no shaping (also a complex script under a + // Standard composer). if let Some(f) = face.skrifa() { let cmap = f.charmap(); let gm = f.glyph_metrics(Size::unscaled(), face.location()); @@ -1572,6 +1598,10 @@ fn shape_segment(text: &str, context: &Range, seg: &Segment, feats: &OtFe raw.push((g.to_u32(), cl, adv.round() as i32, 0, 0)); } } + // Shaped right-to-left text comes out in visual order, which layout expects. + if unshaped && level.is_rtl() { + raw.reverse(); + } } } shaped diff --git a/crates/text/src/test_fonts.rs b/crates/text/src/test_fonts.rs index bdb818d3f3..a997617287 100644 --- a/crates/text/src/test_fonts.rs +++ b/crates/text/src/test_fonts.rs @@ -534,7 +534,8 @@ pub fn half_form_font(half: bool) -> Option> { pub const CONJUNCT_FAMILY: &str = "Conjuncttest Sans"; /// A test-only cmap over bundled Source Sans 3: Devanagari Ka uses K, the halant uses a period and -/// the vowel sign I (drawn before its syllable) uses i. The `GSUB` table's `dev2` script has an +/// the vowel sign I (drawn before its syllable) uses i; Gujarati Ka, virama and vowel sign I use the +/// same glyphs. The `GSUB` table's `dev2` and `gjr2` scripts have an /// `aalt` single substitution of K by k and a `salt` one of K by i, which list k and the vowel /// sign's glyph as alternates of Ka, and a `half` ligature of K and the period into k (Ka's half /// form). Family [`CONJUNCT_FAMILY`]. `None` when it can't be built. @@ -549,7 +550,7 @@ pub fn conjunct_font() -> Option> { const BASE: &[u8] = include_bytes!("../../../assets/fonts/SourceSans3-Regular.ttf"); let font = skrifa::FontRef::new(BASE).ok()?; let charmap = font.charmap(); - let mapping = [('क', 'K'), ('\u{094D}', '.'), ('\u{093F}', 'i')]; + let mapping = [('क', 'K'), ('\u{094D}', '.'), ('\u{093F}', 'i'), ('ક', 'K'), ('\u{0ACD}', '.'), ('\u{0ABF}', 'i')]; let mappings = mapping.into_iter().map(|(c, source)| Some((c, write_fonts::types::GlyphId::new(charmap.map(source)?.to_u32())))); let cmap = Cmap::from_mappings(mappings.collect::>>()?).ok()?; let family = CONJUNCT_FAMILY; @@ -574,7 +575,8 @@ pub fn conjunct_font() -> Option> { SubstitutionLookup::Ligature(Lookup::new(Default::default(), vec![half])), SubstitutionLookup::Single(Lookup::new(Default::default(), vec![salt.into()])), ]); - let scripts = ScriptList::new(vec![ScriptRecord::new(Tag::new(b"dev2"), Script::new(Some(LangSys::new(vec![0, 1, 2])), vec![]))]); + let langsys = || Script::new(Some(LangSys::new(vec![0, 1, 2])), vec![]); + let scripts = ScriptList::new(vec![ScriptRecord::new(Tag::new(b"dev2"), langsys()), ScriptRecord::new(Tag::new(b"gjr2"), langsys())]); builder.add_table(&Gsub::new(scripts, features, lookups)).ok()?; for r in font.table_directory.table_records() { let tag = Tag::new(&r.tag().to_be_bytes()); diff --git a/crates/text/src/tests.rs b/crates/text/src/tests.rs index e7e4f33ff6..6d32831d8e 100644 --- a/crates/text/src/tests.rs +++ b/crates/text/src/tests.rs @@ -10,6 +10,7 @@ mod bidi; mod bitmaps; mod colr; mod combos; +mod composers; mod composite; mod devanagari; mod embed; diff --git a/crates/text/src/tests/composers.rs b/crates/text/src/tests/composers.rs new file mode 100644 index 0000000000..7b4988e822 --- /dev/null +++ b/crates/text/src/tests/composers.rs @@ -0,0 +1,96 @@ +//! The four composers: the Middle Eastern & South Asian ones shape complex scripts with the font's +//! layout tables, the Standard ones set them glyph by glyph as the font maps their characters. +//! Uses a font built in code ([`conjunct_font`]): Ka K, halant a period and vowel sign I i, in +//! Devanagari and Gujarati, with a `half` ligature of K and the period into k. +use crate::test_fonts::{CONJUNCT_FAMILY, conjunct_font, source_sans_gid}; +use crate::*; +use kurbo::Point; +use vectorcraft_doc::{CharStyle, Composer, TextObject}; + +/// Ka, halant, Ka, vowel sign I in Devanagari, then in Gujarati. +const DEVANAGARI: &str = "क\u{94D}क\u{93F}"; +const GUJARATI: &str = "ક\u{ACD}ક\u{ABF}"; + +fn db() -> FontDb { + let db = FontDb::with_font_dirs(vec![]); + db.add_font(conjunct_font().expect("the test font builds")); + db +} + +fn object(text: &str, composer: Composer) -> TextObject { + let st = CharStyle { font_family: CONJUNCT_FAMILY.into(), font_style: "Regular".into(), size: 20.0, ..CharStyle::default() }; + let mut t = TextObject::point(Point::ZERO, text, st); + t.para.composer = composer; + t +} + +/// The glyph ids drawn for `text` with `composer`, and each glyph's source cluster length. +fn drawn(db: &FontDb, text: &str, composer: Composer) -> Vec<(u32, usize)> { + layout(db, &object(text, composer)).glyphs.iter().map(|g| (g.gid, g.len)).collect() +} + +fn g(c: char) -> u32 { + u32::from(source_sans_gid(c).expect("a Source Sans glyph")) +} + +/// Under the ME&SA composers the conjunct forms (Devanagari: the vowel sign I drawn before its +/// syllable and Ka's half form; Gujarati: the half form); under the Standard ones each character +/// has its own glyph, in text order, as the font maps it. +#[test] +fn standard_composers_set_indic_text_glyph_by_glyph() { + let db = db(); + let ids = |v: Vec<(u32, usize)>| v.into_iter().map(|(gid, _)| gid).collect::>(); + for composer in [Composer::SingleLine, Composer::EveryLine] { + assert_eq!(ids(drawn(&db, DEVANAGARI, composer)), [g('i'), g('k'), g('K')], "{composer:?} Devanagari"); + assert_eq!(ids(drawn(&db, GUJARATI, composer)), [g('k'), g('K'), g('i')], "{composer:?} Gujarati"); + } + for composer in [Composer::StandardSingleLine, Composer::StandardEveryLine] { + let plain = [g('K'), g('.'), g('K'), g('i')]; + let devanagari = drawn(&db, DEVANAGARI, composer); + assert_eq!(ids(devanagari.clone()), plain, "{composer:?} Devanagari"); + assert_eq!(ids(drawn(&db, GUJARATI, composer)), plain, "{composer:?} Gujarati"); + assert!(devanagari.iter().all(|&(_, len)| len == 3), "each glyph is one character's own cluster: {devanagari:?}"); + } +} + +/// The composer is per paragraph: of two paragraphs of the same text, each is shaped by its own. +#[test] +fn each_paragraph_follows_its_own_composer() { + let db = db(); + let mut t = object(&format!("{DEVANAGARI}\n{DEVANAGARI}"), Composer::EveryLine); + let standard = vectorcraft_doc::ParaStyle { composer: Composer::StandardEveryLine, ..t.para.clone() }; + t.set_paragraph_styles(vec![t.para.clone(), standard]); + let l = layout(&db, &t); + let second = DEVANAGARI.len() + 1; + let of = |from: usize, to: usize| l.glyphs.iter().filter(|g| (from..to).contains(&g.byte) && g.len > 0).map(|g| g.gid).collect::>(); + assert_eq!(of(0, second), [g('i'), g('k'), g('K')], "ME&SA paragraph"); + assert_eq!(of(second, second + DEVANAGARI.len()), [g('K'), g('.'), g('K'), g('i')], "Standard paragraph"); +} + +/// Layout's composer override ([`LayoutOptions::composer`]) decides the shaping too. +#[test] +fn the_layout_composer_override_decides_the_shaping() { + let db = db(); + let t = object(DEVANAGARI, Composer::EveryLine); + let with = |c| layout_with(&db, &t, &LayoutOptions { composer: Some(c), ..Default::default() }).glyphs.len(); + assert_eq!((with(Composer::SingleLine), with(Composer::StandardSingleLine)), (3, 4)); +} + +/// Standard composers break lines as the ME&SA ones do (`is_single_line`), and old files' composers +/// keep their meaning. +#[test] +fn composers_split_into_breaking_and_shaping() { + use Composer::*; + for (c, single, shapes) in + [(SingleLine, true, true), (EveryLine, false, true), (StandardSingleLine, true, false), (StandardEveryLine, false, false)] + { + assert_eq!((c.is_single_line(), c.shapes_complex_scripts()), (single, shapes), "{c:?}"); + assert_eq!(c.with_breaking(single), c, "{c:?}"); + assert_eq!( + (c.with_breaking(!single).is_single_line(), c.with_breaking(!single).shapes_complex_scripts()), + (!single, shapes), + "{c:?} toggled" + ); + } + assert_eq!(Composer::default(), EveryLine, "new type and old documents are ME&SA Every-line"); +} diff --git a/crates/ui-egui/src/dialogs/para_style_options.rs b/crates/ui-egui/src/dialogs/para_style_options.rs index a78790d692..d63d43be89 100644 --- a/crates/ui-egui/src/dialogs/para_style_options.rs +++ b/crates/ui-egui/src/dialogs/para_style_options.rs @@ -361,7 +361,12 @@ pub(crate) fn edited_attrs(d: &Dialog) -> Result, String> { } let same = unchanged("composer", "__resetComposition"); - keep_or(&mut attrs, "composer", same, choice("composer").filter(|v| matches!(v.as_str(), Some("singleLine" | "everyLine")))); + keep_or( + &mut attrs, + "composer", + same, + choice("composer").filter(|v| matches!(v.as_str(), Some("singleLine" | "everyLine" | "standardSingleLine" | "standardEveryLine"))), + ); let same = unchanged("roman_hanging", "__resetComposition"); keep_or(&mut attrs, "roman_hanging", same, switch("roman_hanging")); @@ -637,7 +642,9 @@ fn choice(ui: &mut egui::Ui, d: &mut Dialog, key: &str, options: &[(&str, &str)] let shown = options.iter().find(|(value, _)| *value == selected).map_or("", |(_, label)| *label); let labels: Vec<&str> = std::iter::once(" ").chain(options.iter().map(|(_, label)| *label)).collect(); ui.add_enabled_ui(enabled, |ui| { - if let Some(i) = crate::widgets::dropdown(ui, (KIND, key), shown, &labels, 190.0) { + // shortcut: 7 pt per character approximates the widest label; measure the text when a label wraps. + let width = (labels.iter().map(|l| l.chars().count()).max().unwrap_or(0) as f32 * 7.0).max(190.0); + if let Some(i) = crate::widgets::dropdown(ui, (KIND, key), shown, &labels, width) { d.fields.insert(key.into(), if i == 0 { Value::Null } else { options.get(i - 1).map_or(Value::Null, |(value, _)| json!(value)) }); } }); @@ -842,11 +849,16 @@ pub(crate) fn clear_tabs(d: &mut Dialog) { d.fields.remove("__tabEdited"); } -/// Composition: the Single-line or Every-line Composer, and Roman Hanging Punctuation. +/// Composition: the Middle Eastern & South Asian or Standard, Single-line or Every-line Composer, and Roman Hanging Punctuation. pub(crate) fn composition_body(ui: &mut egui::Ui, d: &mut Dialog) { egui::Grid::new("paragraph-style-composition").num_columns(2).spacing([18.0, 8.0]).show(ui, |ui| { let row = ui.label(tl!("Composition")); - let composers = [("singleLine", tl!("Single-line Composer")), ("everyLine", tl!("Every-line Composer"))]; + let composers = [ + ("singleLine", tl!("Middle Eastern & South Asian Single-line Composer")), + ("everyLine", tl!("Middle Eastern & South Asian Every-line Composer")), + ("standardSingleLine", tl!("Standard Single-line Composer")), + ("standardEveryLine", tl!("Standard Every-line Composer")), + ]; ui.label_inputs_by(row.id, |ui| choice(ui, d, "composer", &composers, true)); ui.end_row(); switch(ui, d, "roman_hanging", tl!("Roman Hanging Punctuation"), true); @@ -857,7 +869,7 @@ pub(crate) fn composition_body(ui: &mut egui::Ui, d: &mut Dialog) { /// unset; Hyphenation Zone is also inactive with the Every-line Composer, which does not use it. pub(crate) fn hyphenation_body(ui: &mut egui::Ui, d: &mut Dialog) { let on = d.fields.get("hyphenate").and_then(Value::as_bool) == Some(true); - let single_line = d.fields.get("composer").and_then(Value::as_str) == Some("singleLine"); + let single_line = matches!(d.fields.get("composer").and_then(Value::as_str), Some("singleLine" | "standardSingleLine")); egui::Grid::new("paragraph-style-hyphenation").num_columns(2).spacing([18.0, 8.0]).show(ui, |ui| { switch(ui, d, "hyphenate", tl!("Hyphenation"), true); for (key, suffix) in [ diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index 4b5982cecd..a84162840f 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -1046,7 +1046,8 @@ font-technology Variable Променливи Every (minutes) На всеки (минути) Every option is at its default. Всички опции са в състояние по подразбиране. Every option matches {base}. Всички опции съответстват на {base}. - Every-line Composer Композитор за всеки ред + Middle Eastern & South Asian Every-line Composer Композитор за всеки ред (Близък изток и Южна Азия) + Standard Every-line Composer Стандартен композитор за всеки ред Exact dash lengths Точни дължини на тиретата Exceptions (comma separated) Изключения (разделени със запетаи) Exclude Изключване @@ -3310,7 +3311,8 @@ digits Malayalam Малаялам Single Left Quotation Mark Лява единична кавичка Single Quotes: Единични кавички: Single Right Quotation Mark Дясна единична кавичка - Single-line Composer Ред по ред композитор + Middle Eastern & South Asian Single-line Composer Ред по ред композитор (Близък изток и Южна Азия) + Standard Single-line Composer Стандартен ред по ред композитор Toggle Line Composer Превключване на композитора на редове Sixth Space Шесто разстояние Size Размер @@ -6884,3 +6886,4 @@ breakText Glyphs Глифи Grommets Капси Grommet Inset Отстъп на капсите от ръба Diameter Диаметър +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer трябва да е "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 1576b72373..9f6702e229 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -1998,7 +1998,8 @@ digits Malayalam Malajalam Tabular Lining Tabelarne brojke Tabular Oldstyle Tabelarne stare brojke Titling Alternates Alternative za naslove - Every-line Composer Slagač svih redova + Middle Eastern & South Asian Every-line Composer Slagač svih redova (Bliski istok i Južna Azija) + Standard Every-line Composer Standardni slagač svih redova First-line Left Indent Lijeva uvlaka prvog reda Hyphenation… Rastavljanje riječi… Words Longer Than: Riječi duže od: @@ -2038,7 +2039,8 @@ digits Malayalam Malajalam East Asian Composition Settings Postavke istočnoazijske kompozicije Korean Composition Settings Postavke korejske kompozicije Select a text object to edit its paragraph attributes. Odaberite tekstualni objekat da uredite njegove atribute pasusa. - Single-line Composer Slagač jednog reda + Middle Eastern & South Asian Single-line Composer Slagač jednog reda (Bliski istok i Južna Azija) + Standard Single-line Composer Standardni slagač jednog reda Toggle Line Composer Uključi/isključi Line Composer Space After Paragraph Razmak nakon pasusa Space Before Paragraph Razmak prije pasusa @@ -6937,3 +6939,4 @@ shape Open Otvoren Grommets Ušice Grommet Inset Udaljenost ušica od ruba Diameter Prečnik +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer mora biti "singleLine", "everyLine", "standardSingleLine" ili "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index c098a7cb4b..cb3cbdd80a 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -1525,7 +1525,8 @@ antiAlias Sharp Nítid Every (minutes) Cada (minuts) Every option is at its default. Totes les opcions són al valor predeterminat. Every option matches {base}. Totes les opcions coincideixen amb {base}. - Every-line Composer Composició línia per línia + Middle Eastern & South Asian Every-line Composer Composició línia per línia (Orient Pròxim i Àsia Meridional) + Standard Every-line Composer Composició estàndard línia per línia Exact Exacte Exact dash lengths Longituds de guió exactes Example: {name} Exemple: {name} @@ -4326,7 +4327,8 @@ digits Malayalam Malaiàlam Single Quotes: Cometes simples: Single Right Quotation Mark Cometa simple dreta Single Word Justification: Justificació d’una sola paraula: - Single-line Composer Compositor d’una línia + Middle Eastern & South Asian Single-line Composer Compositor d’una línia (Orient Pròxim i Àsia Meridional) + Standard Single-line Composer Compositor estàndard d’una línia Sixth Space Espai de sisena part Size Mida Size Tile to Art Ajusta la mida del mosaic a l’art @@ -7476,3 +7478,4 @@ breakText Glyphs Glifs Grommets Ullets Grommet Inset Distància dels ullets a la vora Diameter Diàmetre +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer ha de ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index c83c9945dc..7dd2192eca 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -2029,7 +2029,8 @@ digits Malayalam Malajálamské Tabular Lining Tabulkové verzálkové Tabular Oldstyle Tabulkové minuskové Titling Alternates Titulkové alternativy - Every-line Composer Sazba všech řádků + Middle Eastern & South Asian Every-line Composer Sazba všech řádků (Blízký východ a Jižní Asie) + Standard Every-line Composer Standardní sazba všech řádků First-line Left Indent Odsazení prvního řádku zleva Hyphenation… Dělení slov… Words Longer Than: Slova delší než: @@ -2069,7 +2070,8 @@ digits Malayalam Malajálamské East Asian Composition Settings Nastavení východoasijské sazby Korean Composition Settings Nastavení korejské sazby Select a text object to edit its paragraph attributes. Vyberte textový objekt, abyste mohli upravit atributy jeho odstavce. - Single-line Composer Sazba jednoho řádku + Middle Eastern & South Asian Single-line Composer Sazba jednoho řádku (Blízký východ a Jižní Asie) + Standard Single-line Composer Standardní sazba jednoho řádku Toggle Line Composer Přepnout sazbu řádků Space After Paragraph Mezera za odstavcem Space Before Paragraph Mezera před odstavcem @@ -8114,7 +8116,7 @@ breakText Glyphs Glyfy @msg column: true floats the whole column and takes no onto, above or below column: true uvolní celý sloupec jako plovoucí a nepřijímá onto, above ani below @msg command must be a shape.* command command musí být příkaz shape.* @msg commands[{i}]: missing `command` commands[{i}]: chybí `command` -@msg composer must be "singleLine" or "everyLine" composer musí být "singleLine" nebo "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer musí být "singleLine", "everyLine", "standardSingleLine" nebo "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes složené tvary přijímají cesty, složené cesty, skupiny, složené tvary, text, prolnutí a obálky @msg compound {_1} must contain exactly one open path to join složený objekt {_1} musí ke spojení obsahovat právě jednu otevřenou cestu @msg connect needs a path other than the one extended connect vyžaduje jinou cestu než tu prodlužovanou diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 5fad269299..35550bfebd 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -1837,7 +1837,8 @@ digits Malayalam Malayalam Tabular Lining Tabulære versalcifre Tabular Oldstyle Tabulære mediævalcifre Titling Alternates Titelalternativer - Every-line Composer Hverlinjesætter + Middle Eastern & South Asian Every-line Composer Hverlinjesætter (Mellemøsten og Sydasien) + Standard Every-line Composer Standard-hverlinjesætter First-line Left Indent Venstre indrykning af første linje Hyphenation… Orddeling… Justification… Justering… @@ -1869,7 +1870,8 @@ digits Malayalam Malayalam East Asian Composition Settings Indstillinger for østasiatisk komposition Korean Composition Settings Indstillinger for koreansk komposition Select a text object to edit its paragraph attributes. Markér et tekstobjekt for at redigere dets afsnitsattributter. - Single-line Composer Enlinjesætter + Middle Eastern & South Asian Single-line Composer Enlinjesætter (Mellemøsten og Sydasien) + Standard Single-line Composer Standard-enlinjesætter Toggle Line Composer Skift linjesætter Space After Paragraph Mellemrum efter afsnit Space Before Paragraph Mellemrum før afsnit @@ -6899,3 +6901,4 @@ breakText Glyphs Glyffer Grommets Maljer Grommet Inset Maljernes afstand fra kanten Diameter Diameter +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer skal være "singleLine", "everyLine", "standardSingleLine" eller "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index e33ed2a7a9..8fd441aea9 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -1048,7 +1048,8 @@ font-technology Variable Variabel Every (minutes) Alle (Minuten) Every option is at its default. Alle Optionen haben ihren Standardwert. Every option matches {base}. Alle Optionen entsprechen {base}. - Every-line Composer Alle-Zeilen-Setzer + Middle Eastern & South Asian Every-line Composer Alle-Zeilen-Setzer (Naher Osten und Südasien) + Standard Every-line Composer Standard-Alle-Zeilen-Setzer Exact dash lengths Exakte Strichlängen Exceptions (comma separated) Ausnahmen (durch Kommas getrennt) Exclude Schnittmenge entfernen @@ -3372,7 +3373,8 @@ digits Malayalam Malayalam Single Left Quotation Mark Einfaches öffnendes Anführungszeichen Single Quotes: Einfache Anführungszeichen: Single Right Quotation Mark Einfaches schließendes Anführungszeichen - Single-line Composer Einzeilen-Setzer + Middle Eastern & South Asian Single-line Composer Einzeilen-Setzer (Naher Osten und Südasien) + Standard Single-line Composer Standard-Einzeilen-Setzer Toggle Line Composer Zeilensetzer umschalten Sixth Space Sechstelgeviert-Leerzeichen Size Größe @@ -7918,7 +7920,7 @@ breakText Glyphs Glyphen @msg column: true floats the whole column and takes no onto, above or below column: true macht die ganze Spalte schwebend und nimmt kein onto, above oder below @msg command must be a shape.* command command muss ein shape.*-Befehl sein @msg commands[{i}]: missing `command` commands[{i}]: `command` fehlt -@msg composer must be "singleLine" or "everyLine" composer muss „singleLine“ oder „everyLine“ sein +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer muss „singleLine“, „everyLine“, „standardSingleLine“ oder „standardEveryLine“ sein @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes zusammengesetzte Formen nehmen Pfade, zusammengesetzte Pfade, Gruppen, zusammengesetzte Formen, Text, Angleichungen und Verzerrungshüllen @msg compound {_1} must contain exactly one open path to join zusammengesetzter Pfad {_1} muss genau einen offenen Pfad zum Zusammenfügen enthalten @msg connect end must be "start" or "end" connect end muss „start“ oder „end“ sein diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 9ff2eae9a2..ce41492ac8 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -1013,7 +1013,8 @@ font-technology Variable Μεταβλητές Every (minutes) Κάθε (λεπτά) Every option is at its default. Όλες οι επιλογές έχουν τις προεπιλεγμένες τιμές τους. Every option matches {base}. Όλες οι επιλογές ταιριάζουν με το {base}. - Every-line Composer Σύνθεση όλων των γραμμών + Middle Eastern & South Asian Every-line Composer Σύνθεση όλων των γραμμών (Μέση Ανατολή και Νότια Ασία) + Standard Every-line Composer Τυπική σύνθεση όλων των γραμμών Exact dash lengths Ακριβή μήκη παυλών Exceptions (comma separated) Εξαιρέσεις (χωρισμένες με κόμμα) Exclude Εξαίρεση @@ -3954,7 +3955,8 @@ digits Malayalam Μαλαγιάλαμ Single Left Quotation Mark Μονό αριστερό εισαγωγικό Single Quotes: Μονά εισαγωγικά: Single Right Quotation Mark Μονό δεξί εισαγωγικό - Single-line Composer Σύνθεση μονής γραμμής + Middle Eastern & South Asian Single-line Composer Σύνθεση μονής γραμμής (Μέση Ανατολή και Νότια Ασία) + Standard Single-line Composer Τυπική σύνθεση μονής γραμμής Toggle Line Composer Εναλλαγή σύνθεσης γραμμών Sixth Space Διάστημα ενός έκτου Size Tile to Art Προσαρμογή μεγέθους πλακιδίου στο σχέδιο @@ -7448,3 +7450,4 @@ breakText Glyphs Γλύφοι Grommets Τρουκς Grommet Inset Απόσταση τρουκς από την άκρη Diameter Διάμετρος +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" το composer πρέπει να είναι "singleLine", "everyLine", "standardSingleLine" ή "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index e51ba240a8..600863255e 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -1069,7 +1069,8 @@ font-technology Variable Variables Every (minutes) Cada (minutos) Every option is at its default. Todas las opciones tienen su valor predeterminado. Every option matches {base}. Todas las opciones coinciden con {base}. - Every-line Composer Composición de todas las líneas + Middle Eastern & South Asian Every-line Composer Composición de todas las líneas (Oriente Medio y Sur de Asia) + Standard Every-line Composer Composición estándar de todas las líneas Exact dash lengths Longitudes exactas de guion Exceptions (comma separated) Excepciones (separadas por comas) Exclude Excluir @@ -3403,7 +3404,8 @@ digits Malayalam Malayálam Single Left Quotation Mark Comilla simple de apertura Single Quotes: Comillas simples: Single Right Quotation Mark Comilla simple de cierre - Single-line Composer Composición de una línea + Middle Eastern & South Asian Single-line Composer Composición de una línea (Oriente Medio y Sur de Asia) + Standard Single-line Composer Composición estándar de una línea Toggle Line Composer Alternar composición de líneas Sixth Space Sexto de espacio Size Tamaño @@ -7439,3 +7441,4 @@ breakText Glyphs Glifos Grommets Ojales Grommet Inset Distancia de los ojales al borde Diameter Diámetro +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer debe ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index 36f4c9f5a9..48f8771fb2 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -1990,7 +1990,8 @@ digits Malayalam Malajalam Tabular Lining Taulukkonumerot Tabular Oldstyle Vanhanaikaiset taulukkonumerot Titling Alternates Otsikkovaihtoehdot - Every-line Composer Kaikkien rivien asettelu + Middle Eastern & South Asian Every-line Composer Kaikkien rivien asettelu (Lähi-itä ja Etelä-Aasia) + Standard Every-line Composer Tavallinen kaikkien rivien asettelu First-line Left Indent Ensimmäisen rivin vasen sisennys Hyphenation… Tavutus… Words Longer Than: Sanat, jotka ovat pidempiä kuin: @@ -2030,7 +2031,8 @@ digits Malayalam Malajalam East Asian Composition Settings Itäaasialaisen ladonnan asetukset Korean Composition Settings Korean ladonnan asetukset Select a text object to edit its paragraph attributes. Valitse tekstiobjekti, jonka kappalemääritteitä haluat muokata. - Single-line Composer Yhden rivin asettelu + Middle Eastern & South Asian Single-line Composer Yhden rivin asettelu (Lähi-itä ja Etelä-Aasia) + Standard Single-line Composer Tavallinen yhden rivin asettelu Toggle Line Composer Vaihda rivien asettelu Space After Paragraph Väli kappaleen jälkeen Space Before Paragraph Väli ennen kappaletta @@ -7530,3 +7532,4 @@ breakText Glyphs Merkit Grommets Purjerenkaat Grommet Inset Purjerenkaiden etäisyys reunasta Diameter Halkaisija +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer on oltava "singleLine", "everyLine", "standardSingleLine" tai "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index a3d1c9b785..a8b4313e28 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -1064,7 +1064,8 @@ font-technology Variable Variables Every (minutes) Toutes les (minutes) Every option is at its default. Toutes les options ont leur valeur par défaut. Every option matches {base}. Toutes les options correspondent à {base}. - Every-line Composer Compositeur multiligne + Middle Eastern & South Asian Every-line Composer Compositeur multiligne (Moyen-Orient et Asie du Sud) + Standard Every-line Composer Compositeur standard multiligne Exact dash lengths Longueurs de tirets exactes Exceptions (comma separated) Exceptions (séparées par des virgules) Exclude Exclusion @@ -3395,7 +3396,8 @@ digits Malayalam Malayalam Single Left Quotation Mark Guillemet simple ouvrant Single Quotes: Guillemets simples : Single Right Quotation Mark Guillemet simple fermant - Single-line Composer Compositeur ligne par ligne + Middle Eastern & South Asian Single-line Composer Compositeur ligne par ligne (Moyen-Orient et Asie du Sud) + Standard Single-line Composer Compositeur standard ligne par ligne Toggle Line Composer Basculer le compositeur de lignes Sixth Space Espace d’un sixième Size Taille @@ -7490,3 +7492,4 @@ breakText Glyphs Glyphes Grommets Œillets Grommet Inset Distance des œillets au bord Diameter Diamètre +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer doit être "singleLine", "everyLine", "standardSingleLine" ou "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index dff4c3503c..62b9be659b 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -1699,7 +1699,8 @@ antiAlias Sharp शार्प Every (minutes) हर (मिनट) Every option is at its default. प्रत्येक ऑप्शन इसके डिफ़ॉल्ट रूप से होता है। Every option matches {base}. प्रत्येक ऑप्शन {base} से मेल खाता है। - Every-line Composer हर लाइन संगीतकार + Middle Eastern & South Asian Every-line Composer हर लाइन संगीतकार (मध्य पूर्व और दक्षिण एशिया) + Standard Every-line Composer मानक हर लाइन संगीतकार Exact सटीक Exact dash lengths सटीक डैश लंबाई Example: {name} उदाहरण: {name} @@ -4673,7 +4674,8 @@ antiAlias Sharp शार्प Single Quotes: एकल उद्धरण: Single Right Quotation Mark सिंगल राइट कोटेशन मार्क Single Word Justification: एकल शब्द जस्टिफ़िकेशन: - Single-line Composer एकल लाइन संगीतकार + Middle Eastern & South Asian Single-line Composer एकल लाइन संगीतकार (मध्य पूर्व और दक्षिण एशिया) + Standard Single-line Composer मानक एकल लाइन संगीतकार Sixth Space छठे हिस्से जितना स्पेस Size आकार Size Tile to Art आकार टाइल कला के लिए @@ -6567,7 +6569,7 @@ antiAlias Sharp शार्प @msg command `{id}` is not available right now आदेश `{id}` अभी उपलब्ध नहीं है @msg command must be a shape.* command command कोई shape.* कमांड होना चाहिए @msg commands[{i}]: missing `command` आदेश [{i}]: लापता `command` -@msg composer must be "singleLine" or "everyLine" composer "singleLine" या "everyLine" होना चाहिए +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer "singleLine", "everyLine", "standardSingleLine" या "standardEveryLine" होना चाहिए @msg compound {_1} must contain exactly one open path to join जोड़ने के लिए कंपाउंड {_1} में ठीक एक खुला पाथ होना चाहिए @msg compound paths can only contain paths यौगिक पाथ में केवल पाथ हो सकते हैं @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes कंपाउंड शेप पाथ, कंपाउंड पाथ, समूह, कंपाउंड शेप, टाइप, ब्लेंड और एन्वेलप लेते हैं diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 8549bd5d63..22842926eb 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -1356,7 +1356,8 @@ font-technology Variable Változó Every (minutes) Gyakoriság (perc) Every option is at its default. Minden beállítás az alapértéken áll. Every option matches {base}. Minden beállítás egyezik: {base}. - Every-line Composer Többsoros tördelő + Middle Eastern & South Asian Every-line Composer Többsoros tördelő (Közel-Kelet és Dél-Ázsia) + Standard Every-line Composer Normál többsoros tördelő Exact Pontos Exact dash lengths Pontos vonalhosszak Exceptions (comma separated) Kivételek (vesszővel elválasztva) @@ -4052,7 +4053,8 @@ mark-style Japanese Japán Single Left Quotation Mark Bal oldali szimpla idézőjel Single Quotes: Szimpla idézőjelek: Single Right Quotation Mark Jobb oldali szimpla idézőjel - Single-line Composer Egysoros tördelő + Middle Eastern & South Asian Single-line Composer Egysoros tördelő (Közel-Kelet és Dél-Ázsia) + Standard Single-line Composer Normál egysoros tördelő Toggle Line Composer Sortördelő váltása Sixth Space Hatodkvirt-szóköz Size Méret @@ -7479,3 +7481,4 @@ breakText Glyphs Glifák Grommets Ringlik Grommet Inset Ringlik távolsága a széltől Diameter Átmérő +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer értéke "singleLine", "everyLine", "standardSingleLine" vagy "standardEveryLine" lehet diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index e27253376e..1ca61352cf 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -1837,7 +1837,8 @@ digits Malayalam Malayalam Tabular Lining Lining tabular Tabular Oldstyle Oldstyle tabular Titling Alternates Alternatif judul - Every-line Composer Komposer tiap baris + Middle Eastern & South Asian Every-line Composer Komposer tiap baris (Timur Tengah dan Asia Selatan) + Standard Every-line Composer Komposer standar tiap baris First-line Left Indent Indentasi kiri baris pertama Hyphenation… Pemenggalan kata… Justification… Justifikasi… @@ -1869,7 +1870,8 @@ digits Malayalam Malayalam East Asian Composition Settings Pengaturan komposisi Asia Timur Korean Composition Settings Pengaturan komposisi Korea Select a text object to edit its paragraph attributes. Pilih objek teks untuk mengedit atribut paragrafnya. - Single-line Composer Komposer satu baris + Middle Eastern & South Asian Single-line Composer Komposer satu baris (Timur Tengah dan Asia Selatan) + Standard Single-line Composer Komposer standar satu baris Toggle Line Composer Alihkan komposer baris Space After Paragraph Spasi setelah paragraf Space Before Paragraph Spasi sebelum paragraf @@ -6899,3 +6901,4 @@ breakText Glyphs Glif Grommets Mata ayam Grommet Inset Jarak mata ayam dari tepi Diameter Diameter +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer harus "singleLine", "everyLine", "standardSingleLine", atau "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 2381051c9b..b8b2cf14b4 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -1078,7 +1078,8 @@ font-technology Variable Variabili Every (minutes) Ogni (minuti) Every option is at its default. Tutte le opzioni hanno il valore predefinito. Every option matches {base}. Tutte le opzioni corrispondono a {base}. - Every-line Composer Composizione su tutte le righe + Middle Eastern & South Asian Every-line Composer Composizione su tutte le righe (Medio Oriente e Asia meridionale) + Standard Every-line Composer Composizione standard su tutte le righe Exact dash lengths Lunghezze esatte dei trattini Exceptions (comma separated) Eccezioni (separate da virgole) Exclude Escludi @@ -3448,7 +3449,8 @@ digits Malayalam Malayalam Single Left Quotation Mark Virgoletta singola di apertura Single Quotes: Virgolette singole: Single Right Quotation Mark Virgoletta singola di chiusura - Single-line Composer Composizione su riga singola + Middle Eastern & South Asian Single-line Composer Composizione su riga singola (Medio Oriente e Asia meridionale) + Standard Single-line Composer Composizione standard su riga singola Toggle Line Composer Alterna composizione delle righe Sixth Space Spazio di un sesto Size Dimensione @@ -7966,7 +7968,7 @@ breakText Glyphs Glifi @msg column: true floats the whole column and takes no onto, above or below column: true rende mobile l'intera colonna e non accetta onto, above o below @msg command must be a shape.* command command deve essere un comando shape.* @msg commands[{i}]: missing `command` commands[{i}]: `command` mancante -@msg composer must be "singleLine" or "everyLine" composer deve essere "singleLine" o "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer deve essere "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes le forme composte accettano tracciati, tracciati composti, gruppi, forme composte, testo, fusioni e involucri @msg compound {_1} must contain exactly one open path to join il composto {_1} deve contenere esattamente un tracciato aperto da unire @msg connect end must be "start" or "end" end di connect deve essere "start" o "end" diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 1458bf2aa1..e326aaae1f 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -1666,7 +1666,8 @@ antiAlias Sharp シャープ Every (minutes) 間隔 (分) Every option is at its default. すべてのオプションが初期値です。 Every option matches {base}. すべてのオプションが {base} と同じです。 - Every-line Composer すべての行を一括処理 + Middle Eastern & South Asian Every-line Composer すべての行を一括処理 (中東・南アジア) + Standard Every-line Composer すべての行を一括処理 (標準) Exact dash lengths 破線の長さを正確に保つ Exceptions (comma separated) 例外 (カンマ区切り) Exclusion 除外 @@ -3256,7 +3257,8 @@ mark-style Japanese 日本式 Simulate Colored Paper 色紙をシミュレート Simulate Paper 紙色をシミュレート Single Quotes: 一重引用符: - Single-line Composer 1 行ずつ組む + Middle Eastern & South Asian Single-line Composer 1 行ずつ組む (中東・南アジア) + Standard Single-line Composer 1 行ずつ組む (標準) Toggle Line Composer 行の組版方式を切り替え Size Tile to Art タイルをアートワークのサイズに合わせる Size/Leading サイズ/行送り @@ -7191,3 +7193,4 @@ breakText Glyphs 字形 Grommets ハトメ Grommet Inset 端からハトメまでの距離 Diameter 直径 +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer は "singleLine"、"everyLine"、"standardSingleLine"、"standardEveryLine" のいずれかにしてください diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 9105fe50e7..e339971692 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -1766,7 +1766,8 @@ digits Malayalam მალაიალამური Tabular Lining ცხრილური ხაზოვანი Tabular Oldstyle ცხრილური ძველებური Titling Alternates სათაურის ალტერნატივები - Every-line Composer აბზაცის მიხედვით აწყობა + Middle Eastern & South Asian Every-line Composer აბზაცის მიხედვით აწყობა (შუა აღმოსავლეთი და სამხრეთ აზია) + Standard Every-line Composer სტანდარტული აბზაცის მიხედვით აწყობა First-line Left Indent პირველი სტრიქონის მარცხენა შეწევა Hyphenation… სიტყვების გადატანა… Justification… სწორება… @@ -1798,7 +1799,8 @@ digits Malayalam მალაიალამური East Asian Composition Settings აღმოსავლეთ აზიური აწყობის პარამეტრები Korean Composition Settings კორეული აწყობის პარამეტრები Select a text object to edit its paragraph attributes. აბზაცის ატრიბუტების რედაქტირებისთვის მონიშნეთ ტექსტური ობიექტი. - Single-line Composer სტრიქონის მიხედვით აწყობა + Middle Eastern & South Asian Single-line Composer სტრიქონის მიხედვით აწყობა (შუა აღმოსავლეთი და სამხრეთ აზია) + Standard Single-line Composer სტანდარტული სტრიქონის მიხედვით აწყობა Toggle Line Composer აწყობის რეჟიმის გადართვა Space After Paragraph ინტერვალი აბზაცის შემდეგ Space Before Paragraph ინტერვალი აბზაცის წინ @@ -7609,3 +7611,4 @@ font-script Japanese იაპონური Grommets ლუვერები Grommet Inset ლუვერების დაშორება კიდიდან Diameter დიამეტრი +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer უნდა იყოს "singleLine", "everyLine", "standardSingleLine" ან "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index fd75f983ce..d606239f79 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -1656,7 +1656,8 @@ antiAlias Sharp 날카롭게 Every (minutes) 간격 (분) Every option is at its default. 모든 옵션이 기본값입니다. Every option matches {base}. 모든 옵션이 {base}와(과) 같습니다. - Every-line Composer 전체 줄 컴포저 + Middle Eastern & South Asian Every-line Composer 전체 줄 컴포저 (중동·남아시아) + Standard Every-line Composer 표준 전체 줄 컴포저 Exact dash lengths 정확한 대시 길이 Exceptions (comma separated) 예외 (쉼표로 구분) Exclusion 제외 @@ -3245,7 +3246,8 @@ mark-style Japanese 일본식 Simulate Colored Paper 색 용지 시뮬레이션 Simulate Paper 용지 시뮬레이션 Single Quotes: 작은따옴표: - Single-line Composer 한 줄 조판 + Middle Eastern & South Asian Single-line Composer 한 줄 조판 (중동·남아시아) + Standard Single-line Composer 표준 한 줄 조판 Toggle Line Composer 줄 조판 방식 전환 Size Tile to Art 타일을 아트웍 크기에 맞춤 Size/Leading 크기/행간 @@ -7086,3 +7088,4 @@ breakText Glyphs 글리프 Grommets 아일렛 Grommet Inset 가장자리에서 아일렛까지 거리 Diameter 지름 +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer는 "singleLine", "everyLine", "standardSingleLine" 또는 "standardEveryLine"이어야 합니다 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index cd3aa43966..8170f18e3f 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -2354,7 +2354,8 @@ digits Malayalam Malayalam Tabular Lining Tabulaire lining Tabular Oldstyle Tabulaire oldstyle Titling Alternates Titelalternatieven - Every-line Composer Compositie per alinea + Middle Eastern & South Asian Every-line Composer Compositie per alinea (Midden-Oosten en Zuid-Azië) + Standard Every-line Composer Standaardcompositie per alinea First-line Left Indent Eerste regel links inspringen Hyphenation… Afbreken… Justification… Uitvullen… @@ -2386,7 +2387,8 @@ digits Malayalam Malayalam East Asian Composition Settings Instellingen voor Oost-Aziatische zetting Korean Composition Settings Instellingen voor Koreaanse zetting Select a text object to edit its paragraph attributes. Selecteer een tekstobject om de alineakenmerken ervan te bewerken. - Single-line Composer Compositie per regel + Middle Eastern & South Asian Single-line Composer Compositie per regel (Midden-Oosten en Zuid-Azië) + Standard Single-line Composer Standaardcompositie per regel Toggle Line Composer Compositiemethode wisselen Space After Paragraph Ruimte na alinea Space Before Paragraph Ruimte voor alinea @@ -7522,3 +7524,4 @@ breakText Glyphs Glyphs Grommets Zeilringen Grommet Inset Afstand van zeilringen tot de rand Diameter Diameter +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer moet "singleLine", "everyLine", "standardSingleLine" of "standardEveryLine" zijn diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 5f274cef09..85d95d8134 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -1947,7 +1947,8 @@ digits Malayalam Malajalam Tabular Lining Tabelaryczne nowoczesne Tabular Oldstyle Tabelaryczne nautyczne Titling Alternates Alternatywy tytułowe - Every-line Composer Kompozytor wielowierszowy + Middle Eastern & South Asian Every-line Composer Kompozytor wielowierszowy (Bliski Wschód i Azja Południowa) + Standard Every-line Composer Standardowy kompozytor wielowierszowy First-line Left Indent Wcięcie pierwszego wiersza Hyphenation… Dzielenie wyrazów… Words Longer Than: Wyrazy dłuższe niż: @@ -1987,7 +1988,8 @@ digits Malayalam Malajalam East Asian Composition Settings Ustawienia składu wschodnioazjatyckiego Korean Composition Settings Ustawienia składu koreańskiego Select a text object to edit its paragraph attributes. Zaznacz obiekt tekstowy, aby edytować atrybuty akapitu. - Single-line Composer Kompozytor jednowierszowy + Middle Eastern & South Asian Single-line Composer Kompozytor jednowierszowy (Bliski Wschód i Azja Południowa) + Standard Single-line Composer Standardowy kompozytor jednowierszowy Toggle Line Composer Przełącz kompozytor wierszy Space After Paragraph Odstęp po akapicie Space Before Paragraph Odstęp przed akapitem @@ -8205,7 +8207,7 @@ breakText Glyphs Glify @msg column: true floats the whole column and takes no onto, above or below column: true odłącza całą kolumnę i nie przyjmuje onto, above ani below @msg command must be a shape.* command command musi być poleceniem shape.* @msg commands[{i}]: missing `command` commands[{i}]: brak `command` -@msg composer must be "singleLine" or "everyLine" composer musi mieć wartość "singleLine" lub "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer musi mieć wartość "singleLine", "everyLine", "standardSingleLine" lub "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes kształty złożone przyjmują ścieżki, ścieżki złożone, grupy, kształty złożone, tekst, przejścia i koperty @msg compound {_1} must contain exactly one open path to join obiekt złożony {_1} musi zawierać dokładnie jedną otwartą ścieżkę do połączenia @msg connect needs a path other than the one extended connect wymaga ścieżki innej niż przedłużana diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index a9e56041f4..0203e3f850 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -960,7 +960,8 @@ antiAlias Sharp Nítido Every (minutes) A cada (minutos) Every option is at its default. Todas as opções estão no padrão. Every option matches {base}. Todas as opções correspondem a {base}. - Every-line Composer Compositor de Todas as Linhas + Middle Eastern & South Asian Every-line Composer Compositor de Todas as Linhas (Oriente Médio e Sul da Ásia) + Standard Every-line Composer Compositor Padrão de Todas as Linhas Exact dash lengths Comprimentos de tracejado exatos Exceptions (comma separated) Exceções (separadas por vírgula) Exclude Excluir @@ -2877,7 +2878,8 @@ digits Malayalam Malaiala Single Left Quotation Mark Aspa Esquerda Única Single Quotes: Aspas Simples: Single Right Quotation Mark Aspa Direita Única - Single-line Composer Compositor de Linha Única + Middle Eastern & South Asian Single-line Composer Compositor de Linha Única (Oriente Médio e Sul da Ásia) + Standard Single-line Composer Compositor Padrão de Linha Única Toggle Line Composer Alternar Compositor de Linhas Sixth Space Espaço de Sexto Size Tamanho @@ -8181,7 +8183,7 @@ swatch Yellow Green Verde-amarelado @msg column: true floats the whole column and takes no onto, above or below column: true torna flutuante a coluna inteira e não aceita onto, above nem below @msg command must be a shape.* command command deve ser um comando shape.* @msg commands[{i}]: missing `command` commands[{i}]: falta `command` -@msg composer must be "singleLine" or "everyLine" composer deve ser "singleLine" ou "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer deve ser "singleLine", "everyLine", "standardSingleLine" ou "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes formas compostas aceitam caminhos, caminhos compostos, grupos, formas compostas, texto, mesclagens e envelopes @msg compound {_1} must contain exactly one open path to join o composto {_1} deve conter exatamente um caminho aberto para unir @msg connect needs a path other than the one extended connect precisa de um caminho diferente do que foi estendido diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 4ea3511c36..74e6e6ea40 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -1067,7 +1067,8 @@ font-technology Variable Вариативные Every (minutes) Каждые (минут) Every option is at its default. Все параметры имеют значения по умолчанию. Every option matches {base}. Все параметры совпадают с {base}. - Every-line Composer Компоновщик всех строк + Middle Eastern & South Asian Every-line Composer Компоновщик всех строк (Ближний Восток и Южная Азия) + Standard Every-line Composer Стандартный компоновщик всех строк Exact dash lengths Точная длина штрихов Exceptions (comma separated) Исключения (через запятую) Exclude Исключить @@ -3435,7 +3436,8 @@ digits Malayalam Малаялам Single Left Quotation Mark Одинарная открывающая кавычка Single Quotes: Одинарные кавычки: Single Right Quotation Mark Одинарная закрывающая кавычка - Single-line Composer Однострочный компоновщик + Middle Eastern & South Asian Single-line Composer Однострочный компоновщик (Ближний Восток и Южная Азия) + Standard Single-line Composer Стандартный однострочный компоновщик Toggle Line Composer Переключить компоновщик строк Sixth Space Шестая шпация Size Размер @@ -7584,3 +7586,4 @@ shape Open Открытый Grommets Люверсы Grommet Inset Отступ люверсов от края Diameter Диаметр +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer должен быть "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 9a0de40468..67604f634b 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -1048,7 +1048,8 @@ font-technology Variable Variabla Every (minutes) Intervall (minuter) Every option is at its default. Alla alternativ har standardvärden. Every option matches {base}. Alla alternativ matchar {base}. - Every-line Composer Flerradssättning + Middle Eastern & South Asian Every-line Composer Flerradssättning (Mellanöstern och Sydasien) + Standard Every-line Composer Standard-flerradssättning Exact dash lengths Exakta strecklängder Exceptions (comma separated) Undantag (kommaavgränsade) Exclude Uteslut @@ -3325,7 +3326,8 @@ digits Malayalam Malayalam Single Left Quotation Mark Enkelt vänster citattecken Single Quotes: Enkla citattecken: Single Right Quotation Mark Enkelt höger citattecken - Single-line Composer Enradssättare + Middle Eastern & South Asian Single-line Composer Enradssättare (Mellanöstern och Sydasien) + Standard Single-line Composer Standard-enradssättare Toggle Line Composer Växla radsättare Sixth Space Sjättedelsblanksteg Size Storlek @@ -7874,7 +7876,7 @@ digits Hindi Hindi @msg column: true floats the whole column and takes no onto, above or below column: true gör hela kolumnen flytande och tar inte onto, above eller below @msg command must be a shape.* command command måste vara ett shape.*-kommando @msg commands[{i}]: missing `command` commands[{i}]: `command` saknas -@msg composer must be "singleLine" or "everyLine" composer måste vara "singleLine" eller "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer måste vara "singleLine", "everyLine", "standardSingleLine" eller "standardEveryLine" @msg compound {_1} must contain exactly one open path to join sammansatt {_1} måste innehålla exakt en öppen bana att foga samman @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes sammansatta former tar banor, sammansatta banor, grupper, sammansatta former, text, övergångar och kuvert @msg connect end must be "start" or "end" connect end måste vara "start" eller "end" diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index a457467ef6..4e086833ab 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -1040,7 +1040,8 @@ font-technology Variable Değişken Every (minutes) Her (dakika) Every option is at its default. Her seçenek varsayılan değerdedir. Every option matches {base}. Her seçenek {base} ile eşleşir. - Every-line Composer Her Satır Bestecisi + Middle Eastern & South Asian Every-line Composer Her Satır Bestecisi (Orta Doğu ve Güney Asya) + Standard Every-line Composer Standart Her Satır Bestecisi Exact dash lengths Tam çizgi uzunlukları Exceptions (comma separated) İstisnalar (virgülle ayrılmış) Exclude Hariç tut @@ -3201,7 +3202,8 @@ digits Malayalam Malayalam Single Left Quotation Mark Tek Sol Tırnak İşareti Single Quotes: Tek Alıntılar: Single Right Quotation Mark Tek Sağ Tırnak İşareti - Single-line Composer Tek Satır Oluşturucu + Middle Eastern & South Asian Single-line Composer Tek Satır Oluşturucu (Orta Doğu ve Güney Asya) + Standard Single-line Composer Standart Tek Satır Oluşturucu Toggle Line Composer Satır Oluşturucuyu Değiştir Sixth Space Altıncı Uzay Size Boyut @@ -7451,3 +7453,4 @@ breakText Glyphs Glifler Grommets Kuşgözleri Grommet Inset Kuşgözlerinin kenara uzaklığı Diameter Çap +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer "singleLine", "everyLine", "standardSingleLine" veya "standardEveryLine" olmalıdır diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 18a118822f..1de2f2b880 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -1072,7 +1072,8 @@ font-technology Variable Варіативні Every (minutes) Кожен (хвилин) Every option is at its default. Усі параметри мають значення за промовчанням. Every option matches {base}. Усі параметри збігаються з {base}. - Every-line Composer Компонувальник всіх рядків + Middle Eastern & South Asian Every-line Composer Компонувальник всіх рядків (Близький Схід і Південна Азія) + Standard Every-line Composer Стандартний компонувальник всіх рядків Exact dash lengths Точна довжина штрихів Exceptions (comma separated) Винятки (через кому) Exclude Виключити @@ -3440,7 +3441,8 @@ digits Malayalam Малаялам Single Left Quotation Mark Одинарна лапка, що відкриває Single Quotes: Одинарні лапки: Single Right Quotation Mark Одинарна лапка, що закриває - Single-line Composer Однорядковий компонувальник + Middle Eastern & South Asian Single-line Composer Однорядковий компонувальник (Близький Схід і Південна Азія) + Standard Single-line Composer Стандартний однорядковий компонувальник Toggle Line Composer Переключити компонувальник рядків Sixth Space Шоста шпація Size Розмір @@ -7715,7 +7717,7 @@ breakText Glyphs Гліфи @msg column: true floats the whole column and takes no onto, above or below column: true робить плаваючим увесь стовпець і не приймає onto, above або below @msg command must be a shape.* command command має бути командою shape.* @msg commands[{i}]: missing `command` commands[{i}]: відсутній `command` -@msg composer must be "singleLine" or "everyLine" composer має бути "singleLine" або "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer має бути "singleLine", "everyLine", "standardSingleLine" або "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes складені фігури приймають контури, складені контури, групи, складені фігури, текст, переходи й оболонки @msg compound {_1} must contain exactly one open path to join складений об’єкт {_1} має містити рівно один відкритий контур для з’єднання @msg connect needs a path other than the one extended для connect потрібен контур, відмінний від того, що продовжується diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index db36624af7..5e091c8288 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -1245,7 +1245,8 @@ font-technology Variable Biến thiên Every (minutes) Mỗi (phút) Every option is at its default. Mọi tùy chọn đang ở mặc định. Every option matches {base}. Mọi tùy chọn khớp với {base}. - Every-line Composer Soạn theo từng dòng + Middle Eastern & South Asian Every-line Composer Soạn theo từng dòng (Trung Đông và Nam Á) + Standard Every-line Composer Soạn theo từng dòng tiêu chuẩn Exact dash lengths Độ dài nét đứt chính xác Exceptions (comma separated) Ngoại lệ (phân cách bằng dấu phẩy) Exclude Loại trừ @@ -3795,7 +3796,8 @@ mark-style Japanese Kiểu Nhật Single Left Quotation Mark Dấu nháy đơn mở Single Quotes: Dấu nháy đơn: Single Right Quotation Mark Dấu nháy đơn đóng - Single-line Composer Soạn thảo một dòng + Middle Eastern & South Asian Single-line Composer Soạn thảo một dòng (Trung Đông và Nam Á) + Standard Single-line Composer Soạn thảo một dòng tiêu chuẩn Toggle Line Composer Chuyển đổi cách soạn dòng Sixth Space Dấu cách 1/6 Size Kích thước @@ -7106,3 +7108,4 @@ breakText Glyphs Glyph Grommets Khoen Grommet Inset Khoảng cách từ mép đến khoen Diameter Đường kính +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer phải là "singleLine", "everyLine", "standardSingleLine" hoặc "standardEveryLine" diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 0b0639e602..0a390e9e6a 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -1012,7 +1012,8 @@ antiAlias Sharp 锐利 Every (minutes) 每隔 (分钟) Every option is at its default. 所有选项皆为默认值。 Every option matches {base}. 所有选项皆与{base}相同。 - Every-line Composer 逐行排版器 + Middle Eastern & South Asian Every-line Composer 逐行排版器(中东和南亚) + Standard Every-line Composer 标准逐行排版器 Exact dash lengths 精确虚线长度 Exceptions (comma separated) 例外词 (逗号分隔) Exclude 差集 @@ -3264,7 +3265,8 @@ digits Malayalam 马拉雅拉姆数字 Single Left Quotation Mark 左单引号 Single Quotes: 单引号: Single Right Quotation Mark 右单引号 - Single-line Composer 单行排版器 + Middle Eastern & South Asian Single-line Composer 单行排版器(中东和南亚) + Standard Single-line Composer 标准单行排版器 Toggle Line Composer 切换行排版器 Sixth Space 六分之一空格 Size 大小 @@ -8191,7 +8193,7 @@ breakText Glyphs 字形 @msg column: true floats the whole column and takes no onto, above or below column: true 会使整列浮动,不能再给出 onto、above 或 below @msg command must be a shape.* command command 必须是 shape.* 命令 @msg commands[{i}]: missing `command` commands[{i}]:缺少 `command` -@msg composer must be "singleLine" or "everyLine" composer 必须是 "singleLine" 或 "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer 必须是 "singleLine"、"everyLine"、"standardSingleLine" 或 "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes 复合形状接受路径、复合路径、编组、复合形状、文字、混合和封套 @msg compound {_1} must contain exactly one open path to join 复合对象 {_1} 必须恰好包含一条要连接的开放路径 @msg connect needs a path other than the one extended connect 需要一条不同于被延伸路径的路径 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index e72c0d1a0d..bd89fd021f 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -1042,7 +1042,8 @@ font-technology Variable 可變 Every (minutes) 每隔 (分鐘) Every option is at its default. 所有選項皆為預設值。 Every option matches {base}. 所有選項皆與{base}相同。 - Every-line Composer 逐行排版程式 + Middle Eastern & South Asian Every-line Composer 逐行排版程式(中東與南亞) + Standard Every-line Composer 標準逐行排版程式 Exact dash lengths 精確虛線長度 Exceptions (comma separated) 例外 (以逗號分隔) Exclude 差集 @@ -4517,7 +4518,8 @@ digits Malayalam 馬來亞拉姆數字 Single Left Quotation Mark 左單引號 Single Quotes: 單引號: Single Right Quotation Mark 右單引號 - Single-line Composer 單行排版程式 + Middle Eastern & South Asian Single-line Composer 單行排版程式(中東與南亞) + Standard Single-line Composer 標準單行排版程式 Toggle Line Composer 切換行排版程式 Sixth Space 六分之一空格 Size 大小 @@ -7999,7 +8001,7 @@ breakText Glyphs 字符 @msg column: true floats the whole column and takes no onto, above or below column: true 會讓整欄浮動,不接受 onto、above 或 below @msg command must be a shape.* command command 必須是 shape.* 指令 @msg commands[{i}]: missing `command` commands[{i}]:未提供 `command` -@msg composer must be "singleLine" or "everyLine" composer 必須是 "singleLine" 或 "everyLine" +@msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer 必須是 "singleLine"、"everyLine"、"standardSingleLine" 或 "standardEveryLine" @msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes 複合形狀接受路徑、複合路徑、群組、複合形狀、文字、漸變物件和封套 @msg compound {_1} must contain exactly one open path to join 複合路徑 {_1} 必須剛好包含一條可連接的開放路徑 @msg connect needs a path other than the one extended connect 需要延伸路徑以外的另一條路徑 diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs index 255d0836b5..029ddf955a 100644 --- a/crates/ui-egui/src/menus/ui_commands.rs +++ b/crates/ui-egui/src/menus/ui_commands.rs @@ -393,7 +393,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "type.lineComposer", "Toggle Line Composer", "Cmd+Alt+Shift+C", - "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer (text.setFormat {composer}) → \"singleLine\" | \"everyLine\"", + "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer, each keeping its shaping: Middle Eastern & South Asian or Standard (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"", ), ( "type.hyphenate", diff --git a/crates/ui-egui/src/panels/paragraph.rs b/crates/ui-egui/src/panels/paragraph.rs index e02d81e14c..3c1a0fe9c8 100644 --- a/crates/ui-egui/src/panels/paragraph.rs +++ b/crates/ui-egui/src/panels/paragraph.rs @@ -54,15 +54,27 @@ pub(crate) fn align(app: &mut VectorcraftApp, justify: &str) -> Result Result { text_style(app).ok_or("select some type first")?; - let id = if shared_composer(app) == Some(Composer::EveryLine) { "singleLine" } else { "everyLine" }; + let shared = shared_composer(app); + let to_single = shared.is_some_and(|c| !c.is_single_line()); + let id = composer_id(shared.unwrap_or_default().with_breaking(to_single)); format(app, json!({ "composer": id })); Ok(json!(id)) } +/// The `text.setFormat` value of `composer`. +fn composer_id(composer: Composer) -> &'static str { + match composer { + Composer::SingleLine => "singleLine", + Composer::EveryLine => "everyLine", + Composer::StandardSingleLine => "standardSingleLine", + Composer::StandardEveryLine => "standardEveryLine", + } +} + /// `type.hyphenate` (Cmd+Alt+Shift+H): what the Hyphenate checkbox does, on the paragraphs the /// panel acts on. Returns whether they now hyphenate. pub(crate) fn toggle_hyphenate(app: &mut VectorcraftApp) -> Result { @@ -876,11 +888,14 @@ pub fn menu(app: &mut VectorcraftApp, ui: &mut Ui) { } ui.separator(); let composer = shared_composer(app); - for (c, label, id) in - [(Composer::SingleLine, tl!("Single-line Composer"), "singleLine"), (Composer::EveryLine, tl!("Every-line Composer"), "everyLine")] - { + for (c, label) in [ + (Composer::SingleLine, tl!("Middle Eastern & South Asian Single-line Composer")), + (Composer::EveryLine, tl!("Middle Eastern & South Asian Every-line Composer")), + (Composer::StandardSingleLine, tl!("Standard Single-line Composer")), + (Composer::StandardEveryLine, tl!("Standard Every-line Composer")), + ] { if menu_item(ui, label, has, composer == Some(c)) { - format(app, json!({ "composer": id })); + format(app, json!({ "composer": composer_id(c) })); } } ui.separator(); diff --git a/crates/ui-egui/src/panels/paragraph/tests.rs b/crates/ui-egui/src/panels/paragraph/tests.rs index 180f0b1fa1..518df239ae 100644 --- a/crates/ui-egui/src/panels/paragraph/tests.rs +++ b/crates/ui-egui/src/panels/paragraph/tests.rs @@ -82,6 +82,69 @@ fn paragraph_mixed_composer_checks_neither_menu_item() { assert_eq!(shared_composer(&app), Some(Composer::EveryLine)); } +/// Cmd+Alt+Shift+C switches between Single-line and Every-line and keeps what each paragraph's +/// composer does with complex scripts: a Standard composer toggles to the other Standard one. +#[test] +fn toggling_the_line_composer_keeps_the_shaping() { + let (mut app, id) = editing_text("A\nB\n"); + for (from, first, second) in [ + ("standardEveryLine", "standardSingleLine", "standardEveryLine"), + ("everyLine", "singleLine", "everyLine"), + ("standardSingleLine", "standardEveryLine", "standardSingleLine"), + ] { + app.run("text.setFormat", json!({"id": id, "composer": from})).unwrap(); + app.session.set_tool_option("selectAll", &json!(true)); + assert_eq!(toggle_composer(&mut app).unwrap(), json!(first), "{from}"); + assert_eq!(toggle_composer(&mut app).unwrap(), json!(second), "{from} again"); + } + // Paragraphs that differ take Every-line, as before the Standard composers existed. + app.run("text.setFormat", json!({"id": id, "composer": "standardSingleLine"})).unwrap(); + app.run("text.setFormat", json!({"id": id, "start": 2, "end": 3, "composer": "singleLine"})).unwrap(); + app.session.set_tool_option("selectAll", &json!(true)); + assert_eq!(toggle_composer(&mut app).unwrap(), json!("everyLine")); +} + +/// The Paragraph panel menu lists the four composers, and ticks the one every selected paragraph has. +#[test] +fn the_paragraph_menu_sets_each_of_the_four_composers() { + let (mut app, id) = editing_text("A\nB\n"); + app.session.set_tool_option("selectAll", &json!(true)); + let ctx = egui::Context::default(); + let items = |app: &mut VectorcraftApp| { + let mut seen = vec![]; + let mut out = ctx.run_ui(egui::RawInput::default(), |ui| menu(app, ui)); + out.textures_delta.clear(); + for shape in out.shapes { + collect_texts(&shape.shape, &mut seen); + } + seen + }; + fn collect_texts(shape: &egui::Shape, out: &mut Vec) { + match shape { + egui::Shape::Vec(v) => v.iter().for_each(|s| collect_texts(s, out)), + egui::Shape::Text(t) => out.push(t.galley.text().to_string()), + _ => {} + } + } + let texts = items(&mut app); + for label in [ + "Middle Eastern & South Asian Single-line Composer", + "Middle Eastern & South Asian Every-line Composer", + "Standard Single-line Composer", + "Standard Every-line Composer", + ] { + assert!(texts.iter().any(|t| t == label), "{label} in {texts:?}"); + } + for (value, want) in [ + ("standardEveryLine", Composer::StandardEveryLine), + ("singleLine", Composer::SingleLine), + ("standardSingleLine", Composer::StandardSingleLine), + ] { + app.run("text.setFormat", json!({"id": id, "composer": value})).unwrap(); + assert_eq!(shared_composer(&app), Some(want), "{value}"); + } +} + #[test] fn paragraph_mixed_hyphenate_checks_off() { let (mut app, id) = editing_text("A\nB\n"); diff --git a/docs/mcp.md b/docs/mcp.md index 1ad05ba3df..e435dfb1a2 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -1,6 +1,6 @@ # VectorCraft MCP server -> **Last updated:** 2026-11-13 · **Change:** Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; no response-shape change. Previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter (#7097); existing response shapes retained. +> **Last updated:** 2026-11-14 · **Change:** `text.setFormat {composer}` and paragraph styles also take `standardSingleLine` and `standardEveryLine` (#4935); existing values and responses unchanged. Previously: Snap to Point with Smart Guides off draws no Smart Guides labels or lines, #7250; no response-shape change. Previously: Envelopes: a top object's side whose pieces are all one curve split at anchors follows that curve's parameter (#7097); existing response shapes retained. `vectorcraft-cli mcp` runs a [Model Context Protocol](https://modelcontextprotocol.io) server on stdio (newline-delimited JSON-RPC 2.0; see [Protocol](#protocol) for version negotiation). Agents use it to @@ -9553,7 +9553,7 @@ The `paraStyleOptions` dialog exposes `name`, `section` (`general`, `basic`, `ta 100000 pt); it is disabled at 256 stops or when a stop is already at that position. Delete Tab removes the selected stop, and Clear All Tabs leaves the style with no stops, which it then sets. OK sorts the stops by position; of two stops at one position it keeps the one edited last. -- Composition: `composer` (`singleLine` or `everyLine`) and the `roman_hanging` checkbox. +- Composition: `composer` (`singleLine`, `everyLine`, `standardSingleLine` or `standardEveryLine`) and the `roman_hanging` checkbox. - Hyphenation: the `hyphenate` checkbox, `words_longer_than`, `after_first`, `before_last`, `hyphen_limit`, `hyphenation_zone` and the `hyphenate_capitalized` checkbox. The options are inactive while Hyphenation is off, and Hyphenation Zone is inactive with the Every-line Composer. @@ -10478,9 +10478,16 @@ of the group in the Layers panel (`layer.move`). ## Paragraph composer -`text.setFormat {ids?, composer: "singleLine"|"everyLine"}` sets how a text object's lines are broken (the Paragraph -panel menu's Single-line and Every-line Composer; stored in the paragraph attributes as `para.composer`, saved only -when it is Single-line). Every-line, the default, picks the breaks of the whole paragraph together in area type: +`text.setFormat {ids?, composer: "singleLine"|"everyLine"|"standardSingleLine"|"standardEveryLine"}` sets how a text +object's lines are broken and whether complex scripts are shaped (the Paragraph panel menu's four composers: Middle +Eastern & South Asian Single-line and Every-line, and Standard Single-line and Every-line; stored in the paragraph +attributes as `para.composer`, saved only when it is not Every-line, which is the default and what all type used before the +Standard composers existed). `singleLine` and `everyLine` shape Indic, Arabic and Hebrew type with the font's layout +tables, as all type is set; `standardSingleLine` and `standardEveryLine` break lines the same way but set such type +glyph by glyph as the font maps its characters (no conjuncts, reordering, mark placement or joining forms), for legacy +fonts that keep a script on Latin character codes. Latin and other scripts keep their kerning and ligatures under every +composer. An older VectorCraft cannot open a file that uses a Standard composer. `.ai`, EPS and PDF files carry no composer. +Every-line, the default, picks the breaks of the whole paragraph together in area type: justified text gets even word spacing, ragged text (left, centre or right aligned) an even rag, so it may move a word that fits to the next line to avoid a lone short word on the last line or a full line next to a short one. Single-line fills each line as far as it goes. Point type and type on a path have no line width, so both composers @@ -10492,8 +10499,9 @@ narrower, or beside a wrap object, gets the room there. Such a paragraph falls b no room for all of it, or when the search for its breaks passes VectorCraft's own limits (1,000,000 lines tried and 2,000,000 baseline steps for one paragraph, 2,000,000 lines and 4,000,000 steps for all the paragraphs of a frame). The UI command `type.lineComposer` (Cmd+Alt+Shift+C, in remote mode `press_key {key: "C", mods: {cmd: true, alt: true, -shift: true}}` or `invoke_menu`) sets `singleLine` when every paragraph of the selected type (or every paragraph the -Type tool's selection touches) uses Every-line, else `everyLine`, and returns the composer it set. +shift: true}}` or `invoke_menu`) sets the Single-line form when every paragraph of the selected type (or every paragraph the +Type tool's selection touches) uses an Every-line one, else the Every-line form, keeping each paragraph's shaping (`singleLine` +or `everyLine`; a Standard composer toggles between `standardSingleLine` and `standardEveryLine`), and returns the composer it set. ```json {"name":"run_command","arguments":{"command":"text.setFormat","params":{"ids":[7],"composer":"singleLine"}}} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 2c74302900..5af4c94ca7 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-14 · **Change:** minor (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-14 · **Change:** minor (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; `.ai` and EPS files do not carry the choice; scores and estimates unchanged; previously minor: 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) > > Oversized artboard import update (2026-11-12): Explicit editing-data import retains a single artboard beyond a capped 14,400 pt PDF page (#6865). > @@ -56,6 +56,7 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | Date | Change | Summary | |---|---|---| +| 2026-11-14 | minor | Paragraph composers (#4935): `text.setFormat {composer}` and paragraph styles take `singleLine` and `everyLine` (the Middle Eastern & South Asian composers, what all type used and the default) and `standardSingleLine` and `standardEveryLine`, which break lines the same way and set a complex script (Indic, Arabic, Hebrew) glyph by glyph as the font maps its characters, with no conjuncts, reordering, marks placed or joining forms. The choice is per paragraph, saved in the native file only when it is not Every-line, and not written to `.ai`, EPS or PDF files, whose composer setting this app has no recorded format for. Scores and estimates unchanged. Tests `tests::composers`. | | 2026-11-14 | minor | Pencil and Paintbrush: a closed stroke (Alt at the release, or ending within Close Paths When Ends Are Within of its start) is fitted as the open stroke would be and closed by a straight segment back to its start, instead of curving on past both ends (`pencil_alt_closes_a_stroke_straight_back_to_its_start` in `crates/engine/src/tests/draw2.rs`). Scores and estimates unchanged. | | 2026-11-13 | minor | Snap to Point: with Smart Guides off it still pulls drawn and dragged points onto anchors and ruler guides, but draws none of the Smart Guides labels ("anchor") or lines (#7250; `guides::tests::snap_to_point_without_smart_guides_shows_no_guides`). 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. | @@ -513,7 +514,7 @@ about 1–1.5 agent-hours each, so the other rows (estimated on the older scale) | Raster effects (Effect Gallery, Document Raster Effects Settings) | 4 | 35% | ~36 Photoshop-style filters (Artistic, Brush Strokes, Sketch, Stylize) and Texturizer's Load Texture (since done, see the area table above, as is the Effect Gallery, #2883); Document Raster Effects Settings, raster effects in PDF, the pixel-filter pipeline, Radial Blur, Smart Blur (Normal, Edge Only and Overlay Edge), Unsharp Mask, Glowing Edges, Distort (Diffuse Glow, Glass, Ocean Ripple), Pixelate (Color Halftone, Crystallize, Mezzotint, Pointillize), Texture (Craquelure, Grain, Mosaic Tiles, Patchwork, Stained Glass, Texturizer) and Video (De-Interlace, NTSC Colors) are done | 8–14 | | 3D and Materials | 4 | ~25% | Initial Revolve, Extrude & Bevel, Inflate and Rotate, with simple lighting and four original lighting presets; materials, shadows, ray tracing, Rotate (Classic), Map Art and more complete visibility remain | 25–45 | | Type advanced | 4 | 50% | CJK composition for vertical type (mojikumi beyond Line-end Punctuation Half Width — the other sets (and their paragraph-start bracket and indent rules), custom kinsoku sets (beyond Hard, Soft and None) and the Mojikumi Settings dialog —, manual tate-chu-yoko is done, its up/down settings remain; No Break is done), tab leaders, spell check (its engine, custom dictionary commands, the Edit Custom Dictionary dialog and Auto Spell Check are done, #4936: the Check Spelling dialog remains; a right-click on an underlined word offers its suggestions, Ignore All and Add to Dictionary, and a right-click on type has Spelling › Auto Spell Check), Touch Type, Retype; vertical point/area/path type and Type Orientation have initial support (beyond parity, not scored: inline symbols in text) | 20–28 | -| Type core | 9 | 80% | Middle Eastern features beyond bidi layout, Paragraph Direction, digit types and Kashidas (the Middle Eastern composers, editable bidirectional SVG text, a split caret where directions meet); paint-only harakat keep joining with conditional GDEF-mark colour ownership, but fonts without GDEF mark classes and some AAT/`morx` ligatures can still leave marks painted as their letters; Every-line Composer fidelity for justified and ragged text (available per object; mixed type sizes in a paragraph still break single-line in non-rectangular area type and with text wrap), Optical Margin Alignment, paragraph spacing limit for vertically justified area type, hidden characters, paragraph attributes in the Type tool's copy and paste (the characters keep their styles, the paragraphs take the destination's), mixed-value display in the Paragraph panel for a selection across differing paragraphs, partial selection of type-area anchors by marquee, optional font-size preservation during group scaling (scaled character controls fixed in #1034). Hyphenation and Justification options, Fractional Widths, System Layout, styled Type-range canvas Paste (#5636), and pattern hyphenation for eleven Indian languages with grapheme/cluster protection (#4947) are done; Sanskrit automatic patterns remain pending an allowlisted source | 14–19 | +| Type core | 9 | 80% | Middle Eastern features beyond bidi layout, Paragraph Direction, digit types and Kashidas (editable bidirectional SVG text, a split caret where directions meet; the Middle Eastern & South Asian composers are done, #4935, but `.ai`/EPS/PDF files carry no composer); paint-only harakat keep joining with conditional GDEF-mark colour ownership, but fonts without GDEF mark classes and some AAT/`morx` ligatures can still leave marks painted as their letters; Every-line Composer fidelity for justified and ragged text (available per object; mixed type sizes in a paragraph still break single-line in non-rectangular area type and with text wrap), Optical Margin Alignment, paragraph spacing limit for vertically justified area type, hidden characters, paragraph attributes in the Type tool's copy and paste (the characters keep their styles, the paragraphs take the destination's), mixed-value display in the Paragraph panel for a selection across differing paragraphs, partial selection of type-area anchors by marquee, optional font-size preservation during group scaling (scaled character controls fixed in #1034). Hyphenation and Justification options, Fractional Widths, System Layout, styled Type-range canvas Paste (#5636), and pattern hyphenation for eleven Indian languages with grapheme/cluster protection (#4947) are done; Sanskrit automatic patterns remain pending an allowlisted source | 14–19 | | Symbols, blends, envelopes, Repeat, perspective | 5 | 90% | further built-in symbol libraries (Basic Shapes, UI Frames with default 9-slice, Map Markers, Inventory Icons and Skill Icons are done), dynamic symbols' `.ai` round trip, envelope Anti-Alias/Preserve Shape output and warp point editing, brush interpolation in blends (M8 fidelity pass done); Symbol Options › Registration and Export Type and on-canvas dynamic part paint (gradient/pattern, opacity, blend) are done; symbol editing shows draggable 9-slice guides (#5280), while guides outside the artwork remain unsupported | 4–7 | | Image Trace, graphs, image tools | 3 | 72% | graph Column designs (Graph Design, Marker designs and series colours set with Group Selection are done), Create Object Mosaic, per-feature stroke/fill choice and varying widths in Image Trace's Create Strokes (Vector Halftone and the Image Trace View modes, Palette and Create Strokes are done) | 6–10 | | 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 | diff --git a/docs/type-parity.md b/docs/type-parity.md index 308a395670..f49594adc5 100644 --- a/docs/type-parity.md +++ b/docs/type-parity.md @@ -1,6 +1,6 @@ # Type parity -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-11 · **Change:** minor (kerning at the Type tool's caret at the start of a line sets the space before the character after it, #5111; previously minor: type's strokes in an envelope paint along its bent glyph outlines at their own weight, Distort Appearance on or off, as users' `.ai` files draw them, #6644; previously minor: a centred or right-aligned line of tracked type is aligned without the tracking after its last character, as the page of users' `.ai` files aligns it, #6610; previously minor: tracking and manual kerning in horizontally scaled type are thousandths of the em as the Horizontal Scale draws it, as the page of users' `.ai` files spaces such type; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: Direct Selection shows and drags the direction handles of type on a path's path, #3565; 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: Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; paint-only Arabic harakat keep joining with GDEF-mark ownership and Insert Kashidas base-letter paint; scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: right-aligned area type sets the text after a line's last tab against the right edge; a soft return in justified type no longer keeps its line from being justified; 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) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-14 · **Change:** minor (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; `.ai` and EPS files do not carry the choice; scores and estimates unchanged; previously minor: kerning at the Type tool's caret at the start of a line sets the space before the character after it, #5111; previously minor: type's strokes in an envelope paint along its bent glyph outlines at their own weight, Distort Appearance on or off, as users' `.ai` files draw them, #6644; previously minor: a centred or right-aligned line of tracked type is aligned without the tracking after its last character, as the page of users' `.ai` files aligns it, #6610; previously minor: tracking and manual kerning in horizontally scaled type are thousandths of the em as the Horizontal Scale draws it, as the page of users' `.ai` files spaces such type; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: Direct Selection shows and drags the direction handles of type on a path's path, #3565; 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: Auto Spell Check: `edit.autoSpellCheck` underlines the unknown words, #4936; previously minor: PDF marked-text export (#6309): compatible glyphs stay on one layout line with per-glyph offsets; scores and estimates unchanged; paint-only Arabic harakat keep joining with GDEF-mark ownership and Insert Kashidas base-letter paint; scores and estimates unchanged; custom dictionary and Ignore All: `text.spelling.addWord`, `removeWord`, `changeWord`, `dictionary` and `ignoreAll`, #4936; previously minor: spell check engine: `text.spelling.check` and `text.spelling.suggest` on craft-proof, #4936; previously minor: right-aligned area type sets the text after a line's last tab against the right edge; a soft return in justified type no longer keeps its line from being justified; 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) · **Target:** Adobe Illustrator 2026 (30.x) Glyphs review (#6084): a positional variant no supported feature draws is accepted as a glyph choice. Entire Font respects the selection's variable axes and font version; the default cell can reset an unlisted choice without GSUB alternates. Contextual choices use the supplying face, including fallback. Feature-only boundaries preserve ligature clusters and Arabic mark attachment. Encoded characters insert unchanged except Arabic presentation forms with a joining base letter; normalization reports success only after insertion succeeds. Latest follow-up regressions await runtime verification. Scores and estimates unchanged. @@ -20,6 +20,7 @@ against Illustrator's public documentation; **estimated** unless noted. | Feature | Status | Notes | |---|---|---| +| 2026-11-14 | minor | Paragraph composers (#4935): `text.setFormat {composer}` and paragraph styles take `singleLine` and `everyLine` (the Middle Eastern & South Asian composers, what all type used and the default) and `standardSingleLine` and `standardEveryLine`, which break lines the same way and set a complex script (Indic, Arabic, Hebrew) glyph by glyph as the font maps its characters, with no conjuncts, reordering, marks placed or joining forms. The choice is per paragraph, saved in the native file only when it is not Every-line, and not written to `.ai`, EPS or PDF files, whose composer setting this app has no recorded format for. Scores and estimates unchanged. Tests `tests::composers`. | | Mouse wheel over the closed font-family field | done | #5253: Character, Properties and Control step selected text through the family list using saved font filters (excluding search text), one undo step per notch; the style is matched and the list stops at either end. Escape and leaving the field keep the change. The field takes the wheel only when the pointer was moved onto it after the field last moved or was covered by a window or overlay, and the wheel stream began there; a stream that began elsewhere stays there until 0.5 s pass with no wheel input. Order, bounds, Undo grouping, this rule and its 0.5 s are VectorCraft's choices; scores unchanged. | | Soft return (forced line break, Shift+Enter) | done | Shift+Enter inserts a soft return (U+2028), breaking the line without starting a new paragraph; paragraph spacing (space before/after) and first-line indents apply only at paragraph ends; continuation lines in lists do not repeat the marker; in justified text a line a soft return ends is justified as a wrapped line is, only the paragraph's last line keeping its alignment, as Illustrator's own layout in a user's `.ai` sets it (evidence: `tests::typo::soft_return_in_justified_text_spreads_like_a_wrapped_line`; first done the other way in #2754) | | Native font-family labels | partial | With Show Font Names in English off, localized legacy names are used when typographic names contain no native label (#2208); loaded-font and catalog-only regressions. Choosing among multiple native languages is unchanged. | @@ -40,7 +41,7 @@ against Illustrator's public documentation; **estimated** unless noted. | Variable fonts | done | named instances as styles; Character panel › Variable Font sets each axis (`fontAxes`); the font menu's Font Technology › Variable lists only variable font families, with the script, kind and ★ filters ([Find, apply, and adjust variable fonts](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/find-apply-and-adjust-variable-fonts.html)); a family with a variable file beside static ones counts as variable. Evidence: `font_menu::tests::the_variable_filter_lists_only_variable_families`, `tests_axes::a_family_with_variation_axes_is_variable`, `tests_sysfonts::a_family_with_a_variable_file_beside_static_ones_is_variable` | | Fallback glyphs keep the text's weight and slant | done | #2491: a character from a fallback face is set in that family's face nearest the run's weight and slant; Bold Italic of a missing family is drawn Bold (Source Sans 3 has no Bold Italic) rather than Italic; a letter and its combining marks (a grapheme cluster) are drawn in one face, the first that has all of them, so marks the text's font lacks attach to their letter instead of drawing as missing glyphs (#4491). Vietnamese letters with two marks (Ể, Ứ, Ự) sit on their letter whether typed precomposed, decomposed or as a vowel plus a tone mark, built from GPOS mark-to-mark in fonts without the precomposed letters. Evidence: `tests::vietnamese` | | Colour fonts (bitmap, COLR, OpenType SVG) | partial | bitmap glyphs (`sbix`, `CBDT`) done: the largest strike's PNG, transformed with the type, fill and stroke ignored; PDF Type 3 glyphs or images, SVG images with outlined text (live text leaves emoji to the viewer, their fonts not embedded), EPS and legacy `.ai` images, Create Outlines images; not `sbix` duplicate, flipped, JPEG or TIFF glyphs, or `CBDT` BGRA or mask data, or ruby; in envelopes they warp as images do, and a Warp effect moves them without bending them. COLR (v0 and v1) done: a glyph's layers as vector art (solid colours, linear and radial gradients, clip glyphs and boxes, blend modes, transforms, palette 0, the foreground colour from the run's fill, variable fonts at the face's instance), transformed with the type; drawn on the canvas, written as paths in SVG, EPS, legacy `.ai` and PDF with outlined text, as text in PDF (Type 3 glyphs), and Create Outlines makes groups of editable paths. Paints documents have no form for draw the glyph as an image (256 px per em): sweep gradients, Porter-Duff compositing, radial gradients from a circle that isn't the centre, repeating or reflecting gradients. Not ruby. COLR and SVG glyphs also go with type that geometry effects reshape (on the canvas and in exports), into Expand Appearance and EMF/WMF export, as their art, and bitmap glyphs as images. OpenType SVG done: a glyph's SVG document (its element `glyph`) is read by the SVG importer into vector art in font units, `currentColor` in the run's fill (and the legacy `context-fill` and `context-stroke` in its fill and stroke), a `viewBox` mapped onto the em square, and then drawn, exported and outlined as COLR glyphs are; in PDF real text such glyphs are text that draws nothing, with their art drawn where they sit. Images in glyph documents are in the art, holding their pixels until a document takes them in; text, scripts and embedded content are left out, as the table rules them out. Not CPAL palette variables. Evidence: `tests_svg_glyphs`, `svg/tests/it/svg_glyphs.rs`, `tests_colourfonts::svg_glyph_images_draw_and_outline`, `tests_colourfonts::create_outlines_turns_svg_glyphs_into_groups`, `tests_colourfonts::pdf_real_text_draws_svg_glyphs_as_art_and_keeps_their_characters`, `tests_colourfonts::expand_appearance_keeps_the_colour_glyphs_of_type_with_effects`, `render::tests_colrglyphs::colour_glyphs_go_with_type_that_a_geometry_effect_reshapes`, `tests_bitmaps`, `tests_colr`, `render::tests_bitmapglyphs`, `render::tests_colrglyphs`, `pdf::tests::colour_bitmap_glyphs_export_as_images`, `pdf::tests::colr_glyphs_export_as_vector_art`, `svg/tests/it/colour_glyphs.rs`, `eps` `colour_bitmap_glyphs_*` and `colr_glyphs_*`, `tests_pathops::create_outlines_turns_bitmap_glyphs_into_images`, `tests_pathops::create_outlines_turns_colr_glyphs_into_layer_groups` | -| Every-line and Single-line composers | done | tuned by eye, never compared side by side | +| Every-line and Single-line composers | done | tuned by eye, never compared side by side; each in a Middle Eastern & South Asian and a Standard form (#4935), see below | | Optical Margin Alignment | done | Type › Optical Margin Alignment, `type.opticalMarginAlignment`: per type object, with one setting for all the frames of a thread, in point and area type of left-to-right paragraphs, and at the brackets of type on a path whose first paragraph runs left to right; right-to-left paragraphs of point and area type, and type on a path whose first paragraph runs right to left, do not hang | | System Layout | done | Character panel menu › System Layout, `type.systemLayout`: the whole document, off by default and for documents from before it, saved only when on. On, every text object advances by whole points (at least one when a character takes space). New point, area and path type, threaded frames, placed text, graph and dimension labels and pasted plain text inherit it. Evidence: `tests::system_layout_rounds_positive_advances_to_whole_points`, `typecmd::area_tests::system_layout_sets_the_document_and_every_text_object`, `panels::character::tests::system_layout_menu_item_toggles_the_document` | | Fractional Widths | done | Character panel menu › Fractional Widths, `type.fractionalWidths`: per type object, and every frame of its threads. On by default and for documents from before it; saved only when off. Off, each character that takes space advances by a whole number of points, at least one, so small type does not run together. Evidence: `tests::fractional_widths_off_rounds_positive_advances_to_whole_points`, `typecmd::area_tests::fractional_widths_is_set_per_object_and_saved_only_when_off`, `panels::character::tests::fractional_widths_menu_item_toggles_the_type_object` | @@ -61,7 +62,8 @@ against Illustrator's public documentation; **estimated** unless noted. | Middle Eastern: bidirectional layout, Paragraph Direction | done | 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 still needs ActualText support (#6165); separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. | | Middle Eastern and Indic: digit types (Character panel menu › Digits: Default, Arabic, Hindi, Farsi; Devanagari, Bengali, Gurmukhi, Gujarati, Odia, Tamil, Telugu, Kannada, Malayalam) | done | `text.setFormat` / `text.setRangeStyle {digits}` (`"devanagari"`, `"bengali"`, `"gurmukhi"`, `"gujarati"`, `"odia"`, `"tamil"`, `"telugu"`, `"kannada"`, `"malayalam"` added, #4942); the text keeps the typed digits, the glyphs and SVG export follow the style; carried by character styles. Not yet: `.ai` export of the setting; Indic digits typed as such stay as typed under another system. Evidence: `text::tests::indic_digits_map_to_their_scripts_block`, `tests::bidi::indic_digits_draw_the_scripts_own_digits`, `typecmd::area_tests::indic_digits_round_trip_through_the_commands_and_the_file` | | Middle Eastern: Kashidas | done | Paragraph Insert Kashidas sets the length for justified Arabic area type; Character-menu Kashidas allows or excludes selected characters, on by default. A kashida is inserted only between two allowed joined characters. The character switch is retained in character styles and the native file; the length is retained in paragraph styles and the native file. Paint-only harakat (coloured or hidden marks) stay in one shaping cluster so letters keep joining; when the character-level pass matches, a glyph may take a later in-cluster character's run only if GDEF names it a mark (class 3) and that character is a harakat—otherwise the cluster start (a mark may miss its colour; a base never takes a mark's). Inserted tatweels take the base letter's paint—not a trailing mark's. Fonts without GDEF and some AAT/`morx` ligatures (e.g. Geeza Pro Allah) can leave a mark painted as its letter. No Character-panel harakat colour command yet. Evidence: `tests::harakat`. [Public help](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/justify-text-using-kashida-and-hyphenation.html). | -| Middle Eastern: Middle Eastern composers, split caret | missing | Character Direction is done; editable bidirectional SVG text remains incomplete. | +| Middle Eastern & South Asian composers and Standard composers (Paragraph panel menu, paragraph styles, `text.setFormat {composer}`) | done / partial | #4935: per paragraph, four choices. Middle Eastern & South Asian Single-line and Every-line are how all type was already set (complex-script shaping on) and stay the default, so existing documents do not change. Standard Single-line and Every-line break lines the same way and set Indic, Arabic and Hebrew type glyph by glyph as the font maps its characters (no conjuncts, reordering, mark placement or joining), for legacy fonts that keep a script on Latin character codes; Latin and other scripts keep their kerning and ligatures. The native file and paragraph styles keep the choice (`standardSingleLine` / `standardEveryLine`; an older VectorCraft cannot read a file that uses them). `.ai`, EPS and PDF import and export carry no composer: this app has no recorded format for it, so a Standard paragraph opened from or saved to those files comes back Middle Eastern & South Asian. Evidence: `tests::composers`, `tests::panelcmds::text_set_format_takes_the_four_composers`, `native_v3::all_four_composers_round_trip` | +| Middle Eastern: split caret | missing | Character Direction is done; editable bidirectional SVG text remains incomplete. | | CJK: input methods (marked text, candidate window) | done | | | CJK: kinsoku (Hard, Soft, None), the predefined mojikumi sets (None, YakumonoHankaku, GyomatsuYakumonoHankaku, GyomatsuYakumonoZenkaku, YakumonoZenkaku, with VectorCraft's own spacing for each) and Line-end Punctuation Half Width, tate-chu-yoko (auto) | done / partial | custom kinsoku sets, custom mojikumi sets and the Mojikumi Settings dialog missing | | CJK: Kinsoku Shori Type (Push In First, Push Out First, Push Out Only) | done | Paragraph panel menu › Kinsoku Shori Type (`text.setFormat {kinsokuType}`), with the East Asian options ([Formatting Asian characters](https://helpx.adobe.com/illustrator/using/formatting-asian-characters.html)); Push Out Only is the default, and a push-in closes the line's gaps next to CJK characters by at most a tenth of an em each (VectorCraft's own limit). Evidence: `layout::wrapping_tests::kinsoku_shori_type_pushes_a_closing_bracket_in_or_out`, `tests::vertical::kinsoku_shori_type_pushes_a_closing_bracket_in_or_out`, `typecmd::area_tests::kinsoku_shori_type_is_set_per_paragraph_and_saved_only_when_not_push_out_only` | From a3f3805bf3035cbf4e147eeb684e6c2ea26663f2 Mon Sep 17 00:00:00 2001 From: Taha-Mahmoodi <85902429+Taha-Mahmoodi@users.noreply.github.com> Date: Sat, 14 Nov 2026 13:59:18 +0430 Subject: [PATCH 06/50] fix(text): review findings for the Standard composers Unshaped complex scripts: no joiner boxes, no kashidas or path bending as if joined, a toggle that keeps shared Standard shaping, a test font fix, and doc wording for the scripts left unshaped. --- crates/format/tests/it/native_v3.rs | 2 +- crates/mcp/src/ui_catalog.rs | 2 +- crates/text/src/features.rs | 1 + crates/text/src/kashida.rs | 7 +++-- crates/text/src/layout.rs | 2 +- crates/text/src/layout/flow.rs | 6 ++-- crates/text/src/shape.rs | 20 +++++++----- crates/text/src/tests/composers.rs | 21 +++++++++++-- crates/ui-egui/src/menus/ui_commands.rs | 2 +- crates/ui-egui/src/panels/paragraph.rs | 12 +++++--- crates/ui-egui/src/panels/paragraph/tests.rs | 32 ++++++++++++++------ docs/gaps.md | 5 +-- docs/mcp.md | 10 +++--- docs/type-parity.md | 2 +- 14 files changed, 82 insertions(+), 42 deletions(-) diff --git a/crates/format/tests/it/native_v3.rs b/crates/format/tests/it/native_v3.rs index 4dbd33c196..afc3bea9d2 100644 --- a/crates/format/tests/it/native_v3.rs +++ b/crates/format/tests/it/native_v3.rs @@ -220,7 +220,7 @@ fn all_four_composers_round_trip() { use vectorcraft_doc::{TextKind, TextObject}; let one = |c: Composer| { let mut d = Document::new(200.0, 200.0); - let mut t = TextObject::point(kurbo::Point::ZERO, "ક\u{ACD}ક", Default::default()); + let mut t = TextObject::point(vectorcraft_geom::Point::ZERO, "ક\u{ACD}ક", Default::default()); t.para.composer = c; t.kind = TextKind::Point; let id = d.alloc_id(); diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs index deb43ae968..28c1fc36fd 100644 --- a/crates/mcp/src/ui_catalog.rs +++ b/crates/mcp/src/ui_catalog.rs @@ -392,7 +392,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "type.lineComposer", "Toggle Line Composer", "Cmd+Alt+Shift+C", - "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer, each keeping its shaping: Middle Eastern & South Asian or Standard (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"", + "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer; paragraphs that all use a Standard composer keep it, any other mix takes the Middle Eastern & South Asian one (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"", ), ( "type.hyphenate", diff --git a/crates/text/src/features.rs b/crates/text/src/features.rs index e25d225dc1..99c27b68a8 100644 --- a/crates/text/src/features.rs +++ b/crates/text/src/features.rs @@ -164,6 +164,7 @@ impl OtFeatures { extra: u32::MAX >> (32 - EXTRA_FEATURES.len()), extra_values: [0; EXTRA_FEATURES.len()], swash_value: 0, + unshaped_complex: false, }; change(&mut off); change(&mut on); diff --git a/crates/text/src/kashida.rs b/crates/text/src/kashida.rs index c36eacbf2d..8db784a2bc 100644 --- a/crates/text/src/kashida.rs +++ b/crates/text/src/kashida.rs @@ -78,10 +78,11 @@ fn joining(c: char) -> Joining { } /// Is the cluster of glyph `a` joined to the cluster of glyph `b` that follows it in `text`: both -/// right to left in one face, `a`'s last character other than a mark joining the letter after it, -/// and `b` starting with a letter that joins the one before it? +/// right to left in one face and set as joining letters (not by a Standard composer), `a`'s last +/// character other than a mark joining the letter after it, and `b` starting with a letter that +/// joins the one before it? fn joined(text: &str, a: &SGlyph, b: &SGlyph) -> bool { - if a.face.id() != b.face.id() || a.level != b.level || !a.level.is_rtl() || a.byte + a.len != b.byte { + if a.face.id() != b.face.id() || a.level != b.level || !a.level.is_rtl() || a.byte + a.len != b.byte || !(a.cursive && b.cursive) { return false; } let last = text.get(a.byte..a.byte + a.len).and_then(|s| s.chars().rev().find(|&c| joining(c) != Joining::Transparent)); diff --git a/crates/text/src/layout.rs b/crates/text/src/layout.rs index 5ff18b4076..159248750c 100644 --- a/crates/text/src/layout.rs +++ b/crates/text/src/layout.rs @@ -22,7 +22,7 @@ use crate::shape::{ Punct, SGlyph, Tcy, cap_x_heights, hyphen_glyph, is_cjk, mark_word_ends, no_line_end, no_line_start, punct, run_face, shape_range, shape_runs, soft_line_start, style_metrics, }; -use crate::{Composer, FirstBaseline, InlineGlyph, LayoutOptions, LineInfo, ListMarker, OtFeatures, PositionedGlyph, TextLayout, VerticalAlign}; +use crate::{FirstBaseline, InlineGlyph, LayoutOptions, LineInfo, ListMarker, OtFeatures, PositionedGlyph, TextLayout, VerticalAlign}; mod bidi; mod breaking; diff --git a/crates/text/src/layout/flow.rs b/crates/text/src/layout/flow.rs index 38df882e07..0bd9b3b6b9 100644 --- a/crates/text/src/layout/flow.rs +++ b/crates/text/src/layout/flow.rs @@ -8,9 +8,9 @@ use super::vertical::{ EM_CENTER, MojikumiRules, align_shift, compress_punctuation, dot_quarter, glyph_em, halve_punctuation, punct_half, space_japanese_and_latin, }; use super::{ - Affine, BidiInfo, Burasagari, CharStyle, Composer, Ctx, EPS, Flex, Justify, Kinsoku, KinsokuShoriType, LeadingModel, LineFit, LineInfo, - ListMarker, ParaStyle, Params, Point, Punct, Range, SGlyph, SingleWordJustify, TextObject, apply_desired, cap_x_heights, compose, fit_line, - hyphen_glyph, is_cjk, is_word_space, kashida, mark_word_ends, no_line_end, no_line_start, style_metrics, + Affine, BidiInfo, Burasagari, CharStyle, Ctx, EPS, Flex, Justify, Kinsoku, KinsokuShoriType, LeadingModel, LineFit, LineInfo, ListMarker, + ParaStyle, Params, Point, Punct, Range, SGlyph, SingleWordJustify, TextObject, apply_desired, cap_x_heights, compose, fit_line, hyphen_glyph, + is_cjk, is_word_space, kashida, mark_word_ends, no_line_end, no_line_start, style_metrics, }; use crate::justify::is_format_control; use crate::shape::{keep_inseparable_pairs, keep_korean_words}; diff --git a/crates/text/src/shape.rs b/crates/text/src/shape.rs index 16809291bc..67ae8362c7 100644 --- a/crates/text/src/shape.rs +++ b/crates/text/src/shape.rs @@ -123,7 +123,8 @@ pub(crate) fn joins(script: Script) -> bool { } /// Is `script` one a Standard composer leaves unshaped: Indic (conjuncts, half forms, marks placed -/// by the font's layout tables), Arabic-like ([`joins`]) and Hebrew? +/// by the font's layout tables), the joining scripts ([`joins`]: Arabic, Syriac, N'Ko, Mongolian…) +/// and Hebrew? fn is_complex_script(script: Script) -> bool { joins(script) || matches!( @@ -1395,11 +1396,12 @@ fn shape_segment(text: &str, context: &Range, seg: &Segment, feats: &OtFe let text_seg = &text[range.clone()]; // The segment's script: that of its first character of a script of its own. let first_script = text_seg.chars().map(|c| c.script()).find(|s| !matches!(s, Script::Common | Script::Inherited)); - let cursive = first_script.is_some_and(joins); // A Standard composer sets a complex script glyph by glyph (no layout tables, nominal glyphs). // shortcut: decided for the whole segment by its first strong script, as `cursive` is; segments // already split where the script changes. let unshaped = feats.unshaped_complex && first_script.is_some_and(is_complex_script); + // Unshaped letters don't join, so they are not bent along a path as joined ones are. + let cursive = first_script.is_some_and(joins) && !unshaped; let full = st.size.max(0.0); // Superscript/subscript and small capitals shrink the glyphs; line metrics keep the full size. let (_, pos_shift) = st.position.scale_shift(full); @@ -1593,15 +1595,17 @@ fn shape_segment(text: &str, context: &Range, seg: &Segment, feats: &OtFe let c = st.digits.map(c); let chars: Vec = if upper { c.to_uppercase().collect() } else { vec![c] }; for u in chars { - let g = cmap.map(u).unwrap_or_default(); - let adv = gm.advance_width(g).unwrap_or(face.upem as f32 * 0.5); + // Format characters (joiners, direction marks) have no glyph of their own in most + // fonts, and the shaper hides them: draw the space's glyph with no advance. + let (g, adv) = if crate::justify::is_format_control(u) { + (cmap.map(' ').unwrap_or_default(), 0.0) + } else { + let g = cmap.map(u).unwrap_or_default(); + (g, gm.advance_width(g).unwrap_or(face.upem as f32 * 0.5)) + }; raw.push((g.to_u32(), cl, adv.round() as i32, 0, 0)); } } - // Shaped right-to-left text comes out in visual order, which layout expects. - if unshaped && level.is_rtl() { - raw.reverse(); - } } } shaped diff --git a/crates/text/src/tests/composers.rs b/crates/text/src/tests/composers.rs index 7b4988e822..57236d8708 100644 --- a/crates/text/src/tests/composers.rs +++ b/crates/text/src/tests/composers.rs @@ -33,8 +33,8 @@ fn g(c: char) -> u32 { u32::from(source_sans_gid(c).expect("a Source Sans glyph")) } -/// Under the ME&SA composers the conjunct forms (Devanagari: the vowel sign I drawn before its -/// syllable and Ka's half form; Gujarati: the half form); under the Standard ones each character +/// Under the ME&SA composers the conjunct forms (the vowel sign I drawn before its syllable and Ka's +/// half form, in Devanagari and in Gujarati); under the Standard ones each character /// has its own glyph, in text order, as the font maps it. #[test] fn standard_composers_set_indic_text_glyph_by_glyph() { @@ -42,7 +42,7 @@ fn standard_composers_set_indic_text_glyph_by_glyph() { let ids = |v: Vec<(u32, usize)>| v.into_iter().map(|(gid, _)| gid).collect::>(); for composer in [Composer::SingleLine, Composer::EveryLine] { assert_eq!(ids(drawn(&db, DEVANAGARI, composer)), [g('i'), g('k'), g('K')], "{composer:?} Devanagari"); - assert_eq!(ids(drawn(&db, GUJARATI, composer)), [g('k'), g('K'), g('i')], "{composer:?} Gujarati"); + assert_eq!(ids(drawn(&db, GUJARATI, composer)), [g('i'), g('k'), g('K')], "{composer:?} Gujarati"); } for composer in [Composer::StandardSingleLine, Composer::StandardEveryLine] { let plain = [g('K'), g('.'), g('K'), g('i')]; @@ -94,3 +94,18 @@ fn composers_split_into_breaking_and_shaping() { } assert_eq!(Composer::default(), EveryLine, "new type and old documents are ME&SA Every-line"); } + +/// A joiner or non-joiner has no glyph in most fonts and the shaper hides it; a Standard composer +/// draws it as no width at all, not as a missing-glyph box. +#[test] +fn standard_composers_give_format_characters_no_width() { + let db = db(); + let text = "क\u{200C}क"; + for composer in [Composer::StandardSingleLine, Composer::StandardEveryLine] { + let l = layout(&db, &object(text, composer)); + let widths: Vec = l.glyphs.iter().map(|g| g.advance).collect(); + assert_eq!(widths.len(), 3, "{composer:?}: {widths:?}"); + assert_eq!(widths[1], 0.0, "{composer:?}: the non-joiner takes no room: {widths:?}"); + assert!(widths[0] > 0.0 && widths[2] > 0.0, "{composer:?}: {widths:?}"); + } +} diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs index 029ddf955a..2c9d328039 100644 --- a/crates/ui-egui/src/menus/ui_commands.rs +++ b/crates/ui-egui/src/menus/ui_commands.rs @@ -393,7 +393,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "type.lineComposer", "Toggle Line Composer", "Cmd+Alt+Shift+C", - "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer, each keeping its shaping: Middle Eastern & South Asian or Standard (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"", + "{} the selected type's paragraphs (or those the Type tool's selection touches) use the Single-line Composer when they all use the Every-line Composer, else the Every-line Composer; paragraphs that all use a Standard composer keep it, any other mix takes the Middle Eastern & South Asian one (text.setFormat {composer}) → \"singleLine\" | \"everyLine\" | \"standardSingleLine\" | \"standardEveryLine\"", ), ( "type.hyphenate", diff --git a/crates/ui-egui/src/panels/paragraph.rs b/crates/ui-egui/src/panels/paragraph.rs index 3c1a0fe9c8..6d4e5c4c69 100644 --- a/crates/ui-egui/src/panels/paragraph.rs +++ b/crates/ui-egui/src/panels/paragraph.rs @@ -54,13 +54,15 @@ pub(crate) fn align(app: &mut VectorcraftApp, justify: &str) -> Result Result { text_style(app).ok_or("select some type first")?; - let shared = shared_composer(app); - let to_single = shared.is_some_and(|c| !c.is_single_line()); - let id = composer_id(shared.unwrap_or_default().with_breaking(to_single)); + let to_single = shared_para(app, |p| p.composer.is_single_line()) == Some(false); + let standard = shared_para(app, |p| p.composer.shapes_complex_scripts()) == Some(false); + let base = if standard { Composer::StandardEveryLine } else { Composer::EveryLine }; + let id = composer_id(base.with_breaking(to_single)); format(app, json!({ "composer": id })); Ok(json!(id)) } diff --git a/crates/ui-egui/src/panels/paragraph/tests.rs b/crates/ui-egui/src/panels/paragraph/tests.rs index 518df239ae..f700d404c1 100644 --- a/crates/ui-egui/src/panels/paragraph/tests.rs +++ b/crates/ui-egui/src/panels/paragraph/tests.rs @@ -97,11 +97,16 @@ fn toggling_the_line_composer_keeps_the_shaping() { assert_eq!(toggle_composer(&mut app).unwrap(), json!(first), "{from}"); assert_eq!(toggle_composer(&mut app).unwrap(), json!(second), "{from} again"); } - // Paragraphs that differ take Every-line, as before the Standard composers existed. + // Paragraphs that break differently take Every-line, as before the Standard composers existed. app.run("text.setFormat", json!({"id": id, "composer": "standardSingleLine"})).unwrap(); app.run("text.setFormat", json!({"id": id, "start": 2, "end": 3, "composer": "singleLine"})).unwrap(); app.session.set_tool_option("selectAll", &json!(true)); assert_eq!(toggle_composer(&mut app).unwrap(), json!("everyLine")); + // Paragraphs that both break every-line but differ in shaping: Single-line, Middle Eastern & South Asian. + app.run("text.setFormat", json!({"id": id, "composer": "everyLine"})).unwrap(); + app.run("text.setFormat", json!({"id": id, "start": 2, "end": 3, "composer": "standardEveryLine"})).unwrap(); + app.session.set_tool_option("selectAll", &json!(true)); + assert_eq!(toggle_composer(&mut app).unwrap(), json!("singleLine")); } /// The Paragraph panel menu lists the four composers, and ticks the one every selected paragraph has. @@ -126,15 +131,23 @@ fn the_paragraph_menu_sets_each_of_the_four_composers() { _ => {} } } - let texts = items(&mut app); - for label in [ - "Middle Eastern & South Asian Single-line Composer", - "Middle Eastern & South Asian Every-line Composer", - "Standard Single-line Composer", - "Standard Every-line Composer", - ] { - assert!(texts.iter().any(|t| t == label), "{label} in {texts:?}"); + let labels = [ + ("singleLine", "Middle Eastern & South Asian Single-line Composer"), + ("everyLine", "Middle Eastern & South Asian Every-line Composer"), + ("standardSingleLine", "Standard Single-line Composer"), + ("standardEveryLine", "Standard Every-line Composer"), + ]; + // The menu lists all four, each row ticked (and only that one) when every selected paragraph has it. + for (value, _) in labels { + app.run("text.setFormat", json!({"id": id, "composer": value})).unwrap(); + app.session.set_tool_option("selectAll", &json!(true)); + let texts = items(&mut app); + for (v, label) in labels { + let row = if v == value { format!("✓ {label}") } else { format!(" {label}") }; + assert!(texts.iter().any(|t| *t == row), "{value}: {row:?} in {texts:?}"); + } } + // Choosing a row sets its composer: the row is a `text.setFormat {composer}` with the row's id. for (value, want) in [ ("standardEveryLine", Composer::StandardEveryLine), ("singleLine", Composer::SingleLine), @@ -142,6 +155,7 @@ fn the_paragraph_menu_sets_each_of_the_four_composers() { ] { app.run("text.setFormat", json!({"id": id, "composer": value})).unwrap(); assert_eq!(shared_composer(&app), Some(want), "{value}"); + assert_eq!(composer_id(want), value); } } diff --git a/docs/gaps.md b/docs/gaps.md index 201823b983..e49e9ba252 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -1,6 +1,6 @@ # Gaps -> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-13 · **Change:** minor (3D: the seams of white-light Extrude & Bevel, Inflate and Rotate, and the face seams of the 3D (Classic) effects, have round joins instead of miters; previously: PDF import: preserve Type 3 font text runs as named groups , or as live text in TextAs::Text mode if ToUnicode exists on non-colour fonts (TextAs::Outlines produces grouped outlines), #6740; 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: oversized editing artboard import; Glyphs panel: Alternates for Current Selection applies an OpenType feature value (`salt=2`) to the selected letter alone, so an Arabic word stays joined, and Entire Font lists the unencoded glyphs, #5514; #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: G5: built-in Energy Beams brush library; estimate 5–15 → 4–14 h; previously minor: G5: built-in Skill Icons symbol library; estimate 6–16 → 5–15 h; previously minor: ruler double-click adds a guide at the pointer, #5239; G5: built-in Status Effects graphic style library; estimate 7–17 → 6–16 h; MCP docs catch-up for UI Frames and Map Markers; previously minor: G5: built-in Inventory Icons symbol library; estimate 8–18 → 7–17 h; previously minor: G9: `.ai` save names a variable font instance's design-space setting, #6388; previously minor: G5: built-in Game Trails brush library; estimate 9–19 → 8–18 h; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: docs tidy-up, no content change: stray notes at the top moved into the revision table; scores and estimates unchanged; previously minor: G5: built-in Game HUD graphic style library; estimate 10–20 → 9–19 h; previously minor: G5: built-in Map Markers symbol library; estimate 11–21 → 10–20 h; 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; estimate 1–2 h → 0; 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: built-in UI Frames symbol library with default 9-slice; estimate 11–21 h; previously minor: G5: dynamic symbol part on-canvas takes opacity, blend, gradient and pattern; docs Overlap/auto-corners sync; estimate 12–22 h; previously minor: interim macOS cursor delivery, #2292; native validation pending; 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, Pattern brush auto corners and Global Edit Shift-click leave-out moved from Missing to Done (code already shipped); 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; G9: EPS gradients drawn as abutting strips import as one gradient, without seams; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; 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; Indian-language hyphenation review and license allowlist, #4947; opening a slow file shows a progress window, part of #5930; Hindi catalog and contributor loanword preferences; agent wording pass complete; wider native proofreading welcome; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); scores and estimates unchanged; a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window; scores and estimates unchanged; large images in CMYK documents are shrunk before they are separated into ink planes (#4155); scores and estimates unchanged; `.ai` paths with a Calligraphic brush open brushed, with the 6D Art Pen's channels, and Windows reads the pen's tilt and barrel rotation, #372; scores and estimates unchanged; Compound Shapes add-on, beyond Illustrator; scores and estimates unchanged; Contour add-on, beyond Illustrator; scores and estimates unchanged; a slow first frame is waited for instead of restarting without the graphics adapter, and the menu bar no longer waits for the installed fonts' scan; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) +> **Last reviewed:** 2026-10-10 · **Last updated:** 2026-11-14 · **Change:** minor (Type: the Middle Eastern & South Asian composers are done as a per-paragraph choice with the Standard composers (#4935); scores and estimates unchanged; previously minor: 3D: the seams of white-light Extrude & Bevel, Inflate and Rotate, and the face seams of the 3D (Classic) effects, have round joins instead of miters; previously: PDF import: preserve Type 3 font text runs as named groups , or as live text in TextAs::Text mode if ToUnicode exists on non-colour fonts (TextAs::Outlines produces grouped outlines), #6740; 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: oversized editing artboard import; Glyphs panel: Alternates for Current Selection applies an OpenType feature value (`salt=2`) to the selected letter alone, so an Arabic word stays joined, and Entire Font lists the unencoded glyphs, #5514; #6404: transform-aware Eyedropper character copying; scores and estimates unchanged; previously: G5: built-in Energy Beams brush library; estimate 5–15 → 4–14 h; previously minor: G5: built-in Skill Icons symbol library; estimate 6–16 → 5–15 h; previously minor: ruler double-click adds a guide at the pointer, #5239; G5: built-in Status Effects graphic style library; estimate 7–17 → 6–16 h; MCP docs catch-up for UI Frames and Map Markers; previously minor: G5: built-in Inventory Icons symbol library; estimate 8–18 → 7–17 h; previously minor: G9: `.ai` save names a variable font instance's design-space setting, #6388; previously minor: G5: built-in Game Trails brush library; estimate 9–19 → 8–18 h; previously minor: Edit › Edit Custom Dictionary…: its dialog adds, deletes and changes the custom dictionary's words, #4936; previously minor: docs tidy-up, no content change: stray notes at the top moved into the revision table; scores and estimates unchanged; previously minor: G5: built-in Game HUD graphic style library; estimate 10–20 → 9–19 h; previously minor: G5: built-in Map Markers symbol library; estimate 11–21 → 10–20 h; 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; estimate 1–2 h → 0; 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: built-in UI Frames symbol library with default 9-slice; estimate 11–21 h; previously minor: G5: dynamic symbol part on-canvas takes opacity, blend, gradient and pattern; docs Overlap/auto-corners sync; estimate 12–22 h; previously minor: interim macOS cursor delivery, #2292; native validation pending; 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, Pattern brush auto corners and Global Edit Shift-click leave-out moved from Missing to Done (code already shipped); 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; G9: EPS gradients drawn as abutting strips import as one gradient, without seams; Tools stays beside the canvas with left-side panels; new gradients follow document color mode; 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; Indian-language hyphenation review and license allowlist, #4947; opening a slow file shows a progress window, part of #5930; Hindi catalog and contributor loanword preferences; agent wording pass complete; wider native proofreading welcome; an image zoomed in on is separated, colorized or proofed only where it shows (#4155); scores and estimates unchanged; a document's first frame renders on the render worker, so opening a heavy file no longer freezes the window; scores and estimates unchanged; large images in CMYK documents are shrunk before they are separated into ink planes (#4155); scores and estimates unchanged; `.ai` paths with a Calligraphic brush open brushed, with the 6D Art Pen's channels, and Windows reads the pen's tilt and barrel rotation, #372; scores and estimates unchanged; Compound Shapes add-on, beyond Illustrator; scores and estimates unchanged; Contour add-on, beyond Illustrator; scores and estimates unchanged; a slow first frame is waited for instead of restarting without the graphics adapter, and the menu bar no longer waits for the installed fonts' scan; scores and estimates unchanged) · **Target:** Adobe Illustrator 2026 (30.x) ## Feature submission evidence @@ -34,6 +34,7 @@ Artboard Options forwards the active Artboard tool's Scale Artwork with Artboard | Date | Change | Summary | |---|---|---| +| 2026-11-14 | minor | Type: Middle Eastern & South Asian and Standard composers per paragraph (#4935): Paragraph panel menu, paragraph styles, `text.setFormat {composer}` and the native file; the Standard composers set Indic, Arabic and Hebrew type glyph by glyph. `.ai`, EPS and PDF files carry no composer. Scores and estimates unchanged. | | 2026-11-13 | minor | PDF import: preserve Type 3 font text runs as named groups ``, or as live text in `TextAs::Text` mode if `/ToUnicode` exists on non-colour fonts (`TextAs::Outlines` produces grouped outlines) (#6740); scores and estimates unchanged. | | 2026-11-08 | minor | #3380, deletion only: preserve gradient placement and exact surviving geometry; consume owned subpaths with a shared original-node snapshot; consolidate status/evidence and document command/helper contracts. Compound behavior and the existing M2 status entry are retained. Endpoint highlighting remains open; scores and estimates unchanged. | | 2026-11-07 | minor | #3380 (deletion only): independent surviving path objects; transformed appearance, stacking, selection, cubic handles and Undo/Redo covered by `delete_path_pieces`; compound semantics retained. Endpoint highlighting remains open; scores and estimates unchanged. | @@ -447,7 +448,7 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi own pixels until a document takes them in; estimate unchanged. - **Missing:** CJK vertical composition (custom mojikumi sets and the Mojikumi Settings dialog, kinsoku settings #633, manual tate-chu-yoko), Middle Eastern - features beyond bidi, digit types, Character Direction and Kashidas (Middle Eastern composers, a split caret), spell check (its engine is done, #4936: `text.spelling.check` and + features beyond bidi, digit types, Character Direction and Kashidas (a split caret; the Middle Eastern & South Asian composers are done, #4935), spell check (its engine is done, #4936: `text.spelling.check` and `text.spelling.suggest` on craft-proof; the custom dictionary and Ignore All commands; Auto Spell Check, `edit.autoSpellCheck`, with a right-click on an underlined word offering its suggestions, Ignore All and Add to Dictionary, and Spelling › Auto Spell Check in the context menu of type; the Edit Custom Dictionary dialog; the Check Spelling dialog remains), Touch Type, Retype, Snap to Glyph; optional preservation of font sizes during group scaling (#1034 enhancement). Itemized in [type-parity.md](type-parity.md). diff --git a/docs/mcp.md b/docs/mcp.md index e435dfb1a2..9ff3548778 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -10485,8 +10485,9 @@ attributes as `para.composer`, saved only when it is not Every-line, which is th Standard composers existed). `singleLine` and `everyLine` shape Indic, Arabic and Hebrew type with the font's layout tables, as all type is set; `standardSingleLine` and `standardEveryLine` break lines the same way but set such type glyph by glyph as the font maps its characters (no conjuncts, reordering, mark placement or joining forms), for legacy -fonts that keep a script on Latin character codes. Latin and other scripts keep their kerning and ligatures under every -composer. An older VectorCraft cannot open a file that uses a Standard composer. `.ai`, EPS and PDF files carry no composer. +fonts that keep a script on Latin character codes. The scripts a Standard composer leaves unshaped are Indic, Arabic and the +other joining scripts (Syriac, N'Ko, Mongolian, Adlam…) and Hebrew; Latin, Greek, Cyrillic, CJK, Thai and the rest keep their +kerning and ligatures under every composer. Letters left unshaped do not join, so Insert Kashidas adds no tatweel between them. An older VectorCraft cannot open a file that uses a Standard composer. `.ai`, EPS and PDF files carry no composer. Every-line, the default, picks the breaks of the whole paragraph together in area type: justified text gets even word spacing, ragged text (left, centre or right aligned) an even rag, so it may move a word that fits to the next line to avoid a lone short word on the last line or a full line next to a short one. @@ -10500,8 +10501,9 @@ no room for all of it, or when the search for its breaks passes VectorCraft's ow 2,000,000 baseline steps for one paragraph, 2,000,000 lines and 4,000,000 steps for all the paragraphs of a frame). The UI command `type.lineComposer` (Cmd+Alt+Shift+C, in remote mode `press_key {key: "C", mods: {cmd: true, alt: true, shift: true}}` or `invoke_menu`) sets the Single-line form when every paragraph of the selected type (or every paragraph the -Type tool's selection touches) uses an Every-line one, else the Every-line form, keeping each paragraph's shaping (`singleLine` -or `everyLine`; a Standard composer toggles between `standardSingleLine` and `standardEveryLine`), and returns the composer it set. +Type tool's selection touches) uses an Every-line one, else the Every-line form. Paragraphs that all use a Standard composer +keep it (`standardSingleLine` or `standardEveryLine`); any other mix takes the Middle Eastern & South Asian one (`singleLine` +or `everyLine`). It returns the composer it set. ```json {"name":"run_command","arguments":{"command":"text.setFormat","params":{"ids":[7],"composer":"singleLine"}}} diff --git a/docs/type-parity.md b/docs/type-parity.md index f49594adc5..ed343131af 100644 --- a/docs/type-parity.md +++ b/docs/type-parity.md @@ -62,7 +62,7 @@ against Illustrator's public documentation; **estimated** unless noted. | Middle Eastern: bidirectional layout, Paragraph Direction | done | 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 still needs ActualText support (#6165); separately styled or differently rotated clusters and external viewer search/copy remain outside this export-only evidence. | | Middle Eastern and Indic: digit types (Character panel menu › Digits: Default, Arabic, Hindi, Farsi; Devanagari, Bengali, Gurmukhi, Gujarati, Odia, Tamil, Telugu, Kannada, Malayalam) | done | `text.setFormat` / `text.setRangeStyle {digits}` (`"devanagari"`, `"bengali"`, `"gurmukhi"`, `"gujarati"`, `"odia"`, `"tamil"`, `"telugu"`, `"kannada"`, `"malayalam"` added, #4942); the text keeps the typed digits, the glyphs and SVG export follow the style; carried by character styles. Not yet: `.ai` export of the setting; Indic digits typed as such stay as typed under another system. Evidence: `text::tests::indic_digits_map_to_their_scripts_block`, `tests::bidi::indic_digits_draw_the_scripts_own_digits`, `typecmd::area_tests::indic_digits_round_trip_through_the_commands_and_the_file` | | Middle Eastern: Kashidas | done | Paragraph Insert Kashidas sets the length for justified Arabic area type; Character-menu Kashidas allows or excludes selected characters, on by default. A kashida is inserted only between two allowed joined characters. The character switch is retained in character styles and the native file; the length is retained in paragraph styles and the native file. Paint-only harakat (coloured or hidden marks) stay in one shaping cluster so letters keep joining; when the character-level pass matches, a glyph may take a later in-cluster character's run only if GDEF names it a mark (class 3) and that character is a harakat—otherwise the cluster start (a mark may miss its colour; a base never takes a mark's). Inserted tatweels take the base letter's paint—not a trailing mark's. Fonts without GDEF and some AAT/`morx` ligatures (e.g. Geeza Pro Allah) can leave a mark painted as its letter. No Character-panel harakat colour command yet. Evidence: `tests::harakat`. [Public help](https://helpx.adobe.com/illustrator/desktop/design-with-text/fonts-and-scripts/justify-text-using-kashida-and-hyphenation.html). | -| Middle Eastern & South Asian composers and Standard composers (Paragraph panel menu, paragraph styles, `text.setFormat {composer}`) | done / partial | #4935: per paragraph, four choices. Middle Eastern & South Asian Single-line and Every-line are how all type was already set (complex-script shaping on) and stay the default, so existing documents do not change. Standard Single-line and Every-line break lines the same way and set Indic, Arabic and Hebrew type glyph by glyph as the font maps its characters (no conjuncts, reordering, mark placement or joining), for legacy fonts that keep a script on Latin character codes; Latin and other scripts keep their kerning and ligatures. The native file and paragraph styles keep the choice (`standardSingleLine` / `standardEveryLine`; an older VectorCraft cannot read a file that uses them). `.ai`, EPS and PDF import and export carry no composer: this app has no recorded format for it, so a Standard paragraph opened from or saved to those files comes back Middle Eastern & South Asian. Evidence: `tests::composers`, `tests::panelcmds::text_set_format_takes_the_four_composers`, `native_v3::all_four_composers_round_trip` | +| Middle Eastern & South Asian composers and Standard composers (Paragraph panel menu, paragraph styles, `text.setFormat {composer}`) | done / partial | #4935: per paragraph, four choices. Middle Eastern & South Asian Single-line and Every-line are how all type was already set (complex-script shaping on) and stay the default, so existing documents do not change. Standard Single-line and Every-line break lines the same way and set Indic, Arabic and Hebrew type glyph by glyph as the font maps its characters (no conjuncts, reordering, mark placement or joining), for legacy fonts that keep a script on Latin character codes. Indic, Arabic and the other joining scripts and Hebrew are the scripts left unshaped (their letters do not join, so Insert Kashidas adds no tatweel); Latin, Greek, Cyrillic, CJK, Thai and the rest keep their kerning and ligatures. The native file and paragraph styles keep the choice (`standardSingleLine` / `standardEveryLine`; an older VectorCraft cannot read a file that uses them). `.ai`, EPS and PDF import and export carry no composer: this app has no recorded format for it, so a Standard paragraph opened from or saved to those files comes back Middle Eastern & South Asian. Evidence: `tests::composers`, `tests::panelcmds::text_set_format_takes_the_four_composers`, `native_v3::all_four_composers_round_trip` | | Middle Eastern: split caret | missing | Character Direction is done; editable bidirectional SVG text remains incomplete. | | CJK: input methods (marked text, candidate window) | done | | | CJK: kinsoku (Hard, Soft, None), the predefined mojikumi sets (None, YakumonoHankaku, GyomatsuYakumonoHankaku, GyomatsuYakumonoZenkaku, YakumonoZenkaku, with VectorCraft's own spacing for each) and Line-end Punctuation Half Width, tate-chu-yoko (auto) | done / partial | custom kinsoku sets, custom mojikumi sets and the Mojikumi Settings dialog missing | From 2ad37706767d959bcabfc564d481375f94f204e8 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 02:11:35 -0800 Subject: [PATCH 07/50] i18n: drop the answers rows main now carries in fr, ko, ru and zh-hans Main added the script.run answers list and reason rows to fr and ko, and the `answers[{i}]` wrapper to ru and zh-hans. This branch's copies of those rows were duplicates, which bundled_catalogs_are_consistent rejects. Main's rows stay; the wrapper and app-run refusal rows this branch adds are kept. --- crates/ui-egui/src/i18n/fr.tsv | 10 ---------- crates/ui-egui/src/i18n/ko.tsv | 10 ---------- crates/ui-egui/src/i18n/ru.tsv | 1 - crates/ui-egui/src/i18n/zh-hans.tsv | 1 - 4 files changed, 22 deletions(-) diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 9eb9ad3630..0e8e227aa1 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -4358,17 +4358,7 @@ axis Both Les deux @msg `name` must be the name of a script engine `name` doit être le nom d'un moteur de script @msg the main script engine is new for each run and is never kept, so it cannot be dropped le moteur de script principal est nouveau à chaque exécution et n'est jamais conservé, il ne peut donc pas être supprimé @msg there is no script engine named {name} il n'y a aucun moteur de script nommé {name} -@msg `answers` must be a list of answers `answers` doit être une liste de réponses -@msg `answers` has more than {MAX_ANSWERS} answers `answers` contient plus de {MAX_ANSWERS} réponses -@msg `answers` is larger than 1 MiB `answers` dépasse 1 Mio @msg `answers[{i}]` {e} `answers[{i}]` {e} -@msg must be an object with `kind` and `value` doit être un objet avec `kind` et `value` -@msg must have exactly `kind` and `value` doit avoir exactement `kind` et `value` -@msg is an alert's answer, whose `value` must be "ok" est la réponse d'un alert, dont `value` doit être "ok" -@msg is a confirm's answer, whose `value` must be true or false est la réponse d'un confirm, dont `value` doit être true ou false -@msg is longer than 16 KiB dépasse 16 Kio -@msg is a prompt's answer, whose `value` must be a string or null est la réponse d'un prompt, dont `value` doit être une chaîne ou null -@msg must have `kind` alert, confirm or prompt doit avoir `kind` alert, confirm ou prompt @msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` est réservé à une exécution sans personne à qui demander : dans l'application, la personne répond à chaque boîte de dialogue @msg Running a script Exécution d’un script @msg Copied the script report Rapport du script copié diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 0b10067aee..2a52297a85 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -5111,17 +5111,7 @@ theme Appearance 외관 @msg `name` must be the name of a script engine `name`은(는) 스크립트 엔진의 이름이어야 합니다 @msg the main script engine is new for each run and is never kept, so it cannot be dropped 기본 스크립트 엔진은 실행마다 새로 만들어지고 유지되지 않으므로 삭제할 수 없습니다 @msg there is no script engine named {name} 이름이 {name}인 스크립트 엔진이 없습니다 -@msg `answers` must be a list of answers `answers`는 답의 목록이어야 합니다 -@msg `answers` has more than {MAX_ANSWERS} answers `answers`에 답이 {MAX_ANSWERS}개보다 많습니다 -@msg `answers` is larger than 1 MiB `answers`가 1 MiB보다 큽니다 @msg `answers[{i}]` {e} `answers[{i}]`: {e} -@msg must be an object with `kind` and `value` `kind`와 `value`가 있는 객체여야 합니다 -@msg must have exactly `kind` and `value` 정확히 `kind`와 `value`만 있어야 합니다 -@msg is an alert's answer, whose `value` must be "ok" alert의 답이므로 `value`는 "ok"여야 합니다 -@msg is a confirm's answer, whose `value` must be true or false confirm의 답이므로 `value`는 true 또는 false여야 합니다 -@msg is longer than 16 KiB 16 KiB보다 깁니다 -@msg is a prompt's answer, whose `value` must be a string or null prompt의 답이므로 `value`는 문자열 또는 null이어야 합니다 -@msg must have `kind` alert, confirm or prompt `kind`는 alert, confirm 또는 prompt여야 합니다 @msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers`는 물어볼 사람이 없는 실행에만 쓰입니다. 앱에서는 사람이 각 대화 상자에 답합니다 @msg Running a script 스크립트 실행 중 @msg Copied the script report 스크립트 보고서를 복사했습니다 diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index 4861884c9b..9e6dc7c497 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -4409,7 +4409,6 @@ axis Both Оба @msg `answers` must be a list of answers `answers` должен быть списком ответов @msg `answers` has more than {MAX_ANSWERS} answers в `answers` больше {MAX_ANSWERS} ответов @msg `answers` is larger than 1 MiB `answers` больше 1 МиБ -@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg must be an object with `kind` and `value` должен быть объектом с `kind` и `value` @msg must have exactly `kind` and `value` должен содержать ровно `kind` и `value` @msg is an alert's answer, whose `value` must be "ok" является ответом на alert, поэтому его `value` должно быть "ok" diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index fd9a7255cf..1c81751241 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -7366,7 +7366,6 @@ breakText Glyphs 字形 @msg `alignOn` must be a string `alignOn` 必须是字符串 @msg `align` must be a string `align` 必须是字符串 @msg `answer` for this {kind} dialog must be one of: {_1} 此 {kind} 对话框的 `answer` 必须是以下之一:{_1} -@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` 中的回答超过 {MAX_ANSWERS} 个 @msg `answers` is larger than 1 MiB `answers` 大于 1 MiB @msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` 仅用于无人可问的运行:在应用中,由用户回答每个对话框 From 04c2b070ef88607a0c26b59245f8cea93eff4437 Mon Sep 17 00:00:00 2001 From: Taha-Mahmoodi <85902429+Taha-Mahmoodi@users.noreply.github.com> Date: Sat, 14 Nov 2026 14:43:40 +0430 Subject: [PATCH 08/50] test(ui): satisfy clippy manual_contains --- crates/ui-egui/src/panels/paragraph/tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/panels/paragraph/tests.rs b/crates/ui-egui/src/panels/paragraph/tests.rs index f700d404c1..d9859fdf60 100644 --- a/crates/ui-egui/src/panels/paragraph/tests.rs +++ b/crates/ui-egui/src/panels/paragraph/tests.rs @@ -144,7 +144,7 @@ fn the_paragraph_menu_sets_each_of_the_four_composers() { let texts = items(&mut app); for (v, label) in labels { let row = if v == value { format!("✓ {label}") } else { format!(" {label}") }; - assert!(texts.iter().any(|t| *t == row), "{value}: {row:?} in {texts:?}"); + assert!(texts.contains(&row), "{value}: {row:?} in {texts:?}"); } } // Choosing a row sets its composer: the row is a `text.setFormat {composer}` with the row's id. From 3886849c8b9181968062b8a4509842e28b0f4c6b Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 03:03:05 -0800 Subject: [PATCH 09/50] i18n: the untranslated scan reads return values and tail expressions, not locals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The scan of `.map_err` closures and named error handlers now reads the value of each `return` (also inside an `if` branch or a `let` statement, but not inside a closure the handler holds) and the last expression after a block statement that has no `;`. The branches, arms and statements of a `let` statement count only when the handler returns the local by name, as in `let why = if … { format!(…) } else { … }; Error(why)`. A local the handler only passes to another call or writes into a `format!` string, such as `let level = if … { "warning" } else { "error" };`, stays out of the untranslated report and the message dump. --- crates/ui-egui/src/i18n/tests.rs | 206 ++++++++++++++++++++++++++++--- 1 file changed, 190 insertions(+), 16 deletions(-) diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 4f9f03e5f6..bbce046ac7 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -2852,6 +2852,72 @@ fn f(text: &str, n: usize) -> Result { assert!(message_literals_in(&["effects"]).contains("the SVG filter isn't valid XML: {e}")); } +/// The scan reads the message a `.map_err` closure gives with `return`, also from inside an `if` +/// branch or a `let` statement but not from a closure inside it, the last expression after a block +/// statement with no `;`, and the values a `let` statement gives a local that the closure returns, +/// and not those of a local the closure only passes elsewhere or writes into a format string, by +/// name or as a `format!` argument. +#[test] +fn message_scan_reads_returns_and_tails_and_skips_locals() { + let code = r#" +fn f(text: &str) -> Result { + let a = read(text).map_err(|_| { + return "the file cannot be read".to_string(); + })?; + let b = read(text).map_err(|e| { + if e.is_io() { + return format!("the disk failed: {e}"); + } + e.to_string() + })?; + let c = read(text).map_err(|e| { + if e.is_io() { cleanup(); } + format!("the file is cut short: {e}") + })?; + let d = read(text).map_err(|e| { + if e.is_io() { cleanup(); } + let level = if e.is_io() { "warning" } else { "error" }; + log_failure(level, &e); + format!("the file is not a library: {e}") + })?; + let g = read(text).map_err(|e| { + let kind = match e.kind() { + Kind::Gone => return GONE.into(), + _ => { "some other kind" } + }; + format!("the {kind} file is wrong") + })?; + let h = read(text).map_err(|e| { + let name = e.name().unwrap_or_else(|| return "unnamed source"); + let note = e.note().map(move |n| { return "noted source" }); + format!("the source {name} is gone") + })?; + let k = read(text).map_err(|e| { + let why = if e.is_deep() { format!("its objects are nested too deep ({e})") } else { e.to_string() }; + FormatError::NotVectorcraft(why) + })?; + let m = read(text).map_err(|e| { + let level = if e.is_io() { "warning" } else { "error" }; + format!("the file failed with a {}", level) + })?; + Ok(a) +} +"#; + let consts = [("GONE", "the file is gone")].map(|(k, v)| (k.to_string(), vec![v.to_string()])).into(); + let want = [ + "the file cannot be read", + "the disk failed: {e}", + "the file is cut short: {e}", + "the file is not a library: {e}", + "the file is gone", + "the {kind} file is wrong", + "the source {name} is gone", + "its objects are nested too deep ({e})", + "the file failed with a {_1}", + ]; + assert_eq!(source_messages(code, &[], &consts), want); +} + /// The scan reads the messages of an error handler that a `.map_err(name)` names: a closure bound /// to that name, up to its `;`, and a function of that name, each of its statements. #[test] @@ -4464,27 +4530,72 @@ fn statement(code: &str) -> &str { /// Where each value a closure can return starts, `body` being the text after its parameters: the /// body itself, each block or `if`/`else` branch in it (`{ ACB_CUT_SHORT.into() }`, not the -/// `{` of a `json!({…})` value), each `match` arm (`=>`) and each statement after a `;` (the -/// last expression of a block or a function body), up to the bracket that closes the call the -/// closure is given to or the function. +/// `{` of a `json!({…})` value), each `match` arm (`=>`), each statement after a `;` or after a +/// block statement's `}` (the last expression of a block or a function body) and the value of +/// each `return`, up to the bracket that closes the call the closure is given to or the function. +/// The blocks, arms and statements inside a `let` statement give a local its value, so they count +/// only when the local's name is used, outside a string literal and a `format!`, in a value the closure returns +/// (`let why = if … { format!("…") } else { … }; Error(why)`), and not when the local only goes +/// elsewhere (`let level = if … { "warning" } else { "error" }; log(level);`). A `return` counts +/// wherever it is, except inside a closure the body holds (`unwrap_or_else(|| return …)`). fn closure_returns(body: &str) -> Vec<&str> { - let mut out = vec![body]; - let (mut depth, mut chars) = (0usize, body.char_indices()); + let ident = |c: char| c.is_alphanumeric() || c == '_'; + // The name a `let` statement starting at `at` binds (empty for a pattern), if it is one. + let let_at = |at: usize| { + let rest = body[at..].trim_start().strip_prefix("let").filter(|r| r.starts_with(char::is_whitespace))?.trim_start(); + let rest = rest.strip_prefix("mut ").map_or(rest, str::trim_start); + Some(&rest[..rest.find(|c: char| !ident(c)).unwrap_or(rest.len())]) + }; + // Each place a value starts, with the `let` whose local it gives a value to, if any, and + // whether a `return` gives it. + let mut found: Vec<(&str, Option<&str>, bool)> = vec![(body, None, false)]; + // For each open bracket, the `quiet` and `in_let` of the text around it: `quiet` names the + // `let` that a value inside the bracket belongs to, `in_let` the `let` the statement is. + let mut outer = vec![]; + let (mut quiet, mut in_let, mut chars) = (None, let_at(0), body.char_indices()); + // Where the innermost closure in the body that a `return` would leave ends. + let mut inner_closure_end = 0; while let Some((at, c)) = chars.next() { match c { - '(' | '[' => depth += 1, - '{' => { - depth += 1; - if !body[..at].trim_end().ends_with('(') { - out.push(&body[at + 1..]); + '|' if at >= inner_closure_end => { + let before = body[..at].trim_end(); + let after_operator = before.ends_with(['(', ',', '=']) && !["==", "!=", "<=", ">="].iter().any(|op| before.ends_with(op)); + let opens = after_operator || (before.ends_with("move") && !before[..before.len() - 4].ends_with(ident)); + let params_end = if body[at + 1..].starts_with('|') { Some(at + 1) } else { body[at + 1..].find('|').map(|end| at + 1 + end) }; + if let Some(params_end) = params_end.filter(|_| opens) { + inner_closure_end = params_end + 1 + statement(&body[params_end + 1..]).len(); } } - ')' | ']' | '}' => match depth.checked_sub(1) { - Some(d) => depth = d, - None => break, - }, - ';' => out.push(&body[at + 1..]), - '=' if body[at + 1..].starts_with('>') => out.push(&body[at + 2..]), + '(' | '[' | '{' => { + outer.push((quiet, in_let)); + if c == '{' && !body[..at].trim_end().ends_with('(') { + found.push((&body[at + 1..], quiet.or(in_let), false)); + } + quiet = quiet.or(in_let); + in_let = if c == '{' { let_at(at + 1) } else { None }; + } + ')' | ']' | '}' => { + let Some(around) = outer.pop() else { break }; + (quiet, in_let) = around; + if c == '}' { + found.push((&body[at + 1..], quiet.or(in_let), false)); + if in_let.is_none() { + in_let = let_at(at + 1); + } + } + } + ';' => { + found.push((&body[at + 1..], quiet, false)); + in_let = let_at(at + 1); + } + '=' if body[at + 1..].starts_with('>') => found.push((&body[at + 2..], quiet.or(in_let), false)), + 'r' if at >= inner_closure_end + && body[at..].starts_with("return") + && !body[..at].ends_with(ident) + && !body[at + "return".len()..].starts_with(ident) => + { + found.push((&body[at + "return".len()..], None, true)); + } '"' => loop { match chars.next() { Some((_, '\\')) => { @@ -4497,6 +4608,69 @@ fn closure_returns(body: &str) -> Vec<&str> { _ => {} } } + // The values the closure returns: each `return`, and each expression that ends its block + // rather than a `;` (a block's start, which spans the whole block, aside). + let returned: Vec = found + .iter() + .filter(|&&(start, held, by_return)| { + let tail = !start.trim_start().starts_with('{') && !start[statement(start).len()..].starts_with(';'); + held.is_none() && (by_return || tail) + }) + .map(|(start, ..)| without_format_args(&without_strings(statement(start)))) + .collect(); + let used = |name: &str| !name.is_empty() && returned.iter().any(|value| holds_ascii_word(value, name)); + found.into_iter().filter(|&(_, held, _)| held.is_none_or(used)).map(|(start, ..)| start).collect() +} + +/// `code`, its string literals already emptied, with the arguments of each `format!(…)` removed: +/// a value written into a format string is part of a message, not one of its own. +fn without_format_args(code: &str) -> String { + let (mut out, mut rest) = (String::new(), code); + while let Some(at) = rest.find("format!(") { + out.push_str(&rest[..at + "format!(".len()]); + rest = &rest[at + "format!(".len()..]; + let mut depth = 0usize; + let end = rest.char_indices().find_map(|(i, c)| match c { + '(' | '[' | '{' => { + depth += 1; + None + } + ')' | ']' | '}' => match depth.checked_sub(1) { + Some(d) => { + depth = d; + None + } + None => Some(i), + }, + _ => None, + }); + rest = &rest[end.unwrap_or(rest.len())..]; + } + out.push_str(rest); + out +} + +/// `code` with the text of its string literals removed, the quotes kept. +fn without_strings(code: &str) -> String { + let (mut out, mut chars) = (String::new(), code.chars()); + while let Some(c) = chars.next() { + out.push(c); + if c == '"' { + loop { + match chars.next() { + Some('\\') => { + chars.next(); + } + Some('"') => { + out.push('"'); + break; + } + Some(_) => {} + None => break, + } + } + } + } out } From 6c9497847ede91774a0db6a62f30683b7280f0eb Mon Sep 17 00:00:00 2001 From: Davit Matchakhelidze Date: Sat, 14 Nov 2026 21:41:51 +0400 Subject: [PATCH 10/50] i18n(ka): update the Georgian catalog --- crates/ui-egui/src/i18n/ka.tsv | 2101 +++++++++++++++++++++++++++++++- 1 file changed, 2059 insertions(+), 42 deletions(-) diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 55f726dc38..b0eb70e775 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -170,7 +170,7 @@ Place Image გამოსახულების განთავსება Remove Background ფონის მოშორება Background ფონი - Edge Color კიდის ფერი + Edge Color კიდეების ფერი Picked Colors არჩეული ფერები Corner Color კუთხეების ფერი Contiguous მომიჯნავე @@ -357,7 +357,7 @@ Create Outlines კონტურებად გარდაქმნა Optical Margin Alignment ოპტიკური არშიის სწორება Dynamic Text დინამიკური ტექსტი - Dynamic Text Presets დინამიკური ტექსტის წინასწარი პარამეტრები + Dynamic Text Presets დინამიკური ტექსტის პრესეტები Arch თაღი @msg select point type or type on a path აირჩიეთ წერტილოვანი ტექსტი ან ტრაექტორიაზე ტექსტი @msg type on a path in a thread cannot use Dynamic Text: {frames} დაკავშირებულ ტექსტში ტრაექტორიაზე ტექსტი ვერ გამოიყენებს დინამიკურ ტექსტს: {frames} @@ -439,7 +439,7 @@ Revolve (Classic)… ბრუნვა (კლასიკური)… Rotate (Classic)… შემობრუნება (კლასიკური)… Surface ზედაპირი - Wireframe მავთულის ჩარჩო + Wireframe კარკასი No Shading დაჩრდილვის გარეშე Plastic პლასტიკური Highlight Intensity ელვარების ინტენსივობა @@ -730,7 +730,7 @@ Cracked Glaze დამსკდარი მინანქარი Mosaic Floor მოზაიკის იატაკი Quilted Squares ქვილთის კვადრატები - Leaded Glass ტყვიის მინა + Leaded Glass ტყვიის ვიტრაჟი Damp Paper ნესტიანი ქაღალდი Outlines and Rules კონტურები და ხაზები Hand-Drawn ხელით დახატული @@ -1463,14 +1463,14 @@ digits Telugu ტელუგუ digits Kannada კანადა digits Malayalam მალაიალამური Reset Panel პანელის ჩამოყრა - Roman Baseline ლათინური საბაზისო ხაზი + Roman Baseline რომაული საბაზისო ხაზი Select a text object to edit its character attributes. სიმბოლოების ატრიბუტების რედაქტირებისთვის მონიშნეთ ტექსტური ობიექტი. Show Options პარამეტრების ჩვენება Show Recent Colors ბოლოდროინდელი ფერების ჩვენება Toggle RGB Percent RGB-ის პროცენტებში ჩვენების გადართვა Small Caps პატარა მთავრული Small Caps (on the roadmap) პატარა მთავრული (სამომავლო გეგმაშია) - Standard Vertical Roman Alignment სტანდარტული ვერტიკალური ლათინური სწორება + Standard Vertical Roman Alignment სტანდარტული ვერტიკალური რომაული სწორება Strikethrough გადახაზული Character: სიმბოლო: Paragraph: აბზაცი: @@ -1584,7 +1584,7 @@ digits Malayalam მალაიალამური {glyph} is not an alternate of {sel} (U+{code}) as it stands in its word. {glyph} არ არის {sel} (U+{code})-ის ალტერნატივა იმ სახით, როგორც ის თავის სიტყვაშია. Double-click to insert {base} (U+{code}) instead: a presentation form does not join, the letter does. ორჯერ დაწკაპეთ ამის ნაცვლად {base} (U+{code}) ჩასასმელად: გამოსახვის ფორმა არ უკავშირდება, ასო უკავშირდება. Inserted {base} (U+{code}) instead of a presentation form: the font joins it to its neighbors by position. გამოსახვის ფორმის ნაცვლად ჩასმულია {base} (U+{code}): შრიფტი მას მეზობლებს პოზიციის მიხედვით აკავშირებს. - No OpenType feature draws this glyph here, so it replaces the character's glyph and may not join its neighbors. აქ არც ერთი OpenType ფუნქცია არ ხატავს ამ გლიფს, ამიტომ ის ანაცვლებს სიმბოლოს გლიფს და შეიძლება არ დაუკავშირდეს მეზობელ სიმბოლოებს. + No OpenType feature draws this glyph here, so it replaces the character's glyph and may not join its neighbors. აქ არც ერთი OpenType შესაძლებლობა არ ხატავს ამ გლიფს, ამიტომ ის ანაცვლებს სიმბოლოს გლიფს და შეიძლება არ დაუკავშირდეს მეზობელ სიმბოლოებს. Double-click to insert ორჯერ დაწკაპეთ ჩასასმელად Entire Font მთელი შრიფტი glyph {id} გლიფი {id} @@ -1616,7 +1616,7 @@ digits Malayalam მალაიალამური Points: clicks add free points წერტილები: დაწკაპუნებები ამატებს თავისუფალ წერტილებს Radial Gradient რადიალური გრადიენტი Conic Gradient კონუსური გრადიენტი - Diamond Gradient რომბული გრადიენტი + Diamond Gradient ბრილიანტისებრი გრადიენტი Reset to White, Black თეთრზე და შავზე დაბრუნება Reverse Gradient გრადიენტის შებრუნება Gradient Presets გრადიენტის პრესეტები @@ -1795,7 +1795,7 @@ digits Malayalam მალაიალამური Hard მკაცრი Right Indent მარჯვენა შეწევა Right-to-Left Paragraph Direction აბზაცის მიმართულება მარჯვნიდან მარცხნივ - Roman Hanging Punctuation ლათინური გამოწეული პუნქტუაცია + Roman Hanging Punctuation რომაული გამოწეული პუნქტუაცია Korean Line Break Anywhere კორეული სტრიქონის გადატანა ნებისმიერ ადგილას Bunri-Kinshi Bunri-Kinshi East Asian Composition Settings აღმოსავლეთ აზიური აწყობის პარამეტრები @@ -2381,7 +2381,7 @@ digits Malayalam მალაიალამური @plural {n} folder|{n} folders {n} საქაღალდე @plural {n} file|{n} files {n} ფაილი @plural {n} folder skipped, such as another app's or the system's folder or a hidden one|{n} folders skipped, such as other apps' and the system's folders and hidden ones გამოტოვებული საქაღალდეები: {n} — მაგ. სხვა აპლიკაციების, სისტემის და დამალული საქაღალდეები -@plural {n} folder or file couldn't be read|{n} folders or files couldn't be read ვერ წაიკითხა საქაღალდეები ან ფაილები: {n} +@plural {n} folder or file couldn't be read|{n} folders or files couldn't be read საქაღალდეების ან ფაილების წაკითხვა ვერ მოხერხდა: {n} The search stopped at its limit: search a smaller folder. ძიება ზღვარზე შეჩერდა: მოძებნეთ უფრო პატარა საქაღალდეში. Copy only fonts you own or are licensed to install. დააკოპირეთ მხოლოდ ის შრიფტები, რომლებიც გეკუთვნით ან რომელთა დაყენების ლიცენზია გაქვთ. VectorCraft copies the fonts to {folder}. VectorCraft შრიფტებს აკოპირებს აქ: {folder}. @@ -2538,7 +2538,7 @@ digits Malayalam მალაიალამური Printer პრინტერი Printer profile: პრინტერის პროფილი: Printer: პრინტერი: - Rendering intent: რენდერინგის მიზანი: + Rendering intent: რენდერინგის განზრახვა: Same As Source წყაროს მსგავსად Save these settings as a print preset ამ პარამეტრების შენახვა ბეჭდვის პრესეტად Scaling: მასშტაბირება: @@ -2605,7 +2605,7 @@ digits Malayalam მალაიალამური Recolor this row ამ სტრიქონის ხელახლა შეფერადება Reset the rows to the artwork's colors სტრიქონებისთვის ნახატის ფერების დაბრუნება Color Theme Picker ფერთა თემის ამრჩევი - Click or drag across the art to pick its colors; Shift adds more დააწკაპუნეთ ან გადაატარეთ ნახატზე მისი ფერების ასაღებად; Shift ამატებს კიდევ + Click or drag across the art to pick its colors; Shift adds more დაწკაპეთ ან გადაატარეთ ნახატზე მისი ფერების ასაღებად; Shift ამატებს კიდევ Prominent Colors გამოკვეთილი ფერები Save All Colors ყველა ფერის შენახვა Save Prominent Colors გამოკვეთილი ფერების შენახვა @@ -3174,9 +3174,9 @@ theme Appearance იერსახე Split Freeform Line თავისუფალი ხაზის გაყოფა Gradient Vector გრადიენტის ვექტორი Select Gradient Stop გრადიენტის გადასვლის წერტილის მონიშვნა - Create Graph გრაფიკის შექმნა - Graph Data გრაფიკის მონაცემები - Graph Type გრაფიკის ტიპი + Create Graph დიაგრამის შექმნა + Graph Data დიაგრამის მონაცემები + Graph Type დიაგრამის ტიპი Vector Halftone ვექტორული ნახევარტონი spot სპოტ Text ტექსტი @@ -3865,7 +3865,7 @@ font-technology Variable ცვლადი The defaults are applied when you click OK in Preferences. Cancel there keeps your current preferences. ნაგულისხმევი მნიშვნელობები გამოიყენება, როცა პარამეტრებში OK-ს დააჭერთ. იქ გაუქმება ინარჩუნებს თქვენს მიმდინარე პარამეტრებს. Smaller ↔ Larger უფრო პატარა ↔ უფრო დიდი Smart Guides (View → Smart Guides) ჭკვიანი დამხმარე ხაზები (ხედი → ჭკვიანი დამხმარე ხაზები) - Couldn't save recovery data: {e} აღდგენის მონაცემები ვერ შეინახა: {e} + Couldn't save recovery data: {e} აღდგენის მონაცემების შენახვა ვერ მოხერხდა: {e} Saved recovery data for {title} შენახულია აღდგენის მონაცემები: {title} Saving recovery data for {} ინახება აღდგენის მონაცემები: {} Alt Alt @@ -4087,12 +4087,12 @@ font-technology Variable ცვლადი @msg Couldn't place {name}: the document it was dropped on was reverted {name} ვერ განთავსდა: დოკუმენტი, რომელზეც ის ჩამოაგდეს, წინა ვერსიაზე დაბრუნდა @msg Couldn't place {name}: the document it was placed in was reverted {name} ვერ განთავსდა: დოკუმენტი, რომელშიც ის თავსდებოდა, წინა ვერსიაზე დაბრუნდა @msg Couldn't paste: the document it was pasted in was reverted ჩასმა ვერ მოხერხდა: დოკუმენტი, რომელშიც ის ჩაისმებოდა, წინა ვერსიაზე დაბრუნდა -@msg Couldn't read {name}: {e} {name} ვერ წაიკითხა: {e} -@msg Couldn't save recovery data: {e} აღდგენის მონაცემები ვერ შეინახა: {e} -@msg Couldn't save recovery data for {title}: {e}. Copies go to {folder}, the default recovery folder; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) დოკუმენტის {title} აღდგენის მონაცემები ვერ შეინახა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც აღდგენის ნაგულისხმევი საქაღალდეა; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) -@msg Couldn't save recovery data for {title}: {e}. Copies go to {folder}, the folder set in Preferences; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) დოკუმენტის {title} აღდგენის მონაცემები ვერ შეინახა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც პარამეტრებშია მითითებული; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) -@msg Couldn't save recovery data: {e}. Copies go to {folder}, the default recovery folder; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) აღდგენის მონაცემები ვერ შეინახა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც აღდგენის ნაგულისხმევი საქაღალდეა; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) -@msg Couldn't save recovery data: {e}. Copies go to {folder}, the folder set in Preferences; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) აღდგენის მონაცემები ვერ შეინახა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც პარამეტრებშია მითითებული; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) +@msg Couldn't read {name}: {e} ფაილის წაკითხვა ვერ მოხერხდა ({name}): {e} +@msg Couldn't save recovery data: {e} აღდგენის მონაცემების შენახვა ვერ მოხერხდა: {e} +@msg Couldn't save recovery data for {title}: {e}. Copies go to {folder}, the default recovery folder; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) დოკუმენტის {title} აღდგენის მონაცემების შენახვა ვერ მოხერხდა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც აღდგენის ნაგულისხმევი საქაღალდეა; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) +@msg Couldn't save recovery data for {title}: {e}. Copies go to {folder}, the folder set in Preferences; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) დოკუმენტის {title} აღდგენის მონაცემების შენახვა ვერ მოხერხდა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც პარამეტრებშია მითითებული; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) +@msg Couldn't save recovery data: {e}. Copies go to {folder}, the default recovery folder; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) აღდგენის მონაცემების შენახვა ვერ მოხერხდა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც აღდგენის ნაგულისხმევი საქაღალდეა; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) +@msg Couldn't save recovery data: {e}. Copies go to {folder}, the folder set in Preferences; to use another folder, set Preferences → File Handling → Data Recovery → Folder (recoveryFolder) აღდგენის მონაცემების შენახვა ვერ მოხერხდა: {e}. ასლები ინახება საქაღალდეში {folder}, რომელიც პარამეტრებშია მითითებული; სხვა საქაღალდის გამოსაყენებლად მიუთითეთ პარამეტრები → ფაილების დამუშავება → მონაცემთა აღდგენა → საქაღალდე (recoveryFolder) @msg Create Outlines: select text objects კონტურების შექმნა: მონიშნეთ ტექსტური ობიექტები @msg Create from Guides: the document has no artboard დამხმარე ხაზებიდან შექმნა: დოკუმენტს სამუშაო დაფა არ აქვს @msg Create from Guides: the guides make more than {MAX_PIECES} slices დამხმარე ხაზებიდან შექმნა: დამხმარე ხაზები {MAX_PIECES}-ზე მეტ ნაჭერს ქმნის @@ -4249,7 +4249,7 @@ font-technology Variable ცვლადი @msg `{name}` is a built-in preset and can't change: save it under another name `{name}` ჩაშენებული პრესეტია და მისი შეცვლა შეუძლებელია: შეინახეთ სხვა სახელით @msg `{name}` is a built-in preset and stays `{name}` ჩაშენებული პრესეტია და მისი წაშლა შეუძლებელია @msg a swatch or color group named `{n}` exists ფერის ნიმუში ან ფერების ჯგუფი სახელით `{n}` არსებობს -@msg a slice size must be a positive number of points ნაჭრის ზომა წერტილების დადებითი რიცხვი უნდა იყოს +@msg a slice size must be a positive number of points ნაჭრის ზომა უნდა იყოს დადებითი რიცხვი პუნქტებში @msg a stream runs past the end ნაკადი ბოლოს სცილდება @msg a stream's length is wrong ნაკადის სიგრძე არასწორია @msg a stream's length isn't a number ნაკადის სიგრძე რიცხვი არ არის @@ -4461,7 +4461,7 @@ font-technology Variable ცვლადი @msg not a VectorCraft file: {0} ეს არ არის VectorCraft-ის ფაილი: {0} @msg not a VectorCraft shortcut set (missing `overrides`) ეს არ არის VectorCraft-ის მალსახმობების ნაკრები (აკლია `overrides`) @msg not a graphic style library (format `{_1}`) ეს არ არის გრაფიკული სტილების ბიბლიოთეკა (ფორმატი `{_1}`) -@msg not a stored central record ეს არ არის შენახული ცენტრალური ჩანაწერი +@msg not a stored central record ეს არ არის შეუკუმშავი (stored) ცენტრალური ჩანაწერი @msg not a valid plug-in module: {0} ეს არ არის პლაგინის სწორი მოდული: {0} @msg not an EMF or WMF file ეს არ არის EMF ან WMF ფაილი @msg not an HP-GL file ეს არ არის HP-GL ფაილი @@ -4522,7 +4522,7 @@ font-technology Variable ცვლადი @msg select a blend მონიშნეთ გადასვლა @msg select a clip group მონიშნეთ მომჭრელი ჯგუფი @msg select a gradient mesh მონიშნეთ გრადიენტული ბადე -@msg select a linked image: an embedded one has no file მონიშნეთ მიბმული გამოსახულება: ჩაშენებულს ფაილი არ აქვს +@msg select a linked image: an embedded one has no file მონიშნეთ დაკავშირებული გამოსახულება: ჩაშენებულს ფაილი არ აქვს @msg select a repeat მონიშნეთ გამეორება @msg select a stroke with a variable width მონიშნეთ ცვლადი სიგანის კონტური @msg select a symbol instance მონიშნეთ სიმბოლოს ეგზემპლარი @@ -4539,7 +4539,7 @@ font-technology Variable ცვლადი @msg `match` must be distance or channels `match` უნდა იყოს distance ან channels @msg `{key}` must be from 0 to 100 `{key}` უნდა იყოს 0-დან 100-მდე @msg `colors` must list 1 to 16 colors, each hex (#rrggbb or #rgb) or black, white, red, green or blue `colors` უნდა შეიცავდეს 1-დან 16-მდე ფერს, თითოეულს თექვსმეტობით ფორმატში (#rrggbb ან #rgb) ან როგორც black, white, red, green ან blue -@msg the linked image shows its preview: embed or relink it first დაკავშირებული გამოსახულება გადახედვას აჩვენებს: ჯერ ჩააშენეთ ან ხელახლა მიაბით +@msg the linked image shows its preview: embed or relink it first დაკავშირებული გამოსახულება გადახედვას აჩვენებს: ჯერ ჩააშენეთ ან ხელახლა დააკავშირეთ @msg a CMYK image has no transparency to set CMYK გამოსახულებას არ აქვს დასაყენებელი გამჭვირვალობა @msg every pixel matches the background: no image would be left ყველა პიქსელი ემთხვევა ფონს: გამოსახულება აღარ დარჩებოდა @msg an image of {w} × {h} pixels is too large to change {w} × {h} პიქსელის გამოსახულება შესაცვლელად ზედმეტად დიდია @@ -4707,7 +4707,7 @@ font-technology Variable ცვლადი @msg {name}: CRC mismatch {name}: CRC არ ემთხვევა @msg {name}: no local header {name}: ლოკალური სათაური არ არის @msg {name}: no such recovery entry {name}: ასეთი აღდგენის ჩანაწერი არ არის -@msg {path} can't be found: relink it first {path} ვერ მოიძებნა: ჯერ ხელახლა მიაბით +@msg {path} can't be found: relink it first {path} ვერ მოიძებნა: ჯერ ხელახლა დააკავშირეთ @msg {path}: no file system here (pass dataBase64 to open; omit the path to get dataBase64) {path}: აქ ფაილური სისტემა არ არის (გასახსნელად გადაეცით dataBase64; dataBase64-ის მისაღებად გამოტოვეთ path) @msg {path}: {e} {path}: {e} @msg {status} ({e}) {status} ({e}) @@ -4730,7 +4730,7 @@ font-technology Variable ცვლადი @msgplural Opened with {n} note: {first}|Opened with {n} notes: {first} გაიხსნა, შენიშვნები: {n}: {first} @msgplural {notice}. Opened with {n} note: {first}|{notice}. Opened with {n} notes: {first} {notice}. გაიხსნა, შენიშვნები: {n}: {first} @msgplural Saved {path} with {n} note: {first}|Saved {path} with {n} notes: {first} შენახულია {path}, შენიშვნები: {n}: {first} -@msgplural Embedded {n} image; {missing} missing: relink them first|Embedded {n} images; {missing} missing: relink them first ჩაშენებულია გამოსახულებები: {n}; აკლია {missing}: ჯერ ხელახლა მიაბით +@msgplural Embedded {n} image; {missing} missing: relink them first|Embedded {n} images; {missing} missing: relink them first ჩაშენებულია გამოსახულებები: {n}; აკლია {missing}: ჯერ ხელახლა დააკავშირეთ @msgplural Embedded {n} image|Embedded {n} images ჩაშენებულია გამოსახულებები: {n} @msgplural Relinked {n} image|Relinked {n} images ხელახლა მიბმულია გამოსახულებები: {n} @msgplural Relinked {n} image; not in that folder: {names}|Relinked {n} images; not in that folder: {names} ხელახლა მიბმულია გამოსახულებები: {n}; იმ საქაღალდეში არ არის: {names} @@ -4738,10 +4738,10 @@ font-technology Variable ცვლადი @msgplural Updated {n} image|Updated {n} images განახლებულია გამოსახულებები: {n} @msgplural Replaced {n} image|Replaced {n} images ჩანაცვლებულია გამოსახულებები: {n} @msgplural Broke {n} link|Broke {n} links გაწყვეტილია ბმულები: {n} -@msgplural Broke {n} link; {missing} can't be read: relink or update them first|Broke {n} links; {missing} can't be read: relink or update them first გაწყვეტილია ბმულები: {n}; ვერ იკითხება {missing}: ჯერ ხელახლა მიაბით ან განაახლეთ -@msgplural {n} linked file can't be read here: its preview shows|{n} linked files can't be read here: their previews show მიბმული ფაილების წაკითხვა აქ ვერ ხერხდება ({n}): ჩანს მათი გადახედვა +@msgplural Broke {n} link; {missing} can't be read: relink or update them first|Broke {n} links; {missing} can't be read: relink or update them first გაწყვეტილია ბმულები: {n}; ვერ იკითხება {missing}: ჯერ ხელახლა დააკავშირეთ ან განაახლეთ +@msgplural {n} linked file can't be read here: its preview shows|{n} linked files can't be read here: their previews show დაკავშირებული ფაილების წაკითხვა აქ ვერ ხერხდება ({n}): ჩანს მათი გადახედვა @msgplural {n} image couldn't be decoded and shows as a crossed box|{n} images couldn't be decoded and show as crossed boxes სურათების დეკოდირება ვერ მოხერხდა ({n}): ისინი ჯვრით გადახაზული ჩარჩოებით ჩანს -@msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions მიბმული გამოსახულებები შეიცვალა დისკზე ({n}): ბმულების განახლება აჩვენებს ახალ ვერსიებს +@msgplural {n} linked image changed on disk: Update Links shows the new version|{n} linked images changed on disk: Update Links shows the new versions დაკავშირებული გამოსახულებები შეიცვალა დისკზე ({n}): ბმულების განახლება აჩვენებს ახალ ვერსიებს @msgplural Updated {n} linked file changed on disk|Updated {n} linked files changed on disk განახლდა დისკზე შეცვლილი დაკავშირებული ფაილები: {n} @msg the document sets a bleed that this PDF/X file leaves out: turn on Use document bleed settings დოკუმენტი ადგენს ჭრისპირა არეს, რომელსაც ეს PDF/X ფაილი გამოტოვებს: ჩართეთ „დოკუმენტის ჭრისპირა არის პარამეტრების გამოყენება“ @msgplural Exported {what} with {n} note: {first}|Exported {what} with {n} notes: {first} ექსპორტირებულია {what}, შენიშვნები: {n}: {first} @@ -4840,10 +4840,10 @@ font-technology Variable ცვლადი @msg id {value} is a layer, not an object; move layers with layer.move id {value} შრეა და არა ობიექტი; შრეების გადასატანად გამოიყენეთ layer.move @msg automation filesystem access is not granted: read authority is absent: {path} ავტომატიზაციას ფაილურ სისტემაზე წვდომა არ აქვს: წაკითხვის უფლება არ არის: {path} @msg automation filesystem access is not granted: write authority is absent: {path} ავტომატიზაციას ფაილურ სისტემაზე წვდომა არ აქვს: ჩაწერის უფლება არ არის: {path} -@msg automation path rejected: outside the read root {root}: {path} ავტომატიზაციის გზა უარყოფილია: წაკითხვის ძირის {root} გარეთაა: {path} -@msg automation path rejected: outside the read roots {roots}: {path} ავტომატიზაციის გზა უარყოფილია: წაკითხვის ძირების {roots} გარეთაა: {path} -@msg automation path rejected: outside the write root {root}: {path} ავტომატიზაციის გზა უარყოფილია: ჩაწერის ძირის {root} გარეთაა: {path} -@msg automation path rejected: outside the write roots {roots}: {path} ავტომატიზაციის გზა უარყოფილია: ჩაწერის ძირების {roots} გარეთაა: {path} +@msg automation path rejected: outside the read root {root}: {path} ავტომატიზაციის გზა უარყოფილია: წაკითხვის ძირეული საქაღალდის {root} გარეთაა: {path} +@msg automation path rejected: outside the read roots {roots}: {path} ავტომატიზაციის გზა უარყოფილია: წაკითხვის ძირეული საქაღალდეების {roots} გარეთაა: {path} +@msg automation path rejected: outside the write root {root}: {path} ავტომატიზაციის გზა უარყოფილია: ჩაწერის ძირეული საქაღალდის {root} გარეთაა: {path} +@msg automation path rejected: outside the write roots {roots}: {path} ავტომატიზაციის გზა უარყოფილია: ჩაწერის ძირეული საქაღალდეების {roots} გარეთაა: {path} @msg automation path rejected: path is empty ავტომატიზაციის გზა უარყოფილია: გზა ცარიელია @msg automation path rejected: a link that leads nowhere: {path} ავტომატიზაციის გზა უარყოფილია: ბმული არსად მიდის: {path} @msg automation path rejected: cannot resolve {path}: {e} ავტომატიზაციის გზა უარყოფილია: {path} ვერ გაირკვა: {e} @@ -5585,7 +5585,7 @@ imageTrace Outline კონტური @msg vc.document{place} is too large for a script vc.document{place} ზედმეტად დიდია სკრიპტისთვის @msg vc.log: the log of this run is full vc.log: ამ გაშვების ჟურნალი სავსეა @msg this function's script run has ended ამ ფუნქციის სკრიპტის გაშვება დასრულდა -@msg the script made more host calls than one run may make სკრიპტმა იმაზე მეტი მასპინძლის გამოძახება შეასრულა, ვიდრე ერთ გაშვებას შეუძლია +@msg the script made more host calls than one run may make სკრიპტმა ჰოსტის იმაზე მეტი გამოძახება შეასრულა, ვიდრე ერთ გაშვებაშია დასაშვები @msg the script passed more data to and from commands than one run may pass სკრიპტმა ბრძანებებს და ბრძანებებიდან იმაზე მეტი მონაცემი გადასცა, ვიდრე ერთ გაშვებას შეუძლია @msg the script added more objects and data to the documents than one run may add სკრიპტმა დოკუმენტებს იმაზე მეტი ობიექტი და მონაცემი დაამატა, ვიდრე ერთ გაშვებას შეუძლია @msg {what}: the object is not a File or a Folder {what}: ობიექტი არც File-ია და არც Folder @@ -5708,8 +5708,8 @@ imageTrace Outline კონტური PDF-compatible PDF-თან თავსებადი Panels Except Tools and Control პანელები, ხელსაწყოებისა და მართვის პანელის გარდა Isolate Selected Object მონიშნული ობიექტის იზოლირება -@msg the file's layers weren't read ({_1}): it comes in as its page, in one layer ფაილის შრეები ვერ წაიკითხა ({_1}): ის გაიხსნება როგორც მისი გვერდი, ერთ შრეში -@msg the file's layers weren't read from its editing data ({_1}): they come from its PDF part ფაილის შრეები რედაქტირების მონაცემებიდან ვერ წაიკითხა ({_1}): ისინი მისი PDF ნაწილიდან აიღება +@msg the file's layers weren't read ({_1}): it comes in as its page, in one layer ფაილის შრეების წაკითხვა ვერ მოხერხდა ({_1}): ის გაიხსნება როგორც მისი გვერდი, ერთ შრეში +@msg the file's layers weren't read from its editing data ({_1}): they come from its PDF part ფაილის შრეების წაკითხვა რედაქტირების მონაცემებიდან ვერ მოხერხდა ({_1}): ისინი მისი PDF ნაწილიდან აიღება @msg the Color Picker is not open ფერის ამრჩევი გახსნილი არ არის @msg the Simplify slider is not open გამარტივების სლაიდერი გახსნილი არ არის @msg the Smooth slider is not open გაგლუვების სლაიდერი გახსნილი არ არის @@ -5723,7 +5723,7 @@ imageTrace Outline კონტური Preview (1 inch on the page) წინასწარი ნახვა (1 დუიმი გვერდზე) Set as Default ნაგულისხმევად დაყენება out from a highlighted edge to place its dimension | — გამოკვეთილი კიდიდან გარეთ, მისი ზომის დასასმელად | - two points, then move and click to place an aligned, horizontal or vertical dimension | — ორ წერტილზე, შემდეგ გადაადგილეთ და დააწკაპუნეთ გასწორებული, ჰორიზონტალური ან ვერტიკალური ზომის დასასმელად | + two points, then move and click to place an aligned, horizontal or vertical dimension | — ორ წერტილზე, შემდეგ გადაადგილეთ და დაწკაპეთ გასწორებული, ჰორიზონტალური ან ვერტიკალური ზომის დასასმელად | cancels | Double-click the tool for options — გაუქმება | პარამეტრებისთვის ორჯერ დაწკაპეთ ხელსაწყოზე Angular კუთხური Away from the Line ხაზისგან მოშორებით @@ -5804,7 +5804,7 @@ imageTrace Outline კონტური @msg span must be "object" or "selection", got {v} span უნდა იყოს "object" ან "selection", მიღებულია {v} @msg span: "selection" places a `gradient`, not a swatch span: "selection" ათავსებს `gradient`-ს და არა ფერის ნიმუშს @msg span: "selection" places a gradient: give `gradient` span: "selection" ათავსებს გრადიენტს: მიუთითეთ `gradient` -@msg span: "selection" places a linear, radial, conic or diamond gradient, not a freeform one span: "selection" ათავსებს წრფივ, რადიალურ, კონუსურ ან რომბულ გრადიენტს და არა თავისუფალი ფორმისას +@msg span: "selection" places a linear, radial, conic or diamond gradient, not a freeform one span: "selection" ათავსებს წრფივ, რადიალურ, კონუსურ ან ბრილიანტისებრ გრადიენტს და არა თავისუფალი ფორმისას @msg span: "selection" places the gradient itself: leave out `start` and `end` (they already place it in document coordinates) span: "selection" თავად ათავსებს გრადიენტს: გამოტოვეთ `start` და `end` (ისინი მას უკვე დოკუმენტის კოორდინატებში ათავსებენ) Make Image Dynamic გამოსახულების დინამიკურად ქცევა Import Data Sets… მონაცემთა ნაკრებების იმპორტი… @@ -6325,7 +6325,7 @@ axis Y Axis Y ღერძი @msg `method` must be classic, perceptual, hue-clockwise or hue-counterclockwise `method` უნდა იყოს classic, perceptual, hue-clockwise ან hue-counterclockwise @msg `spread` must be pad, repeat or reflect `spread` უნდა იყოს pad, repeat ან reflect @msg `repeats` must be a whole number from 1 to {MAX_REPEATS} `repeats` უნდა იყოს მთელი რიცხვი 1-დან {MAX_REPEATS}-მდე -@msg `spread` applies to linear, radial, conic and diamond gradients `spread` ეხება წრფივ, რადიალურ, კონუსურ და რომბულ გრადიენტებს +@msg `spread` applies to linear, radial, conic and diamond gradients `spread` ეხება წრფივ, რადიალურ, კონუსურ და ბრილიანტისებრ გრადიენტებს # Heavy plug-in filters (plugin.inspect, plug-in runs) Install “{name}”, which asks for a heavy budget? დავაყენოთ „{name}“, რომელიც დიდ გამოთვლით ბიუჯეტს ითხოვს? Each run may take up to {minutes} minutes and do {times} times the work other plug-ins may. It runs in the background, and you can cancel it. თითოეულ გაშვებას შეიძლება {minutes} წუთამდე დასჭირდეს და სხვა პლაგინებისთვის დაშვებულზე {times}-ჯერ მეტი სამუშაო შეასრულოს. ის ფონურ რეჟიმში მუშაობს და შეგიძლიათ გააუქმოთ. @@ -7034,7 +7034,7 @@ anchor Points: წერტილები: @msg {label} must be a number of at least 0.1 {label} უნდა იყოს მინიმუმ 0,1 Advanced Character Formats სიმბოლოს დამატებითი ფორმატები Basic Paragraph Formats აბზაცის ძირითადი ფორმატები - Composition კომპოზიცია + Composition აწყობა Horizontal Scale ჰორიზონტალური მასშტაბი Vertical Scale ვერტიკალური მასშტაბი @msg {label} must be a number from {min} to {max} {label} უნდა იყოს რიცხვი {min}-დან {max}-მდე @@ -7621,3 +7621,2020 @@ font-script Japanese იაპონური Grommets ლუვერები Grommet Inset ლუვერების დაშორება კიდიდან Diameter დიამეტრი + +# Missing rows: menu strings, tl! strings and status/error messages untranslated on main (2026-11-14) + Add as Single Graphic ერთ გრაფიკად დამატება + Expand as Wireframes კარკასებად გაშლა + Add art with Add as Single Graphic, or drop art here. დაამატეთ ნახატი ბრძანებით „ერთ გრაფიკად დამატება“ ან ჩამოაგდეთ ნახატი აქ. + Face მხარე + Graphics map onto the Plane, Extrude and Revolve object types. გრაფიკა თავსდება ობიექტის ტიპებზე „სიბრტყე“, „ამოწევა“ და „ბრუნვა“. + Line Gap სტრიქონებს შორის ღრეჩო + Manage Profiles პროფილების მართვა + Mapped graphics განთავსებული გრაფიკა + Materials მასალები + NEW DOCUMENT PROFILES ახალი დოკუმენტის პროფილები + Pick a graphic above to map it onto the object. აირჩიეთ გრაფიკა ზემოთ, რომ ობიექტზე განათავსოთ. + Remove Graphic გრაფიკის მოცილება + Replace the selected 3D objects with the edges of their faces, as stroked paths. მონიშნული 3D ობიექტების ჩანაცვლება მათი წახნაგების წიბოებით, კონტურიანი ტრაექტორიების სახით. + Select a 3D object to map the graphic onto it. მონიშნეთ 3D ობიექტი, რომ მასზე გრაფიკა განათავსოთ. + The selected objects have different graphics. მონიშნულ ობიექტებს სხვადასხვა გრაფიკა აქვს. + Word Gap სიტყვებს შორის ღრეჩო + Drop Script Engine სკრიპტის ძრავის მოცილება + Edit Paragraph Style აბზაცის სტილის რედაქტირება + Edit Profile პროფილის რედაქტირება + List Script Engines სკრიპტის ძრავების სია + Map Graphic გრაფიკის განთავსება + Move Object on Path ტრაექტორიაზე ობიექტის გადაადგილება + New Document Profiles ახალი დოკუმენტის პროფილები + Reset Profile პროფილის ჩამოყრა + Select Object on Path ტრაექტორიაზე ობიექტის მონიშვნა + Weather Icons ამინდის ხატულები +@msg 'caller', 'callee' and 'arguments' cannot be used on strict mode functions 'caller', 'callee' და 'arguments' მკაცრი რეჟიმის ფუნქციებში ვერ გამოიყენება +@msg 3D effects require finite coordinates within 100 million points 3D ეფექტებს სჭირდება სასრული კოორდინატები 100 მილიონი პუნქტის ფარგლებში +@msg 3D effects require one to ten lights 3D ეფექტებს სჭირდება ერთიდან ათამდე სინათლის წყარო +@msg A profile supports one Revolve effect. Edit the existing effect's options instead. პროფილს მხოლოდ ერთი „ბრუნვის“ ეფექტი შეიძლება ჰქონდეს. სანაცვლოდ შეცვალეთ არსებული ეფექტის პარამეტრები. +@msg Add Points at Crossings: a path went missing წერტილების დამატება გადაკვეთებზე: ერთ-ერთი ტრაექტორია დაიკარგა +@msg Alignment must be one of the choices სწორება უნდა იყოს ერთ-ერთი შემოთავაზებული ვარიანტი +@msg BMP depth {_1}: 1, 4, 8, 16, 24 or 32 bits per pixel BMP-ის სიღრმე {_1}: 1, 4, 8, 16, 24 ან 32 ბიტი პიქსელზე +@msg BMP encoding failed: {width} × {height} pixels doesn't fit the format or the pixel buffer BMP-ის კოდირება ვერ მოხერხდა: {width} × {height} პიქსელი არ ეტევა ფორმატში ან პიქსელების ბუფერში +@msg Boolean.prototype.{name} was called on a value that is not a Boolean Boolean.prototype.{name} გამოძახებულია მნიშვნელობაზე, რომელიც Boolean არ არის +@msg CMYK images whose samples couldn't be read in CMYK were imported in RGB CMYK გამოსახულებები, რომელთა პიქსელური მნიშვნელობების CMYK-ში წაკითხვა ვერ მოხერხდა, RGB-ში იმპორტირდა +@msg CSS options: {e} CSS-ის პარამეტრები: {e} +@msg CSV has a header but no data rows CSV-ს აქვს სათაური, მაგრამ მონაცემთა სტრიქონები არ აქვს +@msg CSV holds NUL bytes: save it as UTF-8, or as UTF-16 with a byte-order mark CSV შეიცავს NUL ბაიტებს: შეინახეთ ის UTF-8-ად ან UTF-16-ად ბაიტების რიგის ნიშნით (BOM) +@msg CSV is empty CSV ცარიელია +@msg CSV is larger than {MAX_CSV_BYTES} bytes CSV {MAX_CSV_BYTES} ბაიტზე დიდია +@msg CSV is not UTF-16 CSV არ არის UTF-16 +@msg CSV is not UTF-8 CSV არ არის UTF-8 +@msg CSV would be larger than {MAX_CSV_BYTES} bytes CSV {MAX_CSV_BYTES} ბაიტზე დიდი იქნებოდა +@msg Cannot write to the location of “{name}”; choose where to save it იქ, სადაც „{name}“ მდებარეობს, ჩაწერა შეუძლებელია; აირჩიეთ, სად შეინახოთ +@msg Choose original artwork, not a dimension's generated paths აირჩიეთ საწყისი ნახატი და არა ზომის მიერ შექმნილი ტრაექტორიები +@msg Contour: select paths or shapes მოხაზულობა: მონიშნეთ ტრაექტორიები ან ფიგურები +@msg Contour: the Offset Path effect is not available მოხაზულობა: ეფექტი „ტრაექტორიის წანაცვლება“ მიუწვდომელია +@msg Create needs fills, strokes or both „შექმნას“ სჭირდება შევსებები, კონტურები ან ორივე +@msg DCS files can only be placed linked: use File › Place with Link on DCS ფაილების განთავსება მხოლოდ ბმულით შეიძლება: გამოიყენეთ ფაილი › განთავსება და ჩართეთ „ბმული“ +@msg DXF options: {e} DXF-ის პარამეტრები: {e} +@msg DXF scale must be a positive number up to {_1}, not {scale} DXF-ის მასშტაბი უნდა იყოს დადებითი რიცხვი, არაუმეტეს {_1}-ისა, და არა {scale} +@msg DXF {field} `{s}`: {allowed} DXF {field} `{s}`: {allowed} +@msg Date.prototype method called on a value that is not a Date object Date.prototype-ის მეთოდი გამოძახებულია მნიშვნელობაზე, რომელიც Date ობიექტი არ არის +@msg Dimension is locked or hidden ზომა ჩაკეტილი ან დამალულია +@msg Dimension mode does not match its source ზომის რეჟიმი არ შეესაბამება მის წყაროს +@msg Draw Inside needs exactly one selected path, compound path or text „შიგნით ხატვას“ სჭირდება ზუსტად ერთი მონიშნული ტრაექტორია, შედგენილი ტრაექტორია ან ტექსტი +@msg EPS Save writes all artwork: use document.export for selected-only EPS EPS-ად შენახვა მთელ ნახატს წერს: მხოლოდ მონიშნულის EPS-ისთვის გამოიყენეთ document.export +@msg EPS flattener: {e} EPS-ის გაბრტყელება: {e} +@msg EPS options: {e} EPS-ის პარამეტრები: {e} +@msg EPS {field} `{s}`: {allowed} EPS {field} `{s}`: {allowed} +@msg Error.prototype.toString was called on a value that is not an object Error.prototype.toString გამოძახებულია მნიშვნელობაზე, რომელიც ობიექტი არ არის +@msg Export for Screens writes png, png8, jpg, webp, gif, tiff, bmp, tga, psd, svg, svgz, pdf, eps, ai or vectorcraft „ეკრანებისთვის ექსპორტირება“ წერს png, png8, jpg, webp, gif, tiff, bmp, tga, psd, svg, svgz, pdf, eps, ai ან vectorcraft ფორმატებს +@msg Flare click coordinates must be finite numbers ბლიკის დაწკაპუნების კოორდინატები სასრული რიცხვები უნდა იყოს +@msg Function.prototype.toString was called on a value that is not a function Function.prototype.toString გამოძახებულია მნიშვნელობაზე, რომელიც ფუნქცია არ არის +@msg GIF encoding failed: the palette image is malformed GIF-ის კოდირება ვერ მოხერხდა: პალიტრის გამოსახულება დაზიანებულია +@msg GIF encoding failed: {e} GIF-ის კოდირება ვერ მოხერხდა: {e} +@msg HTML Text applies to object slices of type only „HTML ტექსტი“ მხოლოდ ტექსტური ობიექტების ნაჭრებზე ვრცელდება +@msg Identify Objects By is XML ID: the name must be a valid XML ID (start with a letter, underscore or colon; no spaces) „ობიექტების იდენტიფიკაცია“ დაყენებულია XML ID-ზე: სახელი უნდა იყოს სწორი XML ID (იწყებოდეს ასოთი, ქვედა ტირეთი ან ორწერტილით; ჰარების გარეშე) +@msg Image Trace failed: internal error: its thread stopped (please report this bug) გამოსახულების ვექტორიზაცია ვერ მოხერხდა: შიდა შეცდომა: მისი ნაკადი შეჩერდა (გთხოვთ, შეგვატყობინოთ ამ ხარვეზის შესახებ) +@msg Image Trace failed: {e} გამოსახულების ვექტორიზაცია ვერ მოხერხდა: {e} +@msg Image Trace finished, but its document was closed გამოსახულების ვექტორიზაცია დასრულდა, მაგრამ მისი დოკუმენტი დაიხურა +@msg Image Trace finished, but the image or its settings changed meanwhile: trace it again გამოსახულების ვექტორიზაცია დასრულდა, მაგრამ ამასობაში გამოსახულება ან მისი პარამეტრები შეიცვალა: გაუშვით ვექტორიზაცია ხელახლა +@msg Import SVG Filter reads SVG files, not SVGZ „SVG ფილტრის იმპორტი“ კითხულობს SVG ფაილებს და არა SVGZ-ს +@msg Invalid dimension offset ზომის არასწორი წანაცვლება +@msg Invalid point არასწორი წერტილი +@msg JPEG colour profile: {e} JPEG-ის ფერის პროფილი: {e} +@msg JPEG encoding failed: pixel buffer doesn't match the image size JPEG-ის კოდირება ვერ მოხერხდა: პიქსელების ბუფერი გამოსახულების ზომას არ შეესაბამება +@msg JPEG encoding failed: {e} JPEG-ის კოდირება ვერ მოხერხდა: {e} +@msg JSON.parse: {why} (at offset {at}) JSON.parse: {why} (წანაცვლება {at}) +@msg JSON.stringify cannot write a structure that contains itself JSON.stringify ვერ ჩაწერს სტრუქტურას, რომელიც თავის თავს შეიცავს +@msg Join: a subpath went missing შეერთება: ერთ-ერთი ქვეტრაექტორია დაიკარგა +@msg Line Gap must be a number „სტრიქონებს შორის ღრეჩო“ უნდა იყოს რიცხვი +@msg Lock Workspace is not available in VectorCraft „სამუშაო სივრცის ჩაკეტვა“ VectorCraft-ში მიუწვდომელია +@msg Move Panel to New Window is not available: floating panels stay in the main window „პანელის ახალ ფანჯარაში გადატანა“ მიუწვდომელია: მცურავი პანელები მთავარ ფანჯარაში რჩება +@msg Namespace.prototype.toString needs a Namespace Namespace.prototype.toString-ს სჭირდება Namespace +@msg New Document profiles need the preferences folder, which this run doesn't have ახალი დოკუმენტის პროფილებს სჭირდება პარამეტრების საქაღალდე, რომელიც ამ გაშვებას არ აქვს +@msg Number.prototype.{name} was called on a value that is not a number Number.prototype.{name} გამოძახებულია მნიშვნელობაზე, რომელიც რიცხვი არ არის +@msg Object.create's prototype must be an object or null Object.create-ის პროტოტიპი უნდა იყოს ობიექტი ან null +@msg Object.{function} was given a value that is not an object Object.{function}-ს გადაეცა მნიშვნელობა, რომელიც ობიექტი არ არის +@msg Offset Path: the path is too complex to offset ტრაექტორიის წანაცვლება: ტრაექტორია წასანაცვლებლად ზედმეტად რთულია +@msg Offset Path: {e} ტრაექტორიის წანაცვლება: {e} +@msg PDF content is incomplete or exceeds the reader's limits; no document was imported PDF-ის შიგთავსი არასრულია ან წამკითხველის ლიმიტებს აჭარბებს; დოკუმენტი არ იმპორტირდა +@msg PDF flattener: {e} PDF-ის გაბრტყელება: {e} +@msg PDF options: {e} PDF-ის პარამეტრები: {e} +@msg PNG encoding failed: pixel buffer doesn't match the image size PNG-ის კოდირება ვერ მოხერხდა: პიქსელების ბუფერი გამოსახულების ზომას არ შეესაბამება +@msg PNG encoding failed: the palette image is malformed PNG-ის კოდირება ვერ მოხერხდა: პალიტრის გამოსახულება დაზიანებულია +@msg PNG encoding failed: {e} PNG-ის კოდირება ვერ მოხერხდა: {e} +@msg PNG encoding failed: {width} × {height} pixels is not a valid image size PNG-ის კოდირება ვერ მოხერხდა: {width} × {height} პიქსელი გამოსახულების სწორი ზომა არ არის +@msg PSD colour profile: {e} PSD-ის ფერის პროფილი: {e} +@msg PSD encoding failed: the pixel buffer doesn't match the image size PSD-ის კოდირება ვერ მოხერხდა: პიქსელების ბუფერი გამოსახულების ზომას არ შეესაბამება +@msg QName.prototype.toString needs a QName QName.prototype.toString-ს სჭირდება QName +@msg Recolor Artwork is no longer open „ნახატის ხელახლა შეფერადება“ აღარ არის გახსნილი +@msg RegExp.prototype.{name} was called on a value that is not a RegExp object RegExp.prototype.{name} გამოძახებულია მნიშვნელობაზე, რომელიც RegExp ობიექტი არ არის +@msg Revolve profile contains invalid coordinates ბრუნვის პროფილი არასწორ კოორდინატებს შეიცავს +@msg Revolve profile is too complex ბრუნვის პროფილი ზედმეტად რთულია +@msg Revolve projection is not finite ბრუნვის პროექცია სასრული არ არის +@msg Revolve requires finite profile coordinates within 100 million points ბრუნვას სჭირდება პროფილის სასრული კოორდინატები 100 მილიონი პუნქტის ფარგლებში +@msg Revolve surface is too complex; reduce Segments or simplify the profile ბრუნვის ზედაპირი ზედმეტად რთულია; შეამცირეთ სეგმენტები ან გაამარტივეთ პროფილი +@msg Revolve surface is too complex; simplify the profile ბრუნვის ზედაპირი ზედმეტად რთულია; გაამარტივეთ პროფილი +@msg Revolve visibility cannot split the projected boundary ბრუნვის ხილვადობა ვერ ყოფს პროეცირებულ საზღვარს +@msg Revolve visibility creates too many fragments ბრუნვის ხილვადობა ზედმეტად ბევრ ფრაგმენტს ქმნის +@msg Revolve visibility creates too many vector anchors ბრუნვის ხილვადობა ზედმეტად ბევრ ვექტორულ საყრდენ წერტილს ქმნის +@msg Revolve visibility exceeds its geometry work limit ბრუნვის ხილვადობა გეომეტრიული გამოთვლების ლიმიტს აჭარბებს +@msg Revolve visibility exceeds its spatial index limit ბრუნვის ხილვადობა სივრცითი ინდექსის ლიმიტს აჭარბებს +@msg Revolve visibility has too many boundary crossings ბრუნვის ხილვადობას საზღვრის ზედმეტად ბევრი გადაკვეთა აქვს +@msg Revolve visibility has too many input anchors ბრუნვის ხილვადობას ზედმეტად ბევრი შემავალი საყრდენი წერტილი აქვს +@msg Revolve visibility requires convex cap sectors ბრუნვის ხილვადობას სჭირდება თავსახურის ამოზნექილი სექტორები +@msg Revolve visibility requires finite projected faces ბრუნვის ხილვადობას სჭირდება სასრული პროეცირებული წახნაგები +@msg SVG is not UTF-8, UTF-16 or ISO 8859-1 SVG არ არის UTF-8, UTF-16 ან ISO 8859-1 +@msg SVG options: {e} SVG-ის პარამეტრები: {e} +@msg Save for Web settings: {e} „ვებისთვის შენახვის“ პარამეტრები: {e} +@msg Save writes one artboard: name one, or export several with document.export შენახვა ერთ სამუშაო დაფას წერს: მიუთითეთ ერთი, ან რამდენიმის ექსპორტისთვის გამოიყენეთ document.export +@msg Select a dimension first ჯერ მონიშნეთ ზომა +@msg Select dimensions to update მონიშნეთ განსაახლებელი ზომები +@msg Select only dimensions მონიშნეთ მხოლოდ ზომები +@msg Select two or more objects, or a group მონიშნეთ ორი ან მეტი ობიექტი, ან ჯგუფი +@msg Shaper needs 1–64 source paths ფორმირებას სჭირდება 1–64 საწყისი ტრაექტორია +@msg Stencil Bridges: the selected art is too large or too detailed to bridge ტრაფარეტის ხიდები: მონიშნული ნახატი ხიდების დასამატებლად ზედმეტად დიდი ან დეტალურია +@msg String.prototype.toString was called on a value that is not a string String.prototype.toString გამოძახებულია მნიშვნელობაზე, რომელიც სტრიქონი არ არის +@msg Switch x/y is for scatter graphs „x/y-ის გაცვლა“ წერტილოვანი დიაგრამებისთვისაა +@msg TIFF colour profile: {e} TIFF-ის ფერის პროფილი: {e} +@msg TIFF encoding failed: the pixel buffer doesn't match the image size TIFF-ის კოდირება ვერ მოხერხდა: პიქსელების ბუფერი გამოსახულების ზომას არ შეესაბამება +@msg TIFF encoding failed: {e} TIFF-ის კოდირება ვერ მოხერხდა: {e} +@msg Targa depth {_1}: 16, 24 or 32 bits per pixel Targa-ს სიღრმე {_1}: 16, 24 ან 32 ბიტი პიქსელზე +@msg Targa encoding failed: the pixel buffer doesn't match the image size Targa-ს კოდირება ვერ მოხერხდა: პიქსელების ბუფერი გამოსახულების ზომას არ შეესაბამება +@msg Text options: {e} ტექსტის პარამეტრები: {e} +@msg The 3D projection is not finite 3D პროექცია სასრული არ არის +@msg The 3D shadow is too complex; turn Shadows off or simplify the art 3D ჩრდილი ზედმეტად რთულია; გამორთეთ ჩრდილები ან გაამარტივეთ ნახატი +@msg The shape contains invalid coordinates ფიგურა არასწორ კოორდინატებს შეიცავს +@msg The {name} profile could not be read, so the new document has the default settings: {reason} პროფილის „{name}“ წაკითხვა ვერ მოხერხდა, ამიტომ ახალ დოკუმენტს ნაგულისხმევი პარამეტრები აქვს: {reason} +@msg Too many Revolve faces for visibility evaluation ხილვადობის შესაფასებლად ბრუნვას ზედმეტად ბევრი წახნაგი აქვს +@msg Trap: more than {_1} pairs of objects lie close enough to trap, or too many objects share a horizontal range; trap fewer objects at a time ტრეპინგი: ობიექტების {_1}-ზე მეტი წყვილი ტრეპინგისთვის საკმარისად ახლოს მდებარეობს, ან ზედმეტად ბევრ ობიექტს საერთო ჰორიზონტალური დიაპაზონი აქვს; ერთდროულად ნაკლებ ობიექტზე გამოიყენეთ ტრეპინგი +@msg VectorCraft reads at most {ASE_MAX_ENTRIES} colors and groups from a swatch exchange file, and this library has {entries} VectorCraft ფერის ნიმუშების გაცვლის ფაილიდან კითხულობს მაქსიმუმ {ASE_MAX_ENTRIES} ფერსა და ჯგუფს, ამ ბიბლიოთეკაში კი არის {entries} +@msg WebP encoding failed: {e} WebP-ის კოდირება ვერ მოხერხდა: {e} +@msg Weed Box and Lines: no weeding line fits outside the art, and the weed box is off ნარჩენის მოსაცილებელი ჩარჩო და ხაზები: ნახატის გარეთ ნარჩენის მოსაცილებელი არცერთი ხაზი არ ეტევა, ნარჩენის ჩარჩო კი გამორთულია +@msg [{j}] `{_1}`: {why} [{j}] `{_1}`: {why} +@msg \\ at end of pattern \\ შაბლონის ბოლოს +@msg `alignOn` cannot be empty `alignOn` ცარიელი ვერ იქნება +@msg `alignOn` must be a string `alignOn` უნდა იყოს სტრიქონი +@msg `align` is start, center or end `align` არის start, center ან end +@msg `align` must be a string `align` უნდა იყოს სტრიქონი +@msg `anchors` must be an array of [subpath, anchor] pairs `anchors` უნდა იყოს [subpath, anchor] წყვილების მასივი +@msg `anchors` must list anchor indices (0, 1, 2…), not {k} `anchors` უნდა ჩამოთვლიდეს საყრდენი წერტილების ინდექსებს (0, 1, 2…) და არა {k} +@msg `anchors` must list anchor indices (0, 1, 2…), not {v} `anchors` უნდა ჩამოთვლიდეს საყრდენი წერტილების ინდექსებს (0, 1, 2…) და არა {v} +@msg `answer` for this {kind} dialog must be one of: {_1} დიალოგისთვის (ტიპი: {kind}) `answer` უნდა იყოს ერთ-ერთი: {_1} +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg `answers` has more than {MAX_ANSWERS} answers `answers` შეიცავს {MAX_ANSWERS}-ზე მეტ პასუხს +@msg `answers` is larger than 1 MiB `answers` 1 MiB-ზე დიდია +@msg `answers` must be a list of answers `answers` უნდა იყოს პასუხების სია +@msg `artboard` must be the index of an artboard of the document `artboard` უნდა იყოს დოკუმენტის სამუშაო დაფის ინდექსი +@msg `artboardsAt` must be [x, y] `artboardsAt` უნდა იყოს [x, y] +@msg `artboards` must be a list of artboard indices `artboards` უნდა იყოს სამუშაო დაფების ინდექსების სია +@msg `artboards` names an artboard the document does not have `artboards` მიუთითებს სამუშაო დაფას, რომელიც დოკუმენტს არ აქვს +@msg `artboards` names an artboard twice `artboards` ერთსა და იმავე სამუშაო დაფას ორჯერ მიუთითებს +@msg `asset` is the asset id (see assets.list) `asset` არის რესურსის id (იხ. assets.list) +@msg `at` must be [x, y] (got {at}) `at` უნდა იყოს [x, y] (მიღებულია {at}) +@msg `at` must be a byte offset `at` უნდა იყოს ბაიტური წანაცვლება +@msg `at` must be a point [x, y] `at` უნდა იყოს წერტილი [x, y] +@msg `autoLeading` must be a number `autoLeading` უნდა იყოს რიცხვი +@msg `background` must be "", "matte" or #rrggbb `background` უნდა იყოს "", "matte" ან #rrggbb +@msg `beside` needs `side` `beside`-ს სჭირდება `side` +@msg `burasagari` must be "none", "standard" or "forced" `burasagari` უნდა იყოს "none", "standard" ან "forced" +@msg `center` must be [x, y] `center` უნდა იყოს [x, y] +@msg `charAlign` must be "romanBaseline", "emBoxTop", "emBoxCenter", "emBoxBottom", "icfTop" or "icfBottom" `charAlign` უნდა იყოს "romanBaseline", "emBoxTop", "emBoxCenter", "emBoxBottom", "icfTop" ან "icfBottom" +@msg `charDirection` must be "default", "leftToRight" or "rightToLeft" `charDirection` უნდა იყოს "default", "leftToRight" ან "rightToLeft" +@msg `clearStroke` requires `stroke: false`, `ids: []` and no `stop` `clearStroke`-ს სჭირდება `stroke: false` და `ids: []`, ხოლო `stop` არ უნდა იყოს მითითებული +@msg `clear` must be a list of type object ids, not {v} `clear` უნდა იყოს ტექსტური ობიექტების id-ების სია და არა {v} +@msg `clear` must list type objects; {_1} is not one `clear` უნდა ჩამოთვლიდეს ტექსტურ ობიექტებს; {_1} ასეთი არ არის +@msg `clear` must not list `id` `clear` არ უნდა შეიცავდეს `id`-ს +@msg `code` must be a whole number `code` უნდა იყოს მთელი რიცხვი +@msg `colorMode` must be one of rgb, cmyk `colorMode` უნდა იყოს ერთ-ერთი: rgb, cmyk +@msg `color` needs a `rule` to make the theme from `color`-ს სჭირდება `rule`, რომლითაც თემა შეიქმნება +@msg `colors` does not apply to the {name} reduction `colors` არ ვრცელდება ფერების შემცირების მეთოდზე „{name}“ +@msg `colors` is empty `colors` ცარიელია +@msg `colors` must be a whole number from 2 to 256 `colors` უნდა იყოს მთელი რიცხვი 2-დან 256-მდე +@msg `colors` must be at least 9 for the uniform reduction `colors` ერთგვაროვანი შემცირებისთვის მინიმუმ 9 უნდა იყოს +@msg `colors` must be between 1 and {MAX_THEME_COLORS} (got {n}) `colors` უნდა იყოს 1-სა და {MAX_THEME_COLORS}-ს შორის (მიღებულია {n}) +@msg `columnType` is vertical, uniform, repeating or sliding `columnType` არის vertical, uniform, repeating ან sliding +@msg `columns` must be a whole number 1..50 `columns` უნდა იყოს მთელი რიცხვი 1..50 +@msg `commands` must not be empty `commands` არ უნდა იყოს ცარიელი +@msg `contents` goes with `to` `contents` გამოიყენება `to`-სთან ერთად +@msg `corners` must be sharp, round or square, not `{other}` `corners` უნდა იყოს sharp, round ან square და არა `{other}` +@msg `corners` must list anchor indices (0, 1, 2…), not {v} `corners` უნდა ჩამოთვლიდეს საყრდენი წერტილების ინდექსებს (0, 1, 2…) და არა {v} +@msg `count` must be a whole number from 0 to {MAX_COUNT} `count` უნდა იყოს მთელი რიცხვი 0-დან {MAX_COUNT}-მდე +@msg `count` must be a whole number from 1 to 100 `count` უნდა იყოს მთელი რიცხვი 1-დან 100-მდე +@msg `dataBase64` is larger than the module limit `dataBase64` მოდულის ლიმიტზე დიდია +@msg `dataBase64` is not valid base64 `dataBase64` სწორი base64 არ არის +@msg `defaultsOnly` cannot be combined with `ids`, `reverse` or `append` `defaultsOnly` ვერ გამოიყენება `ids`-თან, `reverse`-თან ან `append`-თან ერთად +@msg `depth` and `childLimit` slice the summary: pass `summary: true` `depth` და `childLimit` შეჯამებას ზღუდავს: გადაეცით `summary: true` +@msg `design` is a design name, or null for plain columns `design` არის დიზაინის სახელი, ან null — ჩვეულებრივი სვეტებისთვის +@msg `design` is a design name, or null for the default marker `design` არის დიზაინის სახელი, ან null — ნაგულისხმევი მარკერისთვის +@msg `destinationFolder` is required when destination is `folder` `destinationFolder` აუცილებელია, როცა destination არის `folder` +@msg `destination` must be `none`, `saveAndClose` or `folder` `destination` უნდა იყოს `none`, `saveAndClose` ან `folder` +@msg `diameter` must be from 0.1 to 2500 pt `diameter` უნდა იყოს 0.1-დან 2500 pt-მდე +@msg `digits` must be one of {_1} `digits` უნდა იყოს ერთ-ერთი: {_1} +@msg `dimImages` is a percentage or false `dimImages` არის პროცენტი ან false +@msg `direction` must be "auto", "leftToRight" or "rightToLeft" `direction` უნდა იყოს "auto", "leftToRight" ან "rightToLeft" +@msg `ditherAmount` must be a number from 0 to 100 `ditherAmount` უნდა იყოს რიცხვი 0-დან 100-მდე +@msg `each` is the value one design stands for, more than 0 `each` არის მნიშვნელობა, რომელსაც ერთი დიზაინი გამოხატავს; 0-ზე მეტი +@msg `end` must be "start" or "end" `end` უნდა იყოს "start" ან "end" +@msg `ends` applies to joining exactly two paths `ends` ვრცელდება ზუსტად ორი ტრაექტორიის შეერთებაზე +@msg `event` must be one of {_1} `event` უნდა იყოს ერთ-ერთი: {_1} +@msg `every` must be "all", "odd" or "even", not {v} `every` უნდა იყოს "all", "odd" ან "even" და არა {v} +@msg `expand` must be true or false `expand` უნდა იყოს true ან false +@msg `fidelity` must be from {lo} to {hi} pt `fidelity` უნდა იყოს {lo}-დან {hi} pt-მდე +@msg `files` must be 1 to 1000 paths of font files the last text.findFontFiles search found `files` უნდა იყოს შრიფტის ფაილების 1-დან 1000-მდე გზა, რომლებიც ბოლო text.findFontFiles ძიებამ იპოვა +@msg `focal` and `radius` cannot be used together `focal` და `radius` ერთად ვერ გამოიყენება +@msg `focal` must be an array of [subpath, anchor] pairs `focal` უნდა იყოს [subpath, anchor] წყვილების მასივი +@msg `focal` names [{si}, {ai}], which is not an anchor of the path `focal` მიუთითებს [{si}, {ai}]-ს, რომელიც ტრაექტორიის საყრდენი წერტილი არ არის +@msg `folder` must be an absolute folder path `folder` უნდა იყოს საქაღალდის აბსოლუტური გზა +@msg `fontAxes` must be an object of axis tags and values, such as {{"wght": 650}} `fontAxes` უნდა იყოს ღერძების ტეგებისა და მნიშვნელობების ობიექტი, მაგალითად {{"wght": 650}} +@msg `format` must be a string `format` უნდა იყოს სტრიქონი +@msg `format` must be one of {_1} `format` უნდა იყოს ერთ-ერთი: {_1} +@msg `fractions` is chop or scale `fractions` არის chop ან scale +@msg `from` and `to` must differ `from` და `to` ერთმანეთისგან უნდა განსხვავდებოდეს +@msg `from` has an empty frame `from`-ს ცარიელი ჩარჩო აქვს +@msg `from` must be a non-negative integer `from` უნდა იყოს არაუარყოფითი მთელი რიცხვი +@msg `from` must be area type or type on a path `from` უნდა იყოს არის ტექსტი ან ტექსტი ტრაექტორიაზე +@msg `gid` must be a glyph id, not {v} `gid` უნდა იყოს გლიფის id და არა {v} +@msg `glyphAlternate` belongs to one character, not to a character style (text.setGlyphAlternate sets it) `glyphAlternate` ეკუთვნის ერთ სიმბოლოს და არა სიმბოლოს სტილს (მას text.setGlyphAlternate აყენებს) +@msg `glyphAlternate` takes only null, which takes a glyph choice away (text.setGlyphAlternate makes one) `glyphAlternate` იღებს მხოლოდ null-ს, რომელიც გლიფის არჩევანს აუქმებს (არჩევანს text.setGlyphAlternate ქმნის) +@msg `group` must be one of {_1} `group` უნდა იყოს ერთ-ერთი: {_1} +@msg `group` must be the Objects on Path group of `member` and `target` `group` უნდა იყოს `member`-ისა და `target`-ის ტრაექტორიაზე ობიექტების ჯგუფი +@msg `guide` must be a guide index (guide.list) `guide` უნდა იყოს დამხმარე ხაზის ინდექსი (guide.list) +@msg `hAlign` must be default, left, center or right `hAlign` უნდა იყოს default, left, center ან right +@msg `id` is an object id, not {v} `id` ობიექტის id უნდა იყოს და არა {v} +@msg `id` must be a node id `id` უნდა იყოს კვანძის id +@msg `id` must be an object id, not {v} `id` უნდა იყოს ობიექტის id და არა {v} +@msg `ids` must name Objects on Path groups or objects in them `ids` უნდა მიუთითებდეს ტრაექტორიაზე ობიექტების ჯგუფებს ან მათში შემავალ ობიექტებს +@msg `ids` takes at most {MAX_INSPECT_IDS} ids `ids` იღებს მაქსიმუმ {MAX_INSPECT_IDS} id-ს +@msg `imageMap` must be none, rectangle or polygon `imageMap` უნდა იყოს none, rectangle ან polygon +@msg `includeArtboardFill` must be true or false `includeArtboardFill` უნდა იყოს true ან false +@msg `includeSubdirs` must be true or false `includeSubdirs` უნდა იყოს true ან false +@msg `index` must be a point index `index` უნდა იყოს წერტილის ინდექსი +@msg `index` must be a whole number `index` უნდა იყოს მთელი რიცხვი +@msg `index` must be a whole number or null `index` უნდა იყოს მთელი რიცხვი ან null +@msg `indices` must be a non-empty array of item indices `indices` უნდა იყოს ელემენტების ინდექსების არაცარიელი მასივი +@msg `item` needs `index` `item`-ს სჭირდება `index` +@msg `items` is a list of {{kind, item}} `items` არის {{kind, item}} ჩანაწერების სია +@msg `items` is empty `items` ცარიელია +@msg `items` must be a list of {{id, anchors?}}, not {v} `items` უნდა იყოს {{id, anchors?}} ჩანაწერების სია და არა {v} +@msg `items` must be a list of {{id, points}} `items` უნდა იყოს {{id, points}} ჩანაწერების სია +@msg `items` must be an array of {{id, anchors}} `items` უნდა იყოს {{id, anchors}} ჩანაწერების მასივი +@msg `items` must be an array of {{id, corners?}}, not {v} `items` უნდა იყოს {{id, corners?}} ჩანაწერების მასივი და არა {v} +@msg `kashida` must be "none", "short", "medium", "long" or "stylistic" `kashida` უნდა იყოს "none", "short", "medium", "long" ან "stylistic" +@msg `kerningBefore` belongs to a line's first character, not to a character style (text.setRangeStyle sets it) `kerningBefore` ეკუთვნის სტრიქონის პირველ სიმბოლოს და არა სიმბოლოს სტილს (მას text.setRangeStyle აყენებს) +@msg `kind` is one of {_1} `kind` არის ერთ-ერთი: {_1} +@msg `kind` must be "round", "invertedRound" or "chamfer", not {v} `kind` უნდა იყოს "round", "invertedRound" ან "chamfer" და არა {v} +@msg `kind` must be `text`, `visibility`, `image` or `graph` `kind` უნდა იყოს `text`, `visibility`, `image` ან `graph` +@msg `kind` must be a string `kind` უნდა იყოს სტრიქონი +@msg `kind` must be image, noImage or htmlText `kind` უნდა იყოს image, noImage ან htmlText +@msg `kinsokuType` must be "pushInFirst", "pushOutFirst" or "pushOutOnly" `kinsokuType` უნდა იყოს "pushInFirst", "pushOutFirst" ან "pushOutOnly" +@msg `kinsoku` must be "none", "hard" or "soft" `kinsoku` უნდა იყოს "none", "hard" ან "soft" +@msg `label` must be a non-empty name of at most 200 characters `label` უნდა იყოს არაცარიელი სახელი, არაუმეტეს 200 სიმბოლოსი +@msg `language` must be a language name or tag, such as "Turkish" or "tr" `language` უნდა იყოს ენის სახელი ან ტეგი, მაგალითად "Turkish" ან "tr" +@msg `leader` must be a string `leader` უნდა იყოს სტრიქონი +@msg `leadingModel` must be "romanBaseline" or "emBoxTop" `leadingModel` უნდა იყოს "romanBaseline" ან "emBoxTop" +@msg `leading` must be from 0.1 to 5000, or null for Auto `leading` უნდა იყოს 0.1-დან 5000-მდე, ან null — ავტომატურისთვის +@msg `length` must be a number of at most 1000000 pt either way `length` უნდა იყოს რიცხვი, ნებისმიერი მიმართულებით არაუმეტეს 1000000 pt-ისა +@msg `line` must be true or false `line` უნდა იყოს true ან false +@msg `max` must be 1 to {MAX_SUGGESTIONS} `max` უნდა იყოს 1-დან {MAX_SUGGESTIONS}-მდე +@msg `minAngle` ({min_angle}°) can't be more than `maxAngle` ({max_angle}°) `minAngle` ({min_angle}°) ვერ იქნება `maxAngle`-ზე ({max_angle}°) მეტი +@msg `mode` must be "handles", "straight" or "smooth" `mode` უნდა იყოს "handles", "straight" ან "smooth" +@msg `mode` must be "straight", "bezier" or "arc" `mode` უნდა იყოს "straight", "bezier" ან "arc" +@msg `mode` must be one of {_1} `mode` უნდა იყოს ერთ-ერთი: {_1} +@msg `mojikumi` must be "none", "yakumonoHankaku", "gyomatsuYakumonoHankaku", "gyomatsuYakumonoZenkaku", "yakumonoZenkaku" or "lineEndHalf" `mojikumi` უნდა იყოს "none", "yakumonoHankaku", "gyomatsuYakumonoHankaku", "gyomatsuYakumonoZenkaku", "yakumonoZenkaku" ან "lineEndHalf" +@msg `name` must be a name that is not empty `name` უნდა იყოს არაცარიელი სახელი +@msg `name` must not be empty `name` არ უნდა იყოს ცარიელი +@msg `names` is a list of preset names `names` არის პრესეტების სახელების სია +@msg `names` lists preset names `names` ჩამოთვლის პრესეტების სახელებს +@msg `names` must be a list of names `names` უნდა იყოს სახელების სია +@msg `names` must be a list of swatch names `names` უნდა იყოს ფერის ნიმუშების სახელების სია +@msg `names` must be an array of style names `names` უნდა იყოს სტილების სახელების მასივი +@msg `new` is a design name, or true `new` არის დიზაინის სახელი ან true +@msg `origin` must be [x, y] in points `origin` უნდა იყოს [x, y] პუნქტებში +@msg `path` must be a folder `path` უნდა იყოს საქაღალდე +@msg `path` must be a path object `path` უნდა იყოს ტრაექტორიის ობიექტი +@msg `picks` must be an array (got {v}) `picks` უნდა იყოს მასივი (მიღებულია {v}) +@msg `picks` must hold 1 to {MAX_PICKS} picks (got {_1}) `picks` უნდა შეიცავდეს 1-დან {MAX_PICKS}-მდე არჩევანს (მიღებულია {_1}) +@msg `pivot` must be a whole number from 0 to 8 `pivot` უნდა იყოს მთელი რიცხვი 0-დან 8-მდე +@msg `points` must be a list of [x, y] points `points` უნდა იყოს [x, y] წერტილების სია +@msg `points` must be a list of point indexes `points` უნდა იყოს წერტილების ინდექსების სია +@msg `points` must be an array of point indices `points` უნდა იყოს წერტილების ინდექსების მასივი +@msg `points` must be point indexes `points` უნდა იყოს წერტილების ინდექსები +@msg `points` must hold from 2 to 100000 points `points` უნდა შეიცავდეს 2-დან 100000-მდე წერტილს +@msg `port` must be "in" or "out" `port` უნდა იყოს "in" ან "out" +@msg `position` is above or below `position` არის above ან below +@msg `preset` must be a string `preset` უნდა იყოს სტრიქონი +@msg `radius` must be 0 or more `radius` უნდა იყოს 0 ან მეტი +@msg `ratio` must be from 0.1 to 0.5 `ratio` უნდა იყოს 0.1-დან 0.5-მდე +@msg `rect` must be [x, y, width, height] `rect` უნდა იყოს [x, y, width, height] +@msg `rect` must be [x, y, width, height] with a positive size `rect` უნდა იყოს [x, y, width, height] დადებითი ზომით +@msg `rect` must be [x0, y0, x1, y1] (got {r}) `rect` უნდა იყოს [x0, y0, x1, y1] (მიღებულია {r}) +@msg `relation` must be overlap, inside or outside `relation` უნდა იყოს overlap, inside ან outside +@msg `replace` must be a string `replace` უნდა იყოს სტრიქონი +@msg `reversed` must be true or false `reversed` უნდა იყოს true ან false +@msg `rotate` must be a finite number `rotate` უნდა იყოს სასრული რიცხვი +@msg `rows` must be lists of numbers or nulls, not {r} `rows` უნდა იყოს რიცხვების ან null-ების სიები და არა {r} +@msg `rule` must be nonZero or evenOdd `rule` უნდა იყოს nonZero ან evenOdd +@msg `scale` must be a number from 0.001 to 1000 `scale` უნდა იყოს რიცხვი 0.001-დან 1000-მდე +@msg `scale` must be a number in (0, 100] `scale` უნდა იყოს რიცხვი (0, 100] შუალედში +@msg `scope.{key}` must be a non-empty array `scope.{key}` უნდა იყოს არაცარიელი მასივი +@msg `scope` must be "selection" or "document", not {other} `scope` უნდა იყოს "selection" ან "document" და არა {other} +@msg `script` must be a string `script` უნდა იყოს სტრიქონი +@msg `seriesIndexes` is a non-empty list of series indexes `seriesIndexes` არის სერიების ინდექსების არაცარიელი სია +@msg `seriesIndexes` needs a `type` or a `valueAxis` `seriesIndexes`-ს სჭირდება `type` ან `valueAxis` +@msg `shift` must be a number of points `shift` უნდა იყოს რიცხვი პუნქტებში +@msg `showCenter` must be true or false `showCenter` უნდა იყოს true ან false +@msg `side` must be "left", "right", "top" or "bottom" `side` უნდა იყოს "left", "right", "top" ან "bottom" +@msg `side` places the artboard: leave out x, y, width and height `side` სამუშაო დაფას თავად განათავსებს: გამოტოვეთ x, y, width და height +@msg `singleWordJustification` must be "fullJustify", "alignLeft", "alignCenter" or "alignRight" `singleWordJustification` უნდა იყოს "fullJustify", "alignLeft", "alignCenter" ან "alignRight" +@msg `size` is a percentage of the base text's size, 1 to 100 `size` არის საბაზისო ტექსტის ზომის პროცენტი, 1-დან 100-მდე +@msg `source` and `target` are the same object `source` და `target` ერთი და იგივე ობიექტია +@msg `source` is the only path in series group `target` `source` ერთადერთი ტრაექტორიაა სერიის ჯგუფში `target` +@msg `source` must be `folder` or `datasets` `source` უნდა იყოს `folder` ან `datasets` +@msg `spacing` makes more than {MAX_COUNT} lines across the box `spacing` ჩარჩოში {MAX_COUNT}-ზე მეტ ხაზს ქმნის +@msg `spacing` must be a number `spacing` უნდა იყოს რიცხვი +@msg `spacing` must be a number of points, 0 or more, or "auto" `spacing` უნდა იყოს რიცხვი პუნქტებში (0 ან მეტი) ან "auto" +@msg `spacing` must be more than 0 and at most {MAX_DISTANCE} pt `spacing` უნდა იყოს 0-ზე მეტი და არაუმეტეს {MAX_DISTANCE} pt-ისა +@msg `start` must be a finite number `start` უნდა იყოს სასრული რიცხვი +@msg `starts` must be an array of anchor indices (or nulls) `starts` უნდა იყოს საყრდენი წერტილების ინდექსების (ან null-ების) მასივი +@msg `status` must be linked, embedded, missing or modified, or a list of them `status` უნდა იყოს linked, embedded, missing ან modified, ან მათი სია +@msg `stop` must be a stop index `stop` უნდა იყოს გადასვლის წერტილის ინდექსი +@msg `story` styles the whole story: give no `start` or `end` `story` მთელ ტექსტს აფორმებს: გამოტოვეთ `start` და `end` +@msg `story` takes the whole story: give no `start` or `end` `story` მთელ ტექსტს იღებს: გამოტოვეთ `start` და `end` +@msg `strokeMode` applies to strokes (stroke: true) `strokeMode` ვრცელდება კონტურებზე (stroke: true) +@msg `style` must be roman or japanese `style` უნდა იყოს roman ან japanese +@msg `subpaths` must be two integer indices `subpaths` უნდა იყოს ორი მთელრიცხვა ინდექსი +@msg `symbol` must be a symbol name `symbol` უნდა იყოს სიმბოლოს სახელი +@msg `target` must be "object" or "contents", not {v} `target` უნდა იყოს "object" ან "contents" და არა {v} +@msg `target` must be an object of the same Objects on Path group as `member` `target` უნდა იყოს ობიექტი იმავე ტრაექტორიაზე ობიექტების ჯგუფიდან, რომელშიც `member` არის +@msg `tint` applies to global and spot colours `tint` ვრცელდება გლობალურ და სპოტ-ფერებზე +@msg `tint` goes with a global or spot `swatch` `tint` გამოიყენება გლობალური ან სპოტ-ფერის `swatch`-თან ერთად +@msg `tint` must be a number (%) `tint` უნდა იყოს რიცხვი (%) +@msg `tint` needs a global or spot colour `tint`-ს სჭირდება გლობალური ან სპოტ-ფერი +@msg `to` is already threaded `to` უკვე დაკავშირებულია +@msg `to` is the design's new name `to` არის დიზაინის ახალი სახელი +@msg `to` must be [x, y] `to` უნდა იყოს [x, y] +@msg `to` must be a closed path, area type or type on a path other than `from` `to` უნდა იყოს შეკრული ტრაექტორია, არის ტექსტი ან ტექსტი ტრაექტორიაზე, `from`-ისგან განსხვავებული +@msg `to` must be a whole number `to` უნდა იყოს მთელი რიცხვი +@msg `to` takes the rows of one object's stack, not aligned rows `to` იღებს ერთი ობიექტის დასტის სტრიქონებს და არა გასწორებულ სტრიქონებს +@msg `tolerance` must be from 0 to 100 pt `tolerance` უნდა იყოს 0-დან 100 pt-მდე +@msg `useLab` must be true or false `useLab` უნდა იყოს true ან false +@msg `vAlign` must be default, top, middle, baseline or bottom `vAlign` უნდა იყოს default, top, middle, baseline ან bottom +@msg `values` must be a list `values` უნდა იყოს სია +@msg `values` must be an object `values` უნდა იყოს ობიექტი +@msg `values` must name hex, rgb, cmyk, lab or gray `values` უნდა შეიცავდეს hex, rgb, cmyk, lab ან gray მნიშვნელობას +@msg `values` names a kind twice `values` ერთსა და იმავე სახეობას ორჯერ მიუთითებს +@msg `version` must be 0 or {_1} `version` უნდა იყოს 0 ან {_1} +@msg `version` must be 0 or {newest} `version` უნდა იყოს 0 ან {newest} +@msg `view` is smallThumb, mediumThumb, largeThumb, smallList or largeList `view` არის smallThumb, mediumThumb, largeThumb, smallList ან largeList +@msg `warichuAlign` must be one of {_1} `warichuAlign` უნდა იყოს ერთ-ერთი: {_1} +@msg `warichuLines` must be a whole number from {_1} to {_2} `warichuLines` უნდა იყოს მთელი რიცხვი {_1}-დან {_2}-მდე +@msg `weight` must be from 0.01 to 1000 pt `weight` უნდა იყოს 0.01-დან 1000 pt-მდე +@msg `weights` must be a list of {_1} numbers, one per row (got {v}) `weights` უნდა იყოს {_1} რიცხვის სია, თითო სტრიქონზე ერთი (მიღებულია {v}) +@msg `xml` must be a string `xml` უნდა იყოს სტრიქონი +@msg `{KEY}` entry {n} gives the paragraph at byte {start} of {_1} other indents than an entry before it `{KEY}`-ის ჩანაწერი {n} აბზაცს ({_1}, ბაიტი {start}) სხვა შეწევებს ანიჭებს, ვიდრე მანამდე მყოფი ჩანაწერი +@msg `{KEY}` entry {n} must be an object `{KEY}`-ის ჩანაწერი {n} უნდა იყოს ობიექტი +@msg `{KEY}` entry {n} sets neither `leftIndent` nor `firstLineIndent` `{KEY}`-ის ჩანაწერი {n} არც `leftIndent`-ს აყენებს და არც `firstLineIndent`-ს +@msg `{KEY}` entry {n}: `id` must be an object id `{KEY}`-ის ჩანაწერი {n}: `id` უნდა იყოს ობიექტის id +@msg `{KEY}` entry {n}: `start` must be a byte offset `{KEY}`-ის ჩანაწერი {n}: `start` უნდა იყოს ბაიტური წანაცვლება +@msg `{KEY}` entry {n}: `{k}` must be a number from -{MAX_PARA} to {MAX_PARA} pt `{KEY}`-ის ჩანაწერი {n}: `{k}` უნდა იყოს რიცხვი -{MAX_PARA}-დან {MAX_PARA} pt-მდე +@msg `{KEY}` entry {n}: no paragraph of {_1} starts at byte {start} `{KEY}`-ის ჩანაწერი {n}: ობიექტში {_1} ბაიტზე {start} არცერთი აბზაცი არ იწყება +@msg `{KEY}` entry {n}: unknown key `{k}` `{KEY}`-ის ჩანაწერი {n}: უცნობი გასაღები `{k}` +@msg `{KEY}` entry {n}: {_1} is not a type object `{KEY}`-ის ჩანაწერი {n}: {_1} ტექსტური ობიექტი არ არის +@msg `{KEY}` is empty `{KEY}` ცარიელია +@msg `{KEY}` must be a list `{KEY}` უნდა იყოს სია +@msg `{KEY}` takes at most {MAX_PARAGRAPH_INDENTS} entries (got {_1}) `{KEY}` იღებს მაქსიმუმ {MAX_PARAGRAPH_INDENTS} ჩანაწერს (მიღებულია {_1}) +@msg `{KEY}` takes no `{other}` beside it `{KEY}`-თან ერთად `{other}` ვერ გამოიყენება +@msg `{_1}` can't be edited or removed `{_1}`: რედაქტირება და მოცილება შეუძლებელია +@msg `{_1}` is built in and always listed `{_1}` ჩაშენებულია და სიაში ყოველთვის ჩანს +@msg `{_1}` is not a font file the last text.findFontFiles search found `{_1}` არ არის შრიფტის ფაილი, რომელიც ბოლო text.findFontFiles ძიებამ იპოვა +@msg `{_1}` would be overwritten by the package: choose a different folder or name `{_1}` შეფუთვით გადაიწერებოდა: აირჩიეთ სხვა საქაღალდე ან სახელი +@msg `{base}` is larger than {_1} MB `{base}` {_1} MB-ზე დიდია +@msg `{base}` is not in the DCS file's folder `{base}` DCS ფაილის საქაღალდეში არ არის +@msg `{file}` has no art to place `{file}`: განსათავსებელი ნახატი არ არის +@msg `{file}` is over {_1} MB `{file}` {_1} MB-ს აღემატება +@msg `{f}` belongs to a VectorCraft that is running `{f}` ეკუთვნის გაშვებულ VectorCraft-ს +@msg `{f}` is the copy of a document open now `{f}` ახლა გახსნილი დოკუმენტის ასლია +@msg `{id}` is no writable format (see document.formats) `{id}` ჩაწერადი ფორმატი არ არის (იხ. document.formats) +@msg `{id}` isn't a loaded library `{id}` ჩატვირთული ბიბლიოთეკა არ არის +@msg `{key}` has no colours `{key}`: ფერები არ არის +@msg `{key}` holds more than {MAX_EDIT_WORDS} words `{key}` {MAX_EDIT_WORDS}-ზე მეტ სიტყვას შეიცავს +@msg `{key}` is a design name `{key}` არის დიზაინის სახელი +@msg `{key}` is a design name or a list of them `{key}` არის დიზაინის სახელი ან მათი სია +@msg `{key}` is longer than {MAX_NAME} characters `{key}` {MAX_NAME} სიმბოლოზე გრძელია +@msg `{key}` is out of range `{key}` დიაპაზონს სცდება +@msg `{key}` must be 0 or more `{key}` უნდა იყოს 0 ან მეტი +@msg `{key}` must be [min, desired, max] or {{min?, desired?, max?}}, in percent `{key}` უნდა იყოს [min, desired, max] ან {{min?, desired?, max?}}, პროცენტებში +@msg `{key}` must be [x, y] numbers `{key}` უნდა იყოს [x, y] რიცხვები +@msg `{key}` must be a list of words `{key}` უნდა იყოს სიტყვების სია +@msg `{key}` must be a list, not {v} `{key}` უნდა იყოს სია და არა {v} +@msg `{key}` must be a non-negative integer `{key}` უნდა იყოს არაუარყოფითი მთელი რიცხვი +@msg `{key}` must be a number or null, not {v} `{key}` უნდა იყოს რიცხვი ან null და არა {v} +@msg `{key}` must be a number {_1}..{_2} `{key}` უნდა იყოს რიცხვი {_1}..{_2} +@msg `{key}` must be a whole number of 0 or more `{key}` უნდა იყოს მთელი რიცხვი, 0 ან მეტი +@msg `{key}` must be a whole number of at least 0, not {n} `{key}` უნდა იყოს მთელი რიცხვი, არანაკლებ 0, და არა {n} +@msg `{key}` must be an appearance item index (paint order) or null `{key}` უნდა იყოს იერსახის ელემენტის ინდექსი (დახატვის რიგით) ან null +@msg `{key}` must be an array of asset ids (see assets.list) `{key}` უნდა იყოს რესურსების id-ების მასივი (იხ. assets.list) +@msg `{key}` must be from 0 to 180 degrees, not {a} `{key}` უნდა იყოს 0-დან 180 გრადუსამდე და არა {a} +@msg `{key}` must be from 0 to {MAX_DISTANCE} pt `{key}` უნდა იყოს 0-დან {MAX_DISTANCE} pt-მდე +@msg `{key}` must be from 0.01 to 1000 pt `{key}` უნდა იყოს 0.01-დან 1000 pt-მდე +@msg `{key}` must be from {_1} to {shift_max} `{key}` უნდა იყოს {_1}-დან {shift_max}-მდე +@msg `{key}` must be from {lo} to {hi}, not {v} `{key}` უნდა იყოს {lo}-დან {hi}-მდე და არა {v} +@msg `{key}` must be one of auto, always, never `{key}` უნდა იყოს ერთ-ერთი: auto, always, never +@msg `{key}` must be one of miter, round, bevel `{key}` უნდა იყოს ერთ-ერთი: miter, round, bevel +@msg `{key}` must be one word of at most {_1} characters `{key}` უნდა იყოს ერთი სიტყვა, არაუმეტეს {_1} სიმბოლოსი +@msg `{key}` must hold single words of at most {_1} characters `{key}` უნდა შეიცავდეს ცალკეულ სიტყვებს, თითოეული არაუმეტეს {_1} სიმბოლოსი +@msg `{key}` must name an object attached to the path of an Objects on Path group `{key}` უნდა მიუთითებდეს ობიექტს, რომელიც ტრაექტორიაზე ობიექტების ჯგუფის ტრაექტორიაზეა მიმაგრებული +@msg `{key}` names an object that is hidden or locked `{key}` მიუთითებს ობიექტს, რომელიც დამალული ან ჩაკეტილია +@msg `{key}`: not a colour: {v} `{key}`: ფერი არ არის: {v} +@msg `{k}.family` is required `{k}.family` აუცილებელია +@msg `{k}` is a number 0..1 `{k}` არის რიცხვი 0..1 +@msg `{k}` is true or false `{k}` არის true ან false +@msg `{k}` isn't an export setting: {_1} `{k}` ექსპორტის პარამეტრი არ არის: {_1} +@msg `{k}` must be a byte offset `{k}` უნდა იყოს ბაიტური წანაცვლება +@msg `{k}` must be a number `{k}` უნდა იყოს რიცხვი +@msg `{k}` must be a number of points `{k}` უნდა იყოს რიცხვი პუნქტებში +@msg `{k}` must be a string `{k}` უნდა იყოს სტრიქონი +@msg `{k}` must be a whole number `{k}` უნდა იყოს მთელი რიცხვი +@msg `{k}` must be from {lo} to {hi} for {key} {key}: `{k}` უნდა იყოს {lo}-დან {hi}-მდე +@msg `{k}` must be {what}, not {v} `{k}` უნდა იყოს {what} და არა {v} +@msg `{l}` isn't a global or spot colour `{l}` გლობალური ან სპოტ-ფერი არ არის +@msg `{m}` isn't a bitmap: use clipboard.importSvg, importPdf or importText `{m}` ბიტმაპი არ არის: გამოიყენეთ clipboard.importSvg, importPdf ან importText +@msg `{name}` can't be deleted `{name}`: წაშლა შეუძლებელია +@msg `{name}` can't be duplicated `{name}`: დუბლირება შეუძლებელია +@msg `{name}` can't be edited `{name}`: რედაქტირება შეუძლებელია +@msg `{name}` can't be edited this way `{name}`: ამგვარად რედაქტირება შეუძლებელია +@msg `{name}` can't be renamed `{name}`: სახელის შეცვლა შეუძლებელია +@msg `{name}` can't name a folder `{name}` საქაღალდის სახელად ვერ გამოდგება +@msg `{name}` has no art to place `{name}`: განსათავსებელი ნახატი არ არის +@msg `{name}` has no text to place `{name}`: განსათავსებელი ტექსტი არ არის +@msg `{name}` in the Word document is not UTF-8 or UTF-16 text `{name}` Word-ის დოკუმენტში არ არის UTF-8 ან UTF-16 ტექსტი +@msg `{name}` in the Word document is not well-formed XML: {e} `{name}` Word-ის დოკუმენტში სწორად აგებული XML არ არის: {e} +@msg `{name}` in the Word document nests elements more than {MAX_NESTING} deep `{name}` Word-ის დოკუმენტში შეიცავს {MAX_NESTING} დონეზე ღრმად ჩადგმულ ელემენტებს +@msg `{name}` is a built-in preset and is read-only: save it under another name `{name}` ჩაშენებული პრესეტია და მხოლოდ წასაკითხია: შეინახეთ სხვა სახელით +@msg `{name}` is a built-in preset: save under another name `{name}` ჩაშენებული პრესეტია: შეინახეთ სხვა სახელით +@msg `{name}` is a built-in profile and stays `{name}` ჩაშენებული პროფილია და ყოველთვის რჩება +@msg `{name}` is a file of its own, which can only be found next to the DCS file's path `{name}` ცალკე ფაილია, რომლის პოვნაც მხოლოდ DCS ფაილის გვერდით შეიძლება +@msg `{name}` is a tint of `{base}`: edit `{base}` (a tint swatch only takes a new name) `{name}` არის ფერის `{base}` ტონირება: დაარედაქტირეთ `{base}` (ტონირების ფერის ნიმუშს მხოლოდ ახალი სახელის მინიჭება შეიძლება) +@msg `{name}` is a working space: choose another with edit.colorSettings first `{name}` სამუშაო ფერთა სივრცეა: ჯერ edit.colorSettings-ით სხვა აირჩიეთ +@msg `{name}` is built in and stays `{name}` ჩაშენებულია და ყოველთვის რჩება +@msg `{name}` takes a paint of its own kind (colour, gradient or pattern) `{name}` იღებს მხოლოდ საკუთარი სახეობის საღებავს (ფერს, გრადიენტს ან პატერნს) +@msg `{name}`: Minimum must not exceed Desired, nor Desired Maximum `{name}`: მინიმალური არ უნდა აღემატებოდეს სასურველს, ხოლო სასურველი — მაქსიმალურს +@msg `{name}`: {_1}: {e} `{name}`: {_1}: {e} +@msg `{n}` can't be deleted `{n}`: წაშლა შეუძლებელია +@msg `{n}` can't be merged `{n}`: შერწყმა შეუძლებელია +@msg `{n}` can't be moved `{n}`: გადატანა შეუძლებელია +@msg `{n}` is not a colour swatch `{n}` ფერის ნიმუში არ არის +@msg `{n}` isn't a solid colour `{n}` მყარი ფერი არ არის +@msg `{n}`: colour groups hold solid colours only `{n}`: ფერთა ჯგუფები მხოლოდ მყარ ფერებს შეიცავს +@msg `{other}` doesn't trace an image `{other}` გამოსახულების ვექტორიზაციას არ ახდენს +@msg `{s}`: the step's references copy in more than {_1} MB of values `{s}`: ნაბიჯის მიმართვებს {_1} MB-ზე მეტი მნიშვნელობა შემოაქვს +@msg `{tag}` is not an axis tag: a tag is four characters, such as "wght" `{tag}` ღერძის ტეგი არ არის: ტეგი ოთხი სიმბოლოსგან შედგება, მაგალითად "wght" +@msg `{to}` is empty or already used `{to}` ცარიელია ან უკვე გამოიყენება +@msg `{u}` is no Unicode character `{u}` Unicode სიმბოლო არ არის +@msg `{what}` is longer than {MAX_TEXT} bytes `{what}` {MAX_TEXT} ბაიტზე გრძელია +@msg `{what}` must be text `{what}` უნდა იყოს ტექსტი +@msg `{word}` isn't in the custom dictionary `{word}` მომხმარებლის ლექსიკონში არ არის +@msg a CMap has too many mappings CMap-ს ზედმეტად ბევრი შესაბამისობა აქვს +@msg a DXF drawing has one origin: pass useArtboards: true for one drawing per artboard DXF ნახაზს ერთი საწყისი წერტილი აქვს: თითო სამუშაო დაფაზე ცალკე ნახაზისთვის გადაეცით useArtboards: true +@msg a PDF presets file with over {_1} presets PDF-ის პრესეტების ფაილი {_1}-ზე მეტი პრესეტით +@msg a \\u escape needs four hexadecimal digits \\u ესკეიპ-მიმდევრობას ოთხი თექვსმეტობითი ციფრი სჭირდება +@msg a batch preview cannot switch documents პაკეტური წინასწარი ნახვა დოკუმენტებს ვერ გადართავს +@msg a brush named `{nn}` exists ფუნჯი სახელით `{nn}` უკვე არსებობს +@msg a comma in an XPath expression must separate function arguments XPath გამოსახულებაში მძიმე ფუნქციის არგუმენტებს უნდა გამოყოფდეს +@msg a container of the listed objects is gone ჩამოთვლილი ობიექტების ერთ-ერთი კონტეინერი აღარ არსებობს +@msg a content stream can't be read შიგთავსის ნაკადი ვერ იკითხება +@msg a content stream isn't a stream შიგთავსის ნაკადი სინამდვილეში ნაკადი არ არის +@msg a design holds at most {_1} objects დიზაინი შეიცავს მაქსიმუმ {_1} ობიექტს +@msg a design needs a name დიზაინს სახელი სჭირდება +@msg a dictionary grew too large ლექსიკონი ზედმეტად გაიზარდა +@msg a document holds at most {_1} SVG filters დოკუმენტი შეიცავს მაქსიმუმ {_1} SVG ფილტრს +@msg a document keeps at most {_1} graph designs დოკუმენტი ინახავს მაქსიმუმ {_1} დიაგრამის დიზაინს +@msg a document keeps at most {_1} saved selections დოკუმენტი ინახავს მაქსიმუმ {_1} შენახულ მონიშვნას +@msg a document keeps at most {_1} views დოკუმენტი ინახავს მაქსიმუმ {_1} ხედს +@msg a document links at most {MAX_SVG_SCRIPTS} JavaScript files დოკუმენტს შეიძლება ჰქონდეს მაქსიმუმ {MAX_SVG_SCRIPTS} დაკავშირებული JavaScript ფაილი +@msg a document with unsaved changes has no recovery copy შეუნახავი ცვლილებების მქონე დოკუმენტს აღდგენის ასლი არ აქვს +@msg a feConvolveMatrix filter's order is {x}×{y}, which overflows the kernel-size multiply usvg makes feConvolveMatrix ფილტრის რიგი არის {x}×{y}, რაც usvg-ის მიერ ბირთვის ზომის გამოთვლისას გადავსებას იწვევს +@msg a font's data is too large შრიფტის მონაცემები ზედმეტად დიდია +@msg a font's subroutines are too large შრიფტის ქვეპროგრამები ზედმეტად დიდია +@msg a function declaration without a name ფუნქციის გამოცხადება სახელის გარეშე +@msg a gradient preset is already called {n} გრადიენტის პრესეტი სახელით {n} უკვე არსებობს +@msg a graph has at most {_1} series, so it transposes with at most that many categories დიაგრამას აქვს მაქსიმუმ {_1} სერია, ამიტომ ტრანსპოზიცია შესაძლებელია მაქსიმუმ ამდენი კატეგორიით +@msg a host value has too many entries ჰოსტის მნიშვნელობას ზედმეტად ბევრი ჩანაწერი აქვს +@msg a host value is nested too deep ჰოსტის მნიშვნელობა ზედმეტად ღრმადაა ჩადგმული +@msg a layer can't be merged into its own sublayer შრე საკუთარ ქვეშრეს ვერ შეერწყმება +@msg a layer's form box isn't an array შრის ფორმის საზღვრების ჩარჩო მასივი არ არის +@msg a layer's form can't be read შრის ფორმა ვერ იკითხება +@msg a layer's form has no box შრის ფორმას საზღვრების ჩარჩო არ აქვს +@msg a layer's form has no dictionary შრის ფორმას ლექსიკონი არ აქვს +@msg a legend draws at most {MAX_CHIPS} swatches ლეგენდა ხატავს მაქსიმუმ {MAX_CHIPS} ფერის ნიმუშს +@msg a line can't run from a point to itself ხაზი წერტილიდან იმავე წერტილამდე ვერ გაივლის +@msg a line needs at least two points ხაზს სჭირდება მინიმუმ ორი წერტილი +@msg a linked JavaScript file is outside the read roots დაკავშირებული JavaScript ფაილი წაკითხვის ძირეული საქაღალდეების გარეთაა +@msg a name names one asset: give multiple: false, or one object სახელი ერთ რესურსს აღნიშნავს: მიუთითეთ multiple: false ან ერთი ობიექტი +@msg a namespace declaration uses a reserved prefix or URI სახელთა სივრცის გამოცხადება დაჯავშნილ პრეფიქსს ან URI-ს იყენებს +@msg a namespace qualifier is undefined სახელთა სივრცის კვალიფიკატორი განსაზღვრული არ არის +@msg a namespace with an empty URI cannot have a prefix ცარიელი URI-ის მქონე სახელთა სივრცეს პრეფიქსი არ შეიძლება ჰქონდეს +@msg a number cannot be read რიცხვის წაკითხვა ვერ ხერხდება +@msg a number has no digits რიცხვს ციფრები არ აქვს +@msg a number's exponent has no digits რიცხვის ხარისხის მაჩვენებელს ციფრები არ აქვს +@msg a number's fraction has no digits რიცხვის წილად ნაწილს ციფრები არ აქვს +@msg a page can't be read გვერდის წაკითხვა ვერ ხერხდება +@msg a page object is used by something else გვერდის ობიექტს სხვა რამ იყენებს +@msg a page thumbnail must be RGB pixels, 1 to {THUMBNAIL_SIZE} a side (got {w} × {h}) გვერდის ესკიზი უნდა შედგებოდეს RGB პიქსელებისგან, თითო მხარე 1-დან {THUMBNAIL_SIZE}-მდე (მიღებულია {w} × {h}) +@msg a pattern layer doesn't end what it starts პატერნის შრე არ ასრულებს იმას, რასაც იწყებს +@msg a pattern layer's colors hold something else პატერნის შრის ფერები სხვა რამეს შეიცავს +@msg a pattern named `{n}` exists პატერნი სახელით `{n}` უკვე არსებობს +@msg a plug-in with id {_1} is already installed პლაგინი ID-ით {_1} უკვე დაყენებულია +@msg a preset named `{n}` exists პრესეტი სახელით `{n}` უკვე არსებობს +@msg a print presets file with over {_1} presets ბეჭდვის პრესეტების ფაილი {_1}-ზე მეტი პრესეტით +@msg a profile is already called {n} პროფილი სახელით {n} უკვე არსებობს +@msg a property descriptor cannot have both a value or writable and a get or set თვისების დესკრიპტორს ერთდროულად ვერ ექნება value ან writable და get ან set +@msg a property descriptor must be an object თვისების დესკრიპტორი უნდა იყოს ობიექტი +@msg a property's {name} must be a function or undefined თვისების {name} უნდა იყოს ფუნქცია ან undefined +@msg a row can't go into itself სტრიქონი საკუთარ თავში ვერ მოთავსდება +@msg a series goes on the left or the right value axis სერია თავსდება მარცხენა ან მარჯვენა მნიშვნელობის ღერძზე +@msg a start must be an anchor index ≥ 0 or null საწყისი უნდა იყოს საყრდენი წერტილის ინდექსი ≥ 0 ან null +@msg a stream in it would decode to more than 256 MB, or its decode parameters can't be applied მასში არსებული ნაკადი დეკოდირებისას 256 MB-ს გადააჭარბებდა, ან მისი დეკოდირების პარამეტრების გამოყენება ვერ ხერხდება +@msg a string holds a control character სტრიქონი მმართველ სიმბოლოს შეიცავს +@msg a string holds an escape sequence JSON does not have სტრიქონი შეიცავს escape-მიმდევრობას, რომელიც JSON-ში არ არსებობს +@msg a string is not closed სტრიქონი არ არის დახურული +@msg a style named `{name}` already exists სტილი სახელით `{name}` უკვე არსებობს +@msg a style named `{to}` already exists სტილი სახელით `{to}` უკვე არსებობს +@msg a swatch exchange block is too long ფერის ნიმუშების გაცვლის ბლოკი ზედმეტად გრძელია +@msg a swatch exchange name is too long ფერის ნიმუშების გაცვლის სახელი ზედმეტად გრძელია +@msg a swatch needs a colour, gradient or pattern ფერის ნიმუშს სჭირდება ფერი, გრადიენტი ან პატერნი +@msg a symbol named `{n}` already exists სიმბოლო სახელით `{n}` უკვე არსებობს +@msg a theme has 1 to {THEME_SIZE} colours თემაში 1-დან {THEME_SIZE}-მდე ფერია +@msg a theme is already called {name} (replace: "{name}" overwrites it) თემა სახელით {name} უკვე არსებობს (replace: "{name}" მას გადააწერს) +@msg a toolbar name has at most {MAX_NAME} characters ხელსაწყოთა ზოლის სახელი შეიძლება შეიცავდეს არაუმეტეს {MAX_NAME} სიმბოლოს +@msg a view named `{_1}` exists ხედი სახელით `{_1}` უკვე არსებობს +@msg a view named `{name}` exists ხედი სახელით `{name}` უკვე არსებობს +@msg a workspace keeps at most {MAX} toolbars სამუშაო სივრცე ინახავს არაუმეტეს {MAX} ხელსაწყოთა ზოლს +@msg a {_1} series can't go in a {_2} graph {_1} ტიპის სერია ვერ მოთავსდება {_2} ტიპის დიაგრამაში +@msg a {sw} × {sh} image can't be resized to {width} × {height} pixels {sw} × {sh} გამოსახულების ზომის შეცვლა {width} × {height} პიქსელამდე ვერ ხერხდება +@msg a {width} × {height} image is too large {width} × {height} გამოსახულება ზედმეტად დიდია +@msg a {width} × {height} image: {e} {width} × {height} გამოსახულება: {e} +@msg aiVersion {v}: "pdf" (PDF-compatible, the default) or "7" (legacy .ai, version 7) aiVersion {v}: "pdf" (PDF-თან თავსებადი, ნაგულისხმევი) ან "7" (ძველი .ai, ვერსია 7) +@msg already editing an opacity mask გაუმჭვირვალობის ნიღაბი უკვე რედაქტირდება +@msg already editing another object's opacity mask უკვე რედაქტირდება სხვა ობიექტის გაუმჭვირვალობის ნიღაბი +@msg already in pattern editing mode პატერნის რედაქტირების რეჟიმი უკვე ჩართულია +@msg an SVG filter is named by its id: give `xml` with `name` SVG ფილტრის სახელი მისი id-ია: მიუთითეთ `xml` `name`-თან ერთად +@msg an XML element has two attributes with the same name XML ელემენტს ერთი და იმავე სახელის ორი ატრიბუტი აქვს +@msg an XML value cannot be inserted into itself or its descendants XML მნიშვნელობის ჩასმა საკუთარ თავში ან თავის შთამომავლებში შეუძლებელია +@msg an XML value's children cannot be assigned by position XML მნიშვნელობის შვილობილი ელემენტების მინიჭება პოზიციით შეუძლებელია +@msg an XML value's children cannot be deleted by position XML მნიშვნელობის შვილობილი ელემენტების წაშლა პოზიციით შეუძლებელია +@msg an XMLList converts to XML only when it has one item XMLList XML-ად მხოლოდ მაშინ გარდაიქმნება, როცა ერთი ელემენტი აქვს +@msg an XPath node test is missing XPath-ის კვანძის ტესტი აკლია +@msg an XPath operand is missing XPath-ის ოპერანდი აკლია +@msg an XPath operator is missing XPath-ის ოპერატორი აკლია +@msg an XPath predicate or step cannot follow here XPath-ის პრედიკატი ან ნაბიჯი აქ ვერ მოჰყვება +@msg an XPath predicate or step follows a value that is not a node-set XPath-ის პრედიკატი ან ნაბიჯი მოსდევს მნიშვნელობას, რომელიც კვანძების სიმრავლე არ არის +@msg an XPath step is missing XPath-ის ნაბიჯი აკლია +@msg an artboard is listed twice სამუშაო დაფა ორჯერაა ჩამოთვლილი +@msg an empty artboard has no width or height to scale to ცარიელ სამუშაო დაფას არ აქვს სიგანე ან სიმაღლე, რომელზეც მასშტაბირება შეიძლება +@msg an image could not be written: {e} გამოსახულების ჩაწერა ვერ მოხერხდა: {e} +@msg an image couldn't be decoded and is missing from the picture გამოსახულების დეკოდირება ვერ მოხერხდა და ის ნახატს აკლია +@msg an image is too large for DXF and was left out გამოსახულება DXF-ისთვის ზედმეტად დიდია და გამოტოვებულია +@msg an image of {_1} MB, at most {_2} MB გამოსახულება {_1} MB-ია, დასაშვებია არაუმეტეს {_2} MB +@msg an image of {declared_w} × {declared_h} pixels is too large to draw {declared_w} × {declared_h} პიქსელის გამოსახულება დასახატად ზედმეტად დიდია +@msg an image of {width} × {height} pixels is too large to draw {width} × {height} პიქსელის გამოსახულება დასახატად ზედმეტად დიდია +@msg an image of {w} × {h} pixels is too large to convert (at most {_1} pixels) {w} × {h} პიქსელის გამოსახულება გარდასაქმნელად ზედმეტად დიდია (არაუმეტეს {_1} პიქსელი) +@msg an image that couldn't be read was left out გამოსახულება, რომლის წაკითხვაც ვერ მოხერხდა, გამოტოვებულია +@msg an index must be a whole number ინდექსი უნდა იყოს მთელი რიცხვი +@msg an inline graphic has no glyphs ტექსტში ჩასმულ გრაფიკას გლიფები არ აქვს +@msg an invisible text form can't be read უხილავი ტექსტის ფორმის წაკითხვა ვერ ხერხდება +@msg an object is missing ობიექტი აკლია +@msg an object's header is missing ობიექტის სათაური აკლია +@msg an overprinting form can't be read ზედდაბეჭდვის ფორმის წაკითხვა ვერ ხერხდება +@msg an unread object has no readable bounds წაუკითხავ ობიექტს წაკითხვადი საზღვრები არ აქვს +@msg an unread object holds a frame of threaded type წაუკითხავი ობიექტი დაკავშირებული ტექსტის ჩარჩოს შეიცავს +@msg an unread object is missing from its layer წაუკითხავი ობიექტი თავის შრეს აკლია +@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}` +@msg apply was called on a value that is not a function apply გამოძახებულია მნიშვნელობაზე, რომელიც ფუნქცია არ არის +@msg area must be a closed polygon of 3 to 100000 [x, y] points area უნდა იყოს შეკრული მრავალკუთხედი 3-დან 100000-მდე [x, y] წერტილით +@msg area type in a thread cannot use Dynamic Text: {frames} დაკავშირებულ ტექსტში არის ტექსტი ვერ გამოიყენებს დინამიკურ ტექსტს: {frames} +@msg area type needs a path that encloses an area არის ტექსტს სჭირდება ტრაექტორია, რომელიც არეს შემოსაზღვრავს +@msg area type {_1} is named twice არის ტექსტი {_1} ორჯერაა დასახელებული +@msg array literal too long მასივის ლიტერალი ზედმეტად გრძელია +@msg arrowAlign must be extend|tip, got {o} arrowAlign უნდა იყოს extend|tip, მიღებულია {o} +@msg arrowScale must be [start, end] arrowScale უნდა იყოს [start, end] +@msg artboard is a 0-based index artboard არის 0-დან დაწყებული ინდექსი +@msg artboard must be a 0-based index artboard უნდა იყოს 0-დან დაწყებული ინდექსი +@msg artboard {i} doesn't print სამუშაო დაფა {i} არ იბეჭდება +@msg artboardLayout must be {{layout?, columns?, spacing?, rightToLeft?}} artboardLayout უნდა იყოს {{layout?, columns?, spacing?, rightToLeft?}} +@msg artboardLayout.columns must be 1 or more artboardLayout.columns უნდა იყოს 1 ან მეტი +@msg artboardLayout.layout must be gridByRow, gridByColumn, row or column artboardLayout.layout უნდა იყოს gridByRow, gridByColumn, row ან column +@msg artboardLayout.rightToLeft must be true or false artboardLayout.rightToLeft უნდა იყოს true ან false +@msg artboardLayout.spacing must be 0–{MAX_SPACING} pt artboardLayout.spacing უნდა იყოს 0–{MAX_SPACING} pt +@msg artboards must be a non-empty list artboards უნდა იყოს არაცარიელი სია +@msg artboards must be a number artboards უნდა იყოს რიცხვი +@msg asset `{_1}` has no art to export რესურსს `{_1}` ექსპორტისთვის ნახატი არ აქვს +@msg assignment to a constant binding მუდმივ ბმას მნიშვნელობა ვერ მიენიჭება +@msg at least one row that isn't excluded needs a weight above 0 მინიმუმ ერთ გამოურიცხავ სტრიქონს 0-ზე მეტი წილი სჭირდება +@msg at most {MAX_KEYWORDS} keywords არაუმეტეს {MAX_KEYWORDS} საკვანძო სიტყვა +@msg at most {MAX_MATCHES} matches are kept ინახება არაუმეტეს {MAX_MATCHES} დამთხვევა +@msg at most {MAX_POINTS} points არაუმეტეს {MAX_POINTS} წერტილი +@msg at most {MAX_QUEUE} files არაუმეტეს {MAX_QUEUE} ფაილი +@msg at must be [x, y] at უნდა იყოს [x, y] +@msg at/rect lie outside the canvas at/rect ტილოს გარეთაა +@msg attribute must be size|leading|tracking|kerning|baselineShift attribute უნდა იყოს size|leading|tracking|kerning|baselineShift +@msg attrs must be an object attrs უნდა იყოს ობიექტი +@msg automation path rejected: the folder's name isn't valid text ავტომატიზაციის გზა უარყოფილია: საქაღალდის სახელი სწორი ტექსტი არ არის +@msg automation path rejected: {_1} isn't valid text ავტომატიზაციის გზა უარყოფილია: {_1} სწორი ტექსტი არ არის +@msg automation path rejected: {why}: {path} ავტომატიზაციის გზა უარყოფილია: {why}: {path} +@msg axis must be "vertical", "horizontal" or an angle in degrees, not `{given}` axis უნდა იყოს "vertical", "horizontal" ან კუთხე გრადუსებში და არა `{given}` +@msg backgroundContents must be transparent or white backgroundContents უნდა იყოს transparent ან white +@msg bad AES key არასწორი AES გასაღები +@msg bad `runs`: {e} არასწორი `runs`: {e} +@msg bad arrowScale არასწორი arrowScale +@msg bad base64 არასწორი base64 +@msg bad color {c} არასწორი ფერი {c} +@msg bad colour არასწორი ფერი +@msg bad colour in `colors` `colors`: არასწორი ფერი +@msg bad colour {v} არასწორი ფერი {v} +@msg bad colour {v} in groupColors groupColors: არასწორი ფერი {v} +@msg bad cross-reference entry ჯვარედინი მიმართვების არასწორი ჩანაწერი +@msg bad cross-reference table ჯვარედინი მიმართვების არასწორი ცხრილი +@msg bad current colour {v} არასწორი მიმდინარე ფერი {v} +@msg bad dataBase64 არასწორი dataBase64 +@msg bad edit არასწორი ცვლილება +@msg bad fill {v} არასწორი შევსება {v} +@msg bad fit: {e} არასწორი მორგება: {e} +@msg bad model {other} (keep, new or document) არასწორი მოდელი {other} (keep, new ან document) +@msg bad new colour {v} არასწორი ახალი ფერი {v} +@msg bad object არასწორი ობიექტი +@msg bad object number ობიექტის არასწორი ნომერი +@msg bad offset არასწორი წანაცვლება +@msg bad path data: {e} ტრაექტორიის არასწორი მონაცემები: {e} +@msg bad point {v}: expected [x, y] არასწორი წერტილი {v}: მოსალოდნელია [x, y] +@msg bad point {v}: expected [x, y] or [x, y, pressure] არასწორი წერტილი {v}: მოსალოდნელია [x, y] ან [x, y, pressure] +@msg bad reference არასწორი მიმართვა +@msg bad trailer size ტრეილერის არასწორი ზომა +@msg bad {k} colour {k}: არასწორი ფერი +@msg batches cannot nest პაკეტები ერთმანეთში ვერ ჩაიდგმება +@msg bind something to a variable first ჯერ ცვლადს რამე მიაბით +@msg bleed must be 0–{MAX_BLEED} pt: a number, [top, bottom, left, right] or {{top, bottom, left, right}} bleed უნდა იყოს 0–{MAX_BLEED} pt: რიცხვი, [top, bottom, left, right] ან {{top, bottom, left, right}} +@msg blend must be a mode name blend უნდა იყოს რეჟიმის სახელი +@msg both sides of an XPath | must select nodes XPath-ის | ოპერატორის ორივე მხარემ კვანძები უნდა აირჩიოს +@msg brush must be a name or null brush უნდა იყოს სახელი ან null +@msg by must be a number by უნდა იყოს რიცხვი +@msg can't add page thumbnails: {why} გვერდების ესკიზების დამატება ვერ ხერხდება: {why} +@msg can't add the editing data for other apps: {why} სხვა აპებისთვის რედაქტირების მონაცემების დამატება ვერ ხერხდება: {why} +@msg can't edit the written PDF: {why} ჩაწერილი PDF-ის რედაქტირება ვერ ხერხდება: {why} +@msg can't encrypt the PDF: {why} PDF-ის დაშიფვრა ვერ ხერხდება: {why} +@msg can't linearise the PDF: {why} PDF-ის ლინეარიზაცია ვერ ხერხდება: {why} +@msg can't open `{_1}`: {_2} `{_1}` ვერ იხსნება: {_2} +@msg can't open `{_1}`: {e} `{_1}` ვერ იხსნება: {e} +@msg can't open `{name}`: not a format VectorCraft reads (see document.formats) `{name}` ვერ იხსნება: VectorCraft ამ ფორმატს არ კითხულობს (იხ. document.formats) +@msg can't open “{name}”: {e} „{name}“ ვერ იხსნება: {e} +@msg can't place `{name}`: not a format VectorCraft reads (see document.formats) `{name}` ვერ განთავსდება: VectorCraft ამ ფორმატს არ კითხულობს (იხ. document.formats) +@msg can't read back the written PDF: {e} ჩაწერილი PDF-ის ხელახლა წაკითხვა ვერ ხერხდება: {e} +@msg can't read this Word document: {why} ამ Word დოკუმენტის წაკითხვა ვერ ხერხდება: {why} +@msg can't write .{e} images: use .png, .jpg, .gif, .webp, .tif or .bmp გამოსახულებების .{e} ფორმატში ჩაწერა შეუძლებელია: გამოიყენეთ .png, .jpg, .gif, .webp, .tif ან .bmp +@msg can't write PDF layers, overprint or invisible text: {why} PDF შრეების, ზედდაბეჭდვის ან უხილავი ტექსტის ჩაწერა ვერ ხერხდება: {why} +@msg can't write the file's copyright: {why} ფაილის საავტორო უფლების მონაცემების ჩაწერა ვერ ხერხდება: {why} +@msg can't write the file's modification date: {why} ფაილის ცვლილების თარიღის ჩაწერა ვერ ხერხდება: {why} +@msg can't write the pages' user units: {why} გვერდების მომხმარებლის ერთეულების ჩაწერა ვერ ხერხდება: {why} +@msg canceled გაუქმდა +@msg cannot align zip entries to {align} bytes zip-ის ჩანაწერების {align} ბაიტზე სწორება შეუძლებელია +@msg cannot convert the object to a primitive value ობიექტის პრიმიტიულ მნიშვნელობად გარდაქმნა შეუძლებელია +@msg cannot convert undefined or null to an object undefined-ის ან null-ის ობიექტად გარდაქმნა შეუძლებელია +@msg cannot distort a zero-size or non-finite bounding box ნულოვანი ზომის ან არასასრული შემომსაზღვრელი ჩარჩოს დეფორმაცია შეუძლებელია +@msg cannot move an object into itself ობიექტის საკუთარ თავში გადატანა შეუძლებელია +@msg cannot open the automation {kind} root `{_1}`: {e} ავტომატიზაციის ძირეული საქაღალდის ({kind}) `{_1}` გახსნა ვერ ხერხდება: {e} +@msg cannot read profile: {0} პროფილის წაკითხვა ვერ ხერხდება: {0} +@msg case must be upper|lower|title|sentence case უნდა იყოს upper|lower|title|sentence +@msg category `{c}`: one of {_1} კატეგორია `{c}`: დასაშვებია ერთ-ერთი: {_1} +@msg center must be [x, y] center უნდა იყოს [x, y] +@msg character dimensions cannot be represented with the source text transform სიმბოლოების ზომები წყარო ტექსტის გარდაქმნით ვერ გამოისახება +@msg character dimensions cannot be represented with the target text transform სიმბოლოების ზომები სამიზნე ტექსტის გარდაქმნით ვერ გამოისახება +@msg choose at least one artboard აირჩიეთ მინიმუმ ერთი სამუშაო დაფა +@msg choose at least one status აირჩიეთ მინიმუმ ერთი სტატუსი +@msg clip must be true or false clip უნდა იყოს true ან false +@msg clippingMask must be true or false clippingMask უნდა იყოს true ან false +@msg closed must be a boolean closed უნდა იყოს ლოგიკური მნიშვნელობა +@msg collapsed must be true or false collapsed უნდა იყოს true ან false +@msg color book version {version} isn't supported (only 1) ფერთა წიგნის ვერსია {version} მხარდაჭერილი არ არის (მხოლოდ 1) +@msg color books in color space {other} aren't supported (only RGB, CMYK and Lab) ფერთა წიგნები ფერთა სივრცეში {other} მხარდაჭერილი არ არის (მხოლოდ RGB, CMYK და Lab) +@msg color.profile: no RGB or CMYK profile is called “{profile}” color.profile: RGB ან CMYK პროფილი სახელით „{profile}“ არ არსებობს +@msg colorMode must be rgb or cmyk, not `{m}` colorMode უნდა იყოს rgb ან cmyk და არა `{m}` +@msg colorModel must be {own} (the document's mode), grayscale or bitmap colorModel უნდა იყოს {own} (დოკუმენტის რეჟიმი), grayscale ან bitmap +@msg colour groups can't go into colour groups ფერთა ჯგუფები ფერთა ჯგუფებში ვერ მოთავსდება +@msg colour, mode and spot apply to solid-colour swatches only ფერი, რეჟიმი და სპოტ-ფერი მხოლოდ მყარი ფერის ნიმუშებს ეხება +@msg column {column}: `{cell}` is a `%` column of graph data files, which are not read სვეტი {column}: `{cell}` დიაგრამის მონაცემთა ფაილების `%` სვეტია, ასეთი ფაილები კი არ იკითხება +@msg column {column}: `{cell}` names `{name}`, which is a {_1} variable სვეტი {column}: `{cell}` ასახელებს ცვლადს `{name}`, რომელიც {_1} ტიპისაა +@msg column {column}: `{cell}` names no variable სვეტი {column}: `{cell}` არცერთ ცვლადს არ ასახელებს +@msg column {column}: the variable name is longer than {MAX_NAME} characters სვეტი {column}: ცვლადის სახელი {MAX_NAME} სიმბოლოზე გრძელია +@msg column: true floats the whole column and takes no onto, above or below column: true მთელ სვეტს მცურავს ხდის და არ იღებს onto, above ან below პარამეტრებს +@msg command must be a shape.* command command უნდა იყოს shape.* ბრძანება +@msg commands[{i}]: missing `command` commands[{i}]: აკლია `command` +@msg composer must be "singleLine" or "everyLine" composer უნდა იყოს "singleLine" ან "everyLine" +@msg compound shapes take paths, compound paths, groups, compound shapes, type, blends and envelopes შედგენილი ფიგურები იღებს ტრაექტორიებს, შედგენილ ტრაექტორიებს, ჯგუფებს, შედგენილ ფიგურებს, ტექსტს, გადასვლებს და გარსებს +@msg compound {_1} must contain exactly one open path to join შედგენილი {_1} შესაერთებლად ზუსტად ერთ ღია ტრაექტორიას უნდა შეიცავდეს +@msg connect end must be "start" or "end" connect-ის end უნდა იყოს "start" ან "end" +@msg connect needs a path other than the one extended connect-ს სჭირდება ტრაექტორია, რომელიც გაგრძელებულისგან განსხვავდება +@msg connect needs id connect-ს სჭირდება id +@msg connect path has no open end connect-ის ტრაექტორიას ღია ბოლო არ აქვს +@msg continuation must be an array of path chunks continuation უნდა იყოს ტრაექტორიის ნაწილების მასივი +@msg continuation requires points continuation-ს სჭირდება წერტილები +@msg copy needs path: the file to copy into the document's folder copy-ს სჭირდება path: ფაილი, რომელიც დოკუმენტის საქაღალდეში დაკოპირდება +@msg copy takes images only: relink placed documents where their files are copy მხოლოდ გამოსახულებებს იღებს: განთავსებული დოკუმენტები ხელახლა დააკავშირეთ იქ, სადაც მათი ფაილებია +@msg copying a file isn't available on the web ფაილის კოპირება ვებში მიუწვდომელია +@msg copyrightStatus must be unknown, copyrighted or publicDomain copyrightStatus უნდა იყოს unknown, copyrighted ან publicDomain +@msg copyrightUrl must be a URL (no spaces, at most 2048 characters) copyrightUrl უნდა იყოს URL (ჰარების გარეშე, არაუმეტეს 2048 სიმბოლო) +@msg corners must be 4 [x, y] points (TL, TR, BR, BL) corners უნდა იყოს 4 [x, y] წერტილი (TL, TR, BR, BL) +@msg counterPer `{c}`: item or file counterPer `{c}`: item ან file +@msg crop `{_1}`: only PDF pages have art, trim, bleed and media boxes; use "crop" or "bounding" crop `{_1}`: art, trim, bleed და media ჩარჩოები მხოლოდ PDF გვერდებს აქვს; გამოიყენეთ "crop" ან "bounding" +@msg crop rectangle doesn't overlap the image ჩამოჭრის მართკუთხედი გამოსახულებას არ კვეთს +@msg cross-reference and object streams aren't supported ჯვარედინი მიმართვებისა და ობიექტების ნაკადები მხარდაჭერილი არ არის +@msg damaged compressed data: {e} დაზიანებული შეკუმშული მონაცემები: {e} +@msg dash lengths must be numbers, got {v} ტირეების სიგრძეები უნდა იყოს რიცხვები, მიღებულია {v} +@msg dash must be a list of lengths or null, got {v} dash უნდა იყოს სიგრძეების სია ან null, მიღებულია {v} +@msg data key `{k}`: letters, digits, -, _ and . (not name or vc-…) მონაცემთა გასაღები `{k}`: ასოები, ციფრები, -, _ და . (არა name ან vc-…) +@msg data must be an object of key: value, not {v} data უნდა იყოს key: value ობიექტი და არა {v} +@msg data set `{name}` holds a value for `{var}`, which the library doesn't declare მონაცემთა ნაკრები `{name}` შეიცავს მნიშვნელობას ცვლადისთვის `{var}`, რომელსაც ბიბლიოთეკა არ აცხადებს +@msg data set `{name}` holds two values for `{var}` მონაცემთა ნაკრები `{name}` შეიცავს ცვლადის `{var}` ორ მნიშვნელობას +@msg data set `{name}` is declared twice მონაცემთა ნაკრები `{name}` ორჯერაა გამოცხადებული +@msg data takes at most {MAX_DATA} keys at once data ერთდროულად იღებს არაუმეტეს {MAX_DATA} გასაღებს +@msg dataset `{name}` already exists მონაცემთა ნაკრები `{name}` უკვე არსებობს +@msg dataset `{to}` already exists მონაცემთა ნაკრები `{to}` უკვე არსებობს +@msg date `{d}`: YYYY-MM-DD თარიღი `{d}`: YYYY-MM-DD +@msg decoded data is too large დეკოდირებული მონაცემები ზედმეტად დიდია +@msg define a variable first ჯერ განსაზღვრეთ ცვლადი +@msg detect must be true or false detect უნდა იყოს true ან false +@msg direct-select anchor points of a path პირდაპირი მონიშვნით მონიშნეთ ტრაექტორიის საყრდენი წერტილები +@msg distance must be > 0 distance უნდა იყოს > 0 +@msg dx and dy give the arrow's direction dx და dy ისრის მიმართულებას განსაზღვრავს +@msg dx and dy must be numbers dx და dy უნდა იყოს რიცხვები +@msg dxf fitTo must be [width, height], positive dxf fitTo უნდა იყოს [width, height], დადებითი +@msg dxf must be an object of DXF import options dxf უნდა იყოს DXF იმპორტის პარამეტრების ობიექტი +@msg dxf scale must be a positive number up to {_1}, not {s} dxf scale უნდა იყოს დადებითი რიცხვი {_1}-მდე და არა {s} +@msg dxf unit `{u}`: a unit such as mm, cm, in or pt dxf unit `{u}`: მიუთითეთ ერთეული, მაგალითად mm, cm, in ან pt +@msg dxf: {e} dxf: {e} +@msg each format is an object {{format, scale?, suffix?}} თითოეული ფორმატი არის ობიექტი {{format, scale?, suffix?}} +@msg each item needs an id თითოეულ ელემენტს სჭირდება id +@msg each match needs `kind` თითოეულ დამთხვევას სჭირდება `kind` +@msg each match needs a `name` თითოეულ დამთხვევას სჭირდება `name` +@msg each of `fonts` is {{family, style?}}; 1 to 1000 of them `fonts`-ის თითოეული ჩანაწერი არის {{family, style?}}; 1-დან 1000-მდე ჩანაწერი +@msg each of `items` is {{id, corners?}} with an object id, not {it} `items`-ის თითოეული ჩანაწერი არის {{id, corners?}} ობიექტის id-ით და არა {it} +@msg each of `items` is {{kind, item}} `items`-ის თითოეული ჩანაწერი არის {{kind, item}} +@msg each path chunk must contain 1 to 4096 points ტრაექტორიის თითოეული ნაწილი უნდა შეიცავდეს 1-დან 4096-მდე წერტილს +@msg each pick is {{at: [x, y]}} or {{rect: [x0, y0, x1, y1]}} (got {v}) თითოეული არჩევანი არის {{at: [x, y]}} ან {{rect: [x0, y0, x1, y1]}} (მიღებულია {v}) +@msg each row needs `from` თითოეულ სტრიქონს სჭირდება `from` +@msg each stop needs a position თითოეულ გადასვლის წერტილს სჭირდება პოზიცია +@msg each subpath needs an anchors array თითოეულ ქვეტრაექტორიას სჭირდება anchors მასივი +@msg each weight must be a number of 0 or more (got {v}) თითოეული წილი უნდა იყოს 0 ან მეტი რიცხვი (მიღებულია {v}) +@msg easingType must be easeIn, easeOut, easeInOut or easeOutIn easingType უნდა იყოს easeIn, easeOut, easeInOut ან easeOutIn +@msg editingData must be true or false editingData უნდა იყოს true ან false +@msg editingData must be true, false or "always" editingData უნდა იყოს true, false ან "always" +@msg edits overlap ცვლილებები ერთმანეთს ფარავს +@msg effects of objects whose appearances differ can't be moved together განსხვავებული იერსახის მქონე ობიექტების ეფექტები ერთად ვერ გადაიტანება +@msg empty header in column {_1} სვეტი {_1}: ცარიელი სათაური +@msg encoding `{_1}`: utf8 or utf16 encoding `{_1}`: utf8 ან utf16 +@msg ends must be two of "first" and "last" ends უნდა შეიცავდეს ორ მნიშვნელობას "first"-ისა და "last"-ის სიიდან +@msg every numbered name for the result is taken შედეგისთვის ყველა დანომრილი სახელი დაკავებულია +@msg expanded SVG styles exceed the import size limit გაშლილი SVG სტილები იმპორტის ზომის ლიმიტს აჭარბებს +@msg export presets file is larger than {MAX_PRESET_FILE_BYTES} bytes ექსპორტის პრესეტების ფაილი {MAX_PRESET_FILE_BYTES} ბაიტზე დიდია +@msg exportText must be editable or appearance exportText უნდა იყოს editable ან appearance +@msg exportType must be movieClip or graphic, not `{s}` exportType უნდა იყოს movieClip ან graphic და არა `{s}` +@msg extend needs id extend-ს სჭირდება id +@msg featureChanges lists at most {MAX_FEATURE_CHANGES} tags featureChanges ჩამოთვლის არაუმეტეს {MAX_FEATURE_CHANGES} ტეგს +@msg featureChanges must be a list of tags featureChanges უნდა იყოს ტეგების სია +@msg features must be a list of tags features უნდა იყოს ტეგების სია +@msg fidelity must be 0..100 fidelity უნდა იყოს 0..100 +@msg file name too long to zip: {_1} ფაილის სახელი zip-ში ჩასამატებლად ზედმეტად გრძელია: {_1} +@msg file name too long to zip: {name} ფაილის სახელი zip-ში ჩასამატებლად ზედმეტად გრძელია: {name} +@msg files must be {{name, dataBase64}} files უნდა იყოს {{name, dataBase64}} +@msg finally table {t} out of range finally ცხრილი {t} დიაპაზონს გარეთაა +@msg fit must be none|autoHeight|shrinkText|block, got {id} fit უნდა იყოს none|autoHeight|shrinkText|block, მიღებულია {id} +@msg flags cannot be given with a RegExp object RegExp ობიექტთან ერთად ალმების მითითება შეუძლებელია +@msg flattener: {e} გაბრტყელება: {e} +@msg flattenerPreset `{name}`: high, medium, low or a saved one (see flattener.presets.list) flattenerPreset `{name}`: high, medium, low ან შენახული პრესეტი (იხ. flattener.presets.list) +@msg flipProfile must be along|across, got {o} flipProfile უნდა იყოს along|across, მიღებულია {o} +@msg folders `{f}`: none, rows, format, item or itemFormat folders `{f}`: none, rows, format, item ან itemFormat +@msg folders deeper than {MAX_BATCH_DEPTH} levels {MAX_BATCH_DEPTH} დონეზე ღრმა საქაღალდეები +@msg folders deeper than {MAX_DEPTH} levels {MAX_DEPTH} დონეზე ღრმა საქაღალდეები +@msg font family `{family}` is not available შრიფტის ოჯახი `{family}` მიუწვდომელია +@msg font family `{tf}` is not available შრიფტის ოჯახი `{tf}` მიუწვდომელია +@msg format `{f}`: pdf or postscript format `{f}`: pdf ან postscript +@msg format `{f}`: text or json format `{f}`: text ან json +@msg format is `{format}` ფორმატია `{format}` +@msg formats must be an array of rows, not {v} formats უნდა იყოს სტრიქონების მასივი და არა {v} +@msg freeform line {i}: {e} freeform-ის ხაზი {i}: {e} +@msg freeform point {i}: {e} freeform-ის წერტილი {i}: {e} +@msg frequency must be between 1 and 300 lines per inch frequency უნდა იყოს 1-დან 300-მდე ხაზი დუიმზე +@msg from and to must be finite from და to უნდა იყოს სასრული +@msg from must be [x0, y0, x1, y1] from უნდა იყოს [x0, y0, x1, y1] +@msg function declaration index out of range ფუნქციის გამოცხადების ინდექსი დიაპაზონს გარეთაა +@msg give `before` or `after`, not both მიუთითეთ `before` ან `after`, ორივე არა +@msg give `char`, `text`, `code` or `unicode` მიუთითეთ `char`, `text`, `code` ან `unicode` +@msg give `colors`, or `color` and `rule` მიუთითეთ `colors`, ან `color` და `rule` +@msg give `count` or `spacing`, not both მიუთითეთ `count` ან `spacing`, ორივე არა +@msg give `event`, such as onclick მიუთითეთ `event`, მაგალითად onclick +@msg give `file`, the JavaScript file's path or URL მიუთითეთ `file`, JavaScript ფაილის გზა ან URL +@msg give `fill` and/or `stroke` მიუთითეთ `fill` და/ან `stroke` +@msg give `fill`, `stroke` or both მიუთითეთ `fill`, `stroke` ან ორივე +@msg give `folder` მიუთითეთ `folder` +@msg give `fonts`, or open a document მიუთითეთ `fonts` ან გახსენით დოკუმენტი +@msg give `from` or `indices`, not both მიუთითეთ `from` ან `indices`, ორივე არა +@msg give `id` (no text is being edited) მიუთითეთ `id` (არცერთი ტექსტი არ რედაქტირდება) +@msg give `id` and `anchors`, or `items`, not both მიუთითეთ `id` და `anchors`, ან `items`, ორივე არა +@msg give `id` or `guide`, not both მიუთითეთ `id` ან `guide`, ორივე არა +@msg give `length` or `to` მიუთითეთ `length` ან `to` +@msg give `matches`: [{{kind, name, target}}] მიუთითეთ `matches`: [{{kind, name, target}}] +@msg give `name` (or edit a pattern) მიუთითეთ `name` (ან დაარედაქტირეთ პატერნი) +@msg give `name` or `names` მიუთითეთ `name` ან `names` +@msg give `name`, an SVG filter's name მიუთითეთ `name`, SVG ფილტრის სახელი +@msg give `path` (a .wasm file) or `dataBase64` (the module) მიუთითეთ `path` (.wasm ფაილი) ან `dataBase64` (მოდული) +@msg give `path`, `data` or `dataBase64` მიუთითეთ `path`, `data` ან `dataBase64` +@msg give `path`, `data`, `dataBase64` or `csv` მიუთითეთ `path`, `data`, `dataBase64` ან `csv` +@msg give `path`, `xml` or `dataBase64` მიუთითეთ `path`, `xml` ან `dataBase64` +@msg give `path`, an SVG file, or `svg`, SVG text მიუთითეთ `path`, SVG ფაილი, ან `svg`, SVG ტექსტი +@msg give `script`, the JavaScript the event runs ("" removes the event) მიუთითეთ `script`, JavaScript, რომელსაც მოვლენა უშვებს ("" მოვლენას შლის) +@msg give `text` (the reading) or `remove` მიუთითეთ `text` (წაკითხვის ტექსტი) ან `remove` +@msg give `x` and `y` (and a `tolerance` of 0 or more) მიუთითეთ `x` და `y` (და `tolerance`, 0 ან მეტი) +@msg give `xml`, one SVG element მიუთითეთ `xml`, ერთი SVG ელემენტი +@msg give `{key}` or `{other}`, not both მიუთითეთ `{key}` ან `{other}`, ორივე არა +@msg give a mode or r/g/b, c/m/y/k, gray or tint adjustments მიუთითეთ რეჟიმი ან r/g/b, c/m/y/k, gray ან tint კორექციები +@msg give a name, or paint the active proxy with a saved preset მიუთითეთ სახელი ან აქტიური შევსება/კონტური შენახული პრესეტით შეღებეთ +@msg give a name, or select a stroke with a saved profile მიუთითეთ სახელი ან მონიშნეთ კონტური შენახული პროფილით +@msg give a pattern name or select an object painted with a pattern მიუთითეთ პატერნის სახელი ან მონიშნეთ პატერნით შეღებილი ობიექტი +@msg give at least one of clip, invert, disabled, linked მიუთითეთ მინიმუმ ერთი: clip, invert, disabled, linked +@msg give color, none, swatch or gradient მიუთითეთ color, none, swatch ან gradient +@msg give dataBase64 მიუთითეთ dataBase64 +@msg give either at (a click) or area (a path drawn around the overlaps) მიუთითეთ ან at (დაწკაპუნება), ან area (გადაფარვების გარშემო დახატული ტრაექტორია) +@msg give exactly one of `at`, `rect` and `points` მიუთითეთ ზუსტად ერთი: `at`, `rect` ან `points` +@msg give exactly one of `path`, `data` and `dataBase64` მიუთითეთ ზუსტად ერთი: `path`, `data` ან `dataBase64` +@msg give formats or a preset, not both მიუთითეთ formats ან პრესეტი, ორივე არა +@msg give index or indexes, not both მიუთითეთ index ან indexes, ორივე არა +@msg give newName or delete მიუთითეთ newName ან delete +@msg give offset or by მიუთითეთ offset ან by +@msg give one element მიუთითეთ ერთი ელემენტი +@msg give one of `to`, `rect` or `at` მიუთითეთ ერთ-ერთი: `to`, `rect` ან `at` +@msg give one of assets, layers, selection or fullDocument მიუთითეთ ერთ-ერთი: assets, layers, selection ან fullDocument +@msg give only one of onto, above, below, icon and a column place მიუთითეთ მხოლოდ ერთი: onto, above, below, icon ან სვეტში მდებარეობა +@msg give opacity or blend მიუთითეთ opacity ან blend +@msg give origin: [x, y], or reset: true მიუთითეთ origin: [x, y] ან reset: true +@msg give overprintFill, overprintStroke, showCenter, imageMap, url or note მიუთითეთ overprintFill, overprintStroke, showCenter, imageMap, url ან note +@msg give path (a file) or folder მიუთითეთ path (ფაილი) ან folder +@msg give path, or name and dataBase64 მიუთითეთ path, ან name და dataBase64 +@msg give paths or files მიუთითეთ paths ან files +@msg give rows, rowHeight, columns or columnWidth მიუთითეთ rows, rowHeight, columns ან columnWidth +@msg give svg, or dataBase64 of an SVG or SVGZ file მიუთითეთ svg, ან SVG ან SVGZ ფაილის dataBase64 +@msg give text მიუთითეთ text +@msg give the asset a name რესურსს სახელი მიეცით +@msg give the preset a `name` პრესეტს მიეცით `name` +@msg give the preset a name პრესეტს სახელი მიეცით +@msg give the preset a name (1–64 characters) პრესეტს სახელი მიეცით (1–64 სიმბოლო) +@msg give the settings to change, e.g. {{"formats": [{{"format": "png", "scale": "2x"}}]}} მიუთითეთ შესაცვლელი პარამეტრები, მაგ. {{"formats": [{{"format": "png", "scale": "2x"}}]}} +@msg give the style a name სტილს სახელი მიეცით +@msg give two or more style `names` მიუთითეთ ორი ან მეტი სტილის `names` +@msg give two or more swatches მიუთითეთ ორი ან მეტი ფერის ნიმუში +@msg give x, y, or a handle's length or angle მიუთითეთ x, y, ან სახელურის სიგრძე ან კუთხე +@msg give {{key, value}} or {{values}} მიუთითეთ {{key, value}} ან {{values}} +@msg global must be true or false global უნდა იყოს true ან false +@msg glyph {_1} is not drawn for {ch} with the character's style (such as All Caps, Small Caps or a numeral system) გლიფი {_1} სიმბოლოს {ch} სტილით არ იხატება (მაგალითად, მთავრული, პატარა მთავრული ან ციფრების სისტემა) +@msg glyph {g} is not an alternate of {ch} in {_1} {_2} გლიფი {g} არ არის სიმბოლოს {ch} ალტერნატივა შრიფტში {_1} {_2} +@msg gradient must be "objects" or "mesh" gradient უნდა იყოს "objects" ან "mesh" +@msg grays must be "profile" or "black", not `{g}` grays უნდა იყოს "profile" ან "black" და არა `{g}` +@msg grayscale profiles can't be working spaces yet ნაცრისფერი გრადაციების პროფილები სამუშაო ფერთა სივრცედ ჯერ ვერ გამოიყენება +@msg gridColors must be a preset name or two colours gridColors უნდა იყოს პრესეტის სახელი ან ორი ფერი +@msg gridSize must be small, medium or large gridSize უნდა იყოს small, medium ან large +@msg guide {g} is not selected დამხმარე ხაზი {g} მონიშნული არ არის +@msg handle must be 0..3 handle უნდა იყოს 0..3 +@msg handler at {_1} expects {_2} values but its range starts with {d} დამმუშავებელი პოზიციაზე {_1} ელოდება {_2} მნიშვნელობას, მაგრამ მისი დიაპაზონი სიღრმით {d} იწყება +@msg handler depth too large დამმუშავებლის სიღრმე ზედმეტად დიდია +@msg handler range {_1}..{_2} out of range დამმუშავებლის დიაპაზონი {_1}..{_2} დასაშვებ ფარგლებს გარეთაა +@msg hiddenLayers must be true or false hiddenLayers უნდა იყოს true ან false +@msg hiddenObjects {v}: "layer" (the default), "omit" or "visible" hiddenObjects {v}: "layer" (ნაგულისხმევი), "omit" ან "visible" +@msg highlight a layer to merge into გამოკვეთეთ შრე, რომელშიც უნდა მოხდეს შერწყმა +@msg highlight two or more rows in one layer or group გამოკვეთეთ ორი ან მეტი სტრიქონი ერთ შრეში ან ჯგუფში +@msg highlight two or more rows to merge შესარწყმელად გამოკვეთეთ ორი ან მეტი სტრიქონი +@msg hvcC hvcC +@msg icon docks a panel in the icon column: use window.panel.dock icon პანელს ხატულების სვეტში ამაგრებს: გამოიყენეთ window.panel.dock +@msg id must be a dimension id id უნდა იყოს ზომის id +@msg image has no bounds გამოსახულებას საზღვრები არ აქვს +@msg image {_1} is linked already გამოსახულება {_1} უკვე დაკავშირებულია +@msg imageMap `{m}`: none, client or server imageMap `{m}`: none, client ან server +@msg images in a spot ink whose samples couldn't be read were imported in RGB სპოტ-მელნის გამოსახულებები, რომელთა პიქსელური მნიშვნელობების წაკითხვა ვერ მოხერხდა, RGB-ში იმპორტირდა +@msg images past the most pixels one file may hold were left out გამოსახულებები, რომლებიც ერთ ფაილში დასაშვებ პიქსელების მაქსიმუმს აჭარბებს, გამოტოვებულია +@msg images too large to read were left out წასაკითხად ზედმეტად დიდი გამოსახულებები გამოტოვებულია +@msg index out of range ინდექსი დიაპაზონს გარეთაა +@msg indexes may hold at most {MAX_GUIDE_INDEXES} entries indexes შეიძლება შეიცავდეს არაუმეტეს {MAX_GUIDE_INDEXES} ჩანაწერს +@msg indexes must be an array of guide indexes indexes უნდა იყოს დამხმარე ხაზების ინდექსების მასივი +@msg input contains NaN or infinite coordinates შეყვანილი მონაცემები შეიცავს NaN ან უსასრულო კოორდინატებს +@msg input path could not be closed შემავალი ტრაექტორიის შეკვრა ვერ მოხერხდა +@msg instances must be 1..1000 instances უნდა იყოს 1..1000 +@msg instruction out of range ინსტრუქცია დიაპაზონს გარეთაა +@msg instruction {pc} ({op}) pops below the stack ინსტრუქცია {pc} ({op}) სტეკიდან იმაზე მეტს იღებს, ვიდრე მასშია +@msg instruction {pc} reached with stack depths {seen} and {d} ინსტრუქცია {pc} მიღწეულია სტეკის სიღრმეებით {seen} და {d} +@msg invalid ICC profile: {0} არასწორი ICC პროფილი: {0} +@msg invalid `color` არასწორი `color` +@msg invalid anchor index {v}: expected a non-negative integer საყრდენი წერტილის არასწორი ინდექსი {v}: მოსალოდნელია არაუარყოფითი მთელი რიცხვი +@msg invalid anchor reference {v}: expected [subpath, anchor] საყრდენი წერტილის არასწორი მიმართვა {v}: მოსალოდნელია [subpath, anchor] +@msg invalid angle არასწორი კუთხე +@msg invalid array length მასივის არასწორი სიგრძე +@msg invalid brush: {e} არასწორი ფუნჯი: {e} +@msg invalid color არასწორი ფერი +@msg invalid colour {c} არასწორი ფერი {c} +@msg invalid delta არასწორი ნაზრდი +@msg invalid group არასწორი ჯგუფი +@msg invalid object id {v}: expected a non-negative integer ობიექტის არასწორი id {v}: მოსალოდნელია არაუარყოფითი მთელი რიცხვი +@msg invalid point არასწორი წერტილი +@msg invalid regular expression flag '{_1}' რეგულარული გამოსახულების არასწორი ალამი '{_1}' +@msg invalid regular expression: {m} არასწორი რეგულარული გამოსახულება: {m} +@msg invalid scale {scale} არასწორი მასშტაბი {scale} +@msg invalid size არასწორი ზომა +@msg invalid t არასწორი t +@msg invalid time value დროის არასწორი მნიშვნელობა +@msg invalid tolerance არასწორი დაშვება +@msg is a confirm's answer, whose `value` must be true or false არის confirm-ის პასუხი, რომლის `value` უნდა იყოს true ან false +@msg is a prompt's answer, whose `value` must be a string or null არის prompt-ის პასუხი, რომლის `value` უნდა იყოს სტრიქონი ან null +@msg is an alert's answer, whose `value` must be "ok" არის alert-ის პასუხი, რომლის `value` უნდა იყოს "ok" +@msg is longer than 16 KiB 16 KiB-ზე გრძელია +@msg it draws its image through a clipping path ის თავის გამოსახულებას მომჭრელი ტრაექტორიით ხატავს +@msg it draws no image ის გამოსახულებას არ ხატავს +@msg it is larger than {MAX_DICTIONARY_FILE_BYTES} bytes ის {MAX_DICTIONARY_FILE_BYTES} ბაიტზე დიდია +@msg it isn't a file ეს ფაილი არ არის +@msg it names {_1} plates, and at most {MAX_PLATES} are read ის {_1} ფირფიტას ასახელებს, იკითხება კი არაუმეტეს {MAX_PLATES} +@msg its art is too long or too detailed for a head მისი ნახატი ისრის წვერისთვის ზედმეტად გრძელი ან დეტალურია +@msg its art paints nothing მისი ნახატი არაფერს ხატავს +@msg its artboards all lie beyond the canvas (more than {_1} pt from the origin) მისი ყველა სამუშაო დაფა ტილოს გარეთაა (სათავიდან {_1} pt-ზე მეტი მანძილით) +@msg its clipping masks are nested too deeply მისი მომჭრელი ნიღბები ზედმეტად ღრმადაა ჩადგმული +@msg its image is too large to read მისი გამოსახულება წასაკითხად ზედმეტად დიდია +@msg its localized names take more than {_1} KB მისი ლოკალიზებული სახელები {_1} KB-ზე მეტს იკავებს +@msg its metadata has no description მის მეტამონაცემებში აღწერა არ არის +@msg its metadata has no direct length მის მეტამონაცემებში პირდაპირი სიგრძე არ არის +@msg its objects are nested too deep ({e}) მისი ობიექტები ზედმეტად ღრმადაა ჩადგმული ({e}) +@msg its plates are too large: more than {MAX_SAMPLES} pixels together მისი ფირფიტები ზედმეტად დიდია: ჯამში {MAX_SAMPLES} პიქსელზე მეტი +@msg its plates are too large: {_1} plates of {w} × {h} pixels მისი ფირფიტები ზედმეტად დიდია: {_1} ფირფიტა, თითო {w} × {h} პიქსელი +@msg its plates can't be kept together მისი ფირფიტების ერთად შენარჩუნება შეუძლებელია +@msg its shapes could not be combined into one მისი ფიგურების ერთში გაერთიანება ვერ მოხერხდა +@msg its tag table lists the `{_1}` tag more than once მის ტეგების ცხრილში ტეგი `{_1}` ერთზე მეტჯერაა ჩამოთვლილი +@msg join two different paths შეაერთეთ ორი სხვადასხვა ტრაექტორია +@msg jump to {pc}, past the end გადასვლა ბოლოს მიღმა: {pc} +@msg justify must be auto|left|center|right|justifyAll justify უნდა იყოს auto|left|center|right|justifyAll +@msg kbps must be a positive number, not {kbps} kbps უნდა იყოს დადებითი რიცხვი და არა {kbps} +@msg keywords must be a list of words or a comma-separated string keywords უნდა იყოს სიტყვების სია ან მძიმეებით გამოყოფილი სტრიქონი +@msg keywords must be at most {MAX_KEYWORD} characters, without control characters keywords უნდა შეიცავდეს არაუმეტეს {MAX_KEYWORD} სიმბოლოს, მმართველი სიმბოლოების გარეშე +@msg kind must be 1, 2 or 3, or give a preset `name` (see perspective.presets.list) kind უნდა იყოს 1, 2 ან 3, ან მიუთითეთ პრესეტის `name` (იხ. perspective.presets.list) +@msg kind must be graphic, fillColor, strokeColor, fillGradient, strokeGradient, fillPattern, strokePattern, charStyle or paraStyle kind უნდა იყოს graphic, fillColor, strokeColor, fillGradient, strokeGradient, fillPattern, strokePattern, charStyle ან paraStyle +@msg knockout must be "on", "off", "neutral" or a bool, not {v} knockout უნდა იყოს "on", "off", "neutral" ან ლოგიკური მნიშვნელობა და არა {v} +@msg layer `{name}` has no art to export შრეს `{name}` ექსპორტისთვის ნახატი არ აქვს +@msg layer must name a layer or sublayer layer უნდა ასახელებდეს შრეს ან ქვეშრეს +@msg layers can't be intertwined: select the objects in them შრეების გადახლართვა შეუძლებელია: მონიშნეთ მათში არსებული ობიექტები +@msg layers go only at the top level or in layers, objects in layers and groups შრეები თავსდება მხოლოდ ზედა დონეზე ან შრეებში, ობიექტები — შრეებსა და ჯგუფებში +@msg layers must be true or false layers უნდა იყოს true ან false +@msg layout must be gridByRow, gridByColumn, row or column layout უნდა იყოს gridByRow, gridByColumn, row ან column +@msg leading must be a number or "auto" leading უნდა იყოს რიცხვი ან "auto" +@msg left/right must be non-negative widths left/right უნდა იყოს არაუარყოფითი სიგანეები +@msg legacyNameEncoding must be one of {_1} legacyNameEncoding უნდა იყოს ერთ-ერთი: {_1} +@msg level `{t}`: 2 or 3 level `{t}`: 2 ან 3 +@msg line {line}: more than {MAX_CSV_COLS} columns სტრიქონი {line}: {MAX_CSV_COLS}-ზე მეტი სვეტი +@msg line {line}: unclosed quote სტრიქონი {line}: დაუხურავი ბრჭყალი +@msg line {line}: value for `{var}` must match its variable kind სტრიქონი {line}: ცვლადის `{var}` მნიშვნელობა მის ტიპს უნდა შეესაბამებოდეს +@msg lineEndings `{other}`: lf or crlf lineEndings `{other}`: lf ან crlf +@msg loading profiles from disk isn't available in the browser პროფილების დისკიდან ჩატვირთვა ბრაუზერში მიუწვდომელია +@msg localize: the first argument must be a localization object or a string localize: პირველი არგუმენტი უნდა იყოს ლოკალიზაციის ობიექტი ან სტრიქონი +@msg margin: a {m} pt margin leaves no imageable area on the paper margin: {m} pt ველი ქაღალდზე დასაბეჭდ არეს აღარ ტოვებს +@msg matrix must be finite and invertible, depth finite matrix უნდა იყოს სასრული და შებრუნებადი, depth — სასრული +@msg matte: {e} matte: {e} +@msg member is for order front, forward, backward or back member მხოლოდ order-ის front, forward, backward ან back მნიშვნელობებისთვისაა +@msg missing `artboards` აკლია `artboards` +@msg missing `at` [x, y] აკლია `at` [x, y] +@msg missing `attrs` აკლია `attrs` +@msg missing `color` or `opacity` აკლია `color` ან `opacity` +@msg missing `colors` აკლია `colors` +@msg missing `commands` აკლია `commands` +@msg missing `destinationFolder` აკლია `destinationFolder` +@msg missing `effect` id აკლია `effect` id +@msg missing `family` აკლია `family` +@msg missing `find` აკლია `find` +@msg missing `gid` (a glyph id, or null for the default glyph) აკლია `gid` (გლიფის id, ან null ნაგულისხმევი გლიფისთვის) +@msg missing `group` აკლია `group` +@msg missing `id` აკლია `id` +@msg missing `id`: give one, or select one type object აკლია `id`: მიუთითეთ ან მონიშნეთ ერთი ტექსტური ობიექტი +@msg missing `index` (a point index, or null to clear) აკლია `index` (წერტილის ინდექსი, ან null გასასუფთავებლად) +@msg missing `index` (a stop index, or null to clear) აკლია `index` (გადასვლის წერტილის ინდექსი, ან null გასასუფთავებლად) +@msg missing `index` (an item index or null) აკლია `index` (ელემენტის ინდექსი ან null) +@msg missing `item` აკლია `item` +@msg missing `library` აკლია `library` +@msg missing `library` (see graphicStyle.libraries) აკლია `library` (იხ. graphicStyle.libraries) +@msg missing `library` (see swatch.library.list) აკლია `library` (იხ. swatch.library.list) +@msg missing `map` (rows [{{from, to}}] or {{current: new}}) აკლია `map` (სტრიქონები [{{from, to}}] ან {{current: new}}) +@msg missing `matrix` [a,b,c,d,e,f] აკლია `matrix` [a,b,c,d,e,f] +@msg missing `name` (see gradient.presets.list) აკლია `name` (იხ. gradient.presets.list) +@msg missing `offset` (a distance in points) აკლია `offset` (მანძილი პუნქტებში) +@msg missing `path` აკლია `path` +@msg missing `path` (a path object id) აკლია `path` (ტრაექტორია-ობიექტის id) +@msg missing `picks` აკლია `picks` +@msg missing `rule` აკლია `rule` +@msg missing `source` id აკლია `source` id +@msg missing `start` (the byte offset of a character) აკლია `start` (სიმბოლოს ბაიტური წანაცვლება) +@msg missing `status`: linked, embedded, missing or modified აკლია `status`: linked, embedded, missing ან modified +@msg missing `target` id აკლია `target` id +@msg missing `text` აკლია `text` +@msg missing `to` აკლია `to` +@msg missing `to` (an index) აკლია `to` (ინდექსი) +@msg missing `to`: a non-negative integer აკლია `to`: არაუარყოფითი მთელი რიცხვი +@msg missing `type` აკლია `type` +@msg missing `value` აკლია `value` +@msg missing `word` აკლია `word` +@msg missing `{key}` აკლია `{key}` +@msg missing `{k}` აკლია `{k}` +@msg missing anchor აკლია საყრდენი წერტილი +@msg missing anchors აკლია საყრდენი წერტილები +@msg missing anchors [[subpath, anchor]…] აკლია საყრდენი წერტილები [[subpath, anchor]…] +@msg missing array `{key}` აკლია მასივი `{key}` +@msg missing case აკლია case +@msg missing color აკლია ფერი +@msg missing commands აკლია ბრძანებები +@msg missing destination folder აკლია დანიშნულების საქაღალდე +@msg missing from აკლია from +@msg missing group აკლია ჯგუფი +@msg missing id or ids აკლია id ან ids +@msg missing ids აკლია ids +@msg missing indexes აკლია ინდექსები +@msg missing matrix [a,b,c,d,e,f] აკლია მატრიცა [a,b,c,d,e,f] +@msg missing name აკლია სახელი +@msg missing op აკლია op +@msg missing or invalid `color` აკლია ან არასწორია `color` +@msg missing or unknown `tool` აკლია ან უცნობია `tool` +@msg missing point აკლია წერტილი +@msg missing point [x,y] აკლია წერტილი [x,y] +@msg missing point `{key}` ([x, y]) აკლია წერტილი `{key}` ([x, y]) +@msg missing points აკლია წერტილები +@msg missing points [[x,y]…] აკლია წერტილები [[x,y]…] +@msg missing segment აკლია სეგმენტი +@msg missing stops აკლია გადასვლის წერტილები +@msg missing subpaths აკლია ქვეტრაექტორიები +@msg missing target აკლია სამიზნე +@msg missing to აკლია to +@msg missing x, y აკლია x, y +@msg mode is set, add or toggle, not `{other}` mode არის set, add ან toggle და არა `{other}` +@msg mode must be "cmyk" or "rgb" mode უნდა იყოს "cmyk" ან "rgb" +@msg mode must be area|onPath, got {o} mode უნდა იყოს area|onPath, მიღებულია {o} +@msg more than 10000 linked files: package dependencies in smaller parts 10000-ზე მეტი დაკავშირებული ფაილი: შეფუთეთ დამოკიდებულებები უფრო მცირე ნაწილებად +@msg more than 256 commands 256-ზე მეტი ბრძანება +@msg more than {MAX_BATCH_FILES} data sets {MAX_BATCH_FILES}-ზე მეტი მონაცემთა ნაკრები +@msg more than {MAX_BATCH_FILES} files {MAX_BATCH_FILES}-ზე მეტი ფაილი +@msg more than {MAX_CSV_ROWS} data rows {MAX_CSV_ROWS}-ზე მეტი მონაცემთა სტრიქონი +@msg more than {MAX_FILES} images {MAX_FILES}-ზე მეტი გამოსახულება +@msg more than {MAX_IMPORT} presets {MAX_IMPORT}-ზე მეტი პრესეტი +@msg moved must be [[x,y]…] moved უნდა იყოს [[x,y]…] +@msg must be an object with `kind` and `value` უნდა იყოს ობიექტი `kind`-ით და `value`-თი +@msg must have `kind` alert, confirm or prompt `kind` უნდა იყოს alert, confirm ან prompt +@msg must have exactly `kind` and `value` უნდა ჰქონდეს ზუსტად `kind` და `value` +@msg name (a toolbar's name) is required საჭიროა name (ხელსაწყოთა ზოლის სახელი) +@msg name (a toolbar's name) must be a string name (ხელსაწყოთა ზოლის სახელი) უნდა იყოს სტრიქონი +@msg name must be a toolbar's name name უნდა იყოს ხელსაწყოთა ზოლის სახელი +@msg names is empty names ცარიელია +@msg names must be an array of symbol names names უნდა იყოს სიმბოლოების სახელების მასივი +@msg need `anchor` or `segment` + `t` საჭიროა `anchor` ან `segment` + `t` +@msg need at least one anchor საჭიროა ერთი საყრდენი წერტილი მაინც +@msg need at least one point საჭიროა ერთი წერტილი მაინც +@msg need at least two points საჭიროა ორი წერტილი მაინც +@msg needs a closing quote after the name სახელის შემდეგ საჭიროა დამხურავი ბრჭყალი +@msg needs a name საჭიროა სახელი +@msg needs a name of at most 64 bytes საჭიროა სახელი, არაუმეტეს 64 ბაიტისა +@msg needs a name of letters, digits and _, or a quoted name საჭიროა სახელი ასოებით, ციფრებით და _-ით, ან ბრჭყალებში ჩასმული სახელი +@msg needs a name without control characters საჭიროა სახელი მმართველი სიმბოლოების გარეშე +@msg needs points საჭიროა წერტილები +@msg nesting too deep ჩადგმა ზედმეტად ღრმაა +@msg nineSlice must be true or false nineSlice უნდა იყოს true ან false +@msg nineSliceGuides must be [left, top, right, bottom], each -16..16, with left + right < 1 and top + bottom < 1 nineSliceGuides უნდა იყოს [left, top, right, bottom], თითოეული -16..16, სადაც left + right < 1 და top + bottom < 1 +@msg no HP-GL format HP-GL ფორმატი არ არის +@msg no New Document profile called `{shown}` ({_1}) ახალი დოკუმენტის პროფილი სახელით `{shown}` არ არის ({_1}) +@msg no PDF preset named `{n}` PDF პრესეტი სახელით `{n}` არ არის +@msg no SVG filter at index {k} SVG ფილტრი ინდექსით {k} არ არის +@msg no action set is current მიმდინარე მოქმედებების ნაკრები არ არის +@msg no active data set აქტიური მონაცემთა ნაკრები არ არის +@msg no appearance item {index} იერსახის ელემენტი {index} არ არის +@msg no arrowheads file here აქ ისრის წვერების ფაილი არ არის +@msg no artboard {_1} სამუშაო დაფა {_1} არ არსებობს +@msg no artboard {artboard} (0-based; the document has {_1}) სამუშაო დაფა {artboard} არ არსებობს (0-დან ითვლება; დოკუმენტს აქვს {_1}) +@msg no asset {id} რესურსი {id} არ არის +@msg no asset {id} (see assets.list) რესურსი {id} არ არის (იხ. assets.list) +@msg no assets to export საექსპორტო რესურსები არ არის +@msg no assets yet: collect art for export first (assets.add) რესურსები ჯერ არ არის: ჯერ შეაგროვეთ ნახატი ექსპორტისთვის (assets.add) +@msg no brush named `{n}` ფუნჯი სახელით `{n}` არ არის +@msg no character at byte {start} ბაიტზე {start} სიმბოლო არ არის +@msg no character has code {code} სიმბოლო კოდით {code} არ არის +@msg no colour ფერი არ არის +@msg no colour group `{group}` ფერების ჯგუფი `{group}` არ არის +@msg no colour group `{name}` ფერების ჯგუფი `{name}` არ არის +@msg no custom arrowhead {name} (see stroke.arrowheads.list) მომხმარებლის ისრის წვერი {name} არ არის (იხ. stroke.arrowheads.list) +@msg no data sets მონაცემთა ნაკრებები არ არის +@msg no dataset named `{from}` მონაცემთა ნაკრები სახელით `{from}` არ არის +@msg no dataset named `{name}` მონაცემთა ნაკრები სახელით `{name}` არ არის +@msg no datasets მონაცემთა ნაკრებები არ არის +@msg no design named `{name}` დიზაინი სახელით `{name}` არ არის +@msg no design named `{n}` დიზაინი სახელით `{n}` არ არის +@msg no design named `{old}` დიზაინი სახელით `{old}` არ არის +@msg no encoder for {_1} yet კოდერი ჯერ არ არის: {_1} +@msg no export preset `{name}` (see document.exportPresets.list) ექსპორტის პრესეტი `{name}` არ არის (იხ. document.exportPresets.list) +@msg no file to open გასახსნელი ფაილი არ არის +@msg no folder: pass `path` or set Preferences › Plug-ins & Scratch Disks › Additional Plug-ins Folder საქაღალდე არ არის: მიუთითეთ `path` ან დააყენეთ პარამეტრები › პლაგინები & სამუშაო დისკები › დამატებითი პლაგინები +@msg no fonts to look for: they are all available მოსაძებნი შრიფტები არ არის: ყველა ხელმისაწვდომია +@msg no formats to export საექსპორტო ფორმატები არ არის +@msg no gradient preset `{name}` (see gradient.presets.list) გრადიენტის პრესეტი `{name}` არ არის (იხ. gradient.presets.list) +@msg no graphic style `{n}` in `{_1}` გრაფიკული სტილი `{n}` არ არის ბიბლიოთეკაში `{_1}` +@msg no graphic style library `{key}` (see graphicStyle.libraries) გრაფიკული სტილების ბიბლიოთეკა `{key}` არ არის (იხ. graphicStyle.libraries) +@msg no guide selected დამხმარე ხაზი მონიშნული არ არის +@msg no guide selected (or give an index) დამხმარე ხაზი მონიშნული არ არის (ან მიუთითეთ ინდექსი) +@msg no guide {i} დამხმარე ხაზი {i} არ არის +@msg no images in the folder საქაღალდეში გამოსახულებები არ არის +@msg no instructions ინსტრუქციები არ არის +@msg no item at index {_1} ინდექსზე {_1} ელემენტი არ არის +@msg no item at index {from} ინდექსზე {from} ელემენტი არ არის +@msg no item at one of the indices {idx} ერთ-ერთ ინდექსზე ელემენტი არ არის: {idx} +@msg no layer შრე არ არის +@msg no layer to rename სახელის შესაცვლელი შრე არ არის +@msg no layer {id} (see layer.list) შრე {id} არ არის (იხ. layer.list) +@msg no layers to export საექსპორტო შრეები არ არის +@msg no library `{key}` ბიბლიოთეკა `{key}` არ არის +@msg no metafile format metafile ფორმატი არ არის +@msg no object {_1} ობიექტი {_1} არ არის +@msg no objects ობიექტები არ არის +@msg no parent layer მშობელი შრე არ არის +@msg no perspective grid preset named `{b}` (see perspective.presets.list) პერსპექტივის ბადის პრესეტი სახელით `{b}` არ არის (იხ. perspective.presets.list) +@msg no perspective grid preset named `{n}` პერსპექტივის ბადის პრესეტი სახელით `{n}` არ არის +@msg no point selected (give `index`) წერტილი მონიშნული არ არის (მიუთითეთ `index`) +@msg no preset called `{from}` (see file.newPresets) პრესეტი სახელით `{from}` არ არის (იხ. file.newPresets) +@msg no preset called `{name}` (see file.newPresets) პრესეტი სახელით `{name}` არ არის (იხ. file.newPresets) +@msg no preset named `{n}` პრესეტი სახელით `{n}` არ არის +@msg no print preset named `{b}` (see print.presets.list) ბეჭდვის პრესეტი სახელით `{b}` არ არის (იხ. print.presets.list) +@msg no print preset named `{name}` (presets: {_1}) ბეჭდვის პრესეტი სახელით `{name}` არ არის (პრესეტები: {_1}) +@msg no print preset named `{n}` ბეჭდვის პრესეტი სახელით `{n}` არ არის +@msg no profile named `{name}` პროფილი სახელით `{name}` არ არის +@msg no random numbers ({e}) შემთხვევითი რიცხვები მიუწვდომელია ({e}) +@msg no readable files in the folder საქაღალდეში წაკითხვადი ფაილები არ არის +@msg no recovery copy `{f}` (see file.recovery.list) აღდგენის ასლი `{f}` არ არის (იხ. file.recovery.list) +@msg no rows სტრიქონები არ არის +@msg no saved PDF preset named `{name}` შენახული PDF პრესეტი სახელით `{name}` არ არის +@msg no saved export preset `{name}` შენახული ექსპორტის პრესეტი `{name}` არ არის +@msg no saved gradient preset called {name} შენახული გრადიენტის პრესეტი სახელით {name} არ არის +@msg no saved gradient presets შენახული გრადიენტის პრესეტები არ არის +@msg no saved preset called `{name}` შენახული პრესეტი სახელით `{name}` არ არის +@msg no saved presets to export (name [Default] in `names` to export it) საექსპორტო შენახული პრესეტები არ არის ([Default]-ის ექსპორტისთვის ჩაწერეთ ის `names`-ში) +@msg no saved presets to export (name built-in ones in `names`) საექსპორტო შენახული პრესეტები არ არის (ჩაშენებულებისთვის ჩაწერეთ მათი სახელები `names`-ში) +@msg no saved print preset named `{name}` შენახული ბეჭდვის პრესეტი სახელით `{name}` არ არის +@msg no saved profile called {name} შენახული პროფილი სახელით {name} არ არის +@msg no saved selection `{name}` შენახული მონიშვნა `{name}` არ არის +@msg no saved theme called {name} (see colorTheme.list) შენახული თემა სახელით {name} არ არის (იხ. colorTheme.list) +@msg no saved views შენახული ხედები არ არის +@msg no selected or given object has a visible 3D effect არცერთ მონიშნულ ან მითითებულ ობიექტს ხილული 3D ეფექტი არ აქვს +@msg no series {i} სერია {i} არ არის +@msg no slice {n} in the image (see slice.list) გამოსახულებაში ნაჭერი {n} არ არის (იხ. slice.list) +@msg no source art საწყისი ნახატი არ არის +@msg no stop {i} (the gradient has {n}) გადასვლის წერტილი {i} არ არის (გრადიენტს აქვს {n}) +@msg no style `{name}` სტილი `{name}` არ არის +@msg no such artboard {v} ასეთი სამუშაო დაფა არ არის: {v} +@msg no such assets (see assets.list) ასეთი რესურსები არ არის (იხ. assets.list) +@msg no such frame anchor, or the frame would reach past the canvas ჩარჩოს ასეთი საყრდენი წერტილი არ არის, ან ჩარჩო ტილოს გასცდებოდა +@msg no such objects ასეთი ობიექტები არ არის +@msg no such path anchor, or the path would reach past the canvas ტრაექტორიის ასეთი საყრდენი წერტილი არ არის, ან ტრაექტორია ტილოს გასცდებოდა +@msg no such rows ასეთი სტრიქონები არ არის +@msg no swatch `{keep}` ფერის ნიმუში `{keep}` არ არის +@msg no swatch `{n}` ფერის ნიმუში `{n}` არ არის +@msg no swatch `{n}` (swatches and colour groups move separately) ფერის ნიმუში `{n}` არ არის (ფერის ნიმუშები და ფერების ჯგუფები ცალ-ცალკე გადაადგილდება) +@msg no swatch library `{key}` (see swatch.library.list) ფერის ნიმუშების ბიბლიოთეკა `{key}` არ არის (იხ. swatch.library.list) +@msg no swatch library `{key}` (see swatch.library.list; "document": the document's swatches) ფერის ნიმუშების ბიბლიოთეკა `{key}` არ არის (იხ. swatch.library.list; "document": დოკუმენტის ფერის ნიმუშები) +@msg no swatch library `{key}` (see swatch.library.list; "{DOCUMENT_SWATCHES}": the document's swatches) ფერის ნიმუშების ბიბლიოთეკა `{key}` არ არის (იხ. swatch.library.list; "{DOCUMENT_SWATCHES}": დოკუმენტის ფერის ნიმუშები) +@msg no swatch named `{n}` ფერის ნიმუში სახელით `{n}` არ არის +@msg no swatch or colour group `{n}` ფერის ნიმუში ან ფერების ჯგუფი `{n}` არ არის +@msg no swatch or colour group `{n}` in `{_1}` ფერის ნიმუში ან ფერების ჯგუფი `{n}` არ არის ბიბლიოთეკაში `{_1}` +@msg no symbol named `{_1}` სიმბოლო სახელით `{_1}` არ არის +@msg no symbol named `{name}` სიმბოლო სახელით `{name}` არ არის +@msg no text objects selected ტექსტური ობიექტები მონიშნული არ არის +@msg no toolbar named `{_1}` ხელსაწყოთა ზოლი სახელით `{_1}` არ არის +@msg no toolbar named `{name}` ხელსაწყოთა ზოლი სახელით `{name}` არ არის +@msg no tracing preset `{preset}` (see imageTrace.presets) ვექტორიზაციის პრესეტი `{preset}` არ არის (იხ. imageTrace.presets) +@msg no user library folder here (save with a path, or without one to get the data) აქ მომხმარებლის ბიბლიოთეკის საქაღალდე არ არის (შეინახეთ გზის მითითებით, ან მის გარეშე, მონაცემების მისაღებად) +@msg no variable named `{from}` ცვლადი სახელით `{from}` არ არის +@msg no variable named `{name}` ცვლადი სახელით `{name}` არ არის +@msg no variable named `{var}` ცვლადი სახელით `{var}` არ არის +@msg no variable named `{v}` ცვლადი სახელით `{v}` არ არის +@msg no view named `{name}` ხედი სახელით `{name}` არ არის +@msg node {_1} already has the text variable `{_2}` კვანძს {_1} უკვე აქვს ტექსტური ცვლადი `{_2}` +@msg node {_1} is not a graph კვანძი {_1} დიაგრამა არ არის +@msg node {_1} is not an image კვანძი {_1} გამოსახულება არ არის +@msg node {_1} is not type კვანძი {_1} ტექსტი არ არის +@msg not a DCS file ეს არ არის DCS ფაილი +@msg not a PDF presets file (format `{_1}`) ეს არ არის PDF პრესეტების ფაილი (ფორმატი `{_1}`) +@msg not a PDF presets file: {e} ეს არ არის PDF პრესეტების ფაილი: {e} +@msg not a RegExp object ეს არ არის RegExp ობიექტი +@msg not a Word document: its WordDocument stream doesn't start with a file information block ეს არ არის Word-ის დოკუმენტი: მისი WordDocument ნაკადი ფაილის საინფორმაციო ბლოკით არ იწყება +@msg not a Word document: its compound file has no WordDocument stream ეს არ არის Word-ის დოკუმენტი: მის შედგენილ ფაილს WordDocument ნაკადი არ აქვს +@msg not a Word document: its main part is not a WordprocessingML document ეს არ არის Word-ის დოკუმენტი: მისი მთავარი ნაწილი WordprocessingML დოკუმენტი არ არის +@msg not a Word document: its package has no main document part ეს არ არის Word-ის დოკუმენტი: მის პაკეტს დოკუმენტის მთავარი ნაწილი არ აქვს +@msg not a closed path ეს არ არის შეკრული ტრაექტორია +@msg not a flattener presets file (format `{_1}`) ეს არ არის გამჭვირვალობის გაბრტყელების პრესეტების ფაილი (ფორმატი `{_1}`) +@msg not a flattener presets file: {e} ეს არ არის გამჭვირვალობის გაბრტყელების პრესეტების ფაილი: {e} +@msg not a graphic style library: {e} ეს არ არის გრაფიკული სტილების ბიბლიოთეკა: {e} +@msg not a layer or group ეს არ არის შრე ან ჯგუფი +@msg not a library file: {e} ეს არ არის ბიბლიოთეკის ფაილი: {e} +@msg not a mesh envelope point ეს არ არის გარსის ბადის წერტილი +@msg not a perspective grid presets file (format `{_1}`) ეს არ არის პერსპექტივის ბადის პრესეტების ფაილი (ფორმატი `{_1}`) +@msg not a perspective grid presets file: {e} ეს არ არის პერსპექტივის ბადის პრესეტების ფაილი: {e} +@msg not a print presets file (format `{_1}`) ეს არ არის ბეჭდვის პრესეტების ფაილი (ფორმატი `{_1}`) +@msg not a print presets file: {e} ეს არ არის ბეჭდვის პრესეტების ფაილი: {e} +@msg not a regular expression ეს არ არის რეგულარული გამოსახულება +@msg not a stored or deflated central record ეს არ არის შეუკუმშავი (stored) ან deflate-ით შეკუმშული ცენტრალური ჩანაწერი +@msg not a swatch library (.vcswatches or .gpl) ეს არ არის ფერის ნიმუშების ბიბლიოთეკა (.vcswatches ან .gpl) +@msg not a swatch library (format `{_1}`) ეს არ არის ფერის ნიმუშების ბიბლიოთეკა (ფორმატი `{_1}`) +@msg not a swatch library: {e} ეს არ არის ფერის ნიმუშების ბიბლიოთეკა: {e} +@msg not a valid SVGZ file: {e} ეს არ არის სწორი SVGZ ფაილი: {e} +@msg not an action set file ({e}) ეს არ არის მოქმედებების ნაკრების ფაილი ({e}) +@msg not an action set: the text doesn't start with /version and a number ეს არ არის მოქმედებების ნაკრები: ტექსტი არ იწყება /version-ით და რიცხვით +@msg not an image VectorCraft reads (see document.formats) ეს არ არის გამოსახულება, რომელსაც VectorCraft კითხულობს (იხ. document.formats) +@msg not area type (text in a frame) outside perspective ეს არ არის არის ტექსტი (ტექსტი ჩარჩოში) პერსპექტივის გარეთ +@msg not editing an opacity mask გაუმჭვირვალობის ნიღბის რედაქტირება არ მიმდინარეობს +@msg not type on a path outside perspective ეს არ არის ტრაექტორიაზე ტექსტი პერსპექტივის გარეთ +@msg nothing prints არაფერი იბეჭდება +@msg nothing to bind მისაბმელი არაფერია +@msg nothing to change შესაცვლელი არაფერია +@msg nothing to change: give dx, dy, hScale, vScale or rotation შესაცვლელი არაფერია: მიუთითეთ dx, dy, hScale, vScale ან rotation +@msg nothing to crop ჩამოსაჭრელი არაფერია +@msg nothing to export ექსპორტისთვის არაფერია +@msg nothing to export: the document has no visible art ექსპორტისთვის არაფერია: დოკუმენტს ხილული ნახატი არ აქვს +@msg nothing to mark ნიშნების დასასმელი არაფერია +@msg nothing to print: every artboard picked is blank დასაბეჭდი არაფერია: ყველა არჩეული სამუშაო დაფა ცარიელია +@msg nothing to print: the document has no art that prints დასაბეჭდი არაფერია: დოკუმენტს დასაბეჭდი ნახატი არ აქვს +@msg nothing to repeat გასამეორებელი არაფერია +@msg object is not a path ობიექტი ტრაექტორია არ არის +@msg object transparency cannot be sampled onto highlighted characters; disable Transparency in Eyedropper Options or select the whole object ობიექტის გამჭვირვალობა მონიშნულ სიმბოლოებზე ვერ გადავა; გამორთეთ „გამჭვირვალობა“ პიპეტის პარამეტრებში ან მონიშნეთ მთელი ობიექტი +@msg object {_1} can't be set as point type ობიექტი {_1} წერტილოვან ტექსტად ვერ დაყენდება +@msg object {_1} has lost its file's contents: relink it ობიექტმა {_1} დაკარგა თავისი ფაილის შიგთავსი: ხელახლა დააკავშირეთ +@msg object {_1} has no path ობიექტს {_1} ტრაექტორია არ აქვს +@msg object {_1} has no size ობიექტს {_1} ზომა არ აქვს +@msg object {_1} is hidden or locked, or on a locked artboard ობიექტი {_1} დამალული ან ჩაკეტილია, ან ჩაკეტილ სამუშაო დაფაზეა +@msg object {_1} is not a placed document ობიექტი {_1} განთავსებული დოკუმენტი არ არის +@msg object {_1} is not an Intertwine group ობიექტი {_1} გადახლართვის ჯგუფი არ არის +@msg object {_1} is not an image ობიექტი {_1} გამოსახულება არ არის +@msg object {_1} is not an image or a linked file ობიექტი {_1} არც გამოსახულებაა და არც დაკავშირებული ფაილი +@msg object {_1} is not an image or a placed document ობიექტი {_1} არც გამოსახულებაა და არც განთავსებული დოკუმენტი +@msg object {_1} is not in this Intertwine group ობიექტი {_1} ამ გადახლართვის ჯგუფში არ არის +@msg object {_1} needs a 3D effect ობიექტს {_1} სჭირდება 3D ეფექტი +@msg object {_1} needs a 3D effect at index {index} ობიექტს {_1} სჭირდება 3D ეფექტი ინდექსზე {index} +@msg object {_1}: a hollow Extrude & Bevel has no caps: turn on Cap to map a graphic ობიექტი {_1}: ღრუ ამოწევასა და წაკვეთას თავსახურები არ აქვს: გრაფიკის განსათავსებლად ჩართეთ „თავსახური“ +@msg object {_1}: with a depth of 0 the object has one face: map its graphics onto the front ობიექტი {_1}: 0 სიღრმისას ობიექტს ერთი მხარე აქვს: მისი გრაფიკა წინა მხარეზე განათავსეთ +@msg object {_1}: {_2} ობიექტი {_1}: {_2} +@msg object {_1}: {e} ობიექტი {_1}: {e} +@msg object {_1}: {name} at index {index} has no lighting presets; set its lights with effect.setParams ობიექტი {_1}: ეფექტს „{name}“ ინდექსზე {index} განათების პრესეტები არ აქვს; მისი სინათლის წყაროები დააყენეთ effect.setParams-ით +@msg object {id} has anchors 0–{_1} for `corners`, not {past} ობიექტს {id} `corners`-ისთვის აქვს საყრდენი წერტილები 0–{_1} და არა {past} +@msg object {id} has {n} anchors, so no anchor {past} ობიექტს {id} აქვს {n} საყრდენი წერტილი, ამიტომ საყრდენი წერტილი {past} არ არსებობს +@msg objects must be none, move or copy objects უნდა იყოს none, move ან copy +@msg objects were left out ზოგიერთი ობიექტი გამოტოვებულია +@msg offset out of range წანაცვლება დიაპაზონს გარეთაა +@msg on must be true or false on უნდა იყოს true ან false +@msg only groups, layers, type and images have a Contents (Characters) row შიგთავსის (სიმბოლოების) სტრიქონი მხოლოდ ჯგუფებს, შრეებს, ტექსტსა და გამოსახულებებს აქვს +@msg only interior mesh lines can be deleted შეიძლება მხოლოდ ბადის შიდა ხაზების წაშლა +@msg only solid colours can be added (not gradients or patterns) შეიძლება მხოლოდ მყარი ფერების დამატება (არა გრადიენტების ან პატერნების) +@msg only solid-colour swatches can be spot colours სპოტ-ფერი შეიძლება იყოს მხოლოდ მყარი ფერის ნიმუში +@msg only this Affinity file's embedded preview could be read: use File › Open to see it with its warning, or export SVG or PDF from Affinity first Affinity-ის ამ ფაილიდან მხოლოდ ჩაშენებული წინასწარი ხედის წაკითხვა მოხერხდა: გაფრთხილებასთან ერთად მის სანახავად გამოიყენეთ ფაილი › გახსნა, ან ჯერ Affinity-დან გააკეთეთ SVG-ის ან PDF-ის ექსპორტი +@msg only this Affinity file's embedded preview could be read; use File › Open to see it with its warning Affinity-ის ამ ფაილიდან მხოლოდ ჩაშენებული წინასწარი ხედის წაკითხვა მოხერხდა; გაფრთხილებასთან ერთად მის სანახავად გამოიყენეთ ფაილი › გახსნა +@msg onto, above, below, icon and a column place belong to window.panel.float and window.panel.dock onto, above, below, icon და სვეტის ადგილი ეკუთვნის window.panel.float-სა და window.panel.dock-ს +@msg onto, above, below, icon and a column place take no anchor, side, zone or before onto, above, below, icon და სვეტის ადგილი არ იღებს anchor, side, zone ან before +@msg onto, above, below, icon and a column place take no x, y, width or height onto, above, below, icon და სვეტის ადგილი არ იღებს x, y, width ან height +@msg opacity must be a number opacity უნდა იყოს რიცხვი +@msg open a document to look for its linked files გახსენით დოკუმენტი მისი დაკავშირებული ფაილების მოსაძებნად +@msg operand too large ოპერანდი ზედმეტად დიდია +@msg options must be an object (see file.formatOptions) options უნდა იყოს ობიექტი (იხ. file.formatOptions) +@msg order is a whole number from 0 to {others}, not `{v}` order არის მთელი რიცხვი 0-დან {others}-მდე და არა `{v}` +@msg order must be leftToRight or rightToLeft order უნდა იყოს leftToRight ან rightToLeft +@msg orientation must be portrait or landscape, not `{o}` orientation უნდა იყოს portrait ან landscape და არა `{o}` +@msg outlineText {v}: true or false outlineText {v}: true ან false +@msg output intent profile: {e} გამოტანის მიზნის პროფილი: {e} +@msg output.destination: no RGB or CMYK profile is called “{name}” output.destination: RGB ან CMYK პროფილი სახელით „{name}“ არ არის +@msg output.destination: {_1} files are CMYK, and “{name}” is an RGB profile output.destination: {_1} ფაილები CMYK-ია, „{name}“ კი RGB პროფილია +@msg output.destination: {e} output.destination: {e} +@msg output.inks: no ink is set to print output.inks: არცერთი მელანი დასაბეჭდად არ არის დაყენებული +@msg output.outputIntent: no profile is called “{name}”, and a {std} output intent embeds its profile output.outputIntent: პროფილი სახელით „{name}“ არ არის, {std} გამოტანის მიზანი კი თავის პროფილს ჩააშენებს +@msg output.outputIntent: no profile is called “{name}”: a {std} output intent embeds a profile, or names a registered printing condition (outputConditionId and registry) output.outputIntent: პროფილი სახელით „{name}“ არ არის: {std} გამოტანის მიზანი ან ჩააშენებს პროფილს, ან ასახელებს რეგისტრირებულ ბეჭდვის პირობას (outputConditionId და registry) +@msg output.outputIntent: {std} files print in CMYK, and “{name}” is an RGB profile output.outputIntent: {std} ფაილები CMYK-ში იბეჭდება, „{name}“ კი RGB პროფილია +@msg output.outputIntent: “{name}” is a grey profile, which can't be a {std} output intent output.outputIntent: „{name}“ ნაცრისფრის პროფილია და {std} გამოტანის მიზანი ვერ იქნება +@msg overlap: {o} pt is half a tile or more overlap: {o} pt ფილის ნახევარი ან მეტია +@msg overlapping Shaper paths must be in the same layer or group გადაფარული ფორმირების ტრაექტორიები ერთ შრეში ან ჯგუფში უნდა იყოს +@msg overlapping edits ცვლილებები ერთმანეთს ფარავს +@msg page art conflicts with image data for {key} გვერდის ნახატი ეწინააღმდეგება გამოსახულების მონაცემებს: {key} +@msg page art conflicts with pattern {name} გვერდის ნახატი ეწინააღმდეგება პატერნს: {name} +@msg page art conflicts with swatch {name} გვერდის ნახატი ეწინააღმდეგება ფერის ნიმუშს: {name} +@msg page art is missing image data for {key} გვერდის ნახატს აკლია გამოსახულების მონაცემები: {key} +@msg page art is missing pattern {name} გვერდის ნახატს აკლია პატერნი: {name} +@msg page art is missing swatch {name} გვერდის ნახატს აკლია ფერის ნიმუში: {name} +@msg page must be a whole number from 1 page უნდა იყოს მთელი რიცხვი 1-დან +@msg page thumbnail: {e} გვერდის ესკიზი: {e} +@msg page {page} of the PDF has no objects PDF-ის გვერდზე {page} ობიექტები არ არის +@msg page {page}: `{file}` has {n} {artboards} გვერდი {page}: `{file}` შეიცავს {n} {artboards} +@msg page {page}: `{name}` has {n} {pages} გვერდი {page}: `{name}` შეიცავს {n} {pages} +@msg pages must be a range such as "2-3" or a page number, not {v} pages უნდა იყოს დიაპაზონი, მაგალითად "2-3", ან გვერდის ნომერი და არა {v} +@msg pages: {e} pages: {e} +@msg panel position must be finite პანელის პოზიცია სასრული უნდა იყოს +@msg parameters must be an object parameters უნდა იყოს ობიექტი +@msg params must be an object params უნდა იყოს ობიექტი +@msg passwords can have up to {MAX_PASSWORD} bytes პაროლი შეიძლება იყოს არაუმეტეს {MAX_PASSWORD} ბაიტისა +@msg path chunks must share their boundary point ტრაექტორიის ნაწილებს საერთო სასაზღვრო წერტილი უნდა ჰქონდეს +@msg path has no open end ტრაექტორიას ღია ბოლო არ აქვს +@msg paths must be strings paths უნდა იყოს სტრიქონები +@msg pdfCompatible: false needs every artboard to keep the editable artwork pdfCompatible: false-ს სჭირდება, რომ ყველა სამუშაო დაფამ რედაქტირებადი ნახატი შეინარჩუნოს +@msg pdfCompatible: false needs the artboards to keep the editable artwork when useArtboards is false pdfCompatible: false-ს სჭირდება, რომ სამუშაო დაფებმა რედაქტირებადი ნახატი შეინარჩუნონ, როცა useArtboards არის false +@msg pdfs `{m}`: single or multiple pdfs `{m}`: single ან multiple +@msg pickColorFrom is "artwork" or "swatches", not {v} pickColorFrom არის "artwork" ან "swatches" და არა {v} +@msg pins and moved must be non-empty lists of the same length pins და moved უნდა იყოს ერთი სიგრძის არაცარიელი სიები +@msg pins must be [[x,y]…] pins უნდა იყოს [[x,y]…] +@msg pins must be finite pins სასრული უნდა იყოს +@msg place is above, below or inside, not `{other}` place არის above, below ან inside და არა `{other}` +@msg plane must be left|right|ground plane უნდა იყოს left|right|ground +@msg plane must be left|right|ground|none plane უნდა იყოს left|right|ground|none +@msg point is outside the mesh წერტილი ბადის გარეთაა +@msg point x must be a number წერტილის x უნდა იყოს რიცხვი +@msg point y must be a number წერტილის y უნდა იყოს რიცხვი +@msg points must be [t, left, right] with non-negative widths points უნდა იყოს [t, left, right] არაუარყოფითი სიგანეებით +@msg points must be [x,y] pairs points უნდა იყოს [x,y] წყვილები +@msg points must be a non-empty [[x,y,pressure?]…] list points უნდა იყოს არაცარიელი სია [[x,y,pressure?]…] +@msg points must be a non-empty list of finite [x,y] points უნდა იყოს სასრული [x,y]-ების არაცარიელი სია +@msg points must be an array or null points უნდა იყოს მასივი ან null +@msg points must be finite points სასრული უნდა იყოს +@msg points must be finite [x,y] pairs points უნდა იყოს სასრული [x,y] წყვილები +@msg points must be finite canvas points points უნდა იყოს ტილოს სასრული წერტილები +@msg points must contain 1–4096 coordinates points უნდა შეიცავდეს 1–4096 კოორდინატს +@msg position must be normal, superscript or subscript position უნდა იყოს normal, superscript ან subscript +@msg position must be topLeft, topRight, bottomLeft or bottomRight position უნდა იყოს topLeft, topRight, bottomLeft ან bottomRight +@msg positions must be between 0 and 100000 pt პოზიციები უნდა იყოს 0-სა და 100000 pt-ს შორის +@msg ppi must be a positive number, not {ppi} ppi უნდა იყოს დადებითი რიცხვი და არა {ppi} +@msg ppi must be between 1 and 2400 ppi უნდა იყოს 1-სა და 2400-ს შორის +@msg preserve `{v}` is not transforms|bounds|fileDimensions|fit|fill preserve `{v}` არ არის transforms|bounds|fileDimensions|fit|fill +@msg preserveShape must be clippingMask|transparency preserveShape უნდა იყოს clippingMask|transparency +@msg preset `{id}`: mobile or density პრესეტი `{id}`: mobile ან density +@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 previewMode must be default, pixel or overprint previewMode უნდა იყოს default, pixel ან overprint +@msg print settings: {e} ბეჭდვის პარამეტრები: {e} +@msg procedures nest too deeply პროცედურები ზედმეტად ღრმადაა ჩადგმული +@msg procedures nested too deeply პროცედურები ზედმეტად ღრმადაა ჩადგმული +@msg profile colour space {other} is not RGB, CMYK or Gray პროფილის ფერთა სივრცე {other} არ არის RGB, CMYK ან Gray +@msg quotes must be {{double?, single?}} quotes უნდა იყოს {{double?, single?}} +@msg quotes.{k} must be an opening and a closing quote, e.g. "“”" quotes.{k} უნდა იყოს გამხსნელი და დამხურავი ბრჭყალი, მაგ. "“”" +@msg range out of order in character class სიმბოლოთა კლასში დიაპაზონი არასწორი რიგითაა +@msg rasterEffectsPpi must be 1–2400 (72 screen, 150 medium, 300 high) rasterEffectsPpi უნდა იყოს 1–2400 (72 ეკრანი, 150 საშუალო, 300 მაღალი) +@msg rating must be a whole number from 0 to {MAX_RATING} rating უნდა იყოს მთელი რიცხვი 0-დან {MAX_RATING}-მდე +@msg rect and {k} contradict each other: give the area or the artboards rect და {k} ერთმანეთს ეწინააღმდეგება: მიუთითეთ არე ან სამუშაო დაფები +@msg rect applies to raster formats, not {_1} rect ეხება რასტრულ ფორმატებს და არა {_1} +@msg rect is [x, y, width, height] in points rect არის [x, y, width, height] პუნქტებში +@msg rect must be [x, y, width, height] rect უნდა იყოს [x, y, width, height] +@msg rect must be [x, y, width, height] with a positive width and height rect უნდა იყოს [x, y, width, height] დადებითი სიგანითა და სიმაღლით +@msg rect needs finite numbers and a positive width and height rect-ს სჭირდება სასრული რიცხვები და დადებითი სიგანე და სიმაღლე +@msg redraw needs id redraw-ს სჭირდება id +@msg redraw within must be a finite distance of 0 or more redraw within უნდა იყოს 0 ან მეტი სასრული მანძილი +@msg reduce of an empty array with no initial value reduce ცარიელ მასივზე საწყისი მნიშვნელობის გარეშე შეუძლებელია +@msg registration must be 0..8 registration უნდა იყოს 0..8 +@msg regular expression flag '{_1}' given twice რეგულარული გამოსახულების ალამი '{_1}' ორჯერაა მითითებული +@msg regular expression too large რეგულარული გამოსახულება ზედმეტად დიდია +@msg release a layer or a group შრეებად გასათავისუფლებლად მიუთითეთ შრე ან ჯგუფი +@msg replace keeps the replaced object's place and transform: drop template, at and rect replace ინარჩუნებს ჩანაცვლებული ობიექტის ადგილს და გარდაქმნას: ამოიღეთ template, at და rect +@msg replace: select the one object to replace replace: მონიშნეთ ერთი ჩასანაცვლებელი ობიექტი +@msg resolution must be a number or screen|medium|high resolution უნდა იყოს რიცხვი ან screen|medium|high +@msg resolution must be between 1 and 2400 ppi გარჩევადობა უნდა იყოს 1-სა და 2400 ppi-ს შორის +@msg rotation must be a number of degrees rotation უნდა იყოს გრადუსების რიცხვი +@msg rotation must be finite rotation სასრული უნდა იყოს +@msg rows and cols must be 1..50 rows და cols უნდა იყოს 1..50 +@msg rows and columns must be 1..500 სტრიქონები და სვეტები უნდა იყოს 1..500 +@msg rows of objects whose appearances differ can't be reordered together სხვადასხვა იერსახის მქონე ობიექტების სტრიქონების ერთად გადალაგება შეუძლებელია +@msg sampled text would exceed the canvas (coordinates out of range) აღებული ტექსტი ტილოს გასცდებოდა (კოორდინატები დიაპაზონს გარეთაა) +@msg save the document first: Package collects a saved document ჯერ შეინახეთ დოკუმენტი: შეფუთვა შენახულ დოკუმენტს აგროვებს +@msg save the document first: copy puts the file in its folder ჯერ შეინახეთ დოკუმენტი: copy ფაილს მის საქაღალდეში აკოპირებს +@msg savedPreset: {e} savedPreset: {e} +@msg scale `{s}`: a factor such as 2x, a width (100w), a height (100h) or a resolution (72ppi) scale `{s}`: კოეფიციენტი, მაგალითად 2x, სიგანე (100w), სიმაღლე (100h) ან გარჩევადობა (72ppi) +@msg scale must be a number above 0, at most 64 scale უნდა იყოს 0-ზე მეტი რიცხვი, არაუმეტეს 64-ისა +@msg scale must be non-zero scale ნულისგან განსხვავებული უნდა იყოს +@msg scope must be selection or all (got {other}) scope უნდა იყოს selection ან all (მიღებულია {other}) +@msg scribble is too long ჯღაბნა ზედმეტად გრძელია +@msg script file is not UTF-8 text: {value} სკრიპტის ფაილი UTF-8 ტექსტი არ არის: {value} +@msg segment does not exist სეგმენტი არ არსებობს +@msg select a Shaper group მონიშნეთ ფორმირების ჯგუფი +@msg select a blend to set easing or color shift შერბილების ან ფერის წანაცვლების დასაყენებლად მონიშნეთ გადასვლა +@msg select a compound shape მონიშნეთ შედგენილი ფიგურა +@msg select a graph მონიშნეთ დიაგრამა +@msg select a group or layer with visible, unlocked members მონიშნეთ ჯგუფი ან შრე ხილული, ჩაუკეტავი წევრებით +@msg select a layer მონიშნეთ შრე +@msg select a text object მონიშნეთ ტექსტური ობიექტი +@msg select an SVG filter მონიშნეთ SVG ფილტრი +@msg select an image (or an Image Trace group) მონიშნეთ გამოსახულება (ან გამოსახულების ვექტორიზაციის ჯგუფი) +@msg select an image, or pass id მონიშნეთ გამოსახულება ან მიუთითეთ id +@msg select an object (or pass `id`) მონიშნეთ ობიექტი (ან მიუთითეთ `id`) +@msg select an object with a 3D effect მონიშნეთ 3D ეფექტის მქონე ობიექტი +@msg select an object with a 3D effect, or give its id in ids მონიშნეთ 3D ეფექტის მქონე ობიექტი ან მიუთითეთ მისი id ids-ში +@msg select an object with a freeform gradient მონიშნეთ თავისუფალი ფორმის გრადიენტის მქონე ობიექტი +@msg select an object with an opacity mask მონიშნეთ გაუმჭვირვალობის ნიღბის მქონე ობიექტი +@msg select area type მონიშნეთ არის ტექსტი +@msg select area type (text in a frame) მონიშნეთ არის ტექსტი (ტექსტი ჩარჩოში) +@msg select area type and closed paths (at least one area type object) მონიშნეთ არის ტექსტი და შეკრული ტრაექტორიები (არის ტექსტის ერთი ობიექტი მაინც) +@msg select area type whose first line can fit its frame მონიშნეთ არის ტექსტი, რომლის პირველი სტრიქონიც მის ჩარჩოში ეტევა +@msg select artwork to add its colours მონიშნეთ ნახატი მისი ფერების დასამატებლად +@msg select artwork to make a group of its colours მონიშნეთ ნახატი მისი ფერებისგან ჯგუფის შესაქმნელად +@msg select artwork to recolour, or give a colour `group` მონიშნეთ ხელახლა შესაფერადებელი ნახატი ან მიუთითეთ ფერების ჯგუფი (`group`) +@msg select exactly two path ends to join შესაერთებლად მონიშნეთ ტრაექტორიის ზუსტად ორი ბოლო +@msg select members of a compound shape მონიშნეთ შედგენილი ფიგურის წევრები +@msg select objects or give ids მონიშნეთ ობიექტები ან მიუთითეთ ids +@msg select objects to align to the guide მონიშნეთ დამხმარე ხაზზე გასასწორებელი ობიექტები +@msg select one Intertwine group მონიშნეთ ერთი გადახლართვის ჯგუფი +@msg select one image or pass id მონიშნეთ ერთი გამოსახულება ან მიუთითეთ id +@msg select one layer, group or object to rename სახელის შესაცვლელად მონიშნეთ ერთი შრე, ჯგუფი ან ობიექტი +@msg select paths მონიშნეთ ტრაექტორიები +@msg select paths or compound paths მონიშნეთ ტრაექტორიები ან შედგენილი ტრაექტორიები +@msg select rows or objects to collect მონიშნეთ შესაგროვებელი სტრიქონები ან ობიექტები +@msg select something to export მონიშნეთ ის, რისი ექსპორტიც გსურთ +@msg select something to export (or turn off selectedOnly) მონიშნეთ ის, რისი ექსპორტიც გსურთ (ან გამორთეთ selectedOnly) +@msg select text to redefine the style from მონიშნეთ ტექსტი, რომლითაც სტილი ხელახლა განისაზღვრება +@msg select the art and, on top of it, the mask object მონიშნეთ ნახატი და მის ზემოთ ნიღბის ობიექტი +@msg select the art for the design მონიშნეთ ნახატი დიზაინისთვის +@msg select the art for the pattern tile მონიშნეთ ნახატი პატერნის ფილისთვის +@msg select the art to add first ჯერ მონიშნეთ დასამატებელი ნახატი +@msg select the art to collect (or give its ids) მონიშნეთ შესაგროვებელი ნახატი (ან მიუთითეთ მისი ids) +@msg select the art to weed მონიშნეთ ნახატი ნარჩენის მოსაცილებლად +@msg select the banner, or mark every artboard მონიშნეთ ბანერი ან ნიშნები დაუსვით ყველა სამუშაო დაფას +@msg select the content and a path on top მონიშნეთ შიგთავსი და მის ზემოთ ტრაექტორია +@msg select the images to relink, or pass ids მონიშნეთ ხელახლა დასაკავშირებელი გამოსახულებები ან მიუთითეთ ids +@msg select the images, or pass ids მონიშნეთ გამოსახულებები ან მიუთითეთ ids +@msg select the linked images or placed documents, or pass ids მონიშნეთ დაკავშირებული გამოსახულებები ან განთავსებული დოკუმენტები, ან მიუთითეთ ids +@msg select the object to copy from მონიშნეთ ობიექტი, საიდანაც დაკოპირდება +@msg select the objects (or give their ids) მონიშნეთ ობიექტები (ან მიუთითეთ მათი ids) +@msg select the objects to attach to the path მონიშნეთ ტრაექტორიაზე მისამაგრებელი ობიექტები +@msg select the objects to bind მონიშნეთ მისაბმელი ობიექტები +@msg select two or more objects to intertwine გადასახლართად მონიშნეთ ორი ან მეტი ობიექტი +@msg select two or more slices to combine გასაერთიანებლად მონიშნეთ ორი ან მეტი ნაჭერი +@msg select type on a path მონიშნეთ ტრაექტორიაზე ტექსტი +@msg select type on a path or area type მონიშნეთ ტრაექტორიაზე ტექსტი ან არის ტექსტი +@msg selection `{m}`: one or each selection `{m}`: one ან each +@msg settings is an object of document.exportForScreens params settings არის document.exportForScreens-ის პარამეტრების ობიექტი +@msg settings must be an object settings უნდა იყოს ობიექტი +@msg show `{show}`: all, missing, modified or embedded show `{show}`: all, missing, modified ან embedded +@msg show must be true or false show უნდა იყოს true ან false +@msg side is left or right, not `{v}` side არის left ან right და არა `{v}` +@msg size must be "small", "medium", "large" or a number of points over 0 up to {_1} size უნდა იყოს "small", "medium", "large" ან პუნქტების რიცხვი 0-ზე მეტი, არაუმეტეს {_1} +@msg size must be positive ზომა დადებითი უნდა იყოს +@msg sizeMode is "fixed" or "pressure", not `{other}` sizeMode არის "fixed" ან "pressure" და არა `{other}` +@msg sizeMode is "fixed" or "pressure", not {other} sizeMode არის "fixed" ან "pressure" და არა {other} +@msg sizeVariation must be 0 or more sizeVariation უნდა იყოს 0 ან მეტი +@msg smallCaps must be true or false smallCaps უნდა იყოს true ან false +@msg sort `{x}`: name, kind or status sort `{x}`: name, kind ან status +@msg source paths are too large for Shaper საწყისი ტრაექტორიები ფორმირებისთვის ზედმეტად დიდია +@msg source text transform is collapsed or unrepresentable საწყისი ტექსტის გარდაქმნა გადაგვარებულია ან ვერ გამოისახება +@msg spot, mode and group apply to solid colours only spot, mode და group ეხება მხოლოდ მყარ ფერებს +@msg status `{s}`: linked, embedded, missing or modified status `{s}`: linked, embedded, missing ან modified +@msg steps must be 1..1000 steps უნდა იყოს 1..1000 +@msg steps must be 1..{MAX_STEPS} steps უნდა იყოს 1..{MAX_STEPS} +@msg stop {i}: `plates` must be four numbers from 0 to 1 (C, M, Y, K) გადასვლის წერტილი {i}: `plates` უნდა იყოს ოთხი რიცხვი 0-დან 1-მდე (C, M, Y, K) +@msg stop {i}: {e} გადასვლის წერტილი {i}: {e} +@msg stopped before the archive was finished შეჩერდა არქივის დასრულებამდე +@msg strokeMode must be within|along|across, got {m} strokeMode უნდა იყოს within|along|across, მიღებულია {m} +@msg strokeOptions must be an object of stroke.set options strokeOptions უნდა იყოს stroke.set-ის პარამეტრების ობიექტი +@msg strokeWidth must be a positive number of pixels strokeWidth უნდა იყოს პიქსელების დადებითი რიცხვი +@msg subpath {si} is not an open subpath ქვეტრაექტორია {si} ღია ქვეტრაექტორია არ არის +@msg subpaths required when joining the same path ერთი და იმავე ტრაექტორიის შეერთებისას საჭიროა subpaths +@msg swatch exchange version {major}.{minor} isn't supported (only 1.x) ფერის ნიმუშების გაცვლის ვერსია {major}.{minor} მხარდაჭერილი არ არის (მხოლოდ 1.x) +@msg swatchConflict must be "merge" or "add", not {v} swatchConflict უნდა იყოს "merge" ან "add" და არა {v} +@msg table must be true or false table უნდა იყოს true ან false +@msg takes one name იღებს ერთ სახელს +@msg target text transform is collapsed or unrepresentable სამიზნე ტექსტის გარდაქმნა გადაგვარებულია ან ვერ გამოისახება +@msg text must be {{characterSet?, platform?, removeLineReturns?, removeParagraphReturns?, replaceSpaces?}} text უნდა იყოს {{characterSet?, platform?, removeLineReturns?, removeParagraphReturns?, replaceSpaces?}} +@msg text transform is collapsed or unrepresentable ტექსტის გარდაქმნა გადაგვარებულია ან ვერ გამოისახება +@msg text.replaceSpaces must be a whole number from 2 to 100 text.replaceSpaces უნდა იყოს მთელი რიცხვი 2-დან 100-მდე +@msg text.{key} `{v}`: use "{_1}" or "{_2}" text.{key} `{v}`: გამოიყენეთ "{_1}" ან "{_2}" +@msg textureImage: give {{path}} or {{name, dataBase64}} of an image file, or a texture as effect.list gives it textureImage: მიუთითეთ გამოსახულების ფაილის {{path}} ან {{name, dataBase64}}, ან ტექსტურა ისე, როგორც effect.list იძლევა +@msg textureImage: {e} textureImage: {e} +@msg that makes more than {MAX_PIECES} slices ეს {MAX_PIECES}-ზე მეტ ნაჭერს ქმნის +@msg that makes too many pieces (at most 100000) or dash steps: simplify the dash pattern or make the dashes longer ეს ზედმეტად ბევრ ნაწილს (მაქსიმუმ 100000) ან ტირეების ნაბიჯს ქმნის: გაამარტივეთ ტირეების ნიმუში ან გაზარდეთ ტირეების სიგრძე +@msg that object is not in the overlap ეს ობიექტი გადაფარვაში არ არის +@msg the Affinity document has no page with a size Affinity-ის დოკუმენტს ზომის მქონე გვერდი არ აქვს +@msg the CMYK image couldn't be written CMYK გამოსახულების ჩაწერა ვერ მოხერხდა +@msg the Layers panel is not shown შრეების პანელი არ ჩანს +@msg the Layers panel's search, filter or Show Layers Only hides its row შრეების პანელის ძიება, ფილტრი ან „მხოლოდ შრეების ჩვენება“ მის სტრიქონს მალავს +@msg the Objects on Path group is hidden or locked ტრაექტორიაზე ობიექტების ჯგუფი დამალული ან ჩაკეტილია +@msg the PDF security settings were saved without their passwords: give openPassword or permissionsPassword again, or security without passwordRequired to export unprotected PDF-ის უსაფრთხოების პარამეტრები პაროლების გარეშეა შენახული: კვლავ მიუთითეთ openPassword ან permissionsPassword, ან დაუცველი ექსპორტისთვის მიუთითეთ security passwordRequired-ის გარეშე +@msg the RTF file has too many paragraphs or formatting changes to place as type (at most {MAX_PARAGRAPHS} paragraphs and {MAX_RUNS} runs) RTF ფაილს ზედმეტად ბევრი აბზაცი ან ფორმატირების ცვლილება აქვს ტექსტად განსათავსებლად (მაქსიმუმ {MAX_PARAGRAPHS} აბზაცი და {MAX_RUNS} ფრაგმენტი) +@msg the RTF file is too large to place as type (at most {_1} MB) RTF ფაილი ზედმეტად დიდია ტექსტად განსათავსებლად (მაქსიმუმ {_1} MB) +@msg the SVG expands to more than {0} nested SVG images SVG იშლება {0}-ზე მეტ ჩადგმულ SVG გამოსახულებად +@msg the SVG expands to more than {0} objects SVG იშლება {0}-ზე მეტ ობიექტად +@msg the SVG file is larger than {MAX_IMPORT_BYTES} bytes SVG ფაილი {MAX_IMPORT_BYTES} ბაიტზე დიდია +@msg the SVG has no drawable objects SVG-ს დასახატი ობიექტები არ აქვს +@msg the SVGZ file unpacks to more than {_1} MB SVGZ ფაილი გაშლისას {_1} MB-ს აჭარბებს +@msg the Word document has more than {MAX_PAGES} pages of properties, too many to place Word-ის დოკუმენტს თვისებების {MAX_PAGES}-ზე მეტი გვერდი აქვს, განსათავსებლად ზედმეტად ბევრი +@msg the Word document has more than {MAX_RUNS} runs of character or paragraph properties, too many to place Word-ის დოკუმენტს სიმბოლოს ან აბზაცის თვისებების {MAX_RUNS}-ზე მეტი ფრაგმენტი აქვს, განსათავსებლად ზედმეტად ბევრი +@msg the Word document has more than {_1} MB of formatting properties, too many to place Word-ის დოკუმენტს {_1} MB-ზე მეტი მოცულობის ფორმატირების თვისებები აქვს, განსათავსებლად ზედმეტად ბევრი +@msg the Word document has too much text or formatting to place as type (at most {MAX_PARAGRAPHS} paragraphs, {MAX_RUNS} runs and {_1} MB of text) Word-ის დოკუმენტს ზედმეტად ბევრი ტექსტი ან ფორმატირება აქვს ტექსტად განსათავსებლად (მაქსიმუმ {MAX_PARAGRAPHS} აბზაცი, {MAX_RUNS} ფრაგმენტი და {_1} MB ტექსტი) +@msg the Word document has too much text to place as type (at most {_1} MB) Word-ის დოკუმენტს ზედმეტად ბევრი ტექსტი აქვს ტექსტად განსათავსებლად (მაქსიმუმ {_1} MB) +@msg the Word document is encrypted or protected with a password; save it without one to place it Word-ის დოკუმენტი დაშიფრული ან პაროლით დაცულია; განსათავსებლად შეინახეთ ის პაროლის გარეშე +@msg the Word document is too large to place (its {name} stream holds more than {_1} MB) Word-ის დოკუმენტი ზედმეტად დიდია განსათავსებლად (ნაკადი {name} {_1} MB-ზე მეტს შეიცავს) +@msg the Word document was last saved with fast save, which VectorCraft doesn't read; save it again with fast save turned off Word-ის დოკუმენტი ბოლოს სწრაფი შენახვით არის შენახული, რასაც VectorCraft ვერ კითხულობს; ხელახლა შეინახეთ ის გამორთული სწრაფი შენახვით +@msg the Word document was saved by Word 6.0 or Word 95, which VectorCraft doesn't read; save it as a Word 97-2003 document Word-ის დოკუმენტი შენახულია Word 6.0-ით ან Word 95-ით, რომელსაც VectorCraft ვერ კითხულობს; შეინახეთ ის Word 97-2003 დოკუმენტად +@msg the Word document's text is made of more than {MAX_PIECES} pieces, too many to place Word-ის დოკუმენტის ტექსტი {MAX_PIECES}-ზე მეტი ნაწილისგან შედგება, განსათავსებლად ზედმეტად ბევრი +@msg the XML operation needs an XML or XMLList value XML ოპერაციას XML ან XMLList მნიშვნელობა სჭირდება +@msg the XPath expression does not evaluate to a node-set XPath გამოსახულების შედეგი კვანძების სიმრავლე არ არის +@msg the XPath expression ends early XPath გამოსახულება ნაადრევად მთავრდება +@msg the XPath expression has an unmatched ) XPath გამოსახულებაში დაუწყვილებელი ) არის +@msg the XPath expression has an unmatched ] XPath გამოსახულებაში დაუწყვილებელი ] არის +@msg the XPath expression has an unmatched closing bracket XPath გამოსახულებაში დაუწყვილებელი დამხურავი ფრჩხილი არის +@msg the XPath expression selects a namespace node, which is not an XML value XPath გამოსახულება სახელთა სივრცის კვანძს ირჩევს, რომელიც XML მნიშვნელობა არ არის +@msg the XPath expression selects the root node, which is not an XML value XPath გამოსახულება ძირეულ კვანძს ირჩევს, რომელიც XML მნიშვნელობა არ არის +@msg the XPath function {name} needs a node-set XPath ფუნქციას {name} კვანძების სიმრავლე სჭირდება +@msg the XPath function {name} takes the wrong number of arguments XPath ფუნქციას {name} არგუმენტების არასწორი რაოდენობა გადაეცა +@msg the XPath name functions need a node-set XPath-ის სახელის ფუნქციებს კვანძების სიმრავლე სჭირდება +@msg the XPath prefix {shown} is not bound to a namespace XPath პრეფიქსი {shown} არცერთ სახელთა სივრცესთან არ არის მიბმული +@msg the XPath variable ${shown} is not bound XPath ცვლადი ${shown} არ არის მიბმული +@msg the action set ids are not a list მოქმედებების ნაკრების იდენტიფიკატორები სია არ არის +@msg the active paint is not a gradient აქტიური საღებავი გრადიენტი არ არის +@msg the argument list is not an object არგუმენტების სია ობიექტი არ არის +@msg the art of a graph design in a graph series is drawn again from the design: edit the design to change it დიაგრამის სერიაში დიაგრამის დიზაინის ნახატი დიზაინიდან თავიდან იხატება: მის შესაცვლელად დიზაინი შეცვალეთ +@msg the artboards don't fit on the canvas: fewer artboards, less spacing or a smaller size სამუშაო დაფები ტილოზე არ ეტევა: შეამცირეთ სამუშაო დაფების რაოდენობა, დაშორება ან ზომა +@msg the artwork is too large for EPS: what follows 256 MB of PostScript was left out ნახატი EPS-ისთვის ზედმეტად დიდია: PostScript-ის 256 MB-ის შემდეგ დანარჩენი გამოტოვებულია +@msg the banner has no width or height ბანერს სიგანე ან სიმაღლე არ აქვს +@msg the bitmaps hold more pixels than one file may ბიტმაპები იმაზე მეტ პიქსელს შეიცავს, ვიდრე ერთ ფაილში ეტევა +@msg the character's size can't be measured სიმბოლოს ზომის გაზომვა შეუძლებელია +@msg the code runs past its last instruction კოდი თავისი ბოლო ინსტრუქციის მიღმა გრძელდება +@msg the color book holds more than {ASE_MAX_ENTRIES} colors ფერთა წიგნი {ASE_MAX_ENTRIES}-ზე მეტ ფერს შეიცავს +@msg the color book is cut short ფერთა წიგნი შეკვეცილია +@msg the color book's names take more than {_1} MB ფერთა წიგნის სახელები {_1} MB-ზე მეტს იკავებს +@msg the compound shape is too complex to expand შედგენილი ფიგურა ზედმეტად რთულია გასაშლელად +@msg the container of the listed objects is gone ჩამოთვლილი ობიექტების კონტეინერი აღარ არსებობს +@msg the copy `{user_id}` can't be read as a library ასლის `{user_id}` ბიბლიოთეკად წაკითხვა შეუძლებელია +@msg the copy would leave the canvas ასლი ტილოს გარეთ გავიდოდა +@msg the curve tolerance must be from 0.01 to 10 points მრუდის დაშვება უნდა იყოს 0.01-დან 10 პუნქტამდე +@msg the custom dictionary couldn't be saved to {_1}: {e} მომხმარებლის ლექსიკონის შენახვა ვერ მოხერხდა აქ: {_1}: {e} +@msg the custom dictionary {_1} can't be read ({why}), so it is left as it is მომხმარებლის ლექსიკონის {_1} წაკითხვა შეუძლებელია ({why}), ამიტომ ის უცვლელი რჩება +@msg the cut cannot be made on this art: {e} ამ ნახატზე გაჭრა შეუძლებელია: {e} +@msg the data isn't an EMF or WMF picture მონაცემები EMF ან WMF სურათი არ არის +@msg the data isn't an EPS or PostScript picture მონაცემები EPS ან PostScript სურათი არ არის +@msg the deferred paste is no longer available გადადებული ჩასმა აღარ არის ხელმისაწვდომი +@msg the design is too big to draw at every data point of this graph დიზაინი ზედმეტად დიდია ამ დიაგრამის ყველა მონაცემთა წერტილზე დასახატად +@msg the design is too big to draw in every column of this graph დიზაინი ზედმეტად დიდია ამ დიაგრამის ყველა სვეტში დასახატად +@msg the dialog it was opened over is no longer open დიალოგი, რომლის ზემოთაც ის გაიხსნა, აღარ არის ღია +@msg the dictionary stack overflowed ლექსიკონების სტეკი გადაივსო +@msg the document already has an SVG filter named {name} დოკუმენტს უკვე აქვს SVG ფილტრი სახელით {name} +@msg the document has another SVG filter named {name}: use svgFilter.apply, or svgFilter.define with `replace` to edit it დოკუმენტს აქვს სხვა SVG ფილტრი სახელით {name}: გამოიყენეთ svgFilter.apply, ან მის შესაცვლელად svgFilter.define `replace`-ით +@msg the document has no SVG filter named {name} დოკუმენტს არ აქვს SVG ფილტრი სახელით {name} +@msg the document has no SVG filter named {r} დოკუმენტს არ აქვს SVG ფილტრი სახელით {r} +@msg the document has no color swatches დოკუმენტს ფერის ნიმუშები არ აქვს +@msg the document's swatches hold {_1} colors; the document reduction takes at most 255 დოკუმენტის ფერის ნიმუშები {_1} ფერს შეიცავს; დოკუმენტის მიხედვით შემცირება მაქსიმუმ 255-ს იღებს +@msg the editing data's hash has no place რედაქტირების მონაცემების ჰეშს ადგილი არ აქვს +@msg the entities the document declares expand to too much text დოკუმენტში გამოცხადებული ერთეულები ზედმეტად ბევრ ტექსტად იშლება +@msg the envelope's content has no bounds გარსის შიგთავსს საზღვრები არ აქვს +@msg the envelope's mesh is malformed გარსის ბადე დაზიანებულია +@msg the file holds no `variableSets` element ფაილი `variableSets` ელემენტს არ შეიცავს +@msg the file is larger than {_1} MB ფაილი {_1} MB-ზე დიდია +@msg the file is too large ფაილი ზედმეტად დიდია +@msg the file isn't valid SVG: {e} ფაილი სწორი SVG არ არის: {e} +@msg the file names no plate ფაილი არცერთ ფირფიტას არ ასახელებს +@msg the file was updated or encrypted already ფაილი უკვე განახლებული ან დაშიფრულია +@msg the first character of a line has no character before it to kern: it moves only up and down (dy) სტრიქონის პირველ სიმბოლოს წინ არ უდგას სიმბოლო, რომელთანაც კერნინგი შეიძლება: ის მხოლოდ ზემოთ და ქვემოთ გადაადგილდება (dy) +@msg the font {_1} is not available შრიფტი {_1} ხელმისაწვდომი არ არის +@msg the format has no file extension ფორმატს ფაილის გაფართოება არ აქვს +@msg the function's prototype is not an object ფუნქციის პროტოტიპი ობიექტი არ არის +@msg the graphic can't be read: {e} გრაფიკის წაკითხვა შეუძლებელია: {e} +@msg the graphic is empty გრაფიკა ცარიელია +@msg the graphic's data is damaged გრაფიკის მონაცემები დაზიანებულია +@msg the graphic's document has no artboard გრაფიკის დოკუმენტს სამუშაო დაფა არ აქვს +@msg the grommet inset is too large for the banner ლუვერების დაშორება კიდიდან ბანერისთვის ზედმეტად დიდია +@msg the guide is hidden or locked დამხმარე ხაზი დამალული ან ჩაკეტილია +@msg the header `{cell}` for `{name}` would read back as the variable `{other}`: rename one of them სათაური `{cell}` (ცვლადისთვის `{name}`) წაკითხვისას ცვლადად `{other}` აღიქმება: ერთ-ერთს სახელი გადაარქვით +@msg the hem is too deep for the banner ნაკეცი ბანერისთვის ზედმეტად ღრმაა +@msg the image `{path}` isn't followed: {r} გამოსახულების ბმული `{path}` არ გაიხსნება: {r} +@msg the image has no embedded pixels გამოსახულებას ჩაშენებული პიქსელები არ აქვს +@msg the image is empty გამოსახულება ცარიელია +@msg the image is fully transparent გამოსახულება სრულად გამჭვირვალეა +@msg the image is not on an artboard; pass rect გამოსახულება სამუშაო დაფაზე არ არის; გადაეცით rect +@msg the image would be {w} × {h} pixels; raster exports are limited to {MAX_RASTER_SIDE} pixels per side and {_1} megapixels: lower the scale or resolution გამოსახულება იქნებოდა {w} × {h} პიქსელი; რასტრული ექსპორტი შეზღუდულია {MAX_RASTER_SIDE} პიქსელით თითო მხარეზე და {_1} მეგაპიქსელით: შეამცირეთ მასშტაბი ან გარჩევადობა +@msg the image's pixels are missing გამოსახულების პიქსელები აკლია +@msg the image's pixels aren't in the document გამოსახულების პიქსელები დოკუმენტში არ არის +@msg the image's pixels can't be read: {e} გამოსახულების პიქსელების წაკითხვა შეუძლებელია: {e} +@msg the image's transparency doesn't fit it გამოსახულების გამჭვირვალობა მას არ შეესაბამება +@msg the job would print more than {MAX_PAGES} pages დავალება {MAX_PAGES}-ზე მეტ გვერდს დაბეჭდავდა +@msg the job would print more than {_1} pages დავალება {_1}-ზე მეტ გვერდს დაბეჭდავდა +@msg the layers hold no art to mask შრეებში დასანიღბი ნახატი არ არის +@msg the layout moved განლაგება გადაადგილდა +@msg the library has a group `{name}` already ბიბლიოთეკას უკვე აქვს ჯგუფი `{name}` +@msg the library has no group `{name}` ბიბლიოთეკას არ აქვს ჯგუფი `{name}` +@msg the library has no item `{item}` ბიბლიოთეკას არ აქვს ელემენტი `{item}` +@msg the library has no item `{other}` ბიბლიოთეკას არ აქვს ელემენტი `{other}` +@msg the library holds {MAX_GROUPS} groups already ბიბლიოთეკა უკვე შეიცავს {MAX_GROUPS} ჯგუფს +@msg the library holds {MAX_ITEMS} items of this kind already ბიბლიოთეკა უკვე შეიცავს ამ სახის {MAX_ITEMS} ელემენტს +@msg the library's file is outside the read roots ბიბლიოთეკის ფაილი წაკითხვის ძირეული საქაღალდეების გარეთაა +@msg the line is too long, or the paths it passes too many, to check ხაზი ზედმეტად გრძელია, ან მის მიერ გადაკვეთილი ტრაექტორიები ზედმეტად ბევრია შესამოწმებლად +@msg the method needs an XML value მეთოდს XML მნიშვნელობა სჭირდება +@msg the name is empty სახელი ცარიელია +@msg the object has no fill, stroke or effect ობიექტს არ აქვს შევსება, კონტური ან ეფექტი +@msg the object has no graphic style (pass `name`) ობიექტს გრაფიკული სტილი არ აქვს (გადაეცით `name`) +@msg the objects don't match the plan ობიექტები გეგმას არ შეესაბამება +@msg the open and permissions passwords must differ გახსნისა და ნებართვების პაროლები ერთმანეთისგან უნდა განსხვავდებოდეს +@msg the operand stack overflowed ოპერანდების სტეკი გადაივსო +@msg the optimised image can't be read back: {e} ოპტიმიზებული გამოსახულების ხელახლა წაკითხვა შეუძლებელია: {e} +@msg the page has no area გვერდს ფართობი არ აქვს +@msg the page's type in an unread object's box isn't in its page art წაუკითხავი ობიექტის ჩარჩოში მოთავსებული გვერდის ტექსტი გვერდის ნახატში არ არის +@msg the paint behind the proxy is not a gradient აქტიური შევსების/კონტურის საღებავი გრადიენტი არ არის +@msg the parameters or body do not form one function პარამეტრები ან სხეული ერთ ფუნქციას არ ქმნის +@msg the parent must be a layer or sublayer მშობელი უნდა იყოს შრე ან ქვეშრე +@msg the pasted SVG filter {name} draws differently from the document's filter of that name, and no free name fits it ჩასმულ SVG ფილტრს {name} დოკუმენტის ამავე სახელის ფილტრისგან განსხვავებული სახე აქვს და მისთვის თავისუფალი სახელი ვერ მოიძებნა +@msg the path can't be extended ტრაექტორიის გაგრძელება შეუძლებელია +@msg the path can't be inside one of the objects to attach ტრაექტორია ვერ იქნება მისამაგრებელი ობიექტებიდან ერთ-ერთის შიგნით +@msg the path has no segments to measure ტრაექტორიას გასაზომი სეგმენტები არ აქვს +@msg the path is empty ტრაექტორია ცარიელია +@msg the path is too short to shorten that much ტრაექტორია ზედმეტად მოკლეა ამდენით შესამოკლებლად +@msg the paths are too many or too tangled to find where they cross ტრაექტორიები ზედმეტად ბევრი ან ზედმეტად ჩახლართულია გადაკვეთის წერტილების საპოვნელად +@msg the pen table holds more than 255 pens კალმების ცხრილი 255-ზე მეტ კალამს შეიცავს +@msg the picture has no objects სურათს ობიექტები არ აქვს +@msg the pixel buffer doesn't match the image size პიქსელების ბუფერი გამოსახულების ზომას არ შეესაბამება +@msg the plates can't be kept ფირფიტების შენარჩუნება შეუძლებელია +@msg the position table does not match the instructions პოზიციების ცხრილი ინსტრუქციებს არ შეესაბამება +@msg the preview: {e} წინასწარი ხედი: {e} +@msg the program runs too long პროგრამა ზედმეტად დიდხანს მუშაობს +@msg the program uses too much memory პროგრამა ზედმეტად ბევრ მეხსიერებას იყენებს +@msg the prompt's text is longer than {MAX_PROMPT_BYTES} bytes prompt-ის ტექსტი {MAX_PROMPT_BYTES} ბაიტზე გრძელია +@msg the radix must be between 2 and 36 თვლის სისტემის ფუძე უნდა იყოს 2-დან 36-მდე +@msg the rectangle must have a width and a height მართკუთხედს უნდა ჰქონდეს სიგანე და სიმაღლე +@msg the rectangle needs a size and must lie on the canvas მართკუთხედს ზომა სჭირდება და ტილოზე უნდა მდებარეობდეს +@msg the rectangle or line reaches too many paths to check მართკუთხედი ან ხაზი ზედმეტად ბევრ ტრაექტორიას სწვდება შესამოწმებლად +@msg the request may not read the New Document profiles folder მოთხოვნას არ შეუძლია ახალი დოკუმენტის პროფილების საქაღალდის წაკითხვა +@msg the right side of 'in' is not an object 'in'-ის მარჯვენა მხარე ობიექტი არ არის +@msg the right side of 'instanceof' is not a function 'instanceof'-ის მარჯვენა მხარე ფუნქცია არ არის +@msg the selected art has no width მონიშნულ ნახატს სიგანე არ აქვს +@msg the selected art is nested more than {MAX_DEPTH} levels deep მონიშნული ნახატი {MAX_DEPTH} დონეზე ღრმადაა ჩადგმული +@msg the selected art is too large to measure მონიშნული ნახატი ზედმეტად დიდია გასაზომად +@msg the selection draws nothing მონიშნული არაფერს ხატავს +@msg the selection has no area მონიშნულს ფართობი არ აქვს +@msg the selection has no art to export მონიშნულში ექსპორტისთვის ნახატი არ არის +@msg the selection has no bounds მონიშნულს საზღვრები არ აქვს +@msg the selection has no graphic style მონიშნულს გრაფიკული სტილი არ აქვს +@msg the selection has no outlines to weed around მონიშნულში არ არის კონტურები, რომელთა გარშემოც ნარჩენის მოცილება შეიძლება +@msg the shapes are too degenerate to combine ფიგურები ზედმეტად გადაგვარებულია გასაერთიანებლად +@msg the shapes cross themselves and each other too often to combine ფიგურები საკუთარ თავს და ერთმანეთს ზედმეტად ხშირად კვეთს გასაერთიანებლად +@msg the slice would leave the canvas ნაჭერი ტილოს გარეთ გავიდოდა +@msg the spacing makes more than {MAX_GROMMETS} grommets ასეთი დაშორებით {MAX_GROMMETS}-ზე მეტი ლუვერი გამოდის +@msg the spot colour couldn't be added სპოტ-ფერის დამატება ვერ მოხერხდა +@msg the subpath has no ends to extend (it is closed or a single point) ქვეტრაექტორიას გასაგრძელებელი ბოლოები არ აქვს (ის შეკრულია ან ერთი წერტილია) +@msg the swatch exchange file holds more than {ASE_MAX_ENTRIES} colors and groups ფერის ნიმუშების გაცვლის ფაილი {ASE_MAX_ENTRIES}-ზე მეტ ფერსა და ჯგუფს შეიცავს +@msg the swatch exchange file is cut short ფერის ნიმუშების გაცვლის ფაილი შეკვეცილია +@msg the symbols are nested too deeply to expand their instances სიმბოლოები ზედმეტად ღრმადაა ჩადგმული მათი ეგზემპლარების გასაშლელად +@msg the text file is too large to place as type (at most {_1} MB) ტექსტური ფაილი ზედმეტად დიდია ტექსტად განსათავსებლად (მაქსიმუმ {_1} MB) +@msg the text is empty ტექსტი ცარიელია +@msg the text is over {_1} MB ტექსტი {_1} MB-ზე მეტია +@msg the top object must be a path ზედა ობიექტი ტრაექტორია უნდა იყოს +@msg the trace was cancelled ვექტორიზაცია გაუქმდა +@msg the trailer has no size ტრეილერს ზომა არ აქვს +@msg the type object is flattened to nothing ტექსტური ობიექტი გაბრტყელებისას არაფრად იქცა +@msg the value bind was called on is not a function მნიშვნელობა, რომელზეც bind გამოიძახეს, ფუნქცია არ არის +@msg the value is not a constructor მნიშვნელობა კონსტრუქტორი არ არის +@msg the value is not a function მნიშვნელობა ფუნქცია არ არის +@msg the value is not a valid XML name მნიშვნელობა XML-ის სწორი სახელი არ არის +@msg the value is not an XML attribute name მნიშვნელობა XML ატრიბუტის სახელი არ არის +@msg the value is not an XML name მნიშვნელობა XML სახელი არ არის +@msg the value of axis `{tag}` must be a number or null ღერძის `{tag}` მნიშვნელობა უნდა იყოს რიცხვი ან null +@msg the variable library declares more than {MAX_LIBRARY_DATASETS} data sets ცვლადების ბიბლიოთეკა {MAX_LIBRARY_DATASETS}-ზე მეტ მონაცემთა ნაკრებს აცხადებს +@msg the variable library declares more than {MAX_LIBRARY_ENTITIES} entities ცვლადების ბიბლიოთეკა {MAX_LIBRARY_ENTITIES}-ზე მეტ ერთეულს აცხადებს +@msg the variable library declares more than {MAX_LIBRARY_VARIABLES} variables ცვლადების ბიბლიოთეკა {MAX_LIBRARY_VARIABLES}-ზე მეტ ცვლადს აცხადებს +@msg the variable library declares no variables ცვლადების ბიბლიოთეკა არცერთ ცვლადს არ აცხადებს +@msg the variable library is larger than {MAX_LIBRARY_BYTES} bytes ცვლადების ბიბლიოთეკა {MAX_LIBRARY_BYTES} ბაიტზე დიდია +@msg the variable library is not UTF-8 ცვლადების ბიბლიოთეკა UTF-8 არ არის +@msg the variable library is not well-formed XML: {e} ცვლადების ბიბლიოთეკა სწორად აგებული XML არ არის: {e} +@msg the variable library nests elements more than {MAX_LIBRARY_NESTING} deep ცვლადების ბიბლიოთეკაში ელემენტები {MAX_LIBRARY_NESTING} დონეზე ღრმადაა ჩადგმული +@msg the variable library's document type declaration holds something other than entities of plain text ცვლადების ბიბლიოთეკის დოკუმენტის ტიპის დეკლარაცია უბრალო ტექსტის ერთეულების გარდა სხვა რამესაც შეიცავს +@msg the variable library's entities expand to more than {MAX_LIBRARY_BYTES} bytes ცვლადების ბიბლიოთეკის ერთეულები {MAX_LIBRARY_BYTES} ბაიტზე მეტად იშლება +@msg the weeding lines cross the art's outlines too many times to measure; use fewer lines ნარჩენის მოსაცილებელი ხაზები ნახატის კონტურებს ზედმეტად ბევრჯერ კვეთს გასაზომად; გამოიყენეთ ნაკლები ხაზი +@msg the weeding lines pass too close to too many outline segments to measure; use fewer lines or a smaller gap ნარჩენის მოსაცილებელი ხაზები ზედმეტად ბევრ კონტურის სეგმენტთან გადის ზედმეტად ახლოს გასაზომად; გამოიყენეთ ნაკლები ხაზი ან უფრო მცირე ღრეჩო +@msg the weeding lines would be more than {max_pieces} pieces ნარჩენის მოსაცილებელი ხაზები {max_pieces}-ზე მეტ ნაწილად დაიყოფოდა +@msg the window has no dock ფანჯარას დოკი არ აქვს +@msg the written PDF has no catalog ჩაწერილ PDF-ს კატალოგი არ აქვს +@msg the written PDF has no cross-reference table ჩაწერილ PDF-ს ჯვარედინი მიმართვების ცხრილი არ აქვს +@msg the written PDF's metadata can't be edited ჩაწერილი PDF-ის მეტამონაცემების რედაქტირება შეუძლებელია +@msg the {_1} plate can't be read: {e} ფირფიტის {_1} წაკითხვა შეუძლებელია: {e} +@msg the {_1} plate lies outside the file ფირფიტა {_1} ფაილის გარეთ მდებარეობს +@msg there are no colour swatches to draw დასახატი ფერის ნიმუშები არ არის +@msg there is already a design named `{name}` უკვე არსებობს დიზაინი სახელით `{name}` +@msg there is already a design named `{to}` უკვე არსებობს დიზაინი სახელით `{to}` +@msg there is already a toolbar named `{name}` უკვე არსებობს ხელსაწყოთა ზოლი სახელით `{name}` +@msg there is already a toolbar named `{to}` უკვე არსებობს ხელსაწყოთა ზოლი სახელით `{to}` +@msg there is no banner to mark ნიშნების დასასმელი ბანერი არ არის +@msg there is no library: create one first ბიბლიოთეკა არ არის: ჯერ შექმენით ის +@msg these paths are too degenerate for Shaper ეს ტრაექტორიები ფორმირებისთვის ზედმეტად გადაგვარებულია +@msg this binary DXF file is damaged or cut short ეს ორობითი DXF ფაილი დაზიანებული ან შეკვეცილია +@msg this is a DWG drawing, which can't be read: save it from the CAD app as a DXF and open that ეს DWG ნახაზია, რომლის წაკითხვაც ვერ ხერხდება: CAD აპიდან შეინახეთ DXF-ად და ის გახსენით +@msg this warp's points can't be edited: use Reset with Mesh first ამ გაღუნვის წერტილების რედაქტირება შეუძლებელია: ჯერ გამოიყენეთ „ბადით ჩამოყრა“ +@msg thumbnail: no page {v} (the {what} has {count}) ესკიზი: გვერდი {v} არ არის ({what}: {count} გვერდი) +@msg tileRange of {what}: {e} tileRange ({what}): {e} +@msg title can't be empty სათაური ცარიელი ვერ იქნება +@msg to (the new name) is required to (ახალი სახელი) აუცილებელია +@msg to must be fill or stroke to უნდა იყოს fill ან stroke +@msg to must be smooth or corner to უნდა იყოს smooth ან corner +@msg toExponential() digits must be between 0 and 20 toExponential()-ის ციფრების რაოდენობა უნდა იყოს 0-დან 20-მდე +@msg toFixed() digits must be between 0 and 20 toFixed()-ის ციფრების რაოდენობა უნდა იყოს 0-დან 20-მდე +@msg toISOString is not a function toISOString ფუნქცია არ არის +@msg toPrecision() argument must be between 1 and 21 toPrecision()-ის არგუმენტი უნდა იყოს 1-დან 21-მდე +@msg toSource: a getter cannot be written as source toSource: getter-ის წყაროდ ჩაწერა შეუძლებელია +@msg toSource: an array with properties besides its elements, a property that is not enumerable or another prototype cannot be written as source toSource: მასივის წყაროდ ჩაწერა შეუძლებელია, თუ მას ელემენტების გარდა თვისებებიც აქვს, აქვს არაჩამოთვლადი თვისება ან სხვა პროტოტიპი +@msg toSource: an object with a property that is not enumerable, or whose prototype is not Object.prototype, cannot be written as source toSource: ობიექტის წყაროდ ჩაწერა შეუძლებელია, თუ მას აქვს არაჩამოთვლადი თვისება ან მისი პროტოტიპი Object.prototype არ არის +@msg toSource: the source is too long toSource: წყარო ზედმეტად გრძელია +@msg toSource: the value contains itself toSource: მნიშვნელობა საკუთარ თავს შეიცავს +@msg toSource: the value has too many entries toSource: მნიშვნელობას ზედმეტად ბევრი ჩანაწერი აქვს +@msg toSource: the value is nested too deep toSource: მნიშვნელობა ზედმეტად ღრმადაა ჩადგმული +@msg toString is not a function toString ფუნქცია არ არის +@msg too large for a zip archive: package to a folder zip არქივისთვის ზედმეტად დიდია: შეფუთეთ საქაღალდეში +@msg too many Shaper edits ზედმეტად ბევრი ფორმირების ჩასწორება +@msg too many `points` (at most 100000) ზედმეტად ბევრი `points` (მაქსიმუმ 100000) +@msg too many arguments ზედმეტად ბევრი არგუმენტი +@msg too many characters: at most {MAX_CHARS} ზედმეტად ბევრი სიმბოლო: მაქსიმუმ {MAX_CHARS} +@msg too many classes ზედმეტად ბევრი კლასი +@msg too many dots for this size: lower the frequency ამ ზომისთვის ზედმეტად ბევრი წერტილია: შეამცირეთ სიხშირე +@msg too many filters over one file ერთ ფაილზე ზედმეტად ბევრი ფილტრია +@msg too many groups ზედმეტად ბევრი ჯგუფი +@msg too many layers for PSD (at most 32767) PSD-ისთვის ზედმეტად ბევრი შრეა (მაქსიმუმ 32767) +@msg too many overlapping paths for Shaper ფორმირებისთვის ზედმეტად ბევრი გადაფარვადი ტრაექტორიაა +@msg too many quantifiers ზედმეტად ბევრი კვანტიფიკატორი +@msg too many saved clips ზედმეტად ბევრი შენახული მომჭრელი ტრაექტორია +@msg too many saved graphics states ზედმეტად ბევრი შენახული გრაფიკული მდგომარეობა +@msg too many swatch exchange blocks ფერის ნიმუშების გაცვლის ზედმეტად ბევრი ბლოკი +@msg toolbar (a toolbar's name) must be a string toolbar (ხელსაწყოთა ზოლის სახელი) სტრიქონი უნდა იყოს +@msg toolbar name can't be empty ხელსაწყოთა ზოლის სახელი ცარიელი ვერ იქნება +@msg transparentImages {v}: "flatten" (the default) or "omit" transparentImages {v}: "flatten" (ნაგულისხმევი) ან "omit" +@msg turn on at least one side ჩართეთ მინიმუმ ერთი მხარე +@msg two saved selections would be named `{_1}` ორ შენახულ მონიშნულს ერთი და იგივე სახელი ექნებოდა: `{_1}` +@msg type dimension cannot be represented with this text transform ტექსტის ზომის წარმოდგენა ამ ტექსტის გარდაქმნით შეუძლებელია +@msg type dimension must be finite ტექსტის ზომა სასრული უნდა იყოს +@msg unexpected resources მოულოდნელი რესურსები +@msg unknown CMYK profile `{name}` უცნობი CMYK პროფილი `{name}` +@msg unknown File Info field `{k}` ფაილის ინფორმაციის უცნობი ველი `{k}` +@msg unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`) უცნობი OpenType შესაძლებლობა `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; გამოსართავად წინ დაურთეთ -; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom და aalt იღებს ალტერნატივის ნომერს ფორმით `tag=N`, სადაც N არის 0-დან {_1}-მდე, მაგალითად `salt=2`) +@msg unknown OpenType feature `{t}` in featureChanges (the tags `features` takes) უცნობი OpenType შესაძლებლობა `{t}` featureChanges-ში (ის ტეგები, რომლებსაც `features` იღებს) +@msg unknown PDF preset `{name}` (presets: {_1}) უცნობი PDF პრესეტი `{name}` (პრესეტები: {_1}) +@msg unknown Warp style გაღუნვის უცნობი სტილი +@msg unknown alignToPath `{a}` უცნობი alignToPath `{a}` +@msg unknown arrowhead {v} უცნობი ისრის წვერი {v} +@msg unknown artboardLayout key `{k}` (layout, columns, spacing, rightToLeft) artboardLayout-ის უცნობი გასაღები `{k}` (layout, columns, spacing, rightToLeft) +@msg unknown attribute `{attribute}` უცნობი ატრიბუტი `{attribute}` +@msg unknown attribute `{k}` უცნობი ატრიბუტი `{k}` +@msg unknown axis `{other}` (vertical|horizontal|free) უცნობი ღერძი `{other}` (vertical|horizontal|free) +@msg unknown blend mode `{b}` უცნობი შერევის რეჟიმი `{b}` +@msg unknown blend mode {b} უცნობი შერევის რეჟიმი {b} +@msg unknown brush type `{o}` ფუნჯის უცნობი ტიპი `{o}` +@msg unknown category `{c}` უცნობი კატეგორია `{c}` +@msg unknown category `{c}` ({_1}) უცნობი კატეგორია `{c}` ({_1}) +@msg unknown character `{c}` უცნობი სიმბოლო `{c}` +@msg unknown character style number field სიმბოლოს სტილის უცნობი რიცხვითი ველი +@msg unknown colour profile: {0} უცნობი ფერის პროფილი: {0} +@msg unknown dither `{d}` (diffusion, pattern, noise or none) უცნობი დიზერინგი `{d}` (diffusion, pattern, noise ან none) +@msg unknown effect `{e}` უცნობი ეფექტი `{e}` +@msg unknown end {e} უცნობი ბოლო {e} +@msg unknown flattenerPreset `{name}` (High Resolution, Medium Resolution, Low Resolution or a saved one: see flattener.presets.list) უცნობი flattenerPreset `{name}` (High Resolution, Medium Resolution, Low Resolution ან შენახული: იხ. flattener.presets.list) +@msg unknown format `{f}` (vcswatches, gpl, ase or css) უცნობი ფორმატი `{f}` (vcswatches, gpl, ase ან css) +@msg unknown from {f} უცნობი from {f} +@msg unknown graph type `{t}` დიაგრამის უცნობი ტიპი `{t}` +@msg unknown grid colours `{name}` (one of {_1}) ბადის უცნობი ფერები `{name}` (ერთ-ერთი: {_1}) +@msg unknown gridType `{t}` უცნობი gridType `{t}` +@msg unknown highlight `{v}` უცნობი გამოკვეთა `{v}` +@msg unknown intent `{i}` უცნობი განზრახვა `{i}` +@msg unknown issue kind {id} პრობლემის უცნობი სახეობა {id} +@msg unknown issue kind {v} პრობლემის უცნობი სახეობა {v} +@msg unknown knockout state {k} ჩაკვეთის უცნობი მდგომარეობა {k} +@msg unknown language `{language}` (one of {_1}) უცნობი ენა `{language}` (ერთ-ერთი: {_1}) +@msg unknown language `{l}` (one of {_1}) უცნობი ენა `{l}` (ერთ-ერთი: {_1}) +@msg unknown method `{m}` ({_1}) უცნობი მეთოდი `{m}` ({_1}) +@msg unknown mode `{other}` (gray, rgb, hsb, lab, cmyk or web) უცნობი რეჟიმი `{other}` (gray, rgb, hsb, lab, cmyk ან web) +@msg unknown mode `{other}` (mono|cmyk) უცნობი რეჟიმი `{other}` (mono|cmyk) +@msg unknown mode `{other}` (rgb|cmyk|gray|global) უცნობი რეჟიმი `{other}` (rgb|cmyk|gray|global) +@msg unknown mode `{other}` (set, add, subtract) უცნობი რეჟიმი `{other}` (set, add, subtract) +@msg unknown mode `{o}` უცნობი რეჟიმი `{o}` +@msg unknown mode {m} უცნობი რეჟიმი {m} +@msg unknown model `{other}` უცნობი მოდელი `{other}` +@msg unknown model `{other}` (keep, new or document) უცნობი მოდელი `{other}` (keep, new ან document) +@msg unknown op {o} უცნობი ოპერაცია {o} +@msg unknown order `{o}`: toggle, front, forward, backward or back უცნობი რიგი `{o}`: toggle, front, forward, backward ან back +@msg unknown overprints `{v}` (preserve, simulate or discard) უცნობი ზედდაბეჭდვა `{v}` (preserve, simulate ან discard) +@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) +@msg unknown plate `{n}` უცნობი ფირფიტა `{n}` +@msg unknown preference `{k}` უცნობი პარამეტრი `{k}` +@msg unknown profile {id} (see stroke.widthProfile.list) უცნობი პროფილი {id} (იხ. stroke.widthProfile.list) +@msg unknown proof target `{t}` საცდელი ჩვენების უცნობი სამიზნე `{t}` +@msg unknown quotes key `{k}` (double, single) ბრჭყალების უცნობი გასაღები `{k}` (double, single) +@msg unknown reduction `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform or document) უცნობი შემცირება `{reduction}` (selective, perceptual, adaptive, web, gray, blackWhite, uniform ან document) +@msg unknown resolution `{v}` უცნობი გარჩევადობა `{v}` +@msg unknown rule `{rule}` ({_1}) უცნობი წესი `{rule}` ({_1}) +@msg unknown rule `{r}` (see color.harmony) უცნობი წესი `{r}` (იხ. color.harmony) +@msg unknown setting `{k}` უცნობი პარამეტრი `{k}` +@msg unknown shape `{v}` (circle|ellipse|square|diamond|line) უცნობი ფორმა `{v}` (circle|ellipse|square|diamond|line) +@msg unknown spacing `{o}` (smooth|steps|distance) უცნობი ინტერვალი `{o}` (smooth|steps|distance) +@msg unknown tileType `{t}` ({_1}) უცნობი tileType `{t}` ({_1}) +@msg unknown units უცნობი ერთეულები +@msg unknown units `{u}` უცნობი ერთეულები `{u}` +@msg unknown value axis `{v}` (left, right or both) მნიშვნელობების უცნობი ღერძი `{v}` (left, right ან both) +@msg unknown variation `{v}` (tintsShades|warmCool|vividMuted) უცნობი ვარიაცია `{v}` (tintsShades|warmCool|vividMuted) +@msg unknown warp style `{s}` გაღუნვის უცნობი სტილი `{s}` +@msg unknown {key} `{v}` (none, short or full) უცნობი {key} `{v}` (none, short ან full) +@msg unknown {key} profile `{n}` უცნობი {key} პროფილი `{n}` +@msg unknown {k} key `{key}` (size, position) {k}: უცნობი გასაღები `{key}` (size, position) +@msg unmatched ')' დაუწყვილებელი ')' +@msg unreadable object წაუკითხავი ობიექტი +@msg unsafe destination file name დანიშნულების ფაილის სახელი სახიფათოა +@msg unterminated character class დაუსრულებელი სიმბოლოთა კლასი +@msg unterminated group დაუსრულებელი ჯგუფი +@msg use paths or compound paths გამოიყენეთ ტრაექტორიები ან შედგენილი ტრაექტორიები +@msg useArtboards must be true or false, not {v} useArtboards უნდა იყოს true ან false და არა {v} +@msg value for `{var}` must match its variable kind ცვლადის `{var}` მნიშვნელობა მის ტიპს უნდა შეესაბამებოდეს +@msg variable `{_1}` is already defined ცვლადი `{_1}` უკვე განსაზღვრულია +@msg variable `{name}` has no `trait` ცვლადს `{name}` არ აქვს `trait` +@msg variable `{name}` is already defined ცვლადი `{name}` უკვე განსაზღვრულია +@msg variable `{name}` is declared twice ცვლადი `{name}` ორჯერაა გამოცხადებული +@msg variable `{to}` already exists ცვლადი `{to}` უკვე არსებობს +@msg view is required view აუცილებელია +@msg view must be one of {_1} view უნდა იყოს ერთ-ერთი: {_1} +@msg warpStyle can only edit an applied Warp effect warpStyle-ს მხოლოდ გამოყენებული გაღუნვის ეფექტის რედაქტირება შეუძლია +@msg width and height must be more than 0 and at most {limit} width და height უნდა იყოს 0-ზე მეტი და მაქსიმუმ {limit} +@msg width factors must be finite სიგანის კოეფიციენტები სასრული უნდა იყოს +@msg width must be positive width დადებითი უნდა იყოს +@msg width out of range width დიაპაზონს გარეთაა +@msg width/height must be > 0 width/height უნდა იყოს > 0 +@msg with no hem and no grommets there is nothing to mark ნაკეცისა და ლუვერების გარეშე ნიშნების დასასმელი არაფერია +@msg wordGap and lineGap need area type in the selection wordGap და lineGap პარამეტრებს მონიშნულში არის ტექსტი სჭირდება +@msg x and y must be finite numbers x და y სასრული რიცხვები უნდა იყოს +@msg x and y must be given together x და y ერთად უნდა იყოს მოცემული +@msg xpath needs its variables as an object xpath-ს ცვლადები ობიექტად სჭირდება +@msg xpath needs the expression as a string xpath-ს გამოსახულება სტრიქონად სჭირდება +@msg zone needs an anchor: dock beside a panel with anchor, or in a new dock column with side (Start or End) zone-ს anchor სჭირდება: მიამაგრეთ პანელის გვერდით anchor-ით, ან ახალ დოკის სვეტში side-ით (Start ან End) +@msg zoom must be positive zoom დადებითი უნდა იყოს +@msg {C}: no effect at index {list} {C}: ინდექსზე {list} ეფექტი არ არის +@msg {DEFAULT_PRESET} is protected and stays {DEFAULT_PRESET} დაცულია და რჩება +@msg {DEFAULT_PRESET} is protected: save the settings under another name {DEFAULT_PRESET} დაცულია: შეინახეთ პარამეტრები სხვა სახელით +@msg {GRANT_NOT_REMOVED}, and its settings and cache can't be moved back from {_1} to {_2}: {e} {GRANT_NOT_REMOVED}; მისი პარამეტრებისა და ქეშის უკან გადატანა ვერ ხერხდება (საიდან: {_1}, სად: {_2}): {e} +@msg {LABEL} produced an empty result {LABEL}: შედეგი ცარიელია +@msg {_1} MB of document, at most {_2} MB დოკუმენტი: {_1} MB, მაქსიმუმ {_2} MB +@msg {_1} MB of images, at most {_2} MB გამოსახულებები: {_1} MB, მაქსიმუმ {_2} MB +@msg {_1} bytes of RGBA data for a {width} × {height} image RGBA მონაცემები: {_1} ბაიტი {width} × {height} გამოსახულებისთვის +@msg {_1} can't be read, or changed since it was read: relink or update it first {_1} ვერ იკითხება ან წაკითხვის შემდეგ შეიცვალა: ჯერ ხელახლა დააკავშირეთ ან განაახლეთ +@msg {_1} can't go into {into} {_1} ვერ მოთავსდება აქ: {into} +@msg {_1} can't limit printing to low resolution: choose PDF 1.4 or later, or allow high-resolution printing {_1}: ბეჭდვის დაბალი გარჩევადობით შეზღუდვა შეუძლებელია: აირჩიეთ PDF 1.4 ან უფრო ახალი, ან დაუშვით მაღალი გარჩევადობით ბეჭდვა +@msg {_1} clashes with a built-in profile name {_1} ჩაშენებული პროფილის სახელს ემთხვევა +@msg {_1} files can't be opened yet {_1} ფაილების გახსნა ჯერ შეუძლებელია +@msg {_1} files can't be password-protected: remove the passwords or choose no standard {_1} ფაილების პაროლით დაცვა შეუძლებელია: მოხსენით პაროლები ან არ აირჩიოთ სტანდარტი +@msg {_1} files can't be {_2} {_1} ფაილები ვერ იქნება {_2} +@msg {_1} files can't carry editing data: turn off preserveEditing {_1} ფაილები რედაქტირების მონაცემებს ვერ შეიცავს: გამორთეთ preserveEditing +@msg {_1} files can't have PDF layers: turn off createLayers {_1} ფაილებს PDF შრეები ვერ ექნება: გამორთეთ createLayers +@msg {_1} files need a creation date, and this platform has no clock to give one {_1} ფაილებს შექმნის თარიღი სჭირდება, ამ პლატფორმას კი საათი არ აქვს, რომ ის მისცეს +@msg {_1} is not a folder: {e} {_1} საქაღალდე არ არის: {e} +@msg {_1} isn't a path {_1} ტრაექტორია არ არის +@msg {_1} options: {e} {_1} პარამეტრები: {e} +@msg {_1} paints nothing to rasterize {_1} არაფერს ხატავს, რასტრირებისთვის არაფერია +@msg {_1} passwords can have up to {MAX_LEGACY_PASSWORD} ASCII characters (PDF 1.7 and later take any) {_1} პაროლები შეიძლება შეიცავდეს მაქსიმუმ {MAX_LEGACY_PASSWORD} ASCII სიმბოლოს (PDF 1.7 და უფრო ახალი ნებისმიერს იღებს) +@msg {_1} with linked images or an image map writes several files: use document.export {_1} დაკავშირებული გამოსახულებებით ან გამოსახულების რუკით რამდენიმე ფაილს წერს: გამოიყენეთ document.export +@msg {_1} writes one file per artboard here: use document.export, or name one artboard {_1} აქ თითო სამუშაო დაფაზე ერთ ფაილს წერს: გამოიყენეთ document.export, ან დაასახელეთ ერთი სამუშაო დაფა +@msg {_1} × {_2} pixels is too large for GIF (at most 65535 pixels a side): lower the resolution {_1} × {_2} პიქსელი GIF-ისთვის ზედმეტად დიდია (მაქსიმუმ 65535 პიქსელი თითო მხარეზე): შეამცირეთ გარჩევადობა +@msg {_1} × {_2} pixels is too large for {_3} (at most {max} pixels a side): lower the scale {_1} × {_2} პიქსელი ზედმეტად დიდია ფორმატისთვის {_3} (მაქსიმუმ {max} პიქსელი თითო მხარეზე): შეამცირეთ მასშტაბი +@msg {_1}: belongs to another account {_1}: სხვა ანგარიშს ეკუთვნის +@msg {_1}: no usable transform to/from sRGB {_1}: sRGB-ში ან sRGB-დან გამოსაყენებელი გარდაქმნა არ არის +@msg {_1}: not a folder of its own {_1}: თავად საქაღალდე არ არის +@msg {_1}: not a plain file {_1}: ჩვეულებრივი ფაილი არ არის +@msg {_1}: {_2} and {_3} are in the way {_1}: ხელს უშლის {_2} და {_3} +@msg {code}: {0} {code}: {0} +@msg {dest}: {e} {dest}: {e} +@msg {dir}: {e} {dir}: {e} +@msg {doc} has no folder {doc}: დოკუმენტს საქაღალდე არ აქვს +@msg {file} isn't linked {file} დაკავშირებული არ არის +@msg {file} names more than one linked JavaScript file {file} ერთზე მეტ დაკავშირებულ JavaScript ფაილს ასახელებს +@msg {folder} is not a package folder {folder} შეფუთვის საქაღალდე არ არის +@msg {folder}: more than {max} files and folders {folder}: {max}-ზე მეტი ფაილი და საქაღალდე +@msg {folder}: {e} {folder}: {e} +@msg {g} is not a Live Paint group {g} ცოცხალი შეღებვის ჯგუფი არ არის +@msg {id} is not a slice {id} ნაჭერი არ არის +@msg {key} must be 0–{MAX_ADD_AROUND} pt {key} უნდა იყოს 0–{MAX_ADD_AROUND} pt +@msg {key} must be [x,y] {key} უნდა იყოს [x,y] +@msg {key} must be a percentage {min}..100 {key} უნდა იყოს პროცენტი {min}..100 +@msg {key} must be a positive number, not {n} {key} უნდა იყოს დადებითი რიცხვი და არა {n} +@msg {key} must be a positive number, not {v} {key} უნდა იყოს დადებითი რიცხვი და არა {v} +@msg {key} must be one of {_1} {key} უნდა იყოს ერთ-ერთი: {_1} +@msg {key} must be {_1}, got {s} {key} უნდა იყოს {_1}, მიღებულია {s} +@msg {key} must name a floating panel {key} უნდა ასახელებდეს მცურავ პანელს +@msg {key} must name a panel in another group {key} უნდა ასახელებდეს სხვა ჯგუფში მყოფ პანელს +@msg {key} must name a panel that shows {key} უნდა ასახელებდეს ხილულ პანელს +@msg {key} must name a registered panel {key} უნდა ასახელებდეს რეგისტრირებულ პანელს +@msg {kind} files have no transparency, and the file would have {what}: flatten it first (object.flattenTransparency) {kind} ფაილებს გამჭვირვალობა არ აქვს, ფაილს კი ექნებოდა: {what}: ჯერ გააბრტყელეთ (object.flattenTransparency) +@msg {kind} images can't be opened (see document.formats) {kind} გამოსახულებების გახსნა შეუძლებელია (იხ. document.formats) +@msg {k} `{v}` is not one of the choices {k} `{v}` შემოთავაზებულ ვარიანტებში არ არის +@msg {k} has control characters{_1} {k} შეიცავს მმართველ სიმბოლოებს{_1} +@msg {k} is too long (at most {MAX_TEXT} characters) {k} ზედმეტად გრძელია (მაქსიმუმ {MAX_TEXT} სიმბოლო) +@msg {k} must be > 0 {k} უნდა იყოს > 0 +@msg {k} must be a number (pt) or a length such as "210 mm" {k} უნდა იყოს რიცხვი (pt) ან სიგრძე, მაგალითად "210 mm" +@msg {k} must be a number from {min} to {max} {k} უნდა იყოს რიცხვი {min}-დან {max}-მდე +@msg {k} must be a number or "auto" {k} უნდა იყოს რიცხვი ან "auto" +@msg {k} must be a string {k} სტრიქონი უნდა იყოს +@msg {k} must be text {k} ტექსტი უნდა იყოს +@msg {k} must be true or false {k} უნდა იყოს true ან false +@msg {k} must be {{size?, position?}} {k} უნდა იყოს {{size?, position?}} +@msg {k}: a custom arrowhead's path needs an area to fill and at most {most} anchors and {most} subpaths, each anchor within {far} head units of its tip {k}: მომხმარებლის ისრის წვერის ტრაექტორიას სჭირდება შესავსები ფართობი და მაქსიმუმ {most} საყრდენი წერტილი და {most} ქვეტრაექტორია, თითოეული საყრდენი წერტილი წვეროდან მაქსიმუმ {far} წვერის ერთეულზე +@msg {k}: bad custom arrowhead path: {e} {k}: მომხმარებლის ისრის წვერის არასწორი ტრაექტორია: {e} +@msg {k}: bad custom arrowhead: {e} {k}: მომხმარებლის ისრის წვერი არასწორია: {e} +@msg {k}: can't read `{s}` as a length {k}: `{s}` სიგრძედ ვერ იკითხება +@msg {k}: custom must be a name {k}: custom სახელი უნდა იყოს +@msg {label} must be a number at most {max} {label} უნდა იყოს რიცხვი, მაქსიმუმ {max} +@msg {label} must be a number from -1296 to 1296 {label} უნდა იყოს რიცხვი -1296-დან 1296-მდე +@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} 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} +@msg {native}; its embedded preview can't be read either ({e}) {native}; მისი ჩაშენებული წინასწარი ხედის წაკითხვაც ვერ ხერხდება ({e}) +@msg {path}: copy takes a DCS file only when its plates are inside it; relink to it where its plate files are {path}: copy DCS ფაილს მხოლოდ მაშინ იღებს, როცა მისი ფირფიტები მის შიგნითაა; ხელახლა დააკავშირეთ იქ, სადაც მისი ფირფიტების ფაილებია +@msg {path}: could not be read {path}: წაკითხვა ვერ მოხერხდა +@msg {path}: larger than {_1} MB {path}: {_1} MB-ზე დიდია +@msg {shown} is not an XPath 1.0 function {shown} XPath 1.0 ფუნქცია არ არის +@msg {std} files are CMYK, and the file would have colours in {_1} {std} ფაილები CMYK-ია, ფაილში კი იქნებოდა ფერები სივრცეში {_1} +@msg {std} files embed their fonts, and the file would have one that isn't {std} ფაილები შრიფტებს ჩაშენებით შეიცავს, ფაილში კი იქნებოდა ჩაუშენებელი შრიფტი +@msg {target} is the file this document was read from, and reading it left things out ({what}): writing over it would lose them for good. Write another file instead, or pass acknowledgeLoss: true to replace it anyway {target} არის ფაილი, საიდანაც ეს დოკუმენტია წაკითხული, და წაკითხვისას ზოგი რამ გამოტოვდა ({what}): მასზე გადაწერისას ისინი სამუდამოდ დაიკარგება. ჩაწერეთ სხვა ფაილში, ან თუ მაინც გსურთ ჩანაცვლება, გადაეცით acknowledgeLoss: true +@msg {ty} brushes need selected art (or params.{k}) {ty} ფუნჯებს მონიშნული ნახატი სჭირდება (ან params.{k}) +@msg {v} is not an asset id {v} რესურსის იდენტიფიკატორი არ არის +@msg {v} names no layer or sublayer {v} არცერთ შრეს ან ქვეშრეს არ ასახელებს +@msg {what} can't be intertwined {what}: გადახლართვა შეუძლებელია +@msg {what} doesn't fit the paper with its bleed and marks {what} ჭრისპირა არითა და ნიშნებთან ერთად ქაღალდზე არ ეტევა +@msg {what} is not a function {what} ფუნქცია არ არის +@msg {what} would print more than {MAX_COPIES_PER_SHEET} copies on a sheet: scale it up {what} ფურცელზე {MAX_COPIES_PER_SHEET}-ზე მეტ ასლს დაბეჭდავდა: გაადიდეთ მასშტაბი +@msg {what} would print on more than {MAX_TILES} tiles: scale it down {what} {MAX_TILES}-ზე მეტ ფილაზე დაიბეჭდებოდა: შეამცირეთ მასშტაბი +@msg {what} {i} out of range {what} {i} დიაპაზონს გარეთაა +@msg {width} × {height} pixels is too large for JPEG (at most 65535 pixels a side): lower the resolution {width} × {height} პიქსელი JPEG-ისთვის ზედმეტად დიდია (მაქსიმუმ 65535 პიქსელი თითო მხარეზე): შეამცირეთ გარჩევადობა +@msg {width} × {height} pixels is too large for Targa (at most 65535 pixels a side): lower the resolution {width} × {height} პიქსელი Targa-სთვის ზედმეტად დიდია (მაქსიმუმ 65535 პიქსელი თითო მხარეზე): შეამცირეთ გარჩევადობა +@msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} პიქსელი PSD-ისთვის ზედმეტად დიდია (მაქსიმუმ {MAX_SIDE} პიქსელი თითო მხარეზე): შეამცირეთ გარჩევადობა +@msg <{_1}> isn't an element of an SVG filter <{_1}> SVG ფილტრის ელემენტი არ არის +@msg `scope` must be "document", {{artboards: [index, …]}} or {{layers: [id, …]}} `scope` უნდა იყოს "document", {{artboards: [index, …]}} ან {{layers: [id, …]}} +@msg `style` must be "pencil" or "brush", not {v} `style` უნდა იყოს "pencil" ან "brush" და არა {v} +@msg `{_1}` can't name a composite font `{_1}` კომპოზიტური შრიფტის სახელი ვერ იქნება +@msg `{_1}` is the name of an installed font `{_1}` დაყენებული შრიფტის სახელია +@msg `{_1}`: {_2} is set in `{font}`, a composite font `{_1}`: {_2} აწყობილია კომპოზიტური შრიფტით `{font}` +@msg `{name}`: give the kanji part `{name}`: მიუთითეთ კანძის ნაწილი +@msg `{name}`: parts must be an object `{name}`: parts ობიექტი უნდა იყოს +@msg `{name}`: unknown class `{k}`; the classes are kanji, kana, punctuation, symbols, roman and numerals `{name}`: უცნობი კლასი `{k}`; კლასებია kanji, kana, punctuation, symbols, roman და numerals +@msg `{name}`: unknown key `{k}` in {_1} `{name}`: უცნობი გასაღები `{k}` აქ: {_1} +@msg `{name}`: {_1} must be an object `{name}`: {_1} ობიექტი უნდა იყოს +@msg `{raw}` can't name a composite font (1 to {COMPOSITE_NAME_MAX} characters, no control characters) `{raw}` კომპოზიტური შრიფტის სახელი ვერ იქნება (1-დან {COMPOSITE_NAME_MAX}-მდე სიმბოლო, მმართველი სიმბოლოების გარეშე) +@msg a document keeps at most {COMPOSITE_FONTS_MAX} composite fonts დოკუმენტი მაქსიმუმ {COMPOSITE_FONTS_MAX} კომპოზიტურ შრიფტს ინახავს +@msg action step {_1} (`{id}`) failed: {reason} მოქმედების ნაბიჯი {_1} (`{id}`) ვერ შესრულდა: {reason} +@msg an SVG filter has at most {MAX_PRIMITIVES} primitives SVG ფილტრს მაქსიმუმ {MAX_PRIMITIVES} პრიმიტივი აქვს +@msg an SVG filter has no event attributes such as {_1} SVG ფილტრს მოვლენის ატრიბუტები, როგორიცაა {_1}, არ აქვს +@msg an SVG filter is at most {_1} KB SVG ფილტრის ზომა მაქსიმუმ {_1} KB-ია +@msg an SVG filter's elements nest at most {MAX_DEPTH} deep SVG ფილტრის ელემენტები მაქსიმუმ {MAX_DEPTH} დონეზეა ჩადგმული +@msg an SVG filter's id is at most {MAX_NAME} characters SVG ფილტრის id მაქსიმუმ {MAX_NAME} სიმბოლოა +@msg an SVG filter's images are PNG, JPEG, GIF or WebP data: URLs SVG ფილტრის გამოსახულებები PNG, JPEG, GIF ან WebP data: URL-ებია +@msg an SVG filter's images have at most {MAX_IMAGE_PIXELS} pixels in all SVG ფილტრის გამოსახულებებს სულ მაქსიმუმ {MAX_IMAGE_PIXELS} პიქსელი აქვს +@msg commands[{i}]: `prefs.import` runs on its own, not as a batch step commands[{i}]: `prefs.import` ცალკე სრულდება და არა პაკეტის ნაბიჯად +@msg dataBase64 is not base64 dataBase64 base64 არ არის +@msg each font must be {{name, parts}} თითოეული შრიფტი უნდა იყოს {{name, parts}} +@msg each font needs a name თითოეულ შრიფტს სახელი სჭირდება +@msg feTurbulence's numOctaves is at most {MAX_OCTAVES} feTurbulence-ის numOctaves მაქსიმუმ {MAX_OCTAVES}-ია +@msg fonts must be a list of composite fonts fonts კომპოზიტური შრიფტების სია უნდა იყოს +@msg give fonts: [{{name, parts}}…] მიუთითეთ fonts: [{{name, parts}}…] +@msg give one of path, data or dataBase64 მიუთითეთ ერთ-ერთი: path, data ან dataBase64 +@msg knockout groups with too many overlapping translucent elements are written as PDF knockout groups: their translucent elements knock out what they cover fully ჩაკვეთილი ჯგუფები, რომლებშიც ზედმეტად ბევრი ნახევრად გამჭვირვალე ელემენტი ერთმანეთს ფარავს, PDF-ის ჩაკვეთილ ჯგუფებად იწერება: მათი ნახევრად გამჭვირვალე ელემენტები სრულად ჩაკვეთს იმას, რასაც ფარავს +@msg names must be a list of names names სახელების სია უნდა იყოს +@msg names must be strings names სტრიქონები უნდა იყოს +@msg no composite font კომპოზიტური შრიფტი არ არის +@msg no composite font named `{n}` კომპოზიტური შრიფტი სახელით `{n}` არ არის +@msg no composite fonts to export საექსპორტო კომპოზიტური შრიფტები არ არის +@msg no pattern `{pat}` პატერნი `{pat}` არ არის +@msg not a composite fonts file: no compositeFonts list ეს კომპოზიტური შრიფტების ფაილი არ არის: compositeFonts სია არ არის +@msg not a composite fonts file: {e} ეს კომპოზიტური შრიფტების ფაილი არ არის: {e} +@msg numbers out of order in {{}} quantifier {{}} კვანტიფიკატორში რიცხვები არასწორი რიგითაა +@msg path is empty path ცარიელია +@msg plugin.remove: {_1}: {e}: nothing was removed plugin.remove: {_1}: {e}: არაფერი წაშლილა +@msg the element needs an id, the filter's name ელემენტს id სჭირდება — ფილტრის სახელი +@msg the SVG filter can't be drawn: check its primitives and their inputs SVG ფილტრის დახატვა შეუძლებელია: შეამოწმეთ მისი პრიმიტივები და მათი შესავლები +@msg the SVG filter has no primitives SVG ფილტრს პრიმიტივები არ აქვს +@msg the SVG filter is too large once its attributes are written out ატრიბუტების ჩაწერის შემდეგ SVG ფილტრი ზედმეტად დიდია +@msg the SVG filter isn't valid XML: {e} SVG ფილტრი სწორი XML არ არის: {e} +@msg the file holds more than {COMPOSITE_FONTS_MAX} composite fonts ფაილი {COMPOSITE_FONTS_MAX}-ზე მეტ კომპოზიტურ შრიფტს შეიცავს +@msg the file holds no composite fonts ფაილი კომპოზიტურ შრიფტებს არ შეიცავს +@msg the file holds two composite fonts named `{_1}` ფაილი შეიცავს ორ კომპოზიტურ შრიფტს სახელით `{_1}` +@msg the file is larger than 4 MB ფაილი 4 MB-ზე დიდია +@msg the paint is not a freeform gradient (apply one with paint.editGradient {{kind: "freeform"}}) საღებავი თავისუფალი ფორმის გრადიენტი არ არის (გამოიყენეთ paint.editGradient {{kind: "freeform"}}) +@msg the plug-in store can't be locked პლაგინების საცავის ჩაკეტვა ვერ ხერხდება +@msg two composite fonts are named `{_1}` ორ კომპოზიტურ შრიფტს ერთი სახელი აქვს: `{_1}` +@msg unknown key `{k}`; a font takes name and parts უცნობი გასაღები `{k}`; შრიფტი იღებს name-სა და parts-ს +@msg {C}: {_1}: {e}: nothing was installed {C}: {_1}: {e}: არაფერი დაყენებულა +@msg {EXPORT_SELECTION} must be true or false, not {v} {EXPORT_SELECTION} უნდა იყოს true ან false და არა {v} +@msg {k}: baseline must be {_1} to {_2}% {k}: საბაზისო ხაზი უნდა იყოს {_1}-დან {_2}%-მდე +@msg {k}: give a font {k}: მიუთითეთ შრიფტი +@msg {k}: only kana can be scaled at the center {k}: ცენტრიდან მასშტაბირება მხოლოდ კანას შეიძლება +@msg {k}: only kana, roman and numerals can be scaled {k}: მასშტაბირება მხოლოდ კანას, რომაულს და ციფრებს შეიძლება +@msg {k}: scale must be {_1} to {_2}% {k}: მასშტაბი უნდა იყოს {_1}-დან {_2}%-მდე +@msg {k}: size must be {_1} to {_2}% {k}: ზომა უნდა იყოს {_1}-დან {_2}%-მდე +@msg {what} is at most {max} {what} მაქსიმუმ {max}-ია From 4d3a21eca7eb702522c4ce17acd925d7d9c1a6e1 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 10:45:30 -0800 Subject: [PATCH 11/50] PSD: Open and Place without Link ask how a layered file's layers come in File > Open of a PSD or PSB file with two or more layers now shows PSD Import Options: Convert Layers to Objects (with Import Hidden Layers) or Flatten Layers to a Single Image. File > Place shows the same dialog for such a file placed without Link, and so does a file dropped on the canvas with Shift held. Several files placed together without Link take the choices made last. A file placed with Link keeps its flat image. file.place takes layers and hiddenLayers: with layers: true the layers come in as one group named after the file, a layer as an image and a layer group as a group, at the place the merged image would take and clipped to the canvas when layers reach past it. link: true with layers is an error, and so is hiddenLayers without layers. file.place.queue and file.place.info pass both on. document.psdInfo counts a file's layers from its layer records without decoding pixels. Docs: the params text, docs/mcp.md, docs/file-format-parity.md and docs/target-app-parity.md. --- crates/engine/src/cmd/fileio.rs | 2 + crates/engine/src/cmd/fileio/commands.rs | 11 +- crates/engine/src/cmd/fileio/load.rs | 13 +- crates/engine/src/cmd/fileio/psdlayers.rs | 59 +++ .../engine/src/cmd/fileio/tests_psdlayers.rs | 188 +++++++++- crates/engine/src/cmd/place.rs | 83 ++++- crates/engine/tests/import_fuzz.rs | 5 + crates/ui-egui/src/dialogs.rs | 2 + crates/ui-egui/src/dialogs/psd_import.rs | 346 ++++++++++++++++++ crates/ui-egui/src/io/open.rs | 10 +- crates/ui-egui/src/place.rs | 11 +- crates/ui-egui/src/state.rs | 4 + docs/file-format-parity.md | 2 +- docs/mcp.md | 39 +- docs/target-app-parity.md | 3 +- 15 files changed, 753 insertions(+), 25 deletions(-) create mode 100644 crates/ui-egui/src/dialogs/psd_import.rs diff --git a/crates/engine/src/cmd/fileio.rs b/crates/engine/src/cmd/fileio.rs index 84fb121d0c..5f0874237e 100644 --- a/crates/engine/src/cmd/fileio.rs +++ b/crates/engine/src/cmd/fileio.rs @@ -89,6 +89,8 @@ pub use naming::{NameParts as FileNameParts, parse_date as parse_file_date, rend pub(crate) use native::preview_png; pub use native::with_compression_pref; pub use pdfimport::{LoadOptions, page_document}; +pub(crate) use psdlayers::import_active as psd_layers; +pub use psdlayers::{PsdInfo, info as psd_info}; pub(crate) use save::job_for; pub(crate) use save::save as save_document; pub use save::{ diff --git a/crates/engine/src/cmd/fileio/commands.rs b/crates/engine/src/cmd/fileio/commands.rs index ca74243699..588f00c680 100644 --- a/crates/engine/src/cmd/fileio/commands.rs +++ b/crates/engine/src/cmd/fileio/commands.rs @@ -1,6 +1,6 @@ use super::access::file_list; use super::formats::formats; -use super::{CommandSpec, action_batch, always, batch, cmd, export, has_doc, has_selection, load, pdfimport, save, screens}; +use super::{CommandSpec, action_batch, always, batch, cmd, export, has_doc, has_selection, load, pdfimport, psdlayers, save, screens}; pub fn specs() -> Vec { vec![ @@ -139,6 +139,15 @@ pub fn specs() -> Vec { always, pdfimport::pdf_info ), + cmd!( + query "document.psdInfo", + "PSD Info", + [], + None, + "{path} or {name?, dataBase64} what a PSD or PSB file holds, read from its header and layer records without decoding pixels → {format: psd|psb, width, height (the canvas, px), layers (group markers not counted), hiddenLayers (the hidden ones among them), groups}; a file without layer records, or whose layer records can't be read, has layers: 0 and opens and places as its merged image; a file that is not a PSD or PSB file is an error", + always, + psdlayers::psd_info + ), cmd!( "document.exportForOffice", "Save for Office Documents…", diff --git a/crates/engine/src/cmd/fileio/load.rs b/crates/engine/src/cmd/fileio/load.rs index bb9dc3711a..c13267fda2 100644 --- a/crates/engine/src/cmd/fileio/load.rs +++ b/crates/engine/src/cmd/fileio/load.rs @@ -526,14 +526,11 @@ pub fn load_with(name: &str, bytes: &[u8], opts: &LoadOptions) -> Result } // A PSD or PSB file's layers become layers (`layers`, default on); without layers, or with // `layers: false`, its merged image opens. Layers that can't be read leave the merged image. - "psd" | "psb" if opts.layers => { - let cms = vectorcraft_color::cms::active(); - match super::psdlayers::import(bytes, opts.hidden_layers, MAX_RASTER_ALLOC, |c| cms.cmyk_to_srgb(c, false)) { - Ok(Some((doc, warnings))) => (doc, warnings, false), - Ok(None) => (raster_doc(&title, bytes)?, vec![], false), - Err(e) => (raster_doc(&title, bytes)?, vec![format!("the layers can't be read ({e}): the file opened as its merged image")], false), - } - } + "psd" | "psb" if opts.layers => match super::psdlayers::import_active(bytes, opts.hidden_layers) { + Ok(Some((doc, warnings))) => (doc, warnings, false), + Ok(None) => (raster_doc(&title, bytes)?, vec![], false), + Err(e) => (raster_doc(&title, bytes)?, vec![format!("the layers can't be read ({e}): the file opened as its merged image")], false), + }, _ if format.raster => (raster_doc(&title, bytes)?, vec![], false), _ => return Err(err(format!("{} files can't be opened yet", format.label))), }; diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index c3c45029a0..5497edebae 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -43,6 +43,7 @@ use std::cell::Cell; use std::sync::Arc; use image::RgbaImage; +use serde_json::{Value, json}; use vectorcraft_color::BlendMode; use vectorcraft_color::blend::{blend_rgb, composite}; use vectorcraft_color::cms::{Lab, lab::lab_to_srgb}; @@ -51,6 +52,7 @@ use vectorcraft_geom::Affine; use super::load::{RasterImage, as_png}; use super::psdread::{Header, Reader, byte, header, layer_channel, layer_info, long_key, row_bytes, sample, to_rgb}; +use crate::cmd::Session; use crate::cmd::place::text::mac_roman; /// Most layer groups inside one another. @@ -1527,3 +1529,60 @@ pub(super) fn import( doc.limit_depth_noting(&mut warnings); Ok(Some((doc, warnings))) } + +/// [`import`] within the memory allowed for one image, CMYK converted with the active color +/// settings: what `document.open` and `file.place` read a PSD or PSB file's layers with. +pub(crate) fn import_active(bytes: &[u8], hidden: bool) -> Result)>, String> { + let cms = vectorcraft_color::cms::active(); + import(bytes, hidden, super::MAX_RASTER_ALLOC, |c| cms.cmyk_to_srgb(c, false)) +} + +/// What a PSD or PSB file holds (`document.psdInfo`, the PSD Import Options dialog). +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +pub struct PsdInfo { + /// The large document format. + pub psb: bool, + /// The canvas, in pixels. + pub width: u32, + pub height: u32, + /// The layers, group markers left out. + pub layers: usize, + /// The layers among them that are hidden. + pub hidden: usize, + /// The layer groups. + pub groups: usize, +} + +/// What PSD or PSB file `bytes` holds, read from its header and layer records without decoding any +/// pixels. A file without layer records, or whose layer records can't be read, has no layers: it +/// opens and places as its merged image. +pub fn info(bytes: &[u8]) -> Result { + let mut r = Reader::new(bytes); + let h = header(&mut r)?; + let records = layer_info(h.layers, h.psb).filter(|info| info.len() > 2).and_then(|info| records(info, h.psb).ok()).unwrap_or_default(); + let layers = records.iter().filter(|r| r.divider == 0); + Ok(PsdInfo { + psb: h.psb, + width: h.width, + height: h.height, + layers: layers.clone().count(), + hidden: layers.filter(|r| r.hidden).count(), + groups: records.iter().filter(|r| matches!(r.divider, 1 | 2)).count(), + }) +} + +const INFO: &str = "document.psdInfo"; + +/// `document.psdInfo`. +pub(super) fn psd_info(_: &mut Session, p: &Value) -> crate::cmd::Result { + let bytes = super::source(p, INFO)?.bytes; + let i = info(&bytes).map_err(super::load::err)?; + Ok(json!({ + "format": if i.psb { "psb" } else { "psd" }, + "width": i.width, + "height": i.height, + "layers": i.layers, + "hiddenLayers": i.hidden, + "groups": i.groups, + })) +} diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index 31f670d7ff..bc56bb483c 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -1,7 +1,8 @@ //! Opening PSD and PSB files with their layers as layers (`document.open`'s `layers` and //! `hiddenLayers`): names, visibility, opacity, blend modes, groups, layer masks, clipped layers //! and blend modes VectorCraft lacks merged, 16-bit and PSB files, VectorCraft's own PSD export -//! read back, and damaged files read without a panic. +//! read back, and damaged files read without a panic. Placing them with their layers as objects +//! (`file.place`'s `layers` and `hiddenLayers`), and `document.psdInfo`. use serde_json::{Value, json}; use vectorcraft_color::BlendMode; @@ -967,10 +968,12 @@ fn damaged_layers_never_panic() { let mut f = good.clone(); f[i] = v; let _ = psdlayers::import(&f, true, 1 << 30, cms); + let _ = psdlayers::info(&f); } } for n in 0..good.len() { let _ = psdlayers::import(&good[..n], true, 1 << 30, cms); + let _ = psdlayers::info(&good[..n]); } // A layer past the memory allowed is refused, not read. assert!(psdlayers::import(&good, true, 64, cms).unwrap_err().contains("too large")); @@ -1015,3 +1018,186 @@ fn merges_keep_pass_through_groups_blending_with_what_is_below() { assert!(px.iter().zip([75, 150, 38, 255]).all(|(&a, b)| a.abs_diff(b) <= 1), "{px:?}"); } } + +/// `file.place` of `f` with `p` into a new 100 × 100 pt document, centred on (50, 50). +fn place(f: &[u8], p: Value) -> (Session, crate::cmd::Result) { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let r = s.execute("file.place", &merge(json!({"name": "layers.psd", "dataBase64": vectorcraft_format::base64_encode(f), "at": [50, 50]}), p)); + (s, r) +} + +/// The one object `file.place` placed. +fn placed(s: &Session, r: &Value) -> Node { + let id = vectorcraft_doc::NodeId(r["ids"][0].as_u64().unwrap()); + s.doc().unwrap().doc.node(id).unwrap().clone() +} + +#[test] +fn placing_with_layers_embeds_the_layers_as_one_group() { + let f = file(8, 8, &stack(), 8, false, false); + let (mut s, r) = place(&f, json!({"layers": true})); + let r = r.unwrap(); + assert_eq!((&r["format"], &r["linked"], &r["warnings"]), (&json!("psd"), &json!(false), &json!([HIDDEN_1])), "{r}"); + let g = placed(&s, &r); + assert!(matches!(g.kind, NodeKind::Group { clip: false, .. }), "one group, unclipped: its layers lie on the canvas"); + assert_eq!(name(&g), "layers.psd"); + let kids = g.children().unwrap(); + assert_eq!(kids.iter().map(|c| name(c)).collect::>(), ["Bottom", "Folder", "Screens", "Faded"], "bottom first"); + // A layer is its image, where the merged image would put it: the 8 pt canvas centred on (50, 50). + let ((x, y), px) = pixels_of(&s, &kids[0]); + assert_eq!(((x, y), px.dimensions(), px.get_pixel(3, 3).0), ((46.0, 46.0), (8, 8), [255, 0, 0, 255])); + // A group is a group of its layers; a pass-through group isn't isolated, another mode's is. + let folder = &kids[1]; + assert!(matches!(folder.kind, NodeKind::Group { .. }) && !folder.isolate && folder.blend == BlendMode::Normal); + let inner = folder.children().unwrap(); + assert_eq!(inner.iter().map(|c| name(c)).collect::>(), ["Inner A"], "the hidden layer is left out"); + assert!(matches!(inner[0].kind, NodeKind::Image(_)) && inner[0].blend == BlendMode::Multiply && (inner[0].opacity - 128.0 / 255.0).abs() < 1e-6); + let screens = &kids[2]; + assert!(screens.isolate && screens.blend == BlendMode::Screen); + let ((x, y), px) = pixels_of(&s, &screens.children().unwrap()[0]); + assert_eq!(((x, y), px.get_pixel(0, 0).0), ((48.0, 48.0), [10, 20, 30, 128])); + assert!((kids[3].opacity - 102.0 / 255.0).abs() < 1e-6, "fill opacity: {}", kids[3].opacity); + // One undo step. + s.execute("edit.undo", &json!({})).unwrap(); + assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.children().is_none_or(Vec::is_empty))); + // Hidden layers come in hidden when asked for. + let (s, r) = place(&f, json!({"layers": true, "hiddenLayers": true})); + let r = r.unwrap(); + assert_eq!(r["warnings"], json!([]), "{r}"); + let g = placed(&s, &r); + let inner: Vec<(&str, bool)> = g.children().unwrap()[1].children().unwrap().iter().map(|c| (name(c), c.visible)).collect(); + assert_eq!(inner, [("Inner A", true), ("Inner B", false)]); + // Without `layers`, the merged image, in the same box. + let (s, r) = place(&f, json!({})); + let r = r.unwrap(); + let flat = placed(&s, &r); + let ((x, y), px) = pixels_of(&s, &flat); + assert_eq!(((x, y), px.dimensions(), px.get_pixel(0, 0).0), ((46.0, 46.0), (8, 8), [128, 128, 128, 255]), "{r}"); +} + +#[test] +fn placed_layers_keep_their_masks_and_are_clipped_to_the_canvas() { + let mut masked = layer("Masked", [0, 0, 8, 8], [255, 255, 255, 255]); + masked.mask = Some(([2, 2, 4, 4], 0, 0, vec![255, 128, 0, 255])); + let (s, r) = place(&file(8, 8, &[masked], 8, false, false), json!({"layers": true})); + let g = placed(&s, &r.unwrap()); + let kids = g.children().unwrap(); + assert!(matches!(kids[0].kind, NodeKind::Image(_)), "the layer is its image"); + let m = kids[0].extras().mask.as_deref().expect("the layer mask as the image's opacity mask"); + let ((x, y), px) = pixels_of(&s, &m.art); + assert_eq!(((x, y), px.dimensions(), m.clip), ((48.0, 48.0), (2, 2), true), "the mask moves with its layer"); + // A layer that reaches past the canvas: the group is clipped to the canvas, as the merged + // image shows only the canvas. + let over = layer("Over", [-2, -2, 6, 6], [0, 255, 0, 255]); + let (s, r) = place(&file(8, 8, &[layer("Bottom", [0, 0, 8, 8], [255, 0, 0, 255]), over], 8, false, false), json!({"layers": true})); + let r = r.unwrap(); + let g = placed(&s, &r); + assert!(matches!(g.kind, NodeKind::Group { clip: true, .. }), "{r}"); + let kids = g.children().unwrap(); + let b = kids[0].geometric_bounds_with(&s.doc().unwrap().doc.symbol_boxes()).unwrap(); + assert!(matches!(kids[0].kind, NodeKind::Path { clipping: true, .. })); + assert_eq!((b.x0, b.y0, b.x1, b.y1), (46.0, 46.0, 54.0, 54.0), "the clipping path is the canvas"); + assert_eq!(kids[1..].iter().map(|c| name(c)).collect::>(), ["Bottom", "Over"]); + assert_eq!(pixels_of(&s, &kids[2]).0, (44.0, 44.0)); + // A hidden layer that reaches past the canvas clips the group too, so showing it later draws + // only the canvas. Left out, it doesn't. + let mut hidden = layer("Hidden", [-2, -2, 6, 6], [0, 255, 0, 255]); + hidden.hidden = true; + let f = file(8, 8, &[layer("Bottom", [0, 0, 8, 8], [255, 0, 0, 255]), hidden], 8, false, false); + let (s, r) = place(&f, json!({"layers": true, "hiddenLayers": true})); + let r = r.unwrap(); + let g = placed(&s, &r); + assert!(matches!(g.kind, NodeKind::Group { clip: true, .. }), "{r}"); + assert_eq!(g.children().unwrap()[1..].iter().map(|c| (name(c), c.visible)).collect::>(), [("Bottom", true), ("Hidden", false)]); + let (s, r) = place(&f, json!({"layers": true})); + assert!(matches!(placed(&s, &r.unwrap()).kind, NodeKind::Group { clip: false, .. })); +} + +#[test] +fn placing_with_layers_never_links_and_refuses_values_it_cant_use() { + let f = file(8, 8, &stack(), 8, false, false); + let dir = std::env::temp_dir().join(format!("vc-psd-place-layers-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + let path = dir.join("layers.psd"); + std::fs::write(&path, &f).unwrap(); + let from_path = |p: Value| { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let r = s.execute("file.place", &merge(json!({"path": path.to_str().unwrap()}), p)); + (s, r) + }; + // From a path, `layers` embeds: `link` is then false unless given, and `link: true` is refused. + let (s, r) = from_path(json!({"layers": true})); + let r = r.unwrap(); + assert_eq!(r["linked"], json!(false), "{r}"); + assert!(matches!(placed(&s, &r).kind, NodeKind::Group { .. })); + let (s, r) = from_path(json!({"layers": true, "link": true})); + assert!(r.unwrap_err().to_string().contains("a linked PSD file is placed as its flat image")); + assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.children().is_none_or(Vec::is_empty)), "nothing is placed"); + // Without `layers` the file is linked as before. + let (s, r) = from_path(json!({})); + let r = r.unwrap(); + assert_eq!(r["linked"], json!(true), "{r}"); + assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_))); + // A file without layers is embedded as its merged image, without a warning. + let flat = { + let mut f = file(2, 2, &[layer("x", [0, 0, 2, 2], [9, 9, 9, 255])], 8, false, false); + let at = 26 + 8; + let len = u32::from_be_bytes(f[at..at + 4].try_into().unwrap()) as usize; + f.splice(at..at + 4 + len, 0u32.to_be_bytes()); + f + }; + std::fs::write(&path, &flat).unwrap(); + let (s, r) = from_path(json!({"layers": true})); + let r = r.unwrap(); + assert_eq!((&r["linked"], &r["warnings"]), (&json!(false), &json!([])), "{r}"); + assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_))); + // Layers that are all left out: the merged image, with the importer's warnings. + let mut gone = layer("Gone", [0, 0, 2, 2], [9, 9, 9, 255]); + gone.hidden = true; + let (s, r) = place(&file(2, 2, &[gone], 8, false, false), json!({"layers": true})); + let r = r.unwrap(); + assert_eq!((&r["linked"], r["warnings"].as_array().map(Vec::len)), (&json!(false), Some(1)), "{r}"); + assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_))); + // Layers that can't be read: the merged image, with a warning. + let mut cut = file(4, 4, &[layer("x", [0, 0, 4, 4], [9, 9, 9, 255])], 8, false, false); + let at = cut.windows(4).position(|w| w == [0, 0, 0, 18]).unwrap(); + cut[at..at + 4].copy_from_slice(&1000u32.to_be_bytes()); + let (s, r) = place(&cut, json!({"layers": true})); + let r = r.unwrap(); + assert!(r["warnings"][0].as_str().unwrap().starts_with("the layers can't be read"), "{r}"); + assert!(matches!(placed(&s, &r).kind, NodeKind::Image(_))); + // Values the command can't use are errors, and nothing is placed. + for (p, why) in [ + (json!({"hiddenLayers": true}), "hiddenLayers applies to a PSD file placed with layers: true"), + (json!({"layers": true, "link": true}), "a linked PSD file is placed as its flat image"), + (json!({"layers": "yes"}), "layers must be true or false"), + (json!({"layers": true, "hiddenLayers": 1}), "hiddenLayers must be true or false"), + ] { + let (s, r) = place(&f, p.clone()); + assert!(r.unwrap_err().to_string().contains(why), "{p}"); + assert!(s.doc().unwrap().doc.layers.iter().all(|l| l.children().is_none_or(Vec::is_empty)), "{p}"); + } + let mut s = Session::new(); + s.execute("file.new", &json!({})).unwrap(); + let q = s.execute("file.place.queue", &json!({"paths": [path.to_str().unwrap()], "layers": "yes"})); + assert!(q.unwrap_err().to_string().contains("`layers` must be true or false")); + std::fs::remove_dir_all(&dir).ok(); +} + +#[test] +fn psd_info_counts_the_layers_without_opening_the_file() { + let mut s = Session::new(); + let info = |s: &mut Session, f: &[u8]| s.execute("document.psdInfo", &json!({"dataBase64": vectorcraft_format::base64_encode(f)})); + let r = info(&mut s, &file(8, 8, &stack(), 8, false, false)).unwrap(); + assert_eq!(r, json!({"format": "psd", "width": 8, "height": 8, "layers": 5, "hiddenLayers": 1, "groups": 2})); + let r = info(&mut s, &file(4, 2, &[layer("x", [0, 0, 2, 2], [9, 9, 9, 255])], 16, true, true)).unwrap(); + assert_eq!((&r["format"], &r["width"], &r["height"], &r["layers"]), (&json!("psb"), &json!(4), &json!(2), &json!(1)), "{r}"); + // Layer records that can't be read count as no layers: the file opens as its merged image. + let mut cut = file(4, 4, &[layer("x", [0, 0, 4, 4], [9, 9, 9, 255])], 8, false, false); + let at = cut.windows(4).position(|w| w == [0, 0, 0, 18]).unwrap(); + cut[at..at + 4].copy_from_slice(&1000u32.to_be_bytes()); + assert_eq!(info(&mut s, &cut).unwrap()["layers"], json!(0)); + assert!(info(&mut s, b"not a psd").unwrap_err().to_string().contains("not a PSD file")); +} diff --git a/crates/engine/src/cmd/place.rs b/crates/engine/src/cmd/place.rs index a558545e4e..fd76d87d01 100644 --- a/crates/engine/src/cmd/place.rs +++ b/crates/engine/src/cmd/place.rs @@ -4,6 +4,8 @@ //! - A raster image becomes one image at 100% of its physical size: its pixels at the resolution //! the file declares ([`fileio::ppi`]; 72 ppi when it declares none), linked to its file with //! `link` ([`super::links`]). +//! - A PSD or PSB file placed with `layers` becomes one group of its layers as objects, embedded +//! ([`fileio::psd_layers`]); otherwise it is an image like any other, its merged image. //! - An SVG becomes one group of its art; so does a DXF drawing, read with the DXF options //! (`dxf`, [`fileio::dxfimport`]), and an HP-GL plot file (`vectorcraft_cad::hpgl`). //! - An EMF, WMF or PICT picture becomes one group, clipped to its frame (`crop: "crop"`) or @@ -75,7 +77,7 @@ pub fn specs() -> Vec { "Place…", ["File"], Some("Cmd+Shift+P"), - "{path | name | dataBase64 (a file's path, or its name with its bytes), link?: true (a raster image keeps its file's path; a VectorCraft document at path becomes one locked placed document showing artboard `page`, linked to the file and read again when it changes (links.update; saving it in this app updates it at once), drawn as vectors in every output; so does a PDF/.ai page at path, showing its `crop` box, unless password or textAs: \"outlines\" is given; false: an editable copy of its art, as from dataBase64; other files are embedded), text?: {characterSet?: \"unicode\" (UTF-8, or UTF-16 with a byte-order mark; other bytes as the platform's 8-bit set) | \"ansi\" (the platform's 8-bit set), platform?: \"windows\" (Windows-1252) | \"mac\" (Mac Roman), removeLineReturns?: false (each block of lines becomes one paragraph; blank lines end paragraphs), removeParagraphReturns?: false (drop blank lines), replaceSpaces?: n (runs of n ≥ 2 spaces become a tab)} (a .txt file, placed as area type filling rect, the replaced object's bounds, or else the artboard less a 36 pt margin), template?: false (onto a new locked template layer below the current layer), replace?: false (swap the one selected object, keeping its stacking place and transform; no at/rect; refused while an object of a symbol instance's art is selected), at?: [x, y] centre (default: the first artboard's centre), rect?: [x, y, width, height] fit inside; aspect kept (wins over at), page?: 1 (PDF/.ai page, or a native document's artboard), crop?: \"crop\" (clipped to that page or artboard, default; an SVG, only when given: framed and clipped by its viewBox, else by its art's bounds) | \"bounding\" (the bounds of the art that shows, with its strokes and effects, as an export measures them: hidden objects and guides left out) | \"art\" | \"trim\" | \"bleed\" | \"media\" (a PDF page's boxes), password? (an encrypted PDF), dxf?: {…the DXF options of document.open} (a .dxf drawing: fit fills the artboard under at, else the first; fitted or uncentred art lands with its drawing's artboard on that artboard, else it is centred on at)} → {ids, name, format, linked, width, height, warnings, image?: the id of the image of a DCS file placed in a clip group, which the Links commands take}. Raster images come in at 100% of their physical size (the file's ppi, else 72); SVG, DXF, HP-GL (.plt, .hpgl, .hgl, .hpg), PDF/.ai, EMF/WMF and PICT (.pct, .pic, .pict; clipped to the picture's frame), EPS (clipped to its bounding box; as document.open reads it), a .ai saved without PDF compatibility (from its editing data, as document.open reads it: the art of the layers that show on artboard `page`, clipped to that artboard unless crop is \"bounding\") and native documents as one group, with the images, symbols, patterns, swatches and brushes they use. A DCS file (an EPS file with one program per printing plate, DCS 1.0 or 2.0) is placed only from its path with link (else an error, as are document.open and links.embed): one linked image of its plates mixed into CMYK, clipped by the clipping path its composite is drawn through, its spot plates added as spot swatches in the process equivalents the file gives (a swatch of the same name is kept, with a warning); print separations and Separations Preview show each plate on its own ink, and plate files of their own are read from its folder. One undo step; selects what it placed (unless on a template layer); never touches the clipboard. A PNG, JPEG, GIF or WebP image whose pixels can't be read (a file cut short) is an error, and nothing is placed", + "{path | name | dataBase64 (a file's path, or its name with its bytes), link?: true (a raster image keeps its file's path; a VectorCraft document at path becomes one locked placed document showing artboard `page`, linked to the file and read again when it changes (links.update; saving it in this app updates it at once), drawn as vectors in every output; so does a PDF/.ai page at path, showing its `crop` box, unless password or textAs: \"outlines\" is given; false: an editable copy of its art, as from dataBase64; other files are embedded), text?: {characterSet?: \"unicode\" (UTF-8, or UTF-16 with a byte-order mark; other bytes as the platform's 8-bit set) | \"ansi\" (the platform's 8-bit set), platform?: \"windows\" (Windows-1252) | \"mac\" (Mac Roman), removeLineReturns?: false (each block of lines becomes one paragraph; blank lines end paragraphs), removeParagraphReturns?: false (drop blank lines), replaceSpaces?: n (runs of n ≥ 2 spaces become a tab)} (a .txt file, placed as area type filling rect, the replaced object's bounds, or else the artboard less a 36 pt margin), template?: false (onto a new locked template layer below the current layer), replace?: false (swap the one selected object, keeping its stacking place and transform; no at/rect; refused while an object of a symbol instance's art is selected), at?: [x, y] centre (default: the first artboard's centre), rect?: [x, y, width, height] fit inside; aspect kept (wins over at), page?: 1 (PDF/.ai page, or a native document's artboard), crop?: \"crop\" (clipped to that page or artboard, default; an SVG, only when given: framed and clipped by its viewBox, else by its art's bounds) | \"bounding\" (the bounds of the art that shows, with its strokes and effects, as an export measures them: hidden objects and guides left out) | \"art\" | \"trim\" | \"bleed\" | \"media\" (a PDF page's boxes), password? (an encrypted PDF), layers?: false (a PSD or PSB file: true embeds its layers as one group named after the file, read as document.open reads them: an image for each layer and a group for each layer group, with the layer's name, visibility, opacity, blend mode and opacity mask, at the place its merged image would take and clipped to the canvas when layers, hidden ones included, reach past it; never linked: link is then false unless given, and link: true is refused; a file without layers is embedded as its merged image, and so are one whose layers are all left out and one whose layers can't be read, with a warning), hiddenLayers?: false (with layers: true, the hidden layers come in hidden instead of being left out; refused without it), dxf?: {…the DXF options of document.open} (a .dxf drawing: fit fills the artboard under at, else the first; fitted or uncentred art lands with its drawing's artboard on that artboard, else it is centred on at)} → {ids, name, format, linked, width, height, warnings, image?: the id of the image of a DCS file placed in a clip group, which the Links commands take}. Raster images come in at 100% of their physical size (the file's ppi, else 72); SVG, DXF, HP-GL (.plt, .hpgl, .hgl, .hpg), PDF/.ai, EMF/WMF and PICT (.pct, .pic, .pict; clipped to the picture's frame), EPS (clipped to its bounding box; as document.open reads it), a .ai saved without PDF compatibility (from its editing data, as document.open reads it: the art of the layers that show on artboard `page`, clipped to that artboard unless crop is \"bounding\") and native documents as one group, with the images, symbols, patterns, swatches and brushes they use. A DCS file (an EPS file with one program per printing plate, DCS 1.0 or 2.0) is placed only from its path with link (else an error, as are document.open and links.embed): one linked image of its plates mixed into CMYK, clipped by the clipping path its composite is drawn through, its spot plates added as spot swatches in the process equivalents the file gives (a swatch of the same name is kept, with a warning); print separations and Separations Preview show each plate on its own ink, and plate files of their own are read from its folder. One undo step; selects what it placed (unless on a template layer); never touches the clipboard. A PNG, JPEG, GIF or WebP image whose pixels can't be read (a file cut short) is an error, and nothing is placed", has_doc, place ), @@ -84,7 +86,7 @@ pub fn specs() -> Vec { "Placed File Info", [], None, - "{path | name | dataBase64 (a file's path, or its name with its bytes), page?, crop?, password?, thumbnail?: px, link?: bool, dxf?: {…} (both as file.place)} what file.place would place, without placing it → {name, format, width, height (pt at 100%), pixelWidth?, pixelHeight?, ppi?: [x, y], colorMode?: RGB|Grayscale|CMYK (raster images), plates?: [ink names] (a DCS file), warnings, thumbnailBase64?: PNG of at most `thumbnail` (≤ 512) px on its longer side}", + "{path | name | dataBase64 (a file's path, or its name with its bytes), page?, crop?, password?, thumbnail?: px, link?: bool, dxf?: {…}, layers?, hiddenLayers? (all as file.place)} what file.place would place, without placing it → {name, format, width, height (pt at 100%), pixelWidth?, pixelHeight?, ppi?: [x, y], colorMode?: RGB|Grayscale|CMYK (raster images), plates?: [ink names] (a DCS file), warnings, thumbnailBase64?: PNG of at most `thumbnail` (≤ 512) px on its longer side}", always, info ), @@ -102,7 +104,7 @@ pub fn specs() -> Vec { "Load Place Cursor", [], None, - "{paths?: [path…], files?: [{name, dataBase64}…], link?, template?, page?, crop?, text?, dxf?, thumbnail?: px} load the place cursor (the `place` tool) with up to 100 files (as file.place reads them): a click places the current file at 100% with its top-left corner there, a drag places it at the dragged size (aspect kept), ←/→ and ↑/↓ cycle the files, Esc discards the current one; each placement is a file.place, and the previous tool returns after the last → {count, files: [{name, format, width, height, thumbnailBase64?}], skipped: [{name, error}]}", + "{paths?: [path…], files?: [{name, dataBase64}…], link?, template?, page?, crop?, text?, dxf?, layers?, hiddenLayers?, thumbnail?: px} load the place cursor (the `place` tool) with up to 100 files (as file.place reads them): a click places the current file at 100% with its top-left corner there, a drag places it at the dragged size (aspect kept), ←/→ and ↑/↓ cycle the files, Esc discards the current one; each placement is a file.place, and the previous tool returns after the last → {count, files: [{name, format, width, height, thumbnailBase64?}], skipped: [{name, error}]}", has_doc, queue ), @@ -235,12 +237,38 @@ fn load(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result match psd_groups(doc) { + Some((art, natural)) => return Ok(Loaded { name, format, art, natural, warnings, link: None, board: None }), + // No layer has art: the merged image, embedded. + None => unread = warnings, + }, + // No layers: the merged image, embedded. + Ok(None) => {} + Err(e) => unread.push(format!("the layers can't be read ({e}): the file was placed as its merged image")), + } + } + } if format.raster { let img = fileio::raster_image(&src.bytes)?; let (sx, sy) = pt_per_px(img.ppi); let natural = Rect::new(0.0, 0.0, img.width as f64 * sx, img.height as f64 * sy); - let link = src.path.map(|path| super::links::link_info(path, &src.bytes)); - let warnings = fileio::size_note(&img.blob.bytes).into_iter().collect(); + let link = src.path.filter(|_| !embed).map(|path| super::links::link_info(path, &src.bytes)); + let warnings = unread.into_iter().chain(fileio::size_note(&img.blob.bytes)).collect(); return Ok(Loaded { name, format, art: Art::Image(img), natural, warnings, link, board: None }); } if pdf { @@ -300,6 +328,47 @@ fn load(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result Option<(Art, Rect)> { + let canvas = doc.artboards.first()?.rect; + let nodes = psd_objects(&std::mem::take(&mut doc.layers)); + // Hidden layers count too: showing one later must not draw past the canvas. + let symbols = doc.symbol_boxes(); + let reached = nodes.iter().fold(None, |acc, n| vectorcraft_geom::union_opt(acc, reach(&symbols, n)))?; + let past = reached.union(canvas) != canvas; + Some((Art::Vector { src: Box::new(doc), nodes, clip: past.then_some(canvas) }, canvas)) +} + +/// The bounds of `n` and every object inside it, hidden ones included. +fn reach(symbols: &SymbolBoxes, n: &Node) -> Option { + match n.children() { + Some(kids) => kids.iter().fold(None, |acc, k| vectorcraft_geom::union_opt(acc, reach(symbols, k))), + None => n.geometric_bounds_with(symbols), + } +} + +/// The layers a PSD import made as objects: a layer of sublayers as a group of them, and a layer +/// holding one image as that image, each with the layer's name, visibility, opacity, blend mode, +/// isolation and opacity mask. +fn psd_objects(layers: &[Arc]) -> Vec { + layers + .iter() + .map(|l| { + let mut n = (**l).clone(); + let NodeKind::Layer { children, .. } = &l.kind else { return n }; + n.kind = match &children[..] { + [c] if matches!(c.kind, NodeKind::Image(_)) => c.kind.clone(), + _ => NodeKind::Group { children: psd_objects(children).into_iter().map(Arc::new).collect(), clip: false }, + }; + n + }) + .collect() +} + /// Page `page` (1-based) of the PDF/.ai/.ait file `src` (`bytes`, read from `path` when there is /// one) as art to place: clipped to the box `opts.crop` names, or (`bounding`) the bounds of its /// art; read with `opts.password`. Only the page placed is read. A .ai saved without PDF @@ -799,7 +868,7 @@ fn read_queue(doc: u64, p: Value, queued: Vec) -> Result { let thumbnail = p.get("thumbnail").and_then(Value::as_f64); let (mut entries, mut files, mut skipped) = (vec![], vec![], vec![]); for mut q in queued { - for k in ["link", "template", "page", "crop", "text", "dxf"] { + for k in ["link", "template", "page", "crop", "text", "dxf", "layers", "hiddenLayers"] { if let Some(v) = p.get(k) { q[k] = v.clone(); } @@ -845,7 +914,7 @@ impl Session { /// desktop the Place dialog's OK with several files does this off the UI thread). pub fn prepare_place_queue(&self, params: &Value) -> Result { has_doc(self).map_err(|why| EngineError::Disabled(QUEUE.into(), why))?; - check_switches(params, &["link", "template"], QUEUE)?; + check_switches(params, &["link", "template", "layers", "hiddenLayers"], QUEUE)?; check_numbers(params, &["thumbnail"], QUEUE)?; let files = queued_files(params)?; Ok(QueueJob { doc: self.doc()?.uid, params: params.clone(), files }) diff --git a/crates/engine/tests/import_fuzz.rs b/crates/engine/tests/import_fuzz.rs index 7e613460cd..1f8d02bed9 100644 --- a/crates/engine/tests/import_fuzz.rs +++ b/crates/engine/tests/import_fuzz.rs @@ -1812,6 +1812,7 @@ proptest! { /// Mutated copies of the PSD and PSB samples never crash opening them with their layers, hidden /// ones too: the PSD's layer records, channel lengths and data, and the PSB's layer count. /// (Masks, clipping and groups are covered by `tests_psdlayers::damaged_layers_never_panic`.) + /// Neither does `document.psdInfo`, nor placing them with their layers as objects. #[test] fn mutated_layered_psds_open_without_panics(which in 6usize..8, cut in 0usize..1_000_000, edits in prop::collection::vec((0usize..1_000_000, any::()), 0..12)) { let (name, mut bytes) = raster_samples().swap_remove(which); @@ -1826,6 +1827,10 @@ proptest! { let mut s = vectorcraft_engine::Session::new(); let p = json!({"name": name, "dataBase64": vectorcraft_format::base64_encode(&bytes), "hiddenLayers": true}); let _ = no_panic(s.execute("document.open", &p)); + let _ = no_panic(s.execute("document.psdInfo", &p)); + let _ = no_panic(s.execute("file.new", &json!({}))); + let p = json!({"name": name, "dataBase64": vectorcraft_format::base64_encode(&bytes), "layers": true, "hiddenLayers": true}); + let _ = no_panic(s.execute("file.place", &p)); }); prop_assert!(r.is_ok(), "{name}: panicked: {:?}", r.err()); } diff --git a/crates/ui-egui/src/dialogs.rs b/crates/ui-egui/src/dialogs.rs index 5afad21b0d..f3f8e273d9 100644 --- a/crates/ui-egui/src/dialogs.rs +++ b/crates/ui-egui/src/dialogs.rs @@ -96,6 +96,7 @@ pub mod plugin; mod png_options; pub mod print; pub mod print_presets; +pub mod psd_import; mod psd_options; pub mod raster_effects; pub mod rearrange_artboards; @@ -412,6 +413,7 @@ registry! { PluginStopped: [safe_mode::STOPPED] => safe_mode::STOPPED_SPEC, SafeMode: [safe_mode::KIND] => safe_mode::SPEC, DxfImport: [dxf_import::KIND] => dxf_import::SPEC, + PsdImport: [psd_import::KIND] => psd_import::SPEC, RasterFormatOptions: ["tiffOptions", "bmpOptions", "tgaOptions"] => png_options::SPEC, SaveForWeb: [save_for_web::KIND] => save_for_web::SPEC, PsdOptions: ["psdOptions"] => png_options::SPEC, diff --git a/crates/ui-egui/src/dialogs/psd_import.rs b/crates/ui-egui/src/dialogs/psd_import.rs new file mode 100644 index 0000000000..016d851bbf --- /dev/null +++ b/crates/ui-egui/src/dialogs/psd_import.rs @@ -0,0 +1,346 @@ +//! PSD Import Options: opening a PSD or PSB file with two or more layers, or placing one +//! without Link, asks whether its layers become objects or one flat image, and whether hidden +//! layers come in +//! (). +//! A linked file shows its flat image, so placing with Link doesn't ask. The two-layer threshold, +//! the starting choices and remembering them are VectorCraft's own. +//! +//! Fields: `mode` (`open` | `place`), `name`, `path?`, `width`, `height` (the canvas, px), +//! `layers` and `hidden` (counts, from `document.psdInfo`), `convert` (`objects` | `flatten`) and +//! `hiddenLayers`. `__place` keeps the other `file.place` params. The file's bytes stay in +//! [`crate::state::UiState::dialog_file`]. OK opens or places the file with `layers` and +//! `hiddenLayers` and remembers both choices for the next file; errors keep the dialog open. + +use serde_json::{Value, json}; +use vectorcraft_engine::cmd::fileio; + +use super::DialogSpec; +use super::import_pdf::{DialogFile, other_place_params, place_source, with_file}; +use crate::state::Dialog; +use crate::{VectorcraftApp, io, widgets}; + +pub const KIND: &str = "psdImport"; + +pub(super) const SPEC: DialogSpec = DialogSpec { + heading: |d| if d.str("mode") == "place" { tl!("Place PSD") } else { tl!("PSD Import Options") }.into(), + body, + confirm, + min_width: 380.0, + ..DialogSpec::FORM +}; + +/// The fewest layers a file has for the dialog to ask. +const MIN_LAYERS: usize = 2; + +/// Open `bytes` (or place them with the `file.place` params `place`) through the dialog when they +/// are a PSD or PSB file with [`MIN_LAYERS`] layers or more; false when they aren't (the loader +/// then opens or places the file, or says why it can't). +pub fn offer(app: &mut VectorcraftApp, name: &str, bytes: &[u8], path: Option, place: Option<&Value>) -> bool { + let Ok(info) = fileio::psd_info(bytes) else { return false }; + if info.layers < MIN_LAYERS { + return false; + } + app.ui.dialog_file = Some(DialogFile::new(bytes.to_vec())); + let (layers, hidden) = last_choices(app); + let mut fields = json!({ + "mode": if place.is_some() { "place" } else { "open" }, + "name": name, + "width": info.width, + "height": info.height, + "layers": info.layers, + "hidden": info.hidden, + "convert": if layers { "objects" } else { "flatten" }, + "hiddenLayers": hidden, + }); + if let Some(p) = path { + fields["path"] = json!(p); + } + if let Some(p) = place { + fields["__place"] = other_place_params(p, &["layers", "hiddenLayers"]); + } + app.ui.dialog = Some(Dialog::new(KIND, fields)); + true +} + +/// `file.place` with params `p` asks first (true) when they embed a PSD or PSB file (`link: false`, +/// or the file's bytes) and give no `layers`. +pub fn offer_place(app: &mut VectorcraftApp, p: &Value) -> bool { + let embedded = p.get("path").is_none() || p.get("link").and_then(Value::as_bool) == Some(false); + if !embedded || p.get("layers").is_some() { + return false; + } + let Some((name, bytes, path)) = place_source(app, p, |ext| matches!(ext, "psd" | "pdd" | "psb")) else { return false }; + offer(app, &name, &bytes, path, Some(p)) +} + +/// The PSD Import Options chosen last, at first Convert Layers to Objects without hidden layers. +fn last_choices(app: &VectorcraftApp) -> (bool, bool) { + let last = |k: &str, default: bool| app.ui.psd_import.get(k).and_then(Value::as_bool).unwrap_or(default); + (last("layers", true), last("hiddenLayers", false)) +} + +/// Several files placed without Link load the place cursor without asking: the `file.place.queue` +/// params `q` take the PSD Import Options chosen last, which apply to each PSD or PSB file among them. +pub fn queue_options(app: &VectorcraftApp, q: &mut Value) { + let (layers, hidden) = last_choices(app); + q["layers"] = json!(layers); + if layers && hidden { + q["hiddenLayers"] = json!(true); + } +} + +/// OK: open or place the file with the choices. +fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { + let file = app.ui.dialog_file.clone().ok_or("the file is no longer loaded")?; + let layers = d.str("convert") != "flatten"; + let hidden = layers && d.bool("hiddenLayers"); + app.ui.psd_import = json!({ "layers": layers, "hiddenLayers": d.bool("hiddenLayers") }); + let r = if d.str("mode") == "place" { + let mut p = with_file(d.fields.get("__place"), d, &file); + p["layers"] = json!(layers); + if layers { + // Layers are always embedded; a file from bytes may carry the Place dialog's Link. + p["link"] = json!(false); + } + if hidden { + p["hiddenLayers"] = json!(true); + } + crate::place::run_for_user(app, &p).map(|_| ()) + } else { + let path = d.fields.get("path").and_then(Value::as_str).map(str::to_string); + io::open_document(app, &d.str("name"), &file.bytes, path, &json!({ "layers": layers, "hiddenLayers": hidden })).map(|_| ()) + }; + match r { + Ok(()) => { + // Placing may have opened another dialog; only this one closes. + if app.ui.dialog.as_ref().is_some_and(|x| x.kind == KIND) { + app.ui.dialog = None; + } + Ok(Value::Null) + } + Err(e) => { + app.ui.dialog = Some(d.clone()); + Err(e) + } + } +} + +fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { + let count = |k: &str| d.fields.get(k).and_then(Value::as_u64).unwrap_or(0); + widgets::dim_label(ui, &format!("{} × {} px · {}: {}", count("width"), count("height"), tl!("Layers"), count("layers"))); + ui.add_space(8.0); + let convert = d.str("convert") != "flatten"; + if widgets::radio(ui, tl!("Convert Layers to Objects"), convert, true) { + d.fields.insert("convert".into(), json!("objects")); + } + ui.horizontal(|ui| { + ui.add_space(22.0); + let on = d.bool("hiddenLayers"); + if widgets::check(ui, tl!("Import Hidden Layers"), on && convert, convert) { + d.fields.insert("hiddenLayers".into(), json!(!on)); + } + }); + if widgets::radio(ui, tl!("Flatten Layers to a Single Image"), !convert, true) { + d.fields.insert("convert".into(), json!("flatten")); + } + false +} + +#[cfg(test)] +mod tests { + use vectorcraft_engine::Session; + use vectorcraft_engine::doc::NodeKind; + + use super::*; + + /// A PSD file of three layers, the middle one hidden, written by `document.export`. + fn layered() -> Vec { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 20, "height": 20})).unwrap(); + let back = s.doc().unwrap().doc.layers[0].id.0; + s.execute("layer.setProps", &json!({"id": back, "name": "Back"})).unwrap(); + for (name, color) in [("Back", "#ff0000"), ("Middle", "#00ff00"), ("Front", "#0000ff")] { + if name != "Back" { + s.execute("layer.new", &json!({ "name": name })).unwrap(); + } + s.execute("paint.setFill", &json!({ "color": color })).unwrap(); + s.execute("shape.rectangle", &json!({"x": 2, "y": 2, "width": 10, "height": 10})).unwrap(); + } + let middle = s.doc().unwrap().doc.layers[1].id.0; + s.execute("layer.setProps", &json!({"id": middle, "visible": false})).unwrap(); + let r = s.execute("document.export", &json!({"format": "psd", "hiddenLayers": true})).unwrap(); + vectorcraft_format::base64_decode(r["dataBase64"].as_str().unwrap()).unwrap() + } + + fn app() -> VectorcraftApp { + VectorcraftApp::new(Session::new(), Default::default()) + } + + fn frame(app: &mut VectorcraftApp) -> String { + crate::tests_labels::painted_text(app, |app, ui| super::super::show(app, ui.ctx())) + } + + fn set(app: &mut VectorcraftApp, k: &str, v: Value) { + app.ui.dialog.as_mut().unwrap().fields.insert(k.into(), v); + } + + fn layer_names(app: &VectorcraftApp) -> Vec<(String, bool)> { + app.session.doc().unwrap().doc.layers.iter().map(|l| (l.name.clone().unwrap_or_default(), l.visible)).collect() + } + + #[test] + fn opening_a_layered_file_asks_for_the_import_options() { + let psd = layered(); + let mut app = app(); + io::open_bytes(&mut app, "poster.psd", &psd, None).unwrap(); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.kind.as_str(), d.str("mode"), d.str("convert"), d.bool("hiddenLayers")), (KIND, "open".into(), "objects".into(), false)); + assert_eq!((&d.fields["layers"], &d.fields["hidden"], &d.fields["width"]), (&json!(3), &json!(1), &json!(20))); + assert!(app.session.active().is_none(), "nothing opens before OK"); + let text = frame(&mut app); + for label in [ + "PSD Import Options", + "20 × 20 px", + "Layers: 3", + "Convert Layers to Objects", + "Import Hidden Layers", + "Flatten Layers to a Single Image", + "OK", + ] { + assert!(text.contains(label), "{label} in {text}"); + } + // Layers as objects, hidden ones left out. + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(layer_names(&app), [("Back".to_string(), true), ("Front".to_string(), true)]); + // With Import Hidden Layers the hidden layer comes in hidden. + io::open_bytes(&mut app, "poster.psd", &psd, None).unwrap(); + set(&mut app, "hiddenLayers", json!(true)); + frame(&mut app); + super::super::confirm(&mut app).unwrap(); + assert_eq!(layer_names(&app), [("Back".to_string(), true), ("Middle".to_string(), false), ("Front".to_string(), true)]); + // Flatten opens one image, and the next file starts from the choices made last. + io::open_bytes(&mut app, "poster.psd", &psd, None).unwrap(); + assert!(app.ui.dialog.as_ref().unwrap().bool("hiddenLayers"), "remembered"); + set(&mut app, "convert", json!("flatten")); + frame(&mut app); + super::super::confirm(&mut app).unwrap(); + let st = app.session.doc().unwrap(); + assert_eq!(st.doc.layers.len(), 1); + assert!(matches!(st.doc.layers[0].children().map(Vec::as_slice), Some([one]) if matches!(one.kind, NodeKind::Image(_)))); + io::open_bytes(&mut app, "poster.psd", &psd, None).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().str("convert"), "flatten"); + } + + #[test] + fn files_with_fewer_than_two_layers_open_without_asking() { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 20, "height": 20})).unwrap(); + s.execute("shape.rectangle", &json!({"x": 2, "y": 2, "width": 10, "height": 10})).unwrap(); + let one = s.execute("document.export", &json!({"format": "psd"})).unwrap(); + let flat = s.execute("document.export", &json!({"format": "psd", "layers": false})).unwrap(); + for r in [one, flat] { + let bytes = vectorcraft_format::base64_decode(r["dataBase64"].as_str().unwrap()).unwrap(); + let mut app = app(); + io::open_bytes(&mut app, "one.psd", &bytes, None).unwrap(); + assert!(app.ui.dialog.is_none()); + assert!(app.session.active().is_some()); + } + } + + #[test] + fn placing_without_link_asks_and_places_the_layers_as_a_group() { + let b64 = vectorcraft_format::base64_encode(&layered()); + let mut app = app(); + app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let r = crate::place::run_for_user(&mut app, &json!({"name": "poster.psd", "dataBase64": b64, "at": [50, 50]})).unwrap(); + assert_eq!(r["dialog"], KIND); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.str("mode"), &d.fields["__place"]), ("place".into(), &json!({"at": [50, 50]}))); + assert!(frame(&mut app).contains("Place PSD")); + super::super::confirm(&mut app).unwrap(); + assert!(app.ui.dialog.is_none()); + let st = app.session.doc().unwrap(); + let [id] = st.selection.objects[..] else { panic!("one object is selected") }; + let g = st.doc.node(id).unwrap(); + assert!(matches!(g.kind, NodeKind::Group { .. })); + let names: Vec<&str> = g.children().unwrap().iter().filter_map(|c| c.name.as_deref()).collect(); + assert_eq!(names, ["Back", "Front"]); + // Flatten places the merged image. + crate::place::run_for_user(&mut app, &json!({"name": "poster.psd", "dataBase64": b64})).unwrap(); + set(&mut app, "convert", json!("flatten")); + super::super::confirm(&mut app).unwrap(); + let st = app.session.doc().unwrap(); + let [id] = st.selection.objects[..] else { panic!("one object is selected") }; + assert!(matches!(st.doc.node(id).unwrap().kind, NodeKind::Image(_))); + } + + #[test] + fn several_files_placed_without_link_take_the_last_choices() { + let dir = std::env::temp_dir().join(format!("vc-psd-import-queue-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + let paths: Vec = ["a.psd", "b.psd"] + .iter() + .map(|n| { + let p = dir.join(n); + std::fs::write(&p, layered()).unwrap(); + p.to_string_lossy().into_owned() + }) + .collect(); + // Place both through the Place dialog, then click the cursor once for each: what was placed. + let place_two = |app: &mut VectorcraftApp, link: bool| -> Vec { + let files: Vec = paths.iter().map(|p| json!({ "path": p })).collect(); + let d = Dialog::new(crate::dialogs::place::KIND, json!({"files": files, "link": link, "template": false})); + crate::place::confirm(app, &d).unwrap(); + assert!(app.ui.dialog.is_none(), "the cursor loads without asking"); + let view = vectorcraft_engine::ViewInfo::default(); + (0..2) + .map(|_| { + for kind in [vectorcraft_tools::PointerKind::Down, vectorcraft_tools::PointerKind::Up] { + for r in app.session.pointer(&vectorcraft_tools::PointerEvent::new(kind, 10.0, 10.0), view).unwrap() { + if let vectorcraft_engine::UiRequest::Place(p) = r { + crate::place::place_from_cursor(app, &p); + } + } + } + let st = app.session.doc().unwrap(); + let [id] = st.selection.objects[..] else { panic!("one object is placed") }; + st.doc.node(id).unwrap().clone() + }) + .collect() + }; + let visible = |n: &vectorcraft_engine::doc::Node| -> Vec { n.children().unwrap().iter().map(|c| c.visible).collect() }; + let mut app = app(); + app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + // At first, Convert Layers to Objects without hidden layers. + for n in place_two(&mut app, false) { + assert!(matches!(n.kind, NodeKind::Group { .. })); + assert_eq!(visible(&n), [true, true]); + } + // Then the choices made last. + app.ui.psd_import = json!({"layers": true, "hiddenLayers": true}); + for n in place_two(&mut app, false) { + assert_eq!(visible(&n), [true, false, true]); + } + app.ui.psd_import = json!({"layers": false, "hiddenLayers": true}); + assert!(place_two(&mut app, false).iter().all(|n| matches!(n.kind, NodeKind::Image(_)))); + // Placed with Link, the files keep their flat images. + app.ui.psd_import = json!({"layers": true, "hiddenLayers": false}); + assert!(place_two(&mut app, true).iter().all(|n| matches!(n.kind, NodeKind::Image(_)))); + std::fs::remove_dir_all(&dir).ok(); + } + + #[test] + fn scripted_places_and_places_that_give_layers_dont_ask() { + let b64 = vectorcraft_format::base64_encode(&layered()); + let mut app = app(); + app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + // `file.place` run as a command places at once, as before. + let r = crate::place::run(&mut app, &json!({"name": "poster.psd", "dataBase64": b64})).unwrap(); + assert!(app.ui.dialog.is_none()); + assert_eq!(r["format"], "psd"); + // The user's place with `layers` given doesn't ask either. + crate::place::run_for_user(&mut app, &json!({"name": "poster.psd", "dataBase64": b64, "layers": false})).unwrap(); + assert!(app.ui.dialog.is_none()); + } +} diff --git a/crates/ui-egui/src/io/open.rs b/crates/ui-egui/src/io/open.rs index e0e4e4c404..f771fba718 100644 --- a/crates/ui-egui/src/io/open.rs +++ b/crates/ui-egui/src/io/open.rs @@ -52,10 +52,12 @@ fn open_bytes_with(app: &mut VectorcraftApp, name: &str, bytes: &[u8], path: Opt let load = if swatches { crate::panels::swatches::load_library } else { crate::panels::graphic_styles::load_library }; return load(app, p).map(|_| Value::Null); } - // A PDF with several pages or a password asks first (the Import PDF dialog), and so does a - // DXF drawing (DXF Import Options). + // A PDF with several pages or a password asks first (the Import PDF dialog), and so do a DXF + // drawing (DXF Import Options) and a PSD file with several layers (PSD Import Options), unless + // `p` says how its layers come in. if crate::dialogs::import_pdf::offer(app, name, bytes, path.clone(), None) || crate::dialogs::dxf_import::offer(app, name, bytes, path.clone(), None) + || (p.get("layers").is_none() && crate::dialogs::psd_import::offer(app, name, bytes, path.clone(), None)) { return Ok(Value::Null); } @@ -552,9 +554,11 @@ fn open_file_with(app: &mut VectorcraftApp, path: &str, background: bool, p: &Va check_import_size(path, false)?; let mut bytes = read(app, path)?; if background && opens_as(path).is_none() { - // A PDF with several pages or a password, or a DXF drawing, asks first, as at once. + // A PDF with several pages or a password, a DXF drawing, or a PSD file with several layers + // asks first, as at once. if crate::dialogs::import_pdf::offer(app, path, &bytes, Some(path.to_string()), None) || crate::dialogs::dxf_import::offer(app, path, &bytes, Some(path.to_string()), None) + || (p.get("layers").is_none() && crate::dialogs::psd_import::offer(app, path, &bytes, Some(path.to_string()), None)) { note_recent(app, path); return Ok(Value::Null); diff --git a/crates/ui-egui/src/place.rs b/crates/ui-egui/src/place.rs index fff3587182..50f3bec7fb 100644 --- a/crates/ui-egui/src/place.rs +++ b/crates/ui-egui/src/place.rs @@ -152,6 +152,11 @@ fn place_file(app: &mut VectorcraftApp, p: &Value, read: Read) -> Result Result { let paths: Vec<&Value> = many.iter().filter_map(|s| s.get("path")).collect(); let files: Vec<&Value> = many.iter().filter(|s| s.get("path").is_none()).collect(); - queue_files(app, &json!({ "paths": paths, "files": files, "link": link, "template": template }), Read::ForUser { dropped: false }) + let mut q = json!({ "paths": paths, "files": files, "link": link, "template": template }); + if !link { + crate::dialogs::psd_import::queue_options(app, &mut q); + } + queue_files(app, &q, Read::ForUser { dropped: false }) } }; app.place.picked.clear(); diff --git a/crates/ui-egui/src/state.rs b/crates/ui-egui/src/state.rs index 80a87b4563..b160dacabf 100644 --- a/crates/ui-egui/src/state.rs +++ b/crates/ui-egui/src/state.rs @@ -816,6 +816,9 @@ pub struct UiState { /// never used). #[serde(default)] pub dxf_import: Value, + /// The PSD Import Options chosen last (layers, hiddenLayers; null: never used). + #[serde(default)] + pub psd_import: Value, /// The Home screen is shown over the open documents (`app.home`): the active document's uid /// and the document count when it opened. Choosing a tab, or a document opening, closing or /// becoming active, leaves it. @@ -1233,6 +1236,7 @@ impl Default for UiState { transform_each: Value::Null, rearrange_artboards_spacing: Value::Null, dxf_import: Value::Null, + psd_import: Value::Null, home: None, trace_hold_source: None, layers_panel: Default::default(), diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index a5ff38be13..1835ec9179 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -290,7 +290,7 @@ Names in the editing data that aren't UTF-8 (layers, objects, artboards, colors, | HP-GL/2 `.plt`, `.hpgl`, `.hgl`, `.hpg` | — | yes (pen moves, pens and widths, line types and attributes, circles, arcs, wedges and Bézier curves, filled and edged rectangles, wedges and polygons, encoded polylines, scaling and rotation; labels, symbol mode, raster images and hatching aren't drawn) | yes (`.plt`: each visible path once along its line, a pen per color or a pen table, type as outlines, clipping applied, HP-GL or HP-GL/2 with pen colors and encoded polylines) | recognized by its first instructions after any printer escapes, under its own extensions or one no other format reads; `crates/cad/src/hpgl/tests.rs`, `crates/cad/src/hpgl/write/tests.rs` (plots read back by the reader), `tests_hpgl.rs`, `import_fuzz.rs` | | DWG | open, export | no | no | no open spec; DXF instead | | EMF / WMF | open, export | yes | yes | an oversized embedded PNG or JPEG is refused from its header, before any pixels are decoded (#1776) | -| PSD | open, place, export | yes (open: layers as layers, or the merged image with `layers: false`; place: merged image; every mode and depth; `.psd` and `.pdd`) | yes (layered, max editability) | placing as layers and a PSD import options dialog missing; the embedded ICC profile's tags are 4-byte aligned (#1584) | +| PSD | open, place, export | yes (open: layers as layers, or the merged image with `layers: false`; place: merged image, or the layers embedded as a group of objects with `layers: true`; every mode and depth; `.psd` and `.pdd`) | yes (layered, max editability) | PSD Import Options on File › Open and on File › Place without Link (Convert Layers to Objects, Flatten Layers to a Single Image, Import Hidden Layers; `tests_psdlayers.rs`, `dialogs/psd_import.rs`); layer comps and slices aren't read; the embedded ICC profile's tags are 4-byte aligned (#1584) | | PSB | open | yes (layers as layers, or the merged image) | no | | | PNG / JPEG / GIF / BMP / TIFF / Targa | open, place, export | yes (PNG: `.png` and `.pns`; BMP: `.bmp`, `.dib` and `.rle`; Targa: `.tga`, `.vda`, `.icb` and `.vst`, raw or run-length encoded, with a 16-bit file's one-bit alpha) | yes; TIFF is also selectable in Export for Screens and Asset Export with its existing options | Targa: `tests_tiffbmp.rs`, `tests/links.rs`; TIFF: grayscale with an alpha channel or other extra channels reads (#1466 in part), and so do files that store each channel as its own plane (PlanarConfiguration 2), CMYK ones with their ink amounts, and 1-bit files compressed with CCITT Group 3 (Compression 2 and 3, one- and two-dimensional rows); the ICC profiles embedded in JPEG and TIFF have 4-byte aligned tags (#1584); PNG export marks its colours as sRGB (`embedIcc`, an `sRGB` chunk; no ICC profile is embedded, #2221) | | WebP | export (Export for Screens) | yes | yes (lossless only; lossy written lossless with a warning) | | diff --git a/docs/mcp.md b/docs/mcp.md index 37ffd74300..2b213e9816 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -8084,6 +8084,42 @@ flattened picture every PSD file carries: Bitmap, Grayscale, Duotone, Indexed, R A document with transparency keeps it. `file.place {path}` links the file like any image (`links.update` reads it again when it changes); Multichannel files are refused. +`file.place` with `layers: true` embeds a PSD or PSB file's layers as objects instead, and `hiddenLayers: true` +brings the hidden layers in, hidden. The +[PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) +offer the conversion and the hidden layers only for a file that is opened or embedded, and a linked file shows its +flat image. The rest are VectorCraft's own rules: + +- The layers are read as `document.open` reads them (below) and placed as one group named after the file. A layer + becomes an image and a layer group becomes a group, each with the layer's name, visibility, opacity, blend mode + and opacity mask. A Pass Through group is not isolated; a group in any other mode is. +- The group takes the place the merged image would take: `at` centers the file's canvas and `rect` fits it. When + layers reach past the canvas, hidden layers included, the group is a clip group whose clipping path is the canvas. +- The layers are never linked. With `layers: true`, `link` is false unless it is given, and `link: true` is an + error. +- `hiddenLayers: true` without `layers: true` is an error. +- A file without layers is embedded as its merged image, and so is a file whose layers are all left out, with the + import's warnings. A file whose layers can't be read is embedded as its merged image with a warning. +- `file.place.queue` and `file.place.info` take `layers` and `hiddenLayers` too. + +`document.psdInfo` reads a PSD or PSB file without opening it: its `format` (`psd` or `psb`), the canvas `width` +and `height` in pixels, and the counts `layers` (group markers left out), `hiddenLayers` and `groups`. A file +without layer records, or whose layer records can't be read, has `layers: 0`. A file that is not a PSD or PSB file +is an error. + +In the app, File › Open of a PSD or PSB file with two or more layers shows PSD Import Options: Convert Layers to +Objects (with Import Hidden Layers) or Flatten Layers to a Single Image. File › Place shows the same dialog for +such a file placed without Link, and so does a file dropped on the canvas with Shift held. The dialog starts from +the choices made last, at first Convert Layers to Objects without hidden layers. A file with fewer than two +layers, a file placed with Link, and `document.open` and `file.place` run as commands don't show it. Several files +placed together without Link load the place cursor without asking, and each PSD or PSB file among them comes in +with the choices made last. + +```json +{"name":"run_command","arguments":{"command":"file.place","params":{"path":"/tmp/poster.psd","layers":true,"hiddenLayers":true}}} +{"name":"run_command","arguments":{"command":"document.psdInfo","params":{"path":"/tmp/poster.psd"}}} +``` + `document.open` converts a PSD or PSB file's layers to objects. In [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html), the option that converts layers to objects keeps as much of the layer structure as it can, merges the layers of a @@ -8132,8 +8168,7 @@ Each layer's pixels must fit the memory allowed for one image, and the pixels of canvases the merges make, must together fit eight times that; a file past either limit opens as its merged image, with a warning. The canvases one step of a merge holds at once must also fit the memory allowed for one image; when they don't, the layer that needed the merge comes in alone, with a warning: in the Normal mode, or as a layer of its -own instead of clipped. File › Open in the app has no PSD import options dialog: it converts the layers and leaves -hidden layers out. +own instead of clipped. ```json {"name":"run_command","arguments":{"command":"document.open","params":{"path":"/tmp/poster.psd","hiddenLayers":true}}} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 9ba8866a8c..2564c83866 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1771,7 +1771,8 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur EPS export and EPS Save make each file's PNG thumbnail from its TIFF preview, averaging the preview's pixels down to the thumbnail's size on white, instead of drawing the document a second time; a file without a preview still draws its thumbnail (`crates/engine/src/cmd/fileio/tests_eps.rs`). - Targa files (`.tga`, `.vda`, `.icb`, `.vst`) open, place linked or embedded, relink and update at their pixel size: color-mapped, true-color and black-and-white, raw or run-length encoded, in any of the four row orders. The image descriptor's attribute bits and the extension area's Attributes Type decide the transparency: a file with no attribute bits, or with attribute data the Attributes Type calls undefined, opens opaque; with one bit, a 16-bit true-color pixel takes that bit as its alpha, and a color-mapped pixel takes the bit of the 16-bit color map entry it indexes; premultiplied colors are divided by their alpha. Open and Place recognize a Targa file by its extension, and `clipboard.importImage` and Glass's Load Texture… by its header; a Targa file copied in a file manager pastes as a bitmap (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/tests/links.rs`). - BMP files named `.dib` or `.rle` (run-length encoded bitmaps included), Photoshop files named `.pdd` and PNG files named `.pns` open and place, linked or embedded, as BMP, PSD and PNG files, in any letter case: the Open and Place dialogs list them with their format, the Links panel names their format, and Edit Original opens them. Exports write only `.bmp`, `.psd` and `.png` (`crates/engine/src/cmd/fileio/tests_tiffbmp.rs`, `crates/engine/src/cmd/fileio/tests_psdread.rs`, `crates/engine/src/tests/links.rs`). - - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), and adjustment layers, layer effects, knockouts and vector masks aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels. There is no PSD import options dialog yet (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). + - File › Open converts a PSD or PSB file's layers to objects, keeping the layer structure, merging clipped layers into one layer and leaving out hidden layers that would need a merge, as [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for the option that converts layers to objects; hidden layers come in with `hiddenLayers`, as Import Hidden Layers brings them in, and `layers: false` opens the merged image. VectorCraft's own rules: each layer becomes a layer holding its pixels with its name, visibility, opacity and blend mode, groups become layers of sublayers, layers in Dissolve, Linear Burn, Linear Dodge, Vivid Light, Linear Light, Pin Light, Hard Mix, Subtract, Divide, Darker Color and Lighter Color are merged with the layers below, layer masks become opacity masks, fill opacity multiplies the opacity (in a layer that others are clipped to, it fades only that layer's own pixels), and adjustment layers, layer effects, knockouts and vector masks aren't applied and are counted in the warnings. 8-, 16- and 32-bit files, PSB, raw, PackBits and zipped channels (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`). + - File › Open of a PSD or PSB file with two or more layers, and File › Place of one without Link, show PSD Import Options: Convert Layers to Objects with Import Hidden Layers, or Flatten Layers to a Single Image, the options [PSD import options](https://helpx.adobe.com/illustrator/desktop/add-and-import-files/import-from-other-apps/photoshop-import-options.html) describes for a file that is opened or embedded. A file placed with Link shows its flat image and isn't asked about. `file.place` takes `layers` and `hiddenLayers`, and `document.psdInfo` counts a file's layers without opening it. VectorCraft's own rules: placed layers come in as one group named after the file, a layer as an image and a layer group as a group, at the place the merged image would take and clipped to the canvas when layers reach past it; the dialog asks from two layers up and starts from the choices made last. Layer comps and slices aren't read (`crates/engine/src/cmd/fileio/tests_psdlayers.rs`, `crates/ui-egui/src/dialogs/psd_import.rs`). - PCX files (`.pcx`) open and place, from the ZSoft PCX Technical Reference Manual: 1 bit in the header palette's first two colors (black and white when the version has no palette or both colors are the same), 1 bit in two to four planes and 4 bits with up to 16 colors from the header's palette (the EGA colors for versions 0 and 3), 2 bits in the CGA colors that the header's CGA palette settings pick (background, color burst, palette and intensity), 8 bits with the 256-color palette after the image data (gray levels without one) and 24-bit color in three planes, run-length encoded. The header's HDpi and VDpi size the image. A file of another depth or plane count, one cut short, and one whose pixels as RGBA pass the pixel allowance are refused with a message before its pixels are decoded. Open and Place recognize a PCX file by its extension, and `clipboard.importImage` and Glass's Load Texture… by its header; a PCX file copied in a file manager pastes as a bitmap (`crates/engine/src/cmd/fileio/tests_pcxread.rs`). - Pixar picture files (`.pxr`) open, place and paste, from "The Format of Stored Pictures" in the Pixar Image Computer manuals: any set of the R, G, B and A channels in 8 or 12 bits, dumped or run-length encoded with all four packet kinds and block ends, in tiles of any size (pixels of border tiles past the picture are dropped). R alone is gray, a missing color channel is 0 and a missing A opaque; 12-bit samples are clamped to 0.0 to 1.0; color matted to black becomes straight color; a null tile is transparent when the picture has A and black otherwise. The offsets aren't read, and the image takes the default resolution. Version 2 headers read like version 0. A file cut short, one with a tile whose writing wasn't finished, one with header values or packets the format doesn't define, and one whose pixels as RGBA pass the pixel allowance are refused with a message. Every reader recognizes a Pixar file by its magic number. Tested on synthetic files only (`crates/engine/src/cmd/fileio/tests_pxrread.rs`). - JPEG 2000 JP2 and raw codestream images open and place from `.jpf`, `.jpx`, `.jp2`, `.j2k`, `.j2c` and `.jpc`. Each axis uses the valid display resolution (`resd`), else the valid capture resolution (`resc`), whichever box comes first ([ITU-T T.800](https://www.itu.int/rec/T-REC-T.800/en), I.5.3.7.2); an axis with none uses 72 ppi. Multiple codestreams, JPX composition or layers, and unsupported color spaces are refused with a message. The decoder checks image size before allocating (`crates/engine/src/cmd/fileio/tests_jp2read.rs`). From 4caac50520067eb4cdac7d54043dbaff302289fa Mon Sep 17 00:00:00 2001 From: Davit Matchakhelidze Date: Sat, 14 Nov 2026 23:00:39 +0400 Subject: [PATCH 12/50] i18n(ka): update the Georgian catalog --- crates/ui-egui/src/i18n/ka.tsv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index b0eb70e775..52b408d790 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -9326,7 +9326,7 @@ font-script Japanese იაპონური @msg this warp's points can't be edited: use Reset with Mesh first ამ გაღუნვის წერტილების რედაქტირება შეუძლებელია: ჯერ გამოიყენეთ „ბადით ჩამოყრა“ @msg thumbnail: no page {v} (the {what} has {count}) ესკიზი: გვერდი {v} არ არის ({what}: {count} გვერდი) @msg tileRange of {what}: {e} tileRange ({what}): {e} -@msg title can't be empty სათაური ცარიელი ვერ იქნება +@msg title can't be empty title ცარიელი ვერ იქნება @msg to (the new name) is required to (ახალი სახელი) აუცილებელია @msg to must be fill or stroke to უნდა იყოს fill ან stroke @msg to must be smooth or corner to უნდა იყოს smooth ან corner From b08f925f479bff0d65bfec16dff0b5fbd86cfda7 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 15:27:52 -0800 Subject: [PATCH 13/50] i18n: Danish rows for script.run answers errors Danish joined the complete-message languages on main, so the script.run answers errors and reasons now need da rows. The merge of main also left the indexed wrapper twice in uk and vi; the duplicate rows from this branch are removed. --- crates/ui-egui/src/i18n/da.tsv | 12 ++++++++++++ crates/ui-egui/src/i18n/uk.tsv | 1 - crates/ui-egui/src/i18n/vi.tsv | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 59ce36d15f..de1726ed4c 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -145,6 +145,18 @@ @msg `name` must be the name of a script engine `name` skal være navnet på en scriptmotor @msg the main script engine is new for each run and is never kept, so it cannot be dropped hovedscriptmotoren er ny ved hver kørsel og bevares aldrig, så den kan ikke fjernes @msg there is no script engine named {name} der findes ingen scriptmotor med navnet {name} +@msg `answers` must be a list of answers `answers` skal være en liste med svar +@msg `answers` has more than {MAX_ANSWERS} answers `answers` har flere end {MAX_ANSWERS} svar +@msg `answers` is larger than 1 MiB `answers` er større end 1 MiB +@msg `answers[{i}]` {e} `answers[{i}]` {e} +@msg must be an object with `kind` and `value` skal være et objekt med `kind` og `value` +@msg must have exactly `kind` and `value` skal have præcis `kind` og `value` +@msg is an alert's answer, whose `value` must be "ok" er svaret på en alert, hvis `value` skal være "ok" +@msg is a confirm's answer, whose `value` must be true or false er svaret på en confirm, hvis `value` skal være true eller false +@msg is longer than 16 KiB er længere end 16 KiB +@msg is a prompt's answer, whose `value` must be a string or null er svaret på en prompt, hvis `value` skal være en streng eller null +@msg must have `kind` alert, confirm or prompt skal have `kind` alert, confirm eller prompt +@msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` er kun til en kørsel uden nogen at spørge: i appen besvarer personen hver dialog @msg Running a script Kører et script @msg Data Recovery can't keep copies in {path}: {e} Datagendannelse kan ikke opbevare kopier i {path}: {e} @msg Plug-ins can't be loaded from {path}: {e} Plug-ins kan ikke indlæses fra {path}: {e} diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index f3ecd68dc8..804a855704 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7338,7 +7338,6 @@ breakText Glyphs Гліфи @msg `anchors` must list anchor indices (0, 1, 2…), not {k} `anchors` має містити індекси опорних точок (0, 1, 2…), а не {k} @msg `anchors` must list anchor indices (0, 1, 2…), not {v} `anchors` має містити індекси опорних точок (0, 1, 2…), а не {v} @msg `answer` for this {kind} dialog must be one of: {_1} `answer` для цього діалогового вікна ({kind}) має бути одним з: {_1} -@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg `answers` has more than {MAX_ANSWERS} answers `answers` містить понад {MAX_ANSWERS} відповідей @msg `answers` is larger than 1 MiB `answers` більший за 1 МіБ @msg `answers` is only for a run with nobody to ask: in the app, the person answers each dialog `answers` призначений лише для запуску, у якому немає кого запитати: у застосунку людина сама відповідає на кожне діалогове вікно diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 79fc9ad87b..19560e8b68 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -4859,7 +4859,6 @@ theme Appearance Giao diện @msg `answers` must be a list of answers `answers` phải là một danh sách câu trả lời @msg `answers` has more than {MAX_ANSWERS} answers `answers` có hơn {MAX_ANSWERS} câu trả lời @msg `answers` is larger than 1 MiB `answers` lớn hơn 1 MiB -@msg `answers[{i}]` {e} `answers[{i}]` {e} @msg must be an object with `kind` and `value` phải là một đối tượng có `kind` và `value` @msg must have exactly `kind` and `value` phải có đúng `kind` và `value` @msg is an alert's answer, whose `value` must be "ok" là câu trả lời cho alert, nên `value` phải là "ok" From f681284dfb01d0ec99e2322993a8c465036b09f1 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 16:40:34 -0800 Subject: [PATCH 14/50] 3D: art at NaN or infinite opacity casts no shadow Extrude & Bevel, Inflate and Rotate decided whether a fill, stroke or member casts part of the shadow with `opacity > 0.0` and skipped it with `opacity <= 0.0`. A NaN opacity failed both tests, so the part was neither cast nor skipped: the shadow cast from the solids drawn added its faces with a NaN ink, giving the shadow fill a NaN opacity, and the shadow built for itself recorded an empty part. Both paths now use one rule, `shadow::Ink::casts`: art casts only when its opacity is a finite number above zero. NaN and infinite opacity cast nothing, as 0 % does, and the art beside it still casts. Finite opacity casts as before. --- crates/effects/src/solids.rs | 20 ++++---- crates/effects/src/solids/shadow.rs | 8 +++ crates/effects/src/solids/tests_shadow.rs | 60 +++++++++++++++++++++++ docs/target-app-parity.md | 1 + 4 files changed, 79 insertions(+), 10 deletions(-) diff --git a/crates/effects/src/solids.rs b/crates/effects/src/solids.rs index c0d44947d7..6fad9eac9c 100644 --- a/crates/effects/src/solids.rs +++ b/crates/effects/src/solids.rs @@ -1457,8 +1457,8 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result = vec![]; let ink = |item: &AppearanceItem, member: f32| { let (_, opacity, blend) = paint_of(item, member); @@ -1466,7 +1466,7 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result 0.0) { + for item in s.items.iter().filter(|i| ink(i, s.opacity).casts()) { let (area, rule) = region(&s.path, s.rule, item); #[cfg(test)] SOLIDS_BUILT.with(|n| n.set(n.get() + 1)); @@ -1480,7 +1480,7 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result, String>> = if id == INFLATE { let shapes: Vec<(&PathData, FillRule)> = parts.iter().map(|(_, _, area, rule, _, _)| (area, *rule)).collect(); - let casts: Vec = inks.iter().map(|i| i.opacity > 0.0).collect(); + let casts: Vec = inks.iter().map(|i| i.casts()).collect(); #[cfg(test)] SOLIDS_BUILT.with(|n| n.set(n.get() + shapes.len())); caster.inflate(&shapes, &casts, bounds, inflate_options(p), view) @@ -1488,13 +1488,13 @@ fn cast_shadow<'a>(id: &str, p: &Value, shapes: &'a [Profile]) -> Result 0.0))); - added.push(if ink.opacity > 0.0 { caster.extrude(area, *rule, bounds, extrude_options(p), view) } else { Ok(0..0) }); + SOLIDS_BUILT.with(|n| n.set(n.get() + usize::from(ink.casts()))); + added.push(if ink.casts() { caster.extrude(area, *rule, bounds, extrude_options(p), view) } else { Ok(0..0) }); } added }; for (((item, _, _, _, scopes, _), ink), faces) in parts.iter().zip(inks).zip(added) { - if ink.opacity <= 0.0 { + if !ink.casts() { continue; } // A stroke whose own solid is past the limits is left out; past the shadow's limit for @@ -1535,7 +1535,7 @@ fn cast_built<'a>(id: &str, p: &Value, shapes: &'a [Profile], built: Vec(id: &str, p: &Value, shapes: &'a [Profile], built: Vec = parts.iter().map(|(item, member, ..)| ink(item, *member)).collect(); - if parts.len() != built.len() || (id == INFLATE && inks.iter().zip(&built).any(|(ink, kept)| ink.opacity > 0.0 && kept.is_none())) { + if parts.len() != built.len() || (id == INFLATE && inks.iter().zip(&built).any(|(ink, kept)| ink.casts() && kept.is_none())) { return cast_shadow(id, p, shapes); } for (((item, _, area, rule, scopes, _), ink), kept) in parts.iter().zip(inks).zip(built) { - if ink.opacity <= 0.0 { + if !ink.casts() { continue; } let faces = match kept { diff --git a/crates/effects/src/solids/shadow.rs b/crates/effects/src/solids/shadow.rs index 3906ac2d3c..15a8e9d3c1 100644 --- a/crates/effects/src/solids/shadow.rs +++ b/crates/effects/src/solids/shadow.rs @@ -50,6 +50,14 @@ pub(crate) struct Ink { pub(crate) blend: BlendMode, } +impl Ink { + /// Whether art in this ink casts part of a shadow: its opacity is a finite number above zero. + /// Art at zero, negative, NaN or infinite opacity casts nothing. + pub(crate) fn casts(self) -> bool { + self.opacity.is_finite() && self.opacity > 0.0 + } +} + /// The shadow of the faces in `caster` as a path of object `id`, cast by art in `ink`: filled /// black at [`SHADOW_OPACITY`] times its opacity, in its blending mode, with the nonzero rule; /// `None` when it casts nothing. diff --git a/crates/effects/src/solids/tests_shadow.rs b/crates/effects/src/solids/tests_shadow.rs index 4d62961612..7dfd78f28d 100644 --- a/crates/effects/src/solids/tests_shadow.rs +++ b/crates/effects/src/solids/tests_shadow.rs @@ -312,3 +312,63 @@ fn the_shadow_cast_from_the_solids_drawn_is_the_shadow_of_solids_built_for_it() } } } + +/// The opacity of each part of the shadow of `n` (its 3D effect's shadow on) and the shadow's art, +/// as [`cast_shadow`] casts it from solids built for the shadow alone and as [`cast_built`] casts +/// it from the faces the solids drawn kept. +fn cast_parts(n: &Node) -> [(Vec, String); 2] { + let (_, fx) = solid(&n.appearance.effects).unwrap(); + let shapes = if is_container(n) { + members(n, "").unwrap() + } else { + let (path, rule) = profile(n).unwrap(); + vec![Profile { path, rule, items: solid_paint_sources(n).1, opacity: 1.0, scopes: vec![] }] + }; + let p = crate::merged_params(&fx.id, &fx.params); + let (_, built) = surfaces_for(None, n, fx, &shapes, true).unwrap(); + [cast_shadow(&fx.id, &p, &shapes), cast_built(&fx.id, &p, &shapes, built)].map(|c| { + let (caster, settings, cast) = c.unwrap().unwrap(); + let inks = cast.iter().map(|(_, ink, _)| ink.opacity).collect(); + (inks, format!("{:?}", shadow::scoped_art(n.id, &caster, settings, cast, has_masks(&shapes)))) + }) +} + +/// A fill, a stroke or a member whose opacity is NaN or infinite casts no part of the shadow, as one +/// at 0 % does, whether the shadow is cast from solids built for it or from the solids drawn; the +/// art beside it still casts its part. +#[test] +fn art_whose_opacity_is_not_a_finite_number_casts_no_shadow() { + // The art with opacity `opacity` in one place: a square's stroke, the fill of a group's second + // member, and a group's second member. + let objects = |opacity: f32| { + let mut fill = square_node(2, 200.0); + for item in &mut fill.appearance.items { + if let AppearanceItem::Fill(f) = item { + f.opacity = opacity; + } + } + let mut member = square_node(2, 200.0); + member.opacity = opacity; + [ + stroked_square(1, 0.0, opacity), + Node::group(NodeId(9), vec![Arc::new(square_node(1, 0.0)), Arc::new(fill)]), + Node::group(NodeId(9), vec![Arc::new(square_node(1, 0.0)), Arc::new(member)]), + ] + }; + for id in [EXTRUDE, INFLATE, ROTATE] { + for bad in [f32::NAN, f32::INFINITY] { + for (i, (mut n, mut clear)) in objects(bad).into_iter().zip(objects(0.0)).enumerate() { + n.appearance.effects.push(crate::new_effect(id, &json!({"shadow": true})).unwrap()); + clear.appearance.effects.push(crate::new_effect(id, &json!({"shadow": true})).unwrap()); + let expected = cast_parts(&clear); + for (k, (inks, shadow)) in cast_parts(&n).into_iter().enumerate() { + assert_eq!(inks, vec![1.0], "{id} {bad} object {i} cast {k}: only the opaque art casts"); + assert_eq!(shadow, expected[k].1, "{id} {bad} object {i} cast {k}"); + } + let mut opacities = vec![]; + art(&n, id).unwrap().walk(&mut |c| opacities.extend(shadow_opacity(c))); + assert_eq!(opacities, vec![0.5], "{id} {bad} object {i}"); + } + } + } +} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index c6972468cc..f915c4bda6 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -585,6 +585,7 @@ since 2026-10-01. - 3D lighting presets: `crates/effects/src/lighting_presets.rs`, `crates/engine/src/cmd/effectcmd/lighting_presets_tests.rs` and the pointer tests in `crates/ui-egui/src/dialogs/revolve/tests.rs` cover recognition, atomic targeting, native round trips, preview, Cancel, reset and Undo. - 3D shadows: Revolve, Extrude & Bevel, Inflate and Rotate take a Shadows switch with Position (Behind Object or Below Object), Distance from Object (0–100 %) and Shadow Bounds (10–400 %) on the Lighting tab ([three-d.md](three-d.md#shadows)); the first light casts one hard-edged vector shadow, drawn behind the solids, in exports and kept by Expand Appearance. Evidence: `crates/three-d/src/shadow/tests.rs`, `crates/effects/src/solids/tests_shadow.rs`, `effectcmd::tests::a_3d_shadow_is_one_undo_step_saved_exported_and_expanded`. Softness and the shadows of lights after the first are not built. Scores unchanged. - 3D shadows: with Shadows on, Revolve, Extrude & Bevel, Inflate and Rotate cast the shadow from the faces kept by the build that draws each solid, so drawing an object builds each of its solids once. The art and the shadow are unchanged. Evidence: `crates/three-d/src/shadow/tests.rs` (`a_solid_and_its_shadow_are_built_once` and the tests that compare each solid and its shadow with the two built apart), `solids::tests_shadow::a_shadowed_3d_object_builds_each_solid_once`, `solids::tests_shadow::the_shadow_cast_from_the_solids_drawn_is_the_shadow_of_solids_built_for_it`, `revolve::tests::the_shadow_cast_from_the_surfaces_drawn_is_the_shadow_of_surfaces_swept_for_it`. Scores unchanged. +- 3D shadows: in Extrude & Bevel, Inflate and Rotate, a fill, stroke or member whose opacity is NaN or infinite casts no part of the shadow, as one at 0 % does, whether the shadow is cast from the solids drawn or from solids built for it alone; the art beside it still casts. This is VectorCraft's own rule. Evidence: `solids::tests_shadow::art_whose_opacity_is_not_a_finite_number_casts_no_shadow`. Scores unchanged. - Window › 3D and Materials panel: `crates/ui-egui/src/panels/three_d.rs` applies a 3D effect by object type (Plane, Extrude, Revolve, Inflate), changes an applied one in place (`effect.setParams` `threeDType`) and edits it with the options dialog's Object, Rotation and Lighting controls, one undo step per change; `crates/engine/src/cmd/effectcmd/three_d_type_tests.rs` and `crates/ui-egui/src/panels/tests_three_d.rs` cover it. No Materials tab. - 3D and Materials › Quick Actions › Expand as Wireframes (#6354): `effect.expandAsWireframes` replaces each selected 3D object with a group of 0.5 pt black stroked paths, the edges of the faces its effect draws, each edge once and joined end to end, curves kept, in one undo step ([three-d.md](three-d.md#3d-and-materials-panel)); `crates/effects/src/solids/wireframe/tests.rs`, `crates/engine/src/cmd/wireframe/tests.rs` and `crates/ui-egui/src/panels/tests_three_d.rs` cover it. Scores and hours unchanged. - 3D effects on clipping groups, blends and symbol instances (#6140, #5725): every 3D type builds from the art the object shows (the art inside the clipping path, the blend's keys and steps, the symbol's art where the instance places it), alone or in a group, on the canvas, in exports, Object › Rasterize and `assets.add3D`; an image is refused with a pointer to Object › Image Trace › Make. `crates/effects/src/solids/tests_sources.rs`, `crates/engine/src/cmd/effectcmd/three_d_source_tests.rs` and `fx::tests::a_symbol_instance_a_blend_and_a_clipping_group_draw_their_solids` cover it. Scores and estimates unchanged. From 1ba9b9e7cd5bbdc7db72512a62f9c4fddf4e2293 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 16:53:01 -0800 Subject: [PATCH 15/50] PDF export: a knockout group that does not isolate is written without /I true An opaque knockout group in Normal mode with isolate off and nothing blending inside was written as an isolated PDF knockout group (/I true /K true), and a clipped one was drawn in an isolated form. The group's elements now start from the art below it, as on the canvas: the /K group carries no /I, and a clipped group gets no isolated form. An isolated knockout group keeps /I true. --- crates/pdf/src/export/nodes.rs | 6 ++++- crates/pdf/src/tests/blend.rs | 42 ++++++++++++++++++++++++++++++++++ docs/target-app-parity.md | 1 + 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/crates/pdf/src/export/nodes.rs b/crates/pdf/src/export/nodes.rs index 403cbc5431..71b65e65d0 100644 --- a/crates/pdf/src/export/nodes.rs +++ b/crates/pdf/src/export/nodes.rs @@ -859,7 +859,9 @@ impl Exporter<'_> { /// Opens the blend mode and the transparency group `n` is drawn with (`container` when it is a /// group or layer whose children `knockout` each other). Returns how many were opened, and /// whether the children are to be drawn in an isolated group of their own: the knockout group of -/// an unclipped group's elements is its isolated group too. +/// an unclipped group's elements is its isolated group too. An opaque knockout group in Normal +/// mode that does not isolate opens no group: its elements are drawn on the art below it, in a +/// knockout group without `/I` when there are several. fn transparency(s: &mut Surface, n: &Node, page: Rect, container: bool, knockout: bool) -> (usize, bool) { let mut pushes = 0; if n.blend != BlendMode::Normal { @@ -876,6 +878,8 @@ fn transparency(s: &mut Surface, n: &Node, page: Rect, container: bool, knockout } else if n.opacity < 1.0 { s.push_opacity(norm(n.opacity)); pushes += 1; + } else if knockout && !n.isolate && n.blend == BlendMode::Normal { + // A knockout group that does not isolate: its elements start from the art below it. } else if knockout && matches!(n.kind, NodeKind::Layer { clip: false, .. } | NodeKind::Group { clip: false, .. }) { isolated_children = true; } else { diff --git a/crates/pdf/src/tests/blend.rs b/crates/pdf/src/tests/blend.rs index c55a0b7504..3ccf48d39a 100644 --- a/crates/pdf/src/tests/blend.rs +++ b/crates/pdf/src/tests/blend.rs @@ -151,6 +151,48 @@ fn a_knockout_group_is_written_as_one_pdf_knockout_group() { } } +/// A knockout group with nothing blending inside is drawn in an isolated group (`/I true`) only +/// when the group isolates, clipped or not, with opaque or translucent elements, and reads back +/// knocking out. +#[test] +fn a_knockout_group_without_blending_inside_is_isolated_only_when_it_isolates() { + for clip in [false, true] { + for opacity in [0.5, 1.0] { + for isolate in [false, true] { + let mut d = knockout_squares(3, false, isolate); + let g = d.layers[0].children().unwrap()[1].id; + let mut squares: Vec<_> = d.node(g).unwrap().children().unwrap().to_vec(); + for s in &mut squares { + std::sync::Arc::make_mut(s).opacity = opacity; + } + if clip { + let c = Node::path( + d.alloc_id(), + shapes::rectangle(Rect::new(10.0, 10.0, 190.0, 190.0)), + Appearance::basic(Paint::None, Paint::None, 0.0), + ); + squares.insert(0, std::sync::Arc::new(c)); + } + d.node_mut(g).unwrap().kind = vectorcraft_doc::NodeKind::Group { children: squares, clip }; + let case = format!("clip {clip}, opacity {opacity}, isolate {isolate}"); + let t = text(&d); + assert_eq!(t.matches("/Ktrue").count(), 1, "{case}"); + // Each translucent element is an isolated form with its opacity. + let elements = if opacity < 1.0 { 3 } else { 0 }; + assert_eq!(t.matches("/Itrue").count(), elements + usize::from(isolate), "{case}"); + let back = import(&export(&d, &PdfOptions::default()).unwrap()).unwrap_or_else(|e| panic!("{case}: {e}")); + let mut found = vec![]; + back.walk(|n| { + if n.knockout == vectorcraft_doc::Knockout::On { + found.push(n.isolate); + } + }); + assert_eq!(found, [false], "{case}"); + } + } + } +} + /// The knockout group of an isolated group is isolated too (`/I true` beside `/K true`), and the /// group reads back as isolated and knocking out. (Each translucent element is a group of its own.) #[test] diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index c6972468cc..d43c2c5ad1 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1649,6 +1649,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur On the canvas, the renderer no longer draws the picture of the art below back as an image each time it copies the backdrop of a non-isolated group that blends: it keeps that picture and draws the art that follows over it. At 2880 × 1800, 50 translucent groups with Multiply members take 65 ms a frame instead of 299 ms on 8 threads (`vectorcraft-cli bench`), and the frames have the same pixels. Type inside a group, layer, symbol instance, blend or repeat keeps its opacity, blend mode, opacity mask, Opacity & Mask Define Knockout Shape, own effects, perspective and visibility when the effects on the container outline it. Hidden type with a geometry effect of its own is left out of exports. PDF export writes a knockout group as one PDF knockout group (`/K true`, with `/I true` when the group isolates; ISO 32000-1, 11.4.6.3), so a knockout group of any size opens again in VectorCraft as a knockout group, and the form nesting of the file does not grow with the number of elements. When an element's opacity or mask defines its knockout shape, or it paints translucently, each element is drawn through one soft mask of the overlapping elements above it instead; past 65,536 objects in a group's masks (or 2,048 elements) the group is a PDF knockout group, with a warning that its translucent elements knock out fully. SVG export draws each element of a knockout group through one mask of the overlapping elements above it, and the masks refer to one copy of each element's shape, so the elements stay siblings and the file nests no deeper with more elements; past 65,536 shapes in a group's masks (or 2,048 elements) the group is written as a plain group, with a warning. Evidence: `pdf/src/tests/blend.rs`, `svg/tests/it/blend_export.rs`, `pdf/tests/gradient_forms.rs` (a gradient in a knockout group reads back in place). + A knockout group in Normal mode at full opacity that does not isolate, with nothing blending inside, is written without an isolated group around its elements, clipped or not, so the art below the group is its initial backdrop in the PDF as on the canvas (ISO 32000-1, 11.4.5): neither its `/K` group nor a form around a clipped group carries `/I true`. Evidence: `pdf/src/tests/blend.rs` (`a_knockout_group_without_blending_inside_is_isolated_only_when_it_isolates`). - **Graphic styles:** styles keep opacity and blend mode, capture groups and type, apply on top with Alt, and link to the objects using them; Redefine, Break Link, Graphic Style Options, Select All Unused, Sort by Name, and Select > Same Graphic Style / Appearance Attribute. The panel has list and thumbnail views with rendered previews, merge, reorder and drag and drop, plus a Control bar Style picker; ten generated style libraries (including Game HUD, Status Effects, Painted and Sketched, whose seven styles each repaint a solid fill with one watercolor, dry brush, pastel, charcoal or ink effect, and Textures) save and load as `.vcstyles`. The built-in Textures graphic style library (`graphicStyle.addFromLibrary {library: "textures"}`) has eight styles that paint their fills and strokes with the texture effects: Fine Grain (Grain), Canvas Weave and Burlap Sack (Texturizer), Cracked Glaze (Craquelure), Mosaic Floor (Mosaic Tiles), Quilted Squares (Patchwork), Leaded Glass (Stained Glass) and Damp Paper (Water Paper). The help page names new graphic styles for textures ([What's new](https://helpx.adobe.com/illustrator/desktop/new-features/whats-new.html)) without naming them, so the styles, their names and their settings are VectorCraft's own (`tests::stylelib::textures_styles_apply_their_texture_effects_and_keep_their_params_through_save_and_open`). In the Graphic Styles panel, Shift-click selects a range of styles and Ctrl/Cmd-click adds or removes one. From 8d5a76b342393be6eb8e88d2d7dfad7236f60e13 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 17:09:50 -0800 Subject: [PATCH 16/50] Image Trace: a trace started before Revert does not apply after it File > Revert keeps the document's tab and uid, so a trace prepared before the revert compared equal to one prepared after it when the restored image, object and settings were the same. A background trace that finished after the revert then applied to the restored content, and a result handed to imageTrace.make or imageTrace.makeAndExpand stood in for a fresh trace. The trace inputs now record the document's revert count. A run prepared before a revert is no longer current, the commands drop its result and trace the restored image again as one undo step, and the status bar says "Image Trace finished, but its document was reverted: trace it again". Reverting another document, or a revert that fails, does not affect the run. --- crates/engine/src/cmd/buildcmds/trace.rs | 37 +++++++++++++---- crates/engine/src/tests/build.rs | 51 ++++++++++++++++++++++++ crates/ui-egui/src/i18n/cs.tsv | 1 + crates/ui-egui/src/i18n/de.tsv | 1 + crates/ui-egui/src/i18n/fr.tsv | 1 + crates/ui-egui/src/i18n/hi.tsv | 1 + crates/ui-egui/src/i18n/hu.tsv | 1 + crates/ui-egui/src/i18n/it.tsv | 1 + crates/ui-egui/src/i18n/ja.tsv | 1 + crates/ui-egui/src/i18n/ko.tsv | 1 + crates/ui-egui/src/i18n/nl.tsv | 1 + crates/ui-egui/src/i18n/pl.tsv | 1 + crates/ui-egui/src/i18n/pt-br.tsv | 1 + crates/ui-egui/src/i18n/sv.tsv | 1 + crates/ui-egui/src/i18n/tr.tsv | 1 + crates/ui-egui/src/i18n/uk.tsv | 1 + crates/ui-egui/src/i18n/zh-hans.tsv | 1 + crates/ui-egui/src/i18n/zh-hant.tsv | 1 + crates/ui-egui/src/tests/trace_runs.rs | 17 ++++++++ crates/ui-egui/src/trace_runs.rs | 11 +++-- docs/target-app-parity.md | 1 + 21 files changed, 123 insertions(+), 10 deletions(-) diff --git a/crates/engine/src/cmd/buildcmds/trace.rs b/crates/engine/src/cmd/buildcmds/trace.rs index a117bd453e..3d17e76707 100644 --- a/crates/engine/src/cmd/buildcmds/trace.rs +++ b/crates/engine/src/cmd/buildcmds/trace.rs @@ -12,6 +12,7 @@ use super::{ thread_local! { static BOX_TESTS: std::cell::Cell = const { std::cell::Cell::new(0) }; static CANDIDATE_VISITS: std::cell::Cell = const { std::cell::Cell::new(0) }; + static TRACES_ON_THIS_THREAD: std::cell::Cell = const { std::cell::Cell::new(0) }; } // ---------- Image Trace ---------- @@ -527,15 +528,20 @@ fn color_groups(cmd: &str, d: &mut Document, items: Vec>) -> Result, /// The settings traced with, as JSON. @@ -604,7 +610,8 @@ fn prepare(s: &Session, c: &str, p: &Value) -> Result { let bytes = Arc::clone(&blob.bytes); let library = trace_library(c, s, &mut params)?; let traced_with = serde_json::to_value(¶ms).map_err(|e| EngineError::Other(e.to_string()))?; - let inputs = TraceInputs { doc: s.doc()?.uid, target, image, params: traced_with, swatches: params.swatches.clone(), bytes }; + let st = s.doc()?; + let inputs = TraceInputs { doc: st.uid, reverts: st.reverts, target, image, params: traced_with, swatches: params.swatches.clone(), bytes }; Ok(Prepared { inputs, trace: params, view, params_json, preset_label, library }) } @@ -618,7 +625,8 @@ pub struct Traced { impl Traced { /// Hand it to the next run of its command with the same inputs ([`TraceRun::params`]) in the /// document it was made in, which applies it as one undo step instead of tracing again. Any - /// other trace drops it, a trace in another document included. + /// other trace drops it and traces again, a trace in another document included, and so does + /// the command after File › Revert replaced the document's content. pub fn hand_in(self, s: &mut Session) { s.trace_hand_off = Some(self); } @@ -627,6 +635,8 @@ impl Traced { /// Decode the image bytes of `inputs` and trace them with `params`, telling `steps` how far it has /// got ([`tr::trace_watched`]); [`EngineError::Cancelled`] once `steps` answers `false`. fn trace_now(inputs: &TraceInputs, params: &tr::TraceParams, steps: &(dyn Fn(u64, u64) -> bool + Sync)) -> Result { + #[cfg(test)] + TRACES_ON_THIS_THREAD.with(|n| n.set(n.get() + 1)); // An image over the tracer's size is traced scaled down (the paths are scaled back). let raster = tr::Raster::decode_to_fit(&inputs.bytes).map_err(|e| EngineError::Other(e.to_string()))?; if !steps(0, 0) { @@ -691,17 +701,30 @@ impl TraceRun { } /// Does it still apply: would the command trace the same object, image, pixels and settings - /// now, in the document it was prepared in? + /// now, in the document it was prepared in, with no File › Revert since? pub fn current(&self, s: &Session) -> bool { prepare(s, self.command, &self.params).is_ok_and(|now| now.inputs == self.prepared.inputs) } + /// Has File › Revert replaced the content of the document it was prepared in since then? False + /// when that document is no longer open. + pub fn reverted(&self, s: &Session) -> bool { + let TraceInputs { doc, reverts, .. } = self.prepared.inputs; + s.documents().iter().any(|st| st.uid == doc && st.reverts != reverts) + } + /// Decode and trace the image, telling `steps` how far it has got → what it traced, or why it /// failed or stopped ([`EngineError::Cancelled`] once `steps` answers `false`). It touches no /// document, so it can run on any thread. pub fn run(&self, steps: &(dyn Fn(u64, u64) -> bool + Sync)) -> Result { trace_now(&self.prepared.inputs, &self.prepared.trace, steps) } + + /// How many images this thread has decoded and traced so far. + #[cfg(test)] + pub(crate) fn traces_on_this_thread() -> usize { + TRACES_ON_THIS_THREAD.with(std::cell::Cell::get) + } } pub(super) fn trace_make(s: &mut Session, p: &Value, expand: bool) -> Result { diff --git a/crates/engine/src/tests/build.rs b/crates/engine/src/tests/build.rs index 8fd5a3aa45..682d1047f8 100644 --- a/crates/engine/src/tests/build.rs +++ b/crates/engine/src/tests/build.rs @@ -4690,6 +4690,57 @@ fn a_trace_run_applies_only_in_its_own_document() { } } +/// A trace prepared before File › Revert doesn't apply after it, even when the document keeps its +/// uid and the restored image, object and settings are the same: both trace commands drop the +/// trace handed in and trace the restored image again, as one undo step. Reverting another +/// document, or a revert that fails, leaves the run current, and a trace prepared after the revert +/// applies as usual. +#[test] +fn a_trace_run_prepared_before_a_revert_does_not_apply_after_it() { + let p = json!({"params": {"ignoreWhite": true}}); + for command in ["imageTrace.make", "imageTrace.makeAndExpand"] { + let mut direct = session(); + image_doc(&mut direct); + let want = direct.execute(command, &p).unwrap(); + let mut s = session(); + let img = image_doc(&mut s); + let a = s.active_index().unwrap(); + let copy = (*s.doc().unwrap().doc).clone(); + let run = cmd::TraceRun::prepare(&s, command, &p).unwrap(); + let traced = run.run(&|_, _| true).unwrap(); + let b = s.add_document(copy.clone(), None); + assert!(s.replace_document(b, copy.clone())); + assert!(s.set_active(a)); + assert!(run.current(&s) && !run.reverted(&s), "{command}: another document reverted"); + assert!(!s.replace_document(s.documents().len(), copy.clone())); + assert!(run.current(&s) && !run.reverted(&s), "{command}: a revert that failed"); + let (uid, reverts) = (s.doc().unwrap().uid, s.doc().unwrap().reverts); + assert!(s.replace_document(a, copy)); + assert_eq!(s.doc().unwrap().uid, uid, "{command}: the tab keeps its uid"); + assert_eq!(s.doc().unwrap().reverts, reverts + 1, "{command}"); + assert!(!run.current(&s), "{command}: reverted"); + assert!(run.reverted(&s), "{command}"); + traced.hand_in(&mut s); + let traces = cmd::TraceRun::traces_on_this_thread(); + let got = s.execute(run.command(), run.params()).unwrap(); + assert_eq!(cmd::TraceRun::traces_on_this_thread(), traces + 1, "{command}: traced again"); + assert!(s.trace_hand_off.is_none(), "{command}: dropped"); + assert_eq!(got, want, "{command}"); + let g = NodeId(got["id"].as_u64().unwrap()); + assert_eq!(node(&s, g), node(&direct, g), "{command}"); + s.execute("edit.undo", &json!({})).unwrap(); + assert!(matches!(node(&s, img).kind, NodeKind::Image(_)), "{command}: one undo step"); + // A trace prepared after the revert is handed in and applied without tracing again. + let after = cmd::TraceRun::prepare(&s, command, run.params()).unwrap(); + let traced = after.run(&|_, _| true).unwrap(); + assert!(after.current(&s) && !after.reverted(&s), "{command}: prepared after the revert"); + traced.hand_in(&mut s); + let traces = cmd::TraceRun::traces_on_this_thread(); + s.execute(after.command(), after.params()).unwrap(); + assert_eq!(cmd::TraceRun::traces_on_this_thread(), traces, "{command}: the trace handed in applied"); + } +} + /// A plug-in run that calls Image Trace and then fails leaves a trace handed in for the command in /// place, as it leaves the document. #[test] diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index 3b9c300980..92e4df9988 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -7688,6 +7688,7 @@ breakText Glyphs Glyfy @msg Image Trace failed: {e} Vektorizace obrazu selhala: {e} @msg Image Trace finished, but its document was closed Vektorizace obrazu skončila, ale její dokument byl zavřen @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Vektorizace obrazu skončila, ale obraz nebo jeho nastavení se mezitím změnily: vektorizujte ho znovu +@msg Image Trace finished, but its document was reverted: trace it again Vektorizace obrazu skončila, ale její dokument byl vrácen k uložené verzi: vektorizujte ho znovu @msg Import SVG Filter reads SVG files, not SVGZ Importovat filtr SVG čte soubory SVG, ne SVGZ @msg Invalid dimension offset Neplatné odsazení kóty @msg Invalid point Neplatný bod diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index ddc01a8016..5818c88225 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -7537,6 +7537,7 @@ breakText Glyphs Glyphen @msg Image Trace failed: {e} Bildnachzeichner fehlgeschlagen: {e} @msg Image Trace finished, but its document was closed Bildnachzeichner abgeschlossen, aber sein Dokument wurde geschlossen @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Bildnachzeichner abgeschlossen, aber das Bild oder seine Einstellungen haben sich inzwischen geändert: Zeichnen Sie es erneut nach +@msg Image Trace finished, but its document was reverted: trace it again Bildnachzeichner abgeschlossen, aber sein Dokument wurde auf die letzte Version zurückgesetzt: Zeichnen Sie es erneut nach @msg Invalid dimension offset Ungültiger Bemaßungsversatz @msg Invalid point Ungültiger Punkt @msg Join: a subpath went missing Zusammenfügen: Ein Teilpfad ist verloren gegangen diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index 90882cf105..55fc28ddb2 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -7556,6 +7556,7 @@ breakText Glyphs Glyphes @msg Image Trace failed: internal error: its thread stopped (please report this bug) Échec de la vectorisation de l’image : erreur interne : son thread s’est arrêté (merci de signaler ce bogue) @msg Image Trace failed: {e} Échec de la vectorisation de l’image : {e} @msg Image Trace finished, but its document was closed La vectorisation de l’image est terminée, mais son document a été fermé +@msg Image Trace finished, but its document was reverted: trace it again La vectorisation de l’image est terminée, mais son document a été rétabli à la version précédente : vectorisez-la à nouveau @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again La vectorisation de l’image est terminée, mais l’image ou ses réglages ont changé entre-temps : vectorisez-la à nouveau @msg Import SVG Filter reads SVG files, not SVGZ Importer un filtre SVG lit les fichiers SVG, pas SVGZ @msg Invalid dimension offset Décalage de cote non valide diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index 671052e82b..6290d77941 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -7001,6 +7001,7 @@ antiAlias Sharp शार्प @msg Image Trace failed: internal error: its thread stopped (please report this bug) इमेज ट्रेस विफल: आंतरिक त्रुटि: इसके धागे को बंद कर दिया (कृपया इस बग की रिपोर्ट करें) @msg Image Trace finished, but its document was closed इमेज ट्रेस समाप्त हो गया, लेकिन इसका डॉक्यूमेंट बंद हो गया। @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again इमेज ट्रेस समाप्त हो गया, लेकिन इस बीच इमेज या इसकी सेटिंग्स बदल गई: इसे फिर से ट्रेस करें +@msg Image Trace finished, but its document was reverted: trace it again इमेज ट्रेस समाप्त हो गया, लेकिन इसके डॉक्यूमेंट को मूल स्थिति में लाया गया: इसे फिर से ट्रेस करें @msg Image Trace: the traced image is missing इमेज ट्रेस: ज्ञात इमेज गायब है @msg image would be too large; lower the resolution इमेज बहुत बड़ी होगी; रिज़ॉल्यूशन कम करें @msg imageMap `{m}`: none, client or server imageMap `{m}`: none, client या server diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index a218a2ce15..5674c2cc9a 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -7558,6 +7558,7 @@ breakText Glyphs Glifák @msg Image Trace failed: {e} A képvektorizálás nem sikerült: {e} @msg Image Trace finished, but its document was closed A képvektorizálás elkészült, de a dokumentumát bezárták @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again A képvektorizálás elkészült, de a kép vagy a beállításai közben megváltoztak: vektorizáld újra +@msg Image Trace finished, but its document was reverted: trace it again A képvektorizálás elkészült, de a dokumentumát visszaállították a mentett változatra: vektorizáld újra @msg Import SVG Filter reads SVG files, not SVGZ Az SVG-szűrő importálása SVG-fájlokat olvas, SVGZ-fájlokat nem @msg Invalid dimension offset Érvénytelen méretvonal-eltolás @msg Invalid point Érvénytelen pont diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index 2b5a6bf3da..fdccbb7609 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -7585,6 +7585,7 @@ breakText Glyphs Glifi @msg Image Trace failed: {e} Ricalco immagine non riuscito: {e} @msg Image Trace finished, but its document was closed Ricalco immagine terminato, ma il suo documento è stato chiuso @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Ricalco immagine terminato, ma nel frattempo l'immagine o le sue impostazioni sono cambiate: ricalcala di nuovo +@msg Image Trace finished, but its document was reverted: trace it again Ricalco immagine terminato, ma il suo documento è stato ripristinato: ricalcala di nuovo @msg Invalid dimension offset Distanza della quota non valida @msg Invalid point Punto non valido @msg Join: a subpath went missing Unisci: un sottotracciato è andato perso diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 87ec6c8b05..f653b02967 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -6793,6 +6793,7 @@ axis Y Axis Y 軸 @msg Image Trace failed: {e} 画像トレースに失敗しました: {e} @msg Image Trace finished, but its document was closed 画像トレースは完了しましたが、ドキュメントが閉じられています @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again 画像トレースは完了しましたが、その間に画像または設定が変更されました: もう一度トレースしてください +@msg Image Trace finished, but its document was reverted: trace it again 画像トレースは完了しましたが、ドキュメントは保存済みの状態に戻されました: もう一度トレースしてください @msg Invalid dimension offset 寸法のオフセットが無効です @msg Invalid point 点が無効です @msg Join: a subpath went missing 連結: サブパスが見つからなくなりました diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index 4fd8001ea7..3dfab2db6c 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -7283,6 +7283,7 @@ breakText Glyphs 글리프 @msg Image Trace failed: {e} 이미지 추적 실패: {e} @msg Image Trace finished, but its document was closed 이미지 추적이 끝났지만 문서가 닫혔습니다 @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again 이미지 추적이 끝났지만 그 사이에 이미지나 설정이 바뀌었습니다: 다시 추적하세요 +@msg Image Trace finished, but its document was reverted: trace it again 이미지 추적이 끝났지만 문서가 되돌려졌습니다: 다시 추적하세요 @msg Import SVG Filter reads SVG files, not SVGZ SVG 필터 가져오기는 SVGZ가 아닌 SVG 파일을 읽습니다 @msg Invalid dimension offset 잘못된 치수 오프셋 @msg Invalid point 잘못된 점 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index 31872f060e..e1b6cc32fd 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -5627,6 +5627,7 @@ imageTrace Outline Contour @msg Image Trace failed: {e} Afbeelding traceren is mislukt: {e} @msg Image Trace finished, but its document was closed Afbeelding traceren is voltooid, maar het document ervan is gesloten @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Afbeelding traceren is voltooid, maar de afbeelding of de instellingen ervan zijn intussen gewijzigd: traceer de afbeelding opnieuw +@msg Image Trace finished, but its document was reverted: trace it again Afbeelding traceren is voltooid, maar het document ervan is teruggezet: traceer de afbeelding opnieuw @msg Import SVG Filter reads SVG files, not SVGZ SVG-filter importeren leest SVG-bestanden, geen SVGZ @msg Invalid dimension offset Ongeldige verschuiving van de maatlijn @msg Invalid point Ongeldig punt diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index 77b1425e5f..5c5a8ab504 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -7826,6 +7826,7 @@ breakText Glyphs Glify @msg Image Trace failed: {e} Obrys obrazu nie powiódł się: {e} @msg Image Trace finished, but its document was closed Obrys obrazu został ukończony, ale jego dokument został zamknięty @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Obrys obrazu został ukończony, ale obraz lub jego ustawienia zmieniły się w międzyczasie: obrysuj go ponownie +@msg Image Trace finished, but its document was reverted: trace it again Obrys obrazu został ukończony, ale jego dokument został przywrócony: obrysuj go ponownie @msg Join: a subpath went missing Połącz: brakuje ścieżki podrzędnej @msg Lock Workspace is not available in VectorCraft Polecenie Zablokuj obszar roboczy nie jest dostępne w programie VectorCraft @msg Move Panel to New Window is not available: floating panels stay in the main window Polecenie Przenieś panel do nowego okna nie jest dostępne: panele pływające pozostają w oknie głównym diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index caed79af2a..5582d781f3 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -7752,6 +7752,7 @@ swatch Yellow Green Verde-amarelado @msg Image Trace failed: {e} O Rastreamento de Imagem falhou: {e} @msg Image Trace finished, but its document was closed O Rastreamento de Imagem terminou, mas o documento dele foi fechado @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again O Rastreamento de Imagem terminou, mas a imagem ou as configurações dela mudaram nesse meio-tempo: rastreie-a novamente +@msg Image Trace finished, but its document was reverted: trace it again O Rastreamento de Imagem terminou, mas o documento dele foi revertido: rastreie-a novamente @msg Import SVG Filter reads SVG files, not SVGZ Importar Filtro SVG lê arquivos SVG, não SVGZ @msg Invalid dimension offset Deslocamento de cota inválido @msg Invalid point Ponto inválido diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index 82e63d1667..e65794517b 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -8091,6 +8091,7 @@ digits Hindi Hindi @msg Image Trace failed: internal error: its thread stopped (please report this bug) Bildkalkering misslyckades: internt fel: dess tråd stoppades (rapportera gärna felet) @msg Image Trace finished, but its document was closed Bildkalkeringen är klar, men dess dokument har stängts @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Bildkalkeringen är klar, men bilden eller dess inställningar ändrades under tiden: vektorisera den igen +@msg Image Trace finished, but its document was reverted: trace it again Bildkalkeringen är klar, men dess dokument har återgått till sparad version: vektorisera den igen @msg imageMap `{m}`: none, client or server imageMap `{m}`: none, client eller server @msg index out of range index utanför intervallet @msg instances must be 1..1000 instances måste vara 1..1000 diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 237694bff5..aa8bc503c5 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -7177,6 +7177,7 @@ axis Y Axis Y ekseni @msg Image Trace failed: {e} Görüntü İzleme başarısız oldu: {e} @msg Image Trace finished, but its document was closed Görüntü İzleme tamamlandı, ancak belgesi kapatılmıştı @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Görüntü İzleme tamamlandı, ancak bu sırada görüntü veya ayarları değişti: yeniden izleyin +@msg Image Trace finished, but its document was reverted: trace it again Görüntü İzleme tamamlandı, ancak belgesi geri döndürüldü: yeniden izleyin @msg Invalid dimension offset Geçersiz boyut ofseti @msg Invalid point Geçersiz nokta @msg Join: a subpath went missing Birleştir: bir alt yol kayboldu diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index a74a03529d..176c5dd127 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -7294,6 +7294,7 @@ breakText Glyphs Гліфи @msg Image Trace failed: {e} Трасування зображення не вдалося: {e} @msg Image Trace finished, but its document was closed Трасування зображення завершено, але його документ закрито @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again Трасування зображення завершено, але зображення або його параметри тим часом змінилися: виконайте трасування ще раз +@msg Image Trace finished, but its document was reverted: trace it again Трасування зображення завершено, але його документ було повернуто до збереженої версії: виконайте трасування ще раз @msg Import SVG Filter reads SVG files, not SVGZ Імпорт фільтра SVG читає файли SVG, а не SVGZ @msg Invalid dimension offset Неприпустиме зміщення розміру @msg Invalid point Неприпустима точка diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index b83bee650f..67f6f0a700 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -7810,6 +7810,7 @@ breakText Glyphs 字形 @msg Image Trace failed: {e} 图像描摹失败:{e} @msg Image Trace finished, but its document was closed 图像描摹已完成,但其文档已关闭 @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again 图像描摹已完成,但图像或其设置在此期间发生了更改:请重新描摹 +@msg Image Trace finished, but its document was reverted: trace it again 图像描摹已完成,但其文档已恢复:请重新描摹 @msg Invalid dimension offset 尺寸标注的偏移无效 @msg Invalid point 点无效 @msg Join: a subpath went missing 连接:有一条子路径丢失 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 4637ecb811..cac09611ab 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -7738,6 +7738,7 @@ breakText Glyphs 字符 @msg Image Trace failed: {e} 影像描圖失敗:{e} @msg Image Trace finished, but its document was closed 影像描圖已完成,但其文件已關閉 @msg Image Trace finished, but the image or its settings changed meanwhile: trace it again 影像描圖已完成,但影像或其設定在此期間已變更:請重新描圖 +@msg Image Trace finished, but its document was reverted: trace it again 影像描圖已完成,但其文件已回復:請重新描圖 @msg Invalid dimension offset 尺寸標註位移無效 @msg Invalid point 點無效 @msg Join: a subpath went missing 連接:有一條子路徑不見了 diff --git a/crates/ui-egui/src/tests/trace_runs.rs b/crates/ui-egui/src/tests/trace_runs.rs index d2de2f00f5..8dd72efe91 100644 --- a/crates/ui-egui/src/tests/trace_runs.rs +++ b/crates/ui-egui/src/tests/trace_runs.rs @@ -162,6 +162,23 @@ fn a_trace_needs_its_image_as_it_was() { assert!(app.ui.status.contains("changed meanwhile: trace it again"), "{}", app.ui.status); } +/// A trace started before File › Revert doesn't apply after it, even when the document was +/// reverted to the same image: nothing changes, and the status bar says why. +#[test] +fn a_trace_started_before_a_revert_does_not_apply() { + let mut app = app(); + let i = app.session.active_index().unwrap(); + let copy = (*app.session.doc().unwrap().doc).clone(); + let [img] = app.session.doc().unwrap().selection.objects[..] else { panic!("the image is selected") }; + crate::menus::invoke(&mut app, "imageTrace.make", json!({"preset": "Default"})); + assert!(app.session.replace_document(i, copy)); + wait(&mut app); + assert_eq!(undos(&app), 0, "nothing changes"); + let st = app.session.doc().unwrap(); + assert!(matches!(st.doc.node(img).unwrap().kind, vectorcraft_doc::NodeKind::Image(_)), "the image is not traced"); + assert_eq!(app.ui.status, "Image Trace finished, but its document was reverted: trace it again"); +} + /// The progress window opens after its delay with Cancel and Continue in Background; Continue in /// Background closes it and the trace goes on. #[test] diff --git a/crates/ui-egui/src/trace_runs.rs b/crates/ui-egui/src/trace_runs.rs index 3d80c1190a..d9800e6668 100644 --- a/crates/ui-egui/src/trace_runs.rs +++ b/crates/ui-egui/src/trace_runs.rs @@ -8,7 +8,8 @@ //! //! When it is done, what it traced is handed to its command with the same parameters //! ([`Traced::hand_in`]), so the edit is one undo step like any trace, unless the image or the -//! settings changed meanwhile: then nothing changes and the status bar says to trace it again. The +//! settings changed meanwhile or File › Revert replaced the document's content: then nothing +//! changes and the status bar says to trace it again. The //! control channel, MCP and scripts run the commands at once, and so does every trace on the web, //! in unit tests that don't set `off_the_ui_thread`, and with `VECTORCRAFT_SYNC_OPEN` set //! ([`available`]). @@ -158,8 +159,8 @@ pub fn poll(app: &mut VectorcraftApp) { } /// Applies trace `r`'s result in its document, which becomes the active one again, as its command -/// would while the object, its image and the settings are as they were; else why it has none, in -/// the status bar. +/// would while the object, its image and the settings are as they were and the document was not +/// reverted; else why it has none, in the status bar. fn finish(app: &mut VectorcraftApp, r: Running, done: Option) { // Cancel changes nothing, even when the trace ended just before it. if r.token.is_cancelled() { @@ -184,6 +185,10 @@ fn finish(app: &mut VectorcraftApp, r: Running, done: Option) { return; }; app.session.set_active(i); + if run.reverted(&app.session) { + app.status("Image Trace finished, but its document was reverted: trace it again"); + return; + } if !run.current(&app.session) { app.status("Image Trace finished, but the image or its settings changed meanwhile: trace it again"); return; diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index c6972468cc..8d615662f0 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1479,6 +1479,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **Image Trace, Flat Logo working size:** Flat Logo traces at most 1024 px on a side; a larger image is averaged down by a whole factor first, and the trace's `warnings` name the size it was traced at and the image's own size, in place of the slower-trace and 64-megapixel notes; code-drawn 1024 and 1025 px tests in `crates/trace` and `crates/engine`. - **Image Trace, Preview:** the Image Trace panel's Preview checkbox, before Trace, is on by default, and a setting change traces the selected Image Trace object again at once. Off, changes wait in the panel until Trace applies them as one undo step, or until Preview is turned on again. Changes stay with the object they were made for while another object is selected. When Preview is turned on with that object not selected, the object is traced with its changes when it is selected again. Preview is kept with the UI preferences, and Reset to Default leaves it. The `imageTrace.preview` command turns it on or off. - **Image Trace, traces made off the UI thread stay with their document:** a trace made away from the command (`TraceRun`) applies only in the document it was made in. In another open document with the same image, object and settings, `imageTrace.make` and `imageTrace.makeAndExpand` drop it and trace that document's image, as one undo step (VectorCraft's own rule). Test: `a_trace_run_applies_only_in_its_own_document` in `crates/engine`. Scores and hours unchanged. +- **Image Trace, a trace started before File › Revert does not apply after it:** the reverted document keeps its tab, but a trace prepared before the revert no longer applies, even when the restored image, object and settings are the same. A background trace that finishes after the revert changes nothing and the status bar says the document was reverted; a result handed to `imageTrace.make` or `imageTrace.makeAndExpand` is dropped and the restored image is traced again, as one undo step. Reverting another document, or a revert that fails, does not affect the trace (VectorCraft's own rule). Tests: `a_trace_run_prepared_before_a_revert_does_not_apply_after_it` in `crates/engine`, `a_trace_started_before_a_revert_does_not_apply` in `crates/ui-egui`. Scores and hours unchanged. - **Image Trace small contours:** closed fits too small to form an editable subpath retain their positioned outline, including holes. Source-generated island, hole/winding and stepped-region regressions cover Corners and Noise; defaults, parity scores and estimates are unchanged. - **Image Trace, custom presets:** Manage Presets next to the Image Trace panel's Preset dropdown saves the panel's settings as a new preset under a name (Save as New Preset…) and renames or deletes the saved preset shown; built-in presets don't change. Saved presets are kept with the preferences and follow the built-in ones in the panel, Control bar and Properties preset lists. `imageTrace.presets.save` and `imageTrace.presets.delete` save, rename and delete them, `imageTrace.presets` lists them, and `imageTrace.make {preset}` traces with one by name. - **Image Trace, preset buttons:** six buttons above the Image Trace panel's Preset dropdown choose a preset as the dropdown does, for the options the [help page](https://helpx.adobe.com/illustrator/desktop/manage-objects/traces-mockups-symbols/image-trace-panel-options.html) lists before Preset. The presets each button chooses are VectorCraft's own: Auto Color chooses Auto Color, High Color chooses High Fidelity Photo, Low Color chooses Low Fidelity Photo, Grayscale chooses Shades of Gray, Black and White chooses Black and White Logo, and Outline chooses Outline. With Preview on, a click traces the selected Image Trace object again as one undo step; with nothing traced selected, it changes the panel's settings only. The button of the panel's preset shows as selected. From d0200d0e5c4ea1034068df122895fa6a7ec0ec1f Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 17:20:23 -0800 Subject: [PATCH 17/50] Swatches: merging a swatch drops the process plates of the gradient stops linked to it Merge Swatches relinked a gradient stop linked to a merged spot swatch to the kept swatch but kept the process plates it printed with the old ink, so a kept spot swatch printed them beside its own tint and a kept global process swatch held them for a later change back to spot. The merge now clears those plates in the art, gradient swatches, graphic styles, the art of brushes and the fill and stroke for new art, in the same undo step. Stops linked to other swatches keep their plates. --- crates/engine/src/cmd/swatch.rs | 31 +++++++++-- crates/engine/src/tests/linked_stops.rs | 69 +++++++++++++++++++++++++ docs/mcp.md | 3 +- docs/target-app-parity.md | 1 + 4 files changed, 100 insertions(+), 4 deletions(-) diff --git a/crates/engine/src/cmd/swatch.rs b/crates/engine/src/cmd/swatch.rs index 3388b8344b..8868143ef3 100644 --- a/crates/engine/src/cmd/swatch.rs +++ b/crates/engine/src/cmd/swatch.rs @@ -93,7 +93,7 @@ pub fn specs() -> Vec { "Merge Swatches", ["Window", "Swatches"], None, - "{names: [two or more solid-colour swatches], name?: the merged swatch's name (one swatch kept)} keep the first (its name and colour) and delete the others; paints linked to them take its colour and link to it (or unlink when it isn't global), as one undo step → {name, merged: [deleted names], relinked}", + "{names: [two or more solid-colour swatches], name?: the merged swatch's name (one swatch kept)} keep the first (its name and colour) and delete the others; paints linked to them take its colour and link to it (or unlink when it isn't global), and gradient stops linked to them drop their process plates, as one undo step → {name, merged: [deleted names], relinked}", has_doc, swatch_merge ), @@ -688,6 +688,11 @@ impl Relink { /// batch, and a canceled batch preview, put back the paints the batch started with. A change is /// recorded with the step just made, so Undo and Redo put these paints back with the document. pub(super) fn map_default_paints(s: &mut Session, f: &mut LinkFn) -> Result<()> { + map_default_paints_by(s, &mut |p| p.map_links(f)) +} + +/// [`map_default_paints`] with `f` applied to each whole paint; `f` returns true when it changed it. +fn map_default_paints_by(s: &mut Session, f: &mut dyn FnMut(&mut Paint) -> bool) -> Result<()> { if s.in_interaction() && s.batch_stash.is_none() { return Ok(()); } @@ -699,7 +704,7 @@ pub(super) fn map_default_paints(s: &mut Session, f: &mut LinkFn) -> Result<()> }); let mut changed = false; for p in [&mut pd.fill, &mut pd.stroke].into_iter().chain(template) { - changed |= p.map_links(f); + changed |= f(p); } if changed { super::colormgmt::record_new_art_colors(s, start)?; @@ -1124,17 +1129,37 @@ fn swatch_merge(s: &mut Session, p: &Value) -> Result { *l = link.clone(); true }; + // A stop linked to a merged swatch loses its process plates, which printed with that ink. + let mut unplate = |p: &Paint| { + let mut q = p.clone(); + drop_stop_plates(&mut q, &merged_names).then_some(q) + }; let colorized_ok = super::paint::check_colorized(d).is_ok(); let relinked = s.edit("Merge Swatches", |d, _| { take_swatches(d, merged, |_| true); + map_all_paints(d, &mut unplate); let relinked = map_swatch_links(d, &mut relink); super::paint::check_colorized_kept(colorized_ok, d).map_err(|e| bad(C, e))?; Ok(relinked) })?; - map_default_paints(s, &mut relink)?; + map_default_paints_by(s, &mut |p| { + let unplated = drop_stop_plates(p, &merged_names); + p.map_links(&mut relink) | unplated + })?; Ok(json!({"name": keep, "merged": merged, "relinked": relinked})) } +/// Clear the process plates of `p`'s gradient stops linked to a swatch in `names`. True when any +/// stop had plates. +fn drop_stop_plates(p: &mut Paint, names: &HashSet<&str>) -> bool { + let Paint::Gradient(g) = p else { return false }; + g.gradient + .stops + .iter_mut() + .filter(|st| st.swatch.as_deref().is_some_and(|l| names.contains(l))) + .fold(false, |ch, st| st.plates.take().is_some() | ch) +} + fn swatch_ungroup(s: &mut Session, p: &Value) -> Result { const C: &str = "swatch.ungroup"; let name = str_param(p, "name").ok_or_else(|| bad(C, "missing `name`"))?.to_string(); diff --git a/crates/engine/src/tests/linked_stops.rs b/crates/engine/src/tests/linked_stops.rs index 62955e6065..a0f001afe6 100644 --- a/crates/engine/src/tests/linked_stops.rs +++ b/crates/engine/src/tests/linked_stops.rs @@ -231,6 +231,75 @@ fn deleting_a_spot_swatch_takes_the_process_plates_of_the_stops_it_unlinks() { assert_eq!(gradient(&s, id).gradient.stops[1], linked, "undo brings back the link and the plates"); } +/// The stops of the gradients the merge test puts in place: the art's fill, gradient swatch "Glow", +/// graphic style "Style", the art of brush "Brush" and the fill new art takes. +fn merge_test_stops(s: &Session, id: NodeId) -> Vec<(&'static str, Vec)> { + let d = doc(s); + let stops = |p: Paint| match p { + Paint::Gradient(g) => g.gradient.stops, + p => panic!("not a gradient: {p:?}"), + }; + let style = d.graphic_style("Style").unwrap().appearance.items.iter().find_map(|it| match it { + vectorcraft_doc::AppearanceItem::Fill(f) => Some(f.paint.clone()), + vectorcraft_doc::AppearanceItem::Stroke(_) => None, + }); + let mut brush = None; + for n in vectorcraft_brush::find(d, "Brush").unwrap().art() { + n.walk(&mut |m| { + if brush.is_none() && matches!(m.appearance.fill_paint(), Paint::Gradient(_)) { + brush = Some(m.appearance.fill_paint()); + } + }); + } + vec![ + ("art", stops(d.node(id).unwrap().appearance.fill_paint())), + ("gradient swatch", stops(d.swatch("Glow").unwrap().paint.clone())), + ("graphic style", stops(style.unwrap())), + ("brush art", stops(brush.unwrap())), + ("new art", stops(s.paint.fill.clone())), + ] +} + +#[test] +fn merging_swatches_takes_the_process_plates_of_the_stops_it_relinks() { + // Kept swatch "Keep": spot, global process, and process that isn't global. + for (spot, global) in [(true, true), (false, true), (false, false)] { + let (mut s, id) = setup(); + run(&mut s, "swatch.new", json!({"name": "Keep", "color": "#00ff00", "spot": spot, "global": global})); + run(&mut s, "swatch.new", json!({"name": "Other", "color": {"c": 1, "m": 0, "y": 0, "k": 0}, "spot": true})); + // Ink at 50 % over a 30 % cyan plate, and Other over its own 20 % magenta plate, which the + // merge leaves alone. + let plated = json!({"stops": [ + {"offset": 0, "swatch": "Ink", "tint": 50, "plates": [0.3, 0, 0, 0]}, + {"offset": 1, "swatch": "Other", "plates": [0, 0.2, 0, 0]}, + ]}); + run(&mut s, "paint.editGradient", plated.clone()); + run(&mut s, "swatch.new", json!({"name": "Glow", "gradient": plated})); + run(&mut s, "graphicStyle.new", json!({"name": "Style"})); + run(&mut s, "brush.new", json!({"type": "art", "name": "Brush"})); + s.paint.fill = doc(&s).node(id).unwrap().appearance.fill_paint(); + let before = merge_test_stops(&s, id); + let kept = doc(&s).linked_color(doc(&s).swatch("Keep").unwrap().paint.color().unwrap(), spot); + assert!(before.iter().all(|(_, st)| st[0].plates == Some([0.3, 0.0, 0.0, 0.0])), "{before:?}"); + + run(&mut s, "swatch.merge", json!({"names": ["Keep", "Ink"]})); + let after = merge_test_stops(&s, id); + // The stop shows its tint of the kept color, unlinked when the kept swatch isn't global. + let (link, tint, color) = if global { (Some("Keep"), 0.5, kept.tinted(0.5)) } else { (None, 1.0, kept.tinted(0.5)) }; + for (place, st) in &after { + let what = format!("spot {spot}, global {global}, {place}: {st:?}"); + assert_eq!((st[0].swatch.as_deref(), st[0].tint, st[0].plates), (link, tint, None), "{what}"); + assert_eq!(st[0].color, color, "{what}"); + assert_eq!((st[1].swatch.as_deref(), st[1].plates), (Some("Other"), Some([0.0, 0.2, 0.0, 0.0])), "{what}"); + } + + run(&mut s, "edit.undo", json!({})); + assert_eq!(merge_test_stops(&s, id), before, "undo brings back the links and the plates"); + run(&mut s, "edit.redo", json!({})); + assert_eq!(merge_test_stops(&s, id), after, "redo merges again"); + } +} + #[test] fn radial_spot_gradients_mixed_with_other_inks_export_as_device_n_shadings() { let (mut s, _) = setup(); diff --git a/docs/mcp.md b/docs/mcp.md index 99b0bfef38..96fda7c4eb 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -928,7 +928,8 @@ them in the Swatches panel does); give colour group names instead to reorder the in the app runs `paint.setFill` (or `paint.setStroke`, the active proxy) with `ids: [the object under the pointer]`. The Swatches panel menu's commands: `swatch.addUsedColors {selection?, global?}`, `swatch.unused` (a query: the names Select All Unused selects; a spot swatch counts as used while an image placed from a DCS file has a plate of -its ink), `swatch.merge {names}` (the first is kept), `swatch.ungroup {name}` and +its ink), `swatch.merge {names}` (the first is kept; gradient stops linked to the others drop their process +plates), `swatch.ungroup {name}` and `swatch.sortByKind`. `brush.move {name | names, to?, type?}` reorders brushes among the brushes of their type, as dragging one onto another of its type in the Brushes panel does. `to` is an index among the brushes of that type in `brush.list` diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index c6972468cc..49a51a5a07 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1590,6 +1590,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - **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). - 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. From 39c85c6b7373c9ef2e5bf70ec12cd18bb1b8a015 Mon Sep 17 00:00:00 2001 From: Davit Matchakhelidze Date: Sun, 15 Nov 2026 05:49:46 +0400 Subject: [PATCH 18/50] i18n(ka): update the Georgian catalog --- crates/ui-egui/src/i18n/ka.tsv | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index a07e676c23..be5d25f424 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -879,6 +879,7 @@ Free Transform თავისუფალი გარდაქმნა Perspective Distort პერსპექტიული დეფორმაცია Radial Blur… რადიალური გაბუნდოვნება… + Blur Center გაბუნდოვნების ცენტრი Smart Blur… ჭკვიანი გაბუნდოვნება… Sharpen გამკვეთრება Unsharp Mask… არამკვეთრი ნიღაბი… @@ -2438,6 +2439,7 @@ digits Malayalam მალაიალამური Transparent Background გამჭვირვალე ფონი Choose… არჩევა… Copy Fonts Used in the Document დოკუმენტში გამოყენებული შრიფტების კოპირება + Copy Info ინფორმაციის კოპირება Copy Links ბმულების კოპირება Create Report ანგარიშის შექმნა Fonts whose licence doesn't allow embedding are not copied. შრიფტები, რომელთა ლიცენზია ჩაშენების უფლებას არ იძლევა, არ კოპირდება. @@ -5616,6 +5618,7 @@ imageTrace Outline კონტური @msg there is no script engine named {name} სკრიპტის ძრავა სახელით {name} არ არსებობს @msg Running a script სკრიპტი მუშაობს @msg Copied the script report კოპირებულია სკრიპტის ანგარიში +@msg Copied the link info კოპირებულია ბმულის ინფორმაცია @msg Offset Path: the offset leaves nothing of the selected paths (an inset larger than the shapes) ტრაექტორიის წანაცვლება: წანაცვლების შემდეგ მონიშნული ტრაექტორიებიდან არაფერი რჩება (შიგნით წანაცვლება ფიგურებზე დიდია) @msg {path}: not a file {path}: ფაილი არ არის Load EPS into Clipboard EPS-ის ბუფერში ჩატვირთვა @@ -5696,6 +5699,7 @@ imageTrace Outline კონტური @msg object has no weighted stroke ობიექტს ცვლადი სისქის კონტური არ აქვს @msg objects can't be nested more than 32 deep ობიექტების ჩადგმის სიღრმე 32-ს ვერ გადააჭარბებს @msg the SVG's elements are nested more than {0} deep SVG-ის ელემენტების ჩადგმის სიღრმე {0}-ს აჭარბებს +@msg the SVG's style sheets take too long to match SVG-ის სტილის ფურცლების შედარებას ძალიან დიდი დრო სჭირდება @msg the SVG's styles expand to more than {0} MB SVG-ის სტილები გაშლისას {0} MB-ს აჭარბებს @msg unknown control `{name}`: fillStroke, coloring, drawMode or screenMode უცნობი control `{name}`: fillStroke, coloring, drawMode ან screenMode @plural agrees with {n} default shortcut|agrees with {n} default shortcuts ემთხვევა ნაგულისხმევ მალსახმობებს: {n}|ემთხვევა ნაგულისხმევ მალსახმობებს: {n} @@ -9710,3 +9714,16 @@ font-script Japanese იაპონური @msg there is no artboard {i} სამუშაო დაფა {i} არ არსებობს @msg tolerance must be 0 or more tolerance უნდა იყოს 0 ან მეტი @msg {name} is a default SVG filter, and the document holds no copy of it to delete {name} ნაგულისხმევი SVG ფილტრია და დოკუმენტში მისი წასაშლელი ასლი არ არის +@msg `{key}` must be a number from 0 to 1 `{key}` უნდა იყოს რიცხვი 0-დან 1-მდე +@msg data set `{name}` holds a graph value for `{var}` with {_1} მონაცემთა ნაკრები `{name}` ცვლადისთვის `{var}` შეიცავს დიაგრამის მნიშვნელობას, რომელშიც {_1} +@msg data set `{name}` holds a graph value for `{var}` without rows or series მონაცემთა ნაკრები `{name}` ცვლადისთვის `{var}` შეიცავს დიაგრამის მნიშვნელობას სტრიქონებისა და სერიების გარეშე +@msg data set `{name}` holds an image value for `{var}` that isn't a file's absolute path მონაცემთა ნაკრები `{name}` ცვლადისთვის `{var}` შეიცავს გამოსახულების მნიშვნელობას, რომელიც ფაილის აბსოლუტური გზა არ არის +@msg data set `{set}` holds a graph value for `{var}` longer than {MAX_GRAPH_CSV} bytes მონაცემთა ნაკრები `{set}` ცვლადისთვის `{var}` შეიცავს დიაგრამის მნიშვნელობას, რომელიც {MAX_GRAPH_CSV} ბაიტზე გრძელია +@msg data set `{set}` holds a graph value for `{var}` with {_1} მონაცემთა ნაკრები `{set}` ცვლადისთვის `{var}` შეიცავს დიაგრამის მნიშვნელობას, რომელშიც {_1} +@msg data set `{set}` holds a value for `{_1}` that isn't {what} მონაცემთა ნაკრები `{set}` ცვლადისთვის `{_1}` შეიცავს მნიშვნელობას, რომელიც {what} არ არის +@msg data set `{set}` holds a value for `{var}` that isn't a graph's `data` element მონაცემთა ნაკრები `{set}` ცვლადისთვის `{var}` შეიცავს მნიშვნელობას, რომელიც დიაგრამის `data` ელემენტი არ არის +@msg match applies only with scope {scopes} match მხოლოდ scope-ის მნიშვნელობით {scopes} მოქმედებს +@msg match must be a paint as the document stores it match უნდა იყოს საღებავი იმ სახით, როგორც დოკუმენტი ინახავს +@msg scope applies to a click: leave out points scope დაწკაპებას ეხება: points არ მიუთითოთ +@msg scope must be "one", "connected" or "samePaint" scope უნდა იყოს "one", "connected" ან "samePaint" +@msg variable `{_1}` starts or ends with white space or holds a control character, which a variable library can't hold ცვლადი `{_1}` იწყება ან მთავრდება ჰარით ან შეიცავს მმართველ სიმბოლოს, რასაც ცვლადების ბიბლიოთეკა ვერ შეინახავს From b981c987c127191bfbf8c9a2023e4f11cf26bfae Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 17:10:14 -0800 Subject: [PATCH 19/50] SVG Filters: a filter on a turned or skewed object is kept on import and drawn An SVG whose filtered element sits under a rotate, skew, uneven scale or matrix transform now opens with the filter as a live Effect > SVG Filters effect instead of losing it with a warning. - The svg.filter effect takes an optional axes [a, b, c, d]: the document directions of one unit along the filter's x and y axes, before scale. effect.apply and effect.setParams refuse axes with an entry outside -1000..1000 or a determinant within 0.001 of 0. - With axes, the filter runs on a canvas lined up with its user space, so offsets, blurs and the region run along the element's axes, and the result is drawn back through axes. The canvas holds at most 4 times the object's raster pixels. A region measured against the object's box uses the object's box in that user space. - SVG import stores the element's user space as scale, origin and axes. - SVG export writes such a filter live: a group's transform holds the user space, and the art is written in document coordinates in a group with the inverse transform, so strokes keep their widths. --- crates/effects/src/catalog.rs | 2 +- crates/effects/src/svg_filter.rs | 177 +++++++++++++++++++++---- crates/effects/src/svg_filter/tests.rs | 92 ++++++++++++- crates/engine/src/cmd/params.rs | 6 + crates/engine/src/cmd/rasterfx.rs | 4 +- crates/engine/src/tests/params.rs | 3 +- crates/engine/src/tests/svgfilter.rs | 17 +++ crates/svg/src/export/paint.rs | 72 ++++++++-- crates/svg/src/import/fx.rs | 48 ++++++- crates/svg/tests/it/import_details.rs | 11 +- crates/svg/tests/it/import_live.rs | 126 +++++++++++++++++- docs/effects-parity.md | 2 +- docs/mcp.md | 28 ++-- 13 files changed, 522 insertions(+), 66 deletions(-) diff --git a/crates/effects/src/catalog.rs b/crates/effects/src/catalog.rs index 424beebe17..2842b01080 100644 --- a/crates/effects/src/catalog.rs +++ b/crates/effects/src/catalog.rs @@ -859,7 +859,7 @@ pub fn effect_catalog() -> Vec { crate::SVG_FILTER, "SVG Filter", &["Effect", "SVG Filters"], - "{name: string (the filter's id), xml: string (one SVG element with an id and 1..64 primitives, at most 64 KB), scale: number 0.001..1000 (1; points per unit of the filter's user space), origin: [x, y] pt ([0, 0]; where the filter's user space starts in the document)} runs the SVG filter on the object's pixels, its lengths in points times scale, at the Document Raster Effects resolution or finer; svgFilter.apply applies one of the document's filters (svgFilter.list)", + "{name: string (the filter's id), xml: string (one SVG element with an id and 1..64 primitives, at most 64 KB), scale: number 0.001..1000 (1; points per unit of the filter's user space), origin: [x, y] pt ([0, 0]; where the filter's user space starts in the document), axes?: [a, b, c, d] (absent: the document's axes; the document directions of one unit along the filter's x axis [a, b] and y axis [c, d] before scale, each -1000..1000, with a·d - b·c at least 0.001 from 0; a turned, skewed or unevenly scaled user space, as SVG import gives a filtered element under a rotate, skew or uneven scale; the filter's offsets, blurs and region run along these axes)} runs the SVG filter on the object's pixels, its lengths in points times scale, at the Document Raster Effects resolution or finer; svgFilter.apply applies one of the document's filters (svgFilter.list)", json!({"scale": 1.0, "origin": [0.0, 0.0]}), )); v diff --git a/crates/effects/src/svg_filter.rs b/crates/effects/src/svg_filter.rs index 0c4bff0f1d..cbbd4287d9 100644 --- a/crates/effects/src/svg_filter.rs +++ b/crates/effects/src/svg_filter.rs @@ -1,7 +1,8 @@ //! Effect › SVG Filters (`svg.filter`): an SVG `` element applied as a live raster effect. //! The filter runs on the object's pixels as SVG 1.1 describes it //! (), drawn by resvg. Its lengths are in points times -//! the effect's `scale`, its user space starts at the effect's `origin`, its object bounding box is the box of the drawn pixels, and it runs at the +//! the effect's `scale`, its user space starts at the effect's `origin`, its axes point as the effect's `axes` say (a turned or +//! skewed user space), its object bounding box is the box of the drawn pixels, and it runs at the //! Document Raster Effects resolution when the view shows the object at a finer one. use std::sync::Arc; @@ -1224,13 +1225,16 @@ fn region_length(v: Option<&str>, default: f64, user: bool) -> Length { } /// An SVG filter effect: the filter's XML, how many points one of its units is, where its user -/// space's origin lies in the document, and its region. +/// space's origin lies in the document, which way its axes point, and its region. #[derive(Clone, Debug, PartialEq)] pub struct SvgFilterFx { /// The filter as it is drawn and written ([`rebuilt`]). xml: Arc, scale: f64, origin: Vec2, + /// The directions of the user space's axes in the document, before `scale` ([`axes_param`]): + /// the identity unless the user space is turned, skewed or scaled unevenly. + axes: Affine, /// Its region (filter effects region): x, y, width, height. region: [Length; 4], /// Is the region in user space with a length measured against the object's box? It is then @@ -1250,11 +1254,49 @@ fn origin_param(p: &Value) -> Vec2 { Vec2::new(at(0), at(1)) } +/// The largest magnitude of an entry of an SVG filter effect's `axes`. +pub const MAX_AXIS: f64 = 1000.0; + +/// The smallest magnitude of the determinant of an SVG filter effect's `axes`. +pub const MIN_AXES_DET: f64 = 0.001; + +/// The `axes` of an SVG filter effect's parameters `p`: `[a, b, c, d]`, the document directions +/// of one unit along the filter's x axis (`[a, b]`) and its y axis (`[c, d]`), before `scale`. +/// The identity when absent; `None` when it isn't four numbers from -[`MAX_AXIS`] to [`MAX_AXIS`] +/// whose determinant is at least [`MIN_AXES_DET`] across ([`valid_axes`]). +fn axes_param(p: &Value) -> Option { + match p.get("axes") { + None | Some(Value::Null) => Some(Affine::IDENTITY), + Some(v) => valid_axes(v), + } +} + +/// `v` as the linear map of an SVG filter effect's `axes` ([`axes_param`]), when it is one. +pub fn valid_axes(v: &Value) -> Option { + let n: Vec = v.as_array()?.iter().map(Value::as_f64).collect::>()?; + let [a, b, c, d] = <[f64; 4]>::try_from(n).ok()?; + let det = a * d - b * c; + ([a, b, c, d].iter().all(|v| v.is_finite() && v.abs() <= MAX_AXIS) && det.abs() >= MIN_AXES_DET).then(|| Affine::new([a, b, c, d, 0.0, 0.0])) +} + +/// The longest a unit vector becomes under the linear part of `a` (its largest singular value). +fn stretch(a: Affine) -> f64 { + let [a, b, c, d, _, _] = a.as_coeffs(); + let sum = a * a + b * b + c * c + d * d; + let det = a * d - b * c; + (0.5 * (sum + (sum * sum - 4.0 * det * det).max(0.0).sqrt())).sqrt() +} + +/// How many times the raster's pixels a turned filter's canvas may hold ([`SvgFilterFx::turned_canvas`]). +const TURNED_ROOM: f64 = 4.0; + impl SvgFilterFx { - /// The effect's parameters `p` (defaults merged in): `xml`, the `` element, `scale` - /// and `origin`. `None` when `xml` isn't a filter [`check`] takes, however the effect came to - /// hold it (an opened file, a script): the object is then drawn, printed and exported without it. + /// The effect's parameters `p` (defaults merged in): `xml`, the `` element, `scale`, + /// `origin` and `axes`. `None` when `xml` isn't a filter [`check`] takes, or `axes` isn't + /// valid ([`axes_param`]), however the effect came to hold it (an opened file, a script): the + /// object is then drawn, printed and exported without it. pub(crate) fn parse(p: &Value) -> Option { + let axes = axes_param(p)?; let xml = checked(text(p, "xml", ""))?; let (wrapped, _) = wrap(&xml); let doc = roxmltree::Document::parse(&wrapped).ok()?; @@ -1273,7 +1315,17 @@ impl SvgFilterFx { let (window, blur) = (largest(&["radius", "kernelUnitLength"]), largest(&["stdDeviation"])); let box_units = f.attribute("primitiveUnits").is_some_and(|u| u.trim() == "objectBoundingBox"); let scale = num(p, "scale", 1.0).clamp(1e-3, 1e3); - Some(Self { xml, scale, origin: origin_param(p), region, measured, window, blur, box_units }) + Some(Self { xml, scale, origin: origin_param(p), axes, region, measured, window, blur, box_units }) + } + + /// The filter's user space → the document: moved to `origin`, scaled by `scale`, along `axes`. + pub fn to_doc(&self) -> Affine { + Affine::translate(self.origin) * Affine::scale(self.scale) * self.axes + } + + /// The box of `bounds` (document units) in the filter's user space. + fn user_box(&self, bounds: Rect) -> Rect { + self.to_doc().inverse().transform_rect_bbox(bounds) } /// The filter's region in its user space for an object whose box there is `b`: lengths in user @@ -1308,11 +1360,11 @@ impl SvgFilterFx { with_attributes(xml, &[("x", r.x0), ("y", r.y0), ("width", r.width()), ("height", r.height())]) } - /// The filter as SVG output writes it (one unit a point, [`Self::in_points`]) for an object - /// whose box in the document is `bounds`: in its SVG 1.1 form ([`svg11`]), `None` when SVG 1.1 - /// can't hold it ([`Self::writes_as_svg11`]). - pub fn written_xml(&self, bounds: Rect) -> Option { - let out = self.with_region(&self.svg11_form()?, (bounds - self.origin).scale_from_origin(1.0 / self.scale))?; + /// The filter as SVG output writes it, in its user space ([`Self::to_doc`]), for an object + /// whose box in that user space is `user_box`: in its SVG 1.1 form ([`svg11`]), `None` when SVG + /// 1.1 can't hold it ([`Self::writes_as_svg11`]). + pub fn written_xml(&self, user_box: Rect) -> Option { + let out = self.with_region(&self.svg11_form()?, user_box)?; (written_len(&out) <= MAX_WRITTEN_XML).then_some(out) } @@ -1346,9 +1398,10 @@ impl SvgFilterFx { return 1.0; } let mut s: f64 = if space.line.is_finite() && space.line > 0.0 { (space.px / space.line).min(1.0) } else { 1.0 }; - // A length spans length × scale / px raster pixels, or a fraction of the box. + // A length spans at most length × scale × the axes' stretch / px raster pixels, or a fraction of the box. + let reach = self.scale * stretch(self.axes); for (length, most) in [(self.window, MAX_WINDOW_PX), (self.blur, MAX_BLUR_PX)] { - let px = if self.box_units { length * box_px.max(0.0) } else { length * self.scale / space.px }; + let px = if self.box_units { length * box_px.max(0.0) } else { length * reach / space.px }; if px * s > most { s = most / px; } @@ -1374,15 +1427,15 @@ impl SvgFilterFx { self.measured } - /// Does one unit of the filter's user space measure one point (its `scale` is 1)? - pub fn in_points(&self) -> bool { - self.scale == 1.0 + /// Is the filter's user space the document's, only moved: one unit a point, its axes the + /// document's (`scale` 1, no `axes`)? + pub fn moves_only(&self) -> bool { + self.scale == 1.0 && self.axes == Affine::IDENTITY } /// How far beyond `bounds` (document units) the filter can draw: its region's reach past them. pub fn outset(&self, bounds: Rect) -> f64 { - let b = (bounds - self.origin).scale_from_origin(1.0 / self.scale); - let region = self.region_in(b).scale_from_origin(self.scale) + self.origin; + let region = self.to_doc().transform_rect_bbox(self.region_in(self.user_box(bounds))); let reach = [bounds.x0 - region.x0, bounds.y0 - region.y0, region.x1 - bounds.x1, region.y1 - bounds.y1].into_iter().fold(0.0, f64::max); if reach.is_finite() { reach.min(MAX_OUTSET) } else { 0.0 } } @@ -1398,13 +1451,26 @@ impl SvgFilterFx { // Art that draws no pixels still has a box: the whole raster stands for it. let (x0, y0, x1, y1) = drawn_box(data, w, h).unwrap_or((0, 0, w, h)); let s = self.resolution(space, (x1 - x0).max(y1 - y0) as f64); - let (sw, sh) = ((w as f64 * s).ceil().max(1.0) as u32, (h as f64 * s).ceil().max(1.0) as u32); + let user = self.to_doc(); + // Filter user space → the small canvas, and the small canvas → the raster's pixels. + let (sw, sh, outer, back) = if self.axes == Affine::IDENTITY { + let (sw, sh) = ((w as f64 * s).ceil().max(1.0) as u32, (h as f64 * s).ceil().max(1.0) as u32); + (sw, sh, Affine::scale(s) * space.to_doc.inverse() * user, Affine::scale(1.0 / s)) + } else { + let Some(canvas) = self.turned_canvas(w, h, s, space) else { return }; + canvas + }; let Some(png) = png_of(data, w, x0, y0, x1, y1).map(Arc::new) else { return }; - let k = self.scale; - // Filter user space → the small canvas, and the image's pixels → filter user space. - let outer = Affine::scale(s) * space.to_doc.inverse() * Affine::translate(self.origin) * Affine::scale(k); - let place = Affine::scale(1.0 / k) * Affine::translate(-self.origin) * space.to_doc * Affine::translate(Vec2::new(x0 as f64, y0 as f64)); - let b = place.transform_rect_bbox(Rect::new(0.0, 0.0, (x1 - x0) as f64, (y1 - y0) as f64)); + // The image's pixels → filter user space. + let place = user.inverse() * space.to_doc * Affine::translate(Vec2::new(x0 as f64, y0 as f64)); + // The object's box in user space: in a turned or skewed one, the box of its pixels turned + // into it, not of their box in the raster. + let b = if self.axes == Affine::IDENTITY { + place.transform_rect_bbox(Rect::new(0.0, 0.0, (x1 - x0) as f64, (y1 - y0) as f64)) + } else { + let Some(b) = turned_box(data, w, user.inverse() * space.to_doc) else { return }; + b + }; let Some(drawn) = self.drawn_xml(b).and_then(|xml| with_id(&xml, DRAWN_ID)) else { return }; let svg = format!( "{drawn}", @@ -1420,19 +1486,51 @@ impl SvgFilterFx { } let Some(mut small) = tiny_skia::Pixmap::new(sw, sh) else { return }; resvg::render(&tree, tiny_skia::Transform::identity(), &mut small.as_mut()); - let out = if s < 1.0 { + let out = if back == Affine::IDENTITY { + small + } else { let Some(mut full) = tiny_skia::Pixmap::new(w as u32, h as u32) else { return }; let paint = tiny_skia::PixmapPaint { quality: tiny_skia::FilterQuality::Bilinear, ..Default::default() }; - let up = (1.0 / s) as f32; - full.draw_pixmap(0, 0, small.as_ref(), &paint, tiny_skia::Transform::from_scale(up, up), None); + let [a, b, c, d, e, f] = back.as_coeffs().map(|v| v as f32); + full.draw_pixmap(0, 0, small.as_ref(), &paint, tiny_skia::Transform::from_row(a, b, c, d, e, f), None); full - } else { - small }; if out.data().len() == data.len() { data.copy_from_slice(out.data()); } } + + /// The canvas a filter whose user space is turned, skewed or scaled unevenly runs on, for a + /// `w` × `h` raster lying in the document as `space` says, at resolution `s` + /// ([`Self::resolution`]): its axes are the user space's, so the filter's offsets, blurs and + /// other lengths run along them as SVG 1.1 measures them, and it covers what the raster shows. + /// Along each of its axes its pixels are about as large as the raster's at `s`, and coarser when it would hold more + /// than [`TURNED_ROOM`] times as many pixels as the raster does at `s`. Returns its size, the + /// map from user space to it, and the map from it to the raster's pixels; `None` when the + /// spaces can't be measured. + fn turned_canvas(&self, w: usize, h: usize, s: f64, space: &PixelSpace) -> Option<(u32, u32, Affine, Affine)> { + let to_px = space.to_doc.inverse() * self.to_doc(); + let ub = to_px.inverse().transform_rect_bbox(Rect::new(0.0, 0.0, w as f64, h as f64)); + let most = ((w as f64 * s).ceil().max(1.0) * (h as f64 * s).ceil().max(1.0) * TURNED_ROOM).max(1.0); + // Canvas pixels a unit along each axis of the user space: as many as the raster's at `s`. + let [a, b, c, d, _, _] = to_px.as_coeffs(); + let (mut qx, mut qy) = (s * a.hypot(b), s * c.hypot(d)); + let pixels = ub.width() * qx * ub.height() * qy; + if pixels > most { + let k = (most / pixels).sqrt(); + (qx, qy) = (qx * k, qy * k); + } + if !(qx.is_finite() && qx > 0.0 && qy.is_finite() && qy > 0.0 && ub.is_finite()) { + return None; + } + let (cw, ch) = ((ub.width() * qx).ceil().max(1.0), (ub.height() * qy).ceil().max(1.0)); + // Rounding up adds at most a row and a column. + if cw * ch > most + cw + ch + 1.0 { + return None; + } + let outer = Affine::scale_non_uniform(qx, qy) * Affine::translate(Vec2::new(-ub.x0, -ub.y0)); + Some((cw as u32, ch as u32, outer, to_px * outer.inverse())) + } } /// The farthest a filter's region reaches beyond the object, in points. @@ -1450,6 +1548,27 @@ fn drawn_box(data: &[u8], w: usize, h: usize) -> Option<(usize, usize, usize, us (x1 > x0 && y1 > y0).then_some((x0, y0, x1, y1)) } +/// The box, under the map `a` from pixel coordinates, of the pixels of `data` (`w` wide) that aren't +/// transparent, or of the whole raster when all are. Under a map that keeps lines straight, a row's +/// farthest corners are those of its first and last such pixel, so each row is measured by those two. +fn turned_box(data: &[u8], w: usize, a: Affine) -> Option { + let px = data.as_chunks::<4>().0; + let h = px.len().checked_div(w)?; + let mut out: Option = None; + let mut add = |x: usize, y: usize| { + let r = a.transform_rect_bbox(Rect::new(x as f64, y as f64, x as f64 + 1.0, y as f64 + 1.0)); + out = Some(out.map_or(r, |o| o.union(r))); + }; + for y in 0..h { + let row = px.get(y * w..(y + 1) * w)?; + if let (Some(first), Some(last)) = (row.iter().position(|p| p[3] > 0), row.iter().rposition(|p| p[3] > 0)) { + add(first, y); + add(last, y); + } + } + out.or_else(|| (w > 0 && h > 0).then(|| a.transform_rect_bbox(Rect::new(0.0, 0.0, w as f64, h as f64)))) +} + /// The pixels of `data` (premultiplied RGBA8, `w` wide) in columns x0..x1 and rows y0..y1, as a PNG. fn png_of(data: &[u8], w: usize, x0: usize, y0: usize, x1: usize, y1: usize) -> Option> { use image::ImageEncoder; diff --git a/crates/effects/src/svg_filter/tests.rs b/crates/effects/src/svg_filter/tests.rs index df1956f3f0..9a76ea1d18 100644 --- a/crates/effects/src/svg_filter/tests.rs +++ b/crates/effects/src/svg_filter/tests.rs @@ -214,6 +214,95 @@ fn user_space_starts_at_the_origin() { assert!((filter(json!({ "xml": half, "origin": [-10.0, 0.0] })).outset(b) - 10.0).abs() < 1e-9); } +/// The opacity of `data` (`w` wide) after the filter `xml` with `params` runs on a blue square +/// over 10..20 pt of a 40 pt raster one point a pixel, at each of `points`. +fn turned_run(xml: &str, params: serde_json::Value, points: &[(usize, usize)]) -> Vec { + let w = 40; + let mut data = image(w, w, |x, y| if (10..20).contains(&x) && (10..20).contains(&y) { [0, 0, 255, 255] } else { [0; 4] }); + let mut p = params; + p["xml"] = json!(xml); + filter(p).apply(&mut data, w, w, &space(w, w, 1.0, 1.0)); + points.iter().map(|&(x, y)| at(&data, w, x, y)[3]).collect() +} + +const SHIFT_X: &str = r#""#; + +/// With `axes`, the filter runs in its turned or skewed user space: an offset along its x axis +/// moves the art along that axis in the document (SVG 1.1 measures a primitive's lengths in the +/// user space of the element the filter is on). +#[test] +fn a_turned_user_space_moves_the_art_along_its_own_axes() { + // The square spans 10..20 pt; moved 4 pt along x it covers 14..24 across. + let points = [(22, 15), (15, 22), (12, 11)]; + assert_eq!(turned_run(SHIFT_X, json!({}), &points), [255, 0, 0], "the document's axes: to the right"); + // Turned a quarter turn: the filter's x axis points down the page. + let down = turned_run(SHIFT_X, json!({ "axes": [0.0, 1.0, -1.0, 0.0] }), &points); + assert_eq!(down, [0, 255, 0], "moved down, not to the right"); + // Skewed: one unit along y is one across and one down, so dy 4 moves the art 4 pt each way. + let shift_y = r#""#; + let skewed = turned_run(shift_y, json!({ "axes": [1.0, 0.0, 1.0, 1.0] }), &[(22, 22), (11, 22), (11, 11)]); + assert!(skewed[0] > 200 && skewed[1] < 60 && skewed[2] < 60, "moved across and down: {skewed:?}"); +} + +#[test] +fn axes_the_effect_cannot_measure_are_not_drawn() { + for axes in [json!([0, 0, 0, 0]), json!([1, 2]), json!([1, 0, 0, "1"]), json!([2000, 0, 0, 1]), json!([0.01, 0, 0, 0.01]), json!("turned")] { + let e = Effect { id: SVG_FILTER.into(), params: json!({ "xml": SHIFT_X, "axes": axes }), visible: true }; + assert!(raster_effects(&[e]).is_empty(), "{axes}: drawn without it"); + assert!(valid_axes(&axes).is_none(), "{axes}"); + } + assert_eq!(valid_axes(&json!([0, 1, -1, 0])), Some(Affine::new([0.0, 1.0, -1.0, 0.0, 0.0, 0.0]))); +} + +/// A region measured against the object's box is measured against its box in the turned user +/// space: a diamond turned an eighth of a turn is a square there, and a flood over 0..100% of it +/// covers the diamond alone. +#[test] +fn a_turned_region_is_measured_against_the_box_in_its_user_space() { + let w = 40; + let diamond = |x: usize, y: usize| (x as f64 - 19.5).abs() + (y as f64 - 19.5).abs() <= 10.0; + let mut data = image(w, w, |x, y| if diamond(x, y) { [0, 0, 255, 255] } else { [0; 4] }); + let flood = r##""##; + let h = std::f64::consts::FRAC_1_SQRT_2; + filter(json!({ "xml": flood, "axes": [h, h, -h, h] })).apply(&mut data, w, w, &space(w, w, 1.0, 1.0)); + assert_eq!(at(&data, w, 20, 20), [255, 0, 0, 255], "inside the diamond"); + assert!(at(&data, w, 12, 12)[3] < 40, "outside the diamond, inside its box on the page: {:?}", at(&data, w, 12, 12)); +} + +/// The region of a turned filter reaches as far as its turned box does. +#[test] +fn a_turned_region_reaches_along_the_turned_axes() { + let b = Rect::new(0.0, 0.0, 50.0, 50.0); + let user = r#""#; + assert!((filter(json!({ "xml": user })).outset(b) - 45.0).abs() < 1e-9, "45 pt below the box"); + // A quarter turn: user y runs to the left of the page, so -5..95 of it lies 95 pt left of the box. + assert!((filter(json!({ "xml": user, "axes": [0.0, 1.0, -1.0, 0.0] })).outset(b) - 95.0).abs() < 1e-9); +} + +/// A filter skewed as far as `axes` allows runs on a canvas no larger than four times the raster's +/// pixels, however far the skew spreads the raster's box in its user space. +#[test] +fn a_skewed_filter_runs_within_its_pixel_budget() { + let (w, h) = (64, 48); + let f = filter(json!({ "xml": SHIFT_X, "axes": [1.0, 0.0, 999.0, 1.0] })); + let (cw, ch, ..) = f.turned_canvas(w, h, 1.0, &space(w, h, 1.0, 1.0)).unwrap(); + let (cw, ch) = (f64::from(cw), f64::from(ch)); + assert!(cw * ch <= TURNED_ROOM * (w * h) as f64 + cw + ch + 1.0, "{cw} × {ch}"); + // It still draws. + let mut data = image(w, h, |x, y| if (20..40).contains(&x) && (10..30).contains(&y) { [0, 0, 255, 255] } else { [0; 4] }); + f.apply(&mut data, w, h, &space(w, h, 1.0, 1.0)); + // A plain quarter turn keeps the raster's own pixel size. + let turned = filter(json!({ "xml": SHIFT_X, "axes": [0.0, 1.0, -1.0, 0.0] })); + let (cw, ch, outer, _) = turned.turned_canvas(w, h, 1.0, &space(w, h, 1.0, 1.0)).unwrap(); + assert_eq!((cw, ch), (48, 64)); + assert!((outer.determinant() - 1.0).abs() < 1e-9); + // Stretched 100 times across and squeezed 100 times down: each canvas axis keeps the raster's + // detail along it, not one column of it. + let stretched = filter(json!({ "xml": SHIFT_X, "axes": [100.0, 0.0, 0.0, 0.01] })); + let (cw, ch, ..) = stretched.turned_canvas(100, 100, 1.0, &space(100, 100, 1.0, 1.0)).unwrap(); + assert_eq!((cw, ch), (100, 100)); +} + #[test] fn runs_no_finer_than_the_raster_effects_resolution() { let w = 16; @@ -440,7 +529,8 @@ fn a_region_measured_against_the_box_is_written_out() { let far = r#""#; let f = filter(json!({ "xml": far, "origin": [10.0, 0.0] })); assert_eq!( - f.written_xml(Rect::new(10.0, 0.0, 30.0, 10.0)).as_deref(), + // The object over 10..30 pt of the page: 0..20 of the user space that starts at the origin. + f.written_xml(Rect::new(0.0, 0.0, 20.0, 10.0)).as_deref(), Some(r#""#) ); let plain = filter(json!({ "xml": RED_FLOOD })); diff --git a/crates/engine/src/cmd/params.rs b/crates/engine/src/cmd/params.rs index 4bb6bcba1d..7f150f6feb 100644 --- a/crates/engine/src/cmd/params.rs +++ b/crates/engine/src/cmd/params.rs @@ -369,6 +369,12 @@ pub fn check_effect_params(id: &str, effect: &str, params: &Value) -> Result<()> { return Err(bad(id, "`origin` must be [x, y] in points")); } + if effect == vectorcraft_render::effects::SVG_FILTER + && let Some(axes) = given.get("axes") + && vectorcraft_render::effects::svg_filter::valid_axes(axes).is_none() + { + return Err(bad(id, "`axes` must be [a, b, c, d], each from -1000 to 1000, with a·d - b·c at least 0.001 from 0")); + } // Its name is the filter's id. if effect == vectorcraft_render::effects::SVG_FILTER && given.contains_key("name") && !given.contains_key("xml") { return Err(bad(id, "an SVG filter is named by its id: give `xml` with `name`")); diff --git a/crates/engine/src/cmd/rasterfx.rs b/crates/engine/src/cmd/rasterfx.rs index 8f5f532c51..9fc28e0b75 100644 --- a/crates/engine/src/cmd/rasterfx.rs +++ b/crates/engine/src/cmd/rasterfx.rs @@ -473,7 +473,9 @@ fn imaged(n: &Node, which: Which) -> bool { let live = filters && pixels == 1 && effects::svg_filter::writes_live(&n.appearance.effects) - && fx.iter().any(|f| matches!(f, RasterFx::Pixel(effects::PixelFx::Svg(s)) if s.in_points() && (!s.measured() || fx.len() == 1) && s.writes_as_svg11())); + && fx + .iter() + .any(|f| matches!(f, RasterFx::Pixel(effects::PixelFx::Svg(s)) if (!s.measured() || fx.len() == 1) && s.writes_as_svg11())); (pixels > 0 && !live) || (fx.iter().any(|f| matches!(f, RasterFx::DropShadow { darkness: Some(_), .. })) && (cmyk || !simple_rgb_shadow_source(n, &fx))) } diff --git a/crates/engine/src/tests/params.rs b/crates/engine/src/tests/params.rs index 52cb314de0..708b602d1f 100644 --- a/crates/engine/src/tests/params.rs +++ b/crates/engine/src/tests/params.rs @@ -704,10 +704,11 @@ fn effect_params_are_the_effects_own() { fn an_effect_parameter_without_a_default_is_held_to_its_type() { use crate::cmd::params::undefaulted_type; use vectorcraft_render::effects::effect_catalog; - // Read by checks of their own: a stored texture or a texture to load, an SVG filter, a Warp's + // Read by checks of their own: a stored texture or a texture to load, an SVG filter and its axes, a Warp's // map and the style of Crop Marks. let own_check = |effect: &str, key: &str| match key { "textureImage" | "name" | "xml" => true, + "axes" => effect == "svg.filter", "version" => effect.starts_with("warp."), "style" => effect == "cropMarks", _ => false, diff --git a/crates/engine/src/tests/svgfilter.rs b/crates/engine/src/tests/svgfilter.rs index e42d7f9736..a0b22e303d 100644 --- a/crates/engine/src/tests/svgfilter.rs +++ b/crates/engine/src/tests/svgfilter.rs @@ -575,6 +575,23 @@ fn moving_the_object_moves_the_filters_origin() { assert_eq!(p["origin"], json!([8.0, 2.0])); } +/// `axes` turns or skews the filter's user space; a move moves only its origin. Axes the effect +/// can't measure are refused. +#[test] +fn axes_turn_the_filters_user_space_and_bad_axes_are_refused() { + let mut s = session(); + let a = rect(&mut s, 10.0); + run(&mut s, "effect.apply", json!({"effect": "svg.filter", "ids": [a.0], "params": {"xml": SHIFT, "axes": [0, 1, -1, 0]}})); + run(&mut s, "object.move", json!({"ids": [a.0], "dx": 5, "dy": -2})); + let p = &s.doc().unwrap().doc.node(a).unwrap().appearance.effects[0].params; + assert_eq!((&p["axes"], &p["origin"]), (&json!([0, 1, -1, 0]), &json!([5.0, -2.0]))); + for axes in [json!([0, 0, 0, 0]), json!([1, 0, 0]), json!([1, 0, 0, "1"]), json!([1001, 0, 0, 1]), json!(null), json!("x")] { + let e = err(&mut s, "effect.apply", json!({"effect": "svg.filter", "ids": [a.0], "params": {"xml": SHIFT, "axes": axes}})); + assert!(e.contains("`axes` must be [a, b, c, d]"), "{axes}: {e}"); + } + assert!(err(&mut s, "effect.setParams", json!({"ids": [a.0], "index": 0, "params": {"axes": [0.01, 0, 0, 0.01]}})).contains("`axes` must be")); +} + #[test] fn filters_survive_a_native_round_trip() { let mut s = session(); diff --git a/crates/svg/src/export/paint.rs b/crates/svg/src/export/paint.rs index bedf456f11..3c246f7c4d 100644 --- a/crates/svg/src/export/paint.rs +++ b/crates/svg/src/export/paint.rs @@ -604,25 +604,41 @@ impl Writer<'_> { let mut inner = n.clone(); inner.appearance.effects.retain(|e| !vectorcraft_effects::is_raster(&e.id)); // An SVG filter's user-space coordinates are the document's from the effect's origin: the - // object is written in them, in a group that moves it where the rest of the art goes. + // object is written in them, in a group that moves it where the rest of the art goes. A + // user space that is scaled or turned ([`turned_filter_space`]) is the group's own: the + // object is written as it is in a group inside the filter that maps it back + // ([`Self::open_filters`]), so its strokes keep their widths. let xf = self.xf; - let origin = live_svg_filter(&n.appearance.effects).map(|f| Affine::translate(f.origin())); + let live = live_svg_filter(&n.appearance.effects); + let turned = self.turned_filter_space(live.as_ref()); + let origin = live.filter(|_| turned.is_none()).map(|f| Affine::translate(f.origin())); let moved = origin.is_some_and(|o| xf * o != Affine::IDENTITY); if let Some(o) = origin.filter(|_| moved) { self.line(&format!("", self.matrix(xf * o))); self.depth += 1; self.xf = o.inverse(); } + if let Some(space) = turned { + self.line(&format!("", exact_matrix(space))); + self.depth += 1; + } let opened = self.open_filters(n, &n.appearance.effects); self.node_body(&inner); self.close_filters(opened); - if moved { + if moved || turned.is_some() { self.xf = xf; self.depth -= 1; self.line(""); } } + /// The group transform that holds a live SVG filter `live` ([`live_svg_filter`]) whose user + /// space is scaled or turned (not only moved, [`vectorcraft_effects::svg_filter::SvgFilterFx::moves_only`]): the filter's user + /// space in the output's. `None` for other filters and in SVG Tiny, which writes no filters. + fn turned_filter_space(&self, live: Option<&vectorcraft_effects::svg_filter::SvgFilterFx>) -> Option { + live.filter(|f| !f.moves_only() && !self.tiny()).map(|f| self.xf * f.to_doc()) + } + /// Open one `` per visible raster effect of `effects` (an object's, or one fill or /// stroke's) on `n`, outermost last effect; returns how many to close. pub(super) fn open_filters(&mut self, n: &Node, effects: &[vectorcraft_doc::Effect]) -> usize { @@ -644,6 +660,7 @@ impl Writer<'_> { let mut opened = 0; // An SVG filter that is the object's last effect is written as it is ([`Self::filtered`]). let live = if std::ptr::eq(effects, n.appearance.effects.as_slice()) { live_svg_filter(effects) } else { None }; + let turned = self.turned_filter_space(live.as_ref()); for (k, f) in fx.iter().enumerate().rev() { if let RasterFx::Pixel(vectorcraft_effects::PixelFx::Svg(sf)) = f && live.is_some() @@ -654,12 +671,40 @@ impl Writer<'_> { // against the object alone, which is all it runs on ([`live_svg_filter`]). let mut input = n.clone(); input.appearance.effects.clear(); - let input_bounds = input.visual_bounds_with(&self.doc.symbol_boxes()).unwrap_or_default(); - if let Some(def) = sf.written_xml(input_bounds).and_then(|xml| vectorcraft_effects::svg_filter::with_id(&xml, &fid)) { - self.def(1, &def); + // Its box in the filter's user space: in a turned or skewed one, the box of the + // object's geometry turned into it, grown by what its strokes and other paint add + // around it in the document: a square that far to each side, as it measures in + // user space along each axis (a miter corner reaches that far along both). + let symbols = self.doc.symbol_boxes(); + let visual = input.visual_bounds_with(&symbols).unwrap_or_default(); + let user_box = if sf.moves_only() { + visual - sf.origin() + } else { + let geometric = input.geometric_bounds_with(&symbols).unwrap_or(visual); + let margin = [geometric.x0 - visual.x0, geometric.y0 - visual.y0, visual.x1 - geometric.x1, visual.y1 - geometric.y1] + .into_iter() + .fold(0.0, f64::max); + let to_user = sf.to_doc().inverse(); + input.transform(to_user, false); + let [a, b, c, d, _, _] = to_user.as_coeffs(); + let turned = input.geometric_bounds_with(&symbols).unwrap_or_default(); + turned.inflate(margin * (a.abs() + c.abs()), margin * (b.abs() + d.abs())) + }; + let def = sf.written_xml(user_box).and_then(|xml| vectorcraft_effects::svg_filter::with_id(&xml, &fid)); + if let Some(def) = &def { + self.def(1, def); self.line(&format!("")); self.depth += 1; opened += 1; + } + // Inside the group of a turned user space ([`Self::filtered`]), the object and its + // other effects are written as they are, in a group that maps them back to it. + if let Some(space) = turned { + self.line(&format!("", exact_matrix(space.inverse()))); + self.depth += 1; + opened += 1; + } + if def.is_some() { continue; } } @@ -786,8 +831,17 @@ pub(super) fn pixel_gradient(p: &Paint, fill: bool) -> Option<&GradientPaint> { } } +/// `a` as an SVG `matrix(…)` with every digit its numbers need to read back the same, whatever +/// the export's decimals: the transforms around a turned SVG filter ([`Writer::turned_filter_space`]) +/// and their inverses still undo each other when one holds very small numbers. +fn exact_matrix(a: Affine) -> String { + // (Without negative zeros.) + let [a, b, c, d, e, f] = a.as_coeffs().map(|v| v + 0.0); + format!("matrix({a} {b} {c} {d} {e} {f})") +} + /// The SVG filter (Effect › SVG Filters) of an object's `effects` that SVG keeps as a ``: -/// its last visible effect, measured in points. +/// its last visible effect, in any user space the effect gives it ([`Writer::turned_filter_space`]). fn live_svg_filter(effects: &[vectorcraft_doc::Effect]) -> Option { if !vectorcraft_effects::svg_filter::writes_live(effects) { return None; @@ -796,9 +850,7 @@ fn live_svg_filter(effects: &[vectorcraft_doc::Effect]) -> Option - { + Some(vectorcraft_effects::RasterFx::Pixel(vectorcraft_effects::PixelFx::Svg(f))) if (alone || !f.measured()) && f.writes_as_svg11() => { Some(f) } _ => None, diff --git a/crates/svg/src/import/fx.rs b/crates/svg/src/import/fx.rs index b760b1b119..d9cfd753d5 100644 --- a/crates/svg/src/import/fx.rs +++ b/crates/svg/src/import/fx.rs @@ -113,24 +113,58 @@ fn source_of<'a>(filter: &Filter, sources: &'a HashMap) -> Optio /// XML from `sources` ([`sources`]), in user space mapped to the document by `ts`. `None` when one /// isn't there, looks different outside the document, or isn't a filter the effect draws /// ([`vectorcraft_effects::svg_filter::check`]), or -/// when `ts` turns or skews the user space or scales it past what the effect measures (0.001 to -/// 1000 points to a unit). Where `ts` moves the user space is the effect's `origin`. +/// when `ts` scales the user space past what the effect measures (0.001 to 1000 points to a unit, +/// as the square root of its area scale) or stretches its axes past what the effect's `axes` hold. +/// Where `ts` moves the user space is the effect's `origin`; a user space that `ts` turns, skews +/// or scales unevenly keeps those directions in the effect's `axes`, so the filter runs in the +/// element's own user space as SVG 1.1 defines it (). pub(super) fn kept(filters: &[Arc], ts: Affine, sources: &HashMap) -> Option> { - let [a, b, c, d, e, f] = ts.as_coeffs(); - if b != 0.0 || c != 0.0 || !(0.001..=1000.0).contains(&a) || (a - d).abs() > 1e-9 * a.abs().max(1.0) || !e.is_finite() || !f.is_finite() { - return None; - } + let space = user_space(ts)?; filters .iter() .map(|filter| { // A filter styled by the document is left out rather than drawn differently. let source = source_of(filter, sources).filter(|s| !s.styled)?; - let params = json!({ "name": source.name()?, "xml": source.xml, "scale": a, "origin": [e, f] }); + let mut params = json!({ "name": source.name()?, "xml": source.xml, "scale": space.scale, "origin": space.origin }); + if let Some(axes) = space.axes { + params["axes"] = json!(axes); + } Some(Effect { id: vectorcraft_effects::SVG_FILTER.into(), params, visible: true }) }) .collect() } +/// A filter's user space as the SVG filter effect stores it ([`user_space`]). +#[derive(Clone, Copy, Debug, PartialEq)] +struct UserSpace { + scale: f64, + origin: [f64; 2], + /// `None` when the axes are the document's. + axes: Option<[f64; 4]>, +} + +/// `ts`, a user space mapped to the document, as the SVG filter effect's `scale` (the square root +/// of its area scale), `origin` and, when it turns, skews or scales unevenly, `axes`. `None` when +/// it can't be stored: not finite, `scale` outside 0.001..1000, or `axes` the effect refuses +/// ([`vectorcraft_effects::svg_filter::valid_axes`]). +fn user_space(ts: Affine) -> Option { + let [a, b, c, d, e, f] = ts.as_coeffs(); + if ![a, b, c, d, e, f].iter().all(|v| v.is_finite()) { + return None; + } + let scale = ts.determinant().abs().sqrt(); + if !(0.001..=1000.0).contains(&scale) { + return None; + } + let even = b == 0.0 && c == 0.0 && a > 0.0 && (a - d).abs() <= 1e-9 * a.max(1.0); + if even { + return Some(UserSpace { scale: a, origin: [e, f], axes: None }); + } + let axes = [a, b, c, d].map(|v| v / scale); + vectorcraft_effects::svg_filter::valid_axes(&json!(axes))?; + Some(UserSpace { scale, origin: [e, f], axes: Some(axes) }) +} + /// The object's alpha, blurred (σ), moved and maybe inverted. #[derive(Clone, Copy, Debug, Default, PartialEq)] struct Shape { diff --git a/crates/svg/tests/it/import_details.rs b/crates/svg/tests/it/import_details.rs index 6276f5ee77..a37fc1d2e1 100644 --- a/crates/svg/tests/it/import_details.rs +++ b/crates/svg/tests/it/import_details.rs @@ -763,14 +763,15 @@ fn percentages_in_a_symbol_are_of_its_view_box() { } /// #1598: the warning for a filter that neither the live effects nor an SVG filter effect can hold -/// (here, on turned objects) names the filter, its primitives and the object, and says it is drawn -/// without it (not "a group": usvg wraps the element in one). Such a filter on an object that -/// isn't turned comes in as an SVG filter effect holding the filter's XML. +/// (here, on objects skewed past what the effect measures) names the filter, its primitives and the +/// object, and says it is drawn without it (not "a group": usvg wraps the element in one). Such a +/// filter on an object that isn't skewed that far comes in as an SVG filter effect holding the +/// filter's XML. #[test] fn unsupported_filters_are_named_in_the_warning() { let body = r#" - - + + "#; let (d, w) = import_with_report(&svg(body)).unwrap(); assert!(w.iter().any(|w| w == "filter 'f' (feColorMatrix) on an object isn't supported; drawn without it"), "{w:?}"); diff --git a/crates/svg/tests/it/import_live.rs b/crates/svg/tests/it/import_live.rs index 1d10c5d9fe..b39842e4fa 100644 --- a/crates/svg/tests/it/import_live.rs +++ b/crates/svg/tests/it/import_live.rs @@ -522,7 +522,8 @@ fn a_filter_used_twice_among_many_is_kept_twice() { assert_eq!(filters, vec![vec![json!("g")], vec![json!("g")]], "{:?}", art(&d)); } -/// Other filters come in as SVG filters; one on a turned object is reported and left out. +/// Other filters come in as SVG filters, on a turned or skewed object too, with the object's user +/// space in `scale`, `origin` and `axes`; one past what the effect measures is reported and left out. #[test] fn other_filters_are_kept_or_reported() { let (d, w) = @@ -530,8 +531,32 @@ fn other_filters_are_kept_or_reported() { assert!(w.is_empty(), "{w:?}"); let fx = effects(&d); assert_eq!((fx.len(), fx[0].id.as_str(), &fx[0].params["name"]), (1, "svg.filter", &json!("t"))); + assert!(fx[0].params.get("axes").is_none(), "the document's axes: {:?}", fx[0].params); let (d, w) = open( - r##""##, + r##""##, + ); + assert!(w.is_empty(), "{w:?}"); + let fx = effects(&d); + assert_eq!(fx.len(), 1); + let p = &fx[0].params; + let (c, s) = (30f64.to_radians().cos(), 30f64.to_radians().sin()); + let num = |v: &serde_json::Value| v.as_f64().unwrap(); + assert!((num(&p["scale"]) - 2.0).abs() < 1e-6 && p["origin"] == json!([10.0, 20.0]), "{p}"); + let axes: Vec = p["axes"].as_array().unwrap().iter().map(num).collect(); + assert!(axes.iter().zip([c, s, -s, c]).all(|(a, b)| (a - b).abs() < 1e-6), "{axes:?}"); + // Skewed, and scaled unevenly: the axes keep both. + let (d, w) = open( + r##""##, + ); + assert!(w.is_empty(), "{w:?}"); + let all: Vec> = + art(&d).iter().flat_map(|n| &n.appearance.effects).map(|e| e.params["axes"].as_array().unwrap().iter().map(num).collect()).collect(); + assert_eq!(all.len(), 2); + assert!(all.iter().any(|a| a.iter().zip([1.0, 0.0, 1.0, 1.0]).all(|(a, b)| (a - b).abs() < 1e-6)), "{all:?}"); + assert!(all.iter().any(|a| a.iter().zip([0.5, 0.0, 0.0, 2.0]).all(|(a, b)| (a - b).abs() < 1e-6)), "{all:?}"); + // Skewed so far that an axis would stretch past 1000 times: reported and left out. + let (d, w) = open( + r##""##, ); assert!(w.iter().any(|w| w.contains("filter")), "{w:?}"); assert!(effects(&d).is_empty()); @@ -543,6 +568,40 @@ fn other_filters_are_kept_or_reported() { assert!(effects(&d).is_empty()); } +/// A filter on a turned object runs in the object's user space (SVG 1.1 measures its lengths +/// there): opened, it draws as the same filter does on the same art drawn unturned with its offset +/// turned by hand. +#[test] +fn a_filter_on_a_turned_object_draws_in_its_user_space() { + let filter = |dx: f64, dy: f64| { + format!( + r#""# + ) + }; + let turned = format!( + r##"{}"##, + filter(24.0, 0.0) + ); + let (d, w) = open(&turned); + assert!(w.is_empty(), "{w:?}"); + assert_eq!(effects(&d).iter().map(|e| e.id.as_str()).collect::>(), ["svg.filter"]); + // The same square, its corners turned by hand, with the offset 24 along the turned x axis. + let (c, s) = (30f64.to_radians().cos(), 30f64.to_radians().sin()); + let corner = |x: f64, y: f64| format!("{},{}", 80.0 + c * (x - 80.0) - s * (y - 50.0), 50.0 + s * (x - 80.0) + c * (y - 50.0)); + let reference = format!( + r##"{}"##, + filter(24.0 * c, 24.0 * s), + corner(60.0, 30.0), + corner(100.0, 30.0), + corner(100.0, 70.0), + corner(60.0, 70.0) + ); + let canvas = render_artboard(&d); + // The moved square lies beyond where it was: its center, turned and moved, is near (100.8, 62). + assert!(canvas.over_white(101, 62) != [255, 255, 255], "drawn where the offset puts it"); + assert_similar(&canvas, &resvg_render(&svg(&reference), 200, 120), 40.0, 0.02); +} + #[test] fn a_filter_and_a_clip_on_one_object_filter_first() { let body = r##" @@ -638,6 +697,69 @@ fn filtered_rect(xml: &str) -> Document { d } +/// An SVG filter in a scaled, turned or skewed user space is written live: the filter's user space +/// is a group's transform, and the art is written in document coordinates in a group inside the +/// filter that maps it back, so its stroke keeps its width. Opened again, it is the same effect +/// and draws as the canvas drew it. +#[test] +fn an_exported_turned_filter_opens_as_the_same_effect() { + let xml = r#""#; + for (scale, axes) in [(2.0, json!([0.8, 0.6, -0.6, 0.8])), (1.0, json!([1.0, 0.0, 0.5, 1.0])), (0.5, serde_json::Value::Null)] { + let mut d = Document::new(200.0, 120.0); + let mut n = Node::path( + d.alloc_id(), + shapes::rectangle(Rect::new(40.0, 20.0, 100.0, 70.0)), + Appearance::basic(Paint::solid(Color::rgb(0.9, 0.1, 0.1)), Paint::solid(Color::BLACK), 4.0), + ); + let mut params = json!({ "xml": xml, "scale": scale, "origin": [30.0, 10.0] }); + if !axes.is_null() { + params["axes"] = axes.clone(); + } + n.appearance.effects = vec![Effect { id: "svg.filter".into(), params, visible: true }]; + let l = d.layers[0].id; + d.insert(Some(l), 0, n).unwrap(); + let out = export(&d, &ExportOptions::default()); + assert!(out.contains(" = fx[0].params["origin"].as_array().unwrap().iter().map(num).collect(); + assert!((origin[0] - 30.0).abs() < 1e-6 && (origin[1] - 10.0).abs() < 1e-6, "{origin:?}"); + match fx[0].params.get("axes") { + Some(got) => { + let got: Vec = got.as_array().unwrap().iter().map(num).collect(); + let want: Vec = axes.as_array().unwrap().iter().map(num).collect(); + assert!(got.iter().zip(&want).all(|(a, b)| (a - b).abs() < 1e-6), "{got:?}"); + } + None => assert!(axes.is_null(), "{:?}", fx[0].params), + } + assert_similar(&render_artboard(&d), &render_artboard(&back), 40.0, 0.02); + } + // A user space stretched 10,000 times along x: the inverse transform holds 0.0001, which the + // export's three decimals would round to 0, and the art still opens at its place. + let mut d = Document::new(200.0, 120.0); + let mut n = Node::path( + d.alloc_id(), + shapes::rectangle(Rect::new(40.0, 20.0, 100.0, 70.0)), + Appearance::basic(Paint::solid(Color::rgb(0.9, 0.1, 0.1)), Paint::None, 0.0), + ); + let xml = r#""#; + let params = json!({ "xml": xml, "scale": 10.0, "axes": [1000.0, 0.0, 0.0, 1.0] }); + n.appearance.effects = vec![Effect { id: "svg.filter".into(), params, visible: true }]; + let l = d.layers[0].id; + d.insert(Some(l), 0, n).unwrap(); + let out = export(&d, &ExportOptions::default()); + let (back, w) = import_with_report(&out).unwrap(); + assert!(w.is_empty(), "{w:?}"); + let bounds = |d: &Document| art(d).iter().find_map(|n| n.path_data().and_then(|p| p.bounds())).unwrap(); + let (a, b) = (bounds(&d), bounds(&back)); + assert!((a.x0 - b.x0).abs() < 1e-3 && (a.x1 - b.x1).abs() < 1e-3 && (a.y1 - b.y1).abs() < 1e-3, "{a:?} {b:?}: {out}"); +} + /// SVG 1.1 export writes an SVG filter's image reference as `xlink:href`, and it imports back. #[test] fn an_exported_filter_image_has_an_xlink_reference() { diff --git a/docs/effects-parity.md b/docs/effects-parity.md index 342a5171b6..cf515ca7aa 100644 --- a/docs/effects-parity.md +++ b/docs/effects-parity.md @@ -27,7 +27,7 @@ Part of [target-app-parity.md](target-app-parity.md); open work is in [gaps.md]( | 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 | — | | Stylize | Drop Shadow, Feather, Inner Glow, Outer Glow, Round Corners, Scribble | 6/6 | Scribble Options' Settings presets | -| SVG Filters | Apply SVG Filter… and the filter list | 1/1 | The submenu lists 14 default filters and then the document's own; the public page names no default set, so the set, names and values are VectorCraft's own, and a default is copied into the document when it is applied or edited. A filter that is the object's last effect is written to SVG as a `` element; otherwise SVG export draws the object as an image. A filter on a turned or skewed object in an imported SVG is left out with a warning | +| SVG Filters | Apply SVG Filter… and the filter list | 1/1 | The submenu lists 14 default filters and then the document's own; the public page names no default set, so the set, names and values are VectorCraft's own, and a default is copied into the document when it is applied or edited. A filter that is the object's last effect is written to SVG as a `` element; otherwise SVG export draws the object as an image. A filter on a turned, skewed or unevenly scaled object in an imported SVG is kept and runs in that object's user space, and SVG export writes it back under the same transform | | Warp | Arc, Arc Lower, Arc Upper, Arch, Bulge, Shell Lower, Shell Upper, Flag, Wave, Fish, Rise, Fisheye, Inflate, Squeeze, Twist | 15/15 | warp point editing in envelopes; each style bends the bounds as one Bézier patch (`version` 1), so Arc's edges are cubic curves close to concentric arcs; warps saved without a version keep the earlier map, where Arc is a circular arc in the object's own proportions (#1578) | Document Raster Effects Settings exists. When the 64 million pixel cap on an effect image lowers diff --git a/docs/mcp.md b/docs/mcp.md index 99b0bfef38..c31c8c2d5a 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5300,17 +5300,26 @@ SVG Filter (New, Edit, Delete, Import…), and from the Appearance panel it edit The canvas, raster export, printing and PDF draw the filter with the object as its source graphic, its user space starting at `origin` (`[x, y]` in points, `[0, 0]` by default) with its units `scale` points (1 by default), its -object bounding box the drawn object's, and at the Document Raster Effects resolution when the view is finer. The +axes along `axes` (`[a, b, c, d]`: one unit along the filter's x axis points `[a, b]` in the document and one along +its y axis `[c, d]`, before `scale`; absent, the document's axes; each number -1000 to 1000 and `a·d - b·c` at least +0.001 from 0, or the command refuses it), its object bounding box the drawn object's, and at the Document Raster Effects resolution when the view is finer. The filter runs on coarser pixels when a morphology radius or kernel unit would span more than 32 of them, or a standard -deviation more than 512. An effect whose XML these rules refuse (from a file or a script) is not drawn or exported. The +deviation more than 512. With `axes`, the filter runs on pixels lined up with its own axes, so offsets, blurs and the +region run along them, and the result is drawn onto the object's pixels through `axes`; those pixels are about as fine +along each axis as the object's and coarser when there would be more than 4 times as many, and a region measured +against the object's box is measured against its box in that user space. Moving the object moves `origin` and +leaves `scale` and `axes` as they are. An effect whose XML or `axes` these rules refuse (from a file or a script) is not drawn or exported. The filter is drawn and written rebuilt from its filter elements and their filter attributes alone, without comments, text, descriptions or other attributes. An image in a filter is drawn only when its bytes are a PNG, JPEG, GIF or WebP within the pixel limit. A filter region in user space given in percentages is measured against the object's box (x and y from its top-left corner), and one in em or ex or left out takes the default region of that box (10% beyond each side); these are VectorCraft's own rules. Scale Strokes & Effects scales -`scale`. SVG export writes the filter as a `` element when it is the object's last effect, its only pixel -effect and `scale` is 1 (with a region measured against the object's box, its only raster effect), with the object in a -group that places the filter's user space and such a region written in user units. The filter is written in SVG 1.1 +`scale`. SVG export writes the filter as a `` element when it is the object's last effect and its only pixel +effect (with a region measured against the object's box, its only raster effect), with the object in a +group that places the filter's user space and such a region written in user units. When `scale` isn't 1 or the effect +has `axes`, that group's transform is the filter's user space and the object is written in document coordinates in a +group inside the filter whose transform is the inverse, so its strokes keep their widths; SVG import reads that back +as the same `scale`, `origin` and `axes`. The filter is written in SVG 1.1 terms: `feImage`'s reference as `xlink:href`; each `feDropShadow` as the blur, offset, flood, composite and merge that [Filter Effects](https://www.w3.org/TR/filter-effects-1/#feDropShadowElement) gives as its equivalent; colors as `#rrggbb` with a flood color's alpha in `flood-opacity`; `image-rendering` as `optimizeSpeed` or `optimizeQuality`; @@ -5322,9 +5331,12 @@ whose `flood-color` is `currentColor` or with `primitiveUnits="objectBoundingBox its shadows are expanded, has no SVG 1.1 form. Neither does a filter whose written form, with its region and id, is one SVG import would not read, such as one longer than 64 KB. In that case, otherwise, and with the SVG Tiny 1.2 profile, the object becomes an image. SVG import keeps a filter that the live effects (Drop Shadow, the -glows, Gaussian Blur, Feather) can't express as an `svg.filter` effect holding the filter's XML, with `scale` and -`origin` from the object's user space, unless that user space is turned, skewed or scaled past 0.001 to 1000 points -to a unit, or the filter is styled by the document's style sheets: such a filter is left out with a warning. The native format keeps the document's filters and the effects. +glows, Gaussian Blur, Feather) can't express as an `svg.filter` effect holding the filter's XML, with `scale`, +`origin` and, when the object's user space is turned, skewed or scaled unevenly (a `rotate`, `skewX`, `skewY`, uneven +`scale` or `matrix` transform), `axes` from that user space, so the filter runs in the element's user space as +[SVG 1.1](https://www.w3.org/TR/SVG11/filters.html#FilterEffectsRegion) defines it. A filter is left out with a +warning when that user space is scaled past 0.001 to 1000 points to a unit (the square root of its area scale), its +`axes` would pass the limits above, or the filter is styled by the document's style sheets. The native format keeps the document's filters and the effects. ```json {"name":"run_command","arguments":{"command":"svgFilter.define","params":{"xml":""}}} From 98efc6e956c97efd7c6b6bbe206a0d39b64ff940 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 18:14:17 -0800 Subject: [PATCH 20/50] MCP: guide.add and the artboard selections refuse an artboard that is not a whole number guide.add and select.allOnArtboard (`artboard`), select.font (`scope.artboards`) and addon.select.byArtboards (`artboards`) now read artboard indices with the shared artboard helpers. A value that is not a whole number of 0 or more, such as "1", -1, 1.5 or true, fails with an error naming the key, instead of being reported as a missing artboard or read as artboard 0, and the document and selection stay as they were. A whole number past the last artboard is still `no such artboard`, and an omitted or null `artboard` keeps its default. --- crates/engine/src/cmd/addons/select.rs | 12 ++--- crates/engine/src/cmd/addons/select/tests.rs | 29 ++++++++++++ crates/engine/src/cmd/docmenu.rs | 12 ++--- crates/engine/src/cmd/fonts.rs | 45 ++++++++++++++++--- crates/engine/src/cmd/panelcmds.rs | 2 +- crates/engine/src/cmd/select.rs | 5 ++- crates/engine/src/tests/menucmds.rs | 47 ++++++++++++++++++++ docs/mcp.md | 18 +++++--- docs/target-app-parity.md | 1 + 9 files changed, 143 insertions(+), 28 deletions(-) diff --git a/crates/engine/src/cmd/addons/select.rs b/crates/engine/src/cmd/addons/select.rs index b2ab59d851..c9ae29a303 100644 --- a/crates/engine/src/cmd/addons/select.rs +++ b/crates/engine/src/cmd/addons/select.rs @@ -14,8 +14,9 @@ use vectorcraft_doc::{LockedArtboards, Node, NodeId, NodeKind}; use vectorcraft_geom::Point; use super::super::links::{Status, statuses}; +use super::super::panelcmds::listed_artboards; use super::super::select::{is_selectable, on_artboard, selectable}; -use super::super::{CommandSpec, bad, checked_ids_param, cmd, has_doc, point_indices, switch_or, text_param}; +use super::super::{CommandSpec, bad, checked_ids_param, cmd, has_doc, switch_or, text_param}; use crate::{DocState, Result, Session}; /// How Select by Artboards relates an object to the chosen artboards (`relation`). @@ -33,7 +34,7 @@ pub fn specs() -> Vec { "Select by Artboards", ["Object", "Plug-ins", "Selection Tools"], None, - "{artboards: [index…] (0-based, at least one), relation?: \"overlap\" (default: on at least one of them, as select.allOnArtboard takes it: the bounds overlap the artboard or the centre is on it) | \"inside\" (the bounds lie wholly within one of them, edges included) | \"outside\" (on none of them)} select those objects among the ones Select All takes (in isolation mode, the isolated container's); hidden and locked objects, objects on hidden, locked or template layers and art held by a locked artboard are left out. Bounds are geometric, a symbol instance's measured by its art → {count}", + "{artboards: [index…] (0-based whole numbers, at least one), relation?: \"overlap\" (default: on at least one of them, as select.allOnArtboard takes it: the bounds overlap the artboard or the centre is on it) | \"inside\" (the bounds lie wholly within one of them, edges included) | \"outside\" (on none of them)} select those objects among the ones Select All takes (in isolation mode, the isolated container's); hidden and locked objects, objects on hidden, locked or template layers and art held by a locked artboard are left out. Bounds are geometric, a symbol instance's measured by its art → {count}", has_doc, by_artboards ), @@ -58,13 +59,12 @@ fn by_artboards(s: &mut Session, p: &Value) -> Result { return Err(bad(C, "`relation` must be overlap, inside or outside")); } let listed = p.get("artboards").ok_or_else(|| bad(C, "missing `artboards`"))?; - let indices = point_indices(listed).ok_or_else(|| bad(C, "`artboards` must be a list of artboard indices"))?; - if indices.is_empty() { + if listed.as_array().is_some_and(Vec::is_empty) { return Err(bad(C, "choose at least one artboard")); } let st = s.doc()?; - let rects = - indices.iter().map(|i| st.doc.artboards.get(*i).map(|a| a.rect)).collect::>>().ok_or_else(|| bad(C, "no such artboard"))?; + let rects: Vec<_> = + listed_artboards(&st.doc, listed, "artboards", C)?.into_iter().filter_map(|i| st.doc.artboards.get(i)).map(|a| a.rect).collect(); let symbols = st.doc.symbol_boxes(); let ids: Vec = selectable(&st.doc, st.isolation) .into_iter() diff --git a/crates/engine/src/cmd/addons/select/tests.rs b/crates/engine/src/cmd/addons/select/tests.rs index c97b278258..09106a3652 100644 --- a/crates/engine/src/cmd/addons/select/tests.rs +++ b/crates/engine/src/cmd/addons/select/tests.rs @@ -108,6 +108,35 @@ fn bad_params_are_errors_and_leave_the_selection() { } } +/// A malformed `artboards` entry is refused as one, naming the parameter, before any entry is +/// looked up; a value that is not a list, an empty list, a left-out list and a whole number past +/// the last artboard each have their own error. +#[test] +fn artboard_errors_say_what_is_wrong() { + let mut s = three_boards(); + let a = rect(&mut s, 10.0, 10.0, 20.0, 20.0); + let entries = "invalid parameters for `addon.select.byArtboards`: `artboards` must contain whole numbers"; + let not_a_list = "invalid parameters for `addon.select.byArtboards`: `artboards` must be a list of artboard indices"; + for (p, want) in [ + (json!({"artboards": ["1"]}), entries), + (json!({"artboards": [-1]}), entries), + (json!({"artboards": [1.5]}), entries), + (json!({"artboards": [true]}), entries), + (json!({"artboards": [9, "1"]}), entries), + (json!({"artboards": "0"}), not_a_list), + (json!({"artboards": null}), not_a_list), + (json!({"artboards": []}), "invalid parameters for `addon.select.byArtboards`: choose at least one artboard"), + (json!({}), "invalid parameters for `addon.select.byArtboards`: missing `artboards`"), + (json!({"artboards": [9]}), "no such artboard"), + (json!({"artboards": [0, 9]}), "no such artboard"), + ] { + s.execute("select.set", &json!({"ids": [a.0]})).unwrap(); + assert_eq!(s.execute(C, &p).unwrap_err().to_string(), want, "{p}"); + assert_eq!(s.doc().unwrap().selection.objects, vec![a], "{p}"); + } + assert_eq!(pick(&mut s, json!({"artboards": [0, 0]})), vec![a]); +} + #[test] fn a_symbol_instance_is_measured_by_its_art() { // The symbol's art, (100, 60) to (140, 80), drawn 50 pt up and left: (50, 10) to (90, 30), on diff --git a/crates/engine/src/cmd/docmenu.rs b/crates/engine/src/cmd/docmenu.rs index ae48ba02e6..3b1e8a7666 100644 --- a/crates/engine/src/cmd/docmenu.rs +++ b/crates/engine/src/cmd/docmenu.rs @@ -10,6 +10,7 @@ use vectorcraft_doc::{CharStyle, Guide, Node, NodeId, NodeKind, SavedSelection, use vectorcraft_geom::Vec2; use super::edit::selected_roots; +use super::panelcmds::artboard_at; use super::pathops::Beside; use super::select::{first_selectable, is_selectable, selectable_ids, walk_selectable}; use super::{ @@ -201,7 +202,7 @@ pub fn specs() -> Vec { "Add Guide", [], None, - "{vertical: bool, pos: pt (x for vertical, y for horizontal), artboard?: index (an artboard guide: it runs across that artboard only and moves, is copied and is deleted with it; default a canvas guide, across the whole canvas), layer?: id (the layer it is on, shown, hidden, locked and deleted with it; default the current layer)} → {index}", + "{vertical: bool, pos: pt (x for vertical, y for horizontal), artboard?: index (0-based whole number; an artboard guide: it runs across that artboard only and moves, is copied and is deleted with it; default, or null, a canvas guide, across the whole canvas), layer?: id (the layer it is on, shown, hidden, locked and deleted with it; default the current layer)} → {index}", has_doc, guide_add ), @@ -767,15 +768,8 @@ fn clear_guides(s: &mut Session, _: &Value) -> Result { fn guide_add(s: &mut Session, p: &Value) -> Result { let pos = f64_req(p, "pos", "guide.add")?; let vertical = switch_or(p, "vertical", false, "guide.add")?; - let artboard = match p.get("artboard").filter(|v| !v.is_null()) { - Some(v) => { - let boards = &s.doc()?.doc.artboards; - let ab = v.as_u64().and_then(|i| boards.get(usize::try_from(i).ok()?)).ok_or_else(|| EngineError::Other("no such artboard".into()))?; - Some(ab.id) - } - None => None, - }; let st = s.doc()?; + let artboard = artboard_at(&st.doc, p, "artboard", "guide.add")?.and_then(|i| st.doc.artboards.get(i)).map(|a| a.id); let layer = match id_param(p, "layer") { Some(l) if st.doc.node(l).is_some_and(Node::is_layer) => Some(l), Some(_) => return Err(bad("guide.add", "layer must name a layer or sublayer")), diff --git a/crates/engine/src/cmd/fonts.rs b/crates/engine/src/cmd/fonts.rs index 7c8f664cf3..28662f013c 100644 --- a/crates/engine/src/cmd/fonts.rs +++ b/crates/engine/src/cmd/fonts.rs @@ -10,9 +10,10 @@ use vectorcraft_color::Paint; use vectorcraft_doc::{AppearanceItem, Document, Node, NodeId, NodeKind, TextKind, TextObject, TextRun}; use vectorcraft_geom::Rect; +use super::panelcmds::listed_artboards; use super::select::on_artboard; use super::typecmd::refresh_bounds; -use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, index, str_param}; +use super::{CommandSpec, Result, Session, always, bad, bool_or, cmd, has_doc, str_param}; pub fn specs() -> Vec { vec![ @@ -39,7 +40,7 @@ pub fn specs() -> Vec { "Select Text by Font", [], None, - "{family, style?, scope?: \"document\" (default) | {artboards: [index, …] (0-based)} | {layers: [id, …] (layers or sublayers)}} select the text objects using the font, the instances of the symbols whose art uses it, the text whose inline graphics draw such a symbol, the objects painted with a pattern whose art uses it (by a visible fill or stroke whose opacity is above 0, a stroke wider than 0) and the objects whose opacity mask uses it (in type that is not hidden or locked in that art), that are not hidden or locked, in a hidden or locked group or layer, or on a locked artboard; a pattern swatch that nothing paints, or a layer's mask, selects nothing; with scope, only those on one of the artboards (as All on Active Artboard takes them: their bounds overlap it or their center is on it) or in one of the layers → {count}", + "{family, style?, scope?: \"document\" (default) | {artboards: [index, …] (0-based whole numbers)} | {layers: [id, …] (layers or sublayers)}} select the text objects using the font, the instances of the symbols whose art uses it, the text whose inline graphics draw such a symbol, the objects painted with a pattern whose art uses it (by a visible fill or stroke whose opacity is above 0, a stroke wider than 0) and the objects whose opacity mask uses it (in type that is not hidden or locked in that art), that are not hidden or locked, in a hidden or locked group or layer, or on a locked artboard; a pattern swatch that nothing paints, or a layer's mask, selects nothing; with scope, only those on one of the artboards (as All on Active Artboard takes them: their bounds overlap it or their center is on it) or in one of the layers → {count}", has_doc, select_font ), @@ -1080,9 +1081,9 @@ impl FontScope { Some(_) => Err(bad(C, format!("`scope.{key}` must be a non-empty array"))), } }; - if let Some(a) = list("artboards")? { - let rect = |v: &Value| v.as_u64().and_then(|i| d.artboards.get(index(i))).map(|b| b.rect); - return a.iter().map(|v| rect(v).ok_or_else(|| bad(C, format!("no such artboard {v}")))).collect::>().map(Self::Artboards); + if let (Some(v), Some(_)) = (scope.get("artboards"), list("artboards")?) { + let indices = listed_artboards(d, v, "scope.artboards", C)?; + return Ok(Self::Artboards(indices.into_iter().filter_map(|i| d.artboards.get(i)).map(|b| b.rect).collect())); } if let Some(a) = list("layers")? { let layer = |v: &Value| v.as_u64().map(NodeId).filter(|id| d.node(*id).is_some_and(Node::is_layer)); @@ -1292,6 +1293,40 @@ mod tests { } } + /// Select Text by Font refuses a `scope.artboards` entry that is not a whole number, naming the + /// parameter, before it looks at the artboards, and leaves the selection as it was; a whole + /// number past the last artboard is `no such artboard`. + #[test] + fn select_font_refuses_artboards_that_are_not_whole_numbers() { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 200, "height": 200})).unwrap(); + s.execute("artboard.new", &json!({"x": 300, "y": 0, "width": 200, "height": 200})).unwrap(); + let text = |s: &mut Session, x: i32| { + NodeId(s.execute("text.create", &json!({"x": x, "y": 50, "text": "Serif", "font": "Source Serif 4"})).unwrap()["id"].as_u64().unwrap()) + }; + let first = text(&mut s, 10); + let second = text(&mut s, 350); + let run = + |s: &mut Session, artboards: Value| s.execute("select.font", &json!({"family": "Source Serif 4", "scope": {"artboards": artboards}})); + let malformed = "invalid parameters for `select.font`: `scope.artboards` must contain whole numbers"; + for (artboards, want) in [ + (json!(["1"]), malformed), + (json!([-1]), malformed), + (json!([1.5]), malformed), + (json!([true]), malformed), + (json!([null]), malformed), + (json!([9, "1"]), malformed), + (json!([9]), "no such artboard"), + (json!([1, 9]), "no such artboard"), + ] { + s.execute("select.set", &json!({"ids": [first.0]})).unwrap(); + assert_eq!(run(&mut s, artboards.clone()).unwrap_err().to_string(), want, "{artboards}"); + assert_eq!(s.doc().unwrap().selection.objects, [first], "{artboards}"); + } + run(&mut s, json!([1, 1])).unwrap(); + assert_eq!(s.doc().unwrap().selection.objects, [second]); + } + /// Select Text by Font with a layer scope takes the text in the layers, their sublayers /// included, and still leaves out hidden and locked text. #[test] diff --git a/crates/engine/src/cmd/panelcmds.rs b/crates/engine/src/cmd/panelcmds.rs index fa0492c2db..e10875e742 100644 --- a/crates/engine/src/cmd/panelcmds.rs +++ b/crates/engine/src/cmd/panelcmds.rs @@ -255,7 +255,7 @@ pub(crate) fn artboard_indices(d: &vectorcraft_doc::Document, p: &Value, cmd: &s /// list of artboard indices", and a list with an entry that is not a whole number is "`{key}` must /// contain whole numbers"; a whole number past the last artboard is `no such artboard`. Every entry /// is checked for its form before any is checked against the artboards. -fn listed_artboards(d: &vectorcraft_doc::Document, v: &Value, key: &str, cmd: &str) -> Result> { +pub(crate) fn listed_artboards(d: &vectorcraft_doc::Document, v: &Value, key: &str, cmd: &str) -> Result> { let entries = v.as_array().ok_or_else(|| bad(cmd, format!("`{key}` must be a list of artboard indices")))?; if entries.is_empty() { return Err(bad(cmd, format!("`{key}` must be a non-empty list of artboard indices"))); diff --git a/crates/engine/src/cmd/select.rs b/crates/engine/src/cmd/select.rs index ac9ca365f4..1675fcc87c 100644 --- a/crates/engine/src/cmd/select.rs +++ b/crates/engine/src/cmd/select.rs @@ -8,6 +8,7 @@ use vectorcraft_doc::{Document, LockedArtboards, Node, NodeId, NodeKind}; use vectorcraft_tools::builder::is_live_paint; use super::object::can_align; +use super::panelcmds::artboard_at; use super::wand::{fill_of, stroke_of}; use super::{ CommandSpec, Result, Session, bad, bool_or, checked_id, checked_ids_param, cmd, color_value, has_doc, has_selection, index, ok, str_param, @@ -31,7 +32,7 @@ pub fn specs() -> Vec { "All on Active Artboard", ["Select"], Some("Cmd+Alt+A"), - "{artboard?: index (0-based; the app passes the active one; default: the first)}", + "{artboard?: index (0-based whole number; the app passes the active one; default, or null: the first)}", has_doc, all_on_artboard ), @@ -360,7 +361,7 @@ fn all(s: &mut Session, _: &Value) -> Result { fn all_on_artboard(s: &mut Session, p: &Value) -> Result { let st = s.doc()?; - let i = p.get("artboard").and_then(Value::as_u64).map_or(0, index); + let i = artboard_at(&st.doc, p, "artboard", "select.allOnArtboard")?.unwrap_or(0); let r = st.doc.artboards.get(i).map(|a| a.rect).ok_or_else(|| bad("select.allOnArtboard", "no such artboard"))?; let symbols = st.doc.symbol_boxes(); let ids: Vec = diff --git a/crates/engine/src/tests/menucmds.rs b/crates/engine/src/tests/menucmds.rs index 1151f83910..493b4d58e2 100644 --- a/crates/engine/src/tests/menucmds.rs +++ b/crates/engine/src/tests/menucmds.rs @@ -3232,6 +3232,32 @@ fn select_all_on_artboard_refuses_an_artboard_past_u32() { assert!(selected(&s).is_empty()); } +/// All on Active Artboard refuses an `artboard` that is not a whole number, naming the parameter, +/// and leaves the selection as it was; a whole number past the last artboard is `no such +/// artboard`. Left out or null, it takes the first artboard. +#[test] +fn select_all_on_artboard_refuses_an_artboard_that_is_not_a_whole_number() { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100, "artboards": 2, "artboardLayout": {"layout": "row", "spacing": 0}})).unwrap(); + let (first, second) = (rect(&mut s, 10.0, 10.0, 20.0, 20.0), rect(&mut s, 110.0, 10.0, 20.0, 20.0)); + for bad in [json!("1"), json!(-1), json!(1.5), json!(true), json!([1]), json!({})] { + s.execute("select.none", &json!({})).unwrap(); + let err = s.execute("select.allOnArtboard", &json!({"artboard": bad})).unwrap_err().to_string(); + assert_eq!(err, "invalid parameters for `select.allOnArtboard`: `artboard` must be a whole number", "{bad}"); + assert!(selected(&s).is_empty(), "{bad}"); + } + s.execute("select.none", &json!({})).unwrap(); + assert_eq!(s.execute("select.allOnArtboard", &json!({"artboard": 9})).unwrap_err().to_string(), "no such artboard"); + assert!(selected(&s).is_empty()); + for p in [json!({}), json!({"artboard": null}), json!({"artboard": 0})] { + s.execute("select.none", &json!({})).unwrap(); + s.execute("select.allOnArtboard", &p).unwrap(); + assert_eq!(selected(&s), vec![first], "{p}"); + } + s.execute("select.allOnArtboard", &json!({"artboard": 1})).unwrap(); + assert_eq!(selected(&s), vec![second]); +} + #[test] fn save_and_recall_selection() { let mut s = session(); @@ -4538,6 +4564,27 @@ fn artboard_guides_go_with_their_artboard() { assert_eq!((guides(&s).len(), selected_guides(&s)), (3, vec![0, 1])); } +/// `guide.add` refuses an `artboard` that is not a whole number, naming the parameter, and adds no +/// guide; a whole number past the last artboard is `no such artboard`. Null makes a canvas guide, +/// and a whole number an artboard guide. +#[test] +fn guide_add_refuses_an_artboard_that_is_not_a_whole_number() { + let mut s = session(); + s.execute("artboard.new", &json!({"x": 900, "y": 0, "width": 400, "height": 300})).unwrap(); + let add = |s: &mut Session, artboard: Value| s.execute("guide.add", &json!({"vertical": true, "pos": 10, "artboard": artboard})); + for bad in [json!("1"), json!(-1), json!(1.5), json!(true), json!([1]), json!({})] { + let err = add(&mut s, bad.clone()).unwrap_err().to_string(); + assert_eq!(err, "invalid parameters for `guide.add`: `artboard` must be a whole number", "{bad}"); + } + assert_eq!(add(&mut s, json!(9)).unwrap_err().to_string(), "no such artboard"); + assert!(s.doc().unwrap().doc.ruler_guides().is_empty()); + add(&mut s, Value::Null).unwrap(); + add(&mut s, json!(1)).unwrap(); + let d = &s.doc().unwrap().doc; + let boards: Vec<_> = d.ruler_guides().iter().map(|g| g.artboard).collect(); + assert_eq!(boards, [None, Some(d.artboards[1].id)]); +} + /// #451: a guide dragged out of a ruler snaps (to the art's corners, side midpoints and anchors, /// the artboards' edges and centres) and is made in one undo step where it is released over the /// canvas; with the Artboard tool it is an artboard guide of the active artboard. diff --git a/docs/mcp.md b/docs/mcp.md index d4e03892e9..20e688c006 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -3077,7 +3077,9 @@ number. `guide.add {vertical, pos, artboard?}` makes one (the x of a vertical guide, the y of a horizontal one, in points) → `{index}`. With `artboard` (an artboard's index) it is an artboard guide: it runs across that artboard only, moves with it (`artboard.move`, a pure move in `artboard.setProps`, `artboard.rearrange`), scales with it (`artboard.setProps {scaleArt}`), is copied with it (`artboard.duplicate`, `artboard.move {copy}`) and is -deleted with it (`artboard.delete`); without, a canvas guide runs across the whole canvas. `guide.list` → +deleted with it (`artboard.delete`); without, or with null, a canvas guide runs across the whole canvas. An `artboard` +that is not a whole number of 0 or more fails with "`artboard` must be a whole number", and an index past the last +artboard with `no such artboard`; neither adds a guide. `guide.list` → `[{index, id, vertical, pos, selected, artboard?, layer?, hidden, locked, shown, editable}…]` (`artboard` only for artboard guides; `id` is the guide's node and `layer` the layer it is on; `hidden` and `locked` are its own state, `shown` and `editable` also take its layer into account). `layer.setProps {ids: [id…], visible?, locked?}` hides or @@ -5860,8 +5862,12 @@ below 3 or above 1000 counts as 3 or 1000, and a fractional or negative `sides` Without `artboard`, or with an index the document doesn't have, it aligns them to the artboard under the center of the selection, or to the first artboard when no artboard is under the center. With `to: "selection"` or `"key"`, `object.align` does not use `artboard`. `select.allOnArtboard {artboard?}` (Select › All on Active Artboard) selects -the objects on artboard `artboard`, or on the first artboard when the call gives none; an index the document doesn't -have is an error. +the objects on artboard `artboard`, or on the first artboard when the call gives none or null. A value that is not a +whole number of 0 or more fails with "`artboard` must be a whole number", and an index the document doesn't have with +`no such artboard`; either leaves the selection as it was. `select.font {family, style?, scope?}` (Select Text +by Font) takes `scope: {artboards: [index…]}` the same way: an entry that is not a whole number fails with +"`scope.artboards` must contain whole numbers" before any entry is looked up, and an index the document doesn't have +fails with `no such artboard`. `object.distribute {to: "artboard", artboard?}` and `object.distributeSpacing {to: "artboard", artboard?}` (the Distribute Objects and Distribute Spacing buttons with Align to Artboard) use the same artboard as `object.align`. @@ -11749,8 +11755,10 @@ overlapping the artboard or the centre on it), `inside` (the bounds wholly withi straddling two touching artboards is inside neither) or `outside` (on none of them). It looks at the objects Select All takes, or the isolated container's in isolation mode, so hidden and locked objects, objects on hidden, locked or template layers and art held by a locked artboard are left out. Bounds are geometric, a symbol instance's measured by its art. It -returns the `count` selected. An empty list, an index with no artboard, a value that isn't an index, or another -relation is an error, and the selection is left as it was. +returns the `count` selected. An empty list, an index with no artboard (`no such artboard`), a value that isn't a list +("`artboards` must be a list of artboard indices"), an entry that isn't a whole number of 0 or more ("`artboards` must +contain whole numbers", checked before any entry is looked up), or another relation is an error, and the selection is +left as it was. ```json {"name":"run_command","arguments":{"command":"addon.select.byArtboards","params":{"artboards":[2,6,11],"relation":"inside"}}} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index cad5851e98..1e6e7a0f6b 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1155,6 +1155,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur `path.reshapeSegment`, `object.blend.spine.reshapeSegment`, `path.convertAnchor`, `path.curvatureEdit`, `path.insertAnchor`, `path.moveAnchors`, `path.reshape`, `path.close` and the Pencil, Curvature, Knife, Eraser, Path Eraser, Smooth, Join and Blob Brush commands refuse a number, point or handle given as text, such as "10", and leave the document unchanged; `path.convertAnchor` refuses an `x` without a `y`, or a `y` without an `x`. `path.setHandle`, `path.moveAnchor`, `text.setPathHandle` (`anchor`), `path.insertAnchor` (`segment`), `artboard.reorder`, `library.moveGroup`, `graphicStyle.move` (`to`), `path.appendAnchor`, `path.close`, `path.reverse` (`subpath`) and the ruler origin commands (`artboard`) refuse a value that is not a whole number of 0 or more, such as `"3"` or `2.5`, with `` `anchor` must be a whole number ``, naming the key, instead of reporting it as missing or reading it as the default subpath or artboard; a null `artboard` is artboard 0 (`tests::params::a_malformed_index_is_not_missing_or_its_default`). The artboard commands that take `index`, `indices` or a replayed `selectedArtboards`, the artboard Align and Distribute commands (`artboard`, `activeArtboard`), `edit.newDocumentFromState` (`index`) and Paste in Place, in Front and in Back (`artboard`, `artboards`) report a value that is not a whole number as such, naming the key, and keep `no such artboard`, `no history state N` and the paste range messages for a whole number that names nothing; a null artboard `index` is `missing index`, and an `indices` value that is not a list, an empty list and a malformed entry each have their own message (`tests::panelcmds::artboard_lists_name_the_fault_and_the_key`). + `guide.add` and `select.allOnArtboard` (`artboard`), `select.font` (`scope.artboards`) and `addon.select.byArtboards` (`artboards`) refuse an artboard that is not a whole number of 0 or more, such as `"1"`, `-1`, `1.5` or `true`, naming the key, instead of reporting it as a missing artboard or reading it as artboard 0, and leave the document and selection unchanged; a whole number past the last artboard is still `no such artboard`, and a null or left-out `artboard` keeps its default (`tests::menucmds::guide_add_refuses_an_artboard_that_is_not_a_whole_number`). `path.close` and `path.setHandle` (`independent`), `path.moveAnchors` (`patterns`), the Pencil (`closed`, `keepSelected`, `fill`), Curvature (`closed` and a point's `corner`), `path.curvatureEdit` (`corner`), `path.reshapeSegment` (`perpendicular`) and the Blob Brush (`keepSelected`, `mergeOnlySelection`, `merge`) refuse a value other than true, false or null, such as "true", and leave the document unchanged. Direct Selection's marquee selects the frame anchors of area type that lie inside it, and a click on a frame anchor selects that one; Shift toggles them. The selected frame anchors show filled. A drag of one of them moves all of them, the arrow keys nudge them, and the type reflows at its size (`text.reshapeArea`, which takes `items` to move the anchors of several frames in one step), as [Create text](http://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html) and [Selecting objects](http://web.archive.org/web/20211230015528/https://helpx.adobe.com/illustrator/using/selecting-objects.html) describe. When the selection also holds other objects, path anchors or ruler guides, or when another change to the document or the selection follows the pick, the type is selected whole. A press on a selected object's centre point (Attributes panel › Show Center) selects the object whole, and a drag from it moves the object as one Move, held by that point (#4891; test `the_centre_point_selects_and_moves_the_object_whole`). From 621a793abedf4913b7c3114f8176970650e6fa71 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 18:21:40 -0800 Subject: [PATCH 21/50] =?UTF-8?q?Actions:=20Load=20Actions=E2=80=A6=20read?= =?UTF-8?q?s=20.aia=20Set=20Selection=20steps=20as=20Select=20Object?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit actionSet.read now lists each step's recorded values with their key, type and value (a whole number, or UTF-8 text with its length in bytes), at most 100,000 per set; a hexadecimal value with the wrong byte count still marks the set truncated. Load Actions… finds a Set Selection step by its internal name, whatever its label, and adds it as a Select Object step (select.byNote) with its note, Case Sensitive and Whole Word. The step comes in only with exactly three recorded values: the note (key text, ustring, UTF-8, 1 to 1,024 bytes once trimmed) and the two options (keys word and case, boolean, 0 or 1). Any other Set Selection step is left out and counted, with no option filled in. A step that is off in the file stays excluded, and the set saves to and reloads from a .vcactions file unchanged. Docs: docs/mcp.md, docs/target-app-parity.md, docs/ui-parity.md. --- crates/engine/src/cmd/actionset.rs | 94 +++++++++++++--- crates/engine/src/tests/actionset.rs | 60 ++++++++++- crates/engine/tests/import_fuzz.rs | 6 ++ crates/ui-egui/src/panels/actions.rs | 119 +++++++++++++++++++++ crates/ui-egui/src/panels/actions/files.rs | 58 ++++++++-- docs/mcp.md | 14 ++- docs/target-app-parity.md | 1 + docs/ui-parity.md | 2 +- 8 files changed, 324 insertions(+), 30 deletions(-) diff --git a/crates/engine/src/cmd/actionset.rs b/crates/engine/src/cmd/actionset.rs index b6a9118380..ad23db1c64 100644 --- a/crates/engine/src/cmd/actionset.rs +++ b/crates/engine/src/cmd/actionset.rs @@ -9,8 +9,9 @@ //! text. Each action is an `/action-N` block with a hexadecimal `/name`; each step is an `/event-N` //! block inside one, with its `/internalName` in parentheses, the `/localizedName` it is shown with //! as hexadecimal text, and `/isOn` 0 when it is left out of playback; each value a step was -//! recorded with is a `/parameter-N` block inside it, which is counted, and whose hexadecimal -//! `/value` is checked against its byte count. The set's `/actionCount`, an action's `/eventCount` +//! recorded with is a `/parameter-N` block inside it, which is counted, whose `/key` (a number), +//! `/type` (text in parentheses) and `/value` (a number, text in parentheses or hexadecimal text) are +//! kept, and whose hexadecimal `/value` is checked against its byte count. The set's `/actionCount`, an action's `/eventCount` //! and a step's `/parameterCount` give how many actions, steps and recorded values follow. //! The layout follows the README of Inventsable's Redesigning-Illustrator-Actions-in-Scripting //! (https://github.com/Inventsable/Redesigning-Illustrator-Actions-in-Scripting), the forum post @@ -40,6 +41,8 @@ const MAX_STEPS: usize = 10_000; /// The most steps read in the set: a small text can hold hundreds of thousands of empty steps, and /// the answer holds an object for each. const MAX_SET_STEPS: usize = 100_000; +/// The most recorded values kept in the set; the others are counted but not kept. +const MAX_VALUES: usize = 100_000; /// The longest name kept (bytes). const MAX_NAME: usize = 1024; /// The most tokens listed as unread. @@ -56,7 +59,7 @@ pub fn specs() -> Vec { "Read Action Set File", [], None, - "{path? | data?: the file's text | dataBase64?, name?: the file's name (default: the path's)} read an action set another app saved as text (.aia, starting \"/version\") without changing anything → {set: the set's /name (else the file's name without its extension, else empty), version, actions: [{name, steps: [{name: the step's /internalName, label: its /localizedName, or null when it has none or it is blank, on: false when /isOn is 0, params: how many /parameter blocks it has, line}]}], unread: [{line, text}] (tokens that aren't read, at most 1000), truncated: true when a cap stopped the reading (8 MiB, 16 open blocks, 1,000 actions, 10,000 steps in an action, 100,000 steps in the set; names past 1,024 bytes are cut), when the text ends inside a block or a value or after a field's name, when /actionCount, /eventCount or a step's /parameterCount differs from the actions, steps or recorded values read (a negative count, one too large for a number and one that isn't a number always differ), or when a hexadecimal name, label or recorded /value isn't as many bytes as its count says}. Give exactly one of path, data and dataBase64. Text that doesn't start with /version and a number is an error", + "{path? | data?: the file's text | dataBase64?, name?: the file's name (default: the path's)} read an action set another app saved as text (.aia, starting \"/version\") without changing anything → {set: the set's /name (else the file's name without its extension, else empty), version, actions: [{name, steps: [{name: the step's /internalName, label: its /localizedName, or null when it has none or it is blank, on: false when /isOn is 0, params: how many /parameter blocks it has, values: [{key: the block's /key, or null, type: its /type, or null, value: its /value when it is a number, or text that is UTF-8 (else null), bytes?: the text's length in bytes}] (the first 100,000 recorded values in the set), line}]}], unread: [{line, text}] (tokens that aren't read, at most 1000), truncated: true when a cap stopped the reading (8 MiB, 16 open blocks, 1,000 actions, 10,000 steps in an action, 100,000 steps in the set; names past 1,024 bytes are cut), when the text ends inside a block or a value or after a field's name, when /actionCount, /eventCount or a step's /parameterCount differs from the actions, steps or recorded values read (a negative count, one too large for a number and one that isn't a number always differ), or when a hexadecimal name, label or recorded /value isn't as many bytes as its count says}. Give exactly one of path, data and dataBase64. Text that doesn't start with /version and a number is an error", always, read )] @@ -73,12 +76,33 @@ pub struct AiaStep { pub on: Option, /// How many `/parameter-N` blocks it has. pub params: usize, + /// Its `/parameter-N` blocks, in order, while the set keeps at most [`MAX_VALUES`]. + pub values: Vec, /// Its `/parameterCount`, if it has one. pub declared: Option, /// The line its block opens on (from 1). pub line: usize, } +/// A value a step was recorded with: a `/parameter-N` block. +#[derive(Clone, Debug, Default, PartialEq, Eq)] +pub struct AiaValue { + /// Its `/key`, if it has one that fits an `i64`. + pub key: Option, + /// Its `/type`, read as UTF-8 with replacement characters, if it has one. + pub kind: Option, + /// Its `/value`, if it is a number that fits an `i64` or text. + pub value: Option, +} + +/// A recorded `/value` that is kept. +#[derive(Clone, Debug, PartialEq, Eq)] +pub enum AiaData { + Int(i64), + /// The bytes of text in parentheses or of hexadecimal text. + Text(Vec), +} + /// An action: an `/action-N` block. #[derive(Clone, Debug, Default, PartialEq, Eq)] pub struct AiaAction { @@ -106,6 +130,8 @@ pub struct AiaSet { pub truncated: bool, /// How many steps were read in all the actions. steps: usize, + /// How many recorded values were kept in all the steps. + values: usize, } /// A token of the text. @@ -252,7 +278,8 @@ fn hex_bytes(digits: &[u8]) -> Option> { enum Kind { Action, Step, - Param, + /// A recorded value, and whether it is kept. + Param(bool), /// A block that isn't read, or one past a cap. Other, } @@ -315,12 +342,18 @@ fn open_block(set: &mut AiaSet, stack: &[Kind], name: &[u8], line: usize) -> Kin } }, Some(Kind::Step) if numbered(name, b"parameter-") => { + let mut kept = false; if let Some(s) = set.actions.last_mut().and_then(|a| a.steps.last_mut()) { s.params += 1; + if set.values < MAX_VALUES { + s.values.push(AiaValue::default()); + set.values += 1; + kept = true; + } } - Kind::Param + Kind::Param(kept) } - Some(Kind::Param | Kind::Other) => Kind::Other, + Some(Kind::Param(_) | Kind::Other) => Kind::Other, _ => { unread(set, line, format!("/{} {{", String::from_utf8_lossy(name))); Kind::Other @@ -355,12 +388,23 @@ fn set_hex(set: &mut AiaSet, kind: Option<&Kind>, name: Option<&[u8]>, bytes: Op } } -/// Mark `set` truncated when the hexadecimal `/value` on `line` isn't as many bytes as its count -/// says. -fn check_value(set: &mut AiaSet, bytes: Option>, line: usize) { - if bytes.is_none() { +/// Set the field `name` of the recorded value open on `line` to `token`: its `/key`, `/type` or +/// `/value`, when the value is `kept`. A hexadecimal `/value` that isn't as many bytes as its count +/// says marks `set` truncated, kept or not. +fn set_param(set: &mut AiaSet, kept: bool, name: Option<&[u8]>, token: Token, line: usize) { + if name == Some(b"value".as_slice()) && matches!(token, Token::Hex(None)) { set.truncated = true; unread(set, line, BAD_HEX); + return; + } + let value = set.actions.last_mut().and_then(|a| a.steps.last_mut()).and_then(|s| s.values.last_mut()); + let Some(v) = value.filter(|_| kept) else { return }; + match (name, token) { + (Some(b"key"), Token::Int(key)) => v.key = key, + (Some(b"type"), Token::Text(t)) => v.kind = Some(String::from_utf8_lossy(&t).into_owned()), + (Some(b"value"), Token::Int(Some(n))) => v.value = Some(AiaData::Int(n)), + (Some(b"value"), Token::Text(t) | Token::Hex(Some(t))) => v.value = Some(AiaData::Text(t)), + _ => {} } } @@ -448,13 +492,13 @@ pub fn read_aia(bytes: &[u8]) -> std::result::Result { unread(&mut set, line, "}"); } } - Token::Hex(bytes) if matches!(stack.last(), Some(Kind::Param)) => { - if field(&mut pending).as_deref() == Some(b"value".as_slice()) { - check_value(&mut set, bytes, line); - } + _ if matches!(stack.last(), Some(Kind::Param(_))) => { + let kept = matches!(stack.last(), Some(Kind::Param(true))); + let name = field(&mut pending); + set_param(&mut set, kept, name.as_deref(), token, line); } - // The other values inside a recorded value, or a block that isn't read. - _ if matches!(stack.last(), Some(Kind::Param | Kind::Other)) => { + // The values inside a block that isn't read. + _ if matches!(stack.last(), Some(Kind::Other)) => { pending = None; } Token::Hex(bytes) => { @@ -521,6 +565,21 @@ pub fn read_aia(bytes: &[u8]) -> std::result::Result { Ok(set) } +/// A recorded value in `actionSet.read`'s answer: `{key, type, value, bytes?}`, the value a number, +/// text that is UTF-8 (else null) with its length in bytes, or null. +fn value_json(v: &AiaValue) -> Value { + let mut out = json!({ "key": v.key, "type": v.kind, "value": null }); + match &v.value { + Some(AiaData::Int(n)) => out["value"] = json!(n), + Some(AiaData::Text(t)) => { + out["value"] = json!(std::str::from_utf8(t).ok()); + out["bytes"] = json!(t.len()); + } + None => {} + } + out +} + fn read(_: &mut Session, p: &Value) -> Result { const C: &str = "actionSet.read"; let (path, data, b64) = (text_param(p, "path", C)?, text_param(p, "data", C)?, text_param(p, "dataBase64", C)?); @@ -544,7 +603,8 @@ fn read(_: &mut Session, p: &Value) -> Result { .iter() .map(|s| { let label = s.label.clone().filter(|l| !l.trim().is_empty()); - json!({ "name": s.name, "label": label, "on": s.on != Some(0), "params": s.params, "line": s.line }) + let values: Vec = s.values.iter().map(value_json).collect(); + json!({ "name": s.name, "label": label, "on": s.on != Some(0), "params": s.params, "values": values, "line": s.line }) }) .collect(); json!({ "name": a.name, "steps": steps }) diff --git a/crates/engine/src/tests/actionset.rs b/crates/engine/src/tests/actionset.rs index d80e649ec7..49e5685bdc 100644 --- a/crates/engine/src/tests/actionset.rs +++ b/crates/engine/src/tests/actionset.rs @@ -3,7 +3,7 @@ use serde_json::json; -use crate::cmd::actionset::{AiaStep, read_aia}; +use crate::cmd::actionset::{AiaData, AiaStep, AiaValue, read_aia}; use crate::*; /// `text` as a bracketed hexadecimal value. @@ -37,7 +37,12 @@ fn a_set_reads_its_actions_and_steps() { let names: Vec<&str> = set.actions.iter().map(|a| a.name.as_str()).collect(); assert_eq!(names, ["First", "二番目"]); let step = |a: usize, s: usize| set.actions[a].steps[s].clone(); - let join = AiaStep { name: "sample_join".into(), label: Some("Join".into()), on: Some(1), params: 3, declared: Some(3), line: 9 }; + let values = vec![ + AiaValue { key: Some(1), kind: Some("unit real".into()), value: None }, + AiaValue { key: None, kind: Some("ustring".into()), value: Some(AiaData::Text(b"a } brace".to_vec())) }, + AiaValue { key: None, kind: Some("raw".into()), value: None }, + ]; + let join = AiaStep { name: "sample_join".into(), label: Some("Join".into()), on: Some(1), params: 3, values, declared: Some(3), line: 9 }; assert_eq!(step(0, 0), join); assert_eq!((step(1, 0).name.as_str(), step(1, 0).label.clone(), step(1, 0).on), ("sample)one", None, Some(0))); assert_eq!((step(1, 1).label.as_deref(), step(1, 1).on, step(1, 1).line), (Some("Second Step"), None, 39)); @@ -60,6 +65,55 @@ fn recorded_values_are_counted_and_checked() { assert!(set(&[value("one"), "/value [ 1 zz ]".to_string()]).truncated, "a second value that isn't hexadecimal"); } +/// `actionSet.read` answers with each recorded value's key, type and value: a number, text in +/// parentheses or hexadecimal text that is UTF-8 with its length in bytes, and null for text that +/// isn't UTF-8 and for other values. Fields may come in any order, and a value with the wrong byte +/// count still marks the set truncated. +#[test] +fn recorded_values_come_back_with_their_keys_and_types() { + let mut s = Session::new(); + let text = format!( + "/version 3 /action-1 {{ /event-1 {{ /internalName (sample_values) /parameterCount 6 \ + /parameter-1 {{ /key 1952807028 /type (ustring) /value {note} }} \ + /parameter-2 {{ /value 1 /type (boolean) /key 2003792484 }} \ + /parameter-3 {{ /type (ustring) /value [ 2 c328 ] /key 7 }} \ + /parameter-4 {{ /key 99999999999999999999 /type (real) /value 4.5 }} \ + /parameter-5 {{ /key 3 /type (text) /value (plain) }} \ + /parameter-6 {{ }} }} }}", + note = hex("Größe ✓") + ); + let r = s.execute("actionSet.read", &json!({ "data": text })).unwrap(); + assert_eq!(r["truncated"], false); + assert_eq!( + r["actions"][0]["steps"][0]["values"], + json!([ + {"key": 1952807028, "type": "ustring", "value": "Größe ✓", "bytes": 11}, + {"key": 2003792484, "type": "boolean", "value": 1}, + {"key": 7, "type": "ustring", "value": null, "bytes": 2}, + {"key": null, "type": "real", "value": null}, + {"key": 3, "type": "text", "value": "plain", "bytes": 5}, + {"key": null, "type": null, "value": null}, + ]) + ); + let bad = "/version 3 /action-1 { /event-1 { /parameter-1 { /key 1 /type (ustring) /value [ 3 4142 ] } } }"; + assert_eq!(s.execute("actionSet.read", &json!({ "data": bad })).unwrap()["truncated"], true); +} + +/// At most 100,000 recorded values are kept in a set: the others are still counted, so a step's +/// `values` can be shorter than its `params`. +#[test] +fn recorded_values_past_the_cap_are_counted_but_not_kept() { + let step = format!("/event-1 {{ {} }} ", "/parameter-1 { /key 1 /value 0 } ".repeat(1000)); + let action = format!("/action-1 {{ {} }} ", step.repeat(50)); + let set = read_aia(format!("/version 3 {}", action.repeat(3)).as_bytes()).unwrap(); + assert!(!set.truncated); + let steps = || set.actions.iter().flat_map(|a| &a.steps); + assert_eq!(steps().map(|s| s.params).sum::(), 150_000); + assert_eq!(steps().map(|s| s.values.len()).sum::(), 100_000); + assert_eq!(set.actions[2].steps[0].values.len(), 0); + assert_eq!(set.actions[1].steps[49].values[999], AiaValue { key: Some(1), kind: None, value: Some(AiaData::Int(0)) }); +} + /// `actionSet.read` takes exactly one of `path`, `data` and `dataBase64`, and text for the text /// params; any other value is an error. #[test] @@ -97,7 +151,7 @@ fn read_command_answers_with_the_set() { let text = sample().replacen(&format!("/name {}", hex("Prep Sätze")), "", 1); let r = s.execute("actionSet.read", &json!({ "data": text, "name": "/sets/Mine.aia" })).unwrap(); assert_eq!(r["set"], "Mine"); - assert_eq!(r["actions"][1]["steps"][0], json!({"name": "sample)one", "label": null, "on": false, "params": 0, "line": 34})); + assert_eq!(r["actions"][1]["steps"][0], json!({"name": "sample)one", "label": null, "on": false, "params": 0, "values": [], "line": 34})); assert_eq!(r["actions"][0]["steps"][0]["on"], true); assert_eq!(r["actions"][0]["steps"][0]["label"], "Join"); let blank = format!("/version 3 /action-1 {{ /event-1 {{ /internalName (x) /localizedName {} }} }}", hex(" ")); diff --git a/crates/engine/tests/import_fuzz.rs b/crates/engine/tests/import_fuzz.rs index c2235eca77..ac0129cb52 100644 --- a/crates/engine/tests/import_fuzz.rs +++ b/crates/engine/tests/import_fuzz.rs @@ -1672,6 +1672,9 @@ fn action_set(bytes: &[u8]) -> Result<(), TestCaseError> { prop_assert!(actions.iter().all(|a| a["steps"].as_array().map_or(0, Vec::len) <= 10_000)); prop_assert!(actions.iter().map(|a| a["steps"].as_array().map_or(0, Vec::len)).sum::() <= 100_000); prop_assert!(r["unread"].as_array().map_or(0, Vec::len) <= 1000); + let steps = || actions.iter().flat_map(|a| a["steps"].as_array().cloned().unwrap_or_default()); + prop_assert!(steps().all(|s| s["values"].as_array().map_or(0, Vec::len) as u64 <= s["params"].as_u64().unwrap_or(0))); + prop_assert!(steps().map(|s| s["values"].as_array().map_or(0, Vec::len)).sum::() <= 100_000); } Ok(()) } @@ -1690,6 +1693,8 @@ fn arb_aia_token() -> impl Strategy> { "/localizedName", "/isOn", "/value", + "/key", + "/type", "/x", "/version", ]) @@ -1699,6 +1704,7 @@ fn arb_aia_token() -> impl Strategy> { "[a-z ()\\\\]{0,12}".prop_map(|t| format!("({t})").into_bytes()), prop::sample::select(vec!["(", ")", "\\", "[ 2 4142 ]", "[ 3 41 4", "[ 1 zz ]", "[", "]", "< 2 0a0b >", "<", ">", "2.5"]) .prop_map(|t| t.as_bytes().to_vec()), + prop::sample::select(vec!["[ 2 c328 ]", "(ustring)", "(boolean)"]).prop_map(|t| t.as_bytes().to_vec()), prop::sample::select(vec!["{", "}", "\r\n", "\r", "\n"]).prop_map(|t| t.as_bytes().to_vec()), prop::sample::select(vec![vec![0u8], vec![0xFF, 0xFE], vec![0xC3]]), ] diff --git a/crates/ui-egui/src/panels/actions.rs b/crates/ui-egui/src/panels/actions.rs index 4bab22d52e..e594b97fcd 100644 --- a/crates/ui-egui/src/panels/actions.rs +++ b/crates/ui-egui/src/panels/actions.rs @@ -4215,6 +4215,125 @@ mod tests { assert_eq!(r["skipped"], json!([{"action": "A", "step": "group"}, {"action": "A", "step": "Ungroup"}])); assert_eq!(r["leftOut"], 2); } + + /// A Set Selection step written from scratch, as `/event-N` text: its label (none when empty), + /// whether it is on, and its recorded values, each the text inside a `/parameter-N` block. + fn set_selection_event(n: usize, label: &str, on: bool, values: &[String]) -> String { + let hex = |t: &[u8]| format!("[ {} {} ]", t.len(), t.iter().map(|b| format!("{b:02x}")).collect::()); + let label = if label.is_empty() { String::new() } else { format!("/localizedName {} ", hex(label.as_bytes())) }; + let params: String = values.iter().enumerate().map(|(i, v)| format!("/parameter-{} {{ {v} }} ", i + 1)).collect(); + format!( + "/event-{n} {{ /useRulersIn1stQuadrant 0 /internalName (adobe_setSelection) {label}/isOn {} /isOff 0 /parameterCount {} {params}}} ", + u8::from(on), + values.len() + ) + } + + /// The recorded values of a Set Selection step: the note's bytes, then Whole Word and Case + /// Sensitive. + fn set_selection_values(note: &[u8], whole_word: u8, case_sensitive: u8) -> Vec { + let hex = |t: &[u8]| format!("[ {} {} ]", t.len(), t.iter().map(|b| format!("{b:02x}")).collect::()); + vec![ + format!("/key 1952807028 /showInPalette 4294967295 /type (ustring) /value {}", hex(note)), + format!("/key 2003792484 /showInPalette 4294967295 /type (boolean) /value {whole_word}"), + format!("/key 1667330917 /showInPalette 4294967295 /type (boolean) /value {case_sensitive}"), + ] + } + + /// Load Actions… reads an `.aia` Set Selection step, found by its internal name whatever its + /// label, as a Select Object step with its note (trimmed), Case Sensitive and Whole Word, in any + /// order; a step that is off stays excluded. The set saves to VectorCraft's own file and loads + /// back the same, and playing it selects the objects with that note. + #[test] + fn load_actions_reads_set_selection_steps_as_select_object() { + let mut reordered = set_selection_values("Größe ✓".as_bytes(), 1, 0); + reordered.reverse(); + let events = [ + set_selection_event(1, "Set Selection", true, &set_selection_values(b" Badge front ", 0, 1)), + set_selection_event(2, "Auswahl festlegen", true, &reordered), + set_selection_event(3, "", false, &set_selection_values(b"Off", 1, 1)), + ] + .concat(); + let text = format!("/version 3 /name [ 5 4e6f746573 ] /actionCount 1 /action-1 {{ /name [ 1 41 ] /eventCount 3 {events}}}"); + let mut app = app_with_sets(); + let r = app.run(LOAD_SET, json!({ "data": text })).unwrap(); + assert_eq!((r["leftOut"].clone(), r["skipped"].clone()), (json!(0), json!([]))); + let step = |note: &str, case_sensitive: bool, whole_word: bool| { + (SELECT_OBJECT_STEP.to_string(), json!({"note": note, "caseSensitive": case_sensitive, "wholeWord": whole_word})) + }; + let expected = [step("Badge front", true, false), step("Größe ✓", false, true), step("Off", true, true)]; + assert_eq!(app.ui.action_sets[3].actions[0].steps, expected); + assert_eq!(app.ui.action_sets[3].actions[0].excluded_steps, [2].into()); + + let saved = files::write_set(&app.ui.action_sets[3]); + assert!(saved.contains("\"version\": 4"), "{saved}"); + app.run(LOAD_SET, json!({ "data": saved })).unwrap(); + assert_eq!(app.ui.action_sets[4].actions[0].steps, expected); + assert_eq!(app.ui.action_sets[4].actions[0].excluded_steps, [2].into()); + + app.run("file.new", json!({"width": 200, "height": 100})).unwrap(); + let mut ids = vec![]; + for x in [0, 50] { + ids.push(app.run("shape.rectangle", json!({"x": x, "y": 0, "width": 20, "height": 20})).unwrap()["id"].as_u64().unwrap()); + } + app.run("attributes.set", json!({"ids": [ids[1]], "note": "Badge front"})).unwrap(); + app.run("select.all", json!({})).unwrap(); + app.ui.action_sets[3].actions[0].excluded_steps = [1, 2].into(); + play(&mut app, 3, 0).unwrap(); + let selected: Vec = app.session.active().unwrap().selection.objects.iter().map(|id| id.0).collect(); + assert_eq!(selected, [ids[1]], "the step selected the object with the note"); + } + + /// A Set Selection step whose recorded values are not exactly the note (UTF-8 text, not empty + /// once trimmed, at most 1,024 bytes) and the two options (each 0 or 1), with the right types and + /// no other value, is left out, listed by its label (else its internal name) and counted; no step + /// comes in with a missing option filled in. A value whose byte count is wrong refuses the file. + #[test] + fn set_selection_steps_with_bad_values_are_left_out() { + let good = || set_selection_values(b"Badge", 0, 0); + let with = |i: usize, value: &str| { + let mut v = good(); + v[i] = value.to_string(); + v + }; + let mut extra = good(); + extra.push("/key 1 /type (boolean) /value 0".into()); + let mut duplicate = good(); + duplicate[0] = good()[2].clone(); + let bad: Vec> = vec![ + good()[1..].to_vec(), + vec![good()[0].clone(), good()[1].clone()], + extra, + duplicate, + with(0, "/key 1952807028 /type (ustring) /value [ 2 c328 ]"), + with(0, "/key 1952807028 /type (ustring) /value [ 3 202020 ]"), + with(0, &format!("/key 1952807028 /type (ustring) /value [ 1025 {} ]", "61".repeat(1025))), + with(0, "/key 1952807028 /type (text) /value [ 5 4261646765 ]"), + with(0, "/key 1952807028 /type (ustring) /value 5"), + with(1, "/key 2003792484 /type (boolean) /value 2"), + with(1, "/key 2003792484 /type (integer) /value 1"), + with(2, "/key 1667330917 /type (boolean) /value 1.0"), + with(2, "/key 1667330917 /type (boolean)"), + with(2, "/key 1 /type (boolean) /value 1"), + ]; + let events: String = bad.iter().enumerate().map(|(i, values)| set_selection_event(i + 1, "Set Selection", true, values)).collect(); + let events = events + &set_selection_event(bad.len() + 1, "", true, &[]); + let text = format!("/version 3 /name [ 3 426164 ] /action-1 {{ /name [ 1 41 ] {events}}}"); + let mut app = app_with_sets(); + let r = app.run(LOAD_SET, json!({ "data": text })).unwrap(); + assert!(app.ui.action_sets[3].actions[0].steps.is_empty(), "{:?}", app.ui.action_sets[3].actions[0].steps); + assert_eq!(r["leftOut"], bad.len() + 1); + let names: Vec<&str> = r["skipped"].as_array().unwrap().iter().map(|s| s["step"].as_str().unwrap()).collect(); + let mut expected = vec!["Set Selection"; bad.len()]; + expected.push("adobe_setSelection"); + assert_eq!(names, expected); + assert_eq!(app.ui.status, format!("Loaded “Bad”: {} steps were left out", bad.len() + 1)); + + let wrong_count = set_selection_event(1, "Set Selection", true, &with(0, "/key 1952807028 /type (ustring) /value [ 6 4261646765 ]")); + let text = format!("/version 3 /action-1 {{ {wrong_count}}}"); + assert_eq!(app.run(LOAD_SET, json!({ "data": text })).unwrap_err(), "the action set file can't be read in full"); + assert_eq!(app.ui.action_sets.len(), 4, "no set added"); + } /// Load Actions… picks action set files of both kinds, and a set another app saved without a /// name takes the file's name, or `Actions` when there is no file; one named like a set in the /// panel gets the next free number. A file that isn't UTF-8 still reads. A set past the reader's diff --git a/crates/ui-egui/src/panels/actions/files.rs b/crates/ui-egui/src/panels/actions/files.rs index 0d19a0bf2b..5bdd0b9a98 100644 --- a/crates/ui-egui/src/panels/actions/files.rs +++ b/crates/ui-egui/src/panels/actions/files.rs @@ -15,7 +15,7 @@ //! version 6 so older builds refuse them rather than fail at that step. Other sets use version 1, and //! earlier version 1 to 5 files still work. //! Load Actions… also reads the action sets another app saves as text (`.aia`, through -//! `actionSet.read`). +//! `actionSet.read`), a Set Selection step as a Select Object step. use serde::{Deserialize, Serialize}; use serde_json::{Value, json}; @@ -398,6 +398,45 @@ fn step_commands() -> std::collections::HashMap> { by_label } +/// The `/internalName` of a step of another app's action set that selects objects by their note: the +/// Set Selection step. +const SET_SELECTION: &str = "adobe_setSelection"; // brand-ok: the step's internal name in the file format + +/// The `/key` of a Set Selection step's note (`text`), of its Whole Word option (`word`) and of its +/// Case Sensitive option (`case`): four characters read as a big-endian number. +const NOTE_KEY: i64 = 0x7465_7874; +const WHOLE_WORD_KEY: i64 = 0x776f_7264; +const CASE_SENSITIVE_KEY: i64 = 0x6361_7365; + +/// The Select Object step ([`super::SELECT_OBJECT_STEP`]) a Set Selection step of `actionSet.read`'s +/// answer stands for. The step must have exactly three recorded values, all kept: the note, of type +/// `ustring` and UTF-8, and Whole Word and Case Sensitive, each of type `boolean` and 0 or 1. The note +/// is as [`super::select_object_params`] takes it (trimmed, not empty, at most 1,024 bytes). Anything +/// else stands for nothing. +fn select_object_step(step: &Value) -> Option<(String, Value)> { + let values = step.get("values").and_then(Value::as_array)?; + if values.len() != 3 || step.get("params").and_then(Value::as_u64) != Some(3) { + return None; + } + let value = |key: i64, kind: &str| { + let mut found = values.iter().filter(|v| v.get("key").and_then(Value::as_i64) == Some(key)); + let v = found.next().filter(|v| v.get("type").and_then(Value::as_str) == Some(kind))?; + if found.next().is_some() { + return None; + } + v.get("value") + }; + let flag = |key: i64| match value(key, "boolean")?.as_i64()? { + 0 => Some(false), + 1 => Some(true), + _ => None, + }; + let note = value(NOTE_KEY, "ustring")?.as_str()?; + let params = json!({"note": note, "caseSensitive": flag(CASE_SENSITIVE_KEY)?, "wholeWord": flag(WHOLE_WORD_KEY)?}); + let (note, case_sensitive, whole_word) = super::select_object_params(¶ms).ok()?; + Some((super::SELECT_OBJECT_STEP.to_string(), json!({"note": note, "caseSensitive": case_sensitive, "wholeWord": whole_word}))) +} + /// The command a step of another app's action set stands for ([`step_commands`]). #[cfg(test)] pub(super) fn step_command(label: &str) -> Option<&'static str> { @@ -414,8 +453,9 @@ struct AiaLoad { } /// The set of `read`, `actionSet.read`'s answer, named `name` when the file gives none. A step comes -/// in as the command it stands for ([`step_name`], [`step_commands`]), with no params, and excluded -/// from playback when it is off in the file. An action with no name is called `Action N`. +/// in as the command it stands for ([`step_name`], [`step_commands`]), with no params, or a Set +/// Selection step as a Select Object step ([`select_object_step`]), and excluded from playback when +/// it is off in the file. An action with no name is called `Action N`. fn aia_set(read: &Value, name: &str) -> AiaLoad { let (mut skipped, mut left_out) = (vec![], 0usize); let commands = step_commands(); @@ -432,7 +472,12 @@ fn aia_set(read: &Value, name: &str) -> AiaLoad { let (mut steps, mut excluded_steps) = (vec![], std::collections::BTreeSet::new()); for s in a.get("steps").and_then(Value::as_array).map(Vec::as_slice).unwrap_or_default() { let (name, can_stand) = step_name(s); - let Some(id) = commands.get(&bare_label(&name)).copied().flatten().filter(|_| can_stand) else { + let step = if s.get("name").and_then(Value::as_str) == Some(SET_SELECTION) { + select_object_step(s) + } else { + commands.get(&bare_label(&name)).copied().flatten().filter(|_| can_stand).map(|id| (id.to_string(), json!({}))) + }; + let Some(step) = step else { left_out += 1; if skipped.len() < MAX_SKIPPED { skipped.push(json!({ "action": action, "step": name })); @@ -442,7 +487,7 @@ fn aia_set(read: &Value, name: &str) -> AiaLoad { if s.get("on").and_then(Value::as_bool) == Some(false) { excluded_steps.insert(steps.len()); } - steps.push((id.to_string(), json!({}))); + steps.push(step); } Action { excluded_steps, ..Action::new(action, steps) } }) @@ -496,7 +541,8 @@ fn load_aia(app: &mut VectorcraftApp, params: Value) -> Result { /// /// An action set another app saved as text (`.aia`, read with `actionSet.read`) comes in with its /// actions and the steps that stand for a VectorCraft command ([`step_name`], [`step_commands`]), -/// with no params; a step that is off in the file is excluded from playback. A set with no name is +/// with no params, and its Set Selection steps as Select Object steps ([`select_object_step`]); a +/// step that is off in the file is excluded from playback. A set with no name is /// called after the file, else `Actions`. The other steps are left out and listed, and the status /// bar says how many → `{set, name, actions, skipped: [{action, step}] (at most 1,000), leftOut: n}`. /// Such a file that `actionSet.read` marks `truncated` is refused, and so is one whose set Save diff --git a/docs/mcp.md b/docs/mcp.md index d4e03892e9..4a84c626ed 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -11056,7 +11056,11 @@ that starts with `/version`) without changing anything. Give exactly one of `pat the set's name (`set`, else the file's name, else empty), its `version`, and its `actions`, each with its `name` and `steps`. A step lists its `name` (the file's `/internalName`), its `label` (the `/localizedName` it is shown with, or null when it has none or it is blank), `on` (false when the file sets `/isOn 0`), `params` (how many recorded values it -has) and its `line`. `unread` lists the tokens the reader skipped, with their lines. The reader stops at 8 MiB, 16 open +has), `values` and its `line`. `values` lists the step's recorded values in order, each as `{key, type, value, bytes?}`: +the block's `/key` and `/type` (null when it has none), and its `/value` when that is a whole number, or text in +parentheses or hexadecimal text that is UTF-8, with `bytes` giving the text's length in bytes; any other value, and text +that is not UTF-8, is null. Only the first 100,000 recorded values in the set are listed, so a step's `values` can be +shorter than its `params`. `unread` lists the tokens the reader skipped, with their lines. The reader stops at 8 MiB, 16 open blocks, 1,000 actions, 10,000 steps in an action and 100,000 steps in the set, and cuts names at 1,024 bytes. It sets `truncated` when it reaches one of these limits, when the text ends inside a block or a value or after a field's name, when `/actionCount`, `/eventCount` or a step's `/parameterCount` differs from the actions, steps or recorded values read @@ -11071,8 +11075,12 @@ label, in English or in the interface language, in any case and without a final that label and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (Group, Ungroup). A submenu's items, file and document commands, Paste, Undo, Redo and add-on commands are never matched. The step runs with no params, and a step that is off in the file is excluded from -playback. Other steps are left out, including every step with no label and every step recorded with values (recorded -menu items too). The reply lists the first 1,000 in `skipped` (`{action, step}`, the step by its label, else its name), +playback. A Set Selection step, found by its `/internalName` whatever its label, comes in as a Select Object step +(`select.byNote` with `{note, caseSensitive, wholeWord}`) when it has exactly three recorded values: the note (key +`text`, 1952807028, of type `ustring`, UTF-8), Whole Word (key `word`, 2003792484) and Case Sensitive (key `case`, +1667330917), each of type `boolean` and 0 or 1. The note loses its leading and trailing spaces and must then be 1 to +1,024 bytes long. A Set Selection step with any other values is left out; no option is filled in. Other steps are left +out, including every other step with no label and every other step recorded with values (recorded menu items too). The reply lists the first 1,000 in `skipped` (`{action, step}`, the step by its label, else its name), `leftOut` counts them, and the status bar says how many were left out. An action with no name is called `Action N`, by its place in the file. Function keys and colors are not read. A file marked `truncated` is refused, and no set is added. Text that starts `/version` and is not an action set gives "not an action set file". Tokens in `unread` do not stop a diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index cad5851e98..6d98912f64 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -785,6 +785,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur - Actions panel menu: Load Actions… keeps a step whose command this build or its installed plug-ins do not have, and reports each one when the set loads: the `ui.actionSet.load` answer lists the action, step and command id (`unknownCommands`, `unknownCount`), and the status bar names the first and the count. An action with such a step included does not play, and the error names the step and its id before any step runs; an excluded one does not stop it. These are VectorCraft's own rules. Tests `panels::actions::tests::{load_actions_reports_steps_with_unknown_commands, load_actions_bounds_what_it_reports_of_unknown_commands, an_action_with_an_unknown_command_does_not_play}`. - Actions panel menu: Save Actions… does not write a set with a step that sets a folder preference (the Fonts, Plug-ins, Templates and Recovery folders and the two scratch disks) to a folder, and names the action and the preference instead; an empty folder and the scratch disk choices Startup and None save. Export Preferences leaves out both scratch disks, and `ui.inspect` under automation read roots leaves such a folder outside them out of recorded steps. These are VectorCraft's own rules (`ui.actionSet.save`, `prefs.export`). - Actions panel menu: Load Actions… also reads action sets saved as `.aia` files ([Actions panel overview](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html); `actionSet.read`, `ui.actionSet.load`). VectorCraft's own rules: the set comes in with all its actions. A step with a label and no recorded values comes in as the one menu command with the step's label, when that command is directly in a top menu, is what its menu bar item runs with no values and opens no dialog. A step that is off in the file stays excluded from playback. The other steps, recorded menu items included, are left out, and the status bar says how many. + - Actions panel menu: Load Actions… reads an `.aia` file's Set Selection step, which selects objects by the note typed in its dialog ([the help page](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/insert-non-recordable-tasks-into-actions.html)), as a Select Object step with its note, Case Sensitive and Whole Word (`ui.actionSet.load`; `actionSet.read` now lists each step's recorded values with their keys and types). VectorCraft's own rules: the step is found by its internal name whatever its label, and comes in only when it has exactly the note (UTF-8, 1 to 1,024 bytes once trimmed) and the two options (each 0 or 1); any other Set Selection step is left out and counted, with no option filled in. Tests `panels::actions::tests::{load_actions_reads_set_selection_steps_as_select_object, set_selection_steps_with_bad_values_are_left_out}`, `tests::actionset::{recorded_values_come_back_with_their_keys_and_types, recorded_values_past_the_cap_are_counted_but_not_kept}`. - Actions panel: the panel menu's Action Options… renames the selected action and keeps its steps ([Actions panel overview](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html): the menu item opens a dialog that renames the action or gives it a function key and color; `ui.action.options`). It also sets the action's function key and color. - Actions panel: Create New Action (bottom bar) and the panel menu's New Action… ask for the new action's name, set, function key and color, and Record adds the action and starts recording into it ([Create new actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/record-actions.html): the New Action dialog takes the action's name and the set it goes in; `ui.action.new`, `ui.action.play`). The function key (F1 to F15, with Ctrl or Command and Shift) plays the action. An action's function key plays the action even when a command has the same shortcut, and the command keeps it. VectorCraft's own rules, which the page does not cover: when several actions have the same key the first in panel order plays; a copied action has no key; New Action does not open while an action is recording. The color is the color of the action's button in Button Mode. - Actions panel: the panel menu's Button Mode shows the actions as buttons with their names in their Action Options colors, without sets or individual commands; a click on a button plays its action without its excluded steps, and choosing Button Mode again returns to the list ([the help page](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf#page=467) and [the next page](https://web.archive.org/web/20220911143322/https://helpx.adobe.com/pdf/cs6/illustrator_reference.pdf#page=468); [the help page](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/exclude-commands-from-actions.html) says commands cannot be excluded in Button Mode; `ui.action.buttonMode`, `ui.action.playAt`). VectorCraft's own rules, which the pages do not cover: the menu item shows a check mark while Button Mode is on; every set's actions show, in set order and then action order; an action without a color is an ordinary button; function keys still play their actions; the bottom bar shows only Stop Playing/Recording while an action plays or records, and Play Current Selection while one waits at a stop; Button Mode cannot be turned on while an action records; and the mode is kept with the UI preferences. diff --git a/docs/ui-parity.md b/docs/ui-parity.md index 5f26e4377e..58dc44a624 100644 --- a/docs/ui-parity.md +++ b/docs/ui-parity.md @@ -409,7 +409,7 @@ next unit in the order a right-click on a ruler lists them, from Feet back to Po | Image Trace panel: the Preview checkbox before Trace chooses whether a setting change traces the selected Image Trace object again at once | done | Per the public documentation, Preview shows the result of the current settings and Trace traces with them (). Preview is on by default and kept with the UI preferences; Reset to Default leaves it. Off, changes wait in the panel until Trace applies them as one undo step, or until Preview is turned on again. Changes stay with the object they were made for while another object is selected, and come back when it is selected again. `imageTrace.preview {on?}`, `ui.set {imageTracePreview}`; `panels/image_trace.rs` headless tests (`with_preview_off_a_slider_change_waits_for_trace`, `turning_preview_on_traces_the_changes_that_waited`, `preview_turned_on_with_nothing_selected_traces_when_the_object_is_selected_again`, `settings_that_wait_stay_with_their_object`, `settings_that_wait_come_back_when_their_object_is_selected_again`, `settings_that_wait_are_dropped_when_their_object_changed_since`, `preview_is_kept_with_the_preferences_and_reset_to_default_leaves_it`) | | Toolbar without group labels by default, one or two columns; All Tools drawer by flyout group with shortcuts, its menu (Reset, Basic, Advanced) and Show section | done | #1751; a preference brings the labels back; `toolbar.show` sets the Fill/Stroke, Coloring, Draw Mode and Screen Mode controls | | Actions panel: ≡ › Save Actions… saves the current set with all its actions to a file and ≡ › Load Actions… adds a saved set ([Manage a set of actions](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/manage-a-set-of-actions.html)) | partial | `ui.actionSet.save`, `ui.actionSet.load`; `panels/actions.rs` tests. The file is VectorCraft's own `.vcactions` JSON; Reset, Clear and Replace Actions remain | -| Actions panel: ≡ › Load Actions… also reads action sets saved as `.aia` files ([Actions panel overview](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html)) | partial | `actionSet.read`, `ui.actionSet.load`; `tests/actionset.rs`, `panels/actions.rs` tests, `import_fuzz`. Only steps with a label and no recorded values come in, as menu commands that run with no values and open no dialog, matched by label; the other steps, recorded menu items included, are left out and counted | +| Actions panel: ≡ › Load Actions… also reads action sets saved as `.aia` files ([Actions panel overview](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html)) | partial | `actionSet.read`, `ui.actionSet.load`; `tests/actionset.rs`, `panels/actions.rs` tests, `import_fuzz`. Steps with a label and no recorded values come in as menu commands that run with no values and open no dialog, matched by label, and Set Selection steps come in as Select Object steps; the other steps, recorded menu items included, are left out and counted | | Actions panel: ≡ › Action Options… renames the selected action and sets its function key and color ([Actions panel overview](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html)) | partial | `ui.action.options`; `panels/actions.rs` tests (part of #1629). Button Mode shows the color | | Actions panel: ≡ › Button Mode shows each action by name as a button in its Action Options color, without sets or steps; a click on a button plays the action, and choosing Button Mode again shows the list ([the help page](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/actions-panel-overview.html)) | done | `ui.action.buttonMode`, `ui.action.playAt`; `panels/actions.rs` tests. VectorCraft's own rules: every set's actions show in set order, an action without a color is an ordinary button, the mode is kept with the UI preferences, and it cannot be turned on while an action records | | Actions panel: ≡ › Playback Options… plays actions Accelerated, Step by Step or with a pause between steps ([Specify playback speed](https://helpx.adobe.com/illustrator/desktop/automate-visualize-data/automate-actions/specify-playback-speed.html)) | done | `ui.action.playbackOptions`; `panels/actions.rs` tests. The pause is a whole number of seconds from 1 to 60 (VectorCraft's own range); Batch… plays at full speed | From d43d3e84df926d0bdc3fb2fa8e70c72156f48263 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 18:27:58 -0800 Subject: [PATCH 22/50] Type: burasagari keeps right-to-left and tabbed mixed lines inside the frame A right-to-left paragraph draws a comma or full stop inside its line, but the breaker still kept an overflowing mark on the line as if it hung, so the line was drawn past the frame. The breaker now ends such a line at a break where it fits with the mark. In a left-to-right line with right-to-left text and a tab, the breaker hung an overflowing mark without measuring the line as drawn. It now hangs the mark only when the mark is drawn at the line's right end and the line before it fits as drawn; otherwise the line ends at the latest legal break that fits as drawn. --- crates/text/src/layout/breaking.rs | 21 ++++++-- crates/text/src/layout/flow.rs | 4 +- crates/text/src/layout/wrapping_tests.rs | 65 ++++++++++++++++++++++++ crates/text/src/tests/hang.rs | 35 +++++++++++++ docs/target-app-parity.md | 1 + 5 files changed, 122 insertions(+), 4 deletions(-) diff --git a/crates/text/src/layout/breaking.rs b/crates/text/src/layout/breaking.rs index fadb0165d5..0b80b21ddb 100644 --- a/crates/text/src/layout/breaking.rs +++ b/crates/text/src/layout/breaking.rs @@ -416,7 +416,8 @@ pub(super) fn word_width(g: &[SGlyph], i: usize, line_end: &[f64], kinsoku: Kins /// line holds a glyph with a negative advance and has been wider than `width` in the order of its /// text, it reads at most [`MAX_DRAWN_CHECKS_STEPPING_BACK`] legal breaks further, and a forced /// line break right after the last of them, and ends at the latest of the breaks read that fits as -/// drawn. +/// drawn. Such a line with a tab hangs a burasagari mark only when the mark is drawn at its right +/// end and the line before the mark fits as drawn. #[allow(clippy::too_many_arguments)] pub(super) fn break_line( text: &str, @@ -543,8 +544,22 @@ pub(super) fn break_line( let measured = if tabbed && fits.is_some() { (ink + cluster_ink).max(stops_reached) } else { x + cluster_width }; overflowed |= tabbed && fits.is_some() && j > first && !gl.is_space() && x + cluster_width - end_credit > width + EPS; if j > first && !gl.is_space() && measured - end_credit > width + EPS { - // It ends the line with the spaces after it. - if burasagari != Burasagari::None && hangs(gl) && kinsoku_allows(g, cluster_end - 1, kinsoku) { + // It ends the line with the spaces after it. Once the line holds a tab and is measured as + // drawn, the mark hangs only where it is drawn at the line's right end (it and the rest of + // its cluster are set left to right at the paragraph's level) and the line before it fits + // as drawn with no line-end trim on its last glyph; otherwise the line ends at a legal + // break that fits as drawn. + let hangs_as_drawn = || match fits.filter(|_| tabbed) { + None => true, + Some(fits) => { + let mut body = j; + while body > i && g[body - 1].is_space() { + body -= 1; + } + g[j..cluster_end].iter().all(|h| h.level.number() == 0) && line_end_credit(g, line_end, body) == 0.0 && fits(j, false) + } + }; + if burasagari != Burasagari::None && hangs(gl) && kinsoku_allows(g, cluster_end - 1, kinsoku) && hangs_as_drawn() { let mut end = cluster_end; while g.get(end).is_some_and(SGlyph::is_space) { end += 1; diff --git a/crates/text/src/layout/flow.rs b/crates/text/src/layout/flow.rs index 30b615c5fc..413bbf2692 100644 --- a/crates/text/src/layout/flow.rs +++ b/crates/text/src/layout/flow.rs @@ -474,7 +474,9 @@ fn place_flow_line(cx: &mut Ctx<'_>, pen: &mut Pen<'_>, context: &mut PlacementC ¶.tabs, ind_l, hyphenate, - para.burasagari, + // A right-to-left paragraph draws a burasagari mark inside its line + // ([`prepare_line_geometry`]): the line ends where it fits with the mark. + if *rtl { Burasagari::None } else { para.burasagari }, para.kinsoku, ty, *hanging, diff --git a/crates/text/src/layout/wrapping_tests.rs b/crates/text/src/layout/wrapping_tests.rs index a0a09956bc..da9167beb0 100644 --- a/crates/text/src/layout/wrapping_tests.rs +++ b/crates/text/src/layout/wrapping_tests.rs @@ -477,6 +477,71 @@ fn a_tabbed_line_ends_at_the_latest_break_that_fits_as_drawn() { assert_eq!(ended, (8, false)); } +/// A tabbed line measured as drawn hangs a burasagari full stop that overflows only when the stop +/// is drawn at the line's right end and the line before it fits as drawn with no line-end trim on +/// its last glyph; otherwise it ends at the latest legal break that fits as drawn. +#[test] +fn a_tabbed_burasagari_mark_hangs_only_at_the_drawn_end_of_a_fitting_line() { + let text = "a \t\u{05D0} 漢。"; + let specs: Vec<_> = text.char_indices().map(|(byte, ch)| (byte, ch.len_utf8(), 10.0, ch)).collect(); + let mut glyphs = synthetic_glyphs(&specs); + glyphs[3].level = unicode_bidi::Level::rtl(); + // The text without its tab is 60 pt wide at 。 (glyph 6), past 55 pt; kinsoku keeps 。 off a line + // start, so the latest legal break before it ends the line before 漢 (glyph 5). + let end = |glyphs: &[SGlyph], line_end: &[f64], fits: Option<&dyn Fn(usize, bool) -> bool>| { + break_line( + text, + glyphs, + 0, + 55.0, + &[], + 0.0, + None, + Burasagari::Standard, + Kinsoku::Hard, + KinsokuShoriType::PushOutOnly, + false, + false, + line_end, + fits, + ) + }; + let all_fit = |_end: usize, _hyphenated: bool| true; + assert_eq!(end(&glyphs, &[], Some(&all_fit)), (7, false), "drawn at the right end of a line that fits: 。 hangs"); + let body_too_wide = |end: usize, _hyphenated: bool| end <= 5; + assert_eq!(end(&glyphs, &[], Some(&body_too_wide)), (5, false), "the line before 。 is too wide as drawn"); + let mut trimmed = vec![0.0; glyphs.len()]; + trimmed[5] = 2.0; + assert_eq!(end(&glyphs, &trimmed, Some(&all_fit)), (5, false), "the line before 。 fits only with 漢 trimmed"); + glyphs[6].level = unicode_bidi::Level::rtl(); + assert_eq!(end(&glyphs, &[], Some(&all_fit)), (5, false), "。 set right to left is drawn inside the line"); +} + +/// A line with a tab and right-to-left text pushes a closing bracket out with every Kinsoku Shori +/// Type, where the same widths without them push it in. +#[test] +fn push_in_leaves_a_tabbed_right_to_left_line_to_push_out() { + use vectorcraft_doc::{TabAlign, TabStop}; + let tabbed = "\u{05D0}\t一二三四五」六"; + let mut glyphs = full_width(tabbed); + glyphs[0].level = unicode_bidi::Level::rtl(); + glyphs[1].adv = 2.0; + let tabs = [TabStop { position: 12.0, align: TabAlign::Left, leader: String::new(), align_on: '.' }]; + let all_fit = |_end: usize, _hyphenated: bool| true; + let fits: Option<&dyn Fn(usize, bool) -> bool> = Some(&all_fit); + // 」 (glyph 7) ends 72 pt along, 5 pt past the measure: five gaps close by 1 pt each. + let end = |ty| break_line(tabbed, &glyphs, 0, 67.0, &tabs, 0.0, None, Burasagari::None, Kinsoku::Hard, ty, false, false, &[], fits); + for ty in [KinsokuShoriType::PushInFirst, KinsokuShoriType::PushOutFirst, KinsokuShoriType::PushOutOnly] { + assert_eq!(end(ty), (6, false), "{ty:?}: 五 is pushed out with 」"); + } + let plain = "ax一二三四五」六"; + let mut glyphs = full_width(plain); + glyphs[1].adv = 2.0; + let pushed = + break_line(plain, &glyphs, 0, 67.0, &[], 0.0, None, Burasagari::None, Kinsoku::Hard, KinsokuShoriType::PushInFirst, false, false, &[], None); + assert_eq!(pushed, (8, false), "without the tab and right-to-left text, 」 is pushed in"); +} + /// Past the breaks a tabbed line measures one by one, it ends at the latest break without a hyphen /// that fits as drawn, whatever the breaks with a hyphen between them measure. #[test] diff --git a/crates/text/src/tests/hang.rs b/crates/text/src/tests/hang.rs index 5ccb79a5ca..ba978147bf 100644 --- a/crates/text/src/tests/hang.rs +++ b/crates/text/src/tests/hang.rs @@ -293,3 +293,38 @@ fn burasagari_counts_the_hung_start() { assert!((quote.origin.x + quote.advance).abs() < EPS, "the quote hangs: {:?}", quote.origin); assert!((comma.origin.x + comma.advance - 100.0).abs() < EPS, "、 inside, on the edge: {:?} {}", comma.origin, comma.advance); } + +/// A right-to-left paragraph draws a burasagari full stop inside its line, so the line breaks where +/// it fits with the stop: in a frame too narrow for the whole line by half the stop, the line ends +/// after the first word and nothing is drawn past the frame. +#[test] +fn right_to_left_burasagari_keeps_the_line_inside_the_frame() { + use vectorcraft_doc::{Burasagari, Kinsoku, ParaDirection}; + const EPS: f64 = 1e-6; + let text = "\u{05D0}\u{05D1} \u{05D2}\u{05D3}\u{3002}"; + let lay = |width: f64| { + let mut t = area(text, 20.0, Rect::new(0.0, 0.0, width, 400.0), Justify::Auto); + t.para.direction = Some(ParaDirection::RightToLeft); + t.para.burasagari = Burasagari::Standard; + t.para.kinsoku = Kinsoku::Hard; + let l = layout(db(), &t); + (t, l) + }; + let (_, wide) = lay(1000.0); + assert_eq!(wide.lines.len(), 1); + let full: f64 = wide.glyphs.iter().map(|g| g.advance).sum(); + let Some(stop) = wide.glyphs.iter().find(|g| g.byte == text.len() - '\u{3002}'.len_utf8()) else { + panic!("。 is set as a glyph of its own"); + }; + let (t, l) = lay(full - stop.advance / 2.0); + assert!(!l.overflow); + assert_eq!(l.lines.len(), 2, "the line ends after the first word"); + for (li, gs) in inked(&t, &l) { + // A right-to-left line's trailing space is set at its left, outside the aligned text. + for g in gs.into_iter().filter(|g| !is_space(ch(&t, g))) { + let c = ch(&t, g); + assert!(g.origin.x >= li.avail.0 - EPS, "{c:?} starts at {} before {}", g.origin.x, li.avail.0); + assert!(g.origin.x + g.advance <= li.avail.1 + EPS, "{c:?} ends at {} past {}", g.origin.x + g.advance, li.avail.1); + } + } +} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index cad5851e98..3768b15822 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1447,6 +1447,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur The Tabs panel menu's Clear All Tabs (`text.tabs.clear`), Delete Tab and Repeat Tab (`text.tabs.set`) can be chosen while the panel's ruler shows tab stops. Delete Tab removes the stop selected on the ruler. Repeat Tab replaces the stops after the selected stop with up to 20 copies of it. The copies are spaced by the selected stop's distance from the stop before it, or from the paragraph's left indent (18 pt further in for each list level past the first) when it is the first stop, and no copy is placed at 2,000 pt or beyond. Clear All Tabs removes every stop, so the default stops every ½ inch apply again. - **Interface languages, vertical type:** Preferences ▸ User Interface (or VectorCraft ▸ Language on macOS) picks Automatic (the system locale) or a registered language, persisted as `interfaceLanguage`. Translations come from per-language catalogs (`i18n/*.tsv`): Traditional and Simplified Chinese, Japanese, German (every `de-*` locale), Spanish (neutral international Spanish, for every `es-*` locale), French (every `fr-*` locale), Italian (every `it-*` locale), Russian (every `ru-*` locale) and Ukrainian (every `uk-*` locale), Catalan (every `ca-*` locale) and Polish (every `pl-*` locale; AI-drafted, native review pending) cover the whole interface, Czech every menu label; Czech, German, Greek, Spanish, French, Georgian, Hindi, Hungarian, Italian, Japanese, Korean, Vietnamese, Polish, Brazilian Portuguese, Russian, Simplified Chinese, Traditional Chinese, Swedish, Ukrainian, Finnish, Turkish, Catalan, Dutch and Danish also translate status-bar and error messages as they are shown (`@msg` templates, every message literal tested; the messages themselves stay English for agents); untranslated text stays English. Japanese and Chinese glyphs come from the craft-fonts build input (release builds) or the installed fonts, Czech, German, Spanish, French, Italian, Russian and Ukrainian ones from the bundled UI fonts. The web app follows the browser's languages (or `?lang=`). The Basic toolbar's Type button holds Vertical Type in its flyout. Vertical Type, Vertical Area Type and Vertical Type on a Path create vertical text (columns right to left, upright CJK glyphs and marks with `vert` alternates, Latin and longer numbers on their side, two- and three-digit numbers set as tate-chu-yoko in one em of the column (kept whole when justified), upright glyphs centred on the column (tracked or justified too), point type's anchor on the first column's centre line; on a vertical path, upright glyphs and tate-chu-yoko blocks face the path's start, and letters on their side are a quarter turn clockwise from them (with Skew, 3D Ribbon and Stair Step only on a path that runs to the right), in one column that Align to Path Baseline or Center centers on the path and that the caret and selection span); kinsoku applies to horizontal and vertical Japanese (Paragraph panel › Kinsoku Set, `text.setFormat {kinsoku}`: Hard, the default, keeps closing marks, iteration marks, the prolonged sound mark and small kana off the line start and opening brackets off its end; Soft lets 々, ー and small kana start a line as JLREQ's level 3 rules do; None turns it off), and justified Japanese lines spread their room between characters (not inside Latin words); Paragraph panel › Mojikumi Set (shown with Preferences › Type › Show East Asian Options, `text.setFormat {mojikumi}`): None or Line-end Punctuation Half Width (new type's default, as in Illustrator; older documents and imported text keep None) shares one half-em space between consecutive punctuation, sets a closing mark ending a line half width and an opening bracket starting a line flush with its start (a paragraph's first line at its first-line indent, JIS X 4051's principle in JLREQ 3.1.5), and puts a quarter em between Japanese and Latin letters or digits; Paragraph panel menu › Top-to-Top / Bottom-to-Bottom Leading measures leading from em box top to top (area type's first line touches the frame) or from baseline to baseline (new type in a Japanese interface starts top to top, with em box centre character alignment, #432); Paragraph panel menu › Burasagari None / Regular / Force (`text.setFormat {burasagari: "none"|"standard"|"forced"}`) hangs an East Asian comma or full stop (、。,.、。) ending an area type line outside it, Regular (new type's default) when it doesn't fit and Force always (the rest of the line then fills the measure; closing brackets and Latin punctuation don't hang); Character panel menu › Character Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {charAlign}`) lines characters smaller than the largest on their line up on the Roman baseline, the em box top/right, centre or bottom/left, or the ICF (ideographic character face) top/right or bottom/left, from the font's BASE table or, without one, the average ink box of some ideographs and kana; Proportional Metrics (the same menu; `{proportionalMetrics}`) sets full-width glyphs on the font's proportional widths (OpenType `palt`) in horizontal type and upright glyphs on its proportional heights (`vpal`, shaped top to bottom; fonts without vertical metrics keep their cells) in vertical type, and Line-end Punctuation Half Width takes nothing more off the punctuation they re-spaced; Type ▸ Type Orientation switches existing text; caret, selection, hit testing and arrow keys follow the writing direction. Vertical text exports to PDF as real text and to SVG as outlines. The interface is available in Polish (`pl`): menus, panels, dialogs and messages, with one/few/many plurals; AI-drafted, native review pending (#1498). With Line-end Punctuation Half Width, both composers measure a line with its last character set as narrow as Mojikumi sets it ([the help page](https://helpx.adobe.com/illustrator/desktop/design-with-text/edit-format-text/use-mojikumi-for-japanese-text-composition.html)): a closing bracket, comma or full stop that fits at half width ends the line, and the character before it no longer goes to the next line with it. A mark that already lost its half to the punctuation after it and a line that ends in a hyphen take nothing more off, and the quarter em between Japanese and Latin text counts only where the line ends there. Kinsoku Shori Type and Burasagari Regular measure lines the same way; right-to-left lines and Mojikumi None break as before. In a frame that is not a rectangle, or with text wrap, a line's first word is measured as it is set (an opening bracket at its start flush, its last character narrowed) when layout looks for a line wide enough for it, and it ends only where the line may break, so kinsoku keeps an opening bracket with the character after it and a No Break run counts whole (`crates/text/src/layout/wrapping_tests.rs`, `crates/text/src/tests/vertical.rs`). Scores and estimates are unchanged. + Burasagari ([the help page](https://helpx.adobe.com/illustrator/using/formatting-asian-characters.html)) leaves a right-to-left paragraph's comma or full stop inside its line, which then ends at a break where it fits with the mark, and in a left-to-right line with right-to-left text and a tab it hangs a mark only when the mark is drawn at the line's right end and the rest of the line fits as drawn; otherwise the line ends at the latest break that fits as drawn. Both are VectorCraft's own rules (`crates/text/src/layout/wrapping_tests.rs`, `crates/text/src/tests/hang.rs`). Scores and estimates are unchanged. The Paragraph panel's Mojikumi Set lists the five predefined sets the help page names (None, YakumonoHankaku, GyomatsuYakumonoHankaku, GyomatsuYakumonoZenkaku and YakumonoZenkaku), then Line-end Punctuation Half Width, and `text.setFormat {mojikumi}` takes each of them. YakumonoHankaku sets every bracket, comma and full stop half width and takes a quarter em off each side of a middle dot; GyomatsuYakumonoHankaku keeps punctuation full width inside a line, sets an opening bracket flush at a line's start and a closing mark half width at its end, and takes the quarter em after a middle dot off at a line's end; GyomatsuYakumonoZenkaku keeps punctuation full width and adds a quarter em between Japanese and Latin text; YakumonoZenkaku sets characters as None does. These widths are VectorCraft's own rules, from the help page's one-line description of each set. Both composers and vertical type measure each line as it is set, the sets save with the document and paragraph styles, and a `.ai` save reports the new sets as left out (`crates/text/src/tests/vertical.rs`, `crates/ui-egui/src/panels/paragraph/tests.rs`). Scores and estimates are unchanged. Interface text in characters the interface's fonts lack, drawn in a bundled Japanese, Georgian or Devanagari face or in an installed font that covers them, sits on the baseline of the Latin text beside it, monospace text included (#5816; `crates/ui-egui/src/ui_fonts.rs`, `crates/ui-egui/src/theme.rs`). Character panel menu › Standard Vertical Roman Alignment (with the East Asian options; `text.setFormat` or `text.setRangeStyle {standardVerticalRoman}`, off by default) stands the selected Latin letters, digits and other half-width characters upright one below the other in vertical type instead of rotating them ([formatting Asian characters](https://helpx.adobe.com/illustrator/using/formatting-asian-characters.html)); spaces keep their width, tate-chu-yoko blocks stay across the column, and Character Style Options gives it its own checkbox beside Character Alignment. From 18c98141d5da1d23b4d941316beede106502b7d7 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 18:56:28 -0800 Subject: [PATCH 23/50] 3D: Revolve art at NaN or infinite opacity casts no shadow Revolve's shadow check, its kept-faces test, the single-object shadow and the group shadow now use the same rule as Extrude & Bevel, Inflate and Rotate: art whose opacity is not a finite number above zero casts nothing. Before, a NaN opacity passed the skip checks and gave the shadow fill a NaN opacity. --- crates/effects/src/revolve.rs | 62 ++++++++++++++++++++++++++--- crates/effects/src/solids/shadow.rs | 11 +++-- docs/target-app-parity.md | 2 +- 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/crates/effects/src/revolve.rs b/crates/effects/src/revolve.rs index a9c9482d1d..4d55664a67 100644 --- a/crates/effects/src/revolve.rs +++ b/crates/effects/src/revolve.rs @@ -166,7 +166,7 @@ pub(crate) fn validate_in(doc: Option<&Document>, n: &Node, id: &str, p: &Value) } } } - let casting = shapes.iter().filter(|s| surface_item(&s.items).is_some_and(|i| paint_of(i).1 * s.opacity > 0.0)); + let casting = shapes.iter().filter(|s| surface_item(&s.items).is_some_and(|i| crate::solids::shadow::casts(paint_of(i).1 * s.opacity))); return check_shadow(p, casting.map(|s| &s.path), b, options); } let (path, _) = object_profile(n, "Revolve")?; @@ -336,7 +336,8 @@ fn geometry(path: &PathData, fx: &[Effect], ctx: &GeomContext) -> PathData { /// The shadow of Revolve `fx` cast by the surface of `path` in `item`'s paint about the axis of /// `b`, revolved with `options`, as dark as `item` is opaque and in its blending mode; `None` with -/// the shadow off, when `item` is fully transparent or when it casts nothing, and an error when +/// the shadow off, when `item` is fully transparent or its opacity is not a finite number, or when +/// it casts nothing, and an error when /// the surface it is cast from is past the limits. /// /// `kept` holds the faces the surface drawn kept for its shadow ([`surface`]); without them the @@ -352,7 +353,7 @@ fn shadow_of( ) -> Result, String> { let Some(settings) = crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)) else { return Ok(None) }; let (_, opacity, blend) = paint_of(item); - if opacity <= 0.0 { + if !crate::solids::shadow::casts(opacity) { return Ok(None); } let mut caster = vectorcraft_three_d::ShadowCaster::new(); @@ -363,7 +364,7 @@ fn shadow_of( /// Does Revolve `fx` cast a shadow, so a surface in paint as opaque as `opacity` keeps the faces /// its shadow is cast from ([`surface`])? fn casts(fx: &Effect, opacity: f32) -> bool { - opacity > 0.0 && crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)).is_some() + crate::solids::shadow::casts(opacity) && crate::solids::shadow::options(&merged_params(&fx.id, &fx.params)).is_some() } /// Add the surface of `path` about the axis of `b` to `caster`: the faces it kept when it was @@ -406,9 +407,9 @@ fn group_shadow( for s in shapes { let kept = kept.next().flatten(); let Some((_, opacity, blend)) = surface_item(&s.items).map(paint_of) else { continue }; - // A member whose surface is fully transparent casts nothing. + // A member whose surface is fully transparent, or whose opacity is not a finite number, casts nothing. let ink = crate::solids::shadow::Ink { opacity: opacity * s.opacity, blend }; - if ink.opacity <= 0.0 { + if !ink.casts() { continue; } let faces = cast_surface(&mut caster, &s.path, b, options, kept)?; @@ -1810,6 +1811,55 @@ mod tests { } } } + + /// A surface whose fill, or whose member, is at NaN or infinite opacity casts no shadow, as one + /// at 0 % does, whether the shadow is cast from the surface drawn or swept for it alone; the + /// member beside it still casts its part. + #[test] + fn a_surface_whose_opacity_is_not_a_finite_number_casts_no_shadow() { + let fx = crate::new_effect(REVOLVE, &json!({"shadow": true})).unwrap(); + let group = |opacity: f32| { + let mut other = profile_node(); + other.id = NodeId(2); + other.transform(Affine::translate((120.0, 0.0)), false); + other.opacity = opacity; + let mut g = Node::group(NodeId(9), vec![Arc::new(profile_node()), Arc::new(other)]); + g.appearance.effects.push(fx.clone()); + g + }; + let group_shadows = |g: &Node| { + let shapes = members(g, "").unwrap(); + let b = union_bounds(&shapes).unwrap(); + let options = shared_options(&shapes, fx_options(&fx)).unwrap(); + let kept: Vec> = shapes + .iter() + .map(|s| { + let (paint, opacity, blend) = paint_of(surface_item(&s.items).unwrap()); + let cast = casts(&fx, opacity * s.opacity); + surface(None, g, &s.path, b, options, &fx, paint, opacity, blend, false, &mut Copies::default(), cast).unwrap().2 + }) + .collect(); + [group_shadow(g.id, &fx, &shapes, b, options, kept).unwrap(), group_shadow(g.id, &fx, &shapes, b, options, vec![]).unwrap()] + .map(|art| format!("{art:?}")) + }; + let expected = group_shadows(&group(0.0)); + for bad in [f32::NAN, f32::INFINITY] { + let mut n = profile_node(); + if let AppearanceItem::Fill(f) = &mut n.appearance.items[0] { + f.opacity = bad; + } + let (path, _) = profile(&n).unwrap(); + let b = path.bounds().unwrap(); + let item = surface_item(&n.appearance.items).unwrap(); + assert!(!casts(&fx, bad), "{bad}: the surface keeps no faces for a shadow"); + let (_, kept) = object_surface(None, &n, &path, &fx, item, false, &mut Copies::default()).unwrap(); + assert_eq!(shadow_of(n.id, &fx, &path, item, b, fx_options(&fx), kept).unwrap(), None, "{bad} drawn"); + assert_eq!(shadow_of(n.id, &fx, &path, item, b, fx_options(&fx), None).unwrap(), None, "{bad} alone"); + let shadows = group_shadows(&group(bad)); + assert!(!expected[0].is_empty() && expected[0] != "[]", "the opaque member casts"); + assert_eq!(shadows, expected, "{bad}: only the opaque member casts"); + } + } } #[cfg(test)] diff --git a/crates/effects/src/solids/shadow.rs b/crates/effects/src/solids/shadow.rs index 15a8e9d3c1..81542a3722 100644 --- a/crates/effects/src/solids/shadow.rs +++ b/crates/effects/src/solids/shadow.rs @@ -51,13 +51,18 @@ pub(crate) struct Ink { } impl Ink { - /// Whether art in this ink casts part of a shadow: its opacity is a finite number above zero. - /// Art at zero, negative, NaN or infinite opacity casts nothing. + /// Whether art in this ink casts part of a shadow ([`casts`]). pub(crate) fn casts(self) -> bool { - self.opacity.is_finite() && self.opacity > 0.0 + casts(self.opacity) } } +/// Whether art at `opacity` casts part of a shadow: its opacity is a finite number above zero. +/// Art at zero, negative, NaN or infinite opacity casts nothing. +pub(crate) fn casts(opacity: f32) -> bool { + opacity.is_finite() && opacity > 0.0 +} + /// The shadow of the faces in `caster` as a path of object `id`, cast by art in `ink`: filled /// black at [`SHADOW_OPACITY`] times its opacity, in its blending mode, with the nonzero rule; /// `None` when it casts nothing. diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 4ea5de5557..ebb85a6acf 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -585,7 +585,7 @@ since 2026-10-01. - 3D lighting presets: `crates/effects/src/lighting_presets.rs`, `crates/engine/src/cmd/effectcmd/lighting_presets_tests.rs` and the pointer tests in `crates/ui-egui/src/dialogs/revolve/tests.rs` cover recognition, atomic targeting, native round trips, preview, Cancel, reset and Undo. - 3D shadows: Revolve, Extrude & Bevel, Inflate and Rotate take a Shadows switch with Position (Behind Object or Below Object), Distance from Object (0–100 %) and Shadow Bounds (10–400 %) on the Lighting tab ([three-d.md](three-d.md#shadows)); the first light casts one hard-edged vector shadow, drawn behind the solids, in exports and kept by Expand Appearance. Evidence: `crates/three-d/src/shadow/tests.rs`, `crates/effects/src/solids/tests_shadow.rs`, `effectcmd::tests::a_3d_shadow_is_one_undo_step_saved_exported_and_expanded`. Softness and the shadows of lights after the first are not built. Scores unchanged. - 3D shadows: with Shadows on, Revolve, Extrude & Bevel, Inflate and Rotate cast the shadow from the faces kept by the build that draws each solid, so drawing an object builds each of its solids once. The art and the shadow are unchanged. Evidence: `crates/three-d/src/shadow/tests.rs` (`a_solid_and_its_shadow_are_built_once` and the tests that compare each solid and its shadow with the two built apart), `solids::tests_shadow::a_shadowed_3d_object_builds_each_solid_once`, `solids::tests_shadow::the_shadow_cast_from_the_solids_drawn_is_the_shadow_of_solids_built_for_it`, `revolve::tests::the_shadow_cast_from_the_surfaces_drawn_is_the_shadow_of_surfaces_swept_for_it`. Scores unchanged. -- 3D shadows: in Extrude & Bevel, Inflate and Rotate, a fill, stroke or member whose opacity is NaN or infinite casts no part of the shadow, as one at 0 % does, whether the shadow is cast from the solids drawn or from solids built for it alone; the art beside it still casts. This is VectorCraft's own rule. Evidence: `solids::tests_shadow::art_whose_opacity_is_not_a_finite_number_casts_no_shadow`. Scores unchanged. +- 3D shadows: in Revolve, Extrude & Bevel, Inflate and Rotate, a fill, stroke or member whose opacity is NaN or infinite casts no part of the shadow, as one at 0 % does, whether the shadow is cast from the solids drawn or from solids built for it alone; the art beside it still casts. This is VectorCraft's own rule. Evidence: `solids::tests_shadow::art_whose_opacity_is_not_a_finite_number_casts_no_shadow`, `revolve::tests::a_surface_whose_opacity_is_not_a_finite_number_casts_no_shadow`. Scores unchanged. - Window › 3D and Materials panel: `crates/ui-egui/src/panels/three_d.rs` applies a 3D effect by object type (Plane, Extrude, Revolve, Inflate), changes an applied one in place (`effect.setParams` `threeDType`) and edits it with the options dialog's Object, Rotation and Lighting controls, one undo step per change; `crates/engine/src/cmd/effectcmd/three_d_type_tests.rs` and `crates/ui-egui/src/panels/tests_three_d.rs` cover it. No Materials tab. - 3D and Materials › Quick Actions › Expand as Wireframes (#6354): `effect.expandAsWireframes` replaces each selected 3D object with a group of 0.5 pt black stroked paths, the edges of the faces its effect draws, each edge once and joined end to end, curves kept, in one undo step ([three-d.md](three-d.md#3d-and-materials-panel)); `crates/effects/src/solids/wireframe/tests.rs`, `crates/engine/src/cmd/wireframe/tests.rs` and `crates/ui-egui/src/panels/tests_three_d.rs` cover it. Scores and hours unchanged. - 3D effects on clipping groups, blends and symbol instances (#6140, #5725): every 3D type builds from the art the object shows (the art inside the clipping path, the blend's keys and steps, the symbol's art where the instance places it), alone or in a group, on the canvas, in exports, Object › Rasterize and `assets.add3D`; an image is refused with a pointer to Object › Image Trace › Make. `crates/effects/src/solids/tests_sources.rs`, `crates/engine/src/cmd/effectcmd/three_d_source_tests.rs` and `fx::tests::a_symbol_instance_a_blend_and_a_clipping_group_draw_their_solids` cover it. Scores and estimates unchanged. From 6ef785b1d8dcee903db7d20420d77bd46042e66c Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 19:00:19 -0800 Subject: [PATCH 24/50] SVG Filters: a turned filter measures box units against its box, and export keeps it only where import can In a turned or skewed user space, the source is drawn onto the filter's canvas pixels first and cut to the pixels it draws there, so the image lies along the user space's axes. A region in objectBoundingBox units (the default filterUnits) and primitive lengths with primitiveUnits="objectBoundingBox" are then measured against the object's box in that user space instead of the raster's box turned into it. SVG export and the image fallback keep a filter live only when SVG import can store its user space again: scale and axes together can scale it past 0.001 to 1000 points to a unit while each is valid alone (scale 1000 with axes [2, 0, 0, 2]). Such an object is written as an image. Import and export share the user-space check. --- crates/effects/src/svg_filter.rs | 105 +++++++++++++++++-------- crates/effects/src/svg_filter/tests.rs | 32 ++++++++ crates/engine/src/cmd/rasterfx.rs | 2 +- crates/engine/src/tests/svgfilter.rs | 20 +++++ crates/svg/src/export/paint.rs | 7 +- crates/svg/src/import/fx.rs | 33 +------- docs/mcp.md | 8 +- 7 files changed, 138 insertions(+), 69 deletions(-) diff --git a/crates/effects/src/svg_filter.rs b/crates/effects/src/svg_filter.rs index cbbd4287d9..cfaafabe7f 100644 --- a/crates/effects/src/svg_filter.rs +++ b/crates/effects/src/svg_filter.rs @@ -1274,11 +1274,48 @@ fn axes_param(p: &Value) -> Option { /// `v` as the linear map of an SVG filter effect's `axes` ([`axes_param`]), when it is one. pub fn valid_axes(v: &Value) -> Option { let n: Vec = v.as_array()?.iter().map(Value::as_f64).collect::>()?; - let [a, b, c, d] = <[f64; 4]>::try_from(n).ok()?; + axes_of(<[f64; 4]>::try_from(n).ok()?) +} + +/// `[a, b, c, d]` as the linear map of an SVG filter effect's `axes`, when the effect takes it ([`valid_axes`]). +fn axes_of([a, b, c, d]: [f64; 4]) -> Option { let det = a * d - b * c; ([a, b, c, d].iter().all(|v| v.is_finite() && v.abs() <= MAX_AXIS) && det.abs() >= MIN_AXES_DET).then(|| Affine::new([a, b, c, d, 0.0, 0.0])) } +/// A filter's user space as the SVG filter effect stores it ([`user_space`]). +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct UserSpace { + /// The effect's `scale`. + pub scale: f64, + /// The effect's `origin`. + pub origin: [f64; 2], + /// The effect's `axes`; `None` when the axes are the document's. + pub axes: Option<[f64; 4]>, +} + +/// `ts`, a user space mapped to the document, as the SVG filter effect's `scale` (the square root +/// of its area scale), `origin` and, when it turns, skews or scales unevenly, `axes`. `None` when +/// it can't be stored: not finite, `scale` outside 0.001..1000, or `axes` the effect refuses +/// ([`valid_axes`]). +pub fn user_space(ts: Affine) -> Option { + let [a, b, c, d, e, f] = ts.as_coeffs(); + if ![a, b, c, d, e, f].iter().all(|v| v.is_finite()) { + return None; + } + let scale = ts.determinant().abs().sqrt(); + if !(0.001..=1000.0).contains(&scale) { + return None; + } + let even = b == 0.0 && c == 0.0 && a > 0.0 && (a - d).abs() <= 1e-9 * a.max(1.0); + if even { + return Some(UserSpace { scale: a, origin: [e, f], axes: None }); + } + let axes = [a, b, c, d].map(|v| v / scale); + axes_of(axes)?; + Some(UserSpace { scale, origin: [e, f], axes: Some(axes) }) +} + /// The longest a unit vector becomes under the linear part of `a` (its largest singular value). fn stretch(a: Affine) -> f64 { let [a, b, c, d, _, _] = a.as_coeffs(); @@ -1433,6 +1470,12 @@ impl SvgFilterFx { self.scale == 1.0 && self.axes == Affine::IDENTITY } + /// Can SVG import store the filter's user space ([`Self::to_doc`]) again ([`user_space`])? Its + /// `scale` and `axes` together can scale it past what one of them holds alone. + pub fn opens_again(&self) -> bool { + user_space(self.to_doc()).is_some() + } + /// How far beyond `bounds` (document units) the filter can draw: its region's reach past them. pub fn outset(&self, bounds: Rect) -> f64 { let region = self.to_doc().transform_rect_bbox(self.region_in(self.user_box(bounds))); @@ -1460,23 +1503,28 @@ impl SvgFilterFx { let Some(canvas) = self.turned_canvas(w, h, s, space) else { return }; canvas }; - let Some(png) = png_of(data, w, x0, y0, x1, y1).map(Arc::new) else { return }; - // The image's pixels → filter user space. - let place = user.inverse() * space.to_doc * Affine::translate(Vec2::new(x0 as f64, y0 as f64)); - // The object's box in user space: in a turned or skewed one, the box of its pixels turned - // into it, not of their box in the raster. - let b = if self.axes == Affine::IDENTITY { - place.transform_rect_bbox(Rect::new(0.0, 0.0, (x1 - x0) as f64, (y1 - y0) as f64)) + // The source as an image, its size, and the map from its pixels to filter user space. The + // object's box in user space is the image's box there, which resvg measures the region and + // a primitive's lengths in the object's box against. In a turned or skewed user space the + // source is first drawn onto the canvas's pixels, whose rows and columns run along the user + // space's axes, and cut to the pixels it draws there: the image then lies along those axes, + // and its box is the box of the art in the user space, not of the raster's box turned into it. + let source = if self.axes == Affine::IDENTITY { + let place = user.inverse() * space.to_doc * Affine::translate(Vec2::new(x0 as f64, y0 as f64)); + png_of(data, w, x0, y0, x1, y1).map(|png| (png, x1 - x0, y1 - y0, place)) } else { - let Some(b) = turned_box(data, w, user.inverse() * space.to_doc) else { return }; - b + on_canvas(data, w, h, sw, sh, outer * user.inverse() * space.to_doc) + .map(|(png, cx, cy, iw, ih)| (png, iw, ih, outer.inverse() * Affine::translate(Vec2::new(cx as f64, cy as f64)))) }; + let Some((png, iw, ih, place)) = source else { return }; + let png = Arc::new(png); + let b = place.transform_rect_bbox(Rect::new(0.0, 0.0, iw as f64, ih as f64)); let Some(drawn) = self.drawn_xml(b).and_then(|xml| with_id(&xml, DRAWN_ID)) else { return }; let svg = format!( "{drawn}", matrix(outer), - x1 - x0, - y1 - y0, + iw, + ih, matrix(place), base64(&png) ); @@ -1548,25 +1596,20 @@ fn drawn_box(data: &[u8], w: usize, h: usize) -> Option<(usize, usize, usize, us (x1 > x0 && y1 > y0).then_some((x0, y0, x1, y1)) } -/// The box, under the map `a` from pixel coordinates, of the pixels of `data` (`w` wide) that aren't -/// transparent, or of the whole raster when all are. Under a map that keeps lines straight, a row's -/// farthest corners are those of its first and last such pixel, so each row is measured by those two. -fn turned_box(data: &[u8], w: usize, a: Affine) -> Option { - let px = data.as_chunks::<4>().0; - let h = px.len().checked_div(w)?; - let mut out: Option = None; - let mut add = |x: usize, y: usize| { - let r = a.transform_rect_bbox(Rect::new(x as f64, y as f64, x as f64 + 1.0, y as f64 + 1.0)); - out = Some(out.map_or(r, |o| o.union(r))); - }; - for y in 0..h { - let row = px.get(y * w..(y + 1) * w)?; - if let (Some(first), Some(last)) = (row.iter().position(|p| p[3] > 0), row.iter().rposition(|p| p[3] > 0)) { - add(first, y); - add(last, y); - } - } - out.or_else(|| (w > 0 && h > 0).then(|| a.transform_rect_bbox(Rect::new(0.0, 0.0, w as f64, h as f64)))) +/// The pixels of `data` (premultiplied RGBA8, `w` × `h`) drawn onto a `cw` × `ch` canvas through +/// `to_canvas` (the raster's pixels → the canvas's), cut to the box of the canvas pixels that aren't +/// transparent (the whole canvas when all are): a PNG of them, the box's corner on the canvas, and +/// its size. +fn on_canvas(data: &[u8], w: usize, h: usize, cw: u32, ch: u32, to_canvas: Affine) -> Option<(Vec, usize, usize, usize, usize)> { + let size = tiny_skia::IntSize::from_wh(u32::try_from(w).ok()?, u32::try_from(h).ok()?)?; + let raster = tiny_skia::Pixmap::from_vec(data.to_vec(), size)?; + let mut canvas = tiny_skia::Pixmap::new(cw, ch)?; + let paint = tiny_skia::PixmapPaint { quality: tiny_skia::FilterQuality::Bilinear, ..Default::default() }; + let [a, b, c, d, e, f] = to_canvas.as_coeffs().map(|v| v as f32); + canvas.draw_pixmap(0, 0, raster.as_ref(), &paint, tiny_skia::Transform::from_row(a, b, c, d, e, f), None); + let (cw, ch) = (cw as usize, ch as usize); + let (x0, y0, x1, y1) = drawn_box(canvas.data(), cw, ch).unwrap_or((0, 0, cw, ch)); + Some((png_of(canvas.data(), cw, x0, y0, x1, y1)?, x0, y0, x1 - x0, y1 - y0)) } /// The pixels of `data` (premultiplied RGBA8, `w` wide) in columns x0..x1 and rows y0..y1, as a PNG. diff --git a/crates/effects/src/svg_filter/tests.rs b/crates/effects/src/svg_filter/tests.rs index 9a76ea1d18..5ce32e4f0d 100644 --- a/crates/effects/src/svg_filter/tests.rs +++ b/crates/effects/src/svg_filter/tests.rs @@ -269,6 +269,38 @@ fn a_turned_region_is_measured_against_the_box_in_its_user_space() { assert!(at(&data, w, 12, 12)[3] < 40, "outside the diamond, inside its box on the page: {:?}", at(&data, w, 12, 12)); } +/// In a turned user space, a region in the object's bounding box (the default `filterUnits`) and a +/// primitive's lengths in it (`primitiveUnits="objectBoundingBox"`) are measured against the +/// object's box there: on a diamond turned an eighth of a turn, a flood over 0..100% of the box +/// covers the diamond alone. +#[test] +fn a_turned_filter_measures_box_units_against_the_box_in_its_user_space() { + let w = 40; + let h = std::f64::consts::FRAC_1_SQRT_2; + let region = r##""##; + let primitive = r##""##; + for xml in [region, primitive] { + let diamond = |x: usize, y: usize| (x as f64 - 19.5).abs() + (y as f64 - 19.5).abs() <= 10.0; + let mut data = image(w, w, |x, y| if diamond(x, y) { [0, 0, 255, 255] } else { [0; 4] }); + filter(json!({ "xml": xml, "axes": [h, h, -h, h] })).apply(&mut data, w, w, &space(w, w, 1.0, 1.0)); + assert_eq!(at(&data, w, 20, 20), [255, 0, 0, 255], "{xml}: inside the diamond"); + assert!(at(&data, w, 12, 12)[3] < 40, "{xml}: outside the diamond, inside its box on the page: {:?}", at(&data, w, 12, 12)); + } +} + +/// SVG import stores a filter's user space again only when `scale` and `axes` together stay within +/// what it holds: each alone can be valid while their product is not. +#[test] +fn a_user_space_opens_again_only_within_what_import_stores() { + let opens = |scale: f64, axes: serde_json::Value| filter(json!({ "xml": SHIFT_X, "scale": scale, "axes": axes })).opens_again(); + assert!(opens(1000.0, json!(null))); + assert!(opens(2.0, json!([0.0, 1.0, -1.0, 0.0]))); + assert!(!opens(1000.0, json!([2.0, 0.0, 0.0, 2.0])), "scale 2000 across"); + assert!(!opens(0.001, json!([0.5, 0.0, 0.0, 0.5])), "scale 0.0005 across"); + let space = user_space(Affine::new([0.0, 2.0, -2.0, 0.0, 5.0, 6.0])).unwrap(); + assert_eq!((space.scale, space.origin, space.axes), (2.0, [5.0, 6.0], Some([0.0, 1.0, -1.0, 0.0]))); +} + /// The region of a turned filter reaches as far as its turned box does. #[test] fn a_turned_region_reaches_along_the_turned_axes() { diff --git a/crates/engine/src/cmd/rasterfx.rs b/crates/engine/src/cmd/rasterfx.rs index 9fc28e0b75..03ace409b6 100644 --- a/crates/engine/src/cmd/rasterfx.rs +++ b/crates/engine/src/cmd/rasterfx.rs @@ -475,7 +475,7 @@ fn imaged(n: &Node, which: Which) -> bool { && effects::svg_filter::writes_live(&n.appearance.effects) && fx .iter() - .any(|f| matches!(f, RasterFx::Pixel(effects::PixelFx::Svg(s)) if (!s.measured() || fx.len() == 1) && s.writes_as_svg11())); + .any(|f| matches!(f, RasterFx::Pixel(effects::PixelFx::Svg(s)) if (!s.measured() || fx.len() == 1) && s.writes_as_svg11() && s.opens_again())); (pixels > 0 && !live) || (fx.iter().any(|f| matches!(f, RasterFx::DropShadow { darkness: Some(_), .. })) && (cmyk || !simple_rgb_shadow_source(n, &fx))) } diff --git a/crates/engine/src/tests/svgfilter.rs b/crates/engine/src/tests/svgfilter.rs index a0b22e303d..611c9bfd1f 100644 --- a/crates/engine/src/tests/svgfilter.rs +++ b/crates/engine/src/tests/svgfilter.rs @@ -551,6 +551,26 @@ fn svg_export_keeps_a_measured_region_only_on_the_object_alone() { assert!(after.contains(""#; + for (scale, axes, live) in [(2.0, json!([2, 0, 0, 2]), true), (1000.0, json!([2, 0, 0, 2]), false)] { + let mut s = session(); + let a = rect(&mut s, 10.0); + run(&mut s, "effect.apply", json!({"effect": "svg.filter", "ids": [a.0], "params": {"xml": hue, "scale": scale, "axes": axes}})); + let out = svg(&mut s); + assert_eq!((out.contains(" String { } /// The SVG filter (Effect › SVG Filters) of an object's `effects` that SVG keeps as a ``: -/// its last visible effect, in any user space the effect gives it ([`Writer::turned_filter_space`]). +/// its last visible effect, in any user space the effect gives it ([`Writer::turned_filter_space`]) +/// that SVG import can store again. fn live_svg_filter(effects: &[vectorcraft_doc::Effect]) -> Option { if !vectorcraft_effects::svg_filter::writes_live(effects) { return None; @@ -850,7 +851,9 @@ fn live_svg_filter(effects: &[vectorcraft_doc::Effect]) -> Option { + Some(vectorcraft_effects::RasterFx::Pixel(vectorcraft_effects::PixelFx::Svg(f))) + if (alone || !f.measured()) && f.writes_as_svg11() && f.opens_again() => + { Some(f) } _ => None, diff --git a/crates/svg/src/import/fx.rs b/crates/svg/src/import/fx.rs index d9cfd753d5..e6fa791f16 100644 --- a/crates/svg/src/import/fx.rs +++ b/crates/svg/src/import/fx.rs @@ -119,7 +119,7 @@ fn source_of<'a>(filter: &Filter, sources: &'a HashMap) -> Optio /// or scales unevenly keeps those directions in the effect's `axes`, so the filter runs in the /// element's own user space as SVG 1.1 defines it (). pub(super) fn kept(filters: &[Arc], ts: Affine, sources: &HashMap) -> Option> { - let space = user_space(ts)?; + let space = vectorcraft_effects::svg_filter::user_space(ts)?; filters .iter() .map(|filter| { @@ -134,37 +134,6 @@ pub(super) fn kept(filters: &[Arc], ts: Affine, sources: &HashMap, -} - -/// `ts`, a user space mapped to the document, as the SVG filter effect's `scale` (the square root -/// of its area scale), `origin` and, when it turns, skews or scales unevenly, `axes`. `None` when -/// it can't be stored: not finite, `scale` outside 0.001..1000, or `axes` the effect refuses -/// ([`vectorcraft_effects::svg_filter::valid_axes`]). -fn user_space(ts: Affine) -> Option { - let [a, b, c, d, e, f] = ts.as_coeffs(); - if ![a, b, c, d, e, f].iter().all(|v| v.is_finite()) { - return None; - } - let scale = ts.determinant().abs().sqrt(); - if !(0.001..=1000.0).contains(&scale) { - return None; - } - let even = b == 0.0 && c == 0.0 && a > 0.0 && (a - d).abs() <= 1e-9 * a.max(1.0); - if even { - return Some(UserSpace { scale: a, origin: [e, f], axes: None }); - } - let axes = [a, b, c, d].map(|v| v / scale); - vectorcraft_effects::svg_filter::valid_axes(&json!(axes))?; - Some(UserSpace { scale, origin: [e, f], axes: Some(axes) }) -} - /// The object's alpha, blurred (σ), moved and maybe inverted. #[derive(Clone, Copy, Debug, Default, PartialEq)] struct Shape { diff --git a/docs/mcp.md b/docs/mcp.md index c31c8c2d5a..4000572535 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5306,8 +5306,9 @@ its y axis `[c, d]`, before `scale`; absent, the document's axes; each number -1 filter runs on coarser pixels when a morphology radius or kernel unit would span more than 32 of them, or a standard deviation more than 512. With `axes`, the filter runs on pixels lined up with its own axes, so offsets, blurs and the region run along them, and the result is drawn onto the object's pixels through `axes`; those pixels are about as fine -along each axis as the object's and coarser when there would be more than 4 times as many, and a region measured -against the object's box is measured against its box in that user space. Moving the object moves `origin` and +along each axis as the object's and coarser when there would be more than 4 times as many. The object's box is then +its box in that user space: a region measured against it, and a region or primitive lengths in `objectBoundingBox` +units, are measured against that box. Moving the object moves `origin` and leaves `scale` and `axes` as they are. An effect whose XML or `axes` these rules refuse (from a file or a script) is not drawn or exported. The filter is drawn and written rebuilt from its filter elements and their filter attributes alone, without comments, text, descriptions or other attributes. An image in a filter is drawn only when its bytes are a PNG, JPEG, GIF or WebP @@ -5315,7 +5316,8 @@ within the pixel limit. A filter region in user space given in percentages is me and y from its top-left corner), and one in em or ex or left out takes the default region of that box (10% beyond each side); these are VectorCraft's own rules. Scale Strokes & Effects scales `scale`. SVG export writes the filter as a `` element when it is the object's last effect and its only pixel -effect (with a region measured against the object's box, its only raster effect), with the object in a +effect (with a region measured against the object's box, its only raster effect) and SVG import can store its user +space again (`scale` and `axes` together within the import limits below), with the object in a group that places the filter's user space and such a region written in user units. When `scale` isn't 1 or the effect has `axes`, that group's transform is the filter's user space and the object is written in document coordinates in a group inside the filter whose transform is the inverse, so its strokes keep their widths; SVG import reads that back From 147fd2904093fc8ff809385160ebe466d6568e78 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 19:33:43 -0800 Subject: [PATCH 25/50] =?UTF-8?q?Actions:=20Load=20Actions=E2=80=A6=20comm?= =?UTF-8?q?and=20description=20names=20the=20Set=20Selection=20import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The ui.actionSet.load params text, and its MCP catalog mirror, now say that a Set Selection step comes in as select.byNote with its three values and is left out with any others. --- crates/mcp/src/ui_catalog.rs | 2 +- crates/ui-egui/src/menus/ui_commands.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/mcp/src/ui_catalog.rs b/crates/mcp/src/ui_catalog.rs index d5911580aa..f6870ed8f8 100644 --- a/crates/mcp/src/ui_catalog.rs +++ b/crates/mcp/src/ui_catalog.rs @@ -1609,7 +1609,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ "ui.actionSet.load", "Load Actions…", "", - "{path? | data?: the file's text} read an action set file (.vcactions) at path, else a picked one, and add its set after the Actions panel's sets; a set named like one in the panel gets the next free number (Print 2), and the other sets stay. Files of another version, over 8 MiB, with more than 1,000 actions or with an action of more than 10,000 steps are refused, and so is any set, .aia ones too, that Save Actions… would write larger than 8 MiB (a file with less white space, or a name that gets a number); the panel menu's Load Actions… (disabled where there is no open dialog, the web) → {set: index, name, actions: n}. An action set another app saved as text (.aia, starting /version; read with actionSet.read) comes in with its actions. A step with a label and no recorded values comes in when exactly one menu command has that label (in English or the interface language, any case, no final …), and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (never a submenu's item, a file or document command, Paste, Undo, Redo or an add-on's command), with no params and excluded from playback when it is off in the file; the other steps, every step with no label and every step recorded with values (a recorded menu item too) among them, are left out → {set, name, actions, skipped: [{action, step: its label, else its name}] (the first 1,000), leftOut: n}, and the status bar says how many were left out; a set with no name takes the file's name, else Actions; a file actionSet.read marks truncated is refused, and text that starts /version and isn't an action set gives \"not an action set file\"", + "{path? | data?: the file's text} read an action set file (.vcactions) at path, else a picked one, and add its set after the Actions panel's sets; a set named like one in the panel gets the next free number (Print 2), and the other sets stay. Files of another version, over 8 MiB, with more than 1,000 actions or with an action of more than 10,000 steps are refused, and so is any set, .aia ones too, that Save Actions… would write larger than 8 MiB (a file with less white space, or a name that gets a number); the panel menu's Load Actions… (disabled where there is no open dialog, the web) → {set: index, name, actions: n}. An action set another app saved as text (.aia, starting /version; read with actionSet.read) comes in with its actions. A step with a label and no recorded values comes in when exactly one menu command has that label (in English or the interface language, any case, no final …), and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (never a submenu's item, a file or document command, Paste, Undo, Redo or an add-on's command), with no params and excluded from playback when it is off in the file. A Set Selection step (found by its internal name, whatever its label) comes in as select.byNote {note, caseSensitive, wholeWord} when it has exactly three recorded values: text (ustring, UTF-8; 1 to 1,024 bytes once trimmed), word and case (boolean, 0 or 1); with any other values it is left out. The other steps, every other step with no label and every other step recorded with values (a recorded menu item too) among them, are left out → {set, name, actions, skipped: [{action, step: its label, else its name}] (the first 1,000), leftOut: n}, and the status bar says how many were left out; a set with no name takes the file's name, else Actions; a file actionSet.read marks truncated is refused, and text that starts /version and isn't an action set gives \"not an action set file\"", ), ( "ui.actionSet.delete", diff --git a/crates/ui-egui/src/menus/ui_commands.rs b/crates/ui-egui/src/menus/ui_commands.rs index 24a39c9335..c3cd85c219 100644 --- a/crates/ui-egui/src/menus/ui_commands.rs +++ b/crates/ui-egui/src/menus/ui_commands.rs @@ -1610,7 +1610,7 @@ pub const UI_COMMANDS: &[(&str, &str, &str, &str)] = &[ crate::panels::actions::LOAD_SET, "Load Actions…", "", - "{path? | data?: the file's text} read an action set file (.vcactions) at path, else a picked one, and add its set after the Actions panel's sets; a set named like one in the panel gets the next free number (Print 2), and the other sets stay. Files of another version, over 8 MiB, with more than 1,000 actions or with an action of more than 10,000 steps are refused, and so is any set, .aia ones too, that Save Actions… would write larger than 8 MiB (a file with less white space, or a name that gets a number); the panel menu's Load Actions… (disabled where there is no open dialog, the web) → {set: index, name, actions: n}. An action set another app saved as text (.aia, starting /version; read with actionSet.read) comes in with its actions. A step with a label and no recorded values comes in when exactly one menu command has that label (in English or the interface language, any case, no final …), and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (never a submenu's item, a file or document command, Paste, Undo, Redo or an add-on's command), with no params and excluded from playback when it is off in the file; the other steps, every step with no label and every step recorded with values (a recorded menu item too) among them, are left out → {set, name, actions, skipped: [{action, step: its label, else its name}] (the first 1,000), leftOut: n}, and the status bar says how many were left out; a set with no name takes the file's name, else Actions; a file actionSet.read marks truncated is refused, and text that starts /version and isn't an action set gives \"not an action set file\"", + "{path? | data?: the file's text} read an action set file (.vcactions) at path, else a picked one, and add its set after the Actions panel's sets; a set named like one in the panel gets the next free number (Print 2), and the other sets stay. Files of another version, over 8 MiB, with more than 1,000 actions or with an action of more than 10,000 steps are refused, and so is any set, .aia ones too, that Save Actions… would write larger than 8 MiB (a file with less white space, or a name that gets a number); the panel menu's Load Actions… (disabled where there is no open dialog, the web) → {set: index, name, actions: n}. An action set another app saved as text (.aia, starting /version; read with actionSet.read) comes in with its actions. A step with a label and no recorded values comes in when exactly one menu command has that label (in English or the interface language, any case, no final …), and that command is directly in a top menu, can be recorded in actions, is what its menu bar item runs with no values and opens no dialog (never a submenu's item, a file or document command, Paste, Undo, Redo or an add-on's command), with no params and excluded from playback when it is off in the file. A Set Selection step (found by its internal name, whatever its label) comes in as select.byNote {note, caseSensitive, wholeWord} when it has exactly three recorded values: text (ustring, UTF-8; 1 to 1,024 bytes once trimmed), word and case (boolean, 0 or 1); with any other values it is left out. The other steps, every other step with no label and every other step recorded with values (a recorded menu item too) among them, are left out → {set, name, actions, skipped: [{action, step: its label, else its name}] (the first 1,000), leftOut: n}, and the status bar says how many were left out; a set with no name takes the file's name, else Actions; a file actionSet.read marks truncated is refused, and text that starts /version and isn't an action set gives \"not an action set file\"", ), ( crate::panels::actions::DELETE_SETS, From 5eaa976467bfa96abf8e2ebefc2d09538ef0e3a8 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 19:49:34 -0800 Subject: [PATCH 26/50] Docs: one PSD row in the file format table --- docs/file-format-parity.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/file-format-parity.md b/docs/file-format-parity.md index 9806465b89..0dead5bb0a 100644 --- a/docs/file-format-parity.md +++ b/docs/file-format-parity.md @@ -291,8 +291,7 @@ Names in the editing data that aren't UTF-8 (layers, objects, artboards, colors, | HP-GL/2 `.plt`, `.hpgl`, `.hgl`, `.hpg` | — | yes (pen moves, pens and widths, line types and attributes, circles, arcs, wedges and Bézier curves, filled and edged rectangles, wedges and polygons, encoded polylines, scaling and rotation; labels, symbol mode, raster images and hatching aren't drawn) | yes (`.plt`: each visible path once along its line, a pen per color or a pen table, type as outlines, clipping applied, HP-GL or HP-GL/2 with pen colors and encoded polylines) | recognized by its first instructions after any printer escapes, under its own extensions or one no other format reads; `crates/cad/src/hpgl/tests.rs`, `crates/cad/src/hpgl/write/tests.rs` (plots read back by the reader), `tests_hpgl.rs`, `import_fuzz.rs` | | DWG | open, export | no | no | no open spec; DXF instead | | EMF / WMF | open, export | yes | yes | an oversized embedded PNG or JPEG is refused from its header, before any pixels are decoded (#1776) | -| PSD | open, place, export | yes (open: layers as layers, or the merged image with `layers: false`; place: merged image; the merged image comes in clipped by the file's clipping path; every mode and depth; `.psd` and `.pdd`) | yes (layered, max editability) | placing as layers and a PSD import options dialog missing; the embedded ICC profile's tags are 4-byte aligned (#1584) | -| PSD | open, place, export | yes (open: layers as layers, or the merged image with `layers: false`; place: merged image, or the layers embedded as a group of objects with `layers: true`; every mode and depth; `.psd` and `.pdd`) | yes (layered, max editability) | PSD Import Options on File › Open and on File › Place without Link (Convert Layers to Objects, Flatten Layers to a Single Image, Import Hidden Layers; `tests_psdlayers.rs`, `dialogs/psd_import.rs`); layer comps and slices aren't read; the embedded ICC profile's tags are 4-byte aligned (#1584) | +| PSD | open, place, export | yes (open: layers as layers, or the merged image with `layers: false`; place: merged image, or the layers embedded as a group of objects with `layers: true`; the merged image comes in clipped by the file's clipping path; every mode and depth; `.psd` and `.pdd`) | yes (layered, max editability) | PSD Import Options on File › Open and on File › Place without Link (Convert Layers to Objects, Flatten Layers to a Single Image, Import Hidden Layers; `tests_psdlayers.rs`, `dialogs/psd_import.rs`); layer comps and slices aren't read; the embedded ICC profile's tags are 4-byte aligned (#1584) | | PSB | open | yes (layers as layers, or the merged image; the merged image comes in clipped by the file's clipping path) | no | | | PNG / JPEG / GIF / BMP / TIFF / Targa | open, place, export | yes (PNG: `.png` and `.pns`; BMP: `.bmp`, `.dib` and `.rle`; Targa: `.tga`, `.vda`, `.icb` and `.vst`, raw or run-length encoded, with a 16-bit file's one-bit alpha) | yes; TIFF is also selectable in Export for Screens and Asset Export with its existing options | Targa: `tests_tiffbmp.rs`, `tests/links.rs`; TIFF: grayscale with an alpha channel or other extra channels reads (#1466 in part), and so do files that store each channel as its own plane (PlanarConfiguration 2), CMYK ones with their ink amounts, and 1-bit files compressed with CCITT Group 3 (Compression 2 and 3, one- and two-dimensional rows); the ICC profiles embedded in JPEG and TIFF have 4-byte aligned tags (#1584); PNG export marks its colours as sRGB (`embedIcc`, an `sRGB` chunk; no ICC profile is embedded, #2221) | | WebP | export (Export for Screens) | yes | yes (lossless only; lossy written lossless with a warning) | | From abee7e0bc52e9136559abdb6ecb5843196fb1df5 Mon Sep 17 00:00:00 2001 From: Davit Matchakhelidze Date: Sun, 15 Nov 2026 07:57:28 +0400 Subject: [PATCH 27/50] i18n(ka): catalog from the ka branch --- crates/ui-egui/src/i18n/ka.tsv | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 32ddd359c8..268d0078ad 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -9395,7 +9395,7 @@ font-script Japanese იაპონური @msg unexpected resources მოულოდნელი რესურსები @msg unknown CMYK profile `{name}` უცნობი CMYK პროფილი `{name}` @msg unknown File Info field `{k}` ფაილის ინფორმაციის უცნობი ველი `{k}` -@msg unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`) უცნობი OpenType შესაძლებლობა `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt; გამოსართავად წინ დაურთეთ -; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom და aalt იღებს ალტერნატივის ნომერს ფორმით `tag=N`, სადაც N არის 0-დან {_1}-მდე, მაგალითად `salt=2`) +@msg unknown OpenType feature `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; prefix - to turn off; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom and aalt take an alternate's number as `tag=N` with N from 0 to {_1}, as `salt=2`) უცნობი OpenType შესაძლებლობა `{t}` (liga, calt, dlig, smcp, frac, onum, tnum, ordn, swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom, aalt, hkna, ital; გამოსართავად წინ დაურთეთ -; swsh, ss01–ss20, salt, titl, pnum, lnum, sups, subs, numr, dnom და aalt იღებს ალტერნატივის ნომერს ფორმით `tag=N`, სადაც N არის 0-დან {_1}-მდე, მაგალითად `salt=2`) @msg unknown OpenType feature `{t}` in featureChanges (the tags `features` takes) უცნობი OpenType შესაძლებლობა `{t}` featureChanges-ში (ის ტეგები, რომლებსაც `features` იღებს) @msg unknown PDF preset `{name}` (presets: {_1}) უცნობი PDF პრესეტი `{name}` (პრესეტები: {_1}) @msg unknown Warp style გაღუნვის უცნობი სტილი @@ -9729,3 +9729,5 @@ font-script Japanese იაპონური @msg scope applies to a click: leave out points scope დაწკაპებას ეხება: points არ მიუთითოთ @msg scope must be "one", "connected" or "samePaint" scope უნდა იყოს "one", "connected" ან "samePaint" @msg variable `{_1}` starts or ends with white space or holds a control character, which a variable library can't hold ცვლადი `{_1}` იწყება ან მთავრდება ჰარით ან შეიცავს მმართველ სიმბოლოს, რასაც ცვლადების ბიბლიოთეკა ვერ შეინახავს + Set Panel View პანელის ხედის დაყენება +@msg `panel` is swatches, graphicStyles or symbols `panel` უნდა იყოს swatches, graphicStyles ან symbols From 65ec6970ab3e11003cabfbfd97d35a15a46a7a14 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 20:07:36 -0800 Subject: [PATCH 28/50] MCP: select.same.appearanceAttribute refuses an item that is not a whole number An `item` given as text, a negative or fractional number, a boolean or a list was read as left out, so the command matched the Appearance panel's active item instead. It now fails with "`item` must be a whole number" and leaves the selection as it was; a left-out or null `item` still uses the active item. --- crates/engine/src/cmd/select.rs | 6 +++--- crates/engine/src/tests/styles.rs | 20 ++++++++++++++++++++ docs/mcp.md | 5 ++++- docs/target-app-parity.md | 2 +- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/crates/engine/src/cmd/select.rs b/crates/engine/src/cmd/select.rs index 1675fcc87c..7754ce9346 100644 --- a/crates/engine/src/cmd/select.rs +++ b/crates/engine/src/cmd/select.rs @@ -11,7 +11,7 @@ use super::object::can_align; use super::panelcmds::artboard_at; use super::wand::{fill_of, stroke_of}; use super::{ - CommandSpec, Result, Session, bad, bool_or, checked_id, checked_ids_param, cmd, color_value, has_doc, has_selection, index, ok, str_param, + CommandSpec, Result, Session, bad, bool_or, checked_id, checked_ids_param, cmd, color_value, has_doc, has_selection, index_opt, ok, str_param, switch_or, text_param, }; use crate::DocState; @@ -222,7 +222,7 @@ pub fn specs() -> Vec { "Appearance Attribute", ["Select", "Same"], None, - "{item?: appearance item index} the objects sharing an appearance attribute of the first selected object: its fill or stroke `item` (default: the Appearance panel's active item), else its first effect, else its topmost fill (compound paths as select.same.fillColor)", + "{item?: appearance item index (0-based whole number; default, or null: the Appearance panel's active item)} the objects sharing an appearance attribute of the first selected object: its fill or stroke `item` (default: the Appearance panel's active item), else its first effect, else its topmost fill (compound paths as select.same.fillColor)", has_selection, same_attribute ), @@ -1103,10 +1103,10 @@ enum Attribute { fn same_attribute(s: &mut Session, p: &Value) -> Result { let cmd = "select.same.appearanceAttribute"; + let item = index_opt(p, "item", cmd)?.or(s.appearance_item()); let st = s.doc()?; let (refn, _) = same_reference(st, cmd)?; let ap = &refn.appearance; - let item = p.get("item").and_then(Value::as_u64).map(index).or(s.appearance_item()); let attr = match (item.and_then(|i| ap.items.get(i)), ap.effects.first()) { (Some(it), _) => Attribute::Item(it.clone()), (None, Some(e)) => Attribute::Effect(e.clone()), diff --git a/crates/engine/src/tests/styles.rs b/crates/engine/src/tests/styles.rs index 6f77b58971..e460aeb890 100644 --- a/crates/engine/src/tests/styles.rs +++ b/crates/engine/src/tests/styles.rs @@ -325,6 +325,26 @@ fn select_same_appearance_attribute() { run(&mut s, "select.set", json!({"ids": [a.0]})); run(&mut s, "select.same.appearanceAttribute", json!({"item": (1u64 << 32) + 1})); assert_eq!(s.doc().unwrap().selection.objects, vec![a, b]); + // Null is the default: the shared effect. + run(&mut s, "select.set", json!({"ids": [a.0]})); + run(&mut s, "select.same.appearanceAttribute", json!({"item": null})); + assert_eq!(s.doc().unwrap().selection.objects, vec![a, b]); +} + +/// Select > Same > Appearance Attribute refuses an `item` that is not a whole number and leaves +/// the selection as it was. +#[test] +fn select_same_appearance_attribute_refuses_an_item_that_is_not_a_whole_number() { + let mut s = session(); + let a = rect(&mut s, 10.0); + run(&mut s, "effect.apply", json!({"effect": "distort.roughen"})); + rect(&mut s, 100.0); + run(&mut s, "select.set", json!({"ids": [a.0]})); + for item in [json!("1"), json!(-1), json!(1.5), json!(true), json!([1])] { + let e = s.execute("select.same.appearanceAttribute", &json!({"item": item})).unwrap_err().to_string(); + assert_eq!(e, "invalid parameters for `select.same.appearanceAttribute`: `item` must be a whole number", "{item}"); + assert_eq!(s.doc().unwrap().selection.objects, vec![a], "{item}"); + } } /// With a member path of a compound path selected first, Select > Same > Graphic Style and diff --git a/docs/mcp.md b/docs/mcp.md index b001f720d4..ec350e3a97 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -2785,7 +2785,10 @@ group selected on its own, or, for `symbolInstance`, an object that is not a sym leaves the selection empty. A selected object that is hidden or locked, inside a hidden or locked group or layer, on a template layer, on a locked artboard while nothing is isolated, or outside the isolated group is passed over. New art, such as a symbol instance just placed, is not passed over for being on a locked artboard while it stays selected. When -the selection holds no other object, they return the error "nothing selected". +the selection holds no other object, they return the error "nothing selected". `appearanceAttribute {item?}` takes +the fill or stroke at appearance item `item`, or the Appearance panel's active item when the call gives none or null; a +value that is not a whole number of 0 or more fails with "`item` must be a whole number" and leaves the selection as it +was. `select.object.allOnSameLayers` selects the objects on the layers and sublayers of the selected objects that can be selected. A selected object that is hidden or locked, inside a hidden or locked group or layer, on a template layer, on diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 58096f67b1..d2e7c9fadc 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -1158,7 +1158,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur `path.reshapeSegment`, `object.blend.spine.reshapeSegment`, `path.convertAnchor`, `path.curvatureEdit`, `path.insertAnchor`, `path.moveAnchors`, `path.reshape`, `path.close` and the Pencil, Curvature, Knife, Eraser, Path Eraser, Smooth, Join and Blob Brush commands refuse a number, point or handle given as text, such as "10", and leave the document unchanged; `path.convertAnchor` refuses an `x` without a `y`, or a `y` without an `x`. `path.setHandle`, `path.moveAnchor`, `text.setPathHandle` (`anchor`), `path.insertAnchor` (`segment`), `artboard.reorder`, `library.moveGroup`, `graphicStyle.move` (`to`), `path.appendAnchor`, `path.close`, `path.reverse` (`subpath`) and the ruler origin commands (`artboard`) refuse a value that is not a whole number of 0 or more, such as `"3"` or `2.5`, with `` `anchor` must be a whole number ``, naming the key, instead of reporting it as missing or reading it as the default subpath or artboard; a null `artboard` is artboard 0 (`tests::params::a_malformed_index_is_not_missing_or_its_default`). The artboard commands that take `index`, `indices` or a replayed `selectedArtboards`, the artboard Align and Distribute commands (`artboard`, `activeArtboard`), `edit.newDocumentFromState` (`index`) and Paste in Place, in Front and in Back (`artboard`, `artboards`) report a value that is not a whole number as such, naming the key, and keep `no such artboard`, `no history state N` and the paste range messages for a whole number that names nothing; a null artboard `index` is `missing index`, and an `indices` value that is not a list, an empty list and a malformed entry each have their own message (`tests::panelcmds::artboard_lists_name_the_fault_and_the_key`). - `guide.add` and `select.allOnArtboard` (`artboard`), `select.font` (`scope.artboards`) and `addon.select.byArtboards` (`artboards`) refuse an artboard that is not a whole number of 0 or more, such as `"1"`, `-1`, `1.5` or `true`, naming the key, instead of reporting it as a missing artboard or reading it as artboard 0, and leave the document and selection unchanged; a whole number past the last artboard is still `no such artboard`, and a null or left-out `artboard` keeps its default (`tests::menucmds::guide_add_refuses_an_artboard_that_is_not_a_whole_number`). + `guide.add` and `select.allOnArtboard` (`artboard`), `select.font` (`scope.artboards`) and `addon.select.byArtboards` (`artboards`) refuse an artboard that is not a whole number of 0 or more, such as `"1"`, `-1`, `1.5` or `true`, naming the key, instead of reporting it as a missing artboard or reading it as artboard 0, and leave the document and selection unchanged; a whole number past the last artboard is still `no such artboard`, and a null or left-out `artboard` keeps its default (`tests::menucmds::guide_add_refuses_an_artboard_that_is_not_a_whole_number`). `select.same.appearanceAttribute` refuses such an `item` the same way instead of using the Appearance panel's active item (`tests::styles::select_same_appearance_attribute_refuses_an_item_that_is_not_a_whole_number`). `path.close` and `path.setHandle` (`independent`), `path.moveAnchors` (`patterns`), the Pencil (`closed`, `keepSelected`, `fill`), Curvature (`closed` and a point's `corner`), `path.curvatureEdit` (`corner`), `path.reshapeSegment` (`perpendicular`) and the Blob Brush (`keepSelected`, `mergeOnlySelection`, `merge`) refuse a value other than true, false or null, such as "true", and leave the document unchanged. Direct Selection's marquee selects the frame anchors of area type that lie inside it, and a click on a frame anchor selects that one; Shift toggles them. The selected frame anchors show filled. A drag of one of them moves all of them, the arrow keys nudge them, and the type reflows at its size (`text.reshapeArea`, which takes `items` to move the anchors of several frames in one step), as [Create text](http://web.archive.org/web/20220127090642/https://helpx.adobe.com/illustrator/using/creating-text.html) and [Selecting objects](http://web.archive.org/web/20211230015528/https://helpx.adobe.com/illustrator/using/selecting-objects.html) describe. When the selection also holds other objects, path anchors or ruler guides, or when another change to the document or the selection follows the pick, the type is selected whole. A press on a selected object's centre point (Attributes panel › Show Center) selects the object whole, and a drag from it moves the object as one Move, held by that point (#4891; test `the_centre_point_selects_and_moves_the_object_whole`). From 599e1705ce4b74efc65b9433b11ceb3a1c451646 Mon Sep 17 00:00:00 2001 From: dotCooCoo Date: Sat, 14 Nov 2026 20:36:31 -0800 Subject: [PATCH 29/50] PSD: Import Slices brings a file's slices in as user slices on Open and Place Read image resource 1050 (version 6 records and the version 7 and 8 descriptor) and turn each slice the file did not generate automatically into a user slice with its name, type, link, target, message, alternative text, cell text and background color. - document.open takes importSlices (default true) with either layer choice; file.place takes it (default true embedded, false linked; true with link is an error) and moves and scales the slices with the placed art in the same undo step. file.place.info, file.place.queue and document.psdInfo report or pass it. - PSD Import Options gains Import Slices, enabled for a file with slices, independent of the conversion choice, and remembered with the other choices; a file with slices asks even with fewer than two layers. - Slices outside the canvas, and slice data that can't be read, are left out with a warning while the art comes in. Counts, nesting and text lengths read from the file are capped. --- crates/engine/src/cmd/fileio.rs | 4 + crates/engine/src/cmd/fileio/commands.rs | 4 +- crates/engine/src/cmd/fileio/load.rs | 12 + crates/engine/src/cmd/fileio/pdfimport.rs | 10 +- crates/engine/src/cmd/fileio/psdlayers.rs | 9 +- crates/engine/src/cmd/fileio/psdread.rs | 4 +- crates/engine/src/cmd/fileio/psdslices.rs | 398 ++++++++++++++++ .../engine/src/cmd/fileio/tests_psdlayers.rs | 2 +- .../engine/src/cmd/fileio/tests_psdslices.rs | 441 ++++++++++++++++++ crates/engine/src/cmd/place.rs | 101 +++- crates/ui-egui/src/dialogs/psd_import.rs | 163 ++++++- crates/ui-egui/src/io/open.rs | 6 +- crates/ui-egui/src/place.rs | 5 +- crates/ui-egui/src/state.rs | 2 +- docs/file-format-parity.md | 4 +- docs/mcp.md | 43 +- docs/target-app-parity.md | 3 +- 17 files changed, 1145 insertions(+), 66 deletions(-) create mode 100644 crates/engine/src/cmd/fileio/psdslices.rs create mode 100644 crates/engine/src/cmd/fileio/tests_psdslices.rs diff --git a/crates/engine/src/cmd/fileio.rs b/crates/engine/src/cmd/fileio.rs index d1bfb9b0a4..66dd37a168 100644 --- a/crates/engine/src/cmd/fileio.rs +++ b/crates/engine/src/cmd/fileio.rs @@ -54,6 +54,7 @@ pub mod ppi; pub mod progress; mod psdlayers; pub mod psdread; +mod psdslices; mod pxrread; mod save; mod screens; @@ -94,6 +95,7 @@ pub use native::with_compression_pref; pub use pdfimport::{LoadOptions, page_document}; pub(crate) use psdlayers::import_active as psd_layers; pub use psdlayers::{PsdInfo, info as psd_info}; +pub(crate) use psdslices::over as psd_slices; pub(crate) use save::job_for; pub(crate) use save::save as save_document; pub use save::{ @@ -240,6 +242,8 @@ mod tests_psd; mod tests_psdlayers; #[cfg(test)] mod tests_psdread; +#[cfg(test)] +mod tests_psdslices; #[cfg(test)] mod tests_heifread; diff --git a/crates/engine/src/cmd/fileio/commands.rs b/crates/engine/src/cmd/fileio/commands.rs index a1281ba110..3b61608a75 100644 --- a/crates/engine/src/cmd/fileio/commands.rs +++ b/crates/engine/src/cmd/fileio/commands.rs @@ -9,7 +9,7 @@ pub fn specs() -> Vec { "Open Document", [], None, - "{path | name | dataBase64 (a file's path, or its name with its bytes), pages?: \"2-3, 5\" (PDF/.ai: 1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds; trim: the bleed box round it becomes the document's bleed; a PDF-compatible .ai or a PDF saved with its editing data opens on its trim boxes for crop), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, lines wrapped in a frame as area type where they lay out the same, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page; a PSD file's layers become layers holding their pixels, with their names, visibility, opacity and blend modes, groups as layers of sublayers, layer masks as opacity masks, clipped layers and layers in blend modes VectorCraft doesn't have merged with the layers below) | false (one layer per page, without the art that is off; Save then asks for a name; a PSD file opens as its merged image), hiddenLayers?: false (a PSD file's hidden layers come in hidden instead of being left out), editingData?: true (default: an EPS, .ai or PDF that carries its editor's own copy of the art opens from it, with its layers, hidden objects, guides, artboards and the art outside them; a .ai or PDF whose type shows opens from its PDF part with textAs: outlines) | \"always\" (as true, and a .ai's editing copy is used even where it draws differently from its PDF part, which can be older; the warnings say so) | false (only what its page or PDF part prints, for print pipelines; a .ai saved without PDF compatibility then can't be opened), legacyNameEncoding?: windows-1252 (default) | macintosh | windows-949 (also euc-kr) | shift_jis | gbk | big5 (the code page names in the editing data of a .ai or an EPS are read in when they aren't UTF-8: layers, objects, artboards, colors, gradients, patterns, graphic styles, swatches, brushes, symbols, variables and data sets, and data sets' text values; warnings list the first three such names as read, and count the rest), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), grays?: as file.documentColorMode, dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} (DXF), crop?: as cropTo (its older name), linkPages?: false (true: each page `pages` picks of a PDF or PDF-compatible .ai opens as a placed document linked to that page of the file, as file.place with link places one, on an artboard of its cropTo box (bounding: its art's bounds), in a row, and a layer named after the page; links.embed makes a page editable art; refused for any other file, without a path, with a password or with textAs: outlines; Save then asks for a name), importer?: \"plugin.\" (an importer plug-in's format id, see document.formats: it opens the file, which must have an extension it lists, also one a built-in format reads), params?: {…} (the importer's own parameters, see plugin.info)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its size at the resolution it declares, as file.place sizes it; 72 ppi, 1 px = 1 pt, when it declares none), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), PICT .pct/.pic/.pict (QuickDraw versions 1 and 2, with or without the file's 512-byte header: one artboard, the picture's frame; shapes, lines and regions as paths, text as point type, bitmaps, pixel maps and QuickTime JPEG images as images; what isn't read is listed in warnings), HP-GL plot files .plt/.hpgl/.hgl/.hpg (one artboard round the art; what isn't drawn is listed in warnings), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwork is imported and the first warning says why. Templates (native templates, .ait) open as a new untitled document; a restored .ai keeps its path (Save writes .ai again) and opens on the artboard its editing copy names as active. A file that no built-in format reads, by its content or its extension, opens with the installed importer plug-in that lists its extension (the one whose id sorts first, when several do): it is given the file, at most 128 MiB, and its objects become a new document whose artboard is their bounds; Save then asks for a name, and the warnings are the importer's. Linked images are read from their files (looked for at their path, then relative to the document): missing ones show their saved preview (links.relink), modified ones are read again only with Preferences › Update Links: Automatically (else links.update). An SVG's files (relative links from the SVG's folder) stay linked, SVG files become art, missing ones a placeholder in their box (a warning and missingLinks). An SVG's variable data (SVG Options › Include Variable Data, a variableSets element) gives the document its text variables and data sets, each text variable bound to the type object its docRef names, unless the SVG restores the native document; variable data variable.loadLibrary would refuse is left out with a warning", + "{path | name | dataBase64 (a file's path, or its name with its bytes), pages?: \"2-3, 5\" (PDF/.ai: 1-based, default all; one artboard each) | page?: n, cropTo?: bounding|art|crop (default)|trim|bleed|media (the box each artboard gets; bounding: the art's bounds; trim: the bleed box round it becomes the document's bleed; a PDF-compatible .ai or a PDF saved with its editing data opens on its trim boxes for crop), password? (encrypted PDFs; see document.pdfInfo), textAs?: text (default: point type per line, lines wrapped in a frame as area type where they lay out the same, in the file's fonts by name; missing ones are listed in warnings) | outlines (glyph paths), layers?: true (default: optional content groups become layers with their visibility, print state and lock — art that is off comes in as a hidden layer; other art goes to a layer per page; a PSD file's layers become layers holding their pixels, with their names, visibility, opacity and blend modes, groups as layers of sublayers, layer masks as opacity masks, clipped layers and layers in blend modes VectorCraft doesn't have merged with the layers below) | false (one layer per page, without the art that is off; Save then asks for a name; a PSD file opens as its merged image), hiddenLayers?: false (a PSD file's hidden layers come in hidden instead of being left out), importSlices?: true (a PSD file's slices become user slices over its canvas, with its layers or its merged image; slices the file generated automatically are left out, and slices that can't be read are left out with a warning), editingData?: true (default: an EPS, .ai or PDF that carries its editor's own copy of the art opens from it, with its layers, hidden objects, guides, artboards and the art outside them; a .ai or PDF whose type shows opens from its PDF part with textAs: outlines) | \"always\" (as true, and a .ai's editing copy is used even where it draws differently from its PDF part, which can be older; the warnings say so) | false (only what its page or PDF part prints, for print pipelines; a .ai saved without PDF compatibility then can't be opened), legacyNameEncoding?: windows-1252 (default) | macintosh | windows-949 (also euc-kr) | shift_jis | gbk | big5 (the code page names in the editing data of a .ai or an EPS are read in when they aren't UTF-8: layers, objects, artboards, colors, gradients, patterns, graphic styles, swatches, brushes, symbols, variables and data sets, and data sets' text values; warnings list the first three such names as read, and count the rest), colorMode?: rgb|cmyk (the mode the document opens in, its colours converted as file.documentColorMode does, grays? as there; default: the file's — a PDF keeps CMYK, Gray and spot inks (spot swatches at a tint) and opens in CMYK when painted mostly in CMYK), grays?: as file.documentColorMode, dxf?: {layout?: \"Model\" (default) | a paper layout's name (document.dxfInfo lists them), unit?, scale? (the ratio: 1 unit of the art = scale drawing units; default: the drawing at 1:1 in its own unit), fit?: false (scale to fit an artboard of fitTo?: [612, 792], turned to the art's orientation), scaleLineweights?: false (lineweights scale with the art), center?: true (false: the drawing's origin on the artboard's bottom-left corner; fitted art's bottom-left corner), mergeLayers?: false (all art on one layer)} (DXF), crop?: as cropTo (its older name), linkPages?: false (true: each page `pages` picks of a PDF or PDF-compatible .ai opens as a placed document linked to that page of the file, as file.place with link places one, on an artboard of its cropTo box (bounding: its art's bounds), in a row, and a layer named after the page; links.embed makes a page editable art; refused for any other file, without a path, with a password or with textAs: outlines; Save then asks for a name), importer?: \"plugin.\" (an importer plug-in's format id, see document.formats: it opens the file, which must have an extension it lists, also one a built-in format reads), params?: {…} (the importer's own parameters, see plugin.info)} → {index, title, format, warnings, restored, missingLinks, modifiedLinks, updatedLinks: [{name, path, ids}]}; any readable format (see document.formats): .vectorcraft/.drawcraft, .svg/.svgz, .pdf/.ai, .ait, ASCII .dxf (each DXF layer with art a layer; blocks symbols; what can't come in is listed in warnings), PNG/JPEG/GIF/WebP/TIFF/BMP (an image opens as a document of its size at the resolution it declares, as file.place sizes it; 72 ppi, 1 px = 1 pt, when it declares none), .emf/.wmf (one artboard, the picture's frame; records VectorCraft doesn't read are skipped with one warning), PICT .pct/.pic/.pict (QuickDraw versions 1 and 2, with or without the file's 512-byte header: one artboard, the picture's frame; shapes, lines and regions as paths, text as point type, bitmaps, pixel maps and QuickTime JPEG images as images; what isn't read is listed in warnings), HP-GL plot files .plt/.hpgl/.hgl/.hpg (one artboard round the art; what isn't drawn is listed in warnings), .eps and PostScript .ai (one artboard, the bounding box: an EPS file VectorCraft wrote restores the document it carries, restored: true; other files are read by a PostScript interpreter — paths, colours and spot inks, clips, gradients, images, type in the fonts named — and come in as their TIFF preview, with a warning, when their PostScript can't be read). A PDF/.ai/.ait or SVG saved with Preserve Editing restores the native document it carries (restored: true; a PDF only when no pages are picked), unless the file was changed elsewhere since or the data can't be read: then its artwork is imported and the first warning says why. Templates (native templates, .ait) open as a new untitled document; a restored .ai keeps its path (Save writes .ai again) and opens on the artboard its editing copy names as active. A file that no built-in format reads, by its content or its extension, opens with the installed importer plug-in that lists its extension (the one whose id sorts first, when several do): it is given the file, at most 128 MiB, and its objects become a new document whose artboard is their bounds; Save then asks for a name, and the warnings are the importer's. Linked images are read from their files (looked for at their path, then relative to the document): missing ones show their saved preview (links.relink), modified ones are read again only with Preferences › Update Links: Automatically (else links.update). An SVG's files (relative links from the SVG's folder) stay linked, SVG files become art, missing ones a placeholder in their box (a warning and missingLinks). An SVG's variable data (SVG Options › Include Variable Data, a variableSets element) gives the document its text variables and data sets, each text variable bound to the type object its docRef names, unless the SVG restores the native document; variable data variable.loadLibrary would refuse is left out with a warning", always, load::open ), @@ -144,7 +144,7 @@ pub fn specs() -> Vec { "PSD Info", [], None, - "{path} or {name?, dataBase64} what a PSD or PSB file holds, read from its header and layer records without decoding pixels → {format: psd|psb, width, height (the canvas, px), layers (group markers not counted), hiddenLayers (the hidden ones among them), groups}; a file without layer records, or whose layer records can't be read, has layers: 0 and opens and places as its merged image; a file that is not a PSD or PSB file is an error", + "{path} or {name?, dataBase64} what a PSD or PSB file holds, read from its header, slices and layer records without decoding pixels → {format: psd|psb, width, height (the canvas, px), layers (group markers not counted), hiddenLayers (the hidden ones among them), groups, slices (those importSlices brings in; 0 when the file has none or they can't be read)}; a file without layer records, or whose layer records can't be read, has layers: 0 and opens and places as its merged image; a file that is not a PSD or PSB file is an error", always, psdlayers::psd_info ), diff --git a/crates/engine/src/cmd/fileio/load.rs b/crates/engine/src/cmd/fileio/load.rs index 77d55b5733..b3d7040be5 100644 --- a/crates/engine/src/cmd/fileio/load.rs +++ b/crates/engine/src/cmd/fileio/load.rs @@ -534,6 +534,18 @@ pub fn load_with(name: &str, bytes: &[u8], opts: &LoadOptions) -> Result _ if format.raster => (raster_doc(&title, bytes)?, vec![], false), _ => return Err(err(format!("{} files can't be opened yet", format.label))), }; + // A PSD or PSB file's slices become user slices over its canvas (`importSlices`, default on), + // whether its layers or its merged image came in. + if matches!(format.id, "psd" | "psb") + && opts.import_slices + && let Some(canvas) = doc.artboards.first().map(|a| a.rect) + { + let (slices, notes) = super::psd_slices(bytes, canvas); + for (rect, options) in slices { + crate::cmd::slices::add_slice(&mut doc, rect, options); + } + warnings.extend(notes); + } // A PDF, `.ai` or `.ait` read from its pages or its editing copy, not restored from the document // it carries, opens with the File Info it gives (a PostScript `.ai` gives none). if matches!(format.id, "pdf" | "ai" | "ait") diff --git a/crates/engine/src/cmd/fileio/pdfimport.rs b/crates/engine/src/cmd/fileio/pdfimport.rs index b0f08ca4c5..36787f1f3f 100644 --- a/crates/engine/src/cmd/fileio/pdfimport.rs +++ b/crates/engine/src/cmd/fileio/pdfimport.rs @@ -36,6 +36,8 @@ pub struct LoadOptions { pub layers: bool, /// A PSD or PSB file's hidden layers come in, hidden (`hiddenLayers`; else they are left out). pub hidden_layers: bool, + /// A PSD or PSB file's slices become user slices (`importSlices`; else they are left out). + pub import_slices: bool, /// How a DXF drawing comes in (the `dxf` param, see [`super::dxfimport`]). pub dxf: vectorcraft_cad::ImportOptions, /// An Illustrator EPS or `.ai` that carries the editing copy of its art opens from it (its @@ -67,6 +69,7 @@ impl Default for LoadOptions { text_as: TextAs::default(), layers: true, hidden_layers: false, + import_slices: true, dxf: Default::default(), editing_data: true, trust_editing_data: false, @@ -81,7 +84,7 @@ impl LoadOptions { /// From command params: `pages` (`"2-3, 5"`, a page number or `"all"`), `page` (one page, when /// `pages` isn't given), `cropTo` (or `crop`), `password`, `colorMode` (`rgb` | `cmyk`) with `grays`, /// `textAs` (`text` | `outlines`), `layers` (true | false), `hiddenLayers` (true | false), - /// `editingData` (true | false | `always`), + /// `importSlices` (true | false), `editingData` (true | false | `always`), /// `legacyNameEncoding` (one of [`vectorcraft_eps::NameEncoding::LABELS`]), `linkPages` (true | /// false) and `dxf` (the DXF import options). pub fn from_params(cmd: &str, p: &Value) -> Result { @@ -111,6 +114,10 @@ impl LoadOptions { None => false, Some(v) => v.as_bool().ok_or_else(|| bad(cmd, "hiddenLayers must be true or false"))?, }; + let import_slices = match p.get("importSlices").filter(|v| !v.is_null()) { + None => true, + Some(v) => v.as_bool().ok_or_else(|| bad(cmd, "importSlices must be true or false"))?, + }; let (editing_data, trust_editing_data) = match p.get("editingData").filter(|v| !v.is_null()) { None => (true, false), Some(Value::String(s)) if s.eq_ignore_ascii_case("always") => (true, true), @@ -137,6 +144,7 @@ impl LoadOptions { text_as, layers, hidden_layers, + import_slices, dxf, editing_data, trust_editing_data, diff --git a/crates/engine/src/cmd/fileio/psdlayers.rs b/crates/engine/src/cmd/fileio/psdlayers.rs index 5497edebae..ea5cf63aa2 100644 --- a/crates/engine/src/cmd/fileio/psdlayers.rs +++ b/crates/engine/src/cmd/fileio/psdlayers.rs @@ -1551,10 +1551,13 @@ pub struct PsdInfo { pub hidden: usize, /// The layer groups. pub groups: usize, + /// The slices that come in with `importSlices` (those generated automatically, and those + /// outside the canvas, left out). + pub slices: usize, } -/// What PSD or PSB file `bytes` holds, read from its header and layer records without decoding any -/// pixels. A file without layer records, or whose layer records can't be read, has no layers: it +/// What PSD or PSB file `bytes` holds, read from its header, its slices and its layer records +/// without decoding any pixels. A file without layer records, or whose layer records can't be read, has no layers: it /// opens and places as its merged image. pub fn info(bytes: &[u8]) -> Result { let mut r = Reader::new(bytes); @@ -1568,6 +1571,7 @@ pub fn info(bytes: &[u8]) -> Result { layers: layers.clone().count(), hidden: layers.filter(|r| r.hidden).count(), groups: records.iter().filter(|r| matches!(r.divider, 1 | 2)).count(), + slices: super::psdslices::count(bytes), }) } @@ -1584,5 +1588,6 @@ pub(super) fn psd_info(_: &mut Session, p: &Value) -> crate::cmd::Result "layers": i.layers, "hiddenLayers": i.hidden, "groups": i.groups, + "slices": i.slices, })) } diff --git a/crates/engine/src/cmd/fileio/psdread.rs b/crates/engine/src/cmd/fileio/psdread.rs index 28b44d6197..ed9f08a731 100644 --- a/crates/engine/src/cmd/fileio/psdread.rs +++ b/crates/engine/src/cmd/fileio/psdread.rs @@ -105,7 +105,7 @@ pub(super) struct Header<'a> { /// Colour mode data: an indexed image's palette (256 reds, then greens, then blues). palette: &'a [u8], /// The image resources. - resources: &'a [u8], + pub(super) resources: &'a [u8], /// The layer and mask information. pub(super) layers: &'a [u8], } @@ -172,7 +172,7 @@ pub fn resolution(bytes: &[u8]) -> Option<(f64, f64)> { /// The image resource blocks of `resources`, in file order: each one's id, name (the bytes of its /// Pascal string) and data. Stops at the first block that is cut short. With `signed`, only the /// blocks whose signature is `8BIM` are given. -fn resources(resources: &[u8], signed: bool) -> impl Iterator { +pub(super) fn resources(resources: &[u8], signed: bool) -> impl Iterator { let mut r = Reader::new(resources); std::iter::from_fn(move || { if r.rest().is_empty() { diff --git a/crates/engine/src/cmd/fileio/psdslices.rs b/crates/engine/src/cmd/fileio/psdslices.rs new file mode 100644 index 0000000000..f5291c16e5 --- /dev/null +++ b/crates/engine/src/cmd/fileio/psdslices.rs @@ -0,0 +1,398 @@ +//! The slices a Photoshop document (PSD or PSB) stores, for `document.open` and `file.place` +//! with `importSlices`: image resource 1050, read from the "Slices resource format" of Adobe's +//! public Photoshop File Formats Specification +//! (). Version 6 stores the slices +//! as records; versions 7 and 8 store them in a descriptor. The descriptor's keys, and the meaning +//! of the origin, type and background values, are read as the MIT-licensed ag-psd reads them +//! (, `src/imageResources.ts` and `src/descriptor.ts`), +//! which agrees with psd.rb (, +//! `lib/psd/resources/slices.rb`) on the keys both read. +//! +//! A slice the file marks as generated automatically is left out: the document lays out its own +//! auto slices around the others. A slice that follows a layer comes in as a user slice over the +//! rectangle the file stores for it. Each slice keeps its name, its type (Image or No Image), its +//! link, target, message, alternative text, cell text and background color; text alignment isn't +//! read. The file is untrusted: every read is checked, and the slice count, the strings and the +//! descriptor's nesting and item count are capped. + +use vectorcraft_doc::{SliceKind, SliceOptions}; +use vectorcraft_geom::Rect; + +use super::psdread::{Reader, TRUNCATED, header, resources}; + +/// The image resource that holds the slices. +const SLICES: u16 = 1050; + +/// The most slices one file brings in. +const MAX_SLICES: usize = 10_000; + +/// The deepest descriptor objects and lists nest. +const MAX_DEPTH: usize = 16; + +/// The most values one descriptor holds, nested ones included. +const MAX_VALUES: usize = 200_000; + +/// One slice as the file stores it. +#[derive(Clone, Debug, PartialEq)] +struct PsdSlice { + /// Left, top, right and bottom, in the canvas's pixels. + rect: [i64; 4], + options: SliceOptions, +} + +/// The slices a file stores, those generated automatically left out, and its canvas. +struct Stored { + slices: Vec, + /// The canvas's width and height, in pixels. + size: (u32, u32), +} + +/// The slices PSD or PSB file `bytes` stores. `None` when it stores none (no `8BIM` resource 1050 +/// before the image resources end or are cut short). An error when the file isn't a PSD or PSB +/// file, or its slices can't be read. +fn read(bytes: &[u8]) -> Result, String> { + let mut r = Reader::new(bytes); + let h = header(&mut r)?; + let Some((_, _, data)) = resources(h.resources, true).find(|(id, _, _)| *id == SLICES) else { return Ok(None) }; + Ok(Some(Stored { slices: decode(data)?, size: (h.width, h.height) })) +} + +/// The slices of resource 1050's `data`. +fn decode(data: &[u8]) -> Result, String> { + let mut r = Reader::new(data); + match r.u32()? { + 6 => version_6(&mut r), + 7 | 8 => { + if r.u32()? != 16 { + return Err("the slices' descriptor has a version other than 16".into()); + } + let mut budget = MAX_VALUES; + let d = descriptor(&mut r, 0, &mut budget)?; + from_descriptor(&d) + } + v => Err(format!("the slices are stored in version {v}, which isn't read")), + } +} + +/// Version 6: the bounds of all the slices, the group's name, the count, then each slice's record. +fn version_6(r: &mut Reader<'_>) -> Result, String> { + r.take(16)?; + unicode(r)?; + let count = r.u32()? as usize; + if count > MAX_SLICES { + return Err(format!("the file has {count} slices, more than the {MAX_SLICES} read")); + } + let mut out = vec![]; + for _ in 0..count { + // The ID and group ID. + r.take(8)?; + let origin = r.u32()?; + // A slice that follows a layer gives the layer's ID. + if origin == 1 { + r.take(4)?; + } + let name = unicode(r)?; + let kind = if r.u32()? == 0 { SliceKind::NoImage } else { SliceKind::Image }; + let mut rect = [0i64; 4]; + for v in &mut rect { + *v = i64::from(r.u32()? as i32); + } + let (url, target, message, alt) = (unicode(r)?, unicode(r)?, unicode(r)?, unicode(r)?); + let html = r.u8()? != 0; + let cell = unicode(r)?; + // The horizontal and vertical alignment. + r.take(8)?; + let [a, red, green, blue] = r.array::<4>()?; + let background = if a == 0 && red == 0 && green == 0 && blue == 0 { + String::new() + } else if a == 0 { + "matte".into() + } else { + format!("#{red:02x}{green:02x}{blue:02x}") + }; + // Photoshop 7 and later may follow a record with a descriptor (version 16); a record that + // doesn't start one is the next slice. + if r.rest().starts_with(&16u32.to_be_bytes()) { + let mut ahead = Reader::new(r.rest()); + let mut budget = MAX_VALUES; + if ahead.u32().is_ok() && descriptor(&mut ahead, 0, &mut budget).is_ok() { + let used = r.rest().len() - ahead.rest().len(); + r.take(used)?; + } + } + // Origin 0 is a slice generated automatically. + if origin != 0 { + let options = SliceOptions { kind, name, url, target, message, alt, text: cell_text(cell, html), background, ..Default::default() }; + out.push(PsdSlice { rect, options: for_kind(options) }); + } + } + Ok(out) +} + +/// Versions 7 and 8: the descriptor's `slices` list, each slice an object. +fn from_descriptor(d: &[(String, Value)]) -> Result, String> { + let Some(Value::List(list)) = field(d, "slices") else { return Err("the slices' descriptor has no list of slices".into()) }; + if list.len() > MAX_SLICES { + return Err(format!("the file has {} slices, more than the {MAX_SLICES} read", list.len())); + } + let mut out = vec![]; + for s in list { + let Value::Object(s) = s else { return Err("the slices' descriptor lists something other than a slice".into()) }; + if matches!(field(s, "origin"), Some(Value::Enum(_, v)) if v == "autoGenerated") { + continue; + } + let Some(Value::Object(b)) = field(s, "bounds") else { return Err("a slice in the slices' descriptor has no bounds".into()) }; + let edge = |k: &str| number(field(b, k)).ok_or_else(|| "a slice's bounds in the slices' descriptor aren't numbers".to_string()); + let rect = [edge("Left")?, edge("Top ")?, edge("Rght")?, edge("Btom")?]; + let text = |k: &str| match field(s, k) { + Some(Value::Text(t)) => t.clone(), + _ => String::new(), + }; + let kind = if matches!(field(s, "Type"), Some(Value::Enum(_, v)) if v == "noImage") { SliceKind::NoImage } else { SliceKind::Image }; + let html = matches!(field(s, "cellTextIsHTML"), Some(Value::Bool(true))); + let background = match field(s, "bgColorType") { + Some(Value::Enum(_, v)) if v == "matte" => "matte".into(), + Some(Value::Enum(_, v)) if v == "Clr " => match field(s, "bgColor") { + Some(Value::Object(c)) => { + let channel = |k: &str| number(field(c, k)).map(|v| v.clamp(0, 255)); + match (channel("Rd "), channel("Grn "), channel("Bl ")) { + (Some(r), Some(g), Some(b)) => format!("#{r:02x}{g:02x}{b:02x}"), + _ => String::new(), + } + } + _ => String::new(), + }, + _ => String::new(), + }; + let options = SliceOptions { + kind, + name: text("Nm "), + url: text("url"), + target: text("null"), + message: text("Msge"), + alt: text("altTag"), + text: cell_text(text("cellText"), html), + background, + ..Default::default() + }; + out.push(PsdSlice { rect, options: for_kind(options) }); + } + Ok(out) +} + +/// `o` with only the options of its slice type: an Image slice's cell text isn't shown, and a No +/// Image slice has no link, target, message or alternative text. +fn for_kind(mut o: SliceOptions) -> SliceOptions { + if o.kind == SliceKind::Image { + o.text.clear(); + } else { + for s in [&mut o.url, &mut o.target, &mut o.message, &mut o.alt] { + s.clear(); + } + } + o +} + +/// A cell's text as the HTML a No Image slice shows: plain text has `&`, `<` and `>` escaped. +fn cell_text(text: String, html: bool) -> String { + if html { text } else { text.replace('&', "&").replace('<', "<").replace('>', ">") } +} + +/// The longest text one string, key or class ID holds (UTF-16 units or bytes). +const MAX_TEXT: usize = 65_536; + +/// An error unless `n`, the length a string or ID declares, is at most [`MAX_TEXT`]. +fn text_len(n: usize) -> Result { + if n > MAX_TEXT { + return Err(format!("a text in the slices has more than the {MAX_TEXT} characters read")); + } + Ok(n) +} + +/// A Unicode string: a count of UTF-16 units, then the units; trailing NULs dropped. +fn unicode(r: &mut Reader<'_>) -> Result { + let n = text_len(r.u32()? as usize)?; + let bytes = r.take(n.checked_mul(2).ok_or(TRUNCATED)?)?; + let units: Vec = bytes.as_chunks::<2>().0.iter().map(|u| u16::from_be_bytes(*u)).collect(); + Ok(String::from_utf16_lossy(&units).trim_end_matches('\0').to_string()) +} + +/// A descriptor's value, as far as the slices need it. +#[derive(Clone, Debug, PartialEq)] +enum Value { + Long(i32), + Double(f64), + Bool(bool), + Text(String), + /// An enumeration's type and value. + Enum(String, String), + Object(Vec<(String, Value)>), + List(Vec), + /// A value of another type, read past. + Other, +} + +/// The value with key `key`. +fn field<'a>(d: &'a [(String, Value)], key: &str) -> Option<&'a Value> { + d.iter().find(|(k, _)| k == key).map(|(_, v)| v) +} + +/// A whole number: a long, or a finite double rounded. +fn number(v: Option<&Value>) -> Option { + match v? { + Value::Long(n) => Some(i64::from(*n)), + Value::Double(d) if d.is_finite() && d.abs() < 1e12 => Some(d.round() as i64), + _ => None, + } +} + +/// A key or class ID: a length, then that many characters, or four when the length is 0. +fn id(r: &mut Reader<'_>) -> Result { + let n = text_len(r.u32()? as usize)?; + let b = r.take(if n == 0 { 4 } else { n })?; + Ok(String::from_utf8_lossy(b).into_owned()) +} + +/// A class: its Unicode name, then its ID. +fn class(r: &mut Reader<'_>) -> Result<(), String> { + unicode(r)?; + id(r)?; + Ok(()) +} + +/// A descriptor: its class, the count of its items, then each item's key, type and value. +fn descriptor(r: &mut Reader<'_>, depth: usize, budget: &mut usize) -> Result, String> { + if depth > MAX_DEPTH { + return Err("the slices' descriptor nests too deep".into()); + } + class(r)?; + let count = r.u32()? as usize; + let mut out = vec![]; + for _ in 0..count { + let key = id(r)?; + let kind = r.array::<4>()?; + out.push((key, value(r, &kind, depth, budget)?)); + } + Ok(out) +} + +/// A value of type `kind`. +fn value(r: &mut Reader<'_>, kind: &[u8; 4], depth: usize, budget: &mut usize) -> Result { + *budget = budget.checked_sub(1).ok_or("the slices' descriptor holds too many values")?; + Ok(match kind { + b"long" => Value::Long(r.u32()? as i32), + b"doub" => Value::Double(f64::from_be_bytes(r.array()?)), + b"UntF" => { + r.take(4)?; + Value::Double(f64::from_be_bytes(r.array()?)) + } + b"UnFl" => { + r.take(4)?; + Value::Double(f64::from(f32::from_be_bytes(r.array()?))) + } + b"bool" => Value::Bool(r.u8()? != 0), + b"TEXT" => Value::Text(unicode(r)?), + b"enum" => Value::Enum(id(r)?, id(r)?), + b"Objc" | b"GlbO" => Value::Object(descriptor(r, depth + 1, budget)?), + b"VlLs" => { + if depth >= MAX_DEPTH { + return Err("the slices' descriptor nests too deep".into()); + } + let count = r.u32()? as usize; + let mut items = vec![]; + for _ in 0..count { + let kind = r.array::<4>()?; + items.push(value(r, &kind, depth + 1, budget)?); + } + Value::List(items) + } + b"comp" => { + r.take(8)?; + Value::Other + } + b"type" | b"GlbC" => { + class(r)?; + Value::Other + } + b"tdta" | b"alis" => { + let n = r.u32()? as usize; + r.take(n)?; + Value::Other + } + b"obj " => { + let count = r.u32()? as usize; + for _ in 0..count { + *budget = budget.checked_sub(1).ok_or("the slices' descriptor holds too many values")?; + match &r.array::<4>()? { + b"prop" => { + class(r)?; + id(r)?; + } + b"Clss" => class(r)?, + b"Enmr" => { + class(r)?; + id(r)?; + id(r)?; + } + b"rele" => { + class(r)?; + r.take(4)?; + } + b"Idnt" | b"indx" => { + r.take(4)?; + } + b"name" => { + class(r)?; + unicode(r)?; + } + k => return Err(format!("the slices' descriptor has a reference of an unknown kind ({})", String::from_utf8_lossy(k))), + } + } + Value::Other + } + k => return Err(format!("the slices' descriptor has a value of an unknown type ({})", String::from_utf8_lossy(k))), + }) +} + +/// The slices of PSD or PSB file `bytes` laid over `canvas`, the box its canvas takes (points), +/// each clipped to the canvas, with warnings: for slices that lie wholly outside it or have no +/// size, and for slices that can't be read (the file comes in without them). Empty, without a +/// warning, when the file stores no slices. +pub(crate) fn over(bytes: &[u8], canvas: Rect) -> (Vec<(Rect, SliceOptions)>, Vec) { + match read(bytes) { + Ok(None) => (vec![], vec![]), + Ok(Some(s)) => laid_over(&s.slices, s.size, canvas), + Err(e) => (vec![], vec![format!("the slices can't be read ({e}) and were left out")]), + } +} + +/// `slices` of a canvas of `size` pixels laid over `canvas` (points). +fn laid_over(slices: &[PsdSlice], (w, h): (u32, u32), canvas: Rect) -> (Vec<(Rect, SliceOptions)>, Vec) { + let (sx, sy) = (canvas.width() / f64::from(w.max(1)), canvas.height() / f64::from(h.max(1))); + let mut out = vec![]; + for s in slices { + let [l, t, r, b] = s.rect; + let (l, r) = (l.clamp(0, i64::from(w)), r.clamp(0, i64::from(w))); + let (t, b) = (t.clamp(0, i64::from(h)), b.clamp(0, i64::from(h))); + if l < r && t < b { + let x = |v: i64| canvas.x0 + v as f64 * sx; + let y = |v: i64| canvas.y0 + v as f64 * sy; + out.push((Rect::new(x(l), y(t), x(r), y(b)), s.options.clone())); + } + } + let warnings = match slices.len() - out.len() { + 0 => vec![], + 1 => vec!["1 slice lies outside the canvas or has no size and was left out".to_string()], + n => vec![format!("{n} slices lie outside the canvas or have no size and were left out")], + }; + (out, warnings) +} + +/// How many slices of PSD or PSB file `bytes` come in (`document.psdInfo`): 0 when it stores none +/// or they can't be read. +pub(crate) fn count(bytes: &[u8]) -> usize { + match read(bytes) { + Ok(Some(Stored { slices, size: (w, h) })) => laid_over(&slices, (w, h), Rect::new(0.0, 0.0, f64::from(w), f64::from(h))).0.len(), + _ => 0, + } +} diff --git a/crates/engine/src/cmd/fileio/tests_psdlayers.rs b/crates/engine/src/cmd/fileio/tests_psdlayers.rs index bc56bb483c..298f3d22dc 100644 --- a/crates/engine/src/cmd/fileio/tests_psdlayers.rs +++ b/crates/engine/src/cmd/fileio/tests_psdlayers.rs @@ -1191,7 +1191,7 @@ fn psd_info_counts_the_layers_without_opening_the_file() { let mut s = Session::new(); let info = |s: &mut Session, f: &[u8]| s.execute("document.psdInfo", &json!({"dataBase64": vectorcraft_format::base64_encode(f)})); let r = info(&mut s, &file(8, 8, &stack(), 8, false, false)).unwrap(); - assert_eq!(r, json!({"format": "psd", "width": 8, "height": 8, "layers": 5, "hiddenLayers": 1, "groups": 2})); + assert_eq!(r, json!({"format": "psd", "width": 8, "height": 8, "layers": 5, "hiddenLayers": 1, "groups": 2, "slices": 0})); let r = info(&mut s, &file(4, 2, &[layer("x", [0, 0, 2, 2], [9, 9, 9, 255])], 16, true, true)).unwrap(); assert_eq!((&r["format"], &r["width"], &r["height"], &r["layers"]), (&json!("psb"), &json!(4), &json!(2), &json!(1)), "{r}"); // Layer records that can't be read count as no layers: the file opens as its merged image. diff --git a/crates/engine/src/cmd/fileio/tests_psdslices.rs b/crates/engine/src/cmd/fileio/tests_psdslices.rs new file mode 100644 index 0000000000..0456ebe166 --- /dev/null +++ b/crates/engine/src/cmd/fileio/tests_psdslices.rs @@ -0,0 +1,441 @@ +//! A PSD or PSB file's slices (image resource 1050) opened and placed as user slices +//! (`document.open`'s and `file.place`'s `importSlices`): version 6 records and version 7 and 8 +//! descriptors, built from the Photoshop File Formats Specification's "Slices resource format"; +//! their options, slices outside the canvas, damaged or unknown slice data, placing scaled and +//! moved in one undo step, linked files, and `document.psdInfo`'s count. + +use serde_json::{Value, json}; +use vectorcraft_doc::{SliceKind, SliceOptions}; +use vectorcraft_geom::Rect; + +use crate::Session; + +/// A Unicode string: a count of UTF-16 units, then the units. +fn ustr(s: &str) -> Vec { + let units: Vec = s.encode_utf16().collect(); + let mut b = (units.len() as u32).to_be_bytes().to_vec(); + b.extend(units.iter().flat_map(|u| u.to_be_bytes())); + b +} + +/// One version 6 slice record. +#[derive(Clone)] +struct S { + /// 0: generated automatically, 1: follows a layer, 2: made by the user. + origin: u32, + name: &'static str, + /// 0: No Image, 1: Image. + kind: u32, + /// Left, top, right, bottom (px). + rect: [i32; 4], + url: &'static str, + target: &'static str, + message: &'static str, + alt: &'static str, + html: bool, + cell: &'static str, + /// Alpha, red, green, blue. + argb: [u8; 4], +} + +fn user(name: &'static str, rect: [i32; 4]) -> S { + S { origin: 2, name, kind: 1, rect, url: "", target: "", message: "", alt: "", html: false, cell: "", argb: [0; 4] } +} + +/// Resource 1050 in version 6, each record followed by `trailing` (a Photoshop 7 descriptor, or +/// nothing). +fn v6(slices: &[S], trailing: &[u8]) -> Vec { + let mut b = 6u32.to_be_bytes().to_vec(); + b.extend([0u8; 16]); + b.extend(ustr("group")); + b.extend((slices.len() as u32).to_be_bytes()); + for (i, s) in slices.iter().enumerate() { + b.extend((i as u32 + 1).to_be_bytes()); + b.extend(0u32.to_be_bytes()); + b.extend(s.origin.to_be_bytes()); + if s.origin == 1 { + b.extend(7u32.to_be_bytes()); + } + b.extend(ustr(s.name)); + b.extend(s.kind.to_be_bytes()); + for v in s.rect { + b.extend(v.to_be_bytes()); + } + for t in [s.url, s.target, s.message, s.alt] { + b.extend(ustr(t)); + } + b.push(u8::from(s.html)); + b.extend(ustr(s.cell)); + b.extend([0u8; 8]); + b.extend(s.argb); + b.extend(trailing); + } + b +} + +/// A descriptor value. +enum D { + Long(i32), + Doub(f64), + Bool(bool), + Text(&'static str), + Enum(&'static str, &'static str), + Obj(Vec<(&'static str, D)>), + List(Vec), +} + +/// A key or class ID: a four-character one with length 0, else its length and characters. +fn key(k: &str) -> Vec { + let mut b = if k.len() == 4 { 0u32 } else { k.len() as u32 }.to_be_bytes().to_vec(); + b.extend(k.as_bytes()); + b +} + +/// A descriptor: an empty class name, the class ID, the count, then each item. +fn descriptor(items: &[(&str, D)]) -> Vec { + let mut b = ustr(""); + b.extend(key("null")); + b.extend((items.len() as u32).to_be_bytes()); + for (k, v) in items { + b.extend(key(k)); + b.extend(value(v)); + } + b +} + +/// A value's type, then the value. +fn value(v: &D) -> Vec { + let mut b = vec![]; + match v { + D::Long(n) => { + b.extend(b"long"); + b.extend(n.to_be_bytes()); + } + D::Doub(d) => { + b.extend(b"doub"); + b.extend(d.to_be_bytes()); + } + D::Bool(on) => { + b.extend(b"bool"); + b.push(u8::from(*on)); + } + D::Text(t) => { + b.extend(b"TEXT"); + b.extend(ustr(t)); + } + D::Enum(t, e) => { + b.extend(b"enum"); + b.extend(key(t)); + b.extend(key(e)); + } + D::Obj(items) => { + b.extend(b"Objc"); + b.extend(descriptor(items)); + } + D::List(items) => { + b.extend(b"VlLs"); + b.extend((items.len() as u32).to_be_bytes()); + for i in items { + b.extend(value(i)); + } + } + } + b +} + +/// A bounds object: top, left, bottom and right. +fn bounds(l: i32, t: i32, r: i32, b: i32) -> D { + D::Obj(vec![("Top ", D::Long(t)), ("Left", D::Long(l)), ("Btom", D::Long(b)), ("Rght", D::Long(r))]) +} + +/// Resource 1050 in `version` 7 or 8 holding `slices`. +fn v7(version: u32, slices: Vec) -> Vec { + let mut b = version.to_be_bytes().to_vec(); + b.extend(16u32.to_be_bytes()); + b.extend(descriptor(&[("bounds", bounds(0, 0, 20, 20)), ("baseName", D::Text("poster")), ("slices", D::List(slices))])); + b +} + +/// A 20 × 20 px PSD file written by `document.export`, with its layers (two) or flat. +fn psd(layers: bool) -> Vec { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 20, "height": 20})).unwrap(); + s.execute("paint.setFill", &json!({ "color": "#ff0000" })).unwrap(); + s.execute("shape.rectangle", &json!({"x": 2, "y": 2, "width": 10, "height": 10})).unwrap(); + s.execute("layer.new", &json!({ "name": "Top" })).unwrap(); + s.execute("shape.rectangle", &json!({"x": 8, "y": 8, "width": 10, "height": 10})).unwrap(); + let r = s.execute("document.export", &json!({"format": "psd", "layers": layers})).unwrap(); + vectorcraft_format::base64_decode(r["dataBase64"].as_str().unwrap()).unwrap() +} + +/// `psd` with image resource `id` holding `data` added to its image resources. +fn with_resource(psd: &[u8], id: u16, data: &[u8]) -> Vec { + let u32_at = |at: usize| u32::from_be_bytes(psd[at..at + 4].try_into().unwrap()) as usize; + let colors = 26 + 4 + u32_at(26); + let len = u32_at(colors); + let mut block = b"8BIM".to_vec(); + block.extend(id.to_be_bytes()); + block.extend([0, 0]); + block.extend((data.len() as u32).to_be_bytes()); + block.extend(data); + block.resize(block.len().next_multiple_of(2), 0); + let mut out = psd[..colors].to_vec(); + out.extend(((len + block.len()) as u32).to_be_bytes()); + out.extend(&psd[colors + 4..colors + 4 + len]); + out.extend(block); + out.extend(&psd[colors + 4 + len..]); + out +} + +fn b64(f: &[u8]) -> String { + vectorcraft_format::base64_encode(f) +} + +fn open(f: &[u8], extra: Value) -> (Session, Value) { + let mut s = Session::new(); + let mut p = json!({"name": "poster.psd", "dataBase64": b64(f)}); + for (k, v) in extra.as_object().unwrap() { + p[k] = v.clone(); + } + let r = s.execute("document.open", &p).unwrap(); + (s, r) +} + +/// The document's user slices: rectangle and options. +fn slices(s: &Session) -> Vec<(Rect, SliceOptions)> { + s.doc().unwrap().doc.slices.iter().map(|x| (x.rect, x.options.clone())).collect() +} + +fn warnings(r: &Value) -> Vec { + r["warnings"].as_array().map(|a| a.iter().filter_map(|w| w.as_str().map(str::to_string)).collect()).unwrap_or_default() +} + +#[test] +fn version_6_slices_open_as_user_slices_with_their_options() { + let linked = S { origin: 1, url: "https://example.com/", target: "_blank", message: "Go", alt: "Logo", ..user("logo", [2, 4, 10, 8]) }; + let plain = S { kind: 0, cell: "a < b & c", argb: [0, 0, 0, 0], ..user("note", [10, 10, 20, 20]) }; + let html = S { kind: 0, html: true, cell: "Hi", argb: [255, 0x12, 0x34, 0x56], ..user("", [0, 12, 6, 18]) }; + let matte = S { argb: [0, 1, 2, 3], cell: "ignored", ..user("matte", [12, 0, 18, 6]) }; + let auto = S { origin: 0, ..user("auto", [0, 0, 20, 2]) }; + let data = v6(&[linked, plain, html, matte, auto], &[]); + for layers in [true, false] { + let f = with_resource(&psd(layers), 1050, &data); + // Either conversion brings the slices in; the automatic one stays out. + for p in [json!({}), json!({"layers": false})] { + let (s, r) = open(&f, p); + assert!(warnings(&r).is_empty(), "{r}"); + let got = slices(&s); + assert_eq!(got.len(), 4, "{got:?}"); + assert_eq!(got[0].0, Rect::new(2.0, 4.0, 10.0, 8.0)); + assert_eq!( + got[0].1, + SliceOptions { + kind: SliceKind::Image, + name: "logo".into(), + url: "https://example.com/".into(), + target: "_blank".into(), + message: "Go".into(), + alt: "Logo".into(), + ..Default::default() + } + ); + // Plain cell text is escaped as the HTML a No Image cell shows; HTML stays as it is. + assert_eq!((got[1].1.kind, got[1].1.text.as_str(), got[1].1.background.as_str()), (SliceKind::NoImage, "a < b & c", "")); + assert_eq!((got[2].1.text.as_str(), got[2].1.background.as_str(), got[2].1.name.as_str()), ("Hi", "#123456", "")); + // An Image slice's cell text isn't kept; a background with no alpha is the matte. + assert_eq!((got[3].1.text.as_str(), got[3].1.background.as_str()), ("", "matte")); + // Web output lays them out with auto slices around them. + let layout = s.doc().unwrap().doc.slice_layout(); + assert_eq!(layout.iter().filter(|a| a.source == vectorcraft_doc::SliceSource::User).count(), 4); + assert!(layout.iter().any(|a| a.source == vectorcraft_doc::SliceSource::Auto)); + } + } +} + +#[test] +fn photoshop_7_descriptors_after_version_6_records_are_read_past() { + let trailing = [16u32.to_be_bytes().to_vec(), descriptor(&[("topOutset", D::Long(0))])].concat(); + let f = with_resource(&psd(false), 1050, &v6(&[user("a", [0, 0, 5, 5]), user("b", [5, 5, 10, 10])], &trailing)); + let (s, r) = open(&f, json!({})); + assert!(warnings(&r).is_empty(), "{r}"); + let names: Vec = slices(&s).into_iter().map(|(_, o)| o.name).collect(); + assert_eq!(names, ["a", "b"]); +} + +#[test] +fn version_7_and_8_descriptors_open_as_user_slices() { + let slice = |origin: &'static str, kind: &'static str, l: i32, t: i32, r: i32, b: i32| { + D::Obj(vec![ + ("sliceID", D::Long(1)), + ("groupID", D::Long(0)), + ("origin", D::Enum("ESliceOrigin", origin)), + ("Type", D::Enum("ESliceType", kind)), + ("bounds", bounds(l, t, r, b)), + ("Nm ", D::Text("cell")), + ("url", D::Text("https://example.com/")), + ("null", D::Text("_top")), + ("Msge", D::Text("msg")), + ("altTag", D::Text("alt")), + ("cellTextIsHTML", D::Bool(false)), + ("cellText", D::Text("x>y")), + ("bgColorType", D::Enum("ESliceBGColorType", "Clr ")), + ("bgColor", D::Obj(vec![("Rd ", D::Doub(255.0)), ("Grn ", D::Doub(128.0)), ("Bl ", D::Long(0))])), + ]) + }; + for version in [7, 8] { + let data = v7( + version, + vec![slice("userGenerated", "Img ", 1, 2, 9, 10), slice("autoGenerated", "Img ", 0, 0, 20, 1), slice("layer", "noImage", 10, 10, 15, 15)], + ); + let (s, r) = open(&with_resource(&psd(true), 1050, &data), json!({})); + assert!(warnings(&r).is_empty(), "{r}"); + let got = slices(&s); + assert_eq!(got.len(), 2, "{got:?}"); + assert_eq!(got[0].0, Rect::new(1.0, 2.0, 9.0, 10.0)); + assert_eq!( + got[0].1, + SliceOptions { + name: "cell".into(), + url: "https://example.com/".into(), + target: "_top".into(), + message: "msg".into(), + alt: "alt".into(), + background: "#ff8000".into(), + ..Default::default() + } + ); + assert_eq!((got[1].1.kind, got[1].1.text.as_str(), got[1].1.url.as_str()), (SliceKind::NoImage, "x>y", "")); + } +} + +#[test] +fn import_slices_false_leaves_them_out_and_must_be_a_switch() { + let f = with_resource(&psd(true), 1050, &v6(&[user("a", [0, 0, 5, 5])], &[])); + let (s, _) = open(&f, json!({"importSlices": false})); + assert!(slices(&s).is_empty()); + let mut s = Session::new(); + let e = s.execute("document.open", &json!({"name": "poster.psd", "dataBase64": b64(&f), "importSlices": "yes"})).unwrap_err(); + assert!(e.to_string().contains("importSlices must be true or false"), "{e}"); +} + +#[test] +fn slices_that_cant_be_read_warn_and_the_file_still_opens() { + let good = v6(&[user("a", [0, 0, 5, 5])], &[]); + let mut bad_descriptor = v7(7, vec![]); + bad_descriptor[4..8].copy_from_slice(&15u32.to_be_bytes()); + let cases: Vec<(Vec, &str)> = vec![ + (good[..good.len() - 3].to_vec(), "cut short"), + ([9u32.to_be_bytes().to_vec(), good[4..].to_vec()].concat(), "version 9"), + (bad_descriptor, "version other than 16"), + // The count follows the version, the bounds and the group's name. + ([&good[..34], &u32::MAX.to_be_bytes()[..], &good[38..]].concat(), "more than the 10000 read"), + (v7(8, vec![D::Long(3)]), "other than a slice"), + // A whole record whose name is longer than a slice's text may be. + (v6(&[user("a".repeat(65_537).leak(), [0, 0, 5, 5])], &[]), "more than the 65536 characters read"), + ]; + for (data, why) in cases { + for layers in [true, false] { + let (s, r) = open(&with_resource(&psd(layers), 1050, &data), json!({})); + let w = warnings(&r); + assert!(w.iter().any(|w| w.starts_with("the slices can't be read (") && w.contains(why)), "{why}: {w:?}"); + assert!(slices(&s).is_empty()); + // The art still came in. + assert!(s.doc().unwrap().doc.art_bounds().is_some(), "{why}"); + } + } + // A name of the longest length read comes in. + let longest = v6(&[user("a".repeat(65_536).leak(), [0, 0, 5, 5])], &[]); + let (s, r) = open(&with_resource(&psd(false), 1050, &longest), json!({})); + assert!(warnings(&r).is_empty(), "{r}"); + assert_eq!(slices(&s).first().map(|(_, o)| o.name.len()), Some(65_536)); + // A file without slices opens without a word about them. + let (s, r) = open(&psd(true), json!({})); + assert!(warnings(&r).is_empty() && slices(&s).is_empty(), "{r}"); +} + +#[test] +fn slices_are_clipped_to_the_canvas_and_those_outside_it_are_left_out() { + let data = v6(&[user("over", [-5, -5, 5, 30]), user("out", [25, 0, 30, 5]), user("empty", [4, 4, 4, 9]), user("in", [1, 1, 2, 2])], &[]); + let (s, r) = open(&with_resource(&psd(false), 1050, &data), json!({})); + assert_eq!(warnings(&r), ["2 slices lie outside the canvas or have no size and were left out"]); + let got: Vec<(Rect, String)> = slices(&s).into_iter().map(|(r, o)| (r, o.name)).collect(); + assert_eq!(got, [(Rect::new(0.0, 0.0, 5.0, 20.0), "over".to_string()), (Rect::new(1.0, 1.0, 2.0, 2.0), "in".to_string())]); +} + +#[test] +fn placed_embedded_files_bring_their_slices_with_the_art_in_one_undo_step() { + let data = v6(&[user("a", [0, 0, 10, 10]), user("b", [10, 10, 20, 20])], &[]); + for layers in [false, true] { + let f = with_resource(&psd(layers), 1050, &data); + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 200, "height": 200})).unwrap(); + // Fitted into a 40 pt square at (100, 60): twice the size. + let r = s.execute("file.place", &json!({"name": "poster.psd", "dataBase64": b64(&f), "rect": [100, 60, 40, 40], "layers": layers})).unwrap(); + assert_eq!(r["slices"].as_array().map(Vec::len), Some(2), "{r}"); + let got: Vec = slices(&s).into_iter().map(|(r, _)| r).collect(); + assert_eq!(got, [Rect::new(100.0, 60.0, 120.0, 80.0), Rect::new(120.0, 80.0, 140.0, 100.0)]); + // The placed art stays selected, and one undo takes the art and the slices away. + assert_eq!(s.doc().unwrap().selection.objects.len(), 1); + s.execute("edit.undo", &json!({})).unwrap(); + assert!(slices(&s).is_empty()); + assert!(s.doc().unwrap().doc.art_bounds().is_none()); + // Centered on `at` at 100%. + s.execute("file.place", &json!({"name": "poster.psd", "dataBase64": b64(&f), "at": [100, 100], "layers": layers})).unwrap(); + assert_eq!(slices(&s)[0].0, Rect::new(90.0, 90.0, 100.0, 100.0)); + // `importSlices: false` places the art alone. + let r = s.execute("file.place", &json!({"name": "poster.psd", "dataBase64": b64(&f), "importSlices": false, "layers": layers})).unwrap(); + assert!(r.get("slices").is_none()); + assert_eq!(slices(&s).len(), 2); + } +} + +#[test] +fn linked_files_are_placed_without_their_slices() { + let dir = std::env::temp_dir().join(format!("vc-psd-slices-{}", std::process::id())); + std::fs::create_dir_all(&dir).unwrap(); + let path = dir.join("poster.psd"); + std::fs::write(&path, with_resource(&psd(false), 1050, &v6(&[user("a", [0, 0, 5, 5])], &[]))).unwrap(); + let path = path.to_string_lossy().into_owned(); + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + let r = s.execute("file.place", &json!({ "path": path })).unwrap(); + assert_eq!((&r["linked"], r.get("slices")), (&json!(true), None)); + assert!(slices(&s).is_empty()); + let e = s.execute("file.place", &json!({ "path": path, "importSlices": true })).unwrap_err(); + assert!(e.to_string().contains("importSlices: a linked PSD file is placed as its flat image"), "{e}"); + // Embedded from its path, they come in. + let r = s.execute("file.place", &json!({ "path": path, "link": false })).unwrap(); + assert_eq!((&r["linked"], r["slices"].as_array().map(Vec::len)), (&json!(false), Some(1))); + // file.place.info counts what a place would bring in. + let info = s.execute("file.place.info", &json!({ "path": path, "link": false })).unwrap(); + assert_eq!(info["slices"], json!(1)); + let info = s.execute("file.place.info", &json!({ "path": path })).unwrap(); + assert_eq!(info["slices"], json!(0)); + std::fs::remove_dir_all(&dir).ok(); +} + +#[test] +fn psd_info_counts_the_slices_that_come_in() { + let mut s = Session::new(); + let info = |s: &mut Session, f: &[u8]| s.execute("document.psdInfo", &json!({"dataBase64": b64(f)})).unwrap(); + let data = v6(&[user("a", [0, 0, 5, 5]), S { origin: 0, ..user("auto", [5, 5, 20, 20]) }, user("out", [30, 30, 40, 40])], &[]); + assert_eq!(info(&mut s, &with_resource(&psd(false), 1050, &data))["slices"], json!(1)); + assert_eq!(info(&mut s, &with_resource(&psd(true), 1050, &data[..data.len() - 4]))["slices"], json!(0)); + assert_eq!(info(&mut s, &psd(true))["slices"], json!(0)); +} + +#[test] +fn damaged_slices_never_panic() { + let data = v7(8, vec![D::Obj(vec![("origin", D::Enum("ESliceOrigin", "userGenerated")), ("bounds", bounds(0, 0, 5, 5))])]); + let base = with_resource(&psd(false), 1050, &data); + let start = base.windows(data.len()).position(|w| w == data).unwrap(); + for at in (start - 12..start + data.len()).step_by(3) { + for v in [0u8, 0x7f, 0xff] { + let mut f = base.clone(); + f[at] = v; + let mut s = Session::new(); + let _ = s.execute("document.open", &json!({"name": "poster.psd", "dataBase64": b64(&f)})); + let _ = s.execute("document.psdInfo", &json!({"dataBase64": b64(&f)})); + } + } +} diff --git a/crates/engine/src/cmd/place.rs b/crates/engine/src/cmd/place.rs index 509d46c2e0..6fd5972878 100644 --- a/crates/engine/src/cmd/place.rs +++ b/crates/engine/src/cmd/place.rs @@ -5,7 +5,9 @@ //! the file declares ([`fileio::ppi`]; 72 ppi when it declares none), linked to its file with //! `link` ([`super::links`]). //! - A PSD or PSB file placed with `layers` becomes one group of its layers as objects, embedded -//! ([`fileio::psd_layers`]); otherwise it is an image like any other, its merged image. +//! ([`fileio::psd_layers`]); otherwise it is an image like any other, its merged image. An +//! embedded one brings its slices in as user slices, placed with its art (`importSlices`, +//! [`fileio::psd_slices`]). //! - An SVG becomes one group of its art; so does a DXF drawing, read with the DXF options //! (`dxf`, [`fileio::dxfimport`]), and an HP-GL plot file (`vectorcraft_cad::hpgl`). //! - An EMF, WMF or PICT picture becomes one group, clipped to its frame (`crop: "crop"`) or @@ -47,7 +49,7 @@ use std::sync::Arc; use serde_json::{Value, json}; use vectorcraft_color::Paint; -use vectorcraft_doc::{Appearance, Document, ImageObject, LinkInfo, Node, NodeId, NodeKind, PageBox, Scaling, SymbolBoxes}; +use vectorcraft_doc::{Appearance, Document, ImageObject, LinkInfo, Node, NodeId, NodeKind, PageBox, Scaling, SliceOptions, SymbolBoxes}; use vectorcraft_geom::{Affine, Point, Rect, shapes}; use vectorcraft_pdf::CropTo; @@ -77,7 +79,7 @@ pub fn specs() -> Vec { "Place…", ["File"], Some("Cmd+Shift+P"), - "{path | name | dataBase64 (a file's path, or its name with its bytes), link?: true (a raster image keeps its file's path; a VectorCraft document at path becomes one locked placed document showing artboard `page`, linked to the file and read again when it changes (links.update; saving it in this app updates it at once), drawn as vectors in every output; so does a PDF/.ai page at path, showing its `crop` box, unless password or textAs: \"outlines\" is given; false: an editable copy of its art, as from dataBase64; other files are embedded), text?: {characterSet?: \"unicode\" (UTF-8, or UTF-16 with a byte-order mark, or without one by dataset.import's rule: an even length, at least half of its two-byte units holding a NUL byte, the byte order that reads a line break, valid UTF-16 with no NUL character; other bytes as the platform's 8-bit set) | \"ansi\" (the platform's 8-bit set), platform?: \"windows\" (Windows-1252) | \"mac\" (Mac Roman), removeLineReturns?: false (each block of lines becomes one paragraph; blank lines end paragraphs), removeParagraphReturns?: false (drop blank lines), replaceSpaces?: n (runs of n ≥ 2 spaces become a tab)} (a .txt file, placed as area type filling rect, the replaced object's bounds, or else the artboard less a 36 pt margin), template?: false (onto a new locked template layer below the current layer), replace?: false (swap the one selected object, keeping its stacking place and transform; no at/rect; refused while an object of a symbol instance's art is selected), at?: [x, y] centre (default: the first artboard's centre), rect?: [x, y, width, height] fit inside; aspect kept (wins over at), page?: 1 (PDF/.ai page, or a native document's artboard), crop?: \"crop\" (clipped to that page or artboard, default; an SVG, only when given: framed and clipped by its viewBox, else by its art's bounds) | \"bounding\" (the bounds of the art that shows, with its strokes and effects, as an export measures them: hidden objects and guides left out) | \"art\" | \"trim\" | \"bleed\" | \"media\" (a PDF page's boxes), password? (an encrypted PDF), layers?: false (a PSD or PSB file: true embeds its layers as one group named after the file, read as document.open reads them: an image for each layer and a group for each layer group, with the layer's name, visibility, opacity, blend mode and opacity mask, at the place its merged image would take and clipped to the canvas when layers, hidden ones included, reach past it; never linked: link is then false unless given, and link: true is refused; a file without layers is embedded as its merged image, and so are one whose layers are all left out and one whose layers can't be read, with a warning), hiddenLayers?: false (with layers: true, the hidden layers come in hidden instead of being left out; refused without it), dxf?: {…the DXF options of document.open} (a .dxf drawing: fit fills the artboard under at, else the first; fitted or uncentred art lands with its drawing's artboard on that artboard, else it is centred on at)} → {ids, name, format, linked, width, height, warnings, image?: the id of the image of a DCS file or PSD/PSB file placed in a clip group, which the Links commands take}. A PSD or PSB file that names a clipping path places in a clip group of that path (even-odd), as does its merged image in document.open. Raster images come in at 100% of their physical size (the file's ppi, else 72); SVG, DXF, HP-GL (.plt, .hpgl, .hgl, .hpg), PDF/.ai, EMF/WMF and PICT (.pct, .pic, .pict; clipped to the picture's frame), EPS (clipped to its bounding box; as document.open reads it), a .ai saved without PDF compatibility (from its editing data, as document.open reads it: the art of the layers that show on artboard `page`, clipped to that artboard unless crop is \"bounding\") and native documents as one group, with the images, symbols, patterns, swatches and brushes they use. A DCS file (an EPS file with one program per printing plate, DCS 1.0 or 2.0) is placed only from its path with link (else an error, as are document.open and links.embed): one linked image of its plates mixed into CMYK, clipped by the clipping path its composite is drawn through, its spot plates added as spot swatches in the process equivalents the file gives (a swatch of the same name is kept, with a warning); print separations and Separations Preview show each plate on its own ink, and plate files of their own are read from its folder. One undo step; selects what it placed (unless on a template layer); never touches the clipboard. A PNG, JPEG, GIF or WebP image whose pixels can't be read (a file cut short) is an error, and nothing is placed", + "{path | name | dataBase64 (a file's path, or its name with its bytes), link?: true (a raster image keeps its file's path; a VectorCraft document at path becomes one locked placed document showing artboard `page`, linked to the file and read again when it changes (links.update; saving it in this app updates it at once), drawn as vectors in every output; so does a PDF/.ai page at path, showing its `crop` box, unless password or textAs: \"outlines\" is given; false: an editable copy of its art, as from dataBase64; other files are embedded), text?: {characterSet?: \"unicode\" (UTF-8, or UTF-16 with a byte-order mark, or without one by dataset.import's rule: an even length, at least half of its two-byte units holding a NUL byte, the byte order that reads a line break, valid UTF-16 with no NUL character; other bytes as the platform's 8-bit set) | \"ansi\" (the platform's 8-bit set), platform?: \"windows\" (Windows-1252) | \"mac\" (Mac Roman), removeLineReturns?: false (each block of lines becomes one paragraph; blank lines end paragraphs), removeParagraphReturns?: false (drop blank lines), replaceSpaces?: n (runs of n ≥ 2 spaces become a tab)} (a .txt file, placed as area type filling rect, the replaced object's bounds, or else the artboard less a 36 pt margin), template?: false (onto a new locked template layer below the current layer), replace?: false (swap the one selected object, keeping its stacking place and transform; no at/rect; refused while an object of a symbol instance's art is selected), at?: [x, y] centre (default: the first artboard's centre), rect?: [x, y, width, height] fit inside; aspect kept (wins over at), page?: 1 (PDF/.ai page, or a native document's artboard), crop?: \"crop\" (clipped to that page or artboard, default; an SVG, only when given: framed and clipped by its viewBox, else by its art's bounds) | \"bounding\" (the bounds of the art that shows, with its strokes and effects, as an export measures them: hidden objects and guides left out) | \"art\" | \"trim\" | \"bleed\" | \"media\" (a PDF page's boxes), password? (an encrypted PDF), layers?: false (a PSD or PSB file: true embeds its layers as one group named after the file, read as document.open reads them: an image for each layer and a group for each layer group, with the layer's name, visibility, opacity, blend mode and opacity mask, at the place its merged image would take and clipped to the canvas when layers, hidden ones included, reach past it; never linked: link is then false unless given, and link: true is refused; a file without layers is embedded as its merged image, and so are one whose layers are all left out and one whose layers can't be read, with a warning), hiddenLayers?: false (with layers: true, the hidden layers come in hidden instead of being left out; refused without it), importSlices?: bool (a PSD or PSB file: its slices become user slices, moved and scaled with the placed art, in the same undo step; default true when the file is embedded, false when it is linked, and true with link is refused; slices the file generated automatically are left out), dxf?: {…the DXF options of document.open} (a .dxf drawing: fit fills the artboard under at, else the first; fitted or uncentred art lands with its drawing's artboard on that artboard, else it is centred on at)} → {ids, name, format, linked, width, height, warnings, image?: the id of the image of a DCS file or PSD/PSB file placed in a clip group, which the Links commands take, slices?: [the ids of the user slices a PSD file brought in]}. A PSD or PSB file that names a clipping path places in a clip group of that path (even-odd), as does its merged image in document.open. Raster images come in at 100% of their physical size (the file's ppi, else 72); SVG, DXF, HP-GL (.plt, .hpgl, .hgl, .hpg), PDF/.ai, EMF/WMF and PICT (.pct, .pic, .pict; clipped to the picture's frame), EPS (clipped to its bounding box; as document.open reads it), a .ai saved without PDF compatibility (from its editing data, as document.open reads it: the art of the layers that show on artboard `page`, clipped to that artboard unless crop is \"bounding\") and native documents as one group, with the images, symbols, patterns, swatches and brushes they use. A DCS file (an EPS file with one program per printing plate, DCS 1.0 or 2.0) is placed only from its path with link (else an error, as are document.open and links.embed): one linked image of its plates mixed into CMYK, clipped by the clipping path its composite is drawn through, its spot plates added as spot swatches in the process equivalents the file gives (a swatch of the same name is kept, with a warning); print separations and Separations Preview show each plate on its own ink, and plate files of their own are read from its folder. One undo step; selects what it placed (unless on a template layer); never touches the clipboard. A PNG, JPEG, GIF or WebP image whose pixels can't be read (a file cut short) is an error, and nothing is placed", has_doc, place ), @@ -86,7 +88,7 @@ pub fn specs() -> Vec { "Placed File Info", [], None, - "{path | name | dataBase64 (a file's path, or its name with its bytes), page?, crop?, password?, thumbnail?: px, link?: bool, dxf?: {…}, layers?, hiddenLayers? (all as file.place)} what file.place would place, without placing it → {name, format, width, height (pt at 100%), pixelWidth?, pixelHeight?, ppi?: [x, y], colorMode?: RGB|Grayscale|CMYK (raster images), plates?: [ink names] (a DCS file), warnings, thumbnailBase64?: PNG of at most `thumbnail` (≤ 512) px on its longer side}", + "{path | name | dataBase64 (a file's path, or its name with its bytes), page?, crop?, password?, thumbnail?: px, link?: bool, dxf?: {…}, layers?, hiddenLayers?, importSlices? (all as file.place)} what file.place would place, without placing it → {name, format, width, height (pt at 100%), pixelWidth?, pixelHeight?, ppi?: [x, y], colorMode?: RGB|Grayscale|CMYK (raster images), plates?: [ink names] (a DCS file), slices?: the user slices a PSD or PSB file would bring in, warnings, thumbnailBase64?: PNG of at most `thumbnail` (≤ 512) px on its longer side}", always, info ), @@ -104,7 +106,7 @@ pub fn specs() -> Vec { "Load Place Cursor", [], None, - "{paths?: [path…], files?: [{name, dataBase64}…], link?, template?, page?, crop?, text?, dxf?, layers?, hiddenLayers?, thumbnail?: px} load the place cursor (the `place` tool) with up to 100 files (as file.place reads them): a click places the current file at 100% with its top-left corner there, a drag places it at the dragged size (aspect kept), ←/→ and ↑/↓ cycle the files, Esc discards the current one; each placement is a file.place, and the previous tool returns after the last → {count, files: [{name, format, width, height, thumbnailBase64?}], skipped: [{name, error}]}", + "{paths?: [path…], files?: [{name, dataBase64}…], link?, template?, page?, crop?, text?, dxf?, layers?, hiddenLayers?, importSlices?, thumbnail?: px} load the place cursor (the `place` tool) with up to 100 files (as file.place reads them): a click places the current file at 100% with its top-left corner there, a drag places it at the dragged size (aspect kept), ←/→ and ↑/↓ cycle the files, Esc discards the current one; each placement is a file.place, and the previous tool returns after the last → {count, files: [{name, format, width, height, thumbnailBase64?}], skipped: [{name, error}]}", has_doc, queue ), @@ -150,16 +152,33 @@ struct Loaded { board: Option, } +/// A PSD or PSB file's slices, embedded with `importSlices`: their rectangles over the natural box +/// of its art, and their options. +type Slices = Vec<(Rect, SliceOptions)>; + /// Points per pixel of a raster image at the resolution it declares (72 ppi when none). pub(crate) fn pt_per_px(ppi: Option<(f64, f64)>) -> (f64, f64) { let (x, y) = ppi.unwrap_or((72.0, 72.0)); (72.0 / x, 72.0 / y) } +/// [`load_sliced`] without the slices. +fn load(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result { + load_into(p, cmd, board, link_pdf, &mut vec![]) +} + +/// [`load_into`], with the slices of a PSD or PSB file that `importSlices` brings in. +fn load_sliced(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result<(Loaded, Slices)> { + let mut slices = vec![]; + let l = load_into(p, cmd, board, link_pdf, &mut slices)?; + Ok((l, slices)) +} + /// The file `p` names, read into placeable art; a DXF drawing's Fit to Artboard fills `board` /// (unless the params name their own box). A PDF/.ai page read from a path is placed linked with -/// Link when `link_pdf` (false for the queries, which read it embedded). -fn load(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result { +/// Link when `link_pdf` (false for the queries, which read it embedded). A PSD or PSB file's slices +/// go to `slices`. +fn load_into(p: &Value, cmd: &str, board: Option, link_pdf: bool, slices_out: &mut Slices) -> Result { let src = fileio::source(p, cmd)?; let name = fileio::file_name(src.name); // An Affinity file is recognised by its signature, whatever its name says. @@ -242,11 +261,21 @@ fn load(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result, link_pdf: bool) -> Result match psd_groups(doc) { - Some((art, natural)) => return Ok(Loaded { name, format, art, natural, warnings, link: None, board: None }), + Ok(Some((doc, mut warnings))) => match psd_groups(doc) { + Some((art, natural)) => { + *slices_out = psd_slices(slices_from, natural, &mut warnings); + return Ok(Loaded { name, format, art, natural, warnings, link: None, board: None }); + } // No layer has art: the merged image, embedded. None => unread = warnings, }, @@ -270,7 +302,8 @@ fn load(p: &Value, cmd: &str, board: Option, link_pdf: bool) -> Result = unread.into_iter().chain(fileio::size_note(&img.blob.bytes)).collect(); + *slices_out = psd_slices(slices_from, natural, &mut warnings); let clip = fileio::psdread::clipping_path(&src.bytes); return Ok(Loaded { name, format, art: Art::Image(img, clip), natural, warnings, link, board: None }); } @@ -346,6 +379,15 @@ fn psd_groups(mut doc: Document) -> Option<(Art, Rect)> { Some((Art::Vector { src: Box::new(doc), nodes, clip: past.then_some(canvas) }, canvas)) } +/// The slices of the PSD or PSB file `bytes` (none without it) laid over `canvas`, the natural box +/// of its art; their warnings go to `warnings`. +fn psd_slices(bytes: Option<&[u8]>, canvas: Rect, warnings: &mut Vec) -> Slices { + let Some(bytes) = bytes else { return vec![] }; + let (slices, notes) = fileio::psd_slices(bytes, canvas); + warnings.extend(notes); + slices +} + /// The bounds of `n` and every object inside it, hidden ones included. fn reach(symbols: &SymbolBoxes, n: &Node) -> Option { match n.children() { @@ -611,6 +653,7 @@ pub struct PlaceJob { pub struct PlaceRead { job: PlaceJob, loaded: Loaded, + slices: Slices, } impl PlaceJob { @@ -625,7 +668,7 @@ impl PlaceJob { /// the renderers' image store for the first frame that draws them /// ([`super::links::readable_and_kept`]). pub fn read(self) -> Result { - let mut loaded = load(&self.params, PLACE, self.target, true)?; + let (mut loaded, slices) = load_sliced(&self.params, PLACE, self.target, true)?; let linked = loaded.link.is_some() && bool_or(&self.params, "link", true); match &mut loaded.art { Art::Image(img, _) => { @@ -635,7 +678,7 @@ impl PlaceJob { Art::Dcs(a) => a.img.blob = super::links::readable(a.img.blob.clone(), false, true)?, _ => {} } - Ok(PlaceRead { job: self, loaded }) + Ok(PlaceRead { job: self, loaded, slices }) } } @@ -716,7 +759,7 @@ fn prepare(s: &Session, p: &Value) -> Result { /// Place the file `read` holds in the active document. fn apply(s: &mut Session, read: PlaceRead) -> Result { - let PlaceRead { job: PlaceJob { params, old, target: read_for, .. }, mut loaded } = read; + let PlaceRead { job: PlaceJob { params, old, target: read_for, .. }, mut loaded, slices: read_slices } = read; let p = ¶ms; let template = bool_or(p, "template", false); let at = at_param(p)?; @@ -762,7 +805,22 @@ fn apply(s: &mut Session, read: PlaceRead) -> Result { if let Art::Dcs(a) = &loaded.art { warnings.extend(dcs::swatch_notes(&st.doc, &a.spots)); } - let (id, size) = s.edit("Place", |d, sel| { + // A PSD file's slices move and scale with its art; one that would leave the canvas is left out. + let read_count = read_slices.len(); + let slices: Slices = read_slices + .into_iter() + .filter_map(|(r, o)| { + let corners = [Point::new(r.x0, r.y0), Point::new(r.x1, r.y0), Point::new(r.x0, r.y1), Point::new(r.x1, r.y1)].map(|c| m * c); + let placed = corners.iter().skip(1).fold(Rect::from_points(corners[0], corners[0]), |acc, c| acc.union_pt(*c)); + super::slices::slice_rect_ok(placed).then_some((placed, o)) + }) + .collect(); + match read_count - slices.len() { + 0 => {} + 1 => warnings.push("1 slice would lie outside the canvas and was left out".into()), + n => warnings.push(format!("{n} slices would lie outside the canvas and were left out")), + } + let (id, size, slice_ids) = s.edit("Place", |d, sel| { let node = transformed(build(d, loaded, link), m); let size = node.geometric_bounds_with(&d.symbol_boxes()).unwrap_or_default(); let (into, index) = match old { @@ -775,15 +833,19 @@ fn apply(s: &mut Session, read: PlaceRead) -> Result { None => (parent, usize::MAX), }; let id = d.insert(into, index, node)?; + let slice_ids: Vec = slices.into_iter().map(|(r, o)| super::slices::add_slice(d, r, o).0).collect(); // Template art is locked: nothing to select. if template { sel.clear() } else { sel.set([id]) } - Ok((id, size)) + Ok((id, size, slice_ids)) })?; let mut out = json!({ "ids": [id.0], "name": name, "format": format, "linked": linked, "width": size.width(), "height": size.height(), "warnings": warnings }); + if !slice_ids.is_empty() { + out["slices"] = json!(slice_ids); + } // A DCS, PSD or PSB file clipped by its clipping path: its image, which the Links commands // take. if file_clipped { @@ -887,7 +949,7 @@ fn read_queue(doc: u64, p: Value, queued: Vec) -> Result { let thumbnail = p.get("thumbnail").and_then(Value::as_f64); let (mut entries, mut files, mut skipped) = (vec![], vec![], vec![]); for mut q in queued { - for k in ["link", "template", "page", "crop", "text", "dxf", "layers", "hiddenLayers"] { + for k in ["link", "template", "page", "crop", "text", "dxf", "layers", "hiddenLayers", "importSlices"] { if let Some(v) = p.get(k) { q[k] = v.clone(); } @@ -933,7 +995,7 @@ impl Session { /// desktop the Place dialog's OK with several files does this off the UI thread). pub fn prepare_place_queue(&self, params: &Value) -> Result { has_doc(self).map_err(|why| EngineError::Disabled(QUEUE.into(), why))?; - check_switches(params, &["link", "template", "layers", "hiddenLayers"], QUEUE)?; + check_switches(params, &["link", "template", "layers", "hiddenLayers", "importSlices"], QUEUE)?; check_numbers(params, &["thumbnail"], QUEUE)?; let files = queued_files(params)?; Ok(QueueJob { doc: self.doc()?.uid, params: params.clone(), files }) @@ -1011,7 +1073,7 @@ pub fn read_info(p: &Value) -> Result { check_switches(p, &["link"], "file.place.info")?; check_numbers(p, &["thumbnail"], "file.place.info")?; // A PDF/.ai page linked or not has the same size and art. - let mut l = load(p, "file.place.info", None, false)?; + let (mut l, slices) = load_sliced(p, "file.place.info", None, false)?; let natural = l.natural; let mut out = json!({ "name": l.name, @@ -1020,6 +1082,9 @@ pub fn read_info(p: &Value) -> Result { "height": natural.height(), "warnings": std::mem::take(&mut l.warnings), }); + if matches!(l.format.id, "psd" | "psb") { + out["slices"] = json!(slices.len()); + } if let Art::Image(img, _) = &l.art { let (x, y) = img.ppi.unwrap_or((72.0, 72.0)); out["pixelWidth"] = json!(img.width); diff --git a/crates/ui-egui/src/dialogs/psd_import.rs b/crates/ui-egui/src/dialogs/psd_import.rs index 016d851bbf..108495e2cc 100644 --- a/crates/ui-egui/src/dialogs/psd_import.rs +++ b/crates/ui-egui/src/dialogs/psd_import.rs @@ -1,15 +1,18 @@ -//! PSD Import Options: opening a PSD or PSB file with two or more layers, or placing one -//! without Link, asks whether its layers become objects or one flat image, and whether hidden -//! layers come in +//! PSD Import Options: opening a PSD or PSB file with two or more layers or with slices, or +//! placing one without Link, asks whether its layers become objects or one flat image, whether +//! hidden layers come in, and whether its slices come in (Import Slices, offered only for a file +//! with slices) //! (). //! A linked file shows its flat image, so placing with Link doesn't ask. The two-layer threshold, -//! the starting choices and remembering them are VectorCraft's own. +//! the starting choices, Import Slices applying to both conversions and remembering the choices +//! are VectorCraft's own. //! //! Fields: `mode` (`open` | `place`), `name`, `path?`, `width`, `height` (the canvas, px), -//! `layers` and `hidden` (counts, from `document.psdInfo`), `convert` (`objects` | `flatten`) and -//! `hiddenLayers`. `__place` keeps the other `file.place` params. The file's bytes stay in -//! [`crate::state::UiState::dialog_file`]. OK opens or places the file with `layers` and -//! `hiddenLayers` and remembers both choices for the next file; errors keep the dialog open. +//! `layers`, `hidden` and `slices` (counts, from `document.psdInfo`), `convert` (`objects` | +//! `flatten`), `hiddenLayers` and `importSlices`. `__place` keeps the other `file.place` params. +//! The file's bytes stay in [`crate::state::UiState::dialog_file`]. OK opens or places the file +//! with `layers`, `hiddenLayers` and (for a file with slices) `importSlices`, and remembers the +//! choices for the next file; errors keep the dialog open. use serde_json::{Value, json}; use vectorcraft_engine::cmd::fileio; @@ -33,15 +36,15 @@ pub(super) const SPEC: DialogSpec = DialogSpec { const MIN_LAYERS: usize = 2; /// Open `bytes` (or place them with the `file.place` params `place`) through the dialog when they -/// are a PSD or PSB file with [`MIN_LAYERS`] layers or more; false when they aren't (the loader -/// then opens or places the file, or says why it can't). +/// are a PSD or PSB file with [`MIN_LAYERS`] layers or more, or with slices; false when they aren't +/// (the loader then opens or places the file, or says why it can't). pub fn offer(app: &mut VectorcraftApp, name: &str, bytes: &[u8], path: Option, place: Option<&Value>) -> bool { let Ok(info) = fileio::psd_info(bytes) else { return false }; - if info.layers < MIN_LAYERS { + if info.layers < MIN_LAYERS && info.slices == 0 { return false; } app.ui.dialog_file = Some(DialogFile::new(bytes.to_vec())); - let (layers, hidden) = last_choices(app); + let (layers, hidden, slices) = last_choices(app); let mut fields = json!({ "mode": if place.is_some() { "place" } else { "open" }, "name": name, @@ -49,14 +52,16 @@ pub fn offer(app: &mut VectorcraftApp, name: &str, bytes: &[u8], path: Option bool { offer(app, &name, &bytes, path, Some(p)) } -/// The PSD Import Options chosen last, at first Convert Layers to Objects without hidden layers. -fn last_choices(app: &VectorcraftApp) -> (bool, bool) { +/// The PSD Import Options chosen last (layers, hidden layers, slices), at first Convert Layers to +/// Objects without hidden layers, with Import Slices. +fn last_choices(app: &VectorcraftApp) -> (bool, bool, bool) { let last = |k: &str, default: bool| app.ui.psd_import.get(k).and_then(Value::as_bool).unwrap_or(default); - (last("layers", true), last("hiddenLayers", false)) + (last("layers", true), last("hiddenLayers", false), last("importSlices", true)) } /// Several files placed without Link load the place cursor without asking: the `file.place.queue` /// params `q` take the PSD Import Options chosen last, which apply to each PSD or PSB file among them. pub fn queue_options(app: &VectorcraftApp, q: &mut Value) { - let (layers, hidden) = last_choices(app); + let (layers, hidden, slices) = last_choices(app); q["layers"] = json!(layers); if layers && hidden { q["hiddenLayers"] = json!(true); } + q["importSlices"] = json!(slices); } /// OK: open or place the file with the choices. @@ -94,21 +101,32 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { let file = app.ui.dialog_file.clone().ok_or("the file is no longer loaded")?; let layers = d.str("convert") != "flatten"; let hidden = layers && d.bool("hiddenLayers"); - app.ui.psd_import = json!({ "layers": layers, "hiddenLayers": d.bool("hiddenLayers") }); + // Import Slices is a choice only for a file with slices; otherwise the one made last stays. + let has_slices = d.fields.get("slices").and_then(Value::as_u64).unwrap_or(0) > 0; + let slices = if has_slices { d.bool("importSlices") } else { last_choices(app).2 }; + app.ui.psd_import = json!({ "layers": layers, "hiddenLayers": d.bool("hiddenLayers"), "importSlices": slices }); let r = if d.str("mode") == "place" { let mut p = with_file(d.fields.get("__place"), d, &file); p["layers"] = json!(layers); - if layers { - // Layers are always embedded; a file from bytes may carry the Place dialog's Link. + if layers || has_slices { + // Layers and slices are always embedded; a file from bytes may carry the Place dialog's + // Link. p["link"] = json!(false); } if hidden { p["hiddenLayers"] = json!(true); } + if has_slices { + p["importSlices"] = json!(slices); + } crate::place::run_for_user(app, &p).map(|_| ()) } else { let path = d.fields.get("path").and_then(Value::as_str).map(str::to_string); - io::open_document(app, &d.str("name"), &file.bytes, path, &json!({ "layers": layers, "hiddenLayers": hidden })).map(|_| ()) + let mut p = json!({ "layers": layers, "hiddenLayers": hidden }); + if has_slices { + p["importSlices"] = json!(slices); + } + io::open_document(app, &d.str("name"), &file.bytes, path, &p).map(|_| ()) }; match r { Ok(()) => { @@ -128,6 +146,8 @@ fn confirm(app: &mut VectorcraftApp, d: &Dialog) -> Result { fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { let count = |k: &str| d.fields.get(k).and_then(Value::as_u64).unwrap_or(0); widgets::dim_label(ui, &format!("{} × {} px · {}: {}", count("width"), count("height"), tl!("Layers"), count("layers"))); + // Offered only for a file with slices, with either conversion. + let sliced = count("slices") > 0; ui.add_space(8.0); let convert = d.str("convert") != "flatten"; if widgets::radio(ui, tl!("Convert Layers to Objects"), convert, true) { @@ -143,6 +163,11 @@ fn body(_: &mut VectorcraftApp, ui: &mut egui::Ui, d: &mut Dialog) -> bool { if widgets::radio(ui, tl!("Flatten Layers to a Single Image"), !convert, true) { d.fields.insert("convert".into(), json!("flatten")); } + ui.add_space(8.0); + let on = d.bool("importSlices"); + if widgets::check(ui, tl!("Import Slices"), on && sliced, sliced) { + d.fields.insert("importSlices".into(), json!(!on)); + } false } @@ -330,6 +355,102 @@ mod tests { std::fs::remove_dir_all(&dir).ok(); } + /// `psd` with a slices resource (1050, version 6) holding one user slice over its top-left + /// 10 × 10 px, named "cell". + fn sliced(psd: &[u8]) -> Vec { + let ustr = |s: &str| -> Vec { + let units: Vec = s.encode_utf16().collect(); + let mut b = (units.len() as u32).to_be_bytes().to_vec(); + b.extend(units.iter().flat_map(|u| u.to_be_bytes())); + b + }; + let mut data = 6u32.to_be_bytes().to_vec(); + data.extend([0u8; 16]); + data.extend(ustr("")); + data.extend(1u32.to_be_bytes()); + // ID, group ID, origin (made by the user), name, type (Image), left, top, right, bottom. + data.extend([1u32, 0, 2].iter().flat_map(|v| v.to_be_bytes())); + data.extend(ustr("cell")); + data.extend([1u32, 0, 0, 10, 10].iter().flat_map(|v| v.to_be_bytes())); + // URL, target, message, alt text, cell text is HTML, cell text, alignments, color. + for _ in 0..4 { + data.extend(ustr("")); + } + data.push(0); + data.extend(ustr("")); + data.extend([0u8; 12]); + let u32_at = |at: usize| u32::from_be_bytes(psd[at..at + 4].try_into().unwrap()) as usize; + let colors = 26 + 4 + u32_at(26); + let len = u32_at(colors); + let mut block = b"8BIM".to_vec(); + block.extend(1050u16.to_be_bytes()); + block.extend([0, 0]); + block.extend((data.len() as u32).to_be_bytes()); + block.extend(&data); + block.resize(block.len().next_multiple_of(2), 0); + let mut out = psd[..colors].to_vec(); + out.extend(((len + block.len()) as u32).to_be_bytes()); + out.extend(&psd[colors + 4..colors + 4 + len]); + out.extend(block); + out.extend(&psd[colors + 4 + len..]); + out + } + + fn slice_names(app: &VectorcraftApp) -> Vec { + app.session.doc().unwrap().doc.slices.iter().map(|s| s.options.name.clone()).collect() + } + + #[test] + fn a_file_with_slices_asks_with_import_slices_on_either_conversion() { + let mut s = Session::new(); + s.execute("file.new", &json!({"width": 20, "height": 20})).unwrap(); + s.execute("shape.rectangle", &json!({"x": 2, "y": 2, "width": 10, "height": 10})).unwrap(); + let r = s.execute("document.export", &json!({"format": "psd"})).unwrap(); + // One layer: without slices it opens at once, with them it asks. + let psd = sliced(&vectorcraft_format::base64_decode(r["dataBase64"].as_str().unwrap()).unwrap()); + let mut app = app(); + io::open_bytes(&mut app, "one.psd", &psd, None).unwrap(); + let d = app.ui.dialog.as_ref().unwrap(); + assert_eq!((d.kind.as_str(), &d.fields["slices"], d.bool("importSlices")), (KIND, &json!(1), true)); + assert!(frame(&mut app).contains("Import Slices")); + // Flatten keeps Import Slices: the merged image opens with the slice. + set(&mut app, "convert", json!("flatten")); + super::super::confirm(&mut app).unwrap(); + assert_eq!(slice_names(&app), ["cell"]); + // Left off, the slice stays out, and the next file starts from that choice. + io::open_bytes(&mut app, "one.psd", &psd, None).unwrap(); + set(&mut app, "importSlices", json!(false)); + super::super::confirm(&mut app).unwrap(); + assert!(slice_names(&app).is_empty()); + io::open_bytes(&mut app, "one.psd", &psd, None).unwrap(); + assert!(!app.ui.dialog.as_ref().unwrap().bool("importSlices"), "remembered"); + // A layered file without slices keeps the choice made last for the next sliced one. + app.ui.dialog = None; + io::open_bytes(&mut app, "poster.psd", &layered(), None).unwrap(); + assert_eq!(app.ui.dialog.as_ref().unwrap().fields["slices"], json!(0)); + set(&mut app, "importSlices", json!(true)); + super::super::confirm(&mut app).unwrap(); + assert_eq!(app.ui.psd_import["importSlices"], json!(false)); + } + + #[test] + fn placing_a_sliced_file_without_link_brings_its_slices_with_the_art() { + let b64 = vectorcraft_format::base64_encode(&sliced(&layered())); + let mut app = app(); + app.session.execute("file.new", &json!({"width": 100, "height": 100})).unwrap(); + crate::place::run_for_user(&mut app, &json!({"name": "poster.psd", "dataBase64": b64, "at": [50, 50]})).unwrap(); + assert!(app.ui.dialog.as_ref().unwrap().bool("importSlices")); + super::super::confirm(&mut app).unwrap(); + let st = app.session.doc().unwrap(); + assert_eq!(st.doc.slices.len(), 1); + assert_eq!(st.doc.slices[0].rect, vectorcraft_geom::Rect::new(40.0, 40.0, 50.0, 50.0)); + // Several files placed together take the choice made last. + let mut q = json!({}); + app.ui.psd_import = json!({"layers": true, "importSlices": false}); + queue_options(&app, &mut q); + assert_eq!(q["importSlices"], json!(false)); + } + #[test] fn scripted_places_and_places_that_give_layers_dont_ask() { let b64 = vectorcraft_format::base64_encode(&layered()); diff --git a/crates/ui-egui/src/io/open.rs b/crates/ui-egui/src/io/open.rs index f771fba718..11c02ca139 100644 --- a/crates/ui-egui/src/io/open.rs +++ b/crates/ui-egui/src/io/open.rs @@ -53,8 +53,8 @@ fn open_bytes_with(app: &mut VectorcraftApp, name: &str, bytes: &[u8], path: Opt return load(app, p).map(|_| Value::Null); } // A PDF with several pages or a password asks first (the Import PDF dialog), and so do a DXF - // drawing (DXF Import Options) and a PSD file with several layers (PSD Import Options), unless - // `p` says how its layers come in. + // drawing (DXF Import Options) and a PSD file with several layers or with slices (PSD Import + // Options), unless `p` says how its layers come in. if crate::dialogs::import_pdf::offer(app, name, bytes, path.clone(), None) || crate::dialogs::dxf_import::offer(app, name, bytes, path.clone(), None) || (p.get("layers").is_none() && crate::dialogs::psd_import::offer(app, name, bytes, path.clone(), None)) @@ -555,7 +555,7 @@ fn open_file_with(app: &mut VectorcraftApp, path: &str, background: bool, p: &Va let mut bytes = read(app, path)?; if background && opens_as(path).is_none() { // A PDF with several pages or a password, a DXF drawing, or a PSD file with several layers - // asks first, as at once. + // or with slices asks first, as at once. if crate::dialogs::import_pdf::offer(app, path, &bytes, Some(path.to_string()), None) || crate::dialogs::dxf_import::offer(app, path, &bytes, Some(path.to_string()), None) || (p.get("layers").is_none() && crate::dialogs::psd_import::offer(app, path, &bytes, Some(path.to_string()), None)) diff --git a/crates/ui-egui/src/place.rs b/crates/ui-egui/src/place.rs index 50f3bec7fb..7da3e4a38e 100644 --- a/crates/ui-egui/src/place.rs +++ b/crates/ui-egui/src/place.rs @@ -152,8 +152,9 @@ fn place_file(app: &mut VectorcraftApp, p: &Value, read: Read) -> Result