diff --git a/crates/doc/src/style_libs.rs b/crates/doc/src/style_libs.rs index 34faf1f9c4..4bb4ce85bf 100644 --- a/crates/doc/src/style_libs.rs +++ b/crates/doc/src/style_libs.rs @@ -157,6 +157,7 @@ pub const STYLE_LIBRARIES: &[BuiltinStyleLibrary] = &[ BuiltinStyleLibrary { id: "hand-drawn", name: "Hand-Drawn", make: hand_drawn }, BuiltinStyleLibrary { id: "textures", name: "Textures", make: textures }, BuiltinStyleLibrary { id: "painted-sketched", name: "Painted and Sketched", make: painted_sketched }, + BuiltinStyleLibrary { id: "paper-cutouts", name: "Paper Cutouts", make: paper_cutouts }, BuiltinStyleLibrary { id: "gradient-finishes", name: "Gradient Finishes", make: gradient_finishes }, BuiltinStyleLibrary { id: "shape-effects", name: "Shape Effects", make: shape_effects }, BuiltinStyleLibrary { id: "blends-transparency", name: "Blends and Transparency", make: blends_transparency }, @@ -384,6 +385,25 @@ fn painted_sketched() -> Vec { ] } +/// Paper Cutouts: original layered paper colors with visible cut edges and crisp cast shadows. +fn paper_cutouts() -> Vec { + let cutout = |name: &str, face: &str, edge: &str, rim: &str, shadow: &str, x: f64, y: f64| { + style( + name, + vec![F(fill(face)), S(stroke(edge, 7.0)), S(stroke(rim, 2.0))], + vec![fx("stylize.dropShadow", json!({"mode": "normal", "opacity": 100.0, "x": x, "y": y, "blur": 0.0, "color": shadow}))], + ) + }; + vec![ + cutout("Coral Layers", "#ff6b6b", "#f9c74f", "#fff4e6", "#6d597a", 5.0, 5.0), + cutout("Mint Layers", "#80cbc4", "#2a9d8f", "#e9f5db", "#355070", 4.0, 6.0), + cutout("Midnight Layers", "#3d5a80", "#ee6c4d", "#e0fbfc", "#1b263b", 6.0, 4.0), + cutout("Sunflower Sheet", "#ffbe0b", "#fb5607", "#fff3b0", "#6a4c93", 3.0, 6.0), + cutout("Rose Layers", "#f28482", "#84a59d", "#f7ede2", "#4a4e69", 6.0, 3.0), + cutout("Monochrome Stack", "#f5f5f5", "#444444", "#ffffff", "#222222", 5.0, 5.0), + ] +} + /// Textures: fills and strokes painted with the catalog's texture effects (grain, canvas and /// burlap surfaces, craquelure, tiles, patchwork, stained glass and water paper). fn textures() -> Vec { @@ -702,6 +722,26 @@ mod tests { assert_eq!(ids.iter().position(|&i| i == "textures"), ids.iter().position(|&i| i == "hand-drawn").map(|i| i + 1), "after Hand-Drawn"); } + #[test] + fn paper_cutouts_have_layered_edges_and_crisp_shadows() { + let lib = builtin_style_library("paper-cutouts").unwrap(); + assert_eq!(lib.name, "Paper Cutouts"); + let names: Vec<&str> = lib.styles.iter().map(|g| g.name.as_str()).collect(); + assert_eq!(names, ["Coral Layers", "Mint Layers", "Midnight Layers", "Sunflower Sheet", "Rose Layers", "Monochrome Stack"]); + for g in &lib.styles { + assert_eq!(g.appearance.items.len(), 3, "{} has a face and two cut edges", g.name); + assert!(matches!(g.appearance.items[0], AppearanceItem::Fill(_))); + assert!(matches!(g.appearance.items[1], AppearanceItem::Stroke(_))); + assert!(matches!(g.appearance.items[2], AppearanceItem::Stroke(_))); + assert_eq!(g.appearance.effects.len(), 1); + let shadow = &g.appearance.effects[0]; + assert_eq!(shadow.id, "stylize.dropShadow"); + assert_eq!(shadow.params["blur"], 0.0); + assert_eq!(shadow.params["opacity"], 100.0); + } + assert_eq!(read(&write(&lib), "Fallback").unwrap(), *lib); + } + /// The built-in styles' Warps draw with the map a new Warp takes. #[test] fn builtin_warp_styles_take_the_nets_map() { diff --git a/crates/engine/src/tests/stylelib.rs b/crates/engine/src/tests/stylelib.rs index e8623900fd..8f7c410edf 100644 --- a/crates/engine/src/tests/stylelib.rs +++ b/crates/engine/src/tests/stylelib.rs @@ -46,6 +46,7 @@ fn builtin_libraries_are_listed_with_original_styles_using_catalogued_effects() assert!(libs.iter().any(|l| l["id"] == "status-effects" && l["name"] == "Status Effects"), "{libs:?}"); assert!(libs.iter().any(|l| l["id"] == "textures" && l["name"] == "Textures" && l["count"] == 8), "{libs:?}"); assert!(libs.iter().any(|l| l["id"] == "neon-glow" && l["name"] == "Neon & Glow" && l["count"] == 6), "{libs:?}"); + assert!(libs.iter().any(|l| l["id"] == "paper-cutouts" && l["name"] == "Paper Cutouts" && l["count"] == 6), "{libs:?}"); for l in libs { let id = l["id"].as_str().unwrap(); let g = run(&mut s, "graphicStyle.library", json!({"library": id})); @@ -91,6 +92,24 @@ fn builtin_libraries_are_listed_with_original_styles_using_catalogued_effects() assert!(s.execute("graphicStyle.library", &json!({"library": "nope"})).is_err()); } +#[test] +fn paper_cutout_style_applies_to_an_object_and_undoes_together() { + let mut s = session(); + let id = rect(&mut s, 10.0, 20.0, 40.0, 30.0); + let before = doc(&s).node(id).unwrap().appearance.clone(); + let undo_before = undo_len(&s); + let result = + run(&mut s, "graphicStyle.addFromLibrary", json!({"library": "paper-cutouts", "name": "Coral Layers", "apply": true, "ids": [id.0]})); + assert_eq!((names(&result["added"]), result["applied"].as_str()), (vec!["Coral Layers"], Some("Coral Layers"))); + assert_eq!(undo_len(&s), undo_before + 1); + let applied = &doc(&s).node(id).unwrap().appearance; + assert_eq!(applied.items.len(), 3); + assert_eq!(applied.effects[0].id, "stylize.dropShadow"); + assert_eq!(applied.effects[0].params["blur"], 0.0); + run(&mut s, "edit.undo", json!({})); + assert_eq!(doc(&s).node(id).unwrap().appearance, before); +} + #[test] fn painted_and_sketched_styles_set_every_effect_setting_and_reopen_applied() { let mut s = session(); diff --git a/crates/ui-egui/src/i18n/bg.tsv b/crates/ui-egui/src/i18n/bg.tsv index 5d282f47c4..24fd8d571f 100644 --- a/crates/ui-egui/src/i18n/bg.tsv +++ b/crates/ui-egui/src/i18n/bg.tsv @@ -7788,6 +7788,13 @@ breakText Glyphs Глифи @msg A joint does not close by {gap} pt. Една връзка не се затваря с {gap} pt. @msg Two panels pass through each other. Два панела минават един през друг. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer трябва да е "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" + Paper Cutouts Хартиени изрезки + Coral Layers Коралови слоеве + Mint Layers Ментови слоеве + Midnight Layers Среднощни слоеве + Sunflower Sheet Слънчогледов лист + Rose Layers Розови слоеве + Monochrome Stack Монохромен стек # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Показва карта с това какво прави инструментът от лентата и какво правят клавишите му вместо подсказката му; изисква Показване на подсказки. Selects whole objects and groups to move, resize or rotate them. Избира цели обекти и групи, за да ги премествате, оразмерявате или завъртате. diff --git a/crates/ui-egui/src/i18n/bs.tsv b/crates/ui-egui/src/i18n/bs.tsv index 631f8a3b7a..51fb9427cc 100644 --- a/crates/ui-egui/src/i18n/bs.tsv +++ b/crates/ui-egui/src/i18n/bs.tsv @@ -7843,6 +7843,13 @@ shape Open Otvoren @msg A joint does not close by {gap} pt. Spoj se ne zatvara za {gap} pt. @msg Two panels pass through each other. Dva panela prolaze jedan kroz drugi. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer mora biti "singleLine", "everyLine", "standardSingleLine" ili "standardEveryLine" + Paper Cutouts Papirni izrezi + Coral Layers Koraljni slojevi + Mint Layers Mentini slojevi + Midnight Layers Ponoćni slojevi + Sunflower Sheet List suncokreta + Rose Layers Ružičasti slojevi + Monochrome Stack Jednobojni slojevi # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Prikazuje karticu s onim što alat s trake radi i što rade njegove tipke, umjesto njegovog opisa; potrebno je Prikaži opise alata. Selects whole objects and groups to move, resize or rotate them. Odabire cijele objekte i grupe radi pomjeranja, promjene veličine ili rotacije. diff --git a/crates/ui-egui/src/i18n/ca.tsv b/crates/ui-egui/src/i18n/ca.tsv index e188de5976..b6f303147c 100644 --- a/crates/ui-egui/src/i18n/ca.tsv +++ b/crates/ui-egui/src/i18n/ca.tsv @@ -8795,6 +8795,13 @@ breakText Glyphs Glifs @msg A joint does not close by {gap} pt. Una unió no es tanca per {gap} pt. @msg Two panels pass through each other. Dos panells es travessen l’un a l’altre. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer ha de ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" + Paper Cutouts Retalls de paper + Coral Layers Capes de corall + Mint Layers Capes de menta + Midnight Layers Capes de mitjanit + Sunflower Sheet Full de gira-sol + Rose Layers Capes de rosa + Monochrome Stack Pila monocroma # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Mostra una fitxa amb el que fa una eina de la barra i el que fan les seves tecles en lloc del seu consell; cal Mostra els consells d’eines. Selects whole objects and groups to move, resize or rotate them. Selecciona objectes i grups sencers per moure’ls, canviar-ne la mida o girar-los. diff --git a/crates/ui-egui/src/i18n/cs.tsv b/crates/ui-egui/src/i18n/cs.tsv index acedfda809..a0055a5269 100644 --- a/crates/ui-egui/src/i18n/cs.tsv +++ b/crates/ui-egui/src/i18n/cs.tsv @@ -10620,6 +10620,13 @@ breakText Glyphs Glyfy @msg A panel is not joined to the rest by a crease. Panel není se zbytkem spojen žádnou linií bigu. @msg A fold line is on a non-printing layer. Linie skladu je na netisknutelné vrstvě. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panely: {panels}, panty: {hinges}, chyby: {errors}, upozornění: {warnings} + Paper Cutouts Papírové výřezy + Coral Layers Korálové vrstvy + Mint Layers Mátové vrstvy + Midnight Layers Půlnoční vrstvy + Sunflower Sheet Slunečnicový list + Rose Layers Růžové vrstvy + Monochrome Stack Jednobarevná sada Dashed Arrow Přerušovaná šipka Pressure Sensitive Citlivé na tlak Flex Ribbon Pružná stuha diff --git a/crates/ui-egui/src/i18n/da.tsv b/crates/ui-egui/src/i18n/da.tsv index 6ada2f1958..f68a734268 100644 --- a/crates/ui-egui/src/i18n/da.tsv +++ b/crates/ui-egui/src/i18n/da.tsv @@ -10682,6 +10682,13 @@ breakText Glyphs Glyffer @msg A joint does not close by {gap} pt. En samling lukker ikke med {gap} pt. @msg Two panels pass through each other. To paneler går gennem hinanden. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer skal være "singleLine", "everyLine", "standardSingleLine" eller "standardEveryLine" + Paper Cutouts Papirudklip + Coral Layers Korallag + Mint Layers Myntelag + Midnight Layers Midnatslag + Sunflower Sheet Solsikkeark + Rose Layers Rosenlag + Monochrome Stack Monokrom stak # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Viser et kort med, hvad et værktøj på værktøjslinjen og dets taster gør, i stedet for dets tip; kræver Vis værktøjstips. Selects whole objects and groups to move, resize or rotate them. Markerer hele objekter og grupper for at flytte, skalere eller rotere dem. diff --git a/crates/ui-egui/src/i18n/de.tsv b/crates/ui-egui/src/i18n/de.tsv index 8b8e9161b8..9d07f24d00 100644 --- a/crates/ui-egui/src/i18n/de.tsv +++ b/crates/ui-egui/src/i18n/de.tsv @@ -10233,6 +10233,13 @@ breakText Glyphs Glyphen @msg A panel is not joined to the rest by a crease. Ein Feld ist durch keine Rilllinie mit den übrigen verbunden. @msg A fold line is on a non-printing layer. Eine Faltlinie liegt auf einer nicht druckbaren Ebene. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Felder: {panels}, Scharniere: {hinges}, Fehler: {errors}, Warnungen: {warnings} + Paper Cutouts Papierschnitte + Coral Layers Korallschichten + Mint Layers Minzschichten + Midnight Layers Mitternachtsschichten + Sunflower Sheet Sonnenblumenblatt + Rose Layers Rosenschichten + Monochrome Stack Monochromer Stapel Dashed Arrow Gestrichelter Pfeil Pressure Sensitive Druckempfindlich Flex Ribbon Flexibles Band diff --git a/crates/ui-egui/src/i18n/el.tsv b/crates/ui-egui/src/i18n/el.tsv index 414834728c..3eb956e508 100644 --- a/crates/ui-egui/src/i18n/el.tsv +++ b/crates/ui-egui/src/i18n/el.tsv @@ -8769,6 +8769,13 @@ breakText Glyphs Γλύφοι @msg A joint does not close by {gap} pt. Μια ένωση δεν κλείνει κατά {gap} pt. @msg Two panels pass through each other. Δύο πάνελ διαπερνούν το ένα το άλλο. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" το composer πρέπει να είναι "singleLine", "everyLine", "standardSingleLine" ή "standardEveryLine" + Paper Cutouts Χάρτινα αποκόμματα + Coral Layers Στρώσεις κοραλλί + Mint Layers Στρώσεις μέντας + Midnight Layers Στρώσεις μεσονυκτίου + Sunflower Sheet Φύλλο ηλιοτρόπιου + Rose Layers Στρώσεις ροζ + Monochrome Stack Μονόχρωμη στοίβα # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Εμφανίζει μια κάρτα με το τι κάνει ένα εργαλείο της γραμμής και τα πλήκτρα του, αντί για τη συμβουλή του· απαιτεί την Εμφάνιση συμβουλών εργαλείων. Selects whole objects and groups to move, resize or rotate them. Επιλέγει ολόκληρα αντικείμενα και ομάδες για μετακίνηση, αλλαγή μεγέθους ή περιστροφή. diff --git a/crates/ui-egui/src/i18n/es.tsv b/crates/ui-egui/src/i18n/es.tsv index 58a5b88c13..7a8ad7a7c5 100644 --- a/crates/ui-egui/src/i18n/es.tsv +++ b/crates/ui-egui/src/i18n/es.tsv @@ -10512,6 +10512,13 @@ breakText Glyphs Glifos @msg A joint does not close by {gap} pt. Una unión no cierra por {gap} pt. @msg Two panels pass through each other. Dos paneles se atraviesan entre sí. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer debe ser "singleLine", "everyLine", "standardSingleLine" o "standardEveryLine" + Paper Cutouts Recortes de papel + Coral Layers Capas coral + Mint Layers Capas menta + Midnight Layers Capas de medianoche + Sunflower Sheet Hoja de girasol + Rose Layers Capas rosa + Monochrome Stack Pila monocroma # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Muestra una ficha con lo que hacen una herramienta de la barra y sus teclas en lugar de su información; requiere Mostrar información sobre herramientas. Selects whole objects and groups to move, resize or rotate them. Selecciona objetos y grupos completos para moverlos, cambiar su tamaño o girarlos. diff --git a/crates/ui-egui/src/i18n/fi.tsv b/crates/ui-egui/src/i18n/fi.tsv index e50745b5ef..9d0b1c8958 100644 --- a/crates/ui-egui/src/i18n/fi.tsv +++ b/crates/ui-egui/src/i18n/fi.tsv @@ -8852,6 +8852,13 @@ breakText Glyphs Merkit @msg A joint does not close by {gap} pt. Liitos ei sulkeudu, rako {gap} pt. @msg Two panels pass through each other. Kaksi paneelia kulkee toistensa läpi. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer on oltava "singleLine", "everyLine", "standardSingleLine" tai "standardEveryLine" + Paper Cutouts Paperileikkeet + Coral Layers Korallikerrokset + Mint Layers Minttukerrokset + Midnight Layers Keskiyön kerrokset + Sunflower Sheet Auringonkukka-arkki + Rose Layers Ruusukerrokset + Monochrome Stack Yksivärinen pino # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Näyttää vihjeen sijaan kortin siitä, mitä työkalurivin työkalu ja sen näppäimet tekevät; vaatii asetuksen Näytä työkaluvihjeet. Selects whole objects and groups to move, resize or rotate them. Valitsee kokonaisia objekteja ja ryhmiä niiden siirtämistä, koon muuttamista tai kiertämistä varten. diff --git a/crates/ui-egui/src/i18n/fr.tsv b/crates/ui-egui/src/i18n/fr.tsv index fde1b2ca63..40677e1258 100644 --- a/crates/ui-egui/src/i18n/fr.tsv +++ b/crates/ui-egui/src/i18n/fr.tsv @@ -10583,6 +10583,13 @@ breakText Glyphs Glyphes @msg A joint does not close by {gap} pt. Un joint ne se ferme pas, avec un écart de {gap} pt. @msg Two panels pass through each other. Deux panneaux se traversent. @msg {_1} × {_2} pixels is too large for GIF (at most 65535 pixels a side): lower the resolution {_1} × {_2} pixels, c’est trop grand pour le GIF (65535 pixels par côté au plus) : réduisez la résolution + Paper Cutouts Découpes de papier + Coral Layers Couches corail + Mint Layers Couches menthe + Midnight Layers Couches de minuit + Sunflower Sheet Feuille tournesol + Rose Layers Couches rose + Monochrome Stack Pile monochrome # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Affiche une fiche indiquant ce que font un outil de la barre et ses touches, à la place de son info-bulle. Nécessite Afficher les info-bulles. Selects whole objects and groups to move, resize or rotate them. Sélectionne des objets et des groupes entiers pour les déplacer, les redimensionner ou les faire pivoter. diff --git a/crates/ui-egui/src/i18n/gu.tsv b/crates/ui-egui/src/i18n/gu.tsv index 62810e6ac7..8c542e3698 100644 --- a/crates/ui-egui/src/i18n/gu.tsv +++ b/crates/ui-egui/src/i18n/gu.tsv @@ -5506,6 +5506,13 @@ swatch [Registration] [રજિસ્ટ્રેશન] Standard Single-line Composer સ્ટાન્ડર્ડ સિંગલ-લાઇન કમ્પોઝર Standard Every-line Composer સ્ટાન્ડર્ડ એવરી-લાઇન કમ્પોઝર @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer આમાંથી એક હોવું જોઈએ: "singleLine", "everyLine", "standardSingleLine" અથવા "standardEveryLine" + Paper Cutouts કાગળના કટઆઉટ + Coral Layers કોરલ સ્તરો + Mint Layers મિન્ટ સ્તરો + Midnight Layers મધ્યરાત્રિના સ્તરો + Sunflower Sheet સૂર્યમુખી શીટ + Rose Layers ગુલાબી સ્તરો + Monochrome Stack એકરંગી થપ્પો # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. ટૂલબારનું ટૂલ અને તેની કીઓ શું કરે છે તે ટિપને બદલે કાર્ડમાં બતાવે છે; ટૂલ ટિપ્સ બતાવો ચાલુ હોવું જરૂરી છે. Selects whole objects and groups to move, resize or rotate them. આખા ઑબ્જેક્ટ અને જૂથો પસંદ કરે છે, જેથી તેમને ખસેડી, તેમનું કદ બદલી કે ફેરવી શકાય. diff --git a/crates/ui-egui/src/i18n/hi.tsv b/crates/ui-egui/src/i18n/hi.tsv index d7efcfc242..8ab5a6f2b9 100644 --- a/crates/ui-egui/src/i18n/hi.tsv +++ b/crates/ui-egui/src/i18n/hi.tsv @@ -10226,6 +10226,13 @@ theme Appearance अपीयरेंस @msg A panel is not joined to the rest by a crease. कोई पैनल किसी क्रीज़ लाइन से बाकी से जुड़ा नहीं है। @msg A fold line is on a non-printing layer. एक फ़ोल्ड लाइन नॉन-प्रिंटिंग लेयर पर है। @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} पैनल: {panels}, हिंज: {hinges}, एरर: {errors}, वॉर्निंग: {warnings} + Paper Cutouts कागज़ की कतरनें + Coral Layers कोरल परतें + Mint Layers मिंट परतें + Midnight Layers आधी रात की परतें + Sunflower Sheet सूरजमुखी शीट + Rose Layers गुलाबी परतें + Monochrome Stack मोनोक्रोम स्टैक Dashed Arrow बिंदीदार तीर Pressure Sensitive दबाव संवेदनशील Flex Ribbon लचीला फीता diff --git a/crates/ui-egui/src/i18n/hu.tsv b/crates/ui-egui/src/i18n/hu.tsv index 4829761ec6..229dd8096a 100644 --- a/crates/ui-egui/src/i18n/hu.tsv +++ b/crates/ui-egui/src/i18n/hu.tsv @@ -10608,6 +10608,13 @@ breakText Glyphs Glifák @msg A panel is not joined to the rest by a crease. Egy panelt egyetlen bigvonal sem köt a többihez. @msg A fold line is on a non-printing layer. Egy hajtásvonal nem nyomtatható rétegen van. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelek: {panels}, zsanérok: {hinges}, hibák: {errors}, figyelmeztetések: {warnings} + Paper Cutouts Papírkivágások + Coral Layers Korallrétegek + Mint Layers Mentás rétegek + Midnight Layers Éjféli rétegek + Sunflower Sheet Napraforgólap + Rose Layers Rózsaszín rétegek + Monochrome Stack Monokróm köteg Dashed Arrow Szaggatott nyíl Pressure Sensitive Nyomásérzékeny Flex Ribbon Rugalmas szalag diff --git a/crates/ui-egui/src/i18n/id.tsv b/crates/ui-egui/src/i18n/id.tsv index 2d4db8b40c..908db6eade 100644 --- a/crates/ui-egui/src/i18n/id.tsv +++ b/crates/ui-egui/src/i18n/id.tsv @@ -8486,6 +8486,13 @@ breakText Glyphs Glif @msg A joint does not close by {gap} pt. Sebuah sambungan tidak menutup sejauh {gap} pt. @msg Two panels pass through each other. Dua panel saling menembus. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer harus "singleLine", "everyLine", "standardSingleLine", atau "standardEveryLine" + Paper Cutouts Potongan Kertas + Coral Layers Lapisan Koral + Mint Layers Lapisan Mint + Midnight Layers Lapisan Tengah Malam + Sunflower Sheet Lembar Bunga Matahari + Rose Layers Lapisan Mawar + Monochrome Stack Tumpukan Monokrom # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Menampilkan kartu berisi fungsi alat di bilah alat dan tombolnya sebagai pengganti tipnya; memerlukan Tampilkan tips alat. Selects whole objects and groups to move, resize or rotate them. Memilih objek dan grup utuh untuk dipindahkan, diubah ukurannya, atau diputar. diff --git a/crates/ui-egui/src/i18n/it.tsv b/crates/ui-egui/src/i18n/it.tsv index eddf231a69..87e485def3 100644 --- a/crates/ui-egui/src/i18n/it.tsv +++ b/crates/ui-egui/src/i18n/it.tsv @@ -10266,6 +10266,13 @@ breakText Glyphs Glifi @msg A panel is not joined to the rest by a crease. Un pannello non è unito al resto da alcuna linea di cordonatura. @msg A fold line is on a non-printing layer. Una linea di piega si trova su un livello non stampabile. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Pannelli: {panels}, cerniere: {hinges}, errori: {errors}, avvisi: {warnings} + Paper Cutouts Ritagli di carta + Coral Layers Livelli corallo + Mint Layers Livelli menta + Midnight Layers Livelli di mezzanotte + Sunflower Sheet Foglio girasole + Rose Layers Livelli rosa + Monochrome Stack Pila monocromatica Dashed Arrow Freccia tratteggiata Pressure Sensitive Sensibile alla pressione Flex Ribbon Nastro flessibile diff --git a/crates/ui-egui/src/i18n/ja.tsv b/crates/ui-egui/src/i18n/ja.tsv index 66d0680346..0c6c9757cd 100644 --- a/crates/ui-egui/src/i18n/ja.tsv +++ b/crates/ui-egui/src/i18n/ja.tsv @@ -10330,6 +10330,13 @@ breakText Glyphs 字形 @msg A panel is not joined to the rest by a crease. パネルがどの筋入れ線でも他とつながっていません。 @msg A fold line is on a non-printing layer. 折り線が印刷しないレイヤーにあります。 @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} パネル: {panels}、ヒンジ: {hinges}、エラー: {errors}、警告: {warnings} + Paper Cutouts 切り絵 + Coral Layers コーラルのレイヤー + Mint Layers ミントのレイヤー + Midnight Layers 真夜中のレイヤー + Sunflower Sheet ひまわりのシート + Rose Layers ローズのレイヤー + Monochrome Stack モノクロの重なり Dashed Arrow 破線矢印 Pressure Sensitive 筆圧対応 Flex Ribbon しなやかなリボン diff --git a/crates/ui-egui/src/i18n/ka.tsv b/crates/ui-egui/src/i18n/ka.tsv index 05316db300..ba56d54de7 100644 --- a/crates/ui-egui/src/i18n/ka.tsv +++ b/crates/ui-egui/src/i18n/ka.tsv @@ -10906,6 +10906,13 @@ font-script Japanese იაპონური @msg A joint does not close by {gap} pt. შეერთება არ იხურება {gap} pt-ით. @msg Two panels pass through each other. ორი პანელი ერთმანეთში გადის. @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer უნდა იყოს "singleLine", "everyLine", "standardSingleLine" ან "standardEveryLine" + Paper Cutouts ქაღალდის ამონაჭრები + Coral Layers მარჯნის ფენები + Mint Layers პიტნის ფენები + Midnight Layers შუაღამის ფენები + Sunflower Sheet მზესუმზირის ფურცელი + Rose Layers ვარდისფერი ფენები + Monochrome Stack მონოქრომული დასტა # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. ინსტრუმენტების ზოლის ინსტრუმენტისა და მისი კლავიშების მოქმედებას მინიშნების ნაცვლად ბარათზე აჩვენებს; საჭიროა მინიშნებების ჩვენება. Selects whole objects and groups to move, resize or rotate them. მთლიანად მონიშნავს ობიექტებსა და ჯგუფებს მათი გადასაადგილებლად, ზომის შესაცვლელად ან მოსაბრუნებლად. diff --git a/crates/ui-egui/src/i18n/ko.tsv b/crates/ui-egui/src/i18n/ko.tsv index f5b2e347e9..eae6e3eb9a 100644 --- a/crates/ui-egui/src/i18n/ko.tsv +++ b/crates/ui-egui/src/i18n/ko.tsv @@ -10229,6 +10229,13 @@ breakText Glyphs 글리프 @msg A panel is not joined to the rest by a crease. 패널이 어떤 오시선으로도 나머지와 연결되어 있지 않습니다. @msg A fold line is on a non-printing layer. 접는 선이 인쇄되지 않는 레이어에 있습니다. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} 패널: {panels}, 힌지: {hinges}, 오류: {errors}, 경고: {warnings} + Paper Cutouts 종이 오려내기 + Coral Layers 산호색 레이어 + Mint Layers 민트색 레이어 + Midnight Layers 한밤중 레이어 + Sunflower Sheet 해바라기 시트 + Rose Layers 장미색 레이어 + Monochrome Stack 단색 쌓기 Dashed Arrow 점선 화살표 Pressure Sensitive 압력 감지 Flex Ribbon 유연한 리본 diff --git a/crates/ui-egui/src/i18n/nl.tsv b/crates/ui-egui/src/i18n/nl.tsv index bb5112ba7b..930f77b5ac 100644 --- a/crates/ui-egui/src/i18n/nl.tsv +++ b/crates/ui-egui/src/i18n/nl.tsv @@ -10659,6 +10659,13 @@ breakText Glyphs Glyphs @msg A panel is not joined to the rest by a crease. Een paneel is door geen rillijn met de rest verbonden. @msg A fold line is on a non-printing layer. Een vouwlijn staat op een laag die niet wordt afgedrukt. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panelen: {panels}, scharnieren: {hinges}, fouten: {errors}, waarschuwingen: {warnings} + Paper Cutouts Papieruitsneden + Coral Layers Koraallagen + Mint Layers Muntlagen + Midnight Layers Middernachtlagen + Sunflower Sheet Zonnebloemvel + Rose Layers Rozenlagen + Monochrome Stack Monochrome stapel Dashed Arrow Gestreepte pijl Pressure Sensitive Drukgevoelig Flex Ribbon Flexibel lint diff --git a/crates/ui-egui/src/i18n/pl.tsv b/crates/ui-egui/src/i18n/pl.tsv index be1ad0740b..fc5f654683 100644 --- a/crates/ui-egui/src/i18n/pl.tsv +++ b/crates/ui-egui/src/i18n/pl.tsv @@ -10483,6 +10483,13 @@ breakText Glyphs Glify @msg A panel is not joined to the rest by a crease. Panel nie jest połączony z resztą żadną linią bigowania. @msg A fold line is on a non-printing layer. Linia zgięcia znajduje się na warstwie niedrukowanej. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Panele: {panels}, zawiasy: {hinges}, błędy: {errors}, ostrzeżenia: {warnings} + Paper Cutouts Wycinanki papierowe + Coral Layers Warstwy koralowe + Mint Layers Warstwy miętowe + Midnight Layers Warstwy północy + Sunflower Sheet Arkusz słonecznika + Rose Layers Warstwy różowe + Monochrome Stack Monochromatyczny stos Dashed Arrow Przerywana strzałka Pressure Sensitive Czułe na nacisk Flex Ribbon Elastyczna wstążka diff --git a/crates/ui-egui/src/i18n/pt-br.tsv b/crates/ui-egui/src/i18n/pt-br.tsv index b0a5d751cf..723d71a1f0 100644 --- a/crates/ui-egui/src/i18n/pt-br.tsv +++ b/crates/ui-egui/src/i18n/pt-br.tsv @@ -10692,6 +10692,13 @@ swatch Yellow Green Verde-amarelado @msg A panel is not joined to the rest by a crease. Um painel não está unido ao restante por nenhuma linha de vinco. @msg A fold line is on a non-printing layer. Uma linha de dobra está em uma camada não imprimível. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Painéis: {panels}, dobradiças: {hinges}, erros: {errors}, avisos: {warnings} + Paper Cutouts Recortes de papel + Coral Layers Camadas de coral + Mint Layers Camadas de menta + Midnight Layers Camadas da meia-noite + Sunflower Sheet Folha de girassol + Rose Layers Camadas de rosa + Monochrome Stack Pilha monocromática Dashed Arrow Seta tracejada Pressure Sensitive Sensível à pressão Flex Ribbon Fita flexível diff --git a/crates/ui-egui/src/i18n/ru.tsv b/crates/ui-egui/src/i18n/ru.tsv index f99a7becaf..554d86d577 100644 --- a/crates/ui-egui/src/i18n/ru.tsv +++ b/crates/ui-egui/src/i18n/ru.tsv @@ -10675,6 +10675,13 @@ shape Open Открытый @msg Two panels pass through each other. Две панели проходят друг сквозь друга. @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} пикселей — слишком большой размер для PSD (не более {MAX_SIDE} пикселей по стороне): уменьшите разрешение @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer должен быть "singleLine", "everyLine", "standardSingleLine" или "standardEveryLine" + Paper Cutouts Бумажные вырезки + Coral Layers Коралловые слои + Mint Layers Мятные слои + Midnight Layers Полуночные слои + Sunflower Sheet Лист подсолнуха + Rose Layers Розовые слои + Monochrome Stack Монохромная стопка # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Вместо подсказки показывает карточку о том, что делают инструмент панели и его клавиши; требуется Показывать подсказки. Selects whole objects and groups to move, resize or rotate them. Выделяет объекты и группы целиком, чтобы перемещать, масштабировать или поворачивать их. diff --git a/crates/ui-egui/src/i18n/sv.tsv b/crates/ui-egui/src/i18n/sv.tsv index dff2c33d44..d5e5b3e586 100644 --- a/crates/ui-egui/src/i18n/sv.tsv +++ b/crates/ui-egui/src/i18n/sv.tsv @@ -10714,6 +10714,13 @@ digits Hindi Hindi @msg A joint does not close by {gap} pt. En fog sluter inte med {gap} pt. @msg Two panels pass through each other. Två paneler går igenom varandra. @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} pixlar är för stort för PSD (högst {MAX_SIDE} pixlar per sida): sänk upplösningen + Paper Cutouts Pappersutklipp + Coral Layers Korallager + Mint Layers Myntalager + Midnight Layers Midnattslager + Sunflower Sheet Solrosark + Rose Layers Rosenlager + Monochrome Stack Monokrom stapel # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Visar ett kort med vad ett verktyg i verktygsfältet och dess tangenter gör i stället för dess tips; kräver Visa verktygstips. Selects whole objects and groups to move, resize or rotate them. Markerar hela objekt och grupper för att flytta, skala eller rotera dem. diff --git a/crates/ui-egui/src/i18n/tests.rs b/crates/ui-egui/src/i18n/tests.rs index 9e587ce6a3..5e41b647b2 100644 --- a/crates/ui-egui/src/i18n/tests.rs +++ b/crates/ui-egui/src/i18n/tests.rs @@ -765,7 +765,7 @@ fn built_in_library_style_names_are_in_complete_catalogs() { .flat_map(|(_, lib)| lib.styles.iter().map(|s| s.name.clone()).collect::>()) .collect(), ); - assert_eq!(names.len(), 86, "{names:?}"); + assert_eq!(names.len(), 92, "{names:?}"); let bad = lacking(&names, |c, n| c.plain(n).is_some()); assert!(bad.is_empty(), "{}", bad.join("\n")); } @@ -1087,6 +1087,16 @@ fn painted_and_sketched_style_names_are_in_every_catalog() { } } +#[test] +fn paper_cutout_style_names_are_in_every_catalog() { + let lib = vectorcraft_doc::style_libs::builtin_style_library("paper-cutouts").expect("built in"); + for lang in LANGUAGES.iter().filter(|lang| !lang.source.is_empty()) { + for label in std::iter::once(lib.name.as_str()).chain(lib.styles.iter().map(|g| g.name.as_str())) { + assert!(lang.catalog().plain(label).is_some(), "{} is missing {label}", lang.code); + } + } +} + /// The names the EPS options' menus show (preview, overprints, flattener preset and PostScript /// level), and Save As's Preview label. #[test] diff --git a/crates/ui-egui/src/i18n/tr.tsv b/crates/ui-egui/src/i18n/tr.tsv index 988ca7667e..38b59a8e62 100644 --- a/crates/ui-egui/src/i18n/tr.tsv +++ b/crates/ui-egui/src/i18n/tr.tsv @@ -10578,6 +10578,13 @@ breakText Glyphs Glifler @msg A panel is not joined to the rest by a crease. Bir panel geri kalanlara hiçbir pilyaj çizgisiyle bağlı değil. @msg A fold line is on a non-printing layer. Bir katlama çizgisi yazdırılmayan bir katmanda. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Paneller: {panels}, menteşeler: {hinges}, hatalar: {errors}, uyarılar: {warnings} + Paper Cutouts Kağıt Kesikleri + Coral Layers Mercan Katmanları + Mint Layers Nane Katmanları + Midnight Layers Gece Yarısı Katmanları + Sunflower Sheet Ayçiçeği Yaprağı + Rose Layers Gül Katmanları + Monochrome Stack Tek Renkli Yığın Dashed Arrow Kesikli Ok Pressure Sensitive Basınca Duyarlı Flex Ribbon Esnek Şerit diff --git a/crates/ui-egui/src/i18n/uk.tsv b/crates/ui-egui/src/i18n/uk.tsv index 4be3f5825c..d93bd4d1f7 100644 --- a/crates/ui-egui/src/i18n/uk.tsv +++ b/crates/ui-egui/src/i18n/uk.tsv @@ -10242,6 +10242,13 @@ breakText Glyphs Гліфи @msg A panel is not joined to the rest by a crease. Панель не з’єднана з рештою жодною лінією біговки. @msg A fold line is on a non-printing layer. Лінія згину лежить на шарі, що не друкується. @msg Panels: {panels}, hinges: {hinges}, errors: {errors}, warnings: {warnings} Панелі: {panels}, шарніри: {hinges}, помилки: {errors}, попередження: {warnings} + Paper Cutouts Паперові вирізки + Coral Layers Коралові шари + Mint Layers М’ятні шари + Midnight Layers Опівнічні шари + Sunflower Sheet Аркуш соняшника + Rose Layers Рожеві шари + Monochrome Stack Монохромний стос Dashed Arrow Пунктирна стрілка Pressure Sensitive Чутливі до натиску Flex Ribbon Гнучка стрічка diff --git a/crates/ui-egui/src/i18n/vi.tsv b/crates/ui-egui/src/i18n/vi.tsv index 48d2320501..164ad75a40 100644 --- a/crates/ui-egui/src/i18n/vi.tsv +++ b/crates/ui-egui/src/i18n/vi.tsv @@ -8440,6 +8440,13 @@ breakText Glyphs Glyph @msg {width} × {height} pixels is too large for Targa (at most 65535 pixels a side): lower the resolution {width} × {height} điểm ảnh quá lớn cho Targa (tối đa 65535 điểm ảnh mỗi cạnh): hãy giảm độ phân giải @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} điểm ảnh quá lớn cho PSD (tối đa {MAX_SIDE} điểm ảnh mỗi cạnh): hãy giảm độ phân giải @msg composer must be "singleLine", "everyLine", "standardSingleLine" or "standardEveryLine" composer phải là "singleLine", "everyLine", "standardSingleLine" hoặc "standardEveryLine" + Paper Cutouts Hình cắt giấy + Coral Layers Lớp san hô + Mint Layers Lớp bạc hà + Midnight Layers Lớp nửa đêm + Sunflower Sheet Tờ hướng dương + Rose Layers Lớp hoa hồng + Monochrome Stack Chồng đơn sắc # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. Hiện thẻ cho biết công cụ trên thanh công cụ và các phím của nó làm gì thay cho chú thích; cần bật Hiện chú thích công cụ. Selects whole objects and groups to move, resize or rotate them. Chọn toàn bộ đối tượng và nhóm để di chuyển, đổi kích thước hoặc xoay chúng. diff --git a/crates/ui-egui/src/i18n/zh-hans.tsv b/crates/ui-egui/src/i18n/zh-hans.tsv index 2e375a3069..9ebc93da03 100644 --- a/crates/ui-egui/src/i18n/zh-hans.tsv +++ b/crates/ui-egui/src/i18n/zh-hans.tsv @@ -10435,6 +10435,13 @@ breakText Glyphs 字形 @msg A joint does not close by {gap} pt. 有一处接缝相差 {gap} pt 未闭合。 @msg Two panels pass through each other. 两个面板相互穿插。 @msg {w} × {h} pixels is too large for PSD (at most {MAX_SIDE} pixels a side): lower the resolution {w} × {h} 像素对 PSD 而言过大 (每边最多 {MAX_SIDE} 像素):请降低分辨率 + Paper Cutouts 剪纸 + Coral Layers 珊瑚色图层 + Mint Layers 薄荷色图层 + Midnight Layers 午夜色图层 + Sunflower Sheet 向日葵纸片 + Rose Layers 玫瑰色图层 + Monochrome Stack 单色叠层 # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. 以卡片代替提示,显示工具栏工具及其按键的作用;需要开启显示工具提示。 Selects whole objects and groups to move, resize or rotate them. 选择整个对象和编组,以移动、缩放或旋转它们。 diff --git a/crates/ui-egui/src/i18n/zh-hant.tsv b/crates/ui-egui/src/i18n/zh-hant.tsv index 36cfca4cc9..c1d2f46f3c 100644 --- a/crates/ui-egui/src/i18n/zh-hant.tsv +++ b/crates/ui-egui/src/i18n/zh-hant.tsv @@ -10250,6 +10250,13 @@ breakText Glyphs 字符 @msg A joint does not close by {gap} pt. 有一處接縫相差 {gap} pt 未閉合。 @msg Two panels pass through each other. 兩個面板相互穿插。 @msg {what} would print on more than {MAX_TILES} tiles: scale it down {what} 會列印在超過 {MAX_TILES} 個拼貼上:請縮小 + Paper Cutouts 剪紙 + Coral Layers 珊瑚色圖層 + Mint Layers 薄荷色圖層 + Midnight Layers 午夜色圖層 + Sunflower Sheet 向日葵紙片 + Rose Layers 玫瑰色圖層 + Monochrome Stack 單色疊層 # Tool cards (General › Show Tool Cards): one sentence on what each tool does. Shows a card with what a toolbar tool does and what its keys do instead of its tip; it needs Show Tool Tips. 以卡片取代提示,顯示工具列工具及其按鍵的作用;需要開啟顯示工具提示。 Selects whole objects and groups to move, resize or rotate them. 選取整個物件和群組,以移動、縮放或旋轉它們。 diff --git a/crates/ui-egui/src/panels/tests_style_libraries.rs b/crates/ui-egui/src/panels/tests_style_libraries.rs index 569c1765a7..fac6a6bcf0 100644 --- a/crates/ui-egui/src/panels/tests_style_libraries.rs +++ b/crates/ui-egui/src/panels/tests_style_libraries.rs @@ -125,6 +125,47 @@ fn painted_and_sketched_opens_from_the_window_menu_and_a_click_applies_its_style assert_eq!(rows.iter().map(|r| r.name).collect::>(), ["Ink Contour", "Wet Ink"]); } +#[test] +fn paper_cutouts_opens_from_the_window_menu_and_applies_a_layered_style() { + let mut app = app(); + let entry = crate::menus::menu_entries(&app) + .into_iter() + .find(|e| e.path == ["Window", "Graphic Style Libraries"] && e.label == "Paper Cutouts") + .expect("a Window menu item"); + let rect = app.run("shape.rectangle", json!({"x": 10, "y": 10, "width": 80, "height": 40})).unwrap()["id"].as_u64().unwrap(); + app.run(entry.command.as_deref().unwrap(), entry.params.clone()).unwrap(); + assert_eq!(last_open(&app.ui).map(|p| p.id.as_str()), Some("paper-cutouts")); + let undo = undo_len(&app); + click(&mut app, &context(), "Coral Layers", Modifiers::NONE, 0.0); + assert_eq!(undo_len(&app), undo + 1); + let appearance = &app.session.doc().unwrap().doc.node(vectorcraft_doc::NodeId(rect)).unwrap().appearance; + assert_eq!(appearance.items.len(), 3); + assert_eq!(appearance.effects[0].id, "stylize.dropShadow"); +} + +/// A built-in library's list rows and Find field use the UI language; a user library's styles keep +/// their names, and clicks still name the stored style. +#[test] +fn built_in_style_names_show_in_the_ui_language() { + let mut app = app(); + let ctx = context(); + app.run("window.graphicStyleLibrary", json!({"library": "paper-cutouts"})).unwrap(); + app.run("ui.libraryPanel", json!({"panel": "library:graphicStyles:paper-cutouts", "view": "largeList"})).unwrap(); + crate::i18n::set_current(crate::i18n::Lang::from_code("fr").unwrap()); + let mut texts = vec![]; + for t in [0.0, 0.25] { + texts = frame(&ctx, vec![], Modifiers::NONE, t, |ui| library_panel::show_window(&mut app, ui.ctx())); + } + let (_, lib) = GraphicStyleLibraries::get(&app, "paper-cutouts").unwrap(); + let found: Vec<&str> = GraphicStyleLibraries::rows(&lib, "paper-cutouts", "corail").iter().map(|r| r.name).collect(); + let user = GraphicStyleLibraries::label("user/Mine", "Coral Layers").to_string(); + crate::i18n::set_current(crate::i18n::Lang::EN); + assert!(texts.iter().any(|t| t == "Couches corail"), "{texts:?}"); + assert!(!texts.iter().any(|t| t == "Coral Layers"), "{texts:?}"); + assert_eq!(found, ["Coral Layers"]); + assert_eq!(user, "Coral Layers"); +} + #[test] fn the_window_menu_and_the_panel_open_every_library() { let mut app = app(); diff --git a/docs/gaps.md b/docs/gaps.md index 81be1b091e..f5bc46e1cb 100644 --- a/docs/gaps.md +++ b/docs/gaps.md @@ -719,15 +719,16 @@ macOS cursor delivery (#2292) is narrowed to a native host adapter using the exi Direct Selection of a path, compound path or type inside a dynamic instance also takes opacity and blend (`transparency.set`) and a gradient or pattern fill or stroke (`paint.setFill` / `paint.setStroke`, Eyedropper), for that instance only; - graphic style libraries (Window › Graphic Style Libraries; eleven original libraries generated in code, including + graphic style libraries (Window › Graphic Style Libraries; twelve original libraries generated in code, including Game HUD with Health Fill, Mana Glow, Damage Flash, Quest Outline, Coin Shine and Boss Alert, Status Effects with Poison Tint, Freeze Edge, Burn Aura, Stun Pulse, Stealth Fade and Shield Buff, Neon & Glow with Cyan Neon, Magenta Laser, Amber Tube, Electric Lime, Pulse Violet and Cobalt Phosphor, Painted and Sketched with Washed Blue, Bristle Ochre, Pastel Heather, Charcoal Shade, Ink Contour, Wet Ink and Fine Pen, and Textures with Fine Grain, Canvas Weave, Burlap Sack, Cracked Glaze, Mosaic Floor, Quilted Squares, Leaded Glass and Damp Paper, - painted with the texture effects; User Defined; Other Library…; `graphicStyle.libraries`, + painted with the texture effects, and Paper Cutouts with six original layered-paper styles, two colored cut edges + and crisp cast shadows; User Defined; Other Library…; `graphicStyle.libraries`, `graphicStyle.addFromLibrary`). -- **Missing:** more built-in brush libraries beyond the eleven shipped (and further graphic-style libraries beyond the eleven shipped, and further symbol libraries beyond Basic +- **Missing:** more built-in brush libraries beyond the eleven shipped (and further graphic-style libraries beyond the twelve shipped, and further symbol libraries beyond Basic Shapes, UI Frames, Map Markers, Inventory Icons, Skill Icons and Weather Icons; original, generated in code, never Adobe's); dynamic symbols' `.ai` read and write. - **Estimate:** 3–13 h (estimated). diff --git a/docs/mcp.md b/docs/mcp.md index 62e775ffd8..a2ed7b8522 100644 --- a/docs/mcp.md +++ b/docs/mcp.md @@ -5578,7 +5578,7 @@ as a value left out. ## Graphic style libraries Graphic style libraries are read-only sets of graphic styles generated in code (Shadows and Glows, Outlines and -Rules, Hand-Drawn, Textures, Painted and Sketched, Gradient Finishes, Shape Effects, Blends and Transparency, Game HUD, Status Effects). Textures +Rules, Hand-Drawn, Textures, Painted and Sketched, Paper Cutouts, Gradient Finishes, Shape Effects, Blends and Transparency, Game HUD, Status Effects, Neon & Glow). Textures (`textures`) paints its fills and strokes with the texture effects: Fine Grain (`texture.grain`), Canvas Weave and Burlap Sack (`texture.texturizer`), Cracked Glaze (`texture.craquelure`), Mosaic Floor (`texture.mosaicTiles`), Quilted Squares (`texture.patchwork`), Leaded Glass (`texture.stainedGlass`) and Damp Paper (`sketch.waterPaper`). `graphicStyle.libraries` lists them @@ -5598,6 +5598,10 @@ effect that repaints fill and stroke together: `artistic.watercolor`, `artistic. colors and effect settings are VectorCraft's own. These are raster effects, so the document's raster effects resolution sets how fine they draw. +Paper Cutouts (`paper-cutouts`) holds Coral Layers, Mint Layers, Midnight Layers, Sunflower Sheet, +Rose Layers and Monochrome Stack. Each original style paints a solid paper face with two colored +cut edges and a hard, unblurred cast shadow. The colors and shadow offsets are VectorCraft's own. + ```json {"name":"run_command","arguments":{"command":"graphicStyle.library","params":{"library":"hand-drawn"}}} {"name":"run_command","arguments":{"command":"graphicStyle.addFromLibrary","params":{"library":"hand-drawn","name":"Crosshatch","apply":true}}} diff --git a/docs/target-app-parity.md b/docs/target-app-parity.md index 835f20d60a..7951b85d44 100644 --- a/docs/target-app-parity.md +++ b/docs/target-app-parity.md @@ -2030,7 +2030,7 @@ Moved from the ROADMAP's "Shipped so far" on 2026-10-10. Update it when a featur 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`, and an overprinting element in it overprints the art below the group. Evidence: `pdf/src/tests/blend.rs` (`a_knockout_group_without_blending_inside_is_isolated_only_when_it_isolates`, `an_overprinting_element_of_a_knockout_group_that_does_not_isolate_overprints_the_art_below`). PDF import keeps a group's isolation when something inside it overprints as well as when something blends, so an isolated group or knockout group whose objects only overprint opens as an isolated group and is written with `/I true` again, and its overprinting objects still cover the inks of the art below the group. Evidence: `pdf/src/tests/blend.rs` (`an_isolated_group_with_an_overprinting_object_reads_back_isolated`, `an_overprinting_element_of_a_knockout_group_that_does_not_isolate_overprints_the_art_below`). - - **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; eleven generated style libraries (including Game HUD, Status Effects, Neon & Glow, 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`. + - **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; twelve generated style libraries (including Game HUD, Status Effects, Neon & Glow, Painted and Sketched, whose seven styles each repaint a solid fill with one watercolor, dry brush, pastel, charcoal or ink effect, Textures, and Paper Cutouts with six original layered-paper looks and crisp cast shadows) 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. A graphic style dragged onto the Graphic Styles panel's New Graphic Style button is duplicated, as the panel menu's Duplicate Graphic Style does, and both put the copy at the end of the list, as the help page describes ([the help page](https://help.adobe.com/archive/en_US/illustrator/cs5/illustrator_cs5_help.pdf#page=391)). VectorCraft's own rules: the button takes the drop with no art selected; a dragged style that is highlighted brings the other highlighted styles, copied in panel order in one undo step, and the copies are highlighted; the copy is named ` copy`, with a number when that is taken, and no art is linked to it (`a_style_dropped_on_new_graphic_style_is_duplicated_at_the_end` in `crates/ui-egui/src/panels/graphic_styles.rs`, `tests::styles::duplicate_puts_the_copy_at_the_end_of_the_list_in_one_undo_step`).